diff options
86 files changed, 273 insertions, 248 deletions
diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index d95b90669987..e4b3a886d674 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef CHART2_ABSTRACT_SHAPE_FACTORY -#define CHART2_ABSTRACT_SHAPE_FACTORY +#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_ABSTRACTSHAPEFACTORY_HXX +#define INCLUDED_CHART2_SOURCE_VIEW_INC_ABSTRACTSHAPEFACTORY_HXX #include "PropertyMapper.hxx" #include "VLineProperties.hxx" diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx b/chart2/source/view/inc/OpenglShapeFactory.hxx index 63fc02b7c138..896249e90dab 100644 --- a/chart2/source/view/inc/OpenglShapeFactory.hxx +++ b/chart2/source/view/inc/OpenglShapeFactory.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef CHART2_OPENGL_SHAPE_FACTORY -#define CHART2_OPENGL_SHAPE_FACTORY +#ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_OPENGLSHAPEFACTORY_HXX +#define INCLUDED_CHART2_SOURCE_VIEW_INC_OPENGLSHAPEFACTORY_HXX #include "AbstractShapeFactory.hxx" diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 8f0f5cd02866..515ffd453ac5 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -126,6 +126,7 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SPREPAREDSTATEMENT_HXX + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NPREPAREDSTATEMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 20b676ce7352..e1bf253e514b 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -190,6 +190,7 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SRESULTSET_HXX + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NRESULTSET_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index 1fb048e41007..b6ddc6d74f05 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx @@ -77,6 +77,6 @@ namespace connectivity } } -#endif // CONNECTIVITY_SRESULSETMETADATA_HXX +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NRESULTSETMETADATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 27ad32e4fcc7..0a499aadd255 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -270,6 +270,7 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SSTATEMENT_HXX + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NSTATEMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 1b42a64e859f..1c783bbfedb3 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -254,6 +254,6 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SCONNECTION_HXX +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_CONNECTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index bf9146ef3696..1d7549815795 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef CONNECTIVITY_SCONNECTION_HXX -#define CONNECTIVITY_SCONNECTION_HXX +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCONNECTION_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCONNECTION_HXX #include <connectivity/CommonTools.hxx> @@ -113,6 +113,6 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SCONNECTION_HXX +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCONNECTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MNSFolders.hxx b/connectivity/source/drivers/mork/MNSFolders.hxx index 552fc2bc3d01..ade47dab4e05 100644 --- a/connectivity/source/drivers/mork/MNSFolders.hxx +++ b/connectivity/source/drivers/mork/MNSFolders.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _MNSFOLDERS_HXX_ -#define _MNSFOLDERS_HXX_ +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MNSFOLDERS_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MNSFOLDERS_HXX #include <sal/types.h> #include <osl/diagnose.h> diff --git a/connectivity/source/drivers/mork/MNSINIParser.hxx b/connectivity/source/drivers/mork/MNSINIParser.hxx index 8cfbd2856f5c..afdd742d5185 100644 --- a/connectivity/source/drivers/mork/MNSINIParser.hxx +++ b/connectivity/source/drivers/mork/MNSINIParser.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __MNSINIPARSER_HXX__ -#define __MNSINIPARSER_HXX__ + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MNSINIPARSER_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MNSINIPARSER_HXX #include <rtl/ustring.hxx> #include <com/sun/star/io/IOException.hpp> diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx index 5ae56886ccaf..3680609adde4 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __MNSProfileDiscover_h___ -#define __MNSProfileDiscover_h___ +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MNSPROFILEDISCOVER_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MNSPROFILEDISCOVER_HXX #include <sal/types.h> #include <osl/diagnose.h> @@ -84,6 +84,6 @@ namespace connectivity } } -#endif // __MNSProfileDiscover_h___ +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MNSPROFILEDISCOVER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index 7454645c8dc8..3091680abbeb 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX -#define CONNECTIVITY_SPREPAREDSTATEMENT_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MPREPAREDSTATEMENT_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MPREPAREDSTATEMENT_HXX #include "MResultSet.hxx" #include "MStatement.hxx" @@ -151,6 +152,7 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SPREPAREDSTATEMENT_HXX + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MPREPAREDSTATEMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 36874a3ea18d..7ae814ca79e4 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SRESULTSET_HXX -#define CONNECTIVITY_SRESULTSET_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MRESULTSET_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MRESULTSET_HXX #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> @@ -352,6 +353,7 @@ public: } } -#endif // CONNECTIVITY_SRESULTSET_HXX + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MRESULTSET_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx index b72b85388a52..8e17892a8780 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SRESULSETMETADATA_HXX -#define CONNECTIVITY_SRESULSETMETADATA_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MRESULTSETMETADATA_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MRESULTSETMETADATA_HXX #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase1.hxx> @@ -87,6 +88,6 @@ namespace connectivity } } -#endif // CONNECTIVITY_SRESULSETMETADATA_HXX +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MRESULTSETMETADATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index c1b35cdbddfb..0ca38cffde17 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SSTATEMENT_HXX -#define CONNECTIVITY_SSTATEMENT_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MSTATEMENT_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MSTATEMENT_HXX #include <com/sun/star/sdbc/XStatement.hpp> #include <com/sun/star/sdbc/XWarningsSupplier.hpp> @@ -197,6 +198,7 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SSTATEMENT_HXX + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MSTATEMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 1a95d52916ed..7501e978aa18 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SCONNECTION_HXX -#define CONNECTIVITY_SCONNECTION_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MCONNECTION_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MCONNECTION_HXX #include <connectivity/CommonTools.hxx> @@ -218,6 +219,7 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SCONNECTION_HXX + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MCONNECTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx index 49fa119d5858..553aff56e7b1 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx @@ -16,8 +16,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SDATABASEMETADATA_HXX -#define CONNECTIVITY_SDATABASEMETADATA_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MDATABASEMETADATA_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MDATABASEMETADATA_HXX + #include "MConnection.hxx" #include "mozillasrc/MDatabaseMetaDataHelper.hxx" #include "TDatabaseMetaDataBase.hxx" @@ -193,6 +195,6 @@ namespace connectivity } } -#endif // CONNECTIVITY_SDATABASEMETADATA_HXX +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MDATABASEMETADATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx index d161a69a4cf5..155971e4ccbb 100644 --- a/connectivity/source/drivers/mozab/MDriver.hxx +++ b/connectivity/source/drivers/mozab/MDriver.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SDRIVER_HXX -#define CONNECTIVITY_SDRIVER_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MDRIVER_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MDRIVER_HXX #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -99,6 +100,6 @@ namespace connectivity } -#endif // CONNECTIVITY_SDRIVER_HXX +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MDRIVER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx index 27322d37a276..4ad17644f897 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX -#define CONNECTIVITY_SPREPAREDSTATEMENT_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MPREPAREDSTATEMENT_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MPREPAREDSTATEMENT_HXX #include "MResultSet.hxx" #include "MStatement.hxx" @@ -151,6 +152,7 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SPREPAREDSTATEMENT_HXX + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MPREPAREDSTATEMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index 46898f254bc4..4ae7eb127963 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SRESULTSET_HXX -#define CONNECTIVITY_SRESULTSET_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MRESULTSET_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MRESULTSET_HXX #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> @@ -353,6 +354,6 @@ public: } } -#endif // CONNECTIVITY_SRESULTSET_HXX +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MRESULTSET_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx index 18a50c547c11..27a0b44bbf2c 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SRESULSETMETADATA_HXX -#define CONNECTIVITY_SRESULSETMETADATA_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MRESULTSETMETADATA_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MRESULTSETMETADATA_HXX #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase1.hxx> @@ -87,6 +88,6 @@ namespace connectivity } } -#endif // CONNECTIVITY_SRESULSETMETADATA_HXX +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MRESULTSETMETADATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index e459a8f1f68e..070e74747467 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SSTATEMENT_HXX -#define CONNECTIVITY_SSTATEMENT_HXX + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MSTATEMENT_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MSTATEMENT_HXX #include <com/sun/star/sdbc/XStatement.hpp> #include <com/sun/star/sdbc/XWarningsSupplier.hpp> @@ -197,6 +198,7 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SSTATEMENT_HXX + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MSTATEMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx index 552fc2bc3d01..114d20aad14b 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _MNSFOLDERS_HXX_ -#define _MNSFOLDERS_HXX_ +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSFOLDERS_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSFOLDERS_HXX #include <sal/types.h> #include <osl/diagnose.h> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index 8cfbd2856f5c..b5795c1c668b 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __MNSINIPARSER_HXX__ -#define __MNSINIPARSER_HXX__ +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSINIPARSER_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSINIPARSER_HXX #include <rtl/ustring.hxx> #include <com/sun/star/io/IOException.hpp> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx index e76ea3e89897..5f407c4b69af 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY/SOURCE/DRIVERS/MOZAB/BOOTSTRAP/MNSPROFILE.HXX -#define INCLUDED_CONNECTIVITY/SOURCE/DRIVERS/MOZAB/BOOTSTRAP/MNSPROFILE.HXX +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSPROFILE_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSPROFILE_HXX #include "mozilla_nsprofile.h" @@ -67,6 +67,6 @@ public: extern nsresult ConvertStringToUnicode(nsCString& aCharset, const char* inString, nsAString& outString); extern nsresult GetPlatformCharset(nsCString& aCharset); -#endif // INCLUDED_CONNECTIVITY/SOURCE/DRIVERS/MOZAB/BOOTSTRAP/MNSPROFILE.HXX +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSPROFILE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index f5ee6a6f6f5a..a897453380eb 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __MNSProfileDiscover_h___ -#define __MNSProfileDiscover_h___ +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSPROFILEDISCOVER_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSPROFILEDISCOVER_HXX #ifndef MINIMAL_PROFILEDISCOVER #include "mozilla_profile_discover.h" @@ -111,6 +111,6 @@ namespace connectivity } } -#endif // __MNSProfileDiscover_h___ +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSPROFILEDISCOVER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx index d0d95d4e8cfe..88f6f102a225 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSRUNNABLE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSRUNNABLE_HXX + #include "mozillasrc/MNSDeclares.hxx" #include <osl/thread.hxx> @@ -55,6 +56,7 @@ namespace connectivity }; } } -#endif //_CONNECTIVITY_MAB_MOZABHELPER_HXX_ + +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSRUNNABLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx index 97c2882e64a5..c41259394021 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _CONNECTIVITY_MAB_MOZABHELPER_HXX_ -#define _CONNECTIVITY_MAB_MOZABHELPER_HXX_ +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MOZILLASRC_MNSMOZABPROXY_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MOZILLASRC_MNSMOZABPROXY_HXX #include "MNSDeclares.hxx" #include <osl/thread.hxx> @@ -102,6 +102,6 @@ namespace connectivity }; } } -#endif //_CONNECTIVITY_MAB_MOZABHELPER_HXX_ +#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MOZILLASRC_MNSMOZABPROXY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index 4f34c2a52806..b3b3aebabd9e 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -34,8 +34,8 @@ * ************************************************************************/ -#ifndef _PQ_TOOLS_ -#define _PQ_TOOLS_ +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_TOOLS_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_TOOLS_HXX #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XParameters.hpp> diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index 8df9ed0d761e..12a96580ca43 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _CONNECTIVITY_OTYPEINFO_HXX_ -#define _CONNECTIVITY_OTYPEINFO_HXX_ +#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_OTYPEINFO_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_INC_OTYPEINFO_HXX #include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/DataType.hpp> @@ -78,7 +78,7 @@ namespace connectivity inline OUString getDBName() const { return aTypeName; } }; } -#endif // _CONNECTIVITY_OTYPEINFO_HXX_ +#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_OTYPEINFO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx index f3eb554ed7af..93c206ca3f6a 100644 --- a/connectivity/source/inc/propertyids.hxx +++ b/connectivity/source/inc/propertyids.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_ -#define _CONNECTIVITY_PROPERTYIDS_HXX_ + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_PROPERTYIDS_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_INC_PROPERTYIDS_HXX // this define has to be set to split the names into different dll's or so's // every dll has his own set of property names @@ -131,6 +132,6 @@ namespace connectivity #define PROPERTY_ID_VALUE 60 #define PROPERTY_ID_ACTIVE_CONNECTION 61 -#endif // _CONNECTIVITY_PROPERTYIDS_HXX_ +#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_PROPERTYIDS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index 86234171ba79..d00ffceea144 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_SRESULTSET_HXX -#define CONNECTIVITY_SRESULTSET_HXX +#ifndef INCLUDED_CONNECTIVITY_WORKBEN_SKELETON_SRESULTSET_HXX +#define INCLUDED_CONNECTIVITY_WORKBEN_SKELETON_SRESULTSET_HXX #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> @@ -235,6 +235,6 @@ namespace connectivity }; } } -#endif // CONNECTIVITY_SRESULTSET_HXX +#endif // INCLUDED_CONNECTIVITY_WORKBEN_SKELETON_SRESULTSET_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h index ca99b45c9578..68d9778b7bc1 100644 --- a/extensions/source/activex/SOActionsApproval.h +++ b/extensions/source/activex/SOActionsApproval.h @@ -19,8 +19,8 @@ // SOActionsApproval.h: Definition of the SOActionsApproval class -#ifndef __SODOCUMENTEVENTLISTENER_H_ -#define __SODOCUMENTEVENTLISTENER_H_ +#ifndef INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIONSAPPROVAL_H +#define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIONSAPPROVAL_H #ifdef _MSC_VER #pragma once @@ -90,6 +90,6 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SODOCUMENTEVENTLISTENER) } }; -#endif // __SODOCUMENTEVENTLISTENER_H_ +#endif // INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIONSAPPROVAL_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h index 528eb3dba404..f0ec8c47b64d 100644 --- a/extensions/source/activex/SODispatchInterceptor.h +++ b/extensions/source/activex/SODispatchInterceptor.h @@ -19,8 +19,8 @@ // SODispatchInterceptor.h: Definition of the SODispatchInterceptor class -#ifndef __SODISPATCHINTERCEPTOR_H_ -#define __SODISPATCHINTERCEPTOR_H_ +#ifndef INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SODISPATCHINTERCEPTOR_H +#define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SODISPATCHINTERCEPTOR_H #ifdef _MSC_VER #pragma once @@ -166,6 +166,6 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SODISPATCHINTERCEPTOR) } }; -#endif // __SODISPATCHINTERCEPTOR_H_ +#endif // INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SODISPATCHINTERCEPTOR_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h index f200129ed883..810c1a8964c1 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h @@ -18,8 +18,8 @@ */ // Callback.h : Declaration of the CCallback -#ifndef __CALLBACK_H_ -#define __CALLBACK_H_ +#ifndef INCLUDED_EXTENSIONS_TEST_OLE_UNOTOCOMCALLS_XCALLBACK_IMPL_CALLBACK_H +#define INCLUDED_EXTENSIONS_TEST_OLE_UNOTOCOMCALLS_XCALLBACK_IMPL_CALLBACK_H #include "resource.h" @@ -123,7 +123,7 @@ public: STDMETHOD(func1)(); }; -#endif //__CALLBACK_H_ +#endif // INCLUDED_EXTENSIONS_TEST_OLE_UNOTOCOMCALLS_XCALLBACK_IMPL_CALLBACK_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h index e617ca6d763c..cf140245e969 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h @@ -18,8 +18,8 @@ */ // Simple.h : Declaration of the CSimple -#ifndef __SIMPLE_H_ -#define __SIMPLE_H_ +#ifndef INCLUDED_EXTENSIONS_TEST_OLE_UNOTOCOMCALLS_XCALLBACK_IMPL_SIMPLE_H +#define INCLUDED_EXTENSIONS_TEST_OLE_UNOTOCOMCALLS_XCALLBACK_IMPL_SIMPLE_H #include "resource.h" @@ -53,6 +53,6 @@ public: STDMETHOD(func)( BSTR message); }; -#endif //__SIMPLE_H_ +#endif // INCLUDED_EXTENSIONS_TEST_OLE_UNOTOCOMCALLS_XCALLBACK_IMPL_SIMPLE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/helpcontent2 b/helpcontent2 -Subproject a87da6b2546423f1727b2d857dcfe78aa6bf53a +Subproject 2a0b4747b5a83386f1b9c3935d5eb484429c605 diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx index 96b1831e59d8..b88bae441455 100644 --- a/include/comphelper/accessibleeventnotifier.hxx +++ b/include/comphelper/accessibleeventnotifier.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER -#define COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER +#ifndef INCLUDED_COMPHELPER_ACCESSIBLEEVENTNOTIFIER_HXX +#define INCLUDED_COMPHELPER_ACCESSIBLEEVENTNOTIFIER_HXX #include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> @@ -124,8 +124,6 @@ namespace comphelper } // namespace comphelper - -#endif // COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER - +#endif // INCLUDED_COMPHELPER_ACCESSIBLEEVENTNOTIFIER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index 8be7b69c3dd2..725294b1ca75 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef COMPHELPER_PROXY_AGGREGATION -#define COMPHELPER_PROXY_AGGREGATION +#ifndef INCLUDED_COMPHELPER_PROXYAGGREGATION_HXX +#define INCLUDED_COMPHELPER_PROXYAGGREGATION_HXX #include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -220,6 +220,6 @@ namespace comphelper -#endif // COMPHELPER_PROXY_AGGREGATION +#endif // INCLUDED_COMPHELPER_PROXYAGGREGATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/OSubComponent.hxx b/include/connectivity/OSubComponent.hxx index f57e0b09a51d..8aa9404982ff 100644 --- a/include/connectivity/OSubComponent.hxx +++ b/include/connectivity/OSubComponent.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _CONNECTIVITY_OSUBCOMPONENT_HXX_ -#define _CONNECTIVITY_OSUBCOMPONENT_HXX_ +#ifndef INCLUDED_CONNECTIVITY_OSUBCOMPONENT_HXX +#define INCLUDED_CONNECTIVITY_OSUBCOMPONENT_HXX #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.h> @@ -81,6 +81,7 @@ namespace connectivity } }; } -#endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_ + +#endif // INCLUDED_CONNECTIVITY_OSUBCOMPONENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx index 7f75d644cd30..a3570bb87071 100644 --- a/include/formula/IFunctionDescription.hxx +++ b/include/formula/IFunctionDescription.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDE_FUNCTION_DESCRIPTION -#define INCLUDE_FUNCTION_DESCRIPTION +#ifndef INCLUDED_FORMULA_IFUNCTIONDESCRIPTION_HXX +#define INCLUDED_FORMULA_IFUNCTIONDESCRIPTION_HXX #include <vector> #include <memory> @@ -165,6 +165,6 @@ namespace formula }; } -#endif //INCLUDE_FUNCTION_DESCRIPTION +#endif // INCLUDED_FORMULA_IFUNCTIONDESCRIPTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx index ed03b1d7934b..79ec4cb02d69 100644 --- a/include/oox/ppt/slidefragmenthandler.hxx +++ b/include/oox/ppt/slidefragmenthandler.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef OOX_PPT_SLIDEFRAGMENTHANDLER -#define OOX_PPT_SLIDEFRAGMENTHANDLER +#ifndef INCLUDED_OOX_PPT_SLIDEFRAGMENTHANDLER_HXX +#define INCLUDED_OOX_PPT_SLIDEFRAGMENTHANDLER_HXX #include <com/sun/star/drawing/XDrawPage.hpp> #include <oox/helper/propertymap.hxx> @@ -55,6 +55,6 @@ private: } } -#endif // OOX_PPT_SLIDEFRAGMENTHANDLER +#endif // INCLUDED_OOX_PPT_SLIDEFRAGMENTHANDLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/osl/time.h b/include/osl/time.h index 1b35d20be8bc..335f552e7467 100644 --- a/include/osl/time.h +++ b/include/osl/time.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _OSL_TIME_H_ -#define _OSL_TIME_H_ +#ifndef INCLUDED_OSL_TIME_H +#define INCLUDED_OSL_TIME_H #include <sal/config.h> @@ -154,6 +154,6 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getGlobalTimer(void); } #endif -#endif /* _OSL_TIME_H_ */ +#endif // INCLUDED_OSL_TIME_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 98b493bde8b5..b312606d1ff2 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_FRMDESCRHXX -#define _SFX_FRMDESCRHXX +#ifndef INCLUDED_SFX2_FRMDESCR_HXX +#define INCLUDED_SFX2_FRMDESCR_HXX #include <rtl/ustring.hxx> #include <sal/config.h> @@ -253,6 +253,6 @@ public: { aProperties = rProp; } }; -#endif // #ifndef _SFX_FRMDESCRHXX +#endif // INCLUDED_SFX2_FRMDESCR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/systools/win32/comtools.hxx b/include/systools/win32/comtools.hxx index 1ef61ea3d967..0cbe54f1acaf 100644 --- a/include/systools/win32/comtools.hxx +++ b/include/systools/win32/comtools.hxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef INCLUDED_SYSTOOLS_WIN32_COMTOOLS_HXX +#define INCLUDED_SYSTOOLS_WIN32_COMTOOLS_HXX #include <string> #include <stdexcept> @@ -184,4 +185,6 @@ typedef sal::systools::COMReference<IDataObject> IDataObjectPtr; typedef sal::systools::COMReference<IStream> IStreamPtr; typedef sal::systools::COMReference<IEnumFORMATETC> IEnumFORMATETCPtr; +#endif // INCLUDED_SYSTOOLS_WIN32_COMTOOLS_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/systools/win32/uwinapi.h b/include/systools/win32/uwinapi.h index 4aa6997d7a87..db2faead0c29 100644 --- a/include/systools/win32/uwinapi.h +++ b/include/systools/win32/uwinapi.h @@ -17,7 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef INCLUDED_SYSTOOLS_WIN32_UWINAPI_H +#define INCLUDED_SYSTOOLS_WIN32_UWINAPI_H + #include <sal/macros.h> #ifdef _UWINAPI_ # define _KERNEL32_ @@ -55,4 +57,6 @@ inline bool IsValidHandle(HANDLE handle) #endif /* __cplusplus */ +#endif // INCLUDED_SYSTOOLS_WIN32_UWINAPI_H + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/test/mtfxmldump.hxx b/include/test/mtfxmldump.hxx index e630a4c84c9d..9da10c207ca2 100644 --- a/include/test/mtfxmldump.hxx +++ b/include/test/mtfxmldump.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef MFTXMLDUMP_HXX -#define MFTXMLDUMP_HXX +#ifndef INCLUDED_TEST_MTFXMLDUMP_HXX +#define INCLUDED_TEST_MTFXMLDUMP_HXX #include <sal/config.h> #include <test/testdllapi.hxx> diff --git a/include/test/sheet/xgoalseek.hxx b/include/test/sheet/xgoalseek.hxx index 0f91efb03a52..cb984f20fb66 100644 --- a/include/test/sheet/xgoalseek.hxx +++ b/include/test/sheet/xgoalseek.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDE_TEST_SHEET_XGOALSEEK_HXX -#define INCLUDE_TEST_SHEET_XGOALSEEK_HXX +#ifndef INCLUDED_TEST_SHEET_XGOALSEEK_HXX +#define INCLUDED_TEST_SHEET_XGOALSEEK_HXX #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> @@ -28,6 +28,6 @@ protected: } -#endif // INCLUDE_TEST_SHEET_XGOALSEEK_HXX +#endif // INCLUDED_TEST_SHEET_XGOALSEEK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/test/xmlwriter.hxx b/include/test/xmlwriter.hxx index 1f5bfc729986..894c9286a1b7 100644 --- a/include/test/xmlwriter.hxx +++ b/include/test/xmlwriter.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef XML_WRITER_HXX -#define XML_WRITER_HXX +#ifndef INCLUDED_TEST_XMLWRITER_HXX +#define INCLUDED_TEST_XMLWRITER_HXX #include <test/testdllapi.hxx> @@ -40,6 +40,6 @@ public: void content(const OUString& aValue); }; -#endif // XML_WRITER_HXX +#endif // INCLUDED_TEST_XMLWRITER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/uno/threadpool.h b/include/uno/threadpool.h index be744879cec5..d1e738b264d1 100644 --- a/include/uno/threadpool.h +++ b/include/uno/threadpool.h @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_UNO_THREADPOOL_H +#define INCLUDED_UNO_THREADPOOL_H + #include <cppu/cppudllapi.h> #include <rtl/byteseq.h> @@ -182,4 +185,6 @@ uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); } #endif +#endif // INCLUDED_UNO_THREADPOOL_H + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/helperdecl.hxx b/include/vbahelper/helperdecl.hxx index a8a3d75142e0..3f1c53418049 100644 --- a/include/vbahelper/helperdecl.hxx +++ b/include/vbahelper/helperdecl.hxx @@ -16,8 +16,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef OOVBAAPI_SERV_DECL -#define OOVBAAPI_SERV_DECL + +#ifndef INCLUDED_VBAHELPER_HELPERDECL_HXX +#define INCLUDED_VBAHELPER_HELPERDECL_HXX + #include <comphelper/servicedecl.hxx> #include <ooo/vba/XHelperInterface.hpp> @@ -44,6 +46,7 @@ struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<Impl } // namespace service_decl } // namespace comphelper + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index e27a64d81246..260e5d59a68e 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_RSC_SOURCE_RSCPP_CPP_H +#define INCLUDED_RSC_SOURCE_RSCPP_CPP_H #ifndef TRUE #define TRUE 1 @@ -398,4 +400,6 @@ void dumpdef( char *why ); void dumpadef( char *why, DEFBUF *dp ); #endif +#endif // INCLUDED_RSC_SOURCE_RSCPP_CPP_H + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h index a9ed59e43b44..bd46badf1a80 100644 --- a/rsc/source/rscpp/cppdef.h +++ b/rsc/source/rscpp/cppdef.h @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_RSC_SOURCE_RSCPP_CPPDEF_H +#define INCLUDED_RSC_SOURCE_RSCPP_CPPDEF_H + /* * This redundant definition of TRUE and FALSE works around * a limitation of Decus C. @@ -320,4 +323,6 @@ #endif #endif +#endif // INCLUDED_RSC_SOURCE_RSCPP_CPPDEF_H + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/salhelper/test/Symbols/samplelib.hxx b/salhelper/test/Symbols/samplelib.hxx index 7ba44405b7a0..e2d956591bb5 100644 --- a/salhelper/test/Symbols/samplelib.hxx +++ b/salhelper/test/Symbols/samplelib.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __SAMPLELIB_HXX_ -#define __SAMPLELIB_HXX_ +#ifndef INCLUDED_SALHELPER_TEST_SYMBOLS_SAMPLELIB_HXX +#define INCLUDED_SALHELPER_TEST_SYMBOLS_SAMPLELIB_HXX #include <sal/types.h> diff --git a/salhelper/test/dynamicloader/samplelib.hxx b/salhelper/test/dynamicloader/samplelib.hxx index 7ba44405b7a0..06088646c1c4 100644 --- a/salhelper/test/dynamicloader/samplelib.hxx +++ b/salhelper/test/dynamicloader/samplelib.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __SAMPLELIB_HXX_ -#define __SAMPLELIB_HXX_ +#ifndef INCLUDED_SALHELPER_TEST_DYNAMICLOADER_SAMPLELIB_HXX +#define INCLUDED_SALHELPER_TEST_DYNAMICLOADER_SAMPLELIB_HXX #include <sal/types.h> diff --git a/sc/source/core/opencl/opinlinefun_math.hxx b/sc/source/core/opencl/opinlinefun_math.hxx index a8130919245a..7666f9d36095 100644 --- a/sc/source/core/opencl/opinlinefun_math.hxx +++ b/sc/source/core/opencl/opinlinefun_math.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef SC_OPENCL_OPINLINFUN_MATH -#define SC_OPENCL_OPINLINFUN_MATH +#ifndef INCLUDED_SC_SOURCE_CORE_OPENCL_OPINLINEFUN_MATH_HXX +#define INCLUDED_SC_SOURCE_CORE_OPENCL_OPINLINEFUN_MATH_HXX std::string Math_Intg_Str= "\ndouble Intg(double n)\n\ @@ -87,6 +87,6 @@ std::string atan2Content = "}\n"; -#endif //SC_OPENCL_OPINLINFUN_MATH +#endif // INCLUDED_SC_SOURCE_CORE_OPENCL_OPINLINEFUN_MATH_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 8669a2a60acb..a13ae02018f1 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SDEXT_PRESENTER_CURRENT_SLIDE_OBSERVER -#define SDEXT_PRESENTER_CURRENT_SLIDE_OBSERVER +#ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERCURRENTSLIDEOBSERVER_HXX +#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERCURRENTSLIDEOBSERVER_HXX #include "PresenterController.hxx" #include <com/sun/star/presentation/XSlideShow.hpp> diff --git a/setup_native/source/win32/customactions/quickstarter/quickstarter.hxx b/setup_native/source/win32/customactions/quickstarter/quickstarter.hxx index e4b8df480a05..b7fb07c3197f 100644 --- a/setup_native/source/win32/customactions/quickstarter/quickstarter.hxx +++ b/setup_native/source/win32/customactions/quickstarter/quickstarter.hxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once +#ifndef INCLUDED_SETUP_NATIVE_SOURCE_WIN32_CUSTOMACTIONS_QUICKSTARTER_QUICKSTARTER_HXX +#define INCLUDED_SETUP_NATIVE_SOURCE_WIN32_CUSTOMACTIONS_QUICKSTARTER_QUICKSTARTER_HXX #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ @@ -36,4 +37,6 @@ std::string GetOfficeProductName(MSIHANDLE handle); std::string GetQuickstarterLinkName(MSIHANDLE handle); std::string GetProcessImagePath( DWORD dwProcessId ); +#endif // INCLUDED_SETUP_NATIVE_SOURCE_WIN32_CUSTOMACTIONS_QUICKSTARTER_QUICKSTARTER_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx index 7c3d58e19a3c..68c581267781 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx @@ -17,15 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX +#define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX + #include "internal/types.hxx" //+------------------------------------------------------------------------- // Contents: LibreOffice filter declarations // Platform: Windows 2000, Windows XP - -#pragma once - //+------------------------------------------------------------------------- // forward declaration @@ -196,4 +196,6 @@ private: long m_lRefs; // Reference count }; +#endif // INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx index b9606ddd800f..5959cbf147b1 100644 --- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx @@ -16,11 +16,14 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + +#ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_PROPSPEC_HXX +#define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_PROPSPEC_HXX + //+------------------------------------------------------------------------- // File: propspec.hxx // Contents: C++ wrapper(s) for FULLPROPSPEC -#pragma once #if defined _MSC_VER #pragma warning(push, 1) #endif @@ -127,7 +130,6 @@ inline BOOL CFullPropSpec::IsPropertyPropid() const return( _psProperty.ulKind == PRSPEC_PROPID ); } - - +#endif // INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_PROPSPEC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx index e72e87554458..ab3a4466a28f 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.hxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SLIDESHOW_ANIMATIONAUDIONODE_HXX -#define INCLUDED_SLIDESHOW_ANIMATIONAUDIONODE_HXX +#ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONAUDIONODE_HXX +#define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONAUDIONODE_HXX #include "basecontainernode.hxx" #include "soundplayer.hxx" @@ -66,6 +66,6 @@ private: } // namespace internal } // namespace slideshow -#endif /* INCLUDED_SLIDESHOW_ANIMATIONAUDIONODE_HXX */ +#endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONAUDIONODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx index dfc309e056a9..30a89e96f47a 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx @@ -16,6 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOMMANDNODE_HXX #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOMMANDNODE_HXX @@ -57,6 +58,6 @@ private: } // namespace internal } // namespace slideshow -#endif /* INCLUDED_SLIDESHOW_ANIMATIONAUDIONODE_HXX */ +#endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_ANIMATIONCOMMANDNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 9fa2dace14c9..ffff7a308c70 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -16,6 +16,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + +#ifndef INCLUDED_SVL_SOURCE_INC_POOLIO_HXX +#define INCLUDED_SVL_SOURCE_INC_POOLIO_HXX + #include <svl/brdcst.hxx> #include <boost/shared_ptr.hpp> #include <deque> @@ -219,4 +223,6 @@ struct SfxItemPool_Impl #define SFX_STYLES_REC_HEADER sal_uInt16(0x0010) #define SFX_STYLES_REC_STYLES sal_uInt16(0x0020) +#endif // INCLUDED_SVL_SOURCE_INC_POOLIO_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/sprmids.hxx b/sw/source/filter/ww8/sprmids.hxx index a76a6de2c6c5..3e1d3a231295 100644 --- a/sw/source/filter/ww8/sprmids.hxx +++ b/sw/source/filter/ww8/sprmids.hxx @@ -16,8 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SPRMIDS -#define INCLUDED_SPRMIDS + +#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_SPRMIDS_HXX +#define INCLUDED_SW_SOURCE_FILTER_WW8_SPRMIDS_HXX #include <sal/types.h> @@ -311,6 +312,6 @@ const sal_uInt16 LN_TFNoAllowOverlap = 0x3465; const sal_uInt16 LN_CCv = 0x6870; } -#endif // INCLUDED_SPRMIDS +#endif // INCLUDED_SW_SOURCE_FILTER_WW8_SPRMIDS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/types.hxx b/sw/source/filter/ww8/types.hxx index e33535322eab..f0fc5bde8874 100644 --- a/sw/source/filter/ww8/types.hxx +++ b/sw/source/filter/ww8/types.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef WW_TYPES -#define WW_TYPES +#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_TYPES_HXX +#define INCLUDED_SW_SOURCE_FILTER_WW8_TYPES_HXX #include <vector> diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 6955e9730277..00b63bd80ab2 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SW_WRITERHELPER -#define SW_WRITERHELPER +#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WRITERHELPER_HXX +#define INCLUDED_SW_SOURCE_FILTER_WW8_WRITERHELPER_HXX #include <typeinfo> #include <vector> diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx index 98f2c1056f31..27e71e6dfd5b 100644 --- a/sw/source/filter/ww8/writerwordglue.hxx +++ b/sw/source/filter/ww8/writerwordglue.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef SW_WRITERWORDGLUE -#define SW_WRITERWORDGLUE +#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WRITERWORDGLUE_HXX +#define INCLUDED_SW_SOURCE_FILTER_WW8_WRITERWORDGLUE_HXX #include "needed_cast.hxx" #include "types.hxx" diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index fd9eb157ae51..e91124a1ea1f 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -16,7 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once + +#ifndef INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX +#define INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX #include <vcl/dllapi.h> @@ -87,4 +89,6 @@ private: mutable int mnFallbackCount; }; +#endif // INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index 5544252d70dc..f36b6a76f67f 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -16,7 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once + +#ifndef INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX +#define INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX #include <vcl/dllapi.h> @@ -80,5 +82,7 @@ friend class PhysicalFontFamily; PhysicalFontFace* mpNext; }; +#endif // INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx index b1f56dece2db..71861e98a9d6 100644 --- a/vcl/inc/PhysicalFontFamily.hxx +++ b/vcl/inc/PhysicalFontFamily.hxx @@ -16,7 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once + +#ifndef INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX +#define INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX #include <set> @@ -82,3 +84,6 @@ private: int mnMinQuality; // quality of the worst font face }; +#endif // INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/magic.h b/vcl/inc/magic.h index 7da1d09b9b50..8f32567f7767 100644 --- a/vcl/inc/magic.h +++ b/vcl/inc/magic.h @@ -16,8 +16,12 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#pragma once + +#ifndef INCLUDED_VCL_INC_MAGIC_H +#define INCLUDED_VCL_INC_MAGIC_H #define MAX_FALLBACK 16 +#endif // INCLUDED_VCL_INC_MAGIC_H + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/x11/xlimits.hxx b/vcl/inc/unx/x11/xlimits.hxx index b97499c0baed..a60584ad417c 100644 --- a/vcl/inc/unx/x11/xlimits.hxx +++ b/vcl/inc/unx/x11/xlimits.hxx @@ -7,14 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef VCL_X11LIMITS -#define VCL_X11LIMITS +#ifndef INCLUDED_VCL_INC_UNX_X11_XLIMITS_HXX +#define INCLUDED_VCL_INC_UNX_X11_XLIMITS_HXX #include <X11/Xlib.h> #include <vclpluginapi.h> VCLPLUG_GEN_PUBLIC Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int width, unsigned int height, unsigned int depth); -#endif +#endif // INCLUDED_VCL_INC_UNX_X11_XLIMITS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h b/winaccessibility/source/UAccCOM/AccActionBase.h index 8444476e4144..242112f7e785 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.h +++ b/winaccessibility/source/UAccCOM/AccActionBase.h @@ -17,16 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // AccActionBase.h: interface for the CAccActionBase class. - -#if !defined(AFX_ACCACTIONBASE_H__F87FAD24_D66E_4D22_9B24_3304A303DC84__INCLUDED_) -#define AFX_ACCACTIONBASE_H__F87FAD24_D66E_4D22_9B24_3304A303DC84__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTIONBASE_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTIONBASE_H #include <com/sun/star/uno/reference.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> @@ -85,6 +79,6 @@ private: } }; -#endif // !defined(AFX_ACCACTIONBASE_H__F87FAD24_D66E_4D22_9B24_3304A303DC84__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTIONBASE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccComponent.h b/winaccessibility/source/UAccCOM/AccComponent.h index 817487800f84..a0a11d12f897 100644 --- a/winaccessibility/source/UAccCOM/AccComponent.h +++ b/winaccessibility/source/UAccCOM/AccComponent.h @@ -17,12 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined(AFX_ACCCOMPONENT_H__626D760C_3944_4B0E_BB4D_F0D20AEDF7DC__INCLUDED_) -#define AFX_ACCCOMPONENT_H__626D760C_3944_4B0E_BB4D_F0D20AEDF7DC__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMPONENT_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMPONENT_H #include "resource.h" // main symbols @@ -89,6 +85,6 @@ public: }; -#endif // !defined(AFX_ACCCOMPONENT_H__626D760C_3944_4B0E_BB4D_F0D20AEDF7DC__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMPONENT_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.h b/winaccessibility/source/UAccCOM/AccComponentBase.h index 6d72b39e3251..65092c896598 100644 --- a/winaccessibility/source/UAccCOM/AccComponentBase.h +++ b/winaccessibility/source/UAccCOM/AccComponentBase.h @@ -17,16 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // AccComponentBase.h: interface for the CAccComponentBase class. - -#if !defined(AFX_ACCCOMPONENTBASE_H__946BE230_1DCB_494B_ACF6_32A2E197DD2A__INCLUDED_) -#define AFX_ACCCOMPONENTBASE_H__946BE230_1DCB_494B_ACF6_32A2E197DD2A__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMPONENTBASE_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMPONENTBASE_H #include <com/sun/star/uno/reference.hxx> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> @@ -71,6 +65,6 @@ protected: } }; -#endif // !defined(AFX_ACCCOMPONENTBASE_H__946BE230_1DCB_494B_ACF6_32A2E197DD2A__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCCOMPONENTBASE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccEditableText.h b/winaccessibility/source/UAccCOM/AccEditableText.h index cca02cff9a3b..d616f26a7daa 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.h +++ b/winaccessibility/source/UAccCOM/AccEditableText.h @@ -17,12 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined(AFX_ACCEDITABLETEXT_H__0C41AFBE_5A87_4D9D_A284_CEC264D91F81__INCLUDED_) -#define AFX_ACCEDITABLETEXT_H__0C41AFBE_5A87_4D9D_A284_CEC264D91F81__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCEDITABLETEXT_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCEDITABLETEXT_H #include "resource.h" #include <com/sun/star/uno/reference.hxx> @@ -109,6 +105,6 @@ private: } }; -#endif // !defined(AFX_ACCEDITABLETEXT_H__0C41AFBE_5A87_4D9D_A284_CEC264D91F81__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCEDITABLETEXT_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.h b/winaccessibility/source/UAccCOM/AccHyperLink.h index 5a01a872bb67..343342bc5e3b 100644 --- a/winaccessibility/source/UAccCOM/AccHyperLink.h +++ b/winaccessibility/source/UAccCOM/AccHyperLink.h @@ -17,16 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined(AFX_ACCHYPERLINK_H__59DA79A5_A895_43DB_9495_2B2049CF5C65__INCLUDED_) -#define AFX_ACCHYPERLINK_H__59DA79A5_A895_43DB_9495_2B2049CF5C65__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCHYPERLINK_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCHYPERLINK_H #include "resource.h" // main symbols - #include <com/sun/star/accessibility/XAccessibleHyperlink.hpp> #include "AccActionBase.h" #include "UNOXWrapper.h" @@ -135,6 +130,6 @@ private: }; -#endif // !defined(AFX_ACCHYPERLINK_H__59DA79A5_A895_43DB_9495_2B2049CF5C65__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCHYPERLINK_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccHypertext.h b/winaccessibility/source/UAccCOM/AccHypertext.h index 3935262dd1d0..9f3ee33d7454 100644 --- a/winaccessibility/source/UAccCOM/AccHypertext.h +++ b/winaccessibility/source/UAccCOM/AccHypertext.h @@ -17,16 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined(AFX_ACCHYPERTEXT_H__6DC133B6_03DB_42C6_A9B7_27AF4FDA00CA__INCLUDED_) -#define AFX_ACCHYPERTEXT_H__6DC133B6_03DB_42C6_A9B7_27AF4FDA00CA__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCHYPERTEXT_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCHYPERTEXT_H #include "resource.h" // main symbols - #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleHypertext.hpp> #include "AccTextBase.h" @@ -155,6 +150,6 @@ private: }; -#endif // !defined(AFX_ACCHYPERTEXT_H__6DC133B6_03DB_42C6_A9B7_27AF4FDA00CA__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCHYPERTEXT_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccImage.h b/winaccessibility/source/UAccCOM/AccImage.h index 4de6a18d50ff..c25ef345c47e 100644 --- a/winaccessibility/source/UAccCOM/AccImage.h +++ b/winaccessibility/source/UAccCOM/AccImage.h @@ -17,16 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined(AFX_ACCIMAGE_H__D5E55275_CCD4_497F_8E77_F9B391D2F4A8__INCLUDED_) -#define AFX_ACCIMAGE_H__D5E55275_CCD4_497F_8E77_F9B391D2F4A8__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCIMAGE_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCIMAGE_H #include "resource.h" // main symbols - #include <com/sun/star/uno/reference.hxx> #include <com/sun/star/accessibility/XAccessibleImage.hpp> #include "UNOXWrapper.h" @@ -95,6 +90,6 @@ private: } }; -#endif // !defined(AFX_ACCIMAGE_H__D5E55275_CCD4_497F_8E77_F9B391D2F4A8__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCIMAGE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccRelation.h b/winaccessibility/source/UAccCOM/AccRelation.h index 10aa825bae7e..d63b076a66ac 100644 --- a/winaccessibility/source/UAccCOM/AccRelation.h +++ b/winaccessibility/source/UAccCOM/AccRelation.h @@ -22,7 +22,6 @@ #include "resource.h" // main symbols - #include <com/sun/star/uno/reference.hxx> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include "UNOXWrapper.h" diff --git a/winaccessibility/source/UAccCOM/AccText.h b/winaccessibility/source/UAccCOM/AccText.h index 735afd9e0390..c45e349c1d26 100644 --- a/winaccessibility/source/UAccCOM/AccText.h +++ b/winaccessibility/source/UAccCOM/AccText.h @@ -17,12 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined(AFX_ACCTEXT_H__F06C5496_9959_4C7C_873E_A8D50CFB290D__INCLUDED_) -#define AFX_ACCTEXT_H__F06C5496_9959_4C7C_873E_A8D50CFB290D__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTEXT_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTEXT_H #include "resource.h" // main symbols @@ -134,6 +130,6 @@ public: }; -#endif // !defined(AFX_ACCTEXT_H__F06C5496_9959_4C7C_873E_A8D50CFB290D__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTEXT_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccTextBase.h b/winaccessibility/source/UAccCOM/AccTextBase.h index e027524a45df..80cb2f561ddf 100644 --- a/winaccessibility/source/UAccCOM/AccTextBase.h +++ b/winaccessibility/source/UAccCOM/AccTextBase.h @@ -19,14 +19,8 @@ // AccTextBase.h: interface for the CAccTextBase class. - - -#if !defined(AFX_ACCTEXTBASE_H__B9AE05F6_E28B_4CF3_A8F2_EEE5D2E00B82__INCLUDED_) -#define AFX_ACCTEXTBASE_H__B9AE05F6_E28B_4CF3_A8F2_EEE5D2E00B82__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTEXTBASE_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTEXTBASE_H #include <com/sun/star/uno/reference.hxx> #include <com/sun/star/accessibility/XAccessibleText.hpp> @@ -115,6 +109,6 @@ private: } }; -#endif // !defined(AFX_ACCTEXTBASE_H__B9AE05F6_E28B_4CF3_A8F2_EEE5D2E00B82__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTEXTBASE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccValue.h b/winaccessibility/source/UAccCOM/AccValue.h index d7e3496896e5..38659b295065 100644 --- a/winaccessibility/source/UAccCOM/AccValue.h +++ b/winaccessibility/source/UAccCOM/AccValue.h @@ -17,16 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined(AFX_ACCVALUE_H__CBA4972C_4188_4A18_A3CD_4A1FA3DDED38__INCLUDED_) -#define AFX_ACCVALUE_H__CBA4972C_4188_4A18_A3CD_4A1FA3DDED38__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 +#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCVALUE_H +#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCVALUE_H #include "resource.h" // main symbols - #include <com/sun/star/uno/reference.hxx> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include "UNOXWrapper.h" @@ -98,6 +93,6 @@ private: }; -#endif // !defined(AFX_ACCVALUE_H__CBA4972C_4188_4A18_A3CD_4A1FA3DDED38__INCLUDED_) +#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCVALUE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h index 1f32629b06d6..3742251a9a42 100644 --- a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h +++ b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h @@ -20,8 +20,6 @@ #ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H #define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H -#pragma once - typedef struct _ACCESSIBLE_KEYSTROKE { short modifiers; short keyCode; @@ -151,7 +149,6 @@ const short FINDBACKWARD = 16; const short PROPERTIES = 17; const short FRONT = 18; - #endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h index d6c6660a6013..91332715787e 100644 --- a/winaccessibility/source/UAccCOM/UNOXWrapper.h +++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h @@ -22,7 +22,6 @@ #include "resource.h" // main symbols - #include <com/sun/star/accessibility/XAccessible.hpp> #include "UAccCOM.h" diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx index 969d5978b8c2..a71c425af9e5 100644 --- a/xmloff/source/forms/formcellbinding.hxx +++ b/xmloff/source/forms/formcellbinding.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef XMLOFF_FORMS_FORMCELLBINDING -#define XMLOFF_FORMS_FORMCELLBINDING +#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_FORMCELLBINDING_HXX +#define INCLUDED_XMLOFF_SOURCE_FORMS_FORMCELLBINDING_HXX #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> @@ -262,6 +262,6 @@ namespace xmloff } // namespace xmloff -#endif // XMLOFF_FORMS_FORMCELLBINDING +#endif // INCLUDED_XMLOFF_SOURCE_FORMS_FORMCELLBINDING_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |