summaryrefslogtreecommitdiff
path: root/toolkit/source/awt/vclxwindow.cxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-07-06 13:26:58 +0000
committerRüdiger Timm <rt@openoffice.org>2007-07-06 13:26:58 +0000
commit412e542e96ee5ab319b663d7aa6574c59cc90487 (patch)
tree8d21571ed88d3771807bdb43b3d19c9c506be266 /toolkit/source/awt/vclxwindow.cxx
parentc531fa5d4f4d37765c36a6cf18561e5c0e59a439 (diff)
INTEGRATION: CWS updchk06 (1.73.10); FILE MERGED
2007/06/25 07:45:45 dv 1.73.10.2: RESYNC: (1.73-1.74); FILE MERGED 2007/06/08 06:54:55 dv 1.73.10.1: #i70588# Added support for autovscroll and painttransparent to edit
Diffstat (limited to 'toolkit/source/awt/vclxwindow.cxx')
-rw-r--r--toolkit/source/awt/vclxwindow.cxx19
1 files changed, 17 insertions, 2 deletions
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index e6cbd201d28c..e5afb5212e44 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: vclxwindow.cxx,v $
*
- * $Revision: 1.75 $
+ * $Revision: 1.76 $
*
- * last change: $Author: hr $ $Date: 2007-06-27 15:15:34 $
+ * last change: $Author: rt $ $Date: 2007-07-06 14:26:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1862,6 +1862,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
// no break here!
case WINDOW_FIXEDTEXT:
case WINDOW_EDIT:
+ case WINDOW_MULTILINEEDIT:
case WINDOW_CHECKBOX:
case WINDOW_RADIOBUTTON:
case WINDOW_LISTBOX:
@@ -1949,6 +1950,13 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
pWindow->SetMouseTransparent( bMouseTransparent );
}
break;
+ case BASEPROPERTY_PAINTTRANSPARENT:
+ {
+ sal_Bool bPaintTransparent = false;
+ Value >>= bPaintTransparent;
+ pWindow->SetPaintTransparent( bPaintTransparent );
+ }
+ break;
case BASEPROPERTY_REPEAT:
{
@@ -2104,6 +2112,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
{
case WINDOW_FIXEDTEXT:
case WINDOW_EDIT:
+ case WINDOW_MULTILINEEDIT:
case WINDOW_CHECKBOX:
case WINDOW_RADIOBUTTON:
case WINDOW_LISTBOX:
@@ -2151,6 +2160,12 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
aProp <<= bMouseTransparent;
}
break;
+ case BASEPROPERTY_PAINTTRANSPARENT:
+ {
+ sal_Bool bPaintTransparent = GetWindow()->IsPaintTransparent();
+ aProp <<= bPaintTransparent;
+ }
+ break;
case BASEPROPERTY_REPEAT:
aProp <<= (sal_Bool)( 0 != ( GetWindow()->GetStyle() & WB_REPEAT ) );