projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix various Klocwork errors" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
table-view
/
table-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index
fb97e6e
..
a730e40
100644
(file)
--- a/
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@
-1197,8
+1197,8
@@
void TableView::SetHeightOrWidthProperty(TableView& tableViewImpl,
if( childMap )
{
Property::Value* policy = childMap->Find( "policy" );
if( childMap )
{
Property::Value* policy = childMap->Find( "policy" );
- Property::Value*
v
alue = childMap->Find( "value" );
- if( policy &&
v
alue )
+ Property::Value*
childMapV
alue = childMap->Find( "value" );
+ if( policy &&
childMapV
alue )
{
std::string policyValue;
policy->Get( policyValue );
{
std::string policyValue;
policy->Get( policyValue );
@@
-1210,11
+1210,11
@@
void TableView::SetHeightOrWidthProperty(TableView& tableViewImpl,
{
if( policy == Toolkit::TableView::FIXED )
{
{
if( policy == Toolkit::TableView::FIXED )
{
- (tableViewImpl.*funcFixed)( index,
v
alue->Get<float>() );
+ (tableViewImpl.*funcFixed)( index,
childMapV
alue->Get<float>() );
}
else if( policy == Toolkit::TableView::RELATIVE )
{
}
else if( policy == Toolkit::TableView::RELATIVE )
{
- (tableViewImpl.*funcRelative)( index,
v
alue->Get<float>() );
+ (tableViewImpl.*funcRelative)( index,
childMapV
alue->Get<float>() );
}
else if( policy == Toolkit::TableView::FIT )
{
}
else if( policy == Toolkit::TableView::FIT )
{