/formula/

tion> LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-19 09:22:44 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-19 09:00:26 +0000
commit8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch)
tree2dbddceebf0f96492adc5652697e8efce8a8ba06 /sw
parentfe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff)
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex: s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec Reviewed-on: https://gerrit.libreoffice.org/2832 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/PostItMgr.hxx4
-rw-r--r--sw/source/core/unocore/swunohelper.cxx4
-rw-r--r--sw/source/core/unocore/unobkm.cxx7
-rw-r--r--sw/source/core/unocore/unocoll.cxx10
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx6
-rw-r--r--sw/source/core/unocore/unodraw.cxx24
-rw-r--r--sw/source/core/unocore/unofield.cxx14
-rw-r--r--sw/source/core/unocore/unoframe.cxx24
-rw-r--r--sw/source/core/unocore/unoftn.cxx4
-rw-r--r--sw/source/core/unocore/unoidx.cxx34
-rw-r--r--sw/source/core/unocore/unoobj.cxx26
-rw-r--r--sw/source/core/unocore/unoobj2.cxx4
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx28
-rw-r--r--sw/source/core/unocore/unoport.cxx10
-rw-r--r--sw/source/core/unocore/unorefmk.cxx2
-rw-r--r--sw/source/core/unocore/unosect.cxx26
-rw-r--r--sw/source/core/unocore/unosett.cxx24
-rw-r--r--sw/source/core/unocore/unosrch.cxx6
-rw-r--r--sw/source/core/unocore/unostyle.cxx54
-rw-r--r--sw/source/core/unocore/unotbl.cxx26
-rw-r--r--sw/source/core/unocore/unotext.cxx6
-rw-r--r--sw/source/core/view/printdata.cxx32
-rw-r--r--sw/source/filter/basflt/iodetect.cxx2
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx14
-rw-r--r--sw/source/filter/html/htmlbas.cxx2
-rw-r--r--sw/source/filter/html/htmlforw.cxx70
-rw-r--r--sw/source/filter/html/htmlplug.cxx36
-rw-r--r--sw/source/filter/xml/swxml.cxx22
-rw-r--r--sw/source/filter/xml/wrtxml.cxx6
-rw-r--r--sw/source/filter/xml/xmlexp.cxx60
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx69
-rw-r--r--sw/source/filter/xml/xmltexte.cxx40
-rw-r--r--sw/source/filter/xml/xmltexti.cxx26
-rw-r--r--sw/source/ui/app/appopt.cxx6
-rw-r--r--sw/source/ui/app/docsh2.cxx4
-rw-r--r--sw/source/ui/app/docst.cxx2
-rw-r--r--sw/source/ui/app/swmodule.cxx4
-rw-r--r--sw/source/ui/config/optload.cxx2
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx6
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx12
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx2
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx9
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.cxx2
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx4
-rw-r--r--sw/source/ui/envelp/labprt.cxx2
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx5
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx8
-rw-r--r--sw/source/ui/shells/annotsh.cxx6
-rw-r--r--sw/source/ui/shells/drawsh.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx4
-rw-r--r--sw/source/ui/shells/frmsh.cxx2
-rw-r--r--sw/source/ui/shells/textdrw.cxx2
-rw-r--r--sw/source/ui/shells/textsh.cxx20
-rw-r--r--sw/source/ui/shells/textsh1.cxx2
-rw-r--r--sw/source/ui/table/chartins.cxx10
-rw-r--r--sw/source/ui/table/tablemgr.cxx8
-rw-r--r--sw/source/ui/uiview/view.cxx28
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx14
-rw-r--r--sw/source/ui/uno/unoatxt.cxx2
-rw-r--r--sw/source/ui/uno/unodoc.cxx12
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx36
-rw-r--r--sw/source/ui/uno/unomodule.cxx4
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx32
-rw-r--r--sw/source/ui/uno/unotxvw.cxx38
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/ui/vba/vbaaddin.cxx7
-rw-r--r--sw/source/ui/vba/vbaaddins.cxx4
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx4
-rw-r--r--sw/source/ui/vba/vbaautotextentry.cxx20
-rw-r--r--sw/source/ui/vba/vbabookmark.cxx6
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx6
-rw-r--r--sw/source/ui/vba/vbaborders.cxx12
-rw-r--r--sw/source/ui/vba/vbacell.cxx4
-rw-r--r--sw/source/ui/vba/vbacells.cxx4
-rw-r--r--sw/source/ui/vba/vbacolumn.cxx4
-rw-r--r--sw/source/ui/vba/vbacolumns.cxx8
-rw-r--r--sw/source/ui/vba/vbadialog.cxx4
-rw-r--r--sw/source/ui/vba/vbadialogs.cxx4
-rw-r--r--sw/source/ui/vba/vbadocument.cxx18
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx14
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx4
-rw-r--r--sw/source/ui/vba/vbafield.cxx20
-rw-r--r--sw/source/ui/vba/vbafind.cxx38
-rw-r--r--sw/source/ui/vba/vbafont.cxx4
-rw-r--r--sw/source/ui/vba/vbaformfield.cxx8
-rw-r--r--sw/source/ui/vba/vbaformfields.cxx4
-rw-r--r--sw/source/ui/vba/vbaframe.cxx4
-rw-r--r--sw/source/ui/vba/vbaframes.cxx4
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx10
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.cxx10
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.cxx20
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.cxx4
-rw-r--r--sw/source/ui/vba/vbalistformat.cxx12
-rw-r--r--sw/source/ui/vba/vbalistgalleries.cxx6
-rw-r--r--sw/source/ui/vba/vbalistgallery.cxx4
-rw-r--r--sw/source/ui/vba/vbalistlevel.cxx50
-rw-r--r--sw/source/ui/vba/vbalistlevels.cxx6
-rw-r--r--sw/source/ui/vba/vbalisttemplate.cxx6
-rw-r--r--sw/source/ui/vba/vbalisttemplates.cxx6
-rw-r--r--sw/source/ui/vba/vbaoptions.cxx22
-rw-r--r--sw/source/ui/vba/vbapagesetup.cxx86
-rw-r--r--sw/source/ui/vba/vbapane.cxx6
-rw-r--r--sw/source/ui/vba/vbapanes.cxx4
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx12
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.cxx76
-rw-r--r--sw/source/ui/vba/vbarange.cxx24
-rw-r--r--sw/source/ui/vba/vbareplacement.cxx4
-rw-r--r--sw/source/ui/vba/vbarevision.cxx4
-rw-r--r--sw/source/ui/vba/vbarevisions.cxx4
-rw-r--r--sw/source/ui/vba/vbarow.cxx12
-rw-r--r--sw/source/ui/vba/vbarows.cxx36
-rw-r--r--sw/source/ui/vba/vbasection.cxx4
-rw-r--r--sw/source/ui/vba/vbasections.cxx8
-rw-r--r--sw/source/ui/vba/vbaselection.cxx62
-rw-r--r--sw/source/ui/vba/vbastyle.cxx32
-rw-r--r--sw/source/ui/vba/vbastyle.hxx2
-rw-r--r--sw/source/ui/vba/vbastyles.cxx18
-rw-r--r--sw/source/ui/vba/vbasystem.cxx13
-rw-r--r--sw/source/ui/vba/vbatable.cxx4
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx6
-rw-r--r--sw/source/ui/vba/vbatableofcontents.cxx16
-rw-r--r--sw/source/ui/vba/vbatables.cxx6
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.cxx8
-rw-r--r--sw/source/ui/vba/vbatabstop.cxx4
-rw-r--r--sw/source/ui/vba/vbatabstops.cxx8
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx8
-rw-r--r--sw/source/ui/vba/vbavariable.cxx7
-rw-r--r--sw/source/ui/vba/vbavariables.cxx4
-rw-r--r--sw/source/ui/vba/vbaview.cxx40
-rw-r--r--sw/source/ui/vba/vbawindow.cxx6
-rw-r--r--sw/source/ui/vba/vbawrapformat.cxx32
-rw-r--r--sw/source/ui/vba/wordvbahelper.cxx14
-rw-r--r--sw/source/ui/wrtsh/navmgr.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx8
137 files changed, 975 insertions, 986 deletions
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 0a705ee9713e..9bfad8414fc6 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -102,7 +102,7 @@ class SwNoteProps: public utl::ConfigItem
bool bIsShowAnchor;
public:
SwNoteProps()
- : ConfigItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/Notes")))
+ : ConfigItem(::rtl::OUString("Office.Writer/Notes"))
, bIsShowAnchor(false)
{
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames = GetPropertyNames();
@@ -124,7 +124,7 @@ class SwNoteProps: public utl::ConfigItem
{
aNames.realloc(1);
::rtl::OUString* pNames = aNames.getArray();
- pNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowAnkor"));
+ pNames[0] = ::rtl::OUString("ShowAnkor");
}
return aNames;
}
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index be89e34d3747..78b195f3855a 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -200,9 +200,9 @@ bool UCB_GetFileListOfFolder( const String& rURL,
sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1;
::com::sun::star::uno::Sequence < rtl::OUString > aProps( nSeqSize );
rtl::OUString* pProps = aProps.getArray();
- pProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ pProps[ 0 ] = rtl::OUString("Title");
if( pDateTimeList )
- pProps[ 1 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified"));
+ pProps[ 1 ] = rtl::OUString("DateModified");
try
{
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index ccec95703a1f..365425fcdc93 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -242,7 +242,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
UnoActionContext aCont(m_pImpl->m_pDoc);
if (m_pImpl->m_sMarkName.isEmpty())
{
- m_pImpl->m_sMarkName = OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"));
+ m_pImpl->m_sMarkName = OUString("Bookmark");
}
if ((eType == IDocumentMarkAccess::BOOKMARK) &&
::sw::mark::CrossRefNumItemBookmark::IsLegalName(m_pImpl->m_sMarkName))
@@ -378,7 +378,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL
SwXBookmark::getImplementationName() throw (uno::RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("SwXBookmark"));
+ return OUString("SwXBookmark");
}
static char const*const g_ServicesBookmark[] =
@@ -440,8 +440,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
uno::RuntimeException)
{
// nothing to set here
- throw lang::IllegalArgumentException( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Property is read-only: "))
+ throw lang::IllegalArgumentException( ::rtl::OUString("Property is read-only: ")
+ PropertyName, static_cast< cppu::OWeakObject * >(this), 0 );
}
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index cdd89eed79d3..a55f2fb56753 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -113,7 +113,7 @@ public:
try
{
uno::Reference< beans::XPropertySet > xProps( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
- uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString("BasicLibraries") ), uno::UNO_QUERY_THROW );
rtl::OUString sProjectName( "Standard");
if ( !mpDocShell->GetBasicManager()->GetName().isEmpty() )
{
@@ -612,7 +612,7 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16
{
uno::Sequence< uno::Any > aArgs(1);
aArgs[ 0 ] <<= pDoc->GetDocShell()->GetModel();
- aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Globals")), aArgs );
+ aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString("ooo.vba.word.Globals"), aArgs );
pDoc->GetDocShell()->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
}
aGlobs >>= xRet;
@@ -1607,18 +1607,18 @@ uno::Reference< XTextSection > SwXTextSections::GetObject( SwSectionFmt& rFmt )
OUString SwXBookmarks::getImplementationName(void) throw( RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("SwXBookmarks"));
+ return OUString("SwXBookmarks");
}
sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmarks")) == rServiceName;
+ return OUString("com.sun.star.text.Bookmarks") == rServiceName;
}
Sequence< OUString > SwXBookmarks::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmarks"));
+ aRet[0] = OUString("com.sun.star.text.Bookmarks");
return aRet;
}
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index ef6251cfa673..28ab19a9bfac 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1182,7 +1182,7 @@ void makeRedline( SwPaM& rPaM,
//todo: what about REDLINE_FMTCOLL?
comphelper::SequenceAsHashMap aPropMap( rRedlineProperties );
uno::Any aAuthorValue;
- aAuthorValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineAuthor")), aAuthorValue);
+ aAuthorValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineAuthor"), aAuthorValue);
sal_uInt16 nAuthor = 0;
::rtl::OUString sAuthor;
if( aAuthorValue >>= sAuthor )
@@ -1190,7 +1190,7 @@ void makeRedline( SwPaM& rPaM,
::rtl::OUString sComment;
uno::Any aCommentValue;
- aCommentValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineComment")), aCommentValue);
+ aCommentValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineComment"), aCommentValue);
SwRedlineData aRedlineData( eType, nAuthor );
if( aCommentValue >>= sComment )
@@ -1198,7 +1198,7 @@ void makeRedline( SwPaM& rPaM,
::util::DateTime aStamp;
uno::Any aDateTimeValue;
- aDateTimeValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineDateTime")), aDateTimeValue);
+ aDateTimeValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString("RedlineDateTime"), aDateTimeValue);
if( aDateTimeValue >>= aStamp )
{
aRedlineData.SetTimeStamp(
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 907d2e21f558..b6755a58361a 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1108,7 +1108,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException ( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException ( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
//mit Layout kann der Anker umgesetzt werden, ohne dass sich die Position aendert
if(pFmt)
{
@@ -1541,7 +1541,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
// get property <::drawing::Shape::Transformation>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation")) );
+ aRet = _getPropAtAggrObj( rtl::OUString("Transformation") );
}
else if ( FN_SHAPE_POSITION_LAYOUT_DIR == pEntry->nWID )
{
@@ -1552,13 +1552,13 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
// get property <::drawing::Shape::StartPosition>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition")) );
+ aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") );
}
else if ( FN_SHAPE_ENDPOSITION_IN_HORI_L2R == pEntry->nWID )
{
// get property <::drawing::Shape::EndPosition>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition")) );
+ aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") );
}
else
{
@@ -1618,7 +1618,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
// get property <::drawing::Shape::Transformation>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation")) );
+ aRet = _getPropAtAggrObj( rtl::OUString("Transformation") );
}
break;
case FN_SHAPE_POSITION_LAYOUT_DIR:
@@ -1631,14 +1631,14 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
{
// get property <::drawing::Shape::StartPosition>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition")) );
+ aRet = _getPropAtAggrObj( rtl::OUString("StartPosition") );
}
break;
case FN_SHAPE_ENDPOSITION_IN_HORI_L2R:
{
// get property <::drawing::Shape::StartPosition>
// without conversion to layout direction as below
- aRet = _getPropAtAggrObj( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition")) );
+ aRet = _getPropAtAggrObj( rtl::OUString("EndPosition") );
}
break;
}
@@ -1829,7 +1829,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName )
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw uno::RuntimeException( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException( rtl::OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if(pFmt)
{
const SfxItemSet& rSet = pFmt->GetAttrSet();
@@ -1923,7 +1923,7 @@ void SwXShape::addPropertyChangeListener(
uno::RuntimeException )
{
if ( !xShapeAgg.is() )
- throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no shape aggregate" ) ), *this );
+ throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this );
// must be handled by the aggregate
uno::Reference< beans::XPropertySet > xShapeProps;
@@ -1938,7 +1938,7 @@ void SwXShape::removePropertyChangeListener(
uno::RuntimeException )
{
if ( !xShapeAgg.is() )
- throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no shape aggregate" ) ), *this );
+ throw uno::RuntimeException( ::rtl::OUString( "no shape aggregate" ), *this );
// must be handled by the aggregate
uno::Reference< beans::XPropertySet > xShapeProps;
@@ -2367,9 +2367,9 @@ awt::Point SwXShape::_GetAttrPosition()
{
awt::Point aAttrPos;
- uno::Any aHoriPos( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")) ) );
+ uno::Any aHoriPos( getPropertyValue( rtl::OUString("HoriOrientPosition") ) );
aHoriPos >>= aAttrPos.X;
- uno::Any aVertPos( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")) ) );
+ uno::Any aVertPos( getPropertyValue( rtl::OUString("VertOrientPosition") ) );
aVertPos >>= aAttrPos.Y;
// #i35798# - fallback, if attribute position is (0,0)
// and no anchor position is applied to the drawing object
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 2ec74e74015a..6a4bfee16da0 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -566,7 +566,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
if( USHRT_MAX != nMId )
pType->PutValue( rValue, nMId );
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
}
else if(!pType && m_pDoc &&
@@ -701,7 +701,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
}
break;
default:
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
}
}
@@ -809,7 +809,7 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName)
}
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
else
{
@@ -878,7 +878,7 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName)
}
break;
default:
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
if( pStr )
@@ -1921,9 +1921,9 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An
const SfxItemPropertySimpleEntry* pEntry = _pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if(pField)
{
@@ -2080,7 +2080,7 @@ uno::Any SwXTextField::getPropertyValue(const OUString& rPropertyName)
pEntry = _pParaPropSet->getPropertyMap().getByName(rPropertyName);
}
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
switch( pEntry->nWID )
{
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 443f37653f7f..0990c4fc9890 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -840,7 +840,7 @@ SwXFrame::SwXFrame(FlyCntType eSet, const :: SfxItemPropertySet* pSet, SwDoc *pD
// Get the style families
uno::Reference < XNameAccess > xFamilies = xFamilySupplier->getStyleFamilies();
// Get the Frame family (and keep it for later)
- const ::uno::Any aAny = xFamilies->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "FrameStyles" ) ) );
+ const ::uno::Any aAny = xFamilies->getByName ( OUString( "FrameStyles" ) );
aAny >>= mxStyleFamily;
// In the derived class, we'll ask mxStyleFamily for the relevant default style
// mxStyleFamily is initialised in the SwXFrame constructor
@@ -848,21 +848,21 @@ SwXFrame::SwXFrame(FlyCntType eSet, const :: SfxItemPropertySet* pSet, SwDoc *pD
{
case FLYCNTTYPE_FRM:
{
- uno::Any aAny2 = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Frame" ) ) );
+ uno::Any aAny2 = mxStyleFamily->getByName ( OUString( "Frame" ) );
aAny2 >>= mxStyleData;
pProps = new SwFrameProperties_Impl( );
}
break;
case FLYCNTTYPE_GRF:
{
- uno::Any aAny2 = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Graphics" ) ) );
+ uno::Any aAny2 = mxStyleFamily->getByName ( OUString( "Graphics" ) );
aAny2 >>= mxStyleData;
pProps = new SwGraphicProperties_Impl( );
}
break;
case FLYCNTTYPE_OLE:
{
- uno::Any aAny2 = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OLE" ) ) );
+ uno::Any aAny2 = mxStyleFamily->getByName ( OUString( "OLE" ) );
aAny2 >>= mxStyleData;
pProps = new SwOLEProperties_Impl( );
}
@@ -1015,13 +1015,13 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
const :: SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if(pFmt)
{
bool bNextFrame = false;
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
SwDoc* pDoc = pFmt->GetDoc();
if ( ((eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID)) ||
@@ -1482,7 +1482,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
SwFrmFmt* pFmt = GetFrmFmt();
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if(FN_UNO_ANCHOR_TYPES == pEntry->nWID)
{
@@ -1842,7 +1842,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
{
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(pNames[i]);
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) );
if(pEntry->nWID == FN_UNO_ANCHOR_TYPES||
pEntry->nWID == FN_PARAM_LINK_DISPLAY_NAME||
@@ -1899,9 +1899,9 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
{
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "setPropertyToDefault: property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException( OUString( "setPropertyToDefault: property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
bool bNextFrame;
if( pEntry->nWID &&
@@ -2005,7 +2005,7 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName )
}
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
else if(!IsDescriptor())
throw uno::RuntimeException();
@@ -2324,7 +2324,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
if( !aClassName.MakeId( aCLSID ) )
{
lang::IllegalArgumentException aExcept;
- aExcept.Message = OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID invalid"));
+ aExcept.Message = OUString("CLSID invalid");
throw aExcept;
}
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 148062bd30d7..0e9ef54b7856 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -82,8 +82,8 @@ public:
SwFmtFtn const& GetFootnoteFormatOrThrow() {
SwFmtFtn const*const pFootnote( GetFootnoteFormat() );
if (!pFootnote) {
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "SwXFootnote: disposed or invalid")), 0);
+ throw uno::RuntimeException(OUString(
+ "SwXFootnote: disposed or invalid"), 0);
}
return *pFootnote;
}
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index b38c7d8054f1..03a8c9216b15 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -366,8 +366,8 @@ public:
: 0));
if (!pTOXSection)
{
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "SwXDocumentIndex: disposed or invalid")), 0);
+ throw uno::RuntimeException(OUString(
+ "SwXDocumentIndex: disposed or invalid"), 0);
}
return *pTOXSection;
}
@@ -560,14 +560,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
{
throw beans::PropertyVetoException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: " ))
+ OUString("Property is read-only: " )
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
@@ -876,7 +876,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName,
static_cast< cppu::OWeakObject * >(this));
}
@@ -2093,14 +2093,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
{
throw beans::PropertyVetoException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: "))
+ OUString("Property is read-only: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
@@ -2218,7 +2218,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
@@ -3003,7 +3003,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
pArr[nCurrentElement].Name = "TokenType";
pArr[nCurrentElement++].Value <<=
- OUString(RTL_CONSTASCII_USTRINGPARAM("TokenEntryNumber"));
+ OUString("TokenEntryNumber");
pArr[nCurrentElement].Name = "CharacterStyleName";
pArr[nCurrentElement++].Value <<= aProgCharStyle;
@@ -3042,7 +3042,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = "TokenType";
- pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenEntryText"));
+ pArr[0].Value <<= OUString("TokenEntryText");
pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
@@ -3054,7 +3054,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = "TokenType";
- pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenTabStop"));
+ pArr[0].Value <<= OUString("TokenTabStop");
if(SVX_TAB_ADJUST_END == aToken.eTabAlign)
{
@@ -3085,7 +3085,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = "TokenType";
- pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenText"));
+ pArr[0].Value <<= OUString("TokenText");
pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
@@ -3100,7 +3100,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = "TokenType";
- pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenPageNumber"));
+ pArr[0].Value <<= OUString("TokenPageNumber");
pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
@@ -3112,7 +3112,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = "TokenType";
- pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenChapterInfo"));
+ pArr[0].Value <<= OUString("TokenChapterInfo");
pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
@@ -3150,7 +3150,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
pArr[0].Name = "TokenType";
pArr[0].Value <<=
- OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkStart"));
+ OUString("TokenHyperlinkStart");
pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
}
@@ -3162,7 +3162,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
pArr[0].Name = "TokenType";
pArr[0].Value <<=
- OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkEnd"));
+ OUString("TokenHyperlinkEnd");
}
break;
case TOKEN_AUTHORITY:
@@ -3172,7 +3172,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
pArr[0].Name = "TokenType";
pArr[0].Value <<=
- OUString(RTL_CONSTASCII_USTRINGPARAM("TokenBibliographyDataField"));
+ OUString("TokenBibliographyDataField");
pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index f7762ab13dac..75b7f0b7c206 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -746,8 +746,8 @@ public:
SwUnoCrsr & GetCursorOrThrow() {
SwUnoCrsr *const pUnoCursor( GetCursor() );
if (!pUnoCursor) {
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "SwXTextCursor: disposed or invalid")), 0);
+ throw uno::RuntimeException(OUString(
+ "SwXTextCursor: disposed or invalid"), 0);
}
return *pUnoCursor;
}
@@ -1829,7 +1829,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName, static_cast<cppu::OWeakObject *>(0));
}
@@ -1976,7 +1976,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
else
{
throw beans::UnknownPropertyException(
- OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ pNames[i],
static_cast<cppu::OWeakObject *>(0));
}
@@ -2100,14 +2100,14 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName, static_cast<cppu::OWeakObject *>(0));
}
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
{
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "setPropertyToDefault: property is read-only: "))
+ throw uno::RuntimeException(OUString(
+ "setPropertyToDefault: property is read-only: ")
+ rPropertyName, 0);
}
@@ -2141,7 +2141,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName, static_cast<cppu::OWeakObject *>(0));
}
@@ -2418,15 +2418,15 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
continue;
}
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ pNames[i],
static_cast<cppu::OWeakObject *>(this));
}
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
{
throw uno::RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "setPropertiesToDefault: property is read-only: "))
+ OUString(
+ "setPropertiesToDefault: property is read-only: ")
+ pNames[i],
static_cast<cppu::OWeakObject *>(this));
}
@@ -2490,7 +2490,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
continue;
}
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ pNames[i],
static_cast<cppu::OWeakObject *>(0));
}
@@ -2977,7 +2977,7 @@ SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextContent"));
+ pArray[0] = OUString("com.sun.star.text.TextContent");
return aRet;
}
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 851ef6851ff6..d40071ef5ef5 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -907,7 +907,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL
SwXTextRange::getImplementationName() throw (uno::RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("SwXTextRange"));
+ return OUString("SwXTextRange");
}
static char const*const g_ServicesTextRange[] =
@@ -1366,7 +1366,7 @@ SwXTextRange::getAvailableServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextContent"));
+ pArray[0] = OUString("com.sun.star.text.TextContent");
return aRet;
}
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index d0d7c8071297..550b7b7d8959 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -142,8 +142,8 @@ public:
SwTxtNode & GetTxtNodeOrThrow() {
SwTxtNode *const pTxtNode( GetTxtNode() );
if (!pTxtNode) {
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "SwXParagraph: disposed or invalid")), 0);
+ throw uno::RuntimeException(OUString(
+ "SwXParagraph: disposed or invalid"), 0);
}
return *pTxtNode;
}
@@ -397,14 +397,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ pPropertyNames[nProp],
static_cast< cppu::OWeakObject * >(&m_rThis));
}
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
{
throw beans::PropertyVetoException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: "))
+ OUString("Property is read-only: ")
+ pPropertyNames[nProp],
static_cast< cppu::OWeakObject * >(&m_rThis));
}
@@ -457,7 +457,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ pPropertyNames[nProp],
static_cast< cppu::OWeakObject * >(&m_rThis));
}
@@ -491,14 +491,14 @@ throw (uno::RuntimeException)
}
catch (beans::UnknownPropertyException &)
{
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unknown property exception caught")),
+ throw uno::RuntimeException(OUString(
+ "Unknown property exception caught"),
static_cast<cppu::OWeakObject *>(this));
}
catch (lang::WrappedTargetException &)
{
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "WrappedTargetException caught")),
+ throw uno::RuntimeException(OUString(
+ "WrappedTargetException caught"),
static_cast<cppu::OWeakObject *>(this));
}
@@ -919,7 +919,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
@@ -953,7 +953,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ *pNames,
static_cast<cppu::OWeakObject *>(this));
}
@@ -996,7 +996,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
@@ -1004,7 +1004,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
{
throw uno::RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: "))
+ OUString("Property is read-only: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
@@ -1066,7 +1066,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 831ef2940b13..4d66549a8670 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -428,7 +428,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl(
GetPropertyValue( pValues[nProp], *pEntry, pUnoCrsr, pSet );
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
}
delete pSet;
}
@@ -463,9 +463,9 @@ void SAL_CALL SwXTextPortion::SetPropertyValues_Impl(
{
const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(pPropertyNames[nProp]);
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
SwUnoCursorHelper::SetPropertyValue( *pUnoCrsr, *m_pPropSet,
pPropertyNames[nProp], pValues[nProp]);
@@ -510,11 +510,11 @@ uno::Sequence< uno::Any > SwXTextPortion::getPropertyValues(
}
catch (beans::UnknownPropertyException &)
{
- throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property exception caught" ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException(OUString( "Unknown property exception caught" ), static_cast < cppu::OWeakObject * > ( this ) );
}
catch (lang::WrappedTargetException &)
{
- throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "WrappedTargetException caught" ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException(OUString( "WrappedTargetException caught" ), static_cast < cppu::OWeakObject * > ( this ) );
}
return aValues;
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index e606b1c00717..52e34cd9afd0 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1586,7 +1586,7 @@ getPrefixAndSuffix(
throw;
} catch (const uno::Exception & e) {
throw lang::WrappedTargetRuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPrefixAndSuffix: exception")),
+ ::rtl::OUString("getPrefixAndSuffix: exception"),
0, uno::makeAny(e));
}
}
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 1467955cd0cb..88e2b3f2e896 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -140,8 +140,8 @@ public:
SwSectionFmt & GetSectionFmtOrThrow() const {
SwSectionFmt *const pFmt( GetSectionFmt() );
if (!pFmt) {
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "SwXTextSection: disposed or invalid")), 0);
+ throw uno::RuntimeException(OUString(
+ "SwXTextSection: disposed or invalid"), 0);
}
return *pFmt;
}
@@ -585,14 +585,14 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ pPropertyNames[nProperty],
static_cast<cppu::OWeakObject *>(& m_rThis));
}
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
{
throw beans::PropertyVetoException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only: "))
+ OUString("Property is read-only: ")
+ pPropertyNames[nProperty],
static_cast<cppu::OWeakObject *>(& m_rThis));
}
@@ -988,7 +988,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ pPropertyNames[nProperty],
static_cast<cppu::OWeakObject *>(& m_rThis));
}
@@ -1291,14 +1291,12 @@ throw (uno::RuntimeException)
}
catch (beans::UnknownPropertyException &)
{
- throw uno::RuntimeException(OUString(
- RTL_CONSTASCII_USTRINGPARAM("Unknown property exception caught")),
+ throw uno::RuntimeException(OUString("Unknown property exception caught"),
static_cast<cppu::OWeakObject *>(this));
}
catch (lang::WrappedTargetException &)
{
- throw uno::RuntimeException(OUString(
- RTL_CONSTASCII_USTRINGPARAM("WrappedTargetException caught")),
+ throw uno::RuntimeException(OUString("WrappedTargetException caught"),
static_cast<cppu::OWeakObject *>(this));
}
@@ -1415,7 +1413,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ pNames[i], static_cast< cppu::OWeakObject* >(this));
}
switch (pEntry->nWID)
@@ -1491,13 +1489,13 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName, static_cast< cppu::OWeakObject* >(this));
}
if (pEntry->nFlags & beans::PropertyAttribute::READONLY)
{
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "setPropertyToDefault: property is read-only: "))
+ throw uno::RuntimeException(OUString(
+ "setPropertyToDefault: property is read-only: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
@@ -1634,7 +1632,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if (!pEntry)
{
throw beans::UnknownPropertyException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown property: "))
+ OUString("Unknown property: ")
+ rPropertyName,
static_cast<cppu::OWeakObject *>(this));
}
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 061fd05814df..48771155d6f5 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -331,7 +331,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
if(pEntry)
{
if ( pEntry->nFlags & PropertyAttribute::READONLY)
- throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
SwFtnInfo aFtnInfo(pDoc->GetFtnInfo());
switch(pEntry->nWID)
{
@@ -437,7 +437,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
pDoc->SetFtnInfo(aFtnInfo);
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
else
throw uno::RuntimeException();
@@ -557,7 +557,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
}
}
else
- throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
else
throw uno::RuntimeException();
@@ -642,7 +642,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
if(pEntry)
{
if ( pEntry->nFlags & PropertyAttribute::READONLY)
- throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
SwEndNoteInfo aEndInfo(pDoc->GetEndNoteInfo());
switch(pEntry->nWID)
{
@@ -705,7 +705,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
pDoc->SetEndNoteInfo(aEndInfo);
}
else
- throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
}
@@ -792,7 +792,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
}
}
else
- throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
return aRet;
}
@@ -874,7 +874,7 @@ void SwXLineNumberingProperties::setPropertyValue(
if(pEntry)
{
if ( pEntry->nFlags & PropertyAttribute::READONLY)
- throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
SwLineNumberInfo aInfo(pDoc->GetLineNumberInfo());
switch(pEntry->nWID)
{
@@ -976,7 +976,7 @@ void SwXLineNumberingProperties::setPropertyValue(
pDoc->SetLineNumberInfo(aInfo);
}
else
- throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
else
throw uno::RuntimeException();
@@ -1079,7 +1079,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName)
}
}
else
- throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
else
throw uno::RuntimeException();
@@ -2510,9 +2510,9 @@ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any&
{
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pEntry)
- throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & PropertyAttribute::READONLY)
- throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
switch(pEntry->nWID)
{
@@ -2585,7 +2585,7 @@ Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName )
{
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pEntry)
- throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
Any aRet;
switch(pEntry->nWID)
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 0c929cb60f35..a57b4d5075af 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -549,7 +549,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
sal_Bool bVal = sal_False;
if(aValue.getValueType() == ::getBooleanCppuType())
bVal = *(sal_Bool*)aValue.getValue();
@@ -570,7 +570,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A
};
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
@@ -606,7 +606,7 @@ SET_UINT16:
};
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
return aRet;
}
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 6bb99d715d93..77303cb6251d 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -996,7 +996,7 @@ uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sProp
}
else
{
- throw beans::UnknownPropertyException( OUString( RTL_CONSTASCII_USTRINGPARAM("unknown property: ") ) + sPropertyName, static_cast<OWeakObject *>(this) );
+ throw beans::UnknownPropertyException( OUString("unknown property: ") + sPropertyName, static_cast<OWeakObject *>(this) );
}
return aRet;
@@ -1262,7 +1262,7 @@ SwXStyle::SwXStyle( SwDoc *pDoc, SfxStyleFamily eFam, sal_Bool bConditional) :
case SFX_STYLE_FAMILY_CHAR:
{
nMapId = PROPERTY_MAP_CHAR_STYLE;
- aAny = xFamilies->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "CharacterStyles" ) ) );
+ aAny = xFamilies->getByName ( OUString( "CharacterStyles" ) );
// Get the Frame family (and keep it for later)
aAny >>= mxStyleFamily;
}
@@ -1270,20 +1270,20 @@ SwXStyle::SwXStyle( SwDoc *pDoc, SfxStyleFamily eFam, sal_Bool bConditional) :
case SFX_STYLE_FAMILY_PARA:
{
nMapId = bIsConditional ? PROPERTY_MAP_CONDITIONAL_PARA_STYLE : PROPERTY_MAP_PARA_STYLE;
- aAny = xFamilies->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "ParagraphStyles" ) ) );
+ aAny = xFamilies->getByName ( OUString( "ParagraphStyles" ) );
// Get the Frame family (and keep it for later)
aAny >>= mxStyleFamily;
- aAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Standard" ) ) );
+ aAny = mxStyleFamily->getByName ( OUString( "Standard" ) );
aAny >>= mxStyleData;
}
break;
case SFX_STYLE_FAMILY_PAGE:
{
nMapId = PROPERTY_MAP_PAGE_STYLE;
- aAny = xFamilies->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "PageStyles" ) ) );
+ aAny = xFamilies->getByName ( OUString( "PageStyles" ) );
// Get the Frame family (and keep it for later)
aAny >>= mxStyleFamily;
- aAny = mxStyleFamily->getByName ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Standard" ) ) );
+ aAny = mxStyleFamily->getByName ( OUString( "Standard" ) );
aAny >>= mxStyleData;
}
break;
@@ -2110,9 +2110,9 @@ void SAL_CALL SwXStyle::SetPropertyValues_Impl(
if(!pEntry ||
(!bIsConditional && pNames[nProp].equalsAsciiL(SW_PROP_NAME(UNO_NAME_PARA_STYLE_CONDITIONS))))
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if(aBaseImpl.mxNewBase.is())
{
lcl_SetStyleProperty(*pEntry, *pPropSet, pValues[nProp], aBaseImpl,
@@ -2198,7 +2198,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
sal_Int8 nBin = 0;
aRet >>= nBin;
if ( nBin == -1 )
- aRet <<= OUString ( RTL_CONSTASCII_USTRINGPARAM ( "[From printer settings]" ) );
+ aRet <<= OUString( "[From printer settings]" );
else
{
SfxPrinter *pPrinter = pDoc->getPrinter( false );
@@ -2378,7 +2378,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl(
const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp]);
if(!pEntry ||
(!bIsConditional && pNames[nProp].equalsAsciiL(SW_PROP_NAME(UNO_NAME_PARA_STYLE_CONDITIONS))))
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if(pBasePool)
{
if(!pBase)
@@ -2431,7 +2431,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl(
if (bExcept )
{
uno::RuntimeException aExcept;
- aExcept.Message = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "No default value for: " ) ) + pNames[nProp];
+ aExcept.Message = OUString( "No default value for: " ) + pNames[nProp];
throw aExcept;
}
}
@@ -2457,11 +2457,11 @@ uno::Sequence< uno::Any > SwXStyle::getPropertyValues(
}
catch (beans::UnknownPropertyException &)
{
- throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property exception caught" ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException(OUString( "Unknown property exception caught" ), static_cast < cppu::OWeakObject * > ( this ) );
}
catch (lang::WrappedTargetException &)
{
- throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "WrappedTargetException caught" ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException(OUString( "WrappedTargetException caught" ), static_cast < cppu::OWeakObject * > ( this ) );
}
return aValues;
@@ -2585,7 +2585,7 @@ uno::Sequence< beans::PropertyState > SwXStyle::getPropertyStates(
const String& rPropName = pNames[i];
const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( rPropName);
if(!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
if( FN_UNO_NUM_RULES == pEntry->nWID ||
FN_UNO_FOLLOW_STYLE == pEntry->nWID )
{
@@ -2706,11 +2706,11 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >&
{
const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp] );
if( !pEntry )
- throw beans::UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is unknown: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException ( OUString( "Property is unknown: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nWID == FN_UNO_FOLLOW_STYLE || pEntry->nWID == FN_UNO_NUM_RULES )
- throw uno::RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Cannot reset: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException ( OUString( "Cannot reset: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY )
- throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "setPropertiesToDefault: property is read-only: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException( OUString( "setPropertiesToDefault: property is read-only: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if( pEntry->nWID == RES_PARATR_OUTLINELEVEL )
static_cast<SwTxtFmtColl*>(pTargetFmt)->DeleteAssignmentToListLevelOfOutlineStyle();
@@ -2869,7 +2869,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::getPropertyDefaults( const uno::Seq
{
const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[i] );
if ( !pEntry )
- throw beans::UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException ( OUString( "Unknown property: " ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) );
if (pEntry->nWID >= RES_UNKNOWNATR_END)
{
@@ -3022,9 +3022,9 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
{
const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp] );
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException ( OUString( "Property is read-only: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if(GetBasePool())
{
@@ -3258,7 +3258,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
{
const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp] );
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if(GetBasePool())
{
@@ -3467,11 +3467,11 @@ uno::Sequence< uno::Any > SwXPageStyle::getPropertyValues(
}
catch (beans::UnknownPropertyException &)
{
- throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property exception caught" ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException(OUString( "Unknown property exception caught" ), static_cast < cppu::OWeakObject * > ( this ) );
}
catch (lang::WrappedTargetException &)
{
- throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "WrappedTargetException caught" ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException(OUString( "WrappedTargetException caught" ), static_cast < cppu::OWeakObject * > ( this ) );
}
return aValues;
@@ -3967,7 +3967,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl(
const String& rPropName = pNames[i];
const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName);
if(!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
else if ( RES_TXTATR_AUTOFMT == pEntry->nWID || RES_AUTO_STYLE == pEntry->nWID )
{
OUString sName(StylePool::nameOf( pSet ));
@@ -3993,11 +3993,11 @@ uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues (
}
catch (beans::UnknownPropertyException &)
{
- throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property exception caught" ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException(OUString( "Unknown property exception caught" ), static_cast < cppu::OWeakObject * > ( this ) );
}
catch (lang::WrappedTargetException &)
{
- throw uno::RuntimeException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "WrappedTargetException caught" ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException(OUString( "WrappedTargetException caught" ), static_cast < cppu::OWeakObject * > ( this ) );
}
return aValues;
@@ -4080,7 +4080,7 @@ uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates(
const String& rPropName = pNames[i];
const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName);
if(!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
pStates[i] = pPropSet->getPropertyState(*pEntry, rSet );
}
return aRet;
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index b0e8b042b171..02eaaaaefd50 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1349,9 +1349,9 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName,
m_pPropSet->getPropertyMap().getByName(rPropertyName);
SwDoc* pDoc = pFmt->GetDoc();
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
switch(pEntry->nWID)
{
@@ -1408,7 +1408,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw(
const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
switch(pEntry->nWID)
{
@@ -1724,7 +1724,7 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal) th
{
SolarMutexGuard aGuard;
if (Count <= 0)
- throw uno::RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal first argument: needs to be > 0" ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException( OUString( "Illegal first argument: needs to be > 0" ), static_cast < cppu::OWeakObject * > ( this ) );
sal_Bool bRet = sal_False;
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
@@ -1772,7 +1772,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName,
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
pTblCrsr->MakeBoxSels();
SwDoc* pDoc = pUnoCrsr->GetDoc();
switch(pEntry->nWID )
@@ -1813,7 +1813,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName,
}
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
}
@@ -1872,7 +1872,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
}
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
return aRet;
}
@@ -2293,7 +2293,7 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex
{
// attachToRange must only be called once
if(!bIsDescriptor) /* already attached ? */
- throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "SwXTextTable: already attached to range." ) ), static_cast < cppu::OWeakObject * > ( this ) );
+ throw uno::RuntimeException( OUString( "SwXTextTable: already attached to range." ), static_cast < cppu::OWeakObject * > ( this ) );
uno::Reference<XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY);
SwXTextRange* pRange = 0;
@@ -3037,7 +3037,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
if(pFmt)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if(0xFF == pEntry->nMemberId)
{
@@ -3279,7 +3279,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be
if(pFmt)
{
if (!pEntry)
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if(0xFF == pEntry->nMemberId)
{
@@ -3860,7 +3860,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
- throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::PropertyVetoException( OUString( "Property is read-only: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
SwDoc* pDoc = pTblCrsr->GetDoc();
{
@@ -3959,7 +3959,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
}
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
}
@@ -4040,7 +4040,7 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( be
}
}
else
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
+ throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
}
return aRet;
}
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 0aafea97bd45..8d3b8c93b76a 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2527,7 +2527,7 @@ throw (uno::RuntimeException)
if (::sw::XTextRangeToSwPaM(aPam, xTextPosition))
{
if ( !aPam.GetNode()->GetTxtNode() )
- throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Invalid text range") ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString("Invalid text range"), uno::Reference< uno::XInterface >() );
SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent();
@@ -2626,8 +2626,8 @@ public:
SwFrmFmt & GetHeadFootFmtOrThrow() {
SwFrmFmt *const pFmt( GetHeadFootFmt() );
if (!pFmt) {
- throw uno::RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
- "SwXHeadFootText: disposed or invalid")), 0);
+ throw uno::RuntimeException(OUString(
+ "SwXHeadFootText: disposed or invalid"), 0);
}
return *pFmt;
}
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 8c062b656c65..0db34bb5748f 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -285,7 +285,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// create a bool option for paper tray
bDefaultVal = rDefaultPrintData.IsPaperFromSetup();
vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt;
- aPaperTrayOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionsPageOptGroup" ) );
+ aPaperTrayOpt.maGroupHint = rtl::OUString( "OptionsPageOptGroup" );
m_aUIProperties[ nIdx++ ].Value = setBoolControlOpt("printpaperfromsetup", aLocalizedStrings.GetString( 11 ),
".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox",
"PrintPaperFromSetup",
@@ -294,7 +294,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// print range selection
vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
- aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) );
+ aPrintRangeOpt.maGroupHint = rtl::OUString( "PrintRange" );
aPrintRangeOpt.mbInternalOnly = sal_True;
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", rtl::OUString(aLocalizedStrings.GetString(26)),
rtl::OUString(),
@@ -308,15 +308,15 @@ SwPrintUIOptions::SwPrintUIOptions(
uno::Sequence< rtl::OUString > aWidgetIds( 3 );
aChoices[0] = aLocalizedStrings.GetString( 27 );
aChoicesDisabled[0] = sal_False;
- aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) );
+ aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" );
aWidgetIds[0] = "printallpages";
aChoices[1] = aLocalizedStrings.GetString( 28 );
aChoicesDisabled[1] = sal_False;
- aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) );
+ aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" );
aWidgetIds[1] = "printpages";
aChoices[2] = aLocalizedStrings.GetString( 29 );
aChoicesDisabled[2] = sal_Bool(! bHasSelection);
- aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ) );
+ aHelpIds[2] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" );
aWidgetIds[2] = "printselection";
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(),
aHelpIds, aPrintRangeName,
@@ -331,7 +331,7 @@ SwPrintUIOptions::SwPrintUIOptions(
aPageRangeOpt);
// print content selection
vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt;
- aContentsOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobPage" ) );
+ aContentsOpt.maGroupHint = rtl::OUString( "JobPage" );
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("extrawriterprintoptions", rtl::OUString(aLocalizedStrings.GetString(12)),
rtl::OUString(), aContentsOpt);
// create a list box for notes content
@@ -342,14 +342,14 @@ SwPrintUIOptions::SwPrintUIOptions(
aChoices[2] = aLocalizedStrings.GetString( 15 );
aChoices[3] = aLocalizedStrings.GetString( 16 );
aHelpIds.realloc( 2 );
- aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" ) );
- aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" ) );
- vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), 0, sal_False );
+ aHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" );
+ aHelpIds[1] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" );
+ vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( rtl::OUString( "PrintProspect" ), 0, sal_False );
aAnnotOpt.mbEnabled = bHasPostIts;
m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments",
aLocalizedStrings.GetString( 17 ),
aHelpIds,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintAnnotationMode" ) ),
+ rtl::OUString( "PrintAnnotationMode" ),
aChoices,
nPrintPostIts,
uno::Sequence< sal_Bool >(),
@@ -357,7 +357,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// create subsection for Page settings
vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt;
- aPageSetOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) );
+ aPageSetOpt.maGroupHint = rtl::OUString( "LayoutPage" );
if (!bWeb)
{
@@ -368,7 +368,7 @@ SwPrintUIOptions::SwPrintUIOptions(
aRLChoices[1] = aLocalizedStrings.GetString( 20 );
aRLChoices[2] = aLocalizedStrings.GetString( 21 );
uno::Sequence< rtl::OUString > aRLHelp( 1 );
- aRLHelp[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" ) );
+ aRLHelp[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox" );
// create a choice option for all/left/right pages
// 0 : all pages (left & right)
// 1 : left pages
@@ -405,8 +405,8 @@ SwPrintUIOptions::SwPrintUIOptions(
aBRTLChoices[1] = aLocalizedStrings.GetString( 25 );
vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, sal_True );
uno::Sequence< rtl::OUString > aBRTLHelpIds( 1 );
- aBRTLHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" ) );
- aBrochureRTLOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) );
+ aBRTLHelpIds[0] = rtl::OUString( ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox" );
+ aBrochureRTLOpt.maGroupHint = rtl::OUString( "LayoutPage" );
// RTL brochure choices
// 0 : left-to-right
// 1 : right-to-left
@@ -414,7 +414,7 @@ SwPrintUIOptions::SwPrintUIOptions(
m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("scriptdirection",
rtl::OUString(),
aBRTLHelpIds,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspectRTL" ) ),
+ rtl::OUString( "PrintProspectRTL" ),
aBRTLChoices,
nBRTLChoice,
uno::Sequence< sal_Bool >(),
@@ -501,7 +501,7 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat( const uno::Sequence< bea
bool bChanged = processProperties( i_rNewProp );
uno::Reference< awt::XDevice > xRenderDevice;
- uno::Any aVal( getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ) ) );
+ uno::Any aVal( getValue( rtl::OUString( "RenderDevice" ) ) );
aVal >>= xRenderDevice;
OutputDevice* pOut = 0;
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 7a477c7bd709..3058f06f45b9 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -135,7 +135,7 @@ sal_Bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < co
try
{
sal_uLong nStgFmtId = SotStorage::GetFormatID( rStg );
- bRet = rStg->isStreamElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")) );
+ bRet = rStg->isStreamElement( ::rtl::OUString("content.xml") );
if ( bRet )
bRet = ( nStgFmtId && ( rFilter.GetFormat() == nStgFmtId ) );
}
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 4c4e8cccf50c..2a8ae2e5c77c 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -137,14 +137,14 @@ void SwApplet_Impl::CreateApplet( const ::rtl::OUString& rCode, const ::rtl::OUS
uno::Reference < beans::XPropertySet > xSet( xApplet->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode")), uno::makeAny( rCode ) );
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletName")), uno::makeAny( rName ) );
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletIsScript")), uno::makeAny( sal_Bool(bMayScript) ) );
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletDocBase")), uno::makeAny( sDocBase ) );
+ xSet->setPropertyValue( ::rtl::OUString("AppletCode"), uno::makeAny( rCode ) );
+ xSet->setPropertyValue( ::rtl::OUString("AppletName"), uno::makeAny( rName ) );
+ xSet->setPropertyValue( ::rtl::OUString("AppletIsScript"), uno::makeAny( sal_Bool(bMayScript) ) );
+ xSet->setPropertyValue( ::rtl::OUString("AppletDocBase"), uno::makeAny( sDocBase ) );
if ( !rCodeBase.isEmpty() )
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")), uno::makeAny( rCodeBase ) );
+ xSet->setPropertyValue( ::rtl::OUString("AppletCodeBase"), uno::makeAny( rCodeBase ) );
else
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")), uno::makeAny( sDocBase ) );
+ xSet->setPropertyValue( ::rtl::OUString("AppletCodeBase"), uno::makeAny( sDocBase ) );
}
}
#ifdef SOLAR_JAVA
@@ -185,7 +185,7 @@ void SwApplet_Impl::FinishApplet()
{
uno::Sequence < beans::PropertyValue > aProps;
aCommandList.FillSequence( aProps );
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands")), uno::makeAny( aProps ) );
+ xSet->setPropertyValue( ::rtl::OUString("AppletCommands"), uno::makeAny( aProps ) );
}
}
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index a167fc8c670d..e68f00782f81 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -114,7 +114,7 @@ void SwHTMLParser::EndScript()
if( aBasicLib.Len() )
aLibName = aBasicLib;
else
- aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
+ aLibName = ::rtl::OUString("Standard");
// get module library container
Reference< script::XLibraryContainer > xModLibContainer( pDocSh->GetBasicContainer(), UNO_QUERY );
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 2973f6144cf4..42e925a754e6 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -476,7 +476,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
uno::Reference< beans::XPropertySet > xFormPropSet( rFormComps, uno::UNO_QUERY );
uno::Any aTmp = xFormPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
+ OUString("Name") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
!((OUString*)aTmp.getValue())->isEmpty() )
{
@@ -488,7 +488,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
}
aTmp = xFormPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) );
+ OUString("TargetURL") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
!((OUString*)aTmp.getValue())->isEmpty() )
{
@@ -501,7 +501,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
}
aTmp = xFormPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitMethod")) );
+ OUString("SubmitMethod") );
if( aTmp.getValueType() == ::getCppuType((const form::FormSubmitMethod*)0) )
{
form::FormSubmitMethod eMethod =
@@ -514,7 +514,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
}
}
aTmp = xFormPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitEncoding")) );
+ OUString("SubmitEncoding") );
if( aTmp.getValueType()==::getCppuType((const form::FormSubmitEncoding*)0) )
{
form::FormSubmitEncoding eEncType =
@@ -540,7 +540,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
}
aTmp = xFormPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")) );
+ OUString("TargetFrame") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&&
!((OUString*)aTmp.getValue())->isEmpty() )
{
@@ -596,7 +596,7 @@ void SwHTMLWriter::OutHiddenControls(
*(uno::Reference< form::XFormComponent > *)aTmp.getValue();
uno::Reference< beans::XPropertySet > xPropSet( xFC, uno::UNO_QUERY );
- OUString sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId"));
+ OUString sPropName = OUString("ClassId");
if( !xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) )
continue;
@@ -615,7 +615,7 @@ void SwHTMLWriter::OutHiddenControls(
.append(OOO_STRING_SVTOOLS_HTML_IT_hidden);
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
+ OUString("Name") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
!((OUString*)aTmp.getValue())->isEmpty() )
{
@@ -627,7 +627,7 @@ void SwHTMLWriter::OutHiddenControls(
sOut.append('\"');
}
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenValue")) );
+ OUString("HiddenValue") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
!((OUString*)aTmp.getValue())->isEmpty() )
{
@@ -753,7 +753,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
rtl::OStringBuffer sOptions;
sal_Bool bEmptyValue = sal_False;
uno::Any aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId")) );
+ OUString("ClassId") );
sal_Int16 nClassId = *(sal_Int16*) aTmp.getValue();
sal_uInt32 nFrmOpts = HTML_FRMOPTS_CONTROL;
switch( nClassId )
@@ -763,7 +763,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
eType = (form::FormComponentType::CHECKBOX == nClassId
? TYPE_CHECKBOX : TYPE_RADIO);
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")) );
+ OUString("DefaultState") );
if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) &&
STATE_NOCHECK != *(sal_Int16*) aTmp.getValue() )
{
@@ -771,7 +771,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")) );
+ OUString("RefValue") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) )
{
@@ -787,7 +787,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
{
form::FormButtonType eButtonType = form::FormButtonType_PUSH;
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonType")) );
+ OUString("ButtonType") );
if( aTmp.getValueType() ==
::getCppuType((const form::FormButtonType*)0) )
eButtonType = *( form::FormButtonType*)aTmp.getValue();
@@ -806,7 +806,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) );
+ OUString("Label") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
!((OUString*)aTmp.getValue())->isEmpty() )
{
@@ -820,7 +820,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
rHTMLWrt.OutNewLine( sal_True );
eTag = TAG_SELECT;
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Dropdown")) );
+ OUString("Dropdown") );
if( aTmp.getValueType() == ::getBooleanCppuType() &&
!*(sal_Bool*)aTmp.getValue() )
{
@@ -835,7 +835,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("MultiSelection")) );
+ OUString("MultiSelection") );
if( aTmp.getValueType() == ::getBooleanCppuType() &&
*(sal_Bool*)aTmp.getValue() )
{
@@ -878,14 +878,14 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("HScroll")) );
+ OUString("HScroll") );
if( aTmp.getValueType() == ::getVoidCppuType() ||
(aTmp.getValueType() == ::getBooleanCppuType() &&
!*(sal_Bool*)aTmp.getValue()) )
{
const sal_Char *pWrapStr = 0;
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("HardLineBreaks")) );
+ OUString("HardLineBreaks") );
pWrapStr =
(aTmp.getValueType() == ::getBooleanCppuType() &&
*(sal_Bool*)aTmp.getValue()) ? OOO_STRING_SVTOOLS_HTML_WW_hard
@@ -913,7 +913,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("MaxTextLen")) );
+ OUString("MaxTextLen") );
if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) &&
*(sal_Int16*) aTmp.getValue() != 0 )
{
@@ -975,7 +975,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
append('=').append(TypeNames[eType]);
}
- aTmp = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
+ aTmp = xPropSet->getPropertyValue( OUString("Name") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
!((OUString*)aTmp.getValue())->isEmpty() )
{
@@ -987,7 +987,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
sOut.append('\"');
}
- aTmp = xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")) );
+ aTmp = xPropSet->getPropertyValue( OUString("Enabled") );
if( aTmp.getValueType() == ::getBooleanCppuType() &&
!*(sal_Bool*)aTmp.getValue() )
{
@@ -1008,7 +1008,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
if( TYPE_IMAGE == eType )
{
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("ImageURL")) );
+ OUString("ImageURL") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
!((OUString*)aTmp.getValue())->isEmpty() )
{
@@ -1050,7 +1050,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
aTmp = xPropSet->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")) );
+ OUString("TabIndex") );
if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) )
{
sal_Int16 nTabIndex = *(sal_Int16*) aTmp.getValue();
@@ -1097,7 +1097,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
aItemSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ) );
}
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor"));
+ sPropName = OUString("TextColor");
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp = xPropSet->getPropertyValue( sPropName );
@@ -1107,7 +1107,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
aItemSet.Put( SvxColorItem( aColor, RES_CHRATR_COLOR ) );
}
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight"));
+ sPropName = OUString("FontHeight");
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp = xPropSet->getPropertyValue( sPropName );
@@ -1119,7 +1119,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
aItemSet.Put( SvxFontHeightItem( sal_Int16(nHeight * 20.), 100, RES_CHRATR_FONTSIZE ) );
}
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontName"));
+ sPropName = OUString("FontName");
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp = xPropSet->getPropertyValue( sPropName );
@@ -1133,7 +1133,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
if( !bEdit || aFName != aFixedFont.GetName() )
{
FontFamily eFamily = FAMILY_DONTKNOW;
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontFamily"));
+ sPropName = OUString("FontFamily");
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp = xPropSet->getPropertyValue( sPropName );
@@ -1145,7 +1145,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer&