| blob | 1d96a197a14e09d7dc26f1e1fcb200418a22e53e |
1 --- officecfg/registry/schema/org/openoffice/Office/Writer.xcs.old 2009-04-02 11:01:44.000000000 +0000
2 +++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs 2009-04-06 16:41:41.000000000 +0000
3 @@ -1654,6 +1654,18 @@
4 </info>
5 <value>false</value>
6 </prop>
7 + <!-- added for apply char unit 2006-12-1 -->
8 + <prop oor:name="ApplyCharUnit" oor:type="xs:boolean">
9 + <!-- OldPath: Writer/Layout -->
10 + <!-- OldLocation: Soffice.cfg -->
11 + <!-- UIHints: Tools - Options - Text document - Layout - [Section] Apply char unit -->
12 + <info>
13 + <author>OS</author>
14 + <desc>apply char unit to calculate the paragraph's indent</desc>
15 + <label>apply char unit</label>
16 + </info>
17 + <value>true</value>
18 + </prop>
19 </group>
20 </group>
21 <group oor:name="Grid">
22 --- rsc/inc/vclrsc.hxx.old 2009-04-02 10:44:31.000000000 +0000
23 +++ rsc/inc/vclrsc.hxx 2009-04-06 16:41:41.000000000 +0000
24 @@ -176,7 +176,7 @@ typedef sal_Int64 WinBits;
25 // from vcl/inc/fldunit.hxx
26 enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
27 FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
28 - FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
29 + FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
30 FUNIT_PERCENT, FUNIT_100TH_MM };
33 --- rsc/source/parser/rscibas.cxx.old 2009-04-02 10:44:31.000000000 +0000
34 +++ rsc/source/parser/rscibas.cxx 2009-04-06 16:41:41.000000000 +0000
35 @@ -240,6 +240,9 @@ RscEnum * RscTypCont::InitFieldUnitsType
36 SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT );
37 SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE );
38 SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM );
39 + // Amelia : adds two units ,"char" and "line"
40 + SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR );
41 + SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE );
42 SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT );
44 return pFieldUnits;
45 --- sfx2/inc/sfx2/sfxsids.hrc.old 2009-04-02 10:44:03.000000000 +0000
46 +++ sfx2/inc/sfx2/sfxsids.hrc 2009-04-06 16:41:41.000000000 +0000
47 @@ -1028,6 +1028,7 @@
48 #define SID_ATTR_QUICKLAUNCHER (SID_OPTIONS_START + 74)
49 #define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87)
50 #define SID_ATTR_ALLOWFOLDERWEBVIEW (SID_OPTIONS_START + 92)
51 +#define SID_ATTR_APPLYCHARUNIT (SID_OPTIONS_START + 88)
54 // PathTabPage
55 --- sfx2/sdi/sfx.sdi.old 2009-04-02 10:43:51.000000000 +0000
56 +++ sfx2/sdi/sfx.sdi 2009-04-06 16:41:41.000000000 +0000
57 @@ -4282,6 +4282,33 @@ SfxUInt16Item MetricUnit SID_ATTR_METRIC
58 ]
60 //--------------------------------------------------------------------------
61 +SfxBoolItem ApplyCharUnit SID_ATTR_APPLYCHARUNIT
62 +
63 +[
64 + /* flags: */
65 + AutoUpdate = TRUE,
66 + Cachable = Volatile,
67 + FastCall = FALSE,
68 + HasCoreId = FALSE,
69 + HasDialog = FALSE,
70 + ReadOnlyDoc = TRUE,
71 + Toggle = FALSE,
72 + Container = FALSE,
73 + RecordAbsolute = FALSE,
74 + RecordPerSet;
75 + Synchron;
76 +
77 + Readonly = FALSE,
78 +
79 + /* config: */
80 + AccelConfig = FALSE,
81 + MenuConfig = FALSE,
82 + StatusBarConfig = FALSE,
83 + ToolBoxConfig = FALSE,
84 + GroupId = GID_VIEW;
85 +]
86 +
87 +//--------------------------------------------------------------------------
88 SfxBoolItem Modified SID_MODIFIED
90 [
91 --- svtools/inc/svtools/poolitem.hxx.old 2009-04-02 11:06:22.000000000 +0000
92 +++ svtools/inc/svtools/poolitem.hxx 2009-04-06 16:41:41.000000000 +0000
93 @@ -103,7 +103,7 @@ enum SfxFieldUnit
94 {
95 SFX_FUNIT_NONE, SFX_FUNIT_MM, SFX_FUNIT_CM, SFX_FUNIT_M, SFX_FUNIT_KM,
96 SFX_FUNIT_TWIP, SFX_FUNIT_POINT, SFX_FUNIT_PICA,
97 - SFX_FUNIT_INCH, SFX_FUNIT_FOOT, SFX_FUNIT_MILE, SFX_FUNIT_CUSTOM
98 + SFX_FUNIT_INCH, SFX_FUNIT_FOOT, SFX_FUNIT_MILE, SFX_FUNIT_CHAR, SFX_FUNIT_LINE, SFX_FUNIT_CUSTOM
99 };
101 enum SfxMapUnit
102 --- svtools/source/control/ruler.cxx.old 2009-04-06 16:41:40.000000000 +0000
103 +++ svtools/source/control/ruler.cxx 2009-04-06 16:41:41.000000000 +0000
104 @@ -84,7 +84,9 @@
105 #define RULER_UNIT_MILE 6
106 #define RULER_UNIT_POINT 7
107 #define RULER_UNIT_PICA 8
108 -#define RULER_UNIT_COUNT 9
109 +#define RULER_UNIT_CHAR 9
110 +#define RULER_UNIT_LINE 10
111 +#define RULER_UNIT_COUNT 11
113 // -----------------
114 // - ImplRulerData -
115 @@ -148,7 +150,9 @@ static ImplRulerUnitData aImplRulerUnitT
116 { MAP_100TH_INCH, 1200, 120, 600, 1200, 30480, 3, "'" }, // FOOT
117 { MAP_10TH_INCH, 633600, 63360, 316800, 633600, 1609344, 4, " miles" }, // MILE
118 { MAP_POINT, 1, 12, 12, 36, 353, 2, " pt" }, // POINT
119 -{ MAP_100TH_MM, 423, 423, 423, 846, 423, 3, " pi" } // PICA
120 +{ MAP_100TH_MM, 423, 423, 423, 846, 423, 3, " pi" }, // PICA
121 +{ MAP_100TH_MM, 371, 371, 371, 743, 371, 3, " ch" }, // CHAR
122 +{ MAP_100TH_MM, 551, 551, 551, 1102, 551, 3, " li" } // LINE
123 };
125 // =======================================================================
126 --- svx/source/dialog/ruler.hrc.old 2009-04-02 11:03:28.000000000 +0000
127 +++ svx/source/dialog/ruler.hrc 2009-04-06 16:41:41.000000000 +0000
128 @@ -37,4 +37,5 @@
129 #define ID_MILE 10
130 #define ID_POINT 6
131 #define ID_PICA 7
132 -
133 +#define ID_CHAR 11
134 +#define ID_LINE 12
135 --- svx/source/dialog/ruler.src.old 2009-04-02 11:03:28.000000000 +0000
136 +++ svx/source/dialog/ruler.src 2009-04-06 16:41:41.000000000 +0000
137 @@ -90,6 +90,18 @@ Menu RID_SVXMN_RULER
138 Checkable = TRUE ;
139 Text [ en-US ] = "Pica" ;
140 };
141 + MenuItem
142 + {
143 + Identifier = ID_CHAR ;
144 + Checkable = TRUE ;
145 + Text[ en-US ] = "Char" ;
146 + };
147 + MenuItem
148 + {
149 + Identifier = ID_LINE ;
150 + Checkable = TRUE ;
151 + Text[ en-US ] = "Line" ;
152 + };
153 };
154 };
155 String RID_SVXSTR_RULER_TAB_LEFT
156 --- svx/source/dialog/svxruler.cxx.old 2009-04-02 11:03:28.000000000 +0000
157 +++ svx/source/dialog/svxruler.cxx 2009-04-06 16:41:41.000000000 +0000
158 @@ -3743,8 +3743,15 @@ void SvxRuler::Command( const CommandEve
159 (nId == FUNIT_M ||
160 nId == FUNIT_KM ||
161 nId == FUNIT_FOOT ||
162 - nId == FUNIT_MILE ))
163 - aMenu.RemoveItem(i - 1);
164 + nId == FUNIT_MILE ||
165 + nId == FUNIT_CHAR ||
166 + nId == FUNIT_LINE ))
167 + if (( nId == FUNIT_CHAR ) && bHorz )
168 + ;
169 + else if (( nId == FUNIT_LINE ) && !bHorz )
170 + ;
171 + else
172 + aMenu.RemoveItem(i - 1);
173 }
174 aMenu.Execute( this, rCEvt.GetMousePosPixel() );
175 }
176 --- svx/source/options/optgenrl.src.old 2009-04-02 11:03:06.000000000 +0000
177 +++ svx/source/options/optgenrl.src 2009-04-06 16:41:41.000000000 +0000
178 @@ -283,6 +283,8 @@ StringArray RID_SVXSTR_FIELDUNIT_TABLE
179 < "Miles" ; FUNIT_MILE ; > ;
180 < "Pica" ; FUNIT_PICA ; > ;
181 < "Point" ; FUNIT_POINT ; > ;
182 + < "Char" ; FUNIT_CHAR ; >;
183 + < "Line" ; FUNIT_LINE ; >;
184 };
185 };
187 --- sw/source/ui/config/optload.cxx.old 2009-04-06 16:41:40.000000000 +0000
188 +++ sw/source/ui/config/optload.cxx 2009-04-06 16:41:41.000000000 +0000
189 @@ -80,6 +80,10 @@
191 using namespace ::com::sun::star;
193 +#ifndef _SFXENUMITEM_HXX //autogen
194 +#include <svtools/eitem.hxx>
195 +#endif
196 +
197 /* -----------------22.10.98 15:12-------------------
198 *
199 * --------------------------------------------------*/
200 @@ -103,6 +107,7 @@ SwLoadOptPage::SwLoadOptPage( Window* pP
201 aTabFT ( this, SW_RES( FT_TAB ) ),
202 aTabMF ( this, SW_RES( MF_TAB ) ),
203 aUseSquaredPageMode ( this, SW_RES( CB_USE_SQUARE_PAGE_MODE ) ),
204 + aUseCharUnit ( this , SW_RES( CB_USE_CHAR_UNIT ) ),
206 pWrtShell ( NULL ),
207 bHTMLMode ( FALSE ),
208 @@ -125,6 +130,7 @@ SwLoadOptPage::SwLoadOptPage( Window* pP
209 case FUNIT_POINT:
210 case FUNIT_PICA:
211 case FUNIT_INCH:
212 + case FUNIT_CHAR:
213 {
214 // nur diese Metriken benutzen
215 USHORT nPos = aMetricLB.InsertEntry( sMetric );
216 --- sw/source/ui/config/optload.hrc.old 2009-04-02 10:50:46.000000000 +0000
217 +++ sw/source/ui/config/optload.hrc 2009-04-06 16:41:41.000000000 +0000
218 @@ -44,6 +44,7 @@
219 #define FT_TAB 21
220 #define MF_TAB 22
221 #define CB_USE_SQUARE_PAGE_MODE 23
222 +#define CB_USE_CHAR_UNIT 24
224 // SwCaptionOptPage -----------------------------
226 --- sw/source/ui/config/optload.src.old 2009-04-02 10:50:46.000000000 +0000
227 +++ sw/source/ui/config/optload.src 2009-04-06 16:41:41.000000000 +0000
228 @@ -142,6 +142,16 @@ TabPage TP_OPTLOAD_PAGE
229 Text [ en-US ] = "Use square page mode for text grid";
230 Text [ zh-CN ] = "使用稿纸模式";
231 };
232 +
233 + CheckBox CB_USE_CHAR_UNIT
234 + {
235 + Pos = MAP_APPFONT ( 12 , 130) ;
236 + Size = MAP_APPFONT ( 109 , 10 ) ;
237 + Text [ de ] = "appy char unit" ;
238 + Text [ en-US ] = "apply char unit";
239 + Text [ x-comment ] = " ";
240 + };
241 +
242 };
243 /**************************************************************************/
244 /* */
245 @@ -397,6 +407,8 @@ StringArray STR_ARR_METRIC
246 < "Miles" ; FUNIT_MILE ; > ;
247 < "Pica" ; FUNIT_PICA ; > ;
248 < "Point" ; FUNIT_POINT ; > ;
249 + < "Char" ; FUNIT_CHAR ; >;
250 + < "Line" ; FUNIT_LINE ; >;
251 };
252 };
254 --- sw/source/ui/config/optpage.cxx.old 2009-04-02 10:50:46.000000000 +0000
255 +++ sw/source/ui/config/optpage.cxx 2009-04-06 16:41:41.000000000 +0000
256 @@ -179,14 +179,25 @@ SwContentOptPage::SwContentOptPage( Wind
257 case FUNIT_POINT:
258 case FUNIT_PICA:
259 case FUNIT_INCH:
260 + case FUNIT_CHAR: // add two units , 'character' and 'line' , their ticks are not fixed
261 + case FUNIT_LINE:
262 {
263 // nur diese Metriken benutzen
264 - USHORT nPos = aMetricLB.InsertEntry( sMetric );
265 - aMetricLB.SetEntryData( nPos, (void*)(long)eFUnit );
266 - aVMetric.InsertEntry( sMetric );
267 - aVMetric.SetEntryData( nPos, (void*)(long)eFUnit );
268 - aHMetric.InsertEntry( sMetric );
269 - aHMetric.SetEntryData( nPos, (void*)(long)eFUnit );
270 + // a horizontal ruler has not the 'line' unit
271 + // there isn't 'line' unit in HTML format
272 + if ( eFUnit != FUNIT_LINE )
273 + {
274 + USHORT nPos = aMetricLB.InsertEntry( sMetric );
275 + aMetricLB.SetEntryData( nPos, (void*)(long)eFUnit );
276 + aHMetric.InsertEntry( sMetric );
277 + aHMetric.SetEntryData( nPos, (void*)(long)eFUnit );
278 + }
279 + // a vetical ruler has not the 'character' unit
280 + if ( eFUnit != FUNIT_CHAR )
281 + {
282 + USHORT nPos = aVMetric.InsertEntry( sMetric );
283 + aVMetric.SetEntryData( nPos, (void*)(long)eFUnit );
284 + }
285 }
286 default:;//prevent warning
287 }
288 --- sw/source/ui/inc/optload.hxx.old 2009-04-02 10:50:50.000000000 +0000
289 +++ sw/source/ui/inc/optload.hxx 2009-04-06 16:41:41.000000000 +0000
290 @@ -71,6 +71,7 @@ private:
291 FixedText aTabFT;
292 MetricField aTabMF;
293 CheckBox aUseSquaredPageMode;
294 + CheckBox aUseCharUnit;
296 SwWrtShell* pWrtShell;
297 sal_Bool bHTMLMode;
298 --- sw/source/ui/inc/pggrid.hxx.old 2009-04-06 16:41:40.000000000 +0000
299 +++ sw/source/ui/inc/pggrid.hxx 2009-04-06 16:41:41.000000000 +0000
300 @@ -57,12 +57,14 @@ class SwTextGridPage: public SfxTabPage
302 FixedText aLinesPerPageFT;
303 NumericField aLinesPerPageNF;
304 + FixedText aLinesRangeFT;
306 FixedText aTextSizeFT;
307 MetricField aTextSizeMF;
309 FixedText aCharsPerLineFT;
310 NumericField aCharsPerLineNF;
311 + FixedText aCharsRangeFT;
313 FixedText aCharWidthFT;
314 MetricField aCharWidthMF;
315 --- sw/source/ui/misc/pggrid.cxx.old 2009-04-06 16:41:40.000000000 +0000
316 +++ sw/source/ui/misc/pggrid.cxx 2009-04-06 16:41:41.000000000 +0000
317 @@ -54,6 +54,7 @@
318 #include <svx/ulspitem.hxx>
319 #include <svx/boxitem.hxx>
320 #include <svx/frmdiritem.hxx>
321 +#include <svx/ruler.hxx>
322 #include <pggrid.hxx>
323 #include <tgrditem.hxx>
324 #include <pggrid.hrc>
325 @@ -77,10 +78,12 @@ SwTextGridPage::SwTextGridPage(Window *p
326 aLayoutFL (this, SW_RES(FL_LAYOUT )),
327 aLinesPerPageFT (this, SW_RES(FT_LINESPERPAGE )),
328 aLinesPerPageNF (this, SW_RES(NF_LINESPERPAGE )),
329 + aLinesRangeFT (this, SW_RES(FT_LINERANGE )),
330 aTextSizeFT (this, SW_RES(FT_TEXTSIZE )),
331 aTextSizeMF (this, SW_RES(MF_TEXTSIZE )),
332 aCharsPerLineFT (this, SW_RES(FT_CHARSPERLINE )),
333 aCharsPerLineNF (this, SW_RES(NF_CHARSPERLINE )),
334 + aCharsRangeFT (this, SW_RES(FT_CHARRANGE )),
335 aCharWidthFT (this, SW_RES(FT_CHARWIDTH )),
336 aCharWidthMF (this, SW_RES(MF_CHARWIDTH )),
337 aRubySizeFT (this, SW_RES(FT_RUBYSIZE )),
338 --- sw/source/ui/misc/pggrid.hrc.old 2009-04-02 10:50:37.000000000 +0000
339 +++ sw/source/ui/misc/pggrid.hrc 2009-04-06 16:41:41.000000000 +0000
340 @@ -53,3 +53,5 @@
341 #define CB_SNAPTOCHARS 23
342 #define FT_CHARWIDTH 24
343 #define MF_CHARWIDTH 25
344 +#define FT_LINERANGE 26
345 +#define FT_CHARRANGE 27
346 --- sw/source/ui/misc/pggrid.src.old 2009-04-02 10:50:37.000000000 +0000
347 +++ sw/source/ui/misc/pggrid.src 2009-04-06 16:41:41.000000000 +0000
348 @@ -100,6 +100,12 @@ TabPage TP_TEXTGRID_PAGE
349 Last = 154 ;
350 SpinSize = 1 ;
351 };
352 + FixedText FT_LINERANGE
353 + {
354 + Pos = MAP_APPFONT ( 103 , 82 ) ;
355 + Size = MAP_APPFONT ( 25 , 8 );
356 + Text [ en-US ] = "( 1 - 48 )" ;
357 + };
358 FixedText FT_TEXTSIZE
359 {
360 Pos = MAP_APPFONT ( 133 , 82 ) ;
361 @@ -169,6 +175,12 @@ TabPage TP_TEXTGRID_PAGE
362 Last = 5600 ;
363 SpinSize = 5 ;
364 };
365 + FixedText FT_CHARRANGE
366 + {
367 + Pos = MAP_APPFONT ( 103 , 96 ) ;
368 + Size = MAP_APPFONT ( 25 , 8 ) ;
369 + Text [ en-US ] = "( 1 - 45 )" ;
370 + };
371 FixedText FT_RUBYSIZE
372 {
373 Pos = MAP_APPFONT ( 133 , 98 ) ;
374 --- vcl/inc/vcl/fldunit.hxx.old 2009-04-02 10:44:25.000000000 +0000
375 +++ vcl/inc/vcl/fldunit.hxx 2009-04-06 16:41:41.000000000 +0000
376 @@ -38,7 +38,7 @@
377 // By changes you must also change: rsc/vclrsc.hxx
378 enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
379 FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
380 - FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM,
381 + FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
382 FUNIT_PERCENT, FUNIT_100TH_MM };
384 #endif // _VCL_FLDUNIT_HXX
385 --- vcl/source/control/field.cxx.old 2009-04-02 10:44:17.000000000 +0000
386 +++ vcl/source/control/field.cxx 2009-04-06 16:41:41.000000000 +0000
387 @@ -1128,6 +1128,10 @@ static FieldUnit ImplStringToMetric( con
388 if ( strAllUnits->GetString( i ).Equals( aStr ) )
389 return (FieldUnit) strAllUnits->GetValue( i );
391 + // Amelia : about character unit
392 + if (aStr.EqualsIgnoreCaseAscii("cm"))
393 + return FUNIT_CM;
394 +
395 return FUNIT_NONE;
396 }
398 @@ -1143,20 +1147,24 @@ static FieldUnit ImplMetricGetUnit( cons
399 #define M *1000000L
400 #define X *5280L
402 -static const sal_Int64 aImplFactor[FUNIT_MILE+1][FUNIT_MILE+1] =
403 +// Amelia : about measurement unit, 'char' and 'line'
404 +//static const sal_Int64 aImplFactor[FUNIT_MILE+1][FUNIT_MILE+1] =
405 +static const sal_Int64 aImplFactor[FUNIT_LINE+1][FUNIT_LINE+1] =
406 { /*
407 -mm/100 mm cm m km twip point pica inch foot mile */
408 -{ 1, 100, 1 K, 100 K, 100 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X },
409 -{ 1, 1, 10, 1 K, 1 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X },
410 -{ 1, 1, 1, 100, 100 K, 254, 254, 254, 254, 254*12, 254*12 X },
411 -{ 1, 1, 1, 1, 1 K, 254, 254, 254, 254, 254*12, 254*12 X },
412 -{ 1, 1, 1, 1, 1, 0, 254, 254, 254, 254*12, 254*12 X },
413 -{ 1440,144 K,144 K,14400 K, 0, 1, 20, 240, 1440,1440*12,1440*12 X },
414 -{ 72, 7200, 7200, 720 K, 720 M, 1, 1, 12, 72, 72*12, 72*12 X },
415 -{ 6, 600, 600, 60 K, 60 M, 1, 1, 1, 6, 6*12, 6*12 X },
416 -{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 12, 12 X },
417 -{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 1, 1 X },
418 -{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 1, 1 }
419 +mm/100 mm cm m km twip point pica inch foot mile char line*/
420 +{ 1, 100, 1 K, 100 K, 100 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X , 53340, 396240},
421 +{ 1, 1, 10, 1 K, 1 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X , 5334, 396240},
422 +{ 1, 1, 1, 100, 100 K, 254, 254, 254, 254, 254*12, 254*12 X , 5334, 39624},
423 +{ 1, 1, 1, 1, 1 K, 254, 254, 254, 254, 254*12, 254*12 X , 533400, 39624},
424 +{ 1, 1, 1, 1, 1, 0, 254, 254, 254, 254*12, 254*12 X ,533400 K, 39624},
425 +{ 1440,144 K,144 K,14400 K, 0, 1, 20, 240, 1440,1440*12,1440*12 X , 210, 3120},
426 +{ 72, 7200, 7200, 720 K, 720 M, 1, 1, 12, 72, 72*12, 72*12 X , 210, 156},
427 +{ 6, 600, 600, 60 K, 60 M, 1, 1, 1, 6, 6*12, 6*12 X , 210, 10},
428 +{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 12, 12 X , 210, 45},
429 +{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 1, 1 X , 210, 45},
430 +{ 1, 100, 100, 10 K, 10 M, 1, 1, 1, 1, 1, 1 , 210, 45},
431 +{ 144, 1440,14400, 14400, 14400, 1, 20, 240, 1440,1440*12, 1440*12 X, 1, 156 },
432 +{ 720,72000,72000, 7200 K,7200 M, 20, 10, 13, 11, 11*12, 11*12 X, 105, 1 }
433 };
435 #undef X
436 --- vcl/source/src/units.src.old 2009-04-02 10:44:19.000000000 +0000
437 +++ vcl/source/src/units.src 2009-04-06 16:41:41.000000000 +0000
438 @@ -33,6 +33,7 @@
439 #include <vcl/svids.hrc>
440 #endif
442 +// Amelia : adds two units , 'ch' and 'line'
443 StringArray SV_FUNIT_STRINGS
444 {
445 ItemList [ en-US ] =
446 @@ -54,6 +55,8 @@ StringArray SV_FUNIT_STRINGS
447 < "feet" ; FUNIT_FOOT ; > ;
448 < "miles" ; FUNIT_MILE ; > ;
449 < "mile" ; FUNIT_MILE ; > ;
450 + < "ch" ; FUNIT_CHAR ; > ;
451 + < "line" ; FUNIT_LINE ; > ;
452 < "%" ; FUNIT_PERCENT ; > ;
453 };
454 };