offapi/UnoApi_offapi.mk | 2 offapi/com/sun/star/drawing/framework/BorderType.idl | 35 -- offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl | 142 ---------- sd/source/console/PresenterPaneBase.cxx | 2 sd/source/console/PresenterPaneBase.hxx | 1 sd/source/console/PresenterPaneBorderPainter.cxx | 46 +-- sd/source/console/PresenterPaneBorderPainter.hxx | 147 ++++++++--- sd/source/console/PresenterSlideSorter.cxx | 2 sd/source/console/PresenterWindowManager.cxx | 6 9 files changed, 138 insertions(+), 245 deletions(-)
New commits: commit 29d467dd807b01baf458e8183753a9adb599849d Author: Noel Grandin <[email protected]> AuthorDate: Sun Jun 15 15:30:50 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Jun 17 22:11:34 2025 +0200 [API CHANGE] Remove some sd-console IDL interfaces which are unnecessary, we already instantiate and use these classes directly. Change-Id: Iab99a3c1d109badddcea84932e79b6f966ca75ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186586 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index ff9a81cb04f1..0a454103f36c 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2389,7 +2389,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing,\ )) $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\ AnchorBindingMode \ - BorderType \ ConfigurationChangeEvent \ ResourceActivationMode \ TabBarButton \ @@ -2403,7 +2402,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/drawing/framework,\ XModuleController \ XPane \ XPane2 \ - XPaneBorderPainter \ XRelocatableResource \ XResource \ XResourceFactory \ diff --git a/offapi/com/sun/star/drawing/framework/BorderType.idl b/offapi/com/sun/star/drawing/framework/BorderType.idl deleted file mode 100644 index dff66b0cdebf..000000000000 --- a/offapi/com/sun/star/drawing/framework/BorderType.idl +++ /dev/null @@ -1,35 +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 . - */ - - -module com { module sun { module star { module drawing { module framework { - -/** See XPaneBorderPainter and its addBorder() and removeBorder() methods - for an explanation of the border type and its values. -*/ -enum BorderType -{ - INNER_BORDER, - OUTER_BORDER, - TOTAL_BORDER -}; - -}; }; }; }; }; // ::com::sun::star::drawing::framework - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl b/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl deleted file mode 100644 index 19f9cd7633e5..000000000000 --- a/offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl +++ /dev/null @@ -1,142 +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 . - */ - -module com { module sun { module star { module drawing { module framework { - -/** Paint the border around a rectangular region, typically a pane. - - <p>Calling objects have to be able to derive inner bounding boxes of the - border from the outer ones and inner ones from outer ones. This - conversion and the painting of the border involves three rectangles. - The inner and outer bounding box of the border. This is a logical - bounding box which the paint methods may paint over. The center box is - the third rectangle. This is the actual border between outer and inner - background color or bitmap and it is used for placing the bitmaps that are used - paint the border. The inner sides and corners are places relative to - this center box, i.e. when not further offsets are given then the upper - left corner bitmap is painted with its lower right at the upper left of - the center box.</p> -*/ -interface XPaneBorderPainter -{ - /** Enlarge the given rectangle by the size of the specified part of the - border. This method can be used to convert an inner bounding box - into the center box or the outer bounding box. - @param sPaneBorderStyleName - The pane style defines the sizes of the border. - @param aRectangle - This rectangle will be converted into a larger one. This should - be the center box or the inner bounding box of the border. - @param eBorderType - The part of the border to add to the given rectangle. - Use INNER_BORDER to convert an inner bounding box into the - center box or TOTAL_BORDER to convert it into the outer bounding - box. OUTER_BORDER can be used to convert the center box into - the outer bounding box. - */ - ::com::sun::star::awt::Rectangle addBorder ( - [in] string sPaneBorderStyleName, - [in] ::com::sun::star::awt::Rectangle aRectangle, - [in] BorderType eBorderType); - - /** Shrink the given rectangle by the size of the specified part of the - border. This method can be used to convert an outer bounding box - into the center box or the inner bounding box. - @param sPaneBorderStyleName - The pane style defines the sizes of the border. - @param aRectangle - This rectangle will be converted into a smaller one that lies - inside it. It should be the center box or the outer bounding - box of the border. - @param eBorderType - The part of the border to remove from the given rectangle. - Use OUTER_BORDER to convert an outer bounding box into the - center box or TOTAL_BORDER to convert it into the inner bounding - box. INNER_BORDER can be used to convert the center box into - the inner bounding box. - */ - ::com::sun::star::awt::Rectangle removeBorder ( - [in] string sPaneBorderStyleName, - [in] ::com::sun::star::awt::Rectangle aRectangle, - [in] BorderType eBorderType); - - /** Paint the border around a pane. - @param sPaneBorderStyleName - The pane style to use for painting the border. - @param xCanvas - The canvas onto which the border is painted. - @param aOuterBorderRectangle - The outer bounding box of the border. Use addBorder to convert - the bounding box of a pane (the inner bounding box of the - border) into this outer bounding box of the border. - @param aRepaintArea - The area in which the border has to be repainted. The clip - rectangle. - @param sTitle - The pane title. Supply an empty string for panes without - title. It is the responsibility of the caller to supply a title - only for pane border styles that support a title. - */ - void paintBorder ( - [in] string sPaneBorderStyleName, - [in] ::com::sun::star::rendering::XCanvas xCanvas, - [in] ::com::sun::star::awt::Rectangle aOuterBorderRectangle, - [in] ::com::sun::star::awt::Rectangle aRepaintArea, - [in] string sTitle); - - /** Paint the border around a pane where the border includes a call out - that is anchored at the given point. Most arguments have the same - meaning as in the paintBorder(). - - @see paintBorder - - @param sPaneBorderStyleName - See description in #paintBorder. - @param xCanvas - See description in #paintBorder. - @param aOuterBorderRectangle - See description in #paintBorder. - @param aRepaintArea - See description in #paintBorder. - @param sTitle - See description in #paintBorder. - @param aCalloutAnchor - The anchor point of the call out. It is usually located outside - the border. - */ - void paintBorderWithCallout ( - [in] string sPaneBorderStyleName, - [in] ::com::sun::star::rendering::XCanvas xCanvas, - [in] ::com::sun::star::awt::Rectangle aOuterBorderRectangle, - [in] ::com::sun::star::awt::Rectangle aRepaintArea, - [in] string sTitle, - [in] ::com::sun::star::awt::Point aCalloutAnchor); - - /** Return the offset of a call out anchor with respect to the outer - border. This value is used when the call out is realized by a fixed - bitmap in order to determine the size and/or location of the outer - border for a given call out. - */ - ::com::sun::star::awt::Point getCalloutOffset ( - [in] string sPaneBorderStyleName); -}; - -}; }; }; }; }; // ::com::sun::star::drawing::framework - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/console/PresenterPaneBase.cxx b/sd/source/console/PresenterPaneBase.cxx index aa9daf666eb3..545e38b2df3b 100644 --- a/sd/source/console/PresenterPaneBase.cxx +++ b/sd/source/console/PresenterPaneBase.cxx @@ -236,7 +236,7 @@ void PresenterPaneBase::LayoutContextWindow() const awt::Rectangle aInnerBox (mxBorderPainter->removeBorder( mxPaneId->getResourceURL(), aBorderBox, - drawing::framework::BorderType_TOTAL_BORDER)); + sdext::presenter::BorderType::TOTAL)); mxContentWindow->setPosSize( aInnerBox.X - aBorderBox.X, aInnerBox.Y - aBorderBox.Y, diff --git a/sd/source/console/PresenterPaneBase.hxx b/sd/source/console/PresenterPaneBase.hxx index 746be4ac9b0e..fdb2bb1a4fba 100644 --- a/sd/source/console/PresenterPaneBase.hxx +++ b/sd/source/console/PresenterPaneBase.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> -#include <com/sun/star/drawing/framework/XPaneBorderPainter.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <rtl/ref.hxx> diff --git a/sd/source/console/PresenterPaneBorderPainter.cxx b/sd/source/console/PresenterPaneBorderPainter.cxx index 4fa270b2b43e..f98d9006e39a 100644 --- a/sd/source/console/PresenterPaneBorderPainter.cxx +++ b/sd/source/console/PresenterPaneBorderPainter.cxx @@ -58,10 +58,10 @@ namespace { awt::Rectangle AddBorder ( const awt::Rectangle& rBox, - drawing::framework::BorderType eBorderType) const; + BorderType eBorderType) const; awt::Rectangle RemoveBorder ( const awt::Rectangle& rBox, - drawing::framework::BorderType eBorderType) const; + BorderType eBorderType) const; Reference<rendering::XCanvasFont> GetFont ( const Reference<rendering::XCanvas>& rxCanvas) const; @@ -151,12 +151,10 @@ PresenterPaneBorderPainter::~PresenterPaneBorderPainter() { } -//----- XPaneBorderPainter ---------------------------------------------------- - -awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( +awt::Rectangle PresenterPaneBorderPainter::addBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, - drawing::framework::BorderType eBorderType) + BorderType eBorderType) { ThrowIfDisposed(); @@ -165,10 +163,10 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( return AddBorder(rsPaneBorderStyleName, rRectangle, eBorderType); } -awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( +awt::Rectangle PresenterPaneBorderPainter::removeBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, - drawing::framework::BorderType eBorderType) + BorderType eBorderType) { ThrowIfDisposed(); @@ -177,7 +175,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( return RemoveBorder(rsPaneBorderStyleName, rRectangle, eBorderType); } -void SAL_CALL PresenterPaneBorderPainter::paintBorder ( +void PresenterPaneBorderPainter::paintBorder ( const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, @@ -211,7 +209,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder ( rsPaneBorderStyleName); } -void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( +void PresenterPaneBorderPainter::paintBorderWithCallout ( const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, @@ -247,7 +245,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( rsPaneBorderStyleName); } -awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset ( +awt::Point PresenterPaneBorderPainter::getCalloutOffset ( const OUString& rsPaneBorderStyleName) { ThrowIfDisposed(); @@ -323,7 +321,7 @@ void PresenterPaneBorderPainter::SetTheme (const std::shared_ptr<PresenterTheme> awt::Rectangle PresenterPaneBorderPainter::AddBorder ( const OUString& rsPaneURL, const awt::Rectangle& rInnerBox, - const css::drawing::framework::BorderType eBorderType) const + const BorderType eBorderType) const { if (mpRenderer != nullptr) { @@ -337,7 +335,7 @@ awt::Rectangle PresenterPaneBorderPainter::AddBorder ( awt::Rectangle PresenterPaneBorderPainter::RemoveBorder ( const OUString& rsPaneURL, const css::awt::Rectangle& rOuterBox, - const css::drawing::framework::BorderType eBorderType) const + const BorderType eBorderType) const { if (mpRenderer != nullptr) { @@ -391,9 +389,9 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder ( awt::Rectangle aOuterBox (rBBox); awt::Rectangle aCenterBox ( - pStyle->RemoveBorder(aOuterBox, drawing::framework::BorderType_OUTER_BORDER)); + pStyle->RemoveBorder(aOuterBox, BorderType::OUTER)); awt::Rectangle aInnerBox ( - pStyle->RemoveBorder(aOuterBox, drawing::framework::BorderType_TOTAL_BORDER)); + pStyle->RemoveBorder(aOuterBox, BorderType::TOTAL)); // Prepare references for all used bitmaps. SharedBitmapDescriptor pTop (pStyle->mpTop); @@ -660,7 +658,7 @@ void PresenterPaneBorderPainter::Renderer::SetupClipping ( else { awt::Rectangle aInnerBox ( - pStyle->RemoveBorder(rOuterBox, drawing::framework::BorderType_TOTAL_BORDER)); + pStyle->RemoveBorder(rOuterBox, BorderType::TOTAL)); ::std::vector<awt::Rectangle> aRectangles { PresenterGeometryHelper::Intersection(rUpdateBox, rOuterBox), @@ -755,18 +753,18 @@ RendererPaneStyle::RendererPaneStyle ( awt::Rectangle RendererPaneStyle::AddBorder ( const awt::Rectangle& rBox, - const drawing::framework::BorderType eBorderType) const + const BorderType eBorderType) const { const BorderSize* pBorderSize = nullptr; switch (eBorderType) { - case drawing::framework::BorderType_INNER_BORDER: + case BorderType::INNER: pBorderSize = &maInnerBorderSize; break; - case drawing::framework::BorderType_OUTER_BORDER: + case BorderType::OUTER: pBorderSize = &maOuterBorderSize; break; - case drawing::framework::BorderType_TOTAL_BORDER: + case BorderType::TOTAL: pBorderSize = &maTotalBorderSize; break; default: @@ -781,18 +779,18 @@ awt::Rectangle RendererPaneStyle::AddBorder ( awt::Rectangle RendererPaneStyle::RemoveBorder ( const awt::Rectangle& rBox, - const css::drawing::framework::BorderType eBorderType) const + const BorderType eBorderType) const { const BorderSize* pBorderSize = nullptr; switch (eBorderType) { - case drawing::framework::BorderType_INNER_BORDER: + case BorderType::INNER: pBorderSize = &maInnerBorderSize; break; - case drawing::framework::BorderType_OUTER_BORDER: + case BorderType::OUTER: pBorderSize = &maOuterBorderSize; break; - case drawing::framework::BorderType_TOTAL_BORDER: + case BorderType::TOTAL: pBorderSize = &maTotalBorderSize; break; default: diff --git a/sd/source/console/PresenterPaneBorderPainter.hxx b/sd/source/console/PresenterPaneBorderPainter.hxx index b03d4a120a5d..a32737403462 100644 --- a/sd/source/console/PresenterPaneBorderPainter.hxx +++ b/sd/source/console/PresenterPaneBorderPainter.hxx @@ -21,8 +21,8 @@ #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEBORDERPAINTER_HXX #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/drawing/framework/XPaneBorderPainter.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> @@ -32,12 +32,31 @@ namespace sdext::presenter { class PresenterTheme; -typedef ::cppu::WeakComponentImplHelper< - css::drawing::framework::XPaneBorderPainter -> PresenterPaneBorderPainterInterfaceBase; +/** See PresenterPaneBorderPainter and its addBorder() and removeBorder() methods + for an explanation of the border type and its values. +*/ +enum class BorderType +{ + INNER, + OUTER, + TOTAL +}; -/** This class is responsible for painting window borders of PresenterPane - objects. +typedef ::cppu::WeakComponentImplHelper<> PresenterPaneBorderPainterInterfaceBase; + +/** Paint the border around a rectangular region, typically a pane. + + <p>Calling objects have to be able to derive inner bounding boxes of the + border from the outer ones and inner ones from outer ones. This + conversion and the painting of the border involves three rectangles. + The inner and outer bounding box of the border. This is a logical + bounding box which the paint methods may paint over. The center box is + the third rectangle. This is the actual border between outer and inner + background color or bitmap and it is used for placing the bitmaps that are used + paint the border. The inner sides and corners are places relative to + this center box, i.e. when not further offsets are given then the upper + left corner bitmap is painted with its lower right at the upper left of + the center box.</p> */ class PresenterPaneBorderPainter : protected ::cppu::BaseMutex, @@ -50,32 +69,46 @@ public: PresenterPaneBorderPainter(const PresenterPaneBorderPainter&) = delete; PresenterPaneBorderPainter& operator=(const PresenterPaneBorderPainter&) = delete; - /** Transform the bounding box of the window content to the outer - bounding box of the border that is painted around it. - @param rsPaneURL - Specifies the pane style that is used to determine the border sizes. - @param rInnerBox - The rectangle of the inner window content. + /** Enlarge the given rectangle by the size of the specified part of the + border. This method can be used to convert an inner bounding box + into the center box or the outer bounding box. + @param sPaneBorderStyleName + The pane style defines the sizes of the border. + @param aRectangle + This rectangle will be converted into a larger one. This should + be the center box or the inner bounding box of the border. + @param eBorderType + The part of the border to add to the given rectangle. + Use INNER_BORDER to convert an inner bounding box into the + center box or TOTAL_BORDER to convert it into the outer bounding + box. OUTER_BORDER can be used to convert the center box into + the outer bounding box. */ css::awt::Rectangle AddBorder ( const OUString& rsPaneURL, const css::awt::Rectangle& rInnerBox, - const css::drawing::framework::BorderType eBorderType) const; - - /** Transform the outer bounding box of a window to the bounding box of - the inner content area. - @param rsPaneURL - Specifies the pane style that is used to determine the border sizes. - @param rOuterBox - The bounding box of the rectangle around the window. - @param bIsTitleVisible - This flag controls whether the upper part of the frame is - supposed to contain the window title. + const BorderType eBorderType) const; + + /** Shrink the given rectangle by the size of the specified part of the + border. This method can be used to convert an outer bounding box + into the center box or the inner bounding box. + @param sPaneBorderStyleName + The pane style defines the sizes of the border. + @param aRectangle + This rectangle will be converted into a smaller one that lies + inside it. It should be the center box or the outer bounding + box of the border. + @param eBorderType + The part of the border to remove from the given rectangle. + Use OUTER_BORDER to convert an outer bounding box into the + center box or TOTAL_BORDER to convert it into the inner bounding + box. INNER_BORDER can be used to convert the center box into + the inner bounding box. */ css::awt::Rectangle RemoveBorder ( const OUString& rsPaneURL, const css::awt::Rectangle& rOuterBox, - const css::drawing::framework::BorderType eBorderType) const; + const BorderType eBorderType) const; void SetTheme (const std::shared_ptr<PresenterTheme>& rpTheme); @@ -83,33 +116,75 @@ public: // XPaneBorderPainter - virtual css::awt::Rectangle SAL_CALL addBorder ( + css::awt::Rectangle addBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, - css::drawing::framework::BorderType eBorderType) override; + BorderType eBorderType); - virtual css::awt::Rectangle SAL_CALL removeBorder ( + css::awt::Rectangle removeBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, - css::drawing::framework::BorderType eBorderType) override; - - virtual void SAL_CALL paintBorder ( + BorderType eBorderType); + + /** Paint the border around a pane. + @param sPaneBorderStyleName + The pane style to use for painting the border. + @param xCanvas + The canvas onto which the border is painted. + @param aOuterBorderRectangle + The outer bounding box of the border. Use addBorder to convert + the bounding box of a pane (the inner bounding box of the + border) into this outer bounding box of the border. + @param aRepaintArea + The area in which the border has to be repainted. The clip + rectangle. + @param sTitle + The pane title. Supply an empty string for panes without + title. It is the responsibility of the caller to supply a title + only for pane border styles that support a title. + */ + void paintBorder ( const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const OUString& rsTitle) override; - - virtual void SAL_CALL paintBorderWithCallout ( + const OUString& rsTitle); + + /** Paint the border around a pane where the border includes a call out + that is anchored at the given point. Most arguments have the same + meaning as in the paintBorder(). + + @see paintBorder + + @param sPaneBorderStyleName + See description in #paintBorder. + @param xCanvas + See description in #paintBorder. + @param aOuterBorderRectangle + See description in #paintBorder. + @param aRepaintArea + See description in #paintBorder. + @param sTitle + See description in #paintBorder. + @param aCalloutAnchor + The anchor point of the call out. It is usually located outside + the border. + */ + void paintBorderWithCallout ( const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle, - const css::awt::Point& rCalloutAnchor) override; + const css::awt::Point& rCalloutAnchor); - virtual css::awt::Point SAL_CALL getCalloutOffset ( - const OUString& rsPaneBorderStyleName) override; + /** Return the offset of a call out anchor with respect to the outer + border. This value is used when the call out is realized by a fixed + bitmap in order to determine the size and/or location of the outer + border for a given call out. + */ + css::awt::Point getCalloutOffset ( + const OUString& rsPaneBorderStyleName); private: css::uno::Reference<css::uno::XComponentContext> mxContext; diff --git a/sd/source/console/PresenterSlideSorter.cxx b/sd/source/console/PresenterSlideSorter.cxx index 8d4b9a8dd83c..3fa3473ff435 100644 --- a/sd/source/console/PresenterSlideSorter.cxx +++ b/sd/source/console/PresenterSlideSorter.cxx @@ -632,7 +632,7 @@ void PresenterSlideSorter::UpdateLayout() xBorderPainter->addBorder ( mxViewId->getAnchor()->getResourceURL(), awt::Rectangle(0, 0, aWindowBox.Width, aWindowBox.Height), - drawing::framework::BorderType_INNER_BORDER); + BorderType::INNER); } while(false); diff --git a/sd/source/console/PresenterWindowManager.cxx b/sd/source/console/PresenterWindowManager.cxx index 99674378a34e..721fe7b6ed9d 100644 --- a/sd/source/console/PresenterWindowManager.cxx +++ b/sd/source/console/PresenterWindowManager.cxx @@ -765,7 +765,7 @@ geometry::RealRectangle2D PresenterWindowManager::LayoutToolBar() 0, PresenterGeometryHelper::Round(aSize.Width), PresenterGeometryHelper::Round(aSize.Height)), - css::drawing::framework::BorderType_TOTAL_BORDER)); + BorderType::TOTAL)); nToolBarWidth = aBox.Width; nToolBarHeight = aBox.Height; @@ -804,7 +804,7 @@ awt::Size PresenterWindowManager::CalculatePaneSize ( rsPaneURL, awt::Rectangle(0,0, sal_Int32(nOuterWidth+0.5),sal_Int32(nOuterWidth)), - drawing::framework::BorderType_TOTAL_BORDER)); + BorderType::TOTAL)); // Calculate the inner height with the help of the slide aspect ratio. const double nCurrentSlideInnerHeight ( @@ -815,7 +815,7 @@ awt::Size PresenterWindowManager::CalculatePaneSize ( rsPaneURL, awt::Rectangle(0,0, aInnerBox.Width,sal_Int32(nCurrentSlideInnerHeight+0.5)), - drawing::framework::BorderType_TOTAL_BORDER)); + BorderType::TOTAL)); return awt::Size(aOuterBox.Width, aOuterBox.Height); }
