vcl/Library_vcl.mk | 2 vcl/inc/dndlcon.hxx | 112 ------ vcl/inc/dndlistenercontainer.hxx | 112 ++++++ vcl/inc/pch/precompiled_vcl.hxx | 12 vcl/source/window/accessibility.cxx | 2 vcl/source/window/dndeventdispatcher.cxx | 2 vcl/source/window/dndlcon.cxx | 500 ----------------------------- vcl/source/window/dndlistenercontainer.cxx | 500 +++++++++++++++++++++++++++++ vcl/source/window/mouse.cxx | 3 vcl/source/window/window.cxx | 2 vcl/source/window/winproc.cxx | 2 11 files changed, 623 insertions(+), 626 deletions(-)
New commits: commit 4c8e866a6ea3cbafd2a8c89538f53a76eeb81d55 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Mon Jan 25 19:34:52 2016 +1100 git: rename dndlcon.{hxx|cxx} to dndlistenercontainer.{hxx|cxx} Change-Id: I549a17f68971f68313c6665fb4b04a88f7084ad6 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 1a5dc2f..e53ce10 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -161,7 +161,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/window/dialog \ vcl/source/window/dlgctrl \ vcl/source/window/dndeventdispatcher \ - vcl/source/window/dndlcon \ + vcl/source/window/dndlistenercontainer \ vcl/source/window/dockingarea \ vcl/source/window/dockmgr \ vcl/source/window/dockwin \ diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlistenercontainer.hxx similarity index 100% rename from vcl/inc/dndlcon.hxx rename to vcl/inc/dndlistenercontainer.hxx diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 13c88b1..5b1302c 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2016-01-10 11:16:04 using: + Generated on 2016-01-25 19:34:08 using: ./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -36,7 +36,6 @@ #include <functional> #include <iomanip> #include <limits.h> -#include <map> #include <math.h> #include <memory> #include <new> @@ -44,19 +43,18 @@ #include <outdev.h> #include <set> #include <sstream> -#include <stack> #include <stddef.h> #include <stdlib.h> #include <string.h> #include <string> #include <type_traits> -#include <typeinfo> #include <unordered_map> #include <utility> #include <vector> #include <window.h> #include <boost/dynamic_bitset.hpp> #include <boost/functional/hash.hpp> +#include <boost/intrusive_ptr.hpp> #include <boost/math/special_functions/sinc.hpp> #include <boost/multi_array.hpp> #include <boost/optional.hpp> @@ -72,7 +70,6 @@ #include <osl/file.hxx> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> -#include <osl/module.h> #include <osl/module.hxx> #include <osl/mutex.hxx> #include <osl/pipe.h> @@ -181,6 +178,7 @@ #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> #include <vcl/tabctrl.hxx> +#include <vcl/tabpage.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/timer.hxx> #include <vcl/toolbox.hxx> @@ -219,7 +217,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> @@ -260,7 +257,7 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <cppuhelper/weakref.hxx> -#include <dndlcon.hxx> +#include <dndlistenercontainer.hxx> #include <fontattributes.hxx> #include <fontinstance.hxx> #include <helpwin.hxx> @@ -292,7 +289,6 @@ #include <tools/poly.hxx> #include <tools/rc.h> #include <tools/resid.hxx> -#include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> #include <tools/time.hxx> diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index a74fc30..f31a6f9 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -71,7 +71,7 @@ #include "brdwin.hxx" #include "helpwin.hxx" #include "sallayout.hxx" -#include "dndlcon.hxx" +#include "dndlistenercontainer.hxx" #include "dndeventdispatcher.hxx" #include "com/sun/star/accessibility/XAccessible.hpp" diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx index 04a8ea9a..165ad27 100644 --- a/vcl/source/window/dndeventdispatcher.cxx +++ b/vcl/source/window/dndeventdispatcher.cxx @@ -18,7 +18,7 @@ */ #include "dndeventdispatcher.hxx" -#include <dndlcon.hxx> +#include "dndlistenercontainer.hxx" #include <window.h> #include <svdata.hxx> diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlistenercontainer.cxx similarity index 99% rename from vcl/source/window/dndlcon.cxx rename to vcl/source/window/dndlistenercontainer.cxx index 24503c4..76ef78d 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlistenercontainer.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <dndlcon.hxx> +#include "dndlistenercontainer.hxx" using namespace ::cppu; using namespace ::com::sun::star::uno; diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 5c9fca3..3c94759 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -37,7 +37,8 @@ #include <salobj.hxx> #include <salgdi.hxx> #include <salframe.hxx> -#include <dndlcon.hxx> + +#include "dndlistenercontainer.hxx" #include "dndeventdispatcher.hxx" #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index be6a3e4..460d8af 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -55,7 +55,7 @@ #include <outdev.h> #include <brdwin.hxx> #include <helpwin.hxx> -#include <dndlcon.hxx> +#include "dndlistenercontainer.hxx" #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/XDisplayConnection.hpp> diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 58211da..9e9a7fc 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -48,7 +48,7 @@ #include <helpwin.hxx> #include <brdwin.hxx> #include <salgdi.hxx> -#include <dndlcon.hxx> +#include "dndlistenercontainer.hxx" #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> #include <com/sun/star/awt/MouseEvent.hpp> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits