[Libreoffice-commits] core.git: extensions/inc extensions/source

[Tsutomu Uchino]

 extensions/inc/propctrlr.hrc                 |    1 +
 extensions/source/propctrlr/formmetadata.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 68deef115925c60513b42af9bc4e6df24b49dd2d
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Fri Jan 30 14:12:27 2015 +0000

    Resolves: #i67663# add vertical alighment on property UI
    
    (cherry picked from commit 2b2128d0665dc390ae90739c84bc387f399ebe87)
    
    Conflicts:
    	extensions/source/propctrlr/formmetadata.cxx
    
    Change-Id: Ic6d708454009e8023dc2e601043409377fd6cb34

diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc
index da26a11..3709f7d 100644
--- a/extensions/inc/propctrlr.hrc
+++ b/extensions/inc/propctrlr.hrc
@@ -125,6 +125,7 @@
 #define HID_PROP_LINECOLOR                              "EXTENSIONS_HID_PROP_LINECOLOR"
 #define HID_PROP_BORDER                                 "EXTENSIONS_HID_PROP_BORDER"
 #define HID_PROP_ALIGN                                  "EXTENSIONS_HID_PROP_ALIGN"
+#define HID_PROP_VERTICAL_ALIGN                         "EXTENSIONS_HID_PROP_VERTICAL_ALIGN"
 #define HID_PROP_DROPDOWN                               "EXTENSIONS_HID_PROP_DROPDOWN"
 #define HID_PROP_MULTILINE                              "EXTENSIONS_HID_PROP_MULTILINE"
 #define HID_PROP_HSCROLL                                "EXTENSIONS_HID_PROP_HSCROLL"
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 4dcd046..ea2d2aa 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -281,7 +281,7 @@ namespace pcr
         DEF_INFO_3( FONT,              FONT,               142, FONT,              FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
         DEF_INFO_4( VISUALEFFECT,      VISUALEFFECT,       143, VISUALEFFECT,      FORM_VISIBLE, DIALOG_VISIBLE, ENUM_ONE, COMPOSEABLE ),
         DEF_INFO_4( ALIGN,             ALIGN,              144, ALIGN,             FORM_VISIBLE, DIALOG_VISIBLE, ENUM, COMPOSEABLE ),
-        DEF_INFO_3( VERTICAL_ALIGN,    VERTICAL_ALIGN,     145, VERTICAL_ALIGN,    FORM_VISIBLE, ENUM, COMPOSEABLE ),
+        DEF_INFO_4( VERTICAL_ALIGN,    VERTICAL_ALIGN,     145, VERTICAL_ALIGN,    FORM_VISIBLE, DIALOG_VISIBLE, ENUM, COMPOSEABLE ),
         DEF_INFO_3( ROWHEIGHT,         ROWHEIGHT,          146, ROWHEIGHT,         FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
         DEF_INFO_3( BACKGROUNDCOLOR,   BACKGROUNDCOLOR,    147, BACKGROUNDCOLOR,   FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
         DEF_INFO_3( SYMBOLCOLOR,       SYMBOLCOLOR,        148, SYMBOLCOLOR,       FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),