INTEGRATION: CWS changefileheader (1.3.12); FILE MERGED
2008/04/01 15:16:58 thb 1.3.12.3: #i85898# Stripping all external header guards 2008/04/01 12:30:48 thb 1.3.12.2: #i85898# Stripping all external header guards 2008/03/31 13:13:13 rt 1.3.12.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm
parent
b94592ca56
commit
89336a47eb
3 changed files with 54 additions and 119 deletions
|
|
@ -1,35 +1,30 @@
|
|||
/*************************************************************************
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* $RCSfile: SalAquaPicker.cxx,v $
|
||||
* Copyright 2008 by Sun Microsystems, Inc.
|
||||
*
|
||||
* $Revision: 1.3 $
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* last change: $Author: kz $ $Date: 2008-03-05 16:38:36 $
|
||||
* $RCSfile: SalAquaPicker.cxx,v $
|
||||
* $Revision: 1.4 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
* This file is part of OpenOffice.org.
|
||||
*
|
||||
* OpenOffice.org is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License version 3
|
||||
* only, as published by the Free Software Foundation.
|
||||
*
|
||||
* GNU Lesser General Public License Version 2.1
|
||||
* =============================================
|
||||
* Copyright 2005 by Sun Microsystems, Inc.
|
||||
* 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
* OpenOffice.org is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License version 3 for more details
|
||||
* (a copy is included in the LICENSE file that accompanied this code).
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License version 2.1, as published by the Free Software Foundation.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* version 3 along with OpenOffice.org. If not, see
|
||||
* <http://www.openoffice.org/license.html>
|
||||
* for a copy of the LGPLv3 License.
|
||||
*
|
||||
************************************************************************/
|
||||
|
||||
|
|
@ -37,42 +32,20 @@
|
|||
// includes
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
|
||||
#include <com/sun/star/lang/DisposedException.hpp>
|
||||
#endif
|
||||
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
|
||||
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
||||
#endif
|
||||
#ifndef _CPPUHELPER_INTERFACECONTAINER_H_
|
||||
#include <cppuhelper/interfacecontainer.h>
|
||||
#endif
|
||||
#ifndef _OSL_DIAGNOSE_H_
|
||||
#include <osl/diagnose.h>
|
||||
#endif
|
||||
#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
|
||||
#include <com/sun/star/uno/Any.hxx>
|
||||
#endif
|
||||
#ifndef _FPSERVICEINFO_HXX_
|
||||
#include <FPServiceInfo.hxx>
|
||||
#endif
|
||||
#ifndef _VOS_MUTEX_HXX_
|
||||
#include <vos/mutex.hxx>
|
||||
#endif
|
||||
#ifndef _SV_SVAPP_HXX
|
||||
#include <vcl/svapp.hxx>
|
||||
#endif
|
||||
#ifndef _SALAQUAPICKER_HXX_
|
||||
#include "SalAquaPicker.hxx"
|
||||
#endif
|
||||
#ifndef _URLOBJ_HXX
|
||||
#include <tools/urlobj.hxx>
|
||||
#endif
|
||||
#ifndef _OSL_FILE_HXX_
|
||||
#include <osl/file.hxx>
|
||||
#endif
|
||||
#ifndef _CFSTRINGUTILITIES_HXX_
|
||||
#include "CFStringUtilities.hxx"
|
||||
#endif
|
||||
#include "NSString_OOoAdditions.hxx"
|
||||
|
||||
#include "SalAquaFilePicker.hxx"
|
||||
|
|
|
|||
|
|
@ -1,35 +1,30 @@
|
|||
/*************************************************************************
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* $RCSfile: SalAquaPicker.hxx,v $
|
||||
* Copyright 2008 by Sun Microsystems, Inc.
|
||||
*
|
||||
* $Revision: 1.3 $
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* last change: $Author: kz $ $Date: 2008-03-05 16:38:55 $
|
||||
* $RCSfile: SalAquaPicker.hxx,v $
|
||||
* $Revision: 1.4 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
* This file is part of OpenOffice.org.
|
||||
*
|
||||
* OpenOffice.org is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License version 3
|
||||
* only, as published by the Free Software Foundation.
|
||||
*
|
||||
* GNU Lesser General Public License Version 2.1
|
||||
* =============================================
|
||||
* Copyright 2005 by Sun Microsystems, Inc.
|
||||
* 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
* OpenOffice.org is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License version 3 for more details
|
||||
* (a copy is included in the LICENSE file that accompanied this code).
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License version 2.1, as published by the Free Software Foundation.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* version 3 along with OpenOffice.org. If not, see
|
||||
* <http://www.openoffice.org/license.html>
|
||||
* for a copy of the LGPLv3 License.
|
||||
*
|
||||
************************************************************************/
|
||||
|
||||
|
|
@ -40,9 +35,7 @@
|
|||
// includes of other projects
|
||||
//_____________________________________________________________________________
|
||||
|
||||
#ifndef _OSL_MUTEX_HXX_
|
||||
#include <osl/mutex.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _RTL_USTRING_HXX
|
||||
#include <rtl/ustring.hxx>
|
||||
|
|
@ -55,10 +48,7 @@
|
|||
#ifndef _COM_SUN_STAR_UNO_RUNTIMEEXCEPTION_HXX_
|
||||
#include <com/sun/star/uno/RuntimeException.hpp>
|
||||
#endif
|
||||
|
||||
#ifndef _CONTROLHELPER_HXX_
|
||||
#include "ControlHelper.hxx"
|
||||
#endif
|
||||
|
||||
#include <premac.h>
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
|
|
|||
|
|
@ -1,35 +1,30 @@
|
|||
/*************************************************************************
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* $RCSfile: resourceprovider.cxx,v $
|
||||
* Copyright 2008 by Sun Microsystems, Inc.
|
||||
*
|
||||
* $Revision: 1.4 $
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* last change: $Author: kz $ $Date: 2008-04-04 10:52:26 $
|
||||
* $RCSfile: resourceprovider.cxx,v $
|
||||
* $Revision: 1.5 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
* This file is part of OpenOffice.org.
|
||||
*
|
||||
* OpenOffice.org is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License version 3
|
||||
* only, as published by the Free Software Foundation.
|
||||
*
|
||||
* GNU Lesser General Public License Version 2.1
|
||||
* =============================================
|
||||
* Copyright 2005 by Sun Microsystems, Inc.
|
||||
* 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
* OpenOffice.org is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License version 3 for more details
|
||||
* (a copy is included in the LICENSE file that accompanied this code).
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License version 2.1, as published by the Free Software Foundation.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* version 3 along with OpenOffice.org. If not, see
|
||||
* <http://www.openoffice.org/license.html>
|
||||
* for a copy of the LGPLv3 License.
|
||||
*
|
||||
************************************************************************/
|
||||
|
||||
|
|
@ -37,33 +32,13 @@
|
|||
// includes
|
||||
//------------------------------------------------------------------------
|
||||
|
||||
#ifndef _OSL_DIAGNOSE_H_
|
||||
#include <osl/diagnose.h>
|
||||
#endif
|
||||
|
||||
#ifndef _RTL_USTRBUF_HXX_
|
||||
#include <rtl/ustrbuf.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _VOS_MUTEX_HXX_
|
||||
#include <vos/mutex.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _SV_SVAPP_HXX
|
||||
#include <vcl/svapp.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _TOOLS_RESMGR_HXX
|
||||
#include <tools/resmgr.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _COM_SUN_STAR_UI_DIALOGS_COMMONFILEPICKERELEMENTIDS_HPP_
|
||||
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
|
||||
#endif
|
||||
|
||||
#ifndef _COM_SUN_STAR_UI_DIALOGS_EXTENDEDFILEPICKERELEMENTIDS_HPP_
|
||||
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
|
||||
#endif
|
||||
|
||||
#ifndef _SVTOOLS_SVTOOLS_HRC_
|
||||
#include <svtools/svtools.hrc>
|
||||
|
|
@ -72,10 +47,7 @@
|
|||
#ifndef _SVTOOLS_FILEDLG2_HRC_
|
||||
#include <svtools/filedlg2.hrc>
|
||||
#endif
|
||||
|
||||
#ifndef _NSSTRING_OOOADDITIONS_HXX_
|
||||
#include "NSString_OOoAdditions.hxx"
|
||||
#endif
|
||||
|
||||
#include "resourceprovider.hxx"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue