[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 27 02:50:31 PST 2012
sw/inc/unomid.h | 3
sw/source/core/unocore/unochart.cxx | 26 ++++----
sw/source/core/unocore/unocoll.cxx | 54 ++++++++--------
sw/source/core/unocore/unodraw.cxx | 20 +++---
sw/source/core/unocore/unofield.cxx | 20 +++---
sw/source/core/unocore/unoframe.cxx | 34 +++++-----
sw/source/core/unocore/unoftn.cxx | 2
sw/source/core/unocore/unoidx.cxx | 102 ++++++++++++++++----------------
sw/source/core/unocore/unoobj.cxx | 18 ++---
sw/source/core/unocore/unoobj2.cxx | 6 -
sw/source/core/unocore/unoparagraph.cxx | 4 -
sw/source/core/unocore/unoport.cxx | 18 ++---
sw/source/core/unocore/unoportenum.cxx | 6 -
sw/source/core/unocore/unoredline.cxx | 10 +--
sw/source/core/unocore/unoredlines.cxx | 4 -
sw/source/core/unocore/unorefmk.cxx | 22 +++---
sw/source/core/unocore/unosect.cxx | 4 -
sw/source/core/unocore/unosett.cxx | 38 +++++------
sw/source/core/unocore/unosrch.cxx | 10 +--
sw/source/core/unocore/unostyle.cxx | 68 ++++++++++-----------
sw/source/core/unocore/unotbl.cxx | 92 ++++++++++++++--------------
sw/source/core/unocore/unotext.cxx | 47 +++++++-------
22 files changed, 302 insertions(+), 306 deletions(-)
New commits:
commit 90649a207822e1fb402599987b1ac3d4705b1330
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Wed Dec 26 22:49:14 2012 +0100
sw: kill no longer needed C2S and C2U macros
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index 62e38c9..d54cea4 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -19,9 +19,6 @@
#ifndef SW_UNOMID_HXX
#define SW_UNOMID_HXX
-#define C2S(cChar) String::CreateFromAscii( cChar )
-#define C2U(cChar) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( cChar ))
-
#define MID_MIRROR_VERT 0
#define MID_MIRROR_HORZ_EVEN_PAGES 1
#define MID_MIRROR_HORZ_ODD_PAGES 2
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index c65ffe9..bfcb647 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1366,25 +1366,25 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
//
aResult.realloc(5);
sal_Int32 nProps = 0;
- aResult[nProps ].Name = C2U("FirstCellAsLabel");
+ aResult[nProps ].Name = "FirstCellAsLabel";
aResult[nProps++].Value <<= bFirstCellIsLabel;
- aResult[nProps ].Name = C2U("CellRangeRepresentation");
+ aResult[nProps ].Name = "CellRangeRepresentation";
aResult[nProps++].Value <<= aSortedCellRanges;
if (!aBrokenCellRangeForExport.isEmpty())
{
- aResult[nProps ].Name = C2U("BrokenCellRangeForExport");
+ aResult[nProps ].Name = "BrokenCellRangeForExport";
aResult[nProps++].Value <<= aBrokenCellRangeForExport;
}
if (nDtaSrcIsColumns == 0 || nDtaSrcIsColumns == 1)
{
chart::ChartDataRowSource eDataRowSource = (nDtaSrcIsColumns == 1) ?
chart::ChartDataRowSource_COLUMNS : chart::ChartDataRowSource_ROWS;
- aResult[nProps ].Name = C2U("DataRowSource");
+ aResult[nProps ].Name = "DataRowSource";
aResult[nProps++].Value <<= eDataRowSource;
if (aSequenceMapping.getLength() != 0)
{
- aResult[nProps ].Name = C2U("SequenceMapping");
+ aResult[nProps ].Name = "SequenceMapping";
aResult[nProps++].Value <<= aSequenceMapping;
}
}
@@ -1505,7 +1505,7 @@ void SAL_CALL SwChartDataProvider::removeEventListener(
OUString SAL_CALL SwChartDataProvider::getImplementationName( )
throw (uno::RuntimeException)
{
- return C2U("SwChartDataProvider");
+ return OUString("SwChartDataProvider");
}
sal_Bool SAL_CALL SwChartDataProvider::supportsService(
@@ -1521,7 +1521,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataProvider::getSupportedServiceNames
{
SolarMutexGuard aGuard;
uno::Sequence< OUString > aRes(1);
- aRes.getArray()[0] = C2U( SN_DATA_PROVIDER );
+ aRes.getArray()[0] = SN_DATA_PROVIDER;
return aRes;
}
@@ -1888,7 +1888,7 @@ OUString SAL_CALL SwChartDataSource::getImplementationName( )
throw (uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return C2U("SwChartDataSource");
+ return OUString("SwChartDataSource");
}
sal_Bool SAL_CALL SwChartDataSource::supportsService(
@@ -1904,7 +1904,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSource::getSupportedServiceNames(
{
SolarMutexGuard aGuard;
uno::Sequence< OUString > aRes(1);
- aRes.getArray()[0] = C2U( SN_DATA_SOURCE );
+ aRes.getArray()[0] = SN_DATA_SOURCE;
return aRes;
}
@@ -2350,7 +2350,7 @@ void SAL_CALL SwChartDataSequence::removeVetoableChangeListener(
OUString SAL_CALL SwChartDataSequence::getImplementationName( )
throw (uno::RuntimeException)
{
- return C2U("SwChartDataSequence");
+ return OUString("SwChartDataSequence");
}
sal_Bool SAL_CALL SwChartDataSequence::supportsService(
@@ -2365,7 +2365,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getSupportedServiceNames
{
SolarMutexGuard aGuard;
uno::Sequence< OUString > aRes(1);
- aRes.getArray()[0] = C2U( SN_DATA_SEQUENCE );
+ aRes.getArray()[0] = SN_DATA_SEQUENCE;
return aRes;
}
@@ -2833,7 +2833,7 @@ uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createCl
OUString SAL_CALL SwChartLabeledDataSequence::getImplementationName( )
throw (uno::RuntimeException)
{
- return C2U("SwChartLabeledDataSequence");
+ return OUString("SwChartLabeledDataSequence");
}
sal_Bool SAL_CALL SwChartLabeledDataSequence::supportsService(
@@ -2848,7 +2848,7 @@ uno::Sequence< OUString > SAL_CALL SwChartLabeledDataSequence::getSupportedServi
{
SolarMutexGuard aGuard;
uno::Sequence< OUString > aRes(1);
- aRes.getArray()[0] = C2U( SN_LABELED_DATA_SEQUENCE );
+ aRes.getArray()[0] = SN_LABELED_DATA_SEQUENCE;
return aRes;
}
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index f51cd39..cdd89ee 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -987,19 +987,19 @@ sal_Bool SwXTextTables::hasElements(void) throw( uno::RuntimeException )
OUString SwXTextTables::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextTables");
+ return OUString("SwXTextTables");
}
sal_Bool SwXTextTables::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- return rServiceName == C2U("com.sun.star.text.TextTables");
+ return rServiceName == "com.sun.star.text.TextTables";
}
uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
OUString* pArr = aRet.getArray();
- pArr[0] = C2U("com.sun.star.text.TextTables");
+ pArr[0] = "com.sun.star.text.TextTables";
return aRet;
}
@@ -1144,19 +1144,19 @@ Any SwXFrameEnumeration<T>::nextElement(void) throw( NoSuchElementException, Wra
template<FlyCntType T>
OUString SwXFrameEnumeration<T>::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXFrameEnumeration");
+ return OUString("SwXFrameEnumeration");
}
template<FlyCntType T>
sal_Bool SwXFrameEnumeration<T>::supportsService(const OUString& ServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.container.XEnumeration") == ServiceName;
+ return ServiceName == "com.sun.star.container.XEnumeration";
}
template<FlyCntType T>
Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames(void) throw( RuntimeException )
{
- return ::comphelper::makeSequence(C2U("com.sun.star.container.XEnumeration"));
+ return ::comphelper::makeSequence(OUString("com.sun.star.container.XEnumeration"));
}
/******************************************************************
@@ -1164,17 +1164,17 @@ Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames(void) thro
******************************************************************/
OUString SwXFrames::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXFrames");
+ return OUString("SwXFrames");
}
sal_Bool SwXFrames::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.TextFrames") == rServiceName;
+ return rServiceName == "com.sun.star.text.TextFrames";
}
Sequence<OUString> SwXFrames::getSupportedServiceNames(void) throw( RuntimeException )
{
- return ::comphelper::makeSequence(C2U("com.sun.star.text.TextFrames"));
+ return ::comphelper::makeSequence(OUString("com.sun.star.text.TextFrames"));
}
SwXFrames::SwXFrames(SwDoc* _pDoc, FlyCntType eSet) :
@@ -1331,19 +1331,19 @@ SwXFrame* SwXFrames::GetObject(SwFrmFmt& rFmt, FlyCntType eType)
******************************************************************/
OUString SwXTextFrames::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXTextFrames");
+ return OUString("SwXTextFrames");
}
sal_Bool SwXTextFrames::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.TextFrames") == rServiceName;
+ return rServiceName == "com.sun.star.text.TextFrames";
}
Sequence< OUString > SwXTextFrames::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextFrames");
+ pArray[0] = "com.sun.star.text.TextFrames";
return aRet;
}
@@ -1361,19 +1361,19 @@ SwXTextFrames::~SwXTextFrames()
******************************************************************/
OUString SwXTextGraphicObjects::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXTextGraphicObjects");
+ return OUString("SwXTextGraphicObjects");
}
sal_Bool SwXTextGraphicObjects::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.TextGraphicObjects") == rServiceName;
+ return rServiceName == "com.sun.star.text.TextGraphicObjects";
}
Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextGraphicObjects");
+ pArray[0] = "com.sun.star.text.TextGraphicObjects";
return aRet;
}
@@ -1391,19 +1391,19 @@ SwXTextGraphicObjects::~SwXTextGraphicObjects()
******************************************************************/
OUString SwXTextEmbeddedObjects::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXTextEmbeddedObjects");
+ return OUString("SwXTextEmbeddedObjects");
}
sal_Bool SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.TextEmbeddedObjects") == rServiceName;
+ return rServiceName == "com.sun.star.text.TextEmbeddedObjects";
}
Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextEmbeddedObjects");
+ pArray[0] = "com.sun.star.text.TextEmbeddedObjects";
return aRet;
}
@@ -1418,19 +1418,19 @@ SwXTextEmbeddedObjects::~SwXTextEmbeddedObjects()
OUString SwXTextSections::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXTextSections");
+ return OUString("SwXTextSections");
}
sal_Bool SwXTextSections::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.TextSections") == rServiceName;
+ return rServiceName == "com.sun.star.text.TextSections";
}
Sequence< OUString > SwXTextSections::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextSections");
+ pArray[0] = "com.sun.star.text.TextSections";
return aRet;
}
@@ -1816,19 +1816,19 @@ sal_Bool SwXNumberingRulesCollection::hasElements(void) throw( uno::RuntimeExcep
OUString SwXFootnotes::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXFootnotes");
+ return OUString("SwXFootnotes");
}
sal_Bool SwXFootnotes::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.Footnotes") == rServiceName;
+ return rServiceName == "com.sun.star.text.Footnotes";
}
Sequence< OUString > SwXFootnotes::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.Footnotes");
+ pArray[0] = "com.sun.star.text.Footnotes";
return aRet;
}
@@ -1915,19 +1915,19 @@ Reference<XFootnote> SwXFootnotes::GetObject( SwDoc& rDoc, const SwFmtFtn& rF
OUString SwXReferenceMarks::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXReferenceMarks");
+ return OUString("SwXReferenceMarks");
}
sal_Bool SwXReferenceMarks::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.ReferenceMarks") == rServiceName;
+ return rServiceName == "com.sun.star.text.ReferenceMarks";
}
Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.ReferenceMarks");
+ pArray[0] = "com.sun.star.text.ReferenceMarks";
return aRet;
}
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index ed1918a..907d2e2 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -427,17 +427,17 @@ uno::Any SwXShapesEnumeration::nextElement(void) throw(container::NoSuchElementE
OUString SwXShapesEnumeration::getImplementationName(void) throw(uno::RuntimeException)
{
- return C2U("SwXShapeEnumeration");
+ return OUString("SwXShapeEnumeration");
}
sal_Bool SwXShapesEnumeration::supportsService(const OUString& ServiceName) throw(uno::RuntimeException)
{
- return C2U("com.sun.star.container.XEnumeration") == ServiceName;
+ return ServiceName == "com.sun.star.container.XEnumeration";
}
uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames(void) throw(uno::RuntimeException)
{
- return ::comphelper::makeSequence(C2U("com.sun.star.container.XEnumeration"));
+ return ::comphelper::makeSequence(OUString("com.sun.star.container.XEnumeration"));
}
/****************************************************************************
@@ -452,19 +452,19 @@ uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration(void) t
rtl::OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXDrawPage");
+ return OUString("SwXDrawPage");
}
sal_Bool SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException )
{
- return C2U("com.sun.star.drawing.GenericDrawPage") == rServiceName;
+ return rServiceName == "com.sun.star.drawing.GenericDrawPage";
}
uno::Sequence< rtl::OUString > SwXDrawPage::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
uno::Sequence< rtl::OUString > aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.drawing.GenericDrawPage");
+ pArray[0] = "com.sun.star.drawing.GenericDrawPage";
return aRet;
}
@@ -587,9 +587,9 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
{
uno::RuntimeException aExcept;
if(pShape)
- aExcept.Message = C2U("object already inserted");
+ aExcept.Message = "object already inserted";
else
- aExcept.Message = C2U("illegal object");
+ aExcept.Message = "illegal object";
throw aExcept;
}
@@ -2127,7 +2127,7 @@ void SwXShape::removeEventListener(
rtl::OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXShape");
+ return OUString("SwXShape");
}
sal_Bool SwXShape::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException )
@@ -2157,7 +2157,7 @@ uno::Sequence< rtl::OUString > SwXShape::getSupportedServiceNames(void) throw( u
else
{
aSeq.realloc(1);
- aSeq.getArray()[0] = C2U("com.sun.star.drawing.Shape");
+ aSeq.getArray()[0] = "com.sun.star.drawing.Shape";
}
return aSeq;
}
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 99f08cf..f4b6145 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -411,7 +411,7 @@ sal_Int64 SAL_CALL SwXFieldMaster::getSomething( const uno::Sequence< sal_Int8 >
OUString SwXFieldMaster::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXFieldMaster");
+ return OUString("SwXFieldMaster");
}
sal_Bool SwXFieldMaster::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -447,7 +447,7 @@ uno::Sequence< OUString > SwXFieldMaster::getSupportedServiceNames(void) throw(
{
uno::Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextFieldMaster");
+ pArray[0] = "com.sun.star.text.TextFieldMaster";
const sal_Char* pEntry1;
switch( nResTypeId )
@@ -2295,7 +2295,7 @@ void SwXTextField::update( ) throw (uno::RuntimeException)
OUString SwXTextField::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextField");
+ return OUString("SwXTextField");
}
static OUString OldNameToNewName_Impl( const OUString &rOld )
@@ -2341,7 +2341,7 @@ uno::Sequence< OUString > SwXTextField::getSupportedServiceNames(void) throw( un
*pArray++ = sServiceName;
if (nLen == 3)
*pArray++ = sServiceNameCC;
- *pArray++ = C2U("com.sun.star.text.TextContent");
+ *pArray++ = "com.sun.star.text.TextContent";
return aRet;
}
@@ -2392,7 +2392,7 @@ const SwField* SwXTextField::GetField() const
******************************************************************/
OUString SwXTextFieldMasters::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextFieldMasters");
+ return OUString("SwXTextFieldMasters");
}
sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -2404,7 +2404,7 @@ uno::Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames(void) th
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextFieldMasters");
+ pArray[0] = "com.sun.star.text.TextFieldMasters";
return aRet;
}
@@ -2610,7 +2610,7 @@ sal_Bool SwXTextFieldMasters::hasElements(void) throw( uno::RuntimeException )
OUString SwXTextFieldTypes::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextFieldTypes");
+ return OUString("SwXTextFieldTypes");
}
sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -2622,7 +2622,7 @@ uno::Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames(void) thro
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextFields");
+ pArray[0] = "com.sun.star.text.TextFields";
return aRet;
}
@@ -2700,7 +2700,7 @@ void SwXTextFieldTypes::removeRefreshListener(const uno::Reference< util::XRefre
******************************************************************/
OUString SwXFieldEnumeration::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXFieldEnumeration");
+ return OUString("SwXFieldEnumeration");
}
sal_Bool SwXFieldEnumeration::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -2712,7 +2712,7 @@ uno::Sequence< OUString > SwXFieldEnumeration::getSupportedServiceNames(void) th
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.FieldEnumeration");
+ pArray[0] = "com.sun.star.text.FieldEnumeration";
return aRet;
}
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 71eb9de..b70bc19 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -725,7 +725,7 @@ TYPEINIT1(SwXFrame, SwClient);
OUString SwXFrame::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXFrame");
+ return OUString("SwXFrame");
}
sal_Bool SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException )
@@ -739,9 +739,9 @@ uno::Sequence< OUString > SwXFrame::getSupportedServiceNames(void) throw( uno::R
{
uno::Sequence< OUString > aRet(3);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.BaseFrame");
- pArray[1] = C2U("com.sun.star.text.TextContent");
- pArray[2] = C2U("com.sun.star.document.LinkTarget");
+ pArray[0] = "com.sun.star.text.BaseFrame";
+ pArray[1] = "com.sun.star.text.TextContent";
+ pArray[2] = "com.sun.star.document.LinkTarget";
return aRet;
}
@@ -1318,7 +1318,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
if(!pFlyFmt || pFlyFmt->Which() == RES_DRAWFRMFMT)
{
lang::IllegalArgumentException aExcept;
- aExcept.Message = C2U("Anchor to frame: no frame found");
+ aExcept.Message = "Anchor to frame: no frame found";
throw aExcept;
}
else
@@ -2406,7 +2406,7 @@ awt::Point SwXFrame::getPosition(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("position cannot be determined with this method");
+ aRuntime.Message = "position cannot be determined with this method";
throw aRuntime;
}
@@ -2414,13 +2414,13 @@ void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeE
{
SolarMutexGuard aGuard;
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("position cannot be changed with this method");
+ aRuntime.Message = "position cannot be changed with this method";
throw aRuntime;
}
awt::Size SwXFrame::getSize(void) throw( uno::RuntimeException )
{
- const ::uno::Any aVal = getPropertyValue(C2U("Size"));
+ const ::uno::Any aVal = getPropertyValue("Size");
awt::Size* pRet = (awt::Size*)aVal.getValue();
return *pRet;
}
@@ -2429,12 +2429,12 @@ void SwXFrame::setSize(const awt::Size& aSize)
throw( beans::PropertyVetoException, uno::RuntimeException )
{
const ::uno::Any aVal(&aSize, ::getCppuType(static_cast<const awt::Size*>(0)));
- setPropertyValue(C2U("Size"), aVal);
+ setPropertyValue("Size", aVal);
}
OUString SwXFrame::getShapeType(void) throw( uno::RuntimeException )
{
- return C2U("FrameShape");
+ return OUString("FrameShape");
}
/******************************************************************
@@ -2674,7 +2674,7 @@ void SwXTextFrame::removeEventListener(const uno::Reference< lang::XEventListene
OUString SwXTextFrame::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextFrame");
+ return OUString("SwXTextFrame");
}
sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -2689,8 +2689,8 @@ uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames(void) throw( un
uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames();
aRet.realloc(aRet.getLength() + 2);
OUString* pArray = aRet.getArray();
- pArray[aRet.getLength() - 2] = C2U("com.sun.star.text.TextFrame");
- pArray[aRet.getLength() - 1] = C2U("com.sun.star.text.Text");
+ pArray[aRet.getLength() - 2] = "com.sun.star.text.TextFrame";
+ pArray[aRet.getLength() - 1] = "com.sun.star.text.Text";
return aRet;
}
@@ -2836,7 +2836,7 @@ void SwXTextGraphicObject::removeEventListener(const uno::Reference< lang::XEven
OUString SwXTextGraphicObject::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextGraphicObject");
+ return OUString("SwXTextGraphicObject");
}
sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -2851,7 +2851,7 @@ uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames(void)
uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames();
aRet.realloc(aRet.getLength() + 1);
OUString* pArray = aRet.getArray();
- pArray[aRet.getLength() - 1] = C2U("com.sun.star.text.TextGraphicObject");
+ pArray[aRet.getLength() - 1] = "com.sun.star.text.TextGraphicObject";
return aRet;
}
@@ -3097,7 +3097,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplaceme
OUString SwXTextEmbeddedObject::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextEmbeddedObject");
+ return OUString("SwXTextEmbeddedObject");
}
sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -3112,7 +3112,7 @@ uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames(void)
uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames();
aRet.realloc(aRet.getLength() + 1);
OUString* pArray = aRet.getArray();
- pArray[aRet.getLength() - 1] = C2U("com.sun.star.text.TextEmbeddedObject");
+ pArray[aRet.getLength() - 1] = "com.sun.star.text.TextEmbeddedObject";
return aRet;
}
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 78c4f30..5252202 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -186,7 +186,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL
SwXFootnote::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXFootnote");
+ return OUString("SwXFootnote");
}
static char const*const g_ServicesFootnote[] =
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 915569c..f857552 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -147,13 +147,13 @@ static void lcl_ConvertTOUNameToProgrammaticName(OUString& rTmp)
if(rTmp.equals(pShellRes->aTOXUserName))
{
- rTmp = OUString(C2U(cUserDefined));
+ rTmp = cUserDefined;
}
// if the version is not English but the alternative index's name is
// "User-Defined" a " (user)" is appended
else if(rTmp.equalsAscii(cUserDefined))
{
- rTmp += C2U(cUserSuffix);
+ rTmp += cUserSuffix;
}
}
@@ -172,7 +172,7 @@ lcl_ConvertTOUNameToUserName(OUString& rTmp)
if (rTmp.matchAsciiL(cUserDefined, sizeof(cUserDefined)) &&
rTmp.matchAsciiL(cUserSuffix, sizeof(cUserSuffix), USER_LEN))
{
- rTmp = C2U(cUserDefined);
+ rTmp = cUserDefined;
}
}
}
@@ -453,7 +453,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL
SwXDocumentIndex::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXDocumentIndex");
+ return OUString("SwXDocumentIndex");
}
sal_Bool SAL_CALL
@@ -462,7 +462,7 @@ throw (uno::RuntimeException)
{
SolarMutexGuard g;
- return C2U("com.sun.star.text.BaseIndex") == rServiceName
+ return rServiceName == "com.sun.star.text.BaseIndex"
|| ((TOX_INDEX == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.DocumentIndex")
|| ((TOX_CONTENT == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.ContentIndex")
|| ((TOX_USER == m_pImpl->m_eTOXType) && rServiceName == "com.sun.star.text.UserDefinedIndex")
@@ -479,30 +479,30 @@ SwXDocumentIndex::getSupportedServiceNames() throw (uno::RuntimeException)
uno::Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.BaseIndex");
+ pArray[0] = "com.sun.star.text.BaseIndex";
switch (m_pImpl->m_eTOXType)
{
case TOX_INDEX:
- pArray[1] = C2U("com.sun.star.text.DocumentIndex");
+ pArray[1] = "com.sun.star.text.DocumentIndex";
break;
case TOX_CONTENT:
- pArray[1] = C2U("com.sun.star.text.ContentIndex");
+ pArray[1] = "com.sun.star.text.ContentIndex";
break;
case TOX_TABLES:
- pArray[1] = C2U("com.sun.star.text.TableIndex");
+ pArray[1] = "com.sun.star.text.TableIndex";
break;
case TOX_ILLUSTRATIONS:
- pArray[1] = C2U("com.sun.star.text.IllustrationsIndex");
+ pArray[1] = "com.sun.star.text.IllustrationsIndex";
break;
case TOX_OBJECTS:
- pArray[1] = C2U("com.sun.star.text.ObjectIndex");
+ pArray[1] = "com.sun.star.text.ObjectIndex";
break;
case TOX_AUTHORITIES:
- pArray[1] = C2U("com.sun.star.text.Bibliography");
+ pArray[1] = "com.sun.star.text.Bibliography";
break;
//case TOX_USER:
default:
- pArray[1] = C2U("com.sun.star.text.UserDefinedIndex");
+ pArray[1] = "com.sun.star.text.UserDefinedIndex";
}
return aRet;
}
@@ -1669,7 +1669,7 @@ static const sal_Char cTextContent[] = "com.sun.star.text.TextContent";
OUString SAL_CALL
SwXDocumentIndexMark::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXDocumentIndexMark");
+ return OUString("SwXDocumentIndexMark");
}
sal_Bool SAL_CALL
@@ -1698,19 +1698,19 @@ SwXDocumentIndexMark::getSupportedServiceNames() throw (uno::RuntimeException)
const sal_Int32 nCnt = (m_pImpl->m_eTOXType == TOX_INDEX) ? 4 : 3;
uno::Sequence< OUString > aRet(nCnt);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U(cBaseMark);
- pArray[1] = C2U(cTextContent);
+ pArray[0] = cBaseMark;
+ pArray[1] = cTextContent;
switch (m_pImpl->m_eTOXType)
{
case TOX_USER:
- pArray[2] = C2U(cUserMark);
+ pArray[2] = cUserMark;
break;
case TOX_CONTENT:
- pArray[2] = C2U(cContentMark);
+ pArray[2] = cContentMark;
break;
case TOX_INDEX:
- pArray[2] = C2U(cIdxMark);
- pArray[3] = C2U(cIdxMarkAsian);
+ pArray[2] = cIdxMark;
+ pArray[3] = cIdxMarkAsian;
break;
default:
@@ -2375,7 +2375,7 @@ SwXDocumentIndexes::~SwXDocumentIndexes()
OUString SAL_CALL
SwXDocumentIndexes::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXDocumentIndexes");
+ return OUString("SwXDocumentIndexes");
}
static char const*const g_ServicesDocumentIndexes[] =
@@ -2577,7 +2577,7 @@ OUString SAL_CALL
SwXDocumentIndex::StyleAccess_Impl::getImplementationName()
throw (uno::RuntimeException)
{
- return C2U("SwXDocumentIndex::StyleAccess_Impl");
+ return OUString("SwXDocumentIndex::StyleAccess_Impl");
}
static char const*const g_ServicesIndexStyleAccess[] =
@@ -2711,7 +2711,7 @@ OUString SAL_CALL
SwXDocumentIndex::TokenAccess_Impl::getImplementationName()
throw (uno::RuntimeException)
{
- return C2U("SwXDocumentIndex::TokenAccess_Impl");
+ return OUString("SwXDocumentIndex::TokenAccess_Impl");
}
static char const*const g_ServicesIndexTokenAccess[] =
@@ -2893,7 +2893,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
if(nType < 0 || nType > text::BibliographyDataField::ISBN)
{
lang::IllegalArgumentException aExcept;
- aExcept.Message = C2U("BibliographyDataField - wrong value");
+ aExcept.Message = "BibliographyDataField - wrong value";
aExcept.ArgumentPosition = static_cast< sal_Int16 >(j);
throw aExcept;
}
@@ -3009,15 +3009,15 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
- pArr[nCurrentElement].Name = C2U("TokenType");
+ pArr[nCurrentElement].Name = "TokenType";
pArr[nCurrentElement++].Value <<=
OUString(RTL_CONSTASCII_USTRINGPARAM("TokenEntryNumber"));
- pArr[nCurrentElement].Name = C2U("CharacterStyleName");
+ pArr[nCurrentElement].Name = "CharacterStyleName";
pArr[nCurrentElement++].Value <<= aProgCharStyle;
if( aToken.nChapterFormat != CF_NUMBER )
{
- pArr[nCurrentElement].Name = C2U("ChapterFormat");
+ pArr[nCurrentElement].Name = "ChapterFormat";
sal_Int16 nVal;
// the allowed values for chapter format, when used as entry number,
// are CF_NUMBER and CF_NUM_NOPREPST_TITLE only, all else forced to
@@ -3038,7 +3038,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
// only a ChapterLevel != MAXLEVEL is registered
if (aToken.nOutlineLevel != MAXLEVEL)
{
- pArr[nCurrentElement].Name = C2U("ChapterLevel");
+ pArr[nCurrentElement].Name = "ChapterLevel";
pArr[nCurrentElement].Value <<= aToken.nOutlineLevel;
}
}
@@ -3049,10 +3049,10 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
rCurTokenSeq.realloc( 2 );
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
- pArr[0].Name = C2U("TokenType");
+ pArr[0].Name = "TokenType";
pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenEntryText"));
- pArr[1].Name = C2U("CharacterStyleName");
+ pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
}
break;
@@ -3061,29 +3061,29 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
rCurTokenSeq.realloc(5); // #i21237#
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
- pArr[0].Name = C2U("TokenType");
+ pArr[0].Name = "TokenType";
pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenTabStop"));
if(SVX_TAB_ADJUST_END == aToken.eTabAlign)
{
- pArr[1].Name = C2U("TabStopRightAligned");
+ pArr[1].Name = "TabStopRightAligned";
sal_Bool bTemp = sal_True;
pArr[1].Value.setValue(&bTemp, ::getCppuBooleanType());
}
else
{
- pArr[1].Name = C2U("TabStopPosition");
+ pArr[1].Name = "TabStopPosition";
sal_Int32 nPos = (TWIP_TO_MM100(aToken.nTabStopPosition));
if(nPos < 0)
nPos = 0;
pArr[1].Value <<= (sal_Int32)nPos;
}
- pArr[2].Name = C2U("TabStopFillCharacter");
+ pArr[2].Name = "TabStopFillCharacter";
pArr[2].Value <<= OUString(aToken.cTabFillChar);
- pArr[3].Name = C2U("CharacterStyleName");
+ pArr[3].Name = "CharacterStyleName";
pArr[3].Value <<= aProgCharStyle;
// #i21237#
- pArr[4].Name = C2U("WithTab");
+ pArr[4].Name = "WithTab";
pArr[4].Value <<= static_cast<sal_Bool>(aToken.bWithTab);
}
break;
@@ -3092,13 +3092,13 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
rCurTokenSeq.realloc( 3 );
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
- pArr[0].Name = C2U("TokenType");
+ pArr[0].Name = "TokenType";
pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenText"));
- pArr[1].Name = C2U("CharacterStyleName");
+ pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
- pArr[2].Name = C2U("Text");
+ pArr[2].Name = "Text";
pArr[2].Value <<= OUString(aToken.sText);
}
break;
@@ -3107,10 +3107,10 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
rCurTokenSeq.realloc( 2 );
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
- pArr[0].Name = C2U("TokenType");
+ pArr[0].Name = "TokenType";
pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenPageNumber"));
- pArr[1].Name = C2U("CharacterStyleName");
+ pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
}
break;
@@ -3119,13 +3119,13 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
rCurTokenSeq.realloc( 4 );
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
- pArr[0].Name = C2U("TokenType");
+ pArr[0].Name = "TokenType";
pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenChapterInfo"));
- pArr[1].Name = C2U("CharacterStyleName");
+ pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
- pArr[2].Name = C2U("ChapterFormat");
+ pArr[2].Name = "ChapterFormat";
sal_Int16 nVal = text::ChapterFormat::NUMBER;
switch(aToken.nChapterFormat)
{
@@ -3147,7 +3147,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
}
pArr[2].Value <<= nVal;
// #i53420#
- pArr[3].Name = C2U("ChapterLevel");
+ pArr[3].Name = "ChapterLevel";
pArr[3].Value <<= aToken.nOutlineLevel;
}
break;
@@ -3156,10 +3156,10 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
rCurTokenSeq.realloc( 2 );
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
- pArr[0].Name = C2U("TokenType");
+ pArr[0].Name = "TokenType";
pArr[0].Value <<=
OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkStart"));
- pArr[1].Name = C2U("CharacterStyleName");
+ pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
}
break;
@@ -3168,7 +3168,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
rCurTokenSeq.realloc( 1 );
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
- pArr[0].Name = C2U("TokenType");
+ pArr[0].Name = "TokenType";
pArr[0].Value <<=
OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkEnd"));
}
@@ -3178,14 +3178,14 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
rCurTokenSeq.realloc( 3 );
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
- pArr[0].Name = C2U("TokenType");
+ pArr[0].Name = "TokenType";
pArr[0].Value <<=
OUString(RTL_CONSTASCII_USTRINGPARAM("TokenBibliographyDataField"));
- pArr[1].Name = C2U("CharacterStyleName");
+ pArr[1].Name = "CharacterStyleName";
pArr[1].Value <<= aProgCharStyle;
- pArr[2].Name = C2U("BibliographyDataField");
+ pArr[2].Name = "BibliographyDataField";
pArr[2].Value <<= sal_Int16(aToken.nAuthorityField);
}
break;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 371e8fb..01318bb 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -939,7 +939,7 @@ bool SwXTextCursor::IsAtEndOfMeta() const
OUString SwXTextCursor::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXTextCursor");
+ return OUString("SwXTextCursor");
}
static char const*const g_ServicesTextCursor[] =
@@ -1243,7 +1243,7 @@ throw (uno::RuntimeException)
if (!bNotForced)
{
throw uno::RuntimeException(
- C2U("gotoRange: parameter range not contained in nesting"
+ OUString("gotoRange: parameter range not contained in nesting"
" text content for which this cursor was created"),
static_cast<text::XWordCursor*>(this));
}
@@ -2491,19 +2491,19 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable)
uno::Any aVal;
aVal.setValue( &bFromTable, ::getCppuBooleanType());
- pArray[0] = beans::PropertyValue(C2U("IsSortInTable"), -1, aVal,
+ pArray[0] = beans::PropertyValue("IsSortInTable", -1, aVal,
beans::PropertyState_DIRECT_VALUE);
aVal <<= sal_Unicode(' ');
- pArray[1] = beans::PropertyValue(C2U("Delimiter"), -1, aVal,
+ pArray[1] = beans::PropertyValue("Delimiter", -1, aVal,
beans::PropertyState_DIRECT_VALUE);
aVal <<= (sal_Bool) sal_False;
- pArray[2] = beans::PropertyValue(C2U("IsSortColumns"), -1, aVal,
+ pArray[2] = beans::PropertyValue("IsSortColumns", -1, aVal,
beans::PropertyState_DIRECT_VALUE);
aVal <<= (sal_Int32) 3;
- pArray[3] = beans::PropertyValue(C2U("MaxSortFieldsCount"), -1, aVal,
+ pArray[3] = beans::PropertyValue("MaxSortFieldsCount", -1, aVal,
beans::PropertyState_DIRECT_VALUE);
uno::Sequence< table::TableSortField > aFields(3);
@@ -2548,7 +2548,7 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable)
pFields[2].CollatorAlgorithm = aCollAlg;
aVal <<= aFields;
- pArray[4] = beans::PropertyValue(C2U("SortFields"), -1, aVal,
+ pArray[4] = beans::PropertyValue("SortFields", -1, aVal,
beans::PropertyState_DIRECT_VALUE);
return aRet;
@@ -2701,7 +2701,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
bRet = sal_False;
}
}
- else if (0 == rPropName.indexOf(C2U("IsSortNumeric")) &&
+ else if (0 == rPropName.indexOf("IsSortNumeric") &&
rPropName.getLength() == 14 &&
(rPropName.getStr()[13] >= '0' && rPropName.getStr()[13] <= '9'))
{
@@ -2718,7 +2718,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
bRet = sal_False;
}
}
- else if (0 == rPropName.indexOf(C2U("IsSortAscending")) &&
+ else if (0 == rPropName.indexOf("IsSortAscending") &&
rPropName.getLength() == 16 &&
(rPropName.getStr()[15] >= '0' && rPropName.getStr()[15] <= '9'))
{
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 2f57992..043f0cf 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -530,7 +530,7 @@ SwXParagraphEnumeration::~SwXParagraphEnumeration()
OUString SAL_CALL
SwXParagraphEnumeration::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXParagraphEnumeration");
+ return OUString("SwXParagraphEnumeration");
}
static char const*const g_ServicesParagraphEnum[] =
@@ -1645,7 +1645,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL
SwXTextRanges::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXTextRanges");
+ return OUString("SwXTextRanges");
}
static char const*const g_ServicesTextRanges[] =
@@ -1942,7 +1942,7 @@ throw (container::NoSuchElementException,
OUString SAL_CALL
SwXParaFrameEnumeration::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXParaFrameEnumeration");
+ return OUString("SwXParaFrameEnumeration");
}
static char const*const g_ServicesParaFrameEnum[] =
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index fd6762a..5ca68f9 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -278,7 +278,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL
SwXParagraph::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXParagraph");
+ return OUString("SwXParagraph");
}
static char const*const g_ServicesParagraph[] =
@@ -1291,7 +1291,7 @@ SwXParagraph::getAvailableServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextContent");
+ pArray[0] = "com.sun.star.text.TextContent";
return aRet;
}
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 21275ea..75f7a3e 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -906,14 +906,14 @@ throw( uno::RuntimeException )
SolarMutexGuard aGuard;
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextContent");
+ pArray[0] = "com.sun.star.text.TextContent";
return aRet;
}
OUString SwXTextPortion::getImplementationName()
throw( uno::RuntimeException )
{
- return C2U("SwXTextPortion");
+ return OUString("SwXTextPortion");
}
sal_Bool SwXTextPortion::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -948,13 +948,13 @@ throw( uno::RuntimeException )
uno::Sequence< OUString > aRet(7);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextPortion");
- pArray[1] = C2U("com.sun.star.style.CharacterProperties");
- pArray[2] = C2U("com.sun.star.style.CharacterPropertiesAsian");
- pArray[3] = C2U("com.sun.star.style.CharacterPropertiesComplex");
- pArray[4] = C2U("com.sun.star.style.ParagraphProperties");
- pArray[5] = C2U("com.sun.star.style.ParagraphPropertiesAsian");
- pArray[6] = C2U("com.sun.star.style.ParagraphPropertiesComplex");
+ pArray[0] = "com.sun.star.text.TextPortion";
+ pArray[1] = "com.sun.star.style.CharacterProperties";
+ pArray[2] = "com.sun.star.style.CharacterPropertiesAsian";
+ pArray[3] = "com.sun.star.style.CharacterPropertiesComplex";
+ pArray[4] = "com.sun.star.style.ParagraphProperties";
+ pArray[5] = "com.sun.star.style.ParagraphPropertiesAsian";
+ pArray[6] = "com.sun.star.style.ParagraphPropertiesComplex";
return aRet;
}
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 6849d03..8794d5c 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -219,14 +219,14 @@ throw(uno::RuntimeException)
OUString SwXTextPortionEnumeration::getImplementationName()
throw( RuntimeException )
{
- return C2U("SwXTextPortionEnumeration");
+ return OUString("SwXTextPortionEnumeration");
}
sal_Bool
SwXTextPortionEnumeration::supportsService(const OUString& rServiceName)
throw( RuntimeException )
{
- return C2U("com.sun.star.text.TextPortionEnumeration") == rServiceName;
+ return rServiceName == "com.sun.star.text.TextPortionEnumeration";
}
Sequence< OUString > SwXTextPortionEnumeration::getSupportedServiceNames()
@@ -234,7 +234,7 @@ throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextPortionEnumeration");
+ pArray[0] = "com.sun.star.text.TextPortionEnumeration";
return aRet;
}
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 814d0a8..6fe227d 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -213,11 +213,11 @@ static OUString lcl_RedlineTypeToOUString(RedlineType_t eType)
OUString sRet;
switch(eType & nsRedlineType_t::REDLINE_NO_FLAG_MASK)
{
- case nsRedlineType_t::REDLINE_INSERT: sRet = C2U("Insert"); break;
- case nsRedlineType_t::REDLINE_DELETE: sRet = C2U("Delete"); break;
- case nsRedlineType_t::REDLINE_FORMAT: sRet = C2U("Format"); break;
- case nsRedlineType_t::REDLINE_TABLE: sRet = C2U("TextTable"); break;
- case nsRedlineType_t::REDLINE_FMTCOLL:sRet = C2U("Style"); break;
+ case nsRedlineType_t::REDLINE_INSERT: sRet = "Insert"; break;
+ case nsRedlineType_t::REDLINE_DELETE: sRet = "Delete"; break;
+ case nsRedlineType_t::REDLINE_FORMAT: sRet = "Format"; break;
+ case nsRedlineType_t::REDLINE_TABLE: sRet = "TextTable"; break;
+ case nsRedlineType_t::REDLINE_FMTCOLL:sRet = "Style"; break;
}
return sRet;
}
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index da656a2..116f0ae 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -97,7 +97,7 @@ sal_Bool SwXRedlines::hasElements( ) throw(uno::RuntimeException)
OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXRedlines");
+ return OUString("SwXRedlines");
}
sal_Bool SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/)
@@ -164,7 +164,7 @@ uno::Any SwXRedlineEnumeration::nextElement(void)
rtl::OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXRedlineEnumeration");
+ return OUString("SwXRedlineEnumeration");
}
sal_Bool SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException )
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 3dedfdd..84d0ca3 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -163,7 +163,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL SwXReferenceMark::getImplementationName()
throw (uno::RuntimeException)
{
- return C2U("SwXReferenceMark");
+ return OUString("SwXReferenceMark");
}
static char const*const g_ServicesReferenceMark[] =
@@ -835,8 +835,8 @@ bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
if (&pStartPos->nNode.GetNode() != pTxtNode)
{
throw lang::IllegalArgumentException(
- C2U("trying to insert into a nesting text content, but start "
- "of text range not in same paragraph as text content"),
+ "trying to insert into a nesting text content, but start "
+ "of text range not in same paragraph as text content",
0, 0);
}
bool bForceExpandHints(false);
@@ -846,8 +846,8 @@ bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
if ((nStartPos < nMetaStart) || (nStartPos > nMetaEnd))
{
throw lang::IllegalArgumentException(
- C2U("trying to insert into a nesting text content, but start "
- "of text range not inside text content"),
+ "trying to insert into a nesting text content, but start "
+ "of text range not inside text content",
0, 0);
}
else if (nStartPos == nMetaEnd)
@@ -860,8 +860,8 @@ bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
if (&pEndPos->nNode.GetNode() != pTxtNode)
{
throw lang::IllegalArgumentException(
- C2U("trying to insert into a nesting text content, but end "
- "of text range not in same paragraph as text content"),
+ "trying to insert into a nesting text content, but end "
+ "of text range not in same paragraph as text content",
0, 0);
}
const xub_StrLen nEndPos(pEndPos->nContent.GetIndex());
@@ -870,8 +870,8 @@ bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
if ((nEndPos < nMetaStart) || (nEndPos > nMetaEnd))
{
throw lang::IllegalArgumentException(
- C2U("trying to insert into a nesting text content, but end "
- "of text range not inside text content"),
+ "trying to insert into a nesting text content, but end "
+ "of text range not inside text content",
0, 0);
}
else if (nEndPos == nMetaEnd)
@@ -904,7 +904,7 @@ throw (uno::RuntimeException)
::rtl::OUString SAL_CALL
SwXMeta::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXMeta");
+ return OUString("SwXMeta");
}
static char const*const g_ServicesMeta[] =
@@ -1341,7 +1341,7 @@ SwXMetaField::~SwXMetaField()
::rtl::OUString SAL_CALL
SwXMetaField::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXMetaField");
+ return OUString("SwXMetaField");
}
static char const*const g_ServicesMetaField[] =
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 89163d4..9d9eece 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -292,7 +292,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (m_pImpl->m_sName.isEmpty())
{
- m_pImpl->m_sName = C2U("TextSection");
+ m_pImpl->m_sName = "TextSection";
}
SectionType eType = (m_pImpl->m_pProps->m_bDDE)
? DDE_LINK_SECTION
@@ -1761,7 +1761,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL
SwXTextSection::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXTextSection");
+ return OUString("SwXTextSection");
}
static char const*const g_ServicesTextSection[] =
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 9533ffe..55b2d45 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -289,19 +289,19 @@ const unsigned short aUnoToSvxAdjust[] =
******************************************************************/
OUString SwXFootnoteProperties::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXFootnoteProperties");
+ return OUString("SwXFootnoteProperties");
}
sal_Bool SwXFootnoteProperties::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.FootnoteSettings") == rServiceName;
+ return rServiceName == "com.sun.star.text.FootnoteSettings";
}
Sequence< OUString > SwXFootnoteProperties::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.FootnoteSettings");
+ pArray[0] = "com.sun.star.text.FootnoteSettings";
return aRet;
}
@@ -599,19 +599,19 @@ void SwXFootnoteProperties::removeVetoableChangeListener(
******************************************************************/
OUString SwXEndnoteProperties::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXEndnoteProperties");
+ return OUString("SwXEndnoteProperties");
}
sal_Bool SwXEndnoteProperties::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.FootnoteSettings") == rServiceName;
+ return rServiceName == "com.sun.star.text.FootnoteSettings";
}
Sequence< OUString > SwXEndnoteProperties::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.FootnoteSettings");
+ pArray[0] = "com.sun.star.text.FootnoteSettings";
return aRet;
}
@@ -830,19 +830,19 @@ void SwXEndnoteProperties::removeVetoableChangeListener(const OUString& /*Proper
******************************************************************/
OUString SwXLineNumberingProperties::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXLineNumberingProperties");
+ return OUString("SwXLineNumberingProperties");
}
sal_Bool SwXLineNumberingProperties::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.LineNumberingProperties") == rServiceName;
+ return rServiceName == "com.sun.star.text.LineNumberingProperties";
}
Sequence< OUString > SwXLineNumberingProperties::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.LineNumberingProperties");
+ pArray[0] = "com.sun.star.text.LineNumberingProperties";
return aRet;
}
@@ -1143,19 +1143,19 @@ sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId
OUString SwXNumberingRules::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXNumberingRules");
+ return OUString("SwXNumberingRules");
}
sal_Bool SwXNumberingRules::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.NumberingRules") == rServiceName;
+ return rServiceName == "com.sun.star.text.NumberingRules";
}
Sequence< OUString > SwXNumberingRules::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.NumberingRules");
+ pArray[0] = "com.sun.star.text.NumberingRules";
return aRet;
}
@@ -2312,7 +2312,7 @@ OUString SwXNumberingRules::getName() throw( RuntimeException )
void SwXNumberingRules::setName(const OUString& /*rName*/) throw( RuntimeException )
{
RuntimeException aExcept;
- aExcept.Message = C2U("readonly");
+ aExcept.Message = "readonly";
throw aExcept;
}
@@ -2330,7 +2330,7 @@ void SwXNumberingRules::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew
OUString SwXChapterNumbering::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXChapterNumbering");
+ return OUString("SwXChapterNumbering");
}
sal_Bool SwXChapterNumbering::supportsService(const OUString& rServiceName) throw( RuntimeException )
@@ -2344,8 +2344,8 @@ Sequence< OUString > SwXChapterNumbering::getSupportedServiceNames(void) throw(
{
Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.ChapterNumbering");
- pArray[1] = C2U("com.sun.star.text.NumberingRules");
+ pArray[0] = "com.sun.star.text.ChapterNumbering";
+ pArray[1] = "com.sun.star.text.NumberingRules";
return aRet;
}
@@ -2363,19 +2363,19 @@ SwXChapterNumbering::~SwXChapterNumbering()
******************************************************************/
OUString SwXTextColumns::getImplementationName(void) throw( RuntimeException )
{
- return C2U("SwXTextColumns");
+ return OUString("SwXTextColumns");
}
sal_Bool SwXTextColumns::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return C2U("com.sun.star.text.TextColumns") == rServiceName;
+ return rServiceName == "com.sun.star.text.TextColumns";
}
Sequence< OUString > SwXTextColumns::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextColumns");
+ pArray[0] = "com.sun.star.text.TextColumns";
return aRet;
}
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index f7e1fd2..88824db 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -687,21 +687,21 @@ sal_Bool SwXTextSearch::HasReplaceAttributes() const
OUString SwXTextSearch::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextSearch");
+ return OUString("SwXTextSearch");
}
sal_Bool SwXTextSearch::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- return C2U("com.sun.star.util.SearchDescriptor") == rServiceName ||
- C2U("com.sun.star.util.ReplaceDescriptor") == rServiceName;
+ return rServiceName == "com.sun.star.util.SearchDescriptor" ||
+ rServiceName == "com.sun.star.util.ReplaceDescriptor";
}
uno::Sequence< OUString > SwXTextSearch::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.util.SearchDescriptor");
- pArray[1] = C2U("com.sun.star.util.ReplaceDescriptor");
+ pArray[0] = "com.sun.star.util.SearchDescriptor";
+ pArray[1] = "com.sun.star.util.ReplaceDescriptor";
return aRet;
}
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index a1995e4..71e7d72 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -188,19 +188,19 @@ public:
******************************************************************/
OUString SwXStyleFamilies::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXStyleFamilies");
+ return OUString("SwXStyleFamilies");
}
sal_Bool SwXStyleFamilies::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- return C2U("com.sun.star.style.StyleFamilies") == rServiceName;
+ return rServiceName == "com.sun.star.style.StyleFamilies";
}
uno::Sequence< OUString > SwXStyleFamilies::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.style.StyleFamilies");
+ pArray[0] = "com.sun.star.style.StyleFamilies";
return aRet;
}
@@ -255,11 +255,11 @@ uno::Sequence< OUString > SwXStyleFamilies::getElementNames(void) throw( uno::Ru
{
uno::Sequence< OUString > aNames(STYLE_FAMILY_COUNT);
OUString* pNames = aNames.getArray();
- pNames[0] = C2U("CharacterStyles");
- pNames[1] = C2U("ParagraphStyles");
- pNames[2] = C2U("FrameStyles");
- pNames[3] = C2U("PageStyles");
- pNames[4] = C2U("NumberingStyles");
+ pNames[0] = "CharacterStyles";
+ pNames[1] = "ParagraphStyles";
+ pNames[2] = "FrameStyles";
+ pNames[3] = "PageStyles";
+ pNames[4] = "NumberingStyles";
return aNames;
}
@@ -437,19 +437,19 @@ uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions(vo
******************************************************************/
OUString SwXStyleFamily::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXStyleFamily");
+ return OUString("SwXStyleFamily");
}
sal_Bool SwXStyleFamily::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- return C2U("com.sun.star.style.StyleFamily") == rServiceName;
+ return rServiceName == "com.sun.star.style.StyleFamily";
}
uno::Sequence< OUString > SwXStyleFamily::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.style.StyleFamily");
+ pArray[0] = "com.sun.star.style.StyleFamily";
return aRet;
}
@@ -1187,25 +1187,25 @@ TYPEINIT1(SwXStyle, SfxListener);
OUString SwXStyle::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXStyle");
+ return OUString("SwXStyle");
}
sal_Bool SwXStyle::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- sal_Bool bRet = C2U("com.sun.star.style.Style") == rServiceName;
+ sal_Bool bRet = rServiceName == "com.sun.star.style.Style";
if(!bRet && SFX_STYLE_FAMILY_CHAR == eFamily)
bRet = !rServiceName.compareToAscii("com.sun.star.style.CharacterStyle")||
!rServiceName.compareToAscii("com.sun.star.style.CharacterProperties")||
!rServiceName.compareToAscii("com.sun.star.style.CharacterPropertiesAsian")||
!rServiceName.compareToAscii("com.sun.star.style.CharacterPropertiesComplex");
if(!bRet && SFX_STYLE_FAMILY_PARA == eFamily)
- bRet = (C2U("com.sun.star.style.ParagraphStyle") == rServiceName)||
- (C2U("com.sun.star.style.ParagraphProperties") == rServiceName) ||
- (C2U("com.sun.star.style.ParagraphPropertiesAsian") == rServiceName) ||
- (C2U("com.sun.star.style.ParagraphPropertiesComplex") == rServiceName);
+ bRet = (rServiceName == "com.sun.star.style.ParagraphStyle")||
+ (rServiceName == "com.sun.star.style.ParagraphProperties") ||
+ (rServiceName == "com.sun.star.style.ParagraphPropertiesAsian") ||
+ (rServiceName == "com.sun.star.style.ParagraphPropertiesComplex");
if(!bRet && SFX_STYLE_FAMILY_PAGE == eFamily)
- bRet = (C2U("com.sun.star.style.PageStyle") == rServiceName)||
- (C2U("com.sun.star.style.PageProperties") == rServiceName);
+ bRet = (rServiceName == "com.sun.star.style.PageStyle")||
+ (rServiceName == "com.sun.star.style.PageProperties");
return bRet;
}
@@ -1225,26 +1225,26 @@ uno::Sequence< OUString > SwXStyle::getSupportedServiceNames(void) throw( uno::R
nCount = 3;
uno::Sequence< OUString > aRet(nCount);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.style.Style");
+ pArray[0] = "com.sun.star.style.Style";
switch(eFamily)
{
case SFX_STYLE_FAMILY_CHAR:
- pArray[1] = C2U("com.sun.star.style.CharacterStyle");
- pArray[2] = C2U("com.sun.star.style.CharacterProperties");
- pArray[3] = C2U("com.sun.star.style.CharacterPropertiesAsian");
- pArray[4] = C2U("com.sun.star.style.CharacterPropertiesComplex");
+ pArray[1] = "com.sun.star.style.CharacterStyle";
+ pArray[2] = "com.sun.star.style.CharacterProperties";
+ pArray[3] = "com.sun.star.style.CharacterPropertiesAsian";
+ pArray[4] = "com.sun.star.style.CharacterPropertiesComplex";
break;
case SFX_STYLE_FAMILY_PAGE:
- pArray[1] = C2U("com.sun.star.style.PageStyle");
- pArray[2] = C2U("com.sun.star.style.PageProperties");
+ pArray[1] = "com.sun.star.style.PageStyle";
+ pArray[2] = "com.sun.star.style.PageProperties";
break;
case SFX_STYLE_FAMILY_PARA:
- pArray[1] = C2U("com.sun.star.style.ParagraphStyle");
- pArray[2] = C2U("com.sun.star.style.ParagraphProperties");
- pArray[3] = C2U("com.sun.star.style.ParagraphPropertiesAsian");
- pArray[4] = C2U("com.sun.star.style.ParagraphPropertiesComplex");
+ pArray[1] = "com.sun.star.style.ParagraphStyle";
+ pArray[2] = "com.sun.star.style.ParagraphProperties";
+ pArray[3] = "com.sun.star.style.ParagraphPropertiesAsian";
+ pArray[4] = "com.sun.star.style.ParagraphPropertiesComplex";
if(bIsConditional)
- pArray[5] = C2U("com.sun.star.style.ConditionalParagraphStyle");
+ pArray[5] = "com.sun.star.style.ConditionalParagraphStyle";
break;
default:
@@ -3636,9 +3636,9 @@ uno::Sequence< rtl::OUString > SwXAutoStyles::getElementNames(void)
{
uno::Sequence< OUString > aNames(AUTOSTYLE_FAMILY_COUNT);
OUString* pNames = aNames.getArray();
- pNames[0] = C2U("CharacterStyles");
- pNames[1] = C2U("RubyStyles");
- pNames[2] = C2U("ParagraphStyles");
+ pNames[0] = "CharacterStyles";
+ pNames[1] = "RubyStyles";
+ pNames[2] = "ParagraphStyles";
return aNames;
}
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index c54e951..1c70a02 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -173,7 +173,7 @@ static void lcl_SetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEn
else
{
lang::IllegalArgumentException aExcept;
- aExcept.Message = C2U("relative width cannot be switched on with this property");
+ aExcept.Message = "relative width cannot be switched on with this property";
throw aExcept;
}
}
@@ -1248,7 +1248,7 @@ SwTableBox* SwXCell::FindBox(SwTable* pTable, SwTableBox* pBox2)
OUString SwXCell::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXCell");
+ return OUString("SwXCell");
}
sal_Bool SwXCell::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -1261,7 +1261,7 @@ uno::Sequence< OUString > SwXCell::getSupportedServiceNames(void) throw( uno::Ru
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.CellProperties");
+ pArray[0] = "com.sun.star.text.CellProperties";
return aRet;
}
@@ -1270,19 +1270,19 @@ uno::Sequence< OUString > SwXCell::getSupportedServiceNames(void) throw( uno::Ru
******************************************************************/
OUString SwXTextTableRow::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextTableRow");
+ return OUString("SwXTextTableRow");
}
sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- return C2U("com.sun.star.text.TextTableRow") == rServiceName;
+ return rServiceName == "com.sun.star.text.TextTableRow";
}
uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextTableRow");
+ pArray[0] = "com.sun.star.text.TextTableRow";
return aRet;
}
TYPEINIT1(SwXTextTableRow, SwClient);
@@ -1457,12 +1457,12 @@ SwTableLine* SwXTextTableRow::FindLine(SwTable* pTable, SwTableLine* pLine)
******************************************************************/
OUString SwXTextTableCursor::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextTableCursor");
+ return OUString("SwXTextTableCursor");
}
sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- return C2U("com.sun.star.text.TextTableCursor") == rServiceName;
+ return rServiceName == "com.sun.star.text.TextTableCursor";
}
IMPLEMENT_FORWARD_XINTERFACE2(SwXTextTableCursor,SwXTextTableCursor_Base,OTextCursorHelper)
@@ -1477,7 +1477,7 @@ uno::Sequence< OUString > SwXTextTableCursor::getSupportedServiceNames(void) thr
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TextTableCursor");
+ pArray[0] = "com.sun.star.text.TextTableCursor";
return aRet;
}
@@ -2517,7 +2517,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray()
if(!nRowCount || !nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
SwFrmFmt* pFmt = GetFrmFmt();
@@ -2583,7 +2583,7 @@ void SAL_CALL SwXTextTable::setDataArray(
if(pTable->IsTblComplex())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
@@ -2643,7 +2643,7 @@ uno::Sequence< uno::Sequence< double > > SwXTextTable::getData(void)
if(!nRowCount || !nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
//
@@ -2687,7 +2687,7 @@ void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData
if(!nRowCount || !nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
SwFrmFmt* pFmt = GetFrmFmt();
@@ -2731,7 +2731,7 @@ uno::Sequence< OUString > SwXTextTable::getRowDescriptions(void) throw( uno::Run
if(!nRowCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
uno::Sequence< OUString > aRet(bFirstColumnAsLabel ? nRowCount - 1 : nRowCount);
@@ -2807,7 +2807,7 @@ uno::Sequence< OUString > SwXTextTable::getColumnDescriptions(void)
if(!nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
uno::Sequence< OUString > aRet(bFirstRowAsLabel ? nColCount - 1 : nColCount);
@@ -2847,7 +2847,7 @@ void SwXTextTable::setColumnDescriptions(const uno::Sequence< OUString >& rColum
if(!nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
SwFrmFmt* pFmt = GetFrmFmt();
@@ -3608,7 +3608,7 @@ void SwXTextTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
OUString SAL_CALL SwXTextTable::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTextTable");
+ return OUString("SwXTextTable");
}
sal_Bool SwXTextTable::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -3624,10 +3624,10 @@ uno::Sequence< OUString > SwXTextTable::getSupportedServiceNames(void) throw( un
{
uno::Sequence< OUString > aRet(4);
OUString* pArr = aRet.getArray();
- pArr[0] = C2U("com.sun.star.document.LinkTarget");
- pArr[1] = C2U("com.sun.star.text.TextTable");
- pArr[2] = C2U("com.sun.star.text.TextContent");
- pArr[2] = C2U("com.sun.star.text.TextSortable");
+ pArr[0] = "com.sun.star.document.LinkTarget";
+ pArr[1] = "com.sun.star.text.TextTable";
+ pArr[2] = "com.sun.star.text.TextContent";
+ pArr[2] = "com.sun.star.text.TextSortable";
return aRet;
}
@@ -3657,7 +3657,7 @@ TYPEINIT1(SwXCellRange, SwClient);
OUString SwXCellRange::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXCellRange");
+ return OUString("SwXCellRange");
}
sal_Bool SwXCellRange::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
@@ -3673,13 +3673,13 @@ uno::Sequence< OUString > SwXCellRange::getSupportedServiceNames(void) throw( un
{
uno::Sequence< OUString > aRet(7);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.CellRange");
- pArray[1] = C2U("com.sun.star.style.CharacterProperties");
- pArray[2] = C2U("com.sun.star.style.CharacterPropertiesAsian");
- pArray[3] = C2U("com.sun.star.style.CharacterPropertiesComplex");
- pArray[4] = C2U("com.sun.star.style.ParagraphProperties");
- pArray[5] = C2U("com.sun.star.style.ParagraphPropertiesAsian");
- pArray[6] = C2U("com.sun.star.style.ParagraphPropertiesComplex");
+ pArray[0] = "com.sun.star.text.CellRange";
+ pArray[1] = "com.sun.star.style.CharacterProperties";
+ pArray[2] = "com.sun.star.style.CharacterPropertiesAsian";
+ pArray[3] = "com.sun.star.style.CharacterPropertiesComplex";
+ pArray[4] = "com.sun.star.style.ParagraphProperties";
+ pArray[5] = "com.sun.star.style.ParagraphPropertiesAsian";
+ pArray[6] = "com.sun.star.style.ParagraphPropertiesComplex";
return aRet;
}
@@ -4046,7 +4046,7 @@ void SwXCellRange::GetDataSequence(
if(!nRowCount || !nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
@@ -4184,7 +4184,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray()
if(!nRowCount || !nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
uno::Sequence< uno::Sequence< uno::Any > > aRowSeq(nRowCount);
@@ -4245,7 +4245,7 @@ void SAL_CALL SwXCellRange::setDataArray(
if(!nRowCount || !nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
SwFrmFmt* pFmt = GetFrmFmt();
@@ -4308,7 +4308,7 @@ uno::Sequence< uno::Sequence< double > > SwXCellRange::getData(void) throw( uno:
if(!nRowCount || !nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
uno::Sequence< uno::Sequence< double > > aRowSeq(bFirstRowAsLabel ? nRowCount - 1 : nRowCount);
@@ -4347,7 +4347,7 @@ void SwXCellRange::setData(const uno::Sequence< uno::Sequence< double > >& rData
if(!nRowCount || !nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
SwFrmFmt* pFmt = GetFrmFmt();
@@ -4389,7 +4389,7 @@ uno::Sequence< OUString > SwXCellRange::getRowDescriptions(void)
if(!nRowCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
uno::Sequence< OUString > aRet(bFirstColumnAsLabel ? nRowCount - 1 : nRowCount);
@@ -4463,7 +4463,7 @@ uno::Sequence< OUString > SwXCellRange::getColumnDescriptions(void)
if(!nColCount)
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("Table too complex");
+ aRuntime.Message = "Table too complex";
throw aRuntime;
}
uno::Sequence< OUString > aRet(bFirstRowAsLabel ? nColCount - 1 : nColCount);
@@ -4617,19 +4617,19 @@ void SwXCellRange::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
******************************************************************/
OUString SwXTableRows::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTableRows");
+ return OUString("SwXTableRows");
}
sal_Bool SwXTableRows::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- return C2U("com.sun.star.text.TableRows") == rServiceName;
+ return rServiceName == "com.sun.star.text.TableRows";
}
uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TableRows");
+ pArray[0] = "com.sun.star.text.TableRows";
return aRet;
}
TYPEINIT1(SwXTableRows, SwClient);
@@ -4726,7 +4726,7 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno:
if (nCount <= 0 || !(0 <= nIndex && nIndex <= nRowCount))
{
uno::RuntimeException aExcept;
- aExcept.Message = C2U("Illegal arguments");
+ aExcept.Message = "Illegal arguments";
throw aExcept;
}
@@ -4817,7 +4817,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno:
if(!bSuccess)
{
uno::RuntimeException aExcept;
- aExcept.Message = C2U("Illegal arguments");
+ aExcept.Message = "Illegal arguments";
throw aExcept;
}
}
@@ -4833,19 +4833,19 @@ void SwXTableRows::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
******************************************************************/
OUString SwXTableColumns::getImplementationName(void) throw( uno::RuntimeException )
{
- return C2U("SwXTableColumns");
+ return OUString("SwXTableColumns");
}
sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
- return C2U("com.sun.star.text.TableColumns") == rServiceName;
+ return rServiceName == "com.sun.star.text.TableColumns";
}
uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames(void) throw( uno::RuntimeException )
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = C2U("com.sun.star.text.TableColumns");
+ pArray[0] = "com.sun.star.text.TableColumns";
return aRet;
}
@@ -4938,7 +4938,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u
if (nCount <= 0 || !(0 <= nIndex && nIndex <= nColCount))
{
uno::RuntimeException aExcept;
- aExcept.Message = C2U("Illegal arguments");
+ aExcept.Message = "Illegal arguments";
throw aExcept;
}
@@ -5026,7 +5026,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u
if(!bSuccess)
{
uno::RuntimeException aExcept;
- aExcept.Message = C2U("Illegal arguments");
+ aExcept.Message = "Illegal arguments";
throw aExcept;
}
}
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 0515b3c..d2e3add 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -513,19 +513,19 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (!xRange.is())
{
lang::IllegalArgumentException aIllegal;
- aIllegal.Message = C2U("first parameter invalid;");
+ aIllegal.Message = "first parameter invalid;";
throw aIllegal;
}
if (!xContent.is())
{
lang::IllegalArgumentException aIllegal;
- aIllegal.Message += C2U("second parameter invalid");
+ aIllegal.Message += "second parameter invalid";
throw aIllegal;
}
if(!GetDoc())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
@@ -533,7 +533,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (!::sw::XTextRangeToSwPaM(aPam, xRange))
{
lang::IllegalArgumentException aIllegal;
- aIllegal.Message = C2U("first parameter invalid");
+ aIllegal.Message = "first parameter invalid";
throw aIllegal;
}
// first test if the range is at the right position, then call
@@ -570,7 +570,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (pOwnStartNode != pTmp)
{
uno::RuntimeException aRunException;
- aRunException.Message = C2U("text interface and cursor not related");
+ aRunException.Message = "text interface and cursor not related";
throw aRunException;
}
@@ -583,8 +583,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (!xContentTunnel.is())
{
lang::IllegalArgumentException aArgException;
- aArgException.Message =
- C2U("text content does not support lang::XUnoTunnel");
+ aArgException.Message = "text content does not support lang::XUnoTunnel";
throw aArgException;
}
SwXDocumentIndexMark *const pDocumentIndexMark =
@@ -630,7 +629,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if(!GetDoc())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
@@ -748,7 +747,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if(!GetDoc())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
@@ -801,7 +800,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if(!GetDoc())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
@@ -854,7 +853,7 @@ throw (container::NoSuchElementException, uno::RuntimeException)
if(!xContent.is())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U("first parameter invalid");
+ aRuntime.Message = "first parameter invalid";
throw aRuntime;
}
xContent->dispose();
@@ -878,7 +877,7 @@ SwXText::getStart() throw (uno::RuntimeException)
if(!xRef.is())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
xRef->gotoStart(sal_False);
@@ -895,7 +894,7 @@ SwXText::getEnd() throw (uno::RuntimeException)
if(!xRef.is())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
xRef->gotoEnd(sal_False);
@@ -911,7 +910,7 @@ OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException)
if(!xRet.is())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
xRet->gotoEnd(sal_True);
@@ -926,7 +925,7 @@ SwXText::setString(const OUString& rString) throw (uno::RuntimeException)
if (!GetDoc())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
@@ -976,7 +975,7 @@ SwXText::setString(const OUString& rString) throw (uno::RuntimeException)
{
GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_END, NULL);
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
xRet->gotoEnd(sal_True);
@@ -1147,7 +1146,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
if (!pEntry)
{
beans::UnknownPropertyException aExcept;
- aExcept.Message = C2U("Unknown property: ");
+ aExcept.Message = "Unknown property: ";
aExcept.Message += rPropertyName;
throw aExcept;
}
@@ -2385,7 +2384,7 @@ SwXBodyText::~SwXBodyText()
OUString SAL_CALL
SwXBodyText::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXBodyText");
+ return OUString("SwXBodyText");
}
static char const*const g_ServicesBodyText[] =
@@ -2505,7 +2504,7 @@ SwXBodyText::createTextCursor() throw (uno::RuntimeException)
if (!xRef.is())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
return xRef;
@@ -2521,7 +2520,7 @@ throw (uno::RuntimeException)
if(!IsValid())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
@@ -2566,7 +2565,7 @@ throw (uno::RuntimeException)
if (!IsValid())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
@@ -2596,7 +2595,7 @@ SwXBodyText::hasElements() throw (uno::RuntimeException)
if (!IsValid())
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
@@ -2682,7 +2681,7 @@ SwXHeadFootText::~SwXHeadFootText()
OUString SAL_CALL
SwXHeadFootText::getImplementationName() throw (uno::RuntimeException)
{
- return C2U("SwXHeadFootText");
+ return OUString("SwXHeadFootText");
}
static char const*const g_ServicesHeadFootText[] =
@@ -2815,7 +2814,7 @@ throw (uno::RuntimeException)
if (!::sw::XTextRangeToSwPaM(aPam, xTextPosition))
{
uno::RuntimeException aRuntime;
- aRuntime.Message = C2U(cInvalidObject);
+ aRuntime.Message = cInvalidObject;
throw aRuntime;
}
More information about the Libreoffice-commits
mailing list