Kaydet (Commit) 457a9f40 authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Eike Rathke

tdf#94173: Calc doesn't save your own created autoformat presets

Auformat list (maData) is defined as "MapType" which itself is defined like this:
boost::ptr_map<OUString, ScAutoFormatData>
so default sorting is ascii

2 consequences:
1) Default didn't appear first
2) When adding a new autoformat entry when it was new first one of the list
wasn't saved because of iterator was incremented first before looping
See https://bugs.documentfoundation.org/show_bug.cgi?id=94173#c5
There were some other weird behaviors too according to comments of the bugtracker

Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=72c1b6141d590fb4479925ed8bc88b79357c2bfc

Solution:
Add a Compare so Default entry is always first one so the first time incremented iterator is ok and
new entry (even if new first one in list) is saved

Thank you Markus for the idea! (I was lost in Compare syntax)

Reviewed-on: https://gerrit.libreoffice.org/18598Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 652158c3)

use collator for UI visible sorting, tdf#94173 follow-up

(cherry picked from commit a71febc9)

b9f7ebb087c1ce5008f43b2df3f1fadc41066ed1

Change-Id: I9ba0cdc63c66b747db102bb661cd09fbfe5996ae
Reviewed-on: https://gerrit.libreoffice.org/19029Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: 's avatarEike Rathke <erack@redhat.com>
üst ddd5614f
......@@ -307,9 +307,13 @@ public:
bool Save( SvStream& rStream, sal_uInt16 fileVersion );
};
struct DefaultFirstEntry {
bool operator() (const OUString& left, const OUString& right) const;
};
class SC_DLLPUBLIC ScAutoFormat
{
typedef boost::ptr_map<OUString, ScAutoFormatData> MapType;
typedef boost::ptr_map<OUString, ScAutoFormatData, DefaultFirstEntry> MapType;
MapType maData;
bool mbSaveLater;
ScAfVersions m_aVersions;
......
......@@ -896,6 +896,16 @@ ScAutoFormat::ScAutoFormat() :
insert(pData);
}
bool DefaultFirstEntry::operator() (const OUString& left, const OUString& right) const
{
OUString aStrStandard(ScGlobal::GetRscString(STR_STYLENAME_STANDARD));
if ( ScGlobal::GetpTransliteration()->isEqual( left, aStrStandard ) )
return true;
if ( ScGlobal::GetpTransliteration()->isEqual( right, aStrStandard ) )
return false;
return ScGlobal::GetCollator()->compareString( left, right) < 0;
}
ScAutoFormat::ScAutoFormat(const ScAutoFormat& r) :
maData(r.maData),
mbSaveLater(false) {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment