cppcheck: duplicate inherited member
Change-Id: Iee20ca4523739eb082ea1fa8c1145891c0caed29
This commit is contained in:
@@ -537,12 +537,6 @@ void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, cons
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > UpdateableResultSet::getMetaData( )
|
|
||||||
throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
|
|
||||||
{
|
|
||||||
return m_meta;
|
|
||||||
}
|
|
||||||
|
|
||||||
Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable )
|
Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable )
|
||||||
throw( com::sun::star::uno::RuntimeException )
|
throw( com::sun::star::uno::RuntimeException )
|
||||||
{
|
{
|
||||||
|
@@ -70,7 +70,6 @@ class UpdateableResultSet :
|
|||||||
OUString m_table;
|
OUString m_table;
|
||||||
com::sun::star::uno::Sequence< OUString > m_primaryKey;
|
com::sun::star::uno::Sequence< OUString > m_primaryKey;
|
||||||
UpdateableFieldVector m_updateableField;
|
UpdateableFieldVector m_updateableField;
|
||||||
com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > m_meta;
|
|
||||||
bool m_insertRow;
|
bool m_insertRow;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -164,10 +163,7 @@ public: // XRowUpdate
|
|||||||
virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
|
virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
|
||||||
virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
|
virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
|
||||||
|
|
||||||
public: // XResultSetMetaDataSupplier
|
public:
|
||||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( )
|
|
||||||
throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
|
|
||||||
|
|
||||||
|
|
||||||
static com::sun::star::uno::Sequence< com::sun::star::uno::Type > getStaticTypes( bool updateable )
|
static com::sun::star::uno::Sequence< com::sun::star::uno::Type > getStaticTypes( bool updateable )
|
||||||
throw( com::sun::star::uno::RuntimeException );
|
throw( com::sun::star::uno::RuntimeException );
|
||||||
|
@@ -26,8 +26,6 @@
|
|||||||
|
|
||||||
class CSubmissionGet : public CSubmission
|
class CSubmissionGet : public CSubmission
|
||||||
{
|
{
|
||||||
private:
|
|
||||||
css::uno::Reference< css::uno::XComponentContext > m_xContext;
|
|
||||||
public:
|
public:
|
||||||
CSubmissionGet(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment);
|
CSubmissionGet(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment);
|
||||||
virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler) SAL_OVERRIDE;
|
virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler) SAL_OVERRIDE;
|
||||||
|
@@ -29,7 +29,6 @@ namespace rptxml
|
|||||||
class OXMLCell;
|
class OXMLCell;
|
||||||
class OXMLSubDocument : public OXMLReportElementBase, public IMasterDetailFieds
|
class OXMLSubDocument : public OXMLReportElementBase, public IMasterDetailFieds
|
||||||
{
|
{
|
||||||
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xComponent;
|
|
||||||
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake;
|
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> m_xFake;
|
||||||
::std::vector< OUString> m_aMasterFields;
|
::std::vector< OUString> m_aMasterFields;
|
||||||
::std::vector< OUString> m_aDetailFields;
|
::std::vector< OUString> m_aDetailFields;
|
||||||
|
@@ -265,7 +265,7 @@ void InformationDialog::InitDialog()
|
|||||||
OUString aTitle;
|
OUString aTitle;
|
||||||
if ( !maSaveAsURL.isEmpty() )
|
if ( !maSaveAsURL.isEmpty() )
|
||||||
{
|
{
|
||||||
Reference< XURLTransformer > xURLTransformer( URLTransformer::create(mxContext) );
|
Reference< XURLTransformer > xURLTransformer( URLTransformer::create(UnoDialog::mxContext) );
|
||||||
util::URL aURL, aPresentationURL;
|
util::URL aURL, aPresentationURL;
|
||||||
aURL.Complete = maSaveAsURL;
|
aURL.Complete = maSaveAsURL;
|
||||||
xURLTransformer->parseSmart( aURL, OUString() );
|
xURLTransformer->parseSmart( aURL, OUString() );
|
||||||
@@ -315,7 +315,6 @@ void InformationDialog::InitDialog()
|
|||||||
InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) :
|
InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) :
|
||||||
UnoDialog( rxContext, rxFrame ),
|
UnoDialog( rxContext, rxFrame ),
|
||||||
ConfigurationAccess( rxContext, NULL ),
|
ConfigurationAccess( rxContext, NULL ),
|
||||||
mxContext( rxContext ),
|
|
||||||
mxFrame( rxFrame ),
|
mxFrame( rxFrame ),
|
||||||
mxActionListener( new OKActionListener( *this ) ),
|
mxActionListener( new OKActionListener( *this ) ),
|
||||||
mnSourceSize( rSourceSize ),
|
mnSourceSize( rSourceSize ),
|
||||||
|
@@ -55,7 +55,6 @@ public :
|
|||||||
|
|
||||||
private :
|
private :
|
||||||
|
|
||||||
css::uno::Reference< css::uno::XComponentContext > mxContext;
|
|
||||||
css::uno::Reference< css::frame::XFrame > mxFrame;
|
css::uno::Reference< css::frame::XFrame > mxFrame;
|
||||||
css::uno::Reference< css::io::XStream > mxTempFile;
|
css::uno::Reference< css::io::XStream > mxTempFile;
|
||||||
|
|
||||||
@@ -72,7 +71,6 @@ private :
|
|||||||
public :
|
public :
|
||||||
|
|
||||||
css::uno::Reference< css::frame::XFrame>& GetFrame() { return mxFrame; };
|
css::uno::Reference< css::frame::XFrame>& GetFrame() { return mxFrame; };
|
||||||
const css::uno::Reference< css::uno::XComponentContext >& GetComponentContext() { return mxContext; };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class OKActionListener : public ::cppu::WeakImplHelper1< css::awt::XActionListener >
|
class OKActionListener : public ::cppu::WeakImplHelper1< css::awt::XActionListener >
|
||||||
|
@@ -210,7 +210,6 @@ OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxContex
|
|||||||
ConfigurationAccess( rxContext, NULL ),
|
ConfigurationAccess( rxContext, NULL ),
|
||||||
mnCurrentStep( 0 ),
|
mnCurrentStep( 0 ),
|
||||||
mnTabIndex( 0 ),
|
mnTabIndex( 0 ),
|
||||||
mxContext( rxContext ),
|
|
||||||
mxFrame( rxFrame ),
|
mxFrame( rxFrame ),
|
||||||
mxItemListener( new ItemListener( *this ) ),
|
mxItemListener( new ItemListener( *this ) ),
|
||||||
mxActionListener( new ActionListener( *this ) ),
|
mxActionListener( new ActionListener( *this ) ),
|
||||||
|
@@ -71,7 +71,6 @@ public :
|
|||||||
bool mbIsReadonly;
|
bool mbIsReadonly;
|
||||||
|
|
||||||
private :
|
private :
|
||||||
css::uno::Reference< css::uno::XComponentContext > mxContext;
|
|
||||||
css::uno::Reference< css::frame::XFrame > mxFrame;
|
css::uno::Reference< css::frame::XFrame > mxFrame;
|
||||||
|
|
||||||
css::uno::Reference< css::uno::XInterface > mxRoadmapControl;
|
css::uno::Reference< css::uno::XInterface > mxRoadmapControl;
|
||||||
@@ -123,7 +122,7 @@ public :
|
|||||||
OUString GetSelectedString( OUString const & token );
|
OUString GetSelectedString( OUString const & token );
|
||||||
css::uno::Reference< css::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; };
|
css::uno::Reference< css::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; };
|
||||||
css::uno::Reference< css::frame::XFrame>& GetFrame() { return mxFrame; };
|
css::uno::Reference< css::frame::XFrame>& GetFrame() { return mxFrame; };
|
||||||
const css::uno::Reference< css::uno::XComponentContext >& GetComponentContext() { return mxContext; };
|
const css::uno::Reference< css::uno::XComponentContext >& GetComponentContext() { return UnoDialog::mxContext; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@@ -747,7 +747,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
|
|||||||
sal_Int32 nImageResolution( GetConfigProperty( TK_ImageResolution, (sal_Int32)0 ) );
|
sal_Int32 nImageResolution( GetConfigProperty( TK_ImageResolution, (sal_Int32)0 ) );
|
||||||
GraphicSettings aGraphicSettings( bJPEGCompression, nJPEGQuality, GetConfigProperty( TK_RemoveCropArea, false ),
|
GraphicSettings aGraphicSettings( bJPEGCompression, nJPEGQuality, GetConfigProperty( TK_RemoveCropArea, false ),
|
||||||
nImageResolution, GetConfigProperty( TK_EmbedLinkedGraphics, true ) );
|
nImageResolution, GetConfigProperty( TK_EmbedLinkedGraphics, true ) );
|
||||||
GraphicCollector::CountGraphics( mxContext, mxController->getModel(), aGraphicSettings, nGraphics );
|
GraphicCollector::CountGraphics( UnoDialog::mxContext, mxController->getModel(), aGraphicSettings, nGraphics );
|
||||||
if ( nGraphics > 1 )
|
if ( nGraphics > 1 )
|
||||||
{
|
{
|
||||||
OUString aStr( getString( STR_OPTIMIZE_IMAGES ) );
|
OUString aStr( getString( STR_OPTIMIZE_IMAGES ) );
|
||||||
|
Reference in New Issue
Block a user