From 9c4a7372c78eb0324aba43829e16bbe64b0b4046 Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Mon, 7 Jul 2008 05:13:43 +0000 Subject: #86509# cleanups --- cppunit/inc/testshl/autoregisterhelper.hxx | 42 +++++++++++----------- cppunit/inc/testshl/dynamicregister.hxx | 54 +++++++++++++++------------- cppunit/inc/testshl/filehelper.hxx | 41 ++++++++++------------ cppunit/inc/testshl/getopt.hxx | 49 +++++++++----------------- cppunit/inc/testshl/log.hxx | 56 ++++++++++-------------------- cppunit/inc/testshl/tresstatewrapper.h | 39 +++++++++------------ cppunit/inc/testshl/tresstatewrapper.hxx | 41 ++++++++++------------ cppunit/inc/testshl/versionhelper.hxx | 39 +++++++++------------ 8 files changed, 154 insertions(+), 207 deletions(-) (limited to 'cppunit') diff --git a/cppunit/inc/testshl/autoregisterhelper.hxx b/cppunit/inc/testshl/autoregisterhelper.hxx index 88653ba0b85d..89cc878bb2bc 100644 --- a/cppunit/inc/testshl/autoregisterhelper.hxx +++ b/cppunit/inc/testshl/autoregisterhelper.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: autoregisterhelper.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: lla $ $Date: 2008-02-27 16:19:14 $ + * $RCSfile: autoregisterhelper.hxx,v $ + * $Revision: 1.2 $ * - * 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 - * - * 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, + * 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 for more details. + * 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). * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -52,6 +47,7 @@ class AutomaticRegisterHelper : public DynamicLibraryHelper { FunctionList m_aFunctionList; bool m_bLoadLibraryOK; + // GetOpt & m_aOptions; // use getOptions() instead! public: AutomaticRegisterHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions/* , JobList * _pJobList = NULL */ ); @@ -61,6 +57,8 @@ public: /// @return true, if the given DLLName library could load and initialised. bool isOkToStartTests() const {return m_bLoadLibraryOK;} + + virtual ~AutomaticRegisterHelper(); }; #endif diff --git a/cppunit/inc/testshl/dynamicregister.hxx b/cppunit/inc/testshl/dynamicregister.hxx index a8bbdccf2488..de194bcb26cd 100644 --- a/cppunit/inc/testshl/dynamicregister.hxx +++ b/cppunit/inc/testshl/dynamicregister.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: dynamicregister.hxx,v $ + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $Revision: 1.1 $ + * Copyright 2008 by Sun Microsystems, Inc. * - * last change: $Author: lla $ $Date: 2008-02-27 16:20:22 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * OpenOffice.org - a multi-platform office productivity suite * + * $RCSfile: dynamicregister.hxx,v $ + * $Revision: 1.2 $ * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * This file is part of OpenOffice.org. * - * 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. + * 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. * - * This library is distributed in the hope that it will be useful, + * 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 for more details. + * 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). * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -37,10 +32,7 @@ #define DYNAMICREGISTER_HXX #include - -#ifndef _OSL_MODULE_HXX_ #include -#endif #include "getopt.hxx" #include "cppunit/nocopy.hxx" @@ -54,9 +46,21 @@ protected: rtl::OUString m_suDLLName; GetOpt & m_aOptions; + GetOpt& getOptions() {return m_aOptions;} + public: DynamicLibraryHelper(rtl::OUString const& _sDLLName, GetOpt & _aOptions); virtual ~DynamicLibraryHelper(); + +private: + void showFilenameIfVerbose(); + void realLoadLibrary(rtl::OUString const& _sLibToLoad); + void loadLibraryFromAbsolutePath(); + void loadLibraryFromLocalPath(); + + rtl::OUString m_suAbsolutePathFile; // file:///D:/foo/bar/library.dll + rtl::OUString m_suAbsolutePath; // file:///D:/foo/bar + rtl::OUString m_suFilename; // library.dll }; #endif diff --git a/cppunit/inc/testshl/filehelper.hxx b/cppunit/inc/testshl/filehelper.hxx index 539ba7f0cdb0..ca427c4b8c87 100644 --- a/cppunit/inc/testshl/filehelper.hxx +++ b/cppunit/inc/testshl/filehelper.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: filehelper.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: lla $ $Date: 2008-02-27 16:19:56 $ + * $RCSfile: filehelper.hxx,v $ + * $Revision: 1.2 $ * - * 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 - * - * 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, + * 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 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 + * 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). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. * ************************************************************************/ diff --git a/cppunit/inc/testshl/getopt.hxx b/cppunit/inc/testshl/getopt.hxx index 2a757b0b13f0..cc6aa057849e 100644 --- a/cppunit/inc/testshl/getopt.hxx +++ b/cppunit/inc/testshl/getopt.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: getopt.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: lla $ $Date: 2008-02-27 16:20:09 $ + * $RCSfile: getopt.hxx,v $ + * $Revision: 1.2 $ * - * 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 - * - * 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, + * 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 for more details. + * 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). * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -94,22 +89,12 @@ #ifndef __QADEV_REGSCAN_GETOPT_HXX__ #define __QADEV_REGSCAN_GETOPT_HXX__ -#ifndef _OSL_FILE_HXX_ #include -#endif - -#ifndef _SAL_TYPES_H_ #include -#endif - -#ifndef _RTL_STRBUF_HXX_ #include -#endif -#ifndef _RTL_STRING_HXX_ #include -#endif // #ifndef __QADEV_REGSCAN_UTIL_HXX__ // #include "inc/util.hxx" diff --git a/cppunit/inc/testshl/log.hxx b/cppunit/inc/testshl/log.hxx index a732406745d9..76f0c897072d 100644 --- a/cppunit/inc/testshl/log.hxx +++ b/cppunit/inc/testshl/log.hxx @@ -1,41 +1,36 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: log.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: lla $ $Date: 2008-02-27 16:18:51 $ + * $RCSfile: log.hxx,v $ + * $Revision: 1.2 $ * - * 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 - * - * 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, + * 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 for more details. + * 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). * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************* Source Code Control System - Header - $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/cppunit/inc/testshl/log.hxx,v 1.1 2008-02-27 16:18:51 lla Exp $ + $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/cppunit/inc/testshl/log.hxx,v 1.2 2008-07-07 06:13:43 lla Exp $ Source Code Control System - Update @@ -44,26 +39,11 @@ #define __QADEV_REGSCAN_LOG_HXX__ #include - -#ifndef _RTL_USTRING_HXX_ #include -#endif - -#ifndef _RTL_STRBUF_HXX_ #include -#endif - -#ifndef _SAL_TYPES_H_ #include -#endif - -#ifndef _OSL_THREAD_H_ #include -#endif - -#ifndef _OSL_FILE_HXX_ #include -#endif //!io #include #include diff --git a/cppunit/inc/testshl/tresstatewrapper.h b/cppunit/inc/testshl/tresstatewrapper.h index b408bcb71717..b796d60c586b 100644 --- a/cppunit/inc/testshl/tresstatewrapper.h +++ b/cppunit/inc/testshl/tresstatewrapper.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: tresstatewrapper.h,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: lla $ $Date: 2008-02-27 16:19:45 $ + * $RCSfile: tresstatewrapper.h,v $ + * $Revision: 1.2 $ * - * 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 - * - * 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, + * 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 for more details. + * 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). * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ diff --git a/cppunit/inc/testshl/tresstatewrapper.hxx b/cppunit/inc/testshl/tresstatewrapper.hxx index 61a9f6d95b8d..1b897e0ae0b7 100644 --- a/cppunit/inc/testshl/tresstatewrapper.hxx +++ b/cppunit/inc/testshl/tresstatewrapper.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: tresstatewrapper.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: lla $ $Date: 2008-02-27 16:20:33 $ + * $RCSfile: tresstatewrapper.hxx,v $ + * $Revision: 1.2 $ * - * 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 - * - * 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, + * 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 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 + * 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). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. * ************************************************************************/ diff --git a/cppunit/inc/testshl/versionhelper.hxx b/cppunit/inc/testshl/versionhelper.hxx index ce6516397f1d..d86a451424d3 100644 --- a/cppunit/inc/testshl/versionhelper.hxx +++ b/cppunit/inc/testshl/versionhelper.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: versionhelper.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.1 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: lla $ $Date: 2008-02-27 16:19:03 $ + * $RCSfile: versionhelper.hxx,v $ + * $Revision: 1.2 $ * - * 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 - * - * 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, + * 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 for more details. + * 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). * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ -- cgit