diff options
-rw-r--r-- | tools/inc/tools/pstm.hxx | 1 | ||||
-rw-r--r-- | tools/inc/tools/ref.hxx | 4 | ||||
-rw-r--r-- | tools/source/ref/pstm.cxx | 3 | ||||
-rw-r--r-- | unusedcode.easy | 5 | ||||
-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 |
10 files changed, 0 insertions, 77 deletions
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx index 68b4932e1e51..e557b6338719 100644 --- a/tools/inc/tools/pstm.hxx +++ b/tools/inc/tools/pstm.hxx @@ -127,7 +127,6 @@ class TOOLS_DLLPUBLIC SvPersistBaseMemberList : public SuperSvPersistBaseMemberL { public: SvPersistBaseMemberList(); - SvPersistBaseMemberList(sal_uInt16 nInitSz, sal_uInt16 nResize ); void WriteObjects( SvPersistStream &, sal_Bool bOnlyStreamedObj = sal_False ) const; TOOLS_DLLPUBLIC friend SvPersistStream& operator << (SvPersistStream &, const SvPersistBaseMemberList &); diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx index d5ecfe452743..24fb9627de5a 100644 --- a/tools/inc/tools/ref.hxx +++ b/tools/inc/tools/ref.hxx @@ -274,7 +274,6 @@ inline void CN##MemberList::Append( const CN##MemberList & rList )\ /************************** S v M e m b e r L i s t **********************/ #define PRV_SV_DECL_MEMBER_LIST(Class,EntryName) \ Class##MemberList() {} \ -inline Class##MemberList(sal_uInt16 nInitSz,sal_uInt16 nResize);\ inline void Insert( EntryName p ); \ inline void Insert( EntryName p, sal_uIntPtr nIndex ); \ inline void Append( EntryName p ); \ @@ -295,9 +294,6 @@ inline EntryName Prev();\ inline void Append( const Class##MemberList & rList ); #define PRV_SV_IMPL_MEMBER_LIST(ClassName,EntryName,BaseList)\ -inline ClassName##MemberList::ClassName##MemberList\ - (sal_uInt16 nInitSz,sal_uInt16 nResize)\ - : BaseList( nInitSz, nResize ){}\ inline void ClassName##MemberList::Insert( EntryName p )\ {BaseList::Insert(p);}\ inline void ClassName##MemberList::Insert( EntryName p, sal_uIntPtr nIdx )\ diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index a91b078409cb..6a0b17c79c42 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -62,9 +62,6 @@ TYPEINIT0( SvRttiBase ); /****************** SvPersistBaseMemberList ******************************/ SvPersistBaseMemberList::SvPersistBaseMemberList(){} -SvPersistBaseMemberList::SvPersistBaseMemberList( - sal_uInt16 nInitSz, sal_uInt16 nResize ) - : SuperSvPersistBaseMemberList( nInitSz, nResize ){} #define PERSIST_LIST_VER (sal_uInt8)0 #define PERSIST_LIST_DBGUTIL (sal_uInt8)0x80 diff --git a/unusedcode.easy b/unusedcode.easy index 5fbf555bb5fb..16a4630622f9 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -119,9 +119,6 @@ InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short) InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short) InsCapOptArr::Remove(unsigned short, unsigned short) ItemList::FindAttrib(unsigned short) -KeyCode::GetSymbolName(String const&, Window*) const -KeyEvent::InitKeyEvent(com::sun::star::awt::KeyEvent&) const -KeyEvent::KeyEvent(com::sun::star::awt::KeyEvent const&) KeyboardSettings::CopyData() Line::Enum(Link const&) Line::NearestPoint(Point const&) const @@ -186,7 +183,6 @@ ParagraphObj::ParagraphObj(ParagraphObj&) ParagraphStyleManager::get(WPXString const&) const PathDialog::SetPath(Edit const&) PatternFormatter::ImplLoadRes(ResId const&) -PatternFormatter::SelectFixedFont() PluginConnector::getInstance(_NPP*) PluginConnector::getInstanceById(unsigned int) PopupMenu::SetSelectedEntry(unsigned short) @@ -472,7 +468,6 @@ SvLBoxButtonData::SvLBoxButtonData() SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short) SvLBoxItem::GetSize(SvLBoxEntry*, SvViewDataEntry*) SvListView::SvListView(SvTreeList*) -SvPersistBaseMemberList::SvPersistBaseMemberList(unsigned short, unsigned short) SvPersistStream::InsertObj(SvPersistBase*) SvPersistStream::RemoveObj(SvPersistBase*) SvPersistStream::SvPersistStream(SvClassManager&, SvStream*, SvPersistStream const&) 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); |