diff options
Diffstat (limited to 'fpicker/source')
-rw-r--r-- | fpicker/source/aqua/resourceprovider.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/generic/fpicker.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.src | 2 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFolderPicker.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.cxx | 16 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.hrc | 2 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.hxx | 6 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.src | 2 | ||||
-rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 10 | ||||
-rw-r--r-- | fpicker/source/office/iodlgimp.hxx | 2 | ||||
-rw-r--r-- | fpicker/source/unx/gnome/resourceprovider.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/unx/kde4/KDE4FilePicker.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/win32/misc/resourceprovider.cxx | 2 |
14 files changed, 29 insertions, 29 deletions
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx index 75dfacbf8f2d..c643ad158279 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 9bdb870ebcc8..d9f0b16fcacb 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 7ea601e57828..585196ce5ef2 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -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" diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src index afcbf275afdf..7f2ff15a48ce 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 757ebc0cca7f..d9543a3aeee0 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -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 5470df6fe409..c296c22dc931 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -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 a0643c072724..8ab58036f437 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 96bcad358edd..00cfe918c04c 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 116ba9fb540d..2200679dfc7b 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 4d217f518547..8f17704c0e87 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -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; diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 5b97455b628a..1ec46130f6e8 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 73049c251ad0..920c05d7a8dc 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 96a14dbcef11..ae3f9ebf86ad 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 fc488c42e3e6..505a647d1ee9 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 |