[Libreoffice-commits] core.git: sw/inc sw/source

[Stephan Bergmann]

 sw/inc/docary.hxx                               |    2 +-
 sw/source/core/doc/DocumentStylePoolManager.cxx |    2 +-
 sw/source/core/doc/docredln.cxx                 |    2 +-
 sw/source/filter/html/htmlatr.cxx               |    4 ++--
 sw/source/filter/ww8/ww8par6.cxx                |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 810437129ac5d114d28692446243670e1e3efa2e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 28 11:47:44 2017 +0200

    -Werror=ignored-qualifiers (GCC 8)
    
    Change-Id: Icc576de378c27764aa50457f8d548564eb4a3aec

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 424680b329c6..e9f447e9425a 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -332,7 +332,7 @@ private:
     vector_type maVector;
 public:
     ~SwRedlineTable();
-    bool Contains(const SwRangeRedline* p) const { return maVector.find(const_cast<SwRangeRedline* const>(p)) != maVector.end(); }
+    bool Contains(const SwRangeRedline* p) const { return maVector.find(const_cast<SwRangeRedline*>(p)) != maVector.end(); }
     size_type GetPos(const SwRangeRedline* p) const;
 
     bool Insert(SwRangeRedlinePtr& p);
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 059dd24628e7..15b6b0565824 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -373,7 +373,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
             {
                 SvxLineSpacingItem aLSpc( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING );
                 SvxULSpaceItem aUL( 0, PT_7, RES_UL_SPACE );
-                aLSpc.SetPropLineSpace( (const sal_uInt8) 120 );
+                aLSpc.SetPropLineSpace( (sal_uInt8) 120 );
                 if( m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) ) aUL.SetLower( HTML_PARSPACE );
                 aSet.Put( aUL );
                 aSet.Put( aLSpc );
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 046c3ce4f0e1..25ef47cb20bf 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -558,7 +558,7 @@ SwRedlineTable::~SwRedlineTable()
 
 SwRedlineTable::size_type SwRedlineTable::GetPos(const SwRangeRedline* p) const
 {
-    vector_type::const_iterator it = maVector.find(const_cast<SwRangeRedline* const>(p));
+    vector_type::const_iterator it = maVector.find(const_cast<SwRangeRedline*>(p));
     if( it == maVector.end() )
         return npos;
     return it - maVector.begin();
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 0a61af5dbc77..b576b62dcd6e 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1205,7 +1205,7 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem )
         break;
 
     case RES_CHRATR_ESCAPEMENT:
-        switch( (const SvxEscapement)
+        switch( (SvxEscapement)
                         static_cast<const SvxEscapementItem&>(rItem).GetEnumValue() )
         {
         case SvxEscapement::Superscript:
@@ -2784,7 +2784,7 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt )
         return rWrt;
 
     const SvxEscapement eEscape =
-        (const SvxEscapement)static_cast<const SvxEscapementItem&>(rHt).GetEnumValue();
+        (SvxEscapement)static_cast<const SvxEscapementItem&>(rHt).GetEnumValue();
     const sal_Char *pStr = nullptr;
     switch( eEscape )
     {
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d6f02d7bdcec..144de1964730 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4217,7 +4217,7 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short
 
         // as discussed with AMA, the limit is nonsensical
         if( n>200 ) n = 200;        // SW_UI maximum
-        aLSpc.SetPropLineSpace( (const sal_uInt8)n );
+        aLSpc.SetPropLineSpace( (sal_uInt8)n );
         const SvxFontHeightItem* pH = static_cast<const SvxFontHeightItem*>(
             GetFormatAttr( RES_CHRATR_FONTSIZE ));
         nSpaceTw = (sal_uInt16)( n * pH->GetHeight() / 100 );