summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-10-01 12:28:29 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-10-01 12:28:29 +0000
commit248539e2fa8ac0f5271a83f26fe71d0dcc4a5a67 (patch)
tree871bd4a3ab9bfdab3d94a14f7e53ae773a130f5a
parent4749f353739e8702bbbe162c02dd70e535f0b5e5 (diff)
CWS-TOOLING: integrate CWS dba31b
-rw-r--r--toolkit/source/awt/vclxwindows.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 2df507027a08..06e41611f793 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: vclxwindows.cxx,v $
- * $Revision: 1.69 $
+ * $Revision: 1.69.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -3694,7 +3694,10 @@ void VCLXComboBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
BASEPROPERTY_HIDEINACTIVESELECTION,
BASEPROPERTY_ALIGN,
0);
- VCLXEdit::ImplGetPropertyIds( rIds );
+ // no, don't call VCLXEdit here - it has properties which we do *not* want to have at at combo box
+ // #i92690# / 2008-08-12 / frank.schoenheit@sun.com
+ // VCLXEdit::ImplGetPropertyIds( rIds );
+ VCLXWindow::ImplGetPropertyIds( rIds );
}
VCLXComboBox::VCLXComboBox()