loplugin:virtualdead unused param in SfxObjectShell::FillClass

and since I notice that the two call sites also don't care about
pShortTypeName, remove that too

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

21 files changed, 6 insertions, 54 deletions

diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 2c3b621a734a..58c4097284e4 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -77,7 +77,7 @@ void DocShell::SetPrinter( SfxPrinter* pPr )
     }
 }
 
-void DocShell::FillClass( SvGlobalName*, SotClipboardFormatId*, OUString*, OUString*, OUString*, sal_Int32, bool bTemplate) const
+void DocShell::FillClass( SvGlobalName*, SotClipboardFormatId*, OUString*, sal_Int32, bool bTemplate) const
 {
     DBG_ASSERT( !bTemplate, "No template for Basic" );
 }
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index f06b7cf9fe23..1223a0166704 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -39,9 +39,7 @@ protected:
                           sal_uInt16 nAspect ) override;
     virtual void    FillClass( SvGlobalName * pClassName,
                                SotClipboardFormatId * pFormat,
-                               OUString * pAppName,
                                OUString * pFullTypeName,
-                               OUString * pShortTypeName,
                                sal_Int32 nVersion,
                                bool bTemplate = false ) const override;
 
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results
index a916322515a8..3088f9d9f2fa 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -133,9 +133,6 @@ include/oox/dump/oledumper.hxx:166
 include/oox/export/shapes.hxx:136
     class oox::drawingml::ShapeExport & oox::drawingml::ShapeExport::WriteNonVisualProperties(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,)
     0
-include/sfx2/objsh.hxx:637
-    void SfxObjectShell::FillClass(class SvGlobalName *,enum SotClipboardFormatId *,class rtl::OUString *,class rtl::OUString *,class rtl::OUString *,int,_Bool,)const
-    1101111
 include/sfx2/stbitem.hxx:100
     _Bool SfxStatusBarControl::MouseButtonUp(const class MouseEvent &,)
     0
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 53797278c056..a653b2955056 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -636,9 +636,7 @@ public:
 
     virtual void    FillClass( SvGlobalName * pClassName,
                                SotClipboardFormatId * pFormat,
-                               OUString * pAppName,
                                OUString * pFullTypeName,
-                               OUString * pShortTypeName,
                                sal_Int32 nVersion,
                                bool bTemplate = false) const = 0;
 
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 128de8f042c4..9a44676ffbd3 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -27,7 +27,6 @@
 
 #define SCSTR_LONG_SCDOC_NAME_60                    NC_("SCSTR_LONG_SCDOC_NAME", "%PRODUCTNAME Spreadsheet format (calc6)")
 #define SCSTR_LONG_SCDOC_NAME_80                    NC_("SCSTR_LONG_SCDOC_NAME", "%PRODUCTNAME %PRODUCTVERSION Spreadsheet")
-#define SCSTR_SHORT_SCDOC_NAME                      NC_("SCSTR_SHORT_SCDOC_NAME", "Spreadsheet")
 #define SCSTR_UNDEFINED                             NC_("SCSTR_UNDEFINED", "- undefined -")
 #define SCSTR_NONE                                  NC_("SCSTR_NONE", "- none -")
 #define SCSTR_ALL                                   NC_("SCSTR_ALL", "- all -")
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 770c828b6d37..d0f246e73d12 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -175,9 +175,7 @@ SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), "scalc" )
 
 void ScDocShell::FillClass( SvGlobalName* pClassName,
                                         SotClipboardFormatId* pFormat,
-                                        OUString* /* pAppName */,
                                         OUString* pFullTypeName,
-                                        OUString* pShortTypeName,
                                         sal_Int32 nFileFormat,
                                         bool bTemplate /* = false */) const
 {
@@ -186,14 +184,12 @@ void ScDocShell::FillClass( SvGlobalName* pClassName,
         *pClassName     = SvGlobalName( SO3_SC_CLASSID_60 );
         *pFormat        = SotClipboardFormatId::STARCALC_60;
         *pFullTypeName  = ScResId( SCSTR_LONG_SCDOC_NAME_60 );
-        *pShortTypeName = ScResId( SCSTR_SHORT_SCDOC_NAME );
     }
     else if ( nFileFormat == SOFFICE_FILEFORMAT_8 )
     {
         *pClassName     = SvGlobalName( SO3_SC_CLASSID_60 );
         *pFormat        = bTemplate ? SotClipboardFormatId::STARCALC_8_TEMPLATE : SotClipboardFormatId::STARCALC_8;
         *pFullTypeName  = ScResId( SCSTR_LONG_SCDOC_NAME_80 );
-        *pShortTypeName = ScResId(SCSTR_SHORT_SCDOC_NAME);
     }
     else
     {
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 1878a234c00a..528f85e3a830 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -179,9 +179,7 @@ public:
 
     virtual void    FillClass( SvGlobalName * pClassName,
                                SotClipboardFormatId * pFormat,
-                               OUString * pAppName,
                                OUString * pFullTypeName,
-                               OUString * pShortTypeName,
                                sal_Int32 nFileFormat,
                                bool bTemplate = false ) const override;
 
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 17e0912d4cec..26956a1fb751 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -189,9 +189,7 @@
 #define STR_FILEFORMAT_NAME                             NC_("STR_FILEFORMAT_NAME", "File name without extension")
 #define STR_NEW_CUSTOMSHOW                              NC_("STR_NEW_CUSTOMSHOW", "New Custom Slide Show")
 #define STR_COPY_CUSTOMSHOW                             NC_("STR_COPY_CUSTOMSHOW", "Copy ")
-#define STR_IMPRESS_DOCUMENT                            NC_("STR_IMPRESS_DOCUMENT", "Presentation")
 #define STR_IMPRESS_DOCUMENT_FULLTYPE_60                NC_("STR_IMPRESS_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME Presentation format (Impress 6)")
-#define STR_GRAPHIC_DOCUMENT                            NC_("STR_GRAPHIC_DOCUMENT", "Drawing")
 #define STR_GRAPHIC_DOCUMENT_FULLTYPE_60                NC_("STR_GRAPHIC_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME Drawing format (Draw 6)")
 #define STR_BREAK_METAFILE                              NC_("STR_BREAK_METAFILE", "Ungroup Metafile(s)...")
 #define STR_BREAK_FAIL                                  NC_("STR_BREAK_FAIL", "It was not possible to ungroup all drawing objects.")
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 803988cf6422..6a5cdc0965a7 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -898,9 +898,7 @@ bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium )
 
 void DrawDocShell::FillClass(SvGlobalName* pClassName,
                                         SotClipboardFormatId* pFormat,
-                                        OUString* ,
                                         OUString* pFullTypeName,
-                                        OUString* pShortTypeName,
                                         sal_Int32 nFileFormat,
                                         bool bTemplate /* = false */) const
 {
@@ -934,9 +932,6 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
             *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_80); // HACK: method will be removed with new storage API
         }
     }
-
-    *pShortTypeName = SdResId((meDocType == DocumentType::Draw) ?
-                                     STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT);
 }
 
 OutputDevice* DrawDocShell::GetDocumentRefDev()
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index bc064d07dc45..2c5ef9c46cdb 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -96,7 +96,7 @@ public:
     virtual Printer*        GetDocumentPrinter() override;
     virtual void            OnDocumentPrinterChanged(Printer* pNewPrinter) override;
     virtual SfxStyleSheetBasePool* GetStyleSheetPool() override;
-    virtual void            FillClass(SvGlobalName* pClassName, SotClipboardFormatId* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const override;
+    virtual void            FillClass(SvGlobalName* pClassName, SotClipboardFormatId* pFormat, OUString* pFullTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const override;
     virtual void            SetModified( bool = true ) override;
     virtual std::unique_ptr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(weld::Window* pParent,
                                                                             const SfxItemSet &rSet) override;
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 2a5e7c050610..7d5cdb5cb21c 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -148,8 +148,7 @@ void SfxObjectShell::SetMapUnit( MapUnit nMapUnit )
 void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc ) const
 {
     SotClipboardFormatId nClipFormat;
-    OUString aAppName, aShortName;
-    FillClass( &rDesc.maClassName, &nClipFormat, &aAppName, &rDesc.maTypeName, &aShortName, SOFFICE_FILEFORMAT_CURRENT );
+    FillClass( &rDesc.maClassName, &nClipFormat, &rDesc.maTypeName, SOFFICE_FILEFORMAT_CURRENT );
 
     rDesc.mnViewAspect = ASPECT_CONTENT;
     rDesc.maSize = OutputDevice::LogicToLogic(GetVisArea().GetSize(), MapMode(GetMapUnit()), MapMode(MapUnit::Map100thMM));
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 901432384ac2..f162bd5dfa92 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -314,8 +314,8 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
     SotClipboardFormatId nClipFormat = SotClipboardFormatId::NONE;
 
     SvGlobalName aName;
-    OUString aFullTypeName, aShortTypeName, aAppName;
-    FillClass( &aName, &nClipFormat, &aAppName, &aFullTypeName, &aShortTypeName, nVersion, bTemplate );
+    OUString aFullTypeName;
+    FillClass( &aName, &nClipFormat, &aFullTypeName, nVersion, bTemplate );
 
     if ( nClipFormat == SotClipboardFormatId::NONE )
         return;
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index dd1f540a3fe3..cc09c2ea0c9b 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -107,9 +107,7 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
 
     virtual void        FillClass(SvGlobalName* pClassName,
                                   SotClipboardFormatId*  pFormat,
-                                  OUString* pAppName,
                                   OUString* pFullTypeName,
-                                  OUString* pShortTypeName,
                                   sal_Int32 nFileFormat,
                                   bool bTemplate = false ) const override;
 
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 62f0e0fc04fd..c3a56729284d 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1258,9 +1258,7 @@ void SmDocShell::SetVisArea(const tools::Rectangle & rVisArea)
 
 void SmDocShell::FillClass(SvGlobalName* pClassName,
                            SotClipboardFormatId*  pFormat,
-                           OUString* /*pAppName*/,
                            OUString* pFullTypeName,
-                           OUString* pShortTypeName,
                            sal_Int32 nFileFormat,
                            bool bTemplate /* = false */) const
 {
@@ -1269,14 +1267,12 @@ void SmDocShell::FillClass(SvGlobalName* pClassName,
         *pClassName     = SvGlobalName(SO3_SM_CLASSID_60);
         *pFormat        = SotClipboardFormatId::STARMATH_60;
         *pFullTypeName  = SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT);
-        *pShortTypeName = SmResId(RID_DOCUMENTSTR);
     }
     else if (nFileFormat == SOFFICE_FILEFORMAT_8 )
     {
         *pClassName     = SvGlobalName(SO3_SM_CLASSID_60);
         *pFormat        = bTemplate ? SotClipboardFormatId::STARMATH_8_TEMPLATE : SotClipboardFormatId::STARMATH_8;
         *pFullTypeName  = SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT);
-        *pShortTypeName = SmResId(RID_DOCUMENTSTR);
     }
 }
 
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 3834fc34ce02..08eaf82c3e67 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -247,9 +247,7 @@ public:
 
     virtual void FillClass( SvGlobalName * pClassName,
                                    SotClipboardFormatId * pClipFormat,
-                                   OUString * pAppName,
                                    OUString * pLongUserName,
-                                   OUString * pUserName,
                                    sal_Int32 nFileFormat,
                                    bool bTemplate = false ) const override;
 
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index e63f08f62def..91b47eedff65 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -32,9 +32,7 @@ public:
 
     virtual void    FillClass( SvGlobalName * pClassName,
                                    SotClipboardFormatId * pClipFormat,
-                                   OUString * pAppName,
                                    OUString * pLongUserName,
-                                   OUString * pUserName,
                                    sal_Int32 nFileFormat,
                                    bool bTemplate = false ) const override;
 };
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 54ef4b1463c7..e6355c4cbb3d 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -229,8 +229,7 @@
 #define STR_TABLESTYLEFAMILY                    NC_("STR_TABLESTYLEFAMILY", "Table Styles")
 #define STR_ENV_TITLE                           NC_("STR_ENV_TITLE", "Envelope")
 #define STR_LAB_TITLE                           NC_("STR_LAB_TITLE", "Labels")
-// ShortName!!!
-#define STR_HUMAN_SWDOC_NAME                    NC_("STR_HUMAN_SWDOC_NAME", "Text")
+
 #define STR_WRITER_DOCUMENT_FULLTYPE            NC_("STR_WRITER_DOCUMENT_FULLTYPE", "%PRODUCTNAME %PRODUCTVERSION Text Document")
 #define STR_CANTOPEN                            NC_("STR_CANTOPEN", "Cannot open document.")
 #define STR_CANTCREATE                          NC_("STR_CANTCREATE", "Can't create document.")
@@ -1245,7 +1244,6 @@
 #define STR_SWBG_FOOTER                         NC_("STR_SWBG_FOOTER", "Footer")
 //End: strings for gallery/background
 
-#define STR_HUMAN_SWWEBDOC_NAME                 NC_("STR_HUMAN_SWWEBDOC_NAME", "HTML")
 #define STR_WRITER_WEBDOC_FULLTYPE              NC_("STR_WRITER_WEBDOC_FULLTYPE", "%PRODUCTNAME %PRODUCTVERSION HTML Document")
 
 #define STR_TITLE                               NC_("STR_TITLE", "Title")
@@ -1295,7 +1293,6 @@
 #define STR_TEXTCOLL_HEADER                     NC_("STR_TEXTCOLL_HEADER", "(Paragraph Style: ")
 #define STR_ILLEGAL_PAGENUM                     NC_("STR_ILLEGAL_PAGENUM", "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages.")
 
-#define STR_HUMAN_SWGLOBDOC_NAME                NC_("STR_HUMAN_SWGLOBDOC_NAME", "Master Document")
 #define STR_WRITER_GLOBALDOC_FULLTYPE           NC_("STR_WRITER_GLOBALDOC_FULLTYPE", "%PRODUCTNAME %PRODUCTVERSION Master Document")
 
 #define STR_QUERY_CONNECT                       NC_("STR_QUERY_CONNECT", "A file connection will delete the contents of the current section. Connect anyway?")
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index da8f674db260..37424d0fb4a5 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -40,9 +40,7 @@ public:
 
     virtual void        FillClass( SvGlobalName * pClassName,
                                    SotClipboardFormatId * pClipFormat,
-                                   OUString * pAppName,
                                    OUString * pLongUserName,
-                                   OUString * pUserName,
                                    sal_Int32 nFileFormat,
                                    bool bTemplate = false ) const override;
     sal_uInt16      GetSourcePara()const { return m_nSourcePara; }
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index f94c4e5ac514..ecd2ffe7747a 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1371,9 +1371,7 @@ void SwDocShell::ReconnectDdeLink(SfxObjectShell& rServer)
 
 void SwDocShell::FillClass( SvGlobalName * pClassName,
                                    SotClipboardFormatId * pClipFormat,
-                                   OUString * /*pAppName*/,
                                    OUString * pLongUserName,
-                                   OUString * pUserName,
                                    sal_Int32 nVersion,
                                    bool bTemplate /* = false */) const
 {
@@ -1395,8 +1393,6 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
     if( xVbaEventsHelper.is() )
         lcl_processCompatibleSfxHint( xVbaEventsHelper, rHint );
 #endif
-
-    *pUserName = SwResId(STR_HUMAN_SWDOC_NAME);
 }
 
 void SwDocShell::SetModified( bool bSet )
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index 8538886af262..128f3d7680fa 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -45,9 +45,7 @@ SwGlobalDocShell::~SwGlobalDocShell()
 
 void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
                                    SotClipboardFormatId * pClipFormat,
-                                   OUString * /*pAppName*/,
                                    OUString * pLongUserName,
-                                   OUString * pUserName,
                                    sal_Int32 nVersion,
                                    bool bTemplate /* = false */) const
 {
@@ -64,8 +62,6 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
         *pClipFormat    = bTemplate ? SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE : SotClipboardFormatId::STARWRITERGLOB_8;
         *pLongUserName = SwResId(STR_WRITER_GLOBALDOC_FULLTYPE);
     }
-
-    *pUserName = SwResId(STR_HUMAN_SWGLOBDOC_NAME);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index 6e100b58345a..1adc3a21ba90 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -63,9 +63,7 @@ SwWebDocShell::~SwWebDocShell()
 
 void SwWebDocShell::FillClass( SvGlobalName * pClassName,
                                    SotClipboardFormatId * pClipFormat,
-                                   OUString * /*pAppName*/,
                                    OUString * pLongUserName,
-                                   OUString * pUserName,
                                    sal_Int32 nVersion,
                                    bool bTemplate /* = false */) const
 {
@@ -83,7 +81,6 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName,
         *pClipFormat    = SotClipboardFormatId::STARWRITERWEB_8;
         *pLongUserName = SwResId(STR_WRITER_WEBDOC_FULLTYPE);
     }
-    *pUserName = SwResId(STR_HUMAN_SWWEBDOC_NAME);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */