include/vcl/displayconnectiondispatch.hxx | 46 --
include/vcl/fontmanager.hxx | 537 --------------------------
include/vcl/octree.hxx | 127 ------
include/vcl/regband.hxx | 147 -------
vcl/generic/fontmanager/fontconfig.cxx | 2
vcl/generic/fontmanager/fontmanager.cxx | 2
vcl/generic/glyphs/gcach_ftyp.cxx | 2
vcl/generic/print/common_gfx.cxx | 2
vcl/generic/print/glyphset.cxx | 2
vcl/generic/print/glyphset.hxx | 2
vcl/generic/print/text_gfx.cxx | 2
vcl/inc/displayconnectiondispatch.hxx | 46 ++
vcl/inc/fontcache.hxx | 3
vcl/inc/fontmanager.hxx | 537 ++++++++++++++++++++++++++
vcl/inc/generic/genpspgraphics.h | 2
vcl/inc/impoct.hxx | 2
vcl/inc/octree.hxx | 127 ++++++
vcl/inc/regband.hxx | 147 +++++++
vcl/inc/regionband.hxx | 3
vcl/inc/salinst.hxx | 2
vcl/inc/xconnection.hxx | 2
vcl/source/gdi/bitmap3.cxx | 6
vcl/source/gdi/octree.cxx | 4
vcl/source/gdi/regband.cxx | 6
vcl/unx/generic/gdi/salgdi3.cxx | 2
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 2
vcl/unx/kde/salnativewidgets-kde.cxx | 2
vcl/unx/kde4/KDESalFrame.cxx | 3
29 files changed, 886 insertions(+), 883 deletions(-)
New commits:
commit cd7bce9e3701942438e420c9dde69f44eab5fa00
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Dec 11 10:20:07 2013 +0200
regband.hxx is private to vcl
Change-Id: If17510b572aa172c8d973f74b881b0d723213eef
diff --git a/include/vcl/regband.hxx b/vcl/inc/regband.hxx
similarity index 98%
rename from include/vcl/regband.hxx
rename to vcl/inc/regband.hxx
index 65b38cc..11b847b 100644
--- a/include/vcl/regband.hxx
+++ b/vcl/inc/regband.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_REGBAND_HXX
-#define INCLUDED_VCL_REGBAND_HXX
+#ifndef INCLUDED_VCL_INC_REGBAND_HXX
+#define INCLUDED_VCL_INC_REGBAND_HXX
#include <tools/solar.h>
#include <tools/poly.hxx>
@@ -142,6 +142,6 @@ public:
ImplRegionBand* SplitBand (const sal_Int32 nY);
};
-#endif // INCLUDED_VCL_REGBAND_HXX
+#endif // INCLUDED_VCL_INC_REGBAND_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index c913cc8..ed48a73 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -18,9 +18,10 @@
#ifndef INCLUDED_VCL_INC_REGIONBAND_HXX
#define INCLUDED_VCL_INC_REGIONBAND_HXX
-#include <vcl/regband.hxx>
#include <vcl/region.hxx>
+#include "regband.hxx"
+
#ifdef DBG_UTIL
const char* ImplDbgTestRegionBand(const void*);
#endif
diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index a5a28fa..4327f33 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <algorithm>
+
#include <tools/debug.hxx>
#include <tools/helpers.hxx>
-#include <vcl/regband.hxx>
#include <osl/diagnose.hxx>
-#include <algorithm>
-
+#include "regband.hxx"
// =======================================================================
//
commit a1fc912096220648bb2064ff3603bd95fdc84d93
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Dec 11 10:16:44 2013 +0200
octree.hxx is private to vcl
Change-Id: I3cb377cfa99914fdba00504fb7d955e088bfca76
diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx
index 3fc916a..c4219e9 100644
--- a/vcl/inc/impoct.hxx
+++ b/vcl/inc/impoct.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_INC_IMPOCT_HXX
#define INCLUDED_VCL_INC_IMPOCT_HXX
-#include <vcl/octree.hxx>
+#include "octree.hxx"
// ----------------
// - ImpErrorQuad -
diff --git a/include/vcl/octree.hxx b/vcl/inc/octree.hxx
similarity index 97%
rename from include/vcl/octree.hxx
rename to vcl/inc/octree.hxx
index 0b36cc7..f81f1e5 100644
--- a/include/vcl/octree.hxx
+++ b/vcl/inc/octree.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_OCTREE_HXX
-#define INCLUDED_VCL_OCTREE_HXX
+#ifndef INCLUDED_VCL_INC_OCTREE_HXX
+#define INCLUDED_VCL_INC_OCTREE_HXX
#include <vcl/salbtype.hxx>
#include <vcl/dllapi.h>
@@ -122,6 +122,6 @@ inline sal_uInt16 InverseColorMap::GetBestPaletteIndex(
const BitmapColor& rColo
( (sal_uLong) rColor.GetBlue() >> nBits ) ];
}
-#endif // INCLUDED_VCL_OCTREE_HXX
+#endif // INCLUDED_VCL_INC_OCTREE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 5c4905a..8522af0 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -17,17 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
+#include <math.h>
#include <stdlib.h>
#include <vcl/bmpacc.hxx>
-#include <vcl/octree.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/bitmap.hxx>
#include <impoct.hxx>
#include <impvect.hxx>
-#include <math.h>
+
+#include "octree.hxx"
#define RGB15( _def_cR, _def_cG, _def_cB )
(((sal_uLong)(_def_cR)<<10UL)|((sal_uLong)(_def_cG)<<5UL)|(sal_uLong)(_def_cB))
#define GAMMA( _def_cVal, _def_InvGamma ) ((sal_uInt8)MinMax(FRound(pow(
_def_cVal/255.0,_def_InvGamma)*255.0),0L,255L))
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 671a091..165ab33 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -17,14 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <limits.h>
#include <vcl/bmpacc.hxx>
-#include <vcl/octree.hxx>
#include <impoct.hxx>
+#include "octree.hxx"
+
// ---------
// - pMask -
// ---------
commit a0e8a1b69106dd55dd52fc6966ecf2b19d461fa9
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Dec 11 10:13:15 2013 +0200
fontmanager.hxx is private to vcl
Change-Id: Iec1d1539db0b44d2ddc420cf500585098d4793fc
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index e88745c..828daee 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -20,7 +20,7 @@
#include "fontcache.hxx"
#include "impfont.hxx"
-#include <vcl/fontmanager.hxx>
+#include "fontmanager.hxx"
#include <vcl/svapp.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/vclenum.hxx>
diff --git a/vcl/generic/fontmanager/fontmanager.cxx
b/vcl/generic/fontmanager/fontmanager.cxx
index c506a90..56b7240 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -30,7 +30,7 @@
#include "impfont.hxx"
#include "svdata.hxx"
#include "generic/geninst.h"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
#include "vcl/strhelper.hxx"
#include "vcl/ppdparser.hxx"
#include <vcl/embeddedfontshelper.hxx>
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index abfa775..b153e5c 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -63,7 +63,7 @@ typedef const FT_Vector* FT_Vector_CPtr;
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/mman.h>
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
// the gamma table makes artificial bold look better for CJK glyphs
static unsigned char aGammaTable[257];
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 851739a..84d3afc 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -23,7 +23,7 @@
#include "generic/printergfx.hxx"
#include "generic/printerjob.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
#include "vcl/strhelper.hxx"
#include "vcl/printerinfomanager.hxx"
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 07ac746..118a0e2 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -25,7 +25,7 @@
#include "generic/printergfx.hxx"
#include "fontsubset.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
#include <tools/gen.hxx>
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index 7a65b64..009f2ce 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
#define INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
#include "osl/file.hxx"
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 5dc60f1..b8b9439 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -24,7 +24,7 @@
#include "glyphset.hxx"
#include "generic/printergfx.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
#include "vcl/helper.hxx"
#include "osl/thread.h"
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index d70b641..abce743 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -22,9 +22,10 @@
#include <rtl/ustring.hxx>
#include <vcl/dllapi.h>
-#include <vcl/fontmanager.hxx>
#include <boost/unordered_map.hpp>
+#include "fontmanager.hxx"
+
namespace psp
{
diff --git a/include/vcl/fontmanager.hxx b/vcl/inc/fontmanager.hxx
similarity index 99%
rename from include/vcl/fontmanager.hxx
rename to vcl/inc/fontmanager.hxx
index ca78376..a727b84 100644
--- a/include/vcl/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_FONTMANAGER_HXX
-#define INCLUDED_VCL_FONTMANAGER_HXX
+#ifndef INCLUDED_VCL_INC_FONTMANAGER_HXX
+#define INCLUDED_VCL_INC_FONTMANAGER_HXX
#include <boost/unordered_map.hpp>
#include <map>
@@ -532,6 +532,6 @@ public:
} // namespace
-#endif // INCLUDED_VCL_FONTMANAGER_HXX
+#endif // INCLUDED_VCL_INC_FONTMANAGER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 17912bc..a80f75c 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
#include "vclpluginapi.h"
#include "salgdi.hxx"
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 27f87b0..8362c88 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -48,7 +48,7 @@
#include <vcl/sysdata.hxx>
#include "generic/printergfx.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
#include "vcl/jobdata.hxx"
#include "vcl/printerinfomanager.hxx"
#include "vcl/svapp.hxx"
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 67ab5a4..14f6d7a 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -36,7 +36,7 @@
#include <boost/unordered_map.hpp>
#include "vcl/vclenum.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
#include <vcl/decoview.hxx>
typedef struct _cairo_font_options cairo_font_options_t;
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 98da944..c192937 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -14,7 +14,7 @@
#include <unx/gtk/gtkdata.hxx>
#include <unx/gtk/gtkinst.hxx>
#include <unx/gtk/gtkgdi.hxx>
-#include <vcl/fontmanager.hxx>
+#include "fontmanager.hxx"
GtkStyleContext* GtkSalGraphics::mpButtonStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpEntryStyle = NULL;
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx
b/vcl/unx/kde/salnativewidgets-kde.cxx
index dfbdb42..9747313 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -28,7 +28,7 @@
#include <unx/kde/kdedata.hxx>
#include <vcl/settings.hxx>
-#include <vcl/fontmanager.hxx>
+#include "fontmanager.hxx"
#include <vcl/vclenum.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 71f9c56..a322912 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -42,7 +42,8 @@
#include <vcl/font.hxx>
#include <vcl/settings.hxx>
-#include <vcl/fontmanager.hxx>
+
+#include "fontmanager.hxx"
#include <svdata.hxx>
commit 05096c32403eec3198223341b49dc9ae538bc81e
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Dec 11 10:05:12 2013 +0200
displayconnectiondispatch.hxx is private to vcl
Change-Id: I86fab011150be6f151e4fd6a51246f41e86e5833
diff --git a/include/vcl/displayconnectiondispatch.hxx
b/vcl/inc/displayconnectiondispatch.hxx
similarity index 89%
rename from include/vcl/displayconnectiondispatch.hxx
rename to vcl/inc/displayconnectiondispatch.hxx
index 1991df9..bff039e 100644
--- a/include/vcl/displayconnectiondispatch.hxx
+++ b/vcl/inc/displayconnectiondispatch.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_DISPLAYCONNECTIONDISPATCH_HXX
-#define INCLUDED_VCL_DISPLAYCONNECTIONDISPATCH_HXX
+#ifndef INCLUDED_VCL_INC_DISPLAYCONNECTIONDISPATCH_HXX
+#define INCLUDED_VCL_INC_DISPLAYCONNECTIONDISPATCH_HXX
#include <sal/config.h>
@@ -41,6 +41,6 @@ protected:
}
-#endif
+#endif // INCLUDED_VCL_INC_DISPLAYCONNECTIONDISPATCH_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 7e8f470..bcf7548 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -26,7 +26,7 @@
#include "com/sun/star/ui/dialogs/XFolderPicker2.hpp"
#include "tools/solar.h"
-#include "vcl/displayconnectiondispatch.hxx"
+#include "displayconnectiondispatch.hxx"
#include "vcl/dllapi.h"
#include "rtl/ref.hxx"
diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx
index 4a6a760..c556396 100644
--- a/vcl/inc/xconnection.hxx
+++ b/vcl/inc/xconnection.hxx
@@ -24,7 +24,7 @@
#include <rtl/ref.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include "vcl/displayconnectiondispatch.hxx"
+#include "displayconnectiondispatch.hxx"
#include <list>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
