summaryrefslogtreecommitdiff
path: root/toolkit/source
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-07-06 13:27:38 +0000
committerRüdiger Timm <rt@openoffice.org>2007-07-06 13:27:38 +0000
commit19dfdc41ec29bd271392eedd1dec95cccaa62042 (patch)
tree1e0684a9bb96b8fa8e2e622d5d5c517d7a341715 /toolkit/source
parent591144bd8fba78bcc5ce2a0a07eb7cd67ef34a9e (diff)
INTEGRATION: CWS updchk06 (1.53.34); FILE MERGED
2007/06/25 07:46:11 dv 1.53.34.3: RESYNC: (1.53-1.54); FILE MERGED 2007/06/25 06:12:03 dv 1.53.34.2: Added support for property DesktopAsParent 2007/06/08 06:54:55 dv 1.53.34.1: #i70588# Added support for autovscroll and painttransparent to edit
Diffstat (limited to 'toolkit/source')
-rw-r--r--toolkit/source/controls/unocontrolmodel.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 4f2e6c604e51..c6452f627ac6 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: unocontrolmodel.cxx,v $
*
- * $Revision: 1.55 $
+ * $Revision: 1.56 $
*
- * last change: $Author: hr $ $Date: 2007-06-27 12:21:50 $
+ * last change: $Author: rt $ $Date: 2007-07-06 14:27:38 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -379,6 +379,8 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
case BASEPROPERTY_DEFAULTCONTROL: aDefault <<= ((UnoControlModel*)this)->getServiceName(); break;
+ case BASEPROPERTY_AUTOHSCROLL:
+ case BASEPROPERTY_AUTOVSCROLL:
case BASEPROPERTY_MOVEABLE:
case BASEPROPERTY_CLOSEABLE:
case BASEPROPERTY_SIZEABLE:
@@ -394,6 +396,8 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
case BASEPROPERTY_STRICTFORMAT:
case BASEPROPERTY_REPEAT:
+ case BASEPROPERTY_PAINTTRANSPARENT:
+ case BASEPROPERTY_DESKTOP_AS_PARENT:
case BASEPROPERTY_HARDLINEBREAKS: aDefault <<= (sal_Bool) sal_False; break;
case BASEPROPERTY_WHEELWITHOUTFOCUS: