From a57049915d32f549cbda6aa8c8d189531aec522b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 22 Apr 2016 10:13:56 +0200 Subject: Avoid reserved identifiers Change-Id: I263603fb81d368ebc8450b2d8cc01752fcd3f29d --- compilerplugins/clang/mergeclasses.results | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compilerplugins') diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 4678c11b4eaf..6166e73e3cdc 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -183,7 +183,7 @@ merge XclExpFutureRecord with XclExpChFutureRecordBase merge XclExpSubStream with XclExpChart merge XclNumFmtBuffer with XclImpNumFmtBuffer merge SdrItemBrowserWindow with SdrItemBrowser -merge _SfxMacroTabPage with SfxMacroTabPage +merge SfxMacroTabPage_ with SfxMacroTabPage merge abp::OModuleResourceClient with abp::OABSPilotUno merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase merge accessibility::IComboListBoxHelper with VCLListBoxHelper -- cgit