From 77425ec2efd55198a2a5a0326eb8876d093e028d Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Fri, 13 Feb 2009 14:09:50 +0000
Subject: CWS-TOOLING: integrate CWS notes8 2009-01-23 17:44:41 +0100 mba 
 r266842 : #i98275#: start speller before setting text 2009-01-23 10:19:47
 +0100 mod  r266776 : minor cleanup 2009-01-22 16:45:38 +0100 mod  r266742 :
 no looping through notes while saving 2009-01-22 16:40:55 +0100 mod  r266741
 : #i98055# 2009-01-22 15:56:27 +0100 os  r266731 : #98358# dummy strings now
 hidden 2009-01-22 09:31:16 +0100 mod  r266713 : correct hiding and layout
 order 2009-01-22 09:21:23 +0100 mod  r266712 : need a speller 2009-01-21
 17:21:33 +0100 mod  r266691 : notes config 2009-01-21 17:18:23 +0100 mod 
 r266690 : fix for editing states 2009-01-21 17:18:14 +0100 mod  r266689 : fix
 for editing states 2009-01-20 14:15:16 +0100 mod  r266578 : undo fix, mba
 will fix it by importing the props 2009-01-20 00:36:01 +0100 mod  r266537 :
 do not show ankor of top reply note if we are still inside a note inside the
 same stack 2009-01-20 00:33:48 +0100 mod  r266536 : fix typo which does not
 need to be translated 2009-01-20 00:17:19 +0100 mod  r266535 : correct
 replacment of reply text 2009-01-19 23:36:12 +0100 mod  r266534 : #i97693#
 2009-01-19 23:32:26 +0100 mod  r266533 : #i97380# 2009-01-19 23:30:05 +0100
 mod  r266532 : #i97380# 2009-01-19 23:21:35 +0100 mod  r266531 : #i97299#

---
 sw/source/ui/shells/annotsh.cxx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'sw/source/ui/shells/annotsh.cxx')

diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index b2c8846429..2b4e3457c6 100755
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -1092,11 +1092,12 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
                 break;
         }
 
-        if ( (pPostItMgr->GetActivePostIt()->IsProtected()) && 
-        //if ( (pPostItMgr->GetActivePostIt()->GetStatus()==SwPostItHelper::DELETED) && 
-            ( (nSlotId==FN_DELETE_NOTE) || (nSlotId==FN_REPLY) ) )
+        if (pPostItMgr->GetActivePostIt())
+        {
+            if ( (pPostItMgr->GetActivePostIt()->IsProtected()) && 
+                    ( (nSlotId==FN_DELETE_NOTE) || (nSlotId==FN_REPLY) ) )
                 rSet.DisableItem( nWhich );
-
+        }	
         nWhich = aIter.NextWhich();
     }
 }
-- 
cgit v1.2.3