diff options
-rw-r--r-- | connectivity/source/drivers/macab/MacabDriver.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/view/frmload.cxx | 4 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 16 | ||||
-rw-r--r-- | xmloff/source/forms/layerexport.cxx | 12 |
4 files changed, 21 insertions, 21 deletions
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index ff3d985cd8e2..8a8b2d1fc12b 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -102,7 +102,7 @@ bool MacabImplModule::impl_loadModule() OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc, "MacabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!"); - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "macabdrv1" )) ); + const ::rtl::OUString sModuleName( SAL_MODULENAME( "macabdrv1" ) ); m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# OSL_ENSURE( m_hConnectorModule, "MacabImplModule::impl_loadModule: could not load the implementation library!" ); if ( !m_hConnectorModule ) @@ -153,7 +153,7 @@ void MacabImplModule::impl_throwGenericSQLException( const ::rtl::OUString& _rMe { SQLException aError; aError.Message = _rMessage; - aError.SQLState = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) ); + aError.SQLState = ::rtl::OUString( "S1000" ); aError.ErrorCode = 0; throw aError; } @@ -195,7 +195,7 @@ MacabDriver::MacabDriver( try { Reference< XDesktop > xDesktop( - m_xMSFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ), + m_xMSFactory->createInstance( ::rtl::OUString( "com.sun.star.frame.Desktop" ) ), UNO_QUERY_THROW ); xDesktop->addTerminateListener( this ); } @@ -233,7 +233,7 @@ Sequence< ::rtl::OUString > MacabDriver::getSupportedServiceNames_Static( ) thr // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); + aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); return aSNS; } @@ -291,7 +291,7 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const ::rtl::OUString& url ) return sal_False; // here we have to look whether we support this URL format - return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:macab:")), 18)); + return (!url.compareTo(::rtl::OUString("sdbc:address:macab:"), 18)); } // -------------------------------------------------------------------------------- Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const ::rtl::OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 200de3942c84..00a64bd9e990 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -695,14 +695,14 @@ UNOSEQUENCE< rtl::OUString > SfxFrameLoader_Impl::impl_getStaticSupportedService { UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() ); UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 ); - seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.SynchronousFrameLoader" )); + seqServiceNames.getArray() [0] = ::rtl::OUString( "com.sun.star.frame.SynchronousFrameLoader" ); return seqServiceNames ; } /* Helper for XServiceInfo */ rtl::OUString SfxFrameLoader_Impl::impl_getStaticImplementationName() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.office.FrameLoader" )); + return ::rtl::OUString( "com.sun.star.comp.office.FrameLoader" ); } /* Helper for registry */ diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 4baebc946f65..ae3d0b0fae33 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -432,7 +432,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FmXGridControl")); + return ::rtl::OUString("com.sun.star.form.FmXGridControl"); } //------------------------------------------------------------------------------ @@ -440,7 +440,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service { Sequence< ::rtl::OUString > aServiceNames(2); aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL; - aServiceNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControl")); + aServiceNames[1] = ::rtl::OUString("com.sun.star.awt.UnoControl"); return aServiceNames; } @@ -461,7 +461,7 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException ) //------------------------------------------------------------------------------ ::rtl::OUString FmXGridControl::GetComponentServiceName() { - ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("DBGrid")); + ::rtl::OUString aName("DBGrid"); return aName; } @@ -801,7 +801,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio // prepare firing an event aModeChangeEvent.Source = *this; - aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "design" )) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "alive" )); + aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString( "design" ) : ::rtl::OUString( "alive" ); } // --- </mutex_lock> --- @@ -1125,7 +1125,7 @@ namespace fmgridif { const ::rtl::OUString getDataModeIdentifier() { - static ::rtl::OUString s_sDataModeIdentifier = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) ); + static ::rtl::OUString s_sDataModeIdentifier = ::rtl::OUString( "DataMode" ); return s_sDataModeIdentifier; } } @@ -2483,8 +2483,8 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException { aModes.realloc(2); ::rtl::OUString* pModes = aModes.getArray(); - pModes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) ); - pModes[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) ); + pModes[0] = ::rtl::OUString( "DataMode" ); + pModes[1] = ::rtl::OUString( "FilterMode" ); } return aModes; } @@ -2795,7 +2795,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs() // let an ::com::sun::star::util::URL-transformer normalize the URLs Reference< ::com::sun::star::util::XURLTransformer > xTransformer( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), + ::rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY); pSupported = aSupported.getArray(); if (xTransformer.is()) diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 887389056f31..846c00cba503 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -85,7 +85,7 @@ namespace xmloff //--------------------------------------------------------------------- const ::rtl::OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix() { - static const ::rtl::OUString s_sControlNumberStyleNamePrefix(RTL_CONSTASCII_USTRINGPARAM("C")); + static const ::rtl::OUString s_sControlNumberStyleNamePrefix("C"); return s_sControlNumberStyleNamePrefix; } @@ -105,7 +105,7 @@ namespace xmloff m_rContext.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_CONTROL_ID, token::GetXMLToken(token::XML_PARAGRAPH), m_xStyleExportMapper.get(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_CONTROL_PREFIX) ) + ::rtl::OUString( XML_STYLE_FAMILY_CONTROL_PREFIX ) ); // add our event translation table @@ -514,7 +514,7 @@ namespace xmloff ::rtl::OUString lcl_findFreeControlId( const MapPropertySet2Map& _rAllPagesControlIds ) { - static const ::rtl::OUString sControlIdBase( RTL_CONSTASCII_USTRINGPARAM( "control" ) ); + static const ::rtl::OUString sControlIdBase( "control" ); ::rtl::OUString sControlId = sControlIdBase; size_t nKnownControlCount = ::std::accumulate( _rAllPagesControlIds.begin(), _rAllPagesControlIds.end(), (size_t)0, AccumulateSize() ); @@ -569,7 +569,7 @@ namespace xmloff if (!sReferencedBy.isEmpty()) // it's not the first _rxObject referring to the xCurrentReference // -> separate the id - sReferencedBy += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); + sReferencedBy += ::rtl::OUString(","); sReferencedBy += sCurrentId; } } @@ -772,8 +772,8 @@ namespace xmloff // create it for en-US (does not really matter, as we will specify a locale for every // concrete language to use) Sequence< Any > aSupplierArgs(1); - aSupplierArgs[0] <<= Locale ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), + aSupplierArgs[0] <<= Locale ( ::rtl::OUString("en"), + ::rtl::OUString("US"), ::rtl::OUString() ); |