diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-12-15 21:34:39 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-12-16 12:45:55 +0000 |
| commit | a0133459ada8bdc03fd6ae7e509a908ff9581793 (patch) | |
| tree | 535b8209f46b0dec23d4e190fabc745966fa7ba4 /compilerplugins/clang/mergeclasses.results | |
| parent | 60a96f41f0d050ec05bfcb337edf3717689adacb (diff) | |
Merge sdr::table::TableDesignUser into sdr::table::SdrTableObjImpl
Change-Id: Ia7841447df4a7db1b5dd9fad93cab66fbca48981
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144316
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'compilerplugins/clang/mergeclasses.results')
| -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 6757b4070506..793b6f10bef8 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -400,7 +400,6 @@ merge sdext::presenter::PresenterScrollBar with sdext::presenter::PresenterVerti merge sdext::presenter::PresenterSlidePreview with sdext::presenter::(anonymous namespace)::NextSlidePreview merge sdr::SelectionController with sdr::table::SvxTableController merge sdr::contact::ObjectContactOfPagePainter with sdr::contact::PagePrimitiveExtractor -merge sdr::table::TableDesignUser with sdr::table::SdrTableObjImpl merge sfx2::IXmlIdRegistry with sfx2::XmlIdRegistry merge slideshow::internal::(anonymous namespace)::EventContainer with slideshow::internal::ClickEventHandler merge slideshow::internal::AnimationFunction with slideshow::internal::ExpressionNode |