diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-20 14:05:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-21 11:45:59 +0200 |
| commit | 76a3df733ebe016d8adf681d1cf591970d6f2a64 (patch) | |
| tree | 05ee35a96782a22661dac66195687d3ea4ff0158 /compilerplugins | |
| parent | dc2598b7b45638847ac81c1b53bdbe43e5acef19 (diff) | |
loplugin:mergeclasses RscConst with RscEnum
Change-Id: I7bd35df0751c9ffce076848edd5373e00815dbc5
Reviewed-on: https://gerrit.libreoffice.org/36772
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 7031a522f436..59bf4effa157 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -135,7 +135,6 @@ merge StarSymbolToMSMultiFont with StarSymbolToMSMultiFontImpl merge StgAvlIterator with StgIterator merge StgAvlNode with StgDirEntry merge StgCache with StgIo -merge StgReader with WW8Reader merge SvListView with SvTreeListBox merge SvXMLExportItemMapper with SwXMLTableItemMapper_Impl merge SvXMLImportItemMapper with SwXMLImportTableItemMapper_Impl @@ -357,7 +356,6 @@ merge sw::util::WrtRedlineAuthor with WW8_WrtRedlineAuthor merge unographic::GraphicTransformer with unographic::Graphic merge vcl::DeletionNotifier with SalFrame merge vcl::ExtOutDevData with vcl::PDFExtOutDevData -merge vcl::IPrioritable with VclContainer merge vcl::SolarThreadExecutor with vcl::solarthread::detail::GenericSolarThreadExecutor merge vclcanvas::Sprite with vclcanvas::CanvasCustomSpriteSpriteBase_Base merge webdav_ucp::DAVAuthListener with webdav_ucp::DAVAuthListener_Impl |