loplugin:unusedfields in oox,reportdesign

Change-Id: I0201d76cb3d4605bdc00c81cfa9d91f98341c7f3
Reviewed-on: https://gerrit.libreoffice.org/40290
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 2 insertions, 53 deletions

diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 57665bcca364..9e3625eabb2a 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -578,10 +578,6 @@ include/LibreOfficeKit/LibreOfficeKitGtk.h:38
     _LOKDocViewClass parent_class GtkDrawingAreaClass
 include/oox/core/contexthandler2.hxx:220
     oox::core::ContextHandler2Helper mnRootStackSize size_t
-include/oox/dump/dffdumper.hxx:57
-    oox::dump::DffStreamObject maSimpleProps class oox::dump::ItemFormatMap
-include/oox/dump/dffdumper.hxx:58
-    oox::dump::DffStreamObject maComplexProps class oox::dump::ItemFormatMap
 include/registry/refltype.hxx:65
     RTUik m_Data1 sal_uInt32
 include/registry/refltype.hxx:66
@@ -808,8 +804,6 @@ registry/source/reflwrit.cxx:181
     CPInfo::(anonymous) aUik struct RTUik *
 reportdesign/source/core/inc/ReportUndoFactory.hxx:30
     rptui::OReportUndoFactory m_aModuleClient class rptui::OModuleClient
-reportdesign/source/ui/dlg/GroupsSorting.cxx:105
-    rptui::OFieldExpressionControl m_nPasteEvent struct ImplSVEvent *
 reportdesign/source/ui/inc/ColorListener.hxx:35
     rptui::OColorListener m_aModuleClient class rptui::OModuleClient
 reportdesign/source/ui/inc/ColorListener.hxx:37
diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index 5f49b81a201b..56c8b87d3dd6 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -54,8 +54,6 @@ private:
     sal_uInt16          dumpDffOptPropHeader();
 
 private:
-    ItemFormatMap       maSimpleProps;
-    ItemFormatMap       maComplexProps;
     sal_uInt16          mnInstVer;
     sal_Int32           mnRealSize;
 };
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index d35cc1cf2ff6..abbd96d3b7b1 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -41,7 +41,6 @@ const sal_uInt16 DFF_ID_SPLITMENUCOLORS     = 0xF11E;   /// Current toolbar colo
 
 const sal_uInt16 DFF_OPT_IDMASK             = 0x3FFF;
 const sal_uInt16 DFF_OPT_COMPLEX            = 0x8000;
-const sal_uInt16 DFF_OPT_FLAGSMASK          = 0x003F;
 
 } // namespace
 
@@ -186,49 +185,11 @@ void DffStreamObject::dumpDffOpt()
         if( getFlag( nPropId, DFF_OPT_COMPLEX ) )
         {
             writeHexItem( "complex-size", nValue, "CONV-DEC" );
-            String aName;
-            PropType eType = PROPTYPE_BINARY;
-            ::std::map< sal_Int64, ItemFormat >::const_iterator aIt = maComplexProps.find( nBaseId );
-            if( aIt != maComplexProps.end() )
-            {
-                const ItemFormat& rItemFmt = aIt->second;
-                aName = rItemFmt.maItemName;
-                if ( rItemFmt.maListName == "binary" )
-                    eType = PROPTYPE_BINARY;
-                else if ( rItemFmt.maListName == "string" )
-                    eType = PROPTYPE_STRING;
-                else if ( rItemFmt.maListName == "blip" )
-                    eType = PROPTYPE_BLIP;
-                else if ( rItemFmt.maListName == "colorarray" )
-                    eType = PROPTYPE_COLORARRAY;
-            }
-            aPropInfos.push_back( PropInfo( aName( "property-data" ), eType, nBaseId, nValue ) );
+            aPropInfos.push_back( PropInfo( String( "property-data" ), PROPTYPE_BINARY, nBaseId, nValue ) );
         }
         else
         {
-            ::std::map< sal_Int64, ItemFormat >::const_iterator aIt = maSimpleProps.find( nBaseId );
-            if( aIt != maSimpleProps.end() )
-            {
-                const ItemFormat& rItemFmt = aIt->second;
-                // flags always at end of block of 64 properties
-                if( (nBaseId & DFF_OPT_FLAGSMASK) == DFF_OPT_FLAGSMASK )
-                {
-                    FlagsList* pFlagsList = dynamic_cast< FlagsList* >( cfg().getNameList( rItemFmt.maListName ).get() );
-                    sal_Int64 nOldIgnoreFlags = 0;
-                    if( pFlagsList )
-                    {
-                        nOldIgnoreFlags = pFlagsList->getIgnoreFlags();
-                        pFlagsList->setIgnoreFlags( nOldIgnoreFlags | 0xFFFF0000 | ~(nValue >> 16) );
-                    }
-                    writeValueItem( rItemFmt, nValue );
-                    if( pFlagsList )
-                        pFlagsList->setIgnoreFlags( nOldIgnoreFlags );
-                }
-                else
-                    writeValueItem( rItemFmt, nValue );
-            }
-            else
-                writeHexItem( "value", nValue );
+            writeHexItem( "value", nValue );
         }
     }
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 59c7de1376b8..77f2eaa8ba12 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -102,7 +102,6 @@ class OFieldExpressionControl : public ::svt::EditBrowseBox
     VclPtr< ::svt::ComboBoxControl>  m_pComboCell;
     sal_Int32                       m_nDataPos;
     sal_Int32                       m_nCurrentPos;
-    ImplSVEvent *                   m_nPasteEvent;
     ImplSVEvent *                   m_nDeleteEvent;
     VclPtr<OGroupsSortingDialog>    m_pParent;
     bool                            m_bIgnoreEvent;
@@ -194,7 +193,6 @@ OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentD
     ,m_pComboCell(nullptr)
     ,m_nDataPos(-1)
     ,m_nCurrentPos(-1)
-    ,m_nPasteEvent(nullptr)
     ,m_nDeleteEvent(nullptr)
     ,m_pParent(_pParentDialog)
     ,m_bIgnoreEvent(false)
@@ -216,8 +214,6 @@ void OFieldExpressionControl::dispose()
     xGroups->removeContainerListener(aContainerListener.get());
 
     // delete events from queue
-    if( m_nPasteEvent )
-        Application::RemoveUserEvent( m_nPasteEvent );
     if( m_nDeleteEvent )
         Application::RemoveUserEvent( m_nDeleteEvent );