diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:00:13 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-07-13 14:00:13 +0200 |
| commit | d2fb0147e6b873134ee0e15eadad2e311bbbf35a (patch) | |
| tree | 38ec5c708e9799df7f0ba4ad34fba0abd89d57b6 | |
| parent | e24a29c86c8b0bc967455a1469e4eda85736c770 (diff) | |
| parent | c7adf8f96876db4c532322249a7b77455fe9f524 (diff) | |
CWS-TOOLING: integrate CWS findbarfixes01_OOO330
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 6 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 175867d07d..dd8a0a1047 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1463,9 +1463,6 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Find Text</value> </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> </node> <node oor:name=".uno:DownSearch" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> @@ -1487,9 +1484,6 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Focus to Findbar</value> </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> </node> <node oor:name=".uno:ExtendedHelp" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 407ef59149..2d6cfdc40d 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -92,7 +92,7 @@ FindTextFieldControl::~FindTextFieldControl() void FindTextFieldControl::InitControls_Impl() { SetText( String( ::rtl::OUString::createFromAscii("Find") ) ); - SetControlForeground(COL_GRAY); + SetControlForeground(GetSettings().GetStyleSettings().GetDisableColor()); EnableAutocomplete(TRUE, TRUE); } @@ -117,7 +117,7 @@ void FindTextFieldControl::Modify() { ComboBox::Modify(); - SetControlForeground( Color( COL_BLACK ) ); + SetControlForeground( GetSettings().GetStyleSettings().GetWindowTextColor() ); } long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) @@ -171,7 +171,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) if ( GetText().Len() == 0 ) { SetText( String( ::rtl::OUString::createFromAscii("Find") ) ); - SetControlForeground(COL_GRAY); + SetControlForeground(GetSettings().GetStyleSettings().GetDisableColor()); m_bToClearTextField = sal_True; } break; |