[Libreoffice-commits] core.git: 10 commits - config_host/config_global.h.in configure.ac connectivity/source cppuhelper/inc extensions/Library_pcr.mk extensions/source fpicker/source framework/source hwpfilter/source idlc/source l10ntools/source rsc/source solenv/gbuild ucb/source vcl/aqua xmloff/Library_xo.mk xmloff/source xmlsecurity/inc xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Mon Mar 25 00:53:21 PDT 2013
config_host/config_global.h.in | 3
configure.ac | 27 +
connectivity/source/drivers/mozab/post_include_mozilla.h | 3
connectivity/source/drivers/mozab/pre_include_mozilla.h | 5
connectivity/source/parse/sqlflex.l | 6
cppuhelper/inc/cppuhelper/propertysetmixin.hxx | 6
extensions/Library_pcr.mk | 2
extensions/source/propctrlr/formstrings.cxx | 27 -
extensions/source/propctrlr/pcrstrings.cxx | 27 -
fpicker/source/aqua/FilterHelper.mm | 12
fpicker/source/aqua/SalAquaFilePicker.mm | 6
fpicker/source/aqua/SalAquaPicker.mm | 6
framework/source/services/substitutepathvars.cxx | 1
hwpfilter/source/grammar.cxx | 136 ---------
hwpfilter/source/lexer.cxx | 145 ----------
idlc/source/scanner.l | 6
l10ntools/source/cfglex.l | 6
l10ntools/source/srclex.l | 6
l10ntools/source/xrmlex.l | 6
rsc/source/parser/rscyacc.y | 10
solenv/gbuild/LinkTarget.mk | 3
ucb/source/ucp/webdav-neon/NeonUri.cxx | 9
vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 9
vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 10
vcl/aqua/source/gdi/atsui/salatslayout.cxx | 9
vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx | 8
vcl/aqua/source/gdi/atsui/salgdi.cxx | 8
xmloff/Library_xo.mk | 1
xmloff/source/forms/strings.cxx | 28 -
xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h | 46 +++
xmlsecurity/source/xmlsec/biginteger.cxx | 8
xmlsecurity/source/xmlsec/errorcallback.cxx | 8
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 9
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 5
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 4
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 4
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 10
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 11
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 7
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 10
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 14
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 9
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 9
xmlsecurity/source/xmlsec/xmlstreamio.cxx | 7
46 files changed, 152 insertions(+), 544 deletions(-)
New commits:
commit d80415ec257f13247064c7a6c8bd3cbf55c649c4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Mar 24 18:07:12 2013 +0100
extensions/source/propctrlr/{form,pcr}strings.cxx no longer relevant
...since b4f8ab8881785db8e328fbfa84933eadb6bc5dd5 "extensions: get rid of no
longer needed stringdefine.hxx."
Change-Id: I0ab16071267fc08c9a2664be8630f617085fdaad
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 85e7c04..2dde30a 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,pcr,\
extensions/source/propctrlr/formgeometryhandler \
extensions/source/propctrlr/formlinkdialog \
extensions/source/propctrlr/formmetadata \
- extensions/source/propctrlr/formstrings \
extensions/source/propctrlr/genericpropertyhandler \
extensions/source/propctrlr/handlerhelper \
extensions/source/propctrlr/inspectorhelpwindow \
@@ -97,7 +96,6 @@ $(eval $(call gb_Library_add_exception_objects,pcr,\
extensions/source/propctrlr/pcrcommon \
extensions/source/propctrlr/pcrcomponentcontext \
extensions/source/propctrlr/pcrservices \
- extensions/source/propctrlr/pcrstrings \
extensions/source/propctrlr/pcrunodialogs \
extensions/source/propctrlr/propcontroller \
extensions/source/propctrlr/propertycomposer \
diff --git a/extensions/source/propctrlr/formstrings.cxx b/extensions/source/propctrlr/formstrings.cxx
deleted file mode 100644
index b6c129f..0000000
--- a/extensions/source/propctrlr/formstrings.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-
-
-#ifndef _EXTENSIONS_FORMSCTRLR_FORMSTRINGS_HXX_
-#define PCR_IMPLEMENT_STRINGS
-#include "formstrings.hxx"
-#undef PCR_IMPLEMENT_STRINGS
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/pcrstrings.cxx b/extensions/source/propctrlr/pcrstrings.cxx
deleted file mode 100644
index 666f949..0000000
--- a/extensions/source/propctrlr/pcrstrings.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-
-
-#ifndef _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_
-#define PCR_IMPLEMENT_STRINGS
-#include "pcrstrings.hxx"
-#undef PCR_IMPLEMENT_STRINGS
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a9e6e5bf4dd59e8d584bd4949991e97d3fe79fa4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Mar 24 10:57:11 2013 +0100
The [_]DEBUG_WAS_DEFINED macros are not used here
...but only in connectivity/source/drivers/mozab/{pre,post}_include_mozilla.h,
which is never included from here, so this smells like cargo-cult.
Change-Id: Iac0d7d60caad7c090445d551b7adb50424130e2a
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 373f4f9..24df691 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -22,10 +22,7 @@
* Turn off DEBUG Assertions
*/
#ifdef _DEBUG
- #define _DEBUG_WAS_DEFINED _DEBUG
- #undef _DEBUG
-#else
- #undef _DEBUG_WAS_DEFINED
+#undef _DEBUG
#endif
/*
@@ -33,10 +30,7 @@
* with debug
*/
#ifdef DEBUG
- #define DEBUG_WAS_DEFINED DEBUG
- #undef DEBUG
-#else
- #undef DEBUG_WAS_DEFINED
+#undef DEBUG
#endif
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 623919a..980ff36 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -22,10 +22,7 @@
* Turn off DEBUG Assertions
*/
#ifdef _DEBUG
- #define _DEBUG_WAS_DEFINED _DEBUG
- #undef _DEBUG
-#else
- #undef _DEBUG_WAS_DEFINED
+#undef _DEBUG
#endif
/*
@@ -33,10 +30,7 @@
* with debug
*/
#ifdef DEBUG
- #define DEBUG_WAS_DEFINED DEBUG
- #undef DEBUG
-#else
- #undef DEBUG_WAS_DEFINED
+#undef DEBUG
#endif
#include <comphelper/processfactory.hxx>
commit ec52e5e5a204862905b555cdc1f7393aede1f7d8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Mar 24 10:47:54 2013 +0100
Consolidate XMLSEC_NO_SIZE_T setting in xmlsecurity/xmlsec-wrapper.h
...so all xmlsec/*.h includes are bundled there now (except, for pragmatic
reasons, the xmlsec/mscrypto/*.h ones that unconditionally include windows.h and
only work on Windows).
Change-Id: I33e642f4f6a2e40edd6950af7f209c8b76c6e5fe
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h
new file mode 100644
index 0000000..3289ccd
--- /dev/null
+++ b/xmlsecurity/inc/xmlsecurity/xmlsec-wrapper.h
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * 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 regarding copyright
+ * ownership. The ASF licenses this file 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 .
+ */
+
+#ifndef INCLUDED_XMLSECURITY_XMLSEC_WRAPPER_H
+#define INCLUDED_XMLSECURITY_XMLSEC_WRAPPER_H
+
+#include "sal/config.h"
+
+#include "sal/types.h"
+
+// Cf. xmlsec's configure.in:
+#if SAL_TYPES_SIZEOFPOINTER != 4
+#define XMLSEC_NO_SIZE_T
+#endif
+
+#include "xmlsec/base64.h"
+#include "xmlsec/bn.h"
+#include "xmlsec/crypto.h"
+#include "xmlsec/errors.h"
+#include "xmlsec/io.h"
+#include "xmlsec/keysmngr.h"
+#include "xmlsec/strings.h"
+#include "xmlsec/xmldsig.h"
+#include "xmlsec/xmlenc.h"
+#include "xmlsec/xmlsec.h"
+#include "xmlsec/xmltree.h"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx
index 20ea493..652e130 100644
--- a/xmlsecurity/source/xmlsec/biginteger.cxx
+++ b/xmlsecurity/source/xmlsec/biginteger.cxx
@@ -20,13 +20,7 @@
#include <xmlsecurity/biginteger.hxx>
-#include <sal/types.h>
-//For reasons that escape me, this is what xmlsec does when size_t is not 4
-#if SAL_TYPES_SIZEOFPOINTER != 4
-# define XMLSEC_NO_SIZE_T
-#endif
-#include <xmlsec/xmlsec.h>
-#include <xmlsec/bn.h>
+#include "xmlsecurity/xmlsec-wrapper.h"
#include <com/sun/star/uno/Sequence.hxx>
using namespace ::com::sun::star::uno ;
diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx
index ec8436f..b2dcf6a 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.cxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.cxx
@@ -23,13 +23,7 @@
*/
#include "errorcallback.hxx"
-#include <sal/types.h>
-//For reasons that escape me, this is what xmlsec does when size_t is not 4
-#if SAL_TYPES_SIZEOFPOINTER != 4
-# define XMLSEC_NO_SIZE_T
-#endif
-#include "xmlsec/xmlsec.h"
-#include "xmlsec/errors.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
using namespace ::com::sun::star::xml::crypto;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 1420b02..c1b2194 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -35,16 +35,11 @@
#include "x509certificate_mscryptimpl.hxx"
#include <comphelper/servicehelper.hxx>
-#include <xmlsec/xmlsec.h>
-#include <xmlsec/keysmngr.h>
-#include <xmlsec/crypto.h>
-#include <xmlsec/base64.h>
+#include "xmlsecurity/xmlsec-wrapper.h"
+#include "xmlsec/mscrypto/akmngr.h"
#include <xmlsecurity/biginteger.hxx>
-#include "xmlsec/keysmngr.h"
-#include "xmlsec/mscrypto/akmngr.h"
-
#include <rtl/locale.h>
#include <osl/nlsupport.h>
#include <osl/process.h>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index bc2ab88..e721b36 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -46,7 +46,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <list>
-#include "xmlsec/xmlsec.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
#include "sal/types.h"
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index 5dc7352..9f69255 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -22,7 +22,7 @@
#include "securityenvironment_mscryptimpl.hxx"
-#include "xmlsec/strings.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
#include "xmlsec/mscrypto/app.h"
namespace cssu = com::sun::star::uno;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 7757f16..2addf55 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -29,10 +29,7 @@
#include "securityenvironment_mscryptimpl.hxx"
#include "errorcallback.hxx"
-#include "xmlsec/xmlsec.h"
-#include "xmlsec/xmltree.h"
-#include "xmlsec/xmlenc.h"
-#include "xmlsec/crypto.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
#ifdef UNX
#define stricmp strcasecmp
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 02f02c0..1aa241a 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -23,9 +23,7 @@
#include "xmlsecuritycontext_mscryptimpl.hxx"
#include "xmlstreamio.hxx"
-#include "xmlsec/xmlsec.h"
-#include "xmlsec/keysmngr.h"
-#include "xmlsec/crypto.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
#include "xmlsec/mscrypto/akmngr.h"
using namespace ::com::sun::star::uno ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index d18ee4e..73a1761 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -27,9 +27,7 @@
#include "securityenvironment_mscryptimpl.hxx"
#include "xmlstreamio.hxx"
#include "errorcallback.hxx"
-#include "xmlsec/xmlsec.h"
-#include "xmlsec/xmldsig.h"
-#include "xmlsec/crypto.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::lang ;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index f3eacea..8201fad 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -29,16 +29,7 @@
#include <comphelper/servicehelper.hxx>
#include "../diagnose.hxx"
-#include <sal/types.h>
-//For reasons that escape me, this is what xmlsec does when size_t is not 4
-#if SAL_TYPES_SIZEOFPOINTER != 4
-# define XMLSEC_NO_SIZE_T
-#endif
-#include <xmlsec/xmlsec.h>
-#include <xmlsec/keysmngr.h>
-#include <xmlsec/crypto.h>
-#include <xmlsec/base64.h>
-#include <xmlsec/strings.h>
+#include "xmlsecurity/xmlsec-wrapper.h"
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 75fa7fc..c8c0be1 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -44,12 +44,7 @@
#include "certdb.h"
#include "list"
-#include <sal/types.h>
-//For reasons that escape me, this is what xmlsec does when size_t is not 4
-#if SAL_TYPES_SIZEOFPOINTER != 4
-# define XMLSEC_NO_SIZE_T
-#endif
-#include "xmlsec/xmlsec.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper4<
::com::sun::star::xml::crypto::XSecurityEnvironment ,
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 85dfb93..6e04c9d 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -28,15 +28,7 @@
#include "securityenvironment_nssimpl.hxx"
#include "errorcallback.hxx"
-#include <sal/types.h>
-//For reasons that escape me, this is what xmlsec does when size_t is not 4
-#if SAL_TYPES_SIZEOFPOINTER != 4
-# define XMLSEC_NO_SIZE_T
-#endif
-#include "xmlsec/xmlsec.h"
-#include "xmlsec/xmltree.h"
-#include "xmlsec/xmlenc.h"
-#include "xmlsec/crypto.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::lang ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index 60fe6b0..a53955d 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -24,14 +24,7 @@
#include "xmlsecuritycontext_nssimpl.hxx"
#include "xmlstreamio.hxx"
-#include <sal/types.h>
-//For reasons that escape me, this is what xmlsec does when size_t is not 4
-#if SAL_TYPES_SIZEOFPOINTER != 4
-# define XMLSEC_NO_SIZE_T
-#endif
-#include "xmlsec/xmlsec.h"
-#include "xmlsec/keysmngr.h"
-#include "xmlsec/crypto.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::lang ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 32e7548..97fdb27 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -31,14 +31,7 @@
#include "xmlstreamio.hxx"
#include "errorcallback.hxx"
-#include <sal/types.h>
-//For reasons that escape me, this is what xmlsec does when size_t is not 4
-#if SAL_TYPES_SIZEOFPOINTER != 4
-# define XMLSEC_NO_SIZE_T
-#endif
-#include "xmlsec/xmlsec.h"
-#include "xmlsec/xmldsig.h"
-#include "xmlsec/crypto.h"
+#include "xmlsecurity/xmlsec-wrapper.h"
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::lang ;
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index 08237c4..43a8d6a 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -26,12 +26,7 @@
#include "rtl/uri.hxx"
#include <libxml/uri.h>
-#include <sal/types.h>
-//For reasons that escape me, this is what xmlsec does when size_t is not 4
-#if SAL_TYPES_SIZEOFPOINTER != 4
-# define XMLSEC_NO_SIZE_T
-#endif
-#include <xmlsec/io.h>
+#include "xmlsecurity/xmlsec-wrapper.h"
#define XMLSTREAMIO_INITIALIZED 0x01
#define XMLSTREAMIO_REGISTERED 0x02
commit 3b006a10b77db62274af2945a2a94df1efa7ab62
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Mar 24 00:13:27 2013 +0100
stricmp macro is unused
...since f3eb77586e067a46211334a78987652815f47744 "further removing of dead
code."
Change-Id: I6805c5adafcf19782f352cdacd0d99a9e7681eb6
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 8562092..85dfb93 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -38,10 +38,6 @@
#include "xmlsec/xmlenc.h"
#include "xmlsec/crypto.h"
-#ifdef UNX
-#define stricmp strcasecmp
-#endif
-
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::lang ;
using ::com::sun::star::lang::XMultiServiceFactory ;
commit 86ff37355ec8003a45e2b091868d785fe7d7b237
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Mar 23 22:11:58 2013 +0100
xmloff/source/forms/strings.cxx no longer relevant
...since 02944a639dd534e025e3dd57421b714bb816a28d "xmloff: remove no longer
needed XMLFORM_CONSTASCII_STRING macro."
Change-Id: Ic5bae5183435a378655524dba9dbd3eef523533e
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 7ffa8ba..e3777e4 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -173,7 +173,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/forms/propertyexport \
xmloff/source/forms/propertyimport \
xmloff/source/forms/property_meta_data \
- xmloff/source/forms/strings \
xmloff/source/forms/valueproperties \
xmloff/source/forms/handler/form_handler_factory \
xmloff/source/forms/handler/property_handler_base \
diff --git a/xmloff/source/forms/strings.cxx b/xmloff/source/forms/strings.cxx
deleted file mode 100644
index 8c03013..0000000
--- a/xmloff/source/forms/strings.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-
-
-#ifndef _XMLOFF_FORMS_STRINGS_HXX_
-#define XMLFORM_IMPLEMENT_STRINGS
-#include "strings.hxx"
-#undef XMLFORM_IMPLEMENT_STRINGS
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1f668d42b892a5b556c6cff1280f7be3b1aff9cd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Mar 23 22:04:50 2013 +0100
Disable -Werror for all generated source files
...the amount of hackery to silence the warnings inherent in the boilerplate of
such code is out of all proportion to the benefits of catching genuine problems
in LO's injected client code (esp. so with upcoming -Wunused-macros).
Change-Id: I7dce5263a244b9f49a59f526d94f8575a1a8c3ab
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 351a46c..61bdec4 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -965,6 +965,7 @@ $(call gb_GenCObject_get_target,$(2)) : $(call gb_GenCObject_get_source,$(2))
# That's why we need this order-only dependency on gb_Helper_MISCDUMMY
$(call gb_GenCObject_get_source,$(2)) : | $(gb_Helper_MISCDUMMY)
$(call gb_GenCObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCObject_get_target,$(2)) : WARNINGS_NOT_ERRORS := $(true)
$(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(call gb_LinkTarget__get_cflags,$(4)) $(3)
$(call gb_GenCObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
@@ -986,6 +987,7 @@ $(call gb_GenCxxObject_get_target,$(2)) : $(call gb_GenCxxObject_get_source,$(2)
# That's why we need this order-only dependency on gb_Helper_MISCDUMMY
$(call gb_GenCxxObject_get_source,$(2),$(1)) : | $(gb_Helper_MISCDUMMY)
$(call gb_GenCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCxxObject_get_target,$(2)) : WARNINGS_NOT_ERRORS := $(true)
$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
$(call gb_GenCxxObject_get_target,$(2)) : \
OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
@@ -1023,7 +1025,6 @@ endef
define gb_LinkTarget_add_scanner
$(call gb_LexTarget_LexTarget,$(2))
$(call gb_LinkTarget_add_generated_exception_object,$(1),LexTarget/$(2),$(3))
-$(call gb_GenCxxObject_get_target,LexTarget/$(2)) : WARNINGS_NOT_ERRORS := $(true)
$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_LexTarget_get_clean_target,$(2))
endef
commit fa545023ada3f2a5f79cab1ff628fd18434c7c2e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Mar 23 21:55:27 2013 +0100
Introduce HAVE_GCC_PRAGMA_DIAGNOSTIC_{MODIFY,SCOPE}
...replacing hard-coded GCC version checks. Those checks that guard
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
appear relevant only for GCC itself, not Clang (which used to fail the old
guards because it typically announces itself with a rather low
__GNUC__/__GNUC_MINOR__ version), see 6e67c03dc0225fc66343546b14e902b9d238b1a3
"Enable -Wnon-virtual-dtor for GCC 4.6"
Change-Id: I6bfa4d5caa6192e7a203ce829682bf6bb8d61a1b
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 87033db..fa37a17 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -32,6 +32,9 @@ Any change in this header will cause a rebuild of almost everything.
#define HAVE_GCC_BUILTIN_ATOMIC 0
#endif
+#define HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY 0
+#define HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE 0
+
#undef HAVE_SFINAE_ANONYMOUS_BROKEN
#ifndef HAVE_SFINAE_ANONYMOUS_BROKEN
#define HAVE_SFINAE_ANONYMOUS_BROKEN 0
diff --git a/configure.ac b/configure.ac
index 898dedb..a12018a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5562,6 +5562,33 @@ if test "$GCC" = "yes"; then
AC_MSG_RESULT([no])
fi
+ AC_MSG_CHECKING(
+ [whether $CC supports pragma GCC diagnostic error/ignored/warning])
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -Werror -Wunused"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #pragma GCC diagnostic ignored "-Wunused"
+ static void dummy() {}
+ ])], [
+ AC_DEFINE([HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY],[1])
+ AC_MSG_RESULT([yes])
+ ], [AC_MSG_RESULT([no])])
+ CFLAGS=$save_CFLAGS
+
+ AC_MSG_CHECKING([whether $CC supports pragma GCC diagnostic push/pop])
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -Werror -Wunused"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wunused"
+ static void dummy() {}
+ #pragma GCC diagnostic pop
+ ])], [
+ AC_DEFINE([HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE],[1])
+ AC_MSG_RESULT([yes])
+ ], [AC_MSG_RESULT([no])])
+ CFLAGS=$save_CFLAGS
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#if __GNUC__ == 4 && __GNUC_MINOR__ == 7 && (__GNUC_PATCHLEVEL__ == 0 || __GNUC_PATCHLEVEL__ == 1)
#else
diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h
index 9534b03..20753f4 100644
--- a/connectivity/source/drivers/mozab/post_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/post_include_mozilla.h
@@ -17,7 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+ && !defined __clang__
#pragma GCC diagnostic pop
#elif defined __SUNPRO_CC
#pragma enable_warn
diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h
index b59974e..14a7ad6 100644
--- a/connectivity/source/drivers/mozab/pre_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
#ifndef MINIMAL_PROFILEDISCOVER
// Turn off DEBUG Assertions
#ifdef _DEBUG
@@ -46,7 +48,8 @@
#endif
#endif
-#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+ && !defined __clang__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#elif defined __SUNPRO_CC
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index d17128e..44484fe 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -18,6 +18,8 @@
// the License at http://www.apache.org/licenses/LICENSE-2.0 .
//
+#include "sal/config.h"
+
#define YY_EXIT 1 // YY_FATAL will not halt the application
#ifndef _CSTDARG_
@@ -44,11 +46,9 @@
#include <rtl/strbuf.hxx>
#include <connectivity/sqlparse.hxx>
-#if defined __GNUC__
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
# pragma GCC diagnostic ignored "-Wwrite-strings"
# pragma GCC diagnostic ignored "-Wunused-function"
-#endif
#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
index 68c9855..bbca3ac 100644
--- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
+++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
@@ -77,7 +77,8 @@ template< typename T > class PropertySetMixin;
@since UDK 3.2.1
*/
-#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+ && !defined __clang__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
@@ -397,7 +398,8 @@ private:
void checkUnknown(rtl::OUString const & propertyName);
};
-#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE \
+ && !defined __clang__
#pragma GCC diagnostic pop
#endif
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index b076990..fd0e47b 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
#include <functional>
#include <algorithm>
#include <osl/mutex.hxx>
@@ -374,14 +376,8 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
}
// 'fileAttributesAtPath:traverseLink:' is deprecated
-#if defined LIBO_WERROR && defined __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION >= 40201
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
-#define DID_TURN_OFF_DEPRECATED_DECLARATIONS_WARNING
-#endif
#endif
sal_Bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
@@ -440,7 +436,7 @@ sal_Bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
return sal_False;
}
-#ifdef DID_TURN_OFF_DEPRECATED_DECLARATIONS_WARNING
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic error "-Wdeprecated-declarations"
#endif
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 119c00d..8d1d5bc 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
@@ -769,12 +771,12 @@ void SalAquaFilePicker::updateSaveFileNameExtension() {
rtl::OUString suffix = (*(aStringList.begin())).copy(1);
NSString *requiredFileType = [NSString stringWithOUString:suffix];
-#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
[m_pDialog setRequiredFileType:requiredFileType];
-#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
#pragma GCC diagnostic pop
#endif
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index 9fdc848..b4a39d4 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/interfacecontainer.h>
@@ -176,7 +178,7 @@ int SalAquaPicker::run()
startDirectory = NSHomeDirectory();
}
-#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
@@ -199,7 +201,7 @@ int SalAquaPicker::run()
implsetDisplayDirectory([[NSURL fileURLWithPath:pDir] OUStringForInfo:FULLPATH]);
}
}
-#if defined(LIBO_WERROR) && defined(__clang__) && MACOSX_SDK_VERSION >= 1070
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
#pragma GCC diagnostic pop
#endif
DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 4c123ea..166c281 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -23,6 +23,8 @@
* scanner.ll - Lexical scanner for IDLC 1.0
*/
+#include "sal/config.h"
+
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
@@ -247,11 +249,9 @@ static void parseLineAndFile(sal_Char* pBuf)
}
// Suppress any warnings from generated code:
-#if defined __GNUC__
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-label"
-#endif
#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index e8e6b1a..ea9e7b4 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -21,6 +21,8 @@
* lexer for parsing cfg source files
*/
+#include "sal/config.h"
+
/* enlarge token buffer to tokenize whole strings */
#undef YYLMAX
#define YYLMAX 64000
@@ -40,11 +42,9 @@
#include "sal/main.h"
-#if defined __GNUC__
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-label"
-#endif
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 755b0b3..6716b1b 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -22,6 +22,8 @@
* lexer for parsing resource source files (*.src)
*/
+#include "sal/config.h"
+
/* enlarge token buffer to tokenize whole strings */
#undef YYLMAX
#define YYLMAX 64000
@@ -41,11 +43,9 @@
#include "sal/main.h"
-#if defined __GNUC__
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-label"
-#endif
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index ad5b949..7513edd 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -21,6 +21,8 @@
* lexer for parsing xml-property source files (*.xml)
*/
+#include "sal/config.h"
+
/* enlarge token buffer to tokenize whole strings */
#undef YYLMAX
#define YYLMAX 64000
@@ -40,11 +42,9 @@
#include "sal/main.h"
-#if defined __GNUC__
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-label"
-#endif
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index d0be59e..16d2833 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -18,6 +18,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
#include <stdio.h>
#include <ctype.h>
#include <string.h>
@@ -256,14 +258,8 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop )
#pragma warning(push, 1)
#pragma warning(disable:4129 4273 4701 4702)
#endif
-#if defined __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
-/* Diagnostics pragma was introduced with gcc-4.2.1 */
-#if GCC_VERSION >= 40201
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic ignored "-Wwrite-strings"
-#endif
#elif defined __SUNPRO_CC
#pragma disable_warn
#endif
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index 5886429..e578ccf 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -26,6 +26,7 @@
*
************************************************************************/
+#include "sal/config.h"
#include <string.h>
#include <rtl/uri.hxx>
@@ -45,15 +46,9 @@ using namespace webdav_ucp;
# pragma disable_warn
# endif
-#if defined __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
-/* Diagnostics pragma was introduced with gcc-4.2.1 */
-#if GCC_VERSION >= 40201
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic ignored "-Wwrite-strings"
#endif
-#endif
namespace {
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 9de4038..23dbfd4 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
#include <DataFlavorMapping.hxx>
#include "HtmlFmtFlt.hxx"
#include "PictToBmpFlt.hxx"
@@ -97,14 +99,9 @@ namespace // private
// Make deprecation warnings just warnings even in a -Werror
// compilation.
-#if defined LIBO_WERROR && defined __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION >= 40201
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
-#endif
/* At the moment it appears as if only MS Office pastes "public.html" to the clipboard.
*/
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 67714ba..8d6f521 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
#include "tools/resary.hxx"
@@ -1099,15 +1100,10 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
// Make deprecation warnings just warnings in a -Werror compilation.
-#if defined LIBO_WERROR && defined __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION >= 40201
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
// #pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
-#endif
@implementation AquaPrintAccessoryView
+(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState
@@ -1394,9 +1390,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
return pCtrlTarget;
}
-#if defined LIBO_WERROR && defined __GNUC__ && GCC_VERSION >= 40201
// #pragma GCC diagnostic pop
-#endif
@end
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index b2f6a04..dbe507a 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#incldue "sal/config.h"
+
#include "tools/debug.hxx"
#include "aqua/saldata.hxx"
@@ -29,14 +31,9 @@
#include <math.h>
// ATSUI is deprecated in 10.6 (or already 10.5?)
-#if defined LIBO_WERROR && defined __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION >= 40201
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
-#endif
// =======================================================================
diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 502c33b..1dae840 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
#include <boost/assert.hpp>
#include <vector>
@@ -29,14 +30,9 @@
#include "aqua/atsui/salatsuifontutils.hxx"
// ATSUI is deprecated in 10.6 (or already 10.5?)
-#if defined LIBO_WERROR && defined __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION >= 40201
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
-#endif
// we have to get the font attributes from the name table
// since neither head's macStyle nor OS/2's panose are easily available
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 9c9eb9d..d0594b5 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
#include "osl/file.hxx"
#include "osl/process.h"
@@ -52,14 +53,9 @@ typedef std::vector<unsigned char> ByteVector;
// ATSUI is deprecated in 10.6 (or already 10.5?)
-#if defined LIBO_WERROR && defined __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
- + __GNUC_MINOR__ * 100 \
- + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION >= 40201
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
-#endif
// =======================================================================
commit c940e3d8b3895c550fb37e0e9acbd19b4bb3515e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Mar 23 17:46:23 2013 +0100
Remove unused macros from checked-in Flex/Bison output
...(for which the source is no longer available), to silence -Wunused-macros.
Change-Id: If4676ead42e0fb8bd3ff3d07c27aa83fd204167e
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index 9f315d3..af26388 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -21,8 +21,6 @@
/* A Bison parser, made from grammar.y
by GNU Bison version 1.28 */
-#define YYBISON 1 /* Identify Bison output. */
-
#ifndef YYDEBUG
#define YYDEBUG 0
#endif
@@ -30,36 +28,6 @@
#define YYMAXDEPTH 0
#endif
-#define ACCENT 257
-#define SMALL_GREEK 258
-#define CAPITAL_GREEK 259
-#define BINARY_OPERATOR 260
-#define RELATION_OPERATOR 261
-#define ARROW 262
-#define GENERAL_IDEN 263
-#define GENERAL_OPER 264
-#define BIG_SYMBOL 265
-#define FUNCTION 266
-#define ROOT 267
-#define FRACTION 268
-#define SUBSUP 269
-#define EQOVER 270
-#define DELIMETER 271
-#define LARGE_DELIM 272
-#define DECORATION 273
-#define SPACE_SYMBOL 274
-#define CHARACTER 275
-#define STRING 276
-#define OPERATOR 277
-#define EQBEGIN 278
-#define EQEND 279
-#define EQLEFT 280
-#define EQRIGHT 281
-#define NEWLINE 282
-#define LEFT_DELIM 283
-#define RIGHT_DELIM 284
-#define DIGIT 285
-
#include <list>
#include <stdlib.h>
#include <string.h>
@@ -434,33 +402,12 @@ static const short yycheck[] = { 11,
It is replaced by the list of actions, each action
as one case of the switch. */
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY -2
#define YYEOF 0
#define YYACCEPT goto yyacceptlab
#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrlab1
-/* Like YYERROR except do call yyerror.
- This remains here temporarily to ease the
- transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
-#define YYFAIL goto yyerrlab
-#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { yychar = (token), yylval = (value); \
- yychar1 = YYTRANSLATE (yychar); \
- YYPOPSTACK; \
- goto yybackup; \
- } \
- else \
- { yyerror ("syntax error: cannot back up"); YYERROR; } \
-while (0)
#define YYTERROR 1
-#define YYERRCODE 256
#ifndef YYPURE
#define YYLEX yylex()
@@ -616,8 +563,6 @@ yyparse(YYPARSE_PARAM_ARG)
YYLTYPE *yylsp;
#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK (yyvsp--, yyssp--)
#endif
int yystacksize = YYINITDEPTH;
diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx
index 4ebf433..3b08915 100644
--- a/hwpfilter/source/lexer.cxx
+++ b/hwpfilter/source/lexer.cxx
@@ -34,10 +34,6 @@
#define YY_MAIN 0
#endif
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
#include <stdio.h>
@@ -98,18 +94,10 @@
*/
#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-/* Enter a start condition. This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state. The YYSTATE alias is for lex
- * compatibility.
+ * to BEGIN to return to the state.
*/
#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
/* Action number for EOF rule of a given start state. */
#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
@@ -131,33 +119,6 @@ extern FILE *yyin, *yyout;
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator). This
- * avoids problems with code like:
- *
- * if ( condition_holds )
- * yyless( 5 );
- * else
- * do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up yytext. */ \
- *yy_cp = yy_hold_char; \
- YY_RESTORE_YY_MORE_OFFSET \
- yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
- YY_DO_BEFORE_ACTION; /* set up yytext again */ \
- } \
- while ( 0 )
-
//#define unput(c) yyunput( c, yytext_ptr )
/* The following is because we cannot portably get our hands on size_t
@@ -259,7 +220,6 @@ YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
@@ -269,24 +229,6 @@ static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
static void yy_flex_free YY_PROTO(( void * ));
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
- { \
- if ( ! yy_current_buffer ) \
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
- yy_current_buffer->yy_is_interactive = is_interactive; \
- }
-
-#define yy_set_bol(at_bol) \
- { \
- if ( ! yy_current_buffer ) \
- yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
- yy_current_buffer->yy_at_bol = at_bol; \
- }
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
typedef unsigned char YY_CHAR;
FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
typedef int yy_state_type;
@@ -308,7 +250,6 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
*yy_cp = '\0'; \
yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 45
#define YY_END_OF_BUFFER 46
static yyconst short int yy_accept[994] =
{ 0,
@@ -1011,11 +952,6 @@ static yyconst short int yy_chk[1389] =
static yy_state_type yy_last_accepting_state;
static char *yy_last_accepting_cpos;
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
@@ -1030,10 +966,6 @@ char *yytext;
#define isatty _isatty
#endif
-/* enlarge token buffer to tokenize whole strings */
-#undef YYLMAX
-#define YYLMAX 64000
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -1155,11 +1087,6 @@ YY_MALLOC_DECL
#define yyterminate() return YY_NULL
#endif
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
/* Report a fatal error. */
#ifndef YY_FATAL_ERROR
#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
@@ -2125,22 +2052,6 @@ char msg[];
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
- do \
- { \
- /* Undo effects of setting up yytext. */ \
- yytext[yyleng] = yy_hold_char; \
- yy_c_buf_p = yytext + n; \
- yy_hold_char = *yy_c_buf_p; \
- *yy_c_buf_p = '\0'; \
- yyleng = n; \
- } \
- while ( 0 )
-
-
/* Internal utility routines. */
#ifndef yytext_ptr
commit 9e2de8007067928b426088c4c1a16b5f07959332
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Mar 23 17:37:31 2013 +0100
Reduce confusion by removing #line directives
...from checked-in Flex/Bison output for which the source is no longer available
anyway.
Change-Id: Iba9d861bdb102ef52bab7b53019741e3977a7335
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index 60edff4..9f315d3 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -60,8 +60,6 @@
#define RIGHT_DELIM 284
#define DIGIT 285
-#line 1 "grammar.y"
-
#include <list>
#include <stdlib.h>
#include <string.h>
@@ -94,7 +92,6 @@ int debug(const char *format, ...);
#endif
-#line 35 "grammar.y"
typedef union {
char *dval;
char *str;
@@ -376,8 +373,6 @@ static const short yycheck[] = { 11,
-1, 17, 18, -1, 20, 21, 22, 23, -1, -1,
-1, -1, -1, -1, -1, 31, 32
};
-/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/lib/bison.simple"
/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
@@ -570,8 +565,6 @@ __yy_memcpy (char *to, char *from, unsigned int count)
#endif
#endif
-#line 217 "/usr/lib/bison.simple"
-
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
It should actually point to an object.
@@ -900,296 +893,223 @@ yyreduce:
switch (yyn) {
case 1:
-#line 60 "grammar.y"
{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 2:
-#line 61 "grammar.y"
{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 3:
-#line 62 "grammar.y"
{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 4:
-#line 63 "grammar.y"
{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 5:
-#line 64 "grammar.y"
{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 6:
-#line 65 "grammar.y"
{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 7:
-#line 66 "grammar.y"
{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 8:
-#line 67 "grammar.y"
{ yyval.ptr = new Node(ID_CHARACTER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 9:
-#line 68 "grammar.y"
{ yyval.ptr = new Node(ID_OPERATOR); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 10:
-#line 69 "grammar.y"
{ yyval.ptr = new Node(ID_OPERATOR); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 11:
-#line 70 "grammar.y"
{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 12:
-#line 71 "grammar.y"
{ yyval.ptr = new Node(ID_DELIMETER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 13:
-#line 72 "grammar.y"
{ yyval.ptr = new Node(ID_DELIMETER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 14:
-#line 73 "grammar.y"
{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 15:
-#line 74 "grammar.y"
{ yyval.ptr = new Node(ID_CHARACTER); allocChar(yyval.ptr->value , '|'); debug("Identifier : '|'\n"); nodelist.push_back(yyval.ptr); ;
break;}
case 16:
-#line 75 "grammar.y"
{ yyval.ptr = new Node(ID_NUMBER); allocValue(yyval.ptr->value , yyvsp[0].dval); debug("Number : %s\n",yyvsp[0].dval); nodelist.push_back(yyval.ptr); ;
break;}
case 17:
-#line 76 "grammar.y"
{ yyval.ptr = new Node(ID_STRING); allocValue(yyval.ptr->value , yyvsp[0].str); debug("String : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 18:
-#line 80 "grammar.y"
{ yyval.ptr = new Node(ID_PRIMARYEXPR); yyval.ptr->child = yyvsp[0].ptr; debug("PrimaryExpr\n"); nodelist.push_back(yyval.ptr); ;
break;}
case 19:
-#line 81 "grammar.y"
{ yyval.ptr = new Node(ID_PRIMARYEXPR); yyval.ptr->child = yyvsp[-1].ptr; yyval.ptr->next = yyvsp[0].ptr; debug("PrimaryExpr : PrimaryExpr Identifier\n"); nodelist.push_back(yyval.ptr); ;
break;}
case 20:
-#line 85 "grammar.y"
{ yyval.ptr = new Node(ID_LEFT); allocChar(yyval.ptr->value , '('); debug("EQLeft \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 21:
-#line 86 "grammar.y"
{ yyval.ptr = new Node(ID_LEFT); allocChar(yyval.ptr->value , '['); debug("EQLeft \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 22:
-#line 87 "grammar.y"
{ yyval.ptr = new Node(ID_LEFT); allocChar(yyval.ptr->value , '{'); debug("EQLeft \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 23:
-#line 88 "grammar.y"
{ yyval.ptr = new Node(ID_LEFT); allocChar(yyval.ptr->value , '<'); debug("EQLeft \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 24:
-#line 89 "grammar.y"
{ yyval.ptr = new Node(ID_LEFT); allocChar(yyval.ptr->value , '|'); debug("EQLeft \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 25:
-#line 90 "grammar.y"
{ yyval.ptr = new Node(ID_LEFT); allocValue(yyval.ptr->value , "||"); debug("EQLeft \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 26:
-#line 91 "grammar.y"
{ yyval.ptr = new Node(ID_LEFT); allocValue(yyval.ptr->value , yyvsp[0].str); debug("EQLeft \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 27:
-#line 95 "grammar.y"
{ yyval.ptr = new Node(ID_RIGHT); allocChar(yyval.ptr->value , ')'); debug("EQRight \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 28:
-#line 96 "grammar.y"
{ yyval.ptr = new Node(ID_RIGHT); allocChar(yyval.ptr->value , ']'); debug("EQRight \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 29:
-#line 97 "grammar.y"
{ yyval.ptr = new Node(ID_RIGHT); allocChar(yyval.ptr->value , '}'); debug("EQRight \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 30:
-#line 98 "grammar.y"
{ yyval.ptr = new Node(ID_RIGHT); allocChar(yyval.ptr->value , '>'); debug("EQRight \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 31:
-#line 99 "grammar.y"
{ yyval.ptr = new Node(ID_RIGHT); allocChar(yyval.ptr->value , '|'); debug("EQRight \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 32:
-#line 100 "grammar.y"
{ yyval.ptr = new Node(ID_RIGHT); allocValue(yyval.ptr->value , "||"); debug("EQRight \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 33:
-#line 101 "grammar.y"
{ yyval.ptr = new Node(ID_RIGHT); allocValue(yyval.ptr->value , yyvsp[0].str); debug("EQRight \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 34:
-#line 105 "grammar.y"
{ yyval.ptr = new Node(ID_FENCE); yyval.ptr->child=yyvsp[-2].ptr; yyvsp[-2].ptr->next=yyvsp[-1].ptr; yyvsp[-1].ptr->next=yyvsp[0].ptr; debug("Fence \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 35:
-#line 109 "grammar.y"
{ yyval.ptr = new Node(ID_PARENTH); yyval.ptr->child = yyvsp[-1].ptr; debug("Parenth: '(' ExprList ')' \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 36:
-#line 110 "grammar.y"
{ yyval.ptr = new Node(ID_PARENTH); debug("Parenth: '(' ')' \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 37:
-#line 114 "grammar.y"
{ yyval.ptr = new Node(ID_BLOCK); yyval.ptr->child = yyvsp[-1].ptr; debug("Block: '{' ExprList '}' \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 38:
-#line 115 "grammar.y"
{ yyval.ptr = new Node(ID_BLOCK); debug("Block: '{' '}' \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 39:
-#line 119 "grammar.y"
{ yyval.ptr = new Node(ID_BRACKET); yyval.ptr->child = yyvsp[-1].ptr; debug("Bracket \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 40:
-#line 120 "grammar.y"
{ yyval.ptr = new Node(ID_BRACKET); debug("Bracket \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 41:
-#line 124 "grammar.y"
{ yyval.ptr = new Node(ID_SUBEXPR); yyval.ptr->child = yyvsp[-2].ptr; yyvsp[-2].ptr->next = yyvsp[0].ptr; debug("SubSupExpr : ID_SUBEXPR\n"); nodelist.push_back(yyval.ptr); ;
break;}
case 42:
-#line 125 "grammar.y"
{ yyval.ptr = new Node(ID_SUPEXPR); yyval.ptr->child = yyvsp[-2].ptr; yyvsp[-2].ptr->next = yyvsp[0].ptr; debug("SubSupExpr : ID_SUPEXPR\n"); nodelist.push_back(yyval.ptr); ;
break;}
case 43:
-#line 126 "grammar.y"
{ yyval.ptr = new Node(ID_SUBSUPEXPR); yyval.ptr->child=yyvsp[-4].ptr; yyvsp[-4].ptr->next=yyvsp[-2].ptr; yyvsp[-2].ptr->next=yyvsp[0].ptr; debug("SubSupExpr : ID_SUBSUPEXPR\n"); nodelist.push_back(yyval.ptr); ;
break;}
case 44:
-#line 130 "grammar.y"
{ yyval.ptr = new Node(ID_FRACTIONEXPR); yyval.ptr->child = yyvsp[-1].ptr; yyvsp[-1].ptr->next = yyvsp[0].ptr; debug("FractionExpr : %s\n",yyvsp[-2].str); nodelist.push_back(yyval.ptr); ;
break;}
case 45:
-#line 134 "grammar.y"
{ yyval.ptr = new Node(ID_OVER); yyval.ptr->child = yyvsp[-3].ptr; yyvsp[-3].ptr->next = yyvsp[-1].ptr; debug("OverExpr\n"); nodelist.push_back(yyval.ptr); ;
break;}
case 46:
-#line 139 "grammar.y"
{ yyval.ptr = new Node(ID_ACCENTEXPR); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Accent : %s\n", yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 47:
-#line 143 "grammar.y"
{ yyval.ptr = new Node(ID_ACCENTEXPR); yyval.ptr->child=yyvsp[-1].ptr; yyvsp[-1].ptr->next = yyvsp[0].ptr; debug("AccentExpr \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 48:
-#line 146 "grammar.y"
{ yyval.ptr = new Node(ID_DECORATIONEXPR); allocValue(yyval.ptr->value , yyvsp[0].str); debug("Decoration : %s\n", yyvsp[0].str); nodelist.push_back(yyval.ptr); ;
break;}
case 49:
-#line 150 "grammar.y"
{ yyval.ptr = new Node(ID_DECORATIONEXPR); yyval.ptr->child = yyvsp[-1].ptr; yyvsp[-1].ptr->next = yyvsp[0].ptr; debug("DecorationExpr \n"); nodelist.push_back(yyval.ptr); ;
break;}
case 50:
-#line 154 "grammar.y"
{ yyval.ptr = new Node(ID_SQRTEXPR); yyval.ptr->child = yyvsp[0].ptr; debug("RootExpr : %s\n", yyvsp[-1].str); nodelist.push_back(yyval.ptr); ;
break;}
case 51:
-#line 155 "grammar.y"
{ yyval.ptr = new Node(ID_ROOTEXPR); yyval.ptr->child = yyvsp[-1].ptr; yyvsp[-1].ptr->next= yyvsp[0].ptr; debug("RootExpr : %s\n", yyvsp[-2].str); nodelist.push_back(yyval.ptr); ;
break;}
case 52:
-#line 159 "grammar.y"
{ yyval.ptr = new Node(ID_BEGIN); yyval.ptr->child = yyvsp[0].ptr; nodelist.push_back(yyval.ptr); debug("BeginExpr\n"); ;
break;}
case 53:
-#line 160 "grammar.y"
{ yyval.ptr = new Node(ID_BEGIN); yyval.ptr->child = yyvsp[-1].ptr; yyvsp[-1].ptr->next= yyvsp[0].ptr; nodelist.push_back(yyval.ptr); debug("BeginExpr\n"); ;
break;}
case 54:
-#line 164 "grammar.y"
{ yyval.ptr = new Node(ID_END); yyval.ptr->child = yyvsp[0].ptr; nodelist.push_back(yyval.ptr); debug("EndExpr\n"); ;
break;}
case 55:
-#line 169 "grammar.y"
{ yyval.ptr = new Node(ID_MATHML); yyval.ptr->child = yyvsp[0].ptr; nodelist.push_back(yyval.ptr); top = yyval.ptr; debug("MathML\n"); ;
break;}
case 56:
-#line 173 "grammar.y"
{ yyval.ptr = new Node(ID_LINES); yyval.ptr->child = yyvsp[0].ptr; nodelist.push_back(yyval.ptr); debug("Lines\n"); ;
break;}
case 57:
-#line 174 "grammar.y"
{ yyval.ptr = new Node(ID_LINES); yyval.ptr->child = yyvsp[-2].ptr; yyvsp[-2].ptr->next = yyvsp[0].ptr; nodelist.push_back(yyval.ptr); debug("Lines\n"); ;
break;}
case 58:
-#line 178 "grammar.y"
{ yyval.ptr = new Node(ID_LINE); yyval.ptr->child = yyvsp[0].ptr; nodelist.push_back(yyval.ptr); debug("Line\n"); ;
break;}
case 59:
-#line 182 "grammar.y"
{ yyval.ptr = new Node(ID_EXPRLIST); yyval.ptr->child = yyvsp[0].ptr; debug("ExprList : Expr\n"); nodelist.push_back(yyval.ptr); ;
break;}
case 60:
-#line 183 "grammar.y"
{ yyval.ptr = new Node(ID_EXPRLIST); yyval.ptr->child = yyvsp[-1].ptr; yyvsp[-1].ptr->next = yyvsp[0].ptr; debug("ExprList : ExprList Expr\n"); nodelist.push_back(yyval.ptr); ;
break;}
case 61:
-#line 187 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : Block\n"); nodelist.push_back(yyval.ptr);;
break;}
case 62:
-#line 188 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : Parenth\n"); nodelist.push_back(yyval.ptr);;
break;}
case 63:
-#line 189 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : Fence\n"); nodelist.push_back(yyval.ptr);;
break;}
case 64:
-#line 190 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : SubSupExpr\n"); nodelist.push_back(yyval.ptr);;
break;}
case 65:
-#line 191 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : FractionExpr\n"); nodelist.push_back(yyval.ptr);;
break;}
case 66:
-#line 192 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : OverExpr\n"); nodelist.push_back(yyval.ptr);;
break;}
case 67:
-#line 193 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : DecorationExpr\n"); nodelist.push_back(yyval.ptr);;
break;}
case 68:
-#line 194 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : RootExpr\n"); nodelist.push_back(yyval.ptr);;
break;}
case 69:
-#line 195 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : AccentExpr\n"); nodelist.push_back(yyval.ptr);;
break;}
case 70:
-#line 196 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : PrimaryExpr\n"); nodelist.push_back(yyval.ptr);;
break;}
case 71:
-#line 197 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : BeginExpr\n"); nodelist.push_back(yyval.ptr);;
break;}
case 72:
-#line 198 "grammar.y"
{ yyval.ptr = new Node(ID_EXPR); yyval.ptr->child = yyvsp[0].ptr; debug("Expr : EndExpr\n"); nodelist.push_back(yyval.ptr);;
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/lib/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
@@ -1409,7 +1329,6 @@ yyerrhandle:
}
return 1;
}
-#line 202 "grammar.y"
Node *mainParse(const char *_code)
diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx
index 39437c7..4ebf433 100644
--- a/hwpfilter/source/lexer.cxx
+++ b/hwpfilter/source/lexer.cxx
@@ -1019,9 +1019,7 @@ static char *yy_last_accepting_cpos;
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
-#line 1 "lexer.l"
#define INITIAL 0
-#line 2 "lexer.l"
#include <stdlib.h>
#include <string.h>
#include "nodes.h"
@@ -1053,7 +1051,6 @@ extern YYSTYPE yylval;
#else
int token_debug(const char *format, ...);
#endif
-#line 1026 "lex.yy.c"
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -1196,10 +1193,6 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 90 "lexer.l"
-
-#line 1179 "lex.yy.c"
-
if ( yy_init )
{
yy_init = 0;
@@ -1283,231 +1276,185 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 91 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Begin[%s]\n",yytext+1); return EQBEGIN; }
//YY_BREAK
case 2:
YY_RULE_SETUP
-#line 92 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>End[%s]\n",yytext+1); return EQEND; }
//YY_BREAK
case 3:
YY_RULE_SETUP
-#line 93 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Left[%s]\n",yytext+1); return EQLEFT; }
//YY_BREAK
case 4:
YY_RULE_SETUP
-#line 94 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>LeftDelim[%s]\n",yytext+1); return LEFT_DELIM; }
//YY_BREAK
case 5:
YY_RULE_SETUP
-#line 95 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>RightDelim[%s]\n",yytext+1); return RIGHT_DELIM; }
//YY_BREAK
case 6:
YY_RULE_SETUP
-#line 96 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Right[%s]\n",yytext+1); return EQRIGHT; }
//YY_BREAK
case 7:
YY_RULE_SETUP
-#line 97 "lexer.l"
{ yylval.str = yytext; token_debug(" ==>NewLine[%s]\n",yytext); return NEWLINE; }
//YY_BREAK
case 8:
YY_RULE_SETUP
-#line 99 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Accent[%s]\n",yytext+1); return ACCENT; }
//YY_BREAK
case 9:
YY_RULE_SETUP
-#line 100 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Small_Greek[%s]\n",yytext+1); return SMALL_GREEK; }
//YY_BREAK
case 10:
YY_RULE_SETUP
-#line 101 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Capital_Greek[%s]\n",yytext+1); return CAPITAL_GREEK; }
//YY_BREAK
case 11:
YY_RULE_SETUP
-#line 102 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Binary_Operator[%s]\n",yytext+1); return BINARY_OPERATOR; }
//YY_BREAK
case 12:
YY_RULE_SETUP
-#line 103 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Relation_Symbol[%s]\n",yytext+1); return RELATION_OPERATOR; }
//YY_BREAK
case 13:
YY_RULE_SETUP
-#line 105 "lexer.l"
{ yylval.str = strdup("neq"); token_debug(" ==>Relation_Symbol[neq]\n"); return RELATION_OPERATOR; }
//YY_BREAK
case 14:
YY_RULE_SETUP
-#line 106 "lexer.l"
{ yylval.str = strdup("vmlt"); token_debug(" ==>Relation_Symbol[neq]\n"); return RELATION_OPERATOR; }
//YY_BREAK
case 15:
YY_RULE_SETUP
-#line 107 "lexer.l"
{ yylval.str = strdup("vmgt"); token_debug(" ==>Relation_Symbol[neq]\n"); return RELATION_OPERATOR; }
//YY_BREAK
case 16:
YY_RULE_SETUP
-#line 108 "lexer.l"
{ yylval.str = strdup("mlt"); token_debug(" ==>Relation_Symbol[neq]\n"); return RELATION_OPERATOR; }
//YY_BREAK
case 17:
YY_RULE_SETUP
-#line 109 "lexer.l"
{ yylval.str = strdup("mgt"); token_debug(" ==>Relation_Symbol[neq]\n"); return RELATION_OPERATOR; }
//YY_BREAK
case 18:
YY_RULE_SETUP
-#line 110 "lexer.l"
{ yylval.str = yytext; token_debug(" ==>Relation_Symbol[neq]\n"); return RELATION_OPERATOR; }
//YY_BREAK
case 19:
YY_RULE_SETUP
-#line 112 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Arrow[%s]\n",yytext+1); return ARROW; }
//YY_BREAK
case 20:
YY_RULE_SETUP
-#line 113 "lexer.l"
{ yylval.str = strdup("leftrightarrow"); token_debug(" ==>Arrow[leftrightarrow]\n"); return ARROW; }
//YY_BREAK
case 21:
YY_RULE_SETUP
-#line 114 "lexer.l"
{ yylval.str = strdup("rightarrow"); token_debug(" ==>Arrow[rightarrow]\n"); return ARROW; }
//YY_BREAK
case 22:
YY_RULE_SETUP
-#line 115 "lexer.l"
{ yylval.str = strdup("leftarrow"); token_debug(" ==>Arrow[leftarrow]\n"); return ARROW; }
//YY_BREAK
case 23:
YY_RULE_SETUP
-#line 116 "lexer.l"
{ token_debug(" ==>Ignore[\\rm]\n"); }
//YY_BREAK
case 24:
YY_RULE_SETUP
-#line 117 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>General_Iden[%s]\n",yytext+1); return GENERAL_IDEN; }
//YY_BREAK
case 25:
YY_RULE_SETUP
-#line 118 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>General_Oper[%s]\n",yytext+1); return GENERAL_OPER; }
//YY_BREAK
case 26:
YY_RULE_SETUP
-#line 119 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Big_Symbol[%s]\n",yytext+1); return BIG_SYMBOL; }
//YY_BREAK
case 27:
YY_RULE_SETUP
-#line 120 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Function[%s]\n",yytext+1); return FUNCTION; }
//YY_BREAK
case 28:
YY_RULE_SETUP
-#line 121 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Root[%s]\n",yytext+1); return ROOT; }
//YY_BREAK
case 29:
YY_RULE_SETUP
-#line 122 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Fraction[%s]\n",yytext+1); return FRACTION; }
//YY_BREAK
case 30:
YY_RULE_SETUP
-#line 123 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Over[%s]\n",yytext+1); return EQOVER; }
//YY_BREAK
case 31:
YY_RULE_SETUP
-#line 124 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Delimeter[%s]\n",yytext+1); return DELIMETER; }
//YY_BREAK
case 32:
YY_RULE_SETUP
-#line 125 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Large_Delim[%s]\n",yytext+1); return LARGE_DELIM; }
//YY_BREAK
case 33:
YY_RULE_SETUP
-#line 126 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Decoration[%s]\n",yytext+1); return DECORATION; }
//YY_BREAK
case 34:
YY_RULE_SETUP
-#line 127 "lexer.l"
{ yylval.str = yytext+1; token_debug(" ==>Space_Symbol[%s]\n",yytext+1); /*return SPACE_SYMBOL;*/ }
//YY_BREAK
case 35:
YY_RULE_SETUP
-#line 128 "lexer.l"
{ yylval.str = strdup("quad"); token_debug(" ==>Space_Symbol[quad]\n"); /* return SPACE_SYMBOL;*/ }
//YY_BREAK
case 36:
YY_RULE_SETUP
-#line 129 "lexer.l"
{ yylval.dval = yytext; token_debug(" ==>Digit[%s]\n",yytext); return DIGIT; }
//YY_BREAK
case 37:
YY_RULE_SETUP
-#line 130 "lexer.l"
{ yylval.str = yytext; token_debug(" ==>Operator[%s]\n",yytext); return OPERATOR; }
//YY_BREAK
case 38:
YY_RULE_SETUP
-#line 131 "lexer.l"
{ token_debug(" ==>SubSup[%s]\n",yytext); return yytext[0]; }
//YY_BREAK
case 39:
YY_RULE_SETUP
-#line 132 "lexer.l"
{ token_debug(" ==>Paren[%s]\n",yytext); return yytext[0];}
//YY_BREAK
case 40:
YY_RULE_SETUP
-#line 133 "lexer.l"
{ token_debug(" ==>Abs[%s]\n",yytext); return yytext[0];}
//YY_BREAK
case 41:
YY_RULE_SETUP
-#line 134 "lexer.l"
{ token_debug(" ==>Space[0x%2x]\n",yytext[0]); }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 135 "lexer.l"
{ token_debug(" ==>Ignore[0x%2x]\n",yytext[0]); }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 136 "lexer.l"
{ yylval.str = yytext; token_debug(" ==>String[%s]\n",yytext); return STRING; }
//YY_BREAK
case 44:
YY_RULE_SETUP
-#line 137 "lexer.l"
{ yylval.str = yytext; token_debug(" ==>Else[%s]\n",yytext); return CHARACTER; }
//YY_BREAK
case 45:
YY_RULE_SETUP
-#line 138 "lexer.l"
ECHO;
YY_BREAK
-#line 1487 "lex.yy.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2274,7 +2221,6 @@ int main()
return 0;
}
#endif
-#line 138 "lexer.l"
void initFlex(const char *_code )
commit 696a9a5212dd72f8e25a5185e524f4967fa7a9c6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Mar 23 16:56:42 2013 +0100
Duplicate REPLACELENGTH_PATH macro definition
Change-Id: Ia9ff049f1704d9840bf2de2f266d762671114e86
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 7007a03..c6689fc 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -71,7 +71,6 @@
#define REPLACELENGTH_INSTURL 10
#define REPLACELENGTH_PROGURL 10
#define REPLACELENGTH_USERURL 10
-#define REPLACELENGTH_PATH 7
#define REPLACELENGTH_LANG 7
#define REPLACELENGTH_LANGID 9
#define REPLACELENGTH_VLANG 8
More information about the Libreoffice-commits
mailing list