summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-09-08 16:51:08 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-09-08 16:51:08 +0000
commitb56cae9c56d004699bace39899b583a1559c040e (patch)
treebafbdebf8624beaa62e0be4813154b7acb1b0430
parent2aca7d37ccaefce805d23695281d2dd3b295f87a (diff)
INTEGRATION: CWS dba15 (1.74.2); FILE MERGED
2004/08/23 15:24:41 fs 1.74.2.1: #110404#
-rw-r--r--extensions/source/propctrlr/formcontroller.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 4bde991a3458..a14085f8b27c 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: formcontroller.cxx,v $
*
- * $Revision: 1.75 $
+ * $Revision: 1.76 $
*
- * last change: $Author: obo $ $Date: 2004-08-11 14:00:05 $
+ * last change: $Author: hr $ $Date: 2004-09-08 17:51:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2956,7 +2956,8 @@ class EventsNameReplace_Impl:
// URL- Adresse koennte relativ sein
if ((nPropId == PROPERTY_ID_TARGET_URL || nPropId == PROPERTY_ID_IMAGE_URL) && aVal.Len())
{
- aUserVal = URIHelper::SmartRelToAbs(aVal);
+ INetURLObject aDocURL( getDocumentURL() );
+ aUserVal = URIHelper::SmartRel2Abs( aDocURL, aVal, Link(), false, true, INetURLObject::ENCODE_ALL, INetURLObject::DECODE_TO_IURI );
}
Any aValue;