diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-06 16:25:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-06 17:17:40 +0200 |
| commit | 3f4a63f1492b7b471ad995029244a6a113e6636d (patch) | |
| tree | 69b6adc030a2afa5dca2c015bf550a00a18143a1 /sc/source/core/data/conditio.cxx | |
| parent | fb24a49d76edfe3cc7c9aeb7e9c293bee8a3d371 (diff) | |
Revert "abstract type in ptr_container needs this workaround"
d3f063cc86b50ac9adf08eb46dd2caf7975ed43c, by instead restricting the use of the
Boost pointer containers to non-inline code (watch out for implicitly generated
copy ctors and copy assignment ops), thus preventing MSVC from trying to
generate full template instantiations of those containers (similar to
f4227c822c7f5a4e1e1b3b4e096cb63cf710a3f1 "Blind fix for MSVC, take two").
Turns out the ScConditionalFormat copy ctor was unused anyway (but the
ScConditionalFormatList copy ctor isn't, so only prevent generation of an
implicit copy assignment op there).
Change-Id: I23303a98df7024dbce95638ac13097b71a9c5c04
Diffstat (limited to 'sc/source/core/data/conditio.cxx')
| -rw-r--r-- | sc/source/core/data/conditio.cxx | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index f898cfef0906..c091cd592643 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1829,19 +1829,6 @@ ScConditionalFormat::ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocume { } -ScConditionalFormat::ScConditionalFormat(const ScConditionalFormat& r) : - pDoc( r.pDoc ), - nKey( r.nKey ), - maRanges( r.maRanges ) -{ - for (CondFormatContainer::const_iterator itr = r.maEntries.begin(); itr != r.maEntries.end(); ++itr) - { - ScFormatEntry* pNewEntry = itr->Clone(r.pDoc); - maEntries.push_back( pNewEntry ); - pNewEntry->SetParent(this); - } -} - ScConditionalFormat* ScConditionalFormat::Clone(ScDocument* pNewDoc) const { // echte Kopie der Formeln (fuer Ref-Undo / zwischen Dokumenten) @@ -1890,6 +1877,16 @@ void ScConditionalFormat::AddEntry( ScFormatEntry* pNew ) pNew->SetParent(this); } +bool ScConditionalFormat::IsEmpty() const +{ + return maEntries.empty(); +} + +size_t ScConditionalFormat::size() const +{ + return maEntries.size(); +} + ScConditionalFormat::~ScConditionalFormat() { } @@ -2106,6 +2103,11 @@ ScConditionalFormatList::ScConditionalFormatList(ScDocument* pDoc, const ScCondi InsertNew( itr->Clone(pDoc) ); } +void ScConditionalFormatList::InsertNew( ScConditionalFormat* pNew ) +{ + maConditionalFormats.insert(pNew); +} + bool ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) const { // fuer Ref-Undo - interne Variablen werden nicht verglichen |