[Libreoffice-commits] core.git: 2 commits - basctl/inc chart2/inc cui/inc editeng/inc framework/inc include/vcl reportdesign/inc sc/inc sd/inc svtools/inc svx/inc sw/inc vcl/inc vcl/source
Tor Lillqvist
tml at collabora.com
Fri Dec 11 23:29:00 PST 2015
basctl/inc/pch/precompiled_basctl.hxx | 1
chart2/inc/pch/precompiled_chartcontroller.hxx | 2
cui/inc/pch/precompiled_cui.hxx | 1
editeng/inc/pch/precompiled_editeng.hxx | 2
framework/inc/pch/precompiled_fwk.hxx | 2
include/vcl/combobox.hxx | 2
include/vcl/lstbox.h | 69 -------------------------
include/vcl/lstbox.hxx | 49 ++++++++++++++---
include/vcl/spin.h | 34 ------------
reportdesign/inc/pch/precompiled_rpt.hxx | 2
reportdesign/inc/pch/precompiled_rptui.hxx | 2
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 | 2
sw/inc/pch/precompiled_swui.hxx | 1
sw/inc/pch/precompiled_vbaswobj.hxx | 1
vcl/inc/ilstbox.hxx | 2
vcl/inc/pch/precompiled_vcl.hxx | 2
vcl/inc/spin.hxx | 34 ++++++++++++
vcl/source/control/combobox.cxx | 2
vcl/source/control/ilstbox.cxx | 1
vcl/source/control/spinbtn.cxx | 3 -
vcl/source/control/spinfld.cxx | 2
vcl/source/window/toolbox.cxx | 2
27 files changed, 89 insertions(+), 134 deletions(-)
New commits:
commit aacf715527f73b3c3eda65e43a74975bc653586f
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Dec 12 00:47:12 2015 +0200
<vcl/spin.h> can be private to vcl
Change-Id: If723dd72479ab8d072581e9ffbf7a1462c5fecda
diff --git a/include/vcl/spin.h b/vcl/inc/spin.hxx
similarity index 92%
rename from include/vcl/spin.h
rename to vcl/inc/spin.hxx
index e4ce463..9b5c080 100644
--- a/include/vcl/spin.h
+++ b/vcl/inc/spin.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_SPIN_H
-#define INCLUDED_VCL_SPIN_H
+#ifndef INCLUDED_VCL_INC_SPIN_HXX
+#define INCLUDED_VCL_INC_SPIN_HXX
#include <vcl/window.hxx>
@@ -29,6 +29,6 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow
bool bUpperIn, bool bLowerIn, bool bUpperEnabled = true, bool bLowerEnabled = true,
bool bHorz = false, bool bMirrorHorz = false);
-#endif // INCLUDED_VCL_SPIN_H
+#endif // INCLUDED_VCL_INC_SPIN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index f720420..3af10f0 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -18,11 +18,12 @@
*/
#include <tools/rcid.h>
-#include <vcl/spin.h>
#include <vcl/event.hxx>
#include <vcl/spin.hxx>
#include <vcl/settings.hxx>
+#include "spin.hxx"
+
void SpinButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
{
mbUpperIn = false;
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 5f86629..c95bf29 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -21,11 +21,11 @@
#include "vcl/event.hxx"
#include "vcl/decoview.hxx"
-#include "vcl/spin.h"
#include "vcl/spinfld.hxx"
#include "vcl/settings.hxx"
#include "controldata.hxx"
+#include "spin.hxx"
#include "svdata.hxx"
namespace {
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 671f320..3cd2cab 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -23,7 +23,6 @@
#include <vcl/accel.hxx>
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
-#include <vcl/spin.h>
#include <vcl/bitmap.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/gradient.hxx>
@@ -41,6 +40,7 @@
#include <window.h>
#include <toolbox.h>
#include <salframe.hxx>
+#include <spin.hxx>
#if defined WNT
#include <svsys.h>
#endif
commit d2df0adad4cad2098807803a21ced712ad21e918
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Dec 12 00:35:29 2015 +0200
No need for a separate <vcl/lstbox.h>
Change-Id: Ib8d0e3d240e693c678d575b4791f69ca760919ec
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 99b755d..6443d67 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -151,7 +151,6 @@
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index f5ea576..ebd385b 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -139,7 +139,7 @@
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 85bb59e..d305d47 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -149,7 +149,6 @@
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 3a4ca16..ef640fb 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -110,7 +110,7 @@
#include <vcl/impdel.hxx>
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metric.hxx>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index b2de591..530cc3a 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -134,7 +134,7 @@
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 42c012c..7bb281e 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -22,7 +22,7 @@
#include <vcl/dllapi.h>
#include <vcl/edit.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#define COMBOBOX_APPEND (SAL_MAX_INT32)
#define COMBOBOX_ENTRY_NOTFOUND (SAL_MAX_INT32)
diff --git a/include/vcl/lstbox.h b/include/vcl/lstbox.h
deleted file mode 100644
index 3551a62..0000000
--- a/include/vcl/lstbox.h
+++ /dev/null
@@ -1,69 +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_LSTBOX_H
-#define INCLUDED_VCL_LSTBOX_H
-
-#include <sal/types.h>
-#include <o3tl/typed_flags_set.hxx>
-
-#define LISTBOX_APPEND (SAL_MAX_INT32)
-#define LISTBOX_ENTRY_NOTFOUND (SAL_MAX_INT32)
-#define LISTBOX_ERROR (SAL_MAX_INT32)
-#define LISTBOX_MAX_ENTRIES (SAL_MAX_INT32 - 1)
-
-
-
-// the following defines can be used for the SetEntryFlags()
-// and GetEntryFlags() methods
-
-// !! Do not use these flags for user data as they are reserved !!
-// !! to change the internal behaviour of the ListBox implementation !!
-// !! for specific entries. !!
-
-enum class ListBoxEntryFlags
-{
- NONE = 0x0000,
-/** this flag disables a selection of an entry completely. It is not
- possible to select such entries either from the user interface
- nor from the ListBox methods. Cursor traveling is handled correctly.
- This flag can be used to add titles to a ListBox.
-*/
- DisableSelection = 0x0001,
-
-/** this flag can be used to make an entry multiline capable
- A normal entry is single line and will therefore be clipped
- at the right listbox border. Setting this flag enables
- word breaks for the entry text.
-*/
- MultiLine = 0x0002,
-
-/** this flags lets the item be drawn disabled (e.g. in grey text)
- usage only guaranteed with ListBoxEntryFlags::DisableSelection
-*/
- DrawDisabled = 0x0004,
-};
-namespace o3tl
-{
- template<> struct typed_flags<ListBoxEntryFlags> : is_typed_flags<ListBoxEntryFlags, 0x0007> {};
-}
-
-#endif // INCLUDED_VCL_LSTBOX_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index ec52b9d..e2050cf 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -20,9 +20,49 @@
#ifndef INCLUDED_VCL_LSTBOX_HXX
#define INCLUDED_VCL_LSTBOX_HXX
+#include <sal/types.h>
+#include <o3tl/typed_flags_set.hxx>
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
-#include <vcl/lstbox.h>
+
+#define LISTBOX_APPEND (SAL_MAX_INT32)
+#define LISTBOX_ENTRY_NOTFOUND (SAL_MAX_INT32)
+#define LISTBOX_ERROR (SAL_MAX_INT32)
+#define LISTBOX_MAX_ENTRIES (SAL_MAX_INT32 - 1)
+
+// the following defines can be used for the SetEntryFlags()
+// and GetEntryFlags() methods
+
+// !! Do not use these flags for user data as they are reserved !!
+// !! to change the internal behaviour of the ListBox implementation !!
+// !! for specific entries. !!
+
+enum class ListBoxEntryFlags
+{
+ NONE = 0x0000,
+/** this flag disables a selection of an entry completely. It is not
+ possible to select such entries either from the user interface
+ nor from the ListBox methods. Cursor traveling is handled correctly.
+ This flag can be used to add titles to a ListBox.
+*/
+ DisableSelection = 0x0001,
+
+/** this flag can be used to make an entry multiline capable
+ A normal entry is single line and will therefore be clipped
+ at the right listbox border. Setting this flag enables
+ word breaks for the entry text.
+*/
+ MultiLine = 0x0002,
+
+/** this flags lets the item be drawn disabled (e.g. in grey text)
+ usage only guaranteed with ListBoxEntryFlags::DisableSelection
+*/
+ DrawDisabled = 0x0004,
+};
+namespace o3tl
+{
+ template<> struct typed_flags<ListBoxEntryFlags> : is_typed_flags<ListBoxEntryFlags, 0x0007> {};
+}
class Image;
class ImplListBox;
@@ -31,9 +71,6 @@ class ImplBtn;
class ImplWin;
class ImplListBoxWindow;
-// - ListBox -
-
-
class VCL_DLLPUBLIC ListBox : public Control
{
private:
@@ -240,10 +277,6 @@ public:
static sal_Int32 NaturalSortCompare(const OUString &rA, const OUString &rB);
};
-
-// - MultiListBox -
-
-
class VCL_DLLPUBLIC MultiListBox : public ListBox
{
public:
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx
index a79b979..4b3fa9c 100644
--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.hxx
@@ -140,7 +140,7 @@
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 327d821..9e224ca 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -152,7 +152,7 @@
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 4da80fd..c899118 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -152,7 +152,6 @@
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index d06db46..cff3d76 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -104,7 +104,6 @@
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
#include <vcl/layout.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 62805f6..97ba8e2 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -148,7 +148,6 @@
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 7c2ee3d..1d59d0e 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -126,7 +126,6 @@
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index f45a2a4..ee16117 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -133,7 +133,6 @@
#include <vcl/impdel.hxx>
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 3125b96..46b41de 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -149,7 +149,7 @@
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 17a5b99..8d8b527 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -152,7 +152,6 @@
#include <vcl/keycodes.hxx>
#include <vcl/layout.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index 0137649..eb6e2e5 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -143,7 +143,6 @@
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 24eced3..3490165e 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -27,7 +27,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/button.hxx>
#include <vcl/floatwin.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#include <vcl/timer.hxx>
#include "vcl/quickselectionengine.hxx"
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index b72489e..b2908a1 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -162,7 +162,7 @@
#include <vcl/layout.hxx>
#include <vcl/lazydelete.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 94dc649..9327e35 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -27,7 +27,7 @@
#include <tools/debug.hxx>
#include <tools/rc.h>
#include <vcl/decoview.hxx>
-#include <vcl/lstbox.h>
+#include <vcl/lstbox.hxx>
#include <vcl/button.hxx>
#include <vcl/event.hxx>
#include <vcl/settings.hxx>
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 1cd6e52..9079284 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -24,7 +24,6 @@
#include <vcl/event.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/help.hxx>
-#include <vcl/lstbox.h>
#include <vcl/lstbox.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/i18nhelp.hxx>
More information about the Libreoffice-commits
mailing list