diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:13:56 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:13:56 +0200 |
| commit | a57049915d32f549cbda6aa8c8d189531aec522b (patch) | |
| tree | 1ddf76e00952cfe7819e9935b58d5c144eac88ff /compilerplugins | |
| parent | 7e7bef2748c100aed9ec98fbceb8608fc2906ef2 (diff) | |
Avoid reserved identifiers
Change-Id: I263603fb81d368ebc8450b2d8cc01752fcd3f29d
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 2 |
1 files changed, 1 insertions, 1 deletions
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 |