summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Venken <kenneth.venken@gmail.com>2011-01-25 18:39:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-01-26 20:21:25 +0000
commitea96281176b32e7091d2348e6a8ba0f8a2ffb1ad (patch)
tree2a835fcc9152d9c14cf8a9674fcc4d943ae3dfaf
parent2e2cebc360976fd16e6d64b5462ec9aad7cd8b53 (diff)
Cpp cleanliness: redundant assignment to selfLO-BASE-INTEGRATION-DEV300_m98
-rw-r--r--setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx3
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx2
2 files changed, 2 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx b/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
index fa5c3893e..3feef7572 100644
--- a/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
@@ -153,9 +153,8 @@ extern "C" UINT __stdcall SetProductInstallationPath(MSIHANDLE handle)
MsiSetProperty(handle, TEXT("INSTALLLOCATION"), path.c_str());
}
}
- catch(std::runtime_error& ex)
+ catch(std::runtime_error&)
{
- ex = ex; // no warnings
}
return ERROR_SUCCESS;
}
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index dca648926..1095c221b 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -687,7 +687,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
else if (meSignatureMode == SignatureModeMacros
&& bSigValid && bCertValid)
{
- aImage = aImage = maSigsValidImg.GetImage();
+ aImage = maSigsValidImg.GetImage();
}
SvLBoxEntry* pEntry = maSignaturesLB.InsertEntry( aNullStr, aImage, aImage );