[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 19 02:07:01 PDT 2012
sc/source/ui/app/scmod.cxx | 3 +++
sc/source/ui/optdlg/tpusrlst.cxx | 2 ++
2 files changed, 5 insertions(+)
New commits:
commit 07cc274256ebff259e228e7285bc27e6ddc94fdc
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
Change-Id: I9c7f62b47f83b7798a8efdbf3896503918929f03
(cherry picked from commit 4302eb0a6c4e28ab675de9d59e73cac345ba30c7)
Signed-off-by: David Tardon <dtardon 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();
}
+
}
// -----------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list