[Libreoffice-commits] core.git: accessibility/source canvas/source compilerplugins/clang editeng/source include/vcl sc/source vcl/inc vcl/osx vcl/source vcl/unx vcl/win

Noel Grandin noel.grandin at collabora.co.uk
Wed Feb 8 12:43:14 UTC 2017


 accessibility/source/standard/accessiblemenubasecomponent.cxx |    5 
 accessibility/source/standard/vclxaccessiblebox.cxx           |    2 
 accessibility/source/standard/vclxaccessiblelist.cxx          |    5 
 accessibility/source/standard/vclxaccessiblestatusbar.cxx     |    6 
 canvas/source/directx/dx_vcltools.cxx                         |    4 
 compilerplugins/clang/unusedenumconstants.py                  |    8 
 editeng/source/editeng/impedit.cxx                            |    8 
 include/vcl/ptrstyle.hxx                                      |  177 ++++------
 include/vcl/salbtype.hxx                                      |    3 
 include/vcl/settings.hxx                                      |    2 
 include/vcl/throbber.hxx                                      |    2 
 include/vcl/vclenum.hxx                                       |    4 
 include/vcl/vclevent.hxx                                      |    6 
 include/vcl/window.hxx                                        |    6 
 sc/source/ui/app/inputwin.cxx                                 |    9 
 sc/source/ui/view/gridwin.cxx                                 |   11 
 vcl/inc/unx/gtk/gtkgdi.hxx                                    |    1 
 vcl/inc/unx/x11_cursors/airbrush_curs.h                       |   34 -
 vcl/inc/unx/x11_cursors/airbrush_mask.h                       |   34 -
 vcl/inc/unx/x11_cursors/chart_curs.h                          |   34 -
 vcl/inc/unx/x11_cursors/chart_mask.h                          |   34 -
 vcl/inc/unx/x11_cursors/copydlnk_curs.h                       |   36 --
 vcl/inc/unx/x11_cursors/copydlnk_mask.h                       |   36 --
 vcl/inc/unx/x11_cursors/copyfile_curs.h                       |   36 --
 vcl/inc/unx/x11_cursors/copyfile_mask.h                       |   36 --
 vcl/inc/unx/x11_cursors/copyfiles_curs.h                      |   36 --
 vcl/inc/unx/x11_cursors/copyfiles_mask.h                      |   36 --
 vcl/inc/unx/x11_cursors/copyflnk_curs.h                       |   36 --
 vcl/inc/unx/x11_cursors/copyflnk_mask.h                       |   36 --
 vcl/inc/unx/x11_cursors/linkfile_curs.h                       |   36 --
 vcl/inc/unx/x11_cursors/linkfile_mask.h                       |   36 --
 vcl/inc/unx/x11_cursors/movedata_curs.h                       |   36 --
 vcl/inc/unx/x11_cursors/movedata_mask.h                       |   36 --
 vcl/inc/unx/x11_cursors/movefile_curs.h                       |   36 --
 vcl/inc/unx/x11_cursors/movefile_mask.h                       |   36 --
 vcl/inc/unx/x11_cursors/movefiles_curs.h                      |   36 --
 vcl/inc/unx/x11_cursors/movefiles_mask.h                      |   36 --
 vcl/inc/unx/x11_cursors/moveflnk_curs.h                       |   36 --
 vcl/inc/unx/x11_cursors/moveflnk_mask.h                       |   36 --
 vcl/inc/unx/x11_cursors/paintbrush_curs.h                     |   29 -
 vcl/inc/unx/x11_cursors/paintbrush_mask.h                     |   27 -
 vcl/inc/unx/x11_cursors/salcursors.h                          |   29 -
 vcl/inc/unx/x11_cursors/timemove_curs.h                       |   34 -
 vcl/inc/unx/x11_cursors/timemove_mask.h                       |   34 -
 vcl/inc/unx/x11_cursors/timesize_curs.h                       |   34 -
 vcl/inc/unx/x11_cursors/timesize_mask.h                       |   34 -
 vcl/osx/saldata.cxx                                           |   15 
 vcl/source/app/svapp.cxx                                      |   10 
 vcl/source/control/button.cxx                                 |    3 
 vcl/source/control/ctrl.cxx                                   |    1 
 vcl/source/control/edit.cxx                                   |    7 
 vcl/source/control/field2.cxx                                 |   26 -
 vcl/source/control/throbber.cxx                               |    5 
 vcl/source/edit/textview.cxx                                  |   10 
 vcl/source/gdi/bmpacc.cxx                                     |    9 
 vcl/source/gdi/bmpfast.cxx                                    |    9 
 vcl/source/gdi/pdfextoutdevdata.cxx                           |   49 --
 vcl/source/gdi/salmisc.cxx                                    |    3 
 vcl/source/helper/canvasbitmap.cxx                            |   10 
 vcl/source/window/brdwin.cxx                                  |    1 
 vcl/source/window/stacking.cxx                                |   20 -
 vcl/source/window/window.cxx                                  |    1 
 vcl/source/window/winproc.cxx                                 |    2 
 vcl/unx/generic/app/saldisp.cxx                               |   48 --
 vcl/unx/generic/print/genpspgraphics.cxx                      |    2 
 vcl/unx/gtk/gtkdata.cxx                                       |   17 
 vcl/unx/gtk3/gtk3gtkdata.cxx                                  |   17 
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx                     |   15 
 vcl/win/window/salframe.cxx                                   |   17 
 69 files changed, 98 insertions(+), 1463 deletions(-)

New commits:
commit 65b7b6322b662785bf032e66c76abc36c9a2bb0e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Feb 8 10:40:28 2017 +0200

    loplugin:unusedenumconstants read-only constants in vcl
    
    Change-Id: I8c81444cbecdc103cc47d9a4133b0b4d9010e0c2
    Reviewed-on: https://gerrit.libreoffice.org/34018
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 911d21e..f25da0c 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -596,11 +596,6 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen
             RemoveChild( nItemPos );
         }
         break;
-        case VclEventId::MenuAccessibleNameChanged:
-        {
-            UpdateAccessibleName( nItemPos );
-        }
-        break;
         case VclEventId::MenuItemTextChanged:
         {
             UpdateAccessibleName( nItemPos );
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 4dfe0c7..32511a7 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -113,7 +113,6 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
     {
         case VclEventId::DropdownSelect:
         case VclEventId::ListboxSelect:
-        case VclEventId::ListboxFocusItemChanged:
         {
             // Forward the call to the list child.
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
@@ -199,7 +198,6 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
         case VclEventId::ListboxItemRemoved:
         case VclEventId::ComboboxItemAdded:
         case VclEventId::ComboboxItemRemoved:
-        case VclEventId::ComboboxScrolled:
         {
             // Forward the call to the list child.
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 498bbdb..9886509 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -341,10 +341,6 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
             if ( !m_bDisableProcessEvent )
                 UpdateSelection_Impl_Acc(b_IsDropDownList);
             break;
-        case VclEventId::ListboxFocusItemChanged:
-            if ( !m_bDisableProcessEvent )
-                UpdateFocus_Impl_Acc((sal_uInt16)reinterpret_cast<sal_uIntPtr>(rVclWindowEvent.GetData()),b_IsDropDownList);
-            break;
         case VclEventId::WindowGetFocus:
             break;
         case VclEventId::ControlGetFocus:
@@ -397,7 +393,6 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
             notifyVisibleStates(false);
             break;
         case VclEventId::ListboxScrolled:
-        case VclEventId::ComboboxScrolled:
             UpdateEntryRange_Impl();
             break;
 
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index a8c4bf3..9f7bcee 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -197,12 +197,6 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind
             }
         }
         break;
-        case VclEventId::StatusbarShowAllItems:
-        {
-            for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i )
-                UpdateShowing( i, rVclWindowEvent.GetId() == VclEventId::StatusbarShowAllItems );
-        }
-        break;
         case VclEventId::StatusbarNameChanged:
         {
             if ( m_pStatusBar )
diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index 6d60842..1efc1e3 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -288,8 +288,6 @@ namespace dxcanvas
                                 // FALLTHROUGH intended
                             case ScanlineFormat::N24BitTcRgb:
                                 // FALLTHROUGH intended
-                            case ScanlineFormat::N24BitTcMask:
-                                // FALLTHROUGH intended
                             case ScanlineFormat::N16BitTcMsbMask:
                                 // FALLTHROUGH intended
                             case ScanlineFormat::N32BitTcAbgr:
@@ -440,8 +438,6 @@ namespace dxcanvas
                                 // FALLTHROUGH intended
                             case ScanlineFormat::N24BitTcRgb:
                                 // FALLTHROUGH intended
-                            case ScanlineFormat::N24BitTcMask:
-                                // FALLTHROUGH intended
                             case ScanlineFormat::N16BitTcMsbMask:
                                 // FALLTHROUGH intended
                             case ScanlineFormat::N32BitTcAbgr:
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index 50d680e..9acbd49 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -99,6 +99,10 @@ for d in definitionSet:
          "include/svtools/rtftoken.h",
          "sc/source/filter/inc/xltracer.hxx",
          "writerfilter/source/dmapper/FieldTypes.hxx",
+         "vcl/source/fontsubset/cff.cxx",
+         "vcl/source/filter/wmf/winmtf.hxx",
+         "vcl/source/filter/sgvmain.hxx",
+         "vcl/source/filter/jpeg/transupp.h",
         # unit test code
          "cppu/source/uno/check.cxx",
         # general weird nonsense going on
@@ -114,6 +118,9 @@ for d in definitionSet:
          "include/canvas/rendering/icolorbuffer.hxx",
          "include/vcl/commandevent.hxx",
          "vcl/inc/unx/gendata.hxx",
+         "vcl/inc/salwtype.hxx",
+         "include/vcl/svapp.hxx",
+         "include/vcl/salbtype.hxx",
         # must match some other enum
          "include/editeng/bulletitem.hxx",
          "include/editeng/svxenum.hxx",
@@ -128,6 +135,7 @@ for d in definitionSet:
          "vcl/inc/sft.hxx",
          "vcl/inc/unx/XIM.h",
          "vcl/unx/gtk/xid_fullscreen_on_all_monitors.c",
+         "vcl/unx/gtk/salnativewidgets-gtk.cxx",
          ]):
         continue
 
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 27c28a3..8df3d06 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1240,13 +1240,7 @@ bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent )
     nExtraCursorFlags = GetCursorFlags::NONE;
     bClickedInSelection = false;
 
-    if ( rMouseEvent.IsMiddle() && !bReadOnly &&
-         ( GetWindow()->GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection ) )
-    {
-        Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection());
-        Paste( aClipBoard );
-    }
-    else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() )
+    if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() )
     {
         Reference<css::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection());
         CutCopy( aClipBoard, false );
diff --git a/include/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx
index 996caf5..7eb50c10 100644
--- a/include/vcl/ptrstyle.hxx
+++ b/include/vcl/ptrstyle.hxx
@@ -22,102 +22,87 @@
 
 enum class PointerStyle
 {
-    Arrow              = 0,
-    Null               = 1,
-    Wait               = 2,
-    Text               = 3,
-    Help               = 4,
-    Cross              = 5,
-    Move               = 6,
-    NSize              = 7,
-    SSize              = 8,
-    WSize              = 9,
-    ESize              = 10,
-    NWSize             = 11,
-    NESize             = 12,
-    SWSize             = 13,
-    SESize             = 14,
-    WindowNSize        = 15,
-    WindowSSize        = 16,
-    WindowWSize        = 17,
-    WindowESize        = 18,
-    WindowNWSize       = 19,
-    WindowNESize       = 20,
-    WindowSWSize       = 21,
-    WindowSESize       = 22,
-    HSplit             = 23,
-    VSplit             = 24,
-    HSizeBar           = 25,
-    VSizeBar           = 26,
-    Hand               = 27,
-    RefHand            = 28,
-    Pen                = 29,
-    Magnify            = 30,
-    Fill               = 31,
-    Rotate             = 32,
-    HShear             = 33,
-    VShear             = 34,
-    Mirror             = 35,
-    Crook              = 36,
-    Crop               = 37,
-    MovePoint          = 38,
-    MoveBezierWeight   = 39,
-    MoveData           = 40,
-    CopyData           = 41,
-    LinkData           = 42,
-    MoveDataLink       = 43,
-    CopyDataLink       = 44,
-    MoveFile           = 45,
-    CopyFile           = 46,
-    LinkFile           = 47,
-    MoveFileLink       = 48,
-    CopyFileLink       = 49,
-    MoveFiles          = 50,
-    CopyFiles          = 51,
-    NotAllowed         = 52,
-    DrawLine           = 53,
-    DrawRect           = 54,
-    DrawPolygon        = 55,
-    DrawBezier         = 56,
-    DrawArc            = 57,
-    DrawPie            = 58,
-    DrawCircleCut      = 59,
-    DrawEllipse        = 60,
-    DrawFreehand       = 61,
-    DrawConnect        = 62,
-    DrawText           = 63,
-    DrawCaption        = 64,
-    Chart              = 65,
-    Detective          = 66,
-    PivotCol           = 67,
-    PivotRow           = 68,
-    PivotField         = 69,
-    Chain              = 70,
-    ChainNotAllowed    = 71,
-    TimeEventMove      = 72,
-    TimeEventSize      = 73,
-    AutoScrollN        = 74,
-    AutoScrollS        = 75,
-    AutoScrollW        = 76,
-    AutoScrollE        = 77,
-    AutoScrollNW       = 78,
-    AutoScrollNE       = 79,
-    AutoScrollSW       = 80,
-    AutoScrollSE       = 81,
-    AutoScrollNS       = 82,
-    AutoScrollWE       = 83,
-    AutoScrollNSWE     = 84,
-    Airbrush           = 85,
-    TextVertical       = 86,
-    PivotDelete        = 87,
-    TabSelectS         = 88,
-    TabSelectE         = 89,
-    TabSelectSE        = 90,
-    TabSelectW         = 91,
-    TabSelectSW        = 92,
-    Paintbrush         = 93,
-    HideWhitespace     = 94,
-    ShowWhitespace     = 95,
+    Arrow,
+    Null,
+    Wait,
+    Text,
+    Help,
+    Cross,
+    Move,
+    NSize,
+    SSize,
+    WSize,
+    ESize,
+    NWSize,
+    NESize,
+    SWSize,
+    SESize,
+    WindowNSize,
+    WindowSSize,
+    WindowWSize,
+    WindowESize,
+    WindowNWSize,
+    WindowNESize,
+    WindowSWSize,
+    WindowSESize,
+    HSplit,
+    VSplit,
+    HSizeBar,
+    VSizeBar,
+    Hand,
+    RefHand,
+    Magnify,
+    Fill,
+    Rotate,
+    HShear,
+    VShear,
+    Mirror,
+    Crook,
+    Crop,
+    MovePoint,
+    MoveBezierWeight,
+    CopyData,
+    LinkData,
+    MoveDataLink,
+    NotAllowed,
+    DrawLine,
+    DrawRect,
+    DrawPolygon,
+    DrawBezier,
+    DrawArc,
+    DrawPie,
+    DrawCircleCut,
+    DrawEllipse,
+    DrawFreehand,
+    DrawConnect,
+    DrawText,
+    DrawCaption,
+    Detective,
+    PivotCol,
+    PivotRow,
+    PivotField,
+    Chain,
+    ChainNotAllowed,
+    AutoScrollN,
+    AutoScrollS,
+    AutoScrollW,
+    AutoScrollE,
+    AutoScrollNW,
+    AutoScrollNE,
+    AutoScrollSW,
+    AutoScrollSE,
+    AutoScrollNS,
+    AutoScrollWE,
+    AutoScrollNSWE,
+    TextVertical,
+    PivotDelete,
+    TabSelectS,
+    TabSelectE,
+    TabSelectSE,
+    TabSelectW,
+    TabSelectSW,
+    HideWhitespace,
+    ShowWhitespace,
     LAST               = ShowWhitespace,
 };
 
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index e395f0c..d0d71b1 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -50,7 +50,6 @@ enum class ScanlineFormat {
 
     N24BitTcBgr       = 0x00000100,
     N24BitTcRgb       = 0x00000200,
-    N24BitTcMask      = 0x00000400,
 
     N32BitTcAbgr      = 0x00000800,
     N32BitTcArgb      = 0x00001000,
@@ -61,7 +60,7 @@ enum class ScanlineFormat {
     TopDown           = 0x00010000 // scanline adjustment
 };
 namespace o3tl {
-    template<> struct typed_flags<ScanlineFormat> : is_typed_flags<ScanlineFormat, 0x0001ffff> {};
+    template<> struct typed_flags<ScanlineFormat> : is_typed_flags<ScanlineFormat, 0x0001fbff> {};
 }
 inline ScanlineFormat RemoveScanline(ScanlineFormat nFormat) { return nFormat & ~ScanlineFormat::TopDown; }
 
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 7fef457..53bb153 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -79,7 +79,7 @@ namespace o3tl
 
 enum class MouseMiddleButtonAction
 {
-    Nothing, AutoScroll, PasteSelection
+    Nothing, AutoScroll
 };
 
 enum class MouseWheelBehaviour
diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx
index 8dfda97..91906c4 100644
--- a/include/vcl/throbber.hxx
+++ b/include/vcl/throbber.hxx
@@ -33,8 +33,6 @@ class VCL_DLLPUBLIC Throbber : public ImageControl
 public:
     enum class ImageSet
     {
-        /// no (default) images at all
-        NONE,
         /// automatically decide between different image sets, depending on what fits best the actual size
         Auto,
         /// default images, 16x16 pixels
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 8397ec2..9bf5c97 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -26,9 +26,7 @@
 
 enum class ExtTimeFieldFormat
 {
-    Short24H, Long24H,
-    Short12H, Long12H,
-    ShortDuration, LongDuration
+    Short24H, Long24H
 };
 
 enum class ExtDateFieldFormat
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 4cb7723..a607231 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -45,7 +45,6 @@ enum class VclEventId
     ComboboxDoubleClick,
     ComboboxItemAdded,       // pData = itempos
     ComboboxItemRemoved,     // pData = itempos, -1=All
-    ComboboxScrolled,
     ComboboxSelect,
     ComboboxSetText,
     ControlGetFocus,
@@ -61,7 +60,6 @@ enum class VclEventId
     ItemExpanded,
     ListboxDoubleClick,
     ListboxFocus,
-    ListboxFocusItemChanged,
     ListboxItemAdded,        // pData = itempos
     ListboxItemRemoved,      // pData = itempos, -1=All
     ListboxScrolled,
@@ -69,7 +67,6 @@ enum class VclEventId
     ListboxStateUpdate,
     ListboxTreeFocus,
     ListboxTreeSelect,
-    MenuAccessibleNameChanged,
     MenuActivate,
     MenuDeactivate,
     MenuDehighlight,
@@ -107,7 +104,6 @@ enum class VclEventId
     StatusbarItemAdded,     // pData = itemid
     StatusbarItemRemoved,   // pData = itemid
     StatusbarNameChanged,   // pData = itemid
-    StatusbarShowAllItems,
     StatusbarShowItem,      // pData = itemid
     TabbarPageActivated,    // pData = pageid
     TabbarPageDeactivated,  // pData = pageid
@@ -170,11 +166,9 @@ enum class VclEventId
     WindowPaint,            // pData = Rectangle*
     WindowPrepareToggleFloating,   // pData = bool
     WindowResize,
-    WindowScroll,           // pData = ScrollEvent*
     WindowShow,
     WindowStartDocking,     // pData = DockingData
     WindowToggleFloating,
-    WindowZoom,             // pData = ZoomEvent*
 };
 
 class VCL_DLLPUBLIC VclSimpleEvent
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ae214c2..adf31f2 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -132,7 +132,6 @@ enum class GetWindowType
     Prev                     =  3,
     Next                     =  4,
     FirstOverlap             =  5,
-    LastOverlap              =  6,
     Overlap                  =  7,
     ParentOverlap            =  8,
     Client                   =  9,
@@ -140,8 +139,6 @@ enum class GetWindowType
     Frame                    = 11,
     Border                   = 12,
     FirstTopWindowChild      = 13,
-    LastTopWindowChild       = 14,
-    PrevTopWindowSibling     = 15,
     NextTopWindowSibling     = 16,
 };
 
@@ -329,13 +326,10 @@ enum class StateChangedType : sal_uInt16
     UpdateMode         = 3,
     Enable             = 4,
     Text               = 5,
-    Image              = 6,
     Data               = 7,
     State              = 8,
     Style              = 9,
     Zoom               = 10,
-    Border             = 11,
-    Transparent        = 12,
     ControlFont        = 13,
     ControlForeground  = 14,
     ControlBackground  = 15,
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 9f94098..5aab050 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1333,14 +1333,7 @@ void ScTextWnd::MouseButtonUp( const MouseEvent& rMEvt )
     if (mpEditView)
         if (mpEditView->MouseButtonUp( rMEvt ))
         {
-            if ( rMEvt.IsMiddle() &&
-                     GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection )
-            {
-                //  EditView may have pasted from selection
-                SC_MOD()->InputChanged( mpEditView.get() );
-            }
-            else
-                SC_MOD()->InputSelection( mpEditView.get() );
+            SC_MOD()->InputSelection( mpEditView.get() );
         }
 }
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 278aa5d..2aca621 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1997,16 +1997,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
         SCROW       nEditRow;
         pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow );
         pEditView->MouseButtonUp( rMEvt );
-
-        if ( rMEvt.IsMiddle() &&
-                 GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection )
-        {
-            //  EditView may have pasted from selection
-            pScMod->InputChanged( pEditView );
-        }
-        else
-            pScMod->InputSelection( pEditView );            // parentheses etc.
-
+        pScMod->InputSelection( pEditView );            // parentheses etc.
         pViewData->GetView()->InvalidateAttribs();
         rBindings.Invalidate( SID_HYPERLINK_GETLINK );
         bEEMouse = false;
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 23e423b..198e384 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -70,7 +70,6 @@ enum class GtkControlPart
     ScrollbarHorizontalSlider,
     ScrollbarHorizontalButton,
     ProgressBar,
-    ProgressBarTrough,
     ProgressBarProgress,
     Notebook,
     NotebookHeader,
diff --git a/vcl/inc/unx/x11_cursors/airbrush_curs.h b/vcl/inc/unx/x11_cursors/airbrush_curs.h
deleted file mode 100644
index 038e56e..0000000
--- a/vcl/inc/unx/x11_cursors/airbrush_curs.h
+++ /dev/null
@@ -1,34 +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 .
- */
-#define airbrush_curs_width 32
-#define airbrush_curs_height 32
-#define airbrush_curs_x_hot 5
-#define airbrush_curs_y_hot 22
-static unsigned char airbrush_curs_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
- 0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
- 0xcc,0x07,0x00,0x00,0xb4,0x03,0x00,0x00,0x10,0x01,0x00,0x00,0x88,0x00,0x00,
- 0x00,0x44,0x00,0x00,0x00,0x62,0x60,0x00,0x00,0x91,0x10,0x00,0x80,0x88,0x10,
- 0x00,0x40,0x04,0x09,0x00,0x40,0x02,0x06,0x00,0xa0,0x01,0x00,0x00,0x60,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/airbrush_mask.h b/vcl/inc/unx/x11_cursors/airbrush_mask.h
deleted file mode 100644
index cc92822..0000000
--- a/vcl/inc/unx/x11_cursors/airbrush_mask.h
+++ /dev/null
@@ -1,34 +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 .
- */
-#define airbrush_mask_width 32
-#define airbrush_mask_height 32
-#define airbrush_mask_x_hot 5
-#define airbrush_mask_y_hot 22
-static unsigned char airbrush_mask_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
- 0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
- 0xcc,0x07,0x00,0x00,0xf4,0x03,0x00,0x00,0xf0,0x01,0x00,0x00,0xf8,0x00,0x00,
- 0x00,0x7c,0x00,0x00,0x00,0x7e,0x60,0x00,0x00,0x9f,0x10,0x00,0x80,0x8f,0x10,
- 0x00,0xc0,0x07,0x09,0x00,0xc0,0x03,0x06,0x00,0xe0,0x01,0x00,0x00,0x60,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/chart_curs.h b/vcl/inc/unx/x11_cursors/chart_curs.h
deleted file mode 100644
index 367f6b0..0000000
--- a/vcl/inc/unx/x11_cursors/chart_curs.h
+++ /dev/null
@@ -1,34 +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 .
- */
-#define chart_curs_width 32
-#define chart_curs_height 32
-#define chart_curs_x_hot 15
-#define chart_curs_y_hot 16
-static unsigned char chart_curs_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xbf,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,
- 0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,
- 0x10,0x00,0x00,0x80,0x00,0x06,0x00,0x00,0x10,0x06,0x00,0x00,0x00,0x06,0x00,
- 0x00,0x10,0x36,0x00,0x00,0xc0,0x36,0x00,0x00,0xd0,0x36,0x00,0x00,0xc0,0x36,
- 0x00,0x00,0xf0,0x7f,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/chart_mask.h b/vcl/inc/unx/x11_cursors/chart_mask.h
deleted file mode 100644
index 6f69770..0000000
--- a/vcl/inc/unx/x11_cursors/chart_mask.h
+++ /dev/null
@@ -1,34 +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 .
- */
-#define chart_mask_width 32
-#define chart_mask_height 32
-#define chart_mask_x_hot 15
-#define chart_mask_y_hot 16
-static unsigned char chart_mask_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,
- 0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,
- 0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xc0,0x01,
- 0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x39,0x00,0x00,0xc0,
- 0x39,0x0f,0x00,0xc0,0x39,0x0f,0x00,0xc0,0x39,0x0f,0x00,0x00,0x38,0x7f,0x00,
- 0x00,0xf8,0x7f,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf8,0xff,
- 0x00,0x00,0xf8,0xff,0x00,0x00,0xf8,0xff};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copydlnk_curs.h b/vcl/inc/unx/x11_cursors/copydlnk_curs.h
deleted file mode 100644
index df05429..0000000
--- a/vcl/inc/unx/x11_cursors/copydlnk_curs.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define copydlnk_curs_width 32
-#define copydlnk_curs_height 32
-#define copydlnk_curs_x_hot 1
-#define copydlnk_curs_y_hot 1
-static unsigned char copydlnk_curs_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-   0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
-   0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
-   0xfe, 0x03, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00,
-   0x66, 0x00, 0x00, 0x00, 0xc2, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00,
-   0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x10, 0x53, 0x00, 0x00,
-   0x28, 0xa3, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00,
-   0x30, 0xf1, 0x1f, 0x00, 0x10, 0xf1, 0x1f, 0x00, 0xd0, 0xf1, 0x1e, 0x00,
-   0xf0, 0xf1, 0x1e, 0x00, 0x00, 0x34, 0x18, 0x00, 0x00, 0xf0, 0x1e, 0x00,
-   0x00, 0xf0, 0x1e, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copydlnk_mask.h b/vcl/inc/unx/x11_cursors/copydlnk_mask.h
deleted file mode 100644
index b2ffcca..0000000
--- a/vcl/inc/unx/x11_cursors/copydlnk_mask.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define copydlnk_mask_width 32
-#define copydlnk_mask_height 32
-#define copydlnk_mask_x_hot 1
-#define copydlnk_mask_y_hot 1
-static unsigned char copydlnk_mask_bits[] = {
-   0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
-   0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
-   0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
-   0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
-   0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xe7, 0x03, 0x00, 0x00,
-   0xe0, 0x03, 0x00, 0x00, 0xf8, 0xff, 0x00, 0x00, 0xfc, 0xff, 0x01, 0x00,
-   0xfc, 0xff, 0x01, 0x00, 0xfc, 0xff, 0x01, 0x00, 0xf8, 0xff, 0x3f, 0x00,
-   0xf8, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0x3f, 0x00,
-   0xf8, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0x3f, 0x00, 0x00, 0xfe, 0x3f, 0x00,
-   0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00,
-   0x00, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyfile_curs.h b/vcl/inc/unx/x11_cursors/copyfile_curs.h
deleted file mode 100644
index 22d9fc6..0000000
--- a/vcl/inc/unx/x11_cursors/copyfile_curs.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define copyfile_curs_width 32
-#define copyfile_curs_height 32
-#define copyfile_curs_x_hot 9
-#define copyfile_curs_y_hot 9
-static unsigned char copyfile_curs_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
-   0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
-   0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00,
-   0xfe, 0x02, 0x00, 0x00, 0xfe, 0x06, 0x00, 0x00, 0xfe, 0x0e, 0x00, 0x00,
-   0xfe, 0x1e, 0x00, 0x00, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
-   0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00,
-   0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0xc2, 0xe0, 0x3f, 0x00, 0xc0, 0xe0, 0x3f, 0x00, 0x80, 0xe1, 0x3d,
-   0x00, 0x80, 0xe1, 0x3d, 0x00, 0x00, 0x63, 0x30, 0x00, 0x00, 0xe3, 0x3d,
-   0x00, 0x00, 0xe0, 0x3d, 0x00, 0x00, 0xe0, 0x3f, 0x00, 0x00, 0xe0, 0x3f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyfile_mask.h b/vcl/inc/unx/x11_cursors/copyfile_mask.h
deleted file mode 100644
index 171d8b7..0000000
--- a/vcl/inc/unx/x11_cursors/copyfile_mask.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define copyfile_mask_width 32
-#define copyfile_mask_height 32
-#define copyfile_mask_x_hot 9
-#define copyfile_mask_y_hot 9
-static unsigned char copyfile_mask_bits[] = {
-   0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x00, 0xff, 0x3f, 0x00, 0x00,
-   0xff, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00,
-   0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00,
-   0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xf1, 0x7f,
-   0x00, 0xff, 0xf1, 0x7f, 0x00, 0xe7, 0xf3, 0x7f, 0x00, 0xe0, 0xf3, 0x7f,
-   0x00, 0xc0, 0xf7, 0x7f, 0x00, 0xc0, 0xf7, 0x7f, 0x00, 0x80, 0xf7, 0x7f,
-   0x00, 0x80, 0xf7, 0x7f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xf0, 0x7f,
-   0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyfiles_curs.h b/vcl/inc/unx/x11_cursors/copyfiles_curs.h
deleted file mode 100644
index 2a80417..0000000
--- a/vcl/inc/unx/x11_cursors/copyfiles_curs.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define copyfiles_curs_width 32
-#define copyfiles_curs_height 32
-#define copyfiles_curs_x_hot 8
-#define copyfiles_curs_y_hot 9
-static unsigned char copyfiles_curs_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0xe0, 0x2f, 0x00, 0x00,
-   0xe8, 0x0f, 0x00, 0x00, 0xe8, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00,
-   0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0x6a, 0x7e, 0x00, 0x00,
-   0x6a, 0x7d, 0x00, 0x00, 0x6a, 0x7b, 0x00, 0x00, 0x6a, 0x77, 0x00, 0x00,
-   0x6a, 0x6f, 0x00, 0x00, 0x6a, 0x5f, 0x00, 0x00, 0x0a, 0x3f, 0x00, 0x00,
-   0x7a, 0x7f, 0x00, 0x00, 0x02, 0xff, 0x00, 0x00, 0x7e, 0xff, 0x01, 0x00,
-   0x00, 0x3f, 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00,
-   0x00, 0x61, 0xe0, 0x3f, 0x00, 0x60, 0xe0, 0x3f, 0x00, 0xc0, 0xe0, 0x3d,
-   0x00, 0xc0, 0xe0, 0x3d, 0x00, 0x80, 0x61, 0x30, 0x00, 0x80, 0xe1, 0x3d,
-   0x00, 0x00, 0xe0, 0x3d, 0x00, 0x00, 0xe0, 0x3f, 0x00, 0x00, 0xe0, 0x3f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyfiles_mask.h b/vcl/inc/unx/x11_cursors/copyfiles_mask.h
deleted file mode 100644
index 02f2d4c..0000000
--- a/vcl/inc/unx/x11_cursors/copyfiles_mask.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define copyfiles_mask_width 32
-#define copyfiles_mask_height 32
-#define copyfiles_mask_x_hot 8
-#define copyfiles_mask_y_hot 9
-static unsigned char copyfiles_mask_bits[] = {
-   0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00,
-   0xfc, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-   0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-   0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-   0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-   0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0xff, 0xff, 0x03, 0x00,
-   0xff, 0xff, 0x03, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x80, 0xff, 0xf0, 0x7f,
-   0x80, 0xff, 0xf0, 0x7f, 0x80, 0xf3, 0xf1, 0x7f, 0x00, 0xf0, 0xf1, 0x7f,
-   0x00, 0xe0, 0xf3, 0x7f, 0x00, 0xe0, 0xf3, 0x7f, 0x00, 0xc0, 0xf3, 0x7f,
-   0x00, 0xc0, 0xf3, 0x7f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xf0, 0x7f,
-   0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyflnk_curs.h b/vcl/inc/unx/x11_cursors/copyflnk_curs.h
deleted file mode 100644
index 43629e2..0000000
--- a/vcl/inc/unx/x11_cursors/copyflnk_curs.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define copyflnk_curs_width 32
-#define copyflnk_curs_height 32
-#define copyflnk_curs_x_hot 9
-#define copyflnk_curs_y_hot 9
-static unsigned char copyflnk_curs_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
-   0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
-   0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
-   0xbe, 0x02, 0x00, 0x00, 0xa6, 0x06, 0x00, 0x00, 0xa2, 0x0e, 0x00, 0x00,
-   0xba, 0x1e, 0x00, 0x00, 0xbe, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
-   0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00,
-   0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0xc2, 0xe0, 0x3f, 0x00, 0xc0, 0xe0, 0x3f, 0x00, 0x80, 0xe1, 0x3d,
-   0x00, 0x80, 0xe1, 0x3d, 0x00, 0x00, 0x63, 0x30, 0x00, 0x00, 0xe3, 0x3d,
-   0x00, 0x00, 0xe0, 0x3d, 0x00, 0x00, 0xe0, 0x3f, 0x00, 0x00, 0xe0, 0x3f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/copyflnk_mask.h b/vcl/inc/unx/x11_cursors/copyflnk_mask.h
deleted file mode 100644
index cd17b33..0000000
--- a/vcl/inc/unx/x11_cursors/copyflnk_mask.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define copyflnk_mask_width 32
-#define copyflnk_mask_height 32
-#define copyflnk_mask_x_hot 9
-#define copyflnk_mask_y_hot 9
-static unsigned char copyflnk_mask_bits[] = {
-   0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x00, 0xff, 0x3f, 0x00, 0x00,
-   0xff, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00,
-   0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00,
-   0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xf1, 0x7f,
-   0x00, 0xff, 0xf1, 0x7f, 0x00, 0xe7, 0xf3, 0x7f, 0x00, 0xe0, 0xf3, 0x7f,
-   0x00, 0xc0, 0xf7, 0x7f, 0x00, 0xc0, 0xf7, 0x7f, 0x00, 0x80, 0xf7, 0x7f,
-   0x00, 0x80, 0xf7, 0x7f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xf0, 0x7f,
-   0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/linkfile_curs.h b/vcl/inc/unx/x11_cursors/linkfile_curs.h
deleted file mode 100644
index 571d928..0000000
--- a/vcl/inc/unx/x11_cursors/linkfile_curs.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define linkfile_curs_width 32
-#define linkfile_curs_height 32
-#define linkfile_curs_x_hot 9
-#define linkfile_curs_y_hot 9
-static unsigned char linkfile_curs_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
-   0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
-   0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00,
-   0xfe, 0x02, 0x00, 0x00, 0xfe, 0x06, 0x00, 0x00, 0xfe, 0x0e, 0x00, 0x00,
-   0xfe, 0x1e, 0x00, 0x00, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
-   0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00,
-   0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0xc2, 0xe0, 0x3f, 0x00, 0xc0, 0xe0, 0x30, 0x00, 0x80, 0xe1, 0x31,
-   0x00, 0x80, 0xe1, 0x30, 0x00, 0x00, 0x63, 0x34, 0x00, 0x00, 0x63, 0x3e,
-   0x00, 0x00, 0x60, 0x3f, 0x00, 0x00, 0xe0, 0x3e, 0x00, 0x00, 0xe0, 0x3f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/linkfile_mask.h b/vcl/inc/unx/x11_cursors/linkfile_mask.h
deleted file mode 100644
index cbef413..0000000
--- a/vcl/inc/unx/x11_cursors/linkfile_mask.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define linkfile_mask_width 32
-#define linkfile_mask_height 32
-#define linkfile_mask_x_hot 9
-#define linkfile_mask_y_hot 9
-static unsigned char linkfile_mask_bits[] = {
-   0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x00, 0xff, 0x3f, 0x00, 0x00,
-   0xff, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00,
-   0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00,
-   0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xf1, 0x7f,
-   0x00, 0xff, 0xf1, 0x7f, 0x00, 0xe7, 0xf3, 0x7f, 0x00, 0xe0, 0xf3, 0x7f,
-   0x00, 0xc0, 0xf7, 0x7f, 0x00, 0xc0, 0xf7, 0x7f, 0x00, 0x80, 0xf7, 0x7f,
-   0x00, 0x80, 0xf7, 0x7f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xf0, 0x7f,
-   0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/movedata_curs.h b/vcl/inc/unx/x11_cursors/movedata_curs.h
deleted file mode 100644
index b253ce7..0000000
--- a/vcl/inc/unx/x11_cursors/movedata_curs.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define movedata_curs_width 32
-#define movedata_curs_height 32
-#define movedata_curs_x_hot 1
-#define movedata_curs_y_hot 1
-static unsigned char movedata_curs_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-   0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
-   0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
-   0xfe, 0x03, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00,
-   0x66, 0x00, 0x00, 0x00, 0xc2, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00,
-   0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x10, 0x53, 0x00, 0x00,
-   0x28, 0xa3, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00,
-   0x10, 0x40, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00,
-   0xa8, 0xaa, 0x00, 0x00, 0x50, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/movedata_mask.h b/vcl/inc/unx/x11_cursors/movedata_mask.h
deleted file mode 100644
index d317b15..0000000
--- a/vcl/inc/unx/x11_cursors/movedata_mask.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define movedata_mask_width 32
-#define movedata_mask_height 32
-#define movedata_mask_x_hot 1
-#define movedata_mask_y_hot 1
-static unsigned char movedata_mask_bits[] = {
-   0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
-   0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
-   0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
-   0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
-   0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xe7, 0x03, 0x00, 0x00,
-   0xe0, 0x03, 0x00, 0x00, 0xf8, 0xff, 0x00, 0x00, 0xfc, 0xff, 0x01, 0x00,
-   0xfc, 0xff, 0x01, 0x00, 0xfc, 0xff, 0x01, 0x00, 0x3c, 0xe0, 0x01, 0x00,
-   0x3c, 0xe0, 0x01, 0x00, 0x3c, 0xe0, 0x01, 0x00, 0xfc, 0xff, 0x01, 0x00,
-   0xfc, 0xff, 0x01, 0x00, 0xfc, 0xff, 0x01, 0x00, 0xf8, 0xff, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/movefile_curs.h b/vcl/inc/unx/x11_cursors/movefile_curs.h
deleted file mode 100644
index 3ffea19..0000000
--- a/vcl/inc/unx/x11_cursors/movefile_curs.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define movefile_curs_width 32
-#define movefile_curs_height 32
-#define movefile_curs_x_hot 9
-#define movefile_curs_y_hot 9
-static unsigned char movefile_curs_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
-   0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
-   0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00,
-   0xfe, 0x02, 0x00, 0x00, 0xfe, 0x06, 0x00, 0x00, 0xfe, 0x0e, 0x00, 0x00,
-   0xfe, 0x1e, 0x00, 0x00, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
-   0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00,
-   0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0xc2, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00,
-   0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/movefile_mask.h b/vcl/inc/unx/x11_cursors/movefile_mask.h
deleted file mode 100644
index ab74f25..0000000
--- a/vcl/inc/unx/x11_cursors/movefile_mask.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define movefile_mask_width 32
-#define movefile_mask_height 32
-#define movefile_mask_x_hot 9
-#define movefile_mask_y_hot 9
-static unsigned char movefile_mask_bits[] = {
-   0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x00, 0xff, 0x3f, 0x00, 0x00,
-   0xff, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00,
-   0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00,
-   0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00,
-   0x00, 0xff, 0x01, 0x00, 0x00, 0xe7, 0x03, 0x00, 0x00, 0xe0, 0x03, 0x00,
-   0x00, 0xc0, 0x07, 0x00, 0x00, 0xc0, 0x07, 0x00, 0x00, 0x80, 0x07, 0x00,
-   0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/movefiles_curs.h b/vcl/inc/unx/x11_cursors/movefiles_curs.h
deleted file mode 100644
index d5c726a..0000000
--- a/vcl/inc/unx/x11_cursors/movefiles_curs.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define movefiles_curs_width 32
-#define movefiles_curs_height 32
-#define movefiles_curs_x_hot 8
-#define movefiles_curs_y_hot 9
-static unsigned char movefiles_curs_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0xe0, 0x2f, 0x00, 0x00,
-   0xe8, 0x0f, 0x00, 0x00, 0xe8, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00,
-   0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0x6a, 0x7e, 0x00, 0x00,
-   0x6a, 0x7d, 0x00, 0x00, 0x6a, 0x7b, 0x00, 0x00, 0x6a, 0x77, 0x00, 0x00,
-   0x6a, 0x6f, 0x00, 0x00, 0x6a, 0x5f, 0x00, 0x00, 0x0a, 0x3f, 0x00, 0x00,
-   0x7a, 0x7f, 0x00, 0x00, 0x02, 0xff, 0x00, 0x00, 0x7e, 0xff, 0x01, 0x00,
-   0x00, 0x3f, 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00,
-   0x00, 0x61, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00,
-   0x00, 0xc0, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/movefiles_mask.h b/vcl/inc/unx/x11_cursors/movefiles_mask.h
deleted file mode 100644
index c1683b3..0000000
--- a/vcl/inc/unx/x11_cursors/movefiles_mask.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define movefiles_mask_width 32
-#define movefiles_mask_height 32
-#define movefiles_mask_x_hot 8
-#define movefiles_mask_y_hot 9
-static unsigned char movefiles_mask_bits[] = {
-   0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00,
-   0xfc, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-   0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-   0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-   0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-   0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x03, 0x00, 0xff, 0xff, 0x03, 0x00,
-   0xff, 0xff, 0x03, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x80, 0xff, 0x00, 0x00,
-   0x80, 0xff, 0x00, 0x00, 0x80, 0xf3, 0x01, 0x00, 0x00, 0xf0, 0x01, 0x00,
-   0x00, 0xe0, 0x03, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0xc0, 0x03, 0x00,
-   0x00, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/moveflnk_curs.h b/vcl/inc/unx/x11_cursors/moveflnk_curs.h
deleted file mode 100644
index 02d0c81..0000000
--- a/vcl/inc/unx/x11_cursors/moveflnk_curs.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define moveflnk_curs_width 32
-#define moveflnk_curs_height 32
-#define moveflnk_curs_x_hot 9
-#define moveflnk_curs_y_hot 9
-static unsigned char moveflnk_curs_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
-   0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
-   0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
-   0xbe, 0x02, 0x00, 0x00, 0xa6, 0x06, 0x00, 0x00, 0xa2, 0x0e, 0x00, 0x00,
-   0xba, 0x1e, 0x00, 0x00, 0xbe, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
-   0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00,
-   0x00, 0x7e, 0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0xc2, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00,
-   0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/moveflnk_mask.h b/vcl/inc/unx/x11_cursors/moveflnk_mask.h
deleted file mode 100644
index 189c114..0000000
--- a/vcl/inc/unx/x11_cursors/moveflnk_mask.h
+++ /dev/null
@@ -1,36 +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 .
- */
-#define moveflnk_mask_width 32
-#define moveflnk_mask_height 32
-#define moveflnk_mask_x_hot 9
-#define moveflnk_mask_y_hot 9
-static unsigned char moveflnk_mask_bits[] = {
-   0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
-   0xff, 0x0f, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x00, 0xff, 0x3f, 0x00, 0x00,
-   0xff, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00,
-   0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00,
-   0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00,
-   0x00, 0xff, 0x01, 0x00, 0x00, 0xe7, 0x03, 0x00, 0x00, 0xe0, 0x03, 0x00,
-   0x00, 0xc0, 0x07, 0x00, 0x00, 0xc0, 0x07, 0x00, 0x00, 0x80, 0x07, 0x00,
-   0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/paintbrush_curs.h b/vcl/inc/unx/x11_cursors/paintbrush_curs.h
deleted file mode 100644
index fdaa422..0000000
--- a/vcl/inc/unx/x11_cursors/paintbrush_curs.h
+++ /dev/null
@@ -1,29 +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 .
- */
-
-#define paintbrush_curs_width 16
-#define paintbrush_curs_height 16
-#define paintbrush_curs_x_hot 0
-#define paintbrush_curs_y_hot 10
-static unsigned char paintbrush_curs_bits[] = {
-   0x00, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x90, 0x80, 0xcb, 0x60, 0x64,
-   0x90, 0x34, 0x08, 0x19, 0x06, 0x22, 0x11, 0x24, 0x09, 0x18, 0x46, 0x14,
-   0x24, 0x0a, 0x18, 0x05, 0x90, 0x02, 0xe0, 0x01 };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/paintbrush_mask.h b/vcl/inc/unx/x11_cursors/paintbrush_mask.h
deleted file mode 100644
index 8304dfb..0000000
--- a/vcl/inc/unx/x11_cursors/paintbrush_mask.h
+++ /dev/null
@@ -1,27 +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 .
- */
-
-#define paintbrush_mask_width 16
-#define paintbrush_mask_height 16
-static unsigned char paintbrush_mask_bits[] = {
-   0x00, 0x80, 0x00, 0xc0, 0x00, 0xe0, 0x00, 0xf0, 0x80, 0xfb, 0xe0, 0x7f,
-   0xf0, 0x3f, 0xf8, 0x1f, 0xfe, 0x3f, 0xff, 0x3f, 0xff, 0x1f, 0xfe, 0x1f,
-   0xfc, 0x0f, 0xf8, 0x07, 0xf0, 0x03, 0xe0, 0x01 };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/salcursors.h b/vcl/inc/unx/x11_cursors/salcursors.h
index 627352f..9a1abf5 100644
--- a/vcl/inc/unx/x11_cursors/salcursors.h
+++ b/vcl/inc/unx/x11_cursors/salcursors.h
@@ -61,33 +61,13 @@
 #include "unx/x11_cursors/drawfreehand_mask.h"
 #include "unx/x11_cursors/drawcaption_curs.h"
 #include "unx/x11_cursors/drawcaption_mask.h"
-#include "unx/x11_cursors/movedata_curs.h"
-#include "unx/x11_cursors/movedata_mask.h"
 #include "unx/x11_cursors/copydata_curs.h"
 #include "unx/x11_cursors/copydata_mask.h"
 #include "unx/x11_cursors/linkdata_curs.h"
 #include "unx/x11_cursors/linkdata_mask.h"
 #include "unx/x11_cursors/movedlnk_curs.h"
 #include "unx/x11_cursors/movedlnk_mask.h"
-#include "unx/x11_cursors/copydlnk_curs.h"
-#include "unx/x11_cursors/copydlnk_mask.h"
-#include "unx/x11_cursors/movefile_curs.h"
-#include "unx/x11_cursors/movefile_mask.h"
-#include "unx/x11_cursors/copyfile_curs.h"
-#include "unx/x11_cursors/copyfile_mask.h"
-#include "unx/x11_cursors/linkfile_curs.h"
-#include "unx/x11_cursors/linkfile_mask.h"
-#include "unx/x11_cursors/moveflnk_curs.h"
-#include "unx/x11_cursors/moveflnk_mask.h"
-#include "unx/x11_cursors/copyflnk_curs.h"
-#include "unx/x11_cursors/copyflnk_mask.h"
-#include "unx/x11_cursors/movefiles_curs.h"
-#include "unx/x11_cursors/movefiles_mask.h"
-#include "unx/x11_cursors/copyfiles_curs.h"
-#include "unx/x11_cursors/copyfiles_mask.h"
 
-#include "unx/x11_cursors/chart_curs.h"
-#include "unx/x11_cursors/chart_mask.h"
 #include "unx/x11_cursors/detective_curs.h"
 #include "unx/x11_cursors/detective_mask.h"
 #include "unx/x11_cursors/pivotcol_curs.h"
@@ -104,11 +84,6 @@
 #include "unx/x11_cursors/chainnot_curs.h"
 #include "unx/x11_cursors/chainnot_mask.h"
 
-#include "unx/x11_cursors/timemove_curs.h"
-#include "unx/x11_cursors/timemove_mask.h"
-#include "unx/x11_cursors/timesize_curs.h"
-#include "unx/x11_cursors/timesize_mask.h"
-
 #include "unx/x11_cursors/ase_curs.h"
 #include "unx/x11_cursors/ase_mask.h"
 #include "unx/x11_cursors/asn_curs.h"
@@ -134,8 +109,6 @@
 #include "unx/x11_cursors/null_curs.h"
 #include "unx/x11_cursors/null_mask.h"
 
-#include "unx/x11_cursors/airbrush_curs.h"
-#include "unx/x11_cursors/airbrush_mask.h"
 #include "unx/x11_cursors/fill_curs.h"
 #include "unx/x11_cursors/fill_mask.h"
 #include "unx/x11_cursors/vertcurs_curs.h"
@@ -150,8 +123,6 @@
 #include "unx/x11_cursors/tblselw_mask.h"
 #include "unx/x11_cursors/tblselsw_curs.h"
 #include "unx/x11_cursors/tblselsw_mask.h"
-#include "unx/x11_cursors/paintbrush_curs.h"
-#include "unx/x11_cursors/paintbrush_mask.h"
 #include "unx/x11_cursors/wshide_curs.h"
 #include "unx/x11_cursors/wshide_mask.h"
 #include "unx/x11_cursors/wsshow_curs.h"
diff --git a/vcl/inc/unx/x11_cursors/timemove_curs.h b/vcl/inc/unx/x11_cursors/timemove_curs.h
deleted file mode 100644
index 835781f..0000000
--- a/vcl/inc/unx/x11_cursors/timemove_curs.h
+++ /dev/null
@@ -1,34 +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 .
- */
-#define timemove_curs_width 32
-#define timemove_curs_height 32
-#define timemove_curs_x_hot 16
-#define timemove_curs_y_hot 16
-static unsigned char timemove_curs_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,
- 0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0xff,0xff,0x01,
- 0x00,0x01,0x01,0x01,0x00,0x01,0x01,0x01,0x00,0x01,0x01,0x01,0x00,0xff,0xff,
- 0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0xc0,
- 0x07,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/timemove_mask.h b/vcl/inc/unx/x11_cursors/timemove_mask.h
deleted file mode 100644
index 966c285..0000000
--- a/vcl/inc/unx/x11_cursors/timemove_mask.h
+++ /dev/null
@@ -1,34 +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 .
- */
-#define timemove_mask_width 32
-#define timemove_mask_height 32
-#define timemove_mask_x_hot 16
-#define timemove_mask_y_hot 16
-static unsigned char timemove_mask_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,
- 0xc0,0x07,0x00,0x00,0x80,0x03,0x00,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,
- 0x03,0x80,0xff,0xff,0x03,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,
- 0x0f,0x00,0x00,0xc0,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/timesize_curs.h b/vcl/inc/unx/x11_cursors/timesize_curs.h
deleted file mode 100644
index 6a10766..0000000
--- a/vcl/inc/unx/x11_cursors/timesize_curs.h
+++ /dev/null
@@ -1,34 +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 .
- */
-#define timesize_curs_width 32
-#define timesize_curs_height 32
-#define timesize_curs_x_hot 16
-#define timesize_curs_y_hot 16
-static unsigned char timesize_curs_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
- 0x01,0x01,0x01,0x00,0x81,0x03,0x01,0x00,0xc1,0x07,0x01,0x00,0x01,0x01,0x01,
- 0x00,0x01,0x01,0x01,0x00,0x01,0x01,0x01,0x00,0xff,0xff,0x01,0x00,0x00,0x01,
- 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0xc0,0x07,0x00,0x00,0x80,
- 0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/timesize_mask.h b/vcl/inc/unx/x11_cursors/timesize_mask.h
deleted file mode 100644
index 857c09f..0000000
--- a/vcl/inc/unx/x11_cursors/timesize_mask.h
+++ /dev/null
@@ -1,34 +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 .
- */
-#define timesize_mask_width 32
-#define timesize_mask_height 32
-#define timesize_mask_x_hot 16
-#define timesize_mask_y_hot 16
-static unsigned char timesize_mask_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
- 0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,
- 0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,
- 0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,
- 0x03,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,0xc0,
- 0x07,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 549e1cf..f17b3b5 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -142,7 +142,6 @@ curs_ent{ nullptr, { 0, 0 } }, //PointerStyle::Arrow
 { nullptr, { 0, 0 } }, //PointerStyle::VSizeBar
 { nullptr, { 0, 0 } }, //PointerStyle::Hand
 { nullptr, { 0, 0 } }, //PointerStyle::RefHand
-{ "pen", { 3, 27 } }, //PointerStyle::Pen
 { "magnify", { 12, 13 } }, //PointerStyle::Magnify
 { "fill", { 10, 22 } }, //PointerStyle::Fill
 { "rotate", { 15, 15 } }, //PointerStyle::Rotate
@@ -153,18 +152,9 @@ curs_ent{ nullptr, { 0, 0 } }, //PointerStyle::Arrow
 { "crop", { 9, 9 } }, //PointerStyle::Crop
 { "movept", { 0, 0 } }, //PointerStyle::MovePoint
 { "movebw", { 0, 0 } }, //PointerStyle::MoveBezierWeight
-{ "movedata", { 0, 0 } }, //PointerStyle::MoveData
 { "copydata", { 0, 0 } }, //PointerStyle::CopyData
 { "linkdata", { 0, 0 } }, //PointerStyle::LinkData
 { "movedlnk", { 0, 0 } }, //PointerStyle::MoveDataLink
-{ "copydlnk", { 0, 0 } }, //PointerStyle::CopyDataLink
-{ "movef", { 8, 8 } }, //PointerStyle::MoveFile
-{ "copyf", { 8, 8 } }, //PointerStyle::CopyFile
-{ "linkf", { 8, 8 } }, //PointerStyle::LinkFile
-{ "moveflnk", { 8, 8 } }, //PointerStyle::MoveFileLink
-{ "copyflnk", { 8, 8 } }, //PointerStyle::CopyFileLink
-{ "movef2", { 7, 8 } }, //PointerStyle::MoveFiles
-{ "copyf2", { 7, 8 } }, //PointerStyle::CopyFiles
 { "notallow", { 15, 15 } }, //PointerStyle::NotAllowed
 { "dline", { 8, 8 } }, //PointerStyle::DrawLine
 { "drect", { 8, 8 } }, //PointerStyle::DrawRect
@@ -178,15 +168,12 @@ curs_ent{ nullptr, { 0, 0 } }, //PointerStyle::Arrow
 { "dconnect", { 8, 8 } }, //PointerStyle::DrawConnect
 { "dtext", { 8, 8 } }, //PointerStyle::DrawText
 { "dcapt", { 8, 8 } }, //PointerStyle::DrawCaption
-{ "chart", { 15, 16 } }, //PointerStyle::Chart
 { "detectiv", { 12, 13 } }, //PointerStyle::Detective
 { "pivotcol", { 7, 5 } }, //PointerStyle::PivotCol
 { "pivotrow", { 8, 7 } }, //PointerStyle::PivotRow
 { "pivotfld", { 8, 7 } }, //PointerStyle::PivotField
 { "chain", { 0, 2 } }, //PointerStyle::Chain
 { "chainnot", { 2, 2 } }, //PointerStyle::ChainNotAllowed
-{ "timemove", { 16, 16 } }, //PointerStyle::TimeEventMove
-{ "timesize", { 16, 17 } }, //PointerStyle::TimeEventSize
 { "asn", { 16, 12 } }, //PointerStyle::AutoScrollN
 { "ass", { 15, 19 } }, //PointerStyle::AutoScrollS
 { "asw", { 12, 15 } }, //PointerStyle::AutoScrollW
@@ -198,7 +185,6 @@ curs_ent{ nullptr, { 0, 0 } }, //PointerStyle::Arrow
 { "asns", { 15, 15 } }, //PointerStyle::AutoScrollNS
 { "aswe", { 15, 15 } }, //PointerStyle::AutoScrollWE
 { "asnswe", { 15, 15 } }, //PointerStyle::AutoScrollNSWE
-{ "airbrush", { 5, 22 } }, //PointerStyle::Airbrush
 { "vtext", { 15, 15 } }, //PointerStyle::TextVertical
 { "pivotdel", { 18, 15 } }, //PointerStyle::PivotDelete
 { "tblsels", { 15, 30 } }, //PointerStyle::TabSelectS
@@ -206,7 +192,6 @@ curs_ent{ nullptr, { 0, 0 } }, //PointerStyle::Arrow
 { "tblselse", { 30, 30 } }, //PointerStyle::TabSelectSE
 { "tblselw", { 1, 16 } }, //PointerStyle::TabSelectW
 { "tblselsw", { 1, 30 } }, //PointerStyle::TabSelectSW
-{ "pntbrsh", { 9, 16 } }, //PointerStyle::Paintbrush
 { "wshide", { 16, 16 } }, //PointerStyle::HideWhitespace
 { "wsshow", { 16, 16 } } //PointerStyle::ShowWhitespace
 };
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 658126a..c2d0c8a 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -987,16 +987,6 @@ IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData, void )
             pEventData = &pData->maKeyEvent;
         break;
 
-        case VclEventId::WindowZoom:
-            nEvent = SalEvent::ExternalZoom;
-            pEventData = &pData->maZoomEvent;
-        break;
-
-        case VclEventId::WindowScroll:
-            nEvent = SalEvent::ExternalScroll;
-            pEventData = &pData->maScrollEvent;
-        break;
-
         default:
             nEvent = SalEvent::NONE;
             pEventData = nullptr;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 571c843..7acb1d6 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1427,7 +1427,6 @@ void PushButton::StateChanged( StateChangedType nType )
 
     if ( (nType == StateChangedType::Enable) ||
          (nType == StateChangedType::Text) ||
-         (nType == StateChangedType::Image) ||
          (nType == StateChangedType::Data) ||
          (nType == StateChangedType::State) ||
          (nType == StateChangedType::UpdateMode) )
@@ -2538,7 +2537,6 @@ void RadioButton::StateChanged( StateChangedType nType )
     }
     else if ( (nType == StateChangedType::Enable) ||
               (nType == StateChangedType::Text) ||
-              (nType == StateChangedType::Image) ||
               (nType == StateChangedType::Data) ||
               (nType == StateChangedType::UpdateMode) )
     {
@@ -3461,7 +3459,6 @@ void CheckBox::StateChanged( StateChangedType nType )
     }
     else if ( (nType == StateChangedType::Enable) ||
               (nType == StateChangedType::Text) ||
-              (nType == StateChangedType::Image) ||
               (nType == StateChangedType::Data) ||
               (nType == StateChangedType::UpdateMode) )
     {
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 78b9295..15a9215 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -265,7 +265,6 @@ void Control::StateChanged( StateChangedType nStateChange )
     if( nStateChange == StateChangedType::InitShow   ||
         nStateChange == StateChangedType::Visible    ||
         nStateChange == StateChangedType::Zoom       ||
-        nStateChange == StateChangedType::Border     ||
         nStateChange == StateChangedType::ControlFont
         )
     {
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 9490014..a81ec95 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1371,13 +1371,6 @@ void Edit::MouseButtonUp( const MouseEvent& rMEvt )
         ImplSetCursorPos( nCharPos, false );
         mbClickedInSelection = false;
     }
-    else if ( rMEvt.IsMiddle() && !mbReadOnly &&
-              ( GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection ) )
-    {
-        css::uno::Reference<css::datatransfer::clipboard::XClipboard> aSelection(Window::GetPrimarySelection());
-        ImplPaste( aSelection );
-        ImplModified();
-    }
 }
 
 void Edit::Tracking( const TrackingEvent& rTEvt )
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 9fa9259..8699725 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -2618,32 +2618,6 @@ void TimeField::SetExtFormat( ExtTimeFieldFormat eFormat )
             SetFormat( TimeFieldFormat::F_SEC );
         }
         break;
-        case ExtTimeFieldFormat::Short12H:
-        {
-            SetTimeFormat( TimeFormat::Hour12 );
-            SetDuration( false );
-            SetFormat( TimeFieldFormat::F_NONE );
-        }
-        break;
-        case ExtTimeFieldFormat::Long12H:
-        {
-            SetTimeFormat( TimeFormat::Hour12 );
-            SetDuration( false );
-            SetFormat( TimeFieldFormat::F_SEC );
-        }
-        break;
-        case ExtTimeFieldFormat::ShortDuration:
-        {
-            SetDuration( true );
-            SetFormat( TimeFieldFormat::F_NONE );
-        }
-        break;
-        case ExtTimeFieldFormat::LongDuration:
-        {
-            SetDuration( true );
-            SetFormat( TimeFieldFormat::F_SEC );
-        }
-        break;
         default:    OSL_FAIL( "ExtTimeFieldFormat unknown!" );
     }
 
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 2a855e0..86297ad 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -70,7 +70,6 @@ namespace
     ::std::vector< Image > lcl_loadImageSet( const Throbber::ImageSet i_imageSet )
     {
         ::std::vector< Image > aImages;
-        ENSURE_OR_RETURN( i_imageSet != Throbber::ImageSet::NONE, "lcl_loadImageSet: illegal image set", aImages );
 
         const Reference< css::uno::XComponentContext > aContext( ::comphelper::getProcessComponentContext() );
         const Reference< XGraphicProvider > xGraphicProvider( css::graphic::GraphicProvider::create(aContext) );
@@ -104,9 +103,6 @@ void Throbber::Resize()
 
 void Throbber::initImages()
 {
-    if ( meImageSet == ImageSet::NONE )
-        return;
-
     try
     {
         ::std::vector< ::std::vector< Image > > aImageSets;
@@ -203,7 +199,6 @@ void Throbber::setImageList( ::std::vector< Image > const& i_images )
     case ImageSet::N16px:  index = 0;  break;
     case ImageSet::N32px:  index = 1;  break;
     case ImageSet::N64px:  index = 2;  break;
-    case ImageSet::NONE:
     case ImageSet::Auto:
         OSL_ENSURE( false, "Throbber::getDefaultImageURLs: illegal image set!" );
         return aImageURLs;
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index a6d7908..f810b56 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -742,15 +742,7 @@ void TextView::MouseButtonUp( const MouseEvent& rMouseEvent )
     mpImpl->mbClickedInSelection = false;
     mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW;
     mpImpl->mpSelEngine->SelMouseButtonUp( rMouseEvent );
-    if ( rMouseEvent.IsMiddle() && !IsReadOnly() &&
-         ( GetWindow()->GetSettings().GetMouseSettings().GetMiddleButtonAction() == MouseMiddleButtonAction::PasteSelection ) )
-    {
-        css::uno::Reference<css::datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection());
-        Paste( aSelection );
-        if ( mpImpl->mpTextEngine->IsModified() )
-            mpImpl->mpTextEngine->Broadcast( TextHint( SfxHintId::TextModified ) );
-    }
-    else if ( rMouseEvent.IsLeft() && GetSelection().HasRange() )
+    if ( rMouseEvent.IsLeft() && GetSelection().HasRange() )
     {
         css::uno::Reference<css::datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection());
         Copy( aSelection );
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index c55b864..5bf02c5 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -238,12 +238,6 @@ bool BitmapReadAccess::ImplSetAccessPointers( ScanlineFormat nFormat )
             mFncSetPixel = SetPixelForN24BitTcRgb;
         }
         break;
-        case ScanlineFormat::N24BitTcMask:
-        {
-            mFncGetPixel = GetPixelForN24BitTcMask;
-            mFncSetPixel = SetPixelForN24BitTcMask;
-        }
-        break;
         case ScanlineFormat::N32BitTcAbgr:
         {
             mFncGetPixel = GetPixelForN32BitTcAbgr;
@@ -438,7 +432,7 @@ void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline,
         {
             DBG_ASSERT( nFormat != ScanlineFormat::N8BitTcMask &&
                         nFormat != ScanlineFormat::N16BitTcMsbMask && nFormat != ScanlineFormat::N16BitTcLsbMask &&
-                        nFormat != ScanlineFormat::N24BitTcMask && nFormat != ScanlineFormat::N32BitTcMask,
+                        nFormat != ScanlineFormat::N32BitTcMask,
                         "No support for pixel formats with color masks yet!" );
 
             // TODO: use fastbmp infrastructure
@@ -456,7 +450,6 @@ void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline,
                 case ScanlineFormat::N16BitTcLsbMask:   pFncGetPixel = GetPixelForN16BitTcLsbMask; break;
                 case ScanlineFormat::N24BitTcBgr:    pFncGetPixel = GetPixelForN24BitTcBgr; break;
                 case ScanlineFormat::N24BitTcRgb:    pFncGetPixel = GetPixelForN24BitTcRgb; break;
-                case ScanlineFormat::N24BitTcMask:   pFncGetPixel = GetPixelForN24BitTcMask; break;
                 case ScanlineFormat::N32BitTcAbgr:   pFncGetPixel = GetPixelForN32BitTcAbgr; break;
                 case ScanlineFormat::N32BitTcArgb:   pFncGetPixel = GetPixelForN32BitTcArgb; break;
                 case ScanlineFormat::N32BitTcBgra:   pFncGetPixel = GetPixelForN32BitTcBgra; break;
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index e2991df..8131a53 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -391,8 +391,6 @@ inline bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc
 
         case ScanlineFormat::N8BitTcMask:
 //            return ImplConvertToBitmap<ScanlineFormat::N8BitTcMask>( aSrcType, rDst, rSrc );
-        case ScanlineFormat::N24BitTcMask:
-//            return ImplConvertToBitmap<ScanlineFormat::N24BitTcMask>( aSrcType, rDst, rSrc );
         case ScanlineFormat::N32BitTcMask:
 //            return ImplConvertToBitmap<ScanlineFormat::N32BitTcMask>( aSrcType, rDst, rSrc );
             break;
@@ -501,8 +499,6 @@ bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc,
 
         case ScanlineFormat::N8BitTcMask:
 //            return ImplConvertFromBitmap<ScanlineFormat::N8BitTcMask>( rDst, rSrc );
-        case ScanlineFormat::N24BitTcMask:
-//            return ImplConvertFromBitmap<ScanlineFormat::N24BitTcMask>( rDst, rSrc );
         case ScanlineFormat::N32BitTcMask:
 //            return ImplConvertFromBitmap<ScanlineFormat::N32BitTcMask>( rDst, rSrc );
             break;
@@ -630,8 +626,6 @@ bool ImplBlendFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc, const Bi
 
         case ScanlineFormat::N8BitTcMask:
 //            return ImplBlendToBitmap<ScanlineFormat::N8BitTcMask>( aSrcType, rDst, rSrc, rMsk );
-        case ScanlineFormat::N24BitTcMask:
-//            return ImplBlendToBitmap<ScanlineFormat::N24BitTcMask>( aSrcType, rDst, rSrc, rMsk );
         case ScanlineFormat::N32BitTcMask:
 //            return ImplBlendToBitmap<ScanlineFormat::N32BitTcMask>( aSrcType, rDst, rSrc, rMsk );
             break;
@@ -747,8 +741,6 @@ bool ImplFastBitmapBlending( BitmapWriteAccess& rDstWA,
 
         case ScanlineFormat::N8BitTcMask:
 //            return ImplBlendFromBitmap<ScanlineFormat::N8BitTcMask>( rDst, rSrc );
-        case ScanlineFormat::N24BitTcMask:
-//            return ImplBlendFromBitmap<ScanlineFormat::N24BitTcMask>( rDst, rSrc );
         case ScanlineFormat::N32BitTcMask:
 //            return ImplBlendFromBitmap<ScanlineFormat::N32BitTcMask>( rDst, rSrc );
             break;
@@ -810,7 +802,6 @@ bool ImplFastEraseBitmap( BitmapBuffer& rDst, const BitmapColor& rColor )
             nFillByte = rColor.GetIndex();
             break;
 
-        case ScanlineFormat::N24BitTcMask:
         case ScanlineFormat::N24BitTcBgr:
         case ScanlineFormat::N24BitTcRgb:
             nFillByte = rColor.GetRed();
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 386e6837..f70604b0 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -43,11 +43,7 @@ struct PDFExtOutDevDataSync
                     SetScreenStream,
                     RegisterDest,
                     CreateOutlineItem,
-                    SetOutlineItemParent,
-                    SetOutlineItemText,
-                    SetOutlineItemDest,
                     CreateNote,
-                    SetAutoAdvanceTime,
                     SetPageTransition,
 
                     BeginStructureElement,
@@ -60,7 +56,6 @@ struct PDFExtOutDevDataSync
                     SetAlternateText,
                     CreateControl,
                     BeginGroup,
-                    EndGroup,
                     EndGroupGfxLink
     };
 
@@ -248,27 +243,6 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter )
                 mParaOUStrings.pop_front();
             }
             break;
-            case PDFExtOutDevDataSync::SetOutlineItemParent :
-            {
-                sal_Int32 nItem = GetMappedId();
-                sal_Int32 nNewParent = GetMappedId();
-                rWriter.SetOutlineItemParent( nItem, nNewParent );
-            }
-            break;
-            case PDFExtOutDevDataSync::SetOutlineItemText :
-            {
-                sal_Int32 nItem = GetMappedId();
-                rWriter.SetOutlineItemText( nItem, mParaOUStrings.front() );
-                mParaOUStrings.pop_front();
-            }
-            break;
-            case PDFExtOutDevDataSync::SetOutlineItemDest :
-            {
-                sal_Int32 nItem = GetMappedId();
-                sal_Int32 nDestId = GetMappedId();
-                rWriter.SetOutlineItemDest( nItem, nDestId );
-            }
-            break;
             case PDFExtOutDevDataSync::CreateNote :
             {
                 rWriter.Push( PushFlags::MAPMODE );
@@ -280,13 +254,6 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter )
                 mParaInts.pop_front();
             }
             break;
-            case PDFExtOutDevDataSync::SetAutoAdvanceTime :
-            {
-                rWriter.SetAutoAdvanceTime( mParauInts.front(), mParaInts.front() );
-                mParauInts.pop_front();
-                mParaInts.pop_front();
-            }
-            break;
             case PDFExtOutDevDataSync::SetPageTransition :
             {
                 rWriter.SetPageTransition( mParaPageTransitions.front(), mParauInts.front(), mParaInts.front() );
@@ -305,7 +272,6 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter )
             case PDFExtOutDevDataSync::SetAlternateText:
             case PDFExtOutDevDataSync::CreateControl:
             case PDFExtOutDevDataSync::BeginGroup:
-            case PDFExtOutDevDataSync::EndGroup:
             case PDFExtOutDevDataSync::EndGroupGfxLink:
                 break;
         }
@@ -430,11 +396,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc
                 std::deque< PDFExtOutDevDataSync >::iterator aEnd = mActions.end();
                 while ( aBeg != aEnd )
                 {
-                    if ( aBeg->eAct == PDFExtOutDevDataSync::EndGroup )
-                    {
-                        break;
-                    }
-                    else if ( aBeg->eAct == PDFExtOutDevDataSync::EndGroupGfxLink )
+                    if ( aBeg->eAct == PDFExtOutDevDataSync::EndGroupGfxLink )
                     {
                         Graphic& rGraphic = mGraphics.front();
                         if ( rGraphic.IsLink() )
@@ -460,11 +422,6 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc
                 }
             }
             break;
-            case PDFExtOutDevDataSync::EndGroup :
-            {
-                mbGroupIgnoreGDIMtfActions = false;
-            }
-            break;
             case PDFExtOutDevDataSync::EndGroupGfxLink :
             {
                 Rectangle aOutputRect, aVisibleOutputRect;
@@ -529,11 +486,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc
             case PDFExtOutDevDataSync::SetScreenStream:
             case PDFExtOutDevDataSync::RegisterDest:
             case PDFExtOutDevDataSync::CreateOutlineItem:
-            case PDFExtOutDevDataSync::SetOutlineItemParent:
-            case PDFExtOutDevDataSync::SetOutlineItemText:
-            case PDFExtOutDevDataSync::SetOutlineItemDest:
             case PDFExtOutDevDataSync::CreateNote:

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list