accessibility/source/extended/accessibleiconchoicectrl.cxx | 19 ------
accessibility/source/extended/accessiblelistbox.cxx | 19 ------
sc/source/filter/xml/xmlimprt.cxx | 1
sc/source/filter/xml/xmlimprt.hxx | 6 -
sc/source/filter/xml/xmllabri.cxx | 11 +--
svx/source/accessibility/charmapacc.cxx | 40 +++++--------
6 files changed, 26 insertions(+), 70 deletions(-)
New commits:
commit 414a907d11d931b68a0b320d646c3ca06e58052c
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Fri Jul 14 19:38:14 2017 +0200
use unique_ptr for ScMyLabelRange
Change-Id: Ib54d28024d5f853c6f54600222be7a4285873a9b
Reviewed-on: https://gerrit.libreoffice.org/39986
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 8760c189f3fd..cb30edbf7645 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3168,7 +3168,6 @@ void ScXMLImport::SetLabelRanges()
xRowRanges->addNew( aLabelRange, aDataRange );
}
- delete *aItr;
aItr = pMyLabelRanges->erase(aItr);
}
}
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index 945e2abc010f..832dbb395b72 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -774,7 +774,7 @@ struct ScMyLabelRange
bool bColumnOrientation;
};
-typedef std::list<const ScMyLabelRange*> ScMyLabelRanges;
+typedef std::list< std::unique_ptr<const ScMyLabelRange> > ScMyLabelRanges;
struct ScMyImportValidation
{
@@ -1103,10 +1103,10 @@ public:
void AddNamedExpression(SCTAB nTab, ScMyNamedExpression* pNamedExp);
- void AddLabelRange(const ScMyLabelRange* pMyLabelRange) {
+ void AddLabelRange(std::unique_ptr<const ScMyLabelRange> pMyLabelRange) {
if (!pMyLabelRanges)
pMyLabelRanges = new ScMyLabelRanges;
- pMyLabelRanges->push_back(pMyLabelRange); }
+ pMyLabelRanges->push_back(std::move(pMyLabelRange)); }
void AddValidation(const ScMyImportValidation& rValidation) {
if (!pValidations)
diff --git a/sc/source/filter/xml/xmllabri.cxx
b/sc/source/filter/xml/xmllabri.cxx
index 0712a600f35c..d895157866aa 100644
--- a/sc/source/filter/xml/xmllabri.cxx
+++ b/sc/source/filter/xml/xmllabri.cxx
@@ -22,6 +22,8 @@
#include <xmloff/xmltoken.hxx>
#include "xmlimprt.hxx"
+#include <o3tl/make_unique.hxx>
+
using namespace ::com::sun::star;
using namespace xmloff::token;
@@ -109,13 +111,10 @@ void ScXMLLabelRangeContext::EndElement()
// Label ranges must be stored as strings until all sheets are loaded
// (like named expressions).
- ScMyLabelRange* pLabelRange = new ScMyLabelRange;
-
- pLabelRange->sLabelRangeStr = sLabelRangeStr;
- pLabelRange->sDataRangeStr = sDataRangeStr;
- pLabelRange->bColumnOrientation = bColumnOrientation;
+ auto pLabelRange = o3tl::make_unique<ScMyLabelRange>(
+ ScMyLabelRange{sLabelRangeStr, sDataRangeStr,
bColumnOrientation});
- GetScImport().AddLabelRange(pLabelRange);
+ GetScImport().AddLabelRange(std::move(pLabelRange));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0d8eae93766dec97b15cde55dea33df50b6d9505
Author: Arnaud Versini <arnaud.vers...@libreoffice.org>
Date: Sat Jul 15 13:26:27 2017 +0200
Don't call ensureIsAlive after comphelper::OExternalLockGuard.
comphelper::OExternalLockGuard calls ensureIsAlive, no need to call it
twice.
Change-Id: I08d2b77dcb4d1e72a69c521bf969cbe1e65d5721
Reviewed-on: https://gerrit.libreoffice.org/39997
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx
b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 3ec6e6e29c04..6a2c77955b00 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -159,7 +159,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
return getCtrl()->GetEntryCount();
}
@@ -167,7 +166,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl();
SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry(i);
if ( !pEntry )
@@ -194,7 +192,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
return getCtrl()->GetAccessibleDescription();
}
@@ -202,8 +199,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
OUString sName = getCtrl()->GetAccessibleName();
if ( sName.isEmpty() )
sName = "IconChoiceControl";
@@ -216,8 +211,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl();
SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( nChildIndex );
if ( !pEntry )
@@ -230,8 +223,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl();
SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( nChildIndex );
if ( !pEntry )
@@ -243,8 +234,6 @@ namespace accessibility
void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection( )
{
::comphelper::OExternalLockGuard aGuard( this );
-
- ensureAlive();
getCtrl()->SetNoSelection();
}
@@ -252,8 +241,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl();
sal_Int32 nCount = pCtrl->GetEntryCount();
for ( sal_Int32 i = 0; i < nCount; ++i )
@@ -268,8 +255,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
sal_Int32 nSelCount = 0;
VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl();
sal_Int32 nCount = pCtrl->GetEntryCount();
@@ -287,8 +272,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
if ( nSelectedChildIndex < 0 || nSelectedChildIndex >=
getSelectedAccessibleChildCount() )
throw IndexOutOfBoundsException();
@@ -316,8 +299,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
if ( nSelectedChildIndex < 0 || nSelectedChildIndex >=
getAccessibleChildCount() )
throw IndexOutOfBoundsException();
diff --git a/accessibility/source/extended/accessiblelistbox.cxx
b/accessibility/source/extended/accessiblelistbox.cxx
index a79c7a67d4d6..c19499de7dc2 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -333,8 +333,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
sal_Int32 nCount = 0;
VclPtr<SvTreeListBox> pSvTreeListBox = getListBox();
if ( pSvTreeListBox )
@@ -347,7 +345,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
SvTreeListEntry* pEntry = getListBox()->GetEntry(i);
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -420,7 +417,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
return getListBox()->GetAccessibleDescription();
}
@@ -428,7 +424,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
return getListBox()->GetAccessibleName();
}
@@ -438,8 +433,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
SvTreeListEntry* pEntry = getListBox()->GetEntry( nChildIndex );
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -451,8 +444,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
SvTreeListEntry* pEntry = getListBox()->GetEntry( nChildIndex );
if ( !pEntry )
throw IndexOutOfBoundsException();
@@ -464,8 +455,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
sal_Int32 nCount = getListBox()->GetLevelChildCount( nullptr );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
@@ -479,8 +468,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
sal_Int32 nCount = getListBox()->GetLevelChildCount( nullptr );
for ( sal_Int32 i = 0; i < nCount; ++i )
{
@@ -494,8 +481,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
return getListBox()->GetSelectionCount();
}
@@ -503,8 +488,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
if ( nSelectedChildIndex < 0 || nSelectedChildIndex >=
getSelectedAccessibleChildCount() )
throw IndexOutOfBoundsException();
@@ -533,8 +516,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
- ensureAlive();
-
SvTreeListEntry* pEntry = getListBox()->GetEntry( nSelectedChildIndex
);
if ( !pEntry )
throw IndexOutOfBoundsException();
diff --git a/svx/source/accessibility/charmapacc.cxx
b/svx/source/accessibility/charmapacc.cxx
index e34c5867de64..25ebf7640145 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -77,14 +77,13 @@ sal_Int32
SvxShowCharSetVirtualAcc::getImplAccessibleChildCount() const
sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
return getImplAccessibleChildCount();
}
uno::Reference< css::accessibility::XAccessible > SAL_CALL
SvxShowCharSetVirtualAcc::getAccessibleAtPoint( const awt::Point& aPoint )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
uno::Reference< css::accessibility::XAccessible > xRet;
const sal_uInt16 nItemId =
sal::static_int_cast<sal_uInt16>(mpParent->PixelToMapIndex( Point( aPoint.X,
aPoint.Y ) ));
@@ -110,14 +109,13 @@ uno::Reference< css::accessibility::XAccessible >
SAL_CALL SvxShowCharSetVirtual
void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
mpParent->GrabFocus();
}
Reference< XAccessible > SAL_CALL
SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
sal_Int32 nCount = getImplAccessibleChildCount();
if (i >= nCount)
@@ -135,7 +133,7 @@ Reference< XAccessible > SAL_CALL
SvxShowCharSetVirtualAcc::getAccessibleChild(
Reference< XAccessible > SAL_CALL
SvxShowCharSetVirtualAcc::getAccessibleParent( )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
vcl::Window* pParent =
mpParent->GetParent();
uno::Reference< css::accessibility::XAccessible > xRet;
@@ -323,7 +321,7 @@ css::awt::Rectangle SvxShowCharSetAcc::implGetBounds( )
sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
return m_pParent->getCharSetControl()->getMaxCharCount();
}
@@ -331,7 +329,7 @@ sal_Int32 SAL_CALL
SvxShowCharSetAcc::getAccessibleChildCount()
uno::Reference< css::accessibility::XAccessible > SAL_CALL
SvxShowCharSetAcc::getAccessibleChild( sal_Int32 i )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
uno::Reference< css::accessibility::XAccessible > xRet;
SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem(
static_cast< sal_uInt16 >( i ) );
@@ -351,7 +349,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL
SvxShowCharSetAcc::ge
uno::Reference< css::accessibility::XAccessible > SAL_CALL
SvxShowCharSetAcc::getAccessibleParent()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
return m_pParent;
}
@@ -372,7 +370,7 @@ OUString SAL_CALL
SvxShowCharSetAcc::getAccessibleDescription()
OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
return SvxResId( RID_SVXSTR_CHAR_SEL_DESC );
}
@@ -415,7 +413,6 @@ uno::Reference< css::accessibility::XAccessibleStateSet >
SAL_CALL SvxShowCharSe
uno::Reference< css::accessibility::XAccessible > SAL_CALL
SvxShowCharSetAcc::getAccessibleAtPoint( const awt::Point& aPoint )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
uno::Reference< css::accessibility::XAccessible > xRet;
const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>(
@@ -432,7 +429,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL
SvxShowCharSetAcc::ge
void SAL_CALL SvxShowCharSetAcc::grabFocus()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
m_pParent->getCharSetControl()->GrabFocus();
}
@@ -479,7 +476,7 @@ Reference< XAccessibleTable > SAL_CALL
SvxShowCharSetAcc::getAccessibleColumnHea
Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
Sequence< sal_Int32 > aSel(1);
aSel[0] =
SvxShowCharSet::GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId());
return aSel;
@@ -488,7 +485,7 @@ Sequence< sal_Int32 > SAL_CALL
SvxShowCharSetAcc::getSelectedAccessibleRows( )
Sequence< sal_Int32 > SAL_CALL
SvxShowCharSetAcc::getSelectedAccessibleColumns( )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
Sequence< sal_Int32 > aSel(1);
aSel[0] =
SvxShowCharSet::GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId());
return aSel;
@@ -497,7 +494,7 @@ Sequence< sal_Int32 > SAL_CALL
SvxShowCharSetAcc::getSelectedAccessibleColumns(
sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
return
SvxShowCharSet::GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId())
== nRow;
}
@@ -511,7 +508,7 @@ sal_Bool SAL_CALL
SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColu
Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt(
sal_Int32 nRow, sal_Int32 nColumn )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
svx::SvxShowCharSetItem* pItem =
m_pParent->getCharSetControl()->ImplGetItem(
sal::static_int_cast<sal_uInt16>(getAccessibleIndex(nRow,nColumn) ));
if ( !pItem )
@@ -532,7 +529,7 @@ Reference< XAccessible > SAL_CALL
SvxShowCharSetAcc::getAccessibleSummary( )
sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow,
sal_Int32 nColumn )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
return m_pParent->getCharSetControl()->GetSelectIndexId() ==
getAccessibleIndex(nRow,nColumn);
}
@@ -544,14 +541,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex(
sal_Int32 nRow, sal_In
sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
return
SvxShowCharSet::GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
}
sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32
nChildIndex )
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
return
SvxShowCharSet::GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
}
@@ -598,7 +595,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL
SvxShowCharSetItemAcc
uno::Reference< css::accessibility::XAccessible > SAL_CALL
SvxShowCharSetItemAcc::getAccessibleParent()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
return mpParent->m_pParent;
}
@@ -612,7 +609,7 @@ sal_Int16 SAL_CALL
SvxShowCharSetItemAcc::getAccessibleRole()
OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
OUString sDescription;
const OUString aCharStr( mpParent->maText);
@@ -641,7 +638,7 @@ OUString SAL_CALL
SvxShowCharSetItemAcc::getAccessibleDescription()
OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
+
OUString aRet;
if( mpParent )
@@ -665,7 +662,6 @@ uno::Reference< css::accessibility::XAccessibleRelationSet
> SAL_CALL SvxShowCha
uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
SvxShowCharSetItemAcc::getAccessibleStateSet()
{
OExternalLockGuard aGuard( this );
- ensureAlive();
::utl::AccessibleStateSetHelper* pStateSet = new
::utl::AccessibleStateSetHelper;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
