diff options
Diffstat (limited to 'fpicker/source/unx/gnome/FPentry.cxx')
| -rw-r--r-- | fpicker/source/unx/gnome/FPentry.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx index 459d943abf..2f63a948e2 100644 --- a/fpicker/source/unx/gnome/FPentry.cxx +++ b/fpicker/source/unx/gnome/FPentry.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,15 +29,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_fpicker.hxx" +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT +#endif + //---------------------------------------------- // includes of other projects //---------------------------------------------- #include <cppuhelper/factory.hxx> -#include <com/sun/star/container/XSet.hpp> #include <osl/diagnose.h> #include "SalGtkFilePicker.hxx" #include "SalGtkFolderPicker.hxx" -#include <vcl/svapp.hxx> #include "FPServiceInfo.hxx" #include <glib-object.h> @@ -50,11 +55,9 @@ extern const guint gtk_minor_version; using namespace ::rtl; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; using namespace ::cppu; -using ::com::sun::star::ui::dialogs::XFilePicker; using ::com::sun::star::ui::dialogs::XFilePicker2; using ::com::sun::star::ui::dialogs::XFolderPicker; @@ -120,7 +123,7 @@ void* SAL_CALL component_getFactory( { Sequence< OUString > aSNS( 1 ); aSNS.getArray( )[0] = - OUString::createFromAscii(FILE_PICKER_SERVICE_NAME); + OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_SERVICE_NAME)); xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), @@ -132,7 +135,7 @@ void* SAL_CALL component_getFactory( { Sequence< OUString > aSNS( 1 ); aSNS.getArray( )[0] = - OUString::createFromAscii(FOLDER_PICKER_SERVICE_NAME); + OUString(RTL_CONSTASCII_USTRINGPARAM(FOLDER_PICKER_SERVICE_NAME)); xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), @@ -153,3 +156,4 @@ void* SAL_CALL component_getFactory( } // extern "C" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |