No need for a separate <vcl/combobox.h>

Change-Id: Iebf7b44e78fc28c20bdf0cbea84dbfd730b04016

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>

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>

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>

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>

include/vcl/combobox.h

-/* -*- 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: */

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;

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>