diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 09:02:51 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 09:02:51 +0000 |
commit | ad0f7f023af10bffc6ae00c2ba27cfbe9f2b93b5 (patch) | |
tree | a244576922240637483aebc5e97083981e10580a /extensions/source/logging | |
parent | 5c0da0e5ac7107b7c012f9738e80b63fdc0cd7a9 (diff) |
INTEGRATION: CWS changefileheader (1.2.134); FILE MERGED
2008/04/01 12:29:45 thb 1.2.134.2: #i85898# Stripping all external header guards
2008/03/31 12:31:31 rt 1.2.134.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'extensions/source/logging')
-rw-r--r-- | extensions/source/logging/logger.cxx | 51 | ||||
-rw-r--r-- | extensions/source/logging/loggerconfig.cxx | 61 | ||||
-rw-r--r-- | extensions/source/logging/loggerconfig.hxx | 43 | ||||
-rw-r--r-- | extensions/source/logging/loghandler.cxx | 49 | ||||
-rw-r--r-- | extensions/source/logging/loghandler.hxx | 47 | ||||
-rw-r--r-- | extensions/source/logging/logrecord.cxx | 44 | ||||
-rw-r--r-- | extensions/source/logging/logrecord.hxx | 43 |
7 files changed, 126 insertions, 212 deletions
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index dadc99c00c52..69ae5fced483 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: logger.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-06-27 14:58:35 $ + * $RCSfile: logger.cxx,v $ + * $Revision: 1.3 $ * - * 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. * ************************************************************************/ @@ -41,21 +36,11 @@ #include "loggerconfig.hxx" /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_LOGGING_XLOGGER_HPP_ #include <com/sun/star/logging/XLogger.hpp> -#endif -#ifndef _COM_SUN_STAR_LOGGING_LOGLEVEL_HPP_ #include <com/sun/star/logging/LogLevel.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LOGGING_XLOGGERPOOL_HPP_ #include <com/sun/star/logging/XLoggerPool.hpp> -#endif /** === end UNO includes === **/ #include <tools/diagnose_ex.h> diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 79addddb556a..9b75a50e2454 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: loggerconfig.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-06-27 14:58:46 $ + * $RCSfile: loggerconfig.cxx,v $ + * $Revision: 1.3 $ * - * 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. * ************************************************************************/ @@ -39,36 +34,16 @@ #include "loggerconfig.hxx" /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XCHANGESBATCH_HPP_ #include <com/sun/star/util/XChangesBatch.hpp> -#endif -#ifndef _COM_SUN_STAR_LOGGING_LOGLEVEL_HPP_ #include <com/sun/star/logging/LogLevel.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_NULLPOINTEREXCEPTION_HPP_ #include <com/sun/star/lang/NullPointerException.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_SERVICENOTREGISTEREDEXCEPTION_HPP_ #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_ #include <com/sun/star/beans/NamedValue.hpp> -#endif -#ifndef _COM_SUN_STAR_LOGGING_XLOGHANDLER_HPP_ #include <com/sun/star/logging/XLogHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_LOGGING_XLOGFORMATTER_HPP_ #include <com/sun/star/logging/XLogFormatter.hpp> -#endif /** === end UNO includes === **/ #include <tools/diagnose_ex.h> diff --git a/extensions/source/logging/loggerconfig.hxx b/extensions/source/logging/loggerconfig.hxx index 1ccc1f3c74ed..0f157da7b93c 100644 --- a/extensions/source/logging/loggerconfig.hxx +++ b/extensions/source/logging/loggerconfig.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: loggerconfig.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-06-27 14:58:59 $ + * $RCSfile: loggerconfig.hxx,v $ + * $Revision: 1.3 $ * - * 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,9 +32,7 @@ #define EXTENSIONS_LOGGERCONFIG_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_LOGGING_XLOGGER_HPP_ #include <com/sun/star/logging/XLogger.hpp> -#endif /** === end UNO includes === **/ namespace comphelper diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index 8d5909443d7a..a98fe514e5c3 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: loghandler.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-06-27 14:59:10 $ + * $RCSfile: loghandler.cxx,v $ + * $Revision: 1.3 $ * - * 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. * ************************************************************************/ @@ -41,18 +36,10 @@ #endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_LOGGING_LOGLEVEL_HPP_ #include <com/sun/star/logging/LogLevel.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> -#endif -#ifndef _COM_SUN_STAR_LOGGING_PLAINTEXTFORMATTER_HPP_ #include <com/sun/star/logging/PlainTextFormatter.hpp> -#endif /** === end UNO includes === **/ #include <tools/diagnose_ex.h> diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx index 47dc0d75c2b7..42954eb2557d 100644 --- a/extensions/source/logging/loghandler.hxx +++ b/extensions/source/logging/loghandler.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: loghandler.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-06-27 14:59:22 $ + * $RCSfile: loghandler.hxx,v $ + * $Revision: 1.3 $ * - * 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,15 +32,9 @@ #define LOGHANDLER_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_LOGGING_XLOGFORMATTER_HPP_ #include <com/sun/star/logging/XLogFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> -#endif -#ifndef _COM_SUN_STAR_LOGGING_LOGRECORD_HPP_ #include <com/sun/star/logging/LogRecord.hpp> -#endif /** === end UNO includes === **/ #include <comphelper/namedvaluecollection.hxx> diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx index 49396c8772a8..960215c8869c 100644 --- a/extensions/source/logging/logrecord.cxx +++ b/extensions/source/logging/logrecord.cxx @@ -1,44 +1,36 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: logrecord.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-06-27 14:59:35 $ + * $RCSfile: logrecord.cxx,v $ + * $Revision: 1.3 $ * - * 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. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" - -#ifndef LOGRECORD_HXX #include "logrecord.hxx" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx index 9d0aabfd71c4..77ec3fb54cf0 100644 --- a/extensions/source/logging/logrecord.hxx +++ b/extensions/source/logging/logrecord.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: logrecord.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-06-27 14:59:46 $ + * $RCSfile: logrecord.hxx,v $ + * $Revision: 1.3 $ * - * 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,9 +32,7 @@ #define LOGRECORD_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_LOGGING_LOGRECORD_HPP_ #include <com/sun/star/logging/LogRecord.hpp> -#endif /** === end UNO includes === **/ #include <osl/interlck.h> |