Kaydet (Commit) 61d43ea6 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

remove commented out methods and parameters in ScAnyRefDlg

Change-Id: Ie9e9baf42c93353a68ef35b456cd621bf42344c5
üst c65e7ce3
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const = 0; virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const = 0;
virtual void AddRefEntry() = 0; virtual void AddRefEntry() = 0;
virtual void SetActive() = 0; virtual void SetActive() = 0;
virtual void ViewShellChanged( ScTabViewShell* pScViewShell ) = 0; virtual void ViewShellChanged() = 0;
}; };
#endif // SC_IANYREFDIALOG_HXX_INCLUDED #endif // SC_IANYREFDIALOG_HXX_INCLUDED
......
...@@ -98,7 +98,7 @@ public: ...@@ -98,7 +98,7 @@ public:
bool DoClose( sal_uInt16 nId ); bool DoClose( sal_uInt16 nId );
void SetDispatcherLock( bool bLock ); void SetDispatcherLock( bool bLock );
void EnableSpreadsheets( bool bFlag = true, bool bChildren = true ); void EnableSpreadsheets( bool bFlag = true, bool bChildren = true );
void ViewShellChanged( ScTabViewShell* pScViewShell ); void ViewShellChanged();
static void enableInput(bool _bInput); static void enableInput(bool _bInput);
...@@ -112,7 +112,7 @@ public: ...@@ -112,7 +112,7 @@ public:
//============================================================================ //============================================================================
class SC_DLLPUBLIC ScRefHandler : //public SfxModelessDialog, class SC_DLLPUBLIC ScRefHandler :
public IAnyRefDialog public IAnyRefDialog
{ {
Window & m_rWindow; Window & m_rWindow;
...@@ -141,9 +141,6 @@ protected: ...@@ -141,9 +141,6 @@ protected:
void SetDispatcherLock( bool bLock ); void SetDispatcherLock( bool bLock );
//Overwrite TWindow will implemented by ScRefHdlrImplBase
//virtual long PreNotify( NotifyEvent& rNEvt );
virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
virtual void RefInputDone( sal_Bool bForced = false ); virtual void RefInputDone( sal_Bool bForced = false );
void ShowSimpleReference( const XubString& rStr ); void ShowSimpleReference( const XubString& rStr );
...@@ -155,8 +152,7 @@ protected: ...@@ -155,8 +152,7 @@ protected:
void stateChanged(const StateChangedType nStateChange, const bool bBindRef); void stateChanged(const StateChangedType nStateChange, const bool bBindRef);
public: public:
ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pCW, ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef );
Window* pParent, sal_uInt16 nResId*/, bool bBindRef );
virtual ~ScRefHandler(); virtual ~ScRefHandler();
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0; virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0;
...@@ -172,14 +168,10 @@ public: ...@@ -172,14 +168,10 @@ public:
virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
virtual void ViewShellChanged( ScTabViewShell* pScViewShell ); virtual void ViewShellChanged();
void SwitchToDocument(); void SwitchToDocument();
//SfxBindings& GetBindings();
virtual void SetActive() = 0; virtual void SetActive() = 0;
// virtual sal_Bool Close();
//Overwrite TWindow will implemented by ScRefHdlrImplBase
//virtual void StateChanged( StateChangedType nStateChange );
public: public:
bool EnterRefMode(); bool EnterRefMode();
...@@ -207,7 +199,6 @@ template< class TWindow, bool bBindRef = true > ...@@ -207,7 +199,6 @@ template< class TWindow, bool bBindRef = true >
class ScRefHdlrImplBase: public TWindow, public ScRefHandler class ScRefHdlrImplBase: public TWindow, public ScRefHandler
{ {
public: public:
//Overwrite TWindow
virtual long PreNotify( NotifyEvent& rNEvt ); virtual long PreNotify( NotifyEvent& rNEvt );
virtual void StateChanged( StateChangedType nStateChange ); virtual void StateChanged( StateChangedType nStateChange );
...@@ -231,7 +222,7 @@ ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWi ...@@ -231,7 +222,7 @@ ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWi
template<class TWindow, bool bBindRef > template<class TWindow, bool bBindRef >
template<class TParentWindow, class TResId, class TArg> template<class TParentWindow, class TResId, class TArg>
ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, TResId nResIdP, const TArg &rArg, SfxBindings *pB /*= NULL*/ ) ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, TResId nResIdP, const TArg &rArg, SfxBindings *pB )
:TWindow( pParent, ScResId(static_cast<sal_uInt16>( nResIdP )), rArg ), ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef ){} :TWindow( pParent, ScResId(static_cast<sal_uInt16>( nResIdP )), rArg ), ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef ){}
template<class TWindow, bool bBindRef > template<class TWindow, bool bBindRef >
......
...@@ -105,8 +105,8 @@ void ScFormulaReferenceHelper::enableInput( bool bEnable ) ...@@ -105,8 +105,8 @@ void ScFormulaReferenceHelper::enableInput( bool bEnable )
Window *pParent=pWin->GetParent(); Window *pParent=pWin->GetParent();
if(pParent) if(pParent)
{ {
pParent->EnableInput(bEnable,true /* sal_False */); pParent->EnableInput(bEnable,true);
if(true /*bChildren*/) if(true)
pViewSh->EnableRefInput(bEnable); pViewSh->EnableRefInput(bEnable);
} }
} }
...@@ -181,7 +181,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const Strin ...@@ -181,7 +181,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const Strin
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr ) void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr )
{ {
if( /*!pRefEdit &&*/ bEnableColorRef) if( bEnableColorRef)
{ {
bHighLightRef=true; bHighLightRef=true;
ScViewData* pViewData=ScDocShell::GetViewData(); ScViewData* pViewData=ScDocShell::GetViewData();
...@@ -244,7 +244,7 @@ void ScFormulaReferenceHelper::HideReference( bool bDoneRefMode ) ...@@ -244,7 +244,7 @@ void ScFormulaReferenceHelper::HideReference( bool bDoneRefMode )
{ {
ScViewData* pViewData=ScDocShell::GetViewData(); ScViewData* pViewData=ScDocShell::GetViewData();
if( pViewData && /*!pRefEdit &&*/ bHighLightRef && bEnableColorRef) if( pViewData && bHighLightRef && bEnableColorRef)
{ {
ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); ScTabViewShell* pTabViewShell=pViewData->GetViewShell();
...@@ -263,7 +263,7 @@ void ScFormulaReferenceHelper::HideReference( bool bDoneRefMode ) ...@@ -263,7 +263,7 @@ void ScFormulaReferenceHelper::HideReference( bool bDoneRefMode )
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void ScFormulaReferenceHelper::ShowReference( const XubString& rStr ) void ScFormulaReferenceHelper::ShowReference( const XubString& rStr )
{ {
if( /*!pRefEdit &&*/ bEnableColorRef ) if( bEnableColorRef )
{ {
if( rStr.Search('(')!=STRING_NOTFOUND || if( rStr.Search('(')!=STRING_NOTFOUND ||
rStr.Search('+')!=STRING_NOTFOUND || rStr.Search('+')!=STRING_NOTFOUND ||
...@@ -574,7 +574,7 @@ void ScFormulaReferenceHelper::SetDispatcherLock( bool bLock ) ...@@ -574,7 +574,7 @@ void ScFormulaReferenceHelper::SetDispatcherLock( bool bLock )
// for that view (ScTabViewShell::CreateRefDialog) // for that view (ScTabViewShell::CreateRefDialog)
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void ScFormulaReferenceHelper::ViewShellChanged(ScTabViewShell* /* pScViewShell */) void ScFormulaReferenceHelper::ViewShellChanged()
{ {
enableInput( false ); enableInput( false );
...@@ -669,16 +669,14 @@ static void lcl_HideAllReferences() ...@@ -669,16 +669,14 @@ static void lcl_HideAllReferences()
// class ScRefHandler // class ScRefHandler
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pCW, ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ):
Window* pParent, sal_uInt16 nResId*/, bool bBindRef )
: //SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ),
m_rWindow( rWindow ), m_rWindow( rWindow ),
m_bInRefMode( false ), m_bInRefMode( false ),
m_aHelper(this,pB), m_aHelper(this,pB),
pMyBindings( pB ), pMyBindings( pB ),
pActiveWin(NULL) pActiveWin(NULL)
{ {
m_aHelper.SetWindow(/*this*/&m_rWindow); m_aHelper.SetWindow(&m_rWindow);
if(m_rWindow.GetHelpId().isEmpty()) //Hack, da im SfxModelessDialog die HelpId if(m_rWindow.GetHelpId().isEmpty()) //Hack, da im SfxModelessDialog die HelpId
m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und
//in eine UniqueId gewandelt wird, machen //in eine UniqueId gewandelt wird, machen
...@@ -833,7 +831,7 @@ void ScRefHandler::SetDispatcherLock( bool bLock ) ...@@ -833,7 +831,7 @@ void ScRefHandler::SetDispatcherLock( bool bLock )
void ScRefHandler::ViewShellChanged() void ScRefHandler::ViewShellChanged()
{ {
m_aHelper.ViewShellChanged(pScViewShell); m_aHelper.ViewShellChanged();
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment