[Libreoffice-commits] core.git: 2 commits - chart2/source connectivity/source dbaccess/source forms/source reportdesign/source sdext/source
Noel Grandin
noel at peralex.com
Mon Mar 2 00:27:25 PST 2015
chart2/source/controller/main/SelectionHelper.cxx | 3 +--
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 6 ------
connectivity/source/drivers/postgresql/pq_updateableresultset.hxx | 6 +-----
dbaccess/source/ui/misc/HtmlReader.cxx | 5 ++---
dbaccess/source/ui/misc/RtfReader.cxx | 5 ++---
forms/source/xforms/submission/submission_get.hxx | 2 --
reportdesign/source/filter/xml/xmlSubDocument.hxx | 1 -
sdext/source/minimizer/informationdialog.cxx | 3 +--
sdext/source/minimizer/informationdialog.hxx | 2 --
sdext/source/minimizer/optimizerdialog.cxx | 1 -
sdext/source/minimizer/optimizerdialog.hxx | 3 +--
sdext/source/minimizer/optimizerdialogcontrols.cxx | 2 +-
12 files changed, 9 insertions(+), 30 deletions(-)
New commits:
commit 5806a7ed44f675f8c2d6aaf16a4347f3e11c9783
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 2 09:36:39 2015 +0200
cppcheck: Variable is assigned a value that is never used
Change-Id: Iab6eaf148af6219a7c60af23c56ee088f6438a63
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index ee54fc8..fab28f5 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -256,14 +256,13 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject();
if( bBackGroundHit )
{
- //todo: if more than one diagram is available in future do chack the list of all diagrams here
+ //todo: if more than one diagram is available in future do check the list of all diagrams here
SdrObject* pDiagram = pDrawViewWrapper->getNamedSdrObject( aDiagramCID );
if( pDiagram )
{
if( pDrawViewWrapper->IsObjectHit( pDiagram, rMousePos ) )
{
m_aSelectedOID = ObjectIdentifier( aDiagramCID );
- pNewObj = pDiagram;
}
}
}
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index fc573d0..56470b3 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -412,7 +412,6 @@ bool OHTMLReader::CreateTable(int nToken)
aTempName = aTempName.getToken(0,' ');
aTempName = ::dbtools::createUniqueName(m_xTables, aTempName);
- int nTmpToken2 = nToken;
bool bCaption = false;
bool bTableHeader = false;
OUString aColumnName;
@@ -423,7 +422,7 @@ bool OHTMLReader::CreateTable(int nToken)
sal_Int32 nTextColor = 0;
do
{
- switch(nTmpToken2)
+ switch(nToken)
{
case HTML_TEXTTOKEN:
case HTML_SINGLECHAR:
@@ -492,7 +491,7 @@ bool OHTMLReader::CreateTable(int nToken)
break;
}
}
- while((nTmpToken2 = GetNextToken()) != HTML_TABLEROW_OFF);
+ while( GetNextToken() != HTML_TABLEROW_OFF );
if ( !m_sCurrent.isEmpty() )
aColumnName = m_sCurrent;
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index f761256..4e89f2a 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -253,13 +253,12 @@ bool ORTFReader::CreateTable(int nToken)
aTableName = aTableName.getToken(0,' ');
aTableName = ::dbtools::createUniqueName(m_xTables, aTableName);
- int nTmpToken2 = nToken;
OUString aColumnName;
FontDescriptor aFont = VCLUnoHelper::CreateFontDescriptor(Application::GetSettings().GetStyleSettings().GetAppFont());
do
{
- switch(nTmpToken2)
+ switch(nToken)
{
case RTF_UNKNOWNCONTROL:
case RTF_UNKNOWNDATA:
@@ -303,7 +302,7 @@ bool ORTFReader::CreateTable(int nToken)
break;
}
}
- while((nTmpToken2 = GetNextToken()) != RTF_TROWD && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED);
+ while( GetNextToken() != RTF_TROWD && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED );
bool bOk = !m_vDestVector.empty();
if(bOk)
commit a3646d5572b770c74b7b8be80b1091c37a05abc6
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 2 09:23:34 2015 +0200
cppcheck: duplicate inherited member
Change-Id: Iee20ca4523739eb082ea1fa8c1145891c0caed29
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 8241b17..95eb19b 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -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 )
throw( com::sun::star::uno::RuntimeException )
{
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
index 247bd50..c07c140 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
@@ -70,7 +70,6 @@ class UpdateableResultSet :
OUString m_table;
com::sun::star::uno::Sequence< OUString > m_primaryKey;
UpdateableFieldVector m_updateableField;
- com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > m_meta;
bool m_insertRow;
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 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
- 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;
-
+public:
static com::sun::star::uno::Sequence< com::sun::star::uno::Type > getStaticTypes( bool updateable )
throw( com::sun::star::uno::RuntimeException );
diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx
index c8689e9..0941f0c 100644
--- a/forms/source/xforms/submission/submission_get.hxx
+++ b/forms/source/xforms/submission/submission_get.hxx
@@ -26,8 +26,6 @@
class CSubmissionGet : public CSubmission
{
-private:
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
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;
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx
index bf33064..80e312e 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.hxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx
@@ -29,7 +29,6 @@ namespace rptxml
class OXMLCell;
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;
::std::vector< OUString> m_aMasterFields;
::std::vector< OUString> m_aDetailFields;
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 0592154..2aebca0 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -265,7 +265,7 @@ void InformationDialog::InitDialog()
OUString aTitle;
if ( !maSaveAsURL.isEmpty() )
{
- Reference< XURLTransformer > xURLTransformer( URLTransformer::create(mxContext) );
+ Reference< XURLTransformer > xURLTransformer( URLTransformer::create(UnoDialog::mxContext) );
util::URL aURL, aPresentationURL;
aURL.Complete = maSaveAsURL;
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 ) :
UnoDialog( rxContext, rxFrame ),
ConfigurationAccess( rxContext, NULL ),
- mxContext( rxContext ),
mxFrame( rxFrame ),
mxActionListener( new OKActionListener( *this ) ),
mnSourceSize( rSourceSize ),
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 761bf07..d674e08 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -55,7 +55,6 @@ public :
private :
- css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::frame::XFrame > mxFrame;
css::uno::Reference< css::io::XStream > mxTempFile;
@@ -72,7 +71,6 @@ private :
public :
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 >
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index d7c56cb..0a37e6b 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -210,7 +210,6 @@ OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxContex
ConfigurationAccess( rxContext, NULL ),
mnCurrentStep( 0 ),
mnTabIndex( 0 ),
- mxContext( rxContext ),
mxFrame( rxFrame ),
mxItemListener( new ItemListener( *this ) ),
mxActionListener( new ActionListener( *this ) ),
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index 512c0f3..cfd280c 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -71,7 +71,6 @@ public :
bool mbIsReadonly;
private :
- css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::frame::XFrame > mxFrame;
css::uno::Reference< css::uno::XInterface > mxRoadmapControl;
@@ -123,7 +122,7 @@ public :
OUString GetSelectedString( OUString const & token );
css::uno::Reference< css::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; };
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; };
};
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 6461e25..c86fcc4 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -747,7 +747,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
sal_Int32 nImageResolution( GetConfigProperty( TK_ImageResolution, (sal_Int32)0 ) );
GraphicSettings aGraphicSettings( bJPEGCompression, nJPEGQuality, GetConfigProperty( TK_RemoveCropArea, false ),
nImageResolution, GetConfigProperty( TK_EmbedLinkedGraphics, true ) );
- GraphicCollector::CountGraphics( mxContext, mxController->getModel(), aGraphicSettings, nGraphics );
+ GraphicCollector::CountGraphics( UnoDialog::mxContext, mxController->getModel(), aGraphicSettings, nGraphics );
if ( nGraphics > 1 )
{
OUString aStr( getString( STR_OPTIMIZE_IMAGES ) );
More information about the Libreoffice-commits
mailing list