[Libreoffice-commits] core.git: chart2/source include/svtools include/vcl starmath/source vcl/inc vcl/Library_vcl.mk vcl/source
Kohei Yoshida
kohei.yoshida at collabora.com
Tue Nov 25 18:14:19 PST 2014
chart2/source/view/main/GL3DRenderer.cxx | 1
include/svtools/brwbox.hxx | 1
include/vcl/outdev.hxx | 5 +---
include/vcl/outdevstate.hxx | 3 --
starmath/source/mathmlexport.cxx | 1
vcl/Library_vcl.mk | 1
vcl/inc/outdevstatestack.hxx | 31 +++++++++++++++++++++++++
vcl/source/gdi/sallayout.cxx | 1
vcl/source/outdev/outdev.cxx | 3 +-
vcl/source/outdev/outdevstate.cxx | 5 +---
vcl/source/outdev/outdevstatestack.cxx | 37 +++++++++++++++++++++++++++++++
11 files changed, 80 insertions(+), 9 deletions(-)
New commits:
commit 96422e999fbfbfec22767649a973153afc4780f4
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Tue Nov 25 19:18:01 2014 -0500
Remove ptr_deque.hpp header include from vcl/outdev.hxx.
This header is also a very high impact header.
Change-Id: Iab63f2ec2edebc14b47820c6377a7f83131cfd06
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 092810a..7fe634b 100755
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -20,6 +20,7 @@
#include <StaticGeometry.h>
#include "glm/gtc/matrix_inverse.hpp"
#include <boost/checked_delete.hpp>
+#include <boost/scoped_array.hpp>
#define DEBUG_FBO 0
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index f0e47ca..1384ff7 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -28,6 +28,7 @@
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vector>
+#include <stack>
#include <limits.h>
#include <memory>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index a5b5751..23abb00 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -49,14 +49,12 @@
# //some problem with MacOSX and a check define
# undef check
#endif
-#include <boost/ptr_container/ptr_deque.hpp>
#include <boost/intrusive_ptr.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
#include <com/sun/star/uno/Reference.h>
#include <vector>
-#include <stack>
#if defined UNX
#define GLYPH_FONT_HEIGHT 128
@@ -235,6 +233,7 @@ class Printer;
class FontSelectPattern;
class ImplFontMetricData;
class VCLXGraphics;
+class OutDevStateStack;
typedef boost::intrusive_ptr< FontCharMap > FontCharMapPtr;
@@ -270,7 +269,7 @@ private:
mutable PhysicalFontCollection* mpFontCollection;
mutable ImplGetDevFontList* mpGetDevFontList;
mutable ImplGetDevSizeList* mpGetDevSizeList;
- boost::ptr_deque<OutDevState>* mpOutDevStateStack;
+ OutDevStateStack* mpOutDevStateStack;
ImplOutDevData* mpOutDevData;
std::vector< VCLXGraphics* >* mpUnoGraphicsList;
vcl::PDFWriterImpl* mpPDFWriter;
diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index 47f3c09..d7818ab 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -20,13 +20,12 @@
#ifndef INCLUDED_VCL_OUTDEVSTATE_HXX
#define INCLUDED_VCL_OUTDEVSTATE_HXX
-#include <sal/types.h>
-
#include <vcl/mapmod.hxx>
#include <vcl/region.hxx>
#include <vcl/font.hxx>
#include <vcl/vclenum.hxx>
+#include <tools/solar.h>
#include <tools/gen.hxx>
#include <tools/color.hxx>
#include <tools/fontenum.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index fa4258a..ff48dc3 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -63,6 +63,7 @@
#include <comphelper/servicehelper.hxx>
#include <memory>
+#include <stack>
#include "mathmlexport.hxx"
#include "register.hxx"
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 932ca4c..5d900e2 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -224,6 +224,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/edit/xtextedt \
vcl/source/outdev/outdev \
vcl/source/outdev/outdevstate \
+ vcl/source/outdev/outdevstatestack \
vcl/source/outdev/clipping \
vcl/source/outdev/polygon \
vcl/source/outdev/transparent \
diff --git a/vcl/inc/outdevstatestack.hxx b/vcl/inc/outdevstatestack.hxx
new file mode 100644
index 0000000..406d62b
--- /dev/null
+++ b/vcl/inc/outdevstatestack.hxx
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_OUTDEVSTATESTACK_HXX
+#define INCLUDED_VCL_OUTDEVSTATESTACK_HXX
+
+#include <vcl/outdevstate.hxx>
+
+#include <boost/ptr_container/ptr_deque.hpp>
+
+class OutDevStateStack
+{
+ typedef boost::ptr_deque<OutDevState> DataType;
+ DataType maData;
+public:
+ bool empty() const;
+ size_t size() const;
+ void push_back( OutDevState* p );
+ void pop_back();
+ OutDevState& back();
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index c30a99a..1a5938b 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -50,6 +50,7 @@
#endif
#include <algorithm>
+#include <boost/scoped_array.hpp>
#ifdef DEBUG
//#define MULTI_SL_DEBUG
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 5f75f41..82b80c3 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -44,6 +44,7 @@
#include <window.h>
#include <outdev.h>
#include <outdata.hxx>
+#include <outdevstatestack.hxx>
#include "PhysicalFontCollection.hxx"
@@ -95,7 +96,7 @@ OutputDevice::OutputDevice() :
mpFontCollection = NULL;
mpGetDevFontList = NULL;
mpGetDevSizeList = NULL;
- mpOutDevStateStack = new boost::ptr_deque<OutDevState>();
+ mpOutDevStateStack = new OutDevStateStack;
mpPDFWriter = NULL;
mpAlphaVDev = NULL;
mpExtOutDevData = NULL;
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 738a5e5..a71c7d6 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sal/types.h>
+#include <vcl/outdevstate.hxx>
#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
@@ -33,10 +33,9 @@
#include <tools/color.hxx>
#include <tools/fontenum.hxx>
-#include <vcl/outdevstate.hxx>
-
#include "outdev.h"
#include "outdata.hxx"
+#include <outdevstatestack.hxx>
#include "salgdi.hxx"
#include "sallayout.hxx"
diff --git a/vcl/source/outdev/outdevstatestack.cxx b/vcl/source/outdev/outdevstatestack.cxx
new file mode 100644
index 0000000..0fcdcd5
--- /dev/null
+++ b/vcl/source/outdev/outdevstatestack.cxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <outdevstatestack.hxx>
+
+bool OutDevStateStack::empty() const
+{
+ return maData.empty();
+}
+
+size_t OutDevStateStack::size() const
+{
+ return maData.size();
+}
+
+void OutDevStateStack::push_back( OutDevState* p )
+{
+ maData.push_back(p);
+}
+
+void OutDevStateStack::pop_back()
+{
+ maData.pop_back();
+}
+
+OutDevState& OutDevStateStack::back()
+{
+ return maData.back();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list