diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:56:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:56:17 +0000 |
| commit | 9869c0679082209efb5eba22b4f8dafd01c4d0b7 (patch) | |
| tree | ae7aa8a2f35522bafa073a22ba717f3c6b837c93 | |
| parent | a42a27ec57294990766d7dcb9bae8c301740085e (diff) | |
INTEGRATION: CWS sb19 (1.24.494); FILE MERGED
2004/12/21 15:52:29 sb 1.24.494.3: #i10000# Cleaned up merge conflict.
2004/12/21 09:23:33 sb 1.24.494.2: RESYNC: (1.24-1.25); FILE MERGED
2004/10/27 07:30:31 mba 1.24.494.1: #110407#: remove static BaseURL
| -rw-r--r-- | svx/source/dialog/imapdlg.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 8a22629d8790..41fca19ac33d 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: imapdlg.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: hr $ $Date: 2004-12-13 12:15:45 $ + * last change: $Author: rt $ $Date: 2005-01-11 12:56:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,6 +113,8 @@ #endif #include <svtools/miscopt.hxx> #include <sfx2/viewfrm.hxx> +#include <sfx2/objsh.hxx> +#include <sfx2/docfile.hxx> #ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX #include <unotools/localedatawrapper.hxx> @@ -701,7 +703,7 @@ void SvxIMapDlg::DoOpen() if( pIStm ) { - aLoadIMap.Read( *pIStm, IMAP_FORMAT_DETECT ); + aLoadIMap.Read( *pIStm, IMAP_FORMAT_DETECT, String() ); if( pIStm->GetError() ) ErrorHandler::HandleError( ERRCODE_IO_GENERAL ); @@ -775,10 +777,9 @@ BOOL SvxIMapDlg::DoSave() aURL.setExtension( aExt ); SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC ); - if( pOStm ) { - pIMapWnd->GetImageMap().Write( *pOStm, nFormat ); + pIMapWnd->GetImageMap().Write( *pOStm, nFormat, String() ); if( pOStm->GetError() ) ErrorHandler::HandleError( ERRCODE_IO_GENERAL ); @@ -952,7 +953,8 @@ IMPL_LINK( SvxIMapDlg, URLLoseFocusHdl, void*, p ) if ( aURLText.Len() ) { - aNewInfo.aMarkURL = ::URIHelper::SmartRelToAbs( aURLText, FALSE, + String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL(); + aNewInfo.aMarkURL = ::URIHelper::SmartRel2Abs( INetURLObject(aBase), aURLText, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ); } |