summaryrefslogtreecommitdiff
path: root/svx/source/fmcomp/gridctrl.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-05 07:09:20 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-05 07:09:20 +0000
commit949e1fca53e8b0766540261a937cf298848411db (patch)
tree38734e11cd81d3fa7f9839f2d2f0ae7226320d06 /svx/source/fmcomp/gridctrl.cxx
parent1d0219b34f231408fade2fca317937378aa1ed0e (diff)
CWS-TOOLING: integrate CWS cmcfixes54
2009-02-19 17:39:12 +0100 cmc r268301 : revert meant-to-be local-only changes in configure 2009-02-19 17:33:52 +0100 cmc r268300 : revert meant-to-be local-only change in readlicense_oo 2009-02-19 17:31:48 +0100 cmc r268299 : remove config_office dir from workspace, hopefully this doesn't screw things up 2009-02-05 17:38:47 +0100 cmc r267431 : #i98367# snprintf needs stdio.h on gcc4.4 2009-01-27 10:51:54 +0100 cmc r266964 : CWS-TOOLING: rebase CWS cmcfixes54 to trunk@266944 (milestone: DEV300:m40) 2009-01-23 10:05:33 +0100 cmc r266774 : #i98389# fix t602 filter warnings 2009-01-22 16:37:57 +0100 cmc r266740 : #i98367# revert limits.h as its going in elsewhere 2009-01-22 16:36:45 +0100 cmc r266739 : #i98367# remove easy warnings 2009-01-22 16:31:49 +0100 cmc r266738 : #i98366# merge in basic fix of #i96087# to bf_basic 2009-01-22 14:50:24 +0100 cmc r266716 : #i98288# some versions of neon report DAV:Collection instead of Collection
Diffstat (limited to 'svx/source/fmcomp/gridctrl.cxx')
-rw-r--r--svx/source/fmcomp/gridctrl.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index ddf8f54e03..71e115eb5c 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1323,6 +1323,7 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt)
// the 'insert' option affects our empty row
if (bInsertChanged)
+ {
if (m_nOptions & OPT_INSERT)
{ // the insert option is to be set
m_xEmptyRow = new DbGridRow();
@@ -1335,6 +1336,7 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt)
GoToRowColumnId(GetCurRow() - 1, GetCurColumnId());
RowRemoved(GetRowCount(), 1, sal_True);
}
+ }
// the 'delete' options has no immediate consequences
@@ -1729,10 +1731,12 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId)
for (nNewModelPos = 0; nNewModelPos < m_aColumns.Count(); ++nNewModelPos)
{
if (!m_aColumns.GetObject(nNewModelPos)->IsHidden())
+ {
if (!nNewViewPos)
break;
else
--nNewViewPos;
+ }
}
DBG_ASSERT(nNewModelPos<m_aColumns.Count(), "DbGridControl::ColumnMoved : could not find the new model position !");