diff options
author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-08-11 13:29:23 +0100 |
---|---|---|
committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-08-13 18:13:20 +0200 |
commit | 2bda87fd8758448267c447ba26f1932325a1338d (patch) | |
tree | 8fec2ed4450eff43f2e76d2422121755794f171f /sc/source/ui/docshell | |
parent | 1b2219cec9abe0ac77360ca2cc252d11d7f512e3 (diff) |
defer turning xlsx notes into SdrCaptions until activated
to improve import performance
Change-Id: I8dd3483372d20cbbb8694bae02a7d8b062324ff0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155613
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sc/source/ui/docshell')
-rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 4d3288558c40..e89e48476e1c 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1405,7 +1405,9 @@ void ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, c } } -ScPostIt* ScDocFunc::ImportNote( const ScAddress& rPos, const OUString& rNoteText ) +void ScDocFunc::ImportNote( const ScAddress& rPos, + std::unique_ptr<GenerateNoteCaption> xGenerator, + const tools::Rectangle& rCaptionRect, bool bShown ) { ScDocShellModificator aModificator( rDocShell ); ScDocument& rDoc = rDocShell.GetDocument(); @@ -1414,13 +1416,12 @@ ScPostIt* ScDocFunc::ImportNote( const ScAddress& rPos, const OUString& rNoteTex SAL_WARN_IF(pOldNote, "sc.ui", "imported data has >1 notes on same cell? at pos " << rPos); // create new note - ScPostIt* pNewNote = ScNoteUtil::CreateNoteFromString( rDoc, rPos, rNoteText, false, true, /*nNoteId*/0 ); + ScNoteUtil::CreateNoteFromGenerator(rDoc, rPos, std::move(xGenerator), + rCaptionRect, bShown); rDoc.SetStreamValid(rPos.Tab(), false); aModificator.SetDocumentModified(); - - return pNewNote; } bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern, |