From f2b3df3709dd4b5cad5a663b10d2382830642694 Mon Sep 17 00:00:00 2001 From: zhouleonlei Date: Tue, 29 Dec 2020 10:47:05 +0800 Subject: [PATCH] [NUI] Fix Svace issues --- src/Tizen.NUI/src/internal/PropertyRangeManager.cs | 2 +- src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tizen.NUI/src/internal/PropertyRangeManager.cs b/src/Tizen.NUI/src/internal/PropertyRangeManager.cs index a0168b4..aefc0c8 100755 --- a/src/Tizen.NUI/src/internal/PropertyRangeManager.cs +++ b/src/Tizen.NUI/src/internal/PropertyRangeManager.cs @@ -99,7 +99,7 @@ namespace Tizen.NUI // for every base class increase property start index startEventPropertyIndex += (int)Tizen.NUI.PropertyRanges.DEFAULT_PROPERTY_MAX_COUNT_PER_DERIVATION; // DALi uses 10,000 startAnimatablePropertyIndex += maxCountPerDerivation; - NUILog.Debug("getStartPropertyIndex = " + viewType.Name + "current index " + startEventPropertyIndex); + NUILog.Debug("getStartPropertyIndex = " + viewType?.Name + "current index " + startEventPropertyIndex); viewType = viewType.GetTypeInfo().BaseType; } } diff --git a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs b/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs index 7c2469b..751172f 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs @@ -133,7 +133,7 @@ namespace Tizen.NUI.Binding BindableProperty implicitStyleProperty = BindableProperty.Create(nameof(ImplicitStyle), typeof(Style), typeof(View), default(Style), propertyChanged: (bindable, oldvalue, newvalue) => OnImplicitStyleChanged()); _implicitStyles.Add(implicitStyleProperty); - Target.SetDynamicResource(implicitStyleProperty, type.FullName); + Target.SetDynamicResource(implicitStyleProperty, type?.FullName); type = type.GetTypeInfo().BaseType; if (s_stopAtTypes.Contains(type)) return; -- 2.7.4