diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-03 20:02:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-04 10:48:59 +0100 |
| commit | d51640061809034006db6d7ba1205c1f1f8b5fad (patch) | |
| tree | 7863e49a1be50f602fd0380fe3af95545c12ec92 /sw | |
| parent | 9ddca3616fc8b91973b9f261fd53797f9c84570f (diff) | |
cid#1546422 COPY_INSTEAD_OF_MOVE
and
cid#1546416 COPY_INSTEAD_OF_MOVE
cid#1546415 COPY_INSTEAD_OF_MOVE
cid#1546391 COPY_INSTEAD_OF_MOVE
cid#1546390 COPY_INSTEAD_OF_MOVE
cid#1546317 COPY_INSTEAD_OF_MOVE
cid#1546252 COPY_INSTEAD_OF_MOVE
cid#1546251 COPY_INSTEAD_OF_MOVE
cid#1546249 COPY_INSTEAD_OF_MOVE
cid#1546243 COPY_INSTEAD_OF_MOVE
cid#1546195 COPY_INSTEAD_OF_MOVE
cid#1546193 COPY_INSTEAD_OF_MOVE
cid#1546137 COPY_INSTEAD_OF_MOVE
cid#1545738 COPY_INSTEAD_OF_MOVE
cid#1545782 COPY_INSTEAD_OF_MOVE
Change-Id: I10d5091aa72b682371764b8a18cc5062e272c031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160285
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 7 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh2.cxx | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 70e94360f65c..70a724814cc6 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -887,11 +887,10 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam) const SvxFontListItem* pFontListItem = static_cast<const SvxFontListItem* >(rDoc.GetDocShell() ->GetItem( SID_ATTR_CHAR_FONTLIST )); - const FontList* pList = pFontListItem->GetFontList(); + const FontList* pList = pFontListItem->GetFontList(); - FontMetric aFontMetric = pList->Get( - pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE); - vcl::Font aFont(aFontMetric); + vcl::Font aFont(pList->Get( + pBulletFontNames[i],WEIGHT_NORMAL, ITALIC_NONE)); aFormat.SetBulletFont(&aFont); } aRule.Set( i, aFormat ); diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index 8f05aef76788..8a62f401fe46 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -239,8 +239,7 @@ IMPL_LINK( SwBaseShell, InsertDBTextHdl, void*, p, void ) aDBData)); if( RET_OK == pDlg->Execute() ) { - Reference <XResultSet> xResSet = pDBStruct->xCursor; - pDlg->DataToDoc( pDBStruct->aSelection, xSource, xConnection, xResSet); + pDlg->DataToDoc(pDBStruct->aSelection, xSource, xConnection, pDBStruct->xCursor); } } if ( bDispose ) |