summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-04 13:13:30 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-05 06:32:27 +0000
commitdac06d9cb05552022ef8ee958c75297ed58c01b8 (patch)
tree6104c8e3c13d11e82295ebe480d2b43441a0b041 /compilerplugins
parenta12955be5bcfab3dda482a562eed66d7b0ffd996 (diff)
merge svt::StoreString with svt::StoreContentURL
Change-Id: I6f2a7102c697cecc96e8b950b499bc9b0f91240e Reviewed-on: https://gerrit.libreoffice.org/26904 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 a033c15273eb..7f80026d8d24 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -359,7 +359,6 @@ merge svt::IEnumerationResultHandler with SvtFileView_Impl
merge svt::IFilePickerController with SvtFileDialog_Base
merge svt::IFilePickerListener with SvtFilePicker
merge svt::OCommonPicker with SvtFilePicker
-merge svt::StoreString with svt::StoreContentURL
merge svt::table::IAccessibleTable with svt::table::TableControl
merge svt::table::IColumnModel with svt::table::UnoGridColumnFacade
merge svt::table::ITableControl with svt::table::TableControl_Impl