basctl/source/basicide/bastype2.cxx | 5
basctl/source/inc/bastype2.hxx | 1
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 3
chart2/source/controller/dialogs/ChartTypeDialogController.hxx | 1
chart2/source/inc/ObjectIdentifier.hxx | 2
chart2/source/tools/ObjectIdentifier.cxx | 12 -
chart2/source/view/axes/ScaleAutomatism.cxx | 3
chart2/source/view/inc/ScaleAutomatism.hxx | 1
connectivity/source/drivers/file/fcode.cxx | 10 -
connectivity/source/inc/file/fcode.hxx | 3
cui/source/dialogs/hyphen.cxx | 9 -
forms/source/richtext/rtattributes.hxx | 6
forms/source/xforms/mip.cxx | 6
forms/source/xforms/mip.hxx | 1
framework/source/accelerators/acceleratorcache.cxx | 6
framework/source/inc/accelerators/acceleratorcache.hxx | 3
framework/source/services/autorecovery.cxx | 14 -
idl/inc/hash.hxx | 10 -
idl/source/cmptools/hash.cxx | 2
include/oox/drawingml/color.hxx | 3
include/oox/ole/axcontrol.hxx | 1
include/sfx2/docmacromode.hxx | 1
include/vcl/bitmapex.hxx | 1
include/vcl/gfxlink.hxx | 1
oox/source/drawingml/color.cxx | 4
oox/source/ole/axcontrol.cxx | 4
sfx2/source/doc/docmacromode.cxx | 11 -
svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx | 1
svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx | 6
sw/source/ui/misc/outline.cxx | 2
sw/source/uibase/config/uinums.cxx | 30 +---
sw/source/uibase/inc/uinums.hxx | 5
vcl/inc/toolbox.h | 6
vcl/source/gdi/bitmapex.cxx | 4
vcl/source/gdi/gfxlink.cxx | 4
vcl/source/window/toolbox2.cxx | 72
----------
vcl/unx/kde4/KDESalFrame.cxx | 27 ++-
37 files changed, 50 insertions(+), 231 deletions(-)
New commits:
commit c7fd6532682a12d8981e6b19b4fbb75d6d3c412c
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 30 17:52:41 2016 +0100
Resolves: tdf#97055 hyphenation claims its already active after closing
cancel button works, hyphen all works, but closing it via wm close
skips the cancel callback.
simplest thing seems to be to call SpellEnd when necessary, flagging
that its not necessary by disabling the close button on the RET_OK
case
Change-Id: Ib0a67c4395e9d20941e735ebb14f6bd7f7ddb66c
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 28cbb0b..8dd3afa 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -268,7 +268,10 @@ void SvxHyphenWordDialog::ContinueHyph_Impl( sal_Int32
nInsPos )
}
}
else
- EndDialog( RET_OK );
+ {
+ m_pCloseBtn->Disable();
+ EndDialog(RET_OK);
+ }
}
@@ -399,7 +402,6 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CancelHdl_Impl,
Button*, void)
if( !m_bBusy )
{
m_bBusy = true;
- m_pHyphWrapper->SpellEnd();
EndDialog();
m_bBusy = false;
}
@@ -501,6 +503,8 @@ SvxHyphenWordDialog::~SvxHyphenWordDialog()
void SvxHyphenWordDialog::dispose()
{
+ if (m_pCloseBtn->IsEnabled())
+ m_pHyphWrapper->SpellEnd();
m_pWordEdit.clear();
m_pLeftBtn.clear();
m_pRightBtn.clear();
@@ -512,7 +516,6 @@ void SvxHyphenWordDialog::dispose()
SfxModalDialog::dispose();
}
-
void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang )
{
SetText( m_aLabel + " (" + SvtLanguageTable::GetLanguageString( nLang ) +
")" );
commit 107e5981b45f8ee042f6fbf5e1aa84aa557f8989
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 30 14:41:11 2016 +0100
default dtors are fine here
Change-Id: I503f954a2729aa2737d783ed8c72f62d8a68da4c
diff --git a/forms/source/richtext/rtattributes.hxx
b/forms/source/richtext/rtattributes.hxx
index 5e61f55..a47c5e2 100644
--- a/forms/source/richtext/rtattributes.hxx
+++ b/forms/source/richtext/rtattributes.hxx
@@ -51,7 +51,6 @@ namespace frm
inline AttributeState( );
inline explicit AttributeState( AttributeCheckState _eCheckState );
inline AttributeState( const AttributeState& _rSource );
- inline ~AttributeState( );
inline AttributeState& operator=( const AttributeState& _rSource );
@@ -80,11 +79,6 @@ namespace frm
operator=( _rSource );
}
- inline AttributeState::~AttributeState( )
- {
-// delete(pItemHandle);
- }
-
inline AttributeState& AttributeState::operator=( const AttributeState&
_rSource )
{
if ( &_rSource == this )
diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx
index ddeb968..0edf32e 100644
--- a/forms/source/xforms/mip.cxx
+++ b/forms/source/xforms/mip.cxx
@@ -20,11 +20,9 @@
#include "mip.hxx"
-
namespace xforms
{
-
MIP::MIP()
{
resetReadonly();
@@ -35,8 +33,6 @@ MIP::MIP()
resetTypeName();
}
-MIP::~MIP() {}
-
void MIP::inherit( const MIP& rMip )
{
if( ! mbHasReadonly )
@@ -92,14 +88,12 @@ void MIP::resetConstraint() { mbHasConstraint =
false; mbConstraint = true
void MIP::setConstraintExplanation( const OUString& s ) {
msConstraintExplanation = s; }
-
void MIP::setHasCalculate( bool b ) { mbHasCalculate = b; }
void MIP::resetCalculate() { mbHasCalculate = false; }
void MIP::setTypeName( const OUString& s ) { msTypeName = s; mbHasTypeName =
true; }
void MIP::resetTypeName() { msTypeName.clear(); mbHasTypeName = false;
}
-
} // namespace xforms
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx
index 5db986d..4996fe1 100644
--- a/forms/source/xforms/mip.hxx
+++ b/forms/source/xforms/mip.hxx
@@ -52,7 +52,6 @@ class MIP
public:
MIP();
- ~MIP();
/// inherit from upper-level MIPs
void inherit( const MIP& );
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index cde7bf1..2ba97d4 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -38,8 +38,7 @@ namespace drawingml {
class OOX_DLLPUBLIC Color
{
public:
- Color();
- ~Color();
+ Color();
/** Returns the RGB value for the passed DrawingML color token, or
nDefaultRgb on error. */
static sal_Int32 getDmlPresetColor( sal_Int32 nToken, sal_Int32
nDefaultRgb );
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 71c8118..66ab0d0 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -906,7 +906,6 @@ class OOX_DLLPUBLIC EmbeddedControl
{
public:
explicit EmbeddedControl( const OUString& rName );
- virtual ~EmbeddedControl();
/** Creates and returns the internal control model of the specified type.
*/
template< typename ModelType >
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index ebe2e19..01a1d7a 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -190,7 +190,6 @@ namespace sfx2
DocumentMacroMode instance lives, at least
*/
DocumentMacroMode( IMacroDocumentAccess& _rDocumentAccess );
- ~DocumentMacroMode();
/** allows macro execution in the document
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index fd2c9a7..6b45883 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -53,7 +53,6 @@ public:
BitmapEx( const Bitmap& rBmp, const Bitmap& rMask );
BitmapEx( const Bitmap& rBmp, const AlphaMask&
rAlphaMask );
BitmapEx( const Bitmap& rBmp, const Color&
rTransparentColor );
- ~BitmapEx();
BitmapEx& operator=( const BitmapEx& rBitmapEx );
bool operator==( const BitmapEx& rBitmapEx ) const;
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 0fcca06..3632b66 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -82,7 +82,6 @@ public:
// pBuff = The Graphic data. This class takes
ownership of this
GfxLink( std::unique_ptr<sal_uInt8[]> pBuf, sal_uInt32
nBufSize, GfxLinkType nType );
- ~GfxLink();
bool IsEqual( const GfxLink& ) const;
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 74598fc..47aff71 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -202,10 +202,6 @@ Color::Color() :
{
}
-Color::~Color()
-{
-}
-
sal_Int32 Color::getDmlPresetColor( sal_Int32 nToken, sal_Int32 nDefaultRgb )
{
/* Do not pass nDefaultRgb to ContainerHelper::getVectorElement(), to be
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 1455d5d..92a9aa1 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2614,10 +2614,6 @@ EmbeddedControl::EmbeddedControl( const OUString& rName
) :
{
}
-EmbeddedControl::~EmbeddedControl()
-{
-}
-
ControlModelBase* EmbeddedControl::createModelFromGuid( const OUString&
rClassId )
{
if( rClassId.equalsIgnoreAsciiCase( AX_GUID_COMMANDBUTTON ) ) return
&createModel< AxCommandButtonModel >();
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 9edaa2b..934d425 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -121,35 +121,24 @@ namespace sfx2
}
}
-
//= DocumentMacroMode
-
-
DocumentMacroMode::DocumentMacroMode( IMacroDocumentAccess&
rDocumentAccess )
:m_xData( new DocumentMacroMode_Data( rDocumentAccess ) )
{
}
-
- DocumentMacroMode::~DocumentMacroMode()
- {
- }
-
-
bool DocumentMacroMode::allowMacroExecution()
{
m_xData->m_rDocumentAccess.setCurrentMacroExecMode(
MacroExecMode::ALWAYS_EXECUTE_NO_WARN );
return true;
}
-
bool DocumentMacroMode::disallowMacroExecution()
{
m_xData->m_rDocumentAccess.setCurrentMacroExecMode(
MacroExecMode::NEVER_EXECUTE );
return false;
}
-
bool DocumentMacroMode::adjustMacroMode( const Reference<
XInteractionHandler >& rxInteraction )
{
sal_uInt16 nMacroExecutionMode =
m_xData->m_rDocumentAccess.getCurrentMacroExecMode();
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 2066c1b..53b38e4 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -184,10 +184,6 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Color&
rTransparentColor ) :
"BitmapEx::BitmapEx(): size mismatch for bitmap and alpha
mask." );
}
-BitmapEx::~BitmapEx()
-{
-}
-
BitmapEx& BitmapEx::operator=( const BitmapEx& rBitmapEx )
{
if( &rBitmapEx != this )
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index d9680e6..cddf455 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -45,10 +45,6 @@ GfxLink::GfxLink( std::unique_ptr<sal_uInt8[]> pBuf,
sal_uInt32 nSize, GfxLinkTy
mpSwapInData = std::shared_ptr<sal_uInt8>(pBuf.release(),
pBuf.get_deleter()); // std::move(pBuf) does not compile on Jenkins MacOSX (24
May 2016)
}
-GfxLink::~GfxLink()
-{
-}
-
bool GfxLink::IsEqual( const GfxLink& rGfxLink ) const
{
bool bIsEqual = false;
commit a7b18aaa46c225d3546ad52aab0c460092c8edb0
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 30 14:26:19 2016 +0100
no point in these dtors being virtual
nothing inherits from these classes
Change-Id: Ic887ac8a046b8697e310e19b6e7fdf9efae8f074
diff --git a/basctl/source/basicide/bastype2.cxx
b/basctl/source/basicide/bastype2.cxx
index 3fcaae4..af5ab34 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -157,12 +157,7 @@ EntryDescriptor::EntryDescriptor (
OSL_ENSURE( m_aDocument.isValid(), "EntryDescriptor::EntryDescriptor:
invalid document!" );
}
-EntryDescriptor::~EntryDescriptor()
-{ }
-
// TreeListBox
-
-
TreeListBox::TreeListBox (vcl::Window* pParent, ResId const& rRes)
: SvTreeListBox( pParent, IDEResId( sal::static_int_cast<sal_uInt16>(
rRes.GetId() ) ) )
, m_aNotifier( *this )
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index d8f17d8..fd092f2 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -139,7 +139,6 @@ public:
OUString const& rMethodName,
EntryType eType
);
- virtual ~EntryDescriptor ();
ScriptDocument const& GetDocument() const { return m_aDocument; }
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 3059988..972e52d 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -84,9 +84,6 @@ ChartTypeParameter::ChartTypeParameter( sal_Int32
SubTypeIndex, bool HasXAxisWit
, mbRoundedEdge(false)
{
}
-ChartTypeParameter::~ChartTypeParameter()
-{
-}
bool ChartTypeParameter::mapsToSameService( const ChartTypeParameter&
rParameter ) const
{
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index b746940..984fb67 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -60,7 +60,6 @@ public:
, bool _bSymbols = true, bool _bLines = true
, css::chart2::CurveStyle eCurveStyle =
css::chart2::CurveStyle_LINES );
ChartTypeParameter();
- virtual ~ChartTypeParameter();
bool mapsToSameService( const ChartTypeParameter& rParameter ) const;
bool mapsToSimilarService( const ChartTypeParameter& rParameter, sal_Int32
nTheHigherTheLess ) const;
diff --git a/chart2/source/inc/ObjectIdentifier.hxx
b/chart2/source/inc/ObjectIdentifier.hxx
index a38cdc5..067ff96 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -93,7 +93,6 @@ public:
ObjectIdentifier( const OUString& rObjectCID );
ObjectIdentifier( const css::uno::Reference< css::drawing::XShape >&
rxShape );
ObjectIdentifier( const css::uno::Any& rAny );
- virtual ~ObjectIdentifier();
ObjectIdentifier( const ObjectIdentifier& rOID );
bool operator==( const ObjectIdentifier& rOID ) const;
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index 4a65353..9af4f05 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -271,10 +271,6 @@ ObjectIdentifier::ObjectIdentifier( const Any& rAny )
}
}
-ObjectIdentifier::~ObjectIdentifier()
-{
-}
-
ObjectIdentifier::ObjectIdentifier( const ObjectIdentifier& rOID )
:m_aObjectCID( rOID.m_aObjectCID )
,m_xAdditionalShape( rOID.m_xAdditionalShape )
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx
b/chart2/source/view/axes/ScaleAutomatism.cxx
index 9bc8df7..022025b 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -105,9 +105,6 @@ ScaleAutomatism::ScaleAutomatism( const ScaleData&
rSourceScale, const Date& rNu
if( m_aSourceScale.Origin >>= fExplicitOrigin )
expandValueRange( fExplicitOrigin, fExplicitOrigin);
}
-ScaleAutomatism::~ScaleAutomatism()
-{
-}
void ScaleAutomatism::resetValueRange( )
{
diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx
b/chart2/source/view/inc/ScaleAutomatism.hxx
index 221612a..81535bd 100644
--- a/chart2/source/view/inc/ScaleAutomatism.hxx
+++ b/chart2/source/view/inc/ScaleAutomatism.hxx
@@ -42,7 +42,6 @@ class ScaleAutomatism
public:
explicit ScaleAutomatism(
const css::chart2::ScaleData& rSourceScale, const
Date& rNullDate );
- virtual ~ScaleAutomatism();
/** Expands own value range with the passed minimum and maximum.
*
diff --git a/framework/source/accelerators/acceleratorcache.cxx
b/framework/source/accelerators/acceleratorcache.cxx
index ca92b8f..ec5d353 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -40,12 +40,6 @@ AcceleratorCache::AcceleratorCache(const AcceleratorCache&
rCopy)
m_lKey2Commands = rCopy.m_lKey2Commands;
}
-AcceleratorCache::~AcceleratorCache()
-{
- // Don't save anything automatically here.
- // The user has to do that explicitly!
-}
-
void AcceleratorCache::takeOver(const AcceleratorCache& rCopy)
{
SolarMutexGuard g;
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx
b/framework/source/inc/accelerators/acceleratorcache.hxx
index c5332b1c..c52da84 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -85,9 +85,6 @@ class AcceleratorCache
*/
AcceleratorCache(const AcceleratorCache& rCopy);
- /** @short does nothing real. */
- virtual ~AcceleratorCache();
-
/** @short write changes back to the original container.
@param rCopy
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 458a22d..c0dd517 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -60,13 +60,13 @@ public:
, bHasId(false)
{
}
+
SvStringHashEntry( const OString& rName )
: aName(rName)
, nValue(0)
, bHasId(true)
{
}
- virtual ~SvStringHashEntry();
const OString& GetName() const { return aName; }
bool HasId() const { return bHasId; }
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index a03f4cd..76976b4 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -28,8 +28,6 @@
#include <rtl/character.hxx>
-SvStringHashEntry::~SvStringHashEntry() { };
-
SvHashTable::SvHashTable( sal_uInt32 nMaxEntries )
{
nMax = nMaxEntries; // set max entries
commit 2b8b8740f211a649a358fbe2406cae12e9621a77
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 30 14:33:14 2016 +0100
default assignment operator is fine
Change-Id: I0b63abbfe7d29c35cf7c7dd047527b20ad46c538
diff --git a/chart2/source/inc/ObjectIdentifier.hxx
b/chart2/source/inc/ObjectIdentifier.hxx
index 574b2c7..a38cdc5 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -96,7 +96,6 @@ public:
virtual ~ObjectIdentifier();
ObjectIdentifier( const ObjectIdentifier& rOID );
- ObjectIdentifier& operator=( const ObjectIdentifier& rOID );
bool operator==( const ObjectIdentifier& rOID ) const;
bool operator!=( const ObjectIdentifier& rOID ) const;
bool operator<( const ObjectIdentifier& rOID ) const;
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index 94862b2..4a65353 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -279,14 +279,6 @@ ObjectIdentifier::ObjectIdentifier( const
ObjectIdentifier& rOID )
:m_aObjectCID( rOID.m_aObjectCID )
,m_xAdditionalShape( rOID.m_xAdditionalShape )
{
-
-}
-
-ObjectIdentifier& ObjectIdentifier::operator=( const ObjectIdentifier& rOID )
-{
- m_aObjectCID = rOID.m_aObjectCID;
- m_xAdditionalShape = rOID.m_xAdditionalShape;
- return *this;
}
bool ObjectIdentifier::operator==( const ObjectIdentifier& rOID ) const
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 40238c6..5a9e4e6 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -118,9 +118,7 @@ public:
DispatchParams();
DispatchParams(const ::comphelper::SequenceAsHashMap& lArgs ,
const css::uno::Reference< css::uno::XInterface >& xOwner);
- ~DispatchParams();
- DispatchParams& operator=(const DispatchParams& rCopy);
void forget();
public:
@@ -1219,18 +1217,6 @@ DispatchParams::DispatchParams(const
::comphelper::SequenceAsHashMap&
m_xHoldRefForAsyncOpAlive = xOwner;
};
-DispatchParams::~DispatchParams()
-{};
-
-DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy)
-{
- m_xProgress = rCopy.m_xProgress;
- m_sSavePath = rCopy.m_sSavePath;
- m_nWorkingEntryID = rCopy.m_nWorkingEntryID;
- m_xHoldRefForAsyncOpAlive = rCopy.m_xHoldRefForAsyncOpAlive;
- return *this;
-}
-
void DispatchParams::forget()
{
m_sSavePath.clear();
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 6546ca7..458a22d 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -73,14 +73,6 @@ public:
void SetValue( sal_uLong n ) { nValue = n; }
sal_uLong GetValue() const { return nValue; }
-
- SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
- { SvRefBase::operator=( rRef );
- aName = rRef.aName;
- nValue = rRef.nValue;
- bHasId = rRef.bHasId;
- return *this;
- }
};
class SvStringHashTable : public SvHashTable
commit dd5fa4cea7b0c6912754e6887a678a050d4a7610
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 30 14:19:44 2016 +0100
declare default dtor as virtual
Change-Id: Ic77dbe3ffb2d2856d437158914b877b913296e0e
diff --git a/connectivity/source/drivers/file/fcode.cxx
b/connectivity/source/drivers/file/fcode.cxx
index 47e7cac..3089359 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -32,16 +32,6 @@ using namespace connectivity::file;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdb;
-
-OCode::OCode()
-{
-}
-
-OCode::~OCode()
-{
-}
-
-
OOperandRow::OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType)
: OOperand(_rType)
, m_nRowPos(_nPos)
diff --git a/connectivity/source/inc/file/fcode.hxx
b/connectivity/source/inc/file/fcode.hxx
index afd62c7..c346569 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -44,8 +44,7 @@ namespace connectivity
class OOO_DLLPUBLIC_FILE OCode
{
public:
- OCode();
- virtual ~OCode();
+ virtual ~OCode() = default;
inline static void * SAL_CALL operator new( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
commit 181c6a88866511384b291de0701e0e0c9289703d
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Aug 28 22:01:42 2016 +0100
coverity#1371300 Missing move assignment operator
Change-Id: I4add8d1f0e1f007d247d4fe9f6fa2048b792c1b0
diff --git a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
index e2e4aaa..924967a 100644
--- a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx
@@ -53,6 +53,7 @@ namespace drawinglayer
SdrFormTextOutlineAttribute();
SdrFormTextOutlineAttribute(const SdrFormTextOutlineAttribute&
rCandidate);
SdrFormTextOutlineAttribute& operator=(const
SdrFormTextOutlineAttribute& rCandidate);
+ SdrFormTextOutlineAttribute&
operator=(SdrFormTextOutlineAttribute&& rCandidate);
~SdrFormTextOutlineAttribute();
// checks if the incarnation is default constructed
diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
index 1126013..6e6211d 100644
--- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
@@ -108,6 +108,12 @@ namespace drawinglayer
return *this;
}
+ SdrFormTextOutlineAttribute&
SdrFormTextOutlineAttribute::operator=(SdrFormTextOutlineAttribute&& rCandidate)
+ {
+ mpSdrFormTextOutlineAttribute =
std::move(rCandidate.mpSdrFormTextOutlineAttribute);
+ return *this;
+ }
+
bool SdrFormTextOutlineAttribute::operator==(const
SdrFormTextOutlineAttribute& rCandidate) const
{
// tdf#87509 default attr is always != non-default attr, even with
same values
commit 606232e450888b12e24da9c3e56c91333a1bb6d3
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 30 13:31:41 2016 +0100
rework for coverity#1371269 Missing move assignment operator
Change-Id: I10f9ed448854b4ece61fd84b8aa49674d0828cac
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 4bc1439..c1da741 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -305,7 +305,7 @@ IMPL_LINK_TYPED( SwOutlineTabDialog, MenuSelectHdl, Menu *,
pMenu, bool )
const SwNumRulesWithName *pRules = pChapterNumRules->GetRules(
nLevelNo );
if( pRules )
{
- pRules->MakeNumRule( rWrtSh, *pNumRule );
+ *pNumRule = pRules->MakeNumRule(rWrtSh);
pNumRule->SetRuleType( OUTLINE_RULE );
}
else
diff --git a/sw/source/uibase/config/uinums.cxx
b/sw/source/uibase/config/uinums.cxx
index ede3be4..a3943a9 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -159,21 +159,19 @@ SwNumRulesWithName& SwNumRulesWithName::operator=(const
SwNumRulesWithName &rCop
return *this;
}
-void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const
+SwNumRule SwNumRulesWithName::MakeNumRule(SwWrtShell& rSh) const
{
// #i89178#
- rChg = SwNumRule( maName, numfunc::GetDefaultPositionAndSpaceMode() );
- rChg.SetAutoRule( false );
- for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
+ SwNumRule aChg(maName, numfunc::GetDefaultPositionAndSpaceMode());
+ aChg.SetAutoRule( false );
+ for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
{
SwNumFormatGlobal* pFormat = aFormats[ n ];
- if( nullptr != pFormat)
- {
- SwNumFormat aNew;
- pFormat->ChgNumFormat( rSh, aNew );
- rChg.Set( n, aNew );
- }
+ if (!pFormat)
+ continue;
+ aChg.Set(n, pFormat->MakeNumFormat(rSh));
}
+ return aChg;
}
void SwNumRulesWithName::GetNumFormat(
@@ -236,8 +234,7 @@ SwNumRulesWithName::SwNumFormatGlobal::~SwNumFormatGlobal()
{
}
-void SwNumRulesWithName::SwNumFormatGlobal::ChgNumFormat( SwWrtShell& rSh,
- SwNumFormat& rNew ) const
+SwNumFormat SwNumRulesWithName::SwNumFormatGlobal::MakeNumFormat(SwWrtShell&
rSh) const
{
SwCharFormat* pFormat = nullptr;
if( !sCharFormatName.isEmpty() )
@@ -272,10 +269,11 @@ void SwNumRulesWithName::SwNumFormatGlobal::ChgNumFormat(
SwWrtShell& rSh,
}
}
}
- const_cast<SwNumFormat&>(aFormat).SetCharFormat( pFormat );
- rNew = aFormat;
- if( pFormat )
- const_cast<SwNumFormat&>(aFormat).SetCharFormat( nullptr );
+ const_cast<SwNumFormat&>(aFormat).SetCharFormat(pFormat);
+ SwNumFormat aNew = aFormat;
+ if (pFormat)
+ const_cast<SwNumFormat&>(aFormat).SetCharFormat(nullptr);
+ return aNew;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 27a1682..3329579 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwNumRulesWithName
SwNumFormatGlobal( const SwNumFormatGlobal& );
~SwNumFormatGlobal();
- void ChgNumFormat( SwWrtShell& rSh, SwNumFormat& rChg ) const;
+ SwNumFormat MakeNumFormat(SwWrtShell& rSh) const;
};
SwNumFormatGlobal* aFormats[ MAXLEVEL ];
@@ -73,8 +73,7 @@ public:
SwNumRulesWithName &operator=(const SwNumRulesWithName &);
const OUString& GetName() const { return maName; }
- void MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const;
-
+ SwNumRule MakeNumRule(SwWrtShell& rSh) const;
void GetNumFormat(size_t, SwNumFormat const*&, OUString const*&) const;
};
commit 29730225f2e1dcc0a2e0a63f1eebbc442055fecb
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 30 13:19:52 2016 +0100
silence coverity#1371204 Missing move assignment operator
and
silence coverity#1371210 Missing move assignment operator
Change-Id: I6d7a59fd789c16ee11a27d50ba8fd14f17ae77e0
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 1d945a5..9edeb11 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -177,28 +177,33 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
KConfig *pConfig = KGlobal::config().data();
if ( pConfig )
{
- KConfigGroup aGroup = pConfig->group( "WM" );
const char *pKey;
- pKey = "titleFont";
- if ( aGroup.hasKey( pKey ) )
{
- vcl::Font aFont = toFont( aGroup.readEntry( pKey, QFont() ),
rSettings.GetUILanguageTag().getLocale() );
- style.SetTitleFont( aFont );
- bSetTitleFont = true;
+ KConfigGroup aWMGroup = pConfig->group( "WM" );
+
+ pKey = "titleFont";
+ if (aWMGroup.hasKey(pKey))
+ {
+ vcl::Font aFont = toFont(aWMGroup.readEntry(pKey, QFont()),
+
rSettings.GetUILanguageTag().getLocale());
+ style.SetTitleFont( aFont );
+ bSetTitleFont = true;
+ }
}
- aGroup = pConfig->group( "Icons" );
+ KConfigGroup aIconsGroup = pConfig->group("Icons");
pKey = "Theme";
- if ( aGroup.hasKey( pKey ) )
- style.SetPreferredIconTheme( readEntryUntranslated( &aGroup, pKey
) );
+ if (aIconsGroup.hasKey(pKey))
+ style.SetPreferredIconTheme( readEntryUntranslated(&aIconsGroup,
pKey));
//toolbar
pKey = "toolbarFont";
- if ( aGroup.hasKey( pKey ) )
+ if (aIconsGroup.hasKey(pKey))
{
- vcl::Font aFont = toFont( aGroup.readEntry( pKey, QFont() ),
rSettings.GetUILanguageTag().getLocale() );
+ vcl::Font aFont = toFont(aIconsGroup.readEntry(pKey, QFont()),
+ rSettings.GetUILanguageTag().getLocale());
style.SetToolFont( aFont );
}
}
commit a2dbaac6a802af438d82b9889d58fc6ac534ca09
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 30 13:01:06 2016 +0100
default assignment and ctor are fine here
Change-Id: I50edc71ee8bb4398764f2e15180a0269aac233ce
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 7fd621e..e45c394 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -34,7 +34,7 @@ namespace vcl { class Window; }
struct ImplToolItem
{
- VclPtr<vcl::Window> mpWindow;
+ VclPtr<vcl::Window> mpWindow; //don't dispose mpWindow - we get copied
around
void* mpUserData;
Image maImage;
Image maImageOriginal;
@@ -75,10 +75,6 @@ struct ImplToolItem
ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
const OUString& rTxt,
ToolBoxItemBits nItemBits );
- ~ImplToolItem();
-
- ImplToolItem( const ImplToolItem& );
- ImplToolItem& operator=(const ImplToolItem&);
// returns the size of a item, taking toolbox orientation into account
// the default size is the precomputed size for standard items
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 307b387..a584a55 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -127,78 +127,6 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const
Image& rImage,
init(nItemId, nItemBits, false);
}
-ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
- mpWindow ( rItem.mpWindow ),
- mpUserData ( rItem.mpUserData ),
- maImage ( rItem.maImage ),
- maImageOriginal ( rItem.maImageOriginal ),
- mnImageAngle ( rItem.mnImageAngle ),
- mbMirrorMode ( rItem.mbMirrorMode ),
- maText ( rItem.maText ),
- maQuickHelpText ( rItem.maQuickHelpText ),
- maHelpText ( rItem.maHelpText ),
- maCommandStr ( rItem.maCommandStr ),
- maHelpId ( rItem.maHelpId ),
- maRect ( rItem.maRect ),
- maCalcRect ( rItem.maCalcRect ),
- maMinimalItemSize ( rItem.maMinimalItemSize ),
- maItemSize ( rItem.maItemSize ),
- mnSepSize ( rItem.mnSepSize ),
- mnDropDownArrowWidth ( rItem.mnDropDownArrowWidth ),
- maContentSize ( rItem.maContentSize ),
- meType ( rItem.meType ),
- mnBits ( rItem.mnBits ),
- meState ( rItem.meState ),
- mnId ( rItem.mnId ),
- mbEnabled ( rItem.mbEnabled ),
- mbVisible ( rItem.mbVisible ),
- mbEmptyBtn ( rItem.mbEmptyBtn ),
- mbShowWindow ( rItem.mbShowWindow ),
- mbBreak ( rItem.mbBreak ),
- mbVisibleText ( rItem.mbVisibleText ),
- mbExpand ( rItem.mbExpand )
-{
-}
-
-ImplToolItem::~ImplToolItem()
-{
- // don't dispose mpWindow - we get copied around.
-}
-
-ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem )
-{
- mpWindow = rItem.mpWindow;
- mpUserData = rItem.mpUserData;
- maImage = rItem.maImage;
- maImageOriginal = rItem.maImageOriginal;
- mnImageAngle = rItem.mnImageAngle;
- mbMirrorMode = rItem.mbMirrorMode;
- maText = rItem.maText;
- maQuickHelpText = rItem.maQuickHelpText;
- maHelpText = rItem.maHelpText;
- maCommandStr = rItem.maCommandStr;
- maHelpId = rItem.maHelpId;
- maRect = rItem.maRect;
- maCalcRect = rItem.maCalcRect;
- mnSepSize = rItem.mnSepSize;
- mnDropDownArrowWidth = rItem.mnDropDownArrowWidth;
- maContentSize = rItem.maContentSize;
- maMinimalItemSize = rItem.maMinimalItemSize;
- maItemSize = rItem.maItemSize;
- mbVisibleText = rItem.mbVisibleText;
- mbExpand = rItem.mbExpand;
- meType = rItem.meType;
- mnBits = rItem.mnBits;
- meState = rItem.meState;
- mnId = rItem.mnId;
- mbEnabled = rItem.mbEnabled;
- mbVisible = rItem.mbVisible;
- mbEmptyBtn = rItem.mbEmptyBtn;
- mbShowWindow = rItem.mbShowWindow;
- mbBreak = rItem.mbBreak;
- return *this;
-}
-
Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth,
const Size& rDefaultSize )
{
Size aSize( rDefaultSize ); // the size of 'standard' toolbox items
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
