mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:unusedmethods in writerfilter to xmloff

Browse Source 
Change-Id: If95890eff0f785111e8b511ac1d5481c6910f099
Reviewed-on: https://gerrit.libreoffice.org/25148
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2016-05-19 10:43:16 +02:00 committed by Noel Grandin
parent e94deb0639
commit e9af29ba83
18 changed files with 2 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
writerfilter/inc/ooxml/OOXMLDocument.hxx
View File

@ -216,7 +216,6 @@ public:
virtual css::uno::Reference<css::frame::XModel> getModel() = 0;
virtual void setDrawPage(css::uno::Reference<css::drawing::XDrawPage> xDrawPage) = 0;
virtual css::uno::Reference<css::drawing::XDrawPage> getDrawPage() = 0;
virtual css::uno::Reference<css::io::XInputStream> getStorageStream() = 0;
virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) = 0;
virtual void setXNoteId(const sal_Int32 nId) = 0;
virtual sal_Int32 getXNoteId() const = 0;

5
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
View File

@ -883,11 +883,6 @@ uno::Reference<drawing::XDrawPage> OOXMLDocumentImpl::getDrawPage()
return mxDrawPage;
}
uno::Reference<io::XInputStream> OOXMLDocumentImpl::getStorageStream()
{
return mpStream->getStorageStream();
}
const uno::Sequence<beans::PropertyValue>& OOXMLDocumentImpl::getMediaDescriptor()
{
return maMediaDescriptor;

1
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
View File

@ -122,7 +122,6 @@ public:
virtual css::uno::Reference<css::frame::XModel> getModel() override;
virtual void setDrawPage(css::uno::Reference<css::drawing::XDrawPage> xDrawPage) override;
virtual css::uno::Reference<css::drawing::XDrawPage> getDrawPage() override;
virtual css::uno::Reference<css::io::XInputStream> getStorageStream() override;
virtual css::uno::Reference<css::io::XInputStream> getInputStreamForId(const OUString & rId) override;
virtual void setXNoteId(const sal_Int32 nId) override;
virtual sal_Int32 getXNoteId() const override;

2
writerfilter/source/ooxml/OOXMLFactory.hxx
View File

@ -98,7 +98,7 @@ public:
static void endAction(OOXMLFastContextHandler * pHandler, Token_t nToken);
private:
OOXMLFactory() {}
OOXMLFactory() = delete;
static OOXMLFactory_ns::Pointer_t getFactoryForNamespace(Id id);
static css::uno::Reference< css::xml::sax::XFastContextHandler> createFastChildContextFromFactory(OOXMLFastContextHandler * pHandler, OOXMLFactory_ns::Pointer_t pFactory, Token_t Element);

1
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
View File

@ -44,7 +44,6 @@ public:
enum ResourceEnum_t { UNKNOWN, STREAM, PROPERTIES, TABLE, SHAPE };
OOXMLFastContextHandler();
explicit OOXMLFastContextHandler(css::uno::Reference< css::uno::XComponentContext > const & context);
explicit OOXMLFastContextHandler(OOXMLFastContextHandler * pContext);

92
writerperfect/source/writer/WordPerfectImportFilter.cxx
View File

@ -256,98 +256,6 @@ throw (RuntimeException, std::exception)
}
WordPerfectImportFilterDialog::WordPerfectImportFilterDialog()
{}
WordPerfectImportFilterDialog::~WordPerfectImportFilterDialog()
{
}
void SAL_CALL WordPerfectImportFilterDialog::setTitle(const OUString &)
throw (RuntimeException, std::exception)
{
}
sal_Int16 SAL_CALL WordPerfectImportFilterDialog::execute()
throw (RuntimeException, std::exception)
{
WPXSvInputStream input(mxInputStream);
OString aUtf8Passwd;
libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(&input);
if (libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence)
{
int unsuccessfulAttempts = 0;
while (true)
{
ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg(nullptr);
aPasswdDlg->SetMinLen(0);
if (!aPasswdDlg->Execute())
return css::ui::dialogs::ExecutableDialogResults::CANCEL;
msPassword = aPasswdDlg->GetPassword().getStr();
aUtf8Passwd = OUStringToOString(msPassword, RTL_TEXTENCODING_UTF8);
if (libwpd::WPD_PASSWORD_MATCH_OK == libwpd::WPDocument::verifyPassword(&input, aUtf8Passwd.getStr()))
break;
else
unsuccessfulAttempts++;
if (unsuccessfulAttempts == 3) // timeout after 3 password atempts
return css::ui::dialogs::ExecutableDialogResults::CANCEL;
}
}
return css::ui::dialogs::ExecutableDialogResults::OK;
}
Sequence<PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValues() throw(RuntimeException, std::exception)
{
Sequence<PropertyValue> aRet(1);
PropertyValue *pArray = aRet.getArray();
pArray[0].Name = "Password";
pArray[0].Value <<= msPassword;
return aRet;
}
void SAL_CALL WordPerfectImportFilterDialog::setPropertyValues(const Sequence<PropertyValue> &aProps)
throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception)
{
const PropertyValue *pPropArray = aProps.getConstArray();
long nPropCount = aProps.getLength();
for (long i = 0; i < nPropCount; i++)
{
const PropertyValue &rProp = pPropArray[i];
OUString aPropName = rProp.Name;
if (aPropName == "Password")
rProp.Value >>= msPassword;
else if (aPropName == "InputStream")
rProp.Value >>= mxInputStream;
}
}
// XServiceInfo
OUString SAL_CALL WordPerfectImportFilterDialog::getImplementationName()
throw (RuntimeException, std::exception)
{
return OUString("com.sun.star.comp.Writer.WordPerfectImportFilterDialog");
}
sal_Bool SAL_CALL WordPerfectImportFilterDialog::supportsService(const OUString &rServiceName)
throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
Sequence < OUString > aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" };
return aRet;
}
extern "C"
SAL_DLLPUBLIC_EXPORT css::uno::XInterface *SAL_CALL
com_sun_star_comp_Writer_WordPerfectImportFilter_get_implementation(

41
writerperfect/source/writer/WordPerfectImportFilter.hxx
View File

@ -89,47 +89,6 @@ SAL_CALL WordPerfectImportFilter_createInstance(const css::uno::Reference< css::
throw (css::uno::Exception);
class WordPerfectImportFilterDialog : public cppu::WeakImplHelper <
css::ui::dialogs::XExecutableDialog,
css::lang::XServiceInfo,
css::beans::XPropertyAccess
>
{
OUString msPassword;
css::uno::Reference< css::io::XInputStream > mxInputStream;
virtual ~WordPerfectImportFilterDialog();
// XExecutableDialog
virtual void SAL_CALL setTitle(const OUString &aTitle)
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int16 SAL_CALL execute()
throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) override;
// XPropertyAccess
virtual css::uno::Sequence< css::beans::PropertyValue >
SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValues(const css::uno::Sequence<
css::beans::PropertyValue >& aProps)
throw (css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
css::lang::IllegalArgumentException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception) override;
public:
explicit WordPerfectImportFilterDialog();
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

1
xmlhelp/Library_ucpchelp1.mk
View File

@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,ucpchelp1,\
))
$(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
xmlhelp/source/cxxhelp/provider/bufferedinputstream \
xmlhelp/source/cxxhelp/provider/content \
xmlhelp/source/cxxhelp/provider/contentcaps \
xmlhelp/source/cxxhelp/provider/databases \

205
xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
View File

@ -1,205 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "bufferedinputstream.hxx"
#include <cppuhelper/queryinterface.hxx>
#include <string.h>
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::io;
using namespace chelp;
BufferedInputStream::BufferedInputStream(const Reference<XInputStream>& xInputStream)
: m_nBufferLocation(0),
m_nBufferSize(0),
m_pBuffer(new sal_Int8[1]) // Initialize with one to avoid gcc compiler warnings
{
try
{
sal_Int32 num;
sal_Int8 *tmp;
Sequence< sal_Int8 > aData(4096);
do{
num = xInputStream->readBytes(aData,4096);
if( num > 0 )
{
tmp = m_pBuffer;
m_pBuffer = new sal_Int8[m_nBufferSize+num];
memcpy(static_cast<void *>(m_pBuffer),
static_cast<void *>(tmp),
sal_uInt32(m_nBufferSize));
memcpy(static_cast<void *>(m_pBuffer+m_nBufferSize),
static_cast<void *>(aData.getArray()),
sal_uInt32(num));
m_nBufferSize += num;
delete[] tmp;
}
} while( num == 4096 );
}
catch( const NotConnectedException&)
{
}
catch( const BufferSizeExceededException&)
{
}
catch( const IOException&)
{
}
catch( const RuntimeException&)
{
}
xInputStream->closeInput();
}
BufferedInputStream::~BufferedInputStream()
{
delete[] m_pBuffer;
}
Any SAL_CALL BufferedInputStream::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
{
Any aRet = ::cppu::queryInterface( rType,
(static_cast< XInputStream* >(this)),
(static_cast< XSeekable* >(this)) );
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
void SAL_CALL BufferedInputStream::acquire() throw()
{
OWeakObject::acquire();
}
void SAL_CALL BufferedInputStream::release() throw()
{
OWeakObject::release();
}
sal_Int32 SAL_CALL BufferedInputStream::readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead )
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
RuntimeException, std::exception)
{
osl::MutexGuard aGuard( m_aMutex );
if( 0 > nBytesToRead )
throw BufferSizeExceededException();
if( m_nBufferLocation + nBytesToRead > m_nBufferSize )
nBytesToRead = m_nBufferSize - m_nBufferLocation;
if( aData.getLength() < nBytesToRead )
aData.realloc(nBytesToRead);
memcpy(static_cast<void*>(aData.getArray()),
static_cast<void*>(m_pBuffer+m_nBufferLocation),
nBytesToRead);
return nBytesToRead;
}
sal_Int32 SAL_CALL BufferedInputStream::readSomeBytes(
Sequence< sal_Int8 >& aData,sal_Int32 nMaxBytesToRead )
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
RuntimeException, std::exception)
{
return readBytes(aData,nMaxBytesToRead);
}
void SAL_CALL BufferedInputStream::skipBytes( sal_Int32 nBytesToSkip )
throw( NotConnectedException,
BufferSizeExceededException,
IOException,
RuntimeException, std::exception )
{
try
{
seek(m_nBufferLocation+nBytesToSkip);
}
catch( const IllegalArgumentException& )
{
throw BufferSizeExceededException();
}
}
sal_Int32 SAL_CALL BufferedInputStream::available()
throw( NotConnectedException,
IOException,
RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
return m_nBufferSize-m_nBufferLocation;
}
void SAL_CALL BufferedInputStream::closeInput()
throw( NotConnectedException,
IOException,
RuntimeException, std::exception )
{
}
void SAL_CALL BufferedInputStream::seek( sal_Int64 location )
throw( IllegalArgumentException,
IOException,
RuntimeException, std::exception )
{
if( 0 <= location && location < m_nBufferSize )
{
osl::MutexGuard aGuard( m_aMutex );
m_nBufferLocation = sal::static_int_cast<sal_Int32>( location );
}
else
throw IllegalArgumentException();
}
sal_Int64 SAL_CALL BufferedInputStream::getPosition()
throw( IOException,
RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
return m_nBufferLocation;
}
sal_Int64 SAL_CALL BufferedInputStream::getLength() throw( IOException,RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
return m_nBufferSize;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

107
xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
View File

@ -1,107 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_XMLHELP_SOURCE_CXXHELP_PROVIDER_BUFFEREDINPUTSTREAM_HXX
#define INCLUDED_XMLHELP_SOURCE_CXXHELP_PROVIDER_BUFFEREDINPUTSTREAM_HXX
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
namespace chelp {
class BufferedInputStream
: public cppu::OWeakObject,
public css::io::XInputStream,
public css::io::XSeekable
{
private:
sal_Int32 m_nBufferLocation;
sal_Int32 m_nBufferSize;
sal_Int8 *m_pBuffer;
osl::Mutex m_aMutex;
public:
explicit BufferedInputStream(
const css::uno::Reference<css::io::XInputStream>& xInputStream);
virtual ~BufferedInputStream();
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type& rType )
throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData,
sal_Int32 nBytesToRead )
throw( css::io::NotConnectedException,
css::io::BufferSizeExceededException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData,
sal_Int32 nMaxBytesToRead )
throw( css::io::NotConnectedException,
css::io::BufferSizeExceededException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
throw( css::io::NotConnectedException,
css::io::BufferSizeExceededException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL available()
throw( css::io::NotConnectedException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL closeInput()
throw( css::io::NotConnectedException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL seek( sal_Int64 location )
throw( css::lang::IllegalArgumentException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int64 SAL_CALL getPosition()
throw( css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int64 SAL_CALL getLength()
throw( css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
};
}
#endif // INCLUDED_XMLHELP_SOURCE_CXXHELP_PROVIDER_BUFFEREDINPUTSTREAM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
xmlhelp/source/cxxhelp/provider/urlparameter.cxx
View File

@ -18,8 +18,6 @@
*/
#include "bufferedinputstream.hxx"
#include <string.h>
#include <osl/diagnose.hxx>
#include <osl/thread.h>

5
xmloff/inc/StyleMap.hxx
View File

@ -35,11 +35,6 @@ struct StyleNameKey_Impl
m_aName( rName )
{
}
inline StyleNameKey_Impl() :
m_nFamily( 0 )
{
}
};
struct StyleNameHash_Impl

19
xmloff/inc/txtfldi.hxx
View File

@ -1339,25 +1339,6 @@ public:
const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
};
class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
{
public:
XMLCustomPropertyFieldImportContext (SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
const OUString& sAttrValue ) override;
/// prepare XTextField for insertion into document
virtual void PrepareField(
const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
xmloff/source/chart/SchXMLPlotAreaContext.hxx
View File

@ -49,9 +49,6 @@ public:
virtual ~SchXML3DSceneAttributesHelper();
void getCameraDefaultFromDiagram( const css::uno::Reference< css::chart::XDiagram >& xDiagram );
private:
SchXML3DSceneAttributesHelper();
};
class SchXMLPositionAttributesHelper

17
xmloff/source/chart/transporttypes.hxx
View File

@ -89,23 +89,6 @@ typedef ::std::multimap< tSchXMLIndexWithPart,
bool operator < ( const tSchXMLIndexWithPart & rFirst, const tSchXMLIndexWithPart & rSecond );
struct SchNumericCellRangeAddress
{
sal_Int32 nRow1, nRow2;
sal_Int32 nCol1, nCol2;
SchNumericCellRangeAddress() :
nRow1( -1 ), nRow2( -1 ),
nCol1( -1 ), nCol2( -1 )
{}
SchNumericCellRangeAddress( const SchNumericCellRangeAddress& aOther )
{
nRow1 = aOther.nRow1; nRow2 = aOther.nRow2;
nCol1 = aOther.nCol1; nCol2 = aOther.nCol2;
}
};
enum SchXMLAxisDimension
{
SCH_XML_AXIS_X = 0,

3
xmloff/source/forms/elementimport.hxx
View File

@ -55,8 +55,7 @@ namespace xmloff
typedef std::map<OUString, ElementType> MapString2Element;
static MapString2Element s_sElementTranslations;
protected:
OElementNameMap() { }
OElementNameMap() = delete;
public:
static ElementType getElementType(const OUString& _rName);

7
xmloff/source/text/txtparaimphint.hxx
View File

@ -51,13 +51,6 @@ public:
{
}
XMLHint_Impl( sal_uInt8 nTyp,
const css::uno::Reference < css::text::XTextRange > & rS ) :
xStart( rS ),
nType( nTyp )
{
}
virtual ~XMLHint_Impl() {}
const css::uno::Reference < css::text::XTextRange > & GetStart() const { return xStart; }

16
xmloff/source/transform/TransformerActions.hxx
View File

@ -31,13 +31,6 @@ struct NameKey_Impl
sal_uInt16 m_nPrefix;
OUString m_aLocalName;
inline NameKey_Impl( sal_uInt16 nPrfx,
::xmloff::token::XMLTokenEnum eLclNm ) :
m_nPrefix( nPrfx ),
m_aLocalName( ::xmloff::token::GetXMLToken( eLclNm ) )
{
}
inline NameKey_Impl( sal_uInt16 nPrfx, const OUString& rLclNm ) :
m_nPrefix( nPrfx ),
m_aLocalName( rLclNm )
@ -82,15 +75,6 @@ struct TransformerAction_Impl
sal_uInt32 m_nParam2;
sal_uInt32 m_nParam3;
inline TransformerAction_Impl( sal_uInt32 nActnTp, sal_uInt32 nPrm1,
sal_uInt32 nPrm2, sal_uInt32 nPrm3 ) :
m_nActionType( nActnTp ),
m_nParam1( nPrm1 ),
m_nParam2( nPrm2 ),
m_nParam3( nPrm3 )
{
}
inline TransformerAction_Impl() :
m_nActionType( XML_TACTION_EOT ),
m_nParam1( 0 ),