[Libreoffice-commits] core.git: 2 commits - sw/source writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Sun Feb 8 09:11:16 PST 2015 

 sw/source/filter/ww8/docxsdrexport.cxx      |    2 +-
 sw/source/filter/ww8/docxsdrexport.hxx      |    6 ++++++
 sw/source/filter/ww8/rtfattributeoutput.cxx |    2 +-
 sw/source/filter/ww8/rtfstringbuffer.cxx    |    2 +-
 writerfilter/source/dmapper/SdtHelper.cxx   |    2 +-
 writerfilter/source/dmapper/SdtHelper.hxx   |    4 +++-
 writerfilter/source/filter/RtfFilter.cxx    |    2 +-
 writerfilter/source/filter/RtfFilter.hxx    |    3 ++-
 writerfilter/source/rtftok/rtflookahead.cxx |    2 +-
 writerfilter/source/rtftok/rtfsdrimport.cxx |    2 +-
 writerfilter/source/rtftok/rtfsdrimport.hxx |    4 +++-
 writerfilter/source/rtftok/rtftokenizer.cxx |    2 +-
 writerfilter/source/rtftok/rtftokenizer.hxx |    4 ++++
 13 files changed, 26 insertions(+), 11 deletions(-)

New commits:
commit 9614183bbbba33ec9cd658870755645ed64ae221
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Feb 8 18:10:34 2015 +0100

    sw: make sure that these headers are self-contained
    
    Change-Id: Ifdfe85abe57b5873ab4641d3a592c4cf8d2e4e01

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 98cdff3..d086500 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <docxsdrexport.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/xml/sax/XSAXSerializable.hpp>
@@ -26,7 +27,6 @@
 #include <txatbase.hxx>
 #include <fmtfsize.hxx>
 #include <drawdoc.hxx>
-#include <docxsdrexport.hxx>
 #include <docxattributeoutput.hxx>
 #include <docxexportfilter.hxx>
 #include <comphelper/seqstream.hxx>
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index fb25d38..b910ee4 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -11,7 +11,12 @@
 #define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX
 
 #include <boost/shared_ptr.hpp>
+
 #include <com/sun/star/xml/dom/XDocument.hpp>
+#include <rtl/strbuf.hxx>
+#include <sax/fshelper.hxx>
+#include <tools/solar.h>
+
 namespace oox
 {
 namespace drawingml
@@ -22,6 +27,7 @@ class DrawingML;
 class Size;
 class Point;
 class SdrObject;
+class SvxBoxItem;
 
 namespace sw
 {
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index beca882..d65c450 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cstring>
 #include "rtfattributeoutput.hxx"
+#include <cstring>
 #include "rtfsdrexport.hxx"
 #include "writerwordglue.hxx"
 #include "ww8par.hxx"
diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx
index 16535f7..aa7db28 100644
--- a/sw/source/filter/ww8/rtfstringbuffer.cxx
+++ b/sw/source/filter/ww8/rtfstringbuffer.cxx
@@ -6,8 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "rtfattributeoutput.hxx"
 #include "rtfstringbuffer.hxx"
+#include "rtfattributeoutput.hxx"
 
 RtfStringBufferValue::RtfStringBufferValue()
     : m_aBuffer(),
commit 090e5f356a1da58c6bd4e2e8f84487a228ea11dc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Feb 8 12:26:26 2015 +0100

    writerfilter: make sure that these headers are self-contained
    
    Change-Id: I3486e8ba5f6d2a937176c9fe549d707a97eb5655

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 4380374..f5a3bd1 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -7,13 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <SdtHelper.hxx>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <editeng/unoprnms.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/datetime.hxx>
 #include <DomainMapper_Impl.hxx>
-#include <SdtHelper.hxx>
 #include <comphelper/sequence.hxx>
 
 namespace writerfilter
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx
index 462f9a7..f22f306 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -10,12 +10,14 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SDTHELPER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SDTHELPER_HXX
 
-#include <boost/optional.hpp>
 #include <vector>
 
+#include <boost/optional.hpp>
+
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ustrbuf.hxx>
 
+#include <DomainMapper_Impl.hxx>
 
 namespace com
 {
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index b2de8d8..421e485 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/implementationentry.hxx>
 #include <RtfFilter.hxx>
+#include <cppuhelper/implementationentry.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <dmapper/DomainMapperFactory.hxx>
diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx
index d9814e0..bfe30c0 100644
--- a/writerfilter/source/filter/RtfFilter.hxx
+++ b/writerfilter/source/filter/RtfFilter.hxx
@@ -20,11 +20,12 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_FILTER_RTFFILTER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_FILTER_RTFFILTER_HXX
 
+#include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
-#include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx
index 812532f..432cdc2 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/writerfilter/source/rtftok/rtflookahead.cxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <tools/stream.hxx>
 #include <rtflookahead.hxx>
+#include <tools/stream.hxx>
 
 using namespace com::sun::star;
 
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index aa898f3..8a03254 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <rtfsdrimport.hxx>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
@@ -26,7 +27,6 @@
 #include <filter/msfilter/util.hxx>
 #include <svx/svdtrans.hxx>
 #include <comphelper/sequence.hxx>
-#include <rtfsdrimport.hxx>
 #include <rtfreferenceproperties.hxx>
 #include <oox/vml/vmlformatting.hxx>
 #include <oox/helper/modelobjecthelper.hxx>
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index ed7feb6..8cdaabb 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -12,8 +12,10 @@
 
 #include <stack>
 
-#include <rtfdocumentimpl.hxx>
+#include <com/sun/star/drawing/XShapes.hpp>
+
 #include <dmapper/GraphicZOrderHelper.hxx>
+#include <rtfdocumentimpl.hxx>
 
 namespace writerfilter
 {
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 85fc050..e212f2b 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -7,11 +7,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <rtftokenizer.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <rtl/strbuf.hxx>
-#include <rtftokenizer.hxx>
 #include <rtfskipdestination.hxx>
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index bf84eeb..2be4e77 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -11,7 +11,11 @@
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFTOKENIZER_HXX
 
 #include <rtflistener.hxx>
+
+#include <vector>
+
 #include <com/sun/star/task/XStatusIndicator.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 class SvStream;

More information about the Libreoffice-commits mailing list