editeng/source/uno/unotext.cxx | 6 include/editeng/unotext.hxx | 1 include/sfx2/mnuitem.hxx | 6 include/svl/visitem.hxx | 2 include/svtools/langtab.hxx | 7 include/svx/svdotext.hxx | 5 lotuswordpro/source/filter/lwpfilter.hxx | 29 -- sc/inc/column.hxx | 2 sc/inc/compressedarray.hxx | 8 sc/inc/document.hxx | 2 sc/inc/table.hxx | 3 sc/source/core/data/column.cxx | 12 sc/source/core/data/column4.cxx | 25 - sc/source/core/data/compressedarray.cxx | 19 - sc/source/core/data/document.cxx | 20 - sc/source/core/data/table2.cxx | 8 sc/source/core/data/table7.cxx | 8 sc/source/filter/excel/excimp8.cxx | 14 - sdext/source/minimizer/configurationaccess.cxx | 22 - sdext/source/minimizer/configurationaccess.hxx | 1 svl/source/items/visitem.cxx | 6 svtools/source/misc/langtab.cxx | 6 svx/source/svdraw/svdotext.cxx | 50 --- sw/Library_sw.mk | 1 sw/inc/accmap.hxx | 2 sw/inc/docary.hxx | 2 sw/inc/fillattributes.hxx | 2 sw/source/core/access/accfield.cxx | 315 ------------------------- sw/source/core/access/accfield.hxx | 175 ------------- sw/source/core/access/accmap.cxx | 38 --- sw/source/core/doc/docredln.cxx | 26 -- sw/source/core/layout/fillattributes.cxx | 19 - sw/source/filter/ww8/docxsdrexport.cxx | 5 sw/source/filter/ww8/docxsdrexport.hxx | 1 unusedcode.easy | 19 - 35 files changed, 4 insertions(+), 863 deletions(-)
New commits: commit d812b784313ed85ae5085d54a3ae50aa064c053c Author: Noel Grandin <n...@peralex.com> Date: Mon May 12 14:42:57 2014 +0200 remove unused code -SvtLanguageTable::AddLanguageTag Change-Id: Ibb0dda4b48c711e72574c3f5aec9e3d1186d1526 diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx index 0034873..4503d38 100644 --- a/include/svtools/langtab.hxx +++ b/include/svtools/langtab.hxx @@ -43,13 +43,6 @@ public: */ static OUString GetLanguageString( const LanguageType eType, bool bUserInterfaceSelection ); - /** Add a language tag to the table. - - @param rString - UI visible description string. If empty, the rLanguageTag Bcp47 - string is used instead. - */ - static sal_uInt32 AddLanguageTag( const LanguageTag& rLanguageTag, const OUString& rString ); }; // Add LRE or RLE embedding characters to the string based on the diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index b8eeec0..f31ea28 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -233,10 +233,4 @@ LanguageType SvtLanguageTable::GetLanguageTypeAtIndex( sal_uInt32 nIndex ) } -sal_uInt32 SvtLanguageTable::AddLanguageTag( const LanguageTag& rLanguageTag, const OUString& rString ) -{ - return theLanguageTable::get().AddItem( (rString.isEmpty() ? rLanguageTag.getBcp47() : rString), - rLanguageTag.getLanguageType()); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index ae0ce4b..646cb1e 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -68,7 +68,6 @@ StyleSettings::SetTitleHeight(long) StyleSettings::SetUseFlatBorders(bool) StyleSettings::SetUseFlatMenus(bool) SvpSalInstance::PostedEventsInQueue() -SvtLanguageTable::AddLanguageTag(LanguageTag const&, rtl::OUString const&) SvtListener::IsListening(SvtBroadcaster&) const SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>) SvxNumberFormatShell::IsAdded_Impl(unsigned long) commit 8acc97fb46dbb91fdf7e3ee64befed3a9a09a38f Author: Noel Grandin <n...@peralex.com> Date: Mon May 12 12:58:25 2014 +0200 remove dead code in SW Change-Id: Ifda459ea8863d923b211ca3022355b5941a74bfe diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index aacfcc0..6e349b4 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -207,8 +207,6 @@ public: void InvalidateCursorPosition( const SwFrm *pFrm ); void InvalidateFocus(); - void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage); - void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn); void SetCursorContext( const ::rtl::Reference < SwAccessibleContext >& rCursorContext ); diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index f3615a6..f628fb2 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -205,11 +205,9 @@ private: public: ~SwExtraRedlineTbl(); - sal_uInt16 GetPos(const SwExtraRedline* p) const; bool Insert( SwExtraRedline* p ); - void Remove( sal_uInt16 nPos ); void DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen = 1 ); void DeleteAndDestroyAll(); diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index dee4126..60b1509 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -2751,44 +2751,6 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm ) } } -//Notify the page change event to bridge. -void SwAccessibleMap::FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage) -{ - uno::Reference<XAccessible> xAcc = GetDocumentView( ); - if ( xAcc.is() ) - { - SwAccessibleDocumentBase *pAcc = - static_cast< SwAccessibleDocumentBase * >( xAcc.get() ); - if (pAcc) - { - AccessibleEventObject aEvent; - aEvent.EventId = AccessibleEventId::PAGE_CHANGED; - aEvent.OldValue <<= nOldPage; - aEvent.NewValue <<= nNewPage; - pAcc->FireAccessibleEvent( aEvent ); - } - } -} - -void SwAccessibleMap::FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn) -{ - uno::Reference<XAccessible> xAcc = GetDocumentView( ); - if ( xAcc.is() ) - { - SwAccessibleDocumentBase *pAcc = - static_cast< SwAccessibleDocumentBase * >( xAcc.get() ); - if (pAcc) - { - AccessibleEventObject aEvent; - aEvent.EventId = AccessibleEventId::COLUMN_CHANGED; - aEvent.OldValue <<= nOldColumn; - aEvent.NewValue <<= nNewColumn; - pAcc->FireAccessibleEvent( aEvent ); - - } - } -} - void SwAccessibleMap::InvalidateFocus() { if(GetShell()->IsPreview()) diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 680d8d1..64887a1 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -4096,14 +4096,6 @@ bool SwDoc::IsInRedlines(const SwNode & rNode) const return aPam.ContainsPosition(aPos); } -sal_uInt16 SwExtraRedlineTbl::GetPos(const SwExtraRedline* p) const -{ - std::vector<SwExtraRedline*>::const_iterator it = std::find(m_aExtraRedlines.begin(), m_aExtraRedlines.end(), p); - if( it == m_aExtraRedlines.end() ) - return USHRT_MAX; - return it - m_aExtraRedlines.begin(); -} - bool SwExtraRedlineTbl::Insert( SwExtraRedline* p ) { m_aExtraRedlines.push_back( p ); @@ -4111,24 +4103,6 @@ bool SwExtraRedlineTbl::Insert( SwExtraRedline* p ) return true; } -void SwExtraRedlineTbl::Remove( sal_uInt16 nPos ) -{ - /* - SwDoc* pDoc = 0; - if( !nP && 1 == size() ) - pDoc = front()->GetDoc(); - */ - - m_aExtraRedlines.erase( m_aExtraRedlines.begin() + nPos ); - - /* - SwViewShell* pSh; - if( pDoc && !pDoc->IsInDtor() && - 0 != ( pSh = pDoc->GetCurrentViewShell()) ) - pSh->InvalidateWindows( SwRect( 0, 0, LONG_MAX, LONG_MAX ) ); - */ -} - void SwExtraRedlineTbl::DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen ) { /* diff --git a/unusedcode.easy b/unusedcode.easy index 51984e6..ae0ce4b 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -72,10 +72,6 @@ SvtLanguageTable::AddLanguageTag(LanguageTag const&, rtl::OUString const&) SvtListener::IsListening(SvtBroadcaster&) const SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>) SvxNumberFormatShell::IsAdded_Impl(unsigned long) -SwAccessibleMap::FireColumnChangeEvent(unsigned short, unsigned short) -SwAccessibleMap::FirePageChangeEvent(unsigned short, unsigned short) -SwExtraRedlineTbl::GetPos(SwExtraRedline const*) const -SwExtraRedlineTbl::Remove(unsigned short) TextDoc::IsValidPaM(TextPaM const&) Texture::greateEmptyTexture(int, int, unsigned int) UnoApiTest::closeDocument(com::sun::star::uno::Reference<com::sun::star::lang::XComponent>) commit 2f5e8b9767d42e5efb823bb28ef5778d8731f079 Author: Noel Grandin <n...@peralex.com> Date: Mon May 12 12:47:52 2014 +0200 remove dead code SwAccessibleField which seems to be dead since the IA2 integration Change-Id: I3a6c70f27ef0cb2ac23776ad00394a73a99bb7e8 diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 839197b..ec4e021 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -92,7 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/core/access/accdoc \ sw/source/core/access/accembedded \ sw/source/core/access/accfootnote \ - sw/source/core/access/accfield \ sw/source/core/access/accframe \ sw/source/core/access/accframebase\ sw/source/core/access/accfrmobj \ diff --git a/sw/source/core/access/accfield.cxx b/sw/source/core/access/accfield.cxx deleted file mode 100644 index cea3369..0000000 --- a/sw/source/core/access/accfield.cxx +++ /dev/null @@ -1,315 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <comphelper/accessiblekeybindinghelper.hxx> -#include <swurl.hxx> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> -#include <ndtxt.hxx> -#include <txtinet.hxx> - -#include <accpara.hxx> -#include <accfield.hxx> - -#include <comphelper/processfactory.hxx> - -#include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/document/XLinkTargetSupplier.hpp> -#include <comphelper/accessibleeventnotifier.hxx> - -//Add end - -using namespace ::com::sun::star; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::accessibility; - -SwAccessibleField::SwAccessibleField( SwField *pSwFld,SwAccessibleParagraph *p,sal_Int16 nRole) : - m_xPara( p ),m_pSwField(pSwFld),m_nRole(nRole) -{ - m_nClientId=0; -} - -uno::Reference< XAccessibleContext > SAL_CALL - SwAccessibleField::getAccessibleContext( void ) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - uno::Reference < XAccessibleContext > xRet( this ); - return xRet; -} - -sal_Int32 SAL_CALL SwAccessibleField::getAccessibleChildCount( void ) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - return 0; -} - -uno::Reference< XAccessible> SAL_CALL - SwAccessibleField::getAccessibleChild( sal_Int32 ) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) -{ - SolarMutexGuard aGuard; - return uno::Reference< XAccessible >(); -} - -uno::Reference< XAccessible> SAL_CALL SwAccessibleField::getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - - uno::Reference< XAccessible > xParent(static_cast<XAccessible*>(m_xPara.get()),UNO_QUERY); - return xParent; -} - -sal_Int32 SAL_CALL SwAccessibleField::getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - return 0; -} - -sal_Int16 SAL_CALL SwAccessibleField::getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - SolarMutexGuard g; - return m_nRole; -} - -OUString SAL_CALL SwAccessibleField::getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - OSL_ENSURE( !this, "description needs to be overloaded" ); - return OUString(); -} - -OUString SAL_CALL SwAccessibleField::getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - return OUString(); -} - -uno::Reference< XAccessibleRelationSet> SAL_CALL - SwAccessibleField::getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - return NULL; -} - -uno::Reference<XAccessibleStateSet> SAL_CALL - SwAccessibleField::getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - return uno::Reference<XAccessibleStateSet>(); -} - -com::sun::star::lang::Locale SAL_CALL SwAccessibleField::getLocale (void) - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - - com::sun::star::lang::Locale aLoc( Application::GetSettings().GetLanguageTag().getLocale() ); - return aLoc; -} - -static bool lcl_PointInRectangle(const awt::Point & aPoint, - const awt::Rectangle & aRect) -{ - long nDiffX = aPoint.X - aRect.X; - long nDiffY = aPoint.Y - aRect.Y; - - return - nDiffX >= 0 && nDiffX < aRect.Width && nDiffY >= 0 && - nDiffY < aRect.Height; - -} - -sal_Bool SAL_CALL SwAccessibleField::containsPoint( - const ::com::sun::star::awt::Point& aPoint ) - throw (RuntimeException, std::exception) -{ - awt::Rectangle aPixBounds = getBoundsImpl(sal_True); - aPixBounds.X = 0; - aPixBounds.Y = 0; - - return lcl_PointInRectangle(aPoint, aPixBounds); -} - -uno::Reference< XAccessible > SAL_CALL SwAccessibleField::getAccessibleAtPoint( - const awt::Point& aPoint ) - throw (RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - - uno::Reference< XAccessible > xAcc; - awt::Rectangle rc = getBounds(); - if(aPoint.X >= rc.X && aPoint.X <= rc.X + rc.Width && - aPoint.Y >= rc.Y && aPoint.Y <= rc.Y + rc.Height ) - { - xAcc =this; - } - return xAcc; -} - -/** - Get bounding box. - - There are two modes. - - - relative - - Return bounding box relative to parent if parent is no root - frame. Otherwise return the absolute bounding box. - - - absolute - - Return the absolute bounding box. - - @param bRelative - true: Use relative mode. - false: Use absolute mode. -*/ -awt::Rectangle SAL_CALL SwAccessibleField::getBoundsImpl( sal_Bool ) - throw (RuntimeException) -{ - SolarMutexGuard aGuard; - return awt::Rectangle(); -} - -awt::Rectangle SAL_CALL SwAccessibleField::getBounds() - throw (RuntimeException, std::exception) -{ - return getBoundsImpl(sal_True); -} - -awt::Point SAL_CALL SwAccessibleField::getLocation() - throw (RuntimeException, std::exception) -{ - awt::Rectangle aRect = getBoundsImpl(sal_True); - awt::Point aPoint(aRect.X, aRect.Y); - - return aPoint; -} - -awt::Point SAL_CALL SwAccessibleField::getLocationOnScreen() - throw (RuntimeException, std::exception) -{ - awt::Rectangle aRect = getBoundsImpl(sal_False); - //Point aPixPos = m_xPara->getLocationOnScreen(); - return awt::Point( aRect.X,aRect.Y);//aPixPos.X() + aRect.nLeft , aPixPos.Y() + + aRect.nRight ); -} - -awt::Size SAL_CALL SwAccessibleField::getSize() - throw (RuntimeException, std::exception) -{ - awt::Rectangle aRect = getBoundsImpl(sal_False); - awt::Size aSize( aRect.Width, aRect.Height ); - - return aSize; -} - -void SAL_CALL SwAccessibleField::grabFocus() - throw (RuntimeException, std::exception) -{ - SolarMutexGuard aGuard; - return; -} - -sal_Int32 SAL_CALL SwAccessibleField::getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - return 0; -} - -sal_Int32 SAL_CALL SwAccessibleField::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - return 0xffffff; -} -::com::sun::star::uno::Any SAL_CALL SwAccessibleField::queryInterface( - const ::com::sun::star::uno::Type& rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - Any aRet; - if ( rType == ::getCppuType((uno::Reference<XAccessibleContext> *)0) ) - { - Reference<XAccessibleContext> aAccContext = (XAccessibleContext *) this; // resolve ambiguity - aRet <<= aAccContext; - } - else if ( rType == ::getCppuType((Reference<XAccessibleComponent> *)0) ) - { - Reference<XAccessibleComponent> aAccEditComponent = this; - aRet <<= aAccEditComponent; - } - if (rType == ::getCppuType((Reference<XAccessibleEventBroadcaster> *)0)) - { - Reference<XAccessibleEventBroadcaster> aAccBroadcaster= this; - aRet <<= aAccBroadcaster; - } - return aRet; -} - -void SAL_CALL SwAccessibleField::acquire( ) throw () -{ -} -void SAL_CALL SwAccessibleField::release( ) throw () -{ -} - -void SAL_CALL SwAccessibleField::addEventListener( - const Reference< XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException) -{ - //DBG_MSG( "accessible event listener added" ) - - if (xListener.is()) - { - SolarMutexGuard aGuard; - if (!m_nClientId) - m_nClientId = comphelper::AccessibleEventNotifier::registerClient( ); - comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener ); - } -} - -void SAL_CALL SwAccessibleField::removeEventListener( - const Reference< XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException) -{ - //DBG_MSG( "accessible event listener removed" ) - - if (xListener.is()) - { - SolarMutexGuard aGuard; - sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId, xListener ); - if ( !nListenerCount ) - { - // no listeners anymore - // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client), - // and at least to us not firing any events anymore, in case somebody calls - // NotifyAccessibleEvent, again - comphelper::AccessibleEventNotifier::revokeClient( m_nClientId ); - m_nClientId = 0; - } - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfield.hxx b/sw/source/core/access/accfield.hxx deleted file mode 100644 index e50c4c9..0000000 --- a/sw/source/core/access/accfield.hxx +++ /dev/null @@ -1,175 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFIELD_HXX -#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFIELD_HXX - -#include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <com/sun/star/accessibility/XAccessibleComponent.hpp> -#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> -#include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp> -#include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <cppuhelper/implbase4.hxx> -#include <fmtinfmt.hxx> - -class SwAccessibleParagraph; -class SwField; -class SwAccessibleField : - public ::cppu::WeakImplHelper4< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster - > -{ - friend class SwAccessibleParagraph; - friend class SwAccessibleHyperTextData; - -protected: - ::rtl::Reference< SwAccessibleParagraph > m_xPara; - SwField *m_pSwField; - - sal_uInt32 m_nClientId; // client id in the AccessibleEventNotifier queue - sal_Int16 m_nRole; // immutable outside constructor -public: - SwAccessibleField( SwField *pSwFld,SwAccessibleParagraph *p,sal_Int16); - - virtual void SAL_CALL addEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE ; - virtual void SAL_CALL release( ) throw () SAL_OVERRIDE ; - -public: - // XAccessible - - /// Return the XAccessibleContext. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // XAccessibleContext - - /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - /// Return the specified child or NULL if index is invalid. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; - - /// Return a reference to the parent. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - /// Return this object's role. - virtual sal_Int16 SAL_CALL - getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - /// Return this object's description. - virtual OUString SAL_CALL - getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - /// Return the object's current name. - virtual OUString SAL_CALL - getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - /// Return NULL to indicate that an empty relation set. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - /// Return the set of current states. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - /** Return the parents locale or throw exception if this object has no - parent yet/anymore. - */ - virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale (void) - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( - const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - virtual ::com::sun::star::awt::Rectangle SAL_CALL - getBoundsImpl(sal_Bool bRelative) - throw (::com::sun::star::uno::RuntimeException) ; - -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index 2a083a0..51984e6 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -72,7 +72,6 @@ SvtLanguageTable::AddLanguageTag(LanguageTag const&, rtl::OUString const&) SvtListener::IsListening(SvtBroadcaster&) const SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>) SvxNumberFormatShell::IsAdded_Impl(unsigned long) -SwAccessibleField::SwAccessibleField(SwField*, SwAccessibleParagraph*, short) SwAccessibleMap::FireColumnChangeEvent(unsigned short, unsigned short) SwAccessibleMap::FirePageChangeEvent(unsigned short, unsigned short) SwExtraRedlineTbl::GetPos(SwExtraRedline const*) const commit ffa2229a8ebf3b42f6327589814063fc39db7118 Author: Noel Grandin <n...@peralex.com> Date: Mon May 12 12:06:29 2014 +0200 remove dead code Change-Id: Ic4fb478921714429af138ca212bd7f67f408d434 diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index e2c4b7a..c412272 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1658,12 +1658,6 @@ OUString SAL_CALL SvxUnoTextRange::getImplementationName() // class SvxUnoText -SvxUnoTextBase::SvxUnoTextBase() throw() -: SvxUnoTextRangeBase( NULL ) -{ - -} - SvxUnoTextBase::SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw() : SvxUnoTextRangeBase( _pSet ) { diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 528eb50..9000c9c 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -391,7 +391,6 @@ class EDITENG_DLLPUBLIC SvxUnoTextBase : public SvxUnoTextRangeBase, protected: ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParentText; - SvxUnoTextBase( ) throw(); SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw(); SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > xParent ) throw(); SvxUnoTextBase( const SvxUnoTextBase& rText ) throw(); diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index 57e8638..ff0816e 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -50,9 +50,9 @@ public: static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL ); - virtual ~SfxMenuControl(); + virtual ~SfxMenuControl(); - using SfxControllerItem::Bind; + using SfxControllerItem::Bind; void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId, const OUString& rTitle, SfxBindings& rBindings ); void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId, @@ -68,7 +68,7 @@ public: static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & ); static SfxUnoMenuControl* CreateControl( const OUString&, sal_uInt16, Menu&, const OUString& sItemText, SfxBindings&, SfxVirtualMenu* ); - static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*); + static void RegisterMenuControl( SfxModule*, SfxMenuCtrlFactory* ); }; diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index c4f501e..3a84062 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -69,8 +69,6 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - sal_uInt16 GetValueCount() const; - OUString GetValueTextByVal(bool bTheValue) const; bool GetValue() const { return m_nValue.bVisible; } diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index d5f8e01..9922e5e 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -290,11 +290,6 @@ protected: virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; bool NbcSetEckenradius(long nRad); - bool NbcSetAutoGrowHeight(bool bAuto); - bool NbcSetMaxTextFrameHeight(long nHgt); - bool NbcSetAutoGrowWidth(bool bAuto); - bool NbcSetMaxTextFrameWidth(long nWdt); - bool NbcSetFitToSize(SdrFitToSizeType eFit); // #115391# new method for SdrObjCustomShape and SdrTextObj to correctly handle and set // SdrTextMinFrameWidthItem and SdrTextMinFrameHeightItem based on all settings, necessities diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx index 54ca0cf..8bba057 100644 --- a/lotuswordpro/source/filter/lwpfilter.hxx +++ b/lotuswordpro/source/filter/lwpfilter.hxx @@ -53,41 +53,14 @@ * * ************************************************************************/ -/************************************************************************* - * @file - * Circle object. - ************************************************************************/ #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILTER_HXX #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPFILTER_HXX -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/factory.hxx> - -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <com/sun/star/xml/sax/SAXException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/document/XExtendedFilterDetection.hpp> -#include <com/sun/star/text/XTextDocument.hpp> #include <tools/stream.hxx> -using namespace ::rtl; -using namespace ::cppu; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::io; -using namespace ::com::sun::star::registry; -using namespace ::com::sun::star::document; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::xml::sax; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star; - //test code -int ReadWordproFile(SvStream &rStream, uno::Reference<XDocumentHandler>& XDoc); +int ReadWordproFile(SvStream &rStream, css::uno::Reference<css::xml::sax::XDocumentHandler>& XDoc); #endif diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 0376d5a..fb49bf7 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -181,7 +181,6 @@ public: ScRefCellValue GetCellValue( sc::ColumnBlockConstPosition& rBlockPos, SCROW nRow ) const; ScRefCellValue GetCellValue( const sc::CellStoreType::const_iterator& itPos, size_t nOffset ) const; - const sc::CellTextAttr* GetCellTextAttr( SCROW nRow ) const; const sc::CellTextAttr* GetCellTextAttr( sc::ColumnBlockConstPosition& rBlockPos, SCROW nRow ) const; void Delete( SCROW nRow ); @@ -595,7 +594,6 @@ public: void SplitFormulaGroupByRelativeRef( const ScRange& rBoundRange ); void TransferCellValuesTo( SCROW nRow, size_t nLen, sc::CellValues& rDest ); - void TransferCellValuesFrom( SCROW nRow, sc::CellValues& rSrc ); void CopyCellValuesFrom( SCROW nRow, const sc::CellValues& rSrc ); #if DEBUG_COLUMN_STORAGE diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx index a6dd966..0a2f776 100644 --- a/sc/inc/compressedarray.hxx +++ b/sc/inc/compressedarray.hxx @@ -171,14 +171,6 @@ public: A nStart, A nEnd, const D& rValueToAnd, long nSourceDy = 0 ); - /** Return the first row where an entry meets the condition: - ((aValue & rBitMask) == rMaskedCompare), searching between nStart and - nEnd. If no entry meets this condition, ::std::numeric_limits<A>::max() - is returned. */ - SC_DLLPUBLIC A GetFirstForCondition( A nStart, A nEnd, - const D& rBitMask, - const D& rMaskedCompare ) const; - /** Return the last row where an entry meets the condition: ((aValue & rBitMask) != 0), start searching at nStart. If no entry meets this condition, ::std::numeric_limits<A>::max() is returned. */ diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index b251690..8793ab7 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1541,8 +1541,6 @@ public: SC_DLLPUBLIC sal_uInt8 GetColFlags( SCCOL nCol, SCTAB nTab ) const; SC_DLLPUBLIC sal_uInt8 GetRowFlags( SCROW nRow, SCTAB nTab ) const; - SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, sal_uInt8> & GetRowFlagsArray( SCTAB nTab ) const; - SC_DLLPUBLIC void GetAllRowBreaks(::std::set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const; SC_DLLPUBLIC void GetAllColBreaks(::std::set<SCCOL>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const; SC_DLLPUBLIC ScBreakType HasRowBreak(SCROW nRow, SCTAB nTab) const; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 1581e72..0c00851 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -384,8 +384,6 @@ public: CellType GetCellType( SCCOL nCol, SCROW nRow ) const; ScRefCellValue GetCellValue( SCCOL nCol, SCROW nRow ) const; - const sc::CellTextAttr* GetCellTextAttr( SCCOL nCol, SCROW nRow ) const; - void GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const; void GetLastDataPos(SCCOL& rCol, SCROW& rRow) const; @@ -920,7 +918,6 @@ public: SCCOL nColDelta, SCROW nRowDelta ); void TransferCellValuesTo( SCCOL nCol, SCROW nRow, size_t nLen, sc::CellValues& rDest ); - void TransferCellValuesFrom( SCCOL nCol, SCROW nRow, sc::CellValues& rSrc ); void CopyCellValuesFrom( SCCOL nCol, SCROW nRow, const sc::CellValues& rSrc ); #if DEBUG_COLUMN_STORAGE diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 0a5a68e..f4e00c6 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -811,18 +811,6 @@ ScRefCellValue ScColumn::GetCellValue( const sc::CellStoreType::const_iterator& return aVal; } -const sc::CellTextAttr* ScColumn::GetCellTextAttr( SCROW nRow ) const -{ - sc::CellTextAttrStoreType::const_position_type aPos = maCellTextAttrs.position(nRow); - if (aPos.first == maCellTextAttrs.end()) - return NULL; - - if (aPos.first->type != sc::element_type_celltextattr) - return NULL; - - return &sc::celltextattr_block::at(*aPos.first->data, aPos.second); -} - const sc::CellTextAttr* ScColumn::GetCellTextAttr( sc::ColumnBlockConstPosition& rBlockPos, SCROW nRow ) const { sc::CellTextAttrStoreType::const_position_type aPos = maCellTextAttrs.position(rBlockPos.miCellTextAttrPos, nRow); diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index cf9cd1e..c5465c6 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -293,31 +293,6 @@ void ScColumn::TransferCellValuesTo( SCROW nRow, size_t nLen, sc::CellValues& rD BroadcastCells(aRows, SC_HINT_DATACHANGED); } -void ScColumn::TransferCellValuesFrom( SCROW nRow, sc::CellValues& rSrc ) -{ - if (!ValidRow(nRow)) - return; - - SCROW nLastRow = nRow + rSrc.size() - 1; - if (nLastRow > MAXROW) - // Out of bound. Do nothing - return; - - sc::CellStoreType::position_type aPos = maCells.position(nRow); - DetachFormulaCells(aPos, rSrc.size()); - - rSrc.transferTo(*this, nRow); - - CellStorageModified(); - - std::vector<SCROW> aRows; - aRows.reserve(rSrc.size()); - for (SCROW i = nRow; i <= nLastRow; ++i) - aRows.push_back(i); - - BroadcastCells(aRows, SC_HINT_DATACHANGED); -} - void ScColumn::CopyCellValuesFrom( SCROW nRow, const sc::CellValues& rSrc ) { if (!ValidRow(nRow)) diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx index 6d4ffd3..a14cd9d 100644 --- a/sc/source/core/data/compressedarray.cxx +++ b/sc/source/core/data/compressedarray.cxx @@ -401,25 +401,6 @@ void ScBitMaskCompressedArray<A,D>::CopyFromAnded( } template< typename A, typename D > -A ScBitMaskCompressedArray<A,D>::GetFirstForCondition( A nStart, A nEnd, - const D& rBitMask, const D& rMaskedCompare ) const -{ - size_t nIndex = this->Search( nStart); - do - { - if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare) - { - A nFound = nIndex > 0 ? this->pData[nIndex-1].nEnd + 1 : 0; - return ::std::max( nFound, nStart); - } - if (this->pData[nIndex].nEnd >= nEnd) - break; // while - ++nIndex; - } while (nIndex < this->nCount); - return ::std::numeric_limits<A>::max(); -} - -template< typename A, typename D > A ScBitMaskCompressedArray<A,D>::GetLastAnyBitAccess( A nStart, const D& rBitMask ) const { diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index bac82bd..57c82d0 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4064,26 +4064,6 @@ sal_uInt8 ScDocument::GetRowFlags( SCROW nRow, SCTAB nTab ) const return 0; } -const ScBitMaskCompressedArray< SCROW, sal_uInt8> & ScDocument::GetRowFlagsArray( - SCTAB nTab ) const -{ - const ScBitMaskCompressedArray< SCROW, sal_uInt8> * pFlags; - if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) - pFlags = maTabs[nTab]->GetRowFlagsArray(); - else - { - OSL_FAIL("wrong sheet number"); - pFlags = 0; - } - if (!pFlags) - { - OSL_FAIL("no row flags at sheet"); - static ScBitMaskCompressedArray< SCROW, sal_uInt8> aDummy( MAXROW, 0); - pFlags = &aDummy; - } - return *pFlags; -} - void ScDocument::GetAllRowBreaks(set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const { if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab]) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 738d5e1..900c29b 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1609,14 +1609,6 @@ ScRefCellValue ScTable::GetCellValue( SCCOL nCol, SCROW nRow ) const return aCol[nCol].GetCellValue(nRow); } -const sc::CellTextAttr* ScTable::GetCellTextAttr( SCCOL nCol, SCROW nRow ) const -{ - if (!ValidColRow(nCol, nRow)) - return NULL; - - return aCol[nCol].GetCellTextAttr(nRow); -} - void ScTable::GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const { rCol = 0; diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx index 59d2b36..845c720 100644 --- a/sc/source/core/data/table7.cxx +++ b/sc/source/core/data/table7.cxx @@ -73,14 +73,6 @@ void ScTable::TransferCellValuesTo( SCCOL nCol, SCROW nRow, size_t nLen, sc::Cel aCol[nCol].TransferCellValuesTo(nRow, nLen, rDest); } -void ScTable::TransferCellValuesFrom( SCCOL nCol, SCROW nRow, sc::CellValues& rSrc ) -{ - if (!ValidCol(nCol)) - return; - - aCol[nCol].TransferCellValuesFrom(nRow, rSrc); -} - void ScTable::CopyCellValuesFrom( SCCOL nCol, SCROW nRow, const sc::CellValues& rSrc ) { if (!ValidCol(nCol)) diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 736b116..53d0a1d 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -819,20 +819,6 @@ void XclImpAutoFilterData::Apply() if( bActive ) { InsertQueryParam(); - - // #i38093# rows hidden by filter need extra flag, but CR_FILTERED is not set here yet -// SCROW nRow1 = StartRow(); -// SCROW nRow2 = EndRow(); -// size_t nRows = nRow2 - nRow1 + 1; -// boost::scoped_array<sal_uInt8> pFlags( new sal_uInt8[nRows]); -// pExcRoot->pDoc->GetRowFlagsArray( Tab()).FillDataArray( nRow1, nRow2, -// pFlags.get()); -// for (size_t j=0; j<nRows; ++j) -// { -// if ((pFlags[j] & CR_HIDDEN) && !(pFlags[j] & CR_FILTERED)) -// pExcRoot->pDoc->SetRowFlags( nRow1 + j, Tab(), -// pFlags[j] | CR_FILTERED ); -// } } } diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 699d5f6..5165312 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -162,28 +162,6 @@ ConfigurationAccess::~ConfigurationAccess() { } -OUString ConfigurationAccess::getPath( OUString const & token ) -{ - OUString aPath; - try - { - static const OUString sProtocol( "vnd.sun.star.expand:" ); - Reference< container::XNameAccess > xSet( OpenConfiguration( true ), UNO_QUERY_THROW ); - if ( xSet->hasByName( token ) ) - xSet->getByName( token ) >>= aPath; - if ( aPath.match( sProtocol, 0 ) ) - { - OUString aTmp( aPath.copy( 20 ) ); - Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(mxContext); - aPath = xExpander->expandMacros( aTmp ); - } - } - catch (const Exception&) - { - } - return aPath; -} - OUString ConfigurationAccess::getString( const PPPOptimizerTokenEnum eToken ) const { std::map< PPPOptimizerTokenEnum, OUString, Compare >::const_iterator aIter( maStrings.find( eToken ) ); diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index 70e8281..3a186ba 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -87,7 +87,6 @@ class ConfigurationAccess ~ConfigurationAccess(); void SaveConfiguration(); - OUString getPath( OUString const & token ); OUString getString( const PPPOptimizerTokenEnum ) const; // access to current OptimizerSettings (stored in the first entry of maSettings) diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 6e96def..f1723ab 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -95,12 +95,6 @@ SfxPoolItem * SfxVisibilityItem::Clone(SfxItemPool *) const } // virtual -sal_uInt16 SfxVisibilityItem::GetValueCount() const -{ - return 2; -} - -// virtual OUString SfxVisibilityItem::GetValueTextByVal(bool bTheValue) const { return bTheValue ? OUString("TRUE") : OUString("FALSE"); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index adc5999..ab38de0 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -544,26 +544,6 @@ bool SdrTextObj::NbcSetEckenradius(long nRad) return true; } -bool SdrTextObj::NbcSetAutoGrowHeight(bool bAuto) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextAutoGrowHeightItem(bAuto)); - return true; - } - return false; -} - -bool SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextMaxFrameHeightItem(nHgt)); - return true; - } - return false; -} - // #115391# This implementation is based on the object size (aRect) and the // states of IsAutoGrowWidth/Height to correctly set TextMinFrameWidth/Height void SdrTextObj::AdaptTextMinSize() @@ -615,36 +595,6 @@ void SdrTextObj::AdaptTextMinSize() } } -bool SdrTextObj::NbcSetAutoGrowWidth(bool bAuto) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextAutoGrowWidthItem(bAuto)); - return true; - } - return false; -} - -bool SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextMaxFrameWidthItem(nWdt)); - return true; - } - return false; -} - -bool SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextFitToSizeTypeItem(eFit)); - return true; - } - return false; -} - void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const { basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly()); diff --git a/sw/inc/fillattributes.hxx b/sw/inc/fillattributes.hxx index 9908f26..05624c4 100644 --- a/sw/inc/fillattributes.hxx +++ b/sw/inc/fillattributes.hxx @@ -44,7 +44,6 @@ private: protected: public: - FillAttributes(); FillAttributes(const Color& rColor); FillAttributes(const SfxItemSet& rSet); ~FillAttributes(); @@ -55,7 +54,6 @@ public: bool isTransparent() const; const drawinglayer::attribute::SdrFillAttribute& getFillAttribute() const; - const drawinglayer::attribute::FillGradientAttribute& getFillGradientAttribute() const; const drawinglayer::primitive2d::Primitive2DSequence& getPrimitive2DSequence( const basegfx::B2DRange& rPaintRange, const basegfx::B2DRange& rDefineRange) const; diff --git a/sw/source/core/layout/fillattributes.cxx b/sw/source/core/layout/fillattributes.cxx index be948cf..8666c27 100644 --- a/sw/source/core/layout/fillattributes.cxx +++ b/sw/source/core/layout/fillattributes.cxx @@ -50,15 +50,6 @@ void FillAttributes::createPrimitive2DSequence( } } -FillAttributes::FillAttributes() -: maLastPaintRange(), - maLastDefineRange(), - maFillAttribute(), - maFillGradientAttribute(), - maPrimitives() -{ -} - FillAttributes::FillAttributes(const Color& rColor) : maLastPaintRange(), maLastDefineRange(), @@ -130,16 +121,6 @@ const drawinglayer::attribute::SdrFillAttribute& FillAttributes::getFillAttribut return *maFillAttribute.get(); } -const drawinglayer::attribute::FillGradientAttribute& FillAttributes::getFillGradientAttribute() const -{ - if(!maFillGradientAttribute.get()) - { - const_cast< FillAttributes* >(this)->maFillGradientAttribute.reset(new drawinglayer::attribute::FillGradientAttribute()); - } - - return *maFillGradientAttribute.get(); -} - const drawinglayer::primitive2d::Primitive2DSequence& FillAttributes::getPrimitive2DSequence( const basegfx::B2DRange& rPaintRange, const basegfx::B2DRange& rDefineRange) const diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 3153724..2181568 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -239,11 +239,6 @@ bool DocxSdrExport::getFrameBtLr() return m_pImpl->m_bFrameBtLr; } -void DocxSdrExport::setFrameBtLr(bool bFrameBtLr) -{ - m_pImpl->m_bFrameBtLr = bFrameBtLr; -} - sax_fastparser::FastAttributeList*& DocxSdrExport::getFlyFillAttrList() { return m_pImpl->m_pFlyFillAttrList; diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx index 21efb55..b54cad4 100644 --- a/sw/source/filter/ww8/docxsdrexport.hxx +++ b/sw/source/filter/ww8/docxsdrexport.hxx @@ -63,7 +63,6 @@ public: OStringBuffer& getTextFrameStyle(); /// Same, as DocxAttributeOutput::m_bBtLr, but for textframe rotation. bool getFrameBtLr(); - void setFrameBtLr(bool bFrameBtLr); sax_fastparser::FastAttributeList*& getFlyFillAttrList(); sax_fastparser::FastAttributeList* getFlyWrapAttrList(); void setFlyWrapAttrList(sax_fastparser::FastAttributeList* pAttrList); diff --git a/unusedcode.easy b/unusedcode.easy index 15235e2..2a083a0 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -2,9 +2,7 @@ BigInt::BigInt(unsigned int) CPhysicalCamera::CPhysicalCamera() CPhysicalCamera::GetAngleY() CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&) -ConfigurationAccess::getPath(rtl::OUString const&) DocumentHandler::DocumentHandler(com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler>&) -DocxSdrExport::setFrameBtLr(bool) EditEngine::IsIdleFormatterActive() const FPSCounter::getGPUTime() FPSCounter::gpuAccumulationTimeclear() @@ -43,27 +41,17 @@ RenderScene::loadScene(std::basic_string<char, std::char_traits<char>, std::allo RenderScene::renderMoveCamera(double, double, double, double) RenderScene::renderRotateCamera(double, double, double, double) SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) -ScBitMaskCompressedArray<int, unsigned char>::GetFirstForCondition(int, int, unsigned char const&, unsigned char const&) const ScDocument::CreateFormatTable() const -ScDocument::GetRowFlagsArray(short) const ScExtIButton::GetSelected() const ScFormulaCellGroup::scheduleCompilation() ScTabView::DrawMarkRect(Rectangle const&) ScTabViewShell::SetChartArea(tools::SvRef<ScRangeList> const&, Rectangle const&) -ScTable::GetCellTextAttr(short, int) const -ScTable::TransferCellValuesFrom(short, int, sc::CellValues&) ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) SdrItemBrowser::ForceParent() SdrItemBrowser::SdrItemBrowser(SdrView&) -SdrTextObj::NbcSetAutoGrowHeight(bool) -SdrTextObj::NbcSetAutoGrowWidth(bool) -SdrTextObj::NbcSetFitToSize(SdrFitToSizeType) -SdrTextObj::NbcSetMaxTextFrameHeight(long) -SdrTextObj::NbcSetMaxTextFrameWidth(long) SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) SfxInt64Item::SetValue(long) -SfxVisibilityItem::GetValueCount() const ShaderProgram::createProgram(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) ShaderProgram::setUniform(unsigned int, char const*, float) ShaderProgram::setUniform(unsigned int, char const*, glm::detail::tvec2<float>) @@ -84,7 +72,6 @@ SvtLanguageTable::AddLanguageTag(LanguageTag const&, rtl::OUString const&) SvtListener::IsListening(SvtBroadcaster&) const SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>) SvxNumberFormatShell::IsAdded_Impl(unsigned long) -SvxUnoTextBase::SvxUnoTextBase() SwAccessibleField::SwAccessibleField(SwField*, SwAccessibleParagraph*, short) SwAccessibleMap::FireColumnChangeEvent(unsigned short, unsigned short) SwAccessibleMap::FirePageChangeEvent(unsigned short, unsigned short) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits