summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-05-29 21:35:26 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-05-29 21:35:26 -0500
commit20696849975f8e256a1be856e056bfaa8ade99d0 (patch)
treef96fc0f6bd832ab3ebf2285a5c7a37c952badbc3 /editeng
parentcc1743fe8025af04d63060760d99a23e8fcd5e0c (diff)
targeted string re-work
Change-Id: I477fc34c21530b51d975216156e66abf21a7149c
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/accessibility/AccessibleComponentBase.cxx4
-rw-r--r--editeng/source/accessibility/AccessibleContextBase.cxx12
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx36
-rw-r--r--editeng/source/editeng/editview.cxx8
-rw-r--r--editeng/source/editeng/eerdll.cxx2
-rw-r--r--editeng/source/editeng/impedit3.cxx4
-rw-r--r--editeng/source/items/frmitems.cxx8
-rw-r--r--editeng/source/items/numitem.cxx6
-rw-r--r--editeng/source/misc/splwrap.cxx6
-rw-r--r--editeng/source/misc/svxacorr.cxx24
-rw-r--r--editeng/source/uno/unofield.cxx6
11 files changed, 58 insertions, 58 deletions
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 861959448b00..3f39d0e4fc7d 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 6dc15e68853c..e7a3218ced82 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 e1fd56260754..8586dbe28837 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 3a92b8792522..dccb777d689c 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 1e0f3e4241f4..2d369b87cb61 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 e19b88a19d94..451ba164b548 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 8651534e1b0a..e336ef2a18d8 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 fc081b232136..ff1472a19310 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 b90bf75b35c6..d564006ce90f 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 ce5c71c67f67..fa9c7af48f1d 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 3217e89e42b1..8bc3fccddde7 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) )