summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/core/uwriter.cxx8
-rw-r--r--sw/source/core/access/acccontext.cxx4
-rw-r--r--sw/source/core/fields/dbfld.cxx2
-rw-r--r--sw/source/core/fields/ddefld.cxx2
-rw-r--r--sw/source/core/tox/tox.cxx2
-rw-r--r--sw/source/filter/ww8/docxexport.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx4
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx4
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx4
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx8
-rw-r--r--sw/source/uibase/utlui/initui.cxx4
11 files changed, 23 insertions, 23 deletions
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index f4e03a060feb..849ce1b666b8 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -823,7 +823,7 @@ void SwDocTest::testSwScanner()
aDocStat.Reset();
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
- m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" = ")));
+ m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll("X", " = "));
pTextNode = aPaM.GetNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
@@ -832,7 +832,7 @@ void SwDocTest::testSwScanner()
aDocStat.Reset();
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
- m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" _ ")));
+ m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll("X", " _ "));
pTextNode = aPaM.GetNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
@@ -841,7 +841,7 @@ void SwDocTest::testSwScanner()
aDocStat.Reset();
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
- m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" -- ")));
+ m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll("X", " -- "));
pTextNode = aPaM.GetNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
@@ -908,7 +908,7 @@ void SwDocTest::testSwScanner()
const sal_Unicode aChunk[] = {' ', 0x2013, ' '};
OUString sChunk(aChunk, SAL_N_ELEMENTS(aChunk));
m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
- m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), sChunk));
+ m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll("X", sChunk));
pTextNode = aPaM.GetNode().GetTextNode();
pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 09e5372440cb..b99ec626cabb 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1405,11 +1405,11 @@ OUString SwAccessibleContext::GetResource( sal_uInt16 nResId,
if( pArg1 )
{
- sStr = sStr.replaceFirst( OUString("$(ARG1)"), *pArg1 );
+ sStr = sStr.replaceFirst( "$(ARG1)", *pArg1 );
}
if( pArg2 )
{
- sStr = sStr.replaceFirst( OUString("$(ARG2)"), *pArg2 );
+ sStr = sStr.replaceFirst( "$(ARG2)", *pArg2 );
}
return sStr;
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index fa8969e1b7e0..919ca2064638 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star;
/// replace database separator by dots for display
static OUString lcl_DBTrennConv(const OUString& aContent)
{
- return aContent.replaceAll(OUString(DB_DELIM), OUString('.'));
+ return aContent.replaceAll(OUString(DB_DELIM), ".");
}
// database field type
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index de9d8274cb3f..34e6fa8123aa 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -385,7 +385,7 @@ SwDDEField::~SwDDEField()
OUString SwDDEField::Expand() const
{
OUString aStr = static_cast<SwDDEFieldType*>(GetTyp())->GetExpansion();
- aStr = aStr.replaceAll("\r", OUString());
+ aStr = aStr.replaceAll("\r", "");
aStr = aStr.replaceAll("\t", " ");
aStr = aStr.replaceAll("\n", "|");
if (aStr.endsWith("|"))
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 0b6a85269217..6490ae81663d 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -627,7 +627,7 @@ OUString SwFormToken::GetString() const
break;
case TOKEN_TEXT:
sData += OUStringLiteral1<TOX_STYLE_DELIMITER>()
- + sText.replaceAll(OUString(TOX_STYLE_DELIMITER), OUString())
+ + sText.replaceAll(OUStringLiteral1<TOX_STYLE_DELIMITER>(), "")
+ OUStringLiteral1<TOX_STYLE_DELIMITER>();
break;
case TOKEN_AUTHORITY:
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 855be5730b10..e91bea85b15f 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1244,9 +1244,9 @@ void DocxExport::WriteEmbeddings()
embeddingsList[j].Value >>= embeddingsStream;
OUString contentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
- if (embeddingPath.endsWith(OUString(".xlsm")))
+ if (embeddingPath.endsWith(".xlsm"))
contentType = "application/vnd.ms-excel.sheet.macroEnabled.12";
- else if (embeddingPath.endsWith(OUString(".bin")))
+ else if (embeddingPath.endsWith(".bin"))
contentType = "application/vnd.openxmlformats-officedocument.oleObject";
if ( embeddingsStream.is() )
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index b7c1e2e80294..03e5181a9364 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -249,8 +249,8 @@ long SwWW8ImplReader::Read_AtnBook(WW8PLCFManResult*)
OUString SwWW8ImplReader::ConvertFFileName(const OUString& rOrg)
{
OUString aName = rOrg;
- aName = aName.replaceAll("\\\\", OUString('\\'));
- aName = aName.replaceAll("%20", OUString(' '));
+ aName = aName.replaceAll("\\\\", "\\");
+ aName = aName.replaceAll("%20", " ");
// remove attached quotation marks
if (aName.endsWith("\""))
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index c5bc58e38c0b..d765dc0f0eb8 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -388,7 +388,7 @@ static OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
static void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders )
{
//convert the strings used for UI to numbers used for the configuration
- OUString sBlock(rBlock.replaceAll("\n", OUString("\\n")));
+ OUString sBlock(rBlock.replaceAll("\n", "\\n"));
for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i)
{
OUString sHeader = "<" + rHeaders.GetString( i ) + ">";
@@ -402,7 +402,7 @@ static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHead
{
//convert the numbers used for the configuration to strings used for UI to numbers
//doesn't use ReplaceAll to prevent expansion of numbers inside of the headers
- OUString sBlock(rBlock.replaceAll("\\n", OUString('\n')));
+ OUString sBlock(rBlock.replaceAll("\\n", "\n"));
SwAddressIterator aGreetingIter(sBlock);
sBlock.clear();
while(aGreetingIter.HasMore())
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index dd780399a807..4f06e6fd2e10 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -236,8 +236,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
vcl::KeyCode aCode( KEY_SPACE );
vcl::KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
OUString aModStr( aModifiedCode.GetName() );
- aModStr = aModStr.replaceFirst(aCode.GetName(), OUString());
- aModStr = aModStr.replaceAll("+", OUString());
+ aModStr = aModStr.replaceFirst(aCode.GetName(), "");
+ aModStr = aModStr.replaceAll("+", "");
sText = SW_RESSTR(STR_SMARTTAG_CLICK).replaceAll("%s", aModStr);
}
break;
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 9cc7533df4e5..48c0ca89bce6 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -954,10 +954,10 @@ bool SwFieldMgr::InsertField(
//JP 28.08.95: DDE-Topics/-Items can have blanks in their names!
// That's not yet considered here.
sal_Int32 nIndex = 0;
- OUString sCmd = rData.m_sPar2.replaceFirst(OUString(' '), OUString(sfx2::cTokenSeparator), &nIndex);
+ OUString sCmd = rData.m_sPar2.replaceFirst(" ", OUString(sfx2::cTokenSeparator), &nIndex);
if (nIndex>=0 && ++nIndex<sCmd.getLength())
{
- sCmd = sCmd.replaceFirst(OUString(' '), OUString(sfx2::cTokenSeparator), &nIndex);
+ sCmd = sCmd.replaceFirst(" ", OUString(sfx2::cTokenSeparator), &nIndex);
}
SwDDEFieldType aType( rData.m_sPar1, sCmd, static_cast<SfxLinkUpdateMode>(nFormatId) );
@@ -1401,10 +1401,10 @@ void SwFieldMgr::UpdateCurField(sal_uLong nFormat,
// DDE-Topics/-Items can have blanks in their names!
// That's not yet considered here!
sal_Int32 nIndex = 0;
- sPar2 = sPar2.replaceFirst(OUString(' '), OUString(sfx2::cTokenSeparator), &nIndex );
+ sPar2 = sPar2.replaceFirst(" ", OUString(sfx2::cTokenSeparator), &nIndex );
if (nIndex>=0 && ++nIndex<sPar2.getLength())
{
- sPar2 = sPar2.replaceFirst(OUString(' '), OUString(sfx2::cTokenSeparator), &nIndex);
+ sPar2 = sPar2.replaceFirst(" ", OUString(sfx2::cTokenSeparator), &nIndex);
}
break;
}
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index 99acee29afeb..0b5730cd98a2 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -218,8 +218,8 @@ ShellResource::ShellResource()
vcl::KeyCode aCode( KEY_SPACE );
vcl::KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
OUString aModStr( aModifiedCode.GetName() );
- aModStr = aModStr.replaceFirst(aCode.GetName(), OUString());
- aModStr = aModStr.replaceAll("+", OUString());
+ aModStr = aModStr.replaceFirst(aCode.GetName(), "");
+ aModStr = aModStr.replaceAll("+", "");
aLinkCtrlClick = aLinkCtrlClick.replaceAll("%s", aModStr);
for(sal_uInt16 i = 0; i < nCount; ++i)
generated by cgit (git 2.34.1) at 2025-03-12 19:36:32 +0000