diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2017-03-17 11:54:00 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2017-03-17 20:22:31 +0000 |
| commit | b165f0f9cc358e6127f69227fc3e4f6428fe50c7 (patch) | |
| tree | 975fa5f186f7c90430aa875361579303c8c45637 /sfx2 | |
| parent | a6209ba6a8b5a2c9bcbd0d4f334e7d74acbde95f (diff) | |
Remove SfxObjectFactory::GetShortName()
Used in just two places, where GetFactoryName can also work.
Change-Id: I8d498345c41aef520ef776a3deb6744cc64756f5
Reviewed-on: https://gerrit.libreoffice.org/35374
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfac.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index dbeeb746c893..20ebfbcfc0fa 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -344,7 +344,7 @@ OUString SfxObjectFactory::GetFactoryURL() const { OUStringBuffer aURLComposer; aURLComposer.append("private:factory/"); - aURLComposer.appendAscii(GetShortName()); + aURLComposer.appendAscii(pShortName); return aURLComposer.makeStringAndClear(); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 1e9ec49cebf4..70494e9de94a 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2782,9 +2782,9 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) case SID_RECORDMACRO : { SvtMiscOptions aMiscOptions; - const char* pName = GetObjectShell()->GetFactory().GetShortName(); + const OUString sName{GetObjectShell()->GetFactory().GetFactoryName()}; if ( !aMiscOptions.IsMacroRecorderMode() || - ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) ) + ( sName!="swriter" && sName!="scalc" ) ) { rSet.DisableItem( nWhich ); rSet.Put(SfxVisibilityItem(nWhich, false)); @@ -2808,9 +2808,9 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) case SID_STOP_RECORDING : { SvtMiscOptions aMiscOptions; - const char* pName = GetObjectShell()->GetFactory().GetShortName(); + const OUString sName{GetObjectShell()->GetFactory().GetFactoryName()}; if ( !aMiscOptions.IsMacroRecorderMode() || - ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) ) + ( sName!="swriter" && sName!="scalc" ) ) { rSet.DisableItem( nWhich ); break; |