summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-05 09:54:33 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-05 10:51:09 +0000
commit7001ca25ec7251c5bac4a5ff304d1f26794b58a0 (patch)
treeafba191579312c64d09c125d4b5e170448ce9edc /compilerplugins
parent860a82766f2c6d4fad340bf6ab283a7cd22a1fd5 (diff)
merge LineProperties with chart::ErrorBar
Change-Id: Ic3490a15339ff981e90a86cb69c206c231db9161 Reviewed-on: https://gerrit.libreoffice.org/26932 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'compilerplugins')
-rw-r--r--compilerplugins/clang/mergeclasses.results1
1 files changed, 0 insertions, 1 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index 84b085db0106..f62a55cd9dd1 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -76,7 +76,6 @@ merge ImplEESdrWriter with ImplEscherExSdr
merge ImplGlyphFallbackFontSubstitution with FcGlyphFallbackSubstitution
merge ImplPreMatchFontSubstitution with FcPreMatchSubstitution
merge LineLB with SvxLineBox
-merge LineProperties with chart::ErrorBar
merge LwpDLList with LwpParaProperty
merge LwpDLVListHead with LwpPropList
merge LwpMarker with LwpStoryMarker