diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-14 17:52:03 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-05-22 12:17:00 +0200 |
| commit | 11b7f60fa063a51cdb9f021acafafdcae1e3016d (patch) | |
| tree | 9f30923323cf64141852a4af5311bb7c85684d29 /compilerplugins | |
| parent | 028c25f42245074290d6338275e0b0f1845c0ee3 (diff) | |
Merge shell into TaskManager base class
(arbitrarily decided to keep the latter, being the less odd class name)
Change-Id: I5c061a0f12b8f3095e283b4896f7c910948ac50f
(cherry picked from commit 37b21a0a71d500cc5785d856d2e4402df17d8f87)
Diffstat (limited to 'compilerplugins')
| -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 096d79a3aee1..b76adfbe096f 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -234,7 +234,6 @@ merge detail::ScVbaHlinkContainerMember with ScVbaHyperlinks merge drawinglayer::primitive2d::ObjectAndViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::DiscreteBitmapPrimitive2D merge drawinglayer::primitive2d::ViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::WallpaperBitmapPrimitive2D merge drawinglayer::processor3d::DefaultProcessor3D with drawinglayer::processor3d::ZBufferProcessor3D -merge fileaccess::TaskManager with fileaccess::shell merge frm::ICommandImageProvider with frm::DocumentCommandImageProvider merge frm::IEngineStatusListener with frm::RichTextControlImpl merge frm::IEngineTextChangeListener with frm::ORichTextModel |