[Libreoffice-commits] core.git: i18npool/inc include/avmedia include/editeng include/sfx2 include/svtools include/toolkit include/vcl include/xmloff io/source
Jens Carl
j.carl43 at gmx.de
Thu May 29 23:45:43 PDT 2014
i18npool/inc/ordinalsuffix.hxx | 5 +
include/avmedia/modeltools.hxx | 5 +
include/editeng/numdef.hxx | 5 +
include/editeng/unonames.hxx | 5 +
include/sfx2/brokenpackageint.hxx | 5 +
include/sfx2/imagemgr.hxx | 5 +
include/svtools/sores.hxx | 5 +
include/toolkit/controls/eventcontainer.hxx | 4 +
include/vcl/impdel.hxx | 94 ++++++++++++++--------------
include/vcl/threadex.hxx | 5 +
include/xmloff/languagetagodf.hxx | 5 +
io/source/acceptor/acceptor.hxx | 5 +
io/source/connector/connector.hxx | 8 +-
io/source/stm/streamhelper.hxx | 5 +
14 files changed, 112 insertions(+), 49 deletions(-)
New commits:
commit 9e3cc6b47444f988a68ca3ddcad779ed0480b00c
Author: Jens Carl <j.carl43 at gmx.de>
Date: Fri May 30 05:49:03 2014 +0000
fdo#68849: Add header guards to all include files
Added header guard to files in directories i18npool/, include/, and io/
Change-Id: I7ba5b5f0ffdf5dedb8fd40e8efa06936e7c23591
Reviewed-on: https://gerrit.libreoffice.org/9558
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index 322a16c..127d1f1 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_I18NPOOL_INC_ORDINALSUFFIX_HXX
+#define INCLUDED_I18NPOOL_INC_ORDINALSUFFIX_HXX
+
#include <com/sun/star/i18n/XOrdinalSuffix.hpp>
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -46,4 +49,6 @@ class OrdinalSuffix : public cppu::WeakImplHelper2
};
} } } }
+#endif // INCLUDED_I18NPOOL_INC_ORDINALSUFFIX_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx
index 3de866d..d1a84af 100644
--- a/include/avmedia/modeltools.hxx
+++ b/include/avmedia/modeltools.hxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifndef INCLUDED_INCLUDE_AVMEDIA_MODELTOOLS_HXX
+#define INCLUDED_INCLUDE_AVMEDIA_MODELTOOLS_HXX
+
#include <rtl/ustring.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <avmedia/avmediadllapi.h>
@@ -21,4 +24,6 @@ bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType);
} // namespace avemdia
+#endif // INCLUDED_INCLUDE_AVMEDIA_MODELTOOLS_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/numdef.hxx b/include/editeng/numdef.hxx
index 28f94d2..8ab423a 100644
--- a/include/editeng/numdef.hxx
+++ b/include/editeng/numdef.hxx
@@ -17,7 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_INCLUDE_EDITENG_NUMDEF_HXX
+#define INCLUDED_INCLUDE_EDITENG_NUMDEF_HXX
+
#define SVX_MAX_NUM 10 // max. possible numbering level
#define SVX_DEF_BULLET (0xF000 + 149)// Character for lists
+#endif // INCLUDED_INCLUDE_EDITENG_NUMDEF_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/unonames.hxx b/include/editeng/unonames.hxx
index 3a59844..19ed112 100644
--- a/include/editeng/unonames.hxx
+++ b/include/editeng/unonames.hxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifndef INCLUDED_INCLUDE_EDITENG_UNONAMES_HXX
+#define INCLUDED_INCLUDE_EDITENG_UNONAMES_HXX
+
// Common across fields
#define UNO_TC_PROP_ANCHOR "Anchor"
#define UNO_TC_PROP_TEXTFIELD_TYPE "TextFieldType"
@@ -40,4 +43,6 @@
#define UNO_TR_PROP_SELECTION "Selection"
+#endif // INCLUDED_INCLUDE_EDITENG_UNONAMES_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx
index ff78cd7..607c640 100644
--- a/include/sfx2/brokenpackageint.hxx
+++ b/include/sfx2/brokenpackageint.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_INCLUDE_SFX2_BROKENPACKAGEINT_HXX
+#define INCLUDED_INCLUDE_SFX2_BROKENPACKAGEINT_HXX
+
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <com/sun/star/document/BrokenPackageRequest.hpp>
@@ -45,4 +48,6 @@ public:
com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
};
+#endif // INCLUDED_INCLUDE_SFX2_BROKENPACKAGEINT_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/imagemgr.hxx b/include/sfx2/imagemgr.hxx
index eca3deb..c4a4eb1 100644
--- a/include/sfx2/imagemgr.hxx
+++ b/include/sfx2/imagemgr.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_INCLUDE_SFX2_IMAGEMGR_HXX
+#define INCLUDED_INCLUDE_SFX2_IMAGEMGR_HXX
+
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <com/sun/star/uno/Reference.hxx>
@@ -31,4 +34,6 @@ SFX2_DLLPUBLIC Image SAL_CALL GetImage(
bool bBig
);
+#endif // INCLUDED_INCLUDE_SFX2_IMAGEMGR_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/sores.hxx b/include/svtools/sores.hxx
index 8e9093a..91d4f5d 100644
--- a/include/svtools/sores.hxx
+++ b/include/svtools/sores.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_INCLUDE_SVTOOLS_SORES_HXX
+#define INCLUDED_INCLUDE_SVTOOLS_SORES_HXX
+
// Strings
#define STR_ERROR_OBJNOCREATE 32014
#define STR_ERROR_OBJNOCREATE_FROM_FILE 32015
@@ -96,4 +99,6 @@
#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119)
#define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT)
+#endif // INCLUDED_INCLUDE_SVTOOLS_SORES_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index ee1e671..610a43d 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_INCLUDE_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
+#define INCLUDED_INCLUDE_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
#include <osl/diagnose.h>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -128,4 +130,6 @@ public:
} // namespace toolkit_namecontainer
+#endif // INCLUDED_INCLUDE_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/impdel.hxx b/include/vcl/impdel.hxx
index 988d85d..54159fc 100644
--- a/include/vcl/impdel.hxx
+++ b/include/vcl/impdel.hxx
@@ -17,65 +17,65 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_VCL_IMPDEL_HXX
- #define INCLUDED_VCL_IMPDEL_HXX
+#ifndef INCLUDED_VCL_IMPDEL_HXX
+#define INCLUDED_VCL_IMPDEL_HXX
- #include <list>
+#include <list>
- namespace vcl
- {
+namespace vcl
+{
- class DeletionListener;
+class DeletionListener;
- class DeletionNotifier
- {
- std::list< DeletionListener* > m_aListeners;
- protected:
- DeletionNotifier() {}
+class DeletionNotifier
+{
+ std::list< DeletionListener* > m_aListeners;
+ protected:
+ DeletionNotifier() {}
- ~DeletionNotifier()
- { notifyDelete(); }
+ ~DeletionNotifier()
+ { notifyDelete(); }
- inline void notifyDelete();
+ inline void notifyDelete();
- public:
- void addDel( DeletionListener* pListener )
- { m_aListeners.push_back( pListener ); }
+ public:
+ void addDel( DeletionListener* pListener )
+ { m_aListeners.push_back( pListener ); }
- void removeDel( DeletionListener* pListener )
- { m_aListeners.remove( pListener ); }
- };
+ void removeDel( DeletionListener* pListener )
+ { m_aListeners.remove( pListener ); }
+};
- class DeletionListener
- {
- DeletionNotifier* m_pNotifier;
- public:
- DeletionListener( DeletionNotifier* pNotifier )
- : m_pNotifier( pNotifier )
- {
- if( m_pNotifier )
- m_pNotifier->addDel( this );
- }
- ~DeletionListener()
- {
- if( m_pNotifier )
- m_pNotifier->removeDel( this );
- }
- void deleted() { m_pNotifier = NULL; }
- bool isDeleted() const { return (m_pNotifier == NULL); }
- };
+class DeletionListener
+{
+ DeletionNotifier* m_pNotifier;
+ public:
+ DeletionListener( DeletionNotifier* pNotifier )
+ : m_pNotifier( pNotifier )
+ {
+ if( m_pNotifier )
+ m_pNotifier->addDel( this );
+ }
+ ~DeletionListener()
+ {
+ if( m_pNotifier )
+ m_pNotifier->removeDel( this );
+ }
+ void deleted() { m_pNotifier = NULL; }
+ bool isDeleted() const { return (m_pNotifier == NULL); }
+};
- inline void DeletionNotifier::notifyDelete()
- {
- for( std::list< DeletionListener* >::const_iterator it =
- m_aListeners.begin(); it != m_aListeners.end(); ++it )
- (*it)->deleted();
+inline void DeletionNotifier::notifyDelete()
+{
+ for( std::list< DeletionListener* >::const_iterator it =
+ m_aListeners.begin(); it != m_aListeners.end(); ++it )
+ (*it)->deleted();
- m_aListeners.clear();
- }
+ m_aListeners.clear();
+}
- } // namespace vcl
+} // namespace vcl
- #endif // INCLUDED_VCL_IMPDEL_HXX
+#endif // INCLUDED_VCL_IMPDEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 2b375bc..40bddf6c 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_INCLUDE_VCL_THREADEX_HXX
+#define INCLUDED_INCLUDE_VCL_THREADEX_HXX
+
#include <osl/conditn.h>
#include <osl/thread.h>
#include <tools/link.hxx>
@@ -246,4 +249,6 @@ inline typename FuncT::result_type syncExecute( FuncT const& func )
} // namespace solarthread
} // namespace vcl
+#endif // INCLUDED_INCLUDE_VCL_THREADEX_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/xmloff/languagetagodf.hxx b/include/xmloff/languagetagodf.hxx
index 9eef8e8..559819f 100644
--- a/include/xmloff/languagetagodf.hxx
+++ b/include/xmloff/languagetagodf.hxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifndef INCLUDED_INCLUDE_XMLOFF_LANGUAGETAGODF_HXX
+#define INCLUDED_INCLUDE_XMLOFF_LANGUAGETAGODF_HXX
+
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -32,4 +35,6 @@ struct LanguageTagODF
LanguageTag getLanguageTag() const { return LanguageTag( maRfcLanguageTag, maLanguage, maScript, maCountry); }
};
+#endif // INCLUDED_INCLUDE_XMLOFF_LANGUAGETAGODF_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx
index 3e56b86..53db4df 100644
--- a/io/source/acceptor/acceptor.hxx
+++ b/io/source/acceptor/acceptor.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_IO_SOURCE_ACCEPTOR_ACCEPTOR_HXX
+#define INCLUDED_IO_SOURCE_ACCEPTOR_ACCEPTOR_HXX
+
#include <osl/pipe.hxx>
#include <osl/socket.hxx>
@@ -65,4 +68,6 @@ namespace io_acceptor {
}
+#endif // INCLUDED_IO_SOURCE_ACCEPTOR_ACCEPTOR_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx
index f9deefa..b113097 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_IO_SOURCE_CONNECTOR_CONNECTOR.HXX
+#define INCLUDED_IO_SOURCE_CONNECTOR_CONNECTOR.HXX
+
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
@@ -24,8 +27,8 @@
#include <com/sun/star/connection/XConnectionBroadcaster.hpp>
#include <boost/unordered_set.hpp>
-# include <osl/socket.hxx>
-# include <osl/pipe.hxx>
+#include <osl/socket.hxx>
+#include <osl/pipe.hxx>
namespace stoc_connector
{
@@ -130,5 +133,6 @@ namespace stoc_connector
};
}
+#endif // INCLUDED_IO_SOURCE_CONNECTOR_CONNECTOR.HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index 4a31d47..56b7412 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_IO_SOURCE_STM_STREAMHELPER_HXX
+#define INCLUDED_IO_SOURCE_STM_STREAMHELPER_HXX
+
// Save NDEBUG state
#ifdef NDEBUG
#define STREAMHELPER_HXX_HAD_NDEBUG
@@ -153,4 +156,6 @@ public:
}
+#endif // INCLUDED_IO_SOURCE_STM_STREAMHELPER_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list