diff options
Diffstat (limited to 'framework/source/layoutmanager/toolbarlayoutmanager.hxx')
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.hxx | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 96edbe157742..629f50b2b4a2 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -17,12 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX -#define INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX +#pragma once -/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble - with solaris headers ... -*/ +#include <sal/config.h> + +#include <string_view> #include <vector> #include <uiconfiguration/globalsettings.hxx> @@ -57,8 +56,8 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW PREVIEWFRAME_YES }; - ToolbarLayoutManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::ui::XUIElementFactory >& xUIElementFactory, + ToolbarLayoutManager( css::uno::Reference< css::uno::XComponentContext > xContext, + css::uno::Reference< css::ui::XUIElementFactory > xUIElementFactory, LayoutManager* pParentLayouter ); virtual ~ToolbarLayoutManager() override; @@ -68,7 +67,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW const css::uno::Reference< css::ui::XUIConfigurationManager >& xDocCfgMgr, const css::uno::Reference< css::container::XNameAccess >& xPersistentWindowState ); - void setParentWindow( const css::uno::Reference< css::awt::XWindowPeer >& xParentWindow ); + void setParentWindow( const css::uno::Reference< css::awt::XVclWindowPeer >& xParentWindow ); void setDockingAreaOffsets(const ::tools::Rectangle& rOffsets); void resetDockingArea(); @@ -88,7 +87,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW bool requestToolbar( const OUString& rResourceURL ); bool createToolbar( const OUString& rResourceURL ); - bool destroyToolbar( const OUString& rResourceURL ); + bool destroyToolbar( std::u16string_view rResourceURL ); // visibility bool showToolbar( std::u16string_view rResourceURL ); @@ -116,13 +115,15 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW css::uno::Reference< css::ui::XUIElement > getToolbar( std::u16string_view aName ); css::uno::Sequence< css::uno::Reference< css::ui::XUIElement > > getToolbars(); + void updateToolbarsTips(); + // child window notifications void childWindowEvent( VclSimpleEvent const * pEvent ); // XInterface - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; // XEventListener @@ -183,7 +184,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW ::tools::Rectangle implts_calcDockingArea(); void implts_sortUIElements(); void implts_reparentToolbars(); - OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const; + static OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ); void implts_setElementData( UIElement& rUIElement, const css::uno::Reference< css::awt::XDockableWindow >& rDockWindow ); void implts_destroyDockingAreaWindows(); @@ -213,9 +214,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW // internal docking methods - ::tools::Rectangle implts_calcHotZoneRect( const ::tools::Rectangle& rRect, sal_Int32 nHotZoneOffset ); + static ::tools::Rectangle implts_calcHotZoneRect( const ::tools::Rectangle& rRect, sal_Int32 nHotZoneOffset ); void implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::tools::Rectangle& rTrackingRect, const Point& rMousePos ); - DockingOperation implts_determineDockingOperation( css::ui::DockingArea DockingArea, const ::tools::Rectangle& rRowColRect, const Point& rMousePos ); + static DockingOperation implts_determineDockingOperation( css::ui::DockingArea DockingArea, const ::tools::Rectangle& rRowColRect, const Point& rMousePos ); ::tools::Rectangle implts_getWindowRectFromRowColumn( css::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, std::u16string_view rExcludeElementName ); ::tools::Rectangle implts_determineFrontDockingRect( css::ui::DockingArea eDockingArea, sal_Int32 nRowCol, @@ -232,7 +233,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW void implts_getDockingAreaElementInfos( css::ui::DockingArea DockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData ); void implts_getDockingAreaElementInfoOnSingleRowCol( css::ui::DockingArea, sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData ); void implts_findNextDockingPos( css::ui::DockingArea DockingArea, const ::Size& aUIElementSize, css::awt::Point& rVirtualPos, ::Point& rPixelPos ); - void implts_setTrackingRect( css::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::tools::Rectangle& rTrackingRect ); + static void implts_setTrackingRect( css::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::tools::Rectangle& rTrackingRect ); // creation methods @@ -281,6 +282,4 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW } // namespace framework -#endif // INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |