[Libreoffice-commits] .: setup_native/source xmlsecurity/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Jan 26 12:21:32 PST 2011
setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx | 3 +--
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit ea96281176b32e7091d2348e6a8ba0f8a2ffb1ad
Author: Kenneth Venken <kenneth.venken at gmail.com>
Date: Tue Jan 25 18:39:18 2011 +0100
Cpp cleanliness: redundant assignment to self
diff --git a/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx b/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
index fa5c389..3feef75 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 dca6489..1095c22 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 );
More information about the Libreoffice-commits
mailing list