From 595dfc4f75b988b33d66d2e0053cff97e5f7af98 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 9 Nov 2004 12:52:38 +0000
Subject: INTEGRATION: CWS jl13 (1.29.22); FILE MERGED 2004/09/15 07:11:14 dbo
 1.29.22.1: #i33982# updating URL after insertion

---
 ucbhelper/source/client/content.cxx | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index a9442f40d4be..e98c4a6d4486 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: content.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: svesik $ $Date: 2004-04-21 12:34:22 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 13:52:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -316,6 +316,8 @@ public:
     inline const Reference< XCommandEnvironment >& getEnvironment() const;
     inline void setEnvironment(
                         const Reference< XCommandEnvironment >& xNewEnv );
+
+    void inserted();
 };
 
 //=========================================================================
@@ -1397,6 +1399,8 @@ void Content::writeStream( const Reference< XInputStream >& rStream,
     aCommand.Argument <<= aArg;
 
     m_xImpl->executeCommand( aCommand );
+
+    m_xImpl->inserted();
 }
 
 //=========================================================================
@@ -1464,6 +1468,8 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     InsertCommandArgument(
                                         rData,
                                         sal_False /* ReplaceExisting */ ) ) );
+    aNewContent.m_xImpl->inserted();
+
     rNewContent = aNewContent;
     return sal_True;
 }
@@ -1503,6 +1509,8 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     InsertCommandArgument(
                                         rData,
                                         sal_False /* ReplaceExisting */ ) ) );
+    aNewContent.m_xImpl->inserted();
+
     rNewContent = aNewContent;
     return sal_True;
 }
@@ -1703,7 +1711,7 @@ Content_Impl::~Content_Impl()
     }
 }
 
-
+//=========================================================================
 void Content_Impl::disposing( const EventObject& Source )
 {
     Reference<XContent> xContent;
@@ -1886,6 +1894,14 @@ inline void Content_Impl::setEnvironment(
     m_xEnv = xNewEnv;
 }
 
+//=========================================================================
+void Content_Impl::inserted()
+{
+    // URL might have changed during 'insert' => recalculate in next getURL()
+    osl::MutexGuard aGuard( m_aMutex );
+    m_aURL = ::rtl::OUString();
+}
+
 //=========================================================================
 //=========================================================================
 //
-- 
cgit