diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
| commit | 605209eda74b0b31a8da020a2dfd2bbadbb1c7d4 (patch) | |
| tree | df8a931de7a4c4b1ee5ab1f7ed5506388943ecbc /fpicker | |
| parent | c931cca51fec6a327e94b22e93f0e2fb3fa1e43f (diff) | |
| parent | d646413d464dc5d6518f87daa8538cd0c600797f (diff) | |
removetooltypes01: Rebase to DEV300m98
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.hxx | 2 | ||||
| -rw-r--r-- | fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 21839554aefc..c203924f6e51 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -42,7 +42,7 @@ #endif -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include "commonpicker.hxx" #include "pickercallbacks.hxx" diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx index 509c22d3477d..3848ab081186 100644 --- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx @@ -1445,7 +1445,7 @@ uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() t OSL_ASSERT( m_pDialog != NULL ); // TODO return m_pImpl->getSupportedImageFormats(); - return 0; + return uno::Sequence<sal_Int16>(); } sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeException ) |