5 files changed, 8 insertions, 8 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
index ceb8ea14ef..a527e5165f 100644
--- a/fpicker/source/office/OfficeFilePicker.src
+++ b/fpicker/source/office/OfficeFilePicker.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 
 String STR_SVT_FILEPICKER_AUTO_EXTENSION
 {
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 429676d8b7..67388582b7 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -57,7 +57,7 @@
 #include <unotools/localfilehelper.hxx>
 
 #ifndef _SVTOOLS_HRC
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #endif
 #ifndef _SVT_HELPID_HRC
 #include "svtools/helpid.hrc"
@@ -1587,6 +1587,9 @@ void SvtFileDialog::UpdateControls( const String& rURL )
                 sText = sURL;
         }
 
+        if ( !sText.Len() && rURL.Len() )
+            // happens, for instance, for URLs which the INetURLObject does not know to belong to a hierarchical scheme
+            sText = rURL;
         _pImp->_pFtCurrentPath->SetText( sText );
     }
 
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 365c1ec7bb..f28cb90925 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -29,7 +29,7 @@
 #define _SVTOOLS_IODLGIMPL_HRC
 
 #ifndef _SVTOOLS_HRC
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #endif
 
 // ModalDialog DLG_SVT_EXPLORERFILE
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 2f19df5a1b..4ddb6bb8e8 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
  // includes ******************************************************************
-#include "svl/svtools.hrc"
+#include "svtools/svtools.hrc"
 #include "svtools/helpid.hrc"
 #include "iodlg.hrc"
 
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index e362af4ca4..af1e3ca4da 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -46,15 +46,12 @@
 #include "svtools/fileview.hxx"
 #include "svtools/inettbc.hxx"
 #include "iodlg.hxx"
-#ifndef _SVTOOLS_IODLGIMPL_HRC
 #include "iodlg.hrc"
-#endif
 #include "svtools/imagemgr.hxx"
 #include <unotools/localfilehelper.hxx>
 #include "unotools/useroptions.hxx"
-#ifndef _RTL_INSTANCE_HXX_
 #include "rtl/instance.hxx"
-#endif
+#include <svl/svl.hrc>
 
 #define _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_STRINGSDTOR