[Libreoffice-commits] core.git: 3 commits - starmath/source stoc/source svl/source svx/source
Caolán McNamara
caolanm at redhat.com
Wed Aug 12 05:48:42 PDT 2015
starmath/source/node.cxx | 22 +++++++-------------
stoc/source/invocation_adapterfactory/iafactory.cxx | 4 +++
svl/source/fsstor/fsstorage.cxx | 7 +++---
svl/source/numbers/zforfind.hxx | 4 +++
svl/source/undo/undo.cxx | 5 +++-
svx/source/dialog/charmap.cxx | 6 -----
6 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit 79395c934771818686e488a7c2e382a00456c8a1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 12 13:43:27 2015 +0100
Resolves: tdf#93113 crash on revisiting insert special character
this effectively reverts
commit c43ee00e5d2edfebfa148b310813335aab27db34
Author: Herbert Duerr <hdu at openoffice.org>
Date: Wed Aug 15 13:20:51 2001 +0000
#91025# reduce flicker in charmap dialog
in favour of the new double buffering
Paint is calling RecalculateFont which calls SelectIndex
which calls Update which calls Paint, boom
Change-Id: I69e9f53b7db09837ff08a2ce9fc6f81a52b5c794
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 1786b71..7b47b53 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -602,7 +602,6 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus )
aVscrollSB->SetThumbPos( nNewPos );
nSelectedIndex = bFocus ? nMapIndex+1 : -1;
Invalidate();
- Update();
}
else if( nNewIndex < FirstInView() )
{
@@ -612,8 +611,6 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus )
aVscrollSB->SetThumbPos( nOldPos - nDelta );
nSelectedIndex = nNewIndex;
Invalidate();
- if( nDelta )
- Update();
}
else if( nNewIndex > LastInView() )
{
@@ -626,10 +623,9 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus )
nSelectedIndex = nNewIndex;
Invalidate();
}
- if( nOldPos != aVscrollSB->GetThumbPos() )
+ else if (nOldPos != aVscrollSB->GetThumbPos())
{
Invalidate();
- Update();
}
}
else
commit 197c4320aeb6f29e7de15dfc1b8d8ad5ce89b0b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 12 12:29:40 2015 +0100
cppcheck: variableScope
Change-Id: Ibb70de22f566c103af7a1f075252ae38da1742b2
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index f8a7ae1..31ee52a 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -498,11 +498,13 @@ void SmNode::DumpAsDot(std::ostream &out, OUString* label, int number, int& id,
//Dump subnodes
int myid = id;
- const SmNode *pNode;
sal_uInt16 nSize = GetNumSubNodes();
for (sal_uInt16 i = 0; i < nSize; i++)
- if (NULL != (pNode = GetSubNode(i)))
+ {
+ const SmNode *pNode = GetSubNode(i);
+ if (pNode)
pNode->DumpAsDot(out, NULL, i, ++id, myid);
+ }
//If this is the root end the file
if( number == -1 )
@@ -641,25 +643,20 @@ SmNode * SmVisibleNode::GetSubNode(sal_uInt16 /*nIndex*/)
return NULL;
}
-
-
-
void SmGraphicNode::GetAccessibleText( OUStringBuffer &rText ) const
{
rText.append(GetToken().aText);
}
-
-
-
void SmExpressionNode::CreateTextFromNode(OUString &rText)
{
- SmNode *pNode;
sal_uInt16 nSize = GetNumSubNodes();
if (nSize > 1)
rText += "{";
for (sal_uInt16 i = 0; i < nSize; i++)
- if (NULL != (pNode = GetSubNode(i)))
+ {
+ SmNode *pNode = GetSubNode(i);
+ if (pNode)
{
pNode->CreateTextFromNode(rText);
//Just a bit of foo to make unary +asd -asd +-asd -+asd look nice
@@ -668,6 +665,7 @@ void SmExpressionNode::CreateTextFromNode(OUString &rText)
( !rText.endsWith("+") && !rText.endsWith("-") ))
rText += " ";
}
+ }
if (nSize > 1)
{
@@ -676,9 +674,6 @@ void SmExpressionNode::CreateTextFromNode(OUString &rText)
}
}
-
-
-
void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// arranges all subnodes in one column
{
@@ -736,7 +731,6 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
}
}
-
SmNode * SmTableNode::GetLeftMost()
{
return this;
commit b472ba671ab4e388786a109ac61823e0f7290cd4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 12 12:11:18 2015 +0100
cppcheck: noCopyConstructor
Change-Id: I62da241f237b17fc192dd586bcd35b5bd6ea284a
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 102fdeb..ecc67cb 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -164,6 +164,10 @@ struct AdapterImpl
void * key, Reference< script::XInvocation > const & xReceiver,
const Sequence< Type > & rTypes,
FactoryImpl * pFactory );
+
+ // Copy assignment is forbidden and not implemented.
+ AdapterImpl (const AdapterImpl &) SAL_DELETED_FUNCTION;
+ AdapterImpl & operator= (const AdapterImpl &) SAL_DELETED_FUNCTION;
};
inline AdapterImpl::~AdapterImpl()
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 4caaf7b..c463f96 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -83,8 +83,6 @@ bool isLocalFile_Impl( const OUString& aURL )
return ( !aSystemPath.isEmpty() );
}
-
-
struct FSStorage_Impl
{
OUString m_aURL;
@@ -110,8 +108,11 @@ struct FSStorage_Impl
}
~FSStorage_Impl();
-};
+ // Copy assignment is forbidden and not implemented.
+ FSStorage_Impl (const FSStorage_Impl &) SAL_DELETED_FUNCTION;
+ FSStorage_Impl & operator= (const FSStorage_Impl &) SAL_DELETED_FUNCTION;
+};
FSStorage_Impl::~FSStorage_Impl()
{
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 40db649..4dab5cb 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -184,6 +184,10 @@ private:
*/
sal_uInt16 nDatePatternNumbers;
+ // Copy assignment is forbidden and not implemented.
+ ImpSvNumberInputScan (const ImpSvNumberInputScan &) SAL_DELETED_FUNCTION;
+ ImpSvNumberInputScan & operator= (const ImpSvNumberInputScan &) SAL_DELETED_FUNCTION;
+
void Reset(); // Reset all variables before start of analysis
void InitText(); // Init of months and days of week
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 045586d..f0f5df9 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -257,8 +257,11 @@ struct SVL_DLLPRIVATE SfxUndoManager_Data
{
delete pUndoArray;
}
-};
+ // Copy assignment is forbidden and not implemented.
+ SfxUndoManager_Data (const SfxUndoManager_Data &) SAL_DELETED_FUNCTION;
+ SfxUndoManager_Data & operator= (const SfxUndoManager_Data &) SAL_DELETED_FUNCTION;
+};
namespace svl { namespace undo { namespace impl
{
More information about the Libreoffice-commits
mailing list