summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/console/PresenterPaneBorderPainter.cxx31
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx2
-rw-r--r--sd/source/ui/inc/Window.hxx2
-rw-r--r--sd/source/ui/slideshow/showwin.cxx3
-rw-r--r--sd/source/ui/slideshow/showwindow.hxx3
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx7
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx8
-rw-r--r--sd/source/ui/view/sdwindow.cxx3
8 files changed, 15 insertions, 44 deletions
diff --git a/sd/source/console/PresenterPaneBorderPainter.cxx b/sd/source/console/PresenterPaneBorderPainter.cxx
index 056c76b7d44c..697a0f78b033 100644
--- a/sd/source/console/PresenterPaneBorderPainter.cxx
+++ b/sd/source/console/PresenterPaneBorderPainter.cxx
@@ -122,8 +122,6 @@ private:
Reference<rendering::XCanvas> mxCanvas;
css::rendering::ViewState maViewState;
Reference<rendering::XPolyPolygon2D> mxViewStateClip;
- bool mbHasCallout;
- awt::Point maCalloutAnchor;
void PaintBitmap(
const awt::Rectangle& rBox,
@@ -300,8 +298,7 @@ void PresenterPaneBorderPainter::ThrowIfDisposed() const
PresenterPaneBorderPainter::Renderer::Renderer(std::shared_ptr<PresenterTheme> xTheme)
: mpTheme(std::move(xTheme)),
- maViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), nullptr),
- mbHasCallout(false)
+ maViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), nullptr)
{
}
@@ -350,29 +347,9 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder (
pTopLeft->mnYOffset, pBottomLeft->mnYOffset, true, pLeft);
PaintBitmap(aCenterBox, rUpdateBox, +1,0,
pTopRight->mnYOffset, pBottomRight->mnYOffset, true, pRight);
- if (mbHasCallout && pStyle->mpBottomCallout->GetNormalBitmap().is())
- {
- const sal_Int32 nCalloutWidth (pStyle->mpBottomCallout->mnWidth);
- sal_Int32 nCalloutX (maCalloutAnchor.X - pStyle->mpBottomCallout->mnXHotSpot
- - (aCenterBox.X - aOuterBox.X));
- if (nCalloutX < pBottomLeft->mnXOffset + aCenterBox.X)
- nCalloutX = pBottomLeft->mnXOffset + aCenterBox.X;
- if (nCalloutX > pBottomRight->mnXOffset + aCenterBox.X + aCenterBox.Width)
- nCalloutX = pBottomRight->mnXOffset + aCenterBox.X + aCenterBox.Width;
- // Paint bottom callout.
- PaintBitmap(aCenterBox, rUpdateBox, 0,+1, nCalloutX,0, false, pStyle->mpBottomCallout);
- // Paint regular bottom bitmap left and right.
- PaintBitmap(aCenterBox, rUpdateBox, 0,+1,
- pBottomLeft->mnXOffset, nCalloutX-aCenterBox.Width, true, pBottom);
- PaintBitmap(aCenterBox, rUpdateBox, 0,+1,
- nCalloutX+nCalloutWidth, pBottomRight->mnXOffset, true, pBottom);
- }
- else
- {
- // Stretch the bottom bitmap over the full width.
- PaintBitmap(aCenterBox, rUpdateBox, 0,+1,
- pBottomLeft->mnXOffset, pBottomRight->mnXOffset, true, pBottom);
- }
+ // Stretch the bottom bitmap over the full width.
+ PaintBitmap(aCenterBox, rUpdateBox, 0,+1,
+ pBottomLeft->mnXOffset, pBottomRight->mnXOffset, true, pBottom);
// Paint the corners.
PaintBitmap(aCenterBox, rUpdateBox, -1,-1, 0,0, false, pTopLeft);
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 68abaa7933bb..a4e86d7bdb53 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2894,7 +2894,7 @@ void AnimationImporter::dump( Any& rAny )
{
if( aEvent.Trigger != EventTrigger::NONE )
{
- static const char* triggers[] =
+ static const char* const triggers[] =
{
"none","onbegin","onend","begin",
"end","onclick","ondoubleclick","onmouseenter",
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 9763f24e8895..3fd605052433 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -190,7 +190,7 @@ protected:
The returned reference is empty if an accessible object could
not be created.
*/
- virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
+ rtl::Reference<comphelper::OAccessible> CreateAccessible() override;
OUString GetSurroundingText() const override;
Selection GetSurroundingTextSelection() const override;
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index c932d29abb2f..816ccfc3f11c 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -614,8 +614,7 @@ void ShowWindow::AddWindowToPaintView()
}
// Override the sd::Window's CreateAccessible to create a different accessible object
-css::uno::Reference<css::accessibility::XAccessible>
- ShowWindow::CreateAccessible()
+rtl::Reference<comphelper::OAccessible> ShowWindow::CreateAccessible()
{
if (mpViewShell != nullptr)
{
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index c7a1d9bf0261..142db985d0b6 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -72,8 +72,7 @@ public:
virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override;
/// Override the sd::Window's CreateAccessible to create a different accessible object
- virtual css::uno::Reference<css::accessibility::XAccessible>
- CreateAccessible() override;
+ rtl::Reference<comphelper::OAccessible> CreateAccessible() override;
void TerminateShow();
void RestartShow();
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 51e6be5e6650..4d5e8ef107c9 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -805,9 +805,8 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString&
if ( ! pWindow)
return;
- css::uno::Reference< css::accessibility::XAccessible >
- xAccessible (pWindow->GetAccessible(false));
- if ( ! xAccessible.is())
+ rtl::Reference<comphelper::OAccessible> pAccessible = pWindow->GetAccessible(false);
+ if (!pAccessible.is())
return;
// Now comes a small hack. We assume that the accessible object is
@@ -821,7 +820,7 @@ void SlideSorterController::PageNameHasChanged (int nPageIndex, const OUString&
// However, the dynamic cast together with the check of the result
// being NULL should be safe enough.
::accessibility::AccessibleSlideSorterView* pAccessibleView
- = dynamic_cast< ::accessibility::AccessibleSlideSorterView*>(xAccessible.get());
+ = dynamic_cast<::accessibility::AccessibleSlideSorterView*>(pAccessible.get());
if (pAccessibleView == nullptr)
return;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 07276f3f9c08..b4b7a8905b70 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -150,11 +150,9 @@ SlideSorterViewShell::~SlideSorterViewShell()
::sd::Window* pWindow = GetActiveWindow();
if (pWindow!=nullptr)
{
- css::uno::Reference<css::lang::XComponent> xComponent (
- pWindow->GetAccessible(false),
- css::uno::UNO_QUERY);
- if (xComponent.is())
- xComponent->dispose();
+ rtl::Reference<comphelper::OAccessible> pAccessible = pWindow->GetAccessible(false);
+ if (pAccessible.is())
+ pAccessible->dispose();
}
}
catch( css::uno::Exception& )
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index d377ca825883..773778677083 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -954,8 +954,7 @@ void Window::DropScroll(const Point& rMousePos)
}
}
-css::uno::Reference<css::accessibility::XAccessible>
- Window::CreateAccessible()
+rtl::Reference<comphelper::OAccessible> Window::CreateAccessible()
{
// If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later.
if (dynamic_cast< PresentationViewShell *>( mpViewShell ))
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-24 10:07:10 +0000