diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-01-10 23:20:46 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-11 14:13:31 +0000 |
commit | ac310071eb397c3701e3c3cf650a893a225274f3 (patch) | |
tree | e6ae44a1f6e3d7ebb6b3c2a5a578ca64082be2fc /vcl | |
parent | 988829d53327e92b66487ea38bed98b1e6b72d47 (diff) |
callcatcher: lets trust my own tooling
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/vcl/event.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/vcl/field.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/keycod.hxx | 1 | ||||
-rw-r--r-- | vcl/source/control/field2.cxx | 15 | ||||
-rw-r--r-- | vcl/source/window/keycod.cxx | 9 | ||||
-rw-r--r-- | vcl/source/window/keyevent.cxx | 31 |
6 files changed, 0 insertions, 64 deletions
diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx index 2fe32e7c9d55..f912a39a6d41 100644 --- a/vcl/inc/vcl/event.hxx +++ b/vcl/inc/vcl/event.hxx @@ -66,12 +66,6 @@ public: KeyEvent( xub_Unicode nChar, const KeyCode& rKeyCode, sal_uInt16 nRepeat = 0 ); - /** inits this vcl KeyEvent with all settings from the given awt event **/ - KeyEvent( const ::com::sun::star::awt::KeyEvent& rEvent ); - - /** fills out the given awt KeyEvent with all settings from this vcl event **/ - void InitKeyEvent( ::com::sun::star::awt::KeyEvent& rEvent ) const; - xub_Unicode GetCharCode() const { return mnCharCode; } const KeyCode& GetKeyCode() const { return maKeyCode; } sal_uInt16 GetRepeat() const { return mnRepeat; } diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index f43f7d55f2ed..5f5e8d62b2a3 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -142,8 +142,6 @@ public: void SetString( const XubString& rStr ); XubString GetString() const; sal_Bool IsStringModified() const { return !(GetString().Equals( maFieldString )); } - - void SelectFixedFont(); }; // -------------------- diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx index b5be547b1781..cdde1fda4ac6 100644 --- a/vcl/inc/vcl/keycod.hxx +++ b/vcl/inc/vcl/keycod.hxx @@ -98,7 +98,6 @@ public: { return (nCode & KEYGROUP_TYPE); } XubString GetName( Window* pWindow = NULL ) const; - XubString GetSymbolName( const XubString& rFontName, Window* pWindow = NULL ) const; sal_Bool IsFunction() const { return ((eFunc != KEYFUNC_DONTKNOW) ? sal_True : sal_False); } diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index b1c701ab5bf1..6dda5e8c528e 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -903,21 +903,6 @@ void PatternFormatter::Reformat() // ----------------------------------------------------------------------- -void PatternFormatter::SelectFixedFont() -{ - if ( GetField() ) - { - Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetLanguage(), 0 ); - Font aControlFont; - aControlFont.SetName( aFont.GetName() ); - aControlFont.SetFamily( aFont.GetFamily() ); - aControlFont.SetPitch( aFont.GetPitch() ); - GetField()->SetControlFont( aControlFont ); - } -} - -// ----------------------------------------------------------------------- - PatternField::PatternField( Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 94a26a6bdf77..c831beac3ce7 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -119,15 +119,6 @@ XubString KeyCode::GetName( Window* pWindow ) const // ----------------------------------------------------------------------- -XubString KeyCode::GetSymbolName( const XubString& rFontName, Window* pWindow ) const -{ - if ( !pWindow ) - pWindow = ImplGetDefaultWindow(); - return pWindow ? XubString( pWindow->ImplGetFrame()->GetSymbolKeyName( rFontName, GetFullCode() ) ) : XubString(); -} - -// ----------------------------------------------------------------------- - KeyFuncType KeyCode::GetFunction() const { if ( eFunc != KEYFUNC_DONTKNOW ) diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx index 9677640ec5e7..989892694ac1 100644 --- a/vcl/source/window/keyevent.cxx +++ b/vcl/source/window/keyevent.cxx @@ -38,37 +38,6 @@ KeyEvent::KeyEvent (const KeyEvent& rKeyEvent) : mnCharCode(rKeyEvent.mnCharCode) {} -/** inits this vcl KeyEvent with all settings from the given awt event **/ -KeyEvent::KeyEvent( const ::com::sun::star::awt::KeyEvent& rEvent ) -{ - maKeyCode = KeyCode( - rEvent.KeyCode, - (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::SHIFT) != 0, - (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD1) != 0, - (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD2) != 0, - (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD3) != 0); - mnRepeat = 0; - mnCharCode = rEvent.KeyChar; -} - -/** fills out the given awt KeyEvent with all settings from this vcl event **/ -void KeyEvent::InitKeyEvent( ::com::sun::star::awt::KeyEvent& rEvent ) const -{ - rEvent.Modifiers = 0; - if( GetKeyCode().IsShift() ) - rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::SHIFT; - if( GetKeyCode().IsMod1() ) - rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1; - if( GetKeyCode().IsMod2() ) - rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2; - if( GetKeyCode().IsMod3() ) - rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD3; - - rEvent.KeyCode = GetKeyCode().GetCode(); - rEvent.KeyChar = GetCharCode(); - rEvent.KeyFunc = sal::static_int_cast< sal_Int16 >(GetKeyCode().GetFunction()); -} - KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const { KeyEvent aClone(*this); |