[Libreoffice-commits] core.git: sfx2/source
Caolán McNamara
caolanm at redhat.com
Tue Oct 25 13:09:14 UTC 2016
sfx2/source/dialog/templdlg.cxx | 5 -----
sfx2/source/inc/templdgi.hxx | 1 -
2 files changed, 6 deletions(-)
New commits:
commit 578e890e89c9a143d36b3d7307dcdc0545523614
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 25 14:08:30 2016 +0100
m_pStyleFamiliesId is now unused
Change-Id: Ibfd9810e8cfde596aee3189a3498d628d73fdc8b
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index c566eb3..e522d53 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -668,7 +668,6 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl
, pWindow(pW)
, pModule(nullptr)
, pIdle(nullptr)
- , m_pStyleFamiliesId(nullptr)
, pStyleFamilies(nullptr)
, pStyleSheetPool(nullptr)
, pTreeBox(nullptr)
@@ -742,8 +741,6 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
{
ResId aFamId( DLG_STYLE_DESIGNER, *pMgr );
aFamId.SetRT(RSC_SFX_STYLE_FAMILIES);
- m_pStyleFamiliesId = new ResId( aFamId.GetId(), *pMgr );
- m_pStyleFamiliesId->SetRT(RSC_SFX_STYLE_FAMILIES);
if (pMgr->IsAvailable(aFamId))
pStyleFamilies = new SfxStyleFamilies( aFamId );
}
@@ -851,8 +848,6 @@ void SfxCommonTemplateDialog_Impl::impl_clear()
for ( i = 0; i < COUNT_BOUND_FUNC; ++i )
delete pBoundItems[i];
pCurObjShell = nullptr;
-
- DELETEZ( m_pStyleFamiliesId );
}
SfxCommonTemplateDialog_Impl::DeletionWatcher *
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 9803029..0eafffe 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -175,7 +175,6 @@ protected:
SfxModule* pModule;
Idle* pIdle;
- ResId* m_pStyleFamiliesId;
SfxStyleFamilies* pStyleFamilies;
SfxTemplateItem* pFamilyState[MAX_FAMILIES];
SfxStyleSheetBasePool* pStyleSheetPool;
More information about the Libreoffice-commits
mailing list