[Libreoffice-commits] .: chart2/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Tue Feb 1 14:59:40 PST 2011
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx | 3 ++-
chart2/source/controller/main/SelectionHelper.cxx | 2 +-
chart2/source/controller/main/SelectionHelper.hxx | 2 +-
chart2/source/tools/OPropertySet.cxx | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 019f8611a913e9eba1029a8e342a4d782b3ad3f8
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Feb 1 23:59:20 2011 +0100
Some cppcheck cleaning
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index de21e98..2a72dae 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -179,9 +179,10 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
if( rSubIncrements.getLength() == 0 )
rSubIncrements.realloc( 1 );
- double fStepMain = 0, fStepHelp = 0;
+ double fStepHelp = 0;
if( (rOuterValue >>= fStepHelp) )
{
+ double fStepMain = 0;
if( AxisHelper::isLogarithmic(aScaleData.Scaling) )
{
sal_Int32 nIntervalCount = static_cast< sal_Int32 >(fStepHelp);
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index bbcd931..53852fa 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -151,7 +151,7 @@ void Selection::remindSelectionBeforeMouseDown()
m_aSelectedOID_beforeMouseDown = m_aSelectedOID;
}
-bool Selection::isSelectionDifferentFromBeforeMouseDown()
+bool Selection::isSelectionDifferentFromBeforeMouseDown() const
{
return ( m_aSelectedOID != m_aSelectedOID_beforeMouseDown );
}
diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx
index fe7e743..331d95e 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -74,7 +74,7 @@ public: //methods
void resetPossibleSelectionAfterSingleClickWasEnsured();
void remindSelectionBeforeMouseDown();
- bool isSelectionDifferentFromBeforeMouseDown();
+ bool isSelectionDifferentFromBeforeMouseDown() const;
void adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* pDrawViewWrapper
, bool bIsRightMouse, bool bWaitingForDoubleClick );
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 8d7ba0d..66b757c 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -304,7 +304,7 @@ void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast
{
aDefault = GetDefaultValue( nHandle );
}
- catch( beans::UnknownPropertyException ex )
+ catch( beans::UnknownPropertyException &ex )
{
aDefault.clear();
}
@@ -385,7 +385,7 @@ void SAL_CALL OPropertySet::getFastPropertyValue
{
rValue = GetDefaultValue( nHandle );
}
- catch( beans::UnknownPropertyException ex )
+ catch( beans::UnknownPropertyException &ex )
{
rValue.clear();
}
More information about the Libreoffice-commits
mailing list