diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | 83d7b776fba6a9b6be8e52f221b237b49ff7612d (patch) | |
| tree | 204f94243b92698fa07d3859d7336a3730f626fd /svx/source/tbxctrls/grafctrl.cxx | |
| parent | e02ccd1ae444b8bd21e963adc9f368c462fc3609 (diff) | |
| parent | da622616ce54d5c5b4e2e299fbf0a8ae527fd413 (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'svx/source/tbxctrls/grafctrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 5fb37a5fe319..9f8c023c3b3d 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -316,7 +316,7 @@ public: // ----------------------------------------------------------------------------- -ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : +ImplGrafControl::ImplGrafControl( Window* pParent, USHORT, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : Control( pParent, WB_TABSTOP ), maImage ( this ), maField ( this, rCmd, rFrame ) @@ -353,8 +353,7 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU maImage.Show(); - maField.SetHelpId( nSlotId ); - maField.SetSmartHelpId( SmartId( rCmd )); + maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); } |