mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

readme not a sufficient indicator

Browse Source 
Change-Id: Idd5cd004b873280e202b16c182356977045bdab4
Reviewed-on: https://gerrit.libreoffice.org/81993
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-11-04 10:04:25 +00:00
parent f7f4765478
commit 57aa9ea3a6
11 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/inc/uielement/FixedImageToolbarController.hxx
View File

@@ -26,7 +26,7 @@
#include <uielement/complextoolbarcontroller.hxx>
class ToolBox;
class ImageControl;
class FixedImage;
namespace framework
{
@@ -49,11 +49,11 @@ protected:
DECL_LINK(MiscOptionsChanged, LinkParamNone*, void);
private:
VclPtr<ImageControl> m_pFixedImageControl;
VclPtr<FixedImage> m_pFixedImageControl;
sal_Int16 m_eSymbolSize;
};
} // namespace framework
#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_FIXEDIMAGETOOLBARCONTROLLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
framework/source/uielement/FixedImageToolbarController.cxx
View File

@@ -25,7 +25,7 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/toolkit/imgctrl.hxx>
#include <vcl/fixed.hxx>
#include <svtools/miscopt.hxx>
#include <svtools/imgdef.hxx>
#include <framework/sfxhelperfunctions.hxx>
@@ -47,7 +47,7 @@ FixedImageToolbarController::FixedImageToolbarController(
: ComplexToolbarController(rxContext, rFrame, pToolbar, nID, aCommand)
, m_eSymbolSize(SvtMiscOptions().GetCurrentSymbolsSize())
{
m_pFixedImageControl = VclPtr<ImageControl>::Create(m_pToolbar, 0);
m_pFixedImageControl = VclPtr<FixedImage>::Create(m_pToolbar, 0);
m_pToolbar->SetItemWindow(m_nID, m_pFixedImageControl);
bool bBigImages(SvtMiscOptions().AreCurrentSymbolsLarge());

5
include/vcl/toolkit/group.hxx
View File

@@ -20,10 +20,13 @@
#ifndef INCLUDED_VCL_GROUP_HXX
#define INCLUDED_VCL_GROUP_HXX
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
#error "don't use this in new code"
#endif
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
class VCL_DLLPUBLIC GroupBox : public Control
{
private:

6
include/vcl/toolkit/imgctrl.hxx
View File

@@ -20,11 +20,13 @@
#ifndef INCLUDED_VCL_IMGCTRL_HXX
#define INCLUDED_VCL_IMGCTRL_HXX
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
#error "don't use this in new code"
#endif
#include <vcl/dllapi.h>
#include <vcl/fixed.hxx>
class VCL_DLLPUBLIC ImageControl : public FixedImage
{
private:

4
include/vcl/toolkit/morebtn.hxx
View File

@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_MOREBTN_HXX
#define INCLUDED_VCL_MOREBTN_HXX
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
#error "don't use this in new code"
#endif
#include <vcl/dllapi.h>
#include <vcl/button.hxx>
#include <memory>

4
include/vcl/toolkit/roadmap.hxx
View File

@@ -19,6 +19,10 @@
#ifndef INCLUDED_VCL_INC_ROADMAP_HXX
#define INCLUDED_VCL_INC_ROADMAP_HXX
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
#error "don't use this in new code"
#endif
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
#include <vcl/toolkit/imgctrl.hxx>

5
include/vcl/toolkit/spin.hxx
View File

@@ -20,11 +20,14 @@
#ifndef INCLUDED_VCL_SPIN_HXX
#define INCLUDED_VCL_SPIN_HXX
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
#error "don't use this in new code"
#endif
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
#include <vcl/timer.hxx>
class VCL_DLLPUBLIC SpinButton : public Control
{
private:

4
include/vcl/toolkit/tabdlg.hxx
View File

@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_TABDLG_HXX
#define INCLUDED_VCL_TABDLG_HXX
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
#error "don't use this in new code"
#endif
#include <vcl/dllapi.h>
#include <vcl/dialog.hxx>

4
include/vcl/toolkit/throbber.hxx
View File

@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_THROBBER_HXX
#define INCLUDED_VCL_THROBBER_HXX
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
#error "don't use this in new code"
#endif
#include <vcl/dllapi.h>
#include <vcl/toolkit/imgctrl.hxx>
#include <vcl/timer.hxx>

4
include/vcl/toolkit/unowrap.hxx
View File

@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_UNOWRAP_HXX
#define INCLUDED_VCL_UNOWRAP_HXX
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
#error "don't use this in new code"
#endif
#include <com/sun/star/uno/Reference.h>
#include <vcl/dllapi.h>
#include <vcl/vclptr.hxx>

8
vcl/workben/svpclient.cxx
View File

@@ -25,14 +25,13 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/awt/ImageScaleMode.hpp>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/toolkit/imgctrl.hxx>
#include <vcl/fixed.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/graph.hxx>
@@ -96,7 +95,7 @@ class MyWin : public WorkWindow
{
VclPtr<PushButton> m_aListButton;
VclPtr<ListBox> m_aSvpBitmaps;
VclPtr<ImageControl> m_aImage;
VclPtr<FixedImage> m_aImage;
VclPtr<PushButton> m_aQuitButton;
public:
MyWin( vcl::Window* pParent, WinBits nWinStyle );
@@ -126,7 +125,7 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
WorkWindow( pParent, nWinStyle ),
m_aListButton(VclPtr<PushButton>::Create(this, 0)),
m_aSvpBitmaps(VclPtr<ListBox>::Create(this, WB_BORDER)),
m_aImage(VclPtr<ImageControl>::Create(this, WB_BORDER)),
m_aImage(VclPtr<FixedImage>::Create(this, WB_BORDER)),
m_aQuitButton(VclPtr<PushButton>::Create(this, 0))
{
m_aListButton->SetPosSizePixel( Point( 10, 10 ), Size( 120, 25 ) );
@@ -139,7 +138,6 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
m_aSvpBitmaps->Show();
m_aImage->SetPosSizePixel( Point( 170, 10 ), Size( 400, 400 ) );
m_aImage->SetScaleMode( css::awt::ImageScaleMode::NONE );
m_aImage->Show();
m_aQuitButton->SetPosSizePixel( Point( 10, 300 ), Size( 120,25 ) );