diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-10-12 19:44:08 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-12-20 14:19:18 +0100 |
| commit | 41bbcc5b50a91fe45664b6242c2f5c83e8f948e1 (patch) | |
| tree | a495c6e3c9babf4fb54407d1cb3ac3fc304accd0 | |
| parent | 4c4b80a49e803adf9cecd6d079000fabe578ee4b (diff) | |
Drop ListBox include from ComboBox header
ComboBox just uses ListBox internally
Change-Id: Ieed279160db1c9918bd9f3e37102b59ea62f0581
| -rw-r--r-- | avmedia/source/framework/MediaControlBase.cxx | 6 | ||||
| -rw-r--r-- | include/avmedia/MediaControlBase.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/combobox.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 1 |
4 files changed, 9 insertions, 7 deletions
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index ff6eaeb3833f..522479d39652 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -25,7 +25,7 @@ #include <avmedia/mediaitem.hxx> #include <svtools/miscopt.hxx> #include <tools/time.hxx> -#include <vcl/toolbox.hxx> +#include <vcl/lstbox.hxx> #include "mediacontrol.hrc" #include "helpids.hrc" #include "mediamisc.hxx" @@ -270,4 +270,6 @@ Image MediaControlBase::GetImage( sal_Int32 nImageId) const return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) ); } -}
\ No newline at end of file +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/MediaControlBase.hxx b/include/avmedia/MediaControlBase.hxx index d1afa6aa71da..2a34f907bfac 100644 --- a/include/avmedia/MediaControlBase.hxx +++ b/include/avmedia/MediaControlBase.hxx @@ -22,6 +22,7 @@ #include <svx/svxdllapi.h> #include <vcl/edit.hxx> #include <vcl/toolbox.hxx> +#include <vcl/lstbox.hxx> #include <vcl/slider.hxx> #include <avmedia/mediaitem.hxx> #include <avmedia/mediawindow.hxx> @@ -81,4 +82,6 @@ private: }; } -#endif
\ No newline at end of file +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 6796975cc61a..afe4d61d072e 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -22,16 +22,12 @@ #include <vcl/dllapi.h> #include <vcl/edit.hxx> -#include <vcl/lstbox.hxx> #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; class VCL_DLLPUBLIC ComboBox : public Edit { diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 04e150dd0043..cdee3a4bb9d8 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -34,6 +34,7 @@ #include <vcl/unohelp.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/lstbox.hxx> #include "jobset.h" #include "unotools/localedatawrapper.hxx" |