sc/source/core/data/column2.cxx | 10 +++++++--- sc/source/core/data/column3.cxx | 4 ++++ sc/source/ui/app/scmod.cxx | 3 +++ sc/source/ui/optdlg/tpusrlst.cxx | 2 ++ 4 files changed, 16 insertions(+), 3 deletions(-)
New commits: commit 4302eb0a6c4e28ab675de9d59e73cac345ba30c7 Author: Markus Mohrhard <[email protected]> Date: Wed Oct 17 15:45:18 2012 +0200 write the custom sort list info into the item set, fdo#53870 Change-Id: I9c7f62b47f83b7798a8efdbf3896503918929f03 diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 2b74872..3a9ff2f 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2043,7 +2043,10 @@ SfxItemSet* ScModule::CreateItemSet( sal_uInt16 nId ) // TP_USERLISTS if ( pUL ) + { aULItem.SetUserList( *pUL ); + pRet->Put(aULItem); + } // TP_COMPATIBILITY pRet->Put( SfxUInt16Item( SID_SC_OPT_KEY_BINDING_COMPAT, diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index a4f7428..092b24f 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -96,6 +96,7 @@ ScTpUserLists::ScTpUserLists( Window* pParent, { SetExchangeSupport(); Init(); + Reset(rCoreAttrs); FreeResource(); } @@ -153,6 +154,7 @@ void ScTpUserLists::Init() aFtCopyFrom.Disable(); aEdCopyFrom.Disable(); } + } // ----------------------------------------------------------------------- commit 40377a6e26aa61a1c0788cad1c97a10911d38da8 Author: Markus Mohrhard <[email protected]> Date: Wed Oct 17 13:10:09 2012 +0200 only use non blank cells in the visible data methods, fdo#54552 Change-Id: I2a0914fbaff3e3f707a9c06f693079aed2b89ba4 diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 964f1d4..6a74d78 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -1124,7 +1124,8 @@ bool ScColumn::IsEmptyVisData() const SCSIZE i; for (i=0; i<maItems.size() && !bVisData; i++) { - bVisData = true; + if(!maItems[i].pCell->IsBlank()) + bVisData = true; } return !bVisData; } @@ -1158,8 +1159,11 @@ SCROW ScColumn::GetLastVisDataPos() const for (i=maItems.size(); i>0 && !bFound; ) { --i; - bFound = true; - nRet = maItems[i].nRow; + if(!maItems[i].pCell->IsBlank()) + { + bFound = true; + nRet = maItems[i].nRow; + } } } return nRet; commit 622f7751b78fd8584e34f5fa96a04ed6e8bb98f5 Author: Markus Mohrhard <[email protected]> Date: Wed Oct 17 12:28:27 2012 +0200 ignore broadcaster cells to fill autofilter dialog, fdo#55712 Change-Id: Iacd3f8cfc26bb147eaf3b6957338be212b448226 diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index dff64c1..9afed9c 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1499,6 +1499,10 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, std::vector<ScTy } break; + // skip broadcaster cells + case CELLTYPE_NOTE: + continue; + default: ; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
