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

Don't reset the default sheet name when the name has evern been edited.

üst 8a3f4fb9
......@@ -212,7 +212,7 @@ class AbstractScMoveTableDlg : public VclAbstractDialog //add for ScMoveTableDl
public:
virtual USHORT GetSelectedDocument () const = 0;
virtual USHORT GetSelectedTable () const = 0;
virtual BOOL GetCopyTable () const = 0;
virtual bool GetCopyTable () const = 0;
virtual bool GetRenameTable () const = 0;
virtual void GetTabNameString( String& rString ) const = 0;
virtual void SetForceCopyTable () = 0;
......
......@@ -498,7 +498,7 @@ USHORT AbstractScMoveTableDlg_Impl::GetSelectedTable() const
{
return pDlg->GetSelectedTable();
}
BOOL AbstractScMoveTableDlg_Impl::GetCopyTable() const
bool AbstractScMoveTableDlg_Impl::GetCopyTable() const
{
return pDlg->GetCopyTable();
}
......
......@@ -262,7 +262,7 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM
DECL_ABSTDLG_BASE( AbstractScMoveTableDlg_Impl, ScMoveTableDlg)
virtual USHORT GetSelectedDocument () const;
virtual USHORT GetSelectedTable () const;
virtual BOOL GetCopyTable () const;
virtual bool GetCopyTable () const;
virtual bool GetRenameTable () const;
virtual void GetTabNameString( String& rString ) const;
virtual void SetForceCopyTable ();
......
......@@ -50,7 +50,7 @@ public:
USHORT GetSelectedDocument () const;
SCTAB GetSelectedTable () const;
BOOL GetCopyTable () const;
bool GetCopyTable () const;
bool GetRenameTable () const;
void GetTabNameString( String& rString ) const;
void SetForceCopyTable ();
......@@ -87,8 +87,10 @@ private:
USHORT nDocument;
SCTAB nTable;
BOOL bCopyTable;
BOOL bRenameTable;
bool bCopyTable:1;
bool bRenameTable:1;
bool mbEverEdited:1;
//--------------------------------------
void Init ();
void InitBtnRename ();
......
......@@ -84,8 +84,9 @@ ScMoveTableDlg::ScMoveTableDlg( Window* pParent,
mrDefaultName( rDefault ),
nDocument ( 0 ),
nTable ( 0 ),
bCopyTable ( FALSE ),
bRenameTable( FALSE )
bCopyTable ( false ),
bRenameTable( false ),
mbEverEdited( false )
{
#if ENABLE_LAYOUT
#undef ScResId
......@@ -107,7 +108,7 @@ USHORT ScMoveTableDlg::GetSelectedDocument () const { return nDocument; }
SCTAB ScMoveTableDlg::GetSelectedTable () const { return nTable; }
BOOL ScMoveTableDlg::GetCopyTable () const { return bCopyTable; }
bool ScMoveTableDlg::GetCopyTable () const { return bCopyTable; }
bool ScMoveTableDlg::GetRenameTable () const { return bRenameTable; }
......@@ -141,6 +142,10 @@ void ScMoveTableDlg::EnableRenameTable(BOOL bFlag)
void ScMoveTableDlg::ResetRenameInput()
{
if (mbEverEdited)
// Don't reset the name when the sheet name has ever been edited.
return;
if (!aEdTabName.IsEnabled())
{
aEdTabName.SetText(String());
......@@ -360,7 +365,10 @@ IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox *, pLb )
IMPL_LINK( ScMoveTableDlg, CheckNameHdl, Edit *, pEdt )
{
if ( pEdt == &aEdTabName )
{
mbEverEdited = true;
CheckNewTabName();
}
return 0;
}
......
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