sb111: merged in DEV300_m68

14 files changed, 38 insertions, 38 deletions

diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index 937e6fb962..7f40fa026d 100644
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
 #ifndef _SVTOOLS_SVTOOLS_HRC_
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #endif
 
 #ifndef _SVTOOLS_FILEDLG2_HRC_
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 409e582742..f725a20c1f 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -38,7 +38,7 @@
 #endif
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "svtools/miscopt.hxx"
-#include "svtools/pickerhistoryaccess.hxx"
+#include "svl/pickerhistoryaccess.hxx"
 
 #ifndef _SV_APP_HXX
 #include "vcl/svapp.hxx"
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 8486dbdd58..fb981e7f4d 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/ui/dialogs/FilePickerEvent.hpp>
 #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
@@ -58,7 +58,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <unotools/ucbhelper.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include "vos/mutex.hxx"
@@ -1058,7 +1058,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
     throw ( Exception, RuntimeException )
 {
     checkAlive();
-    
+
     Sequence< Any > aArguments( _rArguments.getLength());
 
     m_nServiceType = TemplateDescription::FILEOPEN_SIMPLE;
@@ -1074,7 +1074,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
             NamedValue emptyNamedValue;
             aArguments[0] <<= emptyNamedValue;
             index = 1;
-            
+
         }
         for ( int i = index; i < _rArguments.getLength(); i++)
         {
@@ -1087,9 +1087,9 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
                 if ( namedValue.Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StandardDir" ) ) ) )
                 {
                     ::rtl::OUString sStandardDir;
-                    
+
                     namedValue.Value >>= sStandardDir;
-                    
+
                     // Set the directory for the "back to the default dir" button
                         if ( sStandardDir.getLength() > 0 )
                     {
diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
index 908ce7e4af..c841631466 100644
--- a/fpicker/source/office/OfficeFilePicker.src
+++ b/fpicker/source/office/OfficeFilePicker.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 
 String STR_SVT_FILEPICKER_AUTO_EXTENSION
 {
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 090aed73b0..d9543a3aee 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,13 +39,13 @@
 #include <tools/urlobj.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/container/XSet.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
 
 // using ----------------------------------------------------------------
 
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index d4c88c9371..1f8b6a3ce4 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,23 +44,23 @@
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include "svtools/ehdl.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/pathoptions.hxx"
-#include "svtools/viewoptions.hxx"
+#include "svl/urihelper.hxx"
+#include "unotools/pathoptions.hxx"
+#include "unotools/viewoptions.hxx"
 #include "svtools/fileview.hxx"
-#include "svtools/inetoptions.hxx"
+#include "unotools/inetoptions.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
 #include "svtools/svtabbx.hxx"
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_STRINGSDTOR
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/localfilehelper.hxx>
 
 #ifndef _SVTOOLS_HRC
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 #endif
 #ifndef _SVT_HELPID_HRC
 #include "svtools/helpid.hrc"
@@ -72,7 +72,7 @@
 #include "asyncfilepicker.hxx"
 #include "iodlgimp.hxx"
 #include "svtools/inettbc.hxx"
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
 #include "svtools/QueryFolderName.hxx"
 #ifndef  _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index eaaed21f90..ecd5fd98e1 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -32,7 +32,7 @@
 #define _SVTOOLS_IODLGIMPL_HRC
 
 #ifndef _SVTOOLS_HRC
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 #endif
 
 // ModalDialog DLG_SVT_EXPLORERFILE
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index c680e394d0..d0a6d1489d 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -46,9 +46,9 @@
 #include <com/sun/star/ucb/IOErrorCode.hpp>
 #include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp>
 #include <unotools/confignode.hxx>
-#include "svtools/inettype.hxx"
-#include "svtools/urlfilter.hxx"
-#include <svtools/restrictedpaths.hxx>
+#include "svl/inettype.hxx"
+#include "svl/urlfilter.hxx"
+#include <svl/restrictedpaths.hxx>
 #include "asyncfilepicker.hxx"
 #include "OfficeControlAccess.hxx"
 #include "fpsmartcontent.hxx"
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 91538d1490..56ab98ac22 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -29,7 +29,7 @@
  ************************************************************************/
 
  // includes ******************************************************************
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
 #include "svtools/helpid.hrc"
 #include "iodlg.hrc"
 
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 6a9ace467c..1bd67da654 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,9 +43,9 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/svapp.hxx>
 // #97148# ---------------
-#include "svtools/ctypeitm.hxx"
-#include "svtools/eitem.hxx"
-#include "svtools/viewoptions.hxx"
+#include "svl/ctypeitm.hxx"
+#include "svl/eitem.hxx"
+#include "unotools/viewoptions.hxx"
 #include "svtools/fileview.hxx"
 #include "svtools/inettbc.hxx"
 #include "iodlg.hxx"
@@ -54,7 +54,7 @@
 #endif
 #include "svtools/imagemgr.hxx"
 #include <unotools/localfilehelper.hxx>
-#include "svtools/useroptions.hxx"
+#include "unotools/useroptions.hxx"
 #ifndef _RTL_INSTANCE_HXX_
 #include "rtl/instance.hxx"
 #endif
@@ -62,7 +62,7 @@
 #define _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_USHORTS
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -329,7 +329,7 @@ void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu )
     {
         if ( GetDialogParent()->isUrlAllowed( *aLoop ) )
         {
-            Image aImage = SvFileInformationManager::GetImage( 
+            Image aImage = SvFileInformationManager::GetImage(
                 INetURLObject(*aLoop), bIsHighContrast );
             if ( LocalFileHelper::ConvertURLToSystemPath(*aLoop, sDisplayName) )
                 _pMenu->InsertItem( nItemId, sDisplayName, aImage );
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 8d9df32ee9..07ad8af65a 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -37,7 +37,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/group.hxx>
 
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
 
 #include <vector>
 
diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx
index 9197082b24..04c407b3df 100644
--- a/fpicker/source/unx/gnome/resourceprovider.cxx
+++ b/fpicker/source/unx/gnome/resourceprovider.cxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <svtools/filedlg2.hrc>
 
 //------------------------------------------------------------
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 1d4402d74a..bea4617e8b 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -65,7 +65,7 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #include <vos/mutex.hxx>
 
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 803339892a..9f609a7769 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 //------------------------------------------------------------
 // namespace directives