diff options
| author | Amelia Wang <amwang@novell.com> | 2010-09-13 14:40:57 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-09-13 15:57:19 +0200 |
| commit | c85db626029fd8a5e0dfcb312937279df32339a0 (patch) | |
| tree | 6d7b208776d8c70d8fd514e901d3786904fb90c9 /rsc | |
| parent | 51fb3c7f1925c7d1604549dfd8fcc0139e54a36b (diff) | |
cjk-character-units-ui.diff: add a new unit 'character unit'
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/vclrsc.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/parser/rscibas.cxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx index 19677171dcb2..49847bd91e69 100644 --- a/rsc/inc/vclrsc.hxx +++ b/rsc/inc/vclrsc.hxx @@ -173,7 +173,7 @@ typedef sal_Int64 WinBits; // from vcl/inc/fldunit.hxx enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM, FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA, - FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CUSTOM, + FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM, FUNIT_PERCENT, FUNIT_100TH_MM }; diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 1a896c897e27..6b79b4fdd3b3 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -237,6 +237,9 @@ RscEnum * RscTypCont::InitFieldUnitsType() SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT ); SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE ); SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM ); + // Amelia : adds two units ,"char" and "line" + SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR ); + SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE ); SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT ); return pFieldUnits; |