diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-10 12:50:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-10 17:41:18 +0100 |
| commit | 283aa103b9aa40ef96b022420fdea69a6fdfe41c (patch) | |
| tree | 59412c36d882264a56874d6ee6d5637f93f15ddf /sc | |
| parent | 7cfd3da36b54301fd51189282b39c71efd6bb894 (diff) | |
cid#1545177 COPY_INSTEAD_OF_MOVE
and
cid#1545179 COPY_INSTEAD_OF_MOVE
cid#1545187 COPY_INSTEAD_OF_MOVE
cid#1545188 COPY_INSTEAD_OF_MOVE
cid#1545189 COPY_INSTEAD_OF_MOVE
cid#1545196 COPY_INSTEAD_OF_MOVE
cid#1545197 COPY_INSTEAD_OF_MOVE
cid#1545204 COPY_INSTEAD_OF_MOVE
cid#1545223 COPY_INSTEAD_OF_MOVE
cid#1545236 COPY_INSTEAD_OF_MOVE
cid#1545239 COPY_INSTEAD_OF_MOVE
cid#1545253 COPY_INSTEAD_OF_MOVE
cid#1545274 COPY_INSTEAD_OF_MOVE
cid#1545286 COPY_INSTEAD_OF_MOVE
cid#1545309 COPY_INSTEAD_OF_MOVE
cid#1545311 COPY_INSTEAD_OF_MOVE
cid#1545345 COPY_INSTEAD_OF_MOVE
cid#1545358 COPY_INSTEAD_OF_MOVE
cid#1545361 COPY_INSTEAD_OF_MOVE
cid#1545365 COPY_INSTEAD_OF_MOVE
cid#1545367 COPY_INSTEAD_OF_MOVE
cid#1545372 COPY_INSTEAD_OF_MOVE
cid#1545373 COPY_INSTEAD_OF_MOVE
cid#1545377 COPY_INSTEAD_OF_MOVE
cid#1545392 COPY_INSTEAD_OF_MOVE
cid#1545399 COPY_INSTEAD_OF_MOVE
cid#1545404 COPY_INSTEAD_OF_MOVE
cid#1545408 COPY_INSTEAD_OF_MOVE
cid#1545430 COPY_INSTEAD_OF_MOVE
cid#1545439 COPY_INSTEAD_OF_MOVE
cid#1545449 COPY_INSTEAD_OF_MOVE
Change-Id: I3afe836a0bbc8bd70937035e60eb020435e413d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160539
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/inc/xichart.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/output.cxx | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 8feb17470b11..05f1e6b3b9ea 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -721,7 +721,7 @@ public: /** Reads the CHSERTRENDLINE record. */ void ReadChSerTrendLine( XclImpStream& rStrm ); /** Sets formatting information for the trend line. */ - void SetDataFormat( XclImpChDataFormatRef xDataFmt ) { mxDataFmt = xDataFmt; } + void SetDataFormat(const XclImpChDataFormatRef& xDataFmt) { mxDataFmt = xDataFmt; } void SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; } diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 9d0fe1430550..1696df328404 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -2594,17 +2594,16 @@ void ScOutputData::AddPDFNotes() tools::Rectangle aNoteRect( nMarkX, nPosY, nMarkX+nNoteWidth*nLayoutSign, nPosY+nNoteHeight ); const ScPostIt* pNote = mpDoc->GetNote(nMergeX, nMergeY, nTab); + vcl::PDFNote aNote; + // Note title is the cell address (as on printed note pages) ScAddress aAddress( nMergeX, nMergeY, nTab ); - OUString aTitle(aAddress.Format(ScRefFlags::VALID, mpDoc, mpDoc->GetAddressConvention())); + aNote.Title = aAddress.Format(ScRefFlags::VALID, mpDoc, mpDoc->GetAddressConvention()); // Content has to be a simple string without line breaks OUString aContent = pNote->GetText(); - aContent = aContent.replaceAll("\n", " "); + aNote.Contents = aContent.replaceAll("\n", " "); - vcl::PDFNote aNote; - aNote.Title = aTitle; - aNote.Contents = aContent; pPDFData->CreateNote( aNoteRect, aNote ); } } |