sc/source/core/data/table2.cxx | 7 ++- sc/source/ui/condformat/condformatdlgentry.cxx | 46 ++++++++++++++----------- xmlhelp/source/cxxhelp/provider/content.cxx | 8 ++-- 3 files changed, 35 insertions(+), 26 deletions(-)
New commits: commit 41095e934bcd83e08a472c8fb53743cd3f8e926c Author: Markus Mohrhard <[email protected]> Date: Tue Feb 19 20:11:28 2013 +0100 respect nDelFlags, fdo#57661 Change-Id: I77d3e1f537b59504125d66f66f691d01f8f23894 diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 97bd375..db43e5e 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -567,7 +567,7 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark ) if (nDelFlag & IDF_NOTE && pRange) maNotes.erase(pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row(), true); - if(pRange && pRange->aStart.Tab() == nTab) + if((nDelFlag & IDF_ATTRIB) && pRange && pRange->aStart.Tab() == nTab) mpCondFormatList->DeleteArea( pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row() ); } commit de1c23bb7dc952b6b279d0f7505509486c3b5da6 Author: Markus Mohrhard <[email protected]> Date: Tue Feb 19 19:18:35 2013 +0100 respect local number format in cond format dlg, fdo#60574 Change-Id: Iec185ac6c6447176731619249cdda4457f1bb8a3 diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index e66ab7e..40d247e 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -583,7 +583,7 @@ void ScFormulaFrmtEntry::SetInactive() namespace { -void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit, ColorListBox& rLbCol ) +void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit, ColorListBox& rLbCol, ScDocument* pDoc ) { // entry Automatic is not available for color scales sal_Int32 nIndex = static_cast<sal_Int32>(rEntry.GetType()); @@ -597,7 +597,13 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, case COLORSCALE_PERCENTILE: case COLORSCALE_VALUE: case COLORSCALE_PERCENT: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); + { + double nVal = rEntry.GetValue(); + SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); + rtl::OUString aText; + pNumberFormatter->GetInputLineString(nVal, 0, aText); + rEdit.SetText(aText); + } break; case COLORSCALE_FORMULA: rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); @@ -673,9 +679,9 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDo if(pFormat) { ScColorScaleFormat::const_iterator itr = pFormat->begin(); - SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin); + SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin, pDoc); ++itr; - SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax); + SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax, pDoc); } else { @@ -825,12 +831,12 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDo if(pFormat) { ScColorScaleFormat::const_iterator itr = pFormat->begin(); - SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin); + SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin, pDoc); assert(pFormat->size() == 3); ++itr; - SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle, maLbColMiddle); + SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle, maLbColMiddle, pDoc); ++itr; - SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax); + SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax, pDoc); } else { @@ -1006,7 +1012,7 @@ IMPL_LINK_NOARG( ScConditionFrmtEntry, ConditionTypeSelectHdl ) namespace { -void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit ) +void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit, ScDocument* pDoc ) { rLbType.SelectEntryPos(rEntry.GetType()); switch(rEntry.GetType()) @@ -1015,18 +1021,20 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Ed case COLORSCALE_MIN: case COLORSCALE_MAX: break; - case COLORSCALE_PERCENTILE: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - break; + case COLORSCALE_VALUE: case COLORSCALE_PERCENT: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); + case COLORSCALE_PERCENTILE: + { + double nVal = rEntry.GetValue(); + SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); + rtl::OUString aText; + pNumberFormatter->GetInputLineString(nVal, 0, aText); + rEdit.SetText(aText); + } break; case COLORSCALE_FORMULA: rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); break; - case COLORSCALE_VALUE: - rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue())); - break; } } @@ -1046,8 +1054,8 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const if(pFormat) { mpDataBarData.reset(new ScDataBarFormatData(*pFormat->GetDataBarData())); - SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, maLbDataBarMinType, maEdDataBarMin); - SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, maLbDataBarMaxType, maEdDataBarMax); + SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, maLbDataBarMinType, maEdDataBarMin, pDoc); + SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, maLbDataBarMaxType, maEdDataBarMax, pDoc); DataBarTypeSelectHdl(NULL); } else @@ -1151,8 +1159,8 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl ) if( pDlg->Execute() == RET_OK) { mpDataBarData.reset(pDlg->GetData()); - SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, maLbDataBarMinType, maEdDataBarMin); - SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, maLbDataBarMaxType, maEdDataBarMax); + SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, maLbDataBarMinType, maEdDataBarMin, mpDoc); + SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, maLbDataBarMaxType, maEdDataBarMax, mpDoc); DataBarTypeSelectHdl(NULL); } return 0; commit 2bc95ebcb9ac66b32ea03f3ccd5996304e910fa1 Author: Markus Mohrhard <[email protected]> Date: Tue Feb 19 18:57:18 2013 +0100 automatically extending cond formats is dangerous, fdo#60828 Change-Id: I45549e163f21550e879a171d80e836b6df3dd2cc diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 23b7a9a..97bd375 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -389,9 +389,10 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE if (nStartCol>0) // copy old attributes { - sal_uInt16 nWhichArray[2]; + sal_uInt16 nWhichArray[3]; nWhichArray[0] = ATTR_MERGE; - nWhichArray[1] = 0; + nWhichArray[1] = ATTR_CONDITIONAL; + nWhichArray[2] = 0; for (SCSIZE i=0; i<nSize; i++) { commit beea592413f5e5661c3fa7ef2c38b0a20b2627a4 Author: Markus Mohrhard <[email protected]> Date: Sun Feb 17 20:00:16 2013 +0100 coverity: passing by const reference is more efficient Change-Id: Icee079458f0b4624281a2fdef1ce8cd6d6b900b1 diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index 2f83fb8..cab0215 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -218,14 +218,14 @@ public: sal_Int32 nOpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort, - URLParameter aURLParameter, + const URLParameter& rURLParameter, Databases* pDatabases ) : m_xContext( xContext ), m_xProvider( xProvider ), m_nOpenMode( nOpenMode ), m_seq( seq ), m_seqSort( seqSort ), - m_aURLParameter( aURLParameter ), + m_aURLParameter( rURLParameter ), m_pDatabases( pDatabases ) { } @@ -266,14 +266,14 @@ public: sal_Int32 nOpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort, - URLParameter aURLParameter, + const URLParameter& rURLParameter, Databases* pDatabases ) : m_xContext( rxContext ), m_xProvider( xProvider ), m_nOpenMode( nOpenMode ), m_seq( seq ), m_seqSort( seqSort ), - m_aURLParameter( aURLParameter ), + m_aURLParameter( rURLParameter ), m_pDatabases( pDatabases ) { } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
