[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/column3.cxx  |    4 ++++
 sc/source/ui/app/scmod.cxx       |    3 +++
 sc/source/ui/optdlg/tpusrlst.cxx |    2 ++
 3 files changed, 9 insertions(+)

New commits:
commit d8643c11d4c89f0534b3caebd4e0fbf212777140
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Oct 17 15:45:18 2012 +0200

    write the custom sort list info into the item set, fdo#53870
    
    (cherry picked from commit 4302eb0a6c4e28ab675de9d59e73cac345ba30c7)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 07cc274256ebff259e228e7285bc27e6ddc94fdc)
    
    Change-Id: I9c7f62b47f83b7798a8efdbf3896503918929f03
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 845e551..2635cb8 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2051,7 +2051,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 3eee008..ba6fc9a 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 a25776ae243646179a0bb3cd7f16a6d46f09b4cf
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Oct 17 12:28:27 2012 +0200

    ignore broadcaster cells to fill autofilter dialog, fdo#55712
    
    (cherry picked from commit 622f7751b78fd8584e34f5fa96a04ed6e8bb98f5)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 637096b75f2989640967e72aee41e48b07a5a602)
    
    Change-Id: Iacd3f8cfc26bb147eaf3b6957338be212b448226
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 48d77dc..475299d 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1501,6 +1501,10 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, std::vector<ScTy
             }
             break;
 
+            // skip broadcaster cells
+            case CELLTYPE_NOTE:
+                continue;
+
             default:
                 ;
         }