diff options
24 files changed, 51 insertions, 99 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 2588e9f01f4a..29aefb6f407b 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -523,7 +523,7 @@ void Frame::initListeners() SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk", "Frame::Frame(): DropTarget helper is not valid. Drag and drop without functionality!" ); // establish notifies for changing of "disabled commands" configuration during runtime - m_aCommandOptions.EstablisFrameCallback(this); + m_aCommandOptions.EstablishFrameCallback(this); // Create an initial layout manager // Create layout manager and connect it to the newly created frame diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index 2c220b01c88e..86e10ae26692 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -145,14 +145,10 @@ private: @param _rxControl the control itself. Must be the one which is stored under the given ID. This parameter could also be obtained inside the method, but callers usually have obtained it, anyway. - @param _pNameAccessor - the name which the control was registered for. Might be <NULL/>, in this case - container event broadcasts use the ID as accessor. */ void impl_removeControl( sal_Int32 _nId, - const css::uno::Reference< css::awt::XControl >& _rxControl, - const OUString* _pNameAccessor + const css::uno::Reference< css::awt::XControl >& _rxControl ); }; diff --git a/include/ucbhelper/simpleauthenticationrequest.hxx b/include/ucbhelper/simpleauthenticationrequest.hxx index 892d70ecf696..f1dad91163ae 100644 --- a/include/ucbhelper/simpleauthenticationrequest.hxx +++ b/include/ucbhelper/simpleauthenticationrequest.hxx @@ -60,9 +60,8 @@ private: bool bCanSetUserName, bool bCanSetPassword, bool bCanSetAccount, - bool bAllowPersistentStoring, bool bAllowUseSystemCredentials, - bool bAllowSessionStoring = true ); + bool bAllowSessionStoring ); public: /** Specification whether some entity (realm, username, password, account) diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx index b5d0ad854893..a12b9e33aff1 100644 --- a/include/unotools/cmdoptions.hxx +++ b/include/unotools/cmdoptions.hxx @@ -96,7 +96,7 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtCommandOptions : public utl::detail: notified, if configuration was changed. *//*-*****************************************************************************************************/ - void EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame); + void EstablishFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame); private: diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx index 2ee3e86822d8..16048134353d 100644 --- a/include/unotools/configvaluecontainer.hxx +++ b/include/unotools/configvaluecontainer.hxx @@ -141,16 +141,13 @@ namespace utl <p>Note that calling <method>write</method>(<sal_True/) is the same as calling <method>commit</method>(<TRUE/>).</p> + The current values in the exchange locations are written to the configuration nodes + before the changes are committed.<br/> + @precond The access must have been created for update access - - @param _bWrite - If <TRUE/>, the current values in the exchange locations are written to the configuration nodes - before the changes are committed.<br/> - If <FALSE/>, only the current values in the config nodes (as present since the last call to - <method>write</method>) are committed. */ - void commit( bool _bWrite = true ); + void commit(); private: /// implements the ctors diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx index 1b0fa57ddc0a..2c2caa785dba 100644 --- a/include/unotools/transliterationwrapper.hxx +++ b/include/unotools/transliterationwrapper.hxx @@ -80,8 +80,7 @@ public: If for any reason the string can't be transliterated the original string is returned. */ OUString transliterate( const OUString& rStr, - sal_Int32 nStart, sal_Int32 nLen, - css::uno::Sequence <sal_Int32>* pOffset ) const; + sal_Int32 nStart, sal_Int32 nLen ) const; // Wrapper implementations of class Transliteration OUString transliterate( const OUString& rStr, sal_uInt16 nLanguage, diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index d4e7354484d3..f80239cec023 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -3346,7 +3346,7 @@ static OUString lcl_convertIntoHalfWidth( const OUString & rStr ) bFirstASCCall = false; } - return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ), nullptr ); + return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ) ); } static OUString lcl_convertIntoFullWidth( const OUString & rStr ) @@ -3360,7 +3360,7 @@ static OUString lcl_convertIntoFullWidth( const OUString & rStr ) bFirstJISCall = false; } - return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ), nullptr ); + return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ) ); } /* ODFF: diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index e3c44772e896..c94737775ee2 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -56,7 +56,7 @@ public: MutableTreeDataModel(); virtual ~MutableTreeDataModel(); - void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >* pNodes, sal_Int32 nNodes ); + void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode ); // XMutableTreeDataModel virtual css::uno::Reference< css::awt::tree::XMutableTreeNode > SAL_CALL createNode( const css::uno::Any& DisplayValue, sal_Bool ChildrenOnDemand ) throw (css::uno::RuntimeException, std::exception) override; @@ -151,13 +151,13 @@ MutableTreeDataModel::~MutableTreeDataModel() { } -void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >* pNodes, sal_Int32 nNodes ) +void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode ) { ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( cppu::UnoType<XTreeDataModelListener>::get() ); if( pIter ) { Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); - const Sequence< Reference< XTreeNode > > aNodes( pNodes, nNodes ); + const Sequence< Reference< XTreeNode > > aNodes { rNode }; TreeDataModelEvent aEvent( xSource, aNodes, xParentNode ); ::cppu::OInterfaceIteratorHelper aListIter(*pIter); @@ -203,7 +203,7 @@ void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode > mxRootNode.set(xImpl.get()); Reference< XTreeNode > xParentNode; - broadcast( structure_changed, xParentNode, &mxRootNode, 1 ); + broadcast( structure_changed, xParentNode, mxRootNode ); } } @@ -298,7 +298,7 @@ void MutableTreeNode::broadcast_changes() { Reference< XTreeNode > xParent( getReference( mpParent ) ); Reference< XTreeNode > xNode( getReference( this ) ); - mxModel->broadcast( nodes_changed, xParent, &xNode, 1 ); + mxModel->broadcast( nodes_changed, xParent, xNode ); } } @@ -307,7 +307,7 @@ void MutableTreeNode::broadcast_changes(const Reference< XTreeNode >& xNode, boo if( mxModel.is() ) { Reference< XTreeNode > xParent( getReference( this ) ); - mxModel->broadcast( bNew ? nodes_inserted : nodes_removed, xParent, &xNode, 1 ); + mxModel->broadcast( bNew ? nodes_inserted : nodes_removed, xParent, xNode ); } } diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index af2cbb5a3687..e53da45c3d9b 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -503,7 +503,7 @@ void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier *this ); - impl_removeControl( _nIdentifier, xControl, nullptr ); + impl_removeControl( _nIdentifier, xControl ); } void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, const uno::Any& _rElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) @@ -663,7 +663,7 @@ void UnoControlContainer::removingControl( const uno::Reference< awt::XControl > } } -void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Reference< awt::XControl >& _rxControl, const OUString* _pNameAccessor ) +void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Reference< awt::XControl >& _rxControl ) { #ifdef DBG_UTIL { @@ -680,7 +680,7 @@ void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Referen { container::ContainerEvent aEvent; aEvent.Source = *this; - _pNameAccessor ? ( aEvent.Accessor <<= *_pNameAccessor ) : ( aEvent.Accessor <<= _nId ); + aEvent.Accessor <<= _nId; aEvent.Element <<= _rxControl; maCListeners.elementRemoved( aEvent ); } @@ -694,7 +694,7 @@ void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >& UnoControlHolderList::ControlIdentifier id = mpControls->getControlIdentifier( _rxControl ); if ( id != -1 ) - impl_removeControl( id, _rxControl, nullptr ); + impl_removeControl( id, _rxControl ); } } diff --git a/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx b/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx index 074f21d31eef..3dba002e9e5f 100644 --- a/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx +++ b/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx @@ -114,7 +114,7 @@ namespace // add the cache an element aPropsNames.setPropertiesNames( aProps ); - PropCache.addCachePropertyNames( aPropsNames, 10 ); + PropCache.addCachePropertyNames( aPropsNames ); PropertyNames aRetPropsNames; //test existence diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx index 18b09a36393f..75b17b59789b 100644 --- a/ucb/source/inc/regexp.hxx +++ b/ucb/source/inc/regexp.hxx @@ -42,8 +42,7 @@ public: inline Kind getKind() const { return m_eKind; } - bool matches(OUString const & rString, OUString * pTranslation, - bool * pTranslated) const; + bool matches(OUString const & rString) const; OUString getRegexp() const; diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index 49265e5332ab..6194b187b8dd 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -543,11 +543,11 @@ Val const * RegexpMap< Val >::map(rtl::OUString const & rString) const typename List< Val >::const_iterator aEnd(rTheList.end()); for (typename List< Val >::const_iterator aIt(rTheList.begin()); aIt != aEnd; ++aIt) - if (aIt->m_aRegexp.matches(rString, nullptr, nullptr)) + if (aIt->m_aRegexp.matches(rString)) return &aIt->m_aValue; } if (m_pImpl->m_pDefault - && m_pImpl->m_pDefault->m_aRegexp.matches(rString, nullptr, nullptr)) + && m_pImpl->m_pDefault->m_aRegexp.matches(rString)) return &m_pImpl->m_pDefault->m_aValue; return 0; } diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 28e59401856a..11ee8fa85f13 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -77,8 +77,7 @@ bool matchStringIgnoreCase(sal_Unicode const ** pBegin, } -bool Regexp::matches(OUString const & rString, - OUString * pTranslation, bool * pTranslated) const +bool Regexp::matches(OUString const & rString) const { sal_Unicode const * pBegin = rString.getStr(); sal_Unicode const * pEnd = pBegin + rString.getLength(); @@ -88,7 +87,6 @@ bool Regexp::matches(OUString const & rString, sal_Unicode const * p = pBegin; if (matchStringIgnoreCase(&p, pEnd, m_aPrefix)) { - sal_Unicode const * pBlock1Begin = p; sal_Unicode const * pBlock1End = pEnd; sal_Unicode const * pBlock2Begin = nullptr; @@ -133,30 +131,6 @@ bool Regexp::matches(OUString const & rString, } break; } - - if (bMatches) - { - if (m_bTranslation) - { - if (pTranslation) - { - OUStringBuffer aBuffer(m_aReversePrefix); - aBuffer.append(pBlock1Begin, pBlock1End - pBlock1Begin); - aBuffer.append(m_aInfix); - aBuffer.append(pBlock2Begin, pBlock2End - pBlock2Begin); - *pTranslation = aBuffer.makeStringAndClear(); - } - if (pTranslated) - *pTranslated = true; - } - else - { - if (pTranslation) - *pTranslation = rString; - if (pTranslated) - *pTranslated = false; - } - } } return bMatches; diff --git a/ucb/source/ucp/webdav-neon/PropfindCache.cxx b/ucb/source/ucp/webdav-neon/PropfindCache.cxx index 095273a1cd63..b854e6fda323 100644 --- a/ucb/source/ucp/webdav-neon/PropfindCache.cxx +++ b/ucb/source/ucp/webdav-neon/PropfindCache.cxx @@ -86,13 +86,13 @@ namespace webdav_ucp } } - void PropertyNamesCache::addCachePropertyNames( PropertyNames& rCacheElement, const sal_uInt32 nLifeTime ) + void PropertyNamesCache::addCachePropertyNames( PropertyNames& rCacheElement ) { osl::MutexGuard aGuard( m_aMutex ); OUString aURL( rCacheElement.getURL() ); TimeValue t1; osl_getSystemTime( &t1 ); - rCacheElement.setStaleTime( t1.Seconds + nLifeTime ); + rCacheElement.setStaleTime( t1.Seconds + 10 ); m_aTheCache[ aURL ] = rCacheElement; } diff --git a/ucb/source/ucp/webdav-neon/PropfindCache.hxx b/ucb/source/ucp/webdav-neon/PropfindCache.hxx index f01e6522db61..99ca5c65a7d3 100644 --- a/ucb/source/ucp/webdav-neon/PropfindCache.hxx +++ b/ucb/source/ucp/webdav-neon/PropfindCache.hxx @@ -73,7 +73,7 @@ namespace webdav_ucp bool getCachedPropertyNames( const OUString& URL, PropertyNames& rCacheElement ); void removeCachedPropertyNames( const OUString& URL ); - void addCachePropertyNames( PropertyNames& rCacheElement, const sal_uInt32 nLifeTime ); + void addCachePropertyNames( PropertyNames& rCacheElement ); }; } diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index e51fdb50d845..eaa586c7e577 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -338,7 +338,7 @@ uno::Sequence< beans::Property > Content::getProperties( xResAccess->PROPFIND( DAVZERO, props, xEnv ); aPropsNames.setPropertiesNames( props ); - aStaticPropertyNamesCache.addCachePropertyNames( aPropsNames, 10 ); + aStaticPropertyNamesCache.addCachePropertyNames( aPropsNames ); } else { diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 8b7630b9db17..d64cbd5df979 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -82,8 +82,8 @@ class HostnameCache sal_uInt32 m_nCapacity; public: - explicit HostnameCache( sal_uInt32 nCapacity ) - : m_nCapacity( nCapacity ) {} + explicit HostnameCache() + : m_nCapacity( 256 ) {} bool get( const OUString & rKey, OUString & rValue ) const { @@ -288,7 +288,7 @@ bool getConfigInt32Value( InternetProxyDecider_Impl::InternetProxyDecider_Impl( const uno::Reference< uno::XComponentContext >& rxContext ) : m_nProxyType( 0 ), - m_aHostnames( 256 ) // cache size + m_aHostnames() { try { diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx index a1e0ae4f25d8..ddc8fc9e4079 100644 --- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx +++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx @@ -60,7 +60,6 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest( true, true, aRequest.HasAccount, - true/*bAllowPersistentStoring*/, bAllowUseSystemCredentials, bAllowSessionStoring ); } @@ -100,8 +99,8 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest( eUserNameType == ENTITY_MODIFY, ePasswordType == ENTITY_MODIFY, false, - true, - false ); + false, + true ); } @@ -111,7 +110,6 @@ void SimpleAuthenticationRequest::initialize( bool bCanSetUserName, bool bCanSetPassword, bool bCanSetAccount, - bool bAllowPersistentStoring, bool bAllowUseSystemCredentials, bool bAllowSessionStoring ) { @@ -124,8 +122,7 @@ void SimpleAuthenticationRequest::initialize( if( bAllowSessionStoring ) nSize++; - if( bAllowPersistentStoring ) - nSize++; + nSize++; uno::Sequence< ucb::RememberAuthentication > aRememberModes( nSize ); aRememberModes[ nPos++ ] = ucb::RememberAuthentication_NO; @@ -133,8 +130,7 @@ void SimpleAuthenticationRequest::initialize( if( bAllowSessionStoring ) aRememberModes[ nPos++ ] = ucb::RememberAuthentication_SESSION; - if ( bAllowPersistentStoring ) - aRememberModes[ nPos++ ] = ucb::RememberAuthentication_PERSISTENT; + aRememberModes[ nPos++ ] = ucb::RememberAuthentication_PERSISTENT; m_xAuthSupplier = new InteractionSupplyAuthentication( diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 0f53f1ea52aa..50f816c19ab9 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -115,7 +115,7 @@ class SvtCommandOptions_Impl : public ConfigItem bool HasEntries ( SvtCommandOptions::CmdOption eOption ) const; bool Lookup ( SvtCommandOptions::CmdOption eCmdOption, const OUString& ) const; - void EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame); + void EstablishFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame); private: @@ -260,7 +260,7 @@ bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, co // public method -void SvtCommandOptions_Impl::EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame) +void SvtCommandOptions_Impl::EstablishFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame) { // check if frame already exists inside list // ignore double registrations @@ -335,10 +335,10 @@ bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandUR // public method -void SvtCommandOptions::EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame) +void SvtCommandOptions::EstablishFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame) { MutexGuard aGuard( GetOwnStaticMutex() ); - m_pImpl->EstablisFrameCallback(xFrame); + m_pImpl->EstablishFrameCallback(xFrame); } namespace diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index df0a002d4753..873dcfef85d7 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -281,11 +281,10 @@ namespace utl ); } - void OConfigurationValueContainer::commit( bool _bWrite ) + void OConfigurationValueContainer::commit() { - // write the current values in the exchange locations (if requested) - if ( _bWrite ) - write(); + // write the current values in the exchange locations + write(); // commit the changes done m_pImpl->aConfigRoot.commit( ); diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index a62e54ef3f9f..4e69bb9eaa02 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -68,18 +68,14 @@ OUString TransliterationWrapper::transliterate(const OUString& rStr, sal_uInt16 } OUString TransliterationWrapper::transliterate( const OUString& rStr, - sal_Int32 nStart, sal_Int32 nLen, - Sequence <sal_Int32>* pOffset ) const + sal_Int32 nStart, sal_Int32 nLen ) const { OUString sRet( rStr ); if( xTrans.is() ) { try { - if ( pOffset ) - sRet = xTrans->transliterate( rStr, nStart, nLen, *pOffset ); - else - sRet = xTrans->transliterateString2String( rStr, nStart, nLen); + sRet = xTrans->transliterateString2String( rStr, nStart, nLen); } catch( Exception& ) { diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index c35f346fd0ae..a39ee2a5aba8 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -197,10 +197,9 @@ ScVbaCommandBar::getServiceNames() VbaDummyCommandBar::VbaDummyCommandBar( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, - const OUString& rName, sal_Int32 nType ) throw( uno::RuntimeException ) : + const OUString& rName ) throw( uno::RuntimeException ) : CommandBar_BASE( xParent, xContext ), - maName( rName ), - mnType( nType ) + maName( rName ) { } @@ -253,7 +252,7 @@ uno::Any SAL_CALL VbaDummyCommandBar::Controls( const uno::Any& aIndex ) throw ( sal_Int32 SAL_CALL VbaDummyCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException, std::exception) { - return mnType; + return office::MsoBarType::msoBarTypePopup; } uno::Any SAL_CALL VbaDummyCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx index e2b7ea84a8da..5c66988fb407 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.hxx +++ b/vbahelper/source/vbahelper/vbacommandbar.hxx @@ -67,8 +67,7 @@ public: VbaDummyCommandBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - const OUString& rName, - sal_Int32 nType ) throw( css::uno::RuntimeException ); + const OUString& rName ) throw( css::uno::RuntimeException ); // Attributes virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; @@ -90,7 +89,6 @@ public: private: OUString maName; - sal_Int32 mnType; }; #endif // INCLUDED_VBAHELPER_SOURCE_VBAHELPER_VBACOMMANDBAR_HXX diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index 8c579f96cb51..33ca3d3243f9 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -122,7 +122,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource ) else if( sBarName.equalsIgnoreAsciiCase( "Cell" ) ) { // EVIL HACK (tm): spreadsheet cell context menu as dummy object without functionality - aRet <<= uno::Reference< XCommandBar >( new VbaDummyCommandBar( this, mxContext, sBarName, office::MsoBarType::msoBarTypePopup ) ); + aRet <<= uno::Reference< XCommandBar >( new VbaDummyCommandBar( this, mxContext, sBarName ) ); } } else if( m_pCBarHelper->getModuleId() == "com.sun.star.text.TextDocument" ) |