[Libreoffice-commits] .: 5 commits - sd/qa sd/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Apr 15 06:09:22 PDT 2011
sd/qa/unit/makefile.mk | 3
sd/source/ui/inc/AccessibleSlideView.hxx | 283 ----------
sd/source/ui/inc/DrawViewShell.hxx | 2
sd/source/ui/inc/Ruler.hxx | 6
sd/source/ui/inc/SdUnoSlideView.hxx | 1
sd/source/ui/inc/SlideView.hxx | 147 -----
sd/source/ui/inc/SlideViewShell.hxx | 178 ------
sd/source/ui/inc/ViewShell.hxx | 21
sd/source/ui/inc/fuslhide.hxx | 65 --
sd/source/ui/inc/fuslid.hxx | 80 --
sd/source/ui/slideshow/slideshowviewimpl.cxx | 6
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 1
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 3
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 8
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2
sd/source/ui/view/Outliner.cxx | 2
sd/source/ui/view/drviews5.cxx | 13
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 15
sd/source/ui/view/viewshel.cxx | 36 -
20 files changed, 71 insertions(+), 803 deletions(-)
New commits:
commit 7e13f8c6b8fa4e59bca9111910bea8dc223b7bc4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 15 14:02:47 2011 +0100
Split construct into bits that depend on showing the window and not
This fixes a horrific a11y problem where Show triggers callbacks
to virtual methods, while the object is not fully constructed,
which means, that the *baseclass* virtual method is called,
not the *derived* virtual method that constructs the a11y wrapper
enable a11y, and run the smoketest with dbg-util before touching
this stuff
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 1816ad5..bf2f098 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -562,6 +562,27 @@ protected:
virtual void SetZoomFactor( const Fraction &rZoomX,
const Fraction &rZoomY );
+ /**
+ This must be called after the ctor, but before anything else.
+ It's the part of construction that is dependent
+ on showing the top-level window.
+
+ Showing a window with a11y enabled causes various callbacks
+ to be triggered.
+
+ Due to the "virtual methods are not virtual during constructors"
+ problem, this is a disaster to call from the ctor
+
+ i.e. construct calls Show, and if a11y is enabled this
+ reenters the not-fully constructed object and calls
+ CreateAccessibleDocumentView, so if construct is called
+ from the ctor then if a derived class is contructed the base-cass
+ CreateAccessibleDocumentView is used, not the derived
+ CreateAccessibleDocumentView. i.e. run smoketest under a11y with
+ debugging assertions enabled
+ */
+ void doShow();
+
private:
::Window* mpParentWindow;
/** This window updater is used to keep all relevant windows up to date
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index c0a90c9..f2bb771 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -135,9 +135,6 @@ SlideSorterViewShell::SlideSorterViewShell (
{
meShellType = ST_SLIDE_SORTER;
- SetPool( &GetDoc()->GetPool() );
- SetUndoManager( GetDoc()->GetDocSh()->GetUndoManager() );
-
if (pFrameViewArgument != NULL)
mpFrameView = pFrameViewArgument;
else
@@ -190,6 +187,11 @@ void SlideSorterViewShell::Initialize (void)
mpScrollBarBox);
mpView = &mpSlideSorter->GetView();
+ ViewShell::doShow();
+
+ SetPool( &GetDoc()->GetPool() );
+ SetUndoManager( GetDoc()->GetDocSh()->GetUndoManager() );
+
// For accessibility we have to shortly hide the content window.
// This triggers the construction of a new accessibility object for
// the new view shell. (One is created earlier while the construtor
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 3dc3b38..0ea4534 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -483,6 +483,8 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi
,mpSubShellManager()
,mnMenuId(0)
{
+ ViewShell::doShow();
+
meShellType = ST_TASK_PANE;
mpContentWindow->SetCenterAllowed( false );
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index f09ed46..e277016 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -143,6 +143,8 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
, mbIsLayerModeActive(false)
, mbIsInSwitchPage(false)
{
+ ViewShell::doShow();
+
if (pFrameViewArgument != NULL)
mpFrameView = pFrameViewArgument;
else
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index ceb76f1..2cfed4f 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -225,6 +225,8 @@ OutlineViewShell::OutlineViewShell (
mbInitialized(false)
{
+ ViewShell::doShow();
+
if (pFrameViewArgument != NULL)
mpFrameView = pFrameViewArgument;
else
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 3e72355..2570700 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -218,11 +218,6 @@ void ViewShell::construct(void)
mpContentWindow->SetViewShell(this);
mpContentWindow->SetPosSizePixel(
GetParentWindow()->GetPosPixel(),GetParentWindow()->GetSizePixel());
- mpContentWindow->Show();
- static_cast< ::Window*>(mpContentWindow.get())->Resize();
- OSL_TRACE("content window has size %d %d",
- mpContentWindow->GetSizePixel().Width(),
- mpContentWindow->GetSizePixel().Height());
if ( ! GetDocSh()->IsPreview())
{
@@ -231,18 +226,12 @@ void ViewShell::construct(void)
mpHorizontalScrollBar->EnableRTL (sal_False);
mpHorizontalScrollBar->SetRange(Range(0, 32000));
mpHorizontalScrollBar->SetScrollHdl(LINK(this, ViewShell, HScrollHdl));
- mpHorizontalScrollBar->Show();
mpVerticalScrollBar.reset (new ScrollBar(GetParentWindow(), WinBits(WB_VSCROLL | WB_DRAG)));
mpVerticalScrollBar->SetRange(Range(0, 32000));
mpVerticalScrollBar->SetScrollHdl(LINK(this, ViewShell, VScrollHdl));
- mpVerticalScrollBar->Show();
- maScrBarWH = Size(
- mpVerticalScrollBar->GetSizePixel().Width(),
- mpHorizontalScrollBar->GetSizePixel().Height());
mpScrollBarBox.reset(new ScrollBarBox(GetParentWindow(), WB_SIZEABLE));
- mpScrollBarBox->Show();
}
String aName( RTL_CONSTASCII_USTRINGPARAM( "ViewShell" ));
@@ -264,12 +253,31 @@ void ViewShell::construct(void)
// Register the sub shell factory.
mpImpl->mpSubShellFactory.reset(new ViewShellObjectBarFactory(*this));
GetViewShellBase().GetViewShellManager()->AddSubShellFactory(this,mpImpl->mpSubShellFactory);
-
- GetParentWindow()->Show();
}
+void ViewShell::doShow(void)
+{
+ mpContentWindow->Show();
+ static_cast< ::Window*>(mpContentWindow.get())->Resize();
+ OSL_TRACE("content window has size %d %d",
+ mpContentWindow->GetSizePixel().Width(),
+ mpContentWindow->GetSizePixel().Height());
+
+ if ( ! GetDocSh()->IsPreview())
+ {
+ // Show scroll bars
+ mpHorizontalScrollBar->Show();
+
+ mpVerticalScrollBar->Show();
+ maScrBarWH = Size(
+ mpVerticalScrollBar->GetSizePixel().Width(),
+ mpHorizontalScrollBar->GetSizePixel().Height());
+ mpScrollBarBox->Show();
+ }
+ GetParentWindow()->Show();
+}
void ViewShell::Init (bool bIsMainViewShell)
{
commit a6b9a19e91bcc858d59c1d84c308cfd0a3fe9bf9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 15 09:04:34 2011 +0100
document ViewShell::CreateAccessibleDocumentView problem
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index edd742a..5c73e80 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -671,11 +671,9 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect)
(static_cast< ::com::sun::star::uno::XWeak*>(pDocumentView),
::com::sun::star::uno::UNO_QUERY);
}
- else
- {
- OSL_TRACE ("DrawViewShell::CreateAccessibleDocumentView: no controller");
- return ViewShell::CreateAccessibleDocumentView (pWindow);
- }
+
+ OSL_TRACE ("DrawViewShell::CreateAccessibleDocumentView: no controller");
+ return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>();
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index ceac60f..ceb76f1 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -2099,11 +2099,9 @@ void OutlineViewShell::VisAreaChanged(const Rectangle& rRect)
(static_cast< ::com::sun::star::uno::XWeak*>(pDocumentView),
::com::sun::star::uno::UNO_QUERY);
}
- else
- {
- OSL_TRACE ("OutlineViewShell::CreateAccessibleDocumentView: no controller");
- return ViewShell::CreateAccessibleDocumentView (pWindow);
- }
+
+ OSL_TRACE ("OutlineViewShell::CreateAccessibleDocumentView: no controller");
+ return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >();
}
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index e891586..3e72355 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1281,6 +1281,8 @@ void ViewShell::ExecReq( SfxRequest& rReq )
::com::sun::star::accessibility::XAccessible>
ViewShell::CreateAccessibleDocumentView (::sd::Window* )
{
+ OSL_FAIL("ViewShell::CreateAccessibleDocumentView should not be called!, perhaps Meyers, 3rd edition, Item 9:\n");
+
return ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> ();
}
commit 5f2a9ee91905c24f56ba8bf325cd9c098b44e19e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 15 08:59:05 2011 +0100
add i18npool
diff --git a/sd/qa/unit/makefile.mk b/sd/qa/unit/makefile.mk
index 94e7941..958711f 100644
--- a/sd/qa/unit/makefile.mk
+++ b/sd/qa/unit/makefile.mk
@@ -82,7 +82,8 @@ my_file = file://
ALLTAR: test
test_components = \
- component/framework/util/fwk
+ component/framework/util/fwk \
+ i18npool
#Make a services.rdb with the services we know we need to get up and running
$(MISC)/$(TARGET)/services.input : makefile.mk
commit 29dfd7ea0b897fa121129f085ff9013c1e411749
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 15 08:56:01 2011 +0100
WaE: shadowed variable
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index fa293b2..82aa96d 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -504,10 +504,10 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp
if( mbFirstPaint )
{
mbFirstPaint = false;
- SlideshowImpl* pSlideShow = mpSlideShow;
+ SlideshowImpl* pTmpSlideShow = mpSlideShow;
rGuard.clear();
- if( pSlideShow )
- pSlideShow->onFirstPaint();
+ if( pTmpSlideShow )
+ pTmpSlideShow->onFirstPaint();
} else
rGuard.clear();
commit 0201bbe1f252c6a1ab79ae7a65ab325ba61ad08d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 15 08:54:49 2011 +0100
none of these classes or headers is actually used
diff --git a/sd/source/ui/inc/AccessibleSlideView.hxx b/sd/source/ui/inc/AccessibleSlideView.hxx
deleted file mode 100644
index c99b8e1..0000000
--- a/sd/source/ui/inc/AccessibleSlideView.hxx
+++ /dev/null
@@ -1,283 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SD_ACCESSIBILITY_ACCESSIBLE_SLIDE_VIEW_HXX
-#define SD_ACCESSIBILITY_ACCESSIBLE_SLIDE_VIEW_HXX
-
-#include <cppuhelper/implbase6.hxx>
-#include <cppuhelper/implbase7.hxx>
-#include "SlideView.hxx"
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#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/XAccessibleSelection.hpp>
-#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-#include <vector>
-
-class SdDrawDocument;
-class AccessibleSlideView;
-
-namespace sd {
-class SlideView;
-class Window;
-}
-
-// -----------------------------
-// - AccessibleSlideViewObject -
-// -----------------------------
-
-class AccessibleSlideViewObject : public ::cppu::WeakImplHelper6<
- ::com::sun::star::lang::XUnoTunnel,
- ::com::sun::star::accessibility::XAccessible,
- ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
- ::com::sun::star::accessibility::XAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleComponent,
- ::com::sun::star::lang::XServiceInfo >
-{
-private:
-
- ::osl::Mutex maMutex;
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent;
- AccessibleSlideView* mpManager;
- /// client id in the AccessibleEventNotifier queue
- sal_uInt32 mnClientId;
- sal_uInt16 mnPage;
- sal_Bool mbVisible;
- sal_Bool mbValid;
-
-private:
-
- // Misc
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
-
- // XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException );
-
- // XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException);
-
- // XAccessibleEventBroadcaster
- 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);
-
- // XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
-
- // XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
- 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);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException);
-
- virtual sal_Int32 SAL_CALL getForeground (void)
- throw (::com::sun::star::uno::RuntimeException);
-
- virtual sal_Int32 SAL_CALL getBackground (void)
- throw (::com::sun::star::uno::RuntimeException);
-
- //===== XServiceInfo ====================================================
-
- /** Returns an identifier for the implementation of this object.
- */
- virtual ::rtl::OUString SAL_CALL
- getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException);
-
- /** Return whether the specified service is supported by this class.
- */
- virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException);
-
- /** Returns a list of all supported services.
- */
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
- getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException);
-
-public:
-
- static AccessibleSlideViewObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw();
-
-public:
-
- AccessibleSlideViewObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent, sal_uInt16 nPage, sal_Bool bVisible );
- ~AccessibleSlideViewObject();
-
- void FireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
-
- /** This method acts like a dispose call. It sends a disposing to all
- of its listeners. It may be called twice.
- */
- void Destroyed (void);
-
- sal_uInt16 GetPageNum() const { return mnPage; }
-
- void SetVisible( sal_Bool bVisible );
- sal_Bool IsVisible() const;
-};
-
-// -----------------------
-// - AccessibleSlideView -
-// -----------------------
-
-class AccessibleSlideView : public ::cppu::WeakImplHelper7<
- ::com::sun::star::lang::XUnoTunnel,
- ::com::sun::star::accessibility::XAccessible,
- ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
- ::com::sun::star::accessibility::XAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleComponent,
- ::com::sun::star::accessibility::XAccessibleSelection,
- ::com::sun::star::lang::XServiceInfo >
-{
-public:
-
- static AccessibleSlideView* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw();
-
- AccessibleSlideView(
- SdDrawDocument& rDoc,
- ::sd::SlideView& rView,
- ::sd::Window& rParentWindow);
- virtual ~AccessibleSlideView (void);
-
- void FireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
-
- /** This method acts like a dispose call. It sends a disposing to all
- of its listeners. It may be called twice.
- */
- void Destroyed (void);
-
- SdDrawDocument* GetDrawDocument() const { return mpDoc; }
- ::sd::SlideView* GetSlideView() const { return mpView; }
- ::sd::Window* GetParentWindow() const { return mpParentWindow; }
-
- void SetPageVisible( sal_uInt16 nPage, sal_Bool bVisible );
- void Reset();
- void FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage );
-
-
-private:
- ::osl::Mutex maMutex;
- ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > maSlidePageObjects;
- SdDrawDocument* mpDoc;
- ::sd::SlideView* mpView;
- ::sd::Window* mpParentWindow;
- /// client id in the AccessibleEventNotifier queue
- sal_uInt32 mnClientId;
-
- // internal
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
- sal_Int32 ImplGetVisibleChildCount() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ImplGetVisibleChild( sal_Int32 nVisibleChild ) const;
-
- // XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException );
-
- // XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException);
-
- // XAccessibleEventBroadcaster
- 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);
-
- // XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
-
- // XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
- 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);
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException);
-
- virtual sal_Int32 SAL_CALL getForeground (void)
- throw (::com::sun::star::uno::RuntimeException);
-
- virtual sal_Int32 SAL_CALL getBackground (void)
- throw (::com::sun::star::uno::RuntimeException);
-
- // XAccessibleSelection
- virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
- //===== XServiceInfo ====================================================
-
- /** Returns an identifier for the implementation of this object.
- */
- virtual ::rtl::OUString SAL_CALL
- getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException);
-
- /** Return whether the specified service is supported by this class.
- */
- virtual sal_Bool SAL_CALL
- supportsService (const ::rtl::OUString& sServiceName)
- throw (::com::sun::star::uno::RuntimeException);
-
- /** Returns a list of all supported services.
- */
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
- getSupportedServiceNames (void)
- throw (::com::sun::star::uno::RuntimeException);
-
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index b80dbed..b1d6fd0 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -66,7 +66,7 @@ class ViewOverlayManager;
/** Base class of the stacked shells that provide graphical views to
Draw and Impress documents and editing functionality. In contrast
to this other stacked shells are responsible for showing an
- overview over several slides (SlideViewShell) or a textual
+ overview over several slides or a textual
overview over the text in an Impress document (OutlineViewShell).
*/
class DrawViewShell
diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx
index a3e4121..e994ca3 100644
--- a/sd/source/ui/inc/Ruler.hxx
+++ b/sd/source/ui/inc/Ruler.hxx
@@ -40,12 +40,6 @@ class RulerCtrlItem;
class View;
class Window;
-/*************************************************************************
-|*
-|* das Fenster der Diashow leitet Mouse- und Key-Events an die SlideViewShell
-|*
-\************************************************************************/
-
class Ruler
: public SvxRuler
{
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index c44831c..b65ed13 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -46,7 +46,6 @@ class PageSelector;
namespace sd {
class DrawController;
-class SlideViewShell;
class View;
diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx
deleted file mode 100644
index 5cb657e..0000000
--- a/sd/source/ui/inc/SlideView.hxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SD_SLIDE_VIEW_HXX
-#define SD_SLIDE_VIEW_HXX
-
-#include "View.hxx"
-
-class SdDrawDocument;
-class BitmapCache;
-class SdPage;
-
-namespace sd {
-
-class SlideViewShell;
-class Window;
-
-// ----------------------
-// - SlideViewFocusMove -
-// ----------------------
-
-enum SlideViewFocusMove
-{
- SLIDEVIEWFOCUSMOVE_NONE = 0,
- SLIDEVIEWFOCUSMOVE_TOGGLE = 1,
- SLIDEVIEWFOCUSMOVE_SELECT = 2,
- SLIDEVIEWFOCUSMOVE_LEFT = 3,
- SLIDEVIEWFOCUSMOVE_TOP = 4,
- SLIDEVIEWFOCUSMOVE_RIGHT = 5,
- SLIDEVIEWFOCUSMOVE_BOTTOM = 6
-};
-
-// ---------------
-// - SdSlideView -
-// ---------------
-
-class SlideView
- : public ::sd::View
-{
-public:
- TYPEINFO();
-
- SlideView (
- SdDrawDocument* pDoc,
- ::Window* pWindow,
- SlideViewShell* pSlideVShell);
- virtual ~SlideView (void);
-
- void Select( sal_uInt16 nSdPageNum, sal_Bool bSelect );
- void SelectAllSlides( sal_Bool bSelect );
-
- void MoveFocus( SlideViewFocusMove eMove );
- sal_uInt16 GetFocusPage() const;
- sal_Bool HasFocus() const;
-
- sal_uInt16 ChangePagesPerRow( sal_uInt16 nNum );
- sal_uInt16 GetPagesPerRow() const { return nPagesPerRow; }
-
- virtual void InvalidateOneWin( ::Window& rWin );
- virtual void InvalidateOneWin( ::Window& rWin, const Rectangle& rRect );
-
- void SetAllowInvalidate( sal_Bool bFlag );
- sal_Bool IsInvalidateAllowed() const;
-
- void Paint(const Rectangle& rRect, OutputDevice* pOut);
- void DrawSelectionRect(sal_uInt16 nPage);
-
- Point CalcPagePos( sal_uInt16 nPageNo ) const;
- Rectangle GetPageArea( sal_uInt16 nPageNo ) const;
- sal_uLong GetPageGap() const;
- Rectangle GetFadeIconArea( sal_uInt16 nPageNo ) const;
- SdPage* GetHitPage( const Point& rPos ) const;
- SdPage* GetFadePage( const Point& rPos ) const;
- SdPage* GetNearestPage( const Point& rPos ) const;
-
- void DeleteMarked();
- void MoveMarked( sal_uInt16 nTargetPage );
-
- void AddToCache( SdPage* pPage, const Bitmap& rBitmap, long nZoom );
- const GraphicObject* GetFromCache( SdPage* pPage, long& rZoom, long nZoomTolerance ) const;
-
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
- virtual void DoCut( ::Window* pWindow = NULL );
- virtual void DoCopy( ::Window* pWindow = NULL );
- virtual void DoPaste( ::Window* pWindow = NULL );
-
- virtual void StartDrag( const Point& rDragPt, ::Window* pWindow );
- virtual void DragFinished( sal_Int8 nDropAction );
-
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper,
- ::sd::Window* pTargetWindow = NULL,
- sal_uInt16 nPage = SDRPAGE_NOTFOUND,
- sal_uInt16 nLayer = SDRPAGE_NOTFOUND );
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper,
- ::sd::Window* pTargetWindow = NULL,
- sal_uInt16 nPage = SDRPAGE_NOTFOUND,
- sal_uInt16 nLayer = SDRPAGE_NOTFOUND );
-
- void UpdateAllPages();
-
-private:
- Timer aDelayedPaintTimer;
- List aDelayedPaints;
- SlideViewShell* pSlideViewShell;
- BitmapCache* pCache;
- VirtualDevice* mpVDev;
- sal_uInt16 nAllowInvalidateSmph;
- sal_uInt16 nPagesPerRow;
- sal_uInt16 nFocusPage;
- sal_Bool bInPaint;
- sal_Bool bInDelayedPaint;
-
- DECL_LINK( PaintDelayed, Timer * );
- void CreateSlideTransferable (::Window* pWindow, sal_Bool bDrag);
-};
-
-} // end of namespace sd
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/SlideViewShell.hxx b/sd/source/ui/inc/SlideViewShell.hxx
deleted file mode 100644
index 9628885..0000000
--- a/sd/source/ui/inc/SlideViewShell.hxx
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SD_SLIDE_VIEW_SHELL_HXX
-#define SD_SLIDE_VIEW_SHELL_HXX
-
-
-#include "ViewShell.hxx"
-#include "SlideView.hxx"
-#include <sfx2/viewfac.hxx>
-#include <sfx2/viewsh.hxx>
-
-
-
-class SdPage;
-
-
-
-namespace sd {
-
-class SdUnoSlideView;
-class Window;
-
-/** Show an overview over the slides in an Impress document and allow
- some high level editing i.e. editing of the order in a show, not
- the contents of the slides.
-*/
-class SlideViewShell
- : public ViewShell
-{
-public:
-
- TYPEINFO();
-
- SFX_DECL_VIEWFACTORY(SlideViewShell);
- SFX_DECL_INTERFACE(SD_IF_SDSLIDEVIEWSHELL)
-
- /** Create a new view shell for the slide view.
- @param rViewShellBase
- The new object will be stacked on this view shell base.
- @param pFrameView
- The frame view that makes it possible to pass information from
- one view shell to the next.
- */
- SlideViewShell(SfxViewFrame* pFrame,
- ViewShellBase& rViewShellBase,
- ::Window* pParentWindow,
- FrameView* pFrameView = NULL);
-
- SlideViewShell(SfxViewFrame *pFrame,
- ::Window* pParentWindow,
- const SlideViewShell& rShell);
-
- virtual ~SlideViewShell (void);
-
- virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin);
-
- /** Arrange and resize the GUI elements like rulers, sliders, and
- buttons as well as the actual document view according to the size of
- the enclosing window and current sizes of buttons, rulers, and
- sliders.
- */
- virtual void ArrangeGUIElements (void);
- virtual void AddWindow(::sd::Window* pWin) { pSlideView->AddWindowToPaintView((OutputDevice*) pWin); }
- virtual void RemoveWindow(::sd::Window* pWin) { pSlideView->DeleteWindowFromPaintView((OutputDevice*) pWin); }
-
- virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin);
- virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin);
- virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin);
- virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin);
- virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin);
-
- virtual SdPage* GetActualPage();
-
- /** @returns
- current or selected page or 0.
- */
- virtual SdPage* getCurrentPage() const;
-
- void ExecCtrl(SfxRequest &rReq);
- void GetCtrlState(SfxItemSet &rSet);
- void GetMenuState(SfxItemSet &rSet);
- void GetAttrState(SfxItemSet &rSet);
-
- void SetPagesPerRow( sal_uInt16 nPagesPerRow );
-
- void ExecStatusBar(SfxRequest& rReq);
- void GetStatusBarState(SfxItemSet& rSet);
-
- void FuTemporary(SfxRequest &rReq);
- void FuPermanent(SfxRequest &rReq);
- void FuSupport(SfxRequest &rReq);
-
- virtual void ReadFrameViewData(FrameView* pView);
- virtual void WriteFrameViewData();
-
- virtual void SetZoom(long nZoom);
- virtual void SetZoomRect(const Rectangle& rZoomRect);
-
- virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const;
-
- /** Draw the rectangle arround the specified slide that indicates whether
- the slide is selected or not. When not selected the rectangle is
- painted in the background color (WindowColor from the style settings)
- and is therefore not visible. A selected slide is painted with the
- WindowTextColor from the style settings. Painting takes place in
- all associated windows. The line- and fill color of the windows are
- restored to their original values after the rectangle is painted.
- @param nPage
- When the page number is invalid then the call is ignored.
- */
- void DrawSelectionRect( sal_uInt16 nPage );
- void DrawFocusRect( sal_uInt16 nPage );
-
- virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
- virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
-
- virtual void VisAreaChanged(const Rectangle& rRect);
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessibleDocumentView( ::sd::Window* pWindow );
-
- void SelectionHasChanged();
- void PageLayoutHasChanged();
- void FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage );
- void PageVisibilityHasChanged( sal_uInt16 nPage, sal_Bool bVisible );
-
- /** On activation the preview is turned off.
- */
- virtual void Activate (sal_Bool IsMDIActivate);
-
-protected:
- virtual Size GetOptimalSizePixel() const;
- virtual long VirtHScrollHdl(ScrollBar* pHScroll);
- virtual long VirtVScrollHdl(ScrollBar* pVHScroll);
-
-
-private:
- SlideView* pSlideView;
- Point aDisplayPos;
- Size aDisplaySize;
- sal_uInt16 nCurFocusPage;
- bool bSetInitialZoomFactor;
- bool bInitializeWinPos;
-
- void Construct(SdDrawDocument* pDoc);
- void ImplDrawFocusRect( sal_uInt16 nPage, sal_Bool bVisible );
-};
-
-} // end of namespace sd
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/fuslhide.hxx b/sd/source/ui/inc/fuslhide.hxx
deleted file mode 100644
index dcceef0..0000000
--- a/sd/source/ui/inc/fuslhide.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SD_FU_SLIDE_HIDE_HXX
-#define SD_FU_SLIDE_HIDE_HXX
-
-#include "fuslid.hxx"
-
-namespace sd {
-
-/*************************************************************************
-|*
-|* selektierte Dias in der Show zeigen / nicht zeigen
-|*
-\************************************************************************/
-
-class FuSlideHide
- : public FuSlide
-{
-public:
- TYPEINFO();
-
- static FunctionReference Create( SlideViewShell* pViewSh, ::sd::Window* pWin, SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
- virtual void DoExecute( SfxRequest& rReq );
-
-protected:
- FuSlideHide (
- ViewShell* pViewSh,
- ::sd::Window* pWin,
- ::sd::View* pView,
- SdDrawDocument* pDoc,
- SfxRequest& rReq);
- virtual ~FuSlideHide (void);
-};
-
-} // end of namespace sd
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/fuslid.hxx b/sd/source/ui/inc/fuslid.hxx
deleted file mode 100644
index 822720c..0000000
--- a/sd/source/ui/inc/fuslid.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SD_FU_SLIDE_HXX
-#define SD_FU_SLIDE_HXX
-
-#include "fupoor.hxx"
-
-class SdDrawDocument;
-
-namespace sd {
-
-class SlideView;
-class SlideViewShell;
-class Window;
-
-
-/*************************************************************************
-|*
-|* Basisklasse der Funktionen des Diamodus
-|*
-\************************************************************************/
-
-class FuSlide
- : public FuPoor
-{
-public:
- TYPEINFO();
-
- static FunctionReference Create( SlideViewShell* pViewSh, ::sd::Window* pWin, SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
-
- virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
- virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
-
- virtual void ScrollStart();
- virtual void ScrollEnd();
-
-protected:
- FuSlide (
- SlideViewShell* pViewSh,
- ::sd::Window* pWin,
- SlideView* pView,
- SdDrawDocument* pDoc,
- SfxRequest& rReq);
-
- SlideViewShell* pSlViewShell;
- SlideView* pSlView;
-};
-
-} // end of namespace sd
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index e0378d8..10e9a8f 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -53,7 +53,6 @@
#include "DrawViewShell.hxx"
#include "Window.hxx"
#include "fupoor.hxx"
-#include "fuslhide.hxx"
#include "fuzoom.hxx"
#include "fucushow.hxx"
#include "fusldlg.hxx"
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 500a4a1..34efc22 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -37,9 +37,7 @@
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
-class SdSlideViewShell;
class SdWindow;
-class SdSlideView;
class SdDrawDocument;
class Sound;
@@ -205,4 +203,4 @@ private:
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 14dec69..f4f8033 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -273,8 +273,6 @@ Outliner::~Outliner (void)
<li>When the current shell is a <type>SdOutlineViewShell</type> then
directly operate on it. No switching into other views takes place.</li>
-
- <li>For a <type>SlideViewShell</type> no action is performed.</li>
</ol>
*/
void Outliner::PrepareSpelling (void)
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 25e2190..edd742a 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -650,9 +650,8 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect)
/** If there is a valid controller then create a new instance of
- <type>AccessibleDrawDocumentView</type>. Otherwise delegate this call
- to the base class to return a default object (probably an empty
- reference).
+ <type>AccessibleDrawDocumentView</type>. Otherwise return an empty
+ reference.
*/
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index e3efe65..ceac60f 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -2077,9 +2077,8 @@ void OutlineViewShell::VisAreaChanged(const Rectangle& rRect)
}
/** If there is a valid controller then create a new instance of
- <type>AccessibleDrawDocumentView</type>. Otherwise delegate this call
- to the base class to return a default object (probably an empty
- reference).
+ <type>AccessibleDrawDocumentView</type>. Otherwise return an empty
+ reference.
*/
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
More information about the Libreoffice-commits
mailing list