This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new adfffba115 Cleanup
adfffba115 is described below
commit adfffba1151d85229b2083567609d6ceb95fbc82
Author: mseidel <[email protected]>
AuthorDate: Tue Sep 16 21:52:56 2025 +0200
Cleanup
(cherry picked from commit a89ff9078abb366bc00625aa098662a5b9455273)
---
main/sal/qa/helper/gcov/gcov_filter.pl | 9 ++--
main/sal/qa/helper/gcov/gcov_result.pl | 3 --
main/sal/qa/helper/gcov/gcov_resultcompare.pl | 5 +-
main/sal/qa/helper/gcov/gcov_resultinterpreter.pl | 5 +-
.../source/win32/nsis/downloadtemplate.nsi | 2 +-
main/solenv/bin/langwrap | 20 ++++----
main/solenv/inc/minor.mk | 2 -
main/soltools/cpp/cpp.h | 53 +++++++++++-----------
main/vcl/unx/kde4/KDEXLib.cxx | 49 ++++++++++----------
9 files changed, 66 insertions(+), 82 deletions(-)
diff --git a/main/sal/qa/helper/gcov/gcov_filter.pl
b/main/sal/qa/helper/gcov/gcov_filter.pl
index cab2e7999f..862e89246f 100755
--- a/main/sal/qa/helper/gcov/gcov_filter.pl
+++ b/main/sal/qa/helper/gcov/gcov_filter.pl
@@ -1,7 +1,5 @@
#!/usr/bin/perl -w
#
-# $Id$
-#
# *************************************************************
#
# Licensed to the Apache Software Foundation (ASF) under one
@@ -32,7 +30,6 @@
# A: regexp ;-)
#
-
use strict;
use File::Basename;
use Getopt::Long;
@@ -350,9 +347,9 @@ sub read_gcov_function_file($)
}
# gcov format since gcc 3.3.6
-# 100.00% von 3 Zeilen in function helloworld ausgef�hrt
-# 100.00% von 5 Zeilen in function main ausgef�hrt
-# 100.00% von 8 Zeilen in file tmp.c ausgef�hrt
+# 100.00% von 3 Zeilen in function helloworld ausgeführt
+# 100.00% von 5 Zeilen in function main ausgeführt
+# 100.00% von 8 Zeilen in file tmp.c ausgeführt
sub read_gcov_function_file_old_gcc_3($)
{
local *INPUT_HANDLE;
diff --git a/main/sal/qa/helper/gcov/gcov_result.pl
b/main/sal/qa/helper/gcov/gcov_result.pl
index 0fd5e401d8..21344e75ac 100644
--- a/main/sal/qa/helper/gcov/gcov_result.pl
+++ b/main/sal/qa/helper/gcov/gcov_result.pl
@@ -19,9 +19,6 @@
# under the License.
#
# *************************************************************
-#
-# $Id$
-#
# GCOV_RESULT
#
diff --git a/main/sal/qa/helper/gcov/gcov_resultcompare.pl
b/main/sal/qa/helper/gcov/gcov_resultcompare.pl
index d812ebefdc..5bf6d98d7c 100644
--- a/main/sal/qa/helper/gcov/gcov_resultcompare.pl
+++ b/main/sal/qa/helper/gcov/gcov_resultcompare.pl
@@ -19,9 +19,6 @@
# under the License.
#
# *************************************************************
-#
-# $Id$
-#
# GCOV_RESULTCOMPARE
#
@@ -52,7 +49,7 @@ sub read_gcov_function_file($);
if (!GetOptions(
"o=s" => \$orig,
"c=s" => \$compare,
- "help" => \$help,
+ "help" => \$help,
"version" => \$version
))
{
diff --git a/main/sal/qa/helper/gcov/gcov_resultinterpreter.pl
b/main/sal/qa/helper/gcov/gcov_resultinterpreter.pl
index ecf4810159..0b774cf9d5 100644
--- a/main/sal/qa/helper/gcov/gcov_resultinterpreter.pl
+++ b/main/sal/qa/helper/gcov/gcov_resultinterpreter.pl
@@ -19,9 +19,6 @@
# under the License.
#
# *************************************************************
-#
-# $Id$
-#
# GCOV_RESULTINTERPRETER
#
@@ -58,7 +55,7 @@ if (!GetOptions(
"percent=s" => \$nPercent,
"complete" => \$complete,
"incomplete" => \$incomplete,
- "help" => \$help,
+ "help" => \$help,
"version" => \$version
))
{
diff --git a/main/setup_native/source/win32/nsis/downloadtemplate.nsi
b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
index f00507e406..de47ead55d 100644
--- a/main/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -252,7 +252,7 @@ FunctionEnd
!endif
!define MUI_LANGDLL_LANGUAGES_TEMP "${MUI_LANGDLL_LANGUAGES}"
!undef MUI_LANGDLL_LANGUAGES
- !ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP
+ !ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP
!undef MUI_LANGDLL_LANGUAGES_CP_TEMP
!endif
!define MUI_LANGDLL_LANGUAGES_CP_TEMP "${MUI_LANGDLL_LANGUAGES_CP}"
diff --git a/main/solenv/bin/langwrap b/main/solenv/bin/langwrap
index 6409e70443..ee090f4aaa 100755
--- a/main/solenv/bin/langwrap
+++ b/main/solenv/bin/langwrap
@@ -1,6 +1,6 @@
#!/usr/bin/env perl -w
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,21 +8,19 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
#
# langwrap - language wrapper for building resources
-#
-# $Id$
use Getopt::Std;
@@ -66,14 +64,14 @@ foreach $cmd (@command) {
}
exit(0);
-
+
###### routines ######
### parse_commandfile()
sub parse_commandfile {
my($file) = shift;
my(@field);
-
+
open(COMMAND, "<$file") or die "can�t open $file";
while (<COMMAND>) {
@@ -82,7 +80,7 @@ sub parse_commandfile {
if ( ($line =~ //) || ($line =~ /^\r/) || ($line =~ /^#/) ) {
next;
}
-
+
@field = split " ", $line;
push @LoL, [@field];
if (!$nfield) {
@@ -95,7 +93,7 @@ sub parse_commandfile {
}
}
}
-
+
close(COMMAND);
}
@@ -119,7 +117,7 @@ sub create_commands() {
push @command, $cmd . " " . $cmdline;
}
}
-
+
### check_options()
sub check_options {
diff --git a/main/solenv/inc/minor.mk b/main/solenv/inc/minor.mk
index 755e21ef33..3fa593f04d 100644
--- a/main/solenv/inc/minor.mk
+++ b/main/solenv/inc/minor.mk
@@ -18,8 +18,6 @@
# under the License.
#
# *************************************************************
-# $Id$
-
RSCVERSION=420
RSCREVISION=420m6(Build:9825)
BUILD=9825
diff --git a/main/soltools/cpp/cpp.h b/main/soltools/cpp/cpp.h
index e0540828a1..df3c7c5024 100644
--- a/main/soltools/cpp/cpp.h
+++ b/main/soltools/cpp/cpp.h
@@ -18,12 +18,11 @@
* under the License.
*
*************************************************************/
-/* $Id$ */
#define INS 32768 /* input buffer
*/
-#define OBS 8092 /* outbut buffer
*/
-#define NARG 32 /* Max number arguments to a macro
*/
-#define NINCLUDE 48 /* Max number of include directories
(-I) */
+#define OBS 8092 /* outbut buffer
*/
+#define NARG 32 /* Max number arguments to a
macro */
+#define NINCLUDE 48 /* Max number of include
directories (-I) */
#define NIF 64 /* depth of nesting of
#if */
#define NINC 32 /* depth of nesting of #include
*/
@@ -39,21 +38,21 @@ typedef unsigned char uchar;
enum toktype
{
- END, UNCLASS, NAME, NUMBER, STRING, CCON, NL, WS, DSHARP,
- EQ, NEQ, LEQ, GEQ, LSH, RSH, LAND, LOR, PPLUS, MMINUS,
- ARROW, SBRA, SKET, LP, RP, DOT, AND, STAR, PLUS, MINUS,
- TILDE, NOT, SLASH, PCT, LT, GT, CIRC, OR, QUEST,
- COLON, ASGN, COMMA, SHARP, SEMIC, CBRA, CKET,
- ASPLUS, ASMINUS, ASSTAR, ASSLASH, ASPCT, ASCIRC, ASLSH,
- ASRSH, ASOR, ASAND, ELLIPS,
- DSHARP1, NAME1, NAME2, DEFINED, UMINUS, ARCHITECTURE, IDENT,
+ END, UNCLASS, NAME, NUMBER, STRING, CCON, NL, WS, DSHARP,
+ EQ, NEQ, LEQ, GEQ, LSH, RSH, LAND, LOR, PPLUS, MMINUS,
+ ARROW, SBRA, SKET, LP, RP, DOT, AND, STAR, PLUS, MINUS,
+ TILDE, NOT, SLASH, PCT, LT, GT, CIRC, OR, QUEST,
+ COLON, ASGN, COMMA, SHARP, SEMIC, CBRA, CKET,
+ ASPLUS, ASMINUS, ASSTAR, ASSLASH, ASPCT, ASCIRC, ASLSH,
+ ASRSH, ASOR, ASAND, ELLIPS,
+ DSHARP1, NAME1, NAME2, DEFINED, UMINUS, ARCHITECTURE, IDENT,
COMMENT
};
enum kwtype
{
- KIF, KIFDEF, KIFNDEF, KELIF, KELSE, KENDIF, KINCLUDE, KINCLUDENEXT,
- KIMPORT, KDEFINE, KUNDEF, KLINE, KERROR, KPRAGMA, KIDENT, KDEFINED,
+ KIF, KIFDEF, KIFNDEF, KELIF, KELSE, KENDIF, KINCLUDE, KINCLUDENEXT,
+ KIMPORT, KDEFINE, KUNDEF, KLINE, KERROR, KPRAGMA, KIDENT, KDEFINED,
KMACHINE, KLINENO, KFILE, KDATE, KTIME, KSTDC, KEVAL
};
@@ -62,7 +61,7 @@ enum kwtype
#define ISUNCHANGE 0x04 /* can't be #defined in
PP */
#define ISMAC 0x08 /* builtin macro, e.g.
__LINE__ */
#define ISARCHITECTURE 0x10 /* architecture */
-#define ISACTIVE 0x80 /* is macro currently expanded */
+#define ISACTIVE 0x80 /* is macro currently expanded
*/
#define EOB 0xFE /* sentinel for end of
input buffer */
#define EOFC 0xFD /* sentinel for end of input
file */
@@ -71,13 +70,13 @@ enum kwtype
typedef struct token
{
- unsigned char type;
- unsigned char flag;
- unsigned int wslen;
- unsigned int len;
+ unsigned char type;
+ unsigned char flag;
+ unsigned int wslen;
+ unsigned int len;
uchar *t;
unsigned int identifier; /* used from macro
processor to identify where a macro becomes valid again. */
-} Token;
+} Token;
typedef struct tokenrow
{
@@ -85,7 +84,7 @@ typedef struct tokenrow
Token *bp; /* base (allocated value) */
Token *lp; /* last+1 token used */
int max; /* number allocated */
-} Tokenrow;
+} Tokenrow;
typedef struct source
{
@@ -100,7 +99,7 @@ typedef struct source
int pathdepth;
int wrap;
struct source *next; /* stack for #include */
-} Source;
+} Source;
typedef struct nlist
{
@@ -112,19 +111,19 @@ typedef struct nlist
char val; /* value as preprocessor name */
char flag; /* is defined, is pp name */
uchar *loc; /*
location of definition */
-} Nlist;
+} Nlist;
typedef struct includelist
{
char deleted;
char always;
char *file;
-} Includelist;
+} Includelist;
typedef struct wraplist
{
char *file;
-} Wraplist;
+} Wraplist;
#define new(t) (t *)domalloc(sizeof(t))
#define quicklook(a,b) (namebit[(a)&077] & (1<<((b)&037)))
@@ -147,7 +146,7 @@ typedef struct macroValidator
typedef struct mvl
{
MacroValidator * pFirst;
- unsigned int nextFreeIdentifier;
+ unsigned int nextFreeIdentifier;
} MacroValidatorList;
void mvl_init(
@@ -161,7 +160,7 @@ void mvl_destruct(
void mvl_add(
MacroValidatorList *
inout_pValidators,
- Nlist * in_pMacro,
+ Nlist * in_pMacro,
Token *
in_pTokenWhereMacroBecomesValid);
/* Updates all token pointers within the list, when the tokens have
moved, by
diff --git a/main/vcl/unx/kde4/KDEXLib.cxx b/main/vcl/unx/kde4/KDEXLib.cxx
index 6870c2951c..73a0b77524 100644
--- a/main/vcl/unx/kde4/KDEXLib.cxx
+++ b/main/vcl/unx/kde4/KDEXLib.cxx
@@ -18,7 +18,6 @@
* under the License.
*
*************************************************************/
-/* $Id$ */
#include <vos/process.hxx>
@@ -57,14 +56,14 @@ KDEXLib::~KDEXLib()
{
delete (VCLKDEApplication*)m_pApplication;
- // free the faked cmdline arguments no longer needed by KApplication
- for( int i = 0; i < m_nFakeCmdLineArgs; i++ )
+ // free the faked cmdline arguments no longer needed by KApplication
+ for( int i = 0; i < m_nFakeCmdLineArgs; i++ )
{
- free( m_pFreeCmdLineArgs[i] );
+ free( m_pFreeCmdLineArgs[i] );
}
- delete [] m_pFreeCmdLineArgs;
- delete [] m_pAppCmdLineArgs;
+ delete [] m_pFreeCmdLineArgs;
+ delete [] m_pAppCmdLineArgs;
}
void KDEXLib::Init()
@@ -121,17 +120,17 @@ void KDEXLib::Init()
if ( !m_pFreeCmdLineArgs )
m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs ];
- osl_getExecutableFile( &aParam.pData );
- osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData );
- rtl::OString aExec = rtl::OUStringToOString( aBin,
osl_getThreadTextEncoding() );
+ osl_getExecutableFile( &aParam.pData );
+ osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData );
+ rtl::OString aExec = rtl::OUStringToOString( aBin,
osl_getThreadTextEncoding() );
m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() );
- // make a copy of the string list for freeing it since
- // KApplication manipulates the pointers inside the argument vector
- // note: KApplication bad !
- m_pAppCmdLineArgs = new char*[ m_nFakeCmdLineArgs ];
- for( int i = 0; i < m_nFakeCmdLineArgs; i++ )
- m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i];
+ // make a copy of the string list for freeing it since
+ // KApplication manipulates the pointers inside the argument vector
+ // note: KApplication bad !
+ m_pAppCmdLineArgs = new char*[ m_nFakeCmdLineArgs ];
+ for( int i = 0; i < m_nFakeCmdLineArgs; i++ )
+ m_pAppCmdLineArgs[i] = m_pFreeCmdLineArgs[i];
KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
@@ -148,7 +147,7 @@ void KDEXLib::Init()
pInputMethod->AddConnectionWatch( pDisp, (void*)this );
pSalDisplay->SetInputMethod( pInputMethod );
- PushXErrorLevel( true );
+ PushXErrorLevel( true );
SalI18N_KeyboardExtension *pKbdExtension = new
SalI18N_KeyboardExtension( pDisp );
XSync( pDisp, False );
@@ -160,12 +159,14 @@ void KDEXLib::Init()
void KDEXLib::doStartup()
{
- if( ! m_bStartupDone )
- {
- KStartupInfo::appStarted();
- m_bStartupDone = true;
- #if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "called KStartupInfo::appStarted()\n" );
- #endif
- }
+ if( ! m_bStartupDone )
+ {
+ KStartupInfo::appStarted();
+ m_bStartupDone = true;
+ #if OSL_DEBUG_LEVEL > 1
+ fprintf( stderr, "called KStartupInfo::appStarted()\n" );
+ #endif
+ }
}
+
+/* vim: set noet sw=4 ts=4: */
