summaryrefslogtreecommitdiff
path: root/sw/source/ui/chrdlg/chardlg.cxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-03-01 14:24:52 +0000
committerKurt Zenker <kz@openoffice.org>2005-03-01 14:24:52 +0000
commitc6103378174800a65514874870d42ceb100704f1 (patch)
tree40b7525095ad09605133edeb71e803d0c59a84d4 /sw/source/ui/chrdlg/chardlg.cxx
parentbdcdb2efd98a799bc45cb41ce21122666575debd (diff)
INTEGRATION: CWS os52 (1.21.34); FILE MERGED
2005/02/01 09:46:44 os 1.21.34.1: #i41171# URL detection fixed
Diffstat (limited to 'sw/source/ui/chrdlg/chardlg.cxx')
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 6b9f3567c459..24faba034b73 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: chardlg.cxx,v $
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: rt $ $Date: 2005-01-11 12:39:08 $
+ * last change: $Author: kz $ $Date: 2005-03-01 15:24:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -408,7 +408,8 @@ BOOL SwCharURLPage::FillItemSet(SfxItemSet& rSet)
{
String sURL = aURLED.GetText();
if(sURL.Len())
- sURL = INetURLObject( sURL ).GetMainURL( INetURLObject::NO_DECODE );
+ sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link(), false );
+
SwFmtINetFmt aINetFmt(sURL, aTargetFrmLB.GetText());
aINetFmt.SetName(aNameED.GetText());
SwWrtShell &rSh = ::GetActiveView()->GetWrtShell();