diff options
Diffstat (limited to 'svx/source/fmcomp')
-rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 4 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 6 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 28b6c509dc12..cbb5cd5b48f2 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1109,6 +1109,7 @@ void FmGridControl::SetDesignMode(sal_Bool bMode) sal_Bool bOldMode = IsDesignMode(); DbGridControl::SetDesignMode(bMode); if (bOldMode != bMode) + { if (!bMode) { // selection aufheben @@ -1136,6 +1137,7 @@ void FmGridControl::SetDesignMode(sal_Bool bMode) } } } + } } //------------------------------------------------------------------------------ @@ -2043,6 +2045,7 @@ void FmGridControl::Select() Reference< XIndexAccess > xColumns(GetPeer()->getColumns(), UNO_QUERY); Reference< XSelectionSupplier > xSelSupplier(xColumns, UNO_QUERY); if (xSelSupplier.is()) + { if (nSelectedColumn != SAL_MAX_UINT16) { Reference< XPropertySet > xColumn; @@ -2053,6 +2056,7 @@ void FmGridControl::Select() { xSelSupplier->select(Any()); } + } } catch(Exception&) { diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 157f8deaf2b0..80983514ede5 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1940,10 +1940,12 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V { FmXGridCell* pXCell = pLoop->GetCell(); if (pXCell) + { if (bVoid) pXCell->SetTextLineColor(); else pXCell->SetTextLineColor(aTextLineColor); + } pLoop = rColumns.Next(); } @@ -2911,11 +2913,15 @@ IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot) Sequence<sal_uInt16>& aSupported = getSupportedGridSlots(); const sal_uInt16* pSlots = aSupported.getConstArray(); for (sal_uInt16 i=0; i<aSupported.getLength(); ++i) + { if (pSlots[i] == nSlot) + { if (!m_pDispatchers[i].is()) return -1; // nothing known about this slot else return m_pStateCache[i]; + } + } return -1; } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index b3b18632884c..96534551b354 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 !"); |