diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2024-12-27 15:48:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2024-12-27 17:07:59 +0100 |
| commit | 3642472bea67c6e0c35bee1e6567e1fe9d560e1a (patch) | |
| tree | 52da00c2392e03098305e376b3c590098c44a93c /compilerplugins/clang | |
| parent | 8b492a1f3057d2b6c3daed7405000d0270ea3dd9 (diff) | |
merge SwSidebarItem and SwAnnotationItem classes
Because the separation is not doing useful.
Which reveals that SwAnnotationWin::ChangeSidebarItem was
doing some very dodgy object slicing when assigning
to mrSidebarItem.
Fix that by using a pointer in SwAnnotationWin instead.
Change-Id: I516dfaac7066d8f1effe351ef388c03dd1127fd7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179445
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'compilerplugins/clang')
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 3ed6cdea7300..7d96c32e075e 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -248,7 +248,6 @@ merge SwImpBlocks with SwXMLTextBlocks merge SwInterHyphInfo with (anonymous namespace)::SwHyphArgs merge SwNumberTreeNode with SwNodeNum merge SwSelPaintRects with SwShellCursor -merge SwSidebarItem with SwAnnotationItem merge SwTextAdjuster with SwTextCursor merge SwUndoTextFormatCollCreate with SwUndoCondTextFormatCollCreate maybe merge SwXFrame with cppu::ImplInheritanceHelper, in modules sw and cppuhelper |