include/svx/sdr/event/eventhandler.hxx | 132 ------------------ svx/source/inc/eventhandler.hxx | 132 ++++++++++++++++++ svx/source/sdr/contact/objectcontact.cxx | 5 svx/source/sdr/contact/objectcontactofpageview.cxx | 5 svx/source/sdr/contact/viewcontactofgraphic.cxx | 3 svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 4 svx/source/sdr/event/eventhandler.cxx | 4 7 files changed, 137 insertions(+), 148 deletions(-)
New commits: commit 7eef30b03e6c854edc6e3c23ea2c73910291fcdf Author: Tor Lillqvist <t...@collabora.com> Date: Mon Mar 31 16:13:14 2014 +0300 No need for <svx/sdr/event/eventhandler.hxx> to be public Only used inside svx so move there. Change-Id: I91a4b1964edab589ec8542255a2ca611f0d903a2 diff --git a/include/svx/sdr/event/eventhandler.hxx b/svx/source/inc/eventhandler.hxx similarity index 100% rename from include/svx/sdr/event/eventhandler.hxx rename to svx/source/inc/eventhandler.hxx diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 1d3dca6..259aea7 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -22,16 +22,13 @@ #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/svdpage.hxx> #include <svx/sdr/contact/viewcontact.hxx> -#include <svx/sdr/event/eventhandler.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/animation/objectanimator.hxx> - +#include "eventhandler.hxx" using namespace com::sun::star; - - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index ff31f90..76f7d05 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -26,7 +26,6 @@ #include <svx/svdview.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/animation/objectanimator.hxx> -#include <svx/sdr/event/eventhandler.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -35,12 +34,10 @@ #include <drawinglayer/processor2d/processor2dtools.hxx> #include <svx/unoapi.hxx> - +#include "eventhandler.hxx" using namespace com::sun::star; - - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index a5d6572..4ec7825 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -27,7 +27,6 @@ #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/contact/objectcontact.hxx> -#include <svx/sdr/event/eventhandler.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/primitive2d/sdrgrafprimitive2d.hxx> #include "svx/svdstr.hrc" @@ -46,7 +45,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - +#include "eventhandler.hxx" namespace sdr { diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index 4b22432..037e8c5 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -17,16 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/sdr/contact/viewobjectcontactofgraphic.hxx> #include <svx/sdr/contact/viewcontactofgraphic.hxx> -#include <svx/sdr/event/eventhandler.hxx> #include <svx/svdograf.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> - +#include "eventhandler.hxx" namespace sdr { diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index 0c31a9d..cf9b2f5 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -17,15 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/event/eventhandler.hxx> +#include "eventhandler.hxx" // for SOLARIS compiler include of algorithm part of _STL is necessary to // get access to basic algos like ::std::find #include <algorithm> #include <tools/debug.hxx> - - namespace sdr { namespace event _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits