[Libreoffice-commits] core.git: accessibility/inc basic/source compilerplugins/clang include/basic include/svtools sd/source svtools/source sw/source unotools/source vcl/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri May 12 10:31:34 UTC 2017
accessibility/inc/extended/AccessibleGridControl.hxx | 4 +-
basic/source/sbx/sbxbase.cxx | 2 -
basic/source/sbx/sbxcoll.cxx | 7 +--
compilerplugins/clang/constantparam.py | 3 +
include/basic/sbx.hxx | 2 -
include/svtools/accessibletable.hxx | 3 -
include/svtools/imap.hxx | 12 +++---
sd/source/ui/view/sdview3.cxx | 2 -
svtools/source/misc/imap.cxx | 8 ++--
svtools/source/misc/imap2.cxx | 36 +++++++++----------
svtools/source/misc/transfer.cxx | 4 +-
svtools/source/misc/transfer2.cxx | 2 -
svtools/source/table/tablecontrol_impl.cxx | 2 -
sw/source/core/crsr/bookmrk.cxx | 4 --
sw/source/core/crsr/crossrefbookmark.cxx | 2 -
sw/source/core/doc/docbm.cxx | 2 -
sw/source/core/inc/bookmrk.hxx | 3 -
unotools/source/config/historyoptions.cxx | 8 ++--
vcl/source/window/menu.cxx | 2 -
vcl/source/window/menuitemlist.cxx | 4 --
vcl/source/window/menuitemlist.hxx | 1
21 files changed, 54 insertions(+), 59 deletions(-)
New commits:
commit dd6d7992d6f16133fafa7a617cf5fa0ba1ae37cc
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed May 10 19:19:10 2017 +0200
loplugin:constantparam
Change-Id: I67d74072c776c32a1f91df94c621efe180baf5dc
Reviewed-on: https://gerrit.libreoffice.org/37481
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index 3bcaaac1d288..438315acb7c9 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -203,11 +203,11 @@ protected:
pContext->commitTableEvent( nEventId, rNewValue, rOldValue );
}
virtual void commitEvent( sal_Int16 nEventId,
- const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) override
+ const css::uno::Any& rNewValue ) override
{
AccessibleGridControl* pContext( getContext() );
if ( pContext )
- pContext->commitEvent( nEventId, rNewValue, rOldValue );
+ pContext->commitEvent( nEventId, rNewValue, css::uno::Any() );
}
private:
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index b165f3a8371d..2b4944aa3754 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -155,7 +155,7 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
case SBXID_ARRAY: return new SbxArray;
case SBXID_DIMARRAY: return new SbxDimArray;
case SBXID_OBJECT: return new SbxObject( "" );
- case SBXID_COLLECTION: return new SbxCollection( "" );
+ case SBXID_COLLECTION: return new SbxCollection;
case SBXID_FIXCOLLECTION:
return new SbxStdCollection;
case SBXID_METHOD: return new SbxMethod( "", SbxEMPTY );
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index a624d0241cf7..690cbc2ec2bd 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -30,8 +30,8 @@ static OUString pRemove;
static sal_uInt16 nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
-SbxCollection::SbxCollection( const OUString& rClass )
- : SbxObject( rClass )
+SbxCollection::SbxCollection()
+ : SbxObject( "" )
{
if( !nCountHash )
{
@@ -238,8 +238,7 @@ bool SbxCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
SbxStdCollection::SbxStdCollection()
- : SbxCollection( "" ),
- bAddRemoveOk( true )
+ : bAddRemoveOk( true )
{}
SbxStdCollection::SbxStdCollection( const SbxStdCollection& r )
diff --git a/compilerplugins/clang/constantparam.py b/compilerplugins/clang/constantparam.py
index 99ef69c8816a..db71c51b49d6 100755
--- a/compilerplugins/clang/constantparam.py
+++ b/compilerplugins/clang/constantparam.py
@@ -77,6 +77,9 @@ for callInfo, callValues in callDict.iteritems():
if callValue.startswith("get"): continue
if "operator=" in functionSig: continue
if "&&" in functionSig: continue
+ if callInfo[2] == "###0" and callValue == "InitData()": continue
+ if callInfo[2] == "###0" and callValue == "InitAggregate()": continue
+ if callValue == "shared_from_this()": continue
tmp3list.append((sourceLoc, functionSig, callInfo[3] + " " + callInfo[2], callValue))
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 6b2890688710..485a2e89994b 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -222,7 +222,7 @@ protected:
public:
SBX_DECL_PERSIST_NODATA(SBXID_COLLECTION,1);
- SbxCollection( const OUString& rClassname );
+ SbxCollection();
SbxCollection( const SbxCollection& );
SbxCollection& operator=( const SbxCollection& );
virtual SbxVariable* FindUserData( sal_uInt32 nUserData ) override;
diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx
index 335379ac3bc1..f24e2963270a 100644
--- a/include/svtools/accessibletable.hxx
+++ b/include/svtools/accessibletable.hxx
@@ -159,8 +159,7 @@ public:
///** Commits an event to all listeners. */
virtual void commitEvent(
sal_Int16 nEventId,
- const css::uno::Any& rNewValue,
- const css::uno::Any& rOldValue
+ const css::uno::Any& rNewValue
) = 0;
protected:
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 871cf940ace0..ecb5b09edfc1 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -43,10 +43,10 @@ private:
void ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& );
// Import/Export
- void ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
- void ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const;
- sal_uLong ImpReadCERN( SvStream& rOStm, const OUString& rBaseURL );
- sal_uLong ImpReadNCSA( SvStream& rOStm, const OUString& rBaseURL );
+ void ImpWriteCERN( SvStream& rOStm ) const;
+ void ImpWriteNCSA( SvStream& rOStm ) const;
+ sal_uLong ImpReadCERN( SvStream& rOStm );
+ sal_uLong ImpReadNCSA( SvStream& rOStm );
void ImpReadCERNLine( const OString& rLine, const OUString& rBaseURL );
static Point ImpReadCERNCoords( const char** ppStr );
@@ -108,8 +108,8 @@ public:
void Scale( const Fraction& rFractX, const Fraction& rFracY );
// Import/Export
- void Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
- void Read( SvStream& rIStm, const OUString& rBaseURL );
+ void Write ( SvStream& rOStm ) const;
+ void Read( SvStream& rIStm );
void Write( SvStream& rOStm, sal_uLong nFormat ) const;
sal_uLong Read( SvStream& rIStm, sal_uLong nFormat );
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index d5129135d8ac..5f31aabd0293 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -321,7 +321,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
{
pImageMap.reset(new ImageMap);
// mba: clipboard always must contain absolute URLs (could be from alien source)
- pImageMap->Read( *xStm, OUString() );
+ pImageMap->Read( *xStm );
}
}
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 7888c8ee5099..a4b5b7ef84d4 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -910,7 +910,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString&
|*
\******************************************************************************/
-void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
+void ImageMap::Write( SvStream& rOStm ) const
{
IMapCompat* pCompat;
OUString aImageName( GetName() );
@@ -934,7 +934,7 @@ void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
delete pCompat;
- ImpWriteImageMap( rOStm, rBaseURL );
+ ImpWriteImageMap( rOStm, OUString() );
rOStm.SetEndian( nOldFormat );
}
@@ -946,7 +946,7 @@ void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
|*
\******************************************************************************/
-void ImageMap::Read( SvStream& rIStm, const OUString& rBaseURL )
+void ImageMap::Read( SvStream& rIStm )
{
char cMagic[6];
SvStreamEndian nOldFormat = rIStm.GetEndian();
@@ -975,7 +975,7 @@ void ImageMap::Read( SvStream& rIStm, const OUString& rBaseURL )
// here one can read in newer versions
delete pCompat;
- ImpReadImageMap( rIStm, nCount, rBaseURL );
+ ImpReadImageMap( rIStm, nCount, OUString() );
}
else
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 6f01c15a1fcc..e9ccd365606d 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -144,16 +144,16 @@ void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat ) const
{
switch( nFormat )
{
- case IMAP_FORMAT_BIN : Write( rOStm, "" ); break;
- case IMAP_FORMAT_CERN : ImpWriteCERN( rOStm, "" ); break;
- case IMAP_FORMAT_NCSA : ImpWriteNCSA( rOStm, "" ); break;
+ case IMAP_FORMAT_BIN : Write( rOStm ); break;
+ case IMAP_FORMAT_CERN : ImpWriteCERN( rOStm ); break;
+ case IMAP_FORMAT_NCSA : ImpWriteNCSA( rOStm ); break;
default:
break;
}
}
-void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
+void ImageMap::ImpWriteCERN( SvStream& rOStm ) const
{
size_t nCount = maList.size();
@@ -164,15 +164,15 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
switch( pObj->GetType() )
{
case IMAP_OBJ_RECTANGLE:
- static_cast<IMapRectangleObject*>( pObj )->WriteCERN( rOStm, rBaseURL );
+ static_cast<IMapRectangleObject*>( pObj )->WriteCERN( rOStm, OUString() );
break;
case IMAP_OBJ_CIRCLE:
- static_cast<IMapCircleObject*>( pObj )->WriteCERN( rOStm, rBaseURL );
+ static_cast<IMapCircleObject*>( pObj )->WriteCERN( rOStm, OUString() );
break;
case IMAP_OBJ_POLYGON:
- static_cast<IMapPolygonObject*>( pObj )->WriteCERN( rOStm, rBaseURL );
+ static_cast<IMapPolygonObject*>( pObj )->WriteCERN( rOStm, OUString() );
break;
default:
@@ -181,7 +181,7 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
}
}
-void ImageMap::ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
+void ImageMap::ImpWriteNCSA( SvStream& rOStm ) const
{
size_t nCount = maList.size();
@@ -192,15 +192,15 @@ void ImageMap::ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
switch( pObj->GetType() )
{
case IMAP_OBJ_RECTANGLE:
- static_cast<IMapRectangleObject*>( pObj )->WriteNCSA( rOStm, rBaseURL );
+ static_cast<IMapRectangleObject*>( pObj )->WriteNCSA( rOStm, OUString() );
break;
case IMAP_OBJ_CIRCLE:
- static_cast<IMapCircleObject*>( pObj )->WriteNCSA( rOStm, rBaseURL );
+ static_cast<IMapCircleObject*>( pObj )->WriteNCSA( rOStm, OUString() );
break;
case IMAP_OBJ_POLYGON:
- static_cast<IMapPolygonObject*>( pObj )->WriteNCSA( rOStm, rBaseURL );
+ static_cast<IMapPolygonObject*>( pObj )->WriteNCSA( rOStm, OUString() );
break;
default:
@@ -218,9 +218,9 @@ sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat )
switch ( nFormat )
{
- case IMAP_FORMAT_BIN : Read( rIStm, "" ); break;
- case IMAP_FORMAT_CERN : nRet = ImpReadCERN( rIStm, "" ); break;
- case IMAP_FORMAT_NCSA : nRet = ImpReadNCSA( rIStm, "" ); break;
+ case IMAP_FORMAT_BIN : Read( rIStm ); break;
+ case IMAP_FORMAT_CERN : nRet = ImpReadCERN( rIStm ); break;
+ case IMAP_FORMAT_NCSA : nRet = ImpReadNCSA( rIStm ); break;
default:
break;
@@ -232,14 +232,14 @@ sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat )
return nRet;
}
-sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const OUString& rBaseURL )
+sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm )
{
// delete old content
ClearImageMap();
OString aStr;
while ( rIStm.ReadLine( aStr ) )
- ImpReadCERNLine( aStr, rBaseURL );
+ ImpReadCERNLine( aStr, OUString() );
return IMAP_ERR_OK;
}
@@ -373,14 +373,14 @@ OUString ImageMap::ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL
return INetURLObject::GetAbsURL( rBaseURL, aStr );
}
-sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const OUString& rBaseURL )
+sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm )
{
// delete old content
ClearImageMap();
OString aStr;
while ( rIStm.ReadLine( aStr ) )
- ImpReadNCSALine( aStr, rBaseURL );
+ ImpReadNCSALine( aStr, OUString() );
return IMAP_ERR_OK;
}
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 437745bc9106..dd903daf47d2 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -713,7 +713,7 @@ bool TransferableHelper::SetImageMap( const ImageMap& rIMap )
SvMemoryStream aMemStm( 8192, 8192 );
aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
- rIMap.Write( aMemStm, OUString() );
+ rIMap.Write( aMemStm );
maAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) );
return( maAny.hasValue() );
@@ -1767,7 +1767,7 @@ bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& r
if( bRet )
{
- rIMap.Read( *xStm, OUString() );
+ rIMap.Read( *xStm );
bRet = ( xStm->GetError() == ERRCODE_NONE );
}
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 34a55d768d58..5e9b8374895f 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -463,7 +463,7 @@ void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap )
{
SvMemoryStream aMemStm( 8192, 8192 );
aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
- rImgMap.Write( aMemStm, OUString() );
+ rImgMap.Write( aMemStm );
CopyAnyData( SotClipboardFormatId::SVIM, static_cast<sal_Char const *>(aMemStm.GetData()),
aMemStm.Seek( STREAM_SEEK_TO_END ) );
}
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 8046143f1b62..fa5d0ca21bd0 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2432,7 +2432,7 @@ namespace svt { namespace table
void TableControl_Impl::impl_commitAccessibleEvent( sal_Int16 const i_eventID, Any const & i_newValue )
{
if ( impl_isAccessibleAlive() )
- m_pAccessibleTable->commitEvent( i_eventID, i_newValue, Any() );
+ m_pAccessibleTable->commitEvent( i_eventID, i_newValue );
}
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index ec13274d28d4..09992bf5df48 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -270,12 +270,10 @@ namespace sw { namespace mark
Bookmark::Bookmark(const SwPaM& aPaM,
const vcl::KeyCode& rCode,
- const OUString& rName,
- const OUString& rShortName)
+ const OUString& rName)
: DdeBookmark(aPaM)
, ::sfx2::Metadatable()
, m_aCode(rCode)
- , m_sShortName(rShortName)
{
m_aName = rName;
}
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 831f7923def8..6fe2ce5bcc25 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -38,7 +38,7 @@ namespace sw { namespace mark
const OUString& rPrefix)
: Bookmark(
// ensure that m_pPos2 is null by only passing start to super
- SwPaM(*rPaM.Start()), rCode, rName, OUString())
+ SwPaM(*rPaM.Start()), rCode, rName)
{
assert( IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark(rPaM)
&& "<CrossRefBookmark::CrossRefBookmark(..)>"
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 3d7c1923f1af..9a13a5799a99 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -409,7 +409,7 @@ namespace sw { namespace mark
pMark = std::shared_ptr<IMark>(new NavigatorReminder(rPaM));
break;
case IDocumentMarkAccess::MarkType::BOOKMARK:
- pMark = std::shared_ptr<IMark>(new Bookmark(rPaM, vcl::KeyCode(), rName, OUString()));
+ pMark = std::shared_ptr<IMark>(new Bookmark(rPaM, vcl::KeyCode(), rName));
break;
case IDocumentMarkAccess::MarkType::DDE_BOOKMARK:
pMark = std::shared_ptr<IMark>(new DdeBookmark(rPaM));
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 1528df16be72..f0c34634cc8a 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -161,8 +161,7 @@ namespace sw {
public:
Bookmark(const SwPaM& rPaM,
const vcl::KeyCode& rCode,
- const OUString& rName,
- const OUString& rShortName);
+ const OUString& rName);
virtual void InitDoc(SwDoc* const io_Doc) override;
virtual void DeregisterFromDoc(SwDoc* const io_pDoc) override;
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 2c1a39ee7fc8..b4213295c142 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -79,7 +79,7 @@ public:
void AppendItem(EHistoryType eHistory,
const OUString& sURL, const OUString& sFilter, const OUString& sTitle,
- const OUString& sPassword, const boost::optional<OUString>& sThumbnail);
+ const boost::optional<OUString>& sThumbnail);
void DeleteItem(EHistoryType eHistory, const OUString& sURL);
@@ -320,7 +320,7 @@ Sequence< Sequence<PropertyValue> > SvtHistoryOptions_Impl::GetList(EHistoryType
void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory,
const OUString& sURL, const OUString& sFilter, const OUString& sTitle,
- const OUString& sPassword, const boost::optional<OUString>& sThumbnail)
+ const boost::optional<OUString>& sThumbnail)
{
uno::Reference<container::XNameAccess> xListAccess(GetListAccess(eHistory));
if (!xListAccess.is())
@@ -436,7 +436,7 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory,
xSet.set(xInst, uno::UNO_QUERY);
xSet->setPropertyValue(s_sFilter, uno::makeAny(sFilter));
xSet->setPropertyValue(s_sTitle, uno::makeAny(sTitle));
- xSet->setPropertyValue(s_sPassword, uno::makeAny(sPassword));
+ xSet->setPropertyValue(s_sPassword, uno::makeAny(OUString()));
xSet->setPropertyValue(s_sThumbnail, uno::makeAny(sThumbnail.get_value_or(OUString())));
::comphelper::ConfigurationHelper::flush(m_xCfg);
@@ -565,7 +565,7 @@ void SvtHistoryOptions::AppendItem(EHistoryType eHistory,
{
MutexGuard aGuard(theHistoryOptionsMutex::get());
- m_pImpl->AppendItem(eHistory, sURL, sFilter, sTitle, ""/*sPassword*/, sThumbnail);
+ m_pImpl->AppendItem(eHistory, sURL, sFilter, sTitle, sThumbnail);
}
void SvtHistoryOptions::DeleteItem(EHistoryType eHistory, const OUString& sURL)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 23700d1b45ad..ab458216eca9 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -389,7 +389,7 @@ MenuItemData* Menu::NbcInsertItem(sal_uInt16 nId, MenuItemBits nBits,
{
// put Item in MenuItemList
MenuItemData* pData = pItemList->Insert(nId, MenuItemType::STRING,
- nBits, rStr, Image(), pMenu, nPos, rIdent);
+ nBits, rStr, pMenu, nPos, rIdent);
// update native menu
if (ImplGetSalMenu() && pData->pSalMenuItem)
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index f2a9e41a08f8..95cf7a07875f 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -50,13 +50,12 @@ MenuItemData* MenuItemList::Insert(
MenuItemType eType,
MenuItemBits nBits,
const OUString& rStr,
- const Image& rImage,
Menu* pMenu,
size_t nPos,
const OString &rIdent
)
{
- MenuItemData* pData = new MenuItemData( rStr, rImage );
+ MenuItemData* pData = new MenuItemData( rStr, Image() );
pData->nId = nId;
pData->sIdent = rIdent;
pData->eType = eType;
@@ -74,7 +73,6 @@ MenuItemData* MenuItemList::Insert(
aSalMIData.nBits = nBits;
aSalMIData.pMenu = pMenu;
aSalMIData.aText = rStr;
- aSalMIData.aImage = rImage;
// Native-support: returns NULL if not supported
pData->pSalMenuItem = ImplGetSVData()->mpDefInst->CreateMenuItem( &aSalMIData );
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index e8b970fbe550..6fc2380b0361 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -106,7 +106,6 @@ public:
MenuItemType eType,
MenuItemBits nBits,
const OUString& rStr,
- const Image& rImage,
Menu* pMenu,
size_t nPos,
const OString &rIdent
More information about the Libreoffice-commits
mailing list