equal
deleted
inserted
replaced
1 // Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). |
1 // Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). |
2 // All rights reserved. |
2 // All rights reserved. |
3 // This component and the accompanying materials are made available |
3 // This component and the accompanying materials are made available |
4 // under the terms of "Eclipse Public License v1.0" |
4 // under the terms of "Eclipse Public License v1.0" |
5 // which accompanies this distribution, and is available |
5 // which accompanies this distribution, and is available |
6 // at the URL "http://www.eclipse.org/legal/epl-v10.html". |
6 // at the URL "http://www.eclipse.org/legal/epl-v10.html". |
109 User::LeaveIfError(CreateUserCityTableL()); |
109 User::LeaveIfError(CreateUserCityTableL()); |
110 } |
110 } |
111 } |
111 } |
112 User::LeaveIfError(error); |
112 User::LeaveIfError(error); |
113 // Check if both tables are created. |
113 // Check if both tables are created. |
114 TRAP(error, iLocalizedTimeZoneDb.ColSetL(KCZTableName)); |
114 CDbColSet *colSet = NULL; |
|
115 TRAP(error, colSet = iLocalizedTimeZoneDb.ColSetL(KCZTableName)); |
|
116 delete colSet; |
115 if (error) |
117 if (error) |
116 { |
118 { |
117 User::LeaveIfError(CreateFrequentlyUsedZoneTableL()); |
119 User::LeaveIfError(CreateFrequentlyUsedZoneTableL()); |
118 } |
120 } |
119 TRAP(error, iLocalizedTimeZoneDb.ColSetL(KUCTableName)); |
121 TRAP(error, colSet = iLocalizedTimeZoneDb.ColSetL(KUCTableName)); |
|
122 delete colSet; |
120 if (error) |
123 if (error) |
121 { |
124 { |
122 User::LeaveIfError(CreateUserCityTableL()); |
125 User::LeaveIfError(CreateUserCityTableL()); |
123 } |
126 } |
124 } |
127 } |