diff options
Diffstat (limited to 'extensions/source')
209 files changed, 2765 insertions, 2798 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 >&); diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index b129ea16c764..05c78c394ed2 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define ID_TOOLBAR 1 #define ID_GRIDWIN 2 @@ -145,7 +144,7 @@ namespace bib if ( xPropSet.is() && m_xGridModel.is() ) { uno::Any aAny = xPropSet->getPropertyValue( "DefaultControl" ); - rtl::OUString aControlName; + OUString aControlName; aAny >>= aControlName; m_xControl = Reference< awt::XControl > ( xContext->getServiceManager()->createInstanceWithContext(aControlName, xContext), UNO_QUERY_THROW ); diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index e8ff2f2f7a2d..ada5cc721c89 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdb; -using ::rtl::OUString; const char cDataSourceHistory[] = "DataSourceHistory"; @@ -214,7 +213,7 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc) SetModified(); }; //--------------------------------------------------------------------------- -void BibConfig::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) +void BibConfig::Notify( const com::sun::star::uno::Sequence<OUString>& ) { } diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index fea6b7ed72de..fb17abdcf3a0 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -63,14 +63,14 @@ typedef boost::ptr_vector<Mapping> MappingArray; //----------------------------------------------------------------------------- struct StringPair { - rtl::OUString sRealColumnName; - rtl::OUString sLogicalColumnName; + OUString sRealColumnName; + OUString sLogicalColumnName; }; //----------------------------------------------------------------------------- struct Mapping { - rtl::OUString sTableName; - rtl::OUString sURL; + OUString sTableName; + OUString sURL; sal_Int16 nCommandType; StringPair aColumnPairs[COLUMN_COUNT]; @@ -80,34 +80,34 @@ struct Mapping //----------------------------------------------------------------------------- struct BibDBDescriptor { - rtl::OUString sDataSource; - rtl::OUString sTableOrQuery; + OUString sDataSource; + OUString sTableOrQuery; sal_Int32 nCommandType; }; //----------------------------------------------------------------------------- class BibConfig : public utl::ConfigItem { - rtl::OUString sDataSource; - rtl::OUString sTableOrQuery; + OUString sDataSource; + OUString sTableOrQuery; sal_Int32 nTblOrQuery; - rtl::OUString sQueryField; - rtl::OUString sQueryText; + OUString sQueryField; + OUString sQueryText; MappingArray* pMappingsArr; long nBeamerSize; long nViewSize; sal_Bool bShowColumnAssignmentWarning; - rtl::OUString aColumnDefaults[COLUMN_COUNT]; + OUString aColumnDefaults[COLUMN_COUNT]; - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); + com::sun::star::uno::Sequence<OUString> GetPropertyNames(); public: BibConfig(); ~BibConfig(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); BibDBDescriptor GetBibliographyURL(); void SetBibliographyURL(const BibDBDescriptor& rDesc); @@ -115,7 +115,7 @@ public: const Mapping* GetMapping(const BibDBDescriptor& rDesc) const; void SetMapping(const BibDBDescriptor& rDesc, const Mapping* pMapping); - const rtl::OUString& GetDefColumnName(sal_uInt16 nIndex) const + const OUString& GetDefColumnName(sal_uInt16 nIndex) const {return aColumnDefaults[nIndex];} @@ -124,11 +124,11 @@ public: void setViewSize(long nSize) {SetModified(); nViewSize = nSize;} long getViewSize() {return nViewSize;} - const rtl::OUString& getQueryField() const {return sQueryField;} - void setQueryField(const rtl::OUString& rSet) {SetModified(); sQueryField = rSet;} + const OUString& getQueryField() const {return sQueryField;} + void setQueryField(const OUString& rSet) {SetModified(); sQueryField = rSet;} - const rtl::OUString& getQueryText() const {return sQueryText;} - void setQueryText(const rtl::OUString& rSet) {SetModified(); sQueryText = rSet;} + const OUString& getQueryText() const {return sQueryText;} + void setQueryText(const OUString& rSet) {SetModified(); sQueryText = rSet;} sal_Bool IsShowColumnAssignmentWarning() const { return bShowColumnAssignmentWarning;} @@ -138,12 +138,12 @@ public: class DBChangeDialogConfig_Impl { - com::sun::star::uno::Sequence<rtl::OUString> aSourceNames; + com::sun::star::uno::Sequence<OUString> aSourceNames; public: DBChangeDialogConfig_Impl(); ~DBChangeDialogConfig_Impl(); - const com::sun::star::uno::Sequence<rtl::OUString>& GetDataSourceNames(); + const com::sun::star::uno::Sequence<OUString>& GetDataSourceNames(); }; #endif diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 4330a1877923..ed7627e2bdf7 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -83,7 +83,7 @@ class BibliographyLoader : public cppu::WeakImplHelper4 private: - void loadView(const Reference< XFrame > & aFrame, const rtl::OUString& aURL, + void loadView(const Reference< XFrame > & aFrame, const OUString& aURL, const Sequence< PropertyValue >& aArgs, const Reference< XLoadEventListener > & aListener); @@ -97,10 +97,10 @@ public: ~BibliographyLoader(); // XServiceInfo - rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ); - Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); - static rtl::OUString getImplementationName_Static() throw( ) + OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ); + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + static OUString getImplementationName_Static() throw( ) { //! @@ -109,9 +109,9 @@ public: } //XNameAccess - virtual Any SAL_CALL getByName(const rtl::OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException ); - virtual Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw ( RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& aName) throw ( RuntimeException ); + virtual Any SAL_CALL getByName(const OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException ); + virtual Sequence< OUString > SAL_CALL getElementNames(void) throw ( RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw ( RuntimeException ); //XElementAccess virtual Type SAL_CALL getElementType(void) throw ( RuntimeException ); @@ -119,19 +119,19 @@ public: //XPropertySet virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw ( RuntimeException ); - virtual void SAL_CALL setPropertyValue(const rtl::OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ); - virtual Any SAL_CALL getPropertyValue(const rtl::OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ); + virtual Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - static Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames_Static(void) throw( ); + static Sequence<OUString> SAL_CALL getSupportedServiceNames_Static(void) throw( ); friend Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ); // XLoader - virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const rtl::OUString& aURL, + virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL, const Sequence< PropertyValue >& aArgs, const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException); @@ -160,17 +160,17 @@ Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Refer // XServiceInfo -rtl::OUString BibliographyLoader::getImplementationName() throw( ) +OUString BibliographyLoader::getImplementationName() throw( ) { return getImplementationName_Static(); } // XServiceInfo -sal_Bool BibliographyLoader::supportsService(const rtl::OUString& ServiceName) throw( ) +sal_Bool BibliographyLoader::supportsService(const OUString& ServiceName) throw( ) { - Sequence< rtl::OUString > aSNL = getSupportedServiceNames(); - const rtl::OUString * pArray = aSNL.getConstArray(); + Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -178,15 +178,15 @@ sal_Bool BibliographyLoader::supportsService(const rtl::OUString& ServiceName) t } // XServiceInfo -Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames(void) throw( ) +Sequence< OUString > BibliographyLoader::getSupportedServiceNames(void) throw( ) { return getSupportedServiceNames_Static(); } // ORegistryServiceManager_Static -Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw( ) { - Sequence< rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = "com.sun.star.frame.FrameLoader"; //! aSNS.getArray()[1] = "com.sun.star.frame.Bibliography"; @@ -224,7 +224,7 @@ void BibliographyLoader::cancel(void) throw (::com::sun::star::uno::RuntimeExcep //! } -void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUString& rURL, +void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString& rURL, const Sequence< PropertyValue >& rArgs, const Reference< XLoadEventListener > & rListener) throw (::com::sun::star::uno::RuntimeException) { @@ -249,7 +249,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUS } // ----------------------------------------------------------------------- -void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl::OUString& /*rURL*/, +void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUString& /*rURL*/, const Sequence< PropertyValue >& /*rArgs*/, const Reference< XLoadEventListener > & rListener) { @@ -400,7 +400,7 @@ Reference< sdb::XColumn > BibliographyLoader::GetIdentifierColumn() const { BibDataManager* pDatMan = GetDataManager(); Reference< XNameAccess > xColumns = GetDataColumns(); - rtl::OUString sIdentifierColumnName = pDatMan->GetIdentifierMapping(); + OUString sIdentifierColumnName = pDatMan->GetIdentifierMapping(); Reference< sdb::XColumn > xReturn; if (xColumns.is() && xColumns->hasByName(sIdentifierColumnName)) @@ -420,7 +420,7 @@ Reference< XResultSet > BibliographyLoader::GetDataCursor() const return m_xCursor; } -static rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns, +static OUString lcl_AddProperty(Reference< XNameAccess > xColumns, const Mapping* pMapping, const String& rColumnName) { String sColumnName(rColumnName); @@ -435,8 +435,8 @@ static rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns, } } } - rtl::OUString uColumnName(sColumnName); - rtl::OUString uRet; + OUString uColumnName(sColumnName); + OUString uRet; Reference< sdb::XColumn > xCol; if (xColumns->hasByName(uColumnName)) xCol = Reference< sdb::XColumn > (*(Reference< XInterface > *)xColumns->getByName(uColumnName).getValue(), UNO_QUERY); @@ -445,7 +445,7 @@ static rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns, return uRet; } //----------------------------------------------------------------------------- -Any BibliographyLoader::getByName(const rtl::OUString& rName) throw +Any BibliographyLoader::getByName(const OUString& rName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException ) { Any aRet; @@ -463,7 +463,7 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw return aRet; String sIdentifierMapping = pDatMan->GetIdentifierMapping(); - rtl::OUString sId = sIdentifierMapping; + OUString sId = sIdentifierMapping; Reference< sdb::XColumn > xColumn; if (xColumns->hasByName(sId)) xColumn = Reference< sdb::XColumn > (*(Reference< XInterface > *)xColumns->getByName(sId).getValue(), UNO_QUERY); @@ -500,9 +500,9 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw return aRet; } -Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException ) +Sequence< OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException ) { - Sequence< rtl::OUString > aRet(10); + Sequence< OUString > aRet(10); int nRealNameCount = 0; try { @@ -512,13 +512,13 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt { do { - rtl::OUString sTemp = xIdColumn->getString(); + OUString sTemp = xIdColumn->getString(); if (!sTemp.isEmpty() && !xIdColumn->wasNull()) { int nLen = aRet.getLength(); if(nLen == nRealNameCount) aRet.realloc(nLen + 10); - rtl::OUString* pArray = aRet.getArray(); + OUString* pArray = aRet.getArray(); pArray[nRealNameCount] = sTemp; nRealNameCount++; } @@ -535,7 +535,7 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt return aRet; } -sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( RuntimeException ) +sal_Bool BibliographyLoader::hasByName(const OUString& rName) throw ( RuntimeException ) { sal_Bool bRet = sal_False; try @@ -547,7 +547,7 @@ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( Runti { do { - rtl::OUString sCurrentId = xIdColumn->getString(); + OUString sCurrentId = xIdColumn->getString(); if (!xIdColumn->wasNull() && rName.startsWith(sCurrentId)) { bRet = sal_True; @@ -589,7 +589,7 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) thro return xRet; } -void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, +void BibliographyLoader::setPropertyValue(const OUString& /*PropertyName*/, const Any& /*aValue*/) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) @@ -598,7 +598,7 @@ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, //no changeable properties } -Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) +Any BibliographyLoader::getPropertyValue(const OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { Any aRet; @@ -654,28 +654,28 @@ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) } void BibliographyLoader::addPropertyChangeListener( - const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) + const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } void BibliographyLoader::removePropertyChangeListener( - const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) + const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } void BibliographyLoader::addVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) + const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no vetoable properties } void BibliographyLoader::removeVetoableChangeListener( - const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) + const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no vetoable properties diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 74ad9b42bf18..d642e2620f42 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -89,7 +89,7 @@ BibConfig* BibModul::GetConfig() // PropertyNames -#define STATIC_USTRING(a,b) rtl::OUString a(b) +#define STATIC_USTRING(a,b) OUString a(b) STATIC_USTRING(FM_PROP_LABEL,"Label"); STATIC_USTRING(FM_PROP_CONTROLSOURCE,"DataField"); STATIC_USTRING(FM_PROP_NAME,"Name"); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 9891fe077fff..b22a7d12ab33 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -81,7 +81,7 @@ using namespace ::com::sun::star::form; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; -Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) +Reference< XConnection > getConnection(const OUString& _rURL) { // first get the sdb::DataSource corresponding to the url Reference< XDataSource > xDataSource; @@ -166,7 +166,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) { DBG_ASSERT((*(sal_Int32*)xFormProps->getPropertyValue("CommandType").getValue()) == CommandType::TABLE, "::getColumns : invalid form (has no table as data source) !"); - ::rtl::OUString sTable; + OUString sTable; xFormProps->getPropertyValue("Command") >>= sTable; Reference< XNameAccess > xTables = xSupplyTables->getTables(); if (xTables.is() && xTables->hasByName(sTable)) @@ -178,10 +178,10 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) catch (const Exception& e) { #ifdef DBG_UTIL - String sMsg(rtl::OUString("::getColumns : catched an exception (")); + String sMsg(OUString("::getColumns : catched an exception (")); sMsg += String(e.Message); sMsg.AppendAscii(") ..."); - OSL_FAIL(rtl::OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US ).getStr()); + OSL_FAIL(OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US ).getStr()); #else (void)e; #endif @@ -280,7 +280,7 @@ public: }; static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , - const ::rtl::OUString& rLogicalColumnName) + const OUString& rLogicalColumnName) { for(sal_uInt16 i = 0; i < COLUMN_COUNT; i++) { @@ -400,7 +400,7 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : aOKBT.SetClickHdl(LINK(this, MappingDialog_Impl, OkHdl)); String sTitle = GetText(); - sTitle.SearchAndReplace(rtl::OUString("%1"), pDatMan->getActiveDataTable(), 0); + sTitle.SearchAndReplace(OUString("%1"), pDatMan->getActiveDataTable(), 0); SetText(sTitle); aListBoxes[0] = &aIdentifierLB; @@ -440,9 +440,9 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : DBG_ASSERT(xFields.is(), "MappingDialog_Impl::MappingDialog_Impl : gave me an invalid form !"); if(xFields.is()) { - Sequence< ::rtl::OUString > aNames = xFields->getElementNames(); + Sequence< OUString > aNames = xFields->getElementNames(); sal_Int32 nFieldsCount = aNames.getLength(); - const ::rtl::OUString* pNames = aNames.getConstArray(); + const OUString* pNames = aNames.getConstArray(); for(sal_Int32 nField = 0; nField < nFieldsCount; nField++) aListBoxes[0]->InsertEntry(pNames[nField]); @@ -579,9 +579,9 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_CLIPCHILDREN|WB_SORT); aSelectionLB.GetModel()->SetSortMode(SortAscending); - ::rtl::OUString sActiveSource = pDatMan->getActiveDataSource(); - const Sequence< ::rtl::OUString >& rSources = aConfig.GetDataSourceNames(); - const ::rtl::OUString* pSourceNames = rSources.getConstArray(); + OUString sActiveSource = pDatMan->getActiveDataSource(); + const Sequence< OUString >& rSources = aConfig.GetDataSourceNames(); + const OUString* pSourceNames = rSources.getConstArray(); for(int i = 0; i < rSources.getLength(); i++) { SvTreeListEntry* pEntry = aSelectionLB.InsertEntry(pSourceNames[i]); @@ -644,7 +644,7 @@ void BibInterceptorHelper::ReleaseInterceptor() } ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL - BibInterceptorHelper::queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException) + BibInterceptorHelper::queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException) { Reference< XDispatch > xReturn; @@ -696,11 +696,11 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun: //----------------------------------------------------------------------------- #define STR_UID "uid" -::rtl::OUString gGridName("theGrid"); -::rtl::OUString gViewName("theView"); -::rtl::OUString gGlobalName("theGlobals"); -::rtl::OUString gBeamerSize("theBeamerSize"); -::rtl::OUString gViewSize("theViewSize"); +OUString gGridName("theGrid"); +OUString gViewName("theView"); +OUString gGlobalName("theGlobals"); +OUString gBeamerSize("theBeamerSize"); +OUString gViewSize("theViewSize"); BibDataManager::BibDataManager() :BibDataManager_Base( GetMutex() ) @@ -749,9 +749,9 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) // remove the old fields if ( xColContainer->hasElements() ) { - Sequence< ::rtl::OUString > aNames = xColContainer->getElementNames(); - const ::rtl::OUString* pNames = aNames.getConstArray(); - const ::rtl::OUString* pNamesEnd = pNames + aNames.getLength(); + Sequence< OUString > aNames = xColContainer->getElementNames(); + const OUString* pNames = aNames.getConstArray(); + const OUString* pNamesEnd = pNames + aNames.getLength(); for ( ; pNames != pNamesEnd; ++pNames ) xColContainer->removeByName( *pNames ); } @@ -764,16 +764,16 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) Reference< XPropertySet > xField; - Sequence< ::rtl::OUString > aFields( xFields->getElementNames() ); - const ::rtl::OUString* pFields = aFields.getConstArray(); - const ::rtl::OUString* pFieldsEnd = pFields + aFields.getLength(); + Sequence< OUString > aFields( xFields->getElementNames() ); + const OUString* pFields = aFields.getConstArray(); + const OUString* pFieldsEnd = pFields + aFields.getLength(); for ( ; pFields != pFieldsEnd; ++pFields ) { xFields->getByName( *pFields ) >>= xField; - ::rtl::OUString sCurrentModelType; - const ::rtl::OUString sType("Type"); + OUString sCurrentModelType; + const OUString sType("Type"); sal_Int32 nType = 0; sal_Bool bIsFormatted = sal_False; sal_Bool bFormattedIsNumeric = sal_True; @@ -807,7 +807,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) Reference< XPropertySet > xCurrentCol = xColFactory->createColumn(sCurrentModelType); if (bIsFormatted) { - ::rtl::OUString sFormatKey("FormatKey"); + OUString sFormatKey("FormatKey"); xCurrentCol->setPropertyValue(sFormatKey, xField->getPropertyValue(sFormatKey)); Any aFormatted(&bFormattedIsNumeric, ::getBooleanCppuType()); xCurrentCol->setPropertyValue("TreatAsNumber", aFormatted); @@ -835,7 +835,7 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< try { Reference< XPropertySet > aFormPropSet( xDbForm, UNO_QUERY ); - ::rtl::OUString sName; + OUString sName; aFormPropSet->getPropertyValue("Command") >>= sName; if ( !m_xGridModel.is() ) @@ -889,13 +889,13 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) Reference< XNameAccess > xTables = xSupplyTables.is() ? xSupplyTables->getTables() : Reference< XNameAccess > (); - Sequence< ::rtl::OUString > aTableNameSeq; + Sequence< OUString > aTableNameSeq; if (xTables.is()) aTableNameSeq = xTables->getElementNames(); if(aTableNameSeq.getLength() > 0) { - const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray(); + const OUString* pTableNames = aTableNameSeq.getConstArray(); if(!rDesc.sTableOrQuery.isEmpty()) aActiveDataTable = rDesc.sTableOrQuery; else @@ -915,11 +915,11 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); if ( xFactory.is() ) - m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); - ::rtl::OUString aString("SELECT * FROM "); + OUString aString("SELECT * FROM "); - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; ::dbtools::qualifiedNameComponents( xMetaData, aActiveDataTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); aString += ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sName ); @@ -940,9 +940,9 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) return xResult; } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > BibDataManager::getDataSources() +Sequence< OUString > BibDataManager::getDataSources() { - Sequence< ::rtl::OUString > aTableNameSeq; + Sequence< OUString > aTableNameSeq; try { @@ -961,19 +961,19 @@ Sequence< ::rtl::OUString > BibDataManager::getDataSources() return aTableNameSeq; } //------------------------------------------------------------------------ -::rtl::OUString BibDataManager::getActiveDataTable() +OUString BibDataManager::getActiveDataTable() { return aActiveDataTable; } //------------------------------------------------------------------------ -void BibDataManager::setFilter(const ::rtl::OUString& rQuery) +void BibDataManager::setFilter(const OUString& rQuery) { if(!m_xParser.is()) return; try { m_xParser->setFilter( rQuery ); - ::rtl::OUString aQuery = m_xParser->getFilter(); + OUString aQuery = m_xParser->getFilter(); Reference< XPropertySet > xFormProps( m_xForm, UNO_QUERY_THROW ); xFormProps->setPropertyValue( "Filter", makeAny( aQuery ) ); xFormProps->setPropertyValue( "ApplyFilter", makeAny( sal_True ) ); @@ -987,10 +987,10 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery) } //------------------------------------------------------------------------ -::rtl::OUString BibDataManager::getFilter() +OUString BibDataManager::getFilter() { - ::rtl::OUString aQueryString; + OUString aQueryString; try { Reference< XPropertySet > xFormProps( m_xForm, UNO_QUERY_THROW ); @@ -1006,23 +1006,23 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery) } //------------------------------------------------------------------------ -Sequence< ::rtl::OUString > BibDataManager::getQueryFields() +Sequence< OUString > BibDataManager::getQueryFields() { - Sequence< ::rtl::OUString > aFieldSeq; + Sequence< OUString > aFieldSeq; Reference< XNameAccess > xFields = getColumns( m_xForm ); if (xFields.is()) aFieldSeq = xFields->getElementNames(); return aFieldSeq; } //------------------------------------------------------------------------ -::rtl::OUString BibDataManager::getQueryField() +OUString BibDataManager::getQueryField() { BibConfig* pConfig = BibModul::GetConfig(); - ::rtl::OUString aFieldString = pConfig->getQueryField(); + OUString aFieldString = pConfig->getQueryField(); if(aFieldString.isEmpty()) { - Sequence< ::rtl::OUString > aSeq = getQueryFields(); - const ::rtl::OUString* pFields = aSeq.getConstArray(); + Sequence< OUString > aSeq = getQueryFields(); + const OUString* pFields = aSeq.getConstArray(); if(aSeq.getLength()>0) { aFieldString=pFields[0]; @@ -1031,12 +1031,12 @@ Sequence< ::rtl::OUString > BibDataManager::getQueryFields() return aFieldString; } //------------------------------------------------------------------------ -void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery) +void BibDataManager::startQueryWith(const OUString& rQuery) { BibConfig* pConfig = BibModul::GetConfig(); pConfig->setQueryText( rQuery ); - ::rtl::OUString aQueryString; + OUString aQueryString; if(!rQuery.isEmpty()) { aQueryString=aQuoteChar; @@ -1052,9 +1052,9 @@ void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery) setFilter(aQueryString); } -void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) +void BibDataManager::setActiveDataSource(const OUString& rURL) { - ::rtl::OUString sTmp(aDataSourceURL); + OUString sTmp(aDataSourceURL); aDataSourceURL = rURL; Reference< XPropertySet > aPropertySet( m_xForm, UNO_QUERY ); @@ -1075,12 +1075,12 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) aPropertySet->setPropertyValue("ActiveConnection", aVal); Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); if ( xFactory.is() ) - m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); if(xOldConnection.is()) xOldConnection->dispose(); - Sequence< ::rtl::OUString > aTableNameSeq; + Sequence< OUString > aTableNameSeq; Reference< XTablesSupplier > xSupplyTables(xConnection, UNO_QUERY); if(xSupplyTables.is()) { @@ -1089,7 +1089,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) } if(aTableNameSeq.getLength() > 0) { - const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray(); + const OUString* pTableNames = aTableNameSeq.getConstArray(); aActiveDataTable = pTableNames[0]; aVal <<= aActiveDataTable; aPropertySet->setPropertyValue("Command", aVal); @@ -1097,12 +1097,12 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) //Caching for Performance aVal <<= (sal_Int32)50; aPropertySet->setPropertyValue("FetchSize", aVal); - ::rtl::OUString aString("SELECT * FROM "); + OUString aString("SELECT * FROM "); // quote the table name which may contain catalog.schema.table Reference<XDatabaseMetaData> xMetaData(xConnection->getMetaData(),UNO_QUERY); aQuoteChar = xMetaData->getIdentifierQuoteString(); - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; ::dbtools::qualifiedNameComponents( xMetaData, aActiveDataTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); aString += ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sName ); @@ -1133,7 +1133,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) } -void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) +void BibDataManager::setActiveDataTable(const OUString& rTable) { ResetIdentifierMapping(); try @@ -1145,11 +1145,11 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) Reference< XConnection > xConnection = getConnection( m_xForm ); Reference< XTablesSupplier > xSupplyTables(xConnection, UNO_QUERY); Reference< XNameAccess > xAccess = xSupplyTables->getTables(); - Sequence< ::rtl::OUString > aTableNameSeq = xAccess->getElementNames(); + Sequence< OUString > aTableNameSeq = xAccess->getElementNames(); sal_uInt32 nCount = aTableNameSeq.getLength(); - const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray(); - const ::rtl::OUString* pTableNamesEnd = pTableNames + nCount; + const OUString* pTableNames = aTableNameSeq.getConstArray(); + const OUString* pTableNamesEnd = pTableNames + nCount; for ( ; pTableNames != pTableNamesEnd; ++pTableNames ) { @@ -1168,11 +1168,11 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); if ( xFactory.is() ) - m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); - ::rtl::OUString aString("SELECT * FROM "); + OUString aString("SELECT * FROM "); - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; ::dbtools::qualifiedNameComponents( xMetaData, aActiveDataTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); aString += ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sName ); @@ -1291,7 +1291,7 @@ void SAL_CALL BibDataManager::removeLoadListener( const Reference< XLoadListener } //------------------------------------------------------------------------ -Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUString& rName) +Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString& rName) { Reference< awt::XControlModel > xModel; @@ -1307,17 +1307,17 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS xPropSet->setPropertyValue( "Name", makeAny( rName ) ); // set the name of the to-be-created control - ::rtl::OUString aControlName("com.sun.star.form.control.InteractionGridControl"); + OUString aControlName("com.sun.star.form.control.InteractionGridControl"); Any aAny; aAny <<= aControlName; xPropSet->setPropertyValue( "DefaultControl",aAny ); // the helpURL - ::rtl::OUString uProp("HelpURL"); + OUString uProp("HelpURL"); Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME )); - sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); + OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME )); + sId += OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } } @@ -1329,9 +1329,9 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS return xModel; } //------------------------------------------------------------------------ -::rtl::OUString BibDataManager::getControlName(sal_Int32 nFormatKey ) +OUString BibDataManager::getControlName(sal_Int32 nFormatKey ) { - ::rtl::OUString aResStr; + OUString aResStr; switch (nFormatKey) { case DataType::BIT: @@ -1369,10 +1369,10 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS } //------------------------------------------------------------------------ Reference< awt::XControlModel > BibDataManager::loadControlModel( - const ::rtl::OUString& rName, sal_Bool bForceListBox) + const OUString& rName, sal_Bool bForceListBox) { Reference< awt::XControlModel > xModel; - ::rtl::OUString aName("View_"); + OUString aName("View_"); aName += rName; try @@ -1390,11 +1390,11 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( aElement >>= xField; Reference< XPropertySetInfo > xInfo = xField.is() ? xField->getPropertySetInfo() : Reference< XPropertySetInfo > (); - const ::rtl::OUString sType("Type"); + const OUString sType("Type"); sal_Int32 nFormatKey = 0; xField->getPropertyValue(sType) >>= nFormatKey; - ::rtl::OUString aInstanceName("com.sun.star.form.component."); + OUString aInstanceName("com.sun.star.form.component."); if (bForceListBox) aInstanceName += "ListBox"; @@ -1409,7 +1409,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( xPropSet->setPropertyValue( FM_PROP_NAME,aFieldName); xPropSet->setPropertyValue( FM_PROP_CONTROLSOURCE, makeAny( rName ) ); - xPropSet->setPropertyValue( ::rtl::OUString( "NativeWidgetLook" ), makeAny( (sal_Bool)sal_True ) ); + xPropSet->setPropertyValue( OUString( "NativeWidgetLook" ), makeAny( (sal_Bool)sal_True ) ); Reference< XFormComponent > aFormComp(xModel,UNO_QUERY ); @@ -1494,11 +1494,11 @@ void BibDataManager::SetMeAsUidListener() if (!xFields.is()) return; - Sequence< ::rtl::OUString > aFields(xFields->getElementNames()); - const ::rtl::OUString* pFields = aFields.getConstArray(); + Sequence< OUString > aFields(xFields->getElementNames()); + const OUString* pFields = aFields.getConstArray(); sal_Int32 nCount=aFields.getLength(); - rtl::OUString StrUID(STR_UID); - ::rtl::OUString theFieldName; + OUString StrUID(STR_UID); + OUString theFieldName; for( sal_Int32 i=0; i<nCount; i++ ) { String aName= pFields[i]; @@ -1538,11 +1538,11 @@ void BibDataManager::RemoveMeAsUidListener() return; - Sequence< ::rtl::OUString > aFields(xFields->getElementNames()); - const ::rtl::OUString* pFields = aFields.getConstArray(); + Sequence< OUString > aFields(xFields->getElementNames()); + const OUString* pFields = aFields.getConstArray(); sal_Int32 nCount=aFields.getLength(); - rtl::OUString StrUID(STR_UID); - ::rtl::OUString theFieldName; + OUString StrUID(STR_UID); + OUString theFieldName; for( sal_Int32 i=0; i<nCount; i++ ) { String aName= pFields[i]; @@ -1582,9 +1582,9 @@ void BibDataManager::CreateMappingDialog(Window* pParent) delete pDlg; } -::rtl::OUString BibDataManager::CreateDBChangeDialog(Window* pParent) +OUString BibDataManager::CreateDBChangeDialog(Window* pParent) { - ::rtl::OUString uRet; + OUString uRet; DBChangeDialog_Impl * pDlg = new DBChangeDialog_Impl(pParent, this ); if(RET_OK == pDlg->Execute()) { @@ -1604,7 +1604,7 @@ void BibDataManager::DispatchDBChangeDialog() pToolbar->SendDispatch(TBC_BT_CHANGESOURCE, Sequence< PropertyValue >()); } -const ::rtl::OUString& BibDataManager::GetIdentifierMapping() +const OUString& BibDataManager::GetIdentifierMapping() { if(sIdentifierMapping.isEmpty()) { diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index b450bada2b23..ea3acb6eb9f0 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -66,7 +66,7 @@ public: void ReleaseInterceptor(); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw (::com::sun::star::uno::RuntimeException); // XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException); @@ -92,9 +92,9 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xFormDispatch; BibInterceptorHelper* m_pInterceptorHelper; - ::rtl::OUString aActiveDataTable; - ::rtl::OUString aDataSourceURL; - ::rtl::OUString aQuoteChar; + OUString aActiveDataTable; + OUString aDataSourceURL; + OUString aQuoteChar; ::com::sun::star::uno::Any aUID; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xBibCursor; @@ -103,19 +103,19 @@ private: ::bib::BibView* pBibView; BibToolBar* pToolbar; - rtl::OUString sIdentifierMapping; + OUString sIdentifierMapping; protected: void InsertFields(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid); void SetMeAsUidListener(); void RemoveMeAsUidListener(); - void UpdateAddressbookCursor(::rtl::OUString aSourceName); + void UpdateAddressbookCursor(OUString aSourceName); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - createGridModel( const ::rtl::OUString& rName ); + createGridModel( const OUString& rName ); // XLoadable virtual void SAL_CALL load( ) throw (::com::sun::star::uno::RuntimeException); @@ -143,32 +143,32 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> getDataSources(); + ::com::sun::star::uno::Sequence< OUString> getDataSources(); - ::rtl::OUString getActiveDataSource() {return aDataSourceURL;} - void setActiveDataSource(const ::rtl::OUString& rURL); + OUString getActiveDataSource() {return aDataSourceURL;} + void setActiveDataSource(const OUString& rURL); - ::rtl::OUString getActiveDataTable(); - void setActiveDataTable(const ::rtl::OUString& rTable); + OUString getActiveDataTable(); + void setActiveDataTable(const OUString& rTable); - void setFilter(const ::rtl::OUString& rQuery); - ::rtl::OUString getFilter(); + void setFilter(const OUString& rQuery); + OUString getFilter(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> getQueryFields(); - ::rtl::OUString getQueryField(); - void startQueryWith(const ::rtl::OUString& rQuery); + ::com::sun::star::uno::Sequence< OUString> getQueryFields(); + OUString getQueryField(); + void startQueryWith(const OUString& rQuery); const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& getParser() { return m_xParser; } const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& getForm() { return m_xForm; } - ::rtl::OUString getControlName(sal_Int32 nFormatKey ); + OUString getControlName(sal_Int32 nFormatKey ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const ::rtl::OUString& rName, + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const OUString& rName, sal_Bool bForceListBox = sal_False); void CreateMappingDialog(Window* pParent); - ::rtl::OUString CreateDBChangeDialog(Window* pParent); + OUString CreateDBChangeDialog(Window* pParent); void DispatchDBChangeDialog(); sal_Bool HasActiveConnection() const; @@ -177,8 +177,8 @@ public: void SetToolbar(BibToolBar* pSet); - const rtl::OUString& GetIdentifierMapping(); - void ResetIdentifierMapping() {sIdentifierMapping = rtl::OUString();} + const OUString& GetIdentifierMapping(); + void ResetIdentifierMapping() {sIdentifierMapping = OUString();} ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(); // #100312# ---------- diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 9dfd994a031b..5a6cd4f95e6d 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -60,7 +60,6 @@ using namespace com::sun::star::frame; using namespace com::sun::star::uno; using namespace com::sun::star; -using ::rtl::OUString; struct DispatchInfo { @@ -99,7 +98,7 @@ static DispatchInfo SupportedCommandsArray[] = { 0 , 0 , sal_False } }; -typedef ::boost::unordered_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; +typedef ::boost::unordered_map< OUString, CacheDispatchInfo, OUStringHash, ::std::equal_to< OUString > > CmdToInfoCache; const CmdToInfoCache& GetCommandToInfoCache() { @@ -114,7 +113,7 @@ const CmdToInfoCache& GetCommandToInfoCache() sal_Int32 i( 0 ); while ( SupportedCommandsArray[i].pCommand != 0 ) { - rtl::OUString aCommand( rtl::OUString::createFromAscii( SupportedCommandsArray[i].pCommand )); + OUString aCommand( OUString::createFromAscii( SupportedCommandsArray[i].pCommand )); CacheDispatchInfo aDispatchInfo; aDispatchInfo.nGroupId = SupportedCommandsArray[i].nGroupId; @@ -202,22 +201,22 @@ BibFrameController_Impl::~BibFrameController_Impl() CloseBibModul(pBibMod); } -::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.extensions.Bibliography"); + return OUString("com.sun.star.comp.extensions.Bibliography"); } -sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) { return ( sServiceName == "com.sun.star.frame.Bibliography" || sServiceName == "com.sun.star.frame.Controller" ); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException) { // return only top level services ... // base services are included there and should be asked by uno-rtti. - ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString("com.sun.star.frame.Bibliography"); + ::com::sun::star::uno::Sequence< OUString > lNames(1); + lNames[0] = OUString("com.sun.star.frame.Bibliography"); return lNames; } @@ -281,7 +280,7 @@ void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::X pImp->aLC.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); } -uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const rtl::OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException) +uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException) { if ( !bDisposing ) { @@ -434,14 +433,14 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } else if(aCommand.EqualsAscii("Bib/sdbsource")) { - rtl::OUString aURL = pDatMan->CreateDBChangeDialog(pParent); + OUString aURL = pDatMan->CreateDBChangeDialog(pParent); if(!aURL.isEmpty()) { try { uno::Sequence< beans::PropertyValue > aNewDataSource(2); beans::PropertyValue* pProps = aNewDataSource.getArray(); - pProps[0].Value <<= rtl::OUString(); + pProps[0].Value <<= OUString(); pProps[1].Value <<= aURL; ChangeDataSource(aNewDataSource); } @@ -471,11 +470,11 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen const beans::PropertyValue* pPropertyValue = aArgs.getConstArray(); uno::Any aValue=pPropertyValue[0].Value; - rtl::OUString aQuery; + OUString aQuery; aValue >>= aQuery; aValue=pPropertyValue[1].Value; - rtl::OUString aQueryField; + OUString aQueryField; aValue >>= aQueryField; BibConfig* pConfig = BibModul::GetConfig(); pConfig->setQueryField(aQueryField); @@ -495,7 +494,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen { // the dialog has been executed successfully, and the filter on the query composer // has been changed - ::rtl::OUString sNewFilter = pDatMan->getParser()->getFilter(); + OUString sNewFilter = pDatMan->getParser()->getFilter(); pDatMan->setFilter( sNewFilter ); } } @@ -669,15 +668,15 @@ void BibFrameController_Impl::addStatusListener( { aEvent.IsEnabled = sal_True; const char* pHier = bHierarchical? "" : "*" ; - aEvent.State <<= rtl::OUString::createFromAscii(pHier); + aEvent.State <<= OUString::createFromAscii(pHier); } else if(aURL.Path == "Bib/MenuFilter") { aEvent.IsEnabled = sal_True; aEvent.FeatureDescriptor=pDatMan->getQueryField(); - uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getQueryFields(); - aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<rtl::OUString>*)0)); + uno::Sequence<OUString> aStringSeq=pDatMan->getQueryFields(); + aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<OUString>*)0)); } else if ( aURL.Path == "Bib/source") @@ -685,8 +684,8 @@ void BibFrameController_Impl::addStatusListener( aEvent.IsEnabled = sal_True; aEvent.FeatureDescriptor=pDatMan->getActiveDataTable(); - uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getDataSources(); - aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<rtl::OUString>*)0)); + uno::Sequence<OUString> aStringSeq=pDatMan->getDataSources(); + aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<OUString>*)0)); } else if( aURL.Path == "Bib/sdbsource" || aURL.Path == "Bib/Mapping" || @@ -702,7 +701,7 @@ void BibFrameController_Impl::addStatusListener( } else if (aURL.Path == "Bib/removeFilter" ) { - rtl::OUString aFilterStr=pDatMan->getFilter(); + OUString aFilterStr=pDatMan->getFilter(); aEvent.IsEnabled = !aFilterStr.isEmpty(); } else if(aURL.Path == "Cut") @@ -746,7 +745,7 @@ void BibFrameController_Impl::addStatusListener( try { uno::Any aData = xDataObj->getTransferData( aFlavor ); - ::rtl::OUString aText; + OUString aText; aData >>= aText; aEvent.IsEnabled = !aText.isEmpty(); } @@ -804,7 +803,7 @@ void BibFrameController_Impl::removeStatusListener( //----------------------------------------------------------------------------- void BibFrameController_Impl::RemoveFilter() { - rtl::OUString aQuery; + OUString aQuery; pDatMan->startQueryWith(aQuery); sal_uInt16 nCount = aStatusListeners.size(); @@ -847,14 +846,14 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope { const beans::PropertyValue* pPropertyValue = aArgs.getConstArray(); uno::Any aValue=pPropertyValue[0].Value; - rtl::OUString aDBTableName; + OUString aDBTableName; aValue >>= aDBTableName; if(aArgs.getLength() > 1) { uno::Any aDB = pPropertyValue[1].Value; - rtl::OUString aURL; + OUString aURL; aDB >>= aURL; pDatMan->setActiveDataSource(aURL); aDBTableName = pDatMan->getActiveDataTable(); @@ -884,7 +883,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope aEvent.Source = (XDispatch *) this; aEvent.FeatureDescriptor=pDatMan->getQueryField(); - uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getQueryFields(); + uno::Sequence<OUString> aStringSeq=pDatMan->getQueryFields(); aEvent.State = makeAny( aStringSeq ); pObj->xListener->statusChanged( aEvent ); diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index 18203cd8703c..775ad18ebbbf 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -85,9 +85,9 @@ public: void RemoveFilter(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XController virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) throw (::com::sun::star::uno::RuntimeException); @@ -104,7 +104,7 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw (::com::sun::star::uno::RuntimeException); //class ::com::sun::star::frame::XDispatch diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 7b9a4a4e50c7..6023fcbf742f 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -128,7 +128,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno } } } - rtl::OUString uTypeMapping = sTypeMapping; + OUString uTypeMapping = sTypeMapping; uno::Reference< form::XForm > xForm = pDatMan->getForm(); uno::Reference< sdbcx::XColumnsSupplier > xSupplyCols(xForm, UNO_QUERY); @@ -149,8 +149,8 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno // getShort returns zero if the value is not a number if (!nTempVal || xCol->wasNull()) { - rtl::OUString sTempVal = xCol->getString(); - if(sTempVal != rtl::OUString('0')) + OUString sTempVal = xCol->getString(); + if(sTempVal != OUString('0')) nTempVal = -1; } } @@ -432,7 +432,7 @@ void BibGeneralPage::CommitActiveControl() } //----------------------------------------------------------------------------- void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::Point& rPos, const ::Size& rSize, - String& rErrorString, String aColumnUIName, const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray ) + String& rErrorString, String aColumnUIName, const OString& sHelpId, sal_uInt16 nIndexInFTArray ) { // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT @@ -456,7 +456,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P //----------------------------------------------------------------------------- uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( const String& rName, - ::Point rPos, ::Size rSize, const rtl::OString& sHelpId, sal_Int16& rIndex ) + ::Point rPos, ::Size rSize, const OString& sHelpId, sal_Int16& rIndex ) { uno::Reference< awt::XControlModel > xCtrModel; try @@ -472,15 +472,15 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( uno::Reference< beans::XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); uno::Any aAny = xPropSet->getPropertyValue( "DefaultControl" ); - rtl::OUString aControlName; + OUString aControlName; aAny >>= aControlName; - rtl::OUString uProp("HelpURL"); + OUString uProp("HelpURL"); if(xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME ); - DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); - sId += ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ); + OUString sId = OUString::createFromAscii( INET_HID_SCHEME ); + DBG_ASSERT( INetURLObject( OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); + sId += OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } @@ -493,23 +493,23 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( aAny.setValue( &eSet, ::getCppuType((const ListSourceType*)0) ); xPropSet->setPropertyValue("ListSourceType", aAny); - uno::Sequence<rtl::OUString> aListSource(TYPE_COUNT); - rtl::OUString* pListSourceArr = aListSource.getArray(); + uno::Sequence<OUString> aListSource(TYPE_COUNT); + OUString* pListSourceArr = aListSource.getArray(); //pListSourceArr[0] = "select TypeName, TypeIndex from TypeNms"; for(sal_Int32 i = 0; i < TYPE_COUNT; ++i) - pListSourceArr[i] = rtl::OUString::valueOf(i); - aAny.setValue(&aListSource, ::getCppuType((uno::Sequence<rtl::OUString>*)0)); + pListSourceArr[i] = OUString::valueOf(i); + aAny.setValue(&aListSource, ::getCppuType((uno::Sequence<OUString>*)0)); xPropSet->setPropertyValue("ListSource", aAny); - uno::Sequence<rtl::OUString> aValues(TYPE_COUNT + 1); - rtl::OUString* pValuesArr = aValues.getArray(); + uno::Sequence<OUString> aValues(TYPE_COUNT + 1); + OUString* pValuesArr = aValues.getArray(); for(sal_uInt16 j = 0; j < TYPE_COUNT; j++) pValuesArr[j] = aBibTypeArr[j]; // empty string if an invalid value no values is set - pValuesArr[TYPE_COUNT] = rtl::OUString(); + pValuesArr[TYPE_COUNT] = OUString(); - aAny.setValue(&aValues, ::getCppuType((uno::Sequence<rtl::OUString>*)0)); + aAny.setValue(&aValues, ::getCppuType((uno::Sequence<OUString>*)0)); xPropSet->setPropertyValue("StringItemList", aAny); diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 2b4a7ddb8c87..f9b97db7f5ef 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -124,12 +124,12 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage BibDataManager* pDatMan; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - AddXControl( const String& rName, Point aPos, Size aSize, const rtl::OString& sHelpId, + AddXControl( const String& rName, Point aPos, Size aSize, const OString& sHelpId, sal_Int16& rIndex ); - void AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos, + void AddControlWithError( const OUString& rColumnName, const Point& rPos, const Size& rSize, String& rErrorString, String aColumnUIName, - const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray ); + const OString& sHelpId, sal_uInt16 nIndexInFTArray ); void AdjustScrollbars(); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 3b40e721a32f..ea3999fe03f1 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; // Konstanten ------------------------------------------------------------- -BibToolBarListener::BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId): +BibToolBarListener::BibToolBarListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId): nIndex(nId), aCommand(aStr), pToolBar(pTB) @@ -73,12 +73,12 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta } }; -rtl::OUString BibToolBarListener::GetCommand() const +OUString BibToolBarListener::GetCommand() const { return aCommand; } -BibTBListBoxListener::BibTBListBoxListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId): +BibTBListBoxListener::BibTBListBoxListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId): BibToolBarListener(pTB,aStr,nId) { } @@ -95,13 +95,13 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS pToolBar->EnableSourceList(rEvt.IsEnabled); Any aState = rEvt.State; - if(aState.getValueType() == ::getCppuType((Sequence<rtl::OUString>*)0)) + if(aState.getValueType() == ::getCppuType((Sequence<OUString>*)0)) { pToolBar->UpdateSourceList(sal_False); pToolBar->ClearSourceList(); - Sequence<rtl::OUString>* pStringSeq = (Sequence<rtl::OUString>*)aState.getValue(); - const rtl::OUString* pStringArray = (const rtl::OUString*)pStringSeq->getConstArray(); + Sequence<OUString>* pStringSeq = (Sequence<OUString>*)aState.getValue(); + const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray(); sal_uInt32 nCount = pStringSeq->getLength(); XubString aEntry; @@ -118,7 +118,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS } }; -BibTBQueryMenuListener::BibTBQueryMenuListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId): +BibTBQueryMenuListener::BibTBQueryMenuListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId): BibToolBarListener(pTB,aStr,nId) { } @@ -135,12 +135,12 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) pToolBar->EnableSourceList(rEvt.IsEnabled); uno::Any aState=rEvt.State; - if(aState.getValueType()==::getCppuType((Sequence<rtl::OUString>*)0)) + if(aState.getValueType()==::getCppuType((Sequence<OUString>*)0)) { pToolBar->ClearFilterMenu(); - Sequence<rtl::OUString>* pStringSeq = (Sequence<rtl::OUString>*) aState.getValue(); - const rtl::OUString* pStringArray = (const rtl::OUString*)pStringSeq->getConstArray(); + Sequence<OUString>* pStringSeq = (Sequence<OUString>*) aState.getValue(); + const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray(); sal_uInt32 nCount = pStringSeq->getLength(); for( sal_uInt32 i=0; i<nCount; i++ ) @@ -155,7 +155,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) } }; -BibTBEditListener::BibTBEditListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId): +BibTBEditListener::BibTBEditListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId): BibToolBarListener(pTB,aStr,nId) { } @@ -315,7 +315,7 @@ void BibToolBar::Select() Sequence<PropertyValue> aPropVal(2); PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray(); pPropertyVal[0].Name="QueryText"; - rtl::OUString aSelection = aEdQuery.GetText(); + OUString aSelection = aEdQuery.GetText(); pPropertyVal[0].Value <<= aSelection; pPropertyVal[1].Name="QueryField"; @@ -326,7 +326,7 @@ void BibToolBar::Select() void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& rArgs) { - rtl::OUString aCommand = GetItemCommand(nId); + OUString aCommand = GetItemCommand(nId); uno::Reference< frame::XDispatchProvider > xDSP( xController, UNO_QUERY ); @@ -341,7 +341,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r xTrans->parseStrict( aURL ); - uno::Reference< frame::XDispatch > xDisp = xDSP->queryDispatch( aURL, rtl::OUString(), frame::FrameSearchFlag::SELF ); + uno::Reference< frame::XDispatch > xDisp = xDSP->queryDispatch( aURL, OUString(), frame::FrameSearchFlag::SELF ); if ( xDisp.is() ) xDisp->dispatch( aURL, rArgs); @@ -443,7 +443,7 @@ long BibToolBar::PreNotify( NotifyEvent& rNEvt ) Sequence<PropertyValue> aPropVal(2); PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray(); pPropertyVal[0].Name = "QueryText"; - rtl::OUString aSelection = aEdQuery.GetText(); + OUString aSelection = aEdQuery.GetText(); pPropertyVal[0].Value <<= aSelection; pPropertyVal[1].Name="QueryField"; pPropertyVal[1].Value <<= aQueryField; @@ -470,7 +470,7 @@ IMPL_LINK( BibToolBar, SendSelHdl, Timer*,/*pT*/) PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray(); pPropertyVal[0].Name = "DataSourceName"; String aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource.GetSelectEntry() ) ); - rtl::OUString aSelection = aEntry; + OUString aSelection = aEntry; pPropertyVal[0].Value <<= aSelection; SendDispatch(TBC_LB_SOURCE,aPropVal); @@ -497,7 +497,7 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/) Sequence<PropertyValue> aPropVal(2); PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray(); pPropertyVal[0].Name = "QueryText"; - rtl::OUString aSelection = aEdQuery.GetText(); + OUString aSelection = aEdQuery.GetText(); pPropertyVal[0].Value <<= aSelection; pPropertyVal[1].Name="QueryField"; pPropertyVal[1].Value <<= aQueryField; diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 956ec905fa8e..877931c8a1a5 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -40,7 +40,7 @@ class BibToolBarListener: public cppu::WeakImplHelper1 < ::com::sun::star::frame private: sal_uInt16 nIndex; - rtl::OUString aCommand; + OUString aCommand; protected: @@ -48,10 +48,10 @@ protected: public: - BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); + BibToolBarListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId); ~BibToolBarListener(); - rtl::OUString GetCommand() const; + OUString GetCommand() const; // ::com::sun::star::lang::XEventListener // we do not hold References to dispatches, so there is nothing to do on disposal @@ -68,7 +68,7 @@ class BibTBListBoxListener: public BibToolBarListener { public: - BibTBListBoxListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); + BibTBListBoxListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId); ~BibTBListBoxListener(); virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) @@ -80,7 +80,7 @@ class BibTBEditListener: public BibToolBarListener { public: - BibTBEditListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); + BibTBEditListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId); ~BibTBEditListener(); virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) @@ -92,7 +92,7 @@ class BibTBQueryMenuListener: public BibToolBarListener { public: - BibTBQueryMenuListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); + BibTBQueryMenuListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId); ~BibTBQueryMenuListener(); virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) @@ -122,7 +122,7 @@ class BibToolBar: public ToolBox PopupMenu aPopupMenu; sal_uInt16 nMenuId; sal_uInt16 nSelMenuItem; - rtl::OUString aQueryField; + OUString aQueryField; Link aLayoutManager; sal_Int16 nSymbolsSize; sal_Int16 nOutStyle; diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index cc1992b2229e..4b634acb41d1 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -68,7 +68,7 @@ static void checkLdapReturnCode(const sal_Char *aOperation, if (aRetCode == LDAP_SUCCESS) { return ; } static const sal_Char *kNoSpecificMessage = "No additional information" ; - rtl::OUStringBuffer message ; + OUStringBuffer message ; if (aOperation != NULL) { @@ -140,8 +140,8 @@ void LdapConnection::connectSimple() (PWCHAR) mLdapDefinition.mAnonCredentials.getStr() ); #else LdapErrCode retCode = ldap_simple_bind_s(mConnection, - rtl::OUStringToOString( mLdapDefinition.mAnonUser, RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( mLdapDefinition.mAnonCredentials, RTL_TEXTENCODING_UTF8 ).getStr()) ; + OUStringToOString( mLdapDefinition.mAnonUser, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( mLdapDefinition.mAnonCredentials, RTL_TEXTENCODING_UTF8 ).getStr()) ; #endif checkLdapReturnCode("SimpleBind", retCode, mConnection) ; @@ -153,7 +153,7 @@ void LdapConnection::initConnection() { if (mLdapDefinition.mServer.isEmpty()) { - rtl::OUStringBuffer message ; + OUStringBuffer message ; message.appendAscii("Cannot initialise connection to LDAP: No server specified.") ; throw ldap::LdapConnectionException(message.makeStringAndClear(), NULL) ; @@ -165,12 +165,12 @@ void LdapConnection::initConnection() mConnection = ldap_initW((PWCHAR) mLdapDefinition.mServer.getStr(), mLdapDefinition.mPort) ; #else - mConnection = ldap_init(rtl::OUStringToOString( mLdapDefinition.mServer, RTL_TEXTENCODING_UTF8 ).getStr(), + mConnection = ldap_init(OUStringToOString( mLdapDefinition.mServer, RTL_TEXTENCODING_UTF8 ).getStr(), mLdapDefinition.mPort) ; #endif if (mConnection == NULL) { - rtl::OUStringBuffer message ; + OUStringBuffer message ; message.appendAscii("Cannot initialise connection to LDAP server ") ; message.append(mLdapDefinition.mServer) ; @@ -182,14 +182,14 @@ void LdapConnection::initConnection() } //------------------------------------------------------------------------------ void LdapConnection::getUserProfile( - const rtl::OUString& aUser, LdapData * data) + const OUString& aUser, LdapData * data) throw (lang::IllegalArgumentException, ldap::LdapConnectionException, ldap::LdapGenericException) { OSL_ASSERT(data != 0); if (!isValid()) { connectSimple(); } - rtl::OUString aUserDn =findUserDn( aUser ); + OUString aUserDn =findUserDn( aUser ); LdapMessageHolder result; #ifdef WNT @@ -202,7 +202,7 @@ void LdapConnection::initConnection() &result.msg) ; #else LdapErrCode retCode = ldap_search_s(mConnection, - rtl::OUStringToOString( aUserDn, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( aUserDn, RTL_TEXTENCODING_UTF8 ).getStr(), LDAP_SCOPE_BASE, "(objectclass=*)", 0, @@ -217,8 +217,8 @@ void LdapConnection::initConnection() while (attr) { PWCHAR * values = ldap_get_valuesW(mConnection, result.msg, attr); if (values) { - const rtl::OUString aAttr( reinterpret_cast<sal_Unicode*>( attr ) ); - const rtl::OUString aValues( reinterpret_cast<sal_Unicode*>( *values ) ); + const OUString aAttr( reinterpret_cast<sal_Unicode*>( attr ) ); + const OUString aValues( reinterpret_cast<sal_Unicode*>( *values ) ); data->insert( LdapData::value_type( aAttr, aValues )); ldap_value_freeW(values); @@ -231,8 +231,8 @@ void LdapConnection::initConnection() if (values) { data->insert( LdapData::value_type( - rtl::OStringToOUString(attr, RTL_TEXTENCODING_ASCII_US), - rtl::OStringToOUString(*values, RTL_TEXTENCODING_UTF8))); + OStringToOUString(attr, RTL_TEXTENCODING_ASCII_US), + OStringToOUString(*values, RTL_TEXTENCODING_UTF8))); ldap_value_free(values); } attr = ldap_next_attribute(mConnection, result.msg, ptr); @@ -240,7 +240,7 @@ void LdapConnection::initConnection() } } //------------------------------------------------------------------------------ - rtl::OUString LdapConnection::findUserDn(const rtl::OUString& aUser) + OUString LdapConnection::findUserDn(const OUString& aUser) throw (lang::IllegalArgumentException, ldap::LdapConnectionException, ldap::LdapGenericException) { @@ -249,13 +249,13 @@ void LdapConnection::initConnection() if (aUser.isEmpty()) { throw lang::IllegalArgumentException( - rtl::OUString("LdapConnection::findUserDn -User id is empty"), + OUString("LdapConnection::findUserDn -User id is empty"), NULL, 0) ; } - rtl::OUStringBuffer filter( "(&(objectclass=" ); + OUStringBuffer filter( "(&(objectclass=" ); filter.append( mLdapDefinition.mUserObjectClass ).append(")(") ; filter.append( mLdapDefinition.mUserUniqueAttr ).append("=").append(aUser).append("))") ; @@ -270,12 +270,12 @@ void LdapConnection::initConnection() #else sal_Char * attributes [2] = { const_cast<sal_Char *>(LDAP_NO_ATTRS), NULL }; LdapErrCode retCode = ldap_search_s(mConnection, - rtl::OUStringToOString( mLdapDefinition.mBaseDN, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( mLdapDefinition.mBaseDN, RTL_TEXTENCODING_UTF8 ).getStr(), LDAP_SCOPE_SUBTREE, - rtl::OUStringToOString( filter.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), attributes, 0, &result.msg) ; + OUStringToOString( filter.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), attributes, 0, &result.msg) ; #endif checkLdapReturnCode("FindUserDn", retCode,mConnection) ; - rtl::OUString userDn ; + OUString userDn ; LDAPMessage *entry = ldap_first_entry(mConnection, result.msg) ; if (entry != NULL) @@ -283,12 +283,12 @@ void LdapConnection::initConnection() #ifdef WNT PWCHAR charsDn = ldap_get_dnW(mConnection, entry) ; - userDn = rtl::OUString( reinterpret_cast<const sal_Unicode*>( charsDn ) ); + userDn = OUString( reinterpret_cast<const sal_Unicode*>( charsDn ) ); ldap_memfreeW(charsDn) ; #else sal_Char *charsDn = ldap_get_dn(mConnection, entry) ; - userDn = rtl::OStringToOUString( charsDn, RTL_TEXTENCODING_UTF8 ); + userDn = OStringToOUString( charsDn, RTL_TEXTENCODING_UTF8 ); ldap_memfree(charsDn) ; #endif } diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index 8f681702b255..f2378d080b57 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.hxx @@ -50,22 +50,22 @@ struct LdapUserProfile; struct LdapDefinition { /** LDAP server name */ - rtl::OUString mServer ; + OUString mServer ; /** LDAP server port number */ sal_Int32 mPort ; /** Repository base DN */ - rtl::OUString mBaseDN ; + OUString mBaseDN ; /** DN to use for "anonymous" connection */ - rtl::OUString mAnonUser ; + OUString mAnonUser ; /** Credentials to use for "anonymous" connection */ - rtl::OUString mAnonCredentials ; + OUString mAnonCredentials ; /** User Entity Object Class */ - rtl::OUString mUserObjectClass; + OUString mUserObjectClass; /** User Entity Unique Attribute */ - rtl::OUString mUserUniqueAttr; + OUString mUserUniqueAttr; } ; -typedef std::map< rtl::OUString, rtl::OUString > LdapData; // key/value pairs +typedef std::map< OUString, OUString > LdapData; // key/value pairs /** Class encapulating all LDAP functionality */ class LdapConnection @@ -91,7 +91,7 @@ public: @throws com::sun::star::ldap::LdapGenericException if an LDAP error occurs. */ - void getUserProfile(const rtl::OUString& aUser, LdapData * data) + void getUserProfile(const OUString& aUser, LdapData * data) throw (lang::IllegalArgumentException, ldap::LdapConnectionException, ldap::LdapGenericException); @@ -99,7 +99,7 @@ public: /** finds DN of user @return DN of User */ - rtl::OUString findUserDn(const rtl::OUString& aUser) + OUString findUserDn(const OUString& aUser) throw (lang::IllegalArgumentException, ldap::LdapConnectionException, ldap::LdapGenericException); diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 58be55f2e894..6985b07e65a2 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -40,7 +40,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex BackendBase(mMutex) { LdapDefinition aDefinition; - rtl::OUString loggedOnUser; + OUString loggedOnUser; // This whole rigmarole is to prevent an infinite recursion where reading // the configuration for the backend would create another instance of the @@ -61,7 +61,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex xContext, &aDefinition, &loggedOnUser)) { throw css::uno::RuntimeException( - rtl::OUString("LdapUserProfileBe- LDAP not configured"), + OUString("LdapUserProfileBe- LDAP not configured"), NULL); } @@ -87,19 +87,19 @@ LdapUserProfileBe::~LdapUserProfileBe() bool LdapUserProfileBe::readLdapConfiguration( css::uno::Reference< css::uno::XComponentContext > const & context, - LdapDefinition * definition, rtl::OUString * loggedOnUser) + LdapDefinition * definition, OUString * loggedOnUser) { OSL_ASSERT(context.is() && definition != 0 && loggedOnUser != 0); - const rtl::OUString kReadOnlyViewService("com.sun.star.configuration.ConfigurationAccess") ; - const rtl::OUString kComponent("org.openoffice.LDAP/UserDirectory"); - const rtl::OUString kServerDefiniton("ServerDefinition"); - const rtl::OUString kServer("Server"); - const rtl::OUString kPort("Port"); - const rtl::OUString kBaseDN("BaseDN"); - const rtl::OUString kUser("SearchUser"); - const rtl::OUString kPassword("SearchPassword"); - const rtl::OUString kUserObjectClass("UserObjectClass"); - const rtl::OUString kUserUniqueAttr("UserUniqueAttribute"); + const OUString kReadOnlyViewService("com.sun.star.configuration.ConfigurationAccess") ; + const OUString kComponent("org.openoffice.LDAP/UserDirectory"); + const OUString kServerDefiniton("ServerDefinition"); + const OUString kServer("Server"); + const OUString kPort("Port"); + const OUString kBaseDN("BaseDN"); + const OUString kUser("SearchUser"); + const OUString kPassword("SearchPassword"); + const OUString kUserObjectClass("UserObjectClass"); + const OUString kUserUniqueAttr("UserUniqueAttribute"); uno::Reference< XInterface > xIface; try @@ -107,7 +107,7 @@ bool LdapUserProfileBe::readLdapConfiguration( uno::Reference< lang::XMultiServiceFactory > xCfgProvider( css::configuration::theDefaultProvider::get(context)); - css::beans::NamedValue aPath(rtl::OUString("nodepath"), uno::makeAny(kComponent) ); + css::beans::NamedValue aPath(OUString("nodepath"), uno::makeAny(kComponent) ); uno::Sequence< uno::Any > aArgs(1); aArgs[0] <<= aPath; @@ -140,7 +140,7 @@ bool LdapUserProfileBe::readLdapConfiguration( catch (const uno::Exception & e) { OSL_TRACE("LdapUserProfileBackend: access to configuration data failed: %s", - rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); return false; } @@ -153,7 +153,7 @@ bool LdapUserProfileBe::readLdapConfiguration( *loggedOnUser = loggedOnUser->copy(nIndex+1); //Remember to remove - OSL_TRACE("Logged on user is %s", rtl::OUStringToOString(*loggedOnUser,RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_TRACE("Logged on user is %s", OUStringToOString(*loggedOnUser,RTL_TEXTENCODING_ASCII_US).getStr()); return true; } @@ -161,8 +161,8 @@ bool LdapUserProfileBe::readLdapConfiguration( //------------------------------------------------------------------------------ bool LdapUserProfileBe::getLdapStringParam( uno::Reference<container::XNameAccess>& xAccess, - const rtl::OUString& aLdapSetting, - rtl::OUString& aServerParameter) + const OUString& aLdapSetting, + OUString& aServerParameter) { xAccess->getByName(aLdapSetting) >>= aServerParameter; @@ -170,19 +170,19 @@ bool LdapUserProfileBe::getLdapStringParam( } //------------------------------------------------------------------------------ void LdapUserProfileBe::setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + 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 LdapUserProfileBe::getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) @@ -211,30 +211,30 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { - return rtl::OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe"); +OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { + return OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe"); } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL LdapUserProfileBe::getImplementationName(void) +OUString SAL_CALL LdapUserProfileBe::getImplementationName(void) throw (uno::RuntimeException) { return getLdapUserProfileBeName() ; } //------------------------------------------------------------------------------ -uno::Sequence<rtl::OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void) +uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void) { - uno::Sequence<rtl::OUString> aServices(1) ; - aServices[0] = rtl::OUString("com.sun.star.configuration.backend.LdapUserProfileBe") ; + uno::Sequence<OUString> aServices(1) ; + aServices[0] = OUString("com.sun.star.configuration.backend.LdapUserProfileBe") ; return aServices ; } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const rtl::OUString& aServiceName) +sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const OUString& aServiceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > const svc = getLdapUserProfileBeServiceNames(); + uno::Sequence< OUString > const svc = getLdapUserProfileBeServiceNames(); for(sal_Int32 i = 0; i < svc.getLength(); ++i ) if(svc[i] == aServiceName) @@ -244,7 +244,7 @@ sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const rtl::OUString& aServi //------------------------------------------------------------------------------ -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void) throw (uno::RuntimeException) { diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index c91cc55bdf59..83c614f11436 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx @@ -58,15 +58,15 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase ~LdapUserProfileBe(void) ; // XServiceInfo - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException) ; virtual sal_Bool SAL_CALL - supportsService( const rtl::OUString& aServiceName ) + supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) ; - virtual uno::Sequence<rtl::OUString> SAL_CALL + virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException) ; @@ -76,7 +76,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase { 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, @@ -84,13 +84,13 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase 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, @@ -98,7 +98,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -106,7 +106,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -114,7 +114,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -125,23 +125,23 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase Provides the implementation name. @return implementation name */ - static rtl::OUString SAL_CALL getLdapUserProfileBeName(void) ; + static OUString SAL_CALL getLdapUserProfileBeName(void) ; /** Provides the supported services names @return service names */ - static uno::Sequence<rtl::OUString> SAL_CALL + static uno::Sequence<OUString> SAL_CALL getLdapUserProfileBeServiceNames(void) ; private: /** Check if LDAP is configured */ bool readLdapConfiguration( uno::Reference<uno::XComponentContext> const & context, - LdapDefinition * definition, rtl::OUString * loggedOnUser); + LdapDefinition * definition, OUString * loggedOnUser); bool getLdapStringParam(uno::Reference<container::XNameAccess>& xAccess, - const rtl::OUString& aLdapSetting, - rtl::OUString& aServerParameter); + const OUString& aLdapSetting, + OUString& aServerParameter); LdapData data_; } ; diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 344f314770ec..77dbb9a91e51 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -110,8 +110,8 @@ namespace dbp const OControlWizardContext& rContext = getContext(); try { - ::rtl::OUString sDataSourceName; - rContext.xForm->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName; + OUString sDataSourceName; + rContext.xForm->getPropertyValue(OUString("DataSourceName")) >>= sDataSourceName; Reference< XConnection > xConnection; bool bEmbedded = ::dbtools::isEmbeddedInDatabase( rContext.xForm, xConnection ); @@ -128,10 +128,10 @@ namespace dbp implFillTables(xConnection); - ::rtl::OUString sCommand; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString("Command") ) >>= sCommand ); + OUString sCommand; + OSL_VERIFY( rContext.xForm->getPropertyValue( OUString("Command") ) >>= sCommand ); sal_Int32 nCommandType = CommandType::TABLE; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString("CommandType") ) >>= nCommandType ); + OSL_VERIFY( rContext.xForm->getPropertyValue( OUString("CommandType") ) >>= nCommandType ); // search the entry of the given type with the given name for ( sal_uInt16 nLookup = 0; nLookup < m_aTable.GetEntryCount(); ++nLookup ) @@ -166,14 +166,14 @@ namespace dbp { xOldConn = getFormConnection(); - ::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry(); - rContext.xForm->setPropertyValue( ::rtl::OUString("DataSourceName"), makeAny( sDataSource ) ); + OUString sDataSource = m_aDatasource.GetSelectEntry(); + rContext.xForm->setPropertyValue( OUString("DataSourceName"), makeAny( sDataSource ) ); } - ::rtl::OUString sCommand = m_aTable.GetSelectEntry(); + OUString sCommand = m_aTable.GetSelectEntry(); sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( m_aTable.GetSelectEntryPos() ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString("Command"), makeAny( sCommand ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString("CommandType"), makeAny( nCommandType ) ); + rContext.xForm->setPropertyValue( OUString("Command"), makeAny( sCommand ) ); + rContext.xForm->setPropertyValue( OUString("CommandType"), makeAny( nCommandType ) ); if ( !rContext.bEmbedded ) setFormConnection( xOldConn, sal_False ); @@ -196,7 +196,7 @@ namespace dbp ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() ); - 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!"); if ( pFilter ) { @@ -241,10 +241,10 @@ namespace dbp //--------------------------------------------------------------------- namespace { - void lcl_fillEntries( ListBox& _rListBox, const Sequence< ::rtl::OUString >& _rNames, const Image& _rImage, sal_Int32 _nCommandType ) + void lcl_fillEntries( ListBox& _rListBox, const Sequence< OUString >& _rNames, const Image& _rImage, sal_Int32 _nCommandType ) { - const ::rtl::OUString* pNames = _rNames.getConstArray(); - const ::rtl::OUString* pNamesEnd = _rNames.getConstArray() + _rNames.getLength(); + const OUString* pNames = _rNames.getConstArray(); + const OUString* pNamesEnd = _rNames.getConstArray() + _rNames.getLength(); sal_uInt16 nPos = 0; while ( pNames != pNamesEnd ) { @@ -262,8 +262,8 @@ namespace dbp WaitObject aWaitCursor(this); // will be the table tables of the selected data source - Sequence< ::rtl::OUString > aTableNames; - Sequence< ::rtl::OUString > aQueryNames; + Sequence< OUString > aTableNames; + Sequence< OUString > aQueryNames; // connect to the data source Any aSQLException; @@ -275,7 +275,7 @@ namespace dbp // connect to the data source try { - ::rtl::OUString sCurrentDatasource = m_aDatasource.GetSelectEntry(); + OUString sCurrentDatasource = m_aDatasource.GetSelectEntry(); if (!sCurrentDatasource.isEmpty()) { // obtain the DS object diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 3c486324795b..32a152be18df 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -143,12 +143,12 @@ namespace dbp } //--------------------------------------------------------------------- - void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< ::rtl::OUString >& _rItems, sal_Bool _bClear) + void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) { if (_bClear) _rList.Clear(); - const ::rtl::OUString* pItems = _rItems.getConstArray(); - const ::rtl::OUString* pEnd = pItems + _rItems.getLength(); + const OUString* pItems = _rItems.getConstArray(); + const OUString* pEnd = pItems + _rItems.getLength(); ::svt::WizardTypes::WizardState nPos; sal_Int32 nIndex = 0; for (;pItems < pEnd; ++pItems, ++nIndex) @@ -159,12 +159,12 @@ namespace dbp } //--------------------------------------------------------------------- - void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< ::rtl::OUString >& _rItems, sal_Bool _bClear) + void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) { if (_bClear) _rList.Clear(); - const ::rtl::OUString* pItems = _rItems.getConstArray(); - const ::rtl::OUString* pEnd = pItems + _rItems.getLength(); + const OUString* pItems = _rItems.getConstArray(); + const OUString* pEnd = pItems + _rItems.getLength(); ::svt::WizardTypes::WizardState nPos; sal_Int32 nIndex = 0; for (;pItems < pEnd; ++pItems) @@ -227,14 +227,14 @@ namespace dbp if (m_pFormDatasource && m_pFormContentTypeLabel && m_pFormTable) { const OControlWizardContext& rContext = getContext(); - ::rtl::OUString sDataSource; - ::rtl::OUString sCommand; + OUString sDataSource; + OUString sCommand; sal_Int32 nCommandType = CommandType::COMMAND; try { - rContext.xForm->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSource; - rContext.xForm->getPropertyValue(::rtl::OUString("Command")) >>= sCommand; - rContext.xForm->getPropertyValue(::rtl::OUString("CommandType")) >>= nCommandType; + rContext.xForm->getPropertyValue(OUString("DataSourceName")) >>= sDataSource; + rContext.xForm->getPropertyValue(OUString("Command")) >>= sCommand; + rContext.xForm->getPropertyValue(OUString("CommandType")) >>= nCommandType; } catch(const Exception&) { @@ -298,7 +298,7 @@ namespace dbp sal_Int16 nClassId = FormComponentType::CONTROL; try { - getContext().xObjectModel->getPropertyValue(::rtl::OUString("ClassId")) >>= nClassId; + getContext().xObjectModel->getPropertyValue(OUString("ClassId")) >>= nClassId; } catch(const Exception&) { @@ -457,7 +457,7 @@ namespace dbp try { if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) ) - m_aContext.xForm->getPropertyValue(::rtl::OUString("ActiveConnection")) >>= xConn; + m_aContext.xForm->getPropertyValue(OUString("ActiveConnection")) >>= xConn; } catch(const Exception&) { @@ -487,7 +487,7 @@ namespace dbp } else { - m_aContext.xForm->setPropertyValue( ::rtl::OUString("ActiveConnection"), makeAny( _rxConn ) ); + m_aContext.xForm->setPropertyValue( OUString("ActiveConnection"), makeAny( _rxConn ) ); } } catch(const Exception&) @@ -512,7 +512,7 @@ namespace dbp catch(const Exception&) { } if (!xHandler.is()) { - const ::rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); + const OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler"); ShowServiceNotAvailableError(_pWindow, sInteractionHandlerServiceName, sal_True); } return xHandler; @@ -558,8 +558,8 @@ namespace dbp if (m_aContext.xForm.is()) { // collect some properties of the form - ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString("Command"))); - sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString("CommandType"))); + OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(OUString("Command"))); + sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(OUString("CommandType"))); // calculate the connection the rowset is working with Reference< XConnection > xConnection; @@ -604,7 +604,7 @@ namespace dbp // not interested in any results, only in the fields Reference< XPropertySet > xStatementProps(xStatement, UNO_QUERY); - xStatementProps->setPropertyValue(::rtl::OUString("MaxRows"), makeAny(sal_Int32(0))); + xStatementProps->setPropertyValue(OUString("MaxRows"), makeAny(sal_Int32(0))); // TODO: think about handling local SQLExceptions here ... Reference< XColumnsSupplier > xSupplyCols(xStatement->executeQuery(), UNO_QUERY); @@ -618,9 +618,9 @@ namespace dbp if (xColumns.is()) { m_aContext.aFieldNames = xColumns->getElementNames(); - static const ::rtl::OUString s_sFieldTypeProperty("Type"); - const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength(); + static const OUString s_sFieldTypeProperty("Type"); + const OUString* pBegin = m_aContext.aFieldNames.getConstArray(); + const OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength(); for(;pBegin != pEnd;++pBegin) { sal_Int32 nFieldType = DataType::OTHER; @@ -683,13 +683,13 @@ namespace dbp // the only thing we have at the moment is the label try { - ::rtl::OUString sLabelPropertyName("Label"); + OUString sLabelPropertyName("Label"); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { - ::rtl::OUString sControlLabel(_pSettings->sControlLabel); + OUString sControlLabel(_pSettings->sControlLabel); m_aContext.xObjectModel->setPropertyValue( - ::rtl::OUString("Label"), + OUString("Label"), makeAny(sControlLabel) ); } @@ -710,11 +710,11 @@ namespace dbp // initialize some settings from the control model give try { - ::rtl::OUString sLabelPropertyName("Label"); + OUString sLabelPropertyName("Label"); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { - ::rtl::OUString sControlLabel; + OUString sControlLabel; m_aContext.xObjectModel->getPropertyValue(sLabelPropertyName) >>= sControlLabel; _pSettings->sControlLabel = sControlLabel; } diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index c6b97bd1d7a8..ccd06a9157e4 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -81,11 +81,11 @@ namespace dbp protected: void fillListBox( ListBox& _rList, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rItems, + const ::com::sun::star::uno::Sequence< OUString >& _rItems, sal_Bool _bClear = sal_True); void fillListBox( ComboBox& _rList, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rItems, + const ::com::sun::star::uno::Sequence< OUString >& _rItems, sal_Bool _bClear = sal_True); protected: diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 7dbc4faa4d94..7446afc84901 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -59,7 +59,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dbp::OModule::getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName), + OUString::createFromAscii(pImplementationName), static_cast< XMultiServiceFactory* >(pServiceManager)); } diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx index c71815b081c0..947b50865846 100644 --- a/extensions/source/dbpilots/dbptools.cxx +++ b/extensions/source/dbpilots/dbptools.cxx @@ -29,7 +29,7 @@ namespace dbp using namespace ::com::sun::star::container; //--------------------------------------------------------------------- - void disambiguateName(const Reference< XNameAccess >& _rxContainer, ::rtl::OUString& _rElementsName) + void disambiguateName(const Reference< XNameAccess >& _rxContainer, OUString& _rElementsName) { DBG_ASSERT(_rxContainer.is(), "::dbp::disambiguateName: invalid container!"); if (!_rxContainer.is()) @@ -37,11 +37,11 @@ namespace dbp try { - ::rtl::OUString sBase(_rElementsName); + OUString sBase(_rElementsName); for (sal_Int32 i=1; i<0x7FFFFFFF; ++i) { _rElementsName = sBase; - _rElementsName += ::rtl::OUString::valueOf((sal_Int32)i); + _rElementsName += OUString::valueOf((sal_Int32)i); if (!_rxContainer->hasByName(_rElementsName)) return; } diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx index 9a43596adc4a..b79bf5709499 100644 --- a/extensions/source/dbpilots/dbptools.hxx +++ b/extensions/source/dbpilots/dbptools.hxx @@ -29,7 +29,7 @@ namespace dbp void disambiguateName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, - ::rtl::OUString& _rElementsName); + OUString& _rElementsName); //......................................................................... } // namespace dbp diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 6feabb6d253f..d0885644cedd 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -103,11 +103,11 @@ namespace dbp if (!xColumnFactory.is() || !xColumnContainer.is()) return; - static const ::rtl::OUString s_sDataFieldProperty ("DataField"); - static const ::rtl::OUString s_sLabelProperty ("Label"); - static const ::rtl::OUString s_sWidthProperty ("Width"); - static const ::rtl::OUString s_sMouseWheelBehavior ("MouseWheelBehavior"); - static const ::rtl::OUString s_sEmptyString; + static const OUString s_sDataFieldProperty ("DataField"); + static const OUString s_sLabelProperty ("Label"); + static const OUString s_sWidthProperty ("Width"); + static const OUString s_sMouseWheelBehavior ("MouseWheelBehavior"); + static const OUString s_sEmptyString; // collect "descriptors" for the to-be-created (grid)columns std::vector< OUString > aColumnServiceNames; // service names to be used with the XGridColumnFactory @@ -119,8 +119,8 @@ namespace dbp aFormFieldNames.reserve(getSettings().aSelectedFields.getLength()); // loop through the selected field names - const ::rtl::OUString* pSelectedFields = getSettings().aSelectedFields.getConstArray(); - const ::rtl::OUString* pEnd = pSelectedFields + getSettings().aSelectedFields.getLength(); + const OUString* pSelectedFields = getSettings().aSelectedFields.getConstArray(); + const OUString* pEnd = pSelectedFields + getSettings().aSelectedFields.getLength(); for (;pSelectedFields < pEnd; ++pSelectedFields) { // get the information for the selected column @@ -134,14 +134,14 @@ namespace dbp { case DataType::BIT: case DataType::BOOLEAN: - aColumnServiceNames.push_back(::rtl::OUString("CheckBox")); + aColumnServiceNames.push_back(OUString("CheckBox")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TINYINT: case DataType::SMALLINT: case DataType::INTEGER: - aColumnServiceNames.push_back(::rtl::OUString("NumericField")); + aColumnServiceNames.push_back(OUString("NumericField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; @@ -150,31 +150,31 @@ namespace dbp case DataType::DOUBLE: case DataType::NUMERIC: case DataType::DECIMAL: - aColumnServiceNames.push_back(::rtl::OUString("FormattedField")); + aColumnServiceNames.push_back(OUString("FormattedField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::DATE: - aColumnServiceNames.push_back(::rtl::OUString("DateField")); + aColumnServiceNames.push_back(OUString("DateField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIME: - aColumnServiceNames.push_back(::rtl::OUString("TimeField")); + aColumnServiceNames.push_back(OUString("TimeField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIMESTAMP: - aColumnServiceNames.push_back(::rtl::OUString("DateField")); + aColumnServiceNames.push_back(OUString("DateField")); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX))); aFormFieldNames.push_back(*pSelectedFields); - aColumnServiceNames.push_back(::rtl::OUString("TimeField")); + aColumnServiceNames.push_back(OUString("TimeField")); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX))); break; default: - aColumnServiceNames.push_back(::rtl::OUString("TextField")); + aColumnServiceNames.push_back(OUString("TextField")); aColumnLabelPostfixes.push_back(s_sEmptyString); } } @@ -200,13 +200,13 @@ namespace dbp Reference< XPropertySet > xColumn( xColumnFactory->createColumn(*pColumnServiceName), UNO_SET_THROW ); Reference< XPropertySetInfo > xColumnPSI( xColumn->getPropertySetInfo(), UNO_SET_THROW ); - ::rtl::OUString sColumnName(*pColumnServiceName); + OUString sColumnName(*pColumnServiceName); disambiguateName(xExistenceChecker, sColumnName); // the data field the column should be bound to xColumn->setPropertyValue(s_sDataFieldProperty, makeAny(*pFormFieldName)); // the label - xColumn->setPropertyValue(s_sLabelProperty, makeAny(::rtl::OUString(*pFormFieldName) += *pColumnLabelPostfix)); + xColumn->setPropertyValue(s_sLabelProperty, makeAny(OUString(*pFormFieldName) += *pColumnLabelPostfix)); // the width (<void/> => column will be auto-sized) xColumn->setPropertyValue(s_sWidthProperty, Any()); @@ -346,8 +346,8 @@ namespace dbp m_aSelFields.Clear(); const OGridSettings& rSettings = getSettings(); - const ::rtl::OUString* pSelected = rSettings.aSelectedFields.getConstArray(); - const ::rtl::OUString* pEnd = pSelected + rSettings.aSelectedFields.getLength(); + const OUString* pSelected = rSettings.aSelectedFields.getConstArray(); + const OUString* pEnd = pSelected + rSettings.aSelectedFields.getLength(); for (; pSelected < pEnd; ++pSelected) { m_aSelFields.InsertEntry(*pSelected); @@ -367,7 +367,7 @@ namespace dbp sal_uInt16 nSelected = m_aSelFields.GetEntryCount(); rSettings.aSelectedFields.realloc(nSelected); - ::rtl::OUString* pSelected = rSettings.aSelectedFields.getArray(); + OUString* pSelected = rSettings.aSelectedFields.getArray(); for (sal_uInt16 i=0; i<nSelected; ++i, ++pSelected) *pSelected = m_aSelFields.GetEntry(i); diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index b837e3da4989..1cb62c58c0e9 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -33,7 +33,7 @@ namespace dbp //===================================================================== struct OGridSettings : public OControlWizardSettings { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSelectedFields; + ::com::sun::star::uno::Sequence< OUString > aSelectedFields; }; //===================================================================== diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 36ddee11b6f3..597e73943c6f 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -263,7 +263,7 @@ namespace dbp for (::svt::WizardTypes::WizardState i=0; i<m_aExistingRadios.GetEntryCount(); ++i) { rSettings.aLabels.push_back(m_aExistingRadios.GetEntry(i)); - rSettings.aValues.push_back(rtl::OUString::valueOf((sal_Int32)(i + 1))); + rSettings.aValues.push_back(OUString::valueOf((sal_Int32)(i + 1))); } return sal_True; diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 08e365807d95..eea291394515 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -164,11 +164,11 @@ namespace dbp // do some quotings if (xMetaData.is()) { - ::rtl::OUString sQuoteString = xMetaData->getIdentifierQuoteString(); + OUString sQuoteString = xMetaData->getIdentifierQuoteString(); if (isListBox()) // only when we have a listbox this should be not empty getSettings().sLinkedListField = quoteName(sQuoteString, getSettings().sLinkedListField); - ::rtl::OUString sCatalog, sSchema, sName; + OUString sCatalog, sSchema, sName; ::dbtools::qualifiedNameComponents( xMetaData, getSettings().sListContentTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); getSettings().sListContentTable = ::dbtools::composeTableNameForSelect( xConn, sCatalog, sSchema, sName ); @@ -176,12 +176,12 @@ namespace dbp } // ListSourceType: SQL - getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL)); + getContext().xObjectModel->setPropertyValue(OUString("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL)); if (isListBox()) { // BoundColumn: 1 - getContext().xObjectModel->setPropertyValue(::rtl::OUString("BoundColumn"), makeAny((sal_Int16)1)); + getContext().xObjectModel->setPropertyValue(OUString("BoundColumn"), makeAny((sal_Int16)1)); // build the statement to set as list source String sStatement; @@ -191,9 +191,9 @@ namespace dbp sStatement += getSettings().sLinkedListField; sStatement.AppendAscii(" FROM "); sStatement += getSettings().sListContentTable; - Sequence< ::rtl::OUString > aListSource(1); + Sequence< OUString > aListSource(1); aListSource[0] = sStatement; - getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSource"), makeAny(aListSource)); + getContext().xObjectModel->setPropertyValue(OUString("ListSource"), makeAny(aListSource)); } else { @@ -203,11 +203,11 @@ namespace dbp sStatement += getSettings().sListContentField; sStatement.AppendAscii(" FROM "); sStatement += getSettings().sListContentTable; - getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSource"), makeAny(::rtl::OUString(sStatement))); + getContext().xObjectModel->setPropertyValue(OUString("ListSource"), makeAny(OUString(sStatement))); } // the bound field - getContext().xObjectModel->setPropertyValue(::rtl::OUString("DataField"), makeAny(::rtl::OUString(getSettings().sLinkedFormField))); + getContext().xObjectModel->setPropertyValue(OUString("DataField"), makeAny(OUString(getSettings().sLinkedFormField))); } catch(const Exception&) { @@ -246,10 +246,10 @@ namespace dbp } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > OLCPage::getTableFields(sal_Bool _bNeedIt) + Sequence< OUString > OLCPage::getTableFields(sal_Bool _bNeedIt) { Reference< XNameAccess > xTables = getTables(_bNeedIt); - Sequence< ::rtl::OUString > aColumnNames; + Sequence< OUString > aColumnNames; if (xTables.is()) { try @@ -335,7 +335,7 @@ namespace dbp try { Reference< XNameAccess > xTables = getTables(sal_True); - Sequence< ::rtl::OUString > aTableNames; + Sequence< OUString > aTableNames; if (xTables.is()) aTableNames = xTables->getElementNames(); fillListBox(m_aSelectTable, aTableNames); diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 8c9fc3ac0268..d2c6eb844dc7 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -97,7 +97,7 @@ namespace dbp protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getTables(sal_Bool _bNeedIt); - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getTableFields(sal_Bool _bNeedIt); }; diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index 10f7fac5e267..9e315a8d5811 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -109,7 +109,7 @@ namespace dbp ::com::sun::star::awt::Point aButtonPosition; aButtonPosition.X = aShapePosition.X + OFFSET; - ::rtl::OUString sElementsName("RadioGroup"); + OUString sElementsName("RadioGroup"); disambiguateName(Reference< XNameAccess >(_rContext.xForm, UNO_QUERY), sElementsName); StringArray::const_iterator aLabelIter = _rSettings.aLabels.begin(); @@ -119,28 +119,28 @@ namespace dbp aButtonPosition.Y = aShapePosition.Y + (i+1) * nTempHeight + nTopSpace; Reference< XPropertySet > xRadioModel( - xDocFactory->createInstance(::rtl::OUString("com.sun.star.form.component.RadioButton")), + xDocFactory->createInstance(OUString("com.sun.star.form.component.RadioButton")), UNO_QUERY); // the label - xRadioModel->setPropertyValue(::rtl::OUString("Label"), makeAny(rtl::OUString(*aLabelIter))); + xRadioModel->setPropertyValue(OUString("Label"), makeAny(OUString(*aLabelIter))); // the value - xRadioModel->setPropertyValue(::rtl::OUString("RefValue"), makeAny(rtl::OUString(*aValueIter))); + xRadioModel->setPropertyValue(OUString("RefValue"), makeAny(OUString(*aValueIter))); // default selection if (_rSettings.sDefaultField == *aLabelIter) - xRadioModel->setPropertyValue(::rtl::OUString("DefaultState"), makeAny(sal_Int16(1))); + xRadioModel->setPropertyValue(OUString("DefaultState"), makeAny(sal_Int16(1))); // the connection to the database field if (0 != _rSettings.sDBField.Len()) - xRadioModel->setPropertyValue(::rtl::OUString("DataField"), makeAny(::rtl::OUString(_rSettings.sDBField))); + xRadioModel->setPropertyValue(OUString("DataField"), makeAny(OUString(_rSettings.sDBField))); // the name for the model - xRadioModel->setPropertyValue(::rtl::OUString("Name"), makeAny(sElementsName)); + xRadioModel->setPropertyValue(OUString("Name"), makeAny(sElementsName)); // create a shape for the radio button Reference< XControlShape > xRadioShape( - xDocFactory->createInstance(::rtl::OUString("com.sun.star.drawing.ControlShape")), + xDocFactory->createInstance(OUString("com.sun.star.drawing.ControlShape")), UNO_QUERY); Reference< XPropertySet > xShapeProperties(xRadioShape, UNO_QUERY); @@ -155,7 +155,7 @@ namespace dbp // the name of the shape if (xShapeProperties.is()) - xShapeProperties->setPropertyValue(::rtl::OUString("Name"), makeAny(sElementsName)); + xShapeProperties->setPropertyValue(OUString("Name"), makeAny(sElementsName)); // add to the page xPageShapes->add(xRadioShape.get()); @@ -164,7 +164,7 @@ namespace dbp // set the GroupBox as "LabelControl" for the RadioButton // (_after_ having inserted the model into the page!) - xRadioModel->setPropertyValue(::rtl::OUString("LabelControl"), makeAny(_rContext.xObjectModel)); + xRadioModel->setPropertyValue(OUString("LabelControl"), makeAny(_rContext.xObjectModel)); } // group the shapes @@ -188,7 +188,7 @@ namespace dbp //--------------------------------------------------------------------- void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps) { - static const ::rtl::OUString s_sAnchorPropertyName("AnchorType"); + static const OUString s_sAnchorPropertyName("AnchorType"); Reference< XPropertySetInfo > xPropertyInfo; if (_rxShapeProps.is()) xPropertyInfo = _rxShapeProps->getPropertySetInfo(); diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index fc75e21b509a..477f7ab34aae 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -41,8 +41,8 @@ namespace dbp struct IServiceInfo { public: - ::rtl::OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString getImplementationName() const; + ::com::sun::star::uno::Sequence< OUString > getServiceNames() const; }; @@ -67,12 +67,12 @@ namespace dbp 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 >&); diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx index 6b77c7877571..19f76fdd087c 100644 --- a/extensions/source/dbpilots/wizardcontext.hxx +++ b/extensions/source/dbpilots/wizardcontext.hxx @@ -71,7 +71,7 @@ namespace dbp DECLARE_STL_USTRINGACCESS_MAP(sal_Int32,TNameTypeMap); TNameTypeMap aTypes; // the column names of the object the form is bound to (table, query or SQL statement) - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > aFieldNames; sal_Bool bEmbedded; diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index fae42c1fe260..c9cd98be6672 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -57,16 +57,16 @@ namespace dbp //= OGroupBoxSI //===================================================================== //--------------------------------------------------------------------- - ::rtl::OUString OGroupBoxSI::getImplementationName() const + OUString OGroupBoxSI::getImplementationName() const { - return ::rtl::OUString("org.openoffice.comp.dbp.OGroupBoxWizard"); + return OUString("org.openoffice.comp.dbp.OGroupBoxWizard"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > OGroupBoxSI::getServiceNames() const + Sequence< OUString > OGroupBoxSI::getServiceNames() const { - Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString("com.sun.star.sdb.GroupBoxAutoPilot"); + Sequence< OUString > aReturn(1); + aReturn[0] = OUString("com.sun.star.sdb.GroupBoxAutoPilot"); return aReturn; } @@ -74,16 +74,16 @@ namespace dbp //= OListComboSI //===================================================================== //--------------------------------------------------------------------- - ::rtl::OUString OListComboSI::getImplementationName() const + OUString OListComboSI::getImplementationName() const { - return ::rtl::OUString("org.openoffice.comp.dbp.OListComboWizard"); + return OUString("org.openoffice.comp.dbp.OListComboWizard"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > OListComboSI::getServiceNames() const + Sequence< OUString > OListComboSI::getServiceNames() const { - Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString("com.sun.star.sdb.ListComboBoxAutoPilot"); + Sequence< OUString > aReturn(1); + aReturn[0] = OUString("com.sun.star.sdb.ListComboBoxAutoPilot"); return aReturn; } @@ -91,16 +91,16 @@ namespace dbp //= OGridSI //===================================================================== //--------------------------------------------------------------------- - ::rtl::OUString OGridSI::getImplementationName() const + OUString OGridSI::getImplementationName() const { - return ::rtl::OUString("org.openoffice.comp.dbp.OGridWizard"); + return OUString("org.openoffice.comp.dbp.OGridWizard"); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > OGridSI::getServiceNames() const + Sequence< OUString > OGridSI::getServiceNames() const { - Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString("com.sun.star.sdb.GridControlAutoPilot"); + Sequence< OUString > aReturn(1); + aReturn[0] = OUString("com.sun.star.sdb.GridControlAutoPilot"); return aReturn; } diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx index 6d46207469ea..e952fbae61a6 100644 --- a/extensions/source/dbpilots/wizardservices.hxx +++ b/extensions/source/dbpilots/wizardservices.hxx @@ -35,8 +35,8 @@ namespace dbp struct OGroupBoxSI { public: - ::rtl::OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString getImplementationName() const; + ::com::sun::star::uno::Sequence< OUString > getServiceNames() const; }; @@ -47,8 +47,8 @@ namespace dbp struct OListComboSI { public: - ::rtl::OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString getImplementationName() const; + ::com::sun::star::uno::Sequence< OUString > getServiceNames() const; }; @@ -59,8 +59,8 @@ namespace dbp struct OGridSI { public: - ::rtl::OUString getImplementationName() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OUString getImplementationName() const; + ::com::sun::star::uno::Sequence< OUString > getServiceNames() const; }; diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index a8ef1f858d6f..44ac1c8a6ae3 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -48,7 +48,7 @@ namespace COMPMOD_NAMESPACE { ResMgr* m_pResources; sal_Bool m_bInitialized; - rtl::OString m_sFilePrefix; + OString m_sFilePrefix; public: /// ctor @@ -57,7 +57,7 @@ namespace COMPMOD_NAMESPACE /// get the manager for the resources of the module ResMgr* getResManager(); - void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; } + void setResourceFilePrefix(const OString& _rPrefix) { m_sFilePrefix = _rPrefix; } }; //------------------------------------------------------------------------- @@ -84,7 +84,7 @@ namespace COMPMOD_NAMESPACE // create a manager with a fixed prefix m_pResources = ResMgr::CreateResMgr(m_sFilePrefix.getStr()); DBG_ASSERT(m_pResources, - rtl::OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ") + OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ") .append(m_sFilePrefix) .append(")!").getStr()); @@ -99,7 +99,7 @@ namespace COMPMOD_NAMESPACE ::osl::Mutex OModule::s_aMutex; sal_Int32 OModule::s_nClients = 0; OModuleImpl* OModule::s_pImpl = NULL; - ::rtl::OString OModule::s_sResPrefix; + OString OModule::s_sResPrefix; //------------------------------------------------------------------------- ResMgr* OModule::getResManager() { @@ -108,7 +108,7 @@ namespace COMPMOD_NAMESPACE } //------------------------------------------------------------------------- - void OModule::setResourceFilePrefix(const ::rtl::OString& _rPrefix) + void OModule::setResourceFilePrefix(const OString& _rPrefix) { ::osl::MutexGuard aGuard(s_aMutex); s_sResPrefix = _rPrefix; @@ -147,15 +147,15 @@ namespace COMPMOD_NAMESPACE //- registration helper //-------------------------------------------------------------------------- - Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL; - Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL; + Sequence< OUString >* OModule::s_pImplementationNames = NULL; + Sequence< Sequence< OUString > >* OModule::s_pSupportedServices = NULL; Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL; Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OModule::registerComponent( - const ::rtl::OUString& _rImplementationName, - const Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const Sequence< OUString >& _rServiceNames, ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction) { @@ -163,8 +163,8 @@ namespace COMPMOD_NAMESPACE { OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers, "OModule::registerComponent : inconsistent state (the pointers (1)) !"); - s_pImplementationNames = new Sequence< ::rtl::OUString >; - s_pSupportedServices = new Sequence< Sequence< ::rtl::OUString > >; + s_pImplementationNames = new Sequence< OUString >; + s_pSupportedServices = new Sequence< Sequence< OUString > >; s_pCreationFunctionPointers = new Sequence< sal_Int64 >; s_pFactoryFunctionPointers = new Sequence< sal_Int64 >; } @@ -189,7 +189,7 @@ namespace COMPMOD_NAMESPACE } //-------------------------------------------------------------------------- - void OModule::revokeComponent(const ::rtl::OUString& _rImplementationName) + void OModule::revokeComponent(const OUString& _rImplementationName) { if (!s_pImplementationNames) { @@ -204,7 +204,7 @@ namespace COMPMOD_NAMESPACE "OModule::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplNames = s_pImplementationNames->getConstArray(); + const OUString* pImplNames = s_pImplementationNames->getConstArray(); for (sal_Int32 i=0; i<nLen; ++i, ++pImplNames) { if (pImplNames->equals(_rImplementationName)) @@ -228,7 +228,7 @@ namespace COMPMOD_NAMESPACE //-------------------------------------------------------------------------- Reference< XInterface > OModule::getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const Reference< XMultiServiceFactory >& _rxServiceManager) { OSL_ENSURE(_rxServiceManager.is(), "OModule::getComponentFactory : invalid argument (service manager) !"); @@ -251,8 +251,8 @@ namespace COMPMOD_NAMESPACE sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray(); - const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray(); + const OUString* pImplName = s_pImplementationNames->getConstArray(); + const Sequence< OUString >* pServices = s_pSupportedServices->getConstArray(); const sal_Int64* pComponentFunction = s_pCreationFunctionPointers->getConstArray(); const sal_Int64* pFactoryFunction = s_pFactoryFunctionPointers->getConstArray(); diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index da972aca8db0..810b5ec07f88 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -47,9 +47,9 @@ namespace COMPMOD_NAMESPACE typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager, - const ::rtl::OUString & _rComponentName, + const OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, + const ::com::sun::star::uno::Sequence< OUString > & _rServiceNames, rtl_ModuleCount* _pModuleCounter ); @@ -70,12 +70,12 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService static ::osl::Mutex s_aMutex; /// access safety static sal_Int32 s_nClients; /// number of registered clients static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered - static ::rtl::OString s_sResPrefix; + static OString s_sResPrefix; // auto registration administration - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >* s_pSupportedServices; static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; @@ -84,7 +84,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService public: // can be set as long as no resource has been accessed ... - static void setResourceFilePrefix(const ::rtl::OString& _rPrefix); + static void setResourceFilePrefix(const OString& _rPrefix); /// get the vcl res manager of the module static ResMgr* getResManager(); @@ -101,8 +101,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService @see revokeComponent */ static void registerComponent( - const ::rtl::OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction); @@ -111,7 +111,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService the implementation name of the component */ static void revokeComponent( - const ::rtl::OUString& _rImplementationName); + const OUString& _rImplementationName); /** creates a Factory for the component with the given implementation name. <p>Usually used from within component_getFactory.<p/> @@ -123,7 +123,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService the XInterface access to a factory for the component */ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager ); @@ -173,8 +173,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService /** automatically registeres a multi instance component <p>Assumed that the template argument has the three methods <ul> - <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/> - <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/> + <li><code>static OUString getImplementationName_Static()</code><li/> + <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/> <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code> </li> @@ -215,8 +215,8 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService /** automatically registeres a single instance component <p>Assumed that the template argument has the three methods <ul> - <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/> - <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/> + <li><code>static OUString getImplementationName_Static()</code><li/> + <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/> <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code> </li> diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index fa28571f3723..58abbf8d6d42 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -86,8 +86,8 @@ namespace logging virtual void SAL_CALL setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException); // XLogHandler - virtual ::rtl::OUString SAL_CALL getEncoding() throw (RuntimeException); - virtual void SAL_CALL setEncoding( const ::rtl::OUString& _encoding ) throw (RuntimeException); + virtual OUString SAL_CALL getEncoding() throw (RuntimeException); + virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException); virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException); virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException); virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException); @@ -99,17 +99,17 @@ namespace logging virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); public: @@ -173,16 +173,16 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ConsoleHandler::getEncoding() throw (RuntimeException) + OUString SAL_CALL ConsoleHandler::getEncoding() throw (RuntimeException) { MethodGuard aGuard( *this ); - ::rtl::OUString sEncoding; + OUString sEncoding; OSL_VERIFY( m_aHandlerHelper.getEncoding( sEncoding ) ); return sEncoding; } //-------------------------------------------------------------------- - void SAL_CALL ConsoleHandler::setEncoding( const ::rtl::OUString& _rEncoding ) throw (RuntimeException) + void SAL_CALL ConsoleHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException) { MethodGuard aGuard( *this ); OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) ); @@ -229,7 +229,7 @@ namespace logging { MethodGuard aGuard( *this ); - ::rtl::OString sEntry; + OString sEntry; if ( !m_aHandlerHelper.formatForPublishing( _rRecord, sEntry ) ) return sal_False; @@ -256,11 +256,11 @@ namespace logging } if ( _rArguments.getLength() != 1 ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); Sequence< NamedValue > aSettings; if ( !( _rArguments[0] >>= aSettings ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // createWithSettings( [in] sequence< ::com::sun::star::beans::NamedValue > Settings ) ::comphelper::NamedValueCollection aTypedSettings( aSettings ); @@ -272,16 +272,16 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ConsoleHandler::getImplementationName() throw(RuntimeException) + OUString SAL_CALL ConsoleHandler::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL ConsoleHandler::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool SAL_CALL ConsoleHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -291,22 +291,22 @@ namespace logging } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ConsoleHandler::getImplementationName_static() + OUString SAL_CALL ConsoleHandler::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.ConsoleHandler" ); + return OUString( "com.sun.star.comp.extensions.ConsoleHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.ConsoleHandler" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.ConsoleHandler" ); return aServiceNames; } diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index eeae12a9adc2..19b2a2b2b692 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -57,11 +57,11 @@ namespace logging class CsvFormatter : public CsvFormatter_Base { public: - virtual ::rtl::OUString SAL_CALL formatMultiColumn(const Sequence< ::rtl::OUString>& column_data) throw (RuntimeException); + virtual OUString SAL_CALL formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException); // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& context ); protected: @@ -73,23 +73,23 @@ namespace logging virtual ::sal_Bool SAL_CALL getLogThread() throw (RuntimeException); virtual ::sal_Bool SAL_CALL getLogTimestamp() throw (RuntimeException); virtual ::sal_Bool SAL_CALL getLogSource() throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getColumnnames() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getColumnnames() throw (RuntimeException); virtual void SAL_CALL setLogEventNo( ::sal_Bool log_event_no ) throw (RuntimeException); virtual void SAL_CALL setLogThread( ::sal_Bool log_thread ) throw (RuntimeException); virtual void SAL_CALL setLogTimestamp( ::sal_Bool log_timestamp ) throw (RuntimeException); virtual void SAL_CALL setLogSource( ::sal_Bool log_source ) throw (RuntimeException); - virtual void SAL_CALL setColumnnames( const Sequence< ::rtl::OUString>& column_names) throw (RuntimeException); + virtual void SAL_CALL setColumnnames( const Sequence< OUString>& column_names) throw (RuntimeException); // XLogFormatter - virtual ::rtl::OUString SAL_CALL getHead( ) throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL getTail( ) throw (RuntimeException); + virtual OUString SAL_CALL getHead( ) throw (RuntimeException); + virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException); + virtual OUString SAL_CALL getTail( ) throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& service_name ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& service_name ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); private: ::comphelper::ComponentContext m_aContext; @@ -98,20 +98,20 @@ namespace logging ::sal_Bool m_LogTimestamp; ::sal_Bool m_LogSource; ::sal_Bool m_MultiColumn; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_Columnnames; + ::com::sun::star::uno::Sequence< OUString > m_Columnnames; }; } // namespace logging //= private helpers namespace { - const sal_Unicode quote_char = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")).toChar(); - const sal_Unicode comma_char = ::rtl::OUString(",").toChar(); - const ::rtl::OUString dos_newline = ::rtl::OUString("\r\n"); + const sal_Unicode quote_char = OUString(RTL_CONSTASCII_USTRINGPARAM("\"")).toChar(); + const sal_Unicode comma_char = OUString(",").toChar(); + const OUString dos_newline = OUString("\r\n"); - inline bool needsQuoting(const ::rtl::OUString& str) + inline bool needsQuoting(const OUString& str) { - static const ::rtl::OUString quote_trigger_chars = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("\",\n\r")); + static const OUString quote_trigger_chars = OUString( RTL_CONSTASCII_USTRINGPARAM("\",\n\r")); sal_Int32 len = str.getLength(); for(sal_Int32 i=0; i<len; i++) if(quote_trigger_chars.indexOf(str[i])!=-1) @@ -119,7 +119,7 @@ namespace return false; }; - inline void appendEncodedString(::rtl::OUStringBuffer& buf, const ::rtl::OUString& str) + inline void appendEncodedString(OUStringBuffer& buf, const OUString& str) { if(needsQuoting(str)) { @@ -145,10 +145,10 @@ namespace buf.append(str); }; - ::com::sun::star::uno::Sequence< ::rtl::OUString> initialColumns() + ::com::sun::star::uno::Sequence< OUString> initialColumns() { - com::sun::star::uno::Sequence< ::rtl::OUString> result = ::com::sun::star::uno::Sequence< ::rtl::OUString>(1); - result[0] = ::rtl::OUString("message"); + com::sun::star::uno::Sequence< OUString> result = ::com::sun::star::uno::Sequence< OUString>(1); + result[0] = OUString("message"); return result; }; } @@ -189,7 +189,7 @@ namespace logging return m_LogSource; } - Sequence< ::rtl::OUString > CsvFormatter::getColumnnames() throw (RuntimeException) + Sequence< OUString > CsvFormatter::getColumnnames() throw (RuntimeException) { return m_Columnnames; } @@ -214,15 +214,15 @@ namespace logging m_LogSource = log_source; } - void CsvFormatter::setColumnnames(const Sequence< ::rtl::OUString >& columnnames) throw (RuntimeException) + void CsvFormatter::setColumnnames(const Sequence< OUString >& columnnames) throw (RuntimeException) { - m_Columnnames = Sequence< ::rtl::OUString>(columnnames); + m_Columnnames = Sequence< OUString>(columnnames); m_MultiColumn = (m_Columnnames.getLength()>1); } - ::rtl::OUString SAL_CALL CsvFormatter::getHead( ) throw (RuntimeException) + OUString SAL_CALL CsvFormatter::getHead( ) throw (RuntimeException) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if(m_LogEventNo) buf.appendAscii("event no,"); if(m_LogThread) @@ -242,9 +242,9 @@ namespace logging return buf.makeStringAndClear(); } - ::rtl::OUString SAL_CALL CsvFormatter::format( const LogRecord& record ) throw (RuntimeException) + OUString SAL_CALL CsvFormatter::format( const LogRecord& record ) throw (RuntimeException) { - ::rtl::OUStringBuffer aLogEntry; + OUStringBuffer aLogEntry; if(m_LogEventNo) { @@ -297,15 +297,15 @@ namespace logging return aLogEntry.makeStringAndClear(); } - ::rtl::OUString SAL_CALL CsvFormatter::getTail( ) throw (RuntimeException) + OUString SAL_CALL CsvFormatter::getTail( ) throw (RuntimeException) { - return ::rtl::OUString(); + return OUString(); } - ::rtl::OUString SAL_CALL CsvFormatter::formatMultiColumn(const Sequence< ::rtl::OUString>& column_data) throw (RuntimeException) + OUString SAL_CALL CsvFormatter::formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException) { sal_Int32 columns = column_data.getLength(); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; for(int i=0; i<columns; i++) { appendEncodedString(buf, column_data[i]); @@ -315,10 +315,10 @@ namespace logging return buf.makeStringAndClear(); } - ::sal_Bool SAL_CALL CsvFormatter::supportsService( const ::rtl::OUString& service_name ) throw(RuntimeException) + ::sal_Bool SAL_CALL CsvFormatter::supportsService( const OUString& service_name ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -327,25 +327,25 @@ namespace logging return sal_False; } - ::rtl::OUString SAL_CALL CsvFormatter::getImplementationName() throw(RuntimeException) + OUString SAL_CALL CsvFormatter::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } - Sequence< ::rtl::OUString > SAL_CALL CsvFormatter::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } - ::rtl::OUString SAL_CALL CsvFormatter::getImplementationName_static() + OUString SAL_CALL CsvFormatter::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.CsvFormatter" ); + return OUString( "com.sun.star.comp.extensions.CsvFormatter" ); } - Sequence< ::rtl::OUString > SAL_CALL CsvFormatter::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.CsvFormatter" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.CsvFormatter" ); return aServiceNames; } diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index d0f176915635..f4df55a03a80 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -92,7 +92,7 @@ namespace logging private: ::comphelper::ComponentContext m_aContext; LogHandlerHelper m_aHandlerHelper; - ::rtl::OUString m_sFileURL; + OUString m_sFileURL; ::std::auto_ptr< ::osl::File > m_pFile; FileValidity m_eFileValidity; @@ -101,8 +101,8 @@ namespace logging virtual ~FileHandler(); // XLogHandler - virtual ::rtl::OUString SAL_CALL getEncoding() throw (RuntimeException); - virtual void SAL_CALL setEncoding( const ::rtl::OUString& _encoding ) throw (RuntimeException); + virtual OUString SAL_CALL getEncoding() throw (RuntimeException); + virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException); virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException); virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException); virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException); @@ -114,17 +114,17 @@ namespace logging virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); public: @@ -138,11 +138,11 @@ namespace logging bool impl_prepareFile_nothrow(); /// writes the given string to our file - void impl_writeString_nothrow( const ::rtl::OString& _rEntry ); + void impl_writeString_nothrow( const OString& _rEntry ); /** does string substitution on a (usually externally provided) file url */ - void impl_doStringsubstitution_nothrow( ::rtl::OUString& _inout_rURL ); + void impl_doStringsubstitution_nothrow( OUString& _inout_rURL ); }; //==================================================================== @@ -189,10 +189,10 @@ namespace logging #if OSL_DEBUG_LEVEL > 0 if ( m_eFileValidity == eInvalid ) { - ::rtl::OStringBuffer sMessage; + OStringBuffer sMessage; sMessage.append( "FileHandler::impl_prepareFile_nothrow: could not open the designated log file:" ); sMessage.append( "\nURL: " ); - sMessage.append( ::rtl::OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) ); + sMessage.append( OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) ); sMessage.append( "\nerror code: " ); sMessage.append( (sal_Int32)res ); OSL_FAIL( sMessage.makeStringAndClear().getStr() ); @@ -200,7 +200,7 @@ namespace logging #endif if ( m_eFileValidity == eValid ) { - ::rtl::OString sHead; + OString sHead; if ( m_aHandlerHelper.getEncodedHead( sHead ) ) impl_writeString_nothrow( sHead ); } @@ -210,7 +210,7 @@ namespace logging } //-------------------------------------------------------------------- - void FileHandler::impl_writeString_nothrow( const ::rtl::OString& _rEntry ) + void FileHandler::impl_writeString_nothrow( const OString& _rEntry ) { OSL_PRECOND( m_pFile.get(), "FileHandler::impl_writeString_nothrow: no file!" ); @@ -225,7 +225,7 @@ namespace logging } //-------------------------------------------------------------------- - void FileHandler::impl_doStringsubstitution_nothrow( ::rtl::OUString& _inout_rURL ) + void FileHandler::impl_doStringsubstitution_nothrow( OUString& _inout_rURL ) { try { @@ -243,7 +243,7 @@ namespace logging { if ( m_eFileValidity == eValid ) { - ::rtl::OString sTail; + OString sTail; if ( m_aHandlerHelper.getEncodedTail( sTail ) ) impl_writeString_nothrow( sTail ); } @@ -265,16 +265,16 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FileHandler::getEncoding() throw (RuntimeException) + OUString SAL_CALL FileHandler::getEncoding() throw (RuntimeException) { MethodGuard aGuard( *this ); - ::rtl::OUString sEncoding; + OUString sEncoding; OSL_VERIFY( m_aHandlerHelper.getEncoding( sEncoding ) ); return sEncoding; } //-------------------------------------------------------------------- - void SAL_CALL FileHandler::setEncoding( const ::rtl::OUString& _rEncoding ) throw (RuntimeException) + void SAL_CALL FileHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException) { MethodGuard aGuard( *this ); OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) ); @@ -332,7 +332,7 @@ namespace logging if ( !impl_prepareFile_nothrow() ) return sal_False; - ::rtl::OString sEntry; + OString sEntry; if ( !m_aHandlerHelper.formatForPublishing( _rRecord, sEntry ) ) return sal_False; @@ -349,7 +349,7 @@ namespace logging throw AlreadyInitializedException(); if ( _rArguments.getLength() != 1 ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); Sequence< NamedValue > aSettings; if ( _rArguments[0] >>= m_sFileURL ) @@ -367,22 +367,22 @@ namespace logging impl_doStringsubstitution_nothrow( m_sFileURL ); } else - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); m_aHandlerHelper.setIsInitialized(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FileHandler::getImplementationName() throw(RuntimeException) + OUString SAL_CALL FileHandler::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL FileHandler::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool SAL_CALL FileHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -392,22 +392,22 @@ namespace logging } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FileHandler::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FileHandler::getImplementationName_static() + OUString SAL_CALL FileHandler::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.FileHandler" ); + return OUString( "com.sun.star.comp.extensions.FileHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FileHandler::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.FileHandler" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.FileHandler" ); return aServiceNames; } diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index 69b4a756cba2..dc82f16ba00d 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -66,10 +66,10 @@ namespace logging //==================================================================== namespace { - sal_Bool lcl_supportsService_nothrow( XServiceInfo& _rSI, const ::rtl::OUString& _rServiceName ) + sal_Bool lcl_supportsService_nothrow( XServiceInfo& _rSI, const OUString& _rServiceName ) { - const Sequence< ::rtl::OUString > aServiceNames( _rSI.getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( _rSI.getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -95,26 +95,26 @@ namespace logging // <attributes> sal_Int32 m_nLogLevel; - ::rtl::OUString m_sName; + OUString m_sName; // </attributes> public: - EventLogger( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rName ); + EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); // XLogger - virtual ::rtl::OUString SAL_CALL getName() throw (RuntimeException); + virtual OUString SAL_CALL getName() throw (RuntimeException); virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException); virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException); virtual void SAL_CALL addLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException); virtual void SAL_CALL removeLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException); virtual ::sal_Bool SAL_CALL isLoggable( ::sal_Int32 _nLevel ) throw (RuntimeException); - virtual void SAL_CALL log( ::sal_Int32 Level, const ::rtl::OUString& Message ) throw (RuntimeException); - virtual void SAL_CALL logp( ::sal_Int32 Level, const ::rtl::OUString& SourceClass, const ::rtl::OUString& SourceMethod, const ::rtl::OUString& Message ) throw (RuntimeException); + virtual void SAL_CALL log( ::sal_Int32 Level, const OUString& Message ) throw (RuntimeException); + virtual void SAL_CALL logp( ::sal_Int32 Level, const OUString& SourceClass, const OUString& SourceMethod, const OUString& Message ) throw (RuntimeException); protected: ~EventLogger(); @@ -141,7 +141,7 @@ namespace logging class LoggerPool : public LoggerPool_Base { private: - typedef ::std::map< ::rtl::OUString, WeakReference< XLogger > > ImplPool; + typedef ::std::map< OUString, WeakReference< XLogger > > ImplPool; private: ::osl::Mutex m_aMutex; @@ -152,18 +152,18 @@ namespace logging LoggerPool( const Reference< XComponentContext >& _rxContext ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); // helper for factories - static Sequence< ::rtl::OUString > getSupportedServiceNames_static(); - static ::rtl::OUString getImplementationName_static(); - static ::rtl::OUString getSingletonName_static(); + static Sequence< OUString > getSupportedServiceNames_static(); + static OUString getImplementationName_static(); + static OUString getSingletonName_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); // XLoggerPool - virtual Reference< XLogger > SAL_CALL getNamedLogger( const ::rtl::OUString& Name ) throw (RuntimeException); + virtual Reference< XLogger > SAL_CALL getNamedLogger( const OUString& Name ) throw (RuntimeException); virtual Reference< XLogger > SAL_CALL getDefaultLogger( ) throw (RuntimeException); }; @@ -171,7 +171,7 @@ namespace logging //= EventLogger - implementation //==================================================================== //-------------------------------------------------------------------- - EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rName ) + EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName ) :m_aContext( _rxContext ) ,m_aHandlers( m_aMutex ) ,m_nEventNumber( 0 ) @@ -217,7 +217,7 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventLogger::getName() throw (RuntimeException) + OUString SAL_CALL EventLogger::getName() throw (RuntimeException) { return m_sName; } @@ -258,7 +258,7 @@ namespace logging } //-------------------------------------------------------------------- - void SAL_CALL EventLogger::log( ::sal_Int32 _nLevel, const ::rtl::OUString& _rMessage ) throw (RuntimeException) + void SAL_CALL EventLogger::log( ::sal_Int32 _nLevel, const OUString& _rMessage ) throw (RuntimeException) { impl_ts_logEvent_nothrow( createLogRecord( m_sName, @@ -269,7 +269,7 @@ namespace logging } //-------------------------------------------------------------------- - void SAL_CALL EventLogger::logp( ::sal_Int32 _nLevel, const ::rtl::OUString& _rSourceClass, const ::rtl::OUString& _rSourceMethod, const ::rtl::OUString& _rMessage ) throw (RuntimeException) + void SAL_CALL EventLogger::logp( ::sal_Int32 _nLevel, const OUString& _rSourceClass, const OUString& _rSourceMethod, const OUString& _rMessage ) throw (RuntimeException) { impl_ts_logEvent_nothrow( createLogRecord( m_sName, @@ -282,22 +282,22 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventLogger::getImplementationName() throw(RuntimeException) + OUString SAL_CALL EventLogger::getImplementationName() throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EventLogger" ); + return OUString( "com.sun.star.comp.extensions.EventLogger" ); } //-------------------------------------------------------------------- - ::sal_Bool EventLogger::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool EventLogger::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { return lcl_supportsService_nothrow( *this, _rServiceName ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventLogger::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL EventLogger::getSupportedServiceNames() throw(RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.Logger" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.Logger" ); return aServiceNames; } @@ -311,41 +311,41 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL LoggerPool::getImplementationName() throw(RuntimeException) + OUString SAL_CALL LoggerPool::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL LoggerPool::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool SAL_CALL LoggerPool::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { return lcl_supportsService_nothrow( *this, _rServiceName ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL LoggerPool::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL LoggerPool::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL LoggerPool::getImplementationName_static() + OUString SAL_CALL LoggerPool::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.LoggerPool" ); + return OUString( "com.sun.star.comp.extensions.LoggerPool" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL LoggerPool::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL LoggerPool::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); + Sequence< OUString > aServiceNames(1); aServiceNames[0] = getSingletonName_static(); return aServiceNames; } //-------------------------------------------------------------------- - ::rtl::OUString LoggerPool::getSingletonName_static() + OUString LoggerPool::getSingletonName_static() { - return ::rtl::OUString( "com.sun.star.logging.LoggerPool" ); + return OUString( "com.sun.star.logging.LoggerPool" ); } //-------------------------------------------------------------------- @@ -355,7 +355,7 @@ namespace logging } //-------------------------------------------------------------------- - Reference< XLogger > SAL_CALL LoggerPool::getNamedLogger( const ::rtl::OUString& _rName ) throw (RuntimeException) + Reference< XLogger > SAL_CALL LoggerPool::getNamedLogger( const OUString& _rName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -374,7 +374,7 @@ namespace logging //-------------------------------------------------------------------- Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger( ) throw (RuntimeException) { - return getNamedLogger( ::rtl::OUString( "org.openoffice.logging.DefaultLogger" ) ); + return getNamedLogger( OUString( "org.openoffice.logging.DefaultLogger" ) ); } //-------------------------------------------------------------------- diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 7f80ebaac172..af0fac9efa03 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -71,20 +71,20 @@ namespace logging namespace { //---------------------------------------------------------------- - typedef void (*SettingTranslation)( const Reference< XLogger >&, const ::rtl::OUString&, Any& ); + typedef void (*SettingTranslation)( const Reference< XLogger >&, const OUString&, Any& ); //---------------------------------------------------------------- - void lcl_substituteFileHandlerURLVariables_nothrow( const Reference< XLogger >& _rxLogger, ::rtl::OUString& _inout_rFileURL ) + void lcl_substituteFileHandlerURLVariables_nothrow( const Reference< XLogger >& _rxLogger, OUString& _inout_rFileURL ) { struct Variable { const sal_Char* pVariablePattern; const sal_Int32 nPatternLength; rtl_TextEncoding eEncoding; - const ::rtl::OUString sVariableValue; + const OUString sVariableValue; Variable( const sal_Char* _pVariablePattern, const sal_Int32 _nPatternLength, rtl_TextEncoding _eEncoding, - const ::rtl::OUString& _rVariableValue ) + const OUString& _rVariableValue ) :pVariablePattern( _pVariablePattern ) ,nPatternLength( _nPatternLength ) ,eEncoding( _eEncoding ) @@ -93,7 +93,7 @@ namespace logging } }; - ::rtl::OUString sLoggerName; + OUString sLoggerName; try { sLoggerName = _rxLogger->getName(); } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } @@ -104,7 +104,7 @@ namespace logging for ( size_t i = 0; i < SAL_N_ELEMENTS( aVariables ); ++i ) { - ::rtl::OUString sPattern( aVariables[i].pVariablePattern, aVariables[i].nPatternLength, aVariables[i].eEncoding ); + OUString sPattern( aVariables[i].pVariablePattern, aVariables[i].nPatternLength, aVariables[i].eEncoding ); sal_Int32 nVariableIndex = _inout_rFileURL.indexOf( sPattern ); if ( ( nVariableIndex == 0 ) || ( ( nVariableIndex > 0 ) @@ -119,13 +119,13 @@ namespace logging } //---------------------------------------------------------------- - void lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const ::rtl::OUString& _rSettingName, Any& _inout_rSettingValue ) + void lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const OUString& _rSettingName, Any& _inout_rSettingValue ) { if ( _rSettingName != "FileURL" ) // not interested in this setting return; - ::rtl::OUString sURL; + OUString sURL; OSL_VERIFY( _inout_rSettingValue >>= sURL ); lcl_substituteFileHandlerURLVariables_nothrow( _rxLogger, sURL ); _inout_rSettingValue <<= sURL; @@ -145,15 +145,15 @@ namespace logging // read the settings for the to-be-created service Reference< XNameAccess > xServiceSettingsNode( _rxLoggerSettings->getByName( - ::rtl::OUString::createFromAscii( _pServiceSettingsAsciiNodeName ) ), UNO_QUERY_THROW ); + OUString::createFromAscii( _pServiceSettingsAsciiNodeName ) ), UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > aSettingNames( xServiceSettingsNode->getElementNames() ); + Sequence< OUString > aSettingNames( xServiceSettingsNode->getElementNames() ); size_t nServiceSettingCount( aSettingNames.getLength() ); Sequence< NamedValue > aSettings( nServiceSettingCount ); if ( nServiceSettingCount ) { - const ::rtl::OUString* pSettingNames = aSettingNames.getConstArray(); - const ::rtl::OUString* pSettingNamesEnd = aSettingNames.getConstArray() + aSettingNames.getLength(); + const OUString* pSettingNames = aSettingNames.getConstArray(); + const OUString* pSettingNamesEnd = aSettingNames.getConstArray() + aSettingNames.getLength(); NamedValue* pSetting = aSettings.getArray(); for ( ; @@ -169,8 +169,8 @@ namespace logging } } - ::rtl::OUString sServiceName; - _rxLoggerSettings->getByName( ::rtl::OUString::createFromAscii( _pServiceNameAsciiNodeName ) ) >>= sServiceName; + OUString sServiceName; + _rxLoggerSettings->getByName( OUString::createFromAscii( _pServiceNameAsciiNodeName ) ) >>= sServiceName; if ( !sServiceName.isEmpty() ) { bool bSuccess = false; @@ -208,15 +208,15 @@ namespace logging // write access to the "Settings" node (which includes settings for all loggers) Sequence< Any > aArguments(1); aArguments[0] <<= NamedValue( - ::rtl::OUString( "nodepath" ), - makeAny( ::rtl::OUString( "/org.openoffice.Office.Logging/Settings" ) ) + OUString( "nodepath" ), + makeAny( OUString( "/org.openoffice.Office.Logging/Settings" ) ) ); Reference< XNameContainer > xAllSettings( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), + OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ), aArguments ), UNO_QUERY_THROW ); - ::rtl::OUString sLoggerName( _rxLogger->getName() ); + OUString sLoggerName( _rxLogger->getName() ); if ( !xAllSettings->hasByName( sLoggerName ) ) { // no node yet for this logger. Create default settings. @@ -232,7 +232,7 @@ namespace logging // the log level sal_Int32 nLogLevel( LogLevel::OFF ); - OSL_VERIFY( xLoggerSettings->getByName( ::rtl::OUString( "LogLevel" ) ) >>= nLogLevel ); + OSL_VERIFY( xLoggerSettings->getByName( OUString( "LogLevel" ) ) >>= nLogLevel ); _rxLogger->setLevel( nLogLevel ); // the default handler, if any diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index 6aab561caec5..7acb576c8b5e 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -65,7 +65,7 @@ namespace logging //-------------------------------------------------------------------- void LogHandlerHelper::initFromSettings( const ::comphelper::NamedValueCollection& _rSettings ) { - ::rtl::OUString sEncoding; + OUString sEncoding; if ( _rSettings.get_ensureType( "Encoding", sEncoding ) ) { if ( !setEncoding( sEncoding ) ) @@ -82,10 +82,10 @@ namespace logging m_rMutex.acquire(); if ( !getIsInitialized() ) - throw DisposedException( ::rtl::OUString( "component not initialized" ), NULL ); + throw DisposedException( OUString( "component not initialized" ), NULL ); if ( m_rBHelper.bDisposed ) - throw DisposedException( ::rtl::OUString( "component already disposed" ), NULL ); + throw DisposedException( OUString( "component already disposed" ), NULL ); // fallback settings, in case they weren't passed at construction time if ( !getFormatter().is() ) @@ -103,22 +103,22 @@ namespace logging } //-------------------------------------------------------------------- - bool LogHandlerHelper::getEncoding( ::rtl::OUString& _out_rEncoding ) const + bool LogHandlerHelper::getEncoding( OUString& _out_rEncoding ) const { const char* pMimeCharset = rtl_getMimeCharsetFromTextEncoding( m_eEncoding ); if ( pMimeCharset ) { - _out_rEncoding = ::rtl::OUString::createFromAscii( pMimeCharset ); + _out_rEncoding = OUString::createFromAscii( pMimeCharset ); return true; } - _out_rEncoding = ::rtl::OUString(); + _out_rEncoding = OUString(); return false; } //-------------------------------------------------------------------- - bool LogHandlerHelper::setEncoding( const ::rtl::OUString& _rEncoding ) + bool LogHandlerHelper::setEncoding( const OUString& _rEncoding ) { - ::rtl::OString sAsciiEncoding( ::rtl::OUStringToOString( _rEncoding, RTL_TEXTENCODING_ASCII_US ) ); + OString sAsciiEncoding( OUStringToOString( _rEncoding, RTL_TEXTENCODING_ASCII_US ) ); rtl_TextEncoding eEncoding = rtl_getTextEncodingFromMimeCharset( sAsciiEncoding.getStr() ); if ( eEncoding != RTL_TEXTENCODING_DONTKNOW ) { @@ -129,7 +129,7 @@ namespace logging } //-------------------------------------------------------------------- - bool LogHandlerHelper::formatForPublishing( const LogRecord& _rRecord, ::rtl::OString& _out_rEntry ) const + bool LogHandlerHelper::formatForPublishing( const LogRecord& _rRecord, OString& _out_rEntry ) const { if ( _rRecord.Level < getLevel() ) // not to be published due to low level @@ -138,8 +138,8 @@ namespace logging try { Reference< XLogFormatter > xFormatter( getFormatter(), UNO_QUERY_THROW ); - ::rtl::OUString sEntry( xFormatter->format( _rRecord ) ); - _out_rEntry = ::rtl::OUStringToOString( sEntry, getTextEncoding() ); + OUString sEntry( xFormatter->format( _rRecord ) ); + _out_rEntry = OUStringToOString( sEntry, getTextEncoding() ); return true; } catch( const Exception& ) @@ -150,13 +150,13 @@ namespace logging } //-------------------------------------------------------------------- - bool LogHandlerHelper::getEncodedHead( ::rtl::OString& _out_rHead ) const + bool LogHandlerHelper::getEncodedHead( OString& _out_rHead ) const { try { Reference< XLogFormatter > xFormatter( getFormatter(), UNO_QUERY_THROW ); - ::rtl::OUString sHead( xFormatter->getHead() ); - _out_rHead = ::rtl::OUStringToOString( sHead, getTextEncoding() ); + OUString sHead( xFormatter->getHead() ); + _out_rHead = OUStringToOString( sHead, getTextEncoding() ); return true; } catch( const Exception& ) @@ -167,13 +167,13 @@ namespace logging } //-------------------------------------------------------------------- - bool LogHandlerHelper::getEncodedTail( ::rtl::OString& _out_rTail ) const + bool LogHandlerHelper::getEncodedTail( OString& _out_rTail ) const { try { Reference< XLogFormatter > xFormatter( getFormatter(), UNO_QUERY_THROW ); - ::rtl::OUString sTail( xFormatter->getTail() ); - _out_rTail = ::rtl::OUStringToOString( sTail, getTextEncoding() ); + OUString sTail( xFormatter->getTail() ); + _out_rTail = OUStringToOString( sTail, getTextEncoding() ); return true; } catch( const Exception& ) diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx index fa3d0edeedcf..d2d2a4936b7e 100644 --- a/extensions/source/logging/loghandler.hxx +++ b/extensions/source/logging/loghandler.hxx @@ -63,8 +63,8 @@ namespace logging bool getIsInitialized() const { return m_bInitialized; } void setIsInitialized() { m_bInitialized = true; } - bool getEncoding( ::rtl::OUString& _out_rEncoding ) const; - bool setEncoding( const ::rtl::OUString& _rEncoding ); + bool getEncoding( OUString& _out_rEncoding ) const; + bool setEncoding( const OUString& _rEncoding ); inline rtl_TextEncoding getTextEncoding() const { return m_eEncoding; } @@ -108,19 +108,19 @@ namespace logging Finally, the unicode string is encoded into a byte string, using our encoding setting. Then, <TRUE/> is returned. */ - bool formatForPublishing( const ::com::sun::star::logging::LogRecord& _rRecord, ::rtl::OString& _out_rEntry ) const; + bool formatForPublishing( const ::com::sun::star::logging::LogRecord& _rRecord, OString& _out_rEntry ) const; /** retrieves our formatter's heading, encoded with our encoding @return <TRUE/> in case of success, <FALSE/> if any error occurred */ - bool getEncodedHead( ::rtl::OString& _out_rHead ) const; + bool getEncodedHead( OString& _out_rHead ) const; /** retrieves our formatter's tail, encoded with our encoding @return <TRUE/> in case of success, <FALSE/> if any error occurred */ - bool getEncodedTail( ::rtl::OString& _out_rTail ) const; + bool getEncodedTail( OString& _out_rTail ) const; /** initializes the instance from a collection of named settings diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx index d01770a3d503..ce9c8ba8d036 100644 --- a/extensions/source/logging/logrecord.cxx +++ b/extensions/source/logging/logrecord.cxx @@ -43,16 +43,16 @@ namespace logging We need a way to retrieve the current UNO thread ID as string, which is issue #i77342# */ - ::rtl::OUString getCurrentThreadID() + OUString getCurrentThreadID() { oslThreadIdentifier nThreadID( osl_getThreadIdentifier( NULL ) ); - return ::rtl::OUString::valueOf( (sal_Int64)nThreadID ); + return OUString::valueOf( (sal_Int64)nThreadID ); } } //-------------------------------------------------------------------- - LogRecord createLogRecord( const ::rtl::OUString& _rLoggerName, const ::rtl::OUString& _rClassName, - const ::rtl::OUString& _rMethodName, const ::rtl::OUString& _rMessage, + LogRecord createLogRecord( const OUString& _rLoggerName, const OUString& _rClassName, + const OUString& _rMethodName, const OUString& _rMessage, sal_Int32 _nLogLevel, oslInterlockedCount _nEventNumber ) { TimeValue aTimeValue; diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx index 85962d19a594..772969371077 100644 --- a/extensions/source/logging/logrecord.hxx +++ b/extensions/source/logging/logrecord.hxx @@ -33,22 +33,22 @@ namespace logging //= helper //==================================================================== ::com::sun::star::logging::LogRecord createLogRecord( - const ::rtl::OUString& _rLoggerName, - const ::rtl::OUString& _rClassName, - const ::rtl::OUString& _rMethodName, - const ::rtl::OUString& _rMessage, + const OUString& _rLoggerName, + const OUString& _rClassName, + const OUString& _rMethodName, + const OUString& _rMessage, sal_Int32 _nLogLevel, oslInterlockedCount _nEventNumber ); inline ::com::sun::star::logging::LogRecord createLogRecord( - const ::rtl::OUString& _rLoggerName, - const ::rtl::OUString& _rMessage, + const OUString& _rLoggerName, + const OUString& _rMessage, sal_Int32 _nLogLevel, oslInterlockedCount _nEventNumber ) { - return createLogRecord( _rLoggerName, ::rtl::OUString(), ::rtl::OUString(), _rMessage, _nLogLevel, _nEventNumber ); + return createLogRecord( _rLoggerName, OUString(), OUString(), _rMessage, _nLogLevel, _nEventNumber ); } //........................................................................ diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx index b03dfd715b9c..7396263b8a24 100644 --- a/extensions/source/logging/plaintextformatter.cxx +++ b/extensions/source/logging/plaintextformatter.cxx @@ -64,19 +64,19 @@ namespace logging virtual ~PlainTextFormatter(); // XLogFormatter - virtual ::rtl::OUString SAL_CALL getHead( ) throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL getTail( ) throw (RuntimeException); + virtual OUString SAL_CALL getHead( ) throw (RuntimeException); + virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException); + virtual OUString SAL_CALL getTail( ) throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); }; @@ -95,9 +95,9 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::getHead( ) throw (RuntimeException) + OUString SAL_CALL PlainTextFormatter::getHead( ) throw (RuntimeException) { - ::rtl::OUStringBuffer aHeader; + OUStringBuffer aHeader; aHeader.appendAscii( " event no" ); // column 1: the event number aHeader.appendAscii( " " ); aHeader.appendAscii( "thread " ); // column 2: the thread ID @@ -112,7 +112,7 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException) + OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException) { char buffer[ 30 ]; const int buffer_size = sizeof( buffer ); @@ -120,11 +120,11 @@ namespace logging if ( used >= buffer_size || used < 0 ) buffer[ buffer_size - 1 ] = 0; - ::rtl::OUStringBuffer aLogEntry; + OUStringBuffer aLogEntry; aLogEntry.appendAscii( buffer ); aLogEntry.appendAscii( " " ); - ::rtl::OString sThreadID( ::rtl::OUStringToOString( _rRecord.ThreadID, osl_getThreadTextEncoding() ) ); + OString sThreadID( OUStringToOString( _rRecord.ThreadID, osl_getThreadTextEncoding() ) ); snprintf( buffer, buffer_size, "%8s", sThreadID.getStr() ); aLogEntry.appendAscii( buffer ); aLogEntry.appendAscii( " " ); @@ -150,17 +150,17 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::getTail( ) throw (RuntimeException) + OUString SAL_CALL PlainTextFormatter::getTail( ) throw (RuntimeException) { // no tail - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PlainTextFormatter::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) + ::sal_Bool SAL_CALL PlainTextFormatter::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - const Sequence< ::rtl::OUString > aServiceNames( getSupportedServiceNames() ); - for ( const ::rtl::OUString* pServiceNames = aServiceNames.getConstArray(); + const Sequence< OUString > aServiceNames( getSupportedServiceNames() ); + for ( const OUString* pServiceNames = aServiceNames.getConstArray(); pServiceNames != aServiceNames.getConstArray() + aServiceNames.getLength(); ++pServiceNames ) @@ -170,28 +170,28 @@ namespace logging } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::getImplementationName() throw(RuntimeException) + OUString SAL_CALL PlainTextFormatter::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL PlainTextFormatter::getImplementationName_static() + OUString SAL_CALL PlainTextFormatter::getImplementationName_static() { - return ::rtl::OUString( "com.sun.star.comp.extensions.PlainTextFormatter" ); + return OUString( "com.sun.star.comp.extensions.PlainTextFormatter" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static() + Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static() { - Sequence< ::rtl::OUString > aServiceNames(1); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.logging.PlainTextFormatter" ); + Sequence< OUString > aServiceNames(1); + aServiceNames[0] = OUString( "com.sun.star.logging.PlainTextFormatter" ); return aServiceNames; } diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index c244a07c12a3..23cd49ec4f63 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -64,8 +64,6 @@ using namespace com::sun::star::connection; using namespace cppu; using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OString; char SoPluginInstance::sSO_Dir[] = {0}; Reference< XMultiServiceFactory > SoPluginInstance::mxRemoteMSF = Reference< XMultiServiceFactory >(NULL); @@ -103,8 +101,8 @@ sal_Bool SoPluginInstance::SetURL(char* aURL) osl_getProcessLocale(&pLocale); sal_uInt16 encoding = osl_getTextEncodingFromLocale(pLocale); - m_sURL = ::rtl::OUString(aURL, strlen(aURL), encoding); - debug_fprintf(NSP_LOG_APPEND, "SetURL %s\nencoding is: %d\n", ::rtl::OUStringToOString(m_sURL, + m_sURL = OUString(aURL, strlen(aURL), encoding); + debug_fprintf(NSP_LOG_APPEND, "SetURL %s\nencoding is: %d\n", OUStringToOString(m_sURL, RTL_TEXTENCODING_GB_18030).getStr(), m_sURL.getLength(), encoding); return sal_True; } @@ -175,7 +173,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // create frame m_xFrame = Reference< frame::XFrame >( - mxRemoteMSF->createInstance( ::rtl::OUString("com.sun.star.frame.Frame")), + mxRemoteMSF->createInstance( OUString("com.sun.star.frame.Frame")), uno::UNO_QUERY ); if (!m_xFrame.is()) { @@ -191,9 +189,9 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // currently ignore errors in this code uno::Reference< beans::XPropertySet > xFrameProps( m_xFrame, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xLMProps; - xFrameProps->getPropertyValue( ::rtl::OUString("LayoutManager") ) >>= xLMProps; + xFrameProps->getPropertyValue( OUString("LayoutManager") ) >>= xLMProps; if ( xLMProps.is() ) - xLMProps->setPropertyValue( ::rtl::OUString("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) ); + xLMProps->setPropertyValue( OUString("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) ); } catch( const uno::Exception& ) {} @@ -244,7 +242,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) setPropValues[ 3 ].Value = "Flat XML File";*/ debug_fprintf(NSP_LOG_APPEND, "try to load copy of URL from local file %s:%d\n", - ::rtl::OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ), + OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ), m_sURL.getLength() ); // load document @@ -293,7 +291,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) propertyValue[0].Name = OUString("FunctionBarVisible"); propertyValue[0].Value <<= sal_True; m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString(".uno:FunctionBarVisible"), + OUString(".uno:FunctionBarVisible"), m_xFrame->getName(), 0, propertyValue ); @@ -309,7 +307,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) uno::Reference< presentation::XPresentationSupplier > xPresSuppl( m_xComponent, uno::UNO_QUERY_THROW ); uno::Reference< presentation::XPresentation > xPres( xPresSuppl->getPresentation(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xPresSuppl->getPresentation(), uno::UNO_QUERY_THROW ); - xProps->setPropertyValue( ::rtl::OUString( "IsFullScreen" ), uno::makeAny( sal_False ) ); + xProps->setPropertyValue( OUString( "IsFullScreen" ), uno::makeAny( sal_False ) ); xPres->start(); } catch( const uno::Exception& ) @@ -341,7 +339,7 @@ sal_Bool SoPluginInstance::SetWindow(NSP_HWND hParent, int x, int y, int w, int m_hParent = hParent; debug_fprintf(NSP_LOG_APPEND, "SoPluginInstance::SetWindow %s : %d\n", - ::rtl::OUStringToOString(m_sURL, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(m_sURL, RTL_TEXTENCODING_ASCII_US).getStr(), m_sURL.getLength() ); m_nWidth = w; m_nHeight =h; @@ -400,7 +398,7 @@ sal_Bool SoPluginInstance::Destroy(void) aArgs[0] <<= m_xFrame; uno::Reference< lang::XComponent > xDocumentCloser( mxRemoteMSF->createInstanceWithArguments( - ::rtl::OUString( "com.sun.star.embed.DocumentCloser" ), + OUString( "com.sun.star.embed.DocumentCloser" ), aArgs ), uno::UNO_QUERY_THROW ); @@ -441,7 +439,7 @@ sal_Bool SoPluginInstance::Print(void) Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1); m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString(".uno:PrintDefault"), + OUString(".uno:PrintDefault"), m_xFrame->getName(), 0, propertyValue ); return sal_True; diff --git a/extensions/source/nsplugin/source/so_instance.hxx b/extensions/source/nsplugin/source/so_instance.hxx index 54974799f9a4..1af9146a1605 100644 --- a/extensions/source/nsplugin/source/so_instance.hxx +++ b/extensions/source/nsplugin/source/so_instance.hxx @@ -68,7 +68,7 @@ private: int m_nX; int m_nY; sal_Int16 m_nFlag; // Set to 12 during initialization - ::rtl::OUString m_sURL; // URL of the document to be loaded + OUString m_sURL; // URL of the document to be loaded sal_Bool m_bInit; // If the Plugin instance is initilaized. NSP_HWND m_hParent; // Windows handle of parent window long m_pParent; // ID of this instance - get from NPP diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx index f62383f843f6..6413f21dde05 100644 --- a/extensions/source/nsplugin/source/so_main.cxx +++ b/extensions/source/nsplugin/source/so_main.cxx @@ -301,7 +301,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f } // env string - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; OUString aPath, aPluginPipeName; if(!Bootstrap::get("BRAND_BASE_DIR", aPath)) @@ -310,7 +310,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f return Reference< lang::XMultiServiceFactory >(NULL); } - aPluginPipeName = ::rtl::OUString::valueOf( aPath.hashCode() ); + aPluginPipeName = OUString::valueOf( aPath.hashCode() ); // accept string OSL_ASSERT( buf.isEmpty() ); @@ -361,11 +361,11 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f NSP_Close_Pipe(read_fd); execl( "/bin/sh", "/bin/sh", - ::rtl::OUStringToOString( aOfficePath, osl_getThreadTextEncoding() ).getStr(), - ::rtl::OUStringToOString( args[0], osl_getThreadTextEncoding() ).getStr(), - ::rtl::OUStringToOString( args[1], osl_getThreadTextEncoding() ).getStr(), - ::rtl::OUStringToOString( args[2], osl_getThreadTextEncoding() ).getStr(), - ::rtl::OUStringToOString( args[3], osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( aOfficePath, osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( args[0], osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( args[1], osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( args[2], osl_getThreadTextEncoding() ).getStr(), + OUStringToOString( args[3], osl_getThreadTextEncoding() ).getStr(), NULL); _exit(255); } diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index c7fc0a0b88e3..d70908485cc6 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -58,8 +58,6 @@ using namespace com::sun::star::beans; using namespace osl; using namespace std; -using ::rtl::OUString; - namespace ole_adapter { diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 2814850ff221..709e121f6846 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -67,9 +67,6 @@ using namespace com::sun::star::bridge::oleautomation; using namespace com::sun::star::bridge::ModelDependent; using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringBuffer; #define JSCRIPT_ID_PROPERTY L"_environment" #define JSCRIPT_ID L"jscript" @@ -408,15 +405,15 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, throw RuntimeException(); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( + throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; case DISP_E_PARAMNOTFOUND: - throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( + throw IllegalArgumentException(OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )) ; break; case DISP_E_TYPEMISMATCH: - throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( + throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::UNKNOWN, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_UNKNOWNINTERFACE: @@ -426,7 +423,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, throw RuntimeException(); break; case DISP_E_PARAMNOTOPTIONAL: - throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast<XInterface*>( + throw CannotConvertException(OUString("call to OLE object failed"),static_cast<XInterface*>( static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr); break; default: @@ -489,12 +486,12 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) { if ( pInfo && m_sTypeName.getLength() == 0 ) { - m_sTypeName = rtl::OUString("IDispatch"); + m_sTypeName = OUString("IDispatch"); CComBSTR sName; if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) ) { - rtl::OUString sTmp( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName))); + OUString sTmp( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName))); if ( sTmp.indexOf('_') == 0 ) sTmp = sTmp.copy(1); // do we own the memory for pTypeLib, msdn doco is vague @@ -505,8 +502,8 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) { if ( SUCCEEDED( pTypeLib->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) ) { - rtl::OUString sLibName( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName))); - m_sTypeName = sLibName.concat( rtl::OUString(".") ).concat( sTmp ); + OUString sLibName( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName))); + m_sTypeName = sLibName.concat( OUString(".") ).concat( sTmp ); } } @@ -1177,7 +1174,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, } if( !bConvRet) // conversion of return or out parameter failed - throw CannotConvertException( rtl::OUString("Call to COM object failed. Conversion of return or out value failed"), + throw CannotConvertException( OUString("Call to COM object failed. Conversion of return or out value failed"), Reference<XInterface>( static_cast<XWeak*>(this), UNO_QUERY ), TypeClass_UNKNOWN, FailReason::UNKNOWN, 0);// lookup error code // conversion of return or out parameter failed @@ -1201,15 +1198,15 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, throw IllegalArgumentException(); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( + throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; case DISP_E_PARAMNOTFOUND: - throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( + throw IllegalArgumentException(OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_TYPEMISMATCH: - throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast<XInterface*>( + throw CannotConvertException(OUString("call to OLE object failed"),static_cast<XInterface*>( static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr); break; case DISP_E_UNKNOWNINTERFACE: @@ -1219,7 +1216,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, throw RuntimeException() ; break; case DISP_E_PARAMNOTOPTIONAL: - throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>( + throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr); break; default: @@ -1317,7 +1314,7 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument // -------------------------- // XDirectInvocation -uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aName, const uno::Sequence< uno::Any >& aParams ) +uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, const uno::Sequence< uno::Any >& aParams ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { Any aResult; @@ -1528,7 +1525,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa "returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."), + throw CannotConvertException(OUString("[automation bridge] Call failed."), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; @@ -1566,7 +1563,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa return aResult; } -::sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const ::rtl::OUString& aName ) +::sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const OUString& aName ) throw (uno::RuntimeException) { if ( ! m_spDispatch ) @@ -2160,7 +2157,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, "returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); break; case DISP_E_OVERFLOW: - throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."), + throw CannotConvertException(OUString("[automation bridge] Call failed."), static_cast<XInterface*>( static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr); break; diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 00b0753bbf4f..46168becb692 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -48,7 +48,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::oleautomation; -using ::rtl::OUString; namespace ole_adapter { @@ -112,17 +111,17 @@ public: throw(Exception, RuntimeException); // XDefaultProperty - virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } // XDefaultMethod - virtual ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } + virtual OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } - virtual ::com::sun::star::uno::Any SAL_CALL invokeGetProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL invokePutProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL invokeGetProperty( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL invokePutProperty( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); // XDirectInvocation - virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const ::rtl::OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasMember( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasMember( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); Any invokeWithDispIdComTlb(FuncDesc& aFuncDesc, @@ -237,7 +236,7 @@ protected: Sequence<Type> m_seqTypes; CComPtr<IUnknown> m_spUnknown; CComPtr<IDispatch> m_spDispatch; - rtl::OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type + OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type /** This value is set dureing XInitialization::initialize. It indicates that the COM interface was transported as VT_DISPATCH in a VARIANT rather then a VT_UNKNOWN */ @@ -256,7 +255,7 @@ protected: bool m_bComTlbIndexInit; // Keeps the ITypeInfo obtained from IDispatch::GetTypeInfo CComPtr< ITypeInfo > m_spTypeInfo; - rtl::OUString m_sDefaultMember; + OUString m_sDefaultMember; bool m_bHasDfltMethod; bool m_bHasDfltProperty; }; diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index 4882459508bf..f540ef94a9a1 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -43,7 +43,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::ModelDependent; -using ::rtl::OUString; namespace ole_adapter { diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index 66333dd0f820..a9bc8c3b4313 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -30,7 +30,6 @@ using namespace ole_adapter; using namespace cppu; -using ::rtl::OUString; namespace ole_adapter { diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index c6551f42fa3c..2899abae1715 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -65,7 +65,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::bridge::ModelDependent; using namespace com::sun::star::reflection; -using ::rtl::OUString; #ifndef _MSC_VER extern "C" const GUID IID_IDispatchEx; diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx index 0cfdd2f8970b..3191c4f413db 100644 --- a/extensions/source/ole/unotypewrapper.cxx +++ b/extensions/source/ole/unotypewrapper.cxx @@ -52,7 +52,7 @@ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVar) } -bool createUnoTypeWrapper(const rtl::OUString& sTypeName, VARIANT * pVar) +bool createUnoTypeWrapper(const OUString& sTypeName, VARIANT * pVar) { CComBSTR bstr(reinterpret_cast<LPCOLESTR>(sTypeName.getStr())); return createUnoTypeWrapper(bstr, pVar); diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx index 5965bdb9a33e..a55b4912e75f 100644 --- a/extensions/source/ole/unotypewrapper.hxx +++ b/extensions/source/ole/unotypewrapper.hxx @@ -31,7 +31,7 @@ Returns true if the object could be created and initialized. */ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVariant); -bool createUnoTypeWrapper(const rtl::OUString& sTypeName, VARIANT * pVar); +bool createUnoTypeWrapper(const OUString& sTypeName, VARIANT * pVar); class UnoTypeWrapper: public CComObjectRootEx<CComMultiThreadModel>, diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 1a3b532548f5..2dbc83b722c1 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -64,15 +64,15 @@ private: Reference< ::com::sun::star::uno::XComponentContext > m_xContext; FILE* fp; Reference< ::com::sun::star::plugin::XPlugin > m_xPlugin; - ::rtl::OUString m_aMIMEType; - ::rtl::OUString m_aTarget; - ::rtl::OUString m_aFileName; + OUString m_aMIMEType; + OUString m_aTarget; + OUString m_aFileName; public: FileSink( const Reference< ::com::sun::star::uno::XComponentContext > &, const Reference< ::com::sun::star::plugin::XPlugin > & plugin, - const ::rtl::OUString& mimetype, - const ::rtl::OUString& target, + const OUString& mimetype, + const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ); virtual ~FileSink(); @@ -95,14 +95,14 @@ public: virtual ~XPluginContext_Impl(); - virtual ::rtl::OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& mimetype, const ::rtl::OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); - virtual ::rtl::OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); + virtual OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException ); }; Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw() @@ -120,14 +120,14 @@ XPluginContext_Impl::~XPluginContext_Impl() { } -::rtl::OUString XPluginContext_Impl::getValue( const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, ::com::sun::star::plugin::PluginVariable /*variable*/ ) +OUString XPluginContext_Impl::getValue( const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, ::com::sun::star::plugin::PluginVariable /*variable*/ ) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - return ::rtl::OUString(); + return OUString(); } -void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) +void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); @@ -135,11 +135,11 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu { INetURLObject aURL; aURL.SetSmartProtocol( INET_PROT_FILE ); - aURL.SetSmartURL( ::rtl::OUStringToOString( url, m_aEncoding ) ); + aURL.SetSmartURL( OUStringToOString( url, m_aEncoding ) ); - rtl::OUString aUrl = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); + OUString aUrl = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); // the mimetype cannot be specified - plugin->provideNewStream( ::rtl::OUString(), + plugin->provideNewStream( OUString(), Reference< XActiveDataSource >(), aUrl, 0, 0, aUrl.startsWith("file:") ); @@ -153,7 +153,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString("Referer"); + aValue.Name = OUString("Referer"); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); @@ -177,7 +177,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu } } -void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener ) +void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener ) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { getURL( plugin, url, target ); @@ -185,18 +185,18 @@ void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin listener->disposing( ::com::sun::star::lang::EventObject() ); } -::rtl::OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) +OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - return ::rtl::OUString("Mozilla 3.0"); + return OUString("Mozilla 3.0"); } -void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const ::rtl::OUString& /*message*/) +void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const OUString& /*message*/) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { } -void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) +void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { Sequence< sal_Int8 > aBuf; @@ -228,11 +228,11 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl try { ::com::sun::star::beans::PropertyValue aValues[2]; - aValues[0].Name = ::rtl::OUString("Referer"); + aValues[0].Name = OUString("Referer"); aValues[0].Value <<= pPlugin->getRefererURL(); - aValues[1].Name = ::rtl::OUString("PostString"); - aValues[1].Value <<= ::rtl::OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); + aValues[1].Name = OUString("PostString"); + aValues[1].Value <<= OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 ); Reference< ::com::sun::star::lang::XComponent > xComp = xDesktop->loadComponentFromURL( @@ -254,7 +254,7 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl } } -void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener ) +void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener ) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { postURL( plugin, url, target, buf, file ); @@ -262,7 +262,7 @@ void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugi listener->disposing( ::com::sun::star::lang::EventObject() ); } -void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& mimetype, const ::rtl::OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) +void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { FileSink* pNewSink = new FileSink( m_xContext, plugin, mimetype, target, source ); @@ -272,8 +272,8 @@ void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin:: FileSink::FileSink( const Reference< ::com::sun::star::uno::XComponentContext > & rxContext, const Reference< ::com::sun::star::plugin::XPlugin > & plugin, - const ::rtl::OUString& mimetype, - const ::rtl::OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) : + const OUString& mimetype, + const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) : m_xContext( rxContext ), m_xPlugin( plugin ), m_aMIMEType( mimetype ), @@ -308,7 +308,7 @@ void FileSink::closeOutput() throw() try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString("Referer"); + aValue.Name = OUString("Referer"); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index d3f87150104f..536547cd1e25 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -77,9 +77,9 @@ PluginManager::PluginManager() { } -const Sequence< ::rtl::OUString >& PluginManager::getAdditionalSearchPaths() +const Sequence< OUString >& PluginManager::getAdditionalSearchPaths() { - static Sequence< ::rtl::OUString > aPaths; + static Sequence< OUString > aPaths; if( ! aPaths.getLength() ) { @@ -105,7 +105,7 @@ Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< } // ::com::sun::star::lang::XServiceInfo -::rtl::OUString XPluginManager_Impl::getImplementationName() throw( ) +OUString XPluginManager_Impl::getImplementationName() throw( ) { return getImplementationName_Static(); @@ -113,10 +113,10 @@ Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< } // ::com::sun::star::lang::XServiceInfo -sal_Bool XPluginManager_Impl::supportsService(const ::rtl::OUString& ServiceName) throw( ) +sal_Bool XPluginManager_Impl::supportsService(const OUString& ServiceName) throw( ) { - Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pArray = aSNL.getConstArray(); + Sequence< OUString > aSNL = getSupportedServiceNames(); + const OUString * pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -124,16 +124,16 @@ sal_Bool XPluginManager_Impl::supportsService(const ::rtl::OUString& ServiceName } // ::com::sun::star::lang::XServiceInfo -Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames(void) throw( ) +Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames(void) throw( ) { return getSupportedServiceNames_Static(); } // XPluginManager_Impl -Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.plugin.PluginManager"); + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.plugin.PluginManager"); return aSNS; } @@ -178,8 +178,8 @@ Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug Sequence<com::sun::star::plugin::PluginDescription> aRet; vcl::SettingsConfigItem* pCfg = vcl::SettingsConfigItem::get(); - rtl::OUString aVal( pCfg->getValue( rtl::OUString( "BrowserPlugins" ), - rtl::OUString( "Disabled" ) ) ); + OUString aVal( pCfg->getValue( OUString( "BrowserPlugins" ), + OUString( "Disabled" ) ) ); if( ! aVal.toBoolean() ) { aRet = impl_getPluginDescriptions(); @@ -187,7 +187,7 @@ Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug return aRet; } -Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype) +Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException ) { XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); @@ -203,7 +203,7 @@ Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin return pImpl; } -Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const ::rtl::OUString& url ) throw() +Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw() { XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); Reference< ::com::sun::star::plugin::XPlugin > xRef = pImpl; diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index 7e48f9b45761..cdb20e2a8765 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -90,9 +90,6 @@ void TRACES( char const* s, char const* s2 ) using namespace com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; // Move deprecated functions which no longer appear in npapi.h before // their use to avoid errors that they're undeclared at point of use @@ -139,12 +136,12 @@ NPNetscapeFuncs aNPNFuncs = NPN_ForceRedraw }; -static ::rtl::OString normalizeURL( XPlugin_Impl* plugin, const ::rtl::OString& url ) +static OString normalizeURL( XPlugin_Impl* plugin, const OString& url ) { - ::rtl::OString aLoadURL; + OString aLoadURL; if( url.indexOf( ':' ) == -1 ) { - aLoadURL = ::rtl::OUStringToOString( plugin->getCreationURL(), plugin->getTextEncoding() ); + aLoadURL = OUStringToOString( plugin->getCreationURL(), plugin->getTextEncoding() ); int nPos; if( ( nPos = aLoadURL.indexOf( "://" ) ) != -1 ) { @@ -316,8 +313,8 @@ extern "C" { pImpl->getPluginContext()-> newStream( pImpl, - ::rtl::OStringToOUString( type, pImpl->getTextEncoding () ), - ::rtl::OStringToOUString( target, pImpl->getTextEncoding() ), + OStringToOUString( type, pImpl->getTextEncoding () ), + OStringToOUString( target, pImpl->getTextEncoding() ), ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource > ( pStream->getOutputStream(), UNO_QUERY ) ); pImpl->leavePluginCallback(); @@ -340,7 +337,7 @@ extern "C" { ::com::sun::star::uno::Sequence<sal_Int8> Bytes( (sal_Int8*)buf, len ); - ::rtl::OString aPostURL = normalizeURL( pImpl, url ); + OString aPostURL = normalizeURL( pImpl, url ); PluginEventListener* pListener = new PluginEventListener( pImpl, url, aPostURL.getStr(), notifyData ); @@ -357,8 +354,8 @@ extern "C" { pImpl->enterPluginCallback(); pImpl->getPluginContext()-> postURLNotify( pImpl, - ::rtl::OStringToOUString( aPostURL, pImpl->getTextEncoding() ), - ::rtl::OStringToOUString( target, pImpl->getTextEncoding() ), + OStringToOUString( aPostURL, pImpl->getTextEncoding() ), + OStringToOUString( target, pImpl->getTextEncoding() ), Bytes, file, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > ( pListener ) ); @@ -381,14 +378,14 @@ extern "C" { return NPERR_INVALID_INSTANCE_ERROR; ::com::sun::star::uno::Sequence<sal_Int8> Bytes( (sal_Int8*)buf, len ); - ::rtl::OString aPostURL = normalizeURL( pImpl, url ); + OString aPostURL = normalizeURL( pImpl, url ); try { pImpl->enterPluginCallback(); pImpl->getPluginContext()-> postURL( pImpl, - ::rtl::OStringToOUString( aPostURL, pImpl->getTextEncoding() ), - ::rtl::OStringToOUString( window, pImpl->getTextEncoding () ), + OStringToOUString( aPostURL, pImpl->getTextEncoding() ), + OStringToOUString( window, pImpl->getTextEncoding () ), Bytes, file ); pImpl->leavePluginCallback(); @@ -475,7 +472,7 @@ extern "C" { { pImpl->enterPluginCallback(); pImpl->getPluginContext()-> - displayStatusText( pImpl, ::rtl::OStringToOUString( message, pImpl->getTextEncoding() ) ); + displayStatusText( pImpl, OStringToOUString( message, pImpl->getTextEncoding() ) ); pImpl->leavePluginCallback(); } catch( const ::com::sun::star::plugin::PluginException& ) @@ -492,7 +489,7 @@ extern "C" { XPlugin_Impl* pImpl = XPluginManager_Impl::getXPluginFromNPP( instance ); if( pImpl ) { - rtl::OUString UserAgent; + OUString UserAgent; try { pImpl->enterPluginCallback(); @@ -501,7 +498,7 @@ extern "C" { pImpl->leavePluginCallback(); if( pAgent ) free( pAgent ); - pAgent = strdup( ::rtl::OUStringToOString( UserAgent, pImpl->getTextEncoding() ).getStr() ); + pAgent = strdup( OUStringToOString( UserAgent, pImpl->getTextEncoding() ).getStr() ); } catch( const ::com::sun::star::plugin::PluginException& ) { diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx index 11fc4e30b765..034c2db35350 100644 --- a/extensions/source/plugin/base/plcom.cxx +++ b/extensions/source/plugin/base/plcom.cxx @@ -48,7 +48,7 @@ #include <osl/file.hxx> #include <plugin/impl.hxx> -PluginComm::PluginComm( const ::rtl::OString& rLibName, bool bReusable ) : +PluginComm::PluginComm( const OString& rLibName, bool bReusable ) : m_nRefCount( 0 ), m_aLibName( rLibName ) { diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 296685c9a37f..6942c39c956a 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -53,10 +53,10 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException ) // XPluginManager_Impl -Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw() +Sequence< OUString > PluginModel::getSupportedServiceNames_Static(void) throw() { - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.plugin.PluginModel"); + Sequence< OUString > aSNS( 1 ); + aSNS.getArray()[0] = OUString("com.sun.star.plugin.PluginModel"); return aSNS; } @@ -69,14 +69,14 @@ static ::osl::Mutex aPropertyMutex; static ::com::sun::star::beans::Property aProps[] = { ::com::sun::star::beans::Property( - ::rtl::OUString::createFromAscii( aMime ), + OUString::createFromAscii( aMime ), 1, - ::getCppuType((const ::rtl::OUString*)0), + ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::BOUND ), ::com::sun::star::beans::Property( - ::rtl::OUString::createFromAscii( aCreationURL ), + OUString::createFromAscii( aCreationURL ), 2, - ::getCppuType((const ::rtl::OUString*)0), + ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::BOUND ) }; @@ -87,7 +87,7 @@ PluginModel::PluginModel() : { } -PluginModel::PluginModel(const ::rtl::OUString& rURL, const rtl::OUString& rMimeType ) : +PluginModel::PluginModel(const OUString& rURL, const OUString& rMimeType ) : BroadcasterHelperHolder( aPropertyMutex ), OPropertySetHelper( m_aHelper ), OPropertyArrayHelper( aProps, 2 ), @@ -186,9 +186,9 @@ void PluginModel::dispose(void) throw() // ::com::sun::star::io::XPersistObject -::rtl::OUString PluginModel::getServiceName() throw() +OUString PluginModel::getServiceName() throw() { - return ::rtl::OUString("com.sun.star.plugin.PluginModel"); + return OUString("com.sun.star.plugin.PluginModel"); } void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw() diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index cb0ba02dcf13..0521775c9539 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -63,7 +63,7 @@ extern "C" { { void* pRet = 0; - ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString aImplName( OUString::createFromAscii( pImplementationName ) ); if( pXUnoSMgr ) { diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 5e96bee3a39e..701974da9b7e 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -779,15 +779,15 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, #endif if( isfile && stype == NP_ASFILEONLY ) { - rtl::OString aFileName; + OString aFileName; if( url.startsWith("file:") ) { OUString aSysName; osl_getSystemPathFromFileURL( url.pData, &aSysName.pData ); - aFileName = rtl::OUStringToOString( aSysName, m_aEncoding ); + aFileName = OUStringToOString( aSysName, m_aEncoding ); } else - aFileName = rtl::OUStringToOString( url, m_aEncoding ); + aFileName = OUStringToOString( url, m_aEncoding ); m_pPluginComm-> NPP_StreamAsFile( &m_aInstance, pStream->getStream(), diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx index df8e96681b45..f93300f34e34 100644 --- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx @@ -60,13 +60,13 @@ class XPlugin_Impl; namespace plugstringhelper { -rtl::OUString getString( CFStringRef i_xString ); -rtl::OUString getString( CFURLRef i_xURL ); -CFMutableStringRef createString( const rtl::OUString& i_rString ); -CFURLRef createURL( const rtl::OUString& i_rString ); -rtl::OUString getURLFromPath( const rtl::OUString& i_rPath ); -CFURLRef createURLFromPath( const rtl::OUString& i_rPath ); -rtl::OUString CFURLtoOSLURL( CFURLRef i_xURL ); +OUString getString( CFStringRef i_xString ); +OUString getString( CFURLRef i_xURL ); +CFMutableStringRef createString( const OUString& i_rString ); +CFURLRef createURL( const OUString& i_rString ); +OUString getURLFromPath( const OUString& i_rPath ); +CFURLRef createURLFromPath( const OUString& i_rPath ); +OUString CFURLtoOSLURL( CFURLRef i_xURL ); } //================================================================================================== @@ -100,7 +100,7 @@ class MacPluginComm : virtual long doIt(); public: - MacPluginComm( const rtl::OUString& rMIME, const rtl::OUString& rName, NSView* pView ); + MacPluginComm( const OUString& rMIME, const OUString& rName, NSView* pView ); virtual ~MacPluginComm(); // FIXME: diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 6e10027b8053..54c414c1037a 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -134,7 +134,7 @@ private: const char** m_pArgv; const char** m_pArgn; int m_nArgs; - rtl::OString m_aLastGetUrl; + OString m_aLastGetUrl; Reference< com::sun::star::awt::XControlModel > m_xModel; @@ -148,7 +148,7 @@ private: ::std::list<PluginInputStream*> m_aInputStreams; ::std::list<PluginOutputStream*> m_aOutputStreams; ::std::list<PluginEventListener*> m_aPEventListeners; - ::rtl::OUString m_aURL; + OUString m_aURL; sal_Bool m_bIsDisposed; @@ -157,8 +157,8 @@ private: #endif void prependArg( const char* pName, const char* pValue ); // arguments will be strdup'ed - void initArgs( const Sequence< rtl::OUString >& argn, - const Sequence< rtl::OUString >& argv, + void initArgs( const Sequence< OUString >& argn, + const Sequence< OUString >& argv, sal_Int16 mode ); void freeArgs(); void handleSpecialArgs(); @@ -175,9 +175,9 @@ public: void destroyStreams(); - void setLastGetUrl( const rtl::OString& rUrl ) { m_aLastGetUrl = rUrl; } + void setLastGetUrl( const OString& rUrl ) { m_aLastGetUrl = rUrl; } - com::sun::star::plugin::PluginDescription fitDescription( const rtl::OUString& rURL ); + com::sun::star::plugin::PluginDescription fitDescription( const OUString& rURL ); ::std::list<PluginInputStream*>& getInputStreams() { return m_aInputStreams; } ::std::list<PluginOutputStream*>& getOutputStreams() { return m_aOutputStreams; } @@ -208,17 +208,17 @@ public: void initInstance( const com::sun::star::plugin::PluginDescription& rDescription, - const Sequence< rtl::OUString >& argn, - const Sequence< rtl::OUString >& argv, + const Sequence< OUString >& argn, + const Sequence< OUString >& argv, sal_Int16 mode ); void initInstance( - const rtl::OUString& rURL, - const Sequence< rtl::OUString >& argn, - const Sequence< rtl::OUString >& argv, + const OUString& rURL, + const Sequence< OUString >& argn, + const Sequence< OUString >& argv, sal_Int16 mode ); - const rtl::OUString& getRefererURL() { return m_aURL; } - ::rtl::OUString getCreationURL(); + const OUString& getRefererURL() { return m_aURL; } + OUString getCreationURL(); PluginStream* getStreamFromNPStream( NPStream* ); @@ -255,7 +255,7 @@ public: virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException ); // com::sun::star::plugin::XPlugin - virtual sal_Bool SAL_CALL provideNewStream(const rtl::OUString& mimetype, const Reference< com::sun::star::io::XActiveDataSource > & stream, const rtl::OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(); + virtual sal_Bool SAL_CALL provideNewStream(const OUString& mimetype, const Reference< com::sun::star::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(); // com::sun::star::beans::XPropertyChangeListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rSource ) throw(); @@ -277,7 +277,7 @@ public: static PluginManager& get(); static void setServiceFactory( const Reference< com::sun::star::lang::XMultiServiceFactory >& xFactory ); - static const Sequence< rtl::OUString >& getAdditionalSearchPaths(); + static const Sequence< OUString >& getAdditionalSearchPaths(); ::std::list<PluginComm*>& getPluginComms() { return m_aPluginComms; } ::std::list<XPlugin_Impl*>& getPlugins() { return m_aAllPlugins; } @@ -303,19 +303,19 @@ public: // checks whether plugins are disabled virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions(void) throw(); - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< rtl::OUString >& argn, const Sequence< rtl::OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException ); + virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException ); - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< rtl::OUString >& argn, const Sequence< rtl::OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit, const Reference< com::sun::star::awt::XWindowPeer > & parent, const rtl::OUString& url ) throw(); + virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit, const Reference< com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw(); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(); - virtual rtl::OUString SAL_CALL getImplementationName() throw(); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); + virtual OUString SAL_CALL getImplementationName() throw(); - Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); - static Sequence< rtl::OUString > getSupportedServiceNames_Static(void) throw( ); - static rtl::OUString getImplementationName_Static() throw( ) + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + static Sequence< OUString > getSupportedServiceNames_Static(void) throw( ); + static OUString getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString( "com.sun.star.extensions.PluginManager" ); + return OUString( "com.sun.star.extensions.PluginManager" ); } }; Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index c315b298118b..b45eae8dfed0 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -68,8 +68,8 @@ class PluginModel : public BroadcasterHelperHolder, public com::sun::star::awt::XControlModel { private: - rtl::OUString m_aCreationURL; - rtl::OUString m_aMimeType; + OUString m_aCreationURL; + OUString m_aMimeType; std::list< Reference< com::sun::star::lang::XEventListener > > m_aDisposeListeners; @@ -81,12 +81,12 @@ class PluginModel : public BroadcasterHelperHolder, { rtl_freeMemory( pMem ); } PluginModel(); - PluginModel( const rtl::OUString& rURL, const rtl::OUString& rMimeType ); + PluginModel( const OUString& rURL, const OUString& rMimeType ); virtual ~PluginModel(); - const rtl::OUString& getCreationURL() { return m_aCreationURL; } - void setMimeType( const rtl::OUString& rMime ) { m_aMimeType = rMime; } + const OUString& getCreationURL() { return m_aCreationURL; } + void setMimeType( const OUString& rMime ) { m_aMimeType = rMime; } // XInterface virtual Any SAL_CALL queryInterface( const Type& rType ) throw( com::sun::star::uno::RuntimeException ) @@ -101,11 +101,11 @@ class PluginModel : public BroadcasterHelperHolder, // com::sun::star::lang::XTypeProvider - static Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames_Static(void) throw( ); - static rtl::OUString SAL_CALL getImplementationName_Static() throw( ) + static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(void) throw( ); + static OUString SAL_CALL getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString( "com.sun.star.extensions.PluginModel" ); + return OUString( "com.sun.star.extensions.PluginModel" ); } // OPropertySetHelper @@ -121,7 +121,7 @@ class PluginModel : public BroadcasterHelperHolder, virtual Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(); // com::sun::star::io::XPersistObject - virtual rtl::OUString SAL_CALL getServiceName() throw(); + virtual OUString SAL_CALL getServiceName() throw(); virtual void SAL_CALL write(const Reference< com::sun::star::io::XObjectOutputStream > & OutStream) throw(); virtual void SAL_CALL read(const Reference< com::sun::star::io::XObjectInputStream > & InStream) throw(); diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx index 35bd9ad9d4bb..0b8a6cad7dec 100644 --- a/extensions/source/plugin/inc/plugin/plcom.hxx +++ b/extensions/source/plugin/inc/plugin/plcom.hxx @@ -37,18 +37,18 @@ class PluginComm { protected: int m_nRefCount; - ::rtl::OString m_aLibName; + OString m_aLibName; std::list< String > m_aFilesToDelete; public: - PluginComm( const ::rtl::OString& rLibName, bool bReusable = true ); + PluginComm( const OString& rLibName, bool bReusable = true ); virtual ~PluginComm(); int getRefCount() { return m_nRefCount; } void addRef() { m_nRefCount++; } void decRef() { m_nRefCount--; if( ! m_nRefCount ) delete this; } - const ::rtl::OString& getLibName() { return m_aLibName; } - void setLibName( const ::rtl::OString& rName ) { m_aLibName = rName; } + const OString& getLibName() { return m_aLibName; } + void setLibName( const OString& rName ) { m_aLibName = rName; } void addFileToDelete( const String& filename ) { m_aFilesToDelete.push_back( filename ); } diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index 234964f5181d..27a188dcc327 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx @@ -109,7 +109,7 @@ public: void invalidate() { m_bValid = false; } sal_uLong SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID = 0 ); - sal_uLong SendMessage( const rtl::OString& rMessage, sal_uLong nMessageID = 0 ) + sal_uLong SendMessage( const OString& rMessage, sal_uLong nMessageID = 0 ) { return SendMessage( rMessage.getLength(), rMessage.getStr(), nMessageID ); } diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx index 9f985645ccd2..f95e8470111c 100644 --- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx @@ -76,7 +76,7 @@ public: virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value); - static bool getPluginappPath(rtl::OString * path); + static bool getPluginappPath(OString * path); }; #endif diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx index b512d199d499..0bc91bcb6174 100644 --- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx @@ -78,7 +78,7 @@ class PluginComm_Impl : virtual long doIt(); public: - PluginComm_Impl( const rtl::OUString& rMIME, const rtl::OUString& rName, HWND hWnd ); + PluginComm_Impl( const OUString& rMIME, const OUString& rName, HWND hWnd ); virtual ~PluginComm_Impl(); public: diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index a5c800f412c2..3f449ac90296 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.cxx @@ -178,8 +178,8 @@ void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow ) static oslModule LoadModule( const char* pPath ) { - ::rtl::OUString sSystemPath( ::rtl::OUString::createFromAscii( pPath ) ); - ::rtl::OUString sFileURL; + OUString sSystemPath( OUString::createFromAscii( pPath ) ); + OUString sFileURL; osl_getFileURLFromSystemPath( sSystemPath.pData, &sFileURL.pData ); oslModule pLib = osl_loadModule( sFileURL.pData, SAL_LOADMODULE_LAZY ); diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index d711543d58f9..d7140f1d3fb4 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.cxx @@ -55,11 +55,11 @@ UnxPluginComm::UnxPluginComm( int nDescriptor1, int nDescriptor2 ) : - PluginComm( ::rtl::OUStringToOString( library, osl_getThreadTextEncoding() ), false ), + PluginComm( OUStringToOString( library, osl_getThreadTextEncoding() ), false ), PluginConnector( nDescriptor2 ), m_nCommPID( 0 ) { - rtl::OString path; + OString path; if (!getPluginappPath(&path)) { SAL_WARN("extensions.plugin", "cannot construct path to pluginapp.bin"); @@ -70,7 +70,7 @@ UnxPluginComm::UnxPluginComm( char pWindow[32]; sprintf( pWindow, "%d", (int)aParent ); sprintf( pDesc, "%d", nDescriptor1 ); - rtl::OString aLib(rtl::OUStringToOString(library, osl_getThreadTextEncoding())); + OString aLib(OUStringToOString(library, osl_getThreadTextEncoding())); char const* pArgs[5]; pArgs[0] = path.getStr(); @@ -134,9 +134,9 @@ UnxPluginComm::~UnxPluginComm() } } -bool UnxPluginComm::getPluginappPath(rtl::OString * path) { +bool UnxPluginComm::getPluginappPath(OString * path) { OSL_ASSERT(path != NULL); - rtl::OUString p("$BRAND_BASE_DIR/program/pluginapp.bin"); + OUString p("$BRAND_BASE_DIR/program/pluginapp.bin"); rtl::Bootstrap::expandMacros(p); return (osl::FileBase::getSystemPathFromFileURL(p, p) == diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index 85b56cda6a3e..26a4d10d989e 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -48,13 +48,9 @@ using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::plugin; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::rtl::OStringToOUString; // Unix specific implementation -static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& rDescriptions ) +static bool CheckPlugin( const OString& rPath, list< PluginDescription* >& rDescriptions ) { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "Trying plugin %s ... ", rPath.getStr() ); @@ -69,7 +65,7 @@ static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& return false; } - rtl::OString aBaseName = rPath.copy(nPos+1); + OString aBaseName = rPath.copy(nPos+1); if (aBaseName.equalsL(RTL_CONSTASCII_STRINGPARAM("libnullplugin.so"))) { #if OSL_DEBUG_LEVEL > 1 @@ -89,7 +85,7 @@ static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - rtl::OString path; + OString path; if (!UnxPluginComm::getPluginappPath(&path)) { #if OSL_DEBUG_LEVEL > 1 @@ -97,11 +93,11 @@ static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& #endif return false; } - rtl::OStringBuffer cmd; + OStringBuffer cmd; tools::appendUnixShellWord(&cmd, path); cmd.append(' '); tools::appendUnixShellWord(&cmd, rPath); - rtl::OString aCommand(cmd.makeStringAndClear()); + OString aCommand(cmd.makeStringAndClear()); FILE* pResult = popen( aCommand.getStr(), "r" ); int nDescriptions = 0; @@ -188,9 +184,9 @@ union maxDirent struct dirent asDirent; }; -static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDescription* >& rDescriptions ) +static void CheckPluginRegistryFiles( const OString& rPath, list< PluginDescription* >& rDescriptions ) { - rtl::OStringBuffer aPath( 1024 ); + OStringBuffer aPath( 1024 ); aPath.append( rPath ); aPath.append( "/pluginreg.dat" ); FILE* fp = fopen( aPath.getStr(), "r" ); @@ -207,7 +203,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes for( nDotPos = nLineLen-1; nDotPos > 0 && aLine[nDotPos] != ':'; nDotPos-- ) ; if( aLine[0] == '/' && aLine[nDotPos] == ':' && aLine[nDotPos+1] == '$' ) - CheckPlugin( rtl::OString(aLine, nDotPos), rDescriptions ); + CheckPlugin( OString(aLine, nDotPos), rDescriptions ); } fclose( fp ); } @@ -222,7 +218,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes char* pBaseName = u.asDirent.d_name; if( rtl_str_compare( ".", pBaseName ) && rtl_str_compare( "..", pBaseName ) ) { - rtl::OStringBuffer aBuf( 1024 ); + OStringBuffer aBuf( 1024 ); aBuf.append( rPath ); aBuf.append( '/' ); aBuf.append( pBaseName ); @@ -255,26 +251,26 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th static const char* pNPXPluginPath = getenv( "NPX_PLUGIN_PATH" ); // netscape!, quick, beam me back to the 90's when Motif roamed the earth - rtl::OStringBuffer aSearchBuffer(RTL_CONSTASCII_STRINGPARAM("/usr/lib/netscape/plugins")); + OStringBuffer aSearchBuffer(RTL_CONSTASCII_STRINGPARAM("/usr/lib/netscape/plugins")); if( pHome ) aSearchBuffer.append(':').append(pHome).append("/.netscape/plugins"); if( pNPXPluginPath ) aSearchBuffer.append(':').append(pNPXPluginPath); - const Sequence< ::rtl::OUString >& rPaths( PluginManager::getAdditionalSearchPaths() ); + const Sequence< OUString >& rPaths( PluginManager::getAdditionalSearchPaths() ); for( i = 0; i < rPaths.getLength(); i++ ) { - aSearchBuffer.append(':').append(rtl::OUStringToOString( + aSearchBuffer.append(':').append(OUStringToOString( rPaths.getConstArray()[i], aEncoding)); } - rtl::OString aSearchPath = aSearchBuffer.makeStringAndClear(); + OString aSearchPath = aSearchBuffer.makeStringAndClear(); sal_Int32 nIndex = 0; maxDirent u; do { - rtl::OString aPath(aSearchPath.getToken(0, ':', nIndex)); + OString aPath(aSearchPath.getToken(0, ':', nIndex)); if (!aPath.isEmpty()) { DIR* pDIR = opendir(aPath.getStr()); @@ -286,7 +282,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th pBaseName[1] != '.' || pBaseName[2] != 0 ) { - rtl::OStringBuffer aFileName(aPath); + OStringBuffer aFileName(aPath); aFileName.append('/').append(pBaseName); CheckPlugin( aFileName.makeStringAndClear(), aPlugins ); } @@ -298,7 +294,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th while ( nIndex >= 0 ); // try ~/.mozilla/pluginreg.dat - rtl::OStringBuffer aBuf(256); + OStringBuffer aBuf(256); aBuf.append( pHome ); aBuf.append( "/.mozilla" ); CheckPluginRegistryFiles( aBuf.makeStringAndClear(), aPlugins ); diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index 1e60f6c32274..41c1539a986d 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -51,9 +51,6 @@ extern NPNetscapeFuncs aNPNFuncs; #include <tools/debug.hxx> -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; #if OSL_DEBUG_LEVEL > 1 void TRACE( char const * s ); diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index 706f71d33f18..237ce4309880 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.cxx @@ -60,10 +60,6 @@ using namespace osl; using namespace com::sun::star::uno; using namespace com::sun::star::plugin; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; typedef map< OString, OUString, less< OString > > PluginLocationMap; diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index e8c3a34d0098..db14cb4b76dd 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -56,15 +56,15 @@ namespace pcr } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //--------------------------------------------------------------------- - ::rtl::OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) + OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); + return OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); } //--------------------------------------------------------------------- @@ -77,7 +77,7 @@ namespace pcr ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.form.MasterDetailLinkDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.form.MasterDetailLinkDialog"); return aSupported; } diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index e9882e7000b6..0121c364cb29 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -40,8 +40,8 @@ namespace pcr MasterDetailLinkDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext); // 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::uno::XComponentContext >&); private: @@ -49,7 +49,7 @@ namespace pcr 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); // XPropertySet @@ -65,9 +65,9 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDetail; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xMaster; - ::rtl::OUString m_sExplanation; - ::rtl::OUString m_sDetailLabel; - ::rtl::OUString m_sMasterLabel; + OUString m_sExplanation; + OUString m_sDetailLabel; + OUString m_sMasterLabel; }; //........................................................................ diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index a6d3da201d7c..a8ec00ca0b77 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -57,7 +57,7 @@ namespace pcr DBG_NAME(OBrowserLine) //------------------------------------------------------------------ - OBrowserLine::OBrowserLine( const ::rtl::OUString& _rEntryName, Window* pParent ) + OBrowserLine::OBrowserLine( const OUString& _rEntryName, Window* pParent ) :m_sEntryName( _rEntryName ) ,m_aFtTitle(pParent) ,m_pControlWindow( NULL ) @@ -94,7 +94,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ) + void OBrowserLine::SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId ) { if ( m_pControlWindow ) m_pControlWindow->SetHelpId( _rHelpId ); @@ -294,7 +294,7 @@ namespace pcr //------------------------------------------------------------------ XubString OBrowserLine::GetTitle() const { - rtl::OUString sDisplayName = m_aFtTitle.GetText(); + OUString sDisplayName = m_aFtTitle.GetText(); // for Issue 69452 if (Application::GetSettings().GetLayoutRTL()) @@ -390,7 +390,7 @@ namespace pcr rpButton = new PushButton( m_pTheParent, WB_NOPOINTERFOCUS ); rpButton->SetGetFocusHdl( LINK( this, OBrowserLine, OnButtonFocus ) ); rpButton->SetClickHdl( LINK( this, OBrowserLine, OnButtonClicked ) ); - rpButton->SetText(rtl::OUString("...")); + rpButton->SetText(OUString("...")); } rpButton->Show(); @@ -401,7 +401,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ) + void OBrowserLine::impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ) { try { @@ -409,7 +409,7 @@ namespace pcr Reference< XGraphicProvider > xGraphicProvider( GraphicProvider::create(xContext) ); Sequence< PropertyValue > aMediaProperties(1); - aMediaProperties[0].Name = ::rtl::OUString( "URL" ); + aMediaProperties[0].Name = OUString( "URL" ); aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); @@ -422,7 +422,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::ShowBrowseButton( const ::rtl::OUString& _rImageURL, sal_Bool _bPrimary ) + void OBrowserLine::ShowBrowseButton( const OUString& _rImageURL, sal_Bool _bPrimary ) { PushButton& rButton( impl_ensureButton( _bPrimary ) ); diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index ddfdcd3c9d2c..c137198e753b 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -50,7 +50,7 @@ namespace pcr class OBrowserLine { private: - ::rtl::OUString m_sEntryName; + OUString m_sEntryName; FixedText m_aFtTitle; Size m_aOutputSize; Point m_aLinePos; @@ -67,7 +67,7 @@ namespace pcr bool m_bReadOnly; public: - OBrowserLine( const ::rtl::OUString& _rEntryName, Window* pParent); + OBrowserLine( const OUString& _rEntryName, Window* pParent); ~OBrowserLine(); void setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); @@ -80,10 +80,10 @@ namespace pcr return m_pControlWindow; } - const ::rtl::OUString& + const OUString& GetEntryName() const { return m_sEntryName; } - void SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ); + void SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId ); void SetTitle(const String& rString ); void FullFillTitleString(); @@ -99,7 +99,7 @@ namespace pcr void SetTabOrder(Window* pRefWindow, sal_uInt16 nFlags ); sal_Bool GrabFocus(); - void ShowBrowseButton( const ::rtl::OUString& _rImageURL, sal_Bool _bPrimary ); + void ShowBrowseButton( const OUString& _rImageURL, sal_Bool _bPrimary ); void ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary ); void ShowBrowseButton( sal_Bool _bPrimary ); void HideBrowseButton( sal_Bool _bPrimary ); @@ -123,7 +123,7 @@ namespace pcr void impl_layoutComponents(); PushButton& impl_ensureButton( bool _bPrimary ); - void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ); + void impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ); }; //............................................................................ diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 342a9a454525..fa6bfcc36aca 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -229,7 +229,7 @@ namespace pcr void PropertyControlContext_Impl::impl_checkAlive_throw() const { if ( impl_isDisposed_nothrow() ) - throw DisposedException( ::rtl::OUString(), *const_cast< PropertyControlContext_Impl* >( this ) ); + throw DisposedException( OUString(), *const_cast< PropertyControlContext_Impl* >( this ) ); } //-------------------------------------------------------------------- @@ -533,7 +533,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserListBox::SetHelpText( const ::rtl::OUString& _rHelpText ) + void OBrowserListBox::SetHelpText( const OUString& _rHelpText ) { OSL_ENSURE( HasHelpSection(), "OBrowserListBox::SetHelpText: help section not visible!" ); m_pHelpWindow->SetText( _rHelpText ); @@ -654,7 +654,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserListBox::SetPropertyValue(const ::rtl::OUString& _rEntryName, const Any& _rValue, bool _bUnknownValue ) + void OBrowserListBox::SetPropertyValue(const OUString& _rEntryName, const Any& _rValue, bool _bUnknownValue ) { ListBoxLines::iterator line = m_aLines.begin(); for ( ; line != m_aLines.end() && ( line->aName != _rEntryName ); ++line ) @@ -675,7 +675,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_uInt16 OBrowserListBox::GetPropertyPos( const ::rtl::OUString& _rEntryName ) const + sal_uInt16 OBrowserListBox::GetPropertyPos( const OUString& _rEntryName ) const { sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND; for ( ListBoxLines::const_iterator linePos = m_aLines.begin(); @@ -694,7 +694,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool OBrowserListBox::impl_getBrowserLineForName( const ::rtl::OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const + bool OBrowserListBox::impl_getBrowserLineForName( const OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const { ListBoxLines::const_iterator line = m_aLines.begin(); for ( ; line != m_aLines.end() && ( line->aName != _rEntryName ); ++line ) @@ -708,7 +708,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OBrowserListBox::EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) + void OBrowserListBox::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) { BrowserLinePointer pLine; if ( impl_getBrowserLineForName( _rEntryName, pLine ) ) @@ -716,7 +716,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OBrowserListBox::EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ) + void OBrowserListBox::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ) { BrowserLinePointer pLine; if ( impl_getBrowserLineForName( _rEntryName, pLine ) ) @@ -724,7 +724,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XPropertyControl > OBrowserListBox::GetPropertyControl( const ::rtl::OUString& _rEntryName ) + Reference< XPropertyControl > OBrowserListBox::GetPropertyControl( const OUString& _rEntryName ) { BrowserLinePointer pLine; if ( impl_getBrowserLineForName( _rEntryName, pLine ) ) @@ -913,10 +913,10 @@ namespace pcr #ifdef DBG_UTIL if ( !_rLine.xHandler.is() ) { - ::rtl::OString sMessage( "OBrowserListBox::impl_setControlAsPropertyValue: no handler -> no conversion (property: '" ); - ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); - sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "')!" ); + OString sMessage( "OBrowserListBox::impl_setControlAsPropertyValue: no handler -> no conversion (property: '" ); + OUString sPropertyName( _rLine.pLine->GetEntryName() ); + sMessage += OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "')!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -944,10 +944,10 @@ namespace pcr #ifdef DBG_UTIL if ( !_rLine.xHandler.is() ) { - ::rtl::OString sMessage( "OBrowserListBox::impl_getControlAsPropertyValue: no handler -> no conversion (property: '" ); - ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); - sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "')!" ); + OString sMessage( "OBrowserListBox::impl_getControlAsPropertyValue: no handler -> no conversion (property: '" ); + OUString sPropertyName( _rLine.pLine->GetEntryName() ); + sMessage += OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "')!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -1070,7 +1070,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_Bool OBrowserListBox::RemoveEntry( const ::rtl::OUString& _rName ) + sal_Bool OBrowserListBox::RemoveEntry( const OUString& _rName ) { sal_uInt16 nPos = 0; ListBoxLines::iterator it = m_aLines.begin(); @@ -1181,8 +1181,8 @@ namespace pcr m_aOutOfDateLines.insert( nPos ); rLine.pLine->SetComponentHelpIds( HelpIdUrl::getHelpId( _rPropertyData.HelpURL ), - rtl::OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ), - rtl::OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 ) + OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ), + OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 ) ); if ( _rPropertyData.bReadOnly ) diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 4766cc4f6b6c..347604136007 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -54,12 +54,12 @@ namespace pcr typedef ::boost::shared_ptr< OBrowserLine > BrowserLinePointer; struct ListBoxLine { - ::rtl::OUString aName; + OUString aName; BrowserLinePointer pLine; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > xHandler; - ListBoxLine( const ::rtl::OUString& rName, BrowserLinePointer _pLine, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ) + ListBoxLine( const OUString& rName, BrowserLinePointer _pLine, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ) : aName( rName ), pLine( _pLine ), xHandler( _rxHandler ) @@ -141,21 +141,21 @@ namespace pcr void EnableHelpSection( bool _bEnable ); bool HasHelpSection() const; - void SetHelpText( const ::rtl::OUString& _rHelpText ); + void SetHelpText( const OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); void Clear(); sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 nPos = EDITOR_LIST_APPEND ); - sal_Bool RemoveEntry( const ::rtl::OUString& _rName ); + sal_Bool RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor&, sal_uInt16 nPos ); - void SetPropertyValue( const ::rtl::OUString& rEntryName, const ::com::sun::star::uno::Any& rValue, bool _bUnknownValue ); - sal_uInt16 GetPropertyPos( const ::rtl::OUString& rEntryName ) const; + void SetPropertyValue( const OUString& rEntryName, const ::com::sun::star::uno::Any& rValue, bool _bUnknownValue ); + sal_uInt16 GetPropertyPos( const OUString& rEntryName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > - GetPropertyControl( const ::rtl::OUString& rEntryName ); - void EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); - void EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ); + GetPropertyControl( const OUString& rEntryName ); + void EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); + void EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ); sal_Int32 GetMinimumWidth(); sal_Int32 GetMinimumHeight(); @@ -208,7 +208,7 @@ namespace pcr <TRUE/> if and only if a non-<NULL/> line for the given entry name could be found. */ - bool impl_getBrowserLineForName( const ::rtl::OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const; + bool impl_getBrowserLineForName( const OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const; /** returns the preferred height (in pixels) of the help section, or 0 if we currently don't have a help section diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index bef8d73f25bb..d4b25c2f84ec 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -53,7 +53,7 @@ namespace pcr DBG_CTOR( ButtonNavigationHandler, NULL ); m_aContext.createComponent( - ::rtl::OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ), + OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ), m_xSlaveHandler ); if ( !m_xSlaveHandler.is() ) throw RuntimeException(); @@ -66,16 +66,16 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); + return OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.ButtonNavigationHandler" ); return aSupported; } @@ -87,7 +87,7 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL ButtonNavigationHandler::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL ButtonNavigationHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -116,7 +116,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -147,7 +147,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL ButtonNavigationHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL ButtonNavigationHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -201,16 +201,16 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aActuating( 2 ); + Sequence< OUString > aActuating( 2 ); aActuating[0] = PROPERTY_BUTTONTYPE; aActuating[1] = PROPERTY_TARGET_URL; return aActuating; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -231,7 +231,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rActuatingPropertyName ) ); @@ -257,7 +257,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index 5cd55f7bfd59..b2b704db5ab5 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx @@ -44,8 +44,8 @@ namespace pcr ButtonNavigationHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~ButtonNavigationHandler(); @@ -55,16 +55,16 @@ namespace pcr protected: // XPropertyHandler overriables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 4162df9970b1..3106efcd4e18 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -61,16 +61,16 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.CellBindingPropertyHandler" ); return aSupported; } @@ -92,9 +92,9 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aInterestingProperties( 3 ); + Sequence< OUString > aInterestingProperties( 3 ); aInterestingProperties[0] = PROPERTY_LIST_CELL_RANGE; aInterestingProperties[1] = PROPERTY_BOUND_CELL; aInterestingProperties[2] = PROPERTY_CONTROLSOURCE; @@ -102,7 +102,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) + void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nActuatingPropId( impl_getPropertyId_throw( _rActuatingPropertyName ) ); @@ -168,7 +168,7 @@ namespace pcr try { if ( !xSource.is() ) - setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< ::rtl::OUString >() ) ); + setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< OUString >() ) ); } catch( const Exception& ) { @@ -181,7 +181,7 @@ namespace pcr // ----- DataField ----- case PROPERTY_ID_CONTROLSOURCE: { - ::rtl::OUString sControlSource; + OUString sControlSource; _rNewValue >>= sControlSource; if ( impl_isSupportedProperty_nothrow( PROPERTY_ID_BOUND_CELL ) ) _rxInspectorUI->enablePropertyUI( PROPERTY_BOUND_CELL, sControlSource.isEmpty() ); @@ -230,7 +230,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -276,7 +276,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -348,7 +348,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aPropertyValue; @@ -359,7 +359,7 @@ namespace pcr PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); switch( nPropId ) { @@ -396,7 +396,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, + Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& /*_rControlValueType*/ ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -468,7 +468,7 @@ namespace pcr if ( bAllowCellLinking ) { aProperties[ --nPos ] = Property( PROPERTY_BOUND_CELL, PROPERTY_ID_BOUND_CELL, - ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), 0 ); + ::getCppuType( static_cast< OUString* >( NULL ) ), 0 ); } if ( bAllowCellIntLinking ) { @@ -478,7 +478,7 @@ namespace pcr if ( bAllowListCellRange ) { aProperties[ --nPos ] = Property( PROPERTY_LIST_CELL_RANGE, PROPERTY_ID_LIST_CELL_RANGE, - ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), 0 ); + ::getCppuType( static_cast< OUString* >( NULL ) ), 0 ); } } diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index bb771ddf90d1..1dedcf78a1ac 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -50,21 +50,21 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~CellBindingPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index ebaa842a2b11..718223996ac7 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -60,15 +60,15 @@ namespace pcr namespace { //.................................................................... - struct StringCompare : public ::std::unary_function< ::rtl::OUString, bool > + struct StringCompare : public ::std::unary_function< OUString, bool > { private: - ::rtl::OUString m_sReference; + OUString m_sReference; public: - StringCompare( const ::rtl::OUString& _rReference ) : m_sReference( _rReference ) { } + StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { } - inline bool operator()( const ::rtl::OUString& _rCompare ) + inline bool operator()( const OUString& _rCompare ) { return ( _rCompare == m_sReference ) ? true : false; } @@ -147,7 +147,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress ) const + bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress ) const { Any aAddress; return doConvertAddressRepresentations( @@ -161,15 +161,15 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::doConvertAddressRepresentations( const ::rtl::OUString& _rInputProperty, const Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) + bool CellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue, + const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) { bool bSuccess = false; Reference< XPropertySet > xConverter( createDocumentDependentInstance( _bIsRange ? OUString(SERVICE_RANGEADDRESS_CONVERSION) : OUString(SERVICE_ADDRESS_CONVERSION), - ::rtl::OUString(), + OUString(), Any() ), UNO_QUERY @@ -195,7 +195,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, + bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellRangeAddress& /* [out] */ _rAddress ) const { Any aAddress; @@ -222,7 +222,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XValueBinding > CellBindingHelper::createCellBindingFromStringAddress( const ::rtl::OUString& _rAddress, bool _bSupportIntegerExchange ) const + Reference< XValueBinding > CellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bSupportIntegerExchange ) const { Reference< XValueBinding > xBinding; if ( !m_xDocument.is() ) @@ -238,7 +238,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XListEntrySource > CellBindingHelper::createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const + Reference< XListEntrySource > CellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const { Reference< XListEntrySource > xSource; @@ -257,7 +257,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XInterface > CellBindingHelper::createDocumentDependentInstance( const ::rtl::OUString& _rService, const ::rtl::OUString& _rArgumentName, + Reference< XInterface > CellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, const Any& _rArgumentValue ) const { Reference< XInterface > xReturn; @@ -322,10 +322,10 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString CellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const + OUString CellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const { CellAddress aAddress; - ::rtl::OUString sAddress; + OUString sAddress; if ( getAddressFromCellBinding( _rxBinding, aAddress ) ) { Any aStringAddress; @@ -339,11 +339,11 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString CellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const + OUString CellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const { OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "CellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" ); - ::rtl::OUString sAddress; + OUString sAddress; if ( !m_xDocument.is() ) // very bad ... return sAddress; @@ -372,7 +372,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const + bool CellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const { bool bYesItIs = false; @@ -382,11 +382,11 @@ namespace pcr Reference< XMultiServiceFactory > xDocumentFactory( m_xDocument, UNO_QUERY ); OSL_ENSURE( xDocumentFactory.is(), "CellBindingHelper::isSpreadsheetDocumentWhichSupplies: spreadsheet document, but no factory?" ); - Sequence< ::rtl::OUString > aAvailableServices; + Sequence< OUString > aAvailableServices; if ( xDocumentFactory.is() ) aAvailableServices = xDocumentFactory->getAvailableServiceNames( ); - const ::rtl::OUString* pFound = ::std::find_if( + const OUString* pFound = ::std::find_if( aAvailableServices.getConstArray(), aAvailableServices.getConstArray() + aAvailableServices.getLength(), StringCompare( _rService ) @@ -504,7 +504,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const ::rtl::OUString& _rService ) const + bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const { bool bDoes = false; Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY ); diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx index 12b9c65b42ee..b791bb0b8b1e 100644 --- a/extensions/source/propctrlr/cellbindinghelper.hxx +++ b/extensions/source/propctrlr/cellbindinghelper.hxx @@ -74,7 +74,7 @@ namespace pcr */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > createCellBindingFromStringAddress( - const ::rtl::OUString& _rAddress, + const OUString& _rAddress, bool _bSupportIntegerExchange = false ) const; @@ -90,7 +90,7 @@ namespace pcr /** gets a cell range list source binding for the given address */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > - createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const; + createCellListSourceFromStringAddress( const OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -101,7 +101,7 @@ namespace pcr The binding is a valid cell binding, or <NULL/> @see isCellBinding */ - ::rtl::OUString getStringAddressFromCellBinding( + OUString getStringAddressFromCellBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) const; @@ -128,7 +128,7 @@ namespace pcr The object is a valid cell range list source, or <NULL/> @see isCellRangeListSource */ - ::rtl::OUString getStringAddressFromCellListSource( + OUString getStringAddressFromCellListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) const; @@ -204,27 +204,27 @@ namespace pcr /** creates an address object from a string representation of a cell address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellAddress& /* [out] */ _rAddress ) const; /** creates an address range object from a string representation of a cell range address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellRangeAddress& /* [out] */ _rAddress ) const; /** determines if our document is a spreadsheet document, *and* can supply the given service */ - bool isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const; + bool isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const; /** checkes whether a given component supports a given servive */ bool doesComponentSupport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, - const ::rtl::OUString& _rService + const OUString& _rService ) const; /** uses the document (it's factory interface, respectively) to create a component instance @@ -239,8 +239,8 @@ namespace pcr */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createDocumentDependentInstance( - const ::rtl::OUString& _rService, - const ::rtl::OUString& _rArgumentName, + const OUString& _rService, + const OUString& _rArgumentName, const ::com::sun::star::uno::Any& _rArgumentValue ) const; @@ -265,9 +265,9 @@ namespace pcr @see com::sun::star::table::CellRangeAddressConversion */ bool doConvertAddressRepresentations( - const ::rtl::OUString& _rInputProperty, + const OUString& _rInputProperty, const ::com::sun::star::uno::Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, + const OUString& _rOutputProperty, ::com::sun::star::uno::Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()); diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index f7708a20c6ea..f8aaa357c0cf 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -319,7 +319,7 @@ namespace pcr inline void CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::impl_checkDisposed_throw() { if ( ComponentBaseClass::rBHelper.bDisposed ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), *this ); + throw ::com::sun::star::lang::DisposedException( OUString(), *this ); } //............................................................................ diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 855cc0d985bc..87a174b958c6 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -62,7 +62,7 @@ namespace pcr }; //================================================================ - typedef ::std::set< ::rtl::OUString > StringBag; + typedef ::std::set< OUString > StringBag; typedef ::std::map< sal_Int16, StringBag > MapIntToStringBag; } @@ -138,16 +138,16 @@ namespace pcr void dispose(); // XObjectInspectorUI overridables - virtual void SAL_CALL enablePropertyUI( const ::rtl::OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (RuntimeException); - virtual void SAL_CALL enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (RuntimeException); - virtual void SAL_CALL rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); - virtual void SAL_CALL showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); - virtual void SAL_CALL hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); - virtual void SAL_CALL showCategory( const ::rtl::OUString& _rCategory, ::sal_Bool _bShow ) throw (RuntimeException); - virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (RuntimeException); + virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (RuntimeException); + virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException); + virtual void SAL_CALL showCategory( const OUString& _rCategory, ::sal_Bool _bShow ) throw (RuntimeException); + virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException); virtual void SAL_CALL registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException); virtual void SAL_CALL revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException); - virtual void SAL_CALL setHelpSectionText( const ::rtl::OUString& _HelpText ) throw (NoSupportException, RuntimeException); + virtual void SAL_CALL setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException); // UNOCompatibleNonUNOReference overridables virtual void SAL_CALL acquire() throw(); @@ -163,7 +163,7 @@ namespace pcr void checkDisposed() const; private: - void impl_markElementEnabledOrDisabled( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ); + void impl_markElementEnabledOrDisabled( const OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ); /** calls <member>m_pUIChangeNotification</member> at <member>m_rMaster</member> */ @@ -242,7 +242,7 @@ namespace pcr //---------------------------------------------------------------- namespace { - void lcl_markStringKeyPositiveOrNegative( const ::rtl::OUString& _rKeyName, StringBag& _rPositives, StringBag& _rNegatives, sal_Bool _bMarkPositive ) + void lcl_markStringKeyPositiveOrNegative( const OUString& _rKeyName, StringBag& _rPositives, StringBag& _rNegatives, sal_Bool _bMarkPositive ) { if ( _bMarkPositive ) { @@ -256,7 +256,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::enablePropertyUI( const ::rtl::OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) + void CachedInspectorUI::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -267,7 +267,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::impl_markElementEnabledOrDisabled( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ) + void CachedInspectorUI::impl_markElementEnabledOrDisabled( const OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ) { if ( _nElementIdOrZero == 0 ) return; @@ -287,7 +287,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) + void CachedInspectorUI::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -301,7 +301,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void CachedInspectorUI::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -313,7 +313,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void CachedInspectorUI::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -327,7 +327,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void CachedInspectorUI::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -338,7 +338,7 @@ namespace pcr } //---------------------------------------------------------------- - void CachedInspectorUI::showCategory( const ::rtl::OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) + void CachedInspectorUI::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -347,7 +347,7 @@ namespace pcr } //---------------------------------------------------------------- - Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -375,7 +375,7 @@ namespace pcr } //---------------------------------------------------------------- - void SAL_CALL CachedInspectorUI::setHelpSectionText( const ::rtl::OUString& _HelpText ) throw (NoSupportException, RuntimeException) + void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException) { m_rMaster.getDelegatorUI()->setHelpSectionText( _HelpText ); } @@ -481,7 +481,7 @@ namespace pcr //============================================================ /** a typedef for a ->XObjectInspectorUI member function taking a string */ - typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUISetter )( const ::rtl::OUString& ); + typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUISetter )( const OUString& ); //============================================================ //= PropertyUIOperator @@ -489,7 +489,7 @@ namespace pcr /** an STL-compatible struct which calls a certain member method (taking a string) at a given ->XObjectInspectorUI instance */ - struct PropertyUIOperator : public ::std::unary_function< ::rtl::OUString, void > + struct PropertyUIOperator : public ::std::unary_function< OUString, void > { private: Reference< XObjectInspectorUI > m_xUpdater; @@ -502,7 +502,7 @@ namespace pcr { } - void operator()( const ::rtl::OUString& _rPropertyName ) + void operator()( const OUString& _rPropertyName ) { ((m_xUpdater.get())->*m_pSetter)( _rPropertyName ); } @@ -522,7 +522,7 @@ namespace pcr class IStringKeyBooleanUIUpdate { public: - virtual void updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const = 0; + virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const = 0; virtual ~IStringKeyBooleanUIUpdate() { } }; @@ -548,11 +548,11 @@ namespace pcr { } // IStringKeyBooleanUIUpdate - virtual void updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const; + virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const; }; //............................................................ - void EnablePropertyUIElement::updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const + void EnablePropertyUIElement::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const { m_xUIUpdate->enablePropertyUIElements( _rKey, m_nElement, _bFlag ); } @@ -562,7 +562,7 @@ namespace pcr //============================================================ /** a ->XObjectInspectorUI method taking a string and a boolean */ - typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUIFlagSetter )( const ::rtl::OUString&, sal_Bool ); + typedef void ( SAL_CALL XObjectInspectorUI::*FPropertyUIFlagSetter )( const OUString&, sal_Bool ); //============================================================ //= DefaultStringKeyBooleanUIUpdate @@ -579,7 +579,7 @@ namespace pcr public: DefaultStringKeyBooleanUIUpdate( const Reference< XObjectInspectorUI >& _rxUIUpdate, FPropertyUIFlagSetter _pSetter ); // IStringKeyBooleanUIUpdate - virtual void updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const; + virtual void updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const; }; //............................................................ @@ -590,7 +590,7 @@ namespace pcr } //............................................................ - void DefaultStringKeyBooleanUIUpdate::updateUIForKey( const ::rtl::OUString& _rKey, sal_Bool _bFlag ) const + void DefaultStringKeyBooleanUIUpdate::updateUIForKey( const OUString& _rKey, sal_Bool _bFlag ) const { ((m_xUIUpdate.get())->*m_pSetter)( _rKey, _bFlag ); } @@ -601,7 +601,7 @@ namespace pcr /** an STL-compatible structure which applies a ->IStringKeyBooleanUIUpdate::updateUIForKey operation with a fixed boolean value, for a given string value */ - struct BooleanUIAspectUpdate : public ::std::unary_function< ::rtl::OUString, void > + struct BooleanUIAspectUpdate : public ::std::unary_function< OUString, void > { private: const IStringKeyBooleanUIUpdate& m_rUpdater; @@ -614,7 +614,7 @@ namespace pcr { } - void operator()( const ::rtl::OUString& _rPropertyName ) + void operator()( const OUString& _rPropertyName ) { m_rUpdater.updateUIForKey( _rPropertyName, m_bFlag ); } @@ -630,7 +630,7 @@ namespace pcr //============================================================ /** an STL-compatible structure subtracting a given string from a fixed ->StringBag */ - struct StringBagComplement : public ::std::unary_function< ::rtl::OUString, void > + struct StringBagComplement : public ::std::unary_function< OUString, void > { private: StringBag& m_rMinuend; @@ -638,7 +638,7 @@ namespace pcr public: StringBagComplement( StringBag& _rMinuend ) :m_rMinuend( _rMinuend ) { } - void operator()( const ::rtl::OUString& _rPropertyToSubtract ) + void operator()( const OUString& _rPropertyToSubtract ) { m_rMinuend.erase( _rPropertyToSubtract ); } @@ -830,7 +830,7 @@ namespace pcr } //---------------------------------------------------------------- - bool ComposedPropertyUIUpdate::shouldContinuePropertyHandling( const ::rtl::OUString& _rName ) const + bool ComposedPropertyUIUpdate::shouldContinuePropertyHandling( const OUString& _rName ) const { if ( !m_pPropertyCheck ) return true; diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index 4ae7769a10c5..04899f15598b 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -44,7 +44,7 @@ namespace pcr class SAL_NO_VTABLE IPropertyExistenceCheck { public: - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) = 0; protected: ~IPropertyExistenceCheck() {} @@ -143,7 +143,7 @@ namespace pcr /** invokes m_pPropertyCheck to check whether a given property should be handled */ - bool shouldContinuePropertyHandling( const ::rtl::OUString& _rName ) const; + bool shouldContinuePropertyHandling( const OUString& _rName ) const; private: /// determines whether the instance is already disposed diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index d7b17559a744..861583f686be 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -78,15 +78,15 @@ namespace pcr } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //--------------------------------------------------------------------- - ::rtl::OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) + OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.form.ui.OControlFontDialog"); + return OUString("org.openoffice.comp.form.ui.OControlFontDialog"); } //--------------------------------------------------------------------- @@ -99,7 +99,7 @@ namespace pcr ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.form.ControlFontDialog"); + aSupported.getArray()[0] = OUString("com.sun.star.form.ControlFontDialog"); return aSupported; } diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index b0108c8c513d..c0db06a47b63 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -61,12 +61,12 @@ namespace pcr 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::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 0f2c2a1eab90..7fb4906752b4 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -73,28 +73,28 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ - ::rtl::OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) + OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); + return OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"); return aSupported; } @@ -152,7 +152,7 @@ namespace pcr { if ( aFactories[i].isFormOnly && !m_bUseFormComponentHandlers ) continue; - *pReturn++ <<= ::rtl::OUString::createFromAscii( aFactories[i].serviceName ); + *pReturn++ <<= OUString::createFromAscii( aFactories[i].serviceName ); } aReturn.realloc( pReturn - aReturn.getArray() ); @@ -180,7 +180,7 @@ namespace pcr PropertyCategoryDescriptor* pReturn = aReturn.getArray(); for ( sal_Int32 i=0; i<nCategories; ++i, ++pReturn ) { - pReturn->ProgrammaticName = ::rtl::OUString::createFromAscii( aCategories[i].programmaticName ); + pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName ); pReturn->UIName = String( PcrRes( aCategories[i].uiNameResId ) ); pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId ); } @@ -189,7 +189,7 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException) { sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) ); if ( nPropertyId == -1 ) @@ -221,12 +221,12 @@ namespace pcr if ( arguments.size() == 2 ) { // constructor: "createWithHelpSection( long, long )" if ( !( arguments[0] >>= nMinHelpTextLines ) || !( arguments[1] >>= nMaxHelpTextLines ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); createWithHelpSection( nMinHelpTextLines, nMaxHelpTextLines ); return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //-------------------------------------------------------------------- @@ -239,7 +239,7 @@ namespace pcr void DefaultFormComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); enableHelpSectionProperties( _nMinHelpTextLines, _nMaxHelpTextLines ); m_bConstructed = true; diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index a4075dc2aea6..543de989a440 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -47,21 +47,21 @@ namespace pcr ~DefaultFormComponentInspectorModel(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XObjectInspectorModel virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getHandlerFactories() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) 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::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 6eadb114baa5..695159f15667 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -73,16 +73,16 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) + OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.DefaultHelpProvider"); + return OUString("org.openoffice.comp.extensions.DefaultHelpProvider"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.inspection.DefaultHelpProvider"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.inspection.DefaultHelpProvider"); return aSupported; } @@ -96,7 +96,7 @@ namespace pcr void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& _Control ) throw (RuntimeException) { if ( !m_xInspectorUI.is() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); try { @@ -128,14 +128,14 @@ namespace pcr return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //-------------------------------------------------------------------- void DefaultHelpProvider::create( const Reference< XObjectInspectorUI >& _rxUI ) { if ( !_rxUI.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); try { @@ -172,9 +172,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString DefaultHelpProvider::impl_getHelpText_nothrow( const Reference< XPropertyControl >& _rxControl ) + OUString DefaultHelpProvider::impl_getHelpText_nothrow( const Reference< XPropertyControl >& _rxControl ) { - ::rtl::OUString sHelpText; + OUString sHelpText; OSL_PRECOND( _rxControl.is(), "DefaultHelpProvider::impl_getHelpText_nothrow: illegal control!" ); if ( !_rxControl.is() ) return sHelpText; diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index cf0444c58740..3d8ee8060d63 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -52,8 +52,8 @@ namespace pcr DefaultHelpProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) 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::uno::XComponentContext >&); @@ -73,7 +73,7 @@ namespace pcr private: Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); - ::rtl::OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); + OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); }; //........................................................................ diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index f31ca74a7c0a..bca96ac2dc3a 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -64,21 +64,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.EditPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.EditPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL EditPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EditPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -134,7 +134,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EditPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL EditPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -229,38 +229,38 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aSuperseded; + ::std::vector< OUString > aSuperseded; if ( implHaveBothScrollBarProperties() ) { - aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_HSCROLL) ); - aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_VSCROLL) ); + aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_HSCROLL) ); + aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_VSCROLL) ); } if ( implHaveTextTypeProperty() ) { - aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_RICHTEXT) ); - aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) ); + aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_RICHTEXT) ); + aSuperseded.push_back( static_cast<const OUString&>(PROPERTY_MULTILINE) ); } if ( aSuperseded.empty() ) - return Sequence< ::rtl::OUString >(); - return Sequence< ::rtl::OUString >( &(*aSuperseded.begin()), aSuperseded.size() ); + return Sequence< OUString >(); + return Sequence< OUString >( &(*aSuperseded.begin()), aSuperseded.size() ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aInterestingActuatingProps; + ::std::vector< OUString > aInterestingActuatingProps; if ( implHaveTextTypeProperty() ) - aInterestingActuatingProps.push_back( static_cast<const rtl::OUString&>(PROPERTY_TEXTTYPE) ); - aInterestingActuatingProps.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) ); - return Sequence< ::rtl::OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() ); + aInterestingActuatingProps.push_back( static_cast<const OUString&>(PROPERTY_TEXTTYPE) ); + aInterestingActuatingProps.push_back( static_cast<const OUString&>(PROPERTY_MULTILINE) ); + return Sequence< OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() ); } //-------------------------------------------------------------------- - void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) + void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -285,7 +285,7 @@ namespace pcr _rxInspectorUI->enablePropertyUI( PROPERTY_LINEEND_FORMAT, nTextType != TEXTTYPE_SINGLELINE ); _rxInspectorUI->enablePropertyUI( PROPERTY_VERTICAL_ALIGN, nTextType == TEXTTYPE_SINGLELINE ); - _rxInspectorUI->showCategory( ::rtl::OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT ); + _rxInspectorUI->showCategory( OUString( "Data" ), nTextType != TEXTTYPE_RICHTEXT ); } break; diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index 803f1ca6d668..62d13b4ad231 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -41,19 +41,19 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~EditPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 0306c7fdb87c..daae33437f13 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -56,9 +56,9 @@ namespace pcr namespace { //-------------------------------------------------------------------- - ::rtl::OUString composeModelElementUIName( const ::rtl::OUString& _rModelName, const ::rtl::OUString& _rElementName ) + OUString composeModelElementUIName( const OUString& _rModelName, const OUString& _rElementName ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "[" ); aBuffer.append( _rModelName ); aBuffer.appendAscii( "] " ); @@ -222,11 +222,11 @@ namespace pcr if ( _bDoListening ) { - xBindingProps->addPropertyChangeListener( ::rtl::OUString(), _rxListener ); + xBindingProps->addPropertyChangeListener( OUString(), _rxListener ); } else { - xBindingProps->removePropertyChangeListener( ::rtl::OUString(), _rxListener ); + xBindingProps->removePropertyChangeListener( OUString(), _rxListener ); } } @@ -298,7 +298,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::getFormModelNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()) + void EFormsHelper::getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()) { if ( m_xDocument.is() ) { @@ -310,7 +310,7 @@ namespace pcr OSL_ENSURE( xForms.is(), "EFormsHelper::getFormModelNames: invalid forms container!" ); if ( xForms.is() ) { - Sequence< ::rtl::OUString > aModelNames = xForms->getElementNames(); + Sequence< OUString > aModelNames = xForms->getElementNames(); _rModelNames.resize( aModelNames.getLength() ); ::std::copy( aModelNames.getConstArray(), aModelNames.getConstArray() + aModelNames.getLength(), _rModelNames.begin() @@ -325,7 +325,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::getBindingNames( const ::rtl::OUString& _rModelName, ::std::vector< ::rtl::OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()) + void EFormsHelper::getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()) { _rBindingNames.resize( 0 ); try @@ -337,7 +337,7 @@ namespace pcr OSL_ENSURE( xBindings.is(), "EFormsHelper::getBindingNames: invalid bindings container obtained from the model!" ); if ( xBindings.is() ) { - Sequence< ::rtl::OUString > aNames = xBindings->getElementNames(); + Sequence< OUString > aNames = xBindings->getElementNames(); _rBindingNames.resize( aNames.getLength() ); ::std::copy( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), _rBindingNames.begin() ); } @@ -350,7 +350,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< xforms::XModel > EFormsHelper::getFormModelByName( const ::rtl::OUString& _rModelName ) const SAL_THROW(()) + Reference< xforms::XModel > EFormsHelper::getFormModelByName( const OUString& _rModelName ) const SAL_THROW(()) { Reference< xforms::XModel > xReturn; try @@ -387,9 +387,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EFormsHelper::getCurrentFormModelName() const SAL_THROW(()) + OUString EFormsHelper::getCurrentFormModelName() const SAL_THROW(()) { - ::rtl::OUString sModelName; + OUString sModelName; try { Reference< xforms::XModel > xFormsModel( getCurrentFormModel() ); @@ -422,9 +422,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EFormsHelper::getCurrentBindingName() const SAL_THROW(()) + OUString EFormsHelper::getCurrentBindingName() const SAL_THROW(()) { - ::rtl::OUString sBindingName; + OUString sBindingName; try { Reference< XPropertySet > xBinding( getCurrentBinding() ); @@ -489,7 +489,7 @@ namespace pcr m_xBindableControl->setValueBinding( xBinding ); impl_toggleBindingPropertyListening_throw( true, NULL ); - ::std::set< ::rtl::OUString > aSet; + ::std::set< OUString > aSet; firePropertyChanges( xOldBinding, _rxBinding, aSet ); } catch( const Exception& ) @@ -499,25 +499,25 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()) + Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()) { OSL_ENSURE( !_rBindingName.isEmpty(), "EFormsHelper::getOrCreateBindingForModel: invalid binding name!" ); return implGetOrCreateBinding( _rTargetModel, _rBindingName ); } //-------------------------------------------------------------------- - Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()) + Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()) { OSL_ENSURE( !( _rTargetModel.isEmpty() && !_rBindingName.isEmpty() ), "EFormsHelper::implGetOrCreateBinding: no model, but a binding name?" ); Reference< XPropertySet > xBinding; try { - ::rtl::OUString sTargetModel( _rTargetModel ); + OUString sTargetModel( _rTargetModel ); // determine the model which the binding should belong to if ( sTargetModel.isEmpty() ) { - ::std::vector< ::rtl::OUString > aModelNames; + ::std::vector< OUString > aModelNames; getFormModelNames( aModelNames ); if ( !aModelNames.empty() ) sTargetModel = *aModelNames.begin(); @@ -549,12 +549,12 @@ namespace pcr { // find a nice name for it String sBaseName( PcrRes( RID_STR_BINDING_UI_NAME ) ); - sBaseName += rtl::OUString(" "); + sBaseName += OUString(" "); String sNewName; sal_Int32 nNumber = 1; do { - sNewName = sBaseName + ::rtl::OUString::valueOf( nNumber++ ); + sNewName = sBaseName + OUString::valueOf( nNumber++ ); } while ( xBindingNames->hasByName( sNewName ) ); Reference< XNamed > xName( xBinding, UNO_QUERY_THROW ); @@ -609,9 +609,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const SAL_THROW(()) + OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const SAL_THROW(()) { - ::rtl::OUString sUIName; + OUString sUIName; try { // determine the model which the element belongs to @@ -621,7 +621,7 @@ namespace pcr OSL_ENSURE( xHelper.is(), "EFormsHelper::getModelElementUIName: invalid element or model!" ); if ( xHelper.is() ) { - ::rtl::OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( _rxElement, sal_True ) : xHelper->getBindingName( _rxElement, sal_True ); + OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( _rxElement, sal_True ) : xHelper->getBindingName( _rxElement, sal_True ); Reference< xforms::XModel > xModel( xHelper, UNO_QUERY_THROW ); sUIName = composeModelElementUIName( xModel->getID(), sElementName ); } @@ -635,7 +635,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const ::rtl::OUString& _rUIName ) const SAL_THROW(()) + Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const OUString& _rUIName ) const SAL_THROW(()) { const MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames ); MapStringToPropertySet::const_iterator pos = rMapUINameToElement.find( _rUIName ); @@ -645,24 +645,24 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::getAllElementUINames( const ModelElementType _eType, ::std::vector< ::rtl::OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ) + void EFormsHelper::getAllElementUINames( const ModelElementType _eType, ::std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ) { MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames ); rMapUINameToElement.clear(); _rElementNames.resize( 0 ); if ( _bPrepentEmptyEntry ) - rMapUINameToElement[ ::rtl::OUString() ] = Reference< XPropertySet >(); + rMapUINameToElement[ OUString() ] = Reference< XPropertySet >(); try { // obtain the model names - ::std::vector< ::rtl::OUString > aModels; + ::std::vector< OUString > aModels; getFormModelNames( aModels ); _rElementNames.reserve( aModels.size() * 2 ); // heuristics // for every model, obtain the element - for ( ::std::vector< ::rtl::OUString >::const_iterator pModelName = aModels.begin(); + for ( ::std::vector< OUString >::const_iterator pModelName = aModels.begin(); pModelName != aModels.end(); ++pModelName ) @@ -693,8 +693,8 @@ namespace pcr xElement->setPropertyValue( PROPERTY_MODEL, makeAny( xModel ) ); } #endif - ::rtl::OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( xElement, sal_True ) : xHelper->getBindingName( xElement, sal_True ); - ::rtl::OUString sUIName = composeModelElementUIName( *pModelName, sElementName ); + OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( xElement, sal_True ) : xHelper->getBindingName( xElement, sal_True ); + OUString sUIName = composeModelElementUIName( *pModelName, sElementName ); OSL_ENSURE( rMapUINameToElement.find( sUIName ) == rMapUINameToElement.end(), "EFormsHelper::getAllElementUINames: duplicate name!" ); rMapUINameToElement.insert( MapStringToPropertySet::value_type( sUIName, xElement ) ); @@ -711,7 +711,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::firePropertyChange( const ::rtl::OUString& _rName, const Any& _rOldValue, const Any& _rNewValue ) const + void EFormsHelper::firePropertyChange( const OUString& _rName, const Any& _rOldValue, const Any& _rNewValue ) const { if ( m_aPropertyListeners.empty() ) return; @@ -737,7 +737,7 @@ namespace pcr } //-------------------------------------------------------------------- - void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, ::std::set< ::rtl::OUString >& _rFilter ) const + void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, ::std::set< OUString >& _rFilter ) const { if ( m_aPropertyListeners.empty() ) return; diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index d4ba742fc817..4c7cab782d77 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.hxx @@ -41,7 +41,7 @@ namespace pcr { //........................................................................ - typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::std::less< ::rtl::OUString > > + typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::std::less< OUString > > MapStringToPropertySet; //==================================================================== @@ -117,16 +117,16 @@ namespace pcr /** retrieves the names of all XForms models in the document the control lives in */ - void getFormModelNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()); + void getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()); /** retrieves the names of all bindings for a given model @see getFormModelNames */ - void getBindingNames( const ::rtl::OUString& _rModelName, ::std::vector< ::rtl::OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()); + void getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()); /// retrieves the XForms model (within the control model's document) with the given name ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel > - getFormModelByName( const ::rtl::OUString& _rModelName ) const SAL_THROW(()); + getFormModelByName( const OUString& _rModelName ) const SAL_THROW(()); /** retrieves the model which the active binding of the control model belongs to */ @@ -135,7 +135,7 @@ namespace pcr /** retrieves the name of the model which the active binding of the control model belongs to */ - ::rtl::OUString + OUString getCurrentFormModelName() const SAL_THROW(()); /** retrieves the binding instance which is currently attached to the control model @@ -145,7 +145,7 @@ namespace pcr /** retrieves the name of the binding instance which is currently attached to the control model */ - ::rtl::OUString + OUString getCurrentBindingName() const SAL_THROW(()); /** sets a new binding at the control model @@ -172,7 +172,7 @@ namespace pcr have a binding with this name, a new binding is created and returned. */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - getOrCreateBindingForModel( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()); + getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()); /** types of sub-elements of a model */ @@ -186,7 +186,7 @@ namespace pcr @see getModelElementFromUIName @see getAllElementUINames */ - ::rtl::OUString + OUString getModelElementUIName( const ModelElementType _eType, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement @@ -202,7 +202,7 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getModelElementFromUIName( const ModelElementType _eType, - const ::rtl::OUString& _rUIName + const OUString& _rUIName ) const SAL_THROW(()); /** retrieves the UI names of all elements of all models in our document @@ -215,7 +215,7 @@ namespace pcr */ void getAllElementUINames( const ModelElementType _eType, - ::std::vector< ::rtl::OUString >& /* [out] */ _rElementNames, + ::std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ); @@ -223,14 +223,14 @@ namespace pcr void firePropertyChanges( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxOldProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxNewProps, - ::std::set< ::rtl::OUString >& _rFilter + ::std::set< OUString >& _rFilter ) const; /** fires a change in a single property, if the property value changed, and if we have a listener interested in property changes */ void firePropertyChange( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue ) const; @@ -240,7 +240,7 @@ namespace pcr /// implementation for both <member>getOrCreateBindingForModel</member> ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - implGetOrCreateBinding( const ::rtl::OUString& _rTargetModel, const ::rtl::OUString& _rBindingName ) const SAL_THROW(()); + implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()); void impl_toggleBindingPropertyListening_throw( bool _bDoListen, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxConcreteListenerOrNull ); diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 848f6f52c47e..063735450d2b 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -72,30 +72,30 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.XMLFormsPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - ::rtl::OUString EFormsPropertyHandler::getModelNamePropertyValue() const + OUString EFormsPropertyHandler::getModelNamePropertyValue() const { - ::rtl::OUString sModelName = m_pHelper->getCurrentFormModelName(); + OUString sModelName = m_pHelper->getCurrentFormModelName(); if ( sModelName.isEmpty() ) sModelName = m_sBindingLessModelName; return sModelName; } //-------------------------------------------------------------------- - Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -131,11 +131,11 @@ namespace pcr if ( xBindingProps.is() ) { aReturn = xBindingProps->getPropertyValue( _rPropertyName ); - DBG_ASSERT( aReturn.getValueType().equals( ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) ), + DBG_ASSERT( aReturn.getValueType().equals( ::getCppuType( static_cast< OUString* >( NULL ) ) ), "EFormsPropertyHandler::getPropertyValue: invalid BindingExpression value type!" ); } else - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); } break; @@ -147,9 +147,9 @@ namespace pcr catch( const Exception& ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "EFormsPropertyHandler::getPropertyValue: caught an exception!" ); + OString sMessage( "EFormsPropertyHandler::getPropertyValue: caught an exception!" ); sMessage += "\n(have been asked for the \""; - sMessage += ::rtl::OString( _rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( _rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += "\" property.)"; OSL_FAIL( sMessage.getStr() ); #endif @@ -158,7 +158,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EFormsPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL EFormsPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -187,17 +187,17 @@ namespace pcr // if the model changed, reset the binding to NULL if ( m_pHelper->getCurrentFormModelName() != m_sBindingLessModelName ) { - ::rtl::OUString sOldBindingName = m_pHelper->getCurrentBindingName(); + OUString sOldBindingName = m_pHelper->getCurrentBindingName(); m_pHelper->setBinding( NULL ); firePropertyChange( PROPERTY_BINDING_NAME, PROPERTY_ID_BINDING_NAME, - makeAny( sOldBindingName ), makeAny( ::rtl::OUString() ) ); + makeAny( sOldBindingName ), makeAny( OUString() ) ); } } break; case PROPERTY_ID_BINDING_NAME: { - ::rtl::OUString sNewBindingName; + OUString sNewBindingName; OSL_VERIFY( _rValue >>= sNewBindingName ); bool bPreviouslyEmptyModel = !m_pHelper->getCurrentFormModel().is(); @@ -223,7 +223,7 @@ namespace pcr // However, there's no such mechanism in place currently. m_bSimulatingModelChange = true; firePropertyChange( PROPERTY_XML_DATA_MODEL, PROPERTY_ID_XML_DATA_MODEL, - makeAny( ::rtl::OUString() ), makeAny( getModelNamePropertyValue() ) ); + makeAny( OUString() ), makeAny( getModelNamePropertyValue() ) ); m_bSimulatingModelChange = false; } } @@ -248,7 +248,7 @@ namespace pcr DBG_ASSERT( xBindingProps.is(), "EFormsPropertyHandler::setPropertyValue: how can I set a property if there's no binding?" ); if ( xBindingProps.is() ) { - DBG_ASSERT( _rValue.getValueType().equals( ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) ), + DBG_ASSERT( _rValue.getValueType().equals( ::getCppuType( static_cast< OUString* >( NULL ) ) ), "EFormsPropertyHandler::setPropertyValue: invalid value type!" ); xBindingProps->setPropertyValue( _rPropertyName, _rValue ); } @@ -316,7 +316,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; @@ -327,7 +327,7 @@ namespace pcr PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); - ::rtl::OUString sControlValue; + OUString sControlValue; switch ( nPropId ) { case PROPERTY_ID_LIST_BINDING: @@ -349,7 +349,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; @@ -382,32 +382,32 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - ::std::vector< ::rtl::OUString > aInterestedInActuations( 2 ); + ::std::vector< OUString > aInterestedInActuations( 2 ); aInterestedInActuations[ 0 ] = PROPERTY_XML_DATA_MODEL; aInterestedInActuations[ 1 ] = PROPERTY_BINDING_NAME; - return Sequence< ::rtl::OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); + return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - Sequence< ::rtl::OUString > aReturn( 1 ); + Sequence< OUString > aReturn( 1 ); aReturn[ 0 ] = PROPERTY_INPUT_REQUIRED; return aReturn; } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -419,7 +419,7 @@ namespace pcr LineDescriptor aDescriptor; sal_Int16 nControlType = PropertyControlType::TextField; - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); switch ( nPropId ) { @@ -436,18 +436,18 @@ namespace pcr case PROPERTY_ID_BINDING_NAME: { nControlType = PropertyControlType::ComboBox; - ::rtl::OUString sCurrentModel( getModelNamePropertyValue() ); + OUString sCurrentModel( getModelNamePropertyValue() ); if ( !sCurrentModel.isEmpty() ) m_pHelper->getBindingNames( sCurrentModel, aListEntries ); } break; - case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BIND_EXPRESSION); break; - case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_REQUIRED); break; - case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_RELEVANT); break; - case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_READONLY); break; - case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CONSTRAINT); break; - case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break; + case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BIND_EXPRESSION); break; + case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_REQUIRED); break; + case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_RELEVANT); break; + case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_READONLY); break; + case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_CONSTRAINT); break; + case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break; default: OSL_FAIL( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" ); @@ -468,13 +468,13 @@ namespace pcr } aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = ::rtl::OUString( "Data" ); + aDescriptor.Category = OUString( "Data" ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -505,22 +505,22 @@ namespace pcr // the binding for the dialog to work with Reference< XPropertySet > xBinding( m_pHelper->getCurrentBinding() ); // the aspect of the binding which the dialog should modify - ::rtl::OUString sFacetName( _rPropertyName ); + OUString sFacetName( _rPropertyName ); OSL_ENSURE( xModel.is() && xBinding.is() && !sFacetName.isEmpty(), "EFormsPropertyHandler::onInteractivePropertySelection: something is missing for the dialog initialization!" ); if ( !( xModel.is() && xBinding.is() && !sFacetName.isEmpty() ) ) return InteractiveSelectionResult_Cancelled; - xDialogProps->setPropertyValue( ::rtl::OUString( "FormModel" ), makeAny( xModel ) ); - xDialogProps->setPropertyValue( ::rtl::OUString( "Binding" ), makeAny( xBinding ) ); - xDialogProps->setPropertyValue( ::rtl::OUString( "FacetName" ), makeAny( sFacetName ) ); + xDialogProps->setPropertyValue( OUString( "FormModel" ), makeAny( xModel ) ); + xDialogProps->setPropertyValue( OUString( "Binding" ), makeAny( xBinding ) ); + xDialogProps->setPropertyValue( OUString( "FacetName" ), makeAny( sFacetName ) ); if ( !xDialog->execute() ) // cancelled return InteractiveSelectionResult_Cancelled; - _rData = xDialogProps->getPropertyValue( ::rtl::OUString( "ConditionValue" ) ); + _rData = xDialogProps->getPropertyValue( OUString( "ConditionValue" ) ); return InteractiveSelectionResult_ObtainedValue; } catch( const Exception& ) @@ -551,7 +551,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) + void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -571,7 +571,7 @@ namespace pcr { if ( m_bSimulatingModelChange ) break; - ::rtl::OUString sDataModelName; + OUString sDataModelName; OSL_VERIFY( _rNewValue >>= sDataModelName ); sal_Bool bBoundToSomeModel = !sDataModelName.isEmpty(); _rxInspectorUI->rebuildPropertyUI( PROPERTY_BINDING_NAME ); diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index cbad1720c6d9..cbeb8cc3feb5 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -41,7 +41,7 @@ namespace pcr ::std::auto_ptr< EFormsHelper > m_pHelper; /** current value of the Model property, if there is no binding, yet */ - ::rtl::OUString m_sBindingLessModelName; + OUString m_sBindingLessModelName; /** are we currently simulating a propertyChange event of the Model property? */ bool m_bSimulatingModelChange; @@ -51,27 +51,27 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~EFormsPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); @@ -86,7 +86,7 @@ namespace pcr An extra method is necessary here, which respects both the value set at our helper, and <member>m_sBindingLessModelName</member> */ - ::rtl::OUString getModelNamePropertyValue() const; + OUString getModelNamePropertyValue() const; }; //........................................................................ diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index 0834b7888c49..2d8d373af540 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.hxx @@ -39,19 +39,19 @@ namespace pcr public: /** retrieves all descriptions of all possible values of the enumeration property */ - virtual ::std::vector< ::rtl::OUString > SAL_CALL getDescriptions( + virtual ::std::vector< OUString > SAL_CALL getDescriptions( ) const = 0; /** converts a given description into a property value */ virtual void SAL_CALL getValueFromDescription( - const ::rtl::OUString& _rDescription, + const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const = 0; /** converts a given property value into a description */ - virtual ::rtl::OUString SAL_CALL getDescriptionForValue( + virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const = 0; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 5422e02aa025..fb058aa74279 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -142,14 +142,14 @@ namespace pcr //= EventDescription //==================================================================== EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, - const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const rtl::OString& _sHelpId, const rtl::OString& _sUniqueBrowseId ) + const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) :sDisplayName( String( PcrRes( _nDisplayNameResId ) ) ) - ,sListenerMethodName( ::rtl::OUString::createFromAscii( _pListenerMethodAsciiName ) ) + ,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) ) ,sHelpId( _sHelpId ) ,sUniqueBrowseId( _sUniqueBrowseId ) ,nId( _nId ) { - ::rtl::OUStringBuffer aQualifiedListenerClass; + OUStringBuffer aQualifiedListenerClass; aQualifiedListenerClass.appendAscii( "com.sun.star." ); aQualifiedListenerClass.appendAscii( _pListenerNamespaceAscii ); aQualifiedListenerClass.appendAscii( "." ); @@ -165,11 +165,11 @@ namespace pcr //.................................................................... #define DESCRIBE_EVENT( asciinamespace, asciilistener, asciimethod, id_postfix ) \ s_aKnownEvents.insert( EventMap::value_type( \ - ::rtl::OUString::createFromAscii( asciimethod ), \ + OUString::createFromAscii( asciimethod ), \ EventDescription( ++nEventId, asciinamespace, asciilistener, asciimethod, RID_STR_EVT_##id_postfix, HID_EVT_##id_postfix, UID_BRWEVT_##id_postfix ) ) ) //.................................................................... - bool lcl_getEventDescriptionForMethod( const ::rtl::OUString& _rMethodName, EventDescription& _out_rDescription ) + bool lcl_getEventDescriptionForMethod( const OUString& _rMethodName, EventDescription& _out_rDescription ) { static EventMap s_aKnownEvents; if ( s_aKnownEvents.empty() ) @@ -224,9 +224,9 @@ namespace pcr } //.................................................................... - ::rtl::OUString lcl_getEventPropertyName( const ::rtl::OUString& _rListenerClassName, const ::rtl::OUString& _rMethodName ) + OUString lcl_getEventPropertyName( const OUString& _rListenerClassName, const OUString& _rMethodName ) { - ::rtl::OUStringBuffer aPropertyName; + OUStringBuffer aPropertyName; aPropertyName.append( _rListenerClassName ); aPropertyName.append( (sal_Unicode)';' ); aPropertyName.append( _rMethodName.getStr() ); @@ -271,10 +271,10 @@ namespace pcr sal_Int32 nPrefixLen = aScriptEvent.ScriptCode.indexOf( ':' ); OSL_ENSURE( nPrefixLen > 0, "lcl_getAssignedScriptEvent: illegal location!" ); - ::rtl::OUString sLocation = aScriptEvent.ScriptCode.copy( 0, nPrefixLen ); - ::rtl::OUString sMacroPath = aScriptEvent.ScriptCode.copy( nPrefixLen + 1 ); + OUString sLocation = aScriptEvent.ScriptCode.copy( 0, nPrefixLen ); + OUString sMacroPath = aScriptEvent.ScriptCode.copy( nPrefixLen + 1 ); - ::rtl::OUStringBuffer aNewStyleSpec; + OUStringBuffer aNewStyleSpec; aNewStyleSpec.appendAscii( "vnd.sun.star.script:" ); aNewStyleSpec.append ( sMacroPath ); aNewStyleSpec.appendAscii( "?language=Basic&location=" ); @@ -283,13 +283,13 @@ namespace pcr aScriptEvent.ScriptCode = aNewStyleSpec.makeStringAndClear(); // also, this new-style spec requires the script code to be "Script" instead of "StarBasic" - aScriptEvent.ScriptType = ::rtl::OUString( "Script" ); + aScriptEvent.ScriptType = OUString( "Script" ); } return aScriptEvent; } //................................................................ - ::rtl::OUString lcl_getQualifiedKnownListenerName( const ScriptEventDescriptor& _rFormComponentEventDescriptor ) + OUString lcl_getQualifiedKnownListenerName( const ScriptEventDescriptor& _rFormComponentEventDescriptor ) { EventDescription aKnownEvent; if ( lcl_getEventDescriptionForMethod( _rFormComponentEventDescriptor.EventMethod, aKnownEvent ) ) @@ -344,7 +344,7 @@ namespace pcr class EventHolder : public EventHolder_Base { private: - typedef ::boost::unordered_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< OUString, ScriptEventDescriptor, OUStringHash > EventMap; typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess; EventMap m_aEventNameAccess; @@ -353,18 +353,18 @@ namespace pcr public: EventHolder( ); - void addEvent( EventId _nId, const ::rtl::OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ); + void addEvent( EventId _nId, const OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ); /** effectively the same as getByName, but instead of converting the ScriptEventDescriptor to the weird format used by the macro assignment dialog, it is returned directly */ - ScriptEventDescriptor getNormalizedDescriptorByName( const ::rtl::OUString& _rEventName ) const; + ScriptEventDescriptor getNormalizedDescriptorByName( const OUString& _rEventName ) const; // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException); - virtual Any SAL_CALL getByName( const ::rtl::OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& _rName ) throw (RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& _rName, const Any& aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException); + virtual Any SAL_CALL getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& _rName ) throw (RuntimeException); virtual Type SAL_CALL getElementType( ) throw (RuntimeException); virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException); @@ -372,7 +372,7 @@ namespace pcr ~EventHolder( ); private: - ScriptEventDescriptor impl_getDescriptor_throw( const ::rtl::OUString& _rEventName ) const; + ScriptEventDescriptor impl_getDescriptor_throw( const OUString& _rEventName ) const; }; DBG_NAME( EventHolder ) @@ -391,7 +391,7 @@ namespace pcr } //------------------------------------------------------------------------ - void EventHolder::addEvent( EventId _nId, const ::rtl::OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ) + void EventHolder::addEvent( EventId _nId, const OUString& _rEventName, const ScriptEventDescriptor& _rScriptEvent ) { ::std::pair< EventMap::iterator, bool > insertionResult = m_aEventNameAccess.insert( EventMap::value_type( _rEventName, _rScriptEvent ) ); @@ -400,56 +400,56 @@ namespace pcr } //------------------------------------------------------------------------ - ScriptEventDescriptor EventHolder::getNormalizedDescriptorByName( const ::rtl::OUString& _rEventName ) const + ScriptEventDescriptor EventHolder::getNormalizedDescriptorByName( const OUString& _rEventName ) const { return impl_getDescriptor_throw( _rEventName ); } //------------------------------------------------------------------------ - ScriptEventDescriptor EventHolder::impl_getDescriptor_throw( const ::rtl::OUString& _rEventName ) const + ScriptEventDescriptor EventHolder::impl_getDescriptor_throw( const OUString& _rEventName ) const { EventMap::const_iterator pos = m_aEventNameAccess.find( _rEventName ); if ( pos == m_aEventNameAccess.end() ) - throw NoSuchElementException( ::rtl::OUString(), *const_cast< EventHolder* >( this ) ); + throw NoSuchElementException( OUString(), *const_cast< EventHolder* >( this ) ); return pos->second; } //------------------------------------------------------------------------ - void SAL_CALL EventHolder::replaceByName( const ::rtl::OUString& _rName, const Any& _rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + void SAL_CALL EventHolder::replaceByName( const OUString& _rName, const Any& _rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { EventMap::iterator pos = m_aEventNameAccess.find( _rName ); if ( pos == m_aEventNameAccess.end() ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); Sequence< PropertyValue > aScriptDescriptor; OSL_VERIFY( _rElement >>= aScriptDescriptor ); ::comphelper::NamedValueCollection aExtractor( aScriptDescriptor ); - pos->second.ScriptType = aExtractor.getOrDefault( "EventType", ::rtl::OUString() ); - pos->second.ScriptCode = aExtractor.getOrDefault( "Script", ::rtl::OUString() ); + pos->second.ScriptType = aExtractor.getOrDefault( "EventType", OUString() ); + pos->second.ScriptCode = aExtractor.getOrDefault( "Script", OUString() ); } //------------------------------------------------------------------------ - Any SAL_CALL EventHolder::getByName( const ::rtl::OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL EventHolder::getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { ScriptEventDescriptor aDescriptor( impl_getDescriptor_throw( _rName ) ); Any aRet; Sequence< PropertyValue > aScriptDescriptor( 2 ); - aScriptDescriptor[0].Name = ::rtl::OUString("EventType"); + aScriptDescriptor[0].Name = OUString("EventType"); aScriptDescriptor[0].Value <<= aDescriptor.ScriptType; - aScriptDescriptor[1].Name = ::rtl::OUString("Script"); + aScriptDescriptor[1].Name = OUString("Script"); aScriptDescriptor[1].Value <<= aDescriptor.ScriptCode; return makeAny( aScriptDescriptor ); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL EventHolder::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHolder::getElementNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aReturn( m_aEventIndexAccess.size() ); - ::rtl::OUString* pReturn = aReturn.getArray(); + Sequence< OUString > aReturn( m_aEventIndexAccess.size() ); + OUString* pReturn = aReturn.getArray(); // SvxMacroAssignDlg has a weird API: It expects a XNameReplace, means a container whose // main access method is by name. In it's UI, it shows the possible events in exactly the @@ -469,7 +469,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool SAL_CALL EventHolder::hasByName( const ::rtl::OUString& _rName ) throw (RuntimeException) + sal_Bool SAL_CALL EventHolder::hasByName( const OUString& _rName ) throw (RuntimeException) { EventMap::const_iterator pos = m_aEventNameAccess.find( _rName ); return pos != m_aEventNameAccess.end(); @@ -511,35 +511,35 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventHandler::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL EventHandler::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL EventHandler::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL EventHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() ); + StlSyntaxSequence< OUString > aAllServices( getSupportedServiceNames() ); return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EventHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EventHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.EventHandler" ); + return OUString( "com.sun.star.comp.extensions.EventHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.EventHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.EventHandler" ); return aSupported; } @@ -590,7 +590,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EventHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EventHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -618,7 +618,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EventHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL EventHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -651,11 +651,11 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EventHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EventHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString sNewScriptCode; + OUString sNewScriptCode; OSL_VERIFY( _rControlValue >>= sNewScriptCode ); Sequence< ScriptEventDescriptor > aAllAssignedEvents; @@ -679,7 +679,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL EventHandler::convertToControlValue( const ::rtl::OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL EventHandler::convertToControlValue( const OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -690,7 +690,7 @@ namespace pcr "EventHandler::convertToControlValue: unexpected ControlValue type class!" ); (void)_rControlValueType; - ::rtl::OUString sScript( aScriptEvent.ScriptCode ); + OUString sScript( aScriptEvent.ScriptCode ); if ( !sScript.isEmpty() ) { // format is: "name (location, language)" @@ -700,16 +700,16 @@ namespace pcr Reference< XUriReferenceFactory > xUriRefFac = UriReferenceFactory::create( m_aContext.getUNOContext() ); Reference< XVndSunStarScriptUrlReference > xScriptUri( xUriRefFac->parse( sScript ), UNO_QUERY_THROW ); - ::rtl::OUStringBuffer aComposeBuffer; + OUStringBuffer aComposeBuffer; // name aComposeBuffer.append( xScriptUri->getName() ); // location - const ::rtl::OUString sLocationParamName( "location" ); - const ::rtl::OUString sLocation = xScriptUri->getParameter( sLocationParamName ); - const ::rtl::OUString sLangParamName( "language" ); - const ::rtl::OUString sLanguage = xScriptUri->getParameter( sLangParamName ); + const OUString sLocationParamName( "location" ); + const OUString sLocation = xScriptUri->getParameter( sLocationParamName ); + const OUString sLangParamName( "language" ); + const OUString sLanguage = xScriptUri->getParameter( sLangParamName ); if ( !(sLocation.isEmpty() && sLanguage.isEmpty()) ) { @@ -744,7 +744,7 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL EventHandler::getPropertyState( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL EventHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return PropertyState_DIRECT_VALUE; } @@ -779,7 +779,7 @@ namespace pcr sal_Int32 listenerCount = aListeners.getLength(); Property aCurrentProperty; - ::rtl::OUString sListenerClassName; + OUString sListenerClassName; // loop through all listeners and all methods, and see which we can present at the UI const Type* pListeners = aListeners.getConstArray(); @@ -794,9 +794,9 @@ namespace pcr continue; // loop through all methods - Sequence< ::rtl::OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) ); + Sequence< OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) ); - const ::rtl::OUString* pMethods = aMethods.getConstArray(); + const OUString* pMethods = aMethods.getConstArray(); sal_uInt32 methodCount = aMethods.getLength(); for (sal_uInt32 method = 0 ; method < methodCount ; ++method, ++pMethods ) @@ -829,7 +829,7 @@ namespace pcr { aOrderedProperties[ loop->second.nId ] = Property( loop->first, loop->second.nId, - ::getCppuType( static_cast< const ::rtl::OUString* >( NULL ) ), + ::getCppuType( static_cast< const OUString* >( NULL ) ), PropertyAttribute::BOUND ); } @@ -840,21 +840,21 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupersededProperties( ) throw (RuntimeException) { // none - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EventHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getActuatingProperties( ) throw (RuntimeException) { // none - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL EventHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL EventHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -871,20 +871,20 @@ namespace pcr const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName ); aDescriptor.DisplayName = rEvent.sDisplayName; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId ); - aDescriptor.PrimaryButtonId = rtl::OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); + aDescriptor.PrimaryButtonId = OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); aDescriptor.HasPrimaryButton = sal_True; - aDescriptor.Category = ::rtl::OUString( "Events" ); + aDescriptor.Category = OUString( "Events" ); return aDescriptor; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL EventHandler::isComposable( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL EventHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return sal_False; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -909,8 +909,8 @@ namespace pcr } // the initial selection in the dialog - Sequence< ::rtl::OUString > aNames( pEventHolder->getElementNames() ); - const ::rtl::OUString* pChosenEvent = ::std::find( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), rForEvent.sListenerMethodName ); + Sequence< OUString > aNames( pEventHolder->getElementNames() ); + const OUString* pChosenEvent = ::std::find( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength(), rForEvent.sListenerMethodName ); sal_uInt16 nInitialSelection = (sal_uInt16)( pChosenEvent - aNames.getConstArray() ); // the dialog @@ -959,7 +959,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL EventHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL EventHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { OSL_FAIL( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" ); } @@ -1083,12 +1083,12 @@ namespace pcr { Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW ); Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > aEventNames( xEvents->getElementNames() ); + Sequence< OUString > aEventNames( xEvents->getElementNames() ); sal_Int32 nEventCount = aEventNames.getLength(); _out_rEvents.realloc( nEventCount ); - const ::rtl::OUString* pNames = aEventNames.getConstArray(); + const OUString* pNames = aEventNames.getConstArray(); ScriptEventDescriptor* pDescs = _out_rEvents.getArray(); for( sal_Int32 i = 0 ; i < nEventCount ; ++i, ++pNames, ++pDescs ) @@ -1117,7 +1117,7 @@ namespace pcr } else { - ::rtl::OUString sControlService; + OUString sControlService; OSL_VERIFY( m_xComponent->getPropertyValue( PROPERTY_DEFAULTCONTROL ) >>= sControlService ); xReturn = m_aContext.createComponent( sControlService ); @@ -1126,7 +1126,7 @@ namespace pcr } //-------------------------------------------------------------------- - const EventDescription& EventHandler::impl_getEventForName_throw( const ::rtl::OUString& _rPropertyName ) const + const EventDescription& EventHandler::impl_getEventForName_throw( const OUString& _rPropertyName ) const { EventMap::const_iterator pos = m_aEvents.find( _rPropertyName ); if ( pos == m_aEvents.end() ) @@ -1137,7 +1137,7 @@ namespace pcr //-------------------------------------------------------------------- namespace { - static bool lcl_endsWith( const ::rtl::OUString& _rText, const ::rtl::OUString& _rCheck ) + static bool lcl_endsWith( const OUString& _rText, const OUString& _rCheck ) { sal_Int32 nTextLen = _rText.getLength(); sal_Int32 nCheckLen = _rCheck.getLength(); @@ -1152,8 +1152,8 @@ namespace pcr { try { - ::rtl::OUString sScriptCode( _rScriptEvent.ScriptCode ); - ::rtl::OUString sScriptType( _rScriptEvent.ScriptType ); + OUString sScriptCode( _rScriptEvent.ScriptCode ); + OUString sScriptType( _rScriptEvent.ScriptType ); bool bResetScript = sScriptCode.isEmpty(); sal_Int32 nObjectIndex = impl_getComponentIndexInParent_throw(); @@ -1211,17 +1211,17 @@ namespace pcr { try { - ::rtl::OUString sScriptCode( _rScriptEvent.ScriptCode ); + OUString sScriptCode( _rScriptEvent.ScriptCode ); bool bResetScript = sScriptCode.isEmpty(); Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW ); Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW ); - ::rtl::OUStringBuffer aCompleteName; + OUStringBuffer aCompleteName; aCompleteName.append( _rScriptEvent.ListenerType ); aCompleteName.appendAscii( "::" ); aCompleteName.append( _rScriptEvent.EventMethod ); - ::rtl::OUString sCompleteName( aCompleteName.makeStringAndClear() ); + OUString sCompleteName( aCompleteName.makeStringAndClear() ); bool bExists = xEvents->hasByName( sCompleteName ); diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index c87d4e4c4c33..4ed4ace860df 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -44,11 +44,11 @@ namespace pcr struct EventDescription { public: - ::rtl::OUString sDisplayName; - ::rtl::OUString sListenerClassName; - ::rtl::OUString sListenerMethodName; - ::rtl::OString sHelpId; - ::rtl::OString sUniqueBrowseId; + OUString sDisplayName; + OUString sListenerClassName; + OUString sListenerMethodName; + OString sHelpId; + OString sUniqueBrowseId; EventId nId; EventDescription() @@ -62,11 +62,11 @@ namespace pcr const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, - const rtl::OString& _sHelpId, - const rtl::OString& _sUniqueBrowseId ); + const OString& _sHelpId, + const OString& _sUniqueBrowseId ); }; - typedef ::boost::unordered_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< OUString, EventDescription, OUStringHash > EventMap; //==================================================================== //= EventHandler @@ -97,8 +97,8 @@ namespace pcr public: // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); protected: @@ -111,22 +111,22 @@ namespace pcr protected: // XPropertyHandler overridables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -134,9 +134,9 @@ namespace pcr virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); private: /** returns the script events associated with our introspectee @@ -209,7 +209,7 @@ namespace pcr if our introspectee does not have an event with the given logical name (see ->getSupportedProperties) */ const EventDescription& - impl_getEventForName_throw( const ::rtl::OUString& _rPropertyName ) const; + impl_getEventForName_throw( const OUString& _rPropertyName ) const; /** returns the index of our component within its parent, if this parent can be obtained (XChild::getParent) and supports an ->XIndexAccess interface diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 71423732aff4..0402d6cbca2f 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -79,14 +79,14 @@ namespace pcr _rxProps ); public: - sal_Bool getCheckFontProperty(const ::rtl::OUString& _rPropName, ::com::sun::star::uno::Any& _rValue); - ::rtl::OUString getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault); - sal_Int16 getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault); - sal_Int32 getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault); - float getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault); + sal_Bool getCheckFontProperty(const OUString& _rPropName, ::com::sun::star::uno::Any& _rValue); + OUString getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault); + sal_Int16 getInt16FontProperty(const OUString& _rPropName, const sal_Int16 _nDefault); + sal_Int32 getInt32FontProperty(const OUString& _rPropName, const sal_Int32 _nDefault); + float getFloatFontProperty(const OUString& _rPropName, const float _nDefault); void invalidateItem( - const ::rtl::OUString& _rPropName, + const OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation = sal_False); @@ -101,7 +101,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool OFontPropertyExtractor::getCheckFontProperty(const ::rtl::OUString& _rPropName, Any& _rValue) + sal_Bool OFontPropertyExtractor::getCheckFontProperty(const OUString& _rPropName, Any& _rValue) { _rValue = m_xPropValueAccess->getPropertyValue(_rPropName); if (m_xPropStateAccess.is()) @@ -111,7 +111,7 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString OFontPropertyExtractor::getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault) + OUString OFontPropertyExtractor::getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -121,7 +121,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Int16 OFontPropertyExtractor::getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault) + sal_Int16 OFontPropertyExtractor::getInt16FontProperty(const OUString& _rPropName, const sal_Int16 _nDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -133,7 +133,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Int32 OFontPropertyExtractor::getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault) + sal_Int32 OFontPropertyExtractor::getInt32FontProperty(const OUString& _rPropName, const sal_Int32 _nDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -145,7 +145,7 @@ namespace pcr } //------------------------------------------------------------------------ - float OFontPropertyExtractor::getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault) + float OFontPropertyExtractor::getFloatFontProperty(const OUString& _rPropName, const float _nDefault) { Any aValue; if (getCheckFontProperty(_rPropName, aValue)) @@ -155,7 +155,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OFontPropertyExtractor::invalidateItem(const ::rtl::OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation) + void OFontPropertyExtractor::invalidateItem(const OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation) { if ( _bForceInvalidation || ( m_xPropStateAccess.is() @@ -200,8 +200,8 @@ namespace pcr ::com::sun::star::awt::FontDescriptor aDefaultFont = VCLUnoHelper::CreateFontDescriptor(aDefaultVCLFont); // get the current properties - ::rtl::OUString aFontName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name); - ::rtl::OUString aFontStyleName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_STYLENAME, aDefaultFont.StyleName); + OUString aFontName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name); + OUString aFontStyleName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_STYLENAME, aDefaultFont.StyleName); sal_Int16 nFontFamily = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_FAMILY, aDefaultFont.Family); sal_Int16 nFontCharset = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_CHARSET, aDefaultFont.CharSet); float nFontHeight = aPropExtractor.getFloatFontProperty(PROPERTY_FONT_HEIGHT, (float)aDefaultFont.Height); @@ -288,7 +288,7 @@ namespace pcr //------------------------------------------------------------------------ namespace { - void lcl_pushBackPropertyValue( Sequence< NamedValue >& _out_properties, const ::rtl::OUString& _name, const Any& _value ) + void lcl_pushBackPropertyValue( Sequence< NamedValue >& _out_properties, const OUString& _name, const Any& _value ) { _out_properties.realloc( _out_properties.getLength() + 1 ); _out_properties[ _out_properties.getLength() - 1 ] = NamedValue( _name, _value ); @@ -311,8 +311,8 @@ namespace pcr const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(_rSet.Get(CFID_FONT)); - lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME , makeAny(::rtl::OUString(rFontItem.GetFamilyName()))); - lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, makeAny(::rtl::OUString(rFontItem.GetStyleName()))); + lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME , makeAny(OUString(rFontItem.GetFamilyName()))); + lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, makeAny(OUString(rFontItem.GetStyleName()))); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_FAMILY , makeAny((sal_Int16)rFontItem.GetFamily())); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_CHARSET , makeAny((sal_Int16)rFontItem.GetCharSet())); } @@ -539,7 +539,7 @@ namespace pcr { SID_ATTR_CHAR_FONTLIST, 0 } }; - _rpPool = new SfxItemPool(rtl::OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, + _rpPool = new SfxItemPool(OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID, aItemInfos, _rppDefaults); _rpPool->FreezeIdRanges(); diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index c6cdb04d80aa..b2e56658b628 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -37,12 +37,12 @@ namespace pcr using namespace ::com::sun::star::beans; //------------------------------------------------------------------------ - ::rtl::OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) + OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { PcrClient aResourceAccess; // this ensures that we have our resource file loaded - ::rtl::OUString sClassName; + OUString sClassName; switch (nClassId) { case FormComponentType::TEXTFIELD: diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx index a385f578d6d5..2df90d5ab6bd 100644 --- a/extensions/source/propctrlr/formbrowsertools.hxx +++ b/extensions/source/propctrlr/formbrowsertools.hxx @@ -32,7 +32,7 @@ namespace pcr { //............................................................................ - ::rtl::OUString GetUIHeadlineName(sal_Int16 _nClassId, const ::com::sun::star::uno::Any& _rUnoObject); + OUString GetUIHeadlineName(sal_Int16 _nClassId, const ::com::sun::star::uno::Any& _rUnoObject); sal_Int16 classifyComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); //======================================================================== @@ -53,10 +53,10 @@ namespace pcr struct FindPropertyByName : public ::std::unary_function< ::com::sun::star::beans::Property, bool > { private: - ::rtl::OUString m_sName; + OUString m_sName; public: - FindPropertyByName( const ::rtl::OUString& _rName ) : m_sName( _rName ) { } + FindPropertyByName( const OUString& _rName ) : m_sName( _rName ) { } bool operator()( const ::com::sun::star::beans::Property& _rProp ) const { return m_sName == _rProp.Name; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 008b4b5909c6..2b68425ae3af 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -329,7 +329,7 @@ namespace pcr if ( PROPERTY_ID_IMAGE_URL == nPropId && ( _rValue >>= xGrfObj ) ) { DBG_ASSERT( xGrfObj.is(), "FormComponentPropertyHandler::setPropertyValue() xGrfObj is invalid"); - rtl::OUString sObjectID( GRAPHOBJ_URLPREFIX ); + OUString sObjectID( GRAPHOBJ_URLPREFIX ); sObjectID = sObjectID + xGrfObj->getUniqueID(); m_xComponent->setPropertyValue( _rPropertyName, uno::makeAny( sObjectID ) ); } @@ -936,28 +936,28 @@ namespace pcr { ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString > aInterestingProperties; - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATASOURCE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMAND) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMANDTYPE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SUBMIT_ENCODING) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_REPEAT) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TABSTOP) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BORDER) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DROPDOWN) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_IMAGE_URL) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TARGET_URL) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_STRINGITEMLIST) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BUTTONTYPE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_ESCAPE_PROCESSING) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TRISTATE) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SHOWTHOUSANDSEP) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_FORMATKEY) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) ); - aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TOGGLE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DATASOURCE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_COMMAND) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_COMMANDTYPE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCETYPE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_SUBMIT_ENCODING) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_REPEAT) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TABSTOP) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_BORDER) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_CONTROLSOURCE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DROPDOWN) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_IMAGE_URL) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TARGET_URL) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_STRINGITEMLIST) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_BUTTONTYPE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_ESCAPE_PROCESSING) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TRISTATE) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_DECIMAL_ACCURACY) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_SHOWTHOUSANDSEP) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_FORMATKEY) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_EMPTY_IS_NULL) ); + aInterestingProperties.push_back( static_cast<const OUString&>(PROPERTY_TOGGLE) ); return Sequence< OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() ); } @@ -1014,39 +1014,39 @@ namespace pcr { case PROPERTY_ID_DEFAULT_SELECT_SEQ: case PROPERTY_ID_SELECTEDITEMS: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SELECTION); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SELECTION); break; case PROPERTY_ID_FILTER: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILTER); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FILTER); break; case PROPERTY_ID_SORT: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ORDER); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_ORDER); break; case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: nControlType = PropertyControlType::StringListField; - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS); break; case PROPERTY_ID_COMMAND: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); break; case PROPERTY_ID_TABINDEX: { Reference< XControlContainer > xControlContext( impl_getContextControlContainer_nothrow() ); if ( xControlContext.is() ) - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_TABINDEX); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_TABINDEX); nControlType = PropertyControlType::NumericField; }; break; case PROPERTY_ID_FONT: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE); break; case PROPERTY_ID_TARGET_URL: @@ -1054,7 +1054,7 @@ namespace pcr { aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER ); - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId ) + aDescriptor.PrimaryButtonId = OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId ) ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL); } break; @@ -1072,13 +1072,13 @@ namespace pcr switch( nPropId ) { case PROPERTY_ID_BACKGROUNDCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break; case PROPERTY_ID_FILLCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break; case PROPERTY_ID_SYMBOLCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break; case PROPERTY_ID_BORDERCOLOR: - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break; } break; @@ -1102,7 +1102,7 @@ namespace pcr case PROPERTY_ID_CONTROLLABEL: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL); break; case PROPERTY_ID_FORMATKEY: @@ -1132,7 +1132,7 @@ namespace pcr aDescriptor.Control = pControl; pControl->SetFormatSupplier( pSupplier ); - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT); } else { @@ -1357,7 +1357,7 @@ namespace pcr // DataSource case PROPERTY_ID_DATASOURCE: { - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE); + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE); ::std::vector< OUString > aListEntries; @@ -2458,7 +2458,7 @@ namespace pcr _out_rProperty.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_COMMAND ); _out_rProperty.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_COMMAND ) ); - _out_rProperty.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); + _out_rProperty.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); //////////////////////////////////////////////////////////// sal_Int32 nCommandType = CommandType::COMMAND; @@ -2883,7 +2883,7 @@ namespace pcr { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0, - rtl::OUString("sdatabase")); + OUString("sdatabase")); OUString sDataSource; OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= sDataSource ); @@ -2893,7 +2893,7 @@ namespace pcr // is considered to be potentially expensive aFileDlg.SetDisplayDirectory( sDataSource ); - 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!"); if ( pFilter ) { diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 61036725692c..7c0fc5150055 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -80,9 +80,9 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > m_xBrowserUI; /// the string indicating a "default" (VOID) value in list-like controls - ::rtl::OUString m_sDefaultValueString; + OUString m_sDefaultValueString; /// all properties to whose control's we added ->m_sDefaultValueString - ::std::set< ::rtl::OUString > m_aPropertiesWithDefListEntry; + ::std::set< OUString > m_aPropertiesWithDefListEntry; /// type of our component ComponentClassification m_eComponentClass; /// is our component a (database) sub form? @@ -104,8 +104,8 @@ namespace pcr // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~FormComponentPropertyHandler(); @@ -114,19 +114,19 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // XPropertyHandler overridables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -152,7 +152,7 @@ namespace pcr /** const-version of ->getPropertyValue */ - ::com::sun::star::uno::Any impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ) const; + ::com::sun::star::uno::Any impl_getPropertyValue_throw( const OUString& _rPropertyName ) const; // some property values are faked, and not used in the way they're provided by our component void impl_normalizePropertyValue_nothrow( ::com::sun::star::uno::Any& _rValue, PropertyId _nPropId ) const; @@ -164,7 +164,7 @@ namespace pcr /** initializes the list of field names, if we're handling a control which supports the DataField property */ - void impl_initFieldList_nothrow( ::std::vector< ::rtl::OUString >& rFieldNames ) const; + void impl_initFieldList_nothrow( ::std::vector< OUString >& rFieldNames ) const; /** obtaines the RowSet to which our component belongs @@ -216,14 +216,14 @@ namespace pcr @precond m_xRowSetConnection is not <NULL/> */ - void impl_fillTableNames_throw( ::std::vector< ::rtl::OUString >& _out_rNames ) const; + void impl_fillTableNames_throw( ::std::vector< OUString >& _out_rNames ) const; /** describes the UI for selecting a query name @precond m_xRowSetConnection is not <NULL/> */ - void impl_fillQueryNames_throw( ::std::vector< ::rtl::OUString >& _out_rNames ) const; + void impl_fillQueryNames_throw( ::std::vector< OUString >& _out_rNames ) const; /** describes the UI for selecting a query name @@ -231,8 +231,8 @@ namespace pcr m_xRowSetConnection is not <NULL/> */ void impl_fillQueryNames_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xQueryNames - ,::std::vector< ::rtl::OUString >& _out_rNames - ,const ::rtl::OUString& _sName = ::rtl::OUString() ) const; + ,::std::vector< OUString >& _out_rNames + ,const OUString& _sName = OUString() ) const; /** describes the UI for selecting a ListSource (for list-like form controls) @precond @@ -254,7 +254,7 @@ namespace pcr @return <TRUE/> if and only if the user successfully changed the property */ - bool impl_dialogListSelection_nothrow( const ::rtl::OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogListSelection_nothrow( const OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** executes a dialog for chosing a filter or sort criterion for a database form @param _bFilter @@ -267,7 +267,7 @@ namespace pcr @return <TRUE/> if and only if the user successfully chose a clause */ - bool impl_dialogFilterOrSort_nothrow( bool _bFilter, ::rtl::OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogFilterOrSort_nothrow( bool _bFilter, OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** executes a dialog which allows the user to chose the columns linking a sub to a master form, and sets the respective MasterFields / SlaveFields @@ -428,7 +428,7 @@ namespace pcr /** returns the URL of our context document @return */ - ::rtl::OUString impl_getDocumentURL_nothrow() const; + OUString impl_getDocumentURL_nothrow() const; private: DECL_LINK( OnDesignerClosed, void* ); diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 26084a394eb2..732c639aab5f 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -113,31 +113,31 @@ namespace pcr IMPLEMENT_GET_IMPLEMENTATION_ID( FormController ) //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL FormController::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL FormController::getImplementationName( ) throw(RuntimeException) { return m_aServiceDescriptor.GetImplementationName(); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL FormController::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL FormController::getSupportedServiceNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() ); + Sequence< OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() ); aSupported.realloc( aSupported.getLength() + 1 ); - aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.inspection.ObjectInspector" ); + aSupported[ aSupported.getLength() - 1 ] = OUString( "com.sun.star.inspection.ObjectInspector" ); return aSupported; } //------------------------------------------------------------------------ - ::rtl::OUString FormController::getImplementationName_static( ) throw(RuntimeException) + OUString FormController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.FormController"); + return OUString("org.openoffice.comp.extensions.FormController"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.form.PropertyBrowserController"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.form.PropertyBrowserController"); return aSupported; } @@ -169,7 +169,7 @@ namespace pcr aProps[0] = Property( PROPERTY_CURRENTPAGE, OWN_PROPERTY_ID_CURRENTPAGE, - ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), + ::getCppuType( static_cast< OUString* >( NULL ) ), PropertyAttribute::TRANSIENT ); aProps[1] = Property( @@ -256,16 +256,16 @@ namespace pcr //= DialogController //==================================================================== //------------------------------------------------------------------------ - ::rtl::OUString DialogController::getImplementationName_static( ) throw(RuntimeException) + OUString DialogController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.DialogController"); + return OUString("org.openoffice.comp.extensions.DialogController"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.awt.PropertyBrowserController"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.awt.PropertyBrowserController"); return aSupported; } diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 3cb2f5cdc177..ef21dda890a8 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -35,9 +35,9 @@ namespace pcr //==================================================================== struct ServiceDescriptor { - ::rtl::OUString + OUString ( *GetImplementationName )( void ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > ( *GetSupportedServiceNames )( void ); }; @@ -69,8 +69,8 @@ namespace pcr ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) 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::uno::XComponentContext >&); @@ -81,8 +81,8 @@ namespace pcr DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet and friends virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -111,8 +111,8 @@ namespace pcr { public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) 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::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 807164e19589..6738b66ae02c 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -214,21 +214,21 @@ namespace pcr const Reference< XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (RuntimeException); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (RuntimeException); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (RuntimeException); protected: ~FormGeometryHandler(); protected: // XPropertyHandler overriables - virtual Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException); - virtual LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException); + virtual LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException); // OComponentHandler overridables virtual void SAL_CALL disposing(); @@ -312,21 +312,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); + return OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.FormGeometryHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.FormGeometryHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL FormGeometryHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL FormGeometryHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -375,7 +375,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL FormGeometryHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL FormGeometryHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -441,7 +441,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -508,15 +508,15 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aInterestedIn(1); + Sequence< OUString > aInterestedIn(1); aInterestedIn[0] = PROPERTY_TEXT_ANCHOR_TYPE; return aInterestedIn; } //-------------------------------------------------------------------- - void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -600,7 +600,7 @@ namespace pcr if ( !xPSI->hasPropertyByName( PROPERTY_ANCHOR ) ) return false; Reference< XServiceInfo > xSI( m_xAssociatedShape, UNO_QUERY_THROW ); - if ( xSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.Shape" ) ) ) + if ( xSI->supportsService( OUString( "com.sun.star.sheet.Shape" ) ) ) return true; } catch( const Exception& ) @@ -710,10 +710,10 @@ namespace pcr { struct EventTranslation { - ::rtl::OUString sPropertyName; + OUString sPropertyName; Any aNewPropertyValue; - EventTranslation( const ::rtl::OUString& _propertyName, const Any& _newPropertyValue ) + EventTranslation( const OUString& _propertyName, const Any& _newPropertyValue ) :sPropertyName( _propertyName ) ,aNewPropertyValue( _newPropertyValue ) { @@ -779,7 +779,7 @@ namespace pcr try { Reference< XPropertySet > xShapeProperties( m_xShape, UNO_QUERY_THROW ); - xShapeProperties->addPropertyChangeListener( ::rtl::OUString(), this ); + xShapeProperties->addPropertyChangeListener( OUString(), this ); } catch( const Exception& ) { @@ -794,7 +794,7 @@ namespace pcr try { Reference< XPropertySet > xShapeProperties( m_xShape, UNO_QUERY_THROW ); - xShapeProperties->removePropertyChangeListener( ::rtl::OUString(), this ); + xShapeProperties->removePropertyChangeListener( OUString(), this ); } catch( const Exception& ) { diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index cefae712007f..2fdf007266d1 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -86,7 +86,7 @@ namespace pcr bool GetFieldName( LinkParticipant _eWhich, String& /* [out] */ _rName ) const; void SetFieldName( LinkParticipant _eWhich, const String& _rName ); - void fillList( LinkParticipant _eWhich, const Sequence< ::rtl::OUString >& _rFieldNames ); + void fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames ); private: DECL_LINK( OnFieldNameChanged, ComboBox* ); @@ -109,12 +109,12 @@ namespace pcr } //------------------------------------------------------------------------ - void FieldLinkRow::fillList( LinkParticipant _eWhich, const Sequence< ::rtl::OUString >& _rFieldNames ) + void FieldLinkRow::fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames ) { ComboBox* pBox = ( _eWhich == eDetailField ) ? &m_aDetailColumn : &m_aMasterColumn; - const ::rtl::OUString* pFieldName = _rFieldNames.getConstArray(); - const ::rtl::OUString* pFieldNameEnd = pFieldName + _rFieldNames.getLength(); + const OUString* pFieldName = _rFieldNames.getConstArray(); + const OUString* pFieldNameEnd = pFieldName + _rFieldNames.getLength(); for ( ; pFieldName != pFieldNameEnd; ++pFieldName ) pBox->InsertEntry( *pFieldName ); } @@ -149,9 +149,9 @@ namespace pcr //------------------------------------------------------------------------ FormLinkDialog::FormLinkDialog( Window* _pParent, const Reference< XPropertySet >& _rxDetailForm, const Reference< XPropertySet >& _rxMasterForm, const Reference< XComponentContext >& _rxContext, - const ::rtl::OUString& _sExplanation, - const ::rtl::OUString& _sDetailLabel, - const ::rtl::OUString& _sMasterLabel) + const OUString& _sExplanation, + const OUString& _sDetailLabel, + const OUString& _sMasterLabel) :ModalDialog( _pParent, PcrRes( RID_DLG_FORMLINKS ) ) ,m_aExplanation( this, PcrRes( FT_EXPLANATION ) ) ,m_aDetailLabel( this, PcrRes( FT_DETAIL_LABEL ) ) @@ -194,8 +194,8 @@ namespace pcr void FormLinkDialog::commitLinkPairs() { // collect the field lists from the rows - ::std::vector< ::rtl::OUString > aDetailFields; aDetailFields.reserve( 4 ); - ::std::vector< ::rtl::OUString > aMasterFields; aMasterFields.reserve( 4 ); + ::std::vector< OUString > aDetailFields; aDetailFields.reserve( 4 ); + ::std::vector< OUString > aMasterFields; aMasterFields.reserve( 4 ); const FieldLinkRow* aRows[] = { m_aRow1.get(), m_aRow2.get(), m_aRow3.get(), m_aRow4.get() @@ -219,10 +219,10 @@ namespace pcr Reference< XPropertySet > xDetailFormProps( m_xDetailForm, UNO_QUERY ); if ( xDetailFormProps.is() ) { - ::rtl::OUString *pFields = aDetailFields.empty() ? 0 : &aDetailFields[0]; - xDetailFormProps->setPropertyValue( PROPERTY_DETAILFIELDS, makeAny( Sequence< ::rtl::OUString >( pFields, aDetailFields.size() ) ) ); + OUString *pFields = aDetailFields.empty() ? 0 : &aDetailFields[0]; + xDetailFormProps->setPropertyValue( PROPERTY_DETAILFIELDS, makeAny( Sequence< OUString >( pFields, aDetailFields.size() ) ) ); pFields = aMasterFields.empty() ? 0 : &aMasterFields[0]; - xDetailFormProps->setPropertyValue( PROPERTY_MASTERFIELDS, makeAny( Sequence< ::rtl::OUString >( pFields, aMasterFields.size() ) ) ); + xDetailFormProps->setPropertyValue( PROPERTY_MASTERFIELDS, makeAny( Sequence< OUString >( pFields, aMasterFields.size() ) ) ); } } catch( const Exception& ) @@ -245,10 +245,10 @@ namespace pcr //------------------------------------------------------------------------ void FormLinkDialog::initializeFieldLists() { - Sequence< ::rtl::OUString > sDetailFields; + Sequence< OUString > sDetailFields; getFormFields( m_xDetailForm, sDetailFields ); - Sequence< ::rtl::OUString > sMasterFields; + Sequence< OUString > sMasterFields; getFormFields( m_xMasterForm, sMasterFields ); FieldLinkRow* aRows[] = { @@ -293,14 +293,14 @@ namespace pcr } //------------------------------------------------------------------------ - void FormLinkDialog::initializeFieldRowsFrom( Sequence< ::rtl::OUString >& _rDetailFields, Sequence< ::rtl::OUString >& _rMasterFields ) + void FormLinkDialog::initializeFieldRowsFrom( Sequence< OUString >& _rDetailFields, Sequence< OUString >& _rMasterFields ) { // our UI does allow 4 fields max _rDetailFields.realloc( 4 ); _rMasterFields.realloc( 4 ); - const ::rtl::OUString* pDetailFields = _rDetailFields.getConstArray(); - const ::rtl::OUString* pMasterFields = _rMasterFields.getConstArray(); + const OUString* pDetailFields = _rDetailFields.getConstArray(); + const OUString* pMasterFields = _rMasterFields.getConstArray(); FieldLinkRow* aRows[] = { m_aRow1.get(), m_aRow2.get(), m_aRow3.get(), m_aRow4.get() @@ -317,8 +317,8 @@ namespace pcr { try { - Sequence< ::rtl::OUString > aDetailFields; - Sequence< ::rtl::OUString > aMasterFields; + Sequence< OUString > aDetailFields; + Sequence< OUString > aMasterFields; Reference< XPropertySet > xDetailFormProps( m_xDetailForm, UNO_QUERY ); if ( xDetailFormProps.is() ) @@ -370,7 +370,7 @@ namespace pcr try { sal_Int32 nCommandType = CommandType::COMMAND; - ::rtl::OUString sCommand; + OUString sCommand; xFormProps->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nCommandType; xFormProps->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand; @@ -388,12 +388,12 @@ namespace pcr } //------------------------------------------------------------------------ - void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(( )) + void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< OUString >& /* [out] */ _rNames ) const SAL_THROW(( )) { _rNames.realloc( 0 ); ::dbtools::SQLExceptionInfo aErrorInfo; - ::rtl::OUString sCommand; + OUString sCommand; try { WaitObject aWaitCursor( const_cast< FormLinkDialog* >( this ) ); @@ -430,7 +430,7 @@ namespace pcr { ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG ); sErrorMessage = PcrRes(STR_ERROR_RETRIEVING_COLUMNS).toString(); - sErrorMessage.SearchAndReplace(rtl::OUString('#'), sCommand); + sErrorMessage.SearchAndReplace(OUString('#'), sCommand); } SQLContext aContext; @@ -476,7 +476,7 @@ namespace pcr Reference< XNameAccess > xTables; if ( xTablesInForm.is() ) xTables = xTablesInForm->getTables(); - Sequence< ::rtl::OUString > aTableNames; + Sequence< OUString > aTableNames; if ( xTables.is() ) aTableNames = xTables->getElementNames(); @@ -496,7 +496,7 @@ namespace pcr //------------------------------------------------------------------------ sal_Bool FormLinkDialog::getExistingRelation( const Reference< XPropertySet >& _rxLHS, const Reference< XPropertySet >& /*_rxRHS*/, // TODO: fix the usage of _rxRHS. This is issue #i81956#. - Sequence< ::rtl::OUString >& _rLeftFields, Sequence< ::rtl::OUString >& _rRightFields ) const + Sequence< OUString >& _rLeftFields, Sequence< OUString >& _rRightFields ) const { try { @@ -511,14 +511,14 @@ namespace pcr Reference< XColumnsSupplier > xKeyColSupp( xKey, UNO_QUERY ); Reference< XIndexAccess > xKeyColumns; Reference< XPropertySet > xKeyColumn; - ::rtl::OUString sColumnName, sRelatedColumnName; + OUString sColumnName, sRelatedColumnName; const sal_Int32 keyCount = xKeys->getCount(); for ( sal_Int32 key = 0; key < keyCount; ++key ) { xKeys->getByIndex( key ) >>= xKey; sal_Int32 nKeyType = 0; - xKey->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nKeyType; + xKey->getPropertyValue( OUString( "Type" ) ) >>= nKeyType; if ( nKeyType != KeyType::FOREIGN ) continue; @@ -542,7 +542,7 @@ namespace pcr if ( xKeyColumn.is() ) { xKeyColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumnName; - xKeyColumn->getPropertyValue( ::rtl::OUString( "RelatedColumn" ) ) >>= sRelatedColumnName; + xKeyColumn->getPropertyValue( OUString( "RelatedColumn" ) ) >>= sRelatedColumnName; _rLeftFields[ column ] = sColumnName; _rRightFields[ column ] = sRelatedColumnName; @@ -574,7 +574,7 @@ namespace pcr // only show the button when both forms are based on the same data source if ( bEnable ) { - ::rtl::OUString sMasterDS, sDetailDS; + OUString sMasterDS, sDetailDS; xMasterFormProps->getPropertyValue( PROPERTY_DATASOURCE ) >>= sMasterDS; xDetailFormProps->getPropertyValue( PROPERTY_DATASOURCE ) >>= sDetailDS; bEnable = ( sMasterDS == sDetailDS ); diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 7c859fc01cdf..48aa39db7213 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -64,13 +64,13 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xMasterForm; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aRelationDetailColumns; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aRelationMasterColumns; - ::rtl::OUString m_sDetailLabel; - ::rtl::OUString m_sMasterLabel; + OUString m_sDetailLabel; + OUString m_sMasterLabel; public: FormLinkDialog( @@ -78,9 +78,9 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDetailForm, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxMasterForm, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _sExplanation = ::rtl::OUString(), - const ::rtl::OUString& _sDetailLabel = ::rtl::OUString(), - const ::rtl::OUString& _sMasterLabel = ::rtl::OUString() + const OUString& _sExplanation = OUString(), + const OUString& _sDetailLabel = OUString(), + const OUString& _sMasterLabel = OUString() ); ~FormLinkDialog( ); @@ -100,8 +100,8 @@ namespace pcr void commitLinkPairs(); void initializeFieldRowsFrom( - ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rDetailFields, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rMasterFields + ::com::sun::star::uno::Sequence< OUString >& _rDetailFields, + ::com::sun::star::uno::Sequence< OUString >& _rMasterFields ); String getFormDataSourceType( @@ -110,7 +110,7 @@ namespace pcr void getFormFields( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rNames + ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); void ensureFormConnection( @@ -128,8 +128,8 @@ namespace pcr sal_Bool getExistingRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxLHS, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxRHS, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rLeftFields, - ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rRightFields + ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rLeftFields, + ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rRightFields ) const; }; diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index a150e3160fac..f1cb08caff6e 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -42,21 +42,21 @@ namespace pcr { String sName; String sTranslation; - rtl::OString sHelpId; + OString sHelpId; sal_Int32 nId; sal_uInt32 nUIFlags; OPropertyInfoImpl( - const ::rtl::OUString& rName, + const OUString& rName, sal_Int32 _nId, const String& aTranslation, - const rtl::OString&, + const OString&, sal_uInt32 _nUIFlags); }; //------------------------------------------------------------------------ - OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId, - const String& aString, const rtl::OString& sHid, sal_uInt32 _nUIFlags) + OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId, + const String& aString, const OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) ,sTranslation(aString) ,sHelpId(sHid) @@ -381,10 +381,10 @@ namespace pcr } //------------------------------------------------------------------------ - rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return (pInfo) ? pInfo->sHelpId : rtl::OString(); + return (pInfo) ? pInfo->sHelpId : OString(); } //------------------------------------------------------------------------ @@ -402,7 +402,7 @@ namespace pcr } //------------------------------------------------------------------------ - ::std::vector< ::rtl::OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const + ::std::vector< OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const { OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ), "OPropertyInfoService::getPropertyEnumRepresentations: this is no enum property!" ); @@ -506,7 +506,7 @@ namespace pcr break; } - ::std::vector< ::rtl::OUString > aReturn; + ::std::vector< OUString > aReturn; if ( nStringItemsResId ) { @@ -526,7 +526,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool OPropertyInfoService::isComposeable( const ::rtl::OUString& _rPropertyName ) const + sal_Bool OPropertyInfoService::isComposeable( const OUString& _rPropertyName ) const { sal_Int32 nId = getPropertyId( _rPropertyName ); if ( nId == -1 ) @@ -593,17 +593,17 @@ namespace pcr } //-------------------------------------------------------------------- - ::std::vector< ::rtl::OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const + ::std::vector< OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const { return m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); } //-------------------------------------------------------------------- - void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const ::rtl::OUString& _rDescription, Any& _out_rValue ) const + void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const { sal_uInt32 nPropertyUIFlags = m_rMetaData.getPropertyUIFlags( m_nPropertyId ); - ::std::vector< ::rtl::OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); - ::std::vector< ::rtl::OUString >::const_iterator pos = ::std::find( aEnumStrings.begin(), aEnumStrings.end(), _rDescription ); + ::std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); + ::std::vector< OUString >::const_iterator pos = ::std::find( aEnumStrings.begin(), aEnumStrings.end(), _rDescription ); if ( pos != aEnumStrings.end() ) { sal_Int32 nPos = pos - aEnumStrings.begin(); @@ -642,9 +642,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const + OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const { - ::rtl::OUString sReturn; + OUString sReturn; sal_Int32 nIntValue = -1; OSL_VERIFY( ::cppu::enum2int( nIntValue, _rEnumValue ) ); @@ -653,7 +653,7 @@ namespace pcr // enum value starting with 1 --nIntValue; - ::std::vector< ::rtl::OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); + ::std::vector< OUString > aEnumStrings = m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); if ( ( nIntValue >= 0 ) && ( nIntValue < (sal_Int32)aEnumStrings.size() ) ) { sReturn = aEnumStrings[ nIntValue ]; diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index fdb5819b4f76..1f2340614c52 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -47,13 +47,13 @@ namespace pcr // IPropertyInfoService virtual sal_Int32 getPropertyId(const String& _rName) const; virtual String getPropertyTranslation(sal_Int32 _nId) const; - virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const; + virtual OString getPropertyHelpId(sal_Int32 _nId) const; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; - virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const; + virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const; virtual String getPropertyName( sal_Int32 _nPropId ); - virtual sal_Bool isComposeable( const ::rtl::OUString& _rPropertyName ) const; + virtual sal_Bool isComposeable( const OUString& _rPropertyName ) const; protected: static const OPropertyInfoImpl* getPropertyInfo(); @@ -91,10 +91,10 @@ namespace pcr protected: // IPropertyEnumRepresentation implementqation - virtual ::std::vector< ::rtl::OUString > + virtual ::std::vector< OUString > SAL_CALL getDescriptions() const; - virtual void SAL_CALL getValueFromDescription( const ::rtl::OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; - virtual ::rtl::OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; + virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; + virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; // IReference implementqation virtual oslInterlockedCount SAL_CALL acquire(); diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 703c0985c9a2..cb9d4704e8c9 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -75,10 +75,10 @@ namespace pcr EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType ); // IPropertyEnumRepresentation implementqation - virtual ::std::vector< ::rtl::OUString > + virtual ::std::vector< OUString > SAL_CALL getDescriptions() const; - virtual void SAL_CALL getValueFromDescription( const ::rtl::OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; - virtual ::rtl::OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; + virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const; + virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const; // IReference implementqation virtual oslInterlockedCount SAL_CALL acquire(); @@ -103,7 +103,7 @@ namespace pcr if ( _rxContext.is() ) { Reference< XHierarchicalNameAccess > xTypeDescProv( - _rxContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), + _rxContext->getValueByName( OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), UNO_QUERY_THROW ); m_xTypeDescription = Reference< XEnumTypeDescription >( xTypeDescProv->getByHierarchicalName( m_aEnumType.getTypeName() ), UNO_QUERY_THROW ); @@ -116,9 +116,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::std::vector< ::rtl::OUString > EnumRepresentation::getDescriptions() const + ::std::vector< OUString > EnumRepresentation::getDescriptions() const { - Sequence< ::rtl::OUString > aNames; + Sequence< OUString > aNames; try { if ( m_xTypeDescription.is() ) @@ -129,7 +129,7 @@ namespace pcr OSL_FAIL( "EnumRepresentation::getDescriptions: caught an exception!" ); } - return ::std::vector< ::rtl::OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); + return ::std::vector< OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); } //-------------------------------------------------------------------- @@ -148,9 +148,9 @@ namespace pcr } //-------------------------------------------------------------------- - void EnumRepresentation::getValueFromDescription( const ::rtl::OUString& _rDescription, Any& _out_rValue ) const + void EnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const { - ::std::vector< ::rtl::OUString > aDescriptions( getDescriptions() ); + ::std::vector< OUString > aDescriptions( getDescriptions() ); sal_Int32 index = ::std::find( aDescriptions.begin(), aDescriptions.end(), _rDescription ) - aDescriptions.begin(); @@ -168,9 +168,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString EnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const + OUString EnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const { - ::rtl::OUString sDescription; + OUString sDescription; sal_Int32 nAsInt = 0; OSL_VERIFY( ::cppu::enum2int( nAsInt, _rEnumValue ) ); @@ -181,7 +181,7 @@ namespace pcr sal_Int32 index = ::std::find( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), nAsInt ) - aValues.getConstArray(); - ::std::vector< ::rtl::OUString > aDescriptions( getDescriptions() ); + ::std::vector< OUString > aDescriptions( getDescriptions() ); if ( ( index >= 0 ) && ( index < (sal_Int32)aDescriptions.size() ) ) sDescription = aDescriptions[ index ]; else @@ -229,7 +229,7 @@ namespace pcr virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException); protected: - void impl_dispatch_throw( const ::rtl::OUString& _rURL ); + void impl_dispatch_throw( const OUString& _rURL ); }; //-------------------------------------------------------------------- @@ -263,9 +263,9 @@ namespace pcr Reference< XPropertyControl > xControl( rEvent.Source, UNO_QUERY_THROW ); Any aControlValue( xControl->getValue() ); - ::rtl::OUString sURL; + OUString sURL; if ( aControlValue.hasValue() && !( aControlValue >>= sURL ) ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); if ( sURL.isEmpty() ) return; @@ -280,17 +280,17 @@ namespace pcr } //-------------------------------------------------------------------- - void UrlClickHandler::impl_dispatch_throw( const ::rtl::OUString& _rURL ) + void UrlClickHandler::impl_dispatch_throw( const OUString& _rURL ) { Reference< XURLTransformer > xTransformer( URLTransformer::create(m_aContext.getUNOContext()) ); - URL aURL; aURL.Complete = ::rtl::OUString( ".uno:OpenHyperlink" ); + URL aURL; aURL.Complete = OUString( ".uno:OpenHyperlink" ); xTransformer->parseStrict( aURL ); Reference< XDesktop2 > xDispProv = Desktop::create( m_aContext.getUNOContext() ); - Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, ::rtl::OUString(), 0 ), UNO_QUERY_THROW ); + Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, OUString(), 0 ), UNO_QUERY_THROW ); Sequence< PropertyValue > aDispatchArgs(1); - aDispatchArgs[0].Name = ::rtl::OUString("URL"); + aDispatchArgs[0].Name = OUString("URL"); aDispatchArgs[0].Value <<= _rURL; xDispatch->dispatch( aURL, aDispatchArgs ); @@ -319,35 +319,35 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL GenericPropertyHandler::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL GenericPropertyHandler::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() ); + StlSyntaxSequence< OUString > aAllServices( getSupportedServiceNames() ); return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.inspection.GenericPropertyHandler" ); return aSupported; } @@ -369,7 +369,7 @@ namespace pcr ::cppu::OInterfaceIteratorHelper iterRemove( m_aPropertyListeners ); ::cppu::OInterfaceIteratorHelper iterReAdd( m_aPropertyListeners ); // this holds a copy of the container ... while ( iterRemove.hasMoreElements() ) - m_xComponent->removePropertyChangeListener( ::rtl::OUString(), static_cast< XPropertyChangeListener* >( iterRemove.next() ) ); + m_xComponent->removePropertyChangeListener( OUString(), static_cast< XPropertyChangeListener* >( iterRemove.next() ) ); m_xComponentIntrospectionAccess.clear(); m_xComponent.clear(); @@ -380,7 +380,7 @@ namespace pcr Reference< XIntrospectionAccess > xIntrospectionAccess( xIntrospection->inspect( makeAny( _rxIntrospectee ) ) ); if ( !xIntrospectionAccess.is() ) - throw RuntimeException( ::rtl::OUString( "The introspection service could not handle the given component." ), *this ); + throw RuntimeException( OUString( "The introspection service could not handle the given component." ), *this ); m_xComponent = Reference< XPropertySet >( xIntrospectionAccess->queryAdapter( XPropertySet::static_type() ), UNO_QUERY_THROW ); // now that we survived so far, remember m_xComponentIntrospectionAccess @@ -392,11 +392,11 @@ namespace pcr // re-add the property change listeners while ( iterReAdd.hasMoreElements() ) - m_xComponent->addPropertyChangeListener( ::rtl::OUString(), static_cast< XPropertyChangeListener* >( iterReAdd.next() ) ); + m_xComponent->addPropertyChangeListener( OUString(), static_cast< XPropertyChangeListener* >( iterReAdd.next() ) ); } //-------------------------------------------------------------------- - Any SAL_CALL GenericPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL GenericPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xComponent.is() ) @@ -406,7 +406,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL GenericPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL GenericPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xComponent.is() ) @@ -425,7 +425,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); const_cast< GenericPropertyHandler* >( this )->impl_ensurePropertyMap(); @@ -441,7 +441,7 @@ namespace pcr if ( pos->second.Type.getTypeClass() == TypeClass_ENUM ) { - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); impl_getEnumConverter( pos->second.Type )->getValueFromDescription( sControlValue, aPropertyValue ); } @@ -452,7 +452,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL GenericPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL GenericPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); const_cast< GenericPropertyHandler* >( this )->impl_ensurePropertyMap(); @@ -476,7 +476,7 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyState eState = PropertyState_DIRECT_VALUE; @@ -497,7 +497,7 @@ namespace pcr { try { - m_xComponent->addPropertyChangeListener( ::rtl::OUString(), _rxListener ); + m_xComponent->addPropertyChangeListener( OUString(), _rxListener ); } catch( const UnknownPropertyException& ) { @@ -514,7 +514,7 @@ namespace pcr { try { - m_xComponent->removePropertyChangeListener( ::rtl::OUString(), _rxListener ); + m_xComponent->removePropertyChangeListener( OUString(), _rxListener ); } catch( const UnknownPropertyException& ) { @@ -605,24 +605,24 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { // no superseded properties at all. This handler offers the very basic PropertyHandler // functionality, so it's much more likely that other handlers want to supersede // *our* properties .... - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { // This basic PropertyHandler implementation is too dumb^Wgeneric to know // anything about property dependencies - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL GenericPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL GenericPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -667,25 +667,25 @@ namespace pcr if ( !aDescriptor.Control.is() ) PropertyHandlerHelper::describePropertyLine( pos->second, aDescriptor, _rxControlFactory ); - aDescriptor.Category = ::rtl::OUString( "General" ); + aDescriptor.Category = OUString( "General" ); return aDescriptor; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return sal_False; } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { OSL_FAIL( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" ); return InteractiveSelectionResult_Cancelled; } //-------------------------------------------------------------------- - void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { OSL_FAIL( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" ); } diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 3ba0cb1fcace..f054a30c1dac 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -82,8 +82,8 @@ namespace pcr public: // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); protected: @@ -96,23 +96,23 @@ namespace pcr protected: // XPropertyHandler overridables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -120,9 +120,9 @@ namespace pcr virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); private: /** ensures that ->m_aProperties is initialized diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 83568ad2286a..8561f818d6d6 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -74,7 +74,7 @@ namespace pcr // special handling for booleans (this will become a list) if ( _rProperty.Type.getTypeClass() == TypeClass_BOOLEAN ) { - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); _out_rDescriptor.Control = createListBoxControl( _rxControlFactory, aListEntries, bReadOnlyControl, sal_False ); return; @@ -117,7 +117,7 @@ namespace pcr { Reference< XPropertyControl > lcl_implCreateListLikeControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted, sal_Bool _bTrueIfListBoxFalseIfComboBox @@ -130,11 +130,11 @@ namespace pcr UNO_QUERY_THROW ); - ::std::vector< ::rtl::OUString > aInitialEntries( _rInitialListEntries ); + ::std::vector< OUString > aInitialEntries( _rInitialListEntries ); if ( _bSorted ) ::std::sort( aInitialEntries.begin(), aInitialEntries.end() ); - for ( ::std::vector< ::rtl::OUString >::const_iterator loop = aInitialEntries.begin(); + for ( ::std::vector< OUString >::const_iterator loop = aInitialEntries.begin(); loop != aInitialEntries.end(); ++loop ) @@ -145,14 +145,14 @@ namespace pcr //-------------------------------------------------------------------- Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) { return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_True ); } //-------------------------------------------------------------------- Reference< XPropertyControl > PropertyHandlerHelper::createComboBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) { return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_False ); } @@ -188,7 +188,7 @@ namespace pcr if ( _rControlValue.getValueType().getTypeClass() == TypeClass_STRING ) { - ::rtl::OUString sControlValue; + OUString sControlValue; _rControlValue >>= sControlValue; Reference< XStringRepresentation > xConversionHelper = StringRepresentation::create( _rxContext,_rxTypeConverter ); diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 3d212affa8d0..b9a1d1aff5c9 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -95,7 +95,7 @@ namespace pcr static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > createListBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ); @@ -121,7 +121,7 @@ namespace pcr static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > createComboBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory, - const ::std::vector< ::rtl::OUString >& _rInitialListEntries, + const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ); diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 671fdddd2cbe..d8ebe0780ec0 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -98,25 +98,25 @@ namespace pcr ,m_bIsReadOnly( sal_False ) { registerProperty( - ::rtl::OUString( "HasHelpSection" ), + OUString( "HasHelpSection" ), MODEL_PROPERTY_ID_HAS_HELP_SECTION, PropertyAttribute::READONLY, &m_bHasHelpSection, ::getCppuType( &m_bHasHelpSection ) ); registerProperty( - ::rtl::OUString( "MinHelpTextLines" ), + OUString( "MinHelpTextLines" ), MODEL_PROPERTY_ID_MIN_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMinHelpTextLines, ::getCppuType( &m_nMinHelpTextLines ) ); registerProperty( - ::rtl::OUString( "MaxHelpTextLines" ), + OUString( "MaxHelpTextLines" ), MODEL_PROPERTY_ID_MAX_HELP_TEXT_LINES, PropertyAttribute::READONLY, &m_nMaxHelpTextLines, ::getCppuType( &m_nMaxHelpTextLines ) ); registerProperty( - ::rtl::OUString( "IsReadOnly" ), + OUString( "IsReadOnly" ), MODEL_PROPERTY_ID_IS_READ_ONLY, PropertyAttribute::BOUND, &m_bIsReadOnly, ::getCppuType( &m_bIsReadOnly ) @@ -235,10 +235,10 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL ImplInspectorModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator check = aSupported.begin(); + StlSyntaxSequence< OUString > aSupported( getSupportedServiceNames() ); + for ( StlSyntaxSequence< OUString >::const_iterator check = aSupported.begin(); check != aSupported.end(); ++check ) diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index a82e64601a94..bc12d78a7069 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.hxx @@ -81,7 +81,7 @@ namespace pcr virtual void SAL_CALL setIsReadOnly( ::sal_Bool _IsReadOnly ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); protected: void enableHelpSectionProperties( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index 578897182d73..074ce565f444 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -32,7 +32,7 @@ namespace pcr //======================================================================== struct OLineDescriptor : public ::com::sun::star::inspection::LineDescriptor { - ::rtl::OUString sName; // the name of the property + OUString sName; // the name of the property ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > xPropertyHandler; // the handler for this property ::com::sun::star::uno::Any aValue; // the current value of the property diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index b5b88415cb22..75b040df8d9f 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -38,7 +38,7 @@ namespace pcr //==================================================================== //-------------------------------------------------------------------- ListSelectionDialog::ListSelectionDialog( Window* _pParent, const Reference< XPropertySet >& _rxListBox, - const ::rtl::OUString& _rPropertyName, const String& _rPropertyUIName ) + const OUString& _rPropertyName, const String& _rPropertyUIName ) :ModalDialog( _pParent, PcrRes( RID_DLG_SELECTION ) ) ,m_aLabel ( this, PcrRes( FT_ENTRIES ) ) ,m_aEntries ( this, PcrRes( LB_ENTRIES ) ) @@ -85,7 +85,7 @@ namespace pcr m_aEntries.EnableMultiSelection( bMultiSelection ); // fill the list box with all entries - Sequence< ::rtl::OUString > aListEntries; + Sequence< OUString > aListEntries; OSL_VERIFY( m_xListBox->getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aListEntries ); fillEntryList( aListEntries ); @@ -120,11 +120,11 @@ namespace pcr } //-------------------------------------------------------------------- - void ListSelectionDialog::fillEntryList( const Sequence< ::rtl::OUString >& _rListEntries ) + void ListSelectionDialog::fillEntryList( const Sequence< OUString >& _rListEntries ) { m_aEntries.Clear(); - const ::rtl::OUString* _pListEntries = _rListEntries.getConstArray(); - const ::rtl::OUString* _pListEntriesEnd = _rListEntries.getConstArray() + _rListEntries.getLength(); + const OUString* _pListEntries = _rListEntries.getConstArray(); + const OUString* _pListEntriesEnd = _rListEntries.getConstArray() + _rListEntries.getLength(); for ( ; _pListEntries < _pListEntriesEnd; ++_pListEntries ) m_aEntries.InsertEntry( *_pListEntries ); } diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index 67083efed777..79c4e9c589c6 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.hxx @@ -46,13 +46,13 @@ namespace pcr ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xListBox; - ::rtl::OUString m_sPropertyName; + OUString m_sPropertyName; public: ListSelectionDialog( Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxListBox, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const String& _rPropertyUIName ); @@ -63,7 +63,7 @@ namespace pcr void initialize( ); void commitSelection(); - void fillEntryList ( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rListEntries ); + void fillEntryList ( const ::com::sun::star::uno::Sequence< OUString >& _rListEntries ); void selectEntries ( const ::com::sun::star::uno::Sequence< sal_Int16 >& /* [in ] */ _rSelection ); void collectSelection( ::com::sun::star::uno::Sequence< sal_Int16 >& /* [out] */ _rSelection ); diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index c0bc996d5bce..0da7a156f6fc 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -32,7 +32,7 @@ namespace pcr //= NewDataTypeDialog //==================================================================== //-------------------------------------------------------------------- - NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const ::rtl::OUString& _rNameBase, const ::std::vector< ::rtl::OUString >& _rProhibitedNames ) + NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) :ModalDialog( _pParent, PcrRes( RID_DLG_NEW_DATA_TYPE ) ) ,m_aLabel ( this, PcrRes( FT_LABEL ) ) ,m_aName ( this, PcrRes( ED_NAME ) ) @@ -64,7 +64,7 @@ namespace pcr sal_Int32 nPostfixNumber = 1; do { - ( sInitialName = sNameBase ) += rtl::OUString::valueOf(nPostfixNumber++); + ( sInitialName = sNameBase ) += OUString::valueOf(nPostfixNumber++); } while ( m_aProhibitedNames.find( sInitialName ) != m_aProhibitedNames.end() ); diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index 57395679da52..b78fe3774e8a 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -44,11 +44,11 @@ namespace pcr OKButton m_aOK; CancelButton m_aCancel; - ::std::set< ::rtl::OUString > + ::std::set< OUString > m_aProhibitedNames; public: - NewDataTypeDialog( Window* _pParent, const ::rtl::OUString& _rNameBase, const ::std::vector< ::rtl::OUString >& _rProhibitedNames ); + NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ); inline String GetName() const { return m_aName.GetText(); } diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 68d22900ad86..edd9f883f3cd 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -64,18 +64,18 @@ namespace pcr // XObjectInspectorModel virtual Sequence< Any > SAL_CALL getHandlerFactories() throw (RuntimeException); virtual Sequence< PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (RuntimeException); - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const ::rtl::OUString& PropertyName ) throw (RuntimeException); + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (RuntimeException); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(RuntimeException); - static Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(RuntimeException); + static OUString getImplementationName_static( ) throw(RuntimeException); + static Sequence< OUString > getSupportedServiceNames_static( ) throw(RuntimeException); static Reference< XInterface > SAL_CALL Create(const Reference< XComponentContext >&); @@ -112,7 +112,7 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const ::rtl::OUString& /*PropertyName*/ ) throw (RuntimeException) + ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const OUString& /*PropertyName*/ ) throw (RuntimeException) { // no ordering provided by this default implementation return 0; @@ -154,28 +154,28 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } //-------------------------------------------------------------------- - ::rtl::OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException) + OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" ); + return OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - ::rtl::OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); - return Sequence< ::rtl::OUString >( &sService, 1 ); + OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); + return Sequence< OUString >( &sService, 1 ); } //-------------------------------------------------------------------- @@ -188,7 +188,7 @@ namespace pcr void ObjectInspectorModel::createDefault() { m_aFactories.realloc( 1 ); - m_aFactories[0] <<= ::rtl::OUString( "com.sun.star.inspection.GenericPropertyHandler" ); + m_aFactories[0] <<= OUString( "com.sun.star.inspection.GenericPropertyHandler" ); } //-------------------------------------------------------------------- @@ -214,7 +214,7 @@ namespace pcr void ObjectInspectorModel::impl_verifyArgument_throw( bool _bCondition, sal_Int16 _nArgumentPosition ) { if ( !_bCondition ) - throw IllegalArgumentException( ::rtl::OUString(), *this, _nArgumentPosition ); + throw IllegalArgumentException( OUString(), *this, _nArgumentPosition ); } //........................................................................ diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index aee7ce160773..1fef1572cc1c 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -36,20 +36,20 @@ namespace pcr //= HelpIdUrl //======================================================================== //------------------------------------------------------------------------ - rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) + OString HelpIdUrl::getHelpId( const OUString& _rHelpURL ) { INetURLObject aHID( _rHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) - return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); else - return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) + OUString HelpIdUrl::getHelpURL( const OString& sHelpId ) { - ::rtl::OUStringBuffer aBuffer; - ::rtl::OUString aTmp( rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); + OUStringBuffer aBuffer; + OUString aTmp( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); INetURLObject aHID( aTmp ); if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) aBuffer.appendAscii( INET_HID_SCHEME ); diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 6412839fb0a7..e3216ad295ec 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -66,8 +66,8 @@ namespace pcr class HelpIdUrl { public: - static rtl::OString getHelpId( const ::rtl::OUString& _rHelpURL ); - static ::rtl::OUString getHelpURL( const rtl::OString& ); + static OString getHelpId( const OUString& _rHelpURL ); + static OUString getHelpURL( const OString& ); }; //==================================================================== diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx index 52b476e12f9f..cb2a560de9b8 100644 --- a/extensions/source/propctrlr/pcrcommontypes.hxx +++ b/extensions/source/propctrlr/pcrcommontypes.hxx @@ -30,7 +30,7 @@ namespace pcr { //........................................................................ - typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > + typedef ::boost::unordered_map< OUString, ::com::sun::star::beans::Property, OUStringHash > PropertyMap; //........................................................................ diff --git a/extensions/source/propctrlr/pcrcomponentcontext.cxx b/extensions/source/propctrlr/pcrcomponentcontext.cxx index b05e71b48f5e..95af777606c0 100644 --- a/extensions/source/propctrlr/pcrcomponentcontext.cxx +++ b/extensions/source/propctrlr/pcrcomponentcontext.cxx @@ -55,7 +55,7 @@ namespace pcr } //------------------------------------------------------------------------ - Any ComponentContext::getContextValueByName( const ::rtl::OUString& _rName ) const + Any ComponentContext::getContextValueByName( const OUString& _rName ) const { Any aReturn; try @@ -70,7 +70,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XInterface > ComponentContext::createComponent( const ::rtl::OUString& _rServiceName ) const + Reference< XInterface > ComponentContext::createComponent( const OUString& _rServiceName ) const { Reference< XInterface > xComponent( m_xORB->createInstanceWithContext( _rServiceName, m_xContext ) diff --git a/extensions/source/propctrlr/pcrcomponentcontext.hxx b/extensions/source/propctrlr/pcrcomponentcontext.hxx index 51476febdfa2..e26a675e6d1b 100644 --- a/extensions/source/propctrlr/pcrcomponentcontext.hxx +++ b/extensions/source/propctrlr/pcrcomponentcontext.hxx @@ -66,7 +66,7 @@ namespace pcr <TRUE/> if and only if the component could be successfully created */ template < class INTERFACE > - bool createComponent( const ::rtl::OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const + bool createComponent( const OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { _out_rxComponent.clear(); _out_rxComponent = _out_rxComponent.query( @@ -83,7 +83,7 @@ namespace pcr template < class INTERFACE > bool createComponent( const sal_Char* _pAsciiServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const { - return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent ); + return createComponent( OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent ); } /** creates a component using our component factory/context @@ -95,7 +95,7 @@ namespace pcr @return the newly created component. Is never <NULL/>. */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const ::rtl::OUString& _rServiceName ) const; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const OUString& _rServiceName ) const; /** creates a component using our component factory/context @@ -108,7 +108,7 @@ namespace pcr */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const sal_Char* _pAsciiServiceName ) const { - return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ) ); + return createComponent( OUString::createFromAscii( _pAsciiServiceName ) ); } /** returns the ->XMultiServiceFactory interface of ->m_xORB, for passing to @@ -128,7 +128,7 @@ namespace pcr @seealso getContextValueByAsciiName */ ::com::sun::star::uno::Any - getContextValueByName( const ::rtl::OUString& _rName ) const; + getContextValueByName( const OUString& _rName ) const; /** retrieves a value from our component context, specified by 8-bit ASCII string @param _rName @@ -141,7 +141,7 @@ namespace pcr inline ::com::sun::star::uno::Any getContextValueByAsciiName( const sal_Char* _pAsciiName ) const { - return getContextValueByName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + return getContextValueByName( OUString::createFromAscii( _pAsciiName ) ); } /** retrieve context to create interfaces by the ctors diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 1ba39549fc01..49caa26c0e94 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -91,7 +91,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::pcr::PcrModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii(pImplementationName)); + OUString::createFromAscii(pImplementationName)); } if (xRet.is()) diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 8fa73ae40d3c..adf013ef2fc7 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -78,15 +78,15 @@ namespace pcr } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException) + OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } //--------------------------------------------------------------------- - ::rtl::OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) + OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.form.ui.OTabOrderDialog"); + return OUString("org.openoffice.comp.form.ui.OTabOrderDialog"); } //--------------------------------------------------------------------- @@ -99,7 +99,7 @@ namespace pcr ::comphelper::StringSequence OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.form.ui.TabOrderDialog" ); + aSupported.getArray()[0] = OUString( "com.sun.star.form.ui.TabOrderDialog" ); return aSupported; } diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 5d51743b5755..8c10693aa711 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -57,12 +57,12 @@ namespace pcr 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::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 61bcb4f020df..6c628a1c8250 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -217,11 +217,11 @@ namespace pcr // dynamically - fine with us return; - void (SAL_CALL XPropertySet::*pListenerOperation)( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) + void (SAL_CALL XPropertySet::*pListenerOperation)( const OUString&, const Reference< XPropertyChangeListener >& ) = _bDoListen ? &XPropertySet::addPropertyChangeListener : &XPropertySet::removePropertyChangeListener; (xModelProperties.get()->*pListenerOperation)( - ::rtl::OUString( "IsReadOnly" ), + OUString( "IsReadOnly" ), const_cast< OPropertyBrowserController* >( this ) ); } @@ -287,7 +287,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const ::rtl::OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException) + Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException) { // we don't have any dispatches at all, right now return Reference< XDispatch >(); @@ -327,12 +327,12 @@ namespace pcr if ( arguments.size() == 1 ) { // constructor: "createWithModel( XObjectInspectorModel )" if ( !( arguments[0] >>= xModel ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); createWithModel( xModel ); return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //------------------------------------------------------------------------ @@ -360,7 +360,7 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); if (_rxFrame.is() && haveView()) - throw RuntimeException(::rtl::OUString("Unable to attach to a second frame."),*this); + throw RuntimeException(OUString("Unable to attach to a second frame."),*this); // revoke as focus listener from the old container window stopContainerWindowListening(); @@ -376,7 +376,7 @@ namespace pcr VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow); Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; if (!pParentWin) - throw RuntimeException(::rtl::OUString("The frame is invalid. Unable to extract the container window."),*this); + throw RuntimeException(OUString("The frame is invalid. Unable to extract the container window."),*this); if ( Construct( pParentWin ) ) { @@ -497,7 +497,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data ) throw(RuntimeException) { - ::rtl::OUString sPageSelection; + OUString sPageSelection; if ( ( Data >>= sPageSelection ) && !sPageSelection.isEmpty() ) { m_sPageSelection = sPageSelection; @@ -557,16 +557,16 @@ namespace pcr } //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------ - sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pArray = aSupported.getConstArray(); for (sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray) if (pArray->equals(ServiceName)) return sal_True; @@ -574,22 +574,22 @@ namespace pcr } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ - ::rtl::OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) + OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString("org.openoffice.comp.extensions.ObjectInspector"); + return OUString("org.openoffice.comp.extensions.ObjectInspector"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.inspection.ObjectInspector"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.inspection.ObjectInspector"); return aSupported; } @@ -655,8 +655,8 @@ namespace pcr if (!haveView()) return; - ::rtl::OUString sOldSelection = m_sPageSelection; - m_sPageSelection = ::rtl::OUString(); + OUString sOldSelection = m_sPageSelection; + m_sPageSelection = OUString(); const sal_uInt16 nCurrentPage = m_pView->getActivaPage(); if ( (sal_uInt16)-1 != nCurrentPage ) @@ -681,7 +681,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_uInt16 OPropertyBrowserController::impl_getPageIdForCategory_nothrow( const ::rtl::OUString& _rCategoryName ) const + sal_uInt16 OPropertyBrowserController::impl_getPageIdForCategory_nothrow( const OUString& _rCategoryName ) const { sal_uInt16 nPageId = (sal_uInt16)-1; HashString2Int16::const_iterator pagePos = m_aPageIds.find( _rCategoryName ); @@ -832,7 +832,7 @@ namespace pcr break; default: - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); } return xControl; @@ -935,14 +935,14 @@ namespace pcr } //------------------------------------------------------------------------ - bool OPropertyBrowserController::impl_hasPropertyHandlerFor_nothrow( const ::rtl::OUString& _rPropertyName ) const + bool OPropertyBrowserController::impl_hasPropertyHandlerFor_nothrow( const OUString& _rPropertyName ) const { PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName ); return ( handlerPos != m_aPropertyHandlers.end() ); } //------------------------------------------------------------------------ - OPropertyBrowserController::PropertyHandlerRef OPropertyBrowserController::impl_getHandlerForProperty_throw( const ::rtl::OUString& _rPropertyName ) const + OPropertyBrowserController::PropertyHandlerRef OPropertyBrowserController::impl_getHandlerForProperty_throw( const OUString& _rPropertyName ) const { PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName ); if ( handlerPos == m_aPropertyHandlers.end() ) @@ -951,7 +951,7 @@ namespace pcr } //------------------------------------------------------------------------ - Any OPropertyBrowserController::impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ) + Any OPropertyBrowserController::impl_getPropertyValue_throw( const OUString& _rPropertyName ) { PropertyHandlerRef handler = impl_getHandlerForProperty_throw( _rPropertyName ); return handler->getPropertyValue( _rPropertyName ); @@ -1038,8 +1038,8 @@ namespace pcr } // determine the superseded properties - StlSyntaxSequence< ::rtl::OUString > aSupersededByThisHandler = (*aHandler)->getSupersededProperties(); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator superseded = aSupersededByThisHandler.begin(); + StlSyntaxSequence< OUString > aSupersededByThisHandler = (*aHandler)->getSupersededProperties(); + for ( StlSyntaxSequence< OUString >::const_iterator superseded = aSupersededByThisHandler.begin(); superseded != aSupersededByThisHandler.end(); ++superseded ) @@ -1071,8 +1071,8 @@ namespace pcr } // see if the handler expresses interest in any actuating properties - StlSyntaxSequence< ::rtl::OUString > aInterestingActuations = (*aHandler)->getActuatingProperties(); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator aLoop = aInterestingActuations.begin(); + StlSyntaxSequence< OUString > aInterestingActuations = (*aHandler)->getActuatingProperties(); + for ( StlSyntaxSequence< OUString >::const_iterator aLoop = aInterestingActuations.begin(); aLoop != aInterestingActuations.end(); ++aLoop ) @@ -1156,9 +1156,9 @@ namespace pcr if ( _rDescriptor.DisplayName.isEmpty() ) { #ifdef DBG_UTIL - ::rtl::OString sMessage( "OPropertyBrowserController::describePropertyLine: handler did not provide a display name for '" ); - sMessage += ::rtl::OString( _rProperty.Name.getStr(), _rProperty.Name.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'!" ); + OString sMessage( "OPropertyBrowserController::describePropertyLine: handler did not provide a display name for '" ); + sMessage += OString( _rProperty.Name.getStr(), _rProperty.Name.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'!" ); DBG_ASSERT( !_rDescriptor.DisplayName.isEmpty(), sMessage.getStr() ); #endif _rDescriptor.DisplayName = _rProperty.Name; @@ -1221,7 +1221,7 @@ namespace pcr // when building the UI below, remember which properties are actuating, // to allow for a initial actuatinPropertyChanged call - ::std::vector< ::rtl::OUString > aActuatingProperties; + ::std::vector< OUString > aActuatingProperties; ::std::vector< Any > aActuatingPropertyValues; // ask the handlers to describe the property UI, and insert the resulting @@ -1237,8 +1237,8 @@ namespace pcr #if OSL_DEBUG_LEVEL > 0 if ( aDescriptor.Category.isEmpty() ) { - ::rtl::OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" ); - sMessage += ::rtl::OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() ); + OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" ); + sMessage += OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() ); sMessage += "'!"; OSL_FAIL( sMessage.getStr() ); } @@ -1250,7 +1250,7 @@ namespace pcr // this category does not yet exist. This is allowed, as an inspector model might be lazy, and not provide // any category information of its own. In this case, we have a fallback ... m_aPageIds[ aDescriptor.Category ] = - getPropertyBox().AppendPage( aDescriptor.Category, rtl::OString() ); + getPropertyBox().AppendPage( aDescriptor.Category, OString() ); nTargetPageId = impl_getPageIdForCategory_nothrow( aDescriptor.Category ); } @@ -1267,7 +1267,7 @@ namespace pcr // update any dependencies for the actuating properties which we encountered { - ::std::vector< ::rtl::OUString >::const_iterator aProperty = aActuatingProperties.begin(); + ::std::vector< OUString >::const_iterator aProperty = aActuatingProperties.begin(); ::std::vector< Any >::const_iterator aPropertyValue = aActuatingPropertyValues.begin(); for ( ; aProperty != aActuatingProperties.end(); ++aProperty, ++aPropertyValue ) impl_broadcastPropertyChange_nothrow( *aProperty, *aPropertyValue, *aPropertyValue, true ); @@ -1316,7 +1316,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::Clicked( const ::rtl::OUString& _rName, sal_Bool _bPrimary ) + void OPropertyBrowserController::Clicked( const OUString& _rName, sal_Bool _bPrimary ) { try { @@ -1360,7 +1360,7 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const ::rtl::OUString& _rName ) throw (RuntimeException) + sal_Bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) { for ( OrderedPropertyMap::const_iterator search = m_aProperties.begin(); search != m_aProperties.end(); @@ -1372,18 +1372,18 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::Commit( const ::rtl::OUString& rName, const Any& _rValue ) + void OPropertyBrowserController::Commit( const OUString& rName, const Any& _rValue ) { try { - rtl::OUString sPlcHolder = String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ); + OUString sPlcHolder = String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ); bool bIsPlaceHolderValue = false; if ( rName.equals( PROPERTY_IMAGE_URL ) ) { // if the prop value is the PlaceHolder // can ignore it - rtl::OUString sVal; + OUString sVal; _rValue >>= sVal; if ( sVal.equals( sPlcHolder ) ) bIsPlaceHolderValue = true; @@ -1427,7 +1427,7 @@ namespace pcr OSL_FAIL("OPropertyBrowserController::Commit : caught an exception !"); } - m_sCommittingProperty = ::rtl::OUString(); + m_sCommittingProperty = OUString(); } //-------------------------------------------------------------------- @@ -1454,7 +1454,7 @@ namespace pcr { Reference< XPropertyHandler > xHandler; - ::rtl::OUString sServiceName; + OUString sServiceName; Reference< XSingleServiceFactory > xServiceFac; Reference< XSingleComponentFactory > xComponentFac; @@ -1486,7 +1486,7 @@ namespace pcr { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface( m_pView ) ) ) + ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface( m_pView ) ) ) }; xHandlerContext = ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), @@ -1544,7 +1544,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool OPropertyBrowserController::impl_findObjectProperty_nothrow( const ::rtl::OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty ) + bool OPropertyBrowserController::impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty ) { OrderedPropertyMap::const_iterator search = m_aProperties.begin(); for ( ; search != m_aProperties.end(); ++search ) @@ -1556,7 +1556,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void OPropertyBrowserController::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1580,7 +1580,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::enablePropertyUI( const ::rtl::OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) + void OPropertyBrowserController::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1593,7 +1593,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) + void OPropertyBrowserController::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1606,7 +1606,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void OPropertyBrowserController::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1656,7 +1656,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + void OPropertyBrowserController::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1669,7 +1669,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::showCategory( const ::rtl::OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) + void OPropertyBrowserController::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1682,7 +1682,7 @@ namespace pcr } //------------------------------------------------------------------------ - Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1705,7 +1705,7 @@ namespace pcr } //------------------------------------------------------------------------ - void SAL_CALL OPropertyBrowserController::setHelpSectionText( const ::rtl::OUString& _rHelpText ) throw (NoSupportException, RuntimeException) + void SAL_CALL OPropertyBrowserController::setHelpSectionText( const OUString& _rHelpText ) throw (NoSupportException, RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1720,7 +1720,7 @@ namespace pcr } //------------------------------------------------------------------------ - void OPropertyBrowserController::impl_broadcastPropertyChange_nothrow( const ::rtl::OUString& _rPropertyName, const Any& _rNewValue, const Any& _rOldValue, bool _bFirstTimeInit ) const + void OPropertyBrowserController::impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const Any& _rNewValue, const Any& _rOldValue, bool _bFirstTimeInit ) const { // are there one or more handlers which are interested in the actuation? ::std::pair< PropertyHandlerMultiRepository::const_iterator, PropertyHandlerMultiRepository::const_iterator > aInterestedHandlers = diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 85407096c8b9..0aaf5356b834 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -117,15 +117,15 @@ namespace pcr // meta data about the properties OPropertyBrowserView* m_pView; - ::rtl::OUString m_sPageSelection; - ::rtl::OUString m_sLastValidPageSelection; + OUString m_sPageSelection; + OUString m_sLastValidPageSelection; typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > PropertyHandlerRef; typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray; - typedef ::boost::unordered_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_map< OUString, PropertyHandlerRef, OUStringHash > PropertyHandlerRepository; - typedef ::boost::unordered_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_multimap< OUString, PropertyHandlerRef, OUStringHash > PropertyHandlerMultiRepository; PropertyHandlerRepository m_aPropertyHandlers; PropertyHandlerMultiRepository m_aDependencyHandlers; @@ -141,9 +141,9 @@ namespace pcr /// the properties of the currently inspected object(s) OrderedPropertyMap m_aProperties; /// the property we're just committing - ::rtl::OUString m_sCommittingProperty; + OUString m_sCommittingProperty; - typedef ::boost::unordered_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; + typedef ::boost::unordered_map< OUString, sal_uInt16, OUStringHash > HashString2Int16; HashString2Int16 m_aPageIds; bool m_bContainerFocusListening; @@ -155,9 +155,9 @@ namespace pcr DECLARE_XINTERFACE() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XController virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ) throw(::com::sun::star::uno::RuntimeException); @@ -201,34 +201,34 @@ namespace pcr public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) 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::uno::XComponentContext >&); protected: // IPropertyLineListener - virtual void Clicked( const ::rtl::OUString& _rName, sal_Bool _bPrimary ); - virtual void Commit( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal ); + virtual void Clicked( const OUString& _rName, sal_Bool _bPrimary ); + virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ); // IPropertyControlObserver virtual void focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ); virtual void valueChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ); // IPropertyExistenceCheck - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); // XObjectInspectorUI - virtual void SAL_CALL enablePropertyUI( const ::rtl::OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enablePropertyUIElements( const ::rtl::OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rebuildPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showPropertyUI( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hidePropertyUI( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showCategory( const ::rtl::OUString& _rCategory, ::sal_Bool _bShow ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > SAL_CALL getPropertyControl( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, ::sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL showCategory( const OUString& _rCategory, ::sal_Bool _bShow ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerControlObserver( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlObserver >& _Observer ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL revokeControlObserver( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlObserver >& _Observer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpSectionText( const ::rtl::OUString& HelpText ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XObjectInspector virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > SAL_CALL getInspectorModel() throw (::com::sun::star::uno::RuntimeException); @@ -237,7 +237,7 @@ namespace pcr virtual void SAL_CALL inspect( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects ) throw (::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, const ::rtl::OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, const OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException); // XInitialization @@ -272,17 +272,17 @@ namespace pcr if set to <FALSE/>, this is a real change in the property value, not just a call for purposes of initialization. */ - void impl_broadcastPropertyChange_nothrow( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, bool _bFirstTimeInit ) const; + void impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, bool _bFirstTimeInit ) const; /** determines whether the given property is an actuating property, that is, at least one handler expressed interest in changes to this property's value. */ - inline bool impl_isActuatingProperty_nothrow( const ::rtl::OUString& _rPropertyName ) const + inline bool impl_isActuatingProperty_nothrow( const OUString& _rPropertyName ) const { return ( m_aDependencyHandlers.find( _rPropertyName ) != m_aDependencyHandlers.end() ); } - sal_uInt32 GetPropertyPos(const ::rtl::OUString& _rPropName); + sal_uInt32 GetPropertyPos(const OUString& _rPropName); /** retrieves the value of the given property, by asking the appropriate XPropertyHandler @param _rPropertyName @@ -294,7 +294,7 @@ namespace pcr the value of this property */ ::com::sun::star::uno::Any - impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ); + impl_getPropertyValue_throw( const OUString& _rPropertyName ); /// calls XPropertyHandler::suspend for all our property handlers sal_Bool suspendPropertyHandlers_nothrow( sal_Bool _bSuspend ); @@ -319,7 +319,7 @@ namespace pcr <TRUE/> if and only if the property could be found. In this case, <arg>_pProperty</arg> (if not <NULL/> contains the iterator pointing to this property. */ - bool impl_findObjectProperty_nothrow( const ::rtl::OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = NULL ); + bool impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = NULL ); sal_Bool Construct(Window* _pParentWin); @@ -333,14 +333,14 @@ namespace pcr the handler which is responsible for the given property */ PropertyHandlerRef - impl_getHandlerForProperty_throw( const ::rtl::OUString& _rPropertyName ) const; + impl_getHandlerForProperty_throw( const OUString& _rPropertyName ) const; /** determines whether we have a handler for the given property @param _rPropertyName the name of the property for which the existence of a handler should be checked */ bool - impl_hasPropertyHandlerFor_nothrow( const ::rtl::OUString& _rPropertyName ) const; + impl_hasPropertyHandlerFor_nothrow( const OUString& _rPropertyName ) const; /** builds up m_aPageIds from InspectorModel::describeCategories, and insert all the respective tab pages into our view @@ -360,7 +360,7 @@ namespace pcr is no tab page for the given category */ sal_uInt16 - impl_getPageIdForCategory_nothrow( const ::rtl::OUString& _rCategoryName ) const; + impl_getPageIdForCategory_nothrow( const OUString& _rCategoryName ) const; /** adds or removes ourself as XEventListener to/from all our inspectees */ diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index c80bdf7ba104..f3706dc4a3e3 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -46,9 +46,9 @@ namespace pcr //---------------------------------------------------------------- struct SetPropertyValue : public ::std::unary_function< Reference< XPropertyHandler >, void > { - ::rtl::OUString sPropertyName; + OUString sPropertyName; const Any& rValue; - SetPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) : sPropertyName( _rPropertyName ), rValue( _rValue ) { } + SetPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) : sPropertyName( _rPropertyName ), rValue( _rValue ) { } void operator()( const Reference< XPropertyHandler >& _rHandler ) { _rHandler->setPropertyValue( sPropertyName, rValue ); @@ -122,35 +122,35 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL PropertyComposer::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyComposer::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->getPropertyValue( _rPropertyName ); } //-------------------------------------------------------------------- - void SAL_CALL PropertyComposer::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) ); } //-------------------------------------------------------------------- - Any SAL_CALL PropertyComposer::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyComposer::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToPropertyValue( _rPropertyName, _rControlValue ); } //-------------------------------------------------------------------- - Any SAL_CALL PropertyComposer::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyComposer::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToControlValue( _rPropertyName, _rPropertyValue, _rControlValueType ); } //-------------------------------------------------------------------- - PropertyState SAL_CALL PropertyComposer::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL PropertyComposer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); @@ -259,12 +259,12 @@ namespace pcr } //-------------------------------------------------------------------- - void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< ::rtl::OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ), - Sequence< ::rtl::OUString >& /* [out] */ _rUnion ) + void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ), + Sequence< OUString >& /* [out] */ _rUnion ) { - ::std::set< ::rtl::OUString > aUnitedBag; + ::std::set< OUString > aUnitedBag; - Sequence< ::rtl::OUString > aThisRound; + Sequence< OUString > aThisRound; for ( PropertyComposer::HandlerArray::const_iterator loop = _rHandlers.begin(); loop != _rHandlers.end(); ++loop @@ -278,29 +278,29 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException) { MethodGuard aGuard( *this ); // we supersede those properties which are superseded by at least one of our slaves - Sequence< ::rtl::OUString > aSuperseded; + Sequence< OUString > aSuperseded; uniteStringArrays( m_aSlaveHandlers, &XPropertyHandler::getSupersededProperties, aSuperseded ); return aSuperseded; } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException) { MethodGuard aGuard( *this ); // we're interested in those properties which at least one handler wants to have - Sequence< ::rtl::OUString > aActuating; + Sequence< OUString > aActuating; uniteStringArrays( m_aSlaveHandlers, &XPropertyHandler::getActuatingProperties, aActuating ); return aActuating; } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -309,14 +309,14 @@ namespace pcr } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PropertyComposer::isComposable( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL PropertyComposer::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->isComposable( _rPropertyName ); } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -377,7 +377,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL PropertyComposer::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) + void SAL_CALL PropertyComposer::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -395,8 +395,8 @@ namespace pcr ) { // TODO: make this cheaper (cache it?) - const StlSyntaxSequence< ::rtl::OUString > aThisHandlersActuatingProps = (*loop)->getActuatingProperties(); - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator loopProps = aThisHandlersActuatingProps.begin(); + const StlSyntaxSequence< OUString > aThisHandlersActuatingProps = (*loop)->getActuatingProperties(); + for ( StlSyntaxSequence< OUString >::const_iterator loopProps = aThisHandlersActuatingProps.begin(); loopProps != aThisHandlersActuatingProps.end(); ++loopProps ) @@ -493,7 +493,7 @@ namespace pcr } //-------------------------------------------------------------------- - sal_Bool SAL_CALL PropertyComposer::hasPropertyByName( const ::rtl::OUString& _rName ) throw (RuntimeException) + sal_Bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) { return impl_isSupportedProperty_nothrow( _rName ); } diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index 68e4cee46b14..5191239035a8 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -77,26 +77,26 @@ namespace pcr public: // XPropertyHandler overridables virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::beans::PropertyState - SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); // XComponent @@ -110,7 +110,7 @@ namespace pcr virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // IPropertyExistenceCheck - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException); private: /** ensures that m_pUIRequestComposer exists @@ -119,7 +119,7 @@ namespace pcr /** checks whether a given property exists in <member>m_aSupportedProperties</member> */ - bool impl_isSupportedProperty_nothrow( const ::rtl::OUString& _rPropertyName ) + bool impl_isSupportedProperty_nothrow( const OUString& _rPropertyName ) { ::com::sun::star::beans::Property aDummy; aDummy.Name = _rPropertyName; return m_aSupportedProperties.find( aDummy ) != m_aSupportedProperties.end(); @@ -135,7 +135,7 @@ namespace pcr : ::osl::MutexGuard( _rInstance.m_aMutex ) { if ( _rInstance.m_aSlaveHandlers.empty() ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), *(&_rInstance) ); + throw ::com::sun::star::lang::DisposedException( OUString(), *(&_rInstance) ); } }; }; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index c4d0be1dca4c..0440de348a58 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -163,7 +163,7 @@ namespace pcr } //------------------------------------------------------------------ - OBrowserPage* OPropertyEditor::getPage( const ::rtl::OUString& _rPropertyName ) + OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName ) { OBrowserPage* pPage = NULL; MapStringToPageId::const_iterator aPropertyPageIdPos = m_aPropertyPageIds.find( _rPropertyName ); @@ -173,7 +173,7 @@ namespace pcr } //------------------------------------------------------------------ - const OBrowserPage* OPropertyEditor::getPage( const ::rtl::OUString& _rPropertyName ) const + const OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName ) const { return const_cast< OPropertyEditor* >( this )->getPage( _rPropertyName ); } @@ -206,7 +206,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const rtl::OString& _rHelpId ) + sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const OString& _rHelpId ) { // obtain a new id sal_uInt16 nId = m_nNextId++; @@ -232,7 +232,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetHelpId( const rtl::OString& rHelpId ) + void OPropertyEditor::SetHelpId( const OString& rHelpId ) { Control::SetHelpId(""); m_aTabControl.SetHelpId(rHelpId); @@ -343,7 +343,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetHelpText( const ::rtl::OUString& _rHelpText ) + void OPropertyEditor::SetHelpText( const OUString& _rHelpText ) { forEachPage( &OPropertyEditor::setHelpSectionText, &_rHelpText ); } @@ -369,7 +369,7 @@ namespace pcr if ( !_pPointerToOUString ) return; - const ::rtl::OUString& rText( *(const ::rtl::OUString*)_pPointerToOUString ); + const OUString& rText( *(const OUString*)_pPointerToOUString ); _rPage.getListBox().SetHelpText( rText ); } @@ -398,7 +398,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::RemoveEntry( const ::rtl::OUString& _rName ) + void OPropertyEditor::RemoveEntry( const OUString& _rName ) { OBrowserPage* pPage = getPage( _rName ); if ( pPage ) @@ -420,7 +420,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::SetPropertyValue( const ::rtl::OUString& rEntryName, const Any& _rValue, bool _bUnknownValue ) + void OPropertyEditor::SetPropertyValue( const OUString& rEntryName, const Any& _rValue, bool _bUnknownValue ) { OBrowserPage* pPage = getPage( rEntryName ); if ( pPage ) @@ -428,7 +428,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_uInt16 OPropertyEditor::GetPropertyPos( const ::rtl::OUString& rEntryName ) const + sal_uInt16 OPropertyEditor::GetPropertyPos( const OUString& rEntryName ) const { sal_uInt16 nVal=LISTBOX_ENTRY_NOTFOUND; const OBrowserPage* pPage = getPage( rEntryName ); @@ -465,7 +465,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) + void OPropertyEditor::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) { for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i ) { @@ -476,7 +476,7 @@ namespace pcr } //------------------------------------------------------------------ - void OPropertyEditor::EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ) + void OPropertyEditor::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ) { for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i ) { @@ -487,7 +487,7 @@ namespace pcr } //------------------------------------------------------------------ - Reference< XPropertyControl > OPropertyEditor::GetPropertyControl(const ::rtl::OUString& rEntryName) + Reference< XPropertyControl > OPropertyEditor::GetPropertyControl(const OUString& rEntryName) { Reference< XPropertyControl > xControl; // let the current page handle this diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index d31ca7912d2c..d8883231554d 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -45,7 +45,7 @@ namespace pcr class OPropertyEditor : public Control { private: - typedef ::std::map< ::rtl::OUString, sal_uInt16 > MapStringToPageId; + typedef ::std::map< OUString, sal_uInt16 > MapStringToPageId; struct HiddenPage { sal_uInt16 nPos; @@ -84,28 +84,28 @@ namespace pcr void EnableHelpSection( bool _bEnable ); bool HasHelpSection() const; - void SetHelpText( const ::rtl::OUString& _rHelpText ); + void SetHelpText( const OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); - void SetHelpId( const rtl::OString& sHelpId ); - sal_uInt16 AppendPage( const String& r, const rtl::OString& _rHelpId ); + void SetHelpId( const OString& sHelpId ); + sal_uInt16 AppendPage( const String& r, const OString& _rHelpId ); void SetPage( sal_uInt16 ); void RemovePage(sal_uInt16 nID); sal_uInt16 GetCurPage(); void ClearAll(); - void SetPropertyValue(const ::rtl::OUString& _rEntryName, const ::com::sun::star::uno::Any& _rValue, bool _bUnknownValue ); - ::com::sun::star::uno::Any GetPropertyValue(const ::rtl::OUString& rEntryName ) const; - sal_uInt16 GetPropertyPos(const ::rtl::OUString& rEntryName ) const; + void SetPropertyValue(const OUString& _rEntryName, const ::com::sun::star::uno::Any& _rValue, bool _bUnknownValue ); + ::com::sun::star::uno::Any GetPropertyValue(const OUString& rEntryName ) const; + sal_uInt16 GetPropertyPos(const OUString& rEntryName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > - GetPropertyControl( const ::rtl::OUString& rEntryName ); - void EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable ); - void EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); + GetPropertyControl( const OUString& rEntryName ); + void EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ); + void EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); void ShowPropertyPage( sal_uInt16 _nPageId, bool _bShow ); sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 _nPageId, sal_uInt16 nPos = EDITOR_LIST_APPEND ); - void RemoveEntry( const ::rtl::OUString& _rName ); + void RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor& ); void setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; } @@ -125,8 +125,8 @@ namespace pcr OBrowserPage* getPage( sal_uInt16& _rPageId ); const OBrowserPage* getPage( sal_uInt16& _rPageId ) const; - OBrowserPage* getPage( const ::rtl::OUString& _rPropertyName ); - const OBrowserPage* getPage( const ::rtl::OUString& _rPropertyName ) const; + OBrowserPage* getPage( const OUString& _rPropertyName ); + const OBrowserPage* getPage( const OUString& _rPropertyName ) const; void Update(const ::std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction); diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 4da3b9426245..d6c0649af8d6 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -129,19 +129,19 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyHandler::getSupersededProperties( ) throw (RuntimeException) { - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL PropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL PropertyHandler::getActuatingProperties( ) throw (RuntimeException) { - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } //-------------------------------------------------------------------- - Any SAL_CALL PropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); @@ -154,7 +154,7 @@ namespace pcr if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_ENUM ) != 0 ) { - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); ::rtl::Reference< IPropertyEnumRepresentation > aEnumConversion( new DefaultEnumRepresentation( *m_pInfoService, aProperty.Type, nPropId ) ); @@ -168,7 +168,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL PropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL PropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); @@ -188,13 +188,13 @@ namespace pcr } //-------------------------------------------------------------------- - PropertyState SAL_CALL PropertyHandler::getPropertyState( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL PropertyHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException) { return PropertyState_DIRECT_VALUE; } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL PropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL PropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -219,28 +219,28 @@ namespace pcr aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_DATA_PROPERTY ) != 0 ) - aDescriptor.Category = ::rtl::OUString( "Data" ); + aDescriptor.Category = OUString( "Data" ); else - aDescriptor.Category = ::rtl::OUString( "General" ); + aDescriptor.Category = OUString( "General" ); return aDescriptor; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PropertyHandler::isComposable( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + ::sal_Bool SAL_CALL PropertyHandler::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pInfoService->isComposeable( _rPropertyName ); } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { OSL_FAIL( "PropertyHandler::onInteractivePropertySelection: not implemented!" ); return InteractiveSelectionResult_Cancelled; } //-------------------------------------------------------------------- - void SAL_CALL PropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) + void SAL_CALL PropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { OSL_FAIL( "PropertyHandler::actuatingPropertyChanged: not implemented!" ); } @@ -279,7 +279,7 @@ namespace pcr } //-------------------------------------------------------------------- - void PropertyHandler::firePropertyChange( const ::rtl::OUString& _rPropName, PropertyId _nPropId, const Any& _rOldValue, const Any& _rNewValue ) SAL_THROW(()) + void PropertyHandler::firePropertyChange( const OUString& _rPropName, PropertyId _nPropId, const Any& _rOldValue, const Any& _rNewValue ) SAL_THROW(()) { PropertyChangeEvent aEvent; aEvent.Source = m_xComponent; @@ -313,7 +313,7 @@ namespace pcr } //-------------------------------------------------------------------- - const Property& PropertyHandler::impl_getPropertyFromName_throw( const ::rtl::OUString& _rPropertyName ) const + const Property& PropertyHandler::impl_getPropertyFromName_throw( const OUString& _rPropertyName ) const { const_cast< PropertyHandler* >( this )->getSupportedProperties(); StlSyntaxSequence< Property >::const_iterator pFound = ::std::find_if( m_aSupportedProperties.begin(), m_aSupportedProperties.end(), @@ -326,7 +326,7 @@ namespace pcr } //-------------------------------------------------------------------- - void PropertyHandler::implAddPropertyDescription( ::std::vector< Property >& _rProperties, const ::rtl::OUString& _rPropertyName, const Type& _rType, sal_Int16 _nAttribs ) const + void PropertyHandler::implAddPropertyDescription( ::std::vector< Property >& _rProperties, const OUString& _rPropertyName, const Type& _rType, sal_Int16 _nAttribs ) const { _rProperties.push_back( Property( _rPropertyName, @@ -343,7 +343,7 @@ namespace pcr } //------------------------------------------------------------------------ - PropertyId PropertyHandler::impl_getPropertyId_throw( const ::rtl::OUString& _rPropertyName ) const + PropertyId PropertyHandler::impl_getPropertyId_throw( const OUString& _rPropertyName ) const { PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); if ( nPropId == -1 ) @@ -360,7 +360,7 @@ namespace pcr } //------------------------------------------------------------------------ - bool PropertyHandler::impl_componentHasProperty_throw( const ::rtl::OUString& _rPropName ) const + bool PropertyHandler::impl_componentHasProperty_throw( const OUString& _rPropName ) const { return m_xComponentPropertyInfo.is() && m_xComponentPropertyInfo->hasPropertyByName( _rPropName ); } @@ -375,32 +375,32 @@ namespace pcr if ( xDocumentSI.is() ) { // determine the application type we live in - ::rtl::OUString sConfigurationLocation; - ::rtl::OUString sConfigurationProperty; + OUString sConfigurationLocation; + OUString sConfigurationProperty; if ( xDocumentSI->supportsService( SERVICE_WEB_DOCUMENT ) ) { // writer - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" ); - sConfigurationProperty = ::rtl::OUString( "MeasureUnit" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.WriterWeb/Layout/Other" ); + sConfigurationProperty = OUString( "MeasureUnit" ); } else if ( xDocumentSI->supportsService( SERVICE_TEXT_DOCUMENT ) ) { // writer - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Writer/Layout/Other" ); - sConfigurationProperty = ::rtl::OUString( "MeasureUnit" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Writer/Layout/Other" ); + sConfigurationProperty = OUString( "MeasureUnit" ); } else if ( xDocumentSI->supportsService( SERVICE_SPREADSHEET_DOCUMENT ) ) { // calc - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ); - sConfigurationProperty = ::rtl::OUString( "Metric" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit" ); + sConfigurationProperty = OUString( "Metric" ); } else if ( xDocumentSI->supportsService( SERVICE_DRAWING_DOCUMENT ) ) { - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ); - sConfigurationProperty = ::rtl::OUString( "Metric" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Draw/Layout/Other/MeasureUnit" ); + sConfigurationProperty = OUString( "Metric" ); } else if ( xDocumentSI->supportsService( SERVICE_PRESENTATION_DOCUMENT ) ) { - sConfigurationLocation = ::rtl::OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ); - sConfigurationProperty = ::rtl::OUString( "Metric" ); + sConfigurationLocation = OUString( "/org.openoffice.Office.Impress/Layout/Other/MeasureUnit" ); + sConfigurationProperty = OUString( "Metric" ); } // read the measurement unit from the configuration @@ -440,9 +440,9 @@ namespace pcr IMPLEMENT_FORWARD_XTYPEPROVIDER2( PropertyHandlerComponent, PropertyHandler, PropertyHandlerComponent_Base ) //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - StlSyntaxSequence< ::rtl::OUString > aAllServices( getSupportedServiceNames() ); + StlSyntaxSequence< OUString > aAllServices( getSupportedServiceNames() ); return ::std::find( aAllServices.begin(), aAllServices.end(), ServiceName ) != aAllServices.end(); } diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 56384e8db613..cfdee15f9b7a 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -106,15 +106,15 @@ namespace pcr // default implementations for XPropertyHandler virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException); @@ -134,7 +134,7 @@ namespace pcr /** fires the change in a property value to our listener (if any) @see addPropertyChangeListener */ - void firePropertyChange( const ::rtl::OUString& _rPropName, PropertyId _nPropId, + void firePropertyChange( const OUString& _rPropName, PropertyId _nPropId, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue ) SAL_THROW(()); /** retrieves a window which can be used as parent for dialogs @@ -145,7 +145,7 @@ namespace pcr @throw com::sun::star::beans::UnknownPropertyException if the property name is not known to our ->m_pInfoService */ - PropertyId impl_getPropertyId_throw( const ::rtl::OUString& _rPropertyName ) const; + PropertyId impl_getPropertyId_throw( const OUString& _rPropertyName ) const; //------------------------------------------------------------------------------- // helper for implementing doDescribeSupportedProperties @@ -154,7 +154,7 @@ namespace pcr */ inline void addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -162,7 +162,7 @@ namespace pcr */ inline void addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -170,7 +170,7 @@ namespace pcr */ inline void addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -178,7 +178,7 @@ namespace pcr */ inline void addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -186,7 +186,7 @@ namespace pcr */ inline void addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -194,7 +194,7 @@ namespace pcr */ inline void addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -202,14 +202,14 @@ namespace pcr */ inline void addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; /// adds a Property, given by name only, to a given vector of Properties void implAddPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const ::com::sun::star::uno::Type& _rType, sal_Int16 _nAttribs = 0 ) const; @@ -257,11 +257,11 @@ namespace pcr @seealso doDescribeSupportedProperties */ const ::com::sun::star::beans::Property& - impl_getPropertyFromName_throw( const ::rtl::OUString& _rPropertyName ) const; + impl_getPropertyFromName_throw( const OUString& _rPropertyName ) const; /** get the name of a property given by handle */ - inline ::rtl::OUString + inline OUString impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const; /** returns the value of the ContextDocument property in the ComponentContext which was used to create @@ -281,7 +281,7 @@ namespace pcr void impl_setContextDocumentModified_nothrow() const; /// determines whether our component has a given property - bool impl_componentHasProperty_throw( const ::rtl::OUString& _rPropName ) const; + bool impl_componentHasProperty_throw( const OUString& _rPropName ) const; /** determines the default measure unit for the document in which our component lives */ @@ -294,45 +294,45 @@ namespace pcr }; //-------------------------------------------------------------------- - inline void PropertyHandler::addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< OUString* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< sal_Int32* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< sal_Int16* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< double* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::Date* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::Time* >( NULL ) ), _nAttribs ); } - inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const ::rtl::OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::DateTime* >( NULL ) ), _nAttribs ); } - inline ::rtl::OUString PropertyHandler::impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const + inline OUString PropertyHandler::impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const { const ::com::sun::star::beans::Property* pProp = impl_getPropertyFromId_nothrow( _nPropId ); - return pProp ? pProp->Name : ::rtl::OUString(); + return pProp ? pProp->Name : OUString(); } //==================================================================== @@ -354,9 +354,9 @@ namespace pcr DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; }; //==================================================================== @@ -379,8 +379,8 @@ namespace pcr { ... public: - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); }; </pre> */ @@ -395,8 +395,8 @@ namespace pcr protected: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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::uno::XComponentContext >& _rxContext ); public: @@ -407,14 +407,14 @@ namespace pcr //-------------------------------------------------------------------- template < class HANDLER > - ::rtl::OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { return HANDLER::getImplementationName_static(); } //-------------------------------------------------------------------- template < class HANDLER > - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) { return HANDLER::getSupportedServiceNames_static(); } diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 01ecdf312399..45bcbaed6986 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -39,10 +39,10 @@ namespace pcr public: virtual sal_Int32 getPropertyId(const String& _rName) const = 0; virtual String getPropertyTranslation(sal_Int32 _nId) const = 0; - virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const = 0; + virtual OString getPropertyHelpId(sal_Int32 _nId) const = 0; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const = 0; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const = 0; - virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; + virtual ::std::vector< OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; // this is only temporary, until the UNOization of the property browser is completed virtual String getPropertyName( sal_Int32 _nPropId ) = 0; diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx index 6f2a58c8c454..1315548da4ab 100644 --- a/extensions/source/propctrlr/proplinelistener.hxx +++ b/extensions/source/propctrlr/proplinelistener.hxx @@ -31,8 +31,8 @@ namespace pcr class IPropertyLineListener { public: - virtual void Clicked( const ::rtl::OUString& _rName, sal_Bool _bPrimary ) = 0; - virtual void Commit( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0; + virtual void Clicked( const OUString& _rName, sal_Bool _bPrimary ) = 0; + virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0; protected: ~IPropertyLineListener() {} diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx index 20a085d9922a..8d65391b9cc9 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.cxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx @@ -54,7 +54,7 @@ namespace pcr NULL }; - static sal_Int32 lcl_getNavigationURLIndex( const ::rtl::OUString& _rNavURL ) + static sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL ) { const sal_Char** pLookup = pNavigationURLs; while ( *pLookup ) @@ -108,7 +108,7 @@ namespace pcr { // there's a chance that this is a "virtual" button type // (which are realized by special URLs) - ::rtl::OUString sTargetURL; + OUString sTargetURL; m_xControlModel->getPropertyValue( PROPERTY_TARGET_URL ) >>= sTargetURL; sal_Int32 nNavigationURLIndex = lcl_getNavigationURLIndex( sTargetURL ); @@ -147,13 +147,13 @@ namespace pcr { sal_Int32 nButtonType = FormButtonType_PUSH; OSL_VERIFY( ::cppu::enum2int( nButtonType, _rValue ) ); - ::rtl::OUString sTargetURL; + OUString sTargetURL; bool bIsVirtualButtonType = nButtonType >= s_nFirstVirtualButtonType; if ( bIsVirtualButtonType ) { const sal_Char* pURL = lcl_getNavigationURL( nButtonType - s_nFirstVirtualButtonType ); - sTargetURL = ::rtl::OUString::createFromAscii( pURL ); + sTargetURL = OUString::createFromAscii( pURL ); nButtonType = FormButtonType_URL; } @@ -220,7 +220,7 @@ namespace pcr // pretend (to the user) that there's no URL set - since // virtual button types imply a special (technical) URL which // the user should not see - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); } } } @@ -286,7 +286,7 @@ namespace pcr //------------------------------------------------------------------------ bool PushButtonNavigation::hasNonEmptyCurrentTargetURL() const { - ::rtl::OUString sTargetURL; + OUString sTargetURL; OSL_VERIFY( getCurrentTargetURL() >>= sTargetURL ); return !sTargetURL.isEmpty(); } diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 365382743c3a..ace03a37d1d0 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -75,15 +75,15 @@ namespace pcr m_aControlTree.SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); // fill the description - rtl::OUString sDescription = m_aMainDesc.GetText(); + OUString sDescription = m_aMainDesc.GetText(); sal_Int16 nClassID = FormComponentType::CONTROL; if (::comphelper::hasProperty(PROPERTY_CLASSID, m_xControlModel)) nClassID = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); - sDescription = sDescription.replaceAll(rtl::OUString("$control_class$"), + sDescription = sDescription.replaceAll(OUString("$control_class$"), GetUIHeadlineName(nClassID, makeAny(m_xControlModel))); - rtl::OUString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME)); - sDescription = sDescription.replaceAll(rtl::OUString("$control_name$"), sName); + OUString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME)); + sDescription = sDescription.replaceAll(OUString("$control_name$"), sName); m_aMainDesc.SetText(sDescription); // search for the root of the form hierarchy @@ -174,7 +174,7 @@ namespace pcr return 0; sal_Int32 nChildren = 0; - rtl::OUString sName; + OUString sName; Reference< XPropertySet > xAsSet; for (sal_Int32 i=0; i<xContainer->getCount(); ++i) { @@ -222,7 +222,7 @@ namespace pcr if (!::comphelper::hasProperty(PROPERTY_LABEL, xAsSet)) continue; - rtl::OUString sDisplayName = rtl::OUStringBuffer( + OUString sDisplayName = OUStringBuffer( ::comphelper::getString(xAsSet->getPropertyValue(PROPERTY_LABEL))). appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")).append(sName).append(')'). makeStringAndClear(); diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 9b193d645178..83053a94adb4 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -49,7 +49,7 @@ namespace pcr ImageList m_aModelImages; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; - ::rtl::OUString m_sRequiredService; + OUString m_sRequiredService; Image m_aRequiredControlImage; SvTreeListEntry* m_pInitialSelection; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xInitialLabelControl; diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index df6e1261b84b..d4d6bb7429c8 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -130,7 +130,7 @@ namespace pcr { if ( PROPERTY_ACTIVECOMMAND == Event.PropertyName ) { - ::rtl::OUString sCommand; + OUString sCommand; OSL_VERIFY( Event.NewValue >>= sCommand ); m_xObjectAdapter->setSQLCommand( sCommand ); } @@ -243,12 +243,12 @@ namespace pcr aArgs[3].Name = PROPERTY_ESCAPE_PROCESSING; aArgs[3].Value <<= m_xObjectAdapter->getEscapeProcessing(); - aArgs[4].Name = ::rtl::OUString( "GraphicalDesign" ); + aArgs[4].Name = OUString( "GraphicalDesign" ); aArgs[4].Value <<= m_xObjectAdapter->getEscapeProcessing(); Reference< XComponent > xQueryDesign = xLoader->loadComponentFromURL( - ::rtl::OUString( ".component:DB/QueryDesign" ), - ::rtl::OUString( "_self" ), + OUString( ".component:DB/QueryDesign" ), + OUString( "_self" ), FrameSearchFlag::TASKS | FrameSearchFlag::CREATE, aArgs ); @@ -272,7 +272,7 @@ namespace pcr if ( xTitle.is() ) { ::svt::OLocalResourceAccess aEnumStrings( PcrRes( RID_RSC_ENUM_COMMAND_TYPE ), RSC_RESOURCE ); - ::rtl::OUString sDisplayName = String( PcrRes( CommandType::COMMAND + 1 ) ); + OUString sDisplayName = String( PcrRes( CommandType::COMMAND + 1 ) ); xTitle->setTitle( sDisplayName ); } } @@ -295,7 +295,7 @@ namespace pcr Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), UNO_QUERY_THROW ); - xFrame = xDesktop->findFrame( ::rtl::OUString( "_blank" ), FrameSearchFlag::CREATE ); + xFrame = xDesktop->findFrame( OUString( "_blank" ), FrameSearchFlag::CREATE ); OSL_ENSURE( xFrame.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: could not create an empty frame!" ); xDesktopFramesCollection->remove( xFrame ); } @@ -329,11 +329,11 @@ namespace pcr // instead of calling XCloseable::close directly. The latter method would also close // the frame, but not care for things like shutting down the office when the last // frame is gone ... - const UnoURL aCloseURL( ::rtl::OUString( ".uno:CloseDoc" ), + const UnoURL aCloseURL( OUString( ".uno:CloseDoc" ), Reference< XMultiServiceFactory >( m_xORB, UNO_QUERY ) ); Reference< XDispatchProvider > xProvider( m_xDesigner->getFrame(), UNO_QUERY_THROW ); - Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, ::rtl::OUString( "_top" ), FrameSearchFlag::SELF ) ); + Reference< XDispatch > xDispatch( xProvider->queryDispatch( aCloseURL, OUString( "_top" ), FrameSearchFlag::SELF ) ); OSL_ENSURE( xDispatch.is(), "SQLCommandDesigner::impl_closeDesigner_nothrow: no dispatcher for the CloseDoc command!" ); if ( xDispatch.is() ) { diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index c3bf797e58c4..be140a3543f5 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -171,12 +171,12 @@ namespace pcr /** gets the current value of the command property */ - ::rtl::OUString + OUString impl_getCommandPropertyValue_nothrow(); /** sets anew value for the command property */ - void impl_setCommandPropertyValue_nothrow( const ::rtl::OUString& _rCommand ) const; + void impl_setCommandPropertyValue_nothrow( const OUString& _rCommand ) const; private: SQLCommandDesigner(); // never implemented @@ -193,12 +193,12 @@ namespace pcr { public: /// retrieves the current SQL command of the component - virtual ::rtl::OUString getSQLCommand() const = 0; + virtual OUString getSQLCommand() const = 0; /// retrieves the current value of the EscapeProcessing property of the component virtual sal_Bool getEscapeProcessing() const = 0; /// sets a new SQL command - virtual void setSQLCommand( const ::rtl::OUString& _rCommand ) const = 0; + virtual void setSQLCommand( const OUString& _rCommand ) const = 0; /// sets a new EscapeProcessing property value virtual void setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const = 0; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index fcaa26b30224..f9caaae10131 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -181,14 +181,14 @@ namespace pcr //------------------------------------------------------------------ void SAL_CALL OEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sText; + OUString sText; if ( m_bIsPassword ) { sal_Int16 nValue = 0; _rValue >>= nValue; if ( nValue ) { - sText = rtl::OUString(static_cast<sal_Unicode>(nValue)); + sText = OUString(static_cast<sal_Unicode>(nValue)); } } else @@ -202,7 +202,7 @@ namespace pcr { Any aPropValue; - ::rtl::OUString sText( getTypedControlWindow()->GetText() ); + OUString sText( getTypedControlWindow()->GetText() ); if ( m_bIsPassword ) { if ( !sText.isEmpty() ) @@ -217,7 +217,7 @@ namespace pcr //------------------------------------------------------------------ Type SAL_CALL OEditControl::getValueType() throw (RuntimeException) { - return m_bIsPassword ? ::getCppuType( static_cast< sal_Int16* >( NULL ) ) : ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return m_bIsPassword ? ::getCppuType( static_cast< sal_Int16* >( NULL ) ) : ::getCppuType( static_cast< OUString* >( NULL ) ); } //------------------------------------------------------------------ @@ -423,14 +423,14 @@ namespace pcr //-------------------------------------------------------------------- Any SAL_CALL OHyperlinkControl::getValue() throw (RuntimeException) { - ::rtl::OUString sText = getTypedControlWindow()->GetText(); + OUString sText = getTypedControlWindow()->GetText(); return makeAny( sText ); } //-------------------------------------------------------------------- void SAL_CALL OHyperlinkControl::setValue( const Any& _value ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sText; + OUString sText; _value >>= sText; getTypedControlWindow()->SetText( sText ); } @@ -438,7 +438,7 @@ namespace pcr //-------------------------------------------------------------------- Type SAL_CALL OHyperlinkControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //-------------------------------------------------------------------- @@ -466,7 +466,7 @@ namespace pcr //------------------------------------------------------------------ IMPL_LINK( OHyperlinkControl, OnHyperlinkClicked, void*, /*_NotInterestedIn*/ ) { - ActionEvent aEvent( *this, ::rtl::OUString( "clicked" ) ); + ActionEvent aEvent( *this, OUString( "clicked" ) ); m_aActionListeners.forEach< XActionListener >( boost::bind( &XActionListener::actionPerformed, @@ -715,7 +715,7 @@ namespace pcr getTypedControlWindow()->SelectEntry( aRgbCol ); if ( !getTypedControlWindow()->IsEntrySelected( aRgbCol ) ) { // the given color is not part of the list -> insert a new entry with the hex code of the color - String aStr = rtl::OUString("0x"); + String aStr = OUString("0x"); aStr += MakeHexStr(nColor,8); getTypedControlWindow()->InsertEntry( aRgbCol, aStr ); getTypedControlWindow()->SelectEntry( aRgbCol ); @@ -723,7 +723,7 @@ namespace pcr } else { - ::rtl::OUString sNonColorValue; + OUString sNonColorValue; if ( !( _rValue >>= sNonColorValue ) ) throw IllegalTypeException(); getTypedControlWindow()->SelectEntry( sNonColorValue ); @@ -741,7 +741,7 @@ namespace pcr Any aPropValue; if ( getTypedControlWindow()->GetSelectEntryCount() > 0 ) { - ::rtl::OUString sSelectedEntry = getTypedControlWindow()->GetSelectEntry(); + OUString sSelectedEntry = getTypedControlWindow()->GetSelectEntry(); if ( m_aNonColorEntries.find( sSelectedEntry ) != m_aNonColorEntries.end() ) aPropValue <<= sSelectedEntry; else @@ -766,24 +766,24 @@ namespace pcr } //------------------------------------------------------------------ - void SAL_CALL OColorControl::prependListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OColorControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); m_aNonColorEntries.insert( NewEntry ); } //------------------------------------------------------------------ - void SAL_CALL OColorControl::appendListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OColorControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); m_aNonColorEntries.insert( NewEntry ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OColorControl::getListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OColorControl::getListEntries( ) throw (RuntimeException) { if ( !m_aNonColorEntries.empty() ) - return Sequence< ::rtl::OUString >(&(*m_aNonColorEntries.begin()),m_aNonColorEntries.size()); - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(&(*m_aNonColorEntries.begin()),m_aNonColorEntries.size()); + return Sequence< OUString >(); } //------------------------------------------------------------------ @@ -814,7 +814,7 @@ namespace pcr //------------------------------------------------------------------ Any SAL_CALL OListboxControl::getValue() throw (RuntimeException) { - ::rtl::OUString sControlValue( getTypedControlWindow()->GetSelectEntry() ); + OUString sControlValue( getTypedControlWindow()->GetSelectEntry() ); Any aPropValue; if ( !sControlValue.isEmpty() ) @@ -825,7 +825,7 @@ namespace pcr //------------------------------------------------------------------ Type SAL_CALL OListboxControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //------------------------------------------------------------------ @@ -835,7 +835,7 @@ namespace pcr getTypedControlWindow()->SetNoSelection(); else { - ::rtl::OUString sSelection; + OUString sSelection; _rValue >>= sSelection; if ( !sSelection.equals( getTypedControlWindow()->GetSelectEntry() ) ) @@ -856,22 +856,22 @@ namespace pcr } //------------------------------------------------------------------ - void SAL_CALL OListboxControl::prependListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OListboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } //------------------------------------------------------------------ - void SAL_CALL OListboxControl::appendListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OListboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException) { const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); - Sequence< ::rtl::OUString > aRet(nCount); - ::rtl::OUString* pIter = aRet.getArray(); + Sequence< OUString > aRet(nCount); + OUString* pIter = aRet.getArray(); for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); @@ -902,7 +902,7 @@ namespace pcr //------------------------------------------------------------------ void SAL_CALL OComboboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sText; + OUString sText; _rValue >>= sText; getTypedControlWindow()->SetText( sText ); } @@ -910,13 +910,13 @@ namespace pcr //------------------------------------------------------------------ Any SAL_CALL OComboboxControl::getValue() throw (RuntimeException) { - return makeAny( ::rtl::OUString( getTypedControlWindow()->GetText() ) ); + return makeAny( OUString( getTypedControlWindow()->GetText() ) ); } //------------------------------------------------------------------ Type SAL_CALL OComboboxControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //------------------------------------------------------------------ @@ -926,22 +926,22 @@ namespace pcr } //------------------------------------------------------------------ - void SAL_CALL OComboboxControl::prependListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OComboboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } //------------------------------------------------------------------ - void SAL_CALL OComboboxControl::appendListEntry( const ::rtl::OUString& NewEntry ) throw (RuntimeException) + void SAL_CALL OComboboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException) { const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); - Sequence< ::rtl::OUString > aRet(nCount); - ::rtl::OUString* pIter = aRet.getArray(); + Sequence< OUString > aRet(nCount); + OUString* pIter = aRet.getArray(); for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter) *pIter = getTypedControlWindow()->GetEntry(i); @@ -1158,20 +1158,20 @@ namespace pcr namespace { //.............................................................. - StlSyntaxSequence< ::rtl::OUString > lcl_convertMultiLineToList( const String& _rCompsedTextWithLineBreaks ) + StlSyntaxSequence< OUString > lcl_convertMultiLineToList( const String& _rCompsedTextWithLineBreaks ) { xub_StrLen nLines( comphelper::string::getTokenCount(_rCompsedTextWithLineBreaks, '\n') ); - StlSyntaxSequence< ::rtl::OUString > aStrings( nLines ); - StlSyntaxSequence< ::rtl::OUString >::iterator stringItem = aStrings.begin(); + StlSyntaxSequence< OUString > aStrings( nLines ); + StlSyntaxSequence< OUString >::iterator stringItem = aStrings.begin(); for ( xub_StrLen token = 0; token < nLines; ++token, ++stringItem ) *stringItem = _rCompsedTextWithLineBreaks.GetToken( token, '\n' ); return aStrings; } - String lcl_convertListToMultiLine( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ) + String lcl_convertListToMultiLine( const StlSyntaxSequence< OUString >& _rStrings ) { String sMultiLineText; - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator item = _rStrings.begin(); + for ( StlSyntaxSequence< OUString >::const_iterator item = _rStrings.begin(); item != _rStrings.end(); ) { @@ -1183,10 +1183,10 @@ namespace pcr } //.............................................................. - String lcl_convertListToDisplayText( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ) + String lcl_convertListToDisplayText( const StlSyntaxSequence< OUString >& _rStrings ) { - ::rtl::OUStringBuffer aComposed; - for ( StlSyntaxSequence< ::rtl::OUString >::const_iterator strings = _rStrings.begin(); + OUStringBuffer aComposed; + for ( StlSyntaxSequence< OUString >::const_iterator strings = _rStrings.begin(); strings != _rStrings.end(); ++strings ) @@ -1325,20 +1325,20 @@ namespace pcr } //------------------------------------------------------------------ - void DropDownEditControl::SetStringListValue( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ) + void DropDownEditControl::SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings ) { SetText( lcl_convertListToDisplayText( _rStrings ) ); m_pFloatingEdit->getEdit()->SetText( lcl_convertListToMultiLine( _rStrings ) ); } //------------------------------------------------------------------ - StlSyntaxSequence< ::rtl::OUString > DropDownEditControl::GetStringListValue() const + StlSyntaxSequence< OUString > DropDownEditControl::GetStringListValue() const { return lcl_convertMultiLineToList( m_pFloatingEdit->getEdit()->GetText() ); } //------------------------------------------------------------------ - void DropDownEditControl::SetTextValue( const ::rtl::OUString& _rText ) + void DropDownEditControl::SetTextValue( const OUString& _rText ) { OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::SetTextValue: illegal call!" ); @@ -1347,7 +1347,7 @@ namespace pcr } //------------------------------------------------------------------ - ::rtl::OUString DropDownEditControl::GetTextValue() const + OUString DropDownEditControl::GetTextValue() const { OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::GetTextValue: illegal call!" ); return GetText(); @@ -1375,7 +1375,7 @@ namespace pcr { case eMultiLineText: { - ::rtl::OUString sText; + OUString sText; if ( !( _rValue >>= sText ) && _rValue.hasValue() ) throw IllegalTypeException(); getTypedControlWindow()->SetTextValue( sText ); @@ -1383,7 +1383,7 @@ namespace pcr break; case eStringList: { - Sequence< ::rtl::OUString > aStringLines; + Sequence< OUString > aStringLines; if ( !( _rValue >>= aStringLines ) && _rValue.hasValue() ) throw IllegalTypeException(); getTypedControlWindow()->SetStringListValue( aStringLines ); @@ -1414,8 +1414,8 @@ namespace pcr Type SAL_CALL OMultilineEditControl::getValueType() throw (RuntimeException) { if ( getTypedControlWindow()->getOperationMode() == eMultiLineText ) - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); - return ::getCppuType( static_cast< Sequence< ::rtl::OUString >* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); + return ::getCppuType( static_cast< Sequence< OUString >* >( NULL ) ); } //............................................................................ diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 91bf8a097897..b7cd14efb3c7 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -286,7 +286,7 @@ namespace pcr class OColorControl : public OColorControl_Base { private: - ::std::set< ::rtl::OUString > m_aNonColorEntries; + ::std::set< OUString > m_aNonColorEntries; public: OColorControl( Window* pParent, WinBits nWinStyle ); @@ -298,9 +298,9 @@ namespace pcr // XStringListControl virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL prependListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); protected: virtual void modified(); @@ -324,9 +324,9 @@ namespace pcr // XStringListControl virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL prependListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); protected: virtual void modified(); @@ -348,9 +348,9 @@ namespace pcr // XStringListControl virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL prependListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendListEntry( const ::rtl::OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException); protected: DECL_LINK( OnEntrySelected, void* ); @@ -387,11 +387,11 @@ namespace pcr void setOperationMode( MultiLineOperationMode _eMode ) { m_nOperationMode = _eMode; } MultiLineOperationMode getOperationMode() const { return m_nOperationMode; } - void SetTextValue( const ::rtl::OUString& _rText ); - ::rtl::OUString GetTextValue() const; + void SetTextValue( const OUString& _rText ); + OUString GetTextValue() const; - void SetStringListValue( const StlSyntaxSequence< ::rtl::OUString >& _rStrings ); - StlSyntaxSequence< ::rtl::OUString > + void SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings ); + StlSyntaxSequence< OUString > GetStringListValue() const; // ControlWindow overridables diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 394ad17454c7..a68c8d0489d4 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -49,8 +49,8 @@ namespace comp_StringRepresentation { using namespace ::com::sun::star; // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); uno::Reference< uno::XInterface > SAL_CALL _create( uno::Reference< uno::XComponentContext > const & context ); } // closing component helper namespace @@ -71,13 +71,13 @@ public: explicit StringRepresentation(uno::Reference< uno::XComponentContext > const & context); // lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (uno::RuntimeException); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (uno::RuntimeException); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // inspection::XStringRepresentation: - virtual ::rtl::OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception); - virtual uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception); + virtual OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception); + virtual uno::Any SAL_CALL convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception); // lang::XInitialization: virtual void SAL_CALL initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception); @@ -98,7 +98,7 @@ private: */ bool convertGenericValueToString( const uno::Any& _rValue, - ::rtl::OUString& _rStringRep + OUString& _rStringRep ); /** converts string representation into generic value @@ -110,7 +110,7 @@ private: if and only if the value could be converted */ bool convertStringToGenericValue( - const ::rtl::OUString& _rStringRep, + const OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ); @@ -120,19 +120,19 @@ private: * \param _rValue the value to be converted * \return the converted string. */ - ::rtl::OUString convertSimpleToString( const uno::Any& _rValue ); + OUString convertSimpleToString( const uno::Any& _rValue ); /** converts a string into his constant value if it exists, otherwise the type converter is used. * \param _rValue the value to be converted * \param _ePropertyType the type of the propery to be converted into * \return the converted value */ - uno::Any convertStringToSimple( const ::rtl::OUString& _rValue,const uno::TypeClass& _ePropertyType ); + uno::Any convertStringToSimple( const OUString& _rValue,const uno::TypeClass& _ePropertyType ); uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< script::XTypeConverter > m_xTypeConverter; uno::Reference< reflection::XConstantsTypeDescription > m_xTypeDescription; - uno::Sequence< ::rtl::OUString > m_aValues; + uno::Sequence< OUString > m_aValues; uno::Sequence< uno::Reference< reflection::XConstantTypeDescription> > m_aConstants; }; @@ -142,34 +142,34 @@ StringRepresentation::StringRepresentation(uno::Reference< uno::XComponentContex {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL StringRepresentation::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL StringRepresentation::getImplementationName() throw (uno::RuntimeException) { return comp_StringRepresentation::_getImplementationName(); } -::sal_Bool SAL_CALL StringRepresentation::supportsService(::rtl::OUString const & serviceName) throw (uno::RuntimeException) +::sal_Bool SAL_CALL StringRepresentation::supportsService(OUString const & serviceName) throw (uno::RuntimeException) { return ::comphelper::existsValue(serviceName,comp_StringRepresentation::_getSupportedServiceNames()); } -uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL StringRepresentation::getSupportedServiceNames() throw (uno::RuntimeException) { return comp_StringRepresentation::_getSupportedServiceNames(); } // inspection::XStringRepresentation: -::rtl::OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception) +OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception) { - ::rtl::OUString sReturn; + OUString sReturn; if ( !convertGenericValueToString( PropertyValue, sReturn ) ) { sReturn = convertSimpleToString( PropertyValue ); #ifdef DBG_UTIL if ( sReturn.isEmpty() && PropertyValue.hasValue() ) { - ::rtl::OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" ); - sMessage += ::rtl::OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'!" ); + OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" ); + sMessage += OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -178,7 +178,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedSer return sReturn; } -uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception) +uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception) { uno::Any aReturn; @@ -212,9 +212,9 @@ uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUSt // could not convert ... if ( !bCanConvert && !ControlValue.isEmpty() ) { - ::rtl::OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" ); - sMessage += ::rtl::OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'!" ); + OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" ); + sMessage += OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'!" ); OSL_FAIL( sMessage.getStr() ); } #endif @@ -233,14 +233,14 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & m_xTypeConverter.set(*pIter++,uno::UNO_QUERY); if ( nLength == 3 ) { - ::rtl::OUString sConstantName; + OUString sConstantName; *pIter++ >>= sConstantName; *pIter >>= m_aValues; if ( m_xContext.is() ) { uno::Reference< container::XHierarchicalNameAccess > xTypeDescProv( - m_xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), + m_xContext->getValueByName( OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ), uno::UNO_QUERY_THROW ); m_xTypeDescription.set( xTypeDescProv->getByHierarchicalName( sConstantName ), uno::UNO_QUERY_THROW ); @@ -250,9 +250,9 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & } } //------------------------------------------------------------------------ -::rtl::OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue ) +OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue ) { - ::rtl::OUString sReturn; + OUString sReturn; if ( m_xTypeConverter.is() && _rValue.hasValue() ) { try @@ -290,11 +290,11 @@ namespace { struct ConvertIntegerFromAndToString { - ::rtl::OUString operator()( sal_Int32 _rIntValue ) const + OUString operator()( sal_Int32 _rIntValue ) const { - return ::rtl::OUString::valueOf( (sal_Int32)_rIntValue ); + return OUString::valueOf( (sal_Int32)_rIntValue ); } - sal_Int32 operator()( const ::rtl::OUString& _rStringValue ) const + sal_Int32 operator()( const OUString& _rStringValue ) const { return _rStringValue.toInt32(); } @@ -302,14 +302,14 @@ namespace struct StringIdentity { - ::rtl::OUString operator()( const ::rtl::OUString& _rValue ) const + OUString operator()( const OUString& _rValue ) const { return _rValue; } }; template < class ElementType, class Transformer > - ::rtl::OUString composeSequenceElements( const Sequence< ElementType >& _rElements, const Transformer& _rTransformer ) + OUString composeSequenceElements( const Sequence< ElementType >& _rElements, const Transformer& _rTransformer ) { String sCompose; @@ -328,7 +328,7 @@ namespace } template < class ElementType, class Transformer > - void splitComposedStringToSequence( const ::rtl::OUString& _rComposed, Sequence< ElementType >& _out_SplitUp, const Transformer& _rTransformer ) + void splitComposedStringToSequence( const OUString& _rComposed, Sequence< ElementType >& _out_SplitUp, const Transformer& _rTransformer ) { _out_SplitUp.realloc( 0 ); if ( _rComposed.isEmpty() ) @@ -344,7 +344,7 @@ namespace } //-------------------------------------------------------------------- -bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, ::rtl::OUString& _rStringRep ) +bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, OUString& _rStringRep ) { bool bCanConvert = true; @@ -356,7 +356,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, case uno::TypeClass_BOOLEAN: { - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); sal_Bool bValue = sal_False; _rValue >>= bValue; @@ -367,7 +367,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, // some sequence types case uno::TypeClass_SEQUENCE: { - Sequence< ::rtl::OUString > aStringValues; + Sequence< OUString > aStringValues; Sequence< sal_Int8 > aInt8Values; Sequence< sal_uInt16 > aUInt16Values; Sequence< sal_Int16 > aInt16Values; @@ -452,7 +452,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, return bCanConvert; } //------------------------------------------------------------------------ -uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rValue,const uno::TypeClass& _ePropertyType ) +uno::Any StringRepresentation::convertStringToSimple( const OUString& _rValue,const uno::TypeClass& _ePropertyType ) { uno::Any aReturn; if ( m_xTypeConverter.is() && !_rValue.isEmpty() ) @@ -461,8 +461,8 @@ uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rV { if ( m_aConstants.getLength() && m_aValues.getLength() ) { - const ::rtl::OUString* pIter = m_aValues.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aValues.getLength(); + const OUString* pIter = m_aValues.getConstArray(); + const OUString* pEnd = pIter + m_aValues.getLength(); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) { if ( *pIter == _rValue ) @@ -483,7 +483,7 @@ uno::Any StringRepresentation::convertStringToSimple( const ::rtl::OUString& _rV return aReturn; } //-------------------------------------------------------------------- -bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ) +bool StringRepresentation::convertStringToGenericValue( const OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ) { bool bCanConvert = true; @@ -495,7 +495,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ case uno::TypeClass_BOOLEAN: { - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; tools::StringListResource aRes(PcrRes(RID_RSC_ENUM_YESNO),aListEntries); if ( aListEntries[0] == _rStringRep ) _rValue <<= (sal_Bool)sal_False; @@ -513,7 +513,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ { case uno::TypeClass_STRING: { - Sequence< ::rtl::OUString > aElements; + Sequence< OUString > aElements; splitComposedStringToSequence( aStr, aElements, StringIdentity() ); _rValue <<= aElements; } @@ -599,15 +599,15 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ // component helper namespace namespace comp_StringRepresentation { -::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString( +OUString SAL_CALL _getImplementationName() { + return OUString( "StringRepresentation"); } -uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > s(1); - s[0] = ::rtl::OUString( + uno::Sequence< OUString > s(1); + s[0] = OUString( "com.sun.star.inspection.StringRepresentation"); return s; } diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index 1dd05f7b962b..495db591461d 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -104,21 +104,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.SubmissionPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -167,7 +167,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -210,25 +210,25 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - Sequence< ::rtl::OUString > aReturn( 1 ); + Sequence< OUString > aReturn( 1 ); aReturn[ 0 ] = PROPERTY_XFORMS_BUTTONTYPE; return aReturn; } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - Sequence< ::rtl::OUString > aReturn( 3 ); + Sequence< OUString > aReturn( 3 ); aReturn[ 0 ] = PROPERTY_TARGET_URL; aReturn[ 1 ] = PROPERTY_TARGET_FRAME; aReturn[ 2 ] = PROPERTY_BUTTONTYPE; @@ -277,7 +277,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -287,7 +287,7 @@ namespace pcr if ( !m_pHelper.get() ) RuntimeException(); - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); switch ( nPropId ) { @@ -312,13 +312,13 @@ namespace pcr LineDescriptor aDescriptor; aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, sal_False, sal_True ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); - aDescriptor.Category = ::rtl::OUString( "General" ); + aDescriptor.Category = OUString( "General" ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); return aDescriptor; } //-------------------------------------------------------------------- - void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) + void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -344,7 +344,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aPropertyValue; @@ -353,7 +353,7 @@ namespace pcr if ( !m_pHelper.get() ) return aPropertyValue; - ::rtl::OUString sControlValue; + OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); @@ -383,7 +383,7 @@ namespace pcr } //-------------------------------------------------------------------- - Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Any aControlValue; diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index f62011ac53e5..e5f35d400996 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -78,24 +78,24 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); ~SubmissionPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // PropertyHandler overridables virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 6fe43eb26cf6..bbb0f6fcde8b 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -59,10 +59,10 @@ namespace pcr // XTabControllerModel virtual void SAL_CALL setControlModels(const Sequence< Reference< XControlModel > >& rModels) throw( RuntimeException ) {m_aModels = rModels;} virtual Sequence< Reference< XControlModel > > SAL_CALL getControlModels(void) throw( RuntimeException ) {return m_aModels;} - virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const ::rtl::OUString& /*GroupName*/) throw( RuntimeException ) {} + virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const OUString& /*GroupName*/) throw( RuntimeException ) {} virtual sal_Int32 SAL_CALL getGroupCount(void) throw( RuntimeException ) {return 0;} - virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, ::rtl::OUString& /*Name*/) throw( RuntimeException ) {} - virtual void SAL_CALL getGroupByName(const ::rtl::OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException ) {} + virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, OUString& /*Name*/) throw( RuntimeException ) {} + virtual void SAL_CALL getGroupByName(const OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException ) {} virtual sal_Bool SAL_CALL getGroupControl(void) throw( RuntimeException ){return sal_False;} ; virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException ){}; }; @@ -182,7 +182,7 @@ namespace pcr Sequence< Reference< XControlModel > > aControlModels( m_xTempModel->getControlModels() ); const Reference< XControlModel >* pControlModels = aControlModels.getConstArray(); - ::rtl::OUString aName; + OUString aName; Image aImage; for ( sal_Int32 i=0; i < aControlModels.getLength(); ++i, ++pControlModels ) @@ -323,7 +323,7 @@ namespace pcr //------------------------------------------------------------------------ void TabOrderListBox::MoveSelection( long nRelPos ) { - rtl::OUString aSelEntryPrevText, aSelEntryNextText; + OUString aSelEntryPrevText, aSelEntryNextText; Image aImage; for (long i=0; i<labs(nRelPos); i++) { diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx index 1b4df6e0b344..2c66b83e52b3 100644 --- a/extensions/source/propctrlr/unourl.cxx +++ b/extensions/source/propctrlr/unourl.cxx @@ -34,7 +34,7 @@ namespace pcr //==================================================================== //= UnoURL //==================================================================== - UnoURL::UnoURL( const ::rtl::OUString& _rCompleteURL, const Reference< XMultiServiceFactory >& _rxORB ) + UnoURL::UnoURL( const OUString& _rCompleteURL, const Reference< XMultiServiceFactory >& _rxORB ) { m_aURL.Complete = _rCompleteURL; diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index a7b509735571..474924776963 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.hxx @@ -38,11 +38,11 @@ namespace pcr public: UnoURL( - const ::rtl::OUString& _rCompleteURL, + const OUString& _rCompleteURL, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); - inline operator const ::rtl::OUString& () const { return m_aURL.Complete; } + inline operator const OUString& () const { return m_aURL.Complete; } inline operator const ::com::sun::star::util::URL& () const { return m_aURL; } private: diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 05cee8f40825..16a4e75bca40 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -280,7 +280,7 @@ namespace pcr //------------------------------------------------------------------ void SAL_CALL OFileUrlControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { - ::rtl::OUString sURL; + OUString sURL; if ( ( _rValue >>= sURL ) ) { if ( sURL.indexOf( "vnd.sun.star.GraphicObject:" ) == 0 ) @@ -297,14 +297,14 @@ namespace pcr { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) - aPropValue <<= (::rtl::OUString)getTypedControlWindow()->GetURL(); + aPropValue <<= (OUString)getTypedControlWindow()->GetURL(); return aPropValue; } //------------------------------------------------------------------ Type SAL_CALL OFileUrlControl::getValueType() throw (RuntimeException) { - return ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + return ::getCppuType( static_cast< OUString* >( NULL ) ); } //======================================================================== @@ -315,7 +315,7 @@ namespace pcr :ONumericControl( pParent, nWinStyle ) { getTypedControlWindow()->SetUnit( FUNIT_CUSTOM ); - getTypedControlWindow()->SetCustomUnitText(rtl::OUString(" ms")); + getTypedControlWindow()->SetCustomUnitText(OUString(" ms")); getTypedControlWindow()->SetCustomConvertHdl( LINK( this, OTimeDurationControl, OnCustomConvert ) ); } diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx index 7ee0c46c7c2e..76a1796a038b 100644 --- a/extensions/source/propctrlr/xsddatatypes.cxx +++ b/extensions/source/propctrlr/xsddatatypes.cxx @@ -68,7 +68,7 @@ namespace pcr } template< typename FACETTYPE > - FACETTYPE getFacet( const Reference< XPropertySet >& _rxFacets, const ::rtl::OUString& _rFacetName ) SAL_THROW(()) + FACETTYPE getFacet( const Reference< XPropertySet >& _rxFacets, const OUString& _rFacetName ) SAL_THROW(()) { FACETTYPE aReturn; try @@ -140,13 +140,13 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString XSDDataType::getName() const SAL_THROW(()) + OUString XSDDataType::getName() const SAL_THROW(()) { return getSave( m_xDataType.get(), &XDataType::getName ); } //-------------------------------------------------------------------- - void XSDDataType::setFacet( const ::rtl::OUString& _rFacetName, const Any& _rValue ) SAL_THROW(()) + void XSDDataType::setFacet( const OUString& _rFacetName, const Any& _rValue ) SAL_THROW(()) { try { @@ -159,7 +159,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDDataType::hasFacet( const ::rtl::OUString& _rFacetName ) const SAL_THROW(()) + bool XSDDataType::hasFacet( const OUString& _rFacetName ) const SAL_THROW(()) { bool bReturn = false; try @@ -173,7 +173,7 @@ namespace pcr return bReturn; } //-------------------------------------------------------------------- - Any XSDDataType::getFacet( const ::rtl::OUString& _rFacetName ) SAL_THROW(()) + Any XSDDataType::getFacet( const OUString& _rFacetName ) SAL_THROW(()) { Any aReturn; try diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index 743ea3490842..dfa5cebb52f8 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -71,16 +71,16 @@ namespace pcr sal_Int16 classify() const SAL_THROW(()); // attribute access - ::rtl::OUString getName() const SAL_THROW(()); + OUString getName() const SAL_THROW(()); bool isBasicType() const SAL_THROW(()); /// determines whether a given facet exists at the type - bool hasFacet( const ::rtl::OUString& _rFacetName ) const SAL_THROW(()); + bool hasFacet( const OUString& _rFacetName ) const SAL_THROW(()); /// retrieves a facet value ::com::sun::star::uno::Any - getFacet( const ::rtl::OUString& _rFacetName ) SAL_THROW(()); + getFacet( const OUString& _rFacetName ) SAL_THROW(()); /// sets a facet value - void setFacet( const ::rtl::OUString& _rFacetName, const ::com::sun::star::uno::Any& _rFacetValue ) SAL_THROW(()); + void setFacet( const OUString& _rFacetName, const ::com::sun::star::uno::Any& _rFacetValue ) SAL_THROW(()); /** copies as much facets (values, respectively) from a give data type instance */ diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index bca2aee38bb4..4a6f1eada469 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -74,14 +74,14 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()) + void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()) { _rNames.resize( 0 ); try { Reference< XDataTypeRepository > xRepository = getDataTypeRepository(); - Sequence< ::rtl::OUString > aElements; + Sequence< OUString > aElements; if ( xRepository.is() ) aElements = xRepository->getElementNames(); @@ -107,7 +107,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const ::rtl::OUString& _rModelName ) const SAL_THROW((Exception)) + Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((Exception)) { Reference< XDataTypeRepository > xRepository; @@ -119,7 +119,7 @@ namespace pcr } //-------------------------------------------------------------------- - Reference< XDataType > XSDValidationHelper::getDataType( const ::rtl::OUString& _rName ) const SAL_THROW((Exception)) + Reference< XDataType > XSDValidationHelper::getDataType( const OUString& _rName ) const SAL_THROW((Exception)) { Reference< XDataType > xDataType; @@ -133,9 +133,9 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString XSDValidationHelper::getValidatingDataTypeName( ) const SAL_THROW(()) + OUString XSDValidationHelper::getValidatingDataTypeName( ) const SAL_THROW(()) { - ::rtl::OUString sDataTypeName; + OUString sDataTypeName; try { Reference< XPropertySet > xBinding( getCurrentBinding() ); @@ -153,7 +153,7 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()) + ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const OUString& _rName ) const SAL_THROW(()) { ::rtl::Reference< XSDDataType > pReturn; @@ -182,7 +182,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const ::rtl::OUString& _rNewName ) const SAL_THROW(()) + bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(()) { OSL_ENSURE( _pDataType.is(), "XSDValidationHelper::removeDataTypeFromRepository: invalid data type!" ); if ( !_pDataType.is() ) @@ -210,7 +210,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationHelper::removeDataTypeFromRepository( const ::rtl::OUString& _rName ) const SAL_THROW(()) + bool XSDValidationHelper::removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(()) { try { @@ -236,7 +236,7 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationHelper::setValidatingDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()) + void XSDValidationHelper::setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(()) { try { @@ -246,7 +246,7 @@ namespace pcr if ( xBinding.is() ) { // get the old data type - this is necessary for notifying property changes - ::rtl::OUString sOldDataTypeName; + OUString sOldDataTypeName; OSL_VERIFY( xBinding->getPropertyValue( PROPERTY_XSD_DATA_TYPE ) >>= sOldDataTypeName ); Reference< XPropertySet > xOldType; try { xOldType = xOldType.query( getDataType( sOldDataTypeName ) ); } catch( const Exception& ) { } @@ -258,11 +258,11 @@ namespace pcr Reference< XPropertySet > xNewType( getDataType( _rName ), UNO_QUERY ); // fire any changes in the properties which result from this new type - std::set< ::rtl::OUString > aFilter; aFilter.insert( static_cast<const rtl::OUString&>(PROPERTY_NAME) ); + std::set< OUString > aFilter; aFilter.insert( static_cast<const OUString&>(PROPERTY_NAME) ); firePropertyChanges( xOldType, xNewType, aFilter ); // fire the change in the Data Type property - ::rtl::OUString sNewDataTypeName; + OUString sNewDataTypeName; OSL_VERIFY( xBinding->getPropertyValue( PROPERTY_XSD_DATA_TYPE ) >>= sNewDataTypeName ); firePropertyChange( PROPERTY_XSD_DATA_TYPE, makeAny( sOldDataTypeName ), makeAny( sNewDataTypeName ) ); } @@ -274,8 +274,8 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationHelper::copyDataType( const ::rtl::OUString& _rFromModel, const ::rtl::OUString& _rToModel, - const ::rtl::OUString& _rDataTypeName ) const SAL_THROW(()) + void XSDValidationHelper::copyDataType( const OUString& _rFromModel, const OUString& _rToModel, + const OUString& _rDataTypeName ) const SAL_THROW(()) { if ( _rFromModel == _rToModel ) // nothing to do (me thinks) @@ -298,7 +298,7 @@ namespace pcr // determine the built-in type belonging to the source type ::rtl::Reference< XSDDataType > pSourceType = new XSDDataType( xFromRepository->getDataType( _rDataTypeName ) ); - ::rtl::OUString sTargetBaseType = getBasicTypeNameForClass( pSourceType->classify(), xToRepository ); + OUString sTargetBaseType = getBasicTypeNameForClass( pSourceType->classify(), xToRepository ); // create the target type Reference< XDataType > xTargetType = xToRepository->cloneDataType( sTargetBaseType, _rDataTypeName ); @@ -366,15 +366,15 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const SAL_THROW(()) + OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const SAL_THROW(()) { return getBasicTypeNameForClass( _nClass, getDataTypeRepository() ); } //-------------------------------------------------------------------- - ::rtl::OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const SAL_THROW(()) + OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const SAL_THROW(()) { - ::rtl::OUString sReturn; + OUString sReturn; OSL_ENSURE( _rxRepository.is(), "XSDValidationHelper::getBasicTypeNameForClass: invalid repository!" ); if ( !_rxRepository.is() ) return sReturn; diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx index 3311d7f1c93a..c4d96868357b 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.hxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx @@ -52,12 +52,12 @@ namespace pcr /** retrieves the names of all XForms models in the document the control lives in */ - void getAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()); + void getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); /** retrieves a particular data type given by name */ ::rtl::Reference< XSDDataType > - getDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()); + getDataTypeByName( const OUString& _rName ) const SAL_THROW(()); /** retrieves the DataType instance which the control model is currently validated against @@ -71,26 +71,26 @@ namespace pcr @seealso getValidatingDataType */ - ::rtl::OUString + OUString getValidatingDataTypeName( ) const SAL_THROW(()); /** binds the validator to a new data type To be called with an active binding only. */ - void setValidatingDataTypeByName( const ::rtl::OUString& _rName ) const SAL_THROW(()); + void setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(()); /** removes the data type given by name from the data type repository */ - bool removeDataTypeFromRepository( const ::rtl::OUString& _rName ) const SAL_THROW(()); + bool removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(()); /** creates a new data type, which is a clone of an existing data type */ - bool cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const ::rtl::OUString& _rNewName ) const SAL_THROW(()); + bool cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(()); /** retrieves the name of the basic data type which has the given class */ - ::rtl::OUString + OUString getBasicTypeNameForClass( sal_Int16 _eClass ) const SAL_THROW(()); /** copy a data type from one model to another @@ -98,8 +98,8 @@ namespace pcr If a data type with the given name already exists in the target model, then nothing happens. In particular, the facets of the data type are not copied. */ - void copyDataType( const ::rtl::OUString& _rFromModel, const ::rtl::OUString& _rToModel, - const ::rtl::OUString& _rDataTypeName ) const SAL_THROW(()); + void copyDataType( const OUString& _rFromModel, const OUString& _rToModel, + const OUString& _rDataTypeName ) const SAL_THROW(()); /** finds (and sets) a default format for the formatted field we're inspecting, according to the current data type the control value is evaluated against @@ -115,17 +115,17 @@ namespace pcr /** retrieves the data type repository associated with any model */ ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > - getDataTypeRepository( const ::rtl::OUString& _rModelName ) const SAL_THROW((::com::sun::star::uno::Exception)); + getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((::com::sun::star::uno::Exception)); /** retrieves the data type object for the given name */ ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > - getDataType( const ::rtl::OUString& _rName ) const + getDataType( const OUString& _rName ) const SAL_THROW((::com::sun::star::uno::Exception)); /** retrieves the name of the basic data type which has the given class, in the given repository */ - ::rtl::OUString + OUString getBasicTypeNameForClass( sal_Int16 _nClass, ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > _rxRepository diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index be9ec1e83fff..3f97f953f293 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -86,21 +86,21 @@ namespace pcr } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); + return OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( 1 ); - aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ); + Sequence< OUString > aSupported( 1 ); + aSupported[0] = OUString( "com.sun.star.form.inspection.XSDValidationPropertyHandler" ); return aSupported; } //-------------------------------------------------------------------- - Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -113,9 +113,9 @@ namespace pcr switch ( nPropId ) { // common facets - case PROPERTY_ID_XSD_DATA_TYPE: aReturn = pType.is() ? pType->getFacet( PROPERTY_NAME ) : makeAny( ::rtl::OUString() ); break; + case PROPERTY_ID_XSD_DATA_TYPE: aReturn = pType.is() ? pType->getFacet( PROPERTY_NAME ) : makeAny( OUString() ); break; case PROPERTY_ID_XSD_WHITESPACES:aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_WHITESPACES ) : makeAny( WhiteSpaceTreatment::Preserve ); break; - case PROPERTY_ID_XSD_PATTERN: aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_PATTERN ) : makeAny( ::rtl::OUString() ); break; + case PROPERTY_ID_XSD_PATTERN: aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_PATTERN ) : makeAny( OUString() ); break; // all other properties are simply forwarded, if they exist at the given type default: @@ -130,7 +130,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -140,7 +140,7 @@ namespace pcr if ( PROPERTY_ID_XSD_DATA_TYPE == nPropId ) { - ::rtl::OUString sTypeName; + OUString sTypeName; OSL_VERIFY( _rValue >>= sTypeName ); m_pHelper->setValidatingDataTypeByName( sTypeName ); impl_setContextDocumentModified_nothrow(); @@ -227,61 +227,61 @@ namespace pcr } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aSuperfluous; + ::std::vector< OUString > aSuperfluous; if ( m_pHelper.get() ) { - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_FILTERPROPOSAL) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_BOUNDCOLUMN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_CONTROLSOURCE) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EMPTY_IS_NULL) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_FILTERPROPOSAL) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCETYPE) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCE) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_BOUNDCOLUMN) ); bool bAllowBinding = m_pHelper->canBindToAnyDataType(); if ( bAllowBinding ) { - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_MAXTEXTLEN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMIN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMAX) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMIN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMAX) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMIN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMAX) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MIN) ); - aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MAX) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_MAXTEXTLEN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_VALUEMIN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_VALUEMAX) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DECIMAL_ACCURACY) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_TIMEMIN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_TIMEMAX) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DATEMIN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DATEMAX) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EFFECTIVE_MIN) ); + aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EFFECTIVE_MAX) ); } } if ( aSuperfluous.empty() ) - return Sequence< ::rtl::OUString >(); - return Sequence< ::rtl::OUString >( &(*aSuperfluous.begin()), aSuperfluous.size() ); + return Sequence< OUString >(); + return Sequence< OUString >( &(*aSuperfluous.begin()), aSuperfluous.size() ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< ::rtl::OUString > aInterestedInActuations( 2 ); + ::std::vector< OUString > aInterestedInActuations( 2 ); if ( m_pHelper.get() ) { - aInterestedInActuations.push_back( static_cast<const rtl::OUString&>(PROPERTY_XSD_DATA_TYPE) ); - aInterestedInActuations.push_back( static_cast<const rtl::OUString&>(PROPERTY_XML_DATA_MODEL) ); + aInterestedInActuations.push_back( static_cast<const OUString&>(PROPERTY_XSD_DATA_TYPE) ); + aInterestedInActuations.push_back( static_cast<const OUString&>(PROPERTY_XML_DATA_MODEL) ); } if ( aInterestedInActuations.empty() ) - return Sequence< ::rtl::OUString >(); - return Sequence< ::rtl::OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); + return Sequence< OUString >(); + return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); } //-------------------------------------------------------------------- namespace { - void showPropertyUI( const Reference< XObjectInspectorUI >& _rxInspectorUI, const ::rtl::OUString& _rPropertyName, bool _bShow ) + void showPropertyUI( const Reference< XObjectInspectorUI >& _rxInspectorUI, const OUString& _rPropertyName, bool _bShow ) { if ( _bShow ) _rxInspectorUI->showPropertyUI( _rPropertyName ); @@ -291,7 +291,7 @@ namespace pcr } //-------------------------------------------------------------------- - LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, + LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { @@ -309,7 +309,7 @@ namespace pcr // collect some information about the to-be-created control sal_Int16 nControlType = PropertyControlType::TextField; - ::std::vector< ::rtl::OUString > aListEntries; + ::std::vector< OUString > aListEntries; Optional< double > aMinValue( sal_False, 0 ); Optional< double > aMaxValue( sal_False, 0 ); @@ -320,11 +320,11 @@ namespace pcr implGetAvailableDataTypeNames( aListEntries ); - aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); - aDescriptor.SecondaryButtonId = rtl::OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; + aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); + aDescriptor.SecondaryButtonId = OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True; - aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonplus.png" ); - aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( "private:graphicrepository/extensions/res/buttonminus.png" ); + aDescriptor.PrimaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonplus.png" ); + aDescriptor.SecondaryButtonImageURL = OUString( "private:graphicrepository/extensions/res/buttonminus.png" ); break; case PROPERTY_ID_XSD_WHITESPACES: @@ -419,7 +419,7 @@ namespace pcr break; } - aDescriptor.Category = ::rtl::OUString( "Data" ); + aDescriptor.Category = OUString( "Data" ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); @@ -427,7 +427,7 @@ namespace pcr } //-------------------------------------------------------------------- - InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) + InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -445,7 +445,7 @@ namespace pcr { if ( _bPrimary ) { - ::rtl::OUString sNewDataTypeName; + OUString sNewDataTypeName; if ( implPrepareCloneDataCurrentType( sNewDataTypeName ) ) { implDoCloneCurrentDataType( sNewDataTypeName ); @@ -483,7 +483,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( ::rtl::OUString& _rNewName ) SAL_THROW(()) + bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: this will crash!" ); @@ -494,7 +494,7 @@ namespace pcr return false; } - ::std::vector< ::rtl::OUString > aExistentNames; + ::std::vector< OUString > aExistentNames; m_pHelper->getAvailableDataTypeNames( aExistentNames ); NewDataTypeDialog aDialog( NULL, pType->getName(), aExistentNames ); // TODO/eForms: proper parent @@ -506,7 +506,7 @@ namespace pcr } //-------------------------------------------------------------------- - bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const ::rtl::OUString& _rNewName ) SAL_THROW(()) + bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoCloneCurrentDataType: this will crash!" ); @@ -564,7 +564,7 @@ namespace pcr } //-------------------------------------------------------------------- - void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) + void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -588,7 +588,7 @@ namespace pcr //------------------------------------------------------------ // show the facets which are available at the data type - ::rtl::OUString aFacets[] = { + OUString aFacets[] = { OUString(PROPERTY_XSD_WHITESPACES), OUString(PROPERTY_XSD_PATTERN), OUString(PROPERTY_XSD_LENGTH), OUString(PROPERTY_XSD_MIN_LENGTH), OUString(PROPERTY_XSD_MAX_LENGTH), OUString(PROPERTY_XSD_TOTAL_DIGITS), OUString(PROPERTY_XSD_FRACTION_DIGITS), @@ -615,7 +615,7 @@ namespace pcr }; size_t i=0; - const ::rtl::OUString* pLoop = NULL; + const OUString* pLoop = NULL; for ( i = 0, pLoop = aFacets; i < SAL_N_ELEMENTS( aFacets ); ++i, ++pLoop @@ -631,9 +631,9 @@ namespace pcr { // The data type which the current binding works with may not be present in the // new model. Thus, transfer it. - ::rtl::OUString sOldModelName; _rOldValue >>= sOldModelName; - ::rtl::OUString sNewModelName; _rNewValue >>= sNewModelName; - ::rtl::OUString sDataType = m_pHelper->getValidatingDataTypeName(); + OUString sOldModelName; _rOldValue >>= sOldModelName; + OUString sNewModelName; _rNewValue >>= sNewModelName; + OUString sDataType = m_pHelper->getValidatingDataTypeName(); m_pHelper->copyDataType( sOldModelName, sNewModelName, sDataType ); // the list of available data types depends on the chosen model, so update this @@ -654,17 +654,17 @@ namespace pcr } //-------------------------------------------------------------------- - void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()) + void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implGetAvailableDataTypeNames: this will crash!" ); // start with *all* types which are available at the model - ::std::vector< ::rtl::OUString > aAllTypes; + ::std::vector< OUString > aAllTypes; m_pHelper->getAvailableDataTypeNames( aAllTypes ); _rNames.clear(); _rNames.reserve( aAllTypes.size() ); // then allow only those which are "compatible" with our control - for ( ::std::vector< ::rtl::OUString >::const_iterator dataType = aAllTypes.begin(); + for ( ::std::vector< OUString >::const_iterator dataType = aAllTypes.begin(); dataType != aAllTypes.end(); ++dataType ) diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index 0c9c40245f29..0145b8026cb2 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -45,25 +45,25 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: ~XSDValidationPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); @@ -76,12 +76,12 @@ namespace pcr bool implPrepareRemoveCurrentDataType() SAL_THROW(()); bool implDoRemoveCurrentDataType() SAL_THROW(()); - bool implPrepareCloneDataCurrentType( ::rtl::OUString& _rNewName ) SAL_THROW(()); - bool implDoCloneCurrentDataType( const ::rtl::OUString& _rNewName ) SAL_THROW(()); + bool implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(()); + bool implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(()); /** retrieves the names of the data types which our introspectee can be validated against */ - void implGetAvailableDataTypeNames( ::std::vector< ::rtl::OUString >& /* [out] */ _rNames ) const SAL_THROW(()); + void implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()); }; //........................................................................ diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index c9b9a581b36e..80608adeb6a1 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -47,9 +47,6 @@ using namespace ::com::sun::star::container; using ::comphelper::stl_begin; using ::comphelper::stl_end; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringToOString; namespace { @@ -94,7 +91,7 @@ namespace virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XElementAccessBase virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) - { return ::getCppuType(static_cast< ::rtl::OUString*>(0)); }; + { return ::getCppuType(static_cast< OUString*>(0)); }; }; class ResourceStringListIndexAccess : public ResourceIndexAccessBase diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx index 036c03f6bc61..074d12e9c727 100644 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ b/extensions/source/resource/ResourceIndexAccess.hxx @@ -53,9 +53,9 @@ namespace extensions { namespace resource // The XNameAccess provides access to two named elements: // "String" returns a XIndexAccess to String resources // "StringList" returns a XIndexAccess to StringList/StringArray resources - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) { return ::getCppuType(static_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(0)); }; diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 72930af8bab2..4f0c8f36410f 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -84,7 +84,7 @@ namespace extensions { namespace resource { OSL_PRECOND( _resourceManager.IsAvailable( getResourceType(), _resourceId ), "StringResourceAccess::getResource: precondition not met!" ); Any aResource; - aResource <<= ::rtl::OUString( _resourceManager.ReadString( _resourceId ) ); + aResource <<= OUString( _resourceManager.ReadString( _resourceId ) ); return aResource; } @@ -94,7 +94,7 @@ namespace extensions { namespace resource { private: typedef ::boost::shared_ptr< IResourceType > ResourceTypePtr; - typedef ::std::map< ::rtl::OUString, ResourceTypePtr > ResourceTypes; + typedef ::std::map< OUString, ResourceTypePtr > ResourceTypes; ::osl::Mutex m_aMutex; Reference< XResourceBundle > m_xParent; @@ -105,7 +105,7 @@ namespace extensions { namespace resource public: OpenOfficeResourceBundle( const Reference< XComponentContext >& _rxContext, - const ::rtl::OUString& _rBaseName, + const OUString& _rBaseName, const Locale& _rLocale ); @@ -117,12 +117,12 @@ namespace extensions { namespace resource virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle > SAL_CALL getParent() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle >& _parent ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getDirectElement( const ::rtl::OUString& key ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getDirectElement( const OUString& key ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess (base of XResourceBundle) - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess (base of XNameAccess) virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); @@ -140,7 +140,7 @@ namespace extensions { namespace resource @precond our mutex is locked */ - bool impl_getDirectElement_nothrow( const ::rtl::OUString& _key, Any& _out_Element ) const; + bool impl_getDirectElement_nothrow( const OUString& _key, Any& _out_Element ) const; /** retrieves the resource type and id from a given resource key, which assembles those two @param _key @@ -153,7 +153,7 @@ namespace extensions { namespace resource <TRUE/> if and only if the given key specifies a known resource type, and contains a valid resource id */ - bool impl_getResourceTypeAndId_nothrow( const ::rtl::OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const; + bool impl_getResourceTypeAndId_nothrow( const OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const; }; OpenOfficeResourceLoader::OpenOfficeResourceLoader( Reference< XComponentContext > const& _rxContext ) @@ -162,13 +162,13 @@ namespace extensions { namespace resource } //-------------------------------------------------------------------- - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const ::rtl::OUString& _baseName ) throw (MissingResourceException, RuntimeException) + Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const OUString& _baseName ) throw (MissingResourceException, RuntimeException) { return loadBundle( _baseName, Application::GetSettings().GetUILanguageTag().getLocale() ); } //-------------------------------------------------------------------- - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const ::rtl::OUString& _baseName, const Locale& _locale ) throw (MissingResourceException, RuntimeException) + Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const OUString& _baseName, const Locale& _locale ) throw (MissingResourceException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -188,12 +188,12 @@ namespace extensions { namespace resource return xBundle; } - OpenOfficeResourceBundle::OpenOfficeResourceBundle( const Reference< XComponentContext >& /*_rxContext*/, const ::rtl::OUString& _rBaseName, const Locale& _rLocale ) + OpenOfficeResourceBundle::OpenOfficeResourceBundle( const Reference< XComponentContext >& /*_rxContext*/, const OUString& _rBaseName, const Locale& _rLocale ) :m_aLocale( _rLocale ) ,m_pResourceManager( NULL ) { - ::rtl::OUString sBaseName( _rBaseName ); - m_pResourceManager = new SimpleResMgr( rtl::OUStringToOString( sBaseName, RTL_TEXTENCODING_UTF8 ).getStr(), + OUString sBaseName( _rBaseName ); + m_pResourceManager = new SimpleResMgr( OUStringToOString( sBaseName, RTL_TEXTENCODING_UTF8 ).getStr(), LanguageTag( m_aLocale) ); if ( !m_pResourceManager->IsValid() ) @@ -203,7 +203,7 @@ namespace extensions { namespace resource } // supported resource types so far: strings - m_aResourceTypes[ ::rtl::OUString( "string" ) ] = + m_aResourceTypes[ OUString( "string" ) ] = ResourceTypePtr( new StringResourceAccess ); } @@ -230,14 +230,14 @@ namespace extensions { namespace resource return m_aLocale; } - bool OpenOfficeResourceBundle::impl_getResourceTypeAndId_nothrow( const ::rtl::OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const + bool OpenOfficeResourceBundle::impl_getResourceTypeAndId_nothrow( const OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const { sal_Int32 typeSeparatorPos = _key.indexOf( ':' ); if ( typeSeparatorPos == -1 ) // invalid key return false; - ::rtl::OUString resourceType = _key.copy( 0, typeSeparatorPos ); + OUString resourceType = _key.copy( 0, typeSeparatorPos ); ResourceTypes::const_iterator typePos = m_aResourceTypes.find( resourceType ); if ( typePos == m_aResourceTypes.end() ) @@ -249,7 +249,7 @@ namespace extensions { namespace resource return true; } - bool OpenOfficeResourceBundle::impl_getDirectElement_nothrow( const ::rtl::OUString& _key, Any& _out_Element ) const + bool OpenOfficeResourceBundle::impl_getDirectElement_nothrow( const OUString& _key, Any& _out_Element ) const { ResourceTypePtr resourceType; sal_Int32 resourceId( 0 ); @@ -264,7 +264,7 @@ namespace extensions { namespace resource return _out_Element.hasValue(); } - Any SAL_CALL OpenOfficeResourceBundle::getDirectElement( const ::rtl::OUString& _key ) throw (RuntimeException) + Any SAL_CALL OpenOfficeResourceBundle::getDirectElement( const OUString& _key ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -273,7 +273,7 @@ namespace extensions { namespace resource return aElement; } - Any SAL_CALL OpenOfficeResourceBundle::getByName( const ::rtl::OUString& _key ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL OpenOfficeResourceBundle::getByName( const OUString& _key ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -285,20 +285,20 @@ namespace extensions { namespace resource } if ( !aElement.hasValue() ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); return aElement; } - Sequence< ::rtl::OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_FAIL( "OpenOfficeResourceBundle::getElementNames: not implemented!" ); // the (Simple)ResManager does not provide an API to enumerate the resources - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } - ::sal_Bool SAL_CALL OpenOfficeResourceBundle::hasByName( const ::rtl::OUString& _key ) throw (RuntimeException) + ::sal_Bool SAL_CALL OpenOfficeResourceBundle::hasByName( const OUString& _key ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx index e431d384a034..09da484da32b 100644 --- a/extensions/source/resource/oooresourceloader.hxx +++ b/extensions/source/resource/oooresourceloader.hxx @@ -31,7 +31,7 @@ namespace extensions { namespace resource { - typedef ::std::pair< ::rtl::OUString, ::com::sun::star::lang::Locale> ResourceBundleDescriptor; + typedef ::std::pair< OUString, ::com::sun::star::lang::Locale> ResourceBundleDescriptor; struct ResourceBundleDescriptorLess : public ::std::binary_function<ResourceBundleDescriptor, ResourceBundleDescriptor, bool> { @@ -59,8 +59,8 @@ namespace extensions { namespace resource OpenOfficeResourceLoader(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&); // XResourceBundleLoader - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle_Default( const ::rtl::OUString& aBaseName ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle( const ::rtl::OUString& abaseName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException); private: OpenOfficeResourceLoader(); // never implemented diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index d9f64a30b17b..35a4800ce890 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -137,7 +137,7 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction, pAction = "SANE_ACTION_SET_AUTO";break; } dbg_msg( "Option: \"%s\" action: %s\n", - rtl::OUStringToOString(GetOptionName(nOption), osl_getThreadTextEncoding()).getStr(), + OUStringToOString(GetOptionName(nOption), osl_getThreadTextEncoding()).getStr(), pAction ); } #endif @@ -168,17 +168,17 @@ Sane::~Sane() void Sane::Init() { - ::rtl::OUString sSaneLibName( "libsane" SAL_DLLEXTENSION ); + OUString sSaneLibName( "libsane" SAL_DLLEXTENSION ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); if( ! pSaneLib ) { - sSaneLibName = ::rtl::OUString("libsane" SAL_DLLEXTENSION ".1" ); + sSaneLibName = OUString("libsane" SAL_DLLEXTENSION ".1" ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } // try reasonable places that might not be in the library search path if( ! pSaneLib ) { - ::rtl::OUString sSaneLibSystemPath( "/usr/local/lib/libsane" SAL_DLLEXTENSION ); + OUString sSaneLibSystemPath( "/usr/local/lib/libsane" SAL_DLLEXTENSION ); osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData, &sSaneLibName.pData ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } @@ -292,7 +292,7 @@ sal_Bool Sane::Open( const char* name ) if( mnDevice == -1 ) { - rtl::OString aDevice( name ); + OString aDevice( name ); for( int i = 0; i < nDevices; i++ ) { if( aDevice.equals( ppDevices[i]->name ) ) @@ -331,7 +331,7 @@ void Sane::Close() int Sane::GetOptionByName( const char* rName ) { int i; - rtl::OString aOption( rName ); + OString aOption( rName ); for( i = 0; i < mnOptions; i++ ) { if( mppOptions[i]->name && aOption.equals( mppOptions[i]->name ) ) @@ -353,7 +353,7 @@ sal_Bool Sane::GetOptionValue( int n, sal_Bool& rRet ) return sal_True; } -sal_Bool Sane::GetOptionValue( int n, rtl::OString& rRet ) +sal_Bool Sane::GetOptionValue( int n, OString& rRet ) { sal_Bool bSuccess = sal_False; if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING ) @@ -430,7 +430,7 @@ sal_Bool Sane::SetOptionValue( int n, const String& rSet ) { if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING ) return sal_False; - rtl::OString aSet(rtl::OUStringToOString(rSet, osl_getThreadTextEncoding())); + OString aSet(OUStringToOString(rSet, osl_getThreadTextEncoding())); SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, (void*)aSet.getStr() ); if( nStatus != SANE_STATUS_GOOD ) return sal_False; @@ -986,7 +986,7 @@ String Sane::GetOptionUnitName( int n ) SANE_Unit nUnit = mppOptions[n]->unit; size_t nUnitAsSize = (size_t)nUnit; if (nUnitAsSize >= SAL_N_ELEMENTS( ppUnits )) - aText = rtl::OUString("[unknown units]"); + aText = OUString("[unknown units]"); else aText = String( ppUnits[ nUnit ], osl_getThreadTextEncoding() ); return aText; diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index 914248433526..06a7dc8f0e4c 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -147,7 +147,7 @@ public: inline int GetOptionElements( int n ); int GetOptionByName( const char* ); sal_Bool GetOptionValue( int, sal_Bool& ); - sal_Bool GetOptionValue( int, rtl::OString& ); + sal_Bool GetOptionValue( int, OString& ); sal_Bool GetOptionValue( int, double&, int nElement = 0 ); sal_Bool GetOptionValue( int, double* ); diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 36feba647bf9..2ccd4d94d432 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -280,7 +280,7 @@ void SaneDlg::InitFields() else // SANE_UNIT_PIXEL { pField->SetValue( (int)fValue, FUNIT_CUSTOM ); - pField->SetCustomUnitText(rtl::OUString("Pixel")); + pField->SetCustomUnitText(OUString("Pixel")); } switch( i ) { case 0: maTopLeft.X() = (int)fValue;break; @@ -503,7 +503,7 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox*, pListBox ) { if( pListBox == &maQuantumRangeBox ) { - rtl::OString aValue(rtl::OUStringToOString(maQuantumRangeBox.GetSelectEntry(), + OString aValue(OUStringToOString(maQuantumRangeBox.GetSelectEntry(), osl_getThreadTextEncoding())); double fValue = atof(aValue.getStr()); mrSane.SetOptionValue( mnCurrentOption, fValue, mnCurrentElement ); @@ -522,7 +522,7 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox ) { String aOption = maOptionBox.GetEntryText( maOptionBox.FirstSelected() ); - int nOption = mrSane.GetOptionByName(rtl::OUStringToOString(aOption, + int nOption = mrSane.GetOptionByName(OUStringToOString(aOption, osl_getThreadTextEncoding()).getStr()); if( nOption != -1 && nOption != mnCurrentOption ) { @@ -626,7 +626,7 @@ IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit ) else if( pEdit == &maNumericEdit ) { double fValue; - rtl::OString aContents(rtl::OUStringToOString(maNumericEdit.GetText(), + OString aContents(OUStringToOString(maNumericEdit.GetText(), osl_getThreadTextEncoding())); fValue = atof(aContents.getStr()); if( mfMin != mfMax && ( fValue < mfMin || fValue > mfMax ) ) @@ -817,14 +817,14 @@ void SaneDlg::EstablishBoolOption() void SaneDlg::EstablishStringOption() { sal_Bool bSuccess; - rtl::OString aValue; + OString aValue; bSuccess = mrSane.GetOptionValue( mnCurrentOption, aValue ); if( bSuccess ) { maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) ); maOptionDescTxt.Show( sal_True ); - maStringEdit.SetText(rtl::OStringToOUString(aValue, osl_getThreadTextEncoding())); + maStringEdit.SetText(OStringToOUString(aValue, osl_getThreadTextEncoding())); maStringEdit.Show( sal_True ); } } @@ -835,9 +835,9 @@ void SaneDlg::EstablishStringRange() maStringRangeBox.Clear(); for( int i = 0; ppStrings[i] != 0; i++ ) maStringRangeBox.InsertEntry( String( ppStrings[i], osl_getThreadTextEncoding() ) ); - rtl::OString aValue; + OString aValue; mrSane.GetOptionValue( mnCurrentOption, aValue ); - maStringRangeBox.SelectEntry(rtl::OStringToOUString(aValue, osl_getThreadTextEncoding())); + maStringRangeBox.SelectEntry(OStringToOUString(aValue, osl_getThreadTextEncoding())); maStringRangeBox.Show( sal_True ); maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) ); maOptionDescTxt.Show( sal_True ); @@ -1181,8 +1181,8 @@ sal_Bool SaneDlg::LoadState() return sal_False; aConfig.SetGroup( "SANE" ); - rtl::OString aString = aConfig.ReadKey( "SO_LastSaneDevice" ); - for( i = 0; i < Sane::CountDevices() && !aString.equals(rtl::OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding())); i++ ) ; + OString aString = aConfig.ReadKey( "SO_LastSaneDevice" ); + for( i = 0; i < Sane::CountDevices() && !aString.equals(OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding())); i++ ) ; if( i == Sane::CountDevices() ) return sal_False; @@ -1198,7 +1198,7 @@ sal_Bool SaneDlg::LoadState() for (i = 0; i < iMax; ++i) { aString = aConfig.GetKeyName( i ); - rtl::OString aValue = aConfig.ReadKey( i ); + OString aValue = aConfig.ReadKey( i ); int nOption = mrSane.GetOptionByName( aString.getStr() ); if( nOption == -1 ) continue; @@ -1212,7 +1212,7 @@ sal_Bool SaneDlg::LoadState() else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("STRING="))) { aValue = aValue.copy(RTL_CONSTASCII_LENGTH("STRING=")); - mrSane.SetOptionValue(nOption,rtl::OStringToOUString(aValue, osl_getThreadTextEncoding()) ); + mrSane.SetOptionValue(nOption,OStringToOUString(aValue, osl_getThreadTextEncoding()) ); } else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("NUMERIC="))) { @@ -1222,7 +1222,7 @@ sal_Bool SaneDlg::LoadState() int n = 0; do { - rtl::OString aSub = aValue.getToken(0, ':', nIndex); + OString aSub = aValue.getToken(0, ':', nIndex); double fValue=0.0; sscanf(aSub.getStr(), "%lg", &fValue); SetAdjustedNumericalValue(aString.getStr(), fValue, n++); @@ -1251,7 +1251,7 @@ void SaneDlg::SaveState() aConfig.DeleteGroup( "SANE" ); aConfig.SetGroup( "SANE" ); aConfig.WriteKey( "SO_LastSANEDevice", - rtl::OUStringToOString(maDeviceBox.GetSelectEntry(), RTL_TEXTENCODING_UTF8) ); + OUStringToOString(maDeviceBox.GetSelectEntry(), RTL_TEXTENCODING_UTF8) ); static char const* pSaveOptions[] = { "resolution", @@ -1262,7 +1262,7 @@ void SaneDlg::SaveState() }; for( size_t i = 0; i < SAL_N_ELEMENTS(pSaveOptions); ++i ) { - rtl::OString aOption = pSaveOptions[i]; + OString aOption = pSaveOptions[i]; int nOption = mrSane.GetOptionByName( pSaveOptions[i] ); if( nOption > -1 ) { @@ -1274,7 +1274,7 @@ void SaneDlg::SaveState() sal_Bool bValue; if( mrSane.GetOptionValue( nOption, bValue ) ) { - rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM( "BOOL=")); aString.append(static_cast<sal_Int32>(bValue)); aConfig.WriteKey(aOption, aString.makeStringAndClear()); @@ -1283,10 +1283,10 @@ void SaneDlg::SaveState() break; case SANE_TYPE_STRING: { - rtl::OString aValue; + OString aValue; if( mrSane.GetOptionValue( nOption, aValue ) ) { - rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("STRING=")); + OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("STRING=")); aString.append(aValue); aConfig.WriteKey( aOption, aString.makeStringAndClear() ); } @@ -1295,7 +1295,7 @@ void SaneDlg::SaveState() case SANE_TYPE_FIXED: case SANE_TYPE_INT: { - rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("NUMERIC=")); + OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("NUMERIC=")); double fValue; char buf[256]; int n; diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index d415116dce17..ec2f088594ec 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.cxx @@ -79,7 +79,7 @@ Sequence< sal_Int8 > SAL_CALL ScannerManager::getMaskDIB() throw() OUString ScannerManager::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.scanner.ScannerManager" ); + return OUString( "com.sun.star.scanner.ScannerManager" ); } // ----------------------------------------------------------------------------- @@ -88,7 +88,7 @@ Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw () { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.scanner.ScannerManager" ); + aSNS.getArray()[0] = OUString( "com.sun.star.scanner.ScannerManager" ); return aSNS; } diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index bfbbc99e2289..85f116339591 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -37,8 +37,6 @@ using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::scanner; -using ::rtl::OUString; - class ScannerManager : public OWeakObject, XScannerManager2, css::awt::XBitmap { protected: diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index aace9cb1511e..d6d7615d93cc 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -256,7 +256,7 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw() if( Sane::IsSane() ) { Sequence< ScannerContext > aRet(1); - aRet.getArray()[0].ScannerName = ::rtl::OUString("SANE"); + aRet.getArray()[0].ScannerName = OUString("SANE"); aRet.getArray()[0].InternalData = 0; return aRet; } @@ -281,7 +281,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString("Scanner does not exist"), + OUString("Scanner does not exist"), Reference< XScannerManager >( this ), ScanError_InvalidContext ); @@ -289,7 +289,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString("Scanner is busy"), + OUString("Scanner is busy"), Reference< XScannerManager >( this ), ScanError_ScanInProgress ); @@ -320,14 +320,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString("Scanner does not exist"), + OUString("Scanner does not exist"), Reference< XScannerManager >( this ), ScanError_InvalidContext ); boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString("Scanner is busy"), + OUString("Scanner is busy"), Reference< XScannerManager >( this ), ScanError_ScanInProgress ); @@ -346,7 +346,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString("Scanner does not exist"), + OUString("Scanner does not exist"), Reference< XScannerManager >( this ), ScanError_InvalidContext ); @@ -365,7 +365,7 @@ Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString("Scanner does not exist"), + OUString("Scanner does not exist"), Reference< XScannerManager >( this ), ScanError_InvalidContext ); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 60e1d588a862..fbeeff9f3d98 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -253,9 +253,9 @@ void ImpTwain::ImplOpenSourceManager() { if( 1 == nCurState ) { - pMod = new ::osl::Module( ::rtl::OUString() ); + pMod = new ::osl::Module( OUString() ); - if( pMod->load( ::rtl::OUString( TWAIN_LIBNAME ) ) ) + if( pMod->load( OUString( TWAIN_LIBNAME ) ) ) { nCurState = 2; @@ -869,7 +869,7 @@ uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners() osl::MutexGuard aGuard( maProtector ); uno::Sequence< ScannerContext > aRet( 1 ); - aRet.getArray()[0].ScannerName = ::rtl::OUString( "TWAIN" ); + aRet.getArray()[0].ScannerName = OUString( "TWAIN" ); aRet.getArray()[0].InternalData = 0; return aRet; @@ -881,8 +881,8 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rCont osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); - if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( "TWAIN" ) ) - throw ScannerException( ::rtl::OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); + if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) ) + throw ScannerException( OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); ReleaseData(); @@ -895,8 +895,8 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); - if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( "TWAIN" ) ) - throw ScannerException( ::rtl::OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); + if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) ) + throw ScannerException( OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); ReleaseData(); aTwain.PerformTransfer( *this, rxListener ); @@ -908,8 +908,8 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext ) osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); - if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( "TWAIN" ) ) - throw ScannerException( ::rtl::OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); + if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN" ) ) + throw ScannerException( OUString( "Scanner does not exist" ), xThis, ScanError_InvalidContext ); return( ( aTwain.GetState() == TWAIN_STATE_CANCELED ) ? ScanError_ScanCanceled : ScanError_ScanErrorNone ); } diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx index daf2a07fb805..e9a187bd42cd 100644 --- a/extensions/source/scanner/scnserv.cxx +++ b/extensions/source/scanner/scnserv.cxx @@ -32,7 +32,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const s Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory; void* pRet = 0; - if( ::rtl::OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() ) + if( OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() ) { xFactory = Reference< ::com::sun::star::lang::XSingleServiceFactory >( ::cppu::createSingleFactory( static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ), diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index ad57db85fa1b..3ceb70a4076c 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -45,8 +45,8 @@ namespace uno = com::sun::star::uno ; struct OutData { rtl::Reference< DownloadInteractionHandler >Handler; - rtl::OUString File; - rtl::OUString DestinationDir; + OUString File; + OUString DestinationDir; oslFileHandle FileHandle; sal_uInt64 Offset; osl::Condition& StopCondition; @@ -65,7 +65,7 @@ static void openFile( OutData& out ) double fDownloadSize; curl_easy_getinfo(out.curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &fDownloadSize); - rtl::OString aURL(effective_url); + OString aURL(effective_url); // ensure no trailing '/' sal_Int32 nLen = aURL.getLength(); @@ -76,7 +76,7 @@ static void openFile( OutData& out ) sal_Int32 nIndex = aURL.lastIndexOf('/'); if( nIndex > 0 ) { - out.File = out.DestinationDir + rtl::OStringToOUString(aURL.copy(nIndex), RTL_TEXTENCODING_UTF8); + out.File = out.DestinationDir + OStringToOUString(aURL.copy(nIndex), RTL_TEXTENCODING_UTF8); oslFileError rc; @@ -101,22 +101,22 @@ static void openFile( OutData& out ) //------------------------------------------------------------------------------ -static inline rtl::OString -getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const rtl::OUString& aName) +static inline OString +getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName) { - rtl::OString aRet; + OString aRet; OSL_ASSERT(xNameAccess->hasByName(aName)); uno::Any aValue = xNameAccess->getByName(aName); - return rtl::OUStringToOString(aValue.get<rtl::OUString>(), RTL_TEXTENCODING_UTF8); + return OUStringToOString(aValue.get<OUString>(), RTL_TEXTENCODING_UTF8); } //------------------------------------------------------------------------------ static inline sal_Int32 getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, - const rtl::OUString& aName, sal_Int32 nDefault=-1) + const OUString& aName, sal_Int32 nDefault=-1) { OSL_ASSERT(xNameAccess->hasByName(aName)); uno::Any aValue = xNameAccess->getByName(aName); @@ -180,7 +180,7 @@ progress_callback( void *clientp, double dltotal, double dlnow, double ultotal, //------------------------------------------------------------------------------ void -Download::getProxyForURL(const rtl::OUString& rURL, rtl::OString& rHost, sal_Int32& rPort) const +Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) const { uno::Reference< lang::XMultiServiceFactory > xConfigProvider( com::sun::star::configuration::theDefaultProvider::get( m_xContext ) ); @@ -223,7 +223,7 @@ Download::getProxyForURL(const rtl::OUString& rURL, rtl::OString& rHost, sal_Int //------------------------------------------------------------------------------ -bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProxyHost, sal_Int32 nProxyPort) +bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal_Int32 nProxyPort) { /* Need to investigate further whether it is necessary to call * curl_global_init or not - leave it for now (as the ftp UCB content @@ -237,7 +237,7 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx { out.curl = pCURL; - rtl::OString aURL(rtl::OUStringToOString(rURL, RTL_TEXTENCODING_UTF8)); + OString aURL(OUStringToOString(rURL, RTL_TEXTENCODING_UTF8)); curl_easy_setopt(pCURL, CURLOPT_URL, aURL.getStr()); // abort on http errors @@ -301,7 +301,7 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx // Only report errors when not stopped else { - rtl::OString aMessage(RTL_CONSTASCII_STRINGPARAM("Unknown error")); + OString aMessage(RTL_CONSTASCII_STRINGPARAM("Unknown error")); const char * error_message = curl_easy_strerror(cc); if( NULL != error_message ) @@ -313,9 +313,9 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx curl_easy_getinfo( pCURL, CURLINFO_RESPONSE_CODE, &nError ); if ( 403 == nError ) - aMessage += rtl::OString( RTL_CONSTASCII_STRINGPARAM( " 403: Access denied!" ) ); + aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " 403: Access denied!" ) ); else if ( 404 == nError ) - aMessage += rtl::OString( RTL_CONSTASCII_STRINGPARAM( " 404: File not found!" ) ); + aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " 404: File not found!" ) ); else if ( 416 == nError ) { // we got this error probably, because we already downloaded the file @@ -324,13 +324,13 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx } else { - aMessage += rtl::OString( RTL_CONSTASCII_STRINGPARAM( ":error code = " ) ); + aMessage += OString( RTL_CONSTASCII_STRINGPARAM( ":error code = " ) ); aMessage += aMessage.valueOf( nError ); - aMessage += rtl::OString( RTL_CONSTASCII_STRINGPARAM( " !" ) ); + aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " !" ) ); } } if ( !ret ) - out.Handler->downloadStalled( rtl::OStringToOUString(aMessage, RTL_TEXTENCODING_UTF8) ); + out.Handler->downloadStalled( OStringToOUString(aMessage, RTL_TEXTENCODING_UTF8) ); } curl_easy_cleanup(pCURL); @@ -342,19 +342,19 @@ bool curl_run(const rtl::OUString& rURL, OutData& out, const rtl::OString& aProx //------------------------------------------------------------------------------ bool -Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl::OUString& rDestinationDir) +Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDestinationDir) { OSL_ASSERT( m_aHandler.is() ); OutData out(m_aCondition); - rtl::OUString aFile( rFile ); + OUString aFile( rFile ); // when rFile is empty, there is no remembered file name. If there is already a file with the // same name ask the user if she wants to resume a download or restart the download if ( aFile.isEmpty() ) { // GetFileName() - rtl::OUString aURL( rURL ); + OUString aURL( rURL ); // ensure no trailing '/' sal_Int32 nLen = aURL.getLength(); while( (nLen > 0) && ('/' == aURL[ nLen-1 ]) ) @@ -374,7 +374,7 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl if ( m_aHandler->checkDownloadDestination( aURL.copy( nIndex+1 ) ) ) { osl_removeFile( aFile.pData ); - aFile = rtl::OUString(); + aFile = OUString(); } else m_aHandler->downloadStarted( aFile, 0 ); @@ -382,7 +382,7 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl else { osl_removeFile( aFile.pData ); - aFile = rtl::OUString(); + aFile = OUString(); } } @@ -403,10 +403,10 @@ Download::start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl } } else if( osl_File_E_NOENT == rc ) // file has been deleted meanwhile .. - out.File = rtl::OUString(); + out.File = OUString(); } - rtl::OString aProxyHost; + OString aProxyHost; sal_Int32 nProxyPort = -1; getProxyForURL(rURL, aProxyHost, nProxyPort); diff --git a/extensions/source/update/check/download.hxx b/extensions/source/update/check/download.hxx index 1f01c8c4c230..b1d22e773562 100644 --- a/extensions/source/update/check/download.hxx +++ b/extensions/source/update/check/download.hxx @@ -27,22 +27,22 @@ struct DownloadInteractionHandler : public rtl::IReference { - virtual bool checkDownloadDestination(const rtl::OUString& rFileName) = 0; + virtual bool checkDownloadDestination(const OUString& rFileName) = 0; // called if the destination file already exists, but resume is false - virtual bool downloadTargetExists(const rtl::OUString& rFileName) = 0; + virtual bool downloadTargetExists(const OUString& rFileName) = 0; // called when curl reports an error - virtual void downloadStalled(const rtl::OUString& rErrorMessage) = 0; + virtual void downloadStalled(const OUString& rErrorMessage) = 0; // progress handler virtual void downloadProgressAt(sal_Int8 nPercent) = 0; // called on first progress notification - virtual void downloadStarted(const rtl::OUString& rFileName, sal_Int64 nFileSize) = 0; + virtual void downloadStarted(const OUString& rFileName, sal_Int64 nFileSize) = 0; // called when download has been finished - virtual void downloadFinished(const rtl::OUString& rFileName) = 0; + virtual void downloadFinished(const OUString& rFileName) = 0; protected: ~DownloadInteractionHandler() {} @@ -56,7 +56,7 @@ public: const rtl::Reference< DownloadInteractionHandler >& rHandler) : m_xContext(xContext), m_aHandler(rHandler) {}; // returns true when the content of rURL was successfully written to rLocalFile - bool start(const rtl::OUString& rURL, const rtl::OUString& rFile, const rtl::OUString& rDestinationDir); + bool start(const OUString& rURL, const OUString& rFile, const OUString& rDestinationDir); // stops the download after the next write operation void stop(); @@ -68,7 +68,7 @@ public: protected: // Determines the appropriate proxy settings for the given URL. Returns true if a proxy should be used - void getProxyForURL(const rtl::OUString& rURL, rtl::OString& rHost, sal_Int32& rPort) const; + void getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) const; private: osl::Condition m_aCondition; diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index d2ac583ca758..380217ca19ed 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -72,7 +72,7 @@ extern "C" bool SAL_CALL WNT_hasInternetConnection(); //------------------------------------------------------------------------------ // Returns the URL of the release note for the given position -rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled) +OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled) { std::vector< ReleaseNote >::const_iterator iter = rInfo.ReleaseNotes.begin(); while( iter != rInfo.ReleaseNotes.end() ) @@ -88,7 +88,7 @@ rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDo ++iter; } - return rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------ @@ -96,7 +96,7 @@ rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDo namespace { -static inline rtl::OUString getBuildId() +static inline OUString getBuildId() { OUString aPathVal("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"); rtl::Bootstrap::expandMacros(aPathVal); @@ -104,16 +104,16 @@ static inline rtl::OUString getBuildId() } //------------------------------------------------------------------------------ -static inline rtl::OUString getBaseInstallation() +static inline OUString getBaseInstallation() { - rtl::OUString aPathVal("$BRAND_BASE_DIR"); + OUString aPathVal("$BRAND_BASE_DIR"); rtl::Bootstrap::expandMacros(aPathVal); return aPathVal; } //------------------------------------------------------------------------------ -inline bool isObsoleteUpdateInfo(const rtl::OUString& rBuildId) +inline bool isObsoleteUpdateInfo(const OUString& rBuildId) { return sal_True != rBuildId.equals(getBuildId()) && !rBuildId.isEmpty(); } @@ -121,10 +121,10 @@ inline bool isObsoleteUpdateInfo(const rtl::OUString& rBuildId) //------------------------------------------------------------------------------ -rtl::OUString getImageFromFileName(const rtl::OUString& aFile) +OUString getImageFromFileName(const OUString& aFile) { #ifndef WNT - rtl::OUString aUnpackPath; + OUString aUnpackPath; if( osl_getExecutableFile(&aUnpackPath.pData) == osl_Process_E_None ) { sal_uInt32 lastIndex = aUnpackPath.lastIndexOf('/'); @@ -137,7 +137,7 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile) oslFileHandle hOut = NULL; oslProcess hProcess = NULL; - rtl::OUString aSystemPath; + OUString aSystemPath; osl::File::getSystemPathFromFileURL(aFile, aSystemPath); oslProcessError rc = osl_executeProcess_WithRedirectedIO( @@ -164,7 +164,7 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile) sal_uInt64 nBytesRead = 0; const sal_uInt64 nBytesToRead = sizeof(szBuffer) - 1; - rtl::OUString aImageName; + OUString aImageName; while( osl_File_E_None == osl_readFile(hOut, szBuffer, nBytesToRead, &nBytesRead) ) { sal_Char *pc = szBuffer + nBytesRead; @@ -174,7 +174,7 @@ rtl::OUString getImageFromFileName(const rtl::OUString& aFile) } while( ('\n' == *pc) || ('\r' == *pc) ); - aImageName += rtl::OUString(szBuffer, pc - szBuffer + 1, osl_getThreadTextEncoding()); + aImageName += OUString(szBuffer, pc - szBuffer + 1, osl_getThreadTextEncoding()); if( nBytesRead < nBytesToRead ) break; @@ -316,7 +316,7 @@ public: osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext, const rtl::Reference< DownloadInteractionHandler >& rHandler, - const rtl::OUString& rURL ); + const OUString& rURL ); virtual void SAL_CALL run(); virtual void SAL_CALL cancel(); @@ -329,7 +329,7 @@ protected: private: osl::Condition& m_aCondition; const uno::Reference<uno::XComponentContext> m_xContext; - const rtl::OUString m_aURL; + const OUString m_aURL; Download m_aDownload; }; @@ -553,7 +553,7 @@ UpdateCheckThread::run() catch(const uno::Exception& e) { // Silently catch all errors OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); } } @@ -571,7 +571,7 @@ ManualUpdateCheckThread::run() catch(const uno::Exception& e) { // Silently catch all errors OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() ); } } @@ -601,7 +601,7 @@ MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& ) DownloadThread::DownloadThread(osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext, const rtl::Reference< DownloadInteractionHandler >& rHandler, - const rtl::OUString& rURL) : + const OUString& rURL) : m_aCondition(rCondition), m_xContext(xContext), m_aURL(rURL), @@ -630,8 +630,8 @@ DownloadThread::run() { rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext); - rtl::OUString aLocalFile = rModel->getLocalFileName(); - rtl::OUString aDownloadDest = rModel->getDownloadDestination(); + OUString aLocalFile = rModel->getLocalFileName(); + OUString aDownloadDest = rModel->getDownloadDestination(); // release config class for now rModel.clear(); @@ -756,7 +756,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, UpdateCheckROModel aModel( aNameAccess ); m_xContext = xContext; - rtl::OUString aUpdateEntryVersion = aModel.getUpdateEntryVersion(); + OUString aUpdateEntryVersion = aModel.getUpdateEntryVersion(); aModel.getUpdateEntry(m_aUpdateInfo); @@ -767,7 +767,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, m_bHasExtensionUpdate = checkForPendingUpdates( xContext ); m_bShowExtUpdDlg = false; - rtl::OUString aLocalFileName = aModel.getLocalFileName(); + OUString aLocalFileName = aModel.getLocalFileName(); if( !aLocalFileName.isEmpty() ) { @@ -815,7 +815,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, if( obsoleteUpdateInfo ) { // Bring-up release note for position 5 .. - const rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 5)); + const OUString aURL(getReleaseNote(m_aUpdateInfo, 5)); if( !aURL.isEmpty() ) showReleaseNote(aURL); @@ -827,8 +827,8 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, m_aUpdateInfo = UpdateInfo(); // Remove outdated release notes - storeReleaseNote( 1, rtl::OUString() ); - storeReleaseNote( 2, rtl::OUString() ); + storeReleaseNote( 1, OUString() ); + storeReleaseNote( 2, OUString() ); } else { @@ -902,16 +902,16 @@ UpdateCheck::install() // Construct install command ?? // Store release note for position 3 and 4 - rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 3)); + OUString aURL(getReleaseNote(m_aUpdateInfo, 3)); storeReleaseNote(1, aURL); aURL = getReleaseNote(m_aUpdateInfo, 4); storeReleaseNote(2, aURL); - rtl::OUString aInstallImage(m_aImageName); + OUString aInstallImage(m_aImageName); osl::FileBase::getSystemPathFromFileURL(aInstallImage, aInstallImage); - rtl::OUString aParameter; + OUString aParameter; sal_Int32 nFlags = c3s::SystemShellExecuteFlags::DEFAULTS; #if ( defined LINUX || defined SOLARIS ) nFlags = 42; @@ -1047,7 +1047,7 @@ UpdateCheck::enableDownload(bool enable, bool paused) //------------------------------------------------------------------------------ bool -UpdateCheck::downloadTargetExists(const rtl::OUString& rFileName) +UpdateCheck::downloadTargetExists(const OUString& rFileName) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -1089,7 +1089,7 @@ UpdateCheck::downloadTargetExists(const rtl::OUString& rFileName) } //------------------------------------------------------------------------------ -bool UpdateCheck::checkDownloadDestination( const rtl::OUString& rFileName ) +bool UpdateCheck::checkDownloadDestination( const OUString& rFileName ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -1108,7 +1108,7 @@ bool UpdateCheck::checkDownloadDestination( const rtl::OUString& rFileName ) //------------------------------------------------------------------------------ void -UpdateCheck::downloadStalled(const rtl::OUString& rErrorMessage) +UpdateCheck::downloadStalled(const OUString& rErrorMessage) { osl::ClearableMutexGuard aGuard(m_aMutex); rtl::Reference< UpdateHandler > aUpdateHandler(getUpdateHandler()); @@ -1134,7 +1134,7 @@ UpdateCheck::downloadProgressAt(sal_Int8 nPercent) //------------------------------------------------------------------------------ void -UpdateCheck::downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize) +UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize) { if ( nFileSize > 0 ) { @@ -1144,7 +1144,7 @@ UpdateCheck::downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFil aModel->storeLocalFileName(rLocalFileName, nFileSize); // Bring-up release note for position 1 .. - const rtl::OUString aURL(getReleaseNote(m_aUpdateInfo, 1, aModel->isAutoDownloadEnabled())); + const OUString aURL(getReleaseNote(m_aUpdateInfo, 1, aModel->isAutoDownloadEnabled())); if( !aURL.isEmpty() ) showReleaseNote(aURL); } @@ -1153,7 +1153,7 @@ UpdateCheck::downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFil //------------------------------------------------------------------------------ void -UpdateCheck::downloadFinished(const rtl::OUString& rLocalFileName) +UpdateCheck::downloadFinished(const OUString& rLocalFileName) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -1168,7 +1168,7 @@ UpdateCheck::downloadFinished(const rtl::OUString& rLocalFileName) // Bring-up release note for position 2 .. rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get( m_xContext ); - const rtl::OUString aURL(getReleaseNote(aUpdateInfo, 2, rModel->isAutoDownloadEnabled())); + const OUString aURL(getReleaseNote(aUpdateInfo, 2, rModel->isAutoDownloadEnabled())); if( !aURL.isEmpty() ) showReleaseNote(aURL); } @@ -1185,7 +1185,7 @@ UpdateCheck::cancelDownload() rtl::Reference< UpdateCheckConfig > rModel = UpdateCheckConfig::get(m_xContext); - rtl::OUString aLocalFile(rModel->getLocalFileName()); + OUString aLocalFile(rModel->getLocalFileName()); rModel->clearLocalFileName(); rModel->storeDownloadPaused(false); @@ -1303,7 +1303,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) if( ((1 == iter2->Pos) || (2 == iter2->Pos)) && autoDownloadEnabled && !iter2->URL2.isEmpty()) { iter2->URL = iter2->URL2; - iter2->URL2 = rtl::OUString(); + iter2->URL2 = OUString(); iter2->Pos = iter2->Pos2; iter2->Pos2 = 0; } @@ -1411,7 +1411,7 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble) OSL_ASSERT( aUpdateHandler.is() ); UpdateInfo aUpdateInfo(m_aUpdateInfo); - rtl::OUString aImageName(m_aImageName); + OUString aImageName(m_aImageName); aGuard.clear(); @@ -1423,7 +1423,7 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble) { uno::Reference< uno::XComponentContext > xContext(m_xContext); - rtl::OUString aDownloadDestination = + OUString aDownloadDestination = UpdateCheckConfig::get(xContext, this)->getDownloadDestination(); osl_getSystemPathFromFileURL(aDownloadDestination.pData, &aDownloadDestination.pData); @@ -1461,13 +1461,13 @@ UpdateCheck::getUIState(const UpdateInfo& rInfo) //------------------------------------------------------------------------------ void -UpdateCheck::showReleaseNote(const rtl::OUString& rURL) const +UpdateCheck::showReleaseNote(const OUString& rURL) const { const uno::Reference< c3s::XSystemShellExecute > xShellExecute( c3s::SystemShellExecute::create( m_xContext ) ); try { - xShellExecute->execute(rURL, rtl::OUString(), c3s::SystemShellExecuteFlags::URIS_ONLY); + xShellExecute->execute(rURL, OUString(), c3s::SystemShellExecuteFlags::URIS_ONLY); } catch(const c3s::SystemShellExecuteException&) { } } @@ -1475,18 +1475,18 @@ UpdateCheck::showReleaseNote(const rtl::OUString& rURL) const //------------------------------------------------------------------------------ bool -UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL) +UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL) { osl::FileBase::RC rc; - rtl::OUString aTargetDir( UpdateCheckConfig::getAllUsersDirectory() + "/sun" ); + OUString aTargetDir( UpdateCheckConfig::getAllUsersDirectory() + "/sun" ); rc = osl::Directory::createPath( aTargetDir ); - rtl::OUString aFileName = "releasenote" + - rtl::OUString::valueOf( (sal_Int32) nNum ) + + OUString aFileName = "releasenote" + + OUString::valueOf( (sal_Int32) nNum ) + ".url"; - rtl::OUString aFilePath; + OUString aFilePath; rc = osl::FileBase::getAbsoluteFileURL( aTargetDir, aFileName, aFilePath ); if ( rc != osl::FileBase::E_None ) return false; @@ -1501,16 +1501,16 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL) if ( rc != osl::FileBase::E_None ) return false; - rtl::OString aLineBuf("[InternetShortcut]\r\n"); + OString aLineBuf("[InternetShortcut]\r\n"); sal_uInt64 nWritten = 0; - rtl::OUString aURL( rURL ); + OUString aURL( rURL ); #ifdef WNT rc = aFile.write( aLineBuf.getStr(), aLineBuf.getLength(), nWritten ); if ( rc != osl::FileBase::E_None ) return false; aURL = "URL=" + rURL; #endif - aLineBuf = rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ); + aLineBuf = OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ); rc = aFile.write( aLineBuf.getStr(), aLineBuf.getLength(), nWritten ); if ( rc != osl::FileBase::E_None ) return false; @@ -1521,8 +1521,8 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL) //------------------------------------------------------------------------------ void UpdateCheck::showExtensionDialog() { - rtl::OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; - rtl::OUString sArguments = "SHOW_UPDATE_DIALOG"; + OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; + OUString sArguments = "SHOW_UPDATE_DIALOG"; uno::Reference< uno::XInterface > xService; if( ! m_xContext.is() ) @@ -1571,7 +1571,7 @@ UpdateCheck::getInteractionHandler() const //------------------------------------------------------------------------------ uno::Reference< uno::XInterface > -UpdateCheck::createService(const rtl::OUString& rServiceName, +UpdateCheck::createService(const OUString& rServiceName, const uno::Reference<uno::XComponentContext>& xContext) { if( !xContext.is() ) diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx index 55d2b24c158b..9ae38d8132d3 100644 --- a/extensions/source/update/check/updatecheck.hxx +++ b/extensions/source/update/check/updatecheck.hxx @@ -71,7 +71,7 @@ public: */ static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > createService( - const rtl::OUString& aServiceName, + const OUString& aServiceName, const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext); // Update internal update info member @@ -99,13 +99,13 @@ public: bool hasOfficeUpdate() const { return (m_aUpdateInfo.BuildId.getLength() > 0); } // DownloadInteractionHandler - virtual bool downloadTargetExists(const rtl::OUString& rFileName); - virtual void downloadStalled(const rtl::OUString& rErrorMessage); + virtual bool downloadTargetExists(const OUString& rFileName); + virtual void downloadStalled(const OUString& rErrorMessage); virtual void downloadProgressAt(sal_Int8 nProcent); - virtual void downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize); - virtual void downloadFinished(const rtl::OUString& rLocalFileName); + virtual void downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize); + virtual void downloadFinished(const OUString& rLocalFileName); // checks if the download target already exists and asks user what to do next - virtual bool checkDownloadDestination( const rtl::OUString& rFile ); + virtual bool checkDownloadDestination( const OUString& rFile ); // Cancels the download action (and resumes checking if enabled) void cancelDownload(); @@ -144,10 +144,10 @@ private: rtl::Reference<UpdateHandler> getUpdateHandler(); // Open the given URL in a browser - void showReleaseNote(const rtl::OUString& rURL) const; + void showReleaseNote(const OUString& rURL) const; // stores the release note url on disk to be used by setup app - static bool storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL); + static bool storeReleaseNote(sal_Int8 nNum, const OUString &rURL); /* This method turns on the menubar icon and triggers the bubble window */ @@ -169,7 +169,7 @@ private: osl::Condition m_aCondition; UpdateInfo m_aUpdateInfo; - rtl::OUString m_aImageName; + OUString m_aImageName; bool m_bHasExtensionUpdate; bool m_bShowExtUpdDlg; diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index 8f0de9adaa5c..19dc4c3426c5 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -118,11 +118,11 @@ UpdateCheckROModel::isDownloadPaused() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckROModel::getStringValue(const sal_Char * pStr) const { uno::Any aAny( m_aNameAccess.getValue(pStr) ); - rtl::OUString aRet; + OUString aRet; aAny >>= aRet; @@ -131,7 +131,7 @@ UpdateCheckROModel::getStringValue(const sal_Char * pStr) const //------------------------------------------------------------------------------ -rtl::OUString UpdateCheckROModel::getLocalFileName() const +OUString UpdateCheckROModel::getLocalFileName() const { return getStringValue(LOCAL_FILE); }; @@ -149,7 +149,7 @@ sal_Int64 UpdateCheckROModel::getDownloadSize() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckROModel::getUpdateEntryVersion() const { return getStringValue(OLD_VERSION); @@ -169,11 +169,11 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const rInfo.Sources.push_back( DownloadSource( isDirectDownload, getStringValue(DOWNLOAD_URL) ) ); - rtl::OString aStr(RELEASE_NOTE); + OString aStr(RELEASE_NOTE); for(sal_Int32 n=1; n < 6; ++n ) { - rtl::OUString aUStr = getStringValue( - OString(aStr + rtl::OString::valueOf(n)).getStr()); + OUString aUStr = getStringValue( + OString(aStr + OString::valueOf(n)).getStr()); if( !aUStr.isEmpty() ) rInfo.ReleaseNotes.push_back(ReleaseNote((sal_Int8) n, aUStr)); } @@ -182,23 +182,23 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const //------------------------------------------------------------------------------ -rtl::OUString UpdateCheckConfig::getDesktopDirectory() +OUString UpdateCheckConfig::getDesktopDirectory() { - rtl::OUString aRet; + OUString aRet; #ifdef WNT WCHAR szPath[MAX_PATH]; if( ! FAILED( SHGetSpecialFolderPathW( NULL, szPath, CSIDL_DESKTOPDIRECTORY, true ) ) ) { - aRet = rtl::OUString( reinterpret_cast< sal_Unicode * >(szPath) ); + aRet = OUString( reinterpret_cast< sal_Unicode * >(szPath) ); osl::FileBase::getFileURLFromSystemPath( aRet, aRet ); } #else // This should become a desktop specific setting in some system backend .. - rtl::OUString aHomeDir; + OUString aHomeDir; osl::Security().getHomeDir( aHomeDir ); - aRet = aHomeDir + rtl::OUString("/Desktop"); + aRet = aHomeDir + OUString("/Desktop"); // Set path to home directory when there is no /Desktop directory osl::Directory aDocumentsDir( aRet ); @@ -211,16 +211,16 @@ rtl::OUString UpdateCheckConfig::getDesktopDirectory() //------------------------------------------------------------------------------ -rtl::OUString UpdateCheckConfig::getAllUsersDirectory() +OUString UpdateCheckConfig::getAllUsersDirectory() { - rtl::OUString aRet; + OUString aRet; #ifdef WNT WCHAR szPath[MAX_PATH]; if( ! FAILED( SHGetSpecialFolderPathW( NULL, szPath, CSIDL_COMMON_DOCUMENTS, true ) ) ) { - aRet = rtl::OUString( reinterpret_cast< sal_Unicode * >(szPath) ); + aRet = OUString( reinterpret_cast< sal_Unicode * >(szPath) ); osl::FileBase::getFileURLFromSystemPath( aRet, aRet ); } #else @@ -300,10 +300,10 @@ UpdateCheckConfig::isAutoDownloadEnabled() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckConfig::getUpdateEntryVersion() const { - rtl::OUString aValue; + OUString aValue; // getByName is defined as non const in XNameAccess const_cast < UpdateCheckConfig *> (this)->getByName( OLD_VERSION ) >>= aValue; @@ -339,11 +339,11 @@ UpdateCheckConfig::getCheckInterval() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckConfig::getLocalFileName() const { - rtl::OUString aName = LOCAL_FILE; - rtl::OUString aRet; + OUString aName = LOCAL_FILE; + OUString aRet; if( m_xContainer->hasByName(aName) ) m_xContainer->getByName(aName) >>= aRet; @@ -353,7 +353,7 @@ UpdateCheckConfig::getLocalFileName() const //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckConfig::getDownloadDestination() const { OUString aName = DOWNLOAD_DESTINATION; @@ -367,7 +367,7 @@ UpdateCheckConfig::getDownloadDestination() const //------------------------------------------------------------------------------ void -UpdateCheckConfig::storeLocalFileName(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize) +UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64 nFileSize) { const sal_uInt8 nItems = 2; const OUString aNameList[nItems] = { OUString(LOCAL_FILE), OUString(DOWNLOAD_SIZE) }; @@ -426,7 +426,7 @@ UpdateCheckConfig::updateLastChecked() //------------------------------------------------------------------------------ void -UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const rtl::OUString& aCurrentBuild) +UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aCurrentBuild) { bool autoDownloadEnabled = isAutoDownloadEnabled(); @@ -446,10 +446,10 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const rtl::OUStrin uno::makeAny(aCurrentBuild) }; - rtl::OUString aName; + OUString aName; for( sal_uInt32 n=0; n < nUpdateEntryProperties; ++n ) { - aName = rtl::OUString::createFromAscii(aUpdateEntryProperties[n]); + aName = OUString::createFromAscii(aUpdateEntryProperties[n]); if( m_xContainer->hasByName(aName) ) m_xContainer->replaceByName(aName, aValues[n]); @@ -465,11 +465,11 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const rtl::OUStrin void UpdateCheckConfig::clearUpdateFound() { - rtl::OUString aName; + OUString aName; for( sal_uInt32 n=0; n < nUpdateEntryProperties; ++n ) { - aName = rtl::OUString::createFromAscii(aUpdateEntryProperties[n]); + aName = OUString::createFromAscii(aUpdateEntryProperties[n]); try { if( m_xContainer->hasByName(aName) ) @@ -477,7 +477,7 @@ UpdateCheckConfig::clearUpdateFound() } catch(const lang::WrappedTargetException& ) { // Can not remove value, probably in share layer OSL_ASSERT(false); - m_xContainer->replaceByName(aName, uno::makeAny(rtl::OUString())); + m_xContainer->replaceByName(aName, uno::makeAny(OUString())); } } @@ -491,20 +491,20 @@ UpdateCheckConfig::clearUpdateFound() //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > UpdateCheckConfig::getServiceNames() { - uno::Sequence< rtl::OUString > aServiceList(1); + uno::Sequence< OUString > aServiceList(1); aServiceList[0] = "com.sun.star.setup.UpdateCheckConfig"; return aServiceList; } //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckConfig::getImplName() { - return rtl::OUString("vnd.sun.UpdateCheckConfig"); + return OUString("vnd.sun.UpdateCheckConfig"); } //------------------------------------------------------------------------------ @@ -526,7 +526,7 @@ UpdateCheckConfig::hasElements() throw (uno::RuntimeException) //------------------------------------------------------------------------------ uno::Any SAL_CALL -UpdateCheckConfig::getByName( const ::rtl::OUString& aName ) +UpdateCheckConfig::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aValue = m_xContainer->getByName( aName ); @@ -534,7 +534,7 @@ UpdateCheckConfig::getByName( const ::rtl::OUString& aName ) // Provide dynamic default value if( aName.equalsAscii(DOWNLOAD_DESTINATION) ) { - rtl::OUString aStr; + OUString aStr; aValue >>= aStr; if( aStr.isEmpty() ) @@ -546,7 +546,7 @@ UpdateCheckConfig::getByName( const ::rtl::OUString& aName ) //------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateCheckConfig::getElementNames( ) throw (uno::RuntimeException) { return m_xContainer->getElementNames(); @@ -555,7 +555,7 @@ UpdateCheckConfig::getElementNames( ) throw (uno::RuntimeException) //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateCheckConfig::hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) +UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeException) { return m_xContainer->hasByName( aName ); } @@ -563,7 +563,7 @@ UpdateCheckConfig::hasByName( const ::rtl::OUString& aName ) throw (uno::Runtime //------------------------------------------------------------------------------ void SAL_CALL -UpdateCheckConfig::replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) +UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { @@ -586,7 +586,7 @@ UpdateCheckConfig::commitChanges() if( m_rListener.is() ) { const sal_Int32 nChanges = aChangesSet.getLength(); - rtl::OUString aString; + OUString aString; for( sal_Int32 i=0; i<nChanges; ++i ) { @@ -647,8 +647,8 @@ UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException) } //------------------------------------------------------------------------------ -bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionName, - const rtl::OUString& rVersion ) +bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName, + const OUString& rVersion ) { bool bNotify = true; @@ -663,7 +663,7 @@ bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionNa if ( m_xIgnoredUpdates->hasByName( rExtensionName ) ) { - ::rtl::OUString aIgnoredVersion; + OUString aIgnoredVersion; uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) ); aValue >>= aIgnoredVersion; if ( aIgnoredVersion.isEmpty() ) // no version means ignore all updates @@ -678,18 +678,18 @@ bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionNa } //------------------------------------------------------------------------------ -bool UpdateCheckConfig::checkExtensionVersion( const rtl::OUString& rExtensionName, - const rtl::OUString& rVersion ) +bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName, + const OUString& rVersion ) { if ( m_xAvailableUpdates->hasByName( rExtensionName ) ) { - ::rtl::OUString aStoredVersion; + OUString aStoredVersion; uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xAvailableUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) ); aValue >>= aStoredVersion; if ( m_xIgnoredUpdates->hasByName( rExtensionName ) ) { - ::rtl::OUString aIgnoredVersion; + OUString aIgnoredVersion; uno::Any aValue2( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) ); aValue2 >>= aIgnoredVersion; if ( aIgnoredVersion.isEmpty() ) // no version means ignore all updates @@ -711,7 +711,7 @@ bool UpdateCheckConfig::checkExtensionVersion( const rtl::OUString& rExtensionNa } //------------------------------------------------------------------------------ -rtl::OUString UpdateCheckConfig::getSubVersion( const rtl::OUString& rVersion, +OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion, sal_Int32 *nIndex ) { while ( *nIndex < rVersion.getLength() && rVersion[*nIndex] == '0') @@ -725,13 +725,13 @@ rtl::OUString UpdateCheckConfig::getSubVersion( const rtl::OUString& rVersion, //------------------------------------------------------------------------------ // checks if the second version string is greater than the first one -bool UpdateCheckConfig::isVersionGreater( const rtl::OUString& rVersion1, - const rtl::OUString& rVersion2 ) +bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1, + const OUString& rVersion2 ) { for ( sal_Int32 i1 = 0, i2 = 0; i1 >= 0 || i2 >= 0; ) { - ::rtl::OUString sSub1( getSubVersion( rVersion1, &i1 ) ); - ::rtl::OUString sSub2( getSubVersion( rVersion2, &i2 ) ); + OUString sSub1( getSubVersion( rVersion1, &i1 ) ); + OUString sSub2( getSubVersion( rVersion2, &i2 ) ); if ( sSub1.getLength() < sSub2.getLength() ) { return true; @@ -750,7 +750,7 @@ bool UpdateCheckConfig::isVersionGreater( const rtl::OUString& rVersion1, //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL +OUString SAL_CALL UpdateCheckConfig::getImplementationName() throw (uno::RuntimeException) { return getImplName(); @@ -759,10 +759,10 @@ UpdateCheckConfig::getImplementationName() throw (uno::RuntimeException) //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateCheckConfig::supportsService(rtl::OUString const & serviceName) +UpdateCheckConfig::supportsService(OUString const & serviceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aServiceNameList = getServiceNames(); + uno::Sequence< OUString > aServiceNameList = getServiceNames(); for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ ) if( aServiceNameList[n].equals(serviceName) ) @@ -773,7 +773,7 @@ UpdateCheckConfig::supportsService(rtl::OUString const & serviceName) //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateCheckConfig::getSupportedServiceNames() throw (uno::RuntimeException) { return getServiceNames(); diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx index 641c376f299c..2f89ecb8b177 100644 --- a/extensions/source/update/check/updatecheckconfig.hxx +++ b/extensions/source/update/check/updatecheckconfig.hxx @@ -63,15 +63,15 @@ public: bool isAutoCheckEnabled() const; bool isDownloadPaused() const; - rtl::OUString getLocalFileName() const; + OUString getLocalFileName() const; sal_Int64 getDownloadSize() const; - rtl::OUString getUpdateEntryVersion() const; + OUString getUpdateEntryVersion() const; void getUpdateEntry(UpdateInfo& rInfo) const; private: - rtl::OUString getStringValue(const sal_Char *) const; + OUString getStringValue(const sal_Char *) const; IByNameAccess& m_aNameAccess; }; @@ -97,8 +97,8 @@ class UpdateCheckConfig : public ::cppu::WeakImplHelper3< public: - static ::com::sun::star::uno::Sequence< rtl::OUString > getServiceNames(); - static rtl::OUString getImplName(); + static ::com::sun::star::uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); static ::rtl::Reference< UpdateCheckConfig > get( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, @@ -107,7 +107,7 @@ public: // Should really implement ROModel .. bool isAutoCheckEnabled() const; bool isAutoDownloadEnabled() const; - rtl::OUString getUpdateEntryVersion() const; + OUString getUpdateEntryVersion() const; /* Updates the timestamp of last check, but does not commit the change * as either clearUpdateFound() or setUpdateFound() are expected to get @@ -127,16 +127,16 @@ public: /* Stores the specified data of an available update */ - void storeUpdateFound(const UpdateInfo& rInfo, const rtl::OUString& aCurrentBuild); + void storeUpdateFound(const UpdateInfo& rInfo, const OUString& aCurrentBuild); // Returns the local file name of a started download - rtl::OUString getLocalFileName() const; + OUString getLocalFileName() const; // Returns the local file name of a started download - rtl::OUString getDownloadDestination() const; + OUString getDownloadDestination() const; // stores the local file name of a just started download - void storeLocalFileName(const rtl::OUString& rFileName, sal_Int64 nFileSize); + void storeLocalFileName(const OUString& rFileName, sal_Int64 nFileSize); // Removes the local file name of a download void clearLocalFileName(); @@ -145,16 +145,16 @@ public: void storeDownloadPaused(bool paused); // Returns the directory that acts as the user's desktop - static rtl::OUString getDesktopDirectory(); + static OUString getDesktopDirectory(); // Returns a directory accessible for all users - static rtl::OUString getAllUsersDirectory(); + static OUString getAllUsersDirectory(); // store and retrieve information about extensions - bool storeExtensionVersion( const rtl::OUString& rExtensionName, - const rtl::OUString& rVersion ); - bool checkExtensionVersion( const rtl::OUString& rExtensionName, - const rtl::OUString& rVersion ); + bool storeExtensionVersion( const OUString& rExtensionName, + const OUString& rVersion ); + bool checkExtensionVersion( const OUString& rExtensionName, + const OUString& rVersion ); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) @@ -163,17 +163,17 @@ public: throw (::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, @@ -189,17 +189,17 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); private: - static rtl::OUString getSubVersion( const rtl::OUString& rVersion, sal_Int32 *nIndex ); - static bool isVersionGreater( const rtl::OUString& rVersion1, const rtl::OUString& rVersion2 ); + static OUString getSubVersion( const OUString& rVersion, sal_Int32 *nIndex ); + static bool isVersionGreater( const OUString& rVersion1, const OUString& rVersion2 ); const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xContainer; const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xAvailableUpdates; @@ -222,7 +222,7 @@ T getValue( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Name T value = T(); if( ! (rNamedValues[n].Value >>= value) ) throw ::com::sun::star::uno::RuntimeException( - ::rtl::OUString( + OUString( cppu_Any_extraction_failure_msg( &rNamedValues[n].Value, ::cppu::getTypeFavourUnsigned(&value).getTypeLibType() ), diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index e4ff941c5abb..d61700e5f073 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -69,8 +69,8 @@ public: UpdateCheckJob(const uno::Reference<uno::XComponentContext>& xContext); - static uno::Sequence< rtl::OUString > getServiceNames(); - static rtl::OUString getImplName(); + static uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); // Allows runtime exceptions to be thrown by const methods inline SAL_CALL operator uno::Reference< uno::XInterface > () const @@ -81,11 +81,11 @@ public: throw (lang::IllegalArgumentException, uno::Exception); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (uno::RuntimeException); - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XEventListener @@ -162,20 +162,20 @@ UpdateCheckJob::~UpdateCheckJob() //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > UpdateCheckJob::getServiceNames() { - uno::Sequence< rtl::OUString > aServiceList(1); + uno::Sequence< OUString > aServiceList(1); aServiceList[0] = "com.sun.star.setup.UpdateCheck"; return aServiceList; }; //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateCheckJob::getImplName() { - return rtl::OUString("vnd.sun.UpdateCheck"); + return OUString("vnd.sun.UpdateCheck"); } @@ -214,7 +214,7 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) uno::Sequence<beans::NamedValue> aEnvironment = getValue< uno::Sequence<beans::NamedValue> > (namedValues, "Environment"); - rtl::OUString aEventName = getValue< rtl::OUString > (aEnvironment, "EventName"); + OUString aEventName = getValue< OUString > (aEnvironment, "EventName"); m_pInitThread.reset( new InitUpdateCheckJobThread( @@ -228,8 +228,8 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp ) { try { - uno::Sequence< uno::Sequence< rtl::OUString > > aList = - getValue< uno::Sequence< uno::Sequence< rtl::OUString > > > ( rListProp, "updateList" ); + uno::Sequence< uno::Sequence< OUString > > aList = + getValue< uno::Sequence< uno::Sequence< OUString > > > ( rListProp, "updateList" ); bool bPrepareOnly = getValue< bool > ( rListProp, "prepareOnly" ); // we will first store any new found updates and then check, if there are any @@ -258,13 +258,13 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa catch( const uno::Exception& e ) { OSL_TRACE( "Caught exception: %s\n thread terminated.\n", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL +OUString SAL_CALL UpdateCheckJob::getImplementationName() throw (uno::RuntimeException) { return getImplName(); @@ -272,7 +272,7 @@ UpdateCheckJob::getImplementationName() throw (uno::RuntimeException) //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException) { return getServiceNames(); @@ -281,9 +281,9 @@ UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException) //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateCheckJob::supportsService( rtl::OUString const & serviceName ) throw (uno::RuntimeException) +UpdateCheckJob::supportsService( OUString const & serviceName ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aServiceNameList = getServiceNames(); + uno::Sequence< OUString > aServiceNameList = getServiceNames(); for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ ) if( aServiceNameList[n].equals(serviceName) ) diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 4ed0a20f1b35..0bb52c1cb138 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -144,13 +144,13 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots ) if ( mbDownloadBtnHasDots != bAppendDots ) { - rtl::OUString aLabel( msDownload ); + OUString aLabel( msDownload ); if ( bAppendDots ) aLabel += "..."; setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "Label", uno::Any( aLabel ) ); - setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); + setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); mbDownloadBtnHasDots = bAppendDots; } @@ -242,29 +242,29 @@ void UpdateHandler::setProgress( sal_Int32 nPercent ) } //-------------------------------------------------------------------- -void UpdateHandler::setErrorMessage( const rtl::OUString& rErrorMsg ) +void UpdateHandler::setErrorMessage( const OUString& rErrorMsg ) { setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( rErrorMsg ) ); } //-------------------------------------------------------------------- -void UpdateHandler::setDownloadFile( const rtl::OUString& rFilePath ) +void UpdateHandler::setDownloadFile( const OUString& rFilePath ) { sal_Int32 nLast = rFilePath.lastIndexOf( '/' ); if ( nLast != -1 ) { msDownloadFile = rFilePath.copy( nLast+1 ); - const rtl::OUString aDownloadURL = rFilePath.copy( 0, nLast ); + const OUString aDownloadURL = rFilePath.copy( 0, nLast ); osl::FileBase::getSystemPathFromFileURL( aDownloadURL, msDownloadPath ); } } //-------------------------------------------------------------------- -rtl::OUString UpdateHandler::getBubbleText( UpdateState eState ) +OUString UpdateHandler::getBubbleText( UpdateState eState ) { osl::MutexGuard aGuard( maMutex ); - rtl::OUString sText; + OUString sText; sal_Int32 nIndex = (sal_Int32) eState; loadStrings(); @@ -276,11 +276,11 @@ rtl::OUString UpdateHandler::getBubbleText( UpdateState eState ) } //-------------------------------------------------------------------- -rtl::OUString UpdateHandler::getBubbleTitle( UpdateState eState ) +OUString UpdateHandler::getBubbleTitle( UpdateState eState ) { osl::MutexGuard aGuard( maMutex ); - rtl::OUString sText; + OUString sText; sal_Int32 nIndex = (sal_Int32) eState; loadStrings(); @@ -292,7 +292,7 @@ rtl::OUString UpdateHandler::getBubbleTitle( UpdateState eState ) } //-------------------------------------------------------------------- -rtl::OUString UpdateHandler::getDefaultInstErrMsg() +OUString UpdateHandler::getDefaultInstErrMsg() { osl::MutexGuard aGuard( maMutex ); @@ -445,7 +445,7 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > } uno::Reference< task::XInteractionRequestStringResolver > xStrResolver = task::InteractionRequestStringResolver::create( mxContext ); - beans::Optional< ::rtl::OUString > aErrorText = xStrResolver->getStringFromInformationalRequest( rRequest ); + beans::Optional< OUString > aErrorText = xStrResolver->getStringFromInformationalRequest( rRequest ); if ( aErrorText.IsPresent ) { setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( aErrorText.Value ) ); @@ -518,7 +518,7 @@ void UpdateHandler::updateState( UpdateState eState ) if ( isVisible() ) {} // ToTop(); - rtl::OUString sText; + OUString sText; switch ( eState ) { @@ -526,7 +526,7 @@ void UpdateHandler::updateState( UpdateState eState ) showControls( (1<<CANCEL_BUTTON) + (1<<THROBBER_CTRL) ); enableControls( 1<<CANCEL_BUTTON ); setControlProperty( TEXT_STATUS, "Text", uno::Any( substVariables(msChecking) ) ); - setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( rtl::OUString() ) ); + setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( OUString() ) ); focusControl( CANCEL_BUTTON ); break; case UPDATESTATE_ERROR_CHECKING: @@ -566,7 +566,7 @@ void UpdateHandler::updateState( UpdateState eState ) showControls( 0 ); enableControls( 1 << CLOSE_BUTTON ); setControlProperty( TEXT_STATUS, "Text", uno::Any( substVariables(msNoUpdFound) ) ); - setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( rtl::OUString() ) ); + setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( OUString() ) ); focusControl( CLOSE_BUTTON ); break; case UPDATESTATE_DOWNLOADING: @@ -610,9 +610,9 @@ void UpdateHandler::updateState( UpdateState eState ) } //-------------------------------------------------------------------- -void UpdateHandler::searchAndReplaceAll( rtl::OUString &rText, - const rtl::OUString &rWhat, - const rtl::OUString &rWith ) const +void UpdateHandler::searchAndReplaceAll( OUString &rText, + const OUString &rWhat, + const OUString &rWith ) const { sal_Int32 nIndex = rText.indexOf( rWhat ); @@ -624,11 +624,11 @@ void UpdateHandler::searchAndReplaceAll( rtl::OUString &rText, } //-------------------------------------------------------------------- -rtl::OUString UpdateHandler::loadString( const uno::Reference< resource::XResourceBundle > xBundle, +OUString UpdateHandler::loadString( const uno::Reference< resource::XResourceBundle > xBundle, sal_Int32 nResourceId ) const { - rtl::OUString sString; - rtl::OUString sKey = "string:" + rtl::OUString::valueOf( nResourceId ); + OUString sString; + OUString sKey = "string:" + OUString::valueOf( nResourceId ); try { @@ -643,14 +643,14 @@ rtl::OUString UpdateHandler::loadString( const uno::Reference< resource::XResour return sString; } -rtl::OUString UpdateHandler::substVariables( const rtl::OUString &rSource ) const +OUString UpdateHandler::substVariables( const OUString &rSource ) const { - rtl::OUString sString( rSource ); + OUString sString( rSource ); searchAndReplaceAll( sString, "%NEXTVERSION", msNextVersion ); searchAndReplaceAll( sString, "%DOWNLOAD_PATH", msDownloadPath ); searchAndReplaceAll( sString, "%FILE_NAME", msDownloadFile ); - searchAndReplaceAll( sString, "%PERCENT", rtl::OUString::valueOf( mnPercent ) ); + searchAndReplaceAll( sString, "%PERCENT", OUString::valueOf( mnPercent ) ); return sString; } @@ -737,7 +737,7 @@ void UpdateHandler::loadStrings() for ( int i=0; i < BUTTON_COUNT; i++ ) { - msButtonIDs[ i ] = "BUTTON_" + rtl::OUString::valueOf( (sal_Int32) i ); + msButtonIDs[ i ] = "BUTTON_" + OUString::valueOf( (sal_Int32) i ); } } @@ -762,8 +762,8 @@ void UpdateHandler::startThrobber( bool bStart ) } //-------------------------------------------------------------------- -void UpdateHandler::setControlProperty( const rtl::OUString &rCtrlName, - const rtl::OUString &rPropName, +void UpdateHandler::setControlProperty( const OUString &rCtrlName, + const OUString &rPropName, const uno::Any &rPropValue ) { if ( !mxUpdDlg.is() ) return; @@ -783,7 +783,7 @@ void UpdateHandler::setControlProperty( const rtl::OUString &rCtrlName, } //-------------------------------------------------------------------- -void UpdateHandler::showControl( const rtl::OUString &rCtrlName, bool bShow ) +void UpdateHandler::showControl( const OUString &rCtrlName, bool bShow ) { uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY ); @@ -818,8 +818,8 @@ void UpdateHandler::focusControl( DialogControls eID ) //-------------------------------------------------------------------- void UpdateHandler::insertControlModel( uno::Reference< awt::XControlModel > & rxDialogModel, - rtl::OUString const & rServiceName, - rtl::OUString const & rControlName, + OUString const & rServiceName, + OUString const & rControlName, awt::Rectangle const & rPosSize, uno::Sequence< beans::NamedValue > const & rProps ) { @@ -845,7 +845,7 @@ void UpdateHandler::insertControlModel( uno::Reference< awt::XControlModel > & r } //-------------------------------------------------------------------- -void UpdateHandler::setFullVersion( rtl::OUString& rString ) +void UpdateHandler::setFullVersion( OUString& rString ) { uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider( com::sun::star::configuration::theDefaultProvider::get( mxContext ) ); @@ -863,19 +863,19 @@ void UpdateHandler::setFullVersion( rtl::OUString& rString ) uno::Reference< container::XNameAccess > xNameAccess( xConfigAccess, uno::UNO_QUERY_THROW ); - rtl::OUString aProductVersion; + OUString aProductVersion; xNameAccess->getByName("ooSetupVersion") >>= aProductVersion; sal_Int32 nVerIndex = rString.indexOf( aProductVersion ); if ( nVerIndex != -1 ) { - rtl::OUString aProductFullVersion; + OUString aProductFullVersion; xNameAccess->getByName("ooSetupVersionAboutBox") >>= aProductFullVersion; rString = rString.replaceAt( nVerIndex, aProductVersion.getLength(), aProductFullVersion ); } } //-------------------------------------------------------------------- -bool UpdateHandler::showWarning( const rtl::OUString &rWarningText ) const +bool UpdateHandler::showWarning( const OUString &rWarningText ) const { bool bRet = false; @@ -922,9 +922,9 @@ bool UpdateHandler::showWarning( const rtl::OUString &rWarningText ) const } //-------------------------------------------------------------------- -bool UpdateHandler::showWarning( const rtl::OUString &rWarningText, - const rtl::OUString &rBtnText_1, - const rtl::OUString &rBtnText_2 ) const +bool UpdateHandler::showWarning( const OUString &rWarningText, + const OUString &rBtnText_1, + const OUString &rBtnText_2 ) const { bool bRet = false; @@ -993,9 +993,9 @@ bool UpdateHandler::showWarning( const rtl::OUString &rWarningText, } //-------------------------------------------------------------------- -bool UpdateHandler::showOverwriteWarning( const rtl::OUString& rFileName ) const +bool UpdateHandler::showOverwriteWarning( const OUString& rFileName ) const { - rtl::OUString aMsg( msReloadWarning ); + OUString aMsg( msReloadWarning ); searchAndReplaceAll( aMsg, "%FILENAME", rFileName ); searchAndReplaceAll( aMsg, "%DOWNLOAD_PATH", msDownloadPath ); return showWarning( aMsg, msReloadContinue, msReloadReload ); @@ -1109,7 +1109,7 @@ void UpdateHandler::createDialog() xPropSet->setPropertyValue( "PositionY", uno::Any(sal_Int32( 100 )) ); xPropSet->setPropertyValue( "Width", uno::Any(sal_Int32( DIALOG_WIDTH )) ); xPropSet->setPropertyValue( "Height", uno::Any(sal_Int32( DIALOG_HEIGHT )) ); - xPropSet->setPropertyValue( "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) ); + xPropSet->setPropertyValue( "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) ); } { // Label (fixed text) <status> uno::Sequence< beans::NamedValue > aProps(1); @@ -1136,7 +1136,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 3, "MultiLine", uno::Any( true ) ); setProperty( aProps, 4, "ReadOnly", uno::Any( true ) ); setProperty( aProps, 5, "AutoVScroll", uno::Any( true ) ); - setProperty( aProps, 6, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) ); + setProperty( aProps, 6, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1167,7 +1167,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msPauseBtn ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON], awt::Rectangle( BOX1_BTN_X, BOX1_BTN_Y, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1180,7 +1180,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msResumeBtn ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1196,7 +1196,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msCancelBtn ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1224,13 +1224,13 @@ void UpdateHandler::createDialog() { // Text (MultiLineEdit) <description> uno::Sequence< beans::NamedValue > aProps(7); - setProperty( aProps, 0, "Text", uno::Any( rtl::OUString() ) ); + setProperty( aProps, 0, "Text", uno::Any( OUString() ) ); setProperty( aProps, 1, "Border", uno::Any( sal_Int16( 0 ) ) ); setProperty( aProps, 2, "PaintTransparent", uno::Any( true ) ); setProperty( aProps, 3, "MultiLine", uno::Any( true ) ); setProperty( aProps, 4, "ReadOnly", uno::Any( true ) ); setProperty( aProps, 5, "AutoVScroll", uno::Any( true ) ); - setProperty( aProps, 6, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); + setProperty( aProps, 6, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1260,7 +1260,7 @@ void UpdateHandler::createDialog() // setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) ); // [property] string Label // only if PushButtonType_STANDARD setProperty( aProps, 3, "Label", uno::Any( msClose ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ], awt::Rectangle( CLOSE_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1273,7 +1273,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msInstall ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON], awt::Rectangle( INSTALL_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1286,7 +1286,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, "Enabled", uno::Any( true ) ); setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, "Label", uno::Any( msDownload ) ); - setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); + setProperty( aProps, 4, "HelpURL", uno::makeAny( INET_HID_SCHEME + OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON], awt::Rectangle( DOWNLOAD_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index e6ff02e1eaaa..39804a734332 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -92,71 +92,71 @@ private: osl::Mutex maMutex; - rtl::OUString msNextVersion; - rtl::OUString msDownloadPath; - rtl::OUString msDownloadFile; - rtl::OUString msDescriptionMsg; - rtl::OUString msChecking; // RID_UPDATE_STR_CHECKING - rtl::OUString msCheckingError; // RID_UPDATE_STR_CHECKING_ERR - rtl::OUString msNoUpdFound; // RID_UPDATE_STR_NO_UPD_FOUND - rtl::OUString msUpdFound; // RID_UPDATE_STR_UPD_FOUND - rtl::OUString msDlgTitle; // RID_UPDATE_STR_DLG_TITLE - rtl::OUString msDownloadPause; // RID_UPDATE_STR_DOWNLOAD_PAUSE - rtl::OUString msDownloadError; // RID_UPDATE_STR_DOWNLOAD_ERR - rtl::OUString msDownloadWarning; // RID_UPDATE_STR_DOWNLOAD_WARN - rtl::OUString msDownloadDescr; // RID_UPDATE_STR_DOWNLOAD_WARN - rtl::OUString msDownloadNotAvail; // RID_UPDATE_STR_DOWNLOAD_UNAVAIL - rtl::OUString msDownloading; // RID_UPDATE_STR_DOWNLOADING - rtl::OUString msReady2Install; // RID_UPDATE_STR_READY_INSTALL - rtl::OUString msCancelTitle; // RID_UPDATE_STR_CANCEL_TITLE - rtl::OUString msCancelMessage; // RID_UPDATE_STR_CANCEL_DOWNLOAD - rtl::OUString msInstallMessage; // RID_UPDATE_STR_BEGIN_INSTALL - rtl::OUString msInstallNow; // RID_UPDATE_STR_INSTALL_NOW - rtl::OUString msInstallLater; // RID_UPDATE_STR_INSTALL_LATER - rtl::OUString msInstallError; // RID_UPDATE_STR_INSTALL_ERROR - rtl::OUString msOverwriteWarning; // RID_UPDATE_STR_OVERWRITE_WARNING - rtl::OUString msPercent; // RID_UPDATE_STR_PERCENT - rtl::OUString msReloadWarning; // RID_UPDATE_STR_OVERWRITE_WARNING - rtl::OUString msReloadReload; // RID_UPDATE_STR_OVERWRITE_WARNING - rtl::OUString msReloadContinue; // RID_UPDATE_STR_OVERWRITE_WARNING - rtl::OUString msStatusFL; // RID_UPDATE_FT_STATUS - rtl::OUString msDescription; // RID_UPDATE_FT_DESCRIPTION - rtl::OUString msClose; // RID_UPDATE_BTN_CLOSE - rtl::OUString msDownload; // RID_UPDATE_BTN_DOWNLOAD - rtl::OUString msInstall; // RID_UPDATE_BTN_INSTALL - rtl::OUString msPauseBtn; // RID_UPDATE_BTN_PAUSE - rtl::OUString msResumeBtn; // RID_UPDATE_BTN_RESUME - rtl::OUString msCancelBtn; // RID_UPDATE_BTN_CANCEL - rtl::OUString msButtonIDs[ BUTTON_COUNT ]; - rtl::OUString msBubbleTexts[ UPDATESTATES_COUNT ]; - rtl::OUString msBubbleTitles[ UPDATESTATES_COUNT ]; + OUString msNextVersion; + OUString msDownloadPath; + OUString msDownloadFile; + OUString msDescriptionMsg; + OUString msChecking; // RID_UPDATE_STR_CHECKING + OUString msCheckingError; // RID_UPDATE_STR_CHECKING_ERR + OUString msNoUpdFound; // RID_UPDATE_STR_NO_UPD_FOUND + OUString msUpdFound; // RID_UPDATE_STR_UPD_FOUND + OUString msDlgTitle; // RID_UPDATE_STR_DLG_TITLE + OUString msDownloadPause; // RID_UPDATE_STR_DOWNLOAD_PAUSE + OUString msDownloadError; // RID_UPDATE_STR_DOWNLOAD_ERR + OUString msDownloadWarning; // RID_UPDATE_STR_DOWNLOAD_WARN + OUString msDownloadDescr; // RID_UPDATE_STR_DOWNLOAD_WARN + OUString msDownloadNotAvail; // RID_UPDATE_STR_DOWNLOAD_UNAVAIL + OUString msDownloading; // RID_UPDATE_STR_DOWNLOADING + OUString msReady2Install; // RID_UPDATE_STR_READY_INSTALL + OUString msCancelTitle; // RID_UPDATE_STR_CANCEL_TITLE + OUString msCancelMessage; // RID_UPDATE_STR_CANCEL_DOWNLOAD + OUString msInstallMessage; // RID_UPDATE_STR_BEGIN_INSTALL + OUString msInstallNow; // RID_UPDATE_STR_INSTALL_NOW + OUString msInstallLater; // RID_UPDATE_STR_INSTALL_LATER + OUString msInstallError; // RID_UPDATE_STR_INSTALL_ERROR + OUString msOverwriteWarning; // RID_UPDATE_STR_OVERWRITE_WARNING + OUString msPercent; // RID_UPDATE_STR_PERCENT + OUString msReloadWarning; // RID_UPDATE_STR_OVERWRITE_WARNING + OUString msReloadReload; // RID_UPDATE_STR_OVERWRITE_WARNING + OUString msReloadContinue; // RID_UPDATE_STR_OVERWRITE_WARNING + OUString msStatusFL; // RID_UPDATE_FT_STATUS + OUString msDescription; // RID_UPDATE_FT_DESCRIPTION + OUString msClose; // RID_UPDATE_BTN_CLOSE + OUString msDownload; // RID_UPDATE_BTN_DOWNLOAD + OUString msInstall; // RID_UPDATE_BTN_INSTALL + OUString msPauseBtn; // RID_UPDATE_BTN_PAUSE + OUString msResumeBtn; // RID_UPDATE_BTN_RESUME + OUString msCancelBtn; // RID_UPDATE_BTN_CANCEL + OUString msButtonIDs[ BUTTON_COUNT ]; + OUString msBubbleTexts[ UPDATESTATES_COUNT ]; + OUString msBubbleTitles[ UPDATESTATES_COUNT ]; void createDialog(); void updateState( UpdateState eNewState ); void startThrobber( bool bStart = true ); - void setControlProperty( const rtl::OUString &rCtrlName, - const rtl::OUString &rPropName, + void setControlProperty( const OUString &rCtrlName, + const OUString &rPropName, const com::sun::star::uno::Any &rPropValue ); - void showControl( const rtl::OUString &rCtrlName, bool bShow = true ); + void showControl( const OUString &rCtrlName, bool bShow = true ); void showControls( short nControls ); void focusControl( DialogControls eID ); void enableControls( short nCtrlState ); void setDownloadBtnLabel( bool bAppendDots ); void loadStrings(); - rtl::OUString loadString( const com::sun::star::uno::Reference< com::sun::star::resource::XResourceBundle > xBundle, + OUString loadString( const com::sun::star::uno::Reference< com::sun::star::resource::XResourceBundle > xBundle, sal_Int32 nResourceId ) const; - rtl::OUString substVariables( const rtl::OUString &rSource ) const; + OUString substVariables( const OUString &rSource ) const; static void setProperty( com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > &rProps, - const int nIndex, const rtl::OUString &rPropName, const com::sun::star::uno::Any &rPropValue ) + const int nIndex, const OUString &rPropName, const com::sun::star::uno::Any &rPropValue ) { rProps[ nIndex ].Name = rPropName; rProps[ nIndex ].Value = rPropValue; } static void insertControlModel( com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > & rxDialogModel, - rtl::OUString const & rServiceName, - rtl::OUString const & rControlName, + OUString const & rServiceName, + OUString const & rControlName, com::sun::star::awt::Rectangle const & rPosSize, com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > const & rProps ); - void setFullVersion( rtl::OUString& rString ); - void searchAndReplaceAll( rtl::OUString &rText, const rtl::OUString &rWhat, const rtl::OUString &rWith ) const; + void setFullVersion( OUString& rString ); + void searchAndReplaceAll( OUString &rText, const OUString &rWhat, const OUString &rWith ) const; public: UpdateHandler( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, @@ -167,19 +167,19 @@ public: bool isMinimized() const { return mbMinimized; } void setVisible( bool bVisible = true ); void setProgress( sal_Int32 nPercent ); - void setNextVersion( const rtl::OUString &rNextVersion ) { msNextVersion = rNextVersion; } - void setDownloadPath( const rtl::OUString &rPath ) { msDownloadPath = rPath; } - void setDownloadFile( const rtl::OUString &rPath ); - void setErrorMessage( const rtl::OUString &rErrorMsg ); - void setDescription( const rtl::OUString &rDescription ){ msDescriptionMsg = rDescription; } + void setNextVersion( const OUString &rNextVersion ) { msNextVersion = rNextVersion; } + void setDownloadPath( const OUString &rPath ) { msDownloadPath = rPath; } + void setDownloadFile( const OUString &rPath ); + void setErrorMessage( const OUString &rErrorMsg ); + void setDescription( const OUString &rDescription ){ msDescriptionMsg = rDescription; } void setState( UpdateState eState ); - rtl::OUString getBubbleText( UpdateState eState ); - rtl::OUString getBubbleTitle( UpdateState eState ); - rtl::OUString getDefaultInstErrMsg(); - bool showWarning( const rtl::OUString &rWarning ) const; - bool showWarning( const rtl::OUString &rWarning, const rtl::OUString& rBtnText_1, const rtl::OUString& rBtnText_2 ) const; - bool showOverwriteWarning( const rtl::OUString &rFileName ) const; + OUString getBubbleText( UpdateState eState ); + OUString getBubbleTitle( UpdateState eState ); + OUString getDefaultInstErrMsg(); + bool showWarning( const OUString &rWarning ) const; + bool showWarning( const OUString &rWarning, const OUString& rBtnText_1, const OUString& rBtnText_2 ) const; + bool showOverwriteWarning( const OUString &rFileName ) const; bool showOverwriteWarning() const; // Allows runtime exceptions to be thrown by const methods diff --git a/extensions/source/update/check/updateinfo.hxx b/extensions/source/update/check/updateinfo.hxx index 1e23d9b5be16..67acd557be0c 100644 --- a/extensions/source/update/check/updateinfo.hxx +++ b/extensions/source/update/check/updateinfo.hxx @@ -26,9 +26,9 @@ struct DownloadSource { bool IsDirect; - rtl::OUString URL; + OUString URL; - DownloadSource(bool bIsDirect, const rtl::OUString& aURL) : IsDirect(bIsDirect), URL(aURL) {}; + DownloadSource(bool bIsDirect, const OUString& aURL) : IsDirect(bIsDirect), URL(aURL) {}; DownloadSource(const DownloadSource& ds) : IsDirect(ds.IsDirect), URL(ds.URL) {}; DownloadSource & operator=( const DownloadSource & ds ) { IsDirect = ds.IsDirect; URL = ds.URL; return *this; }; @@ -37,12 +37,12 @@ struct DownloadSource struct ReleaseNote { sal_uInt8 Pos; - rtl::OUString URL; + OUString URL; sal_uInt8 Pos2; - rtl::OUString URL2; + OUString URL2; - ReleaseNote(sal_uInt8 pos, const rtl::OUString aURL) : Pos(pos), URL(aURL), Pos2(0), URL2() {}; - ReleaseNote(sal_uInt8 pos, const rtl::OUString aURL, sal_uInt8 pos2, const rtl::OUString aURL2) : Pos(pos), URL(aURL), Pos2(pos2), URL2(aURL2) {}; + ReleaseNote(sal_uInt8 pos, const OUString aURL) : Pos(pos), URL(aURL), Pos2(0), URL2() {}; + ReleaseNote(sal_uInt8 pos, const OUString aURL, sal_uInt8 pos2, const OUString aURL2) : Pos(pos), URL(aURL), Pos2(pos2), URL2(aURL2) {}; ReleaseNote(const ReleaseNote& rn) :Pos(rn.Pos), URL(rn.URL), Pos2(rn.Pos2), URL2(rn.URL2) {}; ReleaseNote & operator=( const ReleaseNote& rn) { Pos=rn.Pos; URL=rn.URL; Pos2=rn.Pos2; URL2=rn.URL2; return *this; }; @@ -50,9 +50,9 @@ struct ReleaseNote struct UpdateInfo { - rtl::OUString BuildId; - rtl::OUString Version; - rtl::OUString Description; + OUString BuildId; + OUString Version; + OUString Description; std::vector< DownloadSource > Sources; std::vector< ReleaseNote > ReleaseNotes; @@ -73,7 +73,7 @@ UpdateInfo & UpdateInfo::operator=( const UpdateInfo& ui ) // Returns the URL of the release note for the given position -rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled=false); +OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled=false); #endif diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 48730b6b76e7..59ef0d935364 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -46,9 +46,9 @@ namespace xml = css::xml ; static bool getBootstrapData( - uno::Sequence< ::rtl::OUString > & rRepositoryList, - ::rtl::OUString & rGitID, - ::rtl::OUString & rInstallSetID) + uno::Sequence< OUString > & rRepositoryList, + OUString & rGitID, + OUString & rInstallSetID) { rGitID = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"; rtl::Bootstrap::expandMacros( rGitID ); @@ -84,15 +84,15 @@ checkForUpdates( { OSL_TRACE("checking for updates .."); - ::rtl::OUString myArch; - ::rtl::OUString myOS; + OUString myArch; + OUString myOS; rtl::Bootstrap::get("_OS", myOS); rtl::Bootstrap::get("_ARCH", myArch); - uno::Sequence< ::rtl::OUString > aRepositoryList; - ::rtl::OUString aGitID; - ::rtl::OUString aInstallSetID; + uno::Sequence< OUString > aRepositoryList; + OUString aGitID; + OUString aInstallSetID; if( ! ( getBootstrapData(aRepositoryList, aGitID, aInstallSetID) && (aRepositoryList.getLength() > 0) ) ) return false; @@ -108,11 +108,11 @@ checkForUpdates( const uno::Reference< uno::XComponentContext > & rxContext, const uno::Reference< task::XInteractionHandler > & rxInteractionHandler, const uno::Reference< deployment::XUpdateInformationProvider >& rUpdateInfoProvider, - const rtl::OUString &rOS, - const rtl::OUString &rArch, - const uno::Sequence< rtl::OUString > &rRepositoryList, - const rtl::OUString &rGitID, - const rtl::OUString &rInstallSetID ) + const OUString &rOS, + const OUString &rArch, + const uno::Sequence< OUString > &rRepositoryList, + const OUString &rGitID, + const OUString &rInstallSetID ) { if( !rxContext.is() ) throw uno::RuntimeException( @@ -136,7 +136,7 @@ checkForUpdates( if ( !aUpdateInfoEnumeration.is() ) return false; // something went wrong .. - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii("/child::inst:description[inst:os=\'"); aBuffer.append( rOS ); aBuffer.appendAscii("\' and inst:arch=\'"); @@ -145,7 +145,7 @@ checkForUpdates( aBuffer.append( rGitID ); aBuffer.appendAscii("\']"); - rtl::OUString aXPathExpression = aBuffer.makeStringAndClear(); + OUString aXPathExpression = aBuffer.makeStringAndClear(); while( aUpdateInfoEnumeration->hasMoreElements() ) { @@ -170,7 +170,7 @@ checkForUpdates( if( xNode2.is() ) { uno::Reference< xml::dom::XElement > xParent(xNode2->getParentNode(), uno::UNO_QUERY_THROW); - rtl::OUString aType = xParent->getAttribute("type"); + OUString aType = xParent->getAttribute("type"); bool bIsDirect = ( sal_False == aType.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("text/html")) ); o_rUpdateInfo.Sources.push_back( DownloadSource(bIsDirect, xNode2->getNodeValue()) ); @@ -243,7 +243,7 @@ checkForUpdates( //------------------------------------------------------------------------------ bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & rxContext, - const uno::Sequence< uno::Sequence< rtl::OUString > > &rUpdateInfos ) + const uno::Sequence< uno::Sequence< OUString > > &rUpdateInfos ) { bool bNotify = false; @@ -264,7 +264,7 @@ bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & rxContext ) { - uno::Sequence< uno::Sequence< rtl::OUString > > aUpdateList; + uno::Sequence< uno::Sequence< OUString > > aUpdateList; uno::Reference< deployment::XPackageInformationProvider > xInfoProvider; try @@ -280,7 +280,7 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & if ( !xInfoProvider.is() ) return false; - aUpdateList = xInfoProvider->isUpdateAvailable( ::rtl::OUString() ); + aUpdateList = xInfoProvider->isUpdateAvailable( OUString() ); bool bNotify = storeExtensionUpdateInfos( rxContext, aUpdateList ); return bNotify; @@ -291,7 +291,7 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & bool checkForPendingUpdates( const uno::Reference< uno::XComponentContext > & rxContext ) { - uno::Sequence< uno::Sequence< rtl::OUString > > aExtensionList; + uno::Sequence< uno::Sequence< OUString > > aExtensionList; uno::Reference< deployment::XPackageInformationProvider > xInfoProvider; try { diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx index 915379d9e4b1..6e6ba3038daf 100644 --- a/extensions/source/update/check/updateprotocol.hxx +++ b/extensions/source/update/check/updateprotocol.hxx @@ -39,11 +39,11 @@ checkForUpdates( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > & rxInteractionHandler, const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XUpdateInformationProvider >& rUpdateInfoProvider, - const rtl::OUString &rOS, - const rtl::OUString &rArch, - const ::com::sun::star::uno::Sequence< rtl::OUString > &rRepositoryList, - const rtl::OUString &rGitID, - const rtl::OUString &rInstallID + const OUString &rOS, + const OUString &rArch, + const ::com::sun::star::uno::Sequence< OUString > &rRepositoryList, + const OUString &rGitID, + const OUString &rInstallID ); // Returns 'true' if there are updates for any extension @@ -57,7 +57,7 @@ bool checkForPendingUpdates( bool storeExtensionUpdateInfos( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< rtl::OUString > > &rUpdateInfos + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > &rUpdateInfos ); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx index fa82e9e742e9..60cbe243157a 100644 --- a/extensions/source/update/check/updateprotocoltest.cxx +++ b/extensions/source/update/check/updateprotocoltest.cxx @@ -52,8 +52,8 @@ SAL_IMPLEMENT_MAIN() com::sun::star::ucb::UniversalContentBroker::create(rComponentContext); - rtl::OUString aURL; - rtl::OUString aVersion; + OUString aURL; + OUString aVersion; try { diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index fdea48d79433..d45b7f2d2c8d 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -61,11 +61,11 @@ SAL_IMPLEMENT_MAIN() uno::Reference< deployment::XUpdateInformationProvider > rUpdateInformationProvider = deployment::UpdateInformationProvider::create( rComponentContext ); - uno::Sequence< rtl::OUString > theURLs(1); + uno::Sequence< OUString > theURLs(1); osl_getCommandArg( 0, &theURLs[0].pData ); // theURLs[0] = "http://localhost/~olli/atomfeed.xml"; - rtl::OUString aExtension = "MyExtension"; + OUString aExtension = "MyExtension"; try { @@ -76,7 +76,7 @@ SAL_IMPLEMENT_MAIN() } catch( const uno::Exception & e ) { - OSL_TRACE( "exception caught: %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr()); + OSL_TRACE( "exception caught: %s", OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr()); } catch( ... ) { diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index e83ae0cec319..ad971025c211 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -140,18 +140,18 @@ class UpdateInformationProvider : public: static uno::Reference< uno::XInterface > createInstance(const uno::Reference<uno::XComponentContext>& xContext); - static uno::Sequence< rtl::OUString > getServiceNames(); - static rtl::OUString getImplName(); + static uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); uno::Reference< xml::dom::XElement > getDocumentRoot(const uno::Reference< xml::dom::XNode >& rxNode); - uno::Reference< xml::dom::XNode > getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, const rtl::OUString& rName); + uno::Reference< xml::dom::XNode > getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, const OUString& rName); // XUpdateInformationService virtual uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL getUpdateInformation( - uno::Sequence< rtl::OUString > const & repositories, - rtl::OUString const & extensionId + uno::Sequence< OUString > const & repositories, + OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException); virtual void SAL_CALL cancel() @@ -163,8 +163,8 @@ public: virtual uno::Reference< container::XEnumeration > SAL_CALL getUpdateInformationEnumeration( - uno::Sequence< rtl::OUString > const & repositories, - rtl::OUString const & extensionId + uno::Sequence< OUString > const & repositories, + OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException); // XCommandEnvironment @@ -176,24 +176,24 @@ public: // XWebDAVCommandEnvironment virtual uno::Sequence< beans::NamedValue > SAL_CALL getUserRequestHeaders( - const rtl::OUString&, const rtl::OUString& ) + const OUString&, const OUString& ) throw ( uno::RuntimeException ) { return m_aRequestHeaderList; }; // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (uno::RuntimeException); - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); protected: virtual ~UpdateInformationProvider(); - static uno::Any getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, rtl::OUString const & node, rtl::OUString const & item); + static uno::Any getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, OUString const & node, OUString const & item); private: - uno::Reference< io::XInputStream > load(const rtl::OUString& rURL); + uno::Reference< io::XInputStream > load(const OUString& rURL); void storeCommandInfo( sal_Int32 nCommandId, uno::Reference< ucb::XCommandProcessor > const & rxCommandProcessor); @@ -245,7 +245,7 @@ public: OSL_ASSERT( m_xUpdateInformationProvider.is() ); if( !(m_nCount < m_nNodes ) ) - throw container::NoSuchElementException(rtl::OUString::valueOf(m_nCount), *this); + throw container::NoSuchElementException(OUString::valueOf(m_nCount), *this); try { @@ -302,7 +302,7 @@ public: uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if( m_nCount > 0 ) - throw container::NoSuchElementException(rtl::OUString::valueOf(m_nCount), *this); + throw container::NoSuchElementException(OUString::valueOf(m_nCount), *this); ++m_nCount; return uno::makeAny(m_aEntry); @@ -328,21 +328,21 @@ UpdateInformationProvider::UpdateInformationProvider( uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider( com::sun::star::configuration::theDefaultProvider::get(xContext)); - rtl::OUStringBuffer buf; - rtl::OUString name; + OUStringBuffer buf; + OUString name; getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/Product", "ooName") >>= name; buf.append(name); buf.append(sal_Unicode(' ')); - rtl::OUString version; + OUString version; getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/Product", "ooSetupVersion") >>= version; buf.append(version); - rtl::OUString edition( + OUString edition( "${${BRAND_BASE_DIR}/program/edition/edition.ini:" "EDITIONNAME}"); rtl::Bootstrap::expandMacros(edition); @@ -350,7 +350,7 @@ UpdateInformationProvider::UpdateInformationProvider( buf.append(sal_Unicode(' ')); buf.append(edition); } - rtl::OUString extension; + OUString extension; getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/Product", @@ -358,9 +358,9 @@ UpdateInformationProvider::UpdateInformationProvider( if (!extension.isEmpty()) { buf.append(extension); } - rtl::OUString product(buf.makeStringAndClear()); + OUString product(buf.makeStringAndClear()); - rtl::OUString aUserAgent( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ); + OUString aUserAgent( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ); rtl::Bootstrap::expandMacros( aUserAgent ); for (sal_Int32 i = 0;;) { @@ -412,7 +412,7 @@ UpdateInformationProvider::~UpdateInformationProvider() //------------------------------------------------------------------------------ uno::Any -UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, rtl::OUString const & node, rtl::OUString const & item) +UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, OUString const & node, OUString const & item) { beans::NamedValue aProperty; aProperty.Name = "nodepath"; @@ -446,7 +446,7 @@ UpdateInformationProvider::storeCommandInfo( //------------------------------------------------------------------------------ uno::Reference< io::XInputStream > -UpdateInformationProvider::load(const rtl::OUString& rURL) +UpdateInformationProvider::load(const OUString& rURL) { uno::Reference< ucb::XContentIdentifier > xId = m_xUniversalContentBroker->createContentIdentifier(rURL); @@ -551,7 +551,7 @@ UpdateInformationProvider::getDocumentRoot(const uno::Reference< xml::dom::XNode uno::Reference< xml::dom::XNode > UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, - const rtl::OUString& rName) + const OUString& rName) { OSL_ASSERT(m_xXPathAPI.is()); try { @@ -566,8 +566,8 @@ UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& uno::Reference< container::XEnumeration > SAL_CALL UpdateInformationProvider::getUpdateInformationEnumeration( - uno::Sequence< rtl::OUString > const & repositories, - rtl::OUString const & extensionId + uno::Sequence< OUString > const & repositories, + OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException) { OSL_ASSERT(m_xDocumentBuilder.is()); @@ -589,7 +589,7 @@ UpdateInformationProvider::getUpdateInformationEnumeration( { if( xElement->getNodeName().equalsAsciiL("feed", 4) ) { - rtl::OUString aXPathExpression; + OUString aXPathExpression; if( !extensionId.isEmpty() ) aXPathExpression = "//atom:entry/atom:category[@term=\'" + extensionId + "\']/.."; @@ -637,8 +637,8 @@ UpdateInformationProvider::getUpdateInformationEnumeration( uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL UpdateInformationProvider::getUpdateInformation( - uno::Sequence< rtl::OUString > const & repositories, - rtl::OUString const & extensionId + uno::Sequence< OUString > const & repositories, + OUString const & extensionId ) throw (uno::Exception, uno::RuntimeException) { uno::Reference< container::XEnumeration > xEnumeration( @@ -735,17 +735,17 @@ UpdateInformationProvider::getInteractionHandler() } //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > UpdateInformationProvider::getServiceNames() { - uno::Sequence< rtl::OUString > aServiceList(1); + uno::Sequence< OUString > aServiceList(1); aServiceList[0] = "com.sun.star.deployment.UpdateInformationProvider"; return aServiceList; }; //------------------------------------------------------------------------------ -rtl::OUString +OUString UpdateInformationProvider::getImplName() { return OUString("vnd.sun.UpdateInformationProvider"); @@ -753,7 +753,7 @@ UpdateInformationProvider::getImplName() //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL +OUString SAL_CALL UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException) { return getImplName(); @@ -761,7 +761,7 @@ UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException) //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeException) { return getServiceNames(); @@ -770,9 +770,9 @@ UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeExcepti //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateInformationProvider::supportsService( rtl::OUString const & serviceName ) throw (uno::RuntimeException) +UpdateInformationProvider::supportsService( OUString const & serviceName ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aServiceNameList = getServiceNames(); + uno::Sequence< OUString > aServiceNameList = getServiceNames(); for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ ) if( aServiceNameList[n].equals(serviceName) ) diff --git a/extensions/source/update/tools/ztool.cxx b/extensions/source/update/tools/ztool.cxx index b1c4fad1cac9..7009d483c627 100644 --- a/extensions/source/update/tools/ztool.cxx +++ b/extensions/source/update/tools/ztool.cxx @@ -34,8 +34,8 @@ int SAL_CALL main( int argc, char **argv ) show_usage(); return -1; } - rtl::OUString aInName = rtl::OUString::createFromAscii(argv[1]); - rtl::OUString aOutName = rtl::OUString::createFromAscii(argv[2]); + OUString aInName = OUString::createFromAscii(argv[1]); + OUString aOutName = OUString::createFromAscii(argv[2]); SvFileStream aInFile( aInName, STREAM_READ ); SvFileStream aOutFile( aOutName, STREAM_WRITE | STREAM_TRUNC ); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 5c7cf8e1c0f9..57861a76e691 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -64,18 +64,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------------ -static uno::Sequence< rtl::OUString > getServiceNames() +static uno::Sequence< OUString > getServiceNames() { - uno::Sequence< rtl::OUString > aServiceList(1); + uno::Sequence< OUString > aServiceList(1); aServiceList[0] = "com.sun.star.setup.UpdateCheckUI"; return aServiceList; } //------------------------------------------------------------------------------ -static rtl::OUString getImplementationName() +static OUString getImplementationName() { - return rtl::OUString("vnd.sun.UpdateCheckUI"); + return OUString("vnd.sun.UpdateCheckUI"); } //------------------------------------------------------------------------------ @@ -121,9 +121,9 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper3 { uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< task::XJob > mrJob; - rtl::OUString maBubbleTitle; - rtl::OUString maBubbleText; - rtl::OUString maBubbleImageURL; + OUString maBubbleTitle; + OUString maBubbleText; + OUString maBubbleImageURL; Image maBubbleImage; BubbleWindow* mpBubbleWin; SystemWindow* mpIconSysWin; @@ -152,7 +152,7 @@ private: void RemoveBubbleWindow( bool bRemoveIcon ); Image GetMenuBarIcon( MenuBar* pMBar ); void AddMenuBarIcon( SystemWindow* pSysWin, bool bAddEventHdl ); - Image GetBubbleImage( ::rtl::OUString &rURL ); + Image GetBubbleImage( OUString &rURL ); uno::Reference< document::XEventBroadcaster > getGlobalEventBroadcaster() const throw (uno::RuntimeException); @@ -162,11 +162,11 @@ public: virtual ~UpdateCheckUI(); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (uno::RuntimeException); - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XEventListener @@ -178,21 +178,21 @@ public: //XPropertySet virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw ( uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue(const rtl::OUString& PropertyName, const uno::Any& aValue) + virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ); - virtual uno::Any SAL_CALL getPropertyValue(const rtl::OUString& PropertyName) + virtual uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& PropertyName, + virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const uno::Reference< beans::XPropertyChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& PropertyName, + virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const uno::Reference< beans::XPropertyChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener > & aListener) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); }; @@ -251,14 +251,14 @@ UpdateCheckUI::getGlobalEventBroadcaster() const throw (uno::RuntimeException) } //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL +OUString SAL_CALL UpdateCheckUI::getImplementationName() throw (uno::RuntimeException) { return ::getImplementationName(); } //------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException) { return ::getServiceNames(); @@ -266,9 +266,9 @@ UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException) //------------------------------------------------------------------------------ sal_Bool SAL_CALL -UpdateCheckUI::supportsService( rtl::OUString const & serviceName ) throw (uno::RuntimeException) +UpdateCheckUI::supportsService( OUString const & serviceName ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > aServiceNameList = ::getServiceNames(); + uno::Sequence< OUString > aServiceNameList = ::getServiceNames(); for( sal_Int32 n=0; n < aServiceNameList.getLength(); n++ ) if( aServiceNameList[n].equals(serviceName) ) @@ -296,7 +296,7 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar ) } //------------------------------------------------------------------------------ -Image UpdateCheckUI::GetBubbleImage( ::rtl::OUString &rURL ) +Image UpdateCheckUI::GetBubbleImage( OUString &rURL ) { Image aImage; @@ -313,7 +313,7 @@ Image UpdateCheckUI::GetBubbleImage( ::rtl::OUString &rURL ) { uno::Reference< graphic::XGraphicProvider > xGraphProvider(graphic::GraphicProvider::create(xContext)); uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString("URL"); + aMediaProps[0].Name = OUString("URL"); aMediaProps[0].Value <<= rURL; uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps ); @@ -351,7 +351,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl ) if ( pActiveMBar ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; if( !maBubbleTitle.isEmpty() ) aBuf.append( maBubbleTitle ); if( !maBubbleText.isEmpty() ) @@ -413,14 +413,14 @@ uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo(void } //------------------------------------------------------------------------------ -void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName, +void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { SolarMutexGuard aGuard; - rtl::OUString aString; + OUString aString; if( rPropertyName == PROPERTY_TITLE ) { rValue >>= aString; @@ -479,7 +479,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName, } //------------------------------------------------------------------------------ -uno::Any UpdateCheckUI::getPropertyValue(const rtl::OUString& rPropertyName) +uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -505,7 +505,7 @@ uno::Any UpdateCheckUI::getPropertyValue(const rtl::OUString& rPropertyName) } //------------------------------------------------------------------------------ -void UpdateCheckUI::addPropertyChangeListener( const rtl::OUString& /*aPropertyName*/, +void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -513,7 +513,7 @@ void UpdateCheckUI::addPropertyChangeListener( const rtl::OUString& /*aPropertyN } //------------------------------------------------------------------------------ -void UpdateCheckUI::removePropertyChangeListener( const rtl::OUString& /*aPropertyName*/, +void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -521,7 +521,7 @@ void UpdateCheckUI::removePropertyChangeListener( const rtl::OUString& /*aProper } //------------------------------------------------------------------------------ -void UpdateCheckUI::addVetoableChangeListener( const rtl::OUString& /*aPropertyName*/, +void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -529,7 +529,7 @@ void UpdateCheckUI::addVetoableChangeListener( const rtl::OUString& /*aPropertyN } //------------------------------------------------------------------------------ -void UpdateCheckUI::removeVetoableChangeListener( const rtl::OUString& /*aPropertyName*/, +void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { |