diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 16:42:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 16:42:49 +0000 |
| commit | b0ce24ef3d0cd2eea7145195a4a73f9368e1bc5f (patch) | |
| tree | c7fa9ee3cdd0431efa3018e032f25a3c5f9d12fe /forms/source/component/ImageButton.cxx | |
| parent | INTEGRATION: CWS dba15 (1.31.34); FILE MERGED (diff) | |
| download | core-b0ce24ef3d0cd2eea7145195a4a73f9368e1bc5f.tar.gz core-b0ce24ef3d0cd2eea7145195a4a73f9368e1bc5f.zip | |
INTEGRATION: CWS dba15 (1.10.36); FILE MERGED
2004/07/27 14:52:53 fs 1.10.36.1: #110404# no INetURLObject::(Rel|Abs)To(Abs|Rel) anymore
Diffstat (limited to 'forms/source/component/ImageButton.cxx')
| -rw-r--r-- | forms/source/component/ImageButton.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 271bc5ad27ed..68c79a45d2bf 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ImageButton.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2004-05-10 12:45:48 $ + * last change: $Author: hr $ $Date: 2004-09-08 17:42:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -184,7 +184,7 @@ void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream _rxOutStream->writeShort(0x0003); _rxOutStream->writeShort((sal_uInt16)m_eButtonType); - ::rtl::OUString sTmp(INetURLObject::decode(INetURLObject::AbsToRel(m_sTargetURL), '%', INetURLObject::DECODE_UNAMBIGUOUS)); + ::rtl::OUString sTmp(INetURLObject::decode( m_sTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS)); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; writeHelpTextCompatibly(_rxOutStream); @@ -208,18 +208,14 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t case 0x0002: { m_eButtonType = (FormButtonType)_rxInStream->readShort(); - ::rtl::OUString sTmp; - _rxInStream >> sTmp; - m_sTargetURL = INetURLObject::RelToAbs( sTmp ); + _rxInStream >> m_sTargetURL; _rxInStream >> m_sTargetFrame; } break; case 0x0003: { m_eButtonType = (FormButtonType)_rxInStream->readShort(); - ::rtl::OUString sTmp; - _rxInStream >> sTmp; - m_sTargetURL = INetURLObject::RelToAbs( sTmp ); + _rxInStream >> m_sTargetURL; _rxInStream >> m_sTargetFrame; readHelpTextCompatibly(_rxInStream); } |