l10ntools/inc/l10ntools/HelpIndexer.hxx | 31 +++++++++++++++++++++++++++++++ l10ntools/inc/l10ntools/HelpSearch.hxx | 31 +++++++++++++++++++++++++++++++ sal/qa/osl/file/osl_old_test_file.cxx | 24 +++++++----------------- 3 files changed, 69 insertions(+), 17 deletions(-)
New commits: commit e414736c8b3e55b4ddc2bf308435ef6f726fb517 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Apr 7 16:42:30 2012 +0100 add headers to Gert's files diff --git a/l10ntools/inc/l10ntools/HelpIndexer.hxx b/l10ntools/inc/l10ntools/HelpIndexer.hxx index 02281c2..28c7eb6 100644 --- a/l10ntools/inc/l10ntools/HelpIndexer.hxx +++ b/l10ntools/inc/l10ntools/HelpIndexer.hxx @@ -1,3 +1,32 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Gert van Valkenhoef <g.h.m.van.valkenh...@rug.nl> + * (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + #ifndef HELPINDEXER_HXX #define HELPINDEXER_HXX @@ -67,3 +96,5 @@ class L10N_DLLPUBLIC HelpIndexer { }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/inc/l10ntools/HelpSearch.hxx b/l10ntools/inc/l10ntools/HelpSearch.hxx index 8c11aba..63e2807 100644 --- a/l10ntools/inc/l10ntools/HelpSearch.hxx +++ b/l10ntools/inc/l10ntools/HelpSearch.hxx @@ -1,3 +1,32 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Gert van Valkenhoef <g.h.m.van.valkenh...@rug.nl> + * (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + #ifndef HELPSEARCH_HXX #define HELPSEARCH_HXX @@ -34,3 +63,5 @@ class L10N_DLLPUBLIC HelpSearch { }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 63de3197af6ce874e441936638c4a9a73af4b1a3 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Apr 7 16:14:51 2012 +0100 WaE: msvc, unreachable code diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 3d12b76..d8ab73a 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -115,12 +115,10 @@ const char * const aSource3[ ] = using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; + void oldtestfile::test_file_001() { -#ifdef WIN32 - return; -#endif - +#ifndef WIN32 OUString base1( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla" ) ); int i; for( i = 0 ; aSource1[i] ; i +=2 ) @@ -142,15 +140,12 @@ void oldtestfile::test_file_001() OUString err1( RTL_CONSTASCII_USTRINGPARAM( "../.." ) ); OUString target; // CPPUNIT_ASSERT_MESSAGE("failure #11", osl_File_E_None != osl_getAbsoluteFileURL( base1.pData , err1.pData , &target.pData ) ); - +#endif } void oldtestfile::test_file_002() { -#ifdef WIN32 - return; -#endif - +#ifndef WIN32 OUString base2( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla/blubs/schnubbel" ) ); int i; for( i = 0 ; aSource2[i] ; i +=2 ) @@ -166,16 +161,13 @@ void oldtestfile::test_file_002() } OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US ); OString obase = OUStringToOString( base2 , RTL_TEXTENCODING_ASCII_US ); -// fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource2[i], o.pData->buffer ); } +#endif } void oldtestfile::test_file_004() { -#ifdef WIN32 - return; -#endif - +#ifndef WIN32 OUString base4( RTL_CONSTASCII_USTRINGPARAM( "file:///" TEST_VOLUME "bla/" ) ); int i; for( i = 0 ; aSource1[i] ; i +=2 ) @@ -192,9 +184,7 @@ void oldtestfile::test_file_004() OString obase = OUStringToOString( base4 , RTL_TEXTENCODING_ASCII_US ); //fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(), aSource1[i], o.pData->buffer ); } - - -// fprintf( stderr, "test_file done\n" ); +#endif } } // namespace osl_test_file
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits