[Libreoffice-commits] core.git: 2 commits - connectivity/source include/vcl rsc/inc rsc/source

Thomas Arnhold thomas at arnhold.org
Fri Jun 28 04:36:42 PDT 2013 

 connectivity/source/inc/dbase/DIndexPage.hxx |   29 -----------------------
 connectivity/source/inc/dbase/dindexnode.hxx |    4 ++-
 include/vcl/help.hxx                         |    1 
 rsc/inc/vclrsc.hxx                           |   34 ---------------------------
 rsc/source/parser/rscibas.cxx                |   13 ++++++----
 rsc/source/parser/rscicpx.cxx                |    4 +--
 rsc/source/parser/rscinit.cxx                |    4 ---
 7 files changed, 14 insertions(+), 75 deletions(-)

New commits:
commit 61fd1d2e7803516e88a18017ee5d6a34d6ca14fa
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Fri Jun 28 06:52:03 2013 +0200

    fdo#62699 remove rsc/inc/vclrsc.hxx
    
    Change-Id: I8a90bfcfff904d42a529644ae7b6f03d0ac762eb

diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx
index 35d9cb3..7147233 100644
--- a/include/vcl/help.hxx
+++ b/include/vcl/help.hxx
@@ -49,7 +49,6 @@ class Window;
 #define QUICKHELP_NOEVADEPOINTER    ((sal_uInt16)0x4000)
 #define QUICKHELP_BIDI_RTL          ((sal_uInt16)0x8000)
 
-// By changes you must also change: rsc/vclrsc.hxx
 #define OOO_HELP_INDEX          ".help:index"
 #define OOO_HELP_HELPONHELP     ".help:helponhelp"
 
diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx
deleted file mode 100644
index 998eaee..0000000
--- a/rsc/inc/vclrsc.hxx
+++ /dev/null
@@ -1,34 +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 _TOOLS_VCLRSC_HXX
-#define _TOOLS_VCLRSC_HXX
-
-#include <sal/types.h>
-#include <tools/wintypes.hxx>
-#include <tools/fldunit.hxx>
-#include <tools/mapunit.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-
-#include <com/sun/star/awt/Key.hpp>
-#include <com/sun/star/awt/KeyGroup.hpp>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index ddbdd87..a78072e 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -22,20 +22,23 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <comphelper/string.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <comphelper/string.hxx>
-#include <tools/rc.h>
 #include <tools/color.hxx>
+#include <tools/fldunit.hxx>
+#include <tools/mapunit.hxx>
+#include <tools/rc.h>
+#include <tools/wintypes.hxx>
+#include <rsc/rsc-vcl-shared-types.hxx>
+
+#include <com/sun/star/awt/Key.hpp>
 
-#include <vclrsc.hxx>
 #include <rscconst.hxx>
 #include <rscarray.hxx>
 #include <rscclass.hxx>
 #include <rsccont.hxx>
 #include <rscdb.hxx>
-
-
 #include <rsclex.hxx>
 #include <rscyacc.hxx>
 
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index e278309..8df19d3 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -22,14 +22,14 @@
 #include <stdio.h>
 
 #include <tools/rc.h>
+#include <tools/wintypes.hxx>
+#include <rsc/rsc-vcl-shared-types.hxx>
 
-#include <vclrsc.hxx>
 #include <rscmgr.hxx>
 #include <rscclass.hxx>
 #include <rsccont.hxx>
 #include <rscdb.hxx>
 #include <rsc/rscsfx.hxx>
-
 #include <rsclex.hxx>
 #include <rscyacc.hxx>
 
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 8803a01..48710a6 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -22,8 +22,7 @@
 #include <stdio.h>
 
 #include <tools/rc.h>
-
-#include <vclrsc.hxx>
+#include <tools/wintypes.hxx>
 
 #include <rsctree.hxx>
 #include <rsctop.hxx>
@@ -36,7 +35,6 @@
 #include <rscclass.hxx>
 #include <rsckey.hxx>
 #include <rscdb.hxx>
-
 #include <rsclex.hxx>
 #include <rscyacc.hxx>
 
commit ab3f90e051256bbf0d999551fedb5106d0367d3a
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Fri Jun 28 06:40:32 2013 +0200

    fdo#62699 remove pass-through header
    
    Change-Id: Ib2c6ae071525ba52ee754439c1405da79fa3eeaa

diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
deleted file mode 100644
index 1789a9a..0000000
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ /dev/null
@@ -1,29 +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 _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
-#define _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
-
-#include <rtl/ref.hxx>
-#include <tools/stream.hxx>
-#include <vector>
-
-#endif // _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 0060c08..3993a22 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -21,9 +21,11 @@
 
 #include "file/fcode.hxx"
 #include "file/FTable.hxx"
-#include "dbase/DIndexPage.hxx"
 #include "connectivity/FValue.hxx"
+#include <rtl/ref.hxx>
 #include <tools/ref.hxx>
+#include <tools/stream.hxx>
+#include <vector>
 
 #define NODE_NOTFOUND 0xFFFF
 #define DINDEX_PAGE_SIZE 512

More information about the Libreoffice-commits mailing list