diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-05 20:58:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-06 13:11:54 +0100 |
| commit | 66693d82bae6c4333ac754f76550eb5f4a289b22 (patch) | |
| tree | bcb2c29b5738bbcc63de875258b4ca62fda1b913 /compilerplugins | |
| parent | cad01ea74c603affcc15a5e32f75967f6dff0f87 (diff) | |
merge FillTypeLB with SvxFillTypeBox
Change-Id: Ia6229e8cc04c88e6740a12648c50cf5efca3bbd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88067
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
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 3e084ce65dea..12fd4da9f315 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -39,7 +39,6 @@ merge ExcBoolRecord with Exc1904 merge ExcelConverterBase with ExcelToSc merge ExportTyp with ExportBiff5 merge FailTest with testMathMalformedXml -merge FillTypeLB with SvxFillTypeBox merge FmGridListener with FmXGridPeer::GridListenerDelegator merge FmXDisposeListener with DisposeListenerGridBridge merge FmXFormShell_Base_Disambiguation with FmXFormShell |