diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 12:52:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 12:52:38 +0000 |
| commit | 595dfc4f75b988b33d66d2e0053cff97e5f7af98 (patch) | |
| tree | 73bc37aeaad749ff9e9ddd50e71ad2efd410c7c1 /ucbhelper | |
| parent | 465e139bbe73aaaa591187516dd78f96486b0543 (diff) | |
INTEGRATION: CWS jl13 (1.29.22); FILE MERGED
2004/09/15 07:11:14 dbo 1.29.22.1: #i33982# updating URL after insertion
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/client/content.cxx | 22 |
1 files changed, 19 insertions, 3 deletions
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; @@ -1887,6 +1895,14 @@ inline void Content_Impl::setEnvironment( } //========================================================================= +void Content_Impl::inserted() +{ + // URL might have changed during 'insert' => recalculate in next getURL() + osl::MutexGuard aGuard( m_aMutex ); + m_aURL = ::rtl::OUString(); +} + +//========================================================================= //========================================================================= // // ContentEventListener_Impl Implementation. |