diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-04-23 15:04:36 +0300 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-04-23 19:50:15 +0300 |
commit | fb698d5e81c8b4149c092305506d40e2f7ef7f5d (patch) | |
tree | 7d4cc743d6fe75f628e974a1144379a7f6c563c9 /include | |
parent | tdf#95845 Use CommandInfoProvider (diff) | |
download | core-fb698d5e81c8b4149c092305506d40e2f7ef7f5d.tar.gz core-fb698d5e81c8b4149c092305506d40e2f7ef7f5d.zip |
Replace GetImage with CommandInfoProvider::GetImageForCommand
And move ToolBoxButtonSize->ImageType mapping code to a
common place.
Change-Id: If158f4b6f2750054fcf64491c2941706e7d3a329
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/imagemgr.hxx | 39 | ||||
-rw-r--r-- | include/sfx2/tbxctrl.hxx | 3 | ||||
-rw-r--r-- | include/vcl/toolbox.hxx | 1 |
3 files changed, 1 insertions, 42 deletions
diff --git a/include/sfx2/imagemgr.hxx b/include/sfx2/imagemgr.hxx deleted file mode 100644 index 36f914c53cdf..000000000000 --- a/include/sfx2/imagemgr.hxx +++ /dev/null @@ -1,39 +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_IMAGEMGR_HXX -#define INCLUDED_SFX2_IMAGEMGR_HXX - -#include <sal/config.h> -#include <sfx2/dllapi.h> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/frame/XFrame.hpp> - -#include <rtl/ustring.hxx> -#include <vcl/image.hxx> - -SFX2_DLLPUBLIC Image SAL_CALL GetImage( - const css::uno::Reference< css::frame::XFrame >& rFrame, - const OUString& aURL, - bool bBig -); - -#endif // INCLUDED_SFX2_IMAGEMGR_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index caa0cfe9bfad..e6002abb8001 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -157,9 +157,6 @@ protected: // Must be called by subclass to set a new popup window instance void SetPopupWindow( SfxPopupWindow* pWindow ); - // helper methods - bool hasBigImages() const; - public: // XComponent virtual void SAL_CALL dispose() override; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index a200557a4a2f..650fe127f55c 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -336,6 +336,7 @@ public: // sets a fixed button size (small, large or dontcare (==autosize)) void SetToolboxButtonSize( ToolBoxButtonSize eSize ); ToolBoxButtonSize GetToolboxButtonSize() const; + vcl::ImageType GetImageSize() const; void SetAlign( WindowAlign eNewAlign = WindowAlign::Top ); WindowAlign GetAlign() const { return meAlign; } |