equal
deleted
inserted
replaced
151 { |
151 { |
152 iButton.iFlags.iTextModified = false; |
152 iButton.iFlags.iTextModified = false; |
153 iButton.iFlags.iIsNullModified = false; |
153 iButton.iFlags.iIsNullModified = false; |
154 HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText); |
154 HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText); |
155 AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap); |
155 AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap); |
156 CleanupStack::PopAndDestroy(); // actionData |
156 CleanupStack::PopAndDestroy(actionData); |
157 } |
157 } |
158 iButton.iFlags.iPressed = false; |
158 iButton.iFlags.iPressed = false; |
159 TInt error = iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this); |
159 TInt error = iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this); |
160 if (error != KErrNone) { |
160 if (error != KErrNone) { |
161 User::Leave(error); // error can be positive or negative |
161 User::Leave(error); // error can be positive or negative |
169 } |
169 } |
170 |
170 |
171 void CHbDeviceProgressDialogSymbianPrivate::UpdateL() |
171 void CHbDeviceProgressDialogSymbianPrivate::UpdateL() |
172 { |
172 { |
173 CHbSymbianVariantMap* map = CHbSymbianVariantMap::NewL(); |
173 CHbSymbianVariantMap* map = CHbSymbianVariantMap::NewL(); |
|
174 CleanupStack::PushL(map); |
174 |
175 |
175 const CHbSymbianVariant* variant = Variant(KDialogMaximum); |
176 const CHbSymbianVariant* variant = Variant(KDialogMaximum); |
176 if (variant && *variant->Value<TInt>() != iMaximum) |
177 if (variant && *variant->Value<TInt>() != iMaximum) |
177 { |
178 { |
178 AddVariantL(KDialogMaximum, &iMaximum, CHbSymbianVariant::EInt, iVariantMap); |
179 AddVariantL(KDialogMaximum, &iMaximum, CHbSymbianVariant::EInt, iVariantMap); |
232 { |
233 { |
233 iButton.iFlags.iTextModified = false; |
234 iButton.iFlags.iTextModified = false; |
234 iButton.iFlags.iIsNullModified = false; |
235 iButton.iFlags.iIsNullModified = false; |
235 HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText); |
236 HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText); |
236 AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap); |
237 AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap); |
237 CleanupStack::PopAndDestroy(); // actionData |
238 CleanupStack::PopAndDestroy(actionData); |
238 } |
239 } |
239 |
240 |
240 TInt error = iDeviceDialog->Update(*map); |
241 TInt error = iDeviceDialog->Update(*map); |
241 delete map; map = 0; |
242 CleanupStack::PopAndDestroy(map); |
|
243 map = 0; |
242 if (error != KErrNone) { |
244 if (error != KErrNone) { |
243 User::Leave(error); // error can be positive or negative |
245 User::Leave(error); // error can be positive or negative |
244 } |
246 } |
245 } |
247 } |
246 |
248 |