diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:21:00 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 12:21:00 +0000 |
| commit | a41c3667372f3964f1531d4e7dbafb23e2e9a777 (patch) | |
| tree | ce6f0a7f158fba10091b2778915e3cec27af95ec /sc/source/ui/drawfunc/fuins2.cxx | |
| parent | e36df8f7dfbd8571eb4d9a36bc330f2357fd2ed4 (diff) | |
INTEGRATION: CWS sb19 (1.14.8); FILE MERGED
2004/10/27 07:31:54 mba 1.14.8.3: #110407#: remove static BaseURL
2004/10/11 20:27:18 sb 1.14.8.2: RESYNC: (1.14-1.16); FILE MERGED
2004/09/01 18:13:52 er 1.14.8.1: #110405# replace static INetURLObject Rel/Abs calls
Diffstat (limited to 'sc/source/ui/drawfunc/fuins2.cxx')
| -rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 5c5008b2314b..5df0381f69f2 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuins2.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2004-10-04 20:16:42 $ + * last change: $Author: rt $ $Date: 2005-01-11 13:21:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,6 +78,7 @@ #include <sot/exchange.hxx> #include <svtools/globalnameitem.hxx> #include <sfx2/viewfrm.hxx> +#include <sfx2/docfile.hxx> #include <svtools/stritem.hxx> #include <sch/schdll.hxx> #include <sch/memchrt.hxx> @@ -325,13 +326,9 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView, if ( ERRCODE_NONE == aPluginFileDialog.Execute() ) { // get URL - String aStrURL(aPluginFileDialog.GetPath()); - aStrURL = URIHelper::SmartRelToAbs( aStrURL ); - INetURLObject aURL; aURL.SetSmartProtocol( INET_PROT_FILE ); - - if ( aURL.SetURL( aStrURL ) ) + if ( aURL.SetURL( aPluginFileDialog.GetPath() ) ) { // create a plugin object ::rtl::OUString aName; @@ -351,6 +348,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, SdrView* pView, } else { + DBG_ERROR("Invalid URL!"); //! error message //! can this happen??? } |