sc/inc/globstr.hrc | 2 -- sc/source/ui/dbgui/dbnamdlg.cxx | 7 ++++--- sc/source/ui/src/globstr.src | 4 ---- 3 files changed, 4 insertions(+), 9 deletions(-)
New commits: commit 59dcb5918dbcb93173afcd5bc4f3b01fa7bef1ee Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Fri Mar 9 02:16:06 2012 +0100 prevent creating new db ranges with the internal anonymous db name diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 0f32a4d..493b2db 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -469,7 +469,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) if ( aNewName.Len() > 0 && aNewArea.Len() > 0 ) { - if ( ScRangeData::IsNameValid( aNewName, pDoc ) ) + if ( ScRangeData::IsNameValid( aNewName, pDoc ) && !aNewName.EqualsAscii(STR_DB_LOCAL_NONAME) ) { // weil jetzt editiert werden kann, muss erst geparst werden ScRange aTmpRange; commit 66fbd3a48ac5608eeb45629b9d285790cfcefff6 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Fri Mar 9 02:08:40 2012 +0100 remove one more reference to the anonymous db string diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 18850f8..0f32a4d 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -245,7 +245,6 @@ void ScDbNameDlg::Init() pDBData = pDBColl->GetDBAtCursor( nStartCol, nStartRow, nStartTab, sal_True ); if ( pDBData ) { - ::rtl::OUString theDbName; ScAddress& rStart = theCurArea.aStart; ScAddress& rEnd = theCurArea.aEnd; SCCOL nCol1; @@ -260,7 +259,9 @@ void ScDbNameDlg::Init() && (rStart.Col() == nCol1) && (rStart.Row() == nRow1) && (rEnd.Col() == nCol2) && (rEnd.Row() == nRow2 ) ) { - aEdName.SetText(pDBData->GetName()); + rtl::OUString aDBName = pDBData->GetName(); + if (!aDBName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME))) + aEdName.SetText(aDBName); aBtnHeader.Check( pDBData->HasHeader() ); aBtnDoSize.Check( pDBData->IsDoSize() ); commit 50ade1da6464c99bd9670dbaa2fc1a9dadf6b914 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Fri Mar 9 02:00:47 2012 +0100 remove old unnamed db string diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 48f4015..5157eb6 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -67,8 +67,6 @@ #define STR_UNDO_IMPORTDATA 37 #define STR_UNDO_REPEATDB 38 -#define STR_DB_NONAME 39 - #define STR_MSSG_DOSUBTOTALS_0 40 #define STR_MSSG_DOSUBTOTALS_1 41 #define STR_MSSG_DOSUBTOTALS_2 42 diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index 2e852ec..164e12d 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -365,10 +365,6 @@ Resource RID_GLOBSTR { Text [ en-US ] = "~Change Case"; }; - String STR_DB_NONAME - { - Text [ en-US ] = "unnamed" ; - }; String STR_DBNAME_IMPORT { Text [ en-US ] = "Import" ; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits