[Libreoffice-commits] core.git: basctl/source chart2/source comphelper/source compilerplugins/clang connectivity/source include/comphelper toolkit/source
Noel Grandin
noel.grandin at collabora.co.uk
Sat Jul 22 12:08:39 UTC 2017
basctl/source/basicide/bastype3.hxx | 1 -
basctl/source/basicide/bastypes.cxx | 1 -
chart2/source/view/charttypes/BubbleChart.cxx | 8 +-------
chart2/source/view/charttypes/BubbleChart.hxx | 1 -
comphelper/source/misc/accimplaccess.cxx | 6 ------
compilerplugins/clang/unusedfields.readonly.results | 6 ------
connectivity/source/drivers/postgresql/pq_connection.hxx | 2 --
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 2 +-
include/comphelper/accimplaccess.hxx | 6 ------
toolkit/source/controls/accessiblecontrolcontext.cxx | 2 +-
10 files changed, 3 insertions(+), 32 deletions(-)
New commits:
commit 2b4cb88c029cc085e06effb32a2631033ccd8a50
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Jul 21 13:13:39 2017 +0200
loplugin:unusedfields in basctl..connectivity
Change-Id: I2f10daadb84e48eaf96f6cc63899b2f4fce7326e
Reviewed-on: https://gerrit.libreoffice.org/40295
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index 580da6a96595..9305685cdb35 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -31,7 +31,6 @@ class ExtendedEdit : public Edit
private:
Accelerator aAcc;
Link<Accelerator&,void> aAccHdl;
- Link<ExtendedEdit*,void> aLoseFocusHdl;
protected:
DECL_LINK( EditAccHdl, Accelerator&, void );
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 4873d8663b34..91515535a257 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -423,7 +423,6 @@ ExtendedEdit::ExtendedEdit(vcl::Window* pParent, WinBits nStyle)
IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl, Control&, void)
{
Application::InsertAccel( &aAcc );
- aLoseFocusHdl.Call( this );
}
IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl, Control&, void)
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index e78738a0e85e..19c278fff217 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -46,7 +46,6 @@ using namespace ::com::sun::star::chart2;
BubbleChart::BubbleChart( const uno::Reference<XChartType>& xChartTypeModel
, sal_Int32 nDimensionCount )
: VSeriesPlotter( xChartTypeModel, nDimensionCount, false )
- , m_bShowNegativeValues(false)
, m_fBubbleSizeScaling(1.0)
, m_fMaxLogicBubbleSize( 0.0 )
, m_fBubbleSizeFactorToScreen( 1.0 )
@@ -89,8 +88,6 @@ void BubbleChart::calculateMaximumLogicBubbleSize()
continue;
double fSize = pSeries->getBubble_Size( nIndex );
- if( m_bShowNegativeValues )
- fSize = fabs(fSize);
if( fSize > fMaxSize )
fMaxSize = fSize;
}
@@ -124,9 +121,6 @@ drawing::Direction3D BubbleChart::transformToScreenBubbleSize( double fLogicSize
if( ::rtl::math::isNan(fLogicSize) || ::rtl::math::isInf(fLogicSize) )
return aRet;
- if( m_bShowNegativeValues )
- fLogicSize = fabs(fLogicSize);
-
double fMaxSize = m_fMaxLogicBubbleSize;
double fMaxRadius = sqrt( fMaxSize / F_PI );
@@ -251,7 +245,7 @@ void BubbleChart::createShapes()
double fLogicY = pSeries->getYValue(nIndex);
double fBubbleSize = pSeries->getBubble_Size( nIndex );
- if( !m_bShowNegativeValues && fBubbleSize<0.0 )
+ if( fBubbleSize<0.0 )
continue;
if( fBubbleSize == 0.0 || ::rtl::math::isNan(fBubbleSize) )
diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx
index 6958e54d87ff..80cf1a4be282 100644
--- a/chart2/source/view/charttypes/BubbleChart.hxx
+++ b/chart2/source/view/charttypes/BubbleChart.hxx
@@ -53,7 +53,6 @@ private: //methods
private: //member
- bool m_bShowNegativeValues;//input parameter
double m_fBubbleSizeScaling;//input parameter
double m_fMaxLogicBubbleSize;//calculated values
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index 96fdbd96f381..9593b787d3a6 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -38,7 +38,6 @@ namespace comphelper
struct OAccImpl_Impl
{
Reference< XAccessible > m_xAccParent;
- sal_Int64 m_nForeignControlledStates;
};
OAccessibleImplementationAccess::OAccessibleImplementationAccess( )
@@ -58,11 +57,6 @@ namespace comphelper
}
- sal_Int64 OAccessibleImplementationAccess::implGetForeignControlledStates( ) const
- {
- return m_pImpl->m_nForeignControlledStates;
- }
-
const Sequence< sal_Int8 > OAccessibleImplementationAccess::getUnoTunnelImplementationId()
{
static cppu::OImplementationId implID;
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index fafa2d3a0c7d..f13d83aece78 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -1,5 +1,3 @@
-basctl/source/basicide/bastype3.hxx:34
- basctl::ExtendedEdit aLoseFocusHdl Link<class basctl::ExtendedEdit *, void>
basegfx/source/polygon/b2dtrapezoid.cxx:201
basegfx::trapezoidhelper::PointBlockAllocator maFirstStackBlock class basegfx::B2DPoint [32]
basic/qa/cppunit/basictest.hxx:27
@@ -56,8 +54,6 @@ canvas/source/vcl/impltools.hxx:117
vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
chart2/source/model/main/DataPoint.hxx:108
chart::DataPoint m_bNoParentPropAllowed _Bool
-chart2/source/view/charttypes/BubbleChart.hxx:56
- chart::BubbleChart m_bShowNegativeValues _Bool
chart2/source/view/inc/GL3DRenderer.hxx:54
chart::opengl3D::MaterialParameters pad float
chart2/source/view/inc/GL3DRenderer.hxx:55
@@ -68,8 +64,6 @@ chart2/source/view/inc/GL3DRenderer.hxx:65
chart::opengl3D::LightSource pad2 float
chart2/source/view/inc/GL3DRenderer.hxx:66
chart::opengl3D::LightSource pad3 float
-comphelper/source/misc/accimplaccess.cxx:41
- comphelper::OAccImpl_Impl m_nForeignControlledStates sal_Int64
connectivity/source/drivers/evoab2/EApi.h:122
(anonymous) address_format char *
connectivity/source/drivers/evoab2/EApi.h:125
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index bebabb04be82..c49cc8938454 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -97,7 +97,6 @@ struct ConnectionSettings
maxIndexKeys(0),
pTablesImpl(nullptr),
pViewsImpl(nullptr),
- showSystemColumns( false ),
logFile( nullptr ),
m_nLogLevel(LogLevel::Info)
{}
@@ -113,7 +112,6 @@ struct ConnectionSettings
Views *pViewsImpl; // needed to implement renaming of tables / views
OUString user;
OUString catalog;
- bool showSystemColumns;
FILE *logFile;
LogLevel m_nLogLevel;
};
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 1e0443e651f4..7c440d7eb334 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1563,7 +1563,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumns(
while( rs->next() )
{
- if( m_pSettings->showSystemColumns || ! isSystemColumn( xRow->getShort( 12 ) ) )
+ if( ! isSystemColumn( xRow->getShort( 12 ) ) )
{
OUString sNewSchema( xRow->getString(1) );
OUString sNewTable( xRow->getString(2) );
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index 6d5322548e13..943c12b864c1 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -70,12 +70,6 @@ namespace comphelper
const css::uno::Reference< css::accessibility::XAccessible >&
implGetForeignControlledParent( ) const;
- /** retrieves the set of currently set states which are controlled by a foreign instance
- @return
- a bit mask, where a set bit 2^n means that the AccessibleStateType n has been set
- */
- sal_Int64 implGetForeignControlledStates( ) const;
-
protected:
OAccessibleImplementationAccess( );
virtual ~OAccessibleImplementationAccess( );
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index bd9d72958a8b..cde540b577d9 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -176,7 +176,7 @@ namespace toolkit
if ( isAlive() )
{
// no own states, only the ones which are foreign controlled
- pStateSet = new ::utl::AccessibleStateSetHelper( implGetForeignControlledStates() );
+ pStateSet = new ::utl::AccessibleStateSetHelper( 0 );
}
else
{ // only the DEFUNC state if we're already disposed
More information about the Libreoffice-commits
mailing list