diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-18 14:06:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-21 13:06:49 +0200 |
| commit | 0c1ab11c9fa24eb2d4a4d08387d314e04c0aafee (patch) | |
| tree | 545fa93f0826e27d82e8de6ab693e1c39ac3a053 /sd | |
| parent | bbe6bc271ac560991ac41b5beeb7ccc139168f1e (diff) | |
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>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/strings.hrc | 2 | ||||
| -rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/inc/DrawDocShell.hxx | 2 |
3 files changed, 1 insertions, 8 deletions
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; |