diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/frame.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/querystatus.hxx | 54 | ||||
| -rw-r--r-- | include/sfx2/viewfrm.hxx | 1 | ||||
| -rw-r--r-- | include/svx/ofaitem.hxx | 6 | ||||
| -rw-r--r-- | include/svx/svdpage.hxx | 16 | ||||
| -rw-r--r-- | include/vcl/lstbox.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/toolbox.hxx | 3 |
7 files changed, 1 insertions, 84 deletions
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 209fb69ce55a..e08c8bf505b8 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 54223315ce62..000000000000 --- 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 1702e22020f0..8ae9b8d1423f 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 d05e768f1c11..49df180d86a2 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 8067adda06c9..b60f12a57f45 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 0248e1512cde..add63a49e544 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 797462ff0f85..66bd8cf41f98 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; } |