summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-05 20:54:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-05 22:21:49 +0000
commit4d6a509efe6bd56613b5554556d3a4f7f4cfd0d5 (patch)
tree22fc10679131c72993615d0fa634460d14a15ec8 /sw
parent076b098ddf80fc78773d3ed97b7fd50dbcb4ebb6 (diff)
convert all remaining BOOST_STATIC_ASSERT to static_assert
and we can include a few less headers Change-Id: Id742849ff4c1c37a2b861aa3d6ab823f00ea87f8
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/pch/precompiled_msword.hxx1
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx3
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx11
3 files changed, 6 insertions, 9 deletions
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 0ddc79224fc8..390d4493be1f 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -21,7 +21,6 @@
#include <boost/noncopyable.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/static_assert.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 2fe6c6a72b3b..c9f965c74e8a 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -21,7 +21,6 @@
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/static_assert.hpp>
#include <comphelper/string.hxx>
#include <tools/solar.h>
#include <vcl/vclenum.hxx>
@@ -1278,7 +1277,7 @@ void WW8TabBandDesc::ProcessSprmTTableBorders(int nBrcVer, const sal_uInt8* pPar
}
else if ( nBrcVer == 8 )
{
- BOOST_STATIC_ASSERT(sizeof (WW8_BRC) == 4);
+ static_assert(sizeof (WW8_BRC) == 4, "this has to match the msword size");
for( int i = 0; i < 6; ++i )
aDefBrcs[i] = reinterpret_cast<WW8_BRC const *>(pParams)[i];
}
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index b37530feec13..79d96b2be441 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
-#include <boost/static_assert.hpp>
#include <osl/endian.h>
#include <rtl/ustring.hxx>
@@ -190,7 +189,7 @@ struct WW8_STD
// char grupe[];
};
-BOOST_STATIC_ASSERT(sizeof (WW8_STD) == 10);
+static_assert(sizeof (WW8_STD) == 10, "this has to match the msword size");
/** Basis zum Einlesen UND zum Arbeiten (wird jeweils unter schiedlich beerbt)
*/
@@ -210,7 +209,7 @@ struct WW8_FFN_BASE // Font Descriptor
sal_uInt8 ibszAlt; // 0x5 index into ffn.szFfn to the name of the alternate font
};
-BOOST_STATIC_ASSERT(sizeof (WW8_FFN_BASE) == 6);
+static_assert(sizeof (WW8_FFN_BASE) == 6, "this has to match the msword size");
/** Hiermit arbeiten wir im Parser (und Dumper)
*/
@@ -449,7 +448,7 @@ struct WW8_DOGRID
// margins and ignore xaGrid and yaGrid.
};
-BOOST_STATIC_ASSERT(sizeof (WW8_DOGRID) == 10);
+static_assert(sizeof (WW8_DOGRID) == 10, "this has to match the msword size");
struct WW8_PIC
{
@@ -521,7 +520,7 @@ struct WW8_PIC_SHADOW
// sal_uInt8 rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename.
};
-BOOST_STATIC_ASSERT(sizeof (WW8_PIC_SHADOW) == 0x2E);
+static_assert(sizeof (WW8_PIC_SHADOW) == 0x2E, "this has to match the msword size");
// "0x2E": cf. SwWW8ImplReader::PicRead pDataStream->Read call
struct WW8_TBD
@@ -958,7 +957,7 @@ struct WW8_FSPA_SHADOW // alle Member an gleicher Position und Groesse,
SVBT32 nTxbx;
};
-BOOST_STATIC_ASSERT(sizeof (WW8_FSPA_SHADOW) == 26);
+static_assert(sizeof (WW8_FSPA_SHADOW) == 26, "this has to match the msword size");
// "26": cf. WW8ScannerBase ctor case 8 creation of pMainFdoa and pHdFtFdoa
struct WW8_TXBXS