[Libreoffice-commits] core.git: include/vcl solenv/inc

[Chris Sherlock]

 include/vcl/doxygen_dummy.hxx |    8 ++++++++
 solenv/inc/doxygen.cfg        |    3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit a669faa1fa88d4d82d3f1d38b652b689ecc4d3a1
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 15 06:26:41 2016 +1100

    vcl: allow doxygen to see boost::intrusive_ptr
    
    We are using boost::intrusive_ptr for a number of classes,
    unfortunately by default we cannot see this in the Doxygen
    collaboration diagrams.
    
    However, we can work around this problem by making a dummy
    namespace which we include in a header that is scanned by
    Doxygen, but never included in LibreOffice. To be sure of this,
    however, I have put #ifdef DOXYGEN_ONLY guards around the file
    and defined this in the Doxygen config file.
    
    Change-Id: I18d6956518a49e6006b64e2147023ec8266c8f5c

diff --git a/include/vcl/doxygen_dummy.hxx b/include/vcl/doxygen_dummy.hxx
new file mode 100644
index 0000000..b10c81f
--- /dev/null
+++ b/include/vcl/doxygen_dummy.hxx
@@ -0,0 +1,8 @@
+// Do NOT include this file anywhere! This is merely used to make Doxygen see
+// boost intrusive_ptr's - otherwise it doesn't build the collaboration diagram
+// correctly
+#ifdef DOXYGENONLY
+
+namespace boost { template<class T> class intrusive_ptr { T *ptr; }; }
+
+#endif
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 4591c79..d2927cd 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -2020,7 +2020,8 @@ PREDEFINED             = LINUX \
                          EXCEPTIONS_ON \
                          _GIFPRIVATE \
                          _XBMPRIVATE \
-                         _XPMPRIVATE
+                         _XPMPRIVATE \
+                         DOXYGEN_ONLY
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The