diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:37:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:37:19 +0000 |
| commit | ca9a318beb82b86a26cbbd78c5d4a03840ff0f76 (patch) | |
| tree | ae57feecbb6ddff9980c0868cf3a72f9e9e6c3db /sw/source/filter/xml/wrtxml.cxx | |
| parent | INTEGRATION: CWS sb19 (1.55.40); FILE MERGED (diff) | |
| download | core-ca9a318beb82b86a26cbbd78c5d4a03840ff0f76.tar.gz core-ca9a318beb82b86a26cbbd78c5d4a03840ff0f76.zip | |
INTEGRATION: CWS sb19 (1.43.40); FILE MERGED
2004/12/08 19:30:21 sb 1.43.40.5: RESYNC: (1.45-1.46); FILE MERGED
2004/11/01 09:28:42 mba 1.43.40.4: #110409#: use correct BaseURL
2004/10/29 07:40:49 mba 1.43.40.3: #110409#: remove static BaseURL
2004/10/11 16:32:10 sb 1.43.40.2: RESYNC: (1.43-1.45); FILE MERGED
2004/10/07 14:22:06 os 1.43.40.1: #110409# static base URL has gone
Diffstat (limited to 'sw/source/filter/xml/wrtxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 73d4ce5d0c21..4395360282da 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtxml.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: obo $ $Date: 2005-01-05 11:48:04 $ + * last change: $Author: rt $ $Date: 2005-01-11 12:37:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -156,8 +156,9 @@ using namespace ::com::sun::star::lang; #define LOGFILE_AUTHOR "mb93740" -SwXMLWriter::SwXMLWriter() +SwXMLWriter::SwXMLWriter( const String& rBaseURL ) { + SetBaseURL( rBaseURL ); } @@ -327,19 +328,7 @@ sal_uInt32 SwXMLWriter::_Write() // Set base URI OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") ); - ::rtl::OUString aBaseURL; - sal_Bool bBaseURLSet = sal_False; - if ( pMedDescrMedium && pMedDescrMedium->GetItemSet() ) - { - const SfxStringItem* pBaseURLItem = static_cast<const SfxStringItem*>( - pMedDescrMedium->GetItemSet()->GetItem(SID_DOC_BASEURL) ); - if ( pBaseURLItem ) - { - aBaseURL = pBaseURLItem->GetValue(); - bBaseURLSet = sal_True; - } - } - xInfoSet->setPropertyValue( sPropName, makeAny( aBaseURL ) ); + xInfoSet->setPropertyValue( sPropName, makeAny( ::rtl::OUString( GetBaseURL() ) ) ); // TODO/LATER: separate links from normal embedded objects if( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocShell()->GetCreateMode() ) @@ -359,8 +348,6 @@ sal_uInt32 SwXMLWriter::_Write() xInfoSet->setPropertyValue( sPropName, makeAny( aName ) ); } } - else if ( !bBaseURLSet ) - xInfoSet->setPropertyValue( sPropName, makeAny( ::rtl::OUString( INetURLObject::GetBaseURL() ) ) ); if( bBlock ) { @@ -709,9 +696,9 @@ sal_Bool SwXMLWriter::WriteThroughComponent( // ----------------------------------------------------------------------- -void GetXMLWriter( const String& rName, WriterRef& xRet ) +void GetXMLWriter( const String& rName, const String& rBaseURL, WriterRef& xRet ) { - xRet = new SwXMLWriter(); + xRet = new SwXMLWriter( rBaseURL ); } // ----------------------------------------------------------------------- |