summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorFrank Schönheit <fs@openoffice.org>2001-02-13 15:27:08 +0000
committerFrank Schönheit <fs@openoffice.org>2001-02-13 15:27:08 +0000
commit4268f445be1d09caa2d189d05faa94a62f98dd82 (patch)
tree3ff1427c4c9491fcc3a1ddd84b9c65a32ab027bb /extensions
parent81fa681d22622c5dbdd42e2ed4f9c7b4abb99158 (diff)
#83848# no multiline input for 'DefaultText' of FileControl / #83655# -1 as minimum for MaxTextLength
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/propctrlr/formcontroller.cxx30
1 files changed, 22 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 61865d5c6c85..b0b7fb31ccb3 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: formcontroller.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: fs $ $Date: 2001-02-06 10:21:19 $
+ * last change: $Author: fs $ $Date: 2001-02-13 16:27:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1774,9 +1774,16 @@ namespace pcr
}
- else if (nPropId == PROPERTY_ID_LABEL || nPropId == PROPERTY_ID_DEFAULT_TEXT)
+ else if (nPropId == PROPERTY_ID_LABEL)
{
- pProperty->eControlType = BCT_MEDIT; //@ new MultilineEdit
+ pProperty->eControlType = BCT_MEDIT;
+ }
+ else if (nPropId == PROPERTY_ID_DEFAULT_TEXT)
+ {
+ if (FormComponentType::FILECONTROL == m_nClassId)
+ pProperty->eControlType = BCT_EDIT;
+ else
+ pProperty->eControlType = BCT_MEDIT;
}
else if (PROPERTY_ID_CONTROLLABEL == nPropId)
{
@@ -2024,13 +2031,17 @@ namespace pcr
}
break;
- case PROPERTY_ID_BOUNDCOLUMN:
- pProperty->nMinValue = 1;
+ case PROPERTY_ID_MAXTEXTLEN:
case PROPERTY_ID_TABINDEX:
- if (PROPERTY_ID_TABINDEX == nPropId)
- pProperty->nMinValue = 0;
+ case PROPERTY_ID_BOUNDCOLUMN:
pProperty->nMaxValue = 0x7FFFFFFF;
pProperty->bHaveMinMax = sal_True;
+ switch (nPropId)
+ {
+ case PROPERTY_ID_MAXTEXTLEN: pProperty->nMinValue = -1; break;
+ case PROPERTY_ID_TABINDEX: pProperty->nMinValue = 0; break;
+ case PROPERTY_ID_BOUNDCOLUMN: pProperty->nMinValue = 1; break;
+ }
break;
}
@@ -2506,6 +2517,9 @@ namespace pcr
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.7 2001/02/06 10:21:19 fs
+ * #83527# set the minimum for the BoundField property to 1
+ *
* Revision 1.6 2001/02/05 14:38:26 fs
* #83461# no 'not defined' for radio buttons check state
*