summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorenz Paragas <j.paragas.237@gmail.com>2016-04-27 18:51:39 -0700
committerStephan Bergmann <sbergman@redhat.com>2016-04-28 09:59:39 +0000
commit29c4f7bd5863e34c449062aca6f8aee5ec7510a2 (patch)
tree617efc2da90a8d146e66f498ccb51b9796b60f08
parent02c5ab35077e994af1318b0b35ec06332849934b (diff)
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 <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--include/oox/core/binarycodec.hxx2
-rw-r--r--include/oox/core/contexthandler.hxx6
-rw-r--r--include/oox/core/contexthandler2.hxx2
-rw-r--r--include/oox/core/fastparser.hxx2
-rw-r--r--include/oox/core/fasttokenhandler.hxx4
-rw-r--r--include/oox/core/filterbase.hxx6
-rw-r--r--include/oox/core/filterdetect.hxx6
-rw-r--r--include/oox/core/fragmenthandler.hxx6
-rw-r--r--include/oox/core/fragmenthandler2.hxx2
-rw-r--r--include/oox/core/relationshandler.hxx2
-rw-r--r--include/oox/core/xmlfilterbase.hxx2
-rw-r--r--include/oox/crypto/DocumentDecryption.hxx4
-rw-r--r--include/oox/crypto/DocumentEncryption.hxx2
13 files changed, 23 insertions, 23 deletions
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 56cea810c869..6afcead07dc1 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 38f723eb1030..72973dd9fc81 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 cca43cbe6ba5..d1725227bfc8 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 f8fdad783f3e..0b48a741b91b 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 02e2be7a9eaf..59d484f210e5 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 02f10a105575..f225c9a77ec7 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 6a1902d91697..30dd7fdf3bcd 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 7afdb79efd34..3dd37aee5a3a 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 7e529489978b..0d2264ae224b 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 325de5a7b072..46fe8871e096 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 5d0aae9d0d96..c118c227b38b 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 16029ad6998b..4e4abae43380 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 42646f367d1a..a738ede38956 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>