diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-09 19:32:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-09 22:38:50 +0100 |
| commit | a58c0d4cefe4de132af32d910ec797a2efb3ee3a (patch) | |
| tree | 184accf354eb592ebba452567a0e80d1c0351f1a /sw | |
| parent | cf3dda7c1c1da50db75d4c022bef279149d26636 (diff) | |
cid#1556778 COPY_INSTEAD_OF_MOVE
and
cid#1546474 COPY_INSTEAD_OF_MOVE
cid#1546473 COPY_INSTEAD_OF_MOVE
cid#1546469 COPY_INSTEAD_OF_MOVE
cid#1546467 COPY_INSTEAD_OF_MOVE
cid#1546458 COPY_INSTEAD_OF_MOVE
cid#1546448 COPY_INSTEAD_OF_MOVE
cid#1546446 COPY_INSTEAD_OF_MOVE
cid#1546441 COPY_INSTEAD_OF_MOVE
cid#1546424 COPY_INSTEAD_OF_MOVE
cid#1546377 COPY_INSTEAD_OF_MOVE
cid#1546374 COPY_INSTEAD_OF_MOVE
cid#1546352 COPY_INSTEAD_OF_MOVE
cid#1546334 COPY_INSTEAD_OF_MOVE
cid#1546328 COPY_INSTEAD_OF_MOVE
cid#1546310 COPY_INSTEAD_OF_MOVE
cid#1546303 COPY_INSTEAD_OF_MOVE
Change-Id: I8a43fdd574857ba1d3ec416f23c8269a9a08e12f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160515
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/DocumentDeviceManager.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/mailmergehelper.cxx | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index b90474082c92..29eeb9eec5f3 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -236,8 +236,7 @@ const SwPrintData & DocumentDeviceManager::getPrintData() const const SwDocShell *pDocSh = m_rDoc.GetDocShell(); OSL_ENSURE( pDocSh, "pDocSh is 0, can't determine if this is a WebDoc or not" ); bool bWeb = dynamic_cast< const SwWebDocShell * >(pDocSh) != nullptr; - SwPrintOptions aPrintOptions( bWeb ); - *pThis->mpPrtData = aPrintOptions; + *pThis->mpPrtData = SwPrintOptions(bWeb); } assert(mpPrtData && "this will always be set by now"); return *mpPrtData; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index b5077e6c775f..7d122dda2497 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1168,7 +1168,6 @@ SwTextPortion *SwTextFormatter::WhichTextPor( SwTextFormatInfo &rInf ) const { if (rInf.GetOpt().IsFieldName()) { - OUString aFieldName = SwFieldType::GetTypeStr(SwFieldTypesEnum::Input); // assume this is only the *first* portion and follows will be created elsewhere => input field must start at Idx assert(rInf.GetText()[sal_Int32(rInf.GetIdx())] == CH_TXT_ATR_INPUTFIELDSTART); TextFrameIndex nFieldLen(-1); @@ -1182,7 +1181,7 @@ SwTextPortion *SwTextFormatter::WhichTextPor( SwTextFormatInfo &rInf ) const } } assert(2 <= sal_Int32(nFieldLen)); - pPor = new SwFieldPortion(aFieldName, nullptr, nFieldLen); + pPor = new SwFieldPortion(SwFieldType::GetTypeStr(SwFieldTypesEnum::Input), nullptr, nFieldLen); } else { diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 4e6f7534da9a..a82ba2c3d7fe 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -199,7 +199,6 @@ OUString SwAddressPreview::FillData( rConfigItem.GetCurrentDBData() ); const OUString* pAssignment = aAssignment.getConstArray(); const std::vector<std::pair<OUString, int>>& rDefHeaders = rConfigItem.GetDefaultAddressHeaders(); - OUString sNotAssigned = "<" + SwResId(STR_NOTASSIGNED) + ">"; bool bIncludeCountry = rConfigItem.IsIncludeCountry(); const OUString rExcludeCountry = rConfigItem.GetExcludeCountry(); @@ -269,7 +268,7 @@ OUString SwAddressPreview::FillData( } else { - aItem.sText = sNotAssigned; + aItem.sText = "<" + SwResId(STR_NOTASSIGNED) + ">"; } } |