[Libreoffice-commits] core.git: 9 commits - vcl/inc

Chris Sherlock chris.sherlock79 at gmail.com
Tue Jan 26 19:30:22 PST 2016 

 vcl/inc/salgdi.hxx     |    2 --
 vcl/inc/salinst.hxx    |   19 ++++++++-----------
 vcl/inc/sallayout.hxx  |    9 ++-------
 vcl/inc/salmenu.hxx    |    3 ---
 vcl/inc/salobj.hxx     |    7 ++-----
 vcl/inc/salprn.hxx     |    6 ------
 vcl/inc/salsession.hxx |    2 +-
 7 files changed, 13 insertions(+), 35 deletions(-)

New commits:
commit a3a12a84052ddba5ca0f55a5ed86cd84ecca35d9
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 14:26:25 2016 +1100

    vcl: cleanup include in salsession.hxx
    
    Change-Id: I7438c5a7dd19f9934c15677f0604e52806bd0052

diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx
index 6748117..46b4b7f 100644
--- a/vcl/inc/salsession.hxx
+++ b/vcl/inc/salsession.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_SALSESSION_HXX
 #define INCLUDED_VCL_INC_SALSESSION_HXX
 
-#include "vcl/dllapi.h"
+#include <vcl/dllapi.h>
 
 enum SalSessionEventType
 {
commit 02dedff8fa5843e88a1ec7bf8144b7345d3ad5e0
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 14:24:56 2016 +1100

    vcl: remove comment cruft from salprn.hxx
    
    Change-Id: I4019a8844d6fd6d9bf2c4f9bc8ded6739c1c4017

diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index d4d1a0e..e83de98 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -20,16 +20,10 @@
 #ifndef INCLUDED_VCL_INC_SALPRN_HXX
 #define INCLUDED_VCL_INC_SALPRN_HXX
 
-#include <rtl/ustring.hxx>
-
-#include <tools/solar.h>
-#include <vcl/dllapi.h>
 #include <vcl/prntypes.hxx>
 
 #include "salptype.hxx"
 
-#include <vector>
-
 class SalGraphics;
 class SalFrame;
 struct ImplJobSetup;
commit 35ba90cf20024b35b2ed19615f529fcb42c049db
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 14:20:46 2016 +1100

    vcl: remove comment cruft from salobj.hxx
    
    Change-Id: I1f18903ef80de23be6529e9807721463fd6a0e63

diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 723b905..ce35234 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -26,8 +26,6 @@
 
 struct SystemEnvData;
 
-// SalObject types
-
 #define SAL_OBJECT_CLIP_INCLUDERECTS            ((sal_uInt16)0x0001)
 #define SAL_OBJECT_CLIP_EXCLUDERECTS            ((sal_uInt16)0x0002)
 #define SAL_OBJECT_CLIP_ABSOLUTE                ((sal_uInt16)0x0004)
commit 10899052a356893e3b43e31e4cb9d192113b1001
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 14:20:26 2016 +1100

    vcl: remove unnecessary included headers in salobj.hxx
    
    Change-Id: I7a38f9af578b5582f6d315e4add226ce667b43f9

diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 2a268a2..723b905 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -20,10 +20,9 @@
 #ifndef INCLUDED_VCL_INC_SALOBJ_HXX
 #define INCLUDED_VCL_INC_SALOBJ_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <vcl/salgtype.hxx>
-#include <salwtype.hxx>
+
+#include "salwtype.hxx"
 
 struct SystemEnvData;
 
commit b6f50702797ae98835cae3ed09156c6a78ff8992
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 14:17:57 2016 +1100

    vcl: remove unnecessary included headers in salmenu.hxx
    
    Change-Id: I977a07b35fb66f94e7e34b58a0d30b20eac84f6b

diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 287e19e..fba86a1 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -20,10 +20,7 @@
 #ifndef INCLUDED_VCL_INC_SALMENU_HXX
 #define INCLUDED_VCL_INC_SALMENU_HXX
 
-#include <tools/solar.h>
-#include "vcl/dllapi.h"
 #include <vcl/menu.hxx>
-#include <vcl/keycod.hxx>
 #include <vcl/image.hxx>
 
 struct SystemMenuData;
commit 8d775f439c165bf58cad203a2b854bb92c3b4034
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 14:14:50 2016 +1100

    vcl: _TOOLS_LANG_HXX is never, ever defined
    
    Change-Id: Iccf31bb1ad04a338fd631fba8ce3747b712b00bc

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 46b08fa..8c750ae 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -31,9 +31,7 @@
 
 #include "salglyphid.hxx"
 
-#ifndef _TOOLS_LANG_HXX
 typedef unsigned short LanguageType;
-#endif
 
 #define MAX_FALLBACK 16
 
commit cf85da9a9acdf41e3f5324c4bd342e9b31cf97d8
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 14:03:56 2016 +1100

    vcl: remove unnecessary header includes from sallayout.hxx
    
    Change-Id: Ie7ac5416f2776e716ba609aac8e286a3c3975a1c

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index d7ac946..46b08fa 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -20,24 +20,21 @@
 #ifndef INCLUDED_VCL_INC_SALLAYOUT_HXX
 #define INCLUDED_VCL_INC_SALLAYOUT_HXX
 
-#include <iostream>
 #include <list>
-#include <vector>
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/gen.hxx>
-#include <sal/log.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/vclenum.hxx> // for typedef sal_UCS4
 #include <vcl/devicecoordinate.hxx>
 
+#include "salglyphid.hxx"
+
 #ifndef _TOOLS_LANG_HXX
 typedef unsigned short LanguageType;
 #endif
 
-#include "salglyphid.hxx"
-
 #define MAX_FALLBACK 16
 
 class SalGraphics;
commit 3f9088bae26c726e0632e626b7f8c3ae3ff457ee
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 13:26:50 2016 +1100

    vcl: remove unnecessary header includes from salinst.hxx
    
    Change-Id: Ie9163cf337b7fa27b17ebaac382938736e3837b3

diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 5210945..6502679 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -20,20 +20,17 @@
 #ifndef INCLUDED_VCL_INC_SALINST_HXX
 #define INCLUDED_VCL_INC_SALINST_HXX
 
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/ui/dialogs/XFilePicker2.hpp"
-#include "com/sun/star/ui/dialogs/XFolderPicker2.hpp"
-
-#include "tools/solar.h"
-#include "displayconnectiondispatch.hxx"
-#include "vcl/dllapi.h"
-#include "vcl/salgtype.hxx"
 #include <sal/types.h>
+#include <rtl/ref.hxx>
+#include <tools/solar.h>
+#include <vcl/dllapi.h>
+#include <vcl/salgtype.hxx>
 
-#include "rtl/ref.hxx"
+#include "displayconnectiondispatch.hxx"
 
-#include <list>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 
 namespace comphelper { class SolarMutex; }
 struct SystemParentData;
commit b17933e461bac5058cba7004a0e171c61f75a513
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 13:10:11 2016 +1100

    vcl: remove comment cruft from salgdi.hxx
    
    Change-Id: Ic204f0e2ebd1857169c47a3367895aab832d42a3

diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 7492b5f..78cea9e 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -52,8 +52,6 @@ namespace basegfx {
     class B2DPolyPolygon;
 }
 
-// - SalGraphics-Codes -
-
 #define SAL_SETFONT_USEDRAWTEXTARRAY        ((sal_uInt16)0x0004)
 #define SAL_SETFONT_BADFONT                 ((sal_uInt16)0x1000)

More information about the Libreoffice-commits mailing list