summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2001-01-18 10:58:46 +0000
committerCaolán McNamara <cmc@openoffice.org>2001-01-18 10:58:46 +0000
commit76bd85b50ed015d852597ad67ed75032a410115e (patch)
tree54ab736ebea28378287ac89422baec1286ed3e2f
parent61630aede2753637d1de8b849ce17ae18db5fbca (diff)
#82900# Needed the more sophisticated relative url converter for hyperlinks
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 6acdb7d4f4e0..7512f0ef4b8d 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par5.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: khz $ $Date: 2000-12-04 14:08:08 $
+ * last change: $Author: cmc $ $Date: 2001-01-18 11:58:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2597,7 +2597,9 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* pF, String& rStr )
if( !sURL.Len() )
{
ConvertFFileName( sURL, aReadParam.GetResult() );
- sURL = INetURLObject::RelToAbs( sURL );
+ //#82900# Need the more sophisticated url converter. cmc
+ //sURL = INetURLObject::RelToAbs( sURL );
+ sURL = URIHelper::SmartRelToAbs( sURL );
}
break;
@@ -2862,12 +2864,15 @@ void SwWW8ImplReader::Read_Invisible( USHORT, BYTE* pData, short nLen )
Source Code Control System - Header
- $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par5.cxx,v 1.6 2000-12-04 14:08:08 khz Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par5.cxx,v 1.7 2001-01-18 11:58:46 cmc Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
+ Revision 1.6 2000/12/04 14:08:08 khz
+ #78930# Pictures in Hyperlinks will be imported as Graphics with Hyperlink
+
Revision 1.5 2000/11/24 11:04:38 khz
WW field names use ANSI encoding - not plain 7-bit ASCII