summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/svl/style.hxx4
-rw-r--r--sw/inc/docstyle.hxx4
-rw-r--r--sw/source/ui/app/docstyle.cxx19
3 files changed, 24 insertions, 3 deletions
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index af58cbc44327..97082312b095 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -204,9 +204,9 @@ friend class SfxStyleSheetBase;
SfxStyleSheetBasePool_Impl *pImp;
-private:
- SVL_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl();
protected:
+ SfxStyleSheetIterator& GetIterator_Impl();
+
String aAppName;
SfxItemPool& rPool;
SfxStyles aStyles;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 90a049e1ac88..6057a10fe06c 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -175,6 +175,8 @@ public:
virtual SfxStyleSheetBase* Find(const OUString& rStr);
virtual void Notify( SfxBroadcaster&, const SfxHint& );
+
+ void InvalidateIterator();
};
@@ -217,6 +219,8 @@ public:
virtual void SAL_CALL acquire( ) throw ();
virtual void SAL_CALL release( ) throw ();
+ void InvalidateIterator();
+
protected:
virtual ~SwDocStyleSheetPool();
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 934f7174b47b..b0f1701e267b 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -476,7 +476,8 @@ void SwDocStyleSheet::SetHidden( sal_Bool bValue )
if( bChg )
{
- pPool->First(); // internal list has to be updated
+ // calling pPool->First() here would be quite slow...
+ dynamic_cast<SwDocStyleSheetPool*>(pPool)->InvalidateIterator(); // internal list has to be updated
pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
SwEditShell* pSh = rDoc.GetEditShell();
if( pSh )
@@ -2772,6 +2773,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
SfxStyleSheetBase* SwStyleSheetIterator::Next()
{
+ assert(bFirstCalled);
++nLastPos;
if(!aLst.empty() && nLastPos < aLst.size())
{
@@ -2866,6 +2868,21 @@ void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<String>& rLis
}
}
+void SwDocStyleSheetPool::InvalidateIterator()
+{
+ dynamic_cast<SwStyleSheetIterator&>(GetIterator_Impl()).InvalidateIterator();
+}
+
+void SwStyleSheetIterator::InvalidateIterator()
+{
+ // potentially we could send an SfxHint to Notify but currently it's
+ // iterating over the vector anyway so would still be slow - why does
+ // this iterator not use a map?
+ bFirstCalled = false;
+ nLastPos = 0;
+ aLst.Erase();
+}
+
void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// search and remove from View-List!!