From 63c9a01a2ce92230d778a0bc3695c03563ccc864 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 23 Jan 2007 06:34:08 +0000
Subject: INTEGRATION: CWS fwk59 (1.26.4); FILE MERGED 2007/01/17 15:04:10 mav
 1.26.4.2: #i73522# register later 2007/01/16 14:59:33 mav 1.26.4.1: #i73522#
 register as a modify listener

---
 embedserv/source/embed/docholder.cxx | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'embedserv/source')

diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 744aadf126ec..7415f1e4959b 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: docholder.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: rt $ $Date: 2006-12-05 12:51:07 $
+ *  last change: $Author: obo $ $Date: 2007-01-23 07:34:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -680,6 +680,14 @@ void DocumentHolder::FreeOffice()
 
 void DocumentHolder::DisconnectFrameDocument()
 {
+    try
+    {
+        uno::Reference< util::XModifyBroadcaster > xModifiable( m_xDocument, uno::UNO_QUERY_THROW );
+        xModifiable->removeModifyListener( (util::XModifyListener*)this );
+    }
+    catch( uno::Exception& )
+    {}
+
     try
     {
         uno::Reference< util::XCloseBroadcaster > xBroadcaster(
@@ -702,6 +710,14 @@ void DocumentHolder::DisconnectFrameDocument()
 
 void DocumentHolder::CloseDocument()
 {
+    try
+    {
+        uno::Reference< util::XModifyBroadcaster > xModifiable( m_xDocument, uno::UNO_QUERY_THROW );
+        xModifiable->removeModifyListener( (util::XModifyListener*)this );
+    }
+    catch( uno::Exception& )
+    {}
+
     uno::Reference< util::XCloseBroadcaster > xBroadcaster(
         m_xDocument, uno::UNO_QUERY );
     if ( xBroadcaster.is() )
@@ -962,6 +978,18 @@ void DocumentHolder::show()
             {
                 OSL_ENSURE( sal_False, "Can not adjust the frame!\n" );
             }
+
+
+            if ( !m_bLink )
+            {
+                try
+                {
+                    uno::Reference< util::XModifyBroadcaster > xModifiable( m_xDocument, uno::UNO_QUERY_THROW );
+                    xModifiable->addModifyListener( (util::XModifyListener*)this );
+                }
+                catch( uno::Exception& )
+                {}
+            }
         }
 
         if ( !m_bLink )
-- 
cgit v1.2.1