diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-12-13 08:04:26 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-13 10:11:44 +0000 |
commit | 90ca7d9e2423afccfaece5f7ffef7fcdd3b5b1e7 (patch) | |
tree | 4b2276cb495c416e7395bc6bc325da887eb815ad /svtools | |
parent | m_pInfoImage never constructed or used (diff) | |
download | core-90ca7d9e2423afccfaece5f7ffef7fcdd3b5b1e7.tar.gz core-90ca7d9e2423afccfaece5f7ffef7fcdd3b5b1e7.zip |
callcatcher: remove newly unused code
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/svtools/fixedhyper.hxx | 91 | ||||
-rw-r--r-- | svtools/inc/svtools/taskbar.hxx | 1 | ||||
-rw-r--r-- | svtools/inc/svtools/ttprops.hxx | 1 | ||||
-rw-r--r-- | svtools/source/control/fixedhyper.cxx | 82 | ||||
-rw-r--r-- | svtools/source/control/roadmap.cxx | 8 | ||||
-rw-r--r-- | svtools/source/control/taskstat.cxx | 64 | ||||
-rw-r--r-- | svtools/source/dialogs/filedlg2.cxx | 11 | ||||
-rw-r--r-- | svtools/source/dialogs/filedlg2.hxx | 1 | ||||
-rw-r--r-- | svtools/source/plugapp/ttprops.cxx | 12 |
9 files changed, 0 insertions, 271 deletions
diff --git a/svtools/inc/svtools/fixedhyper.hxx b/svtools/inc/svtools/fixedhyper.hxx index b12a83917ceb..b138d5743778 100644 --- a/svtools/inc/svtools/fixedhyper.hxx +++ b/svtools/inc/svtools/fixedhyper.hxx @@ -132,97 +132,6 @@ namespace svt /** sets new text and recalculates the text length. */ virtual void SetDescription( const String& rNewDescription ); }; - - //===================================================================== - //= FixedHyperlinkImage - //===================================================================== - class SVT_DLLPUBLIC FixedHyperlinkImage : public FixedImage - { - private: - Pointer m_aOldPointer; - Link m_aClickHdl; - String m_sURL; - - /** initializes the font (link color and underline). - - Called by the Ctors. - */ - void Initialize(); - - protected: - /** overwrites Window::MouseMove(). - - Changes the pointer only over the text. - */ - virtual void MouseMove( const MouseEvent& rMEvt ); - - /** overwrites Window::MouseButtonUp(). - - Calls the set link if the mouse is over the text. - */ - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - - /** overwrites Window::RequestHelp(). - - Shows tooltip only if the mouse is over the text. - */ - virtual void RequestHelp( const HelpEvent& rHEvt ); - - public: - /** ctors - - With ResId or WinBits. - */ - FixedHyperlinkImage( Window* pParent, WinBits nWinStyle = 0 ); - - /** dtor - - */ - virtual ~FixedHyperlinkImage(); - - /** overwrites Window::GetFocus(). - - Changes the color of the text and shows a focus rectangle. - */ - virtual void GetFocus(); - - /** overwrites Window::LoseFocus(). - - Changes the color of the text and hides the focus rectangle. - */ - virtual void LoseFocus(); - - /** overwrites Window::KeyInput(). - - KEY_RETURN and KEY_SPACE calls the link handler. - */ - virtual void KeyInput( const KeyEvent& rKEvt ); - - /** sets <member>m_aClickHdl</member> with <arg>rLink</arg>. - - <member>m_aClickHdl</member> is called if the text is clicked. - */ - inline void SetClickHdl( const Link& rLink ) { m_aClickHdl = rLink; } - - /** returns <member>m_aClickHdl</member>. - - @return - <member>m_aClickHdl</member> - */ - inline const Link& GetClickHdl() const { return m_aClickHdl; } - - // ::toolkit::FixedHyperbaseLink - - /** sets the URL of the hyperlink and uses it as tooltip. */ - virtual void SetURL( const String& rNewURL ); - - /** returns the URL of the hyperlink. - - @return - <member>m_sURL</member> - */ - virtual String GetURL() const; - }; //......................................................................... } // namespace svt //......................................................................... diff --git a/svtools/inc/svtools/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx index 9d2ed86f8892..c60a0aa2c720 100644 --- a/svtools/inc/svtools/taskbar.hxx +++ b/svtools/inc/svtools/taskbar.hxx @@ -291,7 +291,6 @@ private: SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( const Point& rPos, sal_Bool& rFieldRect ) const; SVT_DLLPRIVATE sal_Bool ImplUpdateClock(); SVT_DLLPRIVATE sal_Bool ImplUpdateFlashItems(); - SVT_DLLPRIVATE void ImplUpdateField( sal_Bool bItems ); DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); #endif diff --git a/svtools/inc/svtools/ttprops.hxx b/svtools/inc/svtools/ttprops.hxx index 6d07b14dfee4..dc43c54c252d 100644 --- a/svtools/inc/svtools/ttprops.hxx +++ b/svtools/inc/svtools/ttprops.hxx @@ -62,7 +62,6 @@ class Bitmap; class SVT_DLLPUBLIC TTProperties : public ApplicationProperty { sal_uInt16 nDonePRs; // Verwaltung f�r die Properties, die nur einmal gerufen werden mussen. - SVT_DLLPRIVATE sal_Bool RequestProperty( sal_uInt16 nRequest ); sal_Bool HasSlots(){ return nPropertyVersion == TT_PROPERTIES_VERSION; } diff --git a/svtools/source/control/fixedhyper.cxx b/svtools/source/control/fixedhyper.cxx index 2fa3fd553c05..598218f2fe9d 100644 --- a/svtools/source/control/fixedhyper.cxx +++ b/svtools/source/control/fixedhyper.cxx @@ -136,88 +136,6 @@ void FixedHyperlink::SetDescription( const String& rNewDescription ) m_nTextLen = GetCtrlTextWidth( GetText() ); } -FixedHyperlinkImage::FixedHyperlinkImage( Window* pParent, WinBits nWinStyle ) : - FixedImage( pParent, nWinStyle ) -{ - Initialize(); -} - -FixedHyperlinkImage::~FixedHyperlinkImage() -{ -} - -void FixedHyperlinkImage::Initialize() -{ - // saves the old pointer - m_aOldPointer = GetPointer(); -} - -void FixedHyperlinkImage::MouseMove( const MouseEvent& rMEvt ) -{ - // changes the pointer if the control is enabled and the mouse is over the text. - if ( !rMEvt.IsLeaveWindow() && IsEnabled() ) - SetPointer( POINTER_REFHAND ); - else - SetPointer( m_aOldPointer ); -} - -void FixedHyperlinkImage::MouseButtonUp( const MouseEvent& ) -{ - // calls the link if the control is enabled and the mouse is over the text. - if ( IsEnabled() ) - ImplCallEventListenersAndHandler( VCLEVENT_BUTTON_CLICK, m_aClickHdl, this ); - - Size aSize = GetSizePixel(); - Size aImgSz = GetImage().GetSizePixel(); - if ( aSize.Width() < aImgSz.Width() ) - { - DBG_ERRORFILE("xxx"); - } -} - -void FixedHyperlinkImage::RequestHelp( const HelpEvent& rHEvt ) -{ - if ( IsEnabled() ) - FixedImage::RequestHelp( rHEvt ); -} - -void FixedHyperlinkImage::GetFocus() -{ - Paint( Rectangle( Point(), GetSizePixel() ) ); - ShowFocus( Rectangle( Point( 1, 1 ), Size( GetSizePixel().Width() - 2, GetSizePixel().Height() - 2 ) ) ); -} - -void FixedHyperlinkImage::LoseFocus() -{ - Paint( Rectangle( Point(), GetSizePixel() ) ); - HideFocus(); -} - -void FixedHyperlinkImage::KeyInput( const KeyEvent& rKEvt ) -{ - switch ( rKEvt.GetKeyCode().GetCode() ) - { - case KEY_SPACE: - case KEY_RETURN: - m_aClickHdl.Call( this ); - break; - - default: - FixedImage::KeyInput( rKEvt ); - } -} - -void FixedHyperlinkImage::SetURL( const String& rNewURL ) -{ - m_sURL = rNewURL; - SetQuickHelpText( m_sURL ); -} - -String FixedHyperlinkImage::GetURL() const -{ - return m_sURL; -} - //......................................................................... } // namespace svt //......................................................................... diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 4460ccc911e8..60c58530d111 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -107,8 +107,6 @@ namespace svt void SetIndex( ItemIndex _Index ); ItemIndex GetIndex() const; - ::rtl::OUString GetLabel( ); - void Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText ); void SetPosition( RoadmapItem* OldHyperLabel ); @@ -792,12 +790,6 @@ namespace svt } //--------------------------------------------------------------------- - ::rtl::OUString RoadmapItem::GetLabel( ) - { - return mpDescription ? mpDescription->GetText() : String(); - } - - //--------------------------------------------------------------------- void RoadmapItem::SetPosition( RoadmapItem* _pOldItem ) { Point aIDPos; diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 594163e50333..a074cf3c02bf 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -240,70 +240,6 @@ sal_Bool TaskStatusBar::ImplUpdateFlashItems() // ----------------------------------------------------------------------- -void TaskStatusBar::ImplUpdateField( sal_Bool bItems ) -{ - maTimer.Stop(); - - if ( bItems ) - { - mnItemWidth = 0; - mbFlashItems = sal_False; - mbOutInterval = sal_False; - for ( size_t i = 0, n = mpFieldItemList->size(); i < n; ++i ) { - ImplTaskSBFldItem* pItem = (*mpFieldItemList)[ i ]; - mnItemWidth += TASKSTATUSBAR_IMAGEOFFX; - pItem->mnOffX = mnItemWidth; - mnItemWidth += pItem->maItem.GetImage().GetSizePixel().Width(); - if ( pItem->maItem.GetFlags() & TASKSTATUSFIELDITEM_FLASH ) { - mbFlashItems = sal_True; - } - } - } - else - { - if ( mnFieldFlags & TASKSTATUSFIELD_CLOCK ) - { - XubString aStr = SvtSysLocale().GetLocaleData().getTime( Time( 23, 59, 59 ), sal_False, sal_False ); - mnClockWidth = GetTextWidth( aStr )+(TASKSTATUSBAR_CLOCXOFFX*2); - } - else - mnClockWidth = 0; - } - - long nNewWidth = mnItemWidth+mnClockWidth; - if ( mnItemWidth && !mnClockWidth ) - nNewWidth += TASKSTATUSBAR_IMAGEOFFX; - if ( nNewWidth != mnFieldWidth ) - { - RemoveItem( TASKSTATUSBAR_STATUSFIELDID ); - - if ( mnItemWidth || mnClockWidth ) - { - mnFieldWidth = nNewWidth; - long nOffset = GetItemOffset( TASKSTATUSBAR_STATUSFIELDID ); - sal_uInt16 nItemPos = GetItemPos( TASKSTATUSBAR_STATUSFIELDID ); - InsertItem( TASKSTATUSBAR_STATUSFIELDID, nNewWidth, SIB_RIGHT | SIB_IN | SIB_USERDRAW, nOffset, nItemPos ); - } - else - mnFieldWidth = 0; - - if ( mpNotifyTaskBar ) - mpNotifyTaskBar->Resize(); - } - else - SetItemData( TASKSTATUSBAR_STATUSFIELDID, NULL ); - - if ( mbFlashItems || (mnFieldFlags & TASKSTATUSFIELD_CLOCK) ) - { - ImplUpdateClock(); - mbOutInterval = sal_True; - ImplUpdateFlashItems(); - maTimer.Start(); - } -} - -// ----------------------------------------------------------------------- - void TaskStatusBar::MouseButtonDown( const MouseEvent& rMEvt ) { sal_Bool bFieldRect; diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index 80ae25ba9298..4bad2d51b65a 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -1168,17 +1168,6 @@ void ImpFileDialog::SetPath( Edit const& rEdit ) SetPath( aPresetText ); } - -void ImpFileDialog::AddFilter( const UniString& rFilter, const UniString& rMask ) -{ - aFilterList.push_back( new ImpFilterItem( rFilter, rMask ) ); - if( pTypeList ) - pTypeList->InsertEntry( rFilter, LISTBOX_APPEND ); - - if( !GetCurFilter().Len() ) - SetCurFilter( rFilter ); -} - void ImpFileDialog::SetCurFilter( const UniString& rFilter ) { if( !pTypeList ) diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx index 7492c4b921b3..694fa012c006 100644 --- a/svtools/source/dialogs/filedlg2.hxx +++ b/svtools/source/dialogs/filedlg2.hxx @@ -158,7 +158,6 @@ public: ImpFileDialog( PathDialog* pDlg, WinBits nStyle, RESOURCE_TYPE nType ); virtual ~ImpFileDialog(); - void AddFilter( const String& rFilter, const String& rMask ); void SetCurFilter( const String& rFilter ); String GetCurFilter() const; diff --git a/svtools/source/plugapp/ttprops.cxx b/svtools/source/plugapp/ttprops.cxx index 6efb3679997c..c050df6d3c28 100644 --- a/svtools/source/plugapp/ttprops.cxx +++ b/svtools/source/plugapp/ttprops.cxx @@ -33,16 +33,4 @@ TYPEINIT1( TTProperties, ApplicationProperty ) -sal_Bool TTProperties::RequestProperty( sal_uInt16 nRequest ) -{ - if ( (( nRequest & TT_PR_ONCE ) == 0) || (nDonePRs & (nRequest & 0x0ff)) == 0 ) - { - nActualPR = nRequest; - nDonePRs |= nRequest; - GetpApp()->Property( *this ); - return nActualPR == 0; - } - return sal_True; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |