[Libreoffice-commits] core.git: include/sfx2 include/svx include/vcl rsc/inc sc/source sfx2/Library_sfx.mk sfx2/source svx/source sw/inc sw/source vcl/inc vcl/source vcl/unx
Noel Grandin
noel.grandin at collabora.co.uk
Mon Nov 14 09:49:16 UTC 2016
include/sfx2/frame.hxx | 3
include/sfx2/querystatus.hxx | 54 --------
include/sfx2/viewfrm.hxx | 1
include/svx/ofaitem.hxx | 6
include/svx/svdpage.hxx | 16 --
include/vcl/lstbox.hxx | 2
include/vcl/toolbox.hxx | 3
rsc/inc/rsctools.hxx | 9 -
sc/source/filter/inc/biffcodec.hxx | 9 -
sc/source/filter/oox/biffcodec.cxx | 10 -
sfx2/Library_sfx.mk | 1
sfx2/source/control/querystatus.cxx | 222 ------------------------------------
sfx2/source/view/frame.cxx | 13 --
sfx2/source/view/viewfrm.cxx | 16 --
svx/source/svdraw/svdpage.cxx | 37 ------
svx/source/tbxctrls/tbcontrl.cxx | 1
sw/inc/cellatr.hxx | 2
sw/source/filter/ww8/ww8struc.hxx | 11 -
vcl/inc/unx/saldisp.hxx | 1
vcl/source/control/listbox.cxx | 7 -
vcl/source/window/toolbox2.cxx | 5
vcl/unx/generic/app/saldata.cxx | 6
22 files changed, 1 insertion(+), 434 deletions(-)
New commits:
commit fdf56e4b50b396884f67b841b82bca2ae8def848
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Nov 14 10:39:55 2016 +0200
loplugin:unusedmethods
Checked a couple of them:
StandardCheckVisisbilityRedirector is unused since
commit b1f8cf37828d5f37527e54774aa4935610aa6325
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Nov 2 10:57:21 2016 +0200
loplugin:singlevalfields
SfxQueryStatus is unused since
commit 64a708cba9b954afe3331f63c58218eb53b3d0ce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 5 20:28:27 2016 +0000
Revert "Reverts a commit series that cripple windows ci."
Change-Id: If1c9fe26c3ebc573d8c53c8f060b05c27f2711e5
Reviewed-on: https://gerrit.libreoffice.org/30840
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 209fb69..e08c8bf 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -103,8 +103,6 @@ protected:
bool Close();
virtual ~SfxFrame();
- SAL_DLLPRIVATE void RemoveChildFrame_Impl( SfxFrame* );
-
SAL_DLLPRIVATE SfxFrame( vcl::Window& i_rContainerWindow );
public:
@@ -156,7 +154,6 @@ public:
// Methods for accessing the current set
SAL_DLLPRIVATE SfxFrameDescriptor* GetDescriptor() const;
- SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl() const;
SAL_DLLPRIVATE bool IsAutoLoadLocked_Impl() const;
SAL_DLLPRIVATE static void InsertTopFrame_Impl( SfxFrame* pFrame );
diff --git a/include/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx
deleted file mode 100644
index 5422331..0000000
--- a/include/sfx2/querystatus.hxx
+++ /dev/null
@@ -1,54 +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_SFX2_QUERYSTATUS_HXX
-#define INCLUDED_SFX2_QUERYSTATUS_HXX
-
-#include <sal/config.h>
-#include <sfx2/dllapi.h>
-#include <svl/poolitem.hxx>
-#include <cppuhelper/weak.hxx>
-#include <osl/conditn.hxx>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-
-#include <sfx2/sfxuno.hxx>
-#include <rtl/ref.hxx>
-
-class SfxQueryStatus_Impl;
-class SFX2_DLLPUBLIC SfxQueryStatus
-{
- public:
- SfxQueryStatus( const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand );
- ~SfxQueryStatus();
-
- // Query method
- SfxItemState QueryState( SfxPoolItem*& pPoolItem );
-
- private:
- SfxQueryStatus( const SfxQueryStatus& ) = delete;
- SfxQueryStatus& operator=( const SfxQueryStatus& ) = delete;
-
- rtl::Reference< SfxQueryStatus_Impl > m_pImpl;
-};
-
-#endif // INCLUDED_SFX2_QUERYSTATUS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 1702e22..8ae9b8d1 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -195,7 +195,6 @@ public:
SAL_DLLPRIVATE void MakeActive_Impl( bool bActivate );
SAL_DLLPRIVATE const Size& GetMargin_Impl() const;
- SAL_DLLPRIVATE void SetActiveChildFrame_Impl( SfxViewFrame* );
SAL_DLLPRIVATE SfxViewFrame* GetActiveChildFrame_Impl() const;
SAL_DLLPRIVATE OUString GetActualPresentationURL_Impl() const;
SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &);
diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx
index d05e768..49df180 100644
--- a/include/svx/ofaitem.hxx
+++ b/include/svx/ofaitem.hxx
@@ -58,14 +58,10 @@ public:
{
return mxRef == static_cast<OfaRefItem<reference_type> const &>(rItem).mxRef;
}
- virtual SfxPoolItem*Clone( SfxItemPool* /*pPool = 0*/ ) const override
+ virtual SfxPoolItem* Clone( SfxItemPool* /*pPool = 0*/ ) const override
{
return new OfaRefItem( *this );
}
- inline rtl::Reference<reference_type> GetValue() const
- {
- return mxRef;
- }
};
#endif
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 8067add..b60f12a 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -535,22 +535,6 @@ private:
typedef tools::WeakReference< SdrPage > SdrPageWeakRef;
-// use new redirector instead of pPaintProc
-
-class SVX_DLLPUBLIC StandardCheckVisisbilityRedirector : public sdr::contact::ViewObjectContactRedirector
-{
-public:
- StandardCheckVisisbilityRedirector();
- virtual ~StandardCheckVisisbilityRedirector() override;
-
- // all default implementations just call the same methods at the original. To do something
- // different, override the method and at least do what the method does.
- virtual drawinglayer::primitive2d::Primitive2DContainer createRedirectedPrimitive2DSequence(
- const sdr::contact::ViewObjectContact& rOriginal,
- const sdr::contact::DisplayInfo& rDisplayInfo) override;
-};
-
-
#endif // INCLUDED_SVX_SVDPAGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 0248e15..add63a4 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -216,8 +216,6 @@ public:
Rectangle GetBoundingRectangle( sal_Int32 nItem ) const;
- void SetUserItemSize( const Size& rSz );
-
void EnableUserDraw( bool bUserDraw );
void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawTextAtImagePos );
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 797462f..66bd8cf 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -357,9 +357,6 @@ public:
/// Returns size of the bitmap / text that is inside this toolbox item.
Size GetItemContentSize( sal_uInt16 nItemId ) const;
- /// Retrieves the optimal position to place a popup window for this item (subtoolbar or dropdown)
- Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const;
-
sal_uInt16 GetCurItemId() const { return mnCurItemId; }
sal_uInt16 GetDownItemId() const { return mnDownItemId; }
sal_uInt16 GetModifier() const { return mnMouseModifier; }
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 8cfb5b9..cf26e05 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -90,15 +90,6 @@ public:
{
return GetPointer( 0 );
}
- sal_uInt16 GetShort( sal_uInt32 nPos )
- {
- sal_uInt16 nVal = 0;
- char* pFrom = GetPointer(nPos);
- char* pTo = reinterpret_cast<char*>(&nVal);
- *pTo++ = *pFrom++;
- *pTo++ = *pFrom++;
- return bSwap ? OSL_SWAPWORD( nVal ) : nVal;
- }
sal_uInt32 GetLong( sal_uInt32 nPos )
{
sal_uInt32 nVal = 0;
diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx
index 914fb60..bd46843 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -52,9 +52,6 @@ public:
sal_uInt16 nBytes );
private:
- /** Derived classes return a clone of the decoder for usage in new streams. */
- virtual BiffDecoderBase* implClone() = 0;
-
/** Derived classes implement password verification and initialization of
the decoder. */
virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) = 0;
@@ -80,9 +77,6 @@ private:
/** Copy constructor for cloning. */
BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder );
- /** Returns a clone of the decoder for usage in new streams. */
- virtual BiffDecoder_XOR* implClone() override;
-
/** Implements password verification and initialization of the decoder. */
virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override;
virtual bool implVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override;
@@ -108,9 +102,6 @@ private:
/** Copy constructor for cloning. */
BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder );
- /** Returns a clone of the decoder for usage in new streams. */
- virtual BiffDecoder_RCF* implClone() override;
-
/** Implements password verification and initialization of the decoder. */
virtual css::uno::Sequence< css::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override;
virtual bool implVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override;
diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx
index 55e1b5c..89feebc 100644
--- a/sc/source/filter/oox/biffcodec.cxx
+++ b/sc/source/filter/oox/biffcodec.cxx
@@ -74,11 +74,6 @@ BiffDecoder_XOR::BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ) :
maCodec.initCodec( maEncryptionData );
}
-BiffDecoder_XOR* BiffDecoder_XOR::implClone()
-{
- return new BiffDecoder_XOR( *this );
-}
-
Sequence< NamedValue > BiffDecoder_XOR::implVerifyPassword( const OUString& rPassword )
{
maEncryptionData.realloc( 0 );
@@ -149,11 +144,6 @@ BiffDecoder_RCF::BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ) :
maCodec.initCodec( maEncryptionData );
}
-BiffDecoder_RCF* BiffDecoder_RCF::implClone()
-{
- return new BiffDecoder_RCF( *this );
-}
-
Sequence< NamedValue > BiffDecoder_RCF::implVerifyPassword( const OUString& rPassword )
{
maEncryptionData.realloc( 0 );
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index e3daa77..647078f 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -144,7 +144,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/control/msg \
sfx2/source/control/msgpool \
sfx2/source/control/objface \
- sfx2/source/control/querystatus \
sfx2/source/control/recentdocsview \
sfx2/source/control/recentdocsviewitem \
sfx2/source/control/request \
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
deleted file mode 100644
index e53d812..0000000
--- a/sfx2/source/control/querystatus.cxx
+++ /dev/null
@@ -1,222 +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 <sal/config.h>
-
-#include <sfx2/querystatus.hxx>
-#include <svl/poolitem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/itemset.hxx>
-#include "itemdel.hxx"
-#include <svl/visitem.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <comphelper/processfactory.hxx>
-#include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>
-#include <com/sun/star/util/URLTransformer.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/status/ItemStatus.hpp>
-#include <com/sun/star/frame/status/ItemState.hpp>
-#include <com/sun/star/frame/status/Visibility.hpp>
-
-using namespace ::cppu;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::frame::status;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
-
-class SfxQueryStatus_Impl:
- public cppu::WeakImplHelper<css::frame::XStatusListener>
-{
- public:
-
- SfxQueryStatus_Impl( const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand );
- virtual ~SfxQueryStatus_Impl() override;
- SfxQueryStatus_Impl(const SfxQueryStatus_Impl&) = delete;
- SfxQueryStatus_Impl& operator=(const SfxQueryStatus_Impl&) = delete;
-
- // Query method
- SfxItemState QueryState( SfxPoolItem*& pPoolItem );
-
- // XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
-
- // XStatusListener
- virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
-
- private:
- bool m_bQueryInProgress;
- SfxItemState m_eState;
- SfxPoolItem* m_pItem;
- sal_uInt16 m_nSlotID;
- osl::Condition m_aCondition;
- css::util::URL m_aCommand;
- css::uno::Reference< css::frame::XDispatch > m_xDispatch;
-};
-
-SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) :
- m_bQueryInProgress( false ),
- m_eState( SfxItemState::DISABLED ),
- m_pItem( nullptr ),
- m_nSlotID( nSlotId )
-{
- m_aCommand.Complete = rCommand;
- Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
- xTrans->parseStrict( m_aCommand );
- if ( rDispatchProvider.is() )
- m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, OUString(), 0 );
- m_aCondition.reset();
-}
-
-SfxQueryStatus_Impl::~SfxQueryStatus_Impl()
-{
-}
-
-void SAL_CALL SfxQueryStatus_Impl::disposing( const EventObject& )
-throw( RuntimeException, std::exception )
-{
- SolarMutexGuard aGuard;
- m_xDispatch.clear();
-}
-
-void SAL_CALL SfxQueryStatus_Impl::statusChanged( const FeatureStateEvent& rEvent)
-throw( RuntimeException, std::exception )
-{
- SolarMutexGuard aGuard;
-
- m_pItem = nullptr;
- m_eState = SfxItemState::DISABLED;
-
- if ( rEvent.IsEnabled )
- {
- m_eState = SfxItemState::DEFAULT;
- css::uno::Type aType = rEvent.State.getValueType();
-
- if ( aType == cppu::UnoType<bool>::get() )
- {
- bool bTemp = false;
- rEvent.State >>= bTemp ;
- m_pItem = new SfxBoolItem( m_nSlotID, bTemp );
- }
- else if ( aType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
- {
- sal_uInt16 nTemp = 0;
- rEvent.State >>= nTemp ;
- m_pItem = new SfxUInt16Item( m_nSlotID, nTemp );
- }
- else if ( aType == cppu::UnoType<sal_uInt32>::get() )
- {
- sal_uInt32 nTemp = 0;
- rEvent.State >>= nTemp ;
- m_pItem = new SfxUInt32Item( m_nSlotID, nTemp );
- }
- else if ( aType == cppu::UnoType<OUString>::get() )
- {
- OUString sTemp ;
- rEvent.State >>= sTemp ;
- m_pItem = new SfxStringItem( m_nSlotID, sTemp );
- }
- else if ( aType == cppu::UnoType< css::frame::status::ItemStatus>::get() )
- {
- ItemStatus aItemStatus;
- rEvent.State >>= aItemStatus;
- m_eState = (SfxItemState) aItemStatus.State;
- m_pItem = new SfxVoidItem( m_nSlotID );
- }
- else if ( aType == cppu::UnoType< css::frame::status::Visibility>::get() )
- {
- Visibility aVisibilityStatus;
- rEvent.State >>= aVisibilityStatus;
- m_pItem = new SfxVisibilityItem( m_nSlotID, aVisibilityStatus.bVisible );
- }
- else
- {
- m_eState = SfxItemState::UNKNOWN;
- m_pItem = new SfxVoidItem( m_nSlotID );
- }
- }
-
- if ( m_pItem )
- DeleteItemOnIdle( m_pItem );
-
- try
- {
- m_aCondition.set();
- m_xDispatch->removeStatusListener( Reference< XStatusListener >( static_cast< cppu::OWeakObject* >( this ), UNO_QUERY ),
- m_aCommand );
- }
- catch ( Exception& )
- {
- }
-}
-
-// Query method
-SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem )
-{
- SolarMutexGuard aGuard;
- if ( !m_bQueryInProgress )
- {
- m_pItem = nullptr;
- m_eState = SfxItemState::DISABLED;
-
- if ( m_xDispatch.is() )
- {
- try
- {
- m_aCondition.reset();
- m_bQueryInProgress = true;
- m_xDispatch->addStatusListener( Reference< XStatusListener >( static_cast< cppu::OWeakObject* >( this ), UNO_QUERY ),
- m_aCommand );
- }
- catch ( Exception& )
- {
- m_aCondition.set();
- }
- }
- else
- m_aCondition.set();
- }
-
- m_aCondition.wait();
-
- m_bQueryInProgress = false;
- rpPoolItem = m_pItem;
- return m_eState;
-}
-
-
-SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand )
- : m_pImpl(new SfxQueryStatus_Impl( rDispatchProvider, nSlotId, rCommand ))
-{
-}
-
-SfxQueryStatus::~SfxQueryStatus()
-{
-}
-
-SfxItemState SfxQueryStatus::QueryState( SfxPoolItem*& rpPoolItem )
-{
- SolarMutexGuard aGuard;
- return m_pImpl->QueryState( rpPoolItem );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 9e80816..e9cf6eb 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -239,14 +239,6 @@ SfxFrame* SfxFrame::GetChildFrame( sal_uInt16 nPos ) const
return nullptr;
}
-void SfxFrame::RemoveChildFrame_Impl( SfxFrame* pFrame )
-{
- DBG_ASSERT( pChildArr, "Unknown Frame!");
- SfxFrameArr_Impl::iterator it = std::find( pChildArr->begin(), pChildArr->end(), pFrame );
- if ( it != pChildArr->end() )
- pChildArr->erase( it );
-};
-
bool SfxFrame::IsClosing_Impl() const
{
return pImpl->bClosing;
@@ -299,11 +291,6 @@ SfxViewFrame* SfxFrame::GetCurrentViewFrame() const
return pImpl->pCurrentViewFrame;
}
-SfxDispatcher* SfxFrame::GetDispatcher_Impl() const
-{
- return pImpl->pCurrentViewFrame->GetDispatcher();
-}
-
bool SfxFrame::IsAutoLoadLocked_Impl() const
{
// Its own Document is locked?
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9240a3a..18022ec 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1643,22 +1643,6 @@ const Size& SfxViewFrame::GetMargin_Impl() const
return m_pImpl->aMargin;
}
-void SfxViewFrame::SetActiveChildFrame_Impl( SfxViewFrame *pViewFrame )
-{
- if ( pViewFrame != m_pImpl->pActiveChild )
- {
- m_pImpl->pActiveChild = pViewFrame;
-
- Reference< XFramesSupplier > xFrame( GetFrame().GetFrameInterface(), UNO_QUERY );
- Reference< XFrame > xActive;
- if ( pViewFrame )
- xActive = pViewFrame->GetFrame().GetFrameInterface();
-
- if ( xFrame.is() ) // xFrame can be NULL
- xFrame->setActiveFrame( xActive );
- }
-}
-
SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const
{
SfxViewFrame *pViewFrame = m_pImpl->pActiveChild;
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 147a4ba..a45a446 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1775,41 +1775,4 @@ const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const
}
-// use new redirector instead of pPaintProc
-
-StandardCheckVisisbilityRedirector::StandardCheckVisisbilityRedirector()
-: ViewObjectContactRedirector()
-{
-}
-
-StandardCheckVisisbilityRedirector::~StandardCheckVisisbilityRedirector()
-{
-}
-
-drawinglayer::primitive2d::Primitive2DContainer StandardCheckVisisbilityRedirector::createRedirectedPrimitive2DSequence(
- const sdr::contact::ViewObjectContact& rOriginal,
- const sdr::contact::DisplayInfo& rDisplayInfo)
-{
- SdrObject* pObject = rOriginal.GetViewContact().TryToGetSdrObject();
-
- if(pObject)
- {
- if(pObject->GetPage())
- {
- if(pObject->GetPage()->checkVisibility(rOriginal, rDisplayInfo, false))
- {
- return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo);
- }
- }
-
- return drawinglayer::primitive2d::Primitive2DContainer();
- }
- else
- {
- // not an object, maybe a page
- return sdr::contact::ViewObjectContactRedirector::createRedirectedPrimitive2DSequence(rOriginal, rDisplayInfo);
- }
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f774559..aa725a7 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -44,7 +44,6 @@
#include <sfx2/docfac.hxx>
#include <sfx2/templdlg.hxx>
#include <svl/isethint.hxx>
-#include <sfx2/querystatus.hxx>
#include <sfx2/sfxstatuslistener.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/urlobj.hxx>
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index f07345b..501744b 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -45,8 +45,6 @@ public:
bAuto = rAttr.bAuto;
return *this;
}
-
- bool GetAutoFlag() const { return bAuto; }
};
class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 254591e..097391d 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -253,17 +253,6 @@ struct WW8_BRCVer6 // BoRder Code (WW6 version)
{ return ((aBits1[0] & 0xc0) >> 6) | ((aBits1[1] & 0x07) << 2); }
sal_uInt8 dxpSpace() const
{ return aBits1[1] >> 3; }
-
- WW8_BRCVer6(sal_uInt8 _dxpLineWidth, sal_uInt8 _brcType, sal_uInt8 _ico,
- sal_uInt8 _dxpSpace, bool _fShadow)
- {
- assert(_dxpSpace < 0x20);
- assert(_brcType <= 3);
- assert(_ico < 32);
- aBits1[0] = _dxpLineWidth | (_brcType << 3) | ((sal_uInt8)_fShadow << 5)
- | ((_ico << 6) & 0xc0);
- aBits1[1] = (_ico >> 2) | (_dxpSpace << 3);
- }
};
struct WW8_BRC // BoRder Code (WW8 version)
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index e1e6d5f..64998df 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -182,7 +182,6 @@ public:
bool CheckTimeout( bool bExecuteTimers = true );
SalI18N_InputMethod* GetInputMethod() const { return m_pInputMethod; }
- void SetInputMethod( SalI18N_InputMethod *pInputMethod );
Display* GetDisplay() const { return m_pDisplay; }
};
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 3482fcf..d8f882b 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1347,13 +1347,6 @@ void ListBox::DrawEntry(const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawTe
mpImplWin->DrawEntry(*rEvt.GetRenderContext(), bDrawImage, bDrawTextAtImagePos);
}
-void ListBox::SetUserItemSize( const Size& rSz )
-{
- mpImplLB->GetMainWindow()->SetUserItemSize( rSz );
- if ( mpImplWin )
- mpImplWin->SetUserItemSize( rSz );
-}
-
void ListBox::EnableUserDraw( bool bUserDraw )
{
mpImplLB->GetMainWindow()->EnableUserDraw( bUserDraw );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index f5c8016..04ba01c 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -845,11 +845,6 @@ Point ToolBox::ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize )
return aPos;
}
-Point ToolBox::GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const
-{
- return ImplGetPopupPosition( GetItemRect( nItemId ), rSize );
-}
-
Rectangle ToolBox::GetItemRect( sal_uInt16 nItemId ) const
{
if ( mbCalc || mbFormat )
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index d607bd7..9fe3422 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -382,12 +382,6 @@ SalXLib::~SalXLib()
delete m_pInputMethod;
}
-void SalXLib::SetInputMethod( SalI18N_InputMethod *pInputMethod )
-{
- delete m_pInputMethod;
- m_pInputMethod = pInputMethod;
-}
-
static Display *OpenX11Display(OString& rDisplay)
{
/*
More information about the Libreoffice-commits
mailing list