diff options
| author | Amelia Wang <amwang@novell.com> | 2010-09-13 14:40:56 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-09-13 15:55:59 +0200 |
| commit | 19ab9349f211ca712aa2b6b777be55830b804340 (patch) | |
| tree | 0462813b303c0147e35a30f8b298435d1eb5ef69 /svx/source/dialog | |
| parent | 258524d43e52170947e94d2af5cd36ba02f31416 (diff) | |
cjk-character-units-ui.diff: add a new unit 'character unit'
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/ruler.hrc | 3 | ||||
| -rw-r--r-- | svx/source/dialog/ruler.src | 12 | ||||
| -rw-r--r-- | svx/source/dialog/sdstring.src | 2 | ||||
| -rw-r--r-- | svx/source/dialog/svxruler.cxx | 11 |
4 files changed, 25 insertions, 3 deletions
diff --git a/svx/source/dialog/ruler.hrc b/svx/source/dialog/ruler.hrc index 8031270272..101130bbb7 100644 --- a/svx/source/dialog/ruler.hrc +++ b/svx/source/dialog/ruler.hrc @@ -34,4 +34,5 @@ #define ID_MILE 10 #define ID_POINT 6 #define ID_PICA 7 - +#define ID_CHAR 11 +#define ID_LINE 12 diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src index 5937ab99fb..b30ca44b5e 100644 --- a/svx/source/dialog/ruler.src +++ b/svx/source/dialog/ruler.src @@ -87,6 +87,18 @@ Menu RID_SVXMN_RULER Checkable = TRUE ; Text [ en-US ] = "Pica" ; }; + MenuItem + { + Identifier = ID_CHAR ; + Checkable = TRUE ; + Text[ en-US ] = "Char" ; + }; + MenuItem + { + Identifier = ID_LINE ; + Checkable = TRUE ; + Text[ en-US ] = "Line" ; + }; }; }; String RID_SVXSTR_RULER_TAB_LEFT diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index d862c1aa63..4a5be0d59a 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -1178,6 +1178,8 @@ StringArray RID_SVXSTR_FIELDUNIT_TABLE < "Miles" ; FUNIT_MILE ; > ; < "Pica" ; FUNIT_PICA ; > ; < "Point" ; FUNIT_POINT ; > ; + < "Char" ; FUNIT_CHAR ; > ; + < "Line" ; FUNIT_LINE ; > ; }; }; diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 7e8d41b71e..3e05ad55cc 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3763,8 +3763,15 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) (nId == FUNIT_M || nId == FUNIT_KM || nId == FUNIT_FOOT || - nId == FUNIT_MILE )) - aMenu.RemoveItem(i - 1); + nId == FUNIT_MILE || + nId == FUNIT_CHAR || + nId == FUNIT_LINE )) + if (( nId == FUNIT_CHAR ) && bHorz ) + ; + else if (( nId == FUNIT_LINE ) && !bHorz ) + ; + else + aMenu.RemoveItem(i - 1); } aMenu.Execute( this, rCEvt.GetMousePosPixel() ); } |