readme not a sufficient indicator

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>

11 files changed, 40 insertions, 14 deletions

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 ) );