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>

7 files changed, 1 insertions, 21 deletions

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: */