[Libreoffice-commits] core.git: 5 commits - desktop/source include/vcl sfx2/inc sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk vcl/inc vcl/osx vcl/Package_osxres.mk vcl/unx vcl/win vcl/WinResTarget_vcl.mk
Caolán McNamara
caolanm at redhat.com
Fri Apr 14 09:27:48 UTC 2017
desktop/source/lib/init.cxx | 2
dev/null |binary
include/vcl/ptrstyle.hxx | 190 ++++++++++++++----------------
sfx2/UIConfig_sfx.mk | 2
sfx2/inc/app.hrc | 1
sfx2/source/appl/newhelp.cxx | 17 ++
sfx2/source/appl/newhelp.src | 29 ----
sfx2/source/dialog/dialog.hrc | 8 -
sfx2/source/dialog/dialog.src | 34 -----
sfx2/source/dialog/templdlg.cxx | 43 +++---
sfx2/source/inc/helpid.hrc | 6
sfx2/source/inc/templdgi.hxx | 3
sfx2/uiconfig/ui/bookmarkdialog.ui | 1
sfx2/uiconfig/ui/bookmarkmenu.ui | 39 ++++++
sfx2/uiconfig/ui/stylecontextmenu.ui | 49 +++++++
vcl/Package_osxres.mk | 4
vcl/WinResTarget_vcl.mk | 4
vcl/inc/unx/x11_cursors/airbrush_curs.h | 34 -----
vcl/inc/unx/x11_cursors/airbrush_mask.h | 34 -----
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 | 9 -
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/inc/win/salids.hrc | 4
vcl/osx/saldata.cxx | 4
vcl/unx/generic/app/saldisp.cxx | 14 --
vcl/unx/gtk/gtkdata.cxx | 6
vcl/unx/gtk3/gtk3gtkdata.cxx | 6
vcl/win/src/salsrc.rc | 4
vcl/win/window/salframe.cxx | 6
33 files changed, 223 insertions(+), 522 deletions(-)
New commits:
commit 6f20cb94640224c47efa0a9de8ee757260ba3771
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 14 10:16:48 2017 +0100
convert style context menu to .ui
Change-Id: Ie72a1ecb91ddbbf2230ff2a56e361af98898d730
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index ecb8c62b9e55..c976d89369cd 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/securityinfopage \
sfx2/uiconfig/ui/singletabdialog \
sfx2/uiconfig/ui/startcenter \
+ sfx2/uiconfig/ui/stylecontextmenu \
sfx2/uiconfig/ui/templatedlg \
sfx2/uiconfig/ui/saveastemplatedlg \
sfx2/uiconfig/ui/templatecategorydlg \
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 4c93cbfdedf1..fc3e67ea53ab 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -24,12 +24,6 @@
// defines ---------------------------------------------------------------
-#define ID_NEW 1
-#define ID_EDIT 2
-#define ID_DELETE 3
-#define ID_HIDE 4
-#define ID_SHOW 5
-
#define RC_DIALOG_BEGIN RID_SFX_DIALOG_START
#define STR_RESET ( RC_DIALOG_BEGIN + 0)
@@ -42,8 +36,6 @@
#define STR_DELETE_STYLE ( RC_DIALOG_BEGIN + 19)
#define STR_DELETE_STYLE_USED ( RC_DIALOG_BEGIN + 20)
-#define MN_CONTEXT_TEMPLDLG ( RC_DIALOG_BEGIN + 46)
-
#define STR_VIEWVERSIONCOMMENT ( RC_DIALOG_BEGIN + 71 )
#define STR_NO_NAME_SET ( RC_DIALOG_BEGIN + 72 )
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index 42cedfa0aee5..27600db38fde 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -50,40 +50,6 @@ String STR_DELETE_STYLE
{
Text [ en-US ] = "Styles in use: " ;
};
-Menu MN_CONTEXT_TEMPLDLG
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = ID_NEW ;
- Text [ en-US ] = "New..." ;
- HelpId = HID_STYLIST_NEW ;
- };
- MenuItem
- {
- Identifier = ID_EDIT ;
- Text [ en-US ] = "Modify..." ;
- HelpId = HID_STYLIST_EDIT ;
- };
- MenuItem
- {
- Identifier = ID_HIDE ;
- Text [ en-US ] = "Hide" ;
- };
- MenuItem
- {
- Identifier = ID_SHOW ;
- Text [ en-US ] = "Show" ;
- };
- MenuItem
- {
- Identifier = ID_DELETE ;
- Text [ en-US ] = "Delete..." ;
- HelpId = HID_STYLIST_DELETE ;
- };
- };
-};
String SID_NAVIGATOR
{
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 3547bc006271..af4ee87f3c6f 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -169,8 +169,6 @@ void StyleLBoxString::Paint(
#define SFX_TEMPLDLG_MIDVSPACE 3
#define SFX_TEMPLDLG_FILTERHEIGHT 100
-static sal_uInt16 nLastItemId = USHRT_MAX;
-
// filter box has maximum 14 entries visible
#define MAX_FILTER_ENTRIES 14
@@ -2088,7 +2086,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool )
{
- nLastItemId = pMenu->GetCurItemId();
+ sLastItemIdent = pMenu->GetCurItemIdent();
Application::PostUserEvent(
LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl ) );
return true;
@@ -2096,13 +2094,16 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool )
IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl, void*, void )
{
- switch(nLastItemId) {
- case ID_NEW: NewHdl(); break;
- case ID_EDIT: EditHdl(); break;
- case ID_DELETE: DeleteHdl(); break;
- case ID_HIDE: HideHdl(); break;
- case ID_SHOW: ShowHdl(); break;
- }
+ if (sLastItemIdent == "new")
+ NewHdl();
+ else if (sLastItemIdent == "edit")
+ EditHdl();
+ else if (sLastItemIdent == "delete")
+ DeleteHdl();
+ else if (sLastItemIdent == "hide")
+ HideHdl();
+ else if (sLastItemIdent == "show")
+ ShowHdl();
}
SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
@@ -2133,22 +2134,24 @@ VclPtr<PopupMenu> SfxCommonTemplateDialog_Impl::CreateContextMenu()
pBindings->Update( SID_STYLE_NEW );
bBindingUpdate = false;
}
- VclPtr<PopupMenu> pMenu = VclPtr<PopupMenu>::Create( SfxResId( MN_CONTEXT_TEMPLDLG ) );
- pMenu->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ) );
- pMenu->EnableItem( ID_EDIT, bCanEdit );
- pMenu->EnableItem( ID_DELETE, bCanDel );
- pMenu->EnableItem( ID_NEW, bCanNew );
- pMenu->EnableItem( ID_HIDE, bCanHide );
- pMenu->EnableItem( ID_SHOW, bCanShow );
+ mxMenu.disposeAndClear();
+ mxBuilder.reset(new VclBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "sfx/ui/stylecontextmenu.ui", ""));
+ mxMenu.set(mxBuilder->get_menu("menu"));
+ mxMenu->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ) );
+ mxMenu->EnableItem(mxMenu->GetItemId("edit"), bCanEdit);
+ mxMenu->EnableItem(mxMenu->GetItemId("delete"), bCanDel);
+ mxMenu->EnableItem(mxMenu->GetItemId("new"), bCanNew);
+ mxMenu->EnableItem(mxMenu->GetItemId("hide"), bCanHide);
+ mxMenu->EnableItem(mxMenu->GetItemId("show"), bCanShow);
const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
if (pItem && pItem->GetFamily() == SfxStyleFamily::Table) //tdf#101648, no ui for this yet
{
- pMenu->EnableItem(ID_EDIT, false);
- pMenu->EnableItem(ID_NEW, false);
+ mxMenu->EnableItem(mxMenu->GetItemId("edit"), false);
+ mxMenu->EnableItem(mxMenu->GetItemId("new"), false);
}
- return pMenu;
+ return mxMenu;
}
static OUString lcl_GetLabel(uno::Any& rAny)
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 70f21bf2ee70..f580d851ebde 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -30,9 +30,6 @@
#define HID_TABDLG_RESET_BTN "SFX2_HID_TABDLG_RESET_BTN"
#define HID_TABDLG_STANDARD_BTN "SFX2_HID_TABDLG_STANDARD_BTN"
#define HID_TEMPLDLG_TOOLBOX_LEFT "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT"
-#define HID_STYLIST_NEW "SFX2_HID_STYLIST_NEW"
-#define HID_STYLIST_EDIT "SFX2_HID_STYLIST_EDIT"
-#define HID_STYLIST_DELETE "SFX2_HID_STYLIST_DELETE"
#define HID_HELP_WINDOW "SFX2_HID_HELP_WINDOW"
#define HID_HELP_TOOLBOX "SFX2_HID_HELP_TOOLBOX"
#define HID_HELP_TOOLBOXITEM_INDEX "SFX2_HID_HELP_TOOLBOXITEM_INDEX"
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 3af5440d0b3c..90c0e6ba82ea 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -172,6 +172,9 @@ protected:
SfxTemplateControllerItem* pBoundItems[COUNT_BOUND_FUNC];
VclPtr<vcl::Window> pWindow;
+ std::unique_ptr<VclBuilder> mxBuilder;
+ VclPtr<PopupMenu> mxMenu;
+ OString sLastItemIdent;
SfxModule* pModule;
Idle* pIdle;
diff --git a/sfx2/uiconfig/ui/stylecontextmenu.ui b/sfx2/uiconfig/ui/stylecontextmenu.ui
new file mode 100644
index 000000000000..da524cf902b4
--- /dev/null
+++ b/sfx2/uiconfig/ui/stylecontextmenu.ui
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkMenu" id="menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="new">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">New...</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="edit">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Modify...</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="hide">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Hide</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="show">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="delete">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Delete...</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+</interface>
commit 3e535baddc534fbb183d763b3a70f457117ceb83
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 14 09:56:23 2017 +0100
only one button should have has_default set
Change-Id: If47aa714e34d4acd7a9fc2e3f600ad4de847cdda
diff --git a/sfx2/uiconfig/ui/bookmarkdialog.ui b/sfx2/uiconfig/ui/bookmarkdialog.ui
index 3f83f865ac09..c9ce55395992 100644
--- a/sfx2/uiconfig/ui/bookmarkdialog.ui
+++ b/sfx2/uiconfig/ui/bookmarkdialog.ui
@@ -65,7 +65,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
commit 8cbec30fcdb16bac41c7dd2ebc9667cd3a71f699
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 14 09:54:18 2017 +0100
convert bookmark menu to .ui
Change-Id: I7b62c3234fd986a0648b9a543d0e44a922ee15e4
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index e057deb2973b..ecb8c62b9e55 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,sfx))
$(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/alienwarndialog \
sfx2/uiconfig/ui/bookmarkdialog \
+ sfx2/uiconfig/ui/bookmarkmenu \
sfx2/uiconfig/ui/checkin \
sfx2/uiconfig/ui/cmisinfopage \
sfx2/uiconfig/ui/cmisline \
diff --git a/sfx2/inc/app.hrc b/sfx2/inc/app.hrc
index e08c2ac5f268..1a95425fecf8 100644
--- a/sfx2/inc/app.hrc
+++ b/sfx2/inc/app.hrc
@@ -35,7 +35,6 @@
#define CONFIG_PATH_START (RID_SFX_APP_START+98)
-#define MENU_HELP_BOOKMARKS (RID_SFX_APP_START+105)
#define STR_INFO_NOSEARCHRESULTS (RID_SFX_APP_START+106)
#define STR_INFO_NOSEARCHTEXTFOUND (RID_SFX_APP_START+107)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 061d94622c0a..4cb7668d9135 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1247,10 +1247,19 @@ bool BookmarksBox_Impl::EventNotify( NotifyEvent& rNEvt )
const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
if ( pCEvt->GetCommand() == CommandEventId::ContextMenu )
{
- ScopedVclPtrInstance<PopupMenu> aMenu( SfxResId( MENU_HELP_BOOKMARKS ) );
- sal_uInt16 nId = aMenu->Execute( this, pCEvt->GetMousePosPixel() );
- if ( nId != MENU_ITEM_NOTFOUND )
- DoAction( nId );
+ VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "sfx/ui/bookmarkmenu.ui", "");
+ VclPtr<PopupMenu> aMenu(aBuilder.get_menu("menu"));
+ sal_uInt16 nId = aMenu->Execute(this, pCEvt->GetMousePosPixel());
+ if (nId != MENU_ITEM_NOTFOUND)
+ {
+ OString sIdent = aMenu->GetCurItemIdent();
+ if (sIdent == "display")
+ DoAction(MID_OPEN);
+ else if (sIdent == "rename")
+ DoAction(MID_RENAME);
+ else if (sIdent == "delete")
+ DoAction(MID_DELETE);
+ }
bRet = true;
}
}
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 2955f9052499..ae0bd6d3bce9 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -141,35 +141,6 @@ String STR_HELP_MENU_TEXT_COPY
Text [ en-US ] = "~Copy" ;
};
-Menu MENU_HELP_BOOKMARKS
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = MID_OPEN ;
- HelpId = HID_HELP_BOOKMARKS_OPEN;
- Text [ en-US ] = "Display";
- };
- MenuItem
- {
- Separator = TRUE ;
- };
- MenuItem
- {
- Identifier = MID_RENAME ;
- HelpId = HID_HELP_BOOKMARKS_RENAME;
- Text [ en-US ] = "Rename...";
- };
- MenuItem
- {
- Identifier = MID_DELETE ;
- HelpId = HID_HELP_BOOKMARKS_DELETE;
- Text [ en-US ] = "Delete";
- };
- };
-};
-
String STR_INFO_NOSEARCHRESULTS
{
Text [ en-US ] = "No topics found.";
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index da1baf6fc394..70f21bf2ee70 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -42,9 +42,6 @@
#define HID_HELP_TOOLBOXITEM_PRINT "SFX2_HID_HELP_TOOLBOXITEM_PRINT"
#define HID_HELP_TOOLBOXITEM_BOOKMARKS "SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS"
#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG"
-#define HID_HELP_BOOKMARKS_OPEN "SFX2_HID_HELP_BOOKMARKS_OPEN"
-#define HID_HELP_BOOKMARKS_RENAME "SFX2_HID_HELP_BOOKMARKS_RENAME"
-#define HID_HELP_BOOKMARKS_DELETE "SFX2_HID_HELP_BOOKMARKS_DELETE"
#define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE"
#define HID_CONFIG_SAVE "SFX2_HID_CONFIG_SAVE"
diff --git a/sfx2/uiconfig/ui/bookmarkmenu.ui b/sfx2/uiconfig/ui/bookmarkmenu.ui
new file mode 100644
index 000000000000..84e0aa6840d7
--- /dev/null
+++ b/sfx2/uiconfig/ui/bookmarkmenu.ui
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkMenu" id="menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="display">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Display</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="menuitem1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="rename">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Rename...</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="delete">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Delete</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+</interface>
commit 32f34f0d1be9ea2c80772ba386b1df3a5a42d86d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 14 09:33:21 2017 +0100
remove the remaining unused mouse cursors
which are not used by us directly or aliases of published awt constants
Change-Id: Ic4f009715d71a2f986b8ef8d64b4b2e64986bf3b
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 608d2bbc9ac4..5c3bcd0a4526 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -243,9 +243,7 @@ static const std::map <PointerStyle, OString> aPointerMap {
{ PointerStyle::NotAllowed, "not-allowed" },
// DrawLine through DrawCaption
// Chart, Detective, PivotCol, PivotRow, PivotField, Chain, ChainNotAllowed
- // TimeEventMove, TimeEventSize
// AutoScrollN through AutoScrollNSWE
- // Airbrush
{ PointerStyle::TextVertical, "vertical-text" }
// Pivot Delete, TabSelectS through TabSelectSW
// PaintBrush, HideWhiteSpace, ShowWhiteSpace
diff --git a/include/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx
index be95dfa81792..e2ae0238e301 100644
--- a/include/vcl/ptrstyle.hxx
+++ b/include/vcl/ptrstyle.hxx
@@ -96,30 +96,26 @@ enum class PointerStyle
PivotField = css::awt::SystemPointer::PIVOT_FIELD,
Chain = css::awt::SystemPointer::CHAIN,
ChainNotAllowed = css::awt::SystemPointer::CHAIN_NOTALLOWED,
- 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,
+ 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/vcl/Package_osxres.mk b/vcl/Package_osxres.mk
index 224853f25993..10451fec779e 100644
--- a/vcl/Package_osxres.mk
+++ b/vcl/Package_osxres.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Package_add_files_with_dir,vcl_osxres,Resources,\
MainMenu.nib/classes.nib \
MainMenu.nib/info.nib \
MainMenu.nib/keyedobjects.nib \
- cursors/airbrush.png \
cursors/ase.png \
cursors/asn.png \
cursors/asne.png \
@@ -72,15 +71,12 @@ $(eval $(call gb_Package_add_files_with_dir,vcl_osxres,Resources,\
cursors/pivotdel.png \
cursors/pivotfld.png \
cursors/pivotrow.png \
- cursors/pntbrsh.png \
cursors/rotate.png \
cursors/tblsele.png \
cursors/tblsels.png \
cursors/tblselse.png \
cursors/tblselsw.png \
cursors/tblselw.png \
- cursors/timemove.png \
- cursors/timesize.png \
cursors/vshear.png \
cursors/vtext.png \
))
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index b3ad34fd63f6..f7195b432ae2 100644
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
vcl/win/src/dpolygon.cur \
vcl/win/src/movedlnk.cur \
vcl/win/src/salsrc.rc \
- vcl/win/src/airbrush.cur \
vcl/win/src/copyf.cur \
vcl/win/src/drect.cur \
vcl/win/src/movef.cur \
@@ -66,10 +65,8 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
vcl/win/src/asnw.cur \
vcl/win/src/darc.cur \
vcl/win/src/nullptr.cur \
- vcl/win/src/timemove.cur \
vcl/win/src/ass.cur \
vcl/win/src/dbezier.cur \
- vcl/win/src/timesize.cur \
vcl/win/src/asse.cur \
vcl/win/src/dcapt.cur \
vcl/win/src/vshear.cur \
@@ -92,7 +89,6 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
vcl/win/src/vtext.cur \
vcl/win/src/chainnot.cur \
vcl/win/src/dfree.cur \
- vcl/win/src/pntbrsh.cur \
vcl/win/src/chart.cur \
vcl/win/src/dline.cur \
vcl/win/src/movebw.cur \
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 038e56ebbac4..000000000000
--- 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 cc92822251c5..000000000000
--- 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/paintbrush_curs.h b/vcl/inc/unx/x11_cursors/paintbrush_curs.h
deleted file mode 100644
index fdaa4225d6f2..000000000000
--- 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 8304dfbfbab3..000000000000
--- 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 627352f9ef4c..5ab22720ef5f 100644
--- a/vcl/inc/unx/x11_cursors/salcursors.h
+++ b/vcl/inc/unx/x11_cursors/salcursors.h
@@ -104,11 +104,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 +129,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 +143,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 835781f1b5d8..000000000000
--- 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 966c2852009e..000000000000
--- 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 6a1076640537..000000000000
--- 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 857c09fcdb13..000000000000
--- 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/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index e1d85b0f0a85..092a24b5225b 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -63,8 +63,6 @@
#define SAL_RESID_POINTER_PIVOT_FIELD 10054
#define SAL_RESID_POINTER_CHAIN 10055
#define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10056
-#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10057
-#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10058
#define SAL_RESID_POINTER_AUTOSCROLL_N 10059
#define SAL_RESID_POINTER_AUTOSCROLL_S 10060
#define SAL_RESID_POINTER_AUTOSCROLL_W 10061
@@ -76,7 +74,6 @@
#define SAL_RESID_POINTER_AUTOSCROLL_NS 10067
#define SAL_RESID_POINTER_AUTOSCROLL_WE 10068
#define SAL_RESID_POINTER_AUTOSCROLL_NSWE 10069
-#define SAL_RESID_POINTER_AIRBRUSH 10070
#define SAL_RESID_POINTER_TEXT_VERTICAL 10071
#define SAL_RESID_POINTER_PIVOT_DELETE 10072
#define SAL_RESID_POINTER_TAB_SELECT_S 10073
@@ -84,7 +81,6 @@
#define SAL_RESID_POINTER_TAB_SELECT_SE 10075
#define SAL_RESID_POINTER_TAB_SELECT_W 10076
#define SAL_RESID_POINTER_TAB_SELECT_SW 10077
-#define SAL_RESID_POINTER_PAINTBRUSH 10078
#define SAL_RESID_POINTER_HIDEWHITESPACE 10079
#define SAL_RESID_POINTER_SHOWWHITESPACE 10080
diff --git a/vcl/osx/res/cursors/airbrush.png b/vcl/osx/res/cursors/airbrush.png
deleted file mode 100644
index 7ec780c4f9f9..000000000000
Binary files a/vcl/osx/res/cursors/airbrush.png and /dev/null differ
diff --git a/vcl/osx/res/cursors/pntbrsh.png b/vcl/osx/res/cursors/pntbrsh.png
deleted file mode 100644
index ec8d799f66c2..000000000000
Binary files a/vcl/osx/res/cursors/pntbrsh.png and /dev/null differ
diff --git a/vcl/osx/res/cursors/timemove.png b/vcl/osx/res/cursors/timemove.png
deleted file mode 100644
index 3dae038a2011..000000000000
Binary files a/vcl/osx/res/cursors/timemove.png and /dev/null differ
diff --git a/vcl/osx/res/cursors/timesize.png b/vcl/osx/res/cursors/timesize.png
deleted file mode 100644
index 22178c9b8d0e..000000000000
Binary files a/vcl/osx/res/cursors/timesize.png and /dev/null differ
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 549e1cf882b8..de139319e8bd 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -185,8 +185,6 @@ curs_ent{ nullptr, { 0, 0 } }, //PointerStyle::Arrow
{ "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 +196,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 +203,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/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 80c28f90fe76..3372fa54dae4 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1771,12 +1771,6 @@ Cursor SalDisplay::GetPointer( PointerStyle ePointerStyle )
case PointerStyle::ChainNotAllowed:
MAKE_CURSOR( chainnot_ );
break;
- case PointerStyle::TimeEventMove:
- MAKE_CURSOR( timemove_ );
- break;
- case PointerStyle::TimeEventSize:
- MAKE_CURSOR( timesize_ );
- break;
case PointerStyle::AutoScrollN:
MAKE_CURSOR(asn_ );
break;
@@ -1810,9 +1804,6 @@ Cursor SalDisplay::GetPointer( PointerStyle ePointerStyle )
case PointerStyle::AutoScrollNSWE:
MAKE_CURSOR( asnswe_ );
break;
- case PointerStyle::Airbrush:
- MAKE_CURSOR( airbrush_ );
- break;
case PointerStyle::TextVertical:
MAKE_CURSOR( vertcurs_ );
break;
@@ -1834,11 +1825,6 @@ Cursor SalDisplay::GetPointer( PointerStyle ePointerStyle )
MAKE_CURSOR( tblselsw_ );
break;
- // #i20119# Paintbrush tool
- case PointerStyle::Paintbrush:
- MAKE_CURSOR( paintbrush_ );
- break;
-
case PointerStyle::HideWhitespace:
MAKE_CURSOR( hidewhitespace_ );
break;
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index 0a3429717f51..966d0b779c9d 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -349,8 +349,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
MAKE_CURSOR( PointerStyle::PivotDelete, pivotdel_ );
MAKE_CURSOR( PointerStyle::Chain, chain_ );
MAKE_CURSOR( PointerStyle::ChainNotAllowed, chainnot_ );
- MAKE_CURSOR( PointerStyle::TimeEventMove, timemove_ );
- MAKE_CURSOR( PointerStyle::TimeEventSize, timesize_ );
MAKE_CURSOR( PointerStyle::AutoScrollN, asn_ );
MAKE_CURSOR( PointerStyle::AutoScrollS, ass_ );
MAKE_CURSOR( PointerStyle::AutoScrollW, asw_ );
@@ -362,7 +360,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
MAKE_CURSOR( PointerStyle::AutoScrollNS, asns_ );
MAKE_CURSOR( PointerStyle::AutoScrollWE, aswe_ );
MAKE_CURSOR( PointerStyle::AutoScrollNSWE, asnswe_ );
- MAKE_CURSOR( PointerStyle::Airbrush, airbrush_ );
MAKE_CURSOR( PointerStyle::TextVertical, vertcurs_ );
// #i32329#
@@ -372,9 +369,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
MAKE_CURSOR( PointerStyle::TabSelectW, tblselw_ );
MAKE_CURSOR( PointerStyle::TabSelectSW, tblselsw_ );
- // #i20119#
- MAKE_CURSOR( PointerStyle::Paintbrush, paintbrush_ );
-
MAKE_CURSOR( PointerStyle::HideWhitespace, hidewhitespace_ );
MAKE_CURSOR( PointerStyle::ShowWhitespace, showwhitespace_ );
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index 12311ad1289e..40d46705a9a5 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -312,8 +312,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
MAKE_CURSOR( PointerStyle::PivotDelete, pivotdel_ );
MAKE_CURSOR( PointerStyle::Chain, chain_ );
MAKE_CURSOR( PointerStyle::ChainNotAllowed, chainnot_ );
- MAKE_CURSOR( PointerStyle::TimeEventMove, timemove_ );
- MAKE_CURSOR( PointerStyle::TimeEventSize, timesize_ );
MAKE_CURSOR( PointerStyle::AutoScrollN, asn_ );
MAKE_CURSOR( PointerStyle::AutoScrollS, ass_ );
MAKE_CURSOR( PointerStyle::AutoScrollW, asw_ );
@@ -325,7 +323,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
MAKE_CURSOR( PointerStyle::AutoScrollNS, asns_ );
MAKE_CURSOR( PointerStyle::AutoScrollWE, aswe_ );
MAKE_CURSOR( PointerStyle::AutoScrollNSWE, asnswe_ );
- MAKE_CURSOR( PointerStyle::Airbrush, airbrush_ );
MAKE_CURSOR( PointerStyle::TextVertical, vertcurs_ );
// #i32329#
@@ -335,9 +332,6 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
MAKE_CURSOR( PointerStyle::TabSelectW, tblselw_ );
MAKE_CURSOR( PointerStyle::TabSelectSW, tblselsw_ );
- // #i20119#
- MAKE_CURSOR( PointerStyle::Paintbrush, paintbrush_ );
-
MAKE_CURSOR( PointerStyle::HideWhitespace, hidewhitespace_ );
MAKE_CURSOR( PointerStyle::ShowWhitespace, showwhitespace_ );
diff --git a/vcl/win/src/airbrush.cur b/vcl/win/src/airbrush.cur
deleted file mode 100644
index f6a684e6fcbd..000000000000
Binary files a/vcl/win/src/airbrush.cur and /dev/null differ
diff --git a/vcl/win/src/pntbrsh.cur b/vcl/win/src/pntbrsh.cur
deleted file mode 100644
index 517d114237c1..000000000000
Binary files a/vcl/win/src/pntbrsh.cur and /dev/null differ
diff --git a/vcl/win/src/salsrc.rc b/vcl/win/src/salsrc.rc
index c45935c59594..a4c5cf574e6a 100644
--- a/vcl/win/src/salsrc.rc
+++ b/vcl/win/src/salsrc.rc
@@ -62,8 +62,6 @@ SAL_RESID_POINTER_PIVOT_FIELD CURSOR pivotfld.cur
SAL_RESID_POINTER_PIVOT_DELETE CURSOR pivotdel.cur
SAL_RESID_POINTER_CHAIN CURSOR chain.cur
SAL_RESID_POINTER_CHAIN_NOTALLOWED CURSOR chainnot.cur
-SAL_RESID_POINTER_TIMEEVENT_MOVE CURSOR timemove.cur
-SAL_RESID_POINTER_TIMEEVENT_SIZE CURSOR timesize.cur
SAL_RESID_POINTER_AUTOSCROLL_N CURSOR asn.cur
SAL_RESID_POINTER_AUTOSCROLL_S CURSOR ass.cur
SAL_RESID_POINTER_AUTOSCROLL_W CURSOR asw.cur
@@ -75,14 +73,12 @@ SAL_RESID_POINTER_AUTOSCROLL_SE CURSOR asse.cur
SAL_RESID_POINTER_AUTOSCROLL_NS CURSOR asns.cur
SAL_RESID_POINTER_AUTOSCROLL_WE CURSOR aswe.cur
SAL_RESID_POINTER_AUTOSCROLL_NSWE CURSOR asnswe.cur
-SAL_RESID_POINTER_AIRBRUSH CURSOR airbrush.cur
SAL_RESID_POINTER_TEXT_VERTICAL CURSOR vtext.cur
SAL_RESID_POINTER_TAB_SELECT_S CURSOR tblsels.cur
SAL_RESID_POINTER_TAB_SELECT_E CURSOR tblsele.cur
SAL_RESID_POINTER_TAB_SELECT_SE CURSOR tblselse.cur
SAL_RESID_POINTER_TAB_SELECT_W CURSOR tblselw.cur
SAL_RESID_POINTER_TAB_SELECT_SW CURSOR tblselsw.cur
-SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur
SAL_RESID_POINTER_HIDEWHITESPACE CURSOR wshide.cur
SAL_RESID_POINTER_SHOWWHITESPACE CURSOR wsshow.cur
diff --git a/vcl/win/src/timemove.cur b/vcl/win/src/timemove.cur
deleted file mode 100644
index 319b6edc5774..000000000000
Binary files a/vcl/win/src/timemove.cur and /dev/null differ
diff --git a/vcl/win/src/timesize.cur b/vcl/win/src/timesize.cur
deleted file mode 100644
index 1ec23de05b71..000000000000
Binary files a/vcl/win/src/timesize.cur and /dev/null differ
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 6d3f99bf3e5b..1a12c416a21c 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2117,8 +2117,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ nullptr, nullptr, SAL_RESID_POINTER_PIVOT_FIELD }, // POINTER_PIVOT_FIELD
{ nullptr, nullptr, SAL_RESID_POINTER_CHAIN }, // POINTER_CHAIN
{ nullptr, nullptr, SAL_RESID_POINTER_CHAIN_NOTALLOWED }, // POINTER_CHAIN_NOTALLOWED
- { nullptr, nullptr, SAL_RESID_POINTER_TIMEEVENT_MOVE }, // POINTER_TIMEEVENT_MOVE
- { nullptr, nullptr, SAL_RESID_POINTER_TIMEEVENT_SIZE }, // POINTER_TIMEEVENT_SIZE
{ nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_N }, // POINTER_AUTOSCROLL_N
{ nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_S }, // POINTER_AUTOSCROLL_S
{ nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_W }, // POINTER_AUTOSCROLL_W
@@ -2130,7 +2128,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_NS }, // POINTER_AUTOSCROLL_NS
{ nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_WE }, // POINTER_AUTOSCROLL_WE
{ nullptr, nullptr, SAL_RESID_POINTER_AUTOSCROLL_NSWE }, // POINTER_AUTOSCROLL_NSWE
- { nullptr, nullptr, SAL_RESID_POINTER_AIRBRUSH }, // POINTER_AIRBRUSH
{ nullptr, nullptr, SAL_RESID_POINTER_TEXT_VERTICAL }, // POINTER_TEXT_VERTICAL
{ nullptr, nullptr, SAL_RESID_POINTER_PIVOT_DELETE }, // POINTER_PIVOT_DELETE
@@ -2141,9 +2138,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
{ nullptr, nullptr, SAL_RESID_POINTER_TAB_SELECT_W }, // POINTER_TAB_SELECT_W
{ nullptr, nullptr, SAL_RESID_POINTER_TAB_SELECT_SW }, // POINTER_TAB_SELECT_SW
- // #i20119#
- { nullptr, nullptr, SAL_RESID_POINTER_PAINTBRUSH }, // POINTER_PAINTBRUSH
-
{ nullptr, nullptr, SAL_RESID_POINTER_HIDEWHITESPACE }, // POINTER_HIDEWHITESPACE
{ nullptr, nullptr, SAL_RESID_POINTER_SHOWWHITESPACE } // POINTER_UNHIDEWHITESPACE
};
commit 185bb1b6bb792d9d18b4934eacdda48cb551e355
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 14 09:14:37 2017 +0100
document that PointerStyle and css::awt::SystemPointer are linked
Change-Id: Ic4a91520fe6c43f1a602e307fbcb0eb89e4f60bb
diff --git a/include/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx
index 996caf5f6078..be95dfa81792 100644
--- a/include/vcl/ptrstyle.hxx
+++ b/include/vcl/ptrstyle.hxx
@@ -20,80 +20,82 @@
#ifndef INCLUDED_VCL_PTRSTYLE_HXX
#define INCLUDED_VCL_PTRSTYLE_HXX
+#include <com/sun/star/awt/SystemPointer.hpp>
+
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,
+ Arrow = css::awt::SystemPointer::ARROW,
+ Null = css::awt::SystemPointer::INVISIBLE,
+ Wait = css::awt::SystemPointer::WAIT,
+ Text = css::awt::SystemPointer::TEXT,
+ Help = css::awt::SystemPointer::HELP,
+ Cross = css::awt::SystemPointer::CROSS,
+ Move = css::awt::SystemPointer::MOVE,
+ NSize = css::awt::SystemPointer::NSIZE,
+ SSize = css::awt::SystemPointer::SSIZE,
+ WSize = css::awt::SystemPointer::WSIZE,
+ ESize = css::awt::SystemPointer::ESIZE,
+ NWSize = css::awt::SystemPointer::NWSIZE,
+ NESize = css::awt::SystemPointer::NESIZE,
+ SWSize = css::awt::SystemPointer::SWSIZE,
+ SESize = css::awt::SystemPointer::SESIZE,
+ WindowNSize = css::awt::SystemPointer::WINDOW_NSIZE,
+ WindowSSize = css::awt::SystemPointer::WINDOW_SSIZE,
+ WindowWSize = css::awt::SystemPointer::WINDOW_WSIZE,
+ WindowESize = css::awt::SystemPointer::WINDOW_ESIZE,
+ WindowNWSize = css::awt::SystemPointer::WINDOW_NWSIZE,
+ WindowNESize = css::awt::SystemPointer::WINDOW_NESIZE,
+ WindowSWSize = css::awt::SystemPointer::WINDOW_SWSIZE,
+ WindowSESize = css::awt::SystemPointer::WINDOW_SESIZE,
+ HSplit = css::awt::SystemPointer::HSPLIT,
+ VSplit = css::awt::SystemPointer::VSPLIT,
+ HSizeBar = css::awt::SystemPointer::HSIZEBAR,
+ VSizeBar = css::awt::SystemPointer::VSIZEBAR,
+ Hand = css::awt::SystemPointer::HAND,
+ RefHand = css::awt::SystemPointer::REFHAND,
+ Pen = css::awt::SystemPointer::PEN,
+ Magnify = css::awt::SystemPointer::MAGNIFY,
+ Fill = css::awt::SystemPointer::FILL,
+ Rotate = css::awt::SystemPointer::ROTATE,
+ HShear = css::awt::SystemPointer::HSHEAR,
+ VShear = css::awt::SystemPointer::VSHEAR,
+ Mirror = css::awt::SystemPointer::MIRROR,
+ Crook = css::awt::SystemPointer::CROOK,
+ Crop = css::awt::SystemPointer::CROP,
+ MovePoint = css::awt::SystemPointer::MOVEPOINT,
+ MoveBezierWeight = css::awt::SystemPointer::MOVEBEZIERWEIGHT,
+ MoveData = css::awt::SystemPointer::MOVEDATA,
+ CopyData = css::awt::SystemPointer::COPYDATA,
+ LinkData = css::awt::SystemPointer::LINKDATA,
+ MoveDataLink = css::awt::SystemPointer::MOVEDATALINK,
+ CopyDataLink = css::awt::SystemPointer::COPYDATALINK,
+ MoveFile = css::awt::SystemPointer::MOVEFILE,
+ CopyFile = css::awt::SystemPointer::COPYFILE,
+ LinkFile = css::awt::SystemPointer::LINKFILE,
+ MoveFileLink = css::awt::SystemPointer::MOVEFILELINK,
+ CopyFileLink = css::awt::SystemPointer::COPYFILELINK,
+ MoveFiles = css::awt::SystemPointer::MOVEFILES,
+ CopyFiles = css::awt::SystemPointer::COPYFILES,
+ NotAllowed = css::awt::SystemPointer::NOTALLOWED,
+ DrawLine = css::awt::SystemPointer::DRAW_LINE,
+ DrawRect = css::awt::SystemPointer::DRAW_RECT,
+ DrawPolygon = css::awt::SystemPointer::DRAW_POLYGON,
+ DrawBezier = css::awt::SystemPointer::DRAW_BEZIER,
+ DrawArc = css::awt::SystemPointer::DRAW_ARC,
+ DrawPie = css::awt::SystemPointer::DRAW_PIE,
+ DrawCircleCut = css::awt::SystemPointer::DRAW_CIRCLECUT,
+ DrawEllipse = css::awt::SystemPointer::DRAW_ELLIPSE,
+ DrawFreehand = css::awt::SystemPointer::DRAW_FREEHAND,
+ DrawConnect = css::awt::SystemPointer::DRAW_CONNECT,
+ DrawText = css::awt::SystemPointer::DRAW_TEXT,
+ DrawCaption = css::awt::SystemPointer::DRAW_CAPTION,
+ Chart = css::awt::SystemPointer::CHART,
+ Detective = css::awt::SystemPointer::DETECTIVE,
+ PivotCol = css::awt::SystemPointer::PIVOT_COL,
+ PivotRow = css::awt::SystemPointer::PIVOT_ROW,
+ PivotField = css::awt::SystemPointer::PIVOT_FIELD,
+ Chain = css::awt::SystemPointer::CHAIN,
+ ChainNotAllowed = css::awt::SystemPointer::CHAIN_NOTALLOWED,
TimeEventMove = 72,
TimeEventSize = 73,
AutoScrollN = 74,
More information about the Libreoffice-commits
mailing list