summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/unocore')
-rw-r--r--sw/source/core/unocore/swunohelper.cxx4
-rw-r--r--sw/source/core/unocore/unochart.cxx13
-rw-r--r--sw/source/core/unocore/unocoll.cxx2
-rw-r--r--sw/source/core/unocore/unofield.cxx2
-rw-r--r--sw/source/core/unocore/unoframe.cxx10
-rw-r--r--sw/source/core/unocore/unoidx.cxx9
-rw-r--r--sw/source/core/unocore/unoobj.cxx2
-rw-r--r--sw/source/core/unocore/unoobj2.cxx2
8 files changed, 21 insertions, 23 deletions
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 3b895574a0fd..cd592eb81204 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -200,9 +200,9 @@ bool UCB_GetFileListOfFolder( const OUString& rURL,
sal_uInt16 nSeqSize = pDateTimeList ? 2 : 1;
::com::sun::star::uno::Sequence < OUString > aProps( nSeqSize );
OUString* pProps = aProps.getArray();
- pProps[ 0 ] = OUString("Title");
+ pProps[ 0 ] = "Title";
if( pDateTimeList )
- pProps[ 1 ] = OUString("DateModified");
+ pProps[ 1 ] = "DateModified";
try
{
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 6c441c774768..f5c86aa0b83c 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1319,7 +1319,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
for (sal_Int32 i = 0; i < nSortedRanges; ++i)
{
if (!aSortedCellRanges.isEmpty())
- aSortedCellRanges += OUString( (sal_Unicode) ';');
+ aSortedCellRanges += ";";
aSortedCellRanges += pSortedRanges[i];
}
@@ -1851,14 +1851,13 @@ OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXML
if (aCellRange.aTableName != aFirstFoundTable)
throw lang::IllegalArgumentException();
- OUString aTmp( aCellRange.aTableName );
- aTmp += OUString((sal_Unicode) '.');
- aTmp += sw_GetCellName( aCellRange.aUpperLeft.nColumn,
+ OUString aTmp = aCellRange.aTableName + "." +
+ sw_GetCellName( aCellRange.aUpperLeft.nColumn,
aCellRange.aUpperLeft.nRow );
// does cell range consist of more than a single cell?
if (!aCellRange.aLowerRight.bIsEmpty)
{
- aTmp += OUString((sal_Unicode) ':');
+ aTmp += ":";
aTmp += sw_GetCellName( aCellRange.aLowerRight.nColumn,
aCellRange.aLowerRight.nRow );
}
@@ -2173,12 +2172,12 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
OUString aNew;
if (bUseCol)
{
- aRplc = OUString("%COLUMNLETTER");
+ aRplc = "%COLUMNLETTER";
aNew = OUString(aCellName.getStr(), pBuf - aCellName.getStr());
}
else
{
- aRplc = OUString("%ROWNUMBER");
+ aRplc = "%ROWNUMBER";
aNew = OUString(pBuf, (aCellName.getStr() + nLen) - pBuf);
}
aTxt = aTxt.replaceFirst( aRplc, aNew );
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 0705a1c25604..58f36a2cae11 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1607,7 +1607,7 @@ sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName) throw( Runt
Sequence< OUString > SwXBookmarks::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString("com.sun.star.text.Bookmarks");
+ aRet[0] = "com.sun.star.text.Bookmarks";
return aRet;
}
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index beb33efb7c94..ef26f6f752a6 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2623,7 +2623,7 @@ static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName )
if( 2 <= nDotCount )
{
// #i51815#
- rName = OUString("DataBase.") + rName;
+ rName = "DataBase." + rName;
nResId = RES_DBFLD;
}
}
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 713f299c64f7..35157a2bef29 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1187,7 +1187,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
pGrfObj = new GraphicObject;
pGrfObj->SetUserData( sTmp );
pGrfObj->SetSwapState();
- sGrfName = OUString();
+ sGrfName = "";
}
else if( sTmp.startsWith(sGraphicObjectProtocol) )
{
@@ -1195,7 +1195,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
sTmp.copy(sizeof(sGraphicObjectProtocol)-1),
RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
- sGrfName = OUString();
+ sGrfName = "";
}
else
{
@@ -2239,7 +2239,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
pGrfObj = new GraphicObject;
pGrfObj->SetUserData( sGraphicURL );
pGrfObj->SetSwapState();
- sGraphicURL = OUString();
+ sGraphicURL = "";
}
else if( sGraphicURL.startsWith(sGraphicObjectProtocol) )
{
@@ -2247,7 +2247,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
sGraphicURL.copy( sizeof(sGraphicObjectProtocol)-1 ),
RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
- sGraphicURL = OUString();
+ sGraphicURL = "";
}
}
Graphic aGraphic;
@@ -2318,7 +2318,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
if( !aClassName.MakeId( aCLSID ) )
{
lang::IllegalArgumentException aExcept;
- aExcept.Message = OUString("CLSID invalid");
+ aExcept.Message = "CLSID invalid";
throw aExcept;
}
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 99fe888aa494..2db7aa13c841 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -1416,11 +1416,11 @@ OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException)
SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() );
if (m_pImpl->m_bIsDescriptor)
{
- uRet = OUString(m_pImpl->m_pProps->GetTOXBase().GetTOXName());
+ uRet = m_pImpl->m_pProps->GetTOXBase().GetTOXName();
}
else if(pSectionFmt)
{
- uRet = OUString(pSectionFmt->GetSection()->GetSectionName());
+ uRet = pSectionFmt->GetSection()->GetSectionName();
}
else
{
@@ -1730,7 +1730,7 @@ SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException)
SwTOXType *const pType = m_pImpl->GetTOXType();
if (pType && m_pImpl->m_pTOXMark)
{
- sRet = OUString(m_pImpl->m_pTOXMark->GetAlternativeText());
+ sRet = m_pImpl->m_pTOXMark->GetAlternativeText();
}
else if (m_pImpl->m_bIsDescriptor)
{
@@ -2504,8 +2504,7 @@ SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException)
if( TOX_CONTENT_SECTION == pSect->GetType() &&
pSect->GetFmt()->GetSectionNode())
{
- pArray[nCnt++] = OUString(
- static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName());
+ pArray[nCnt++] = static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName();
}
}
return aRet;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 0b07b547430b..6e20bf02e0df 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -3063,7 +3063,7 @@ SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString("com.sun.star.text.TextContent");
+ pArray[0] = "com.sun.star.text.TextContent";
return aRet;
}
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 67f0c7112b23..de3772c0c786 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1341,7 +1341,7 @@ SwXTextRange::getAvailableServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString("com.sun.star.text.TextContent");
+ pArray[0] = "com.sun.star.text.TextContent";
return aRet;
}