Kaydet (Commit) c2667d7f authored tarafından Caolán McNamara's avatar Caolán McNamara

pNameResId is unused

Change-Id: Ic1fe6abc7066517187695266c4d1a0888b41ffe7
üst 2acc4dc6
......@@ -39,14 +39,6 @@
#define STR_AUTOMATICVERSION (RID_SFX_DOC_START+ 68)
#define STR_DOCTYPENAME_SW (RID_SFX_DOC_START+ 69)
#define STR_DOCTYPENAME_SWWEB (RID_SFX_DOC_START+ 70)
#define STR_DOCTYPENAME_SWGLOB (RID_SFX_DOC_START+ 71)
#define STR_DOCTYPENAME_SC (RID_SFX_DOC_START+ 72)
#define STR_DOCTYPENAME_SI (RID_SFX_DOC_START+ 73)
#define STR_DOCTYPENAME_SD (RID_SFX_DOC_START+ 74)
#define STR_DOCTYPENAME_MESSAGE (RID_SFX_DOC_START+ 75)
#define TEMPLATE_LONG_NAMES_ARY (RID_SFX_DOC_START+ 81)
#define TEMPLATE_SHORT_NAMES_ARY (RID_SFX_DOC_START+ 82)
#define RID_CNT_STR_WAITING (RID_SFX_DOC_START+ 83)
......
......@@ -84,41 +84,6 @@ String STR_AUTOMATICVERSION
Text [ en-US ] = "Automatically saved version" ;
};
String STR_DOCTYPENAME_SW
{
Text [ en-US ] = "Text Document";
};
String STR_DOCTYPENAME_SWWEB
{
Text [ en-US ] = "HTML Document";
};
String STR_DOCTYPENAME_SWGLOB
{
Text [ en-US ] = "Master Document";
};
String STR_DOCTYPENAME_SC
{
Text [ en-US ] = "Spreadsheet";
};
String STR_DOCTYPENAME_SI
{
Text [ en-US ] = "Presentation";
};
String STR_DOCTYPENAME_SD
{
Text [ en-US ] = "Drawing";
};
String STR_DOCTYPENAME_MESSAGE
{
Text [ en-US ] = "Message";
};
String STR_EXPORTBUTTON
{
Text [ en-US ] = "Export" ;
......
......@@ -61,26 +61,22 @@ typedef std::vector<SfxViewFactory*> SfxViewFactoryArr_Impl;
struct SfxObjectFactory_Impl
{
SfxViewFactoryArr_Impl aViewFactoryArr;// List of <SfxViewFactory>s
ResId* pNameResId;
OUString aServiceName;
SfxFilterContainer* pFilterContainer;
SfxModule* pModule;
SvGlobalName aClassName;
SfxObjectFactory_Impl() :
pNameResId ( nullptr ),
pFilterContainer ( nullptr ),
pModule ( nullptr )
{}
};
SfxFilterContainer* SfxObjectFactory::GetFilterContainer() const
{
return pImpl->pFilterContainer;
}
SfxObjectFactory::SfxObjectFactory
(
const SvGlobalName& rName,
......@@ -91,29 +87,11 @@ SfxObjectFactory::SfxObjectFactory
nFlags( nFlagsP )
{
pImpl->pFilterContainer = new SfxFilterContainer( m_sFactoryName );
const OUString aShortName( m_sFactoryName.toAsciiLowerCase() );
pImpl->aClassName = rName;
if ( aShortName == "swriter" )
pImpl->pNameResId = new SfxResId( STR_DOCTYPENAME_SW );
else if ( aShortName == "swriter/web" )
pImpl->pNameResId = new SfxResId( STR_DOCTYPENAME_SWWEB );
else if ( aShortName == "swriter/globaldocument" )
pImpl->pNameResId = new SfxResId( STR_DOCTYPENAME_SWGLOB );
else if ( aShortName == "scalc" )
pImpl->pNameResId = new SfxResId( STR_DOCTYPENAME_SC );
else if ( aShortName == "simpress" )
pImpl->pNameResId = new SfxResId( STR_DOCTYPENAME_SI );
else if ( aShortName == "sdraw" )
pImpl->pNameResId = new SfxResId( STR_DOCTYPENAME_SD );
else if ( aShortName == "message" )
pImpl->pNameResId = new SfxResId( STR_DOCTYPENAME_MESSAGE );
}
SfxObjectFactory::~SfxObjectFactory()
{
delete pImpl->pNameResId;
delete pImpl->pFilterContainer;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment