Kaydet (Commit) 9e3cc6b4 authored tarafından Jens Carl's avatar Jens Carl Kaydeden (comit) Noel Grandin

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/9558Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst bcd5da6c
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <com/sun/star/i18n/XOrdinalSuffix.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase2.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
...@@ -46,4 +49,6 @@ class OrdinalSuffix : public cppu::WeakImplHelper2 ...@@ -46,4 +49,6 @@ class OrdinalSuffix : public cppu::WeakImplHelper2
}; };
} } } } } } } }
#endif // INCLUDED_I18NPOOL_INC_ORDINALSUFFIX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * 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 <rtl/ustring.hxx>
#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel.hpp>
#include <avmedia/avmediadllapi.h> #include <avmedia/avmediadllapi.h>
...@@ -21,4 +24,6 @@ bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType); ...@@ -21,4 +24,6 @@ bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType);
} // namespace avemdia } // namespace avemdia
#endif // INCLUDED_INCLUDE_AVMEDIA_MODELTOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,7 +17,12 @@ ...@@ -17,7 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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_MAX_NUM 10 // max. possible numbering level
#define SVX_DEF_BULLET (0xF000 + 149)// Character for lists #define SVX_DEF_BULLET (0xF000 + 149)// Character for lists
#endif // INCLUDED_INCLUDE_EDITENG_NUMDEF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * 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 // Common across fields
#define UNO_TC_PROP_ANCHOR "Anchor" #define UNO_TC_PROP_ANCHOR "Anchor"
#define UNO_TC_PROP_TEXTFIELD_TYPE "TextFieldType" #define UNO_TC_PROP_TEXTFIELD_TYPE "TextFieldType"
...@@ -40,4 +43,6 @@ ...@@ -40,4 +43,6 @@
#define UNO_TR_PROP_SELECTION "Selection" #define UNO_TR_PROP_SELECTION "Selection"
#endif // INCLUDED_INCLUDE_EDITENG_UNONAMES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <sal/config.h>
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <com/sun/star/document/BrokenPackageRequest.hpp> #include <com/sun/star/document/BrokenPackageRequest.hpp>
...@@ -45,4 +48,6 @@ public: ...@@ -45,4 +48,6 @@ public:
com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest(); com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
}; };
#endif // INCLUDED_INCLUDE_SFX2_BROKENPACKAGEINT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <sal/config.h>
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
...@@ -31,4 +34,6 @@ SFX2_DLLPUBLIC Image SAL_CALL GetImage( ...@@ -31,4 +34,6 @@ SFX2_DLLPUBLIC Image SAL_CALL GetImage(
bool bBig bool bBig
); );
#endif // INCLUDED_INCLUDE_SFX2_IMAGEMGR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifndef INCLUDED_INCLUDE_SVTOOLS_SORES_HXX
#define INCLUDED_INCLUDE_SVTOOLS_SORES_HXX
// Strings // Strings
#define STR_ERROR_OBJNOCREATE 32014 #define STR_ERROR_OBJNOCREATE 32014
#define STR_ERROR_OBJNOCREATE_FROM_FILE 32015 #define STR_ERROR_OBJNOCREATE_FROM_FILE 32015
...@@ -96,4 +99,6 @@ ...@@ -96,4 +99,6 @@
#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119) #define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119)
#define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT) #define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT)
#endif // INCLUDED_INCLUDE_SVTOOLS_SORES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 <osl/diagnose.h>
#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp>
...@@ -128,4 +130,6 @@ public: ...@@ -128,4 +130,6 @@ public:
} // namespace toolkit_namecontainer } // namespace toolkit_namecontainer
#endif // INCLUDED_INCLUDE_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,65 +17,65 @@ ...@@ -17,65 +17,65 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifndef INCLUDED_VCL_IMPDEL_HXX #ifndef INCLUDED_VCL_IMPDEL_HXX
#define INCLUDED_VCL_IMPDEL_HXX #define INCLUDED_VCL_IMPDEL_HXX
#include <list> #include <list>
namespace vcl namespace vcl
{ {
class DeletionListener; class DeletionListener;
class DeletionNotifier class DeletionNotifier
{ {
std::list< DeletionListener* > m_aListeners; std::list< DeletionListener* > m_aListeners;
protected: protected:
DeletionNotifier() {} DeletionNotifier() {}
~DeletionNotifier() ~DeletionNotifier()
{ notifyDelete(); } { notifyDelete(); }
inline void notifyDelete(); inline void notifyDelete();
public: public:
void addDel( DeletionListener* pListener ) void addDel( DeletionListener* pListener )
{ m_aListeners.push_back( pListener ); } { m_aListeners.push_back( pListener ); }
void removeDel( DeletionListener* pListener ) void removeDel( DeletionListener* pListener )
{ m_aListeners.remove( pListener ); } { m_aListeners.remove( pListener ); }
}; };
class DeletionListener class DeletionListener
{ {
DeletionNotifier* m_pNotifier; DeletionNotifier* m_pNotifier;
public: public:
DeletionListener( DeletionNotifier* pNotifier ) DeletionListener( DeletionNotifier* pNotifier )
: m_pNotifier( pNotifier ) : m_pNotifier( pNotifier )
{ {
if( m_pNotifier ) if( m_pNotifier )
m_pNotifier->addDel( this ); m_pNotifier->addDel( this );
} }
~DeletionListener() ~DeletionListener()
{ {
if( m_pNotifier ) if( m_pNotifier )
m_pNotifier->removeDel( this ); m_pNotifier->removeDel( this );
} }
void deleted() { m_pNotifier = NULL; } void deleted() { m_pNotifier = NULL; }
bool isDeleted() const { return (m_pNotifier == NULL); } bool isDeleted() const { return (m_pNotifier == NULL); }
}; };
inline void DeletionNotifier::notifyDelete() inline void DeletionNotifier::notifyDelete()
{ {
for( std::list< DeletionListener* >::const_iterator it = for( std::list< DeletionListener* >::const_iterator it =
m_aListeners.begin(); it != m_aListeners.end(); ++it ) m_aListeners.begin(); it != m_aListeners.end(); ++it )
(*it)->deleted(); (*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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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/conditn.h>
#include <osl/thread.h> #include <osl/thread.h>
#include <tools/link.hxx> #include <tools/link.hxx>
...@@ -246,4 +249,6 @@ inline typename FuncT::result_type syncExecute( FuncT const& func ) ...@@ -246,4 +249,6 @@ inline typename FuncT::result_type syncExecute( FuncT const& func )
} // namespace solarthread } // namespace solarthread
} // namespace vcl } // namespace vcl
#endif // INCLUDED_INCLUDE_VCL_THREADEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * 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 <sal/config.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/languagetag.hxx>
...@@ -32,4 +35,6 @@ struct LanguageTagODF ...@@ -32,4 +35,6 @@ struct LanguageTagODF
LanguageTag getLanguageTag() const { return LanguageTag( maRfcLanguageTag, maLanguage, maScript, maCountry); } LanguageTag getLanguageTag() const { return LanguageTag( maRfcLanguageTag, maLanguage, maScript, maCountry); }
}; };
#endif // INCLUDED_INCLUDE_XMLOFF_LANGUAGETAGODF_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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/pipe.hxx>
#include <osl/socket.hxx> #include <osl/socket.hxx>
...@@ -65,4 +68,6 @@ namespace io_acceptor { ...@@ -65,4 +68,6 @@ namespace io_acceptor {
} }
#endif // INCLUDED_IO_SOURCE_ACCEPTOR_ACCEPTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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/implbase1.hxx>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase2.hxx>
...@@ -24,8 +27,8 @@ ...@@ -24,8 +27,8 @@
#include <com/sun/star/connection/XConnectionBroadcaster.hpp> #include <com/sun/star/connection/XConnectionBroadcaster.hpp>
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
# include <osl/socket.hxx> #include <osl/socket.hxx>
# include <osl/pipe.hxx> #include <osl/pipe.hxx>
namespace stoc_connector namespace stoc_connector
{ {
...@@ -130,5 +133,6 @@ namespace stoc_connector ...@@ -130,5 +133,6 @@ namespace stoc_connector
}; };
} }
#endif // INCLUDED_IO_SOURCE_CONNECTOR_CONNECTOR.HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 // Save NDEBUG state
#ifdef NDEBUG #ifdef NDEBUG
#define STREAMHELPER_HXX_HAD_NDEBUG #define STREAMHELPER_HXX_HAD_NDEBUG
...@@ -153,4 +156,6 @@ public: ...@@ -153,4 +156,6 @@ public:
} }
#endif // INCLUDED_IO_SOURCE_STM_STREAMHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment