basic/source/classes/sbxmod.cxx | 2 +- basic/source/comp/buffer.cxx | 2 +- basic/source/comp/codegen.cxx | 3 ++- basic/source/comp/dim.cxx | 2 +- basic/source/comp/exprgen.cxx | 3 ++- basic/source/comp/exprnode.cxx | 3 ++- basic/source/comp/exprtree.cxx | 2 +- basic/source/comp/io.cxx | 2 +- basic/source/comp/loops.cxx | 2 +- basic/source/comp/parser.cxx | 2 +- basic/source/comp/sbcomp.cxx | 2 +- basic/source/comp/scanner.cxx | 3 ++- basic/source/comp/symtbl.cxx | 2 +- basic/source/comp/token.cxx | 2 +- basic/source/inc/sbcomp.hxx | 32 -------------------------------- 15 files changed, 18 insertions(+), 46 deletions(-)
New commits: commit 539ba642d738b62f62095296a1bff2621a421e8e Author: Noel Grandin <noelgran...@gmail.com> Date: Sun May 17 10:08:59 2015 +0200 remove unnecessary header file Change-Id: I3b86a54a773341be7e7e69e88c59dc531ea49c5b diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 502186c..7fb9fb7 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -75,8 +75,8 @@ #include <com/sun/star/awt/XControl.hpp> #include <comphelper/anytostring.hxx> #include <ooo/vba/VbQueryClose.hpp> -#include "sbcomp.hxx" #include "sbxmod.hxx" +#include "parser.hxx" using namespace com::sun::star; using namespace com::sun::star::lang; diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx index 870f299..a21ad03 100644 --- a/basic/source/comp/buffer.cxx +++ b/basic/source/comp/buffer.cxx @@ -19,7 +19,7 @@ #include <osl/thread.h> #include "buffer.hxx" -#include "sbcomp.hxx" +#include "parser.hxx" const static sal_uInt32 UP_LIMIT=0xFFFFFF00L; diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index 691fd9a..332bb7b 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -19,8 +19,9 @@ #include <basic/sbx.hxx> -#include "sbcomp.hxx" #include "image.hxx" +#include "codegen.hxx" +#include "parser.hxx" #include <limits> #include <algorithm> #include <osl/diagnose.h> diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index 27ebb4d..e0366f8 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -18,8 +18,8 @@ */ #include <basic/sbx.hxx> -#include "sbcomp.hxx" #include "sbunoobj.hxx" +#include "parser.hxx" #include <svtools/miscopt.hxx> #include <osl/diagnose.h> #include <com/sun/star/reflection/theCoreReflection.hpp> diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx index 8525980..22e59bb 100644 --- a/basic/source/comp/exprgen.cxx +++ b/basic/source/comp/exprgen.cxx @@ -18,8 +18,9 @@ */ -#include "sbcomp.hxx" +#include "codegen.hxx" #include "expr.hxx" +#include "parser.hxx" // Transform table for token operators and opcodes diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx index 53235fb..2ddbc33 100644 --- a/basic/source/comp/exprnode.cxx +++ b/basic/source/comp/exprnode.cxx @@ -21,7 +21,8 @@ #include <math.h> #include <rtl/math.hxx> -#include "sbcomp.hxx" +#include "codegen.hxx" +#include "parser.hxx" #include "expr.hxx" diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index 14c6cc6..2e133b8 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -18,7 +18,7 @@ */ -#include "sbcomp.hxx" +#include "parser.hxx" #include <basic/sbx.hxx> #include "expr.hxx" diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx index 2265ed5..484bcea 100644 --- a/basic/source/comp/io.cxx +++ b/basic/source/comp/io.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sbcomp.hxx" +#include "parser.hxx" #include "iosys.hxx" #include <boost/scoped_ptr.hpp> diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx index abd71e4..b545ae7 100644 --- a/basic/source/comp/loops.cxx +++ b/basic/source/comp/loops.cxx @@ -18,7 +18,7 @@ */ -#include "sbcomp.hxx" +#include "parser.hxx" #include <boost/scoped_ptr.hpp> // Single-line IF and Multiline IF diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index faafb0d..13ed16e 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -18,7 +18,7 @@ */ #include <basic/sbx.hxx> -#include "sbcomp.hxx" +#include "parser.hxx" #include <osl/diagnose.h> #include <com/sun/star/script/ModuleType.hpp> #include <svtools/miscopt.hxx> diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index 99dc478..0c7dc6d 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -19,7 +19,7 @@ #include <basic/sbx.hxx> -#include "sbcomp.hxx" +#include "parser.hxx" #include "image.hxx" #include "sbobjmod.hxx" #include <svtools/miscopt.hxx> diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx index 2e20a0e..ced5ac0 100644 --- a/basic/source/comp/scanner.cxx +++ b/basic/source/comp/scanner.cxx @@ -18,7 +18,8 @@ */ #include "basiccharclass.hxx" -#include "sbcomp.hxx" +#include "scanner.hxx" +#include "sbintern.hxx" #include <vcl/svapp.hxx> diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index bb094e6..b30173f 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -18,7 +18,7 @@ */ -#include "sbcomp.hxx" +#include "parser.hxx" #include <osl/diagnose.h> diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index e49b2ae..eec2f4e 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -19,7 +19,7 @@ #include "basiccharclass.hxx" -#include "sbcomp.hxx" +#include "token.hxx" struct TokenTable { SbiToken t; const char *s; }; diff --git a/basic/source/inc/sbcomp.hxx b/basic/source/inc/sbcomp.hxx deleted file mode 100644 index 0ca6d4a..0000000 --- a/basic/source/inc/sbcomp.hxx +++ /dev/null @@ -1,32 +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 INCLUDED_BASIC_SOURCE_INC_SBCOMP_HXX -#define INCLUDED_BASIC_SOURCE_INC_SBCOMP_HXX - -// I've taken the following from the new file by MD! (MT) -#include "sbintern.hxx" -#include "token.hxx" -#include "symtbl.hxx" -#include "parser.hxx" -#include "codegen.hxx" - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits