[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Jens Carl
j.carl43 at gmx.de
Sun Jun 1 09:16:48 PDT 2014
sw/inc/IDocumentChartDataProviderAccess.hxx | 18 +++++++-------
sw/inc/IDocumentDeviceAccess.hxx | 28 ++++++++++-----------
sw/inc/IDocumentLineNumberAccess.hxx | 16 ++++++------
sw/inc/IDocumentRedlineAccess.hxx | 36 ++++++++++++++--------------
sw/inc/IDocumentState.hxx | 20 +++++++--------
sw/inc/IDocumentStatistics.hxx | 18 +++++++-------
sw/inc/IDocumentStylePoolAccess.hxx | 28 ++++++++++-----------
sw/inc/IDocumentTimerAccess.hxx | 18 +++++++-------
sw/inc/IInterface.hxx | 18 +++++++-------
sw/qa/extras/inc/swmodeltestbase.hxx | 5 +++
sw/source/filter/ww1/w1class.hxx | 6 ++++
sw/source/filter/ww8/WW8FFData.hxx | 5 +++
sw/source/filter/ww8/WW8Sttbf.hxx | 5 +++
sw/source/uibase/inc/swmessdialog.hxx | 5 +++
14 files changed, 126 insertions(+), 100 deletions(-)
New commits:
commit dcb32a33a32665a6fa54df224fcfb2efad411567
Author: Jens Carl <j.carl43 at gmx.de>
Date: Fri May 30 23:30:03 2014 +0000
fdo#68849: Add header guards to all include files
Added header guards to files in directory sw/
Change-Id: I5859f986c6f954d41a7940dc9ae8febaa714d34f
Reviewed-on: https://gerrit.libreoffice.org/9587
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/sw/inc/IDocumentChartDataProviderAccess.hxx b/sw/inc/IDocumentChartDataProviderAccess.hxx
index 0815cd5..842c2d0 100644
--- a/sw/inc/IDocumentChartDataProviderAccess.hxx
+++ b/sw/inc/IDocumentChartDataProviderAccess.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
- #define INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
+#ifndef INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
#include <com/sun/star/uno/Reference.hxx>
@@ -30,11 +30,11 @@ class SwTable;
class SwChartDataProvider;
class SwChartLockController_Helper;
- /** Give access to the data-provider for chart
+/** Give access to the data-provider for chart
*/
- class IDocumentChartDataProviderAccess
- {
- public:
+class IDocumentChartDataProviderAccess
+{
+public:
/**
returns or creates the data-provider for chart
@@ -52,10 +52,10 @@ class SwChartLockController_Helper;
*/
virtual SwChartLockController_Helper & GetChartControllerHelper() = 0;
- protected:
+protected:
virtual ~IDocumentChartDataProviderAccess() {};
- };
+};
- #endif // INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
+#endif // INCLUDED_SW_INC_IDOCUMENTCHARTDATAPROVIDERACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx
index 81ac2a3..18fddae 100644
--- a/sw/inc/IDocumentDeviceAccess.hxx
+++ b/sw/inc/IDocumentDeviceAccess.hxx
@@ -17,20 +17,20 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX
- #define INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX
+#ifndef INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX
- class SfxPrinter;
- class JobSetup;
- class SwPrintData;
- class VirtualDevice;
- class OutputDevice;
+class SfxPrinter;
+class JobSetup;
+class SwPrintData;
+class VirtualDevice;
+class OutputDevice;
- /** Provides access to the formatting devices of a document
+/** Provides access to the formatting devices of a document
*/
- class IDocumentDeviceAccess
- {
- public:
+class IDocumentDeviceAccess
+{
+public:
/** Return the printer set at the document.
@@ -130,10 +130,10 @@
*/
virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData) = 0;
- protected:
+protected:
virtual ~IDocumentDeviceAccess() {};
- };
+};
- #endif // INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX
+#endif // INCLUDED_SW_INC_IDOCUMENTDEVICEACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentLineNumberAccess.hxx b/sw/inc/IDocumentLineNumberAccess.hxx
index 4ed4e9e..b63d004 100644
--- a/sw/inc/IDocumentLineNumberAccess.hxx
+++ b/sw/inc/IDocumentLineNumberAccess.hxx
@@ -17,23 +17,23 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_SW_INC_IDOCUMENTLINENUMBERACCESS_HXX
- #define INCLUDED_SW_INC_IDOCUMENTLINENUMBERACCESS_HXX
+#ifndef INCLUDED_SW_INC_IDOCUMENTLINENUMBERACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTLINENUMBERACCESS_HXX
- #include <sal/types.h>
+#include <sal/types.h>
class SwLineNumberInfo;
- /** Access to the line number information
+/** Access to the line number information
*/
- class IDocumentLineNumberAccess
- {
- public:
+class IDocumentLineNumberAccess
+{
+public:
virtual const SwLineNumberInfo& GetLineNumberInfo() const = 0;
virtual void SetLineNumberInfo(const SwLineNumberInfo& rInfo) = 0;
- protected:
+protected:
virtual ~IDocumentLineNumberAccess() {};
};
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index dac4b65..e974880 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -17,25 +17,25 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_SW_INC_IDOCUMENTREDLINEACCESS_HXX
- #define INCLUDED_SW_INC_IDOCUMENTREDLINEACCESS_HXX
+#ifndef INCLUDED_SW_INC_IDOCUMENTREDLINEACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTREDLINEACCESS_HXX
- #include <sal/types.h>
- #include <tools/solar.h>
+#include <sal/types.h>
+#include <tools/solar.h>
- #include <limits.h>
+#include <limits.h>
- #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
- class SwRangeRedline;
- class SwTableRowRedline;
- class SwTableCellRedline;
- class SwRedlineTbl;
- class SwExtraRedlineTbl;
- class SwPaM;
- struct SwPosition;
- class SwStartNode;
- class SwNode;
+class SwRangeRedline;
+class SwTableRowRedline;
+class SwTableCellRedline;
+class SwRedlineTbl;
+class SwExtraRedlineTbl;
+class SwPaM;
+struct SwPosition;
+class SwStartNode;
+class SwNode;
typedef sal_uInt16 RedlineMode_t;
namespace nsRedlineMode_t
@@ -203,10 +203,10 @@ public:
virtual void SetRedlinePassword(
/*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) = 0;
- protected:
+protected:
virtual ~IDocumentRedlineAccess() {};
- };
+};
- #endif
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index 9230dd3..8ba1c74 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -17,16 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
- #define INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
+#ifndef INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
+#define INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
- #include <tools/solar.h>
+#include <tools/solar.h>
- /** Get information about the current document state
+/** Get information about the current document state
*/
- class IDocumentState
- {
- public:
+class IDocumentState
+{
+public:
/** Must be called manually at changes of format.
*/
virtual void SetModified() = 0;
@@ -56,10 +56,10 @@
virtual void SetLoaded(bool b = true) = 0;
- protected:
+protected:
virtual ~IDocumentState() {};
- };
+};
- #endif // INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
+#endif // INCLUDED_SW_INC_IDOCUMENTSTATE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 9b58b5a..7cb50ae 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -17,16 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX
- #define INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX
+#ifndef INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX
- struct SwDocStat;
+struct SwDocStat;
- /** Document statistics information
+/** Document statistics information
*/
- class IDocumentStatistics
- {
- public:
+class IDocumentStatistics
+{
+public:
/** DocInfo has changed (notify via DocShell):
make required fields update.
@@ -60,8 +60,8 @@
protected:
virtual ~IDocumentStatistics() {};
- };
+};
- #endif // INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX
+#endif // INCLUDED_SW_INC_IDOCUMENTSTATISTICS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx
index fcf3e1c..81ec035 100644
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.hxx
@@ -17,23 +17,23 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_SW_INC_IDOCUMENTSTYLEPOOLACCESS_HXX
- #define INCLUDED_SW_INC_IDOCUMENTSTYLEPOOLACCESS_HXX
+#ifndef INCLUDED_SW_INC_IDOCUMENTSTYLEPOOLACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTSTYLEPOOLACCESS_HXX
- #include <sal/types.h>
+#include <sal/types.h>
- class SwTxtFmtColl;
- class SwCharFmt;
- class SwFmt;
- class SwFrmFmt;
- class SwNumRule;
- class SwPageDesc;
+class SwTxtFmtColl;
+class SwCharFmt;
+class SwFmt;
+class SwFrmFmt;
+class SwNumRule;
+class SwPageDesc;
- /** Access to the style pool
+/** Access to the style pool
*/
- class IDocumentStylePoolAccess
- {
- public:
+class IDocumentStylePoolAccess
+{
+public:
/** Return "Auto-Collection with ID.
Create, if it does not yet exist.
@@ -64,7 +64,7 @@
virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const = 0;
virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const = 0;
- protected:
+protected:
virtual ~IDocumentStylePoolAccess() {};
};
diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx
index cde3d88..2cdb33e 100644
--- a/sw/inc/IDocumentTimerAccess.hxx
+++ b/sw/inc/IDocumentTimerAccess.hxx
@@ -17,15 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
- #define INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
+#ifndef INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
- /** Manipulate background jobs of the document. It starts with a mode of
+/** Manipulate background jobs of the document. It starts with a mode of
'started' and a block count of 0.
*/
- class IDocumentTimerAccess
- {
- public:
+class IDocumentTimerAccess
+{
+public:
/**
Set modus to 'start'.
*/
@@ -55,10 +55,10 @@
*/
virtual void StartBackgroundJobs() = 0;
- protected:
+protected:
virtual ~IDocumentTimerAccess() {};
- };
+};
- #endif // INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
+#endif // INCLUDED_SW_INC_IDOCUMENTTIMERACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IInterface.hxx b/sw/inc/IInterface.hxx
index 5d724dd..3d372fe 100644
--- a/sw/inc/IInterface.hxx
+++ b/sw/inc/IInterface.hxx
@@ -17,16 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- #ifndef INCLUDED_SW_INC_IINTERFACE_HXX
- #define INCLUDED_SW_INC_IINTERFACE_HXX
+#ifndef INCLUDED_SW_INC_IINTERFACE_HXX
+#define INCLUDED_SW_INC_IINTERFACE_HXX
- #include <sal/types.h>
+#include <sal/types.h>
- /** The base interface
+/** The base interface
*/
- class IInterface
- {
- public:
+class IInterface
+{
+public:
/** Acquire a reference to an instance. A caller shall release
the instance by calling 'release' when it is no longer needed.
@@ -54,8 +54,8 @@
protected:
virtual ~IInterface() {};
- };
+};
- #endif // IDOCUMENT_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_IINTERFACE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index da802cf..d163881 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifndef INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
+#define INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
+
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
@@ -642,4 +645,6 @@ inline void assertBorderEqual(
#define CPPUNIT_ASSERT_BORDER_EQUAL(aExpected, aActual) \
assertBorderEqual( aExpected, aActual, CPPUNIT_SOURCELINE() ) \
+#endif // INCLUDED_SW_QA_EXTRAS_INC_SWMODELTESTBASE_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 329e7b1..5c97410 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.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_SW_SOURCE_FILTER_WW1_W1CLASS_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW1_W1CLASS_HXX
+
#include <rtl/ustring.hxx>
// local
@@ -1482,4 +1486,6 @@ public:
Ww1Fields* = 0);
};
+#endif // INCLUDED_SW_SOURCE_FILTER_WW1_W1CLASS_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx
index 0b639af..0f6dd3f 100644
--- a/sw/source/filter/ww8/WW8FFData.hxx
+++ b/sw/source/filter/ww8/WW8FFData.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8FFDATA_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8FFDATA_HXX
+
#include <vector>
#include <rtl/ustring.hxx>
@@ -107,4 +110,6 @@ public:
};
}
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_WW8FFDATA_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index b718754..9a6d8fc 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8STTBF_HXX
+#define INCLUDED_SW_SOURCE_FILTER_WW8_WW8STTBF_HXX
+
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/shared_array.hpp>
@@ -135,4 +138,6 @@ typedef ::std::vector<OUString> StringVector_t;
}
}
+#endif // INCLUDED_SW_SOURCE_FILTER_WW8_WW8STTBF_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/swmessdialog.hxx b/sw/source/uibase/inc/swmessdialog.hxx
index 1937e37..674d347 100644
--- a/sw/source/uibase/inc/swmessdialog.hxx
+++ b/sw/source/uibase/inc/swmessdialog.hxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWMESSDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWMESSDIALOG_HXX
+
#include <vcl/dialog.hxx>
class Edit;
@@ -27,4 +30,6 @@ public:
const OUString& rUIXMLDescription);
};
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWMESSDIALOG_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list