[Libreoffice-commits] .: codemaker/source sal/inc svx/source tools/source xmloff/source xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Oct 13 12:35:57 PDT 2012
codemaker/source/javamaker/javaoptions.cxx | 3 +--
sal/inc/sal/log-areas.dox | 5 +++++
svx/source/table/tablertfimporter.cxx | 2 --
tools/source/inet/inetmime.cxx | 8 +++-----
tools/source/ref/errinf.cxx | 6 +++---
xmloff/source/transform/StyleOASISTContext.cxx | 3 ---
xmloff/source/transform/TransformerBase.cxx | 2 --
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 1 -
8 files changed, 12 insertions(+), 18 deletions(-)
New commits:
commit 1f9f8f4f4074ce7ec9d2b0f2f751f5c47ce38634
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 13 20:34:54 2012 +0100
loplugin: some log, indent and unused variable warnings
fix up some indents, remove some unused OUStrings and add some log areas
Change-Id: I5c50807aff7a726b03b72522975d9b75e6685b9b
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index b6e57b5..3889724 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -172,8 +172,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
m_options["-Gc"] = OString("");
break;
- } else
- if (av[i][2] != '\0')
+ } else if (av[i][2] != '\0')
{
OString tmp("'-G', please check");
if (i <= ac - 1)
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 3040cdb..5ecfd39 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -189,16 +189,21 @@ certain functionality.
@li @c cppuhelper
@li @c cppu
@li @c editeng
+ at li @c framework
@li @c helpcompiler
@li @c linguistic
@li @c oox
@li @c rsc
@li @c shell
@li @c stoc
+ at li @c svl
+ at li @c svx
@li @c ucbhelper
@li @c writerfilter
@li @c xmlhelp
+ at li @c xmloff
@li @c xmlreader
+ at li @c xmlsecurity
*/
/* vim:set ft=cpp shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 77d340f..a0f6b8a 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -282,8 +282,6 @@ void SdrTableRTFParser::FillTable()
if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,sal_False,&pPoolItem)==SFX_ITEM_SET)
xCell->SetMergedItem( *pPoolItem );
- String sDebug = mpOutliner->GetText( mpOutliner->GetParagraph( xCellInfo->mnStartPara ), xCellInfo->mnParaCount );
-
OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (sal_uInt16)xCellInfo->mnStartPara, (sal_uInt16)xCellInfo->mnParaCount );
if( pTextObject )
{
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 4619858..ae1bdb8 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -3591,16 +3591,14 @@ void INetMIMEEncodedWordOutputSink::finish(bool bWriteTrailer)
nSize += nWrapperSize;
for (; m_nExtraSpaces > 1; --m_nExtraSpaces)
{
- if (m_rSink.getColumn()
- >= m_rSink.getLineLengthLimit())
+ if (m_rSink.getColumn() >= m_rSink.getLineLengthLimit())
m_rSink << INetMIMEOutputSink::endl;
m_rSink << ' ';
}
if (m_nExtraSpaces == 1)
{
- if (m_rSink.getColumn() + nSize
- >= m_rSink.getLineLengthLimit())
- m_rSink << INetMIMEOutputSink::endl;
+ if (m_rSink.getColumn() + nSize >= m_rSink.getLineLengthLimit())
+ m_rSink << INetMIMEOutputSink::endl;
m_rSink << ' ';
}
m_rSink << "=?" << pCharsetName << "?Q?";
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index b7867a8..0038c86 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -323,10 +323,10 @@ sal_uInt16 ErrorHandler::HandleError_Impl(
}
else
{
- if( nFlags != USHRT_MAX )
- nErrFlags = nFlags;
+ if (nFlags != USHRT_MAX)
+ nErrFlags = nFlags;
return (*(WindowDisplayErrorFunc*)pData->pDsp)(
- pParent, nErrFlags, aErr, aAction);
+ pParent, nErrFlags, aErr, aAction);
}
}
}
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 6445e91..bc0267d 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -632,9 +632,6 @@ void XMLPropertiesTContext_Impl::StartElement(
void XMLPropertiesTContext_Impl::Export()
{
- OUString aNewQName( GetTransformer().GetNamespaceMap().GetQNameByKey(
- XML_NAMESPACE_STYLE,
- ::xmloff::token::GetXMLToken( XML_PROPERTIES ) ) );
GetTransformer().GetDocHandler()->startElement( GetExportQName(),
m_xAttrList );
ExportContent();
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 3920d82..5332311 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -841,8 +841,6 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList(
break;
case XML_ATACTION_DECODE_ID:
{
- OUString aAttrValue;
-
const sal_Int32 nLen = rAttrValue.getLength();
OUStringBuffer aBuffer;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 1d72807..581663b 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -236,7 +236,6 @@ const Sequence< sal_Int8>& SecurityEnvironment_NssImpl :: getUnoTunnelId() {
::rtl::OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
{
- rtl::OUString result;
::rtl::OUStringBuffer buff;
for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); is++)
{
More information about the Libreoffice-commits
mailing list