basctl/inc/pch/precompiled_basctl.hxx | 1 chart2/inc/pch/precompiled_chartcontroller.hxx | 1 cui/inc/pch/precompiled_cui.hxx | 1 editeng/inc/pch/precompiled_editeng.hxx | 1 include/vcl/combobox.h | 31 ------------------------- include/vcl/combobox.hxx | 7 ++++- reportdesign/inc/pch/precompiled_rpt.hxx | 1 reportdesign/inc/pch/precompiled_rptui.hxx | 1 sc/inc/pch/precompiled_sc.hxx | 1 sd/inc/pch/precompiled_sd.hxx | 1 sd/inc/pch/precompiled_sdui.hxx | 1 svtools/inc/pch/precompiled_svt.hxx | 1 svx/inc/pch/precompiled_svxcore.hxx | 1 sw/inc/pch/precompiled_msword.hxx | 1 sw/inc/pch/precompiled_swui.hxx | 1 sw/inc/pch/precompiled_vbaswobj.hxx | 1 vcl/inc/pch/precompiled_vcl.hxx | 2 - 17 files changed, 6 insertions(+), 48 deletions(-)
New commits: commit c95a6adceb4e5de8b5a73156eb4e8ee21d59899c Author: Tor Lillqvist <[email protected]> Date: Fri Dec 11 14:55:21 2015 +0200 No need for a separate <vcl/combobox.h> Change-Id: Iebf7b44e78fc28c20bdf0cbea84dbfd730b04016 diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index b6da33e..6376ff5 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -124,7 +124,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index 7c2bea8..953a2ec 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -114,7 +114,6 @@ #include <vcl/button.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/devicecoordinate.hxx> diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index c1d76b2..685fa6f 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -123,7 +123,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index 6ea416f..3a4ca16 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -94,7 +94,6 @@ #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/checksum.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/dialog.hxx> diff --git a/include/vcl/combobox.h b/include/vcl/combobox.h deleted file mode 100644 index d51b670..0000000 --- a/include/vcl/combobox.h +++ /dev/null @@ -1,31 +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_VCL_COMBOBOX_H -#define INCLUDED_VCL_COMBOBOX_H - -#include <vcl/lstbox.h> - -#define COMBOBOX_APPEND (SAL_MAX_INT32) -#define COMBOBOX_ENTRY_NOTFOUND (SAL_MAX_INT32) -#define COMBOBOX_MAX_ENTRIES (SAL_MAX_INT32 - 1) - -#endif // INCLUDED_VCL_COMBOBOX_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index a215eaf..42c012c 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -21,11 +21,14 @@ #define INCLUDED_VCL_COMBOBOX_HXX #include <vcl/dllapi.h> -#include <vcl/combobox.h> #include <vcl/edit.hxx> +#include <vcl/lstbox.h> -class UserDrawEvent; +#define COMBOBOX_APPEND (SAL_MAX_INT32) +#define COMBOBOX_ENTRY_NOTFOUND (SAL_MAX_INT32) +#define COMBOBOX_MAX_ENTRIES (SAL_MAX_INT32 - 1) +class UserDrawEvent; class ImplListBoxFloatingWindow; class ImplListBox; class ImplBtn; diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index 8851302..1ad651b 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -119,7 +119,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index cc70eb1..8c50f3b 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -124,7 +124,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index b50cff4..3422d88 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -128,7 +128,6 @@ #include <vcl/button.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index a24a582..d06db46 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -87,7 +87,6 @@ #include <vcl/builderfactory.hxx> #include <vcl/button.hxx> #include <vcl/checksum.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/dialog.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index f8fbba2..016d86e 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -121,7 +121,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index b7c9b0d..7c2ee3d 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -104,7 +104,6 @@ #include <vcl/builderfactory.hxx> #include <vcl/button.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/decoview.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index ac6c377..e6406be 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -112,7 +112,6 @@ #include <vcl/button.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/dialog.hxx> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 916fcdf..e16dcb4 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -125,7 +125,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 9e89928..4d40b34 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -123,7 +123,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 08c3161b..5c0c9d7 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -120,7 +120,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/cmdevt.hxx> -#include <vcl/combobox.h> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 1bb0f2f..b72489e 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -133,7 +133,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/button.hxx> #include <vcl/canvastools.hxx> -#include <vcl/combobox.h> +#include <vcl/combobox.hxx> #include <vcl/configsettings.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
