summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-02 10:23:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-05-02 11:20:33 +0100
commit27d8c527012e2759b1d2b282feff433b26fdc4ce (patch)
treeb1917574d9d353352a92fb0fb08892a9e2405d64 /chart2
parent4cd9b2fbd39cca3553588ae9f61e674f1416a582 (diff)
WaE: simple-minded msvc2008 considers code unreachable
Change-Id: I97da4392bb3ca814e8d9037346c83fde4d460f97
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx20
1 files changed, 12 insertions, 8 deletions
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index b386b79853d3..39a0135ac185 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -717,6 +717,7 @@ OUString ObjectIdentifier::getDragParameterString( const OUString& rCID )
bool ObjectIdentifier::isDragableObject( const OUString& rClassifiedIdentifier )
{
+ bool bReturn = false;
ObjectType eObjectType = ObjectIdentifier::getObjectType( rClassifiedIdentifier );
switch( eObjectType )
{
@@ -725,14 +726,14 @@ bool ObjectIdentifier::isDragableObject( const OUString& rClassifiedIdentifier )
case OBJECTTYPE_DIAGRAM:
case OBJECTTYPE_DATA_CURVE_EQUATION:
//case OBJECTTYPE_DIAGRAM_WALL:
- return true;
+ bReturn = true;
+ break;
default:
OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( rClassifiedIdentifier ) );
- if( !aDragMethodServiceName.isEmpty() )
- return true;
- return false;
+ bReturn = !aDragMethodServiceName.isEmpty();
+ break;
}
- return false;
+ return bReturn;
}
bool ObjectIdentifier::isDragableObject()
@@ -751,16 +752,19 @@ bool ObjectIdentifier::isDragableObject()
bool ObjectIdentifier::isRotateableObject( const OUString& rClassifiedIdentifier )
{
+ bool bReturn = false;
ObjectType eObjectType = ObjectIdentifier::getObjectType( rClassifiedIdentifier );
switch( eObjectType )
{
case OBJECTTYPE_DIAGRAM:
//case OBJECTTYPE_DIAGRAM_WALL:
- return true;
+ bReturn = true;
+ break;
default:
- return false;
+ bReturn = false;
+ break;
}
- return false;
+ return bReturn;
}
bool ObjectIdentifier::isMultiClickObject( const OUString& rClassifiedIdentifier )