framework/inc/uielement/FixedImageToolbarController.hxx | 6 +++---
framework/source/uielement/FixedImageToolbarController.cxx | 4 ++--
include/vcl/toolkit/group.hxx | 5 ++++-
include/vcl/toolkit/imgctrl.hxx | 6 ++++--
include/vcl/toolkit/morebtn.hxx | 4 ++++
include/vcl/toolkit/prgsbar.hxx | 4 ++++
include/vcl/toolkit/roadmap.hxx | 4 ++++
include/vcl/toolkit/spin.hxx | 5 ++++-
include/vcl/toolkit/tabdlg.hxx | 4 ++++
include/vcl/toolkit/throbber.hxx | 4 ++++
include/vcl/toolkit/unowrap.hxx | 4 ++++
solenv/clang-format/blacklist | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
toolkit/source/awt/vclxwindows.cxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/control/prgsbar.cxx | 2 +-
vcl/source/window/builder.cxx | 2 +-
vcl/workben/svpclient.cxx | 8 +++-----
18 files changed, 50 insertions(+), 20 deletions(-)
New commits:
commit 074cab391c20be872a4b5d14a342eda5c541b6fd
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 4 12:07:22 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 4 16:45:12 2019 +0100
ProgressBar now only use in vcl and toolkit
Change-Id: I5d56a4df155806e41cafa6f65a3a030e8443b8f7
Reviewed-on: https://gerrit.libreoffice.org/82005
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/prgsbar.hxx b/include/vcl/toolkit/prgsbar.hxx
similarity index 95%
rename from include/vcl/prgsbar.hxx
rename to include/vcl/toolkit/prgsbar.hxx
index 292c54a13254..9b9f251c81d2 100644
--- a/include/vcl/prgsbar.hxx
+++ b/include/vcl/toolkit/prgsbar.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_PRGSBAR_HXX
#define INCLUDED_VCL_PRGSBAR_HXX
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
+#error "don't use this in new code"
+#endif
+
#include <vcl/dllapi.h>
#include <vcl/window.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index cbc4723e32b8..081e8b37fca3 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7855,7 +7855,6 @@ include/vcl/pngread.hxx
include/vcl/pngwrite.hxx
include/vcl/popupmenuwindow.hxx
include/vcl/ppdparser.hxx
-include/vcl/prgsbar.hxx
include/vcl/print.hxx
include/vcl/prntypes.hxx
include/vcl/ptrstyle.hxx
@@ -7901,6 +7900,7 @@ include/vcl/toolkit/fixedhyper.hxx
include/vcl/toolkit/group.hxx
include/vcl/toolkit/imgctrl.hxx
include/vcl/toolkit/morebtn.hxx
+include/vcl/toolkit/prgsbar.hxx
include/vcl/toolkit/roadmap.hxx
include/vcl/toolkit/spin.hxx
include/vcl/toolkit/tabdlg.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index a32c26cc5765..c73e2fca05fd 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -90,7 +90,7 @@
#include <vcl/fixed.hxx>
#include <vcl/toolkit/fixedhyper.hxx>
#include <vcl/floatwin.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/scheduler.hxx>
#include <vcl/longcurr.hxx>
#include <vcl/lstbox.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 69f391824723..5645bf099288 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -49,7 +49,7 @@
#include <vcl/longcurr.hxx>
#include <vcl/toolkit/imgctrl.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
#include <vcl/tabpage.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2c59c5868c3d..bd367355eb62 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -53,7 +53,7 @@
#include <vcl/ivctrl.hxx>
#include <vcl/layout.hxx>
#include <vcl/menubtn.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/ptrstyle.hxx>
#include <vcl/slider.hxx>
#include <vcl/sysdata.hxx>
diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx
index 2531423a922f..16ec32de0597 100644
--- a/vcl/source/control/prgsbar.cxx
+++ b/vcl/source/control/prgsbar.cxx
@@ -19,7 +19,7 @@
#include <vcl/event.hxx>
#include <vcl/status.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/settings.hxx>
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c06fa544e54a..35758ce26ac2 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -34,7 +34,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/menubtn.hxx>
#include <vcl/mnemonic.hxx>
-#include <vcl/prgsbar.hxx>
+#include <vcl/toolkit/prgsbar.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
#include <vcl/svtabbx.hxx>
commit 57aa9ea3a6d178fcea016fadb005dfbcc2ca2e8d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 4 10:04:25 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 4 16:44:54 2019 +0100
readme not a sufficient indicator
Change-Id: Idd5cd004b873280e202b16c182356977045bdab4
Reviewed-on: https://gerrit.libreoffice.org/81993
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/framework/inc/uielement/FixedImageToolbarController.hxx
b/framework/inc/uielement/FixedImageToolbarController.hxx
index 2fa55e4e8cc5..bfe197bb44a6 100644
--- a/framework/inc/uielement/FixedImageToolbarController.hxx
+++ b/framework/inc/uielement/FixedImageToolbarController.hxx
@@ -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: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/FixedImageToolbarController.cxx
b/framework/source/uielement/FixedImageToolbarController.cxx
index 6338287a8dd9..b90f24abfe6e 100644
--- a/framework/source/uielement/FixedImageToolbarController.cxx
+++ b/framework/source/uielement/FixedImageToolbarController.cxx
@@ -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());
diff --git a/include/vcl/toolkit/group.hxx b/include/vcl/toolkit/group.hxx
index 5a71c2527b2e..0ab20b2d2b36 100644
--- a/include/vcl/toolkit/group.hxx
+++ b/include/vcl/toolkit/group.hxx
@@ -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:
diff --git a/include/vcl/toolkit/imgctrl.hxx b/include/vcl/toolkit/imgctrl.hxx
index a38829776236..e2f8ae972ce2 100644
--- a/include/vcl/toolkit/imgctrl.hxx
+++ b/include/vcl/toolkit/imgctrl.hxx
@@ -20,11 +20,13 @@
#ifndef INCLUDED_VCL_IMGCTRL_HXX
#define INCLUDED_VCL_IMGCTRL_HXX
-#include <vcl/dllapi.h>
+#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:
diff --git a/include/vcl/toolkit/morebtn.hxx b/include/vcl/toolkit/morebtn.hxx
index dccbb4a9e08c..5ed592690359 100644
--- a/include/vcl/toolkit/morebtn.hxx
+++ b/include/vcl/toolkit/morebtn.hxx
@@ -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>
diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index 3ec6f7574a2c..98ed542f0f51 100644
--- a/include/vcl/toolkit/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
@@ -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>
diff --git a/include/vcl/toolkit/spin.hxx b/include/vcl/toolkit/spin.hxx
index fa37bff5f504..0483aef2e980 100644
--- a/include/vcl/toolkit/spin.hxx
+++ b/include/vcl/toolkit/spin.hxx
@@ -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:
diff --git a/include/vcl/toolkit/tabdlg.hxx b/include/vcl/toolkit/tabdlg.hxx
index 18319a992072..30613c926617 100644
--- a/include/vcl/toolkit/tabdlg.hxx
+++ b/include/vcl/toolkit/tabdlg.hxx
@@ -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>
diff --git a/include/vcl/toolkit/throbber.hxx b/include/vcl/toolkit/throbber.hxx
index 4739bd7aa8c3..740e7e19a029 100644
--- a/include/vcl/toolkit/throbber.hxx
+++ b/include/vcl/toolkit/throbber.hxx
@@ -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>
diff --git a/include/vcl/toolkit/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx
index 29c7f3ea794e..d23155b88d64 100644
--- a/include/vcl/toolkit/unowrap.hxx
+++ b/include/vcl/toolkit/unowrap.hxx
@@ -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>
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 93fa276b61f2..2396c6fa69f2 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -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 ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
