[Libreoffice-commits] core.git: 2 commits - sfx2/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon May 14 09:10:52 UTC 2018
sfx2/source/dialog/templdlg.cxx | 90 ++++++++++++++++++----------------------
sfx2/source/inc/templdgi.hxx | 7 +--
sfx2/source/view/viewimp.hxx | 2
sfx2/source/view/viewsh.cxx | 6 --
4 files changed, 48 insertions(+), 57 deletions(-)
New commits:
commit 943e12e73dfa7ec9c09e97be5bdaf851277c25a6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue May 8 14:22:01 2018 +0200
loplugin:useuniqueptr in SfxViewShell_Impl
Change-Id: Ie9efff0d4872d5b3353b765d00e56593e151ff83
Reviewed-on: https://gerrit.libreoffice.org/54173
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 2bb7cffb8a95..864c266f7398 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -51,7 +51,7 @@ struct SfxViewShell_Impl
::rtl::Reference< SfxClipboardChangeListener > xClipboardListener;
std::shared_ptr< vcl::PrinterController > m_xPrinterController;
- mutable std::vector<SfxInPlaceClient*>* mpIPClients;
+ mutable std::unique_ptr<std::vector<SfxInPlaceClient*>> mpIPClients;
LibreOfficeKitCallback m_pLibreOfficeKitViewCallback;
void* m_pLibreOfficeKitViewData;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 681b24258a58..0e9f1a0d4e68 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -222,7 +222,6 @@ SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags const nFlags)
, m_bIsShowView(!(nFlags & SfxViewShellFlags::NO_SHOW))
, m_nFamily(0xFFFF) // undefined, default set by TemplateDialog
, m_pController(nullptr)
-, mpIPClients(nullptr)
, m_pLibreOfficeKitViewCallback(nullptr)
, m_pLibreOfficeKitViewData(nullptr)
, m_bTiledSearching(false)
@@ -231,14 +230,13 @@ SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags const nFlags)
SfxViewShell_Impl::~SfxViewShell_Impl()
{
- DELETEZ(mpIPClients);
}
std::vector< SfxInPlaceClient* > *SfxViewShell_Impl::GetIPClients_Impl( bool bCreate ) const
{
if (!mpIPClients && bCreate)
- mpIPClients = new std::vector< SfxInPlaceClient* >;
- return mpIPClients;
+ mpIPClients.reset(new std::vector< SfxInPlaceClient* >);
+ return mpIPClients.get();
}
SFX_IMPL_SUPERCLASS_INTERFACE(SfxViewShell,SfxShell)
commit 981943837313777d1d96ab82068878dc5d87a5db
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue May 8 14:18:49 2018 +0200
loplugin:useuniqueptr in SfxCommonTemplateDialog_Impl
Change-Id: I204d9ea555e35d8822c01f43172dad53b04c60fb
Reviewed-on: https://gerrit.libreoffice.org/54171
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 678285a27456..3b9f53f6431c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -679,9 +679,6 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl
aFmtLb->SetFont( aFont );
aPreviewCheckbox->Check(officecfg::Office::Common::StylesAndFormatting::Preview::get());
aPreviewCheckbox->SetText( SfxResId(STR_PREVIEW_CHECKBOX) );
-
- memset(pBoundItems, 0, sizeof(pBoundItems));
- memset(pFamilyState, 0, sizeof(pFamilyState));
}
sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId)
@@ -700,16 +697,16 @@ void SfxTemplateDialog_Impl::EnableEdit(bool bEnable)
void SfxCommonTemplateDialog_Impl::ReadResource()
{
// Read global user resource
- for(SfxTemplateItem* & rp : pFamilyState)
- rp = nullptr;
+ for (auto & i : pFamilyState)
+ i.reset();
SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
pCurObjShell = pViewFrame->GetObjectShell();
pModule = pCurObjShell ? pCurObjShell->GetModule() : nullptr;
if (pModule)
- pStyleFamilies = pModule->CreateStyleFamilies();
+ pStyleFamilies.reset(pModule->CreateStyleFamilies());
if (!pStyleFamilies)
- pStyleFamilies = new SfxStyleFamilies;
+ pStyleFamilies.reset(new SfxStyleFamilies);
nActFilter = 0xffff;
if (pCurObjShell)
@@ -745,25 +742,25 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
nSlot = SID_STYLE_FAMILY6; break;
default: OSL_FAIL("unknown StyleFamily"); break;
}
- pBoundItems[i] =
- new SfxTemplateControllerItem(nSlot, *this, *pBindings);
- }
- pBoundItems[i++] = new SfxTemplateControllerItem(
- SID_STYLE_WATERCAN, *this, *pBindings);
- pBoundItems[i++] = new SfxTemplateControllerItem(
- SID_STYLE_NEW_BY_EXAMPLE, *this, *pBindings);
- pBoundItems[i++] = new SfxTemplateControllerItem(
- SID_STYLE_UPDATE_BY_EXAMPLE, *this, *pBindings);
- pBoundItems[i++] = new SfxTemplateControllerItem(
- SID_STYLE_NEW, *this, *pBindings);
- pBoundItems[i++] = new SfxTemplateControllerItem(
- SID_STYLE_DRAGHIERARCHIE, *this, *pBindings);
- pBoundItems[i++] = new SfxTemplateControllerItem(
- SID_STYLE_EDIT, *this, *pBindings);
- pBoundItems[i++] = new SfxTemplateControllerItem(
- SID_STYLE_DELETE, *this, *pBindings);
- pBoundItems[i++] = new SfxTemplateControllerItem(
- SID_STYLE_FAMILY, *this, *pBindings);
+ pBoundItems[i].reset(
+ new SfxTemplateControllerItem(nSlot, *this, *pBindings) );
+ }
+ pBoundItems[i++].reset( new SfxTemplateControllerItem(
+ SID_STYLE_WATERCAN, *this, *pBindings) );
+ pBoundItems[i++].reset( new SfxTemplateControllerItem(
+ SID_STYLE_NEW_BY_EXAMPLE, *this, *pBindings) );
+ pBoundItems[i++].reset( new SfxTemplateControllerItem(
+ SID_STYLE_UPDATE_BY_EXAMPLE, *this, *pBindings) );
+ pBoundItems[i++].reset( new SfxTemplateControllerItem(
+ SID_STYLE_NEW, *this, *pBindings) );
+ pBoundItems[i++].reset( new SfxTemplateControllerItem(
+ SID_STYLE_DRAGHIERARCHIE, *this, *pBindings) );
+ pBoundItems[i++].reset( new SfxTemplateControllerItem(
+ SID_STYLE_EDIT, *this, *pBindings) );
+ pBoundItems[i++].reset( new SfxTemplateControllerItem(
+ SID_STYLE_DELETE, *this, *pBindings) );
+ pBoundItems[i++].reset( new SfxTemplateControllerItem(
+ SID_STYLE_FAMILY, *this, *pBindings) );
pBindings->LEAVEREGISTRATIONS();
for(; i < COUNT_BOUND_FUNC; ++i)
@@ -805,13 +802,11 @@ void SfxCommonTemplateDialog_Impl::ClearResource()
void SfxCommonTemplateDialog_Impl::impl_clear()
{
- delete pStyleFamilies;
- pStyleFamilies = nullptr;
- sal_uInt16 i;
- for ( i = 0; i < MAX_FAMILIES; ++i )
- DELETEZ(pFamilyState[i]);
- for ( i = 0; i < COUNT_BOUND_FUNC; ++i )
- delete pBoundItems[i];
+ pStyleFamilies.reset();
+ for (auto & i : pFamilyState)
+ i.reset();
+ for (auto & i : pBoundItems)
+ i.reset();
pCurObjShell = nullptr;
}
@@ -1053,7 +1048,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
EnableItem(SID_STYLE_WATERCAN, false);
- SfxTemplateItem* pState = pFamilyState[nActFamily - 1];
+ SfxTemplateItem* pState = pFamilyState[nActFamily - 1].get();
if (nCount)
pTreeBox->Expand(pTreeBox->First());
@@ -1089,16 +1084,14 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags)
if (!pItem)
{
// Is the case for the template catalog
- SfxTemplateItem **ppItem = pFamilyState;
const size_t nFamilyCount = pStyleFamilies->size();
size_t n;
for( n = 0; n < nFamilyCount; n++ )
- if( ppItem[ StyleNrToInfoOffset(n) ] ) break;
+ if( pFamilyState[ StyleNrToInfoOffset(n) ] ) break;
if ( n == nFamilyCount )
// It happens sometimes, God knows why
return;
- ppItem += StyleNrToInfoOffset(n);
- nAppFilter = (*ppItem)->GetValue();
+ nAppFilter = pFamilyState[StyleNrToInfoOffset(n)]->GetValue();
FamilySelect( StyleNrToInfoOffset(n)+1 );
pItem = GetFamilyItem_Impl();
}
@@ -1211,7 +1204,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags)
aFmtLb->SetUpdateMode(true);
}
// Selects the current style if any
- SfxTemplateItem *pState = pFamilyState[nActFamily-1];
+ SfxTemplateItem *pState = pFamilyState[nActFamily-1].get();
OUString aStyle;
if(pState)
aStyle = pState->GetStyleName();
@@ -1256,7 +1249,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
pBindings->EnterRegistrations();
for(size_t n = 0; n < nCount; n++)
{
- SfxControllerItem *pCItem=pBoundItems[n];
+ SfxControllerItem *pCItem=pBoundItems[n].get();
bool bChecked = pItem && pItem->GetValue();
if( pCItem->IsBound() == bChecked )
{
@@ -1275,9 +1268,9 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* pItem )
{
sal_uInt16 nIdx = nSlotId - SID_STYLE_FAMILY_START;
- DELETEZ(pFamilyState[nIdx]);
+ pFamilyState[nIdx].reset();
if ( pItem )
- pFamilyState[nIdx] = new SfxTemplateItem(*pItem);
+ pFamilyState[nIdx].reset( new SfxTemplateItem(*pItem) );
bUpdate = true;
// If used templates (how the hell you find this out??)
@@ -1330,19 +1323,18 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
SfxTemplateItem *pItem = nullptr;
// current region not within the allowed region or default
- if(nActFamily == 0xffff || nullptr == (pItem = pFamilyState[nActFamily-1] ) )
+ if(nActFamily == 0xffff || nullptr == (pItem = pFamilyState[nActFamily-1].get() ) )
{
CheckItem(nActFamily, false);
- SfxTemplateItem **ppItem = pFamilyState;
const size_t nFamilyCount = pStyleFamilies->size();
size_t n;
for( n = 0; n < nFamilyCount; n++ )
- if( ppItem[ StyleNrToInfoOffset(n) ] ) break;
- ppItem+=StyleNrToInfoOffset(n);
+ if( pFamilyState[ StyleNrToInfoOffset(n) ] ) break;
- nAppFilter = (*ppItem)->GetValue();
+ std::unique_ptr<SfxTemplateItem> & pNewItem = pFamilyState[StyleNrToInfoOffset(n)];
+ nAppFilter = pNewItem->GetValue();
FamilySelect( StyleNrToInfoOffset(n) + 1 );
- pItem = *ppItem;
+ pItem = pNewItem.get();
}
else if( bDocChanged )
{
@@ -1393,7 +1385,7 @@ IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, void )
else
{
FillTreeBox();
- SfxTemplateItem *pState = pFamilyState[nActFamily-1];
+ SfxTemplateItem *pState = pFamilyState[nActFamily-1].get();
if(pState)
{
const OUString aStyle(pState->GetStyleName());
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 6bf1bde8852f..9495ed73db8c 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -23,6 +23,7 @@ class SfxTemplateControllerItem;
#include <sal/config.h>
+#include <array>
#include <memory>
#include <vcl/button.hxx>
@@ -170,7 +171,7 @@ protected:
friend class SfxTemplateControllerItem;
SfxBindings* pBindings;
- SfxTemplateControllerItem* pBoundItems[COUNT_BOUND_FUNC];
+ std::array<std::unique_ptr<SfxTemplateControllerItem>, COUNT_BOUND_FUNC> pBoundItems;
VclPtr<vcl::Window> pWindow;
std::unique_ptr<VclBuilder> mxBuilder;
@@ -179,8 +180,8 @@ protected:
SfxModule* pModule;
std::unique_ptr<Idle> pIdle;
- SfxStyleFamilies* pStyleFamilies;
- SfxTemplateItem* pFamilyState[MAX_FAMILIES];
+ std::unique_ptr<SfxStyleFamilies> pStyleFamilies;
+ std::array<std::unique_ptr<SfxTemplateItem>, MAX_FAMILIES> pFamilyState;
SfxStyleSheetBasePool* pStyleSheetPool;
VclPtr<StyleTreeListBox_Impl> pTreeBox;
SfxObjectShell* pCurObjShell;
More information about the Libreoffice-commits
mailing list