include/oox/core/binarycodec.hxx | 2 +-
include/oox/core/contexthandler.hxx | 6 +++---
include/oox/core/contexthandler2.hxx | 2 +-
include/oox/core/fastparser.hxx | 2 +-
include/oox/core/fasttokenhandler.hxx | 4 ++--
include/oox/core/filterbase.hxx | 6 +++---
include/oox/core/filterdetect.hxx | 6 +++---
include/oox/core/fragmenthandler.hxx | 6 +++---
include/oox/core/fragmenthandler2.hxx | 2 +-
include/oox/core/relationshandler.hxx | 2 +-
include/oox/core/xmlfilterbase.hxx | 2 +-
include/oox/crypto/DocumentDecryption.hxx | 4 ++--
include/oox/crypto/DocumentEncryption.hxx | 2 +-
13 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 29c4f7bd5863e34c449062aca6f8aee5ec7510a2
Author: Jorenz Paragas <j.paragas....@gmail.com>
Date: Wed Apr 27 18:51:39 2016 -0700
tdf#42949: prefer including Reference.hxx over Reference.h...
...and so on for Any.hxx and Sequence.hxx.
This commit follows up on two of my previous commits, which are
6a4a15c87c03feffb90cc416ce22d2819e41442d and
474eca1f9b42749665bbf69f6dc62c66ea4ad7fd.
Many non-static inline functions that are declared in Reference.h and
similar files are not defined in the .h file, but their definitions
are in the corresponding .hxx files instead. Thus, let's prefer
including the .hxx files over the .h one so that we don't include
inline functions without their definitions.
In practice, the corresponding .hxx file is included transitively
from many other places, but it's better not to rely on that.
Change-Id: I3bada39eb879ae736c0360f435b16cd5a61adba8
Reviewed-on: https://gerrit.libreoffice.org/24456
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 56cea81..6afcead 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_OOX_CORE_BINARYCODEC_HXX
#define INCLUDED_OOX_CORE_BINARYCODEC_HXX
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Sequence.hxx>
#include <oox/dllapi.h>
#include <rtl/cipher.h>
#include <rtl/digest.h>
diff --git a/include/oox/core/contexthandler.hxx
b/include/oox/core/contexthandler.hxx
index 38f723e..72973dd 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -23,10 +23,10 @@
#include <exception>
#include <memory>
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
#include <cppuhelper/implbase.hxx>
diff --git a/include/oox/core/contexthandler2.hxx
b/include/oox/core/contexthandler2.hxx
index cca43cb..d172522 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -25,7 +25,7 @@
#include <memory>
#include <vector>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <oox/core/contexthandler.hxx>
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index f8fdad7..0b48a74 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <rtl/ustring.hxx>
diff --git a/include/oox/core/fasttokenhandler.hxx
b/include/oox/core/fasttokenhandler.hxx
index 02e2be7..59d484f 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -23,8 +23,8 @@
#include <exception>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <cppuhelper/implbase.hxx>
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 02f10a1..f225c9a 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -29,11 +29,11 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Sequence.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <oox/dllapi.h>
diff --git a/include/oox/core/filterdetect.hxx
b/include/oox/core/filterdetect.hxx
index 6a1902d..30dd7fd 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -25,10 +25,10 @@
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
#include <cppuhelper/implbase.hxx>
diff --git a/include/oox/core/fragmenthandler.hxx
b/include/oox/core/fragmenthandler.hxx
index 7afdb79..3dd37ae 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -22,10 +22,10 @@
#include <exception>
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
#include <cppuhelper/implbase.hxx>
diff --git a/include/oox/core/fragmenthandler2.hxx
b/include/oox/core/fragmenthandler2.hxx
index 7e52948..0d2264a 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -23,7 +23,7 @@
#include <exception>
#include <vector>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <oox/core/contexthandler.hxx>
diff --git a/include/oox/core/relationshandler.hxx
b/include/oox/core/relationshandler.hxx
index 325de5a..46fe887 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -22,7 +22,7 @@
#include <exception>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <oox/core/fragmenthandler.hxx>
diff --git a/include/oox/core/xmlfilterbase.hxx
b/include/oox/core/xmlfilterbase.hxx
index 5d0aae9..c118c22 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -23,7 +23,7 @@
#include <memory>
#include <vector>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <oox/core/filterbase.hxx>
#include <oox/core/relations.hxx>
diff --git a/include/oox/crypto/DocumentDecryption.hxx
b/include/oox/crypto/DocumentDecryption.hxx
index 16029ad..4e4abae 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -15,8 +15,8 @@
#include <memory>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
#include <oox/crypto/CryptoEngine.hxx>
#include <rtl/ustring.hxx>
diff --git a/include/oox/crypto/DocumentEncryption.hxx
b/include/oox/crypto/DocumentEncryption.hxx
index 42646f3..a738ede 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -13,7 +13,7 @@
#include <oox/dllapi.h>
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Reference.hxx>
#include <oox/crypto/Standard2007Engine.hxx>
#include <rtl/ustring.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
