Kaydet (Commit) 9e96d3e1 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Force copy when all sheets are selected.

This includes disabling the Move button too.
üst b7379e7d
...@@ -215,7 +215,7 @@ public: ...@@ -215,7 +215,7 @@ public:
virtual BOOL GetCopyTable () const = 0; virtual BOOL GetCopyTable () const = 0;
virtual bool GetRenameTable () const = 0; virtual bool GetRenameTable () const = 0;
virtual void GetTabNameString( String& rString ) const = 0; virtual void GetTabNameString( String& rString ) const = 0;
virtual void SetCopyTable (BOOL bFlag=TRUE) = 0; virtual void SetForceCopyTable () = 0;
virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0; virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0;
virtual void EnableRenameTable (BOOL bFlag=TRUE) = 0; virtual void EnableRenameTable (BOOL bFlag=TRUE) = 0;
}; };
......
...@@ -510,9 +510,9 @@ void AbstractScMoveTableDlg_Impl::GetTabNameString( String& rString ) const ...@@ -510,9 +510,9 @@ void AbstractScMoveTableDlg_Impl::GetTabNameString( String& rString ) const
{ {
pDlg->GetTabNameString( rString ); pDlg->GetTabNameString( rString );
} }
void AbstractScMoveTableDlg_Impl::SetCopyTable(BOOL bFla) void AbstractScMoveTableDlg_Impl::SetForceCopyTable()
{ {
return pDlg->SetCopyTable( bFla ); return pDlg->SetForceCopyTable();
} }
void AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag) void AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag)
{ {
......
...@@ -265,7 +265,7 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM ...@@ -265,7 +265,7 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM
virtual BOOL GetCopyTable () const; virtual BOOL GetCopyTable () const;
virtual bool GetRenameTable () const; virtual bool GetRenameTable () const;
virtual void GetTabNameString( String& rString ) const; virtual void GetTabNameString( String& rString ) const;
virtual void SetCopyTable (BOOL bFlag=TRUE); virtual void SetForceCopyTable ();
virtual void EnableCopyTable (BOOL bFlag=TRUE); virtual void EnableCopyTable (BOOL bFlag=TRUE);
virtual void EnableRenameTable (BOOL bFlag=TRUE); virtual void EnableRenameTable (BOOL bFlag=TRUE);
}; };
......
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
BOOL GetCopyTable () const; BOOL GetCopyTable () const;
bool GetRenameTable () const; bool GetRenameTable () const;
void GetTabNameString( String& rString ) const; void GetTabNameString( String& rString ) const;
void SetCopyTable (BOOL bFlag=TRUE); void SetForceCopyTable ();
void EnableCopyTable (BOOL bFlag=TRUE); void EnableCopyTable (BOOL bFlag=TRUE);
void EnableRenameTable (BOOL bFlag=TRUE); void EnableRenameTable (BOOL bFlag=TRUE);
......
...@@ -112,9 +112,11 @@ void ScMoveTableDlg::GetTabNameString( String& rString ) const ...@@ -112,9 +112,11 @@ void ScMoveTableDlg::GetTabNameString( String& rString ) const
rString = aEdTabName.GetText(); rString = aEdTabName.GetText();
} }
void ScMoveTableDlg::SetCopyTable(BOOL bFlag) void ScMoveTableDlg::SetForceCopyTable()
{ {
aBtnCopy.Check(bFlag); aBtnCopy.Check(true);
aBtnMove.Disable();
aBtnCopy.Disable();
} }
void ScMoveTableDlg::EnableCopyTable(BOOL bFlag) void ScMoveTableDlg::EnableCopyTable(BOOL bFlag)
...@@ -129,6 +131,7 @@ void ScMoveTableDlg::EnableRenameTable(BOOL bFlag) ...@@ -129,6 +131,7 @@ void ScMoveTableDlg::EnableRenameTable(BOOL bFlag)
{ {
bRenameTable = bFlag; bRenameTable = bFlag;
aEdTabName.Enable(bFlag); aEdTabName.Enable(bFlag);
aFtTabName.Enable(bFlag);
ResetRenameInput(); ResetRenameInput();
} }
......
...@@ -555,8 +555,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) ...@@ -555,8 +555,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if(nTableCount==nTabSelCount) if(nTableCount==nTabSelCount)
{ {
pDlg->SetCopyTable(); pDlg->SetForceCopyTable();
pDlg->EnableCopyTable(FALSE);
} }
// We support direct renaming of sheet only when one sheet // We support direct renaming of sheet only when one sheet
......
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