From c6f40c7b47b270e00d280d25d346b0628023aa24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=B6nheit?= Date: Wed, 6 Jun 2001 09:38:55 +0000 Subject: [PATCH] #86837# +PROPERTY_IMAGEALIGN --- extensions/source/propctrlr/formcontroller.cxx | 10 ++++++++-- extensions/source/propctrlr/formmetadata.cxx | 11 +++++++++-- extensions/source/propctrlr/formmetadata.hxx | 8 ++++++-- extensions/source/propctrlr/formstrings.hxx | 8 ++++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 8d98e2cf41f1..92bab8dbc35f 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formcontroller.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: fs $ $Date: 2001-06-06 08:16:55 $ + * last change: $Author: fs $ $Date: 2001-06-06 10:38:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -550,6 +550,7 @@ namespace pcr case PROPERTY_ID_SUBMIT_METHOD: case PROPERTY_ID_SUBMIT_ENCODING: case PROPERTY_ID_ORIENTATION: + case PROPERTY_ID_IMAGEALIGN: { if (m_pPropertyInfo) { @@ -740,6 +741,7 @@ namespace pcr case PROPERTY_ID_SUBMIT_METHOD: case PROPERTY_ID_SUBMIT_ENCODING: case PROPERTY_ID_ORIENTATION: + case PROPERTY_ID_IMAGEALIGN: if (m_pPropertyInfo) { Sequence< ::rtl::OUString > aEnumStrings = m_pPropertyInfo->getPropertyEnumRepresentations(_nPropId); @@ -2375,6 +2377,7 @@ namespace pcr case PROPERTY_ID_DEFAULT_CHECKED: case PROPERTY_ID_LISTSOURCETYPE: case PROPERTY_ID_ORIENTATION: + case PROPERTY_ID_IMAGEALIGN: { Sequence< ::rtl::OUString > aEnumValues = m_pPropertyInfo->getPropertyEnumRepresentations(nPropId); const ::rtl::OUString* pStart = aEnumValues.getConstArray(); @@ -2907,6 +2910,9 @@ namespace pcr /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.28 2001/06/06 08:16:55 fs + * #86096# ChangeFontProperty: added support for Relief, EmphasisMark, TextLineColor + * * Revision 1.27 2001/05/30 13:44:20 fs * #86838# UpdateUI: let the property box grab the focus * diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index f8897b022059..3f9aeee551c4 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formmetadata.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: fs $ $Date: 2001-06-06 08:51:37 $ + * last change: $Author: fs $ $Date: 2001-06-06 10:37:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -248,6 +248,7 @@ namespace pcr OPropertyInfoImpl(PROPERTY_DEFAULTCHECKED, PROPERTY_ID_DEFAULT_CHECKED, sal_True, String(ModuleRes(RID_STR_DEFAULT_CHECKED)), nPos++, HID_PROP_DEFAULT_CHECKED ), OPropertyInfoImpl(PROPERTY_DEFAULTBUTTON, PROPERTY_ID_DEFAULT_BUTTON, sal_True, String(ModuleRes(RID_STR_DEFAULT_BUTTON)), nPos++, HID_PROP_DEFAULT_BUTTON ), OPropertyInfoImpl(PROPERTY_IMAGE_URL, PROPERTY_ID_IMAGE_URL, sal_True, String(ModuleRes(RID_STR_IMAGE_URL)), nPos++, HID_PROP_IMAGE_URL ), + OPropertyInfoImpl(PROPERTY_IMAGEALIGN, PROPERTY_ID_IMAGEALIGN, sal_True, String(ModuleRes(RID_STR_ALIGN)), nPos++, HID_PROP_IMAGE_ALIGN ), OPropertyInfoImpl(PROPERTY_DEFAULT_SELECT_SEQ, PROPERTY_ID_DEFAULT_SELECT_SEQ, sal_True, String(ModuleRes(RID_STR_DEFAULT_SELECT_SEQ)),nPos++, HID_PROP_DEFAULT_SELECT_SEQ ), OPropertyInfoImpl(PROPERTY_ECHO_CHAR, PROPERTY_ID_ECHO_CHAR, sal_True, String(ModuleRes(RID_STR_ECHO_CHAR)), nPos++, HID_PROP_ECHO_CHAR ), OPropertyInfoImpl(PROPERTY_EMPTY_IS_NULL, PROPERTY_ID_EMPTY_IS_NULL, sal_True, String(ModuleRes(RID_STR_EMPTY_IS_NULL)), nPos++, HID_PROP_EMPTY_IS_NULL ), @@ -316,6 +317,9 @@ namespace pcr String sSeparatedList; switch (_nId) { + case PROPERTY_ID_IMAGEALIGN: + sSeparatedList = String(ModuleRes(RID_STR_ENUM_SIDE_ALIGN)); + break; case PROPERTY_ID_BORDER: sSeparatedList = String(ModuleRes(RID_STR_BORDER_TYPE)); break; @@ -489,6 +493,9 @@ namespace pcr /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.11 2001/06/06 08:51:37 fs + * changes in the ConstAsciiString for better runtime performance + * * Revision 1.10 2001/05/02 12:42:03 tbe * added scrollbar properties * diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index ae6f4b89c786..d773cb48e60d 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: formmetadata.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: tbe $ $Date: 2001-05-02 12:42:11 $ + * last change: $Author: fs $ $Date: 2001-06-06 10:37:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -242,6 +242,7 @@ namespace pcr #define PROPERTY_ID_BLOCKINCREMENT 109 #define PROPERTY_ID_VISIBLESIZE 110 #define PROPERTY_ID_ORIENTATION 111 + #define PROPERTY_ID_IMAGEALIGN 112 //............................................................................ } // namespace pcr @@ -252,6 +253,9 @@ namespace pcr /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.8 2001/05/02 12:42:11 tbe + * added scrollbar properties + * * Revision 1.7 2001/04/26 09:15:54 tbe * added progressbar properties * diff --git a/extensions/source/propctrlr/formstrings.hxx b/extensions/source/propctrlr/formstrings.hxx index 58c241ab7ede..f9bf74d7c333 100644 --- a/extensions/source/propctrlr/formstrings.hxx +++ b/extensions/source/propctrlr/formstrings.hxx @@ -2,9 +2,9 @@ * * $RCSfile: formstrings.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fs $ $Date: 2001-06-06 08:14:59 $ + * last change: $Author: fs $ $Date: 2001-06-06 10:37:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -254,6 +254,7 @@ namespace pcr PCR_CONSTASCII_STRING( PROPERTY_BLOCKINCREMENT, "BlockIncrement"); PCR_CONSTASCII_STRING( PROPERTY_VISIBLESIZE, "VisibleSize"); PCR_CONSTASCII_STRING( PROPERTY_ORIENTATION, "Orientation"); + PCR_CONSTASCII_STRING( PROPERTY_IMAGEALIGN, "ImageAlign"); // services PCR_CONSTASCII_STRING( SERVICE_COMPONENT_GROUPBOX, "com.sun.star.form.component.GroupBox"); @@ -270,6 +271,9 @@ namespace pcr /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.9 2001/06/06 08:14:59 fs + * #86096# +FontRelief/FontEmphasisMark/TextLineColor + * * Revision 1.8 2001/05/02 12:43:12 tbe * added scrollbar properties *