vcl/inc/saltimer.hxx | 2 -- vcl/inc/salvd.hxx | 3 --- vcl/inc/salwtype.hxx | 23 ----------------------- vcl/inc/sft.hxx | 9 ++------- vcl/inc/svdata.hxx | 32 ++++++++------------------------ vcl/inc/textlayout.hxx | 4 ---- vcl/inc/textlineinfo.hxx | 3 --- vcl/inc/textrender.hxx | 7 +------ vcl/inc/toolbox.h | 5 ----- vcl/inc/vcleventlisteners.hxx | 10 ---------- vcl/inc/wall2.hxx | 4 +--- vcl/inc/window.h | 18 ------------------ 12 files changed, 12 insertions(+), 108 deletions(-)
New commits: commit f8151c9ced1a2fdce6273fbbce2656bea25cf754 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 19:17:13 2016 +1100 vcl: remove extraneous included headers in window.h Change-Id: I9fce8a5300ba8e2edc4641682063a94b071533e1 diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 3fed5b3..b94ca6e 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -21,27 +21,9 @@ #define INCLUDED_VCL_INC_WINDOW_H #include <sal/config.h> - -#include <com/sun/star/uno/Reference.hxx> -#include <cppuhelper/weakref.hxx> -#include <list> -#include <tools/wintypes.hxx> #include <tools/fract.hxx> -#include <vcl/cursor.hxx> -#include <vcl/inputctx.hxx> -#include <vcl/outdev.hxx> -#include <vcl/pointr.hxx> -#include <vcl/salnativewidgets.hxx> -#include <vcl/timer.hxx> #include <vcl/idle.hxx> -#include <vcl/vclevent.hxx> -#include <vcl/vclptr.hxx> #include <vcl/rendersettings.hxx> -#include "vcleventlisteners.hxx" -#include "impfontcache.hxx" - -#include <vector> -#include <set> struct ImplDelData; commit 0c227ff64c7f3ec02102b93ca432b5c8e501c2ee Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 19:06:11 2016 +1100 vcl: cleanup tabs for wall2.hxx Change-Id: I9110a4b8739f5d641913e8e8d35972e4ca1fab67 diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx index 756d9a8..60cbd68 100644 --- a/vcl/inc/wall2.hxx +++ b/vcl/inc/wall2.hxx @@ -30,7 +30,7 @@ private: Gradient* mpGradient; Rectangle* mpRect; WallpaperStyle meStyle; - sal_uLong mnRefCount; + sal_uLong mnRefCount; BitmapEx* mpCache; friend SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ); commit 37bdc60b11cf398e80af9b71d31bd1443b06e133 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 19:05:49 2016 +1100 vcl: remove extraneous included headers in wall2.hxx Change-Id: I9ad7192ddedfe164638ad5da21c5e27242d94a11 diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx index 724a651..756d9a8 100644 --- a/vcl/inc/wall2.hxx +++ b/vcl/inc/wall2.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_VCL_INC_WALL2_HXX #define INCLUDED_VCL_INC_WALL2_HXX -#include <vcl/wall.hxx> - class ImplWallpaper { friend class Wallpaper; commit ce50faa9fae4ec78c4a6860a72c623545dfadd1d Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 19:01:24 2016 +1100 vcl: remove extraneous included headers in vcleventlisteners.hxx Change-Id: I8fc7f751281520444fc4ca36dcb90fd62d4d65cb diff --git a/vcl/inc/vcleventlisteners.hxx b/vcl/inc/vcleventlisteners.hxx index ec97c55..d88e816 100644 --- a/vcl/inc/vcleventlisteners.hxx +++ b/vcl/inc/vcleventlisteners.hxx @@ -20,16 +20,6 @@ #ifndef INCLUDED_VCL_INC_VCLEVENTLISTENERS_HXX #define INCLUDED_VCL_INC_VCLEVENTLISTENERS_HXX -#include <tools/link.hxx> -#include <vcl/dllapi.h> -#include <vcl/impdel.hxx> -#include <vcl/vclptr.hxx> -#include <vcl/window.hxx> - -#include <com/sun/star/uno/Reference.hxx> - -#include <vector> - class VCL_DLLPUBLIC VclEventListeners { public: commit 2fc1fbd4a33fcf0f1a3af8f9c64015d272958b61 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 18:55:10 2016 +1100 vcl: remove extraneous included headers in toolbox.h Change-Id: I40af01bf7c2e8dd8699d88fa52327d460827e211 diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index e8c7a1f..9be81af 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -20,14 +20,9 @@ #ifndef INCLUDED_VCL_INC_TOOLBOX_H #define INCLUDED_VCL_INC_TOOLBOX_H -#include <rtl/ustring.hxx> -#include <tools/gen.hxx> -#include <vcl/image.hxx> #include <vcl/toolbox.hxx> #include <vcl/controllayout.hxx> -#include <vector> - #define TB_DROPDOWNARROWWIDTH 11 #define TB_MENUBUTTON_SIZE 12 commit 05ca2d70c6e16d0e506688d9934b6c9f2ee39147 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 18:51:10 2016 +1100 vcl: remove extraneous included headers in textrender.hxx Change-Id: I865c48822c8e95c427318a4a26fb86a01b0df2b9 diff --git a/vcl/inc/textlineinfo.hxx b/vcl/inc/textlineinfo.hxx index 807cdd6..a14d774 100644 --- a/vcl/inc/textlineinfo.hxx +++ b/vcl/inc/textlineinfo.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_VCL_INC_TEXTLINEINFO_HXX #define INCLUDED_VCL_INC_TEXTLINEINFO_HXX -#include <vcl/dllapi.h> -#include <sal/types.h> - class ImplTextLineInfo { private: diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx index edd60fb..483eff0 100644 --- a/vcl/inc/textrender.hxx +++ b/vcl/inc/textrender.hxx @@ -20,13 +20,8 @@ #ifndef INCLUDED_VCL_INC_UNX_CAIROFONTIMPL_HXX #define INCLUDED_VCL_INC_UNX_CAIROFONTIMPL_HXX -#include <sal/types.h> -#include <vcl/salgtype.hxx> -#include <vcl/vclenum.hxx> -#include <vcl/metric.hxx> #include "salgdi.hxx" -#include "salglyphid.hxx" -#include "fontsubset.hxx" + #include <config_cairo_canvas.h> class ImplLayoutArgs; commit aa5fe86a1149b5a33a3c203e92605da6197ea8ce Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 18:41:47 2016 +1100 vcl: remove extraneous included headers in textlayout.hxx Change-Id: I5d85d0be2e43cbd5f9f623ef4f627868f8bfd322 diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index bb38a5c..a5c86a9 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -20,10 +20,6 @@ #ifndef INCLUDED_VCL_INC_TEXTLAYOUT_HXX #define INCLUDED_VCL_INC_TEXTLAYOUT_HXX -#include <memory> -#include <rtl/ustring.hxx> -#include <vcl/outdev.hxx> - class Control; namespace vcl commit 0164c401b8aec6a06080931f587acbc528791ca7 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 18:31:59 2016 +1100 vcl: remove unnecessary includes in svdata.hxx Change-Id: I28dd9058f37611d01fbb1d4e8b9b99145c4d1750 diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 8c616f7..0856d32 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -20,37 +20,21 @@ #ifndef INCLUDED_VCL_INC_SVDATA_HXX #define INCLUDED_VCL_INC_SVDATA_HXX -#include "sal/types.h" - -#include <osl/thread.hxx> -#include <rtl/ref.hxx> -#include <rtl/ustring.hxx> -#include "tools/link.hxx" -#include "tools/fldunit.hxx" -#include "tools/color.hxx" -#include "tools/debug.hxx" -#include "tools/solar.h" -#include "vcl/bitmapex.hxx" -#include "vcl/idle.hxx" -#include "vcl/dllapi.h" -#include "vcl/keycod.hxx" -#include "vcl/svapp.hxx" -#include "vcl/vclevent.hxx" -#include "vcleventlisteners.hxx" +#include <config_version.h> -#include "impfontcache.hxx" +#include <tools/fldunit.hxx> +#include <unotools/options.hxx> +#include <vcl/idle.hxx> +#include <vcl/svapp.hxx> -#include "unotools/options.hxx" +#include <com/sun/star/lang/XComponent.hpp> +#include "vcleventlisteners.hxx" +#include "impfontcache.hxx" #include "xconnection.hxx" -#include "com/sun/star/lang/XComponent.hpp" -#include "com/sun/star/uno/Reference.hxx" - #include <unordered_map> -#include <config_version.h> - struct ImplTimerData; struct ImplIdleData; struct ImplConfigData; commit f659bd1ac219b73d7b14f29552fca5678bce1fa8 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 18:10:36 2016 +1100 vcl: remove unnecessary includes in sft.hxx Change-Id: I6574a74e2c5c6d8348a2f25a85462e32a2220f87 diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index a891bb8..fc0e69f 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -46,13 +46,8 @@ #include <unistd.h> #endif -#include <sal/types.h> - -#include "vcl/dllapi.h" - -#include <vector> - -#include "vcl/fontcapabilities.hxx" +#include <vcl/dllapi.h> +#include <vcl/fontcapabilities.hxx> namespace vcl { commit 4627e6a624a87723e3655b2fa48c0d1f1e7732b0 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 18:02:53 2016 +1100 vcl: remove comment cruft in salwtype.hxx Change-Id: Ib3f02b311a81fd3009f58b7bf9acc3ed1fd0cd2e diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index c98994f..155d2f9 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -32,8 +32,6 @@ namespace vcl { class Window; } class FontSelectPattern; enum class InputContextFlags; -// - SalEvent - - #define SALEVENT_MOUSEMOVE ((sal_uInt16)1) #define SALEVENT_MOUSELEAVE ((sal_uInt16)2) #define SALEVENT_MOUSEBUTTONDOWN ((sal_uInt16)3) @@ -123,7 +121,6 @@ struct SalKeyModEvent sal_uInt16 mnModKeyCode; // extended Modifier (MODKEY_LEFT,MODKEY_RIGHT,MODKEY_PRESS,MODKEY_RELEASE) }; -// PAINT struct SalPaintEvent { long mnBoundX; // BoundRect - X @@ -139,10 +136,6 @@ struct SalPaintEvent {} }; -// USEREVENT -// pEvent == pData - -// WHEELMOUSE #define SAL_WHEELMOUSE_EVENT_PAGESCROLL ((sal_uLong)0xFFFFFFFF) struct SalWheelMouseEvent { @@ -161,7 +154,6 @@ struct SalWheelMouseEvent {} }; -// EXTTEXTINPUT struct SalExtTextInputEvent { sal_uInt64 mnTime; // Time in ms, when event is created @@ -172,7 +164,6 @@ struct SalExtTextInputEvent bool mbOnlyCursor; // true: Only Cursor-Position has been changed }; -// EXTTEXTINPUTPOS struct SalExtTextInputPosEvent { long mnX; // Cursor-X-Position to upper left corner of frame @@ -192,13 +183,11 @@ struct SalExtTextInputPosEvent } }; -// INPUTCONTEXTCHANGE struct SalInputContextChangeEvent { LanguageType meLanguage; // new language }; -// SURROUNDINGTEXTREQUEST struct SalSurroundingTextRequestEvent { OUString maText; // Text @@ -206,14 +195,12 @@ struct SalSurroundingTextRequestEvent sal_uLong mnEnd; // The end index of selected range }; -// SURROUNDINGTEXTSELECTIONCHANGE struct SalSurroundingTextSelectionChangeEvent { sal_uLong mnStart; // The beginning index of selected range sal_uLong mnEnd; // The end index of selected range }; -// QUERYCHARPOSITION struct SalQueryCharPositionEvent { bool mbValid; // The data is valid or not. @@ -225,24 +212,16 @@ struct SalQueryCharPositionEvent long mnCursorBoundHeight; // The cursor bounds corresponding to the character specified by mnCharPos - Height }; -// - SalFrame-Types - - typedef bool (*SALFRAMEPROC)( vcl::Window* pInst, sal_uInt16 nEvent, const void* pEvent ); -// - SalObject-Events - - #define SALOBJ_EVENT_GETFOCUS ((sal_uInt16)1) #define SALOBJ_EVENT_LOSEFOCUS ((sal_uInt16)2) #define SALOBJ_EVENT_TOTOP ((sal_uInt16)3) #define SALOBJ_EVENT_COUNT ((sal_uInt16)4) -// - SalObject-Types - - typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject, sal_uInt16 nEvent, const void* pEvent ); -// - SalFrameState - - struct SalFrameState { sal_uLong mnMask; @@ -257,8 +236,6 @@ struct SalFrameState sal_uLong mnState; }; -// - SalInputContext - - struct SalInputContext { FontSelectPattern* mpFont; commit 9a4b74f095d94bad08ba011596b9a3532a75f605 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 17:59:02 2016 +1100 vcl: remove unnecessary includes in salvd.hxx Change-Id: Icf437e3103994e16e128aaa7c0705715099044e5 diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx index 95b4068..53c54ff 100644 --- a/vcl/inc/salvd.hxx +++ b/vcl/inc/salvd.hxx @@ -20,11 +20,8 @@ #ifndef INCLUDED_VCL_INC_SALVD_HXX #define INCLUDED_VCL_INC_SALVD_HXX -#include <vcl/dllapi.h> #include <salgeom.hxx> -#include <memory> - class SalGraphics; /// A non-visible drawable/buffer (e.g. an X11 Pixmap). commit b29d558a0abb2b6e0bbe6d91f67f6ce0b67d1b22 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Wed Jan 27 17:55:06 2016 +1100 vcl: remove unnecessary includes in saltimer.hxx Change-Id: I526c6cac092ce9a9937c9a136f295cc647d04513 diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx index c791a54..ce7a923 100644 --- a/vcl/inc/saltimer.hxx +++ b/vcl/inc/saltimer.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_VCL_INC_SALTIMER_HXX #define INCLUDED_VCL_INC_SALTIMER_HXX -#include <tools/solar.h> -#include <vcl/dllapi.h> #include <salwtype.hxx> /* _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits