[Libreoffice-commits] .: 4 commits - connectivity/source editeng/source lotuswordpro/source sfx2/source svx/source xmloff/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Tue May 29 19:43:36 PDT 2012
connectivity/source/drivers/macab/MacabDriver.cxx | 10 +--
connectivity/source/drivers/mozab/MDriver.cxx | 22 +++----
connectivity/source/drivers/mozab/MServices.cxx | 6 +-
editeng/source/accessibility/AccessibleComponentBase.cxx | 4 -
editeng/source/accessibility/AccessibleContextBase.cxx | 12 ++--
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 36 ++++++------
editeng/source/editeng/editview.cxx | 8 +-
editeng/source/editeng/eerdll.cxx | 2
editeng/source/editeng/impedit3.cxx | 4 -
editeng/source/items/frmitems.cxx | 8 +-
editeng/source/items/numitem.cxx | 6 +-
editeng/source/misc/splwrap.cxx | 6 +-
editeng/source/misc/svxacorr.cxx | 24 ++++----
editeng/source/uno/unofield.cxx | 6 +-
lotuswordpro/source/filter/lwpfilter.cxx | 20 +++---
sfx2/source/view/frmload.cxx | 4 -
svx/source/fmcomp/fmgridif.cxx | 16 ++---
xmloff/source/chart/SchXMLImport.cxx | 36 ++++++------
xmloff/source/forms/layerexport.cxx | 12 ++--
xmloff/source/meta/MetaExportComponent.cxx | 12 ++--
xmloff/source/style/prstylei.cxx | 14 ++--
21 files changed, 134 insertions(+), 134 deletions(-)
New commits:
commit 93d83fe15a198b523ed0e9e7524941e8d7181eb2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue May 29 21:41:07 2012 -0500
targeted string re-work
Change-Id: Ie527fc87d2ef18e60524ef235c1332fdd02be829
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 92867fc..9060089 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -141,7 +141,7 @@ LWPFilterImportFilter::LWPFilterImportFilter( const uno::Reference< XMultiServic
{
try
{
- uno::Reference< XDocumentHandler > xDoc( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( STR_WRITER_IMPORTER_NAME )) ), UNO_QUERY );
+ uno::Reference< XDocumentHandler > xDoc( xFact->createInstance( OUString( STR_WRITER_IMPORTER_NAME ) ), UNO_QUERY );
LWPFilterReader *p = new LWPFilterReader;
p->setDocumentHandler( xDoc );
@@ -182,7 +182,7 @@ void LWPFilterImportFilter::setTargetDocument( const uno::Reference< XComponent
OUString LWPFilterImportFilter::getImplementationName() throw()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( STR_IMPLEMENTATION_NAME ));
+ return OUString( STR_IMPLEMENTATION_NAME );
}
sal_Bool LWPFilterImportFilter::supportsService( const OUString& ServiceName ) throw()
@@ -201,7 +201,7 @@ sal_Bool LWPFilterImportFilter::supportsService( const OUString& ServiceName ) t
Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) throw()
{
Sequence< OUString > seq(1);
- seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( STR_SERVICE_NAME ));
+ seq.getArray()[0] = OUString( STR_SERVICE_NAME );
return seq;
}
@@ -247,14 +247,14 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
if(!bOpenAsTemplate)
{
aDescriptor.realloc( nPropertyCount + 1 );
- aDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
+ aDescriptor[nPropertyCount].Name = ::rtl::OUString("AsTemplate");
aDescriptor[nPropertyCount].Value <<= sal_True;
}
- return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro_template"));
+ return OUString("wordpro_template");
}
else
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro"));
+ return OUString("wordpro");
}
}
return ret;
@@ -270,7 +270,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
if(rc != osl::FileBase::E_None)
{
SAXException except;
- except.Message = OUString( RTL_CONSTASCII_USTRINGPARAM( "GDocting system path from URL failed!"));
+ except.Message = OUString( "GDocting system path from URL failed!");
throw except;
}
*/
@@ -282,14 +282,14 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
if(!bOpenAsTemplate)
{
aDescriptor.realloc( nPropertyCount + 1 );
- aDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
+ aDescriptor[nPropertyCount].Name = ::rtl::OUString("AsTemplate");
aDescriptor[nPropertyCount].Value <<= sal_True;
}
- return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro_template"));
+ return OUString("wordpro_template");
}
else
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro"));
+ return OUString("wordpro");
}
}
return ret;
commit 1a5637b8a958bc9aa22d3d5ebacc10e1a3a2bd4c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue May 29 21:39:24 2012 -0500
targeted string re-work
Change-Id: If9a9889fa36bc76c9afed295568ed9a05de4587f
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index ff3d985..8a8b2d1 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 200de39..00a64bd 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 4baebc9..ae3d0b0 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 8873890..846c00c 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()
);
commit 20696849975f8e256a1be856e056bfaa8ade99d0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue May 29 21:35:26 2012 -0500
targeted string re-work
Change-Id: I477fc34c21530b51d975216156e66abf21a7149c
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 8619594..3f39d0e 100644
--- a/editeng/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -198,7 +198,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void)
::rtl::OUString SAL_CALL AccessibleComponentBase::getTitledBorderText (void)
throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString ();
+ return ::rtl::OUString ("");
}
@@ -207,7 +207,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void)
::rtl::OUString SAL_CALL AccessibleComponentBase::getToolTipText (void)
throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString ();
+ return ::rtl::OUString ("");
}
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 6dc15e6..e7a3218 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -489,7 +489,7 @@ void SAL_CALL
throw (::com::sun::star::uno::RuntimeException)
{
ThrowIfDisposed ();
- return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleContextBase"));
+ return OUString("AccessibleContextBase");
}
@@ -519,10 +519,10 @@ uno::Sequence< ::rtl::OUString> SAL_CALL
{
ThrowIfDisposed ();
static const OUString sServiceNames[2] = {
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.accessibility.Accessible")),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.accessibility.AccessibleContext"))
+ OUString(
+ "com.sun.star.accessibility.Accessible"),
+ OUString(
+ "com.sun.star.accessibility.AccessibleContext")
};
return uno::Sequence<OUString> (sServiceNames, 2);
}
@@ -681,7 +681,7 @@ void AccessibleContextBase::ThrowIfDisposed (void)
{
OSL_TRACE ("Calling disposed object. Throwing exception:");
throw lang::DisposedException (
- OUString(RTL_CONSTASCII_USTRINGPARAM("object has been already disposed")),
+ OUString("object has been already disposed"),
static_cast<uno::XWeak*>(this));
}
}
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index e1fd562..8586dbe 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -432,7 +432,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
if( nIndex < 0 || nIndex >= getCharacterCount() )
- throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleEditableTextPara: character index out of bounds")),
+ throw lang::IndexOutOfBoundsException(::rtl::OUString("AccessibleEditableTextPara: character index out of bounds"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) ) ); // disambiguate hierarchy
}
@@ -442,7 +442,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
if( nIndex < 0 || nIndex > getCharacterCount() )
- throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleEditableTextPara: character position out of bounds")),
+ throw lang::IndexOutOfBoundsException(::rtl::OUString("AccessibleEditableTextPara: character position out of bounds"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) ) ); // disambiguate hierarchy
}
@@ -521,7 +521,7 @@ namespace accessibility
if( mpEditSource )
return *mpEditSource;
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No edit source, object is defunct")),
+ throw uno::RuntimeException(::rtl::OUString("No edit source, object is defunct"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* >
( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy
@@ -535,7 +535,7 @@ namespace accessibility
SvxAccessibleTextAdapter* pTextForwarder = rEditSource.GetTextForwarderAdapter();
if( !pTextForwarder )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch text forwarder, object is defunct")),
+ throw uno::RuntimeException(::rtl::OUString("Unable to fetch text forwarder, object is defunct"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* >
( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy
@@ -543,7 +543,7 @@ namespace accessibility
if( pTextForwarder->IsValid() )
return *pTextForwarder;
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text forwarder is invalid, object is defunct")),
+ throw uno::RuntimeException(::rtl::OUString("Text forwarder is invalid, object is defunct"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* >
( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy
@@ -558,7 +558,7 @@ namespace accessibility
if( !pViewForwarder )
{
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch view forwarder, object is defunct")),
+ throw uno::RuntimeException(::rtl::OUString("Unable to fetch view forwarder, object is defunct"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* >
( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy
@@ -567,7 +567,7 @@ namespace accessibility
if( pViewForwarder->IsValid() )
return *pViewForwarder;
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, object is defunct")),
+ throw uno::RuntimeException(::rtl::OUString("View forwarder is invalid, object is defunct"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* >
( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy
@@ -583,12 +583,12 @@ namespace accessibility
if( !pTextEditViewForwarder )
{
if( bCreate )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to fetch view forwarder, object is defunct")),
+ throw uno::RuntimeException(::rtl::OUString("Unable to fetch view forwarder, object is defunct"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* >
( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No view forwarder, object not in edit mode")),
+ throw uno::RuntimeException(::rtl::OUString("No view forwarder, object not in edit mode"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* >
( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy
@@ -599,12 +599,12 @@ namespace accessibility
else
{
if( bCreate )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, object is defunct")),
+ throw uno::RuntimeException(::rtl::OUString("View forwarder is invalid, object is defunct"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* >
( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy
else
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("View forwarder is invalid, object not in edit mode")),
+ throw uno::RuntimeException(::rtl::OUString("View forwarder is invalid, object not in edit mode"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* >
( const_cast< AccessibleEditableTextPara* > (this) ) ) ); // disambiguate hierarchy
@@ -805,12 +805,12 @@ namespace accessibility
SolarMutexGuard aGuard;
if( !HaveChildren() )
- throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No children available")),
+ throw lang::IndexOutOfBoundsException(::rtl::OUString("No children available"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy
if( i != 0 )
- throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid child index")),
+ throw lang::IndexOutOfBoundsException(::rtl::OUString("Invalid child index"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy
@@ -823,7 +823,7 @@ namespace accessibility
uno::Reference< XAccessible > xChild( static_cast< ::cppu::OWeakObject* > (pChild), uno::UNO_QUERY );
if( !xChild.is() )
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Child creation failed")),
+ throw uno::RuntimeException(::rtl::OUString("Child creation failed"),
uno::Reference< uno::XInterface >
( static_cast< ::cppu::OWeakObject* > (this) ) );
@@ -1097,7 +1097,7 @@ namespace accessibility
}
}
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot access parent")),
+ throw uno::RuntimeException(::rtl::OUString("Cannot access parent"),
uno::Reference< uno::XInterface >
( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy
}
@@ -1864,7 +1864,7 @@ namespace accessibility
aPropSet.SetSelection( MakeSelection( 0, GetTextLen() ) );
uno::Reference< beans::XPropertySetInfo > xPropSetInfo = aPropSet.getPropertySetInfo();
if (!xPropSetInfo.is())
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot query XPropertySetInfo")),
+ throw uno::RuntimeException(::rtl::OUString("Cannot query XPropertySetInfo"),
uno::Reference< uno::XInterface >
( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy
@@ -1963,7 +1963,7 @@ namespace accessibility
aPropSet.SetSelection( MakeSelection( nIndex ) );
uno::Reference< beans::XPropertySetInfo > xPropSetInfo = aPropSet.getPropertySetInfo();
if (!xPropSetInfo.is())
- throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot query XPropertySetInfo")),
+ throw uno::RuntimeException(::rtl::OUString("Cannot query XPropertySetInfo"),
uno::Reference< uno::XInterface >
( static_cast< XAccessible* > (this) ) ); // disambiguate hierarchy
@@ -2231,7 +2231,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
// #105185# Using correct service now
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.AccessibleParagraphView"));
+ return ::rtl::OUString("com.sun.star.text.AccessibleParagraphView");
}
} // end of namespace accessibility
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 3a92b87..dccb777 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -883,7 +883,7 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
// aTmp = lcl_Win_GetShortPathName( aTmp );
#endif
Graphic aGraphic;
- const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
+ const String aFilterName( IMP_PNG );
if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) )
{
aRes = Image( aGraphic.GetBitmapEx() );
@@ -927,7 +927,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
// implementation here by providing an additional parameter.
Sequence< PropertyValue > aPropVals(1);
PropertyValue &rVal = aPropVals.getArray()[0];
- rVal.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_MAX_NUMBER_OF_SUGGESTIONS ));
+ rVal.Name = OUString( UPN_MAX_NUMBER_OF_SUGGESTIONS );
rVal.Value <<= (sal_Int16) 7;
//
// Are there any replace suggestions?
@@ -967,9 +967,9 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
String aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) );
String aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) );
String aWordStr( EE_RESSTR( RID_STR_WORD ) );
- aWordStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpWord );
+ aWordStr.SearchAndReplace( String( "%x" ), aTmpWord );
String aParaStr( EE_RESSTR( RID_STR_PARAGRAPH ) );
- aParaStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpPara );
+ aParaStr.SearchAndReplace( String( "%x" ), aTmpPara );
aPopupMenu.InsertItem( MN_WORDLANGUAGE, aWordStr );
aPopupMenu.SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE );
aPopupMenu.InsertItem( MN_PARALANGUAGE, aParaStr );
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 1e0f3e4..2d369b8 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -196,7 +196,7 @@ uno::Reference< linguistic2::XLanguageGuessing > GlobalEditData::GetLanguageGues
{
xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
xMgr->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LanguageGuessing" )) ),
+ rtl::OUString( "com.sun.star.linguistic2.LanguageGuessing" ) ),
uno::UNO_QUERY );
}
}
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index e19b88a..451ba16 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4257,7 +4257,7 @@ Reference < i18n::XBreakIterator > ImpEditEngine::ImplGetBreakIterator() const
if ( !xBI.is() )
{
Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
- xBI.set( xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" )) ), UNO_QUERY );
+ xBI.set( xMSF->createInstance( OUString( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY );
}
return xBI;
}
@@ -4267,7 +4267,7 @@ Reference < i18n::XExtendedInputSequenceChecker > ImpEditEngine::ImplGetInputSeq
if ( !xISC.is() )
{
Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
- Reference < XInterface > xI = xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.InputSequenceChecker" )) );
+ Reference < XInterface > xI = xMSF->createInstance( OUString( "com.sun.star.i18n.InputSequenceChecker" ) );
if ( xI.is() )
{
Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XExtendedInputSequenceChecker >*)0) );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 8651534..e336ef2 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2056,7 +2056,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
// serialization for basic macro recording
uno::Reference < script::XTypeConverter > xConverter
- ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
+ ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.script.Converter")),
uno::UNO_QUERY );
uno::Sequence < uno::Any > aSeq;
uno::Any aNew;
@@ -2861,7 +2861,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
// serialization for basic macro recording
uno::Reference < script::XTypeConverter > xConverter
- ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
+ ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.script.Converter")),
uno::UNO_QUERY );
uno::Any aNew;
uno::Sequence < uno::Any > aSeq;
@@ -3675,8 +3675,8 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
sLink = *pStrLink;
else if( pImpl->pGraphicObject )
{
- OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM(
- UNO_NAME_GRAPHOBJ_URLPREFIX));
+ OUString sPrefix(
+ UNO_NAME_GRAPHOBJ_URLPREFIX);
OUString sId(rtl::OStringToOUString(
pImpl->pGraphicObject->GetUniqueID(),
RTL_TEXTENCODING_ASCII_US));
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index fc081b2..ff1472a 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -77,7 +77,7 @@ void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumb
{
Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
Reference < XInterface > xI = xMSF->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.DefaultNumberingProvider" )) );
+ ::rtl::OUString( "com.sun.star.text.DefaultNumberingProvider" ) );
Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY);
DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"");
_xFormatter = Reference<XNumberingFormatter> (xRet, UNO_QUERY);
@@ -138,9 +138,9 @@ String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const
{
Sequence< PropertyValue > aProperties(2);
PropertyValue* pValues = aProperties.getArray();
- pValues[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType"));
+ pValues[0].Name = rtl::OUString("NumberingType");
pValues[0].Value <<= nNumType;
- pValues[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"));
+ pValues[1].Name = rtl::OUString("Value");
pValues[1].Value <<= (sal_Int32)nNo;
try
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index b90bf75..d564006 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -175,7 +175,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() );
sal_Bool bWrapReverse = xProp.is() ?
*(sal_Bool*)xProp->getPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UPN_IS_WRAP_REVERSE)) ).getValue()
+ ::rtl::OUString(UPN_IS_WRAP_REVERSE) ).getValue()
: sal_False;
bReverse = bRevAllow && bWrapReverse;
bStartDone = bOther || ( !bReverse && bStart );
@@ -423,7 +423,7 @@ sal_Bool SvxSpellWrapper::SpellNext( )
Reference< beans::XPropertySet > xProp( SvxGetLinguPropertySet() );
sal_Bool bWrapReverse = xProp.is() ?
*(sal_Bool*)xProp->getPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UPN_IS_WRAP_REVERSE)) ).getValue()
+ ::rtl::OUString(UPN_IS_WRAP_REVERSE) ).getValue()
: sal_False;
sal_Bool bActRev = bRevAllowed && bWrapReverse;
@@ -470,7 +470,7 @@ sal_Bool SvxSpellWrapper::SpellNext( )
{
sal_Bool bIsSpellSpecial = xProp.is() ?
*(sal_Bool*)xProp->getPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UPN_IS_SPELL_SPECIAL)) ).getValue()
+ ::rtl::OUString(UPN_IS_SPELL_SPECIAL) ).getValue()
: sal_False;
// Body area done, ask for special area
if( !IsHyphen() && bIsSpellSpecial && HasOtherCnt() )
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index ce5c71c..fa9c7af 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -495,7 +495,7 @@ sal_Bool SvxAutoCorrect::FnChgOrdinalNumber(
sal_Int32 nNum = rTxt.Copy( nSttPos, nNumEnd - nSttPos + 1 ).ToInt32( );
// Check if the characters after that number correspond to the ordinal suffix
- rtl::OUString sServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.OrdinalSuffix"));
+ rtl::OUString sServiceName("com.sun.star.i18n.OrdinalSuffix");
uno::Reference< i18n::XOrdinalSuffix > xOrdSuffix(
comphelper::createProcessComponent( sServiceName ),
uno::UNO_QUERY );
@@ -647,13 +647,13 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
CharClass& rCC = GetCharClass( eLang );
const lang::Locale rLocale = rCC.getLocale( );
- if ( rLocale.Language == OUString(RTL_CONSTASCII_USTRINGPARAM( "fr" )) )
+ if ( rLocale.Language == OUString( "fr" ) )
{
- bool bFrCA = rLocale.Country == OUString(RTL_CONSTASCII_USTRINGPARAM( "CA" ));
- OUString allChars = OUString(RTL_CONSTASCII_USTRINGPARAM( ":;?!%" ));
+ bool bFrCA = rLocale.Country == OUString( "CA" );
+ OUString allChars = OUString( ":;?!%" );
OUString chars( allChars );
if ( bFrCA )
- chars = OUString(RTL_CONSTASCII_USTRINGPARAM( ":" ));
+ chars = OUString( ":" );
sal_Unicode cChar = rTxt.GetChar( nEndPos );
bool bHasSpace = chars.indexOf( cChar ) != -1;
@@ -2046,7 +2046,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
// get parser
uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
+ OUString("com.sun.star.xml.sax.Parser") );
OSL_ENSURE( xXMLParser.is(),
"XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
if( !xXMLParser.is() )
@@ -2112,7 +2112,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
xStrm->SetSize( 0 );
xStrm->SetBufferSize( 8192 );
String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
- OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") );
+ OUString aMime( "text/xml" );
uno::Any aAny;
aAny <<= aMime;
xStrm->SetProperty( aPropName, aAny );
@@ -2128,7 +2128,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
}
uno::Reference < XInterface > xWriter (xServiceFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))));
+ OUString("com.sun.star.xml.sax.Writer")));
OSL_ENSURE(xWriter.is(),"com.sun.star.xml.sax.Writer service missing");
uno::Reference < io::XOutputStream> xOut = new utl::OOutputStreamWrapper( *xStrm );
uno::Reference<io::XActiveDataSource> xSrc(xWriter, uno::UNO_QUERY);
@@ -2178,7 +2178,7 @@ SvxAutocorrWordList* SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
aParserInput.aInputStream = xStrm->getInputStream();
// get parser
- uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
+ uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( OUString("com.sun.star.xml.sax.Parser") );
OSL_ENSURE( xXMLParser.is(), "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
if( xXMLParser.is() )
{
@@ -2417,7 +2417,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
aInfo.SourceURL = aSource.GetMainURL( INetURLObject::DECODE_TO_IURI );
aInfo.MoveData = sal_False;
aAny <<= aInfo;
- aNewContent.executeCommand( OUString ( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), aAny);
+ aNewContent.executeCommand( OUString ( "transfer" ), aAny);
}
catch (...)
{
@@ -2488,7 +2488,7 @@ sal_Bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
refList->SetSize( 0 );
refList->SetBufferSize( 8192 );
String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
- OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") );
+ OUString aMime( "text/xml" );
uno::Any aAny;
aAny <<= aMime;
refList->SetProperty( aPropName, aAny );
@@ -2503,7 +2503,7 @@ sal_Bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
}
uno::Reference < XInterface > xWriter (xServiceFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))));
+ OUString("com.sun.star.xml.sax.Writer")));
OSL_ENSURE(xWriter.is(),"com.sun.star.xml.sax.Writer service missing");
uno::Reference < io::XOutputStream> xOut = new utl::OOutputStreamWrapper( *refList );
uno::Reference<io::XActiveDataSource> xSrc(xWriter, uno::UNO_QUERY);
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 3217e89..8bc3fcc 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -804,7 +804,7 @@ void SvxUnoTextField::disposing()
// lang::XServiceInfo
OUString SAL_CALL SvxUnoTextField::getImplementationName() throw(uno::RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("SvxUnoTextField"));
+ return OUString("SvxUnoTextField");
}
uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
@@ -889,11 +889,11 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt
{
uno::Reference< uno::XInterface > xRet;
- const OUString aTextFieldPrexit( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") );
+ const OUString aTextFieldPrexit( "com.sun.star.text.textfield." );
// #i93308# up to OOo 3.2 we used this wrong namespace name with the capital T & F. This is
// fixed since OOo 3.2 but for compatibility we will still provide support for the wrong notation.
- const OUString aTextFieldPrexit2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField.") );
+ const OUString aTextFieldPrexit2( "com.sun.star.text.TextField." );
if( (ServiceSpecifier.compareTo( aTextFieldPrexit, aTextFieldPrexit.getLength() ) == 0) ||
(ServiceSpecifier.compareTo( aTextFieldPrexit2, aTextFieldPrexit2.getLength() ) == 0) )
commit cc1743fe8025af04d63060760d99a23e8fcd5e0c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue May 29 20:59:45 2012 -0500
targeted string re-work
Change-Id: Ibc811f2ef501a91172e096a700821ab6bd9406ea
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 29919df..3eadfbe 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -91,7 +91,7 @@ void MozabDriver::disposing()
//------------------------------------------------------------------------------
rtl::OUString MozabDriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MOZAB_DRIVER_IMPL_NAME));
+ return rtl::OUString(MOZAB_DRIVER_IMPL_NAME);
// this name is referenced in the configuration and in the mozab.xml
// Please take care when changing it.
}
@@ -101,7 +101,7 @@ Sequence< ::rtl::OUString > MozabDriver::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;
}
@@ -143,7 +143,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u
{
::osl::MutexGuard aGuard(m_aMutex);
//We must make sure we create an com.sun.star.mozilla.MozillaBootstrap brfore call any mozilla codes
- Reference<XInterface> xInstance = m_xMSFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) );
+ Reference<XInterface> xInstance = m_xMSFactory->createInstance(::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap") );
OSL_ENSURE( xInstance.is(), "failed to create instance" );
OConnection* pCon = reinterpret_cast<OConnection*>((*m_pCreationFunc)(this));
@@ -157,7 +157,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u
::connectivity::SharedResources aResources;
const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
STR_COULD_NOT_LOAD_LIB,
- "$libname$", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "mozabdrv" )) )
+ "$libname$", ::rtl::OUString( SVLIBRARY( "mozabdrv" ) )
) );
::dbtools::throwGenericSQLException(sError,*this);
@@ -188,17 +188,17 @@ Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const ::rt
::std::vector< DriverPropertyInfo > aDriverInfo;
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Base DN."))
+ ::rtl::OUString("BaseDN")
+ ,::rtl::OUString("Base DN.")
,sal_False
,::rtl::OUString()
,Sequence< ::rtl::OUString >())
);
aDriverInfo.push_back(DriverPropertyInfo(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRowCount"))
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Records (max.)"))
+ ::rtl::OUString("MaxRowCount")
+ ,::rtl::OUString("Records (max."))
,sal_False
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100"))
+ ,::rtl::OUString("100")
,Sequence< ::rtl::OUString >())
);
return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
@@ -235,7 +235,7 @@ EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url )
// There isn't any subschema: - but could be just subschema
if ( !aAddrbookURI.isEmpty() )
aAddrbookScheme= aAddrbookURI;
- else if(url == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:")) )
+ else if(url == ::rtl::OUString("sdbc:address:") )
return Unknown; // TODO check
else
return Unknown;
@@ -299,7 +299,7 @@ bool MozabDriver::ensureInit()
OSL_ENSURE(NULL == m_pCreationFunc, "MozabDriver::ensureInit: inconsistence: already have a factory function!");
- const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY( "mozabdrv" )));
+ const ::rtl::OUString sModuleName(SVLIBRARY( "mozabdrv" ));
// load the mozabdrv library
m_hModule = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index fa444d6..b57adb8 100644
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -93,7 +93,7 @@ struct ProviderRequest
typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
{
- const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY( "mozabdrv" )));
+ const ::rtl::OUString sModuleName(SVLIBRARY( "mozabdrv" ));
// load the dbtools library
oslModule s_hModule = osl_loadModuleRelative(
@@ -104,7 +104,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere
{
// get the symbol for the method creating the factory
- const ::rtl::OUString sFactoryCreationFunc = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OMozillaBootstrap_CreateInstance"));
+ const ::rtl::OUString sFactoryCreationFunc = ::rtl::OUString( "OMozillaBootstrap_CreateInstance");
// reinterpret_cast<OMozabConnection_CreateInstanceFunction> removed GNU C
OMozillaBootstrap_CreateInstanceFunction s_pCreationFunc = (OMozillaBootstrap_CreateInstanceFunction)osl_getFunctionSymbol(s_hModule, sFactoryCreationFunc.pData);
@@ -140,7 +140,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
else if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" )
{
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
+ aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap");
aReq.CREATE_PROVIDER(
aImplName,
aSNS,
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 8de0a45..f7ef9a7 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -77,7 +77,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
{
Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
if( xFactProp.is())
- xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
+ xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext;
}
catch( uno::Exception& )
{}
@@ -465,9 +465,9 @@ void SchXMLImportHelper::DeleteDataSeries(
{
(void)ex; // avoid warning for pro build
OSL_FAIL( OUStringToOString(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
+ OUString( "Exception caught. Type: " ) +
OUString::createFromAscii( typeid( ex ).name()) +
- OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
+ OUString( ", Message: " ) +
ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
}
@@ -536,7 +536,7 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
{
xResult.set(
xContext->getServiceManager()->createInstanceWithContext(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DataSeries" )),
+ OUString( "com.sun.star.chart2.DataSeries" ),
xContext ), uno::UNO_QUERY_THROW );
}
if( xResult.is() )
@@ -548,9 +548,9 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
{
(void)ex; // avoid warning for pro build
OSL_FAIL( OUStringToOString(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
+ OUString( "Exception caught. Type: " ) +
OUString::createFromAscii( typeid( ex ).name()) +
- OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
+ OUString( ", Message: " ) +
ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
return xResult;
@@ -608,8 +608,8 @@ SvXMLImportContext *SchXMLImport::CreateContext( sal_uInt16 nPrefix, const OUStr
if (xDPS.is()) {
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
mxServiceFactory->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.xml.dom.SAXDocumentBuilder"))),
+ ::rtl::OUString(
+ "com.sun.star.xml.dom.SAXDocumentBuilder")),
uno::UNO_QUERY_THROW);
pContext = (IsXMLToken(rLocalName, XML_DOCUMENT_META))
? new SvXMLMetaDocumentContext(*this,
@@ -683,7 +683,7 @@ void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComp
if ( !xChartDoc->getDataProvider().is() )
{
- const OUString aDataProviderServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider"));
+ const OUString aDataProviderServiceName( "com.sun.star.chart2.data.DataProvider");
const uno::Sequence< OUString > aServiceNames( xFact->getAvailableServiceNames());
const OUString * pBegin = aServiceNames.getConstArray();
const OUString * pEnd = pBegin + aServiceNames.getLength();
@@ -724,14 +724,14 @@ void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComp
Sequence< OUString > SAL_CALL SchXMLImport_getSupportedServiceNames() throw()
{
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisImporter" ) );
+ const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisImporter" );
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
OUString SAL_CALL SchXMLImport_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport" ) );
+ return OUString( "SchXMLImport" );
}
Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
@@ -746,14 +746,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Referenc
Sequence< OUString > SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw()
{
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisStylesImporter" ) );
+ const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisStylesImporter" );
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport.Styles" ) );
+ return OUString( "SchXMLImport.Styles" );
}
Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
@@ -766,14 +766,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const R
Sequence< OUString > SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw()
{
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisContentImporter" ) );
+ const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisContentImporter" );
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport.Content" ) );
+ return OUString( "SchXMLImport.Content" );
}
Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
@@ -786,14 +786,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const
Sequence< OUString > SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw()
{
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisMetaImporter" ) );
+ const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisMetaImporter" );
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport.Meta" ) );
+ return OUString( "SchXMLImport.Meta" );
}
Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
@@ -819,7 +819,7 @@ OUString SAL_CALL SchXMLImport::getImplementationName() throw( uno::RuntimeExcep
case IMPORT_SETTINGS:
// there is no settings component in chart
default:
- return OUString(RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport" ));
+ return OUString( "SchXMLImport" );
}
}
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 6a5892f..26aa8f9 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -102,7 +102,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
uno::Any aAny;
aAny <<= GetXMLToken( XML_TEXT );
xConvPropSet->setPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Class")), aAny );
+ ::rtl::OUString("Class"), aAny );
uno::Reference< beans::XPropertySet > xPropSet =
getExportInfo().is()
@@ -118,7 +118,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
// get filter component
xDocHandler = uno::Reference< xml::sax::XDocumentHandler >(
xFactory->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
+ ::rtl::OUString("com.sun.star.comp.Oasis2OOoTransformer"),
aArgs),
uno::UNO_QUERY_THROW );
@@ -196,14 +196,14 @@ uno::Sequence< rtl::OUString > SAL_CALL XMLMetaExportComponent_getSupportedServi
throw()
{
const rtl::OUString aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.XMLOasisMetaExporter" ) );
+ "com.sun.star.document.XMLOasisMetaExporter" );
const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
rtl::OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLMetaExportComponent" ) );
+ return rtl::OUString( "XMLMetaExportComponent" );
}
uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance(
@@ -217,14 +217,14 @@ uno::Sequence< rtl::OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceName
throw()
{
const rtl::OUString aServiceName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.XMLMetaExporter" ) );
+ "com.sun.star.document.XMLMetaExporter" );
const uno::Sequence< rtl::OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
rtl::OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMLMetaExportOOo" ) );
+ return rtl::OUString( "XMLMetaExportOOo" );
}
uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance(
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 9217888..7bb3f4e 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -81,8 +81,8 @@ XMLPropStyleContext::XMLPropStyleContext( SvXMLImport& rImport,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
sal_Bool bDefault )
: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, nFamily, bDefault )
-, msIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) )
-, msFollowStyle( RTL_CONSTASCII_USTRINGPARAM( "FollowStyle" ) )
+, msIsPhysical( "IsPhysical" )
+, msFollowStyle( "FollowStyle" )
, mxStyles( &rStyles )
{
}
@@ -207,15 +207,15 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
{
aValues.realloc( nLen + 2 );
PropertyValue *pProps = aValues.getArray() + nLen;
- pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName"));
+ pProps->Name = rtl::OUString("ParaStyleName");
OUString sParent( GetParentName() );
if( !sParent.isEmpty() )
sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent );
else
- sParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
+ sParent = rtl::OUString("Standard");
pProps->Value <<= sParent;
++pProps;
- pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaConditionalStyleName"));
+ pProps->Name = rtl::OUString("ParaConditionalStyleName");
pProps->Value <<= sParent;
}
@@ -224,8 +224,8 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
{
Sequence< OUString > aPropNames(1);
aPropNames[0] = GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ?
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAutoStyleName")) :
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharAutoStyleName"));
+ rtl::OUString("ParaAutoStyleName") :
+ rtl::OUString("CharAutoStyleName");
Sequence< Any > aAny = xAutoStyle->getPropertyValues( aPropNames );
if( aAny.hasElements() )
{
More information about the Libreoffice-commits
mailing list