diff options
| -rw-r--r-- | compilerplugins/clang/unusedvariablecheck.cxx | 27 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 4 |
2 files changed, 29 insertions, 2 deletions
diff --git a/compilerplugins/clang/unusedvariablecheck.cxx b/compilerplugins/clang/unusedvariablecheck.cxx index cc3741759a33..0308d9b6150c 100644 --- a/compilerplugins/clang/unusedvariablecheck.cxx +++ b/compilerplugins/clang/unusedvariablecheck.cxx @@ -48,6 +48,30 @@ void UnusedVariableCheck::run() TraverseDecl( compiler.getASTContext().getTranslationUnitDecl()); } +bool BaseCheckNotDialogSubclass(const CXXRecordDecl *BaseDefinition, void *) { + if (BaseDefinition && BaseDefinition->getQualifiedNameAsString().compare("Dialog") == 0) { + return false; + } + return true; +} + +bool isDerivedFromDialog(const CXXRecordDecl *decl) { + if (!decl) + return false; + if (decl->getQualifiedNameAsString() == "Dialog") + return true; + if (!decl->hasDefinition()) { + return false; + } + if (// not sure what hasAnyDependentBases() does, + // but it avoids classes we don't want, e.g. WeakAggComponentImplHelper1 + !decl->hasAnyDependentBases() && + !decl->forallBases(BaseCheckNotDialogSubclass, nullptr, true)) { + return true; + } + return false; +} + bool UnusedVariableCheck::VisitVarDecl( const VarDecl* var ) { if( ignoreLocation( var )) @@ -83,6 +107,9 @@ bool UnusedVariableCheck::VisitVarDecl( const VarDecl* var ) || n == "std::list" || n == "std::__debug::list" || n == "std::vector" || n == "std::__debug::vector" ) warn_unused = true; + // check if this field is derived from Dialog + if (!warn_unused && isDerivedFromDialog(type)) + warn_unused = true; } if( warn_unused ) { diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 094bc968c2c0..972c328500a3 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -933,7 +933,7 @@ void SfxTemplateManagerDlg::OnTemplateImport () { OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT).toString()); aMsg = aMsg.replaceFirst("$1",pFolder->maTitle); - MessageDialog(this, aMsg.replaceFirst("$2",aTemplateList)); + MessageDialog(this, aMsg.replaceFirst("$2",aTemplateList)).Execute(); } } } @@ -956,7 +956,7 @@ void SfxTemplateManagerDlg::OnTemplateImport () { OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT).toString()); aMsg = aMsg.replaceFirst("$1",mpLocalView->getCurRegionName()); - MessageDialog(this, aMsg.replaceFirst("$2",aTemplateList)); + MessageDialog(this, aMsg.replaceFirst("$2",aTemplateList)).Execute(); } } |