From 954dcb2858da1c83914f8421817b4c85c33d28df Mon Sep 17 00:00:00 2001
From: Amelia Wang <amwang@novell.com>
Date: Mon, 13 Sep 2010 14:40:56 +0200
Subject: cjk-character-units-ui.diff: add a new unit 'character unit'

---
 svx/source/dialog/ruler.hrc    |  3 ++-
 svx/source/dialog/ruler.src    | 12 ++++++++++++
 svx/source/dialog/sdstring.src |  2 ++
 svx/source/dialog/svxruler.cxx | 11 +++++++++--
 4 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'svx')

diff --git a/svx/source/dialog/ruler.hrc b/svx/source/dialog/ruler.hrc
index 1280b1237bc5..6aa5e4618da4 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 4d0218f525ee..ef965a6a7752 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 4b70dda6a151..fc4662994b69 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 7705a2dd08df..3aa4e9d235df 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() );
         }
-- 
cgit v1.2.3