[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
Chris Sherlock
chris.sherlock79 at gmail.com
Fri Feb 5 02:20:41 UTC 2016
include/vcl/animate.hxx | 12 -----
vcl/inc/impanmvw.hxx | 96 ++++++++++++++++++++++++++++++++++++++++++++
vcl/source/gdi/animate.cxx | 3 -
vcl/source/gdi/impanmvw.cxx | 3 -
vcl/source/gdi/impanmvw.hxx | 83 --------------------------------------
5 files changed, 100 insertions(+), 97 deletions(-)
New commits:
commit 5e31c9d9e42da8d8776621b2f80dfe9e04ca0871
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Fri Feb 5 13:17:54 2016 +1100
vcl: move AInfo into private header
Change-Id: If6bb832cbf64d12b4ec3a860010fd99340b14ca5
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 9938240..9b3856a 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -91,18 +91,6 @@ struct VCL_DLLPUBLIC AnimationBitmap
BitmapChecksum GetChecksum() const;
};
-struct AInfo
-{
- Point aStartOrg;
- Size aStartSize;
- VclPtr<OutputDevice> pOutDev;
- void* pViewData;
- long nExtraData;
- bool bPause;
-
- AInfo();
-};
-
class ImplAnimView;
class VCL_DLLPUBLIC Animation
diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/inc/impanmvw.hxx
similarity index 92%
rename from vcl/source/gdi/impanmvw.hxx
rename to vcl/inc/impanmvw.hxx
index d80edc9..4e4414a 100644
--- a/vcl/source/gdi/impanmvw.hxx
+++ b/vcl/inc/impanmvw.hxx
@@ -27,6 +27,19 @@ class OutputDevice;
class VirtualDevice;
struct AnimationBitmap;
+struct AInfo
+{
+ Point aStartOrg;
+ Size aStartSize;
+ VclPtr<OutputDevice> pOutDev;
+ void* pViewData;
+ long nExtraData;
+ bool bPause;
+
+ AInfo();
+};
+
+
class ImplAnimView
{
private:
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index d6d9ea1..6f1779e 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -23,9 +23,10 @@
#include <rtl/crc.h>
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
-#include <impanmvw.hxx>
#include <vcl/dibtools.hxx>
+#include "impanmvw.hxx"
+
#define MIN_TIMEOUT 2L
#define INC_TIMEOUT 0L
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index f368132..ce0947b 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -17,12 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "impanmvw.hxx"
#include <window.h>
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
#include <tools/helpers.hxx>
+#include "impanmvw.hxx"
+
ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut,
const Point& rPt, const Size& rSz,
sal_uLong nExtraData,
More information about the Libreoffice-commits
mailing list