diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:35:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:35:55 +0000 |
| commit | 47d87cc3069535336da91d8702b92e3948f9e8e1 (patch) | |
| tree | 0628158525abe221de80513a1c6829acadd8b22c /fpicker/source/aqua/FPentry.cxx | |
| parent | c4966a5ddab7a84b474a7a965c64e78a3d220e80 (diff) | |
INTEGRATION: CWS aquafilepicker02_DEV300 (1.2.40); FILE MERGED
2008/01/14 08:23:24 fheckl 1.2.40.2: Code cleanup and some implementation details
2008/01/02 18:25:58 fheckl 1.2.40.1: issue #80399 more Cocoa
Diffstat (limited to 'fpicker/source/aqua/FPentry.cxx')
| -rw-r--r-- | fpicker/source/aqua/FPentry.cxx | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx index e5239533e7..853adbb07f 100644 --- a/fpicker/source/aqua/FPentry.cxx +++ b/fpicker/source/aqua/FPentry.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FPentry.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: ihi $ $Date: 2007-07-11 10:58:21 $ + * last change: $Author: kz $ $Date: 2008-03-05 16:35:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,20 +45,21 @@ #include <com/sun/star/container/XSet.hpp> #endif -#ifndef _OSL_DIAGNOSE_H_ -#include <osl/diagnose.h> -#endif +// #ifndef _OSL_DIAGNOSE_H_ +// #include <osl/diagnose.h> +// #endif #ifndef _SALAQUAFILEPICKER_HXX_ #include "SalAquaFilePicker.hxx" #endif + #ifndef _SALAQUAFOLDERPICKER_HXX_ #include "SalAquaFolderPicker.hxx" #endif -#ifndef _SV_SVAPP_HXX -#include <vcl/svapp.hxx> -#endif +// #ifndef _SV_SVAPP_HXX +// #include <vcl/svapp.hxx> +// #endif #ifndef _FPSERVICEINFO_HXX_ #include "FPServiceInfo.hxx" @@ -85,16 +86,14 @@ static Reference< XInterface > SAL_CALL createFileInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { return Reference< XInterface >( - static_cast< XFilePicker* >( - new SalAquaFilePicker( rServiceManager ) ) ); + *new SalAquaFilePicker( rServiceManager ) ); } static Reference< XInterface > SAL_CALL createFolderInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { return Reference< XInterface >( - static_cast< XFolderPicker* >( - new SalAquaFolderPicker( rServiceManager ) ) ); + *new SalAquaFolderPicker( rServiceManager ) ); } //------------------------------------------------ |