include/vcl/cursor.hxx | 32 ++++-------
include/vcl/cvtsvm.hxx | 102 ------------------------------------
svx/inc/pch/precompiled_svxcore.hxx | 1
svx/source/svdraw/svdobj.cxx | 1
vcl/inc/cvtsvm.hxx | 102 ++++++++++++++++++++++++++++++++++++
vcl/source/gdi/cvtsvm.cxx | 3 -
vcl/source/gdi/gdimtf.cxx | 2
7 files changed, 117 insertions(+), 126 deletions(-)
New commits:
commit 7d32da410cb413f540f2127db4e6dc2807506510
Author: Tor Lillqvist <t...@collabora.com>
Date: Sat Oct 26 16:54:55 2013 +0300
Seems that <vcl/cvtsvm.hxx> is private to VCL, so move it there
Change-Id: I3fd1ac8aaea2e79efcd9e2d4b12347a387d0d28b
diff --git a/svx/inc/pch/precompiled_svxcore.hxx
b/svx/inc/pch/precompiled_svxcore.hxx
index fcb7519..85b7306f 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -582,7 +582,6 @@
#include <vcl/ctrl.hxx>
#include <vcl/cursor.hxx>
#include <vcl/cvtgrf.hxx>
-#include <vcl/cvtsvm.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/fltcall.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index bfd1d4b..b495c5b 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -44,7 +44,6 @@
#include <tools/diagnose_ex.h>
#include <tools/helpers.hxx>
#include <tools/line.hxx>
-#include <vcl/cvtsvm.hxx>
#include <vcl/graphictools.hxx>
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
diff --git a/include/vcl/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx
similarity index 100%
rename from include/vcl/cvtsvm.hxx
rename to vcl/inc/cvtsvm.hxx
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 8835e44..630cfcf 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -27,9 +27,10 @@
#include <vcl/virdev.hxx>
#include <vcl/graph.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/cvtsvm.hxx>
#include <rtl/strbuf.hxx>
+#include <cvtsvm.hxx>
+
// Inlines
void ImplReadRect( SvStream& rIStm, Rectangle& rRect )
{
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 9301a19..820f2a0 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -24,7 +24,6 @@
#include <vcl/salbtype.hxx>
#include <vcl/outdev.hxx>
#include <vcl/window.hxx>
-#include <vcl/cvtsvm.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/gdimtf.hxx>
@@ -32,6 +31,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <vcl/canvastools.hxx>
+#include <cvtsvm.hxx>
#include <salbmp.hxx>
#include <salinst.hxx>
#include <svdata.hxx>
commit 65ad73b0da8a0df0ac7ae6dd17cbb38be1f2afb2
Author: Tor Lillqvist <t...@collabora.com>
Date: Sat Oct 26 16:38:41 2013 +0300
Minor cleanup and comment (un-)translation
Drop some ASCII graphics. Fix columnar alignment to match surrounding
code. Bin comments that translate field names that are in understandable
English (like maSize) to German. Translate one (actually informative) German
comment to English.
Change-Id: I1e167e3d2f9da4b453140b47c0a8629246e1d932
diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx
index 95da54d..fb82f05 100644
--- a/include/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
@@ -25,36 +25,28 @@
#include <tools/solar.h>
#include <vcl/dllapi.h>
-class AutoTimer;
struct ImplCursorData;
class Window;
-// -----------------
-// - Cursor-Styles -
-// -----------------
-
+// Cursor styles
#define CURSOR_SHADOW ((sal_uInt16)0x0001)
#define CURSOR_DIRECTION_NONE ((unsigned char)0x00)
#define CURSOR_DIRECTION_LTR ((unsigned char)0x01)
#define CURSOR_DIRECTION_RTL ((unsigned char)0x02)
-// ----------
-// - Cursor -
-// ----------
-
class VCL_DLLPUBLIC Cursor
{
private:
- ImplCursorData* mpData; // Interne Daten
- Window* mpWindow; // Window (only for shadow cursor)
- long mnSlant; // Schraegstellung
- long mnOffsetY; // Offset fuer Rotation
- Size maSize; // Groesse
- Point maPos; // Position
- short mnOrientation; // Rotation
- sal_uInt16 mnStyle; // Style
- bool mbVisible; // Ist Cursor sichtbar
- unsigned char mnDirection; // indicates direction
+ ImplCursorData* mpData;
+ Window* mpWindow; // only for shadow cursor
+ long mnSlant;
+ long mnOffsetY; // Offset for rotation
+ Size maSize;
+ Point maPos;
+ short mnOrientation;
+ sal_uInt16 mnStyle;
+ bool mbVisible;
+ unsigned char mnDirection;
public:
SAL_DLLPRIVATE void ImplDraw();
@@ -72,7 +64,7 @@ public:
~Cursor();
void SetStyle( sal_uInt16 nStyle );
- sal_uInt16 GetStyle() const { return mnStyle; }
+ sal_uInt16 GetStyle() const { return mnStyle; }
void Show();
void Hide();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
