[ooo-build-commit] .: patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Mon Oct 4 15:27:00 PDT 2010
patches/dev300/apply | 8
patches/dev300/calc-insert-current-time-framework.diff | 21 -
patches/dev300/calc-insert-current-time-offapi.diff | 22 -
patches/dev300/calc-insert-current-time-officecfg.diff | 50 ---
patches/dev300/calc-insert-current-time-sc.diff | 222 -----------------
patches/dev300/calc-insert-current-time-svx.diff | 61 ----
patches/dev300/calc-insert-current-time-vcl.diff | 71 -----
7 files changed, 455 deletions(-)
New commits:
commit eaa2d6fcba6d36bbcc1f5c5c6ef1e2528e259448
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Oct 4 18:20:11 2010 -0400
Removed calc-insert-current-time-*.diff; moved to git.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c350e40..90ca713 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2677,14 +2677,6 @@ calc-english-func-names-sc.diff, i#38765, kohei
calc-english-func-names-formula.diff, i#38765, kohei
calc-english-func-names-officecfg.diff, i#38765, kohei
-# Insert current date or time to current cell
-calc-insert-current-time-framework.diff, kohei
-calc-insert-current-time-offapi.diff, kohei
-calc-insert-current-time-officecfg.diff, kohei
-calc-insert-current-time-sc.diff, kohei
-calc-insert-current-time-svx.diff, kohei
-calc-insert-current-time-vcl.diff, kohei
-
# Allow export of filtered range selection, and show error when fails.
calc-pdf-export-allow-filtered-range-sc.diff, n#585028, kohei
calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
diff --git a/patches/dev300/calc-insert-current-time-framework.diff b/patches/dev300/calc-insert-current-time-framework.diff
deleted file mode 100644
index 4dd187d..0000000
--- a/patches/dev300/calc-insert-current-time-framework.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- framework/source/accelerators/keymapping.cxx | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git framework/source/accelerators/keymapping.cxx framework/source/accelerators/keymapping.cxx
-index b1d00d0..d215ded 100644
---- framework/source/accelerators/keymapping.cxx
-+++ framework/source/accelerators/keymapping.cxx
-@@ -154,6 +154,9 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] =
- {css::awt::Key::DECIMAL , "KEY_DECIMAL" },
- {css::awt::Key::TILDE , "KEY_TILDE" },
- {css::awt::Key::QUOTELEFT , "KEY_QUOTELEFT" },
-+ {css::awt::Key::BRACKETLEFT , "KEY_BRACKETLEFT" },
-+ {css::awt::Key::BRACKETRIGHT , "KEY_BRACKETRIGHT" },
-+ {css::awt::Key::SEMICOLON , "KEY_SEMICOLON" },
- {0 , "" } // mark the end of this array!
- };
-
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-insert-current-time-offapi.diff b/patches/dev300/calc-insert-current-time-offapi.diff
deleted file mode 100644
index c2522cf..0000000
--- a/patches/dev300/calc-insert-current-time-offapi.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- offapi/com/sun/star/awt/Key.idl | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git offapi/com/sun/star/awt/Key.idl offapi/com/sun/star/awt/Key.idl
-index ec0b3b4..7b0e319 100644
---- offapi/com/sun/star/awt/Key.idl
-+++ offapi/com/sun/star/awt/Key.idl
-@@ -479,6 +479,10 @@ published constants Key
- const short BRACKETRIGHT = 1316;
-
- //-------------------------------------------------------------------------
-+
-+ const short SEMICOLON = 1317;
-+
-+ //-------------------------------------------------------------------------
-
- const short DELETE_TO_END_OF_PARAGRAPH = 1539;
-
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-insert-current-time-officecfg.diff b/patches/dev300/calc-insert-current-time-officecfg.diff
deleted file mode 100644
index 6f3c9f8..0000000
--- a/patches/dev300/calc-insert-current-time-officecfg.diff
+++ /dev/null
@@ -1,50 +0,0 @@
----
- .../data/org/openoffice/Office/Accelerators.xcu | 10 ++++++++++
- .../data/org/openoffice/Office/UI/CalcCommands.xcu | 10 ++++++++++
- 2 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git officecfg/registry/data/org/openoffice/Office/Accelerators.xcu officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
-index f109c7c..b26a468 100755
---- officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
-+++ officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
-@@ -781,6 +781,16 @@
- <value xml:lang="en-US">.uno:SelectRow</value>
- </prop>
- </node>
-+ <node oor:name="SEMICOLON_MOD1" oor:op="replace">
-+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-+ <value xml:lang="en-US">.uno:InsertCurrentDate</value>
-+ </prop>
-+ </node>
-+ <node oor:name="SEMICOLON_SHIFT_MOD1" oor:op="replace">
-+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-+ <value xml:lang="en-US">.uno:InsertCurrentTime</value>
-+ </prop>
-+ </node>
- <node oor:name="SPACE_SHIFT_MOD1" oor:op="replace">
- <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:SelectColumn</value>
-diff --git officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-index 1c71f00..4af2ef8 100644
---- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-@@ -1610,6 +1610,16 @@
- <value xml:lang="en-US">Mark Dependents</value>
- </prop>
- </node>
-+ <node oor:name=".uno:InsertCurrentDate" oor:op="replace">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="en-US">Insert Current Date</value>
-+ </prop>
-+ </node>
-+ <node oor:name=".uno:InsertCurrentTime" oor:op="replace">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="en-US">Insert Current Time</value>
-+ </prop>
-+ </node>
- </node>
- </node>
- </oor:component-data>
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-insert-current-time-sc.diff b/patches/dev300/calc-insert-current-time-sc.diff
deleted file mode 100644
index ee5b380..0000000
--- a/patches/dev300/calc-insert-current-time-sc.diff
+++ /dev/null
@@ -1,222 +0,0 @@
- sc/inc/globstr.hrc | 3 +-
- sc/inc/sc.hrc | 3 ++
- sc/sdi/cellsh.sdi | 2 +
- sc/sdi/scalc.sdi | 51 ++++++++++++++++++++++++++++++++++++++++
- sc/source/ui/inc/viewfunc.hxx | 2 +
- sc/source/ui/src/globstr.src | 8 ++++++
- sc/source/ui/view/cellsh1.cxx | 8 ++++++
- sc/source/ui/view/viewfun6.cxx | 26 ++++++++++++++++++++
- 9 files changed, 112 insertions(+), 10 deletions(-)
-
-diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc
-index 629cbb4..6a62736 100644
---- sc/inc/globstr.hrc
-+++ sc/inc/globstr.hrc
-@@ -594,8 +594,10 @@
- #define STR_FORM_SCROLLBAR 453
-
- #define STR_OPTIONS_WARN_SEPARATORS 454
-+#define STR_UNDO_INSERT_CURRENT_DATE 455
-+#define STR_UNDO_INSERT_CURRENT_TIME 456
-
--#define STR_COUNT 455
-+#define STR_COUNT 457
-
- #endif
-
-diff --git sc/inc/sc.hrc sc/inc/sc.hrc
-index 5547bb4..9341e0d 100644
---- sc/inc/sc.hrc
-+++ sc/inc/sc.hrc
-@@ -1676,6 +1676,9 @@
- #define SID_DATA_FORM (SC_OOO_BUILD_START + 6) // menu (in Data menu)
- #define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 7) // dialog
-
-+#define SID_INSERT_CURRENT_DATE (SC_OOO_BUILD_START + 8)
-+#define SID_INSERT_CURRENT_TIME (SC_OOO_BUILD_START + 9)
-+
- #endif
-
-
-diff --git sc/sdi/cellsh.sdi sc/sdi/cellsh.sdi
-index 84b23d5..8805f36 100644
---- sc/sdi/cellsh.sdi
-+++ sc/sdi/cellsh.sdi
-@@ -115,6 +115,8 @@ interface CellSelection
- SID_DETECTIVE_REFRESH [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
- SID_DETECTIVE_MARK_PRED [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
- SID_DETECTIVE_MARK_SUCC [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
-+ SID_INSERT_CURRENT_DATE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
-+ SID_INSERT_CURRENT_TIME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
- FID_INS_ROW [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
- FID_INS_COLUMN [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
- FID_INS_CELLSDOWN [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
-diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
-index 0537507..e800849 100644
---- sc/sdi/scalc.sdi
-+++ sc/sdi/scalc.sdi
-@@ -7901,6 +7901,57 @@ SfxVoidItem MarkDependents SID_DETECTIVE_MARK_SUCC
- ToolBoxConfig = FALSE,
- GroupId = GID_OPTIONS;
- ]
-+
-+//--------------------------------------------------------------------------
-+SfxVoidItem InsertCurrentDate SID_INSERT_CURRENT_DATE
-+()
-+[
-+ /* flags: */
-+ AutoUpdate = FALSE,
-+ Cachable = Cachable,
-+ FastCall = FALSE,
-+ HasCoreId = FALSE,
-+ HasDialog = FALSE,
-+ ReadOnlyDoc = TRUE,
-+ Toggle = FALSE,
-+ Container = FALSE,
-+ RecordAbsolute = FALSE,
-+ RecordPerSet;
-+ Synchron;
-+
-+ /* config: */
-+ AccelConfig = TRUE,
-+ MenuConfig = TRUE,
-+ StatusBarConfig = FALSE,
-+ ToolBoxConfig = FALSE,
-+ GroupId = GID_OPTIONS;
-+]
-+
-+//--------------------------------------------------------------------------
-+SfxVoidItem InsertCurrentTime SID_INSERT_CURRENT_TIME
-+()
-+[
-+ /* flags: */
-+ AutoUpdate = FALSE,
-+ Cachable = Cachable,
-+ FastCall = FALSE,
-+ HasCoreId = FALSE,
-+ HasDialog = FALSE,
-+ ReadOnlyDoc = TRUE,
-+ Toggle = FALSE,
-+ Container = FALSE,
-+ RecordAbsolute = FALSE,
-+ RecordPerSet;
-+ Synchron;
-+
-+ /* config: */
-+ AccelConfig = TRUE,
-+ MenuConfig = TRUE,
-+ StatusBarConfig = FALSE,
-+ ToolBoxConfig = FALSE,
-+ GroupId = GID_OPTIONS;
-+]
-+
- //--------------------------------------------------------------------------
- SfxVoidItem SetTabBgColor FID_TAB_MENU_SET_TAB_BG_COLOR
- (SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR)
-diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
-index 6e9ec02..9558bc3 100644
---- sc/source/ui/inc/viewfunc.hxx
-+++ sc/source/ui/inc/viewfunc.hxx
-@@ -331,6 +331,8 @@ public:
- void DetectiveMarkPred();
- void DetectiveMarkSucc();
-
-+ void InsertCurrentTime(short nCellFmt, const ::rtl::OUString& rUndoStr);
-+
- void ShowNote( bool bShow = true );
- inline void HideNote() { ShowNote( false ); }
- void EditNote();
-diff --git sc/source/ui/src/globstr.src sc/source/ui/src/globstr.src
-index 5be3d92..271b910 100644
---- sc/source/ui/src/globstr.src
-+++ sc/source/ui/src/globstr.src
-@@ -1813,5 +1813,13 @@ Resource RID_GLOBSTR
- {
- Text [ en-US ] = "Because the current formula separator settings conflict with the locale, the formula separators have been reset to their default values.";
- };
-+ String STR_UNDO_INSERT_CURRENT_DATE
-+ {
-+ Text [ en-US ] = "Insert Current Date";
-+ };
-+ String STR_UNDO_INSERT_CURRENT_TIME
-+ {
-+ Text [ en-US ] = "Insert Current Time";
-+ };
- };
-
-diff --git sc/source/ui/view/cellsh1.cxx sc/source/ui/view/cellsh1.cxx
-index 4282c14..7da17ef 100644
---- sc/source/ui/view/cellsh1.cxx
-+++ sc/source/ui/view/cellsh1.cxx
-@@ -1554,6 +1554,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
- case SID_DETECTIVE_MARK_SUCC:
- pTabViewShell->DetectiveMarkSucc();
- break;
-+ case SID_INSERT_CURRENT_DATE:
-+ pTabViewShell->InsertCurrentTime(
-+ NUMBERFORMAT_DATE, ScGlobal::GetRscString(STR_UNDO_INSERT_CURRENT_DATE));
-+ break;
-+ case SID_INSERT_CURRENT_TIME:
-+ pTabViewShell->InsertCurrentTime(
-+ NUMBERFORMAT_TIME, ScGlobal::GetRscString(STR_UNDO_INSERT_CURRENT_TIME));
-+ break;
-
- case SID_SPELL_DIALOG:
- // pTabViewShell->DoSpellingChecker();
-diff --git sc/source/ui/view/viewfun6.cxx sc/source/ui/view/viewfun6.cxx
-index ce62dd0..c63909e 100644
---- sc/source/ui/view/viewfun6.cxx
-+++ sc/source/ui/view/viewfun6.cxx
-@@ -34,6 +34,7 @@
- #include <sfx2/dispatch.hxx>
- #include <vcl/msgbox.hxx>
- #include <vcl/sound.hxx>
-+#include "svl/zforlist.hxx"
-
- #include "viewfunc.hxx"
- #include "detfunc.hxx"
-@@ -49,12 +50,16 @@
- #include "fusel.hxx"
- #include "reftokenhelper.hxx"
- #include "externalrefmgr.hxx"
-+#include "cell.hxx"
-
- #include <vector>
-
-+using ::rtl::OUString;
- using ::rtl::OUStringBuffer;
- using ::std::vector;
-
-+#define D_TIMEFACTOR 86400.0
-+
- //==================================================================
-
- void ScViewFunc::DetectiveAddPred()
-@@ -274,6 +279,27 @@ void ScViewFunc::DetectiveMarkSucc()
- MarkAndJumpToRanges(aDestRanges);
- }
-
-+void ScViewFunc::InsertCurrentTime(short nCellFmt, const OUString& rUndoStr)
-+{
-+ ScViewData* pViewData = GetViewData();
-+ ScAddress aCurPos = pViewData->GetCurPos();
-+ ScDocShell* pDocSh = pViewData->GetDocShell();
-+ ScDocument* pDoc = pDocSh->GetDocument();
-+ SfxUndoManager* pUndoMgr = pDocSh->GetUndoManager();
-+ SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-+ Date aActDate;
-+ double fDate = aActDate - *pFormatter->GetNullDate();
-+ Time aActTime;
-+ double fTime =
-+ aActTime.Get100Sec() / 100.0 + aActTime.GetSec() +
-+ (aActTime.GetMin() * 60.0) + (aActTime.GetHour() * 3600.0);
-+ fTime /= D_TIMEFACTOR;
-+ pUndoMgr->EnterListAction(rUndoStr, rUndoStr);
-+ pDocSh->GetDocFunc().PutCell(aCurPos, new ScValueCell(fDate+fTime), false);
-+ SetNumberFormat(nCellFmt);
-+ pUndoMgr->LeaveListAction();
-+}
-+
- //---------------------------------------------------------------------------
-
- void ScViewFunc::ShowNote( bool bShow )
diff --git a/patches/dev300/calc-insert-current-time-svx.diff b/patches/dev300/calc-insert-current-time-svx.diff
deleted file mode 100644
index e3d0d3d..0000000
--- a/patches/dev300/calc-insert-current-time-svx.diff
+++ /dev/null
@@ -1,61 +0,0 @@
----
- cui/source/customize/acccfg.cxx | 15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-diff --git cui/source/customize/acccfg.cxx cui/source/customize/acccfg.cxx
-index 50e22f9..43499f9 100644
---- cui/source/customize/acccfg.cxx
-+++ cui/source/customize/acccfg.cxx
-@@ -218,6 +218,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
- KEY_X | KEY_MOD1 ,
- KEY_Y | KEY_MOD1 ,
- KEY_Z | KEY_MOD1 ,
-+ KEY_SEMICOLON | KEY_MOD1 ,
-+ KEY_BRACKETLEFT | KEY_MOD1 ,
-+ KEY_BRACKETRIGHT | KEY_MOD1,
-
- KEY_F1 | KEY_MOD1 ,
- KEY_F2 | KEY_MOD1 ,
-@@ -287,6 +290,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
- KEY_X | KEY_SHIFT | KEY_MOD1,
- KEY_Y | KEY_SHIFT | KEY_MOD1,
- KEY_Z | KEY_SHIFT | KEY_MOD1,
-+ KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 ,
-+ KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 ,
-+ KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1,
-
- KEY_F1 | KEY_SHIFT | KEY_MOD1,
- KEY_F2 | KEY_SHIFT | KEY_MOD1,
-@@ -351,6 +357,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
- KEY_X | KEY_MOD2 ,
- KEY_Y | KEY_MOD2 ,
- KEY_Z | KEY_MOD2 ,
-+ KEY_SEMICOLON | KEY_MOD2 ,
-+ KEY_BRACKETLEFT | KEY_MOD2 ,
-+ KEY_BRACKETRIGHT | KEY_MOD2,
-
- KEY_F1 | KEY_MOD2 ,
- KEY_F2 | KEY_MOD2 ,
-@@ -415,6 +424,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
- KEY_X | KEY_SHIFT | KEY_MOD2,
- KEY_Y | KEY_SHIFT | KEY_MOD2,
- KEY_Z | KEY_SHIFT | KEY_MOD2,
-+ KEY_SEMICOLON | KEY_SHIFT | KEY_MOD2 ,
-+ KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD2 ,
-+ KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2,
-
- KEY_F1 | KEY_SHIFT | KEY_MOD2,
- KEY_F2 | KEY_SHIFT | KEY_MOD2,
-@@ -543,6 +555,9 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
- KEY_X | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
- KEY_Y | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
- KEY_Z | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-+ KEY_SEMICOLON | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-+ KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-+ KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-
- KEY_F1 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
- KEY_F2 | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-insert-current-time-vcl.diff b/patches/dev300/calc-insert-current-time-vcl.diff
deleted file mode 100644
index 4aa35eb..0000000
--- a/patches/dev300/calc-insert-current-time-vcl.diff
+++ /dev/null
@@ -1,71 +0,0 @@
----
- vcl/inc/vcl/keycodes.hxx | 1 +
- vcl/unx/gtk/window/gtkframe.cxx | 1 +
- vcl/unx/source/app/saldisp.cxx | 7 +++++++
- vcl/win/source/app/salinst.cxx | 1 +
- 4 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git vcl/inc/vcl/keycodes.hxx vcl/inc/vcl/keycodes.hxx
-index 7275947..6b4289a 100644
---- vcl/inc/vcl/keycodes.hxx
-+++ vcl/inc/vcl/keycodes.hxx
-@@ -157,6 +157,7 @@
- #define KEY_QUOTELEFT ((USHORT)::com::sun::star::awt::Key::QUOTELEFT)
- #define KEY_BRACKETLEFT ((USHORT)::com::sun::star::awt::Key::BRACKETLEFT)
- #define KEY_BRACKETRIGHT ((USHORT)::com::sun::star::awt::Key::BRACKETRIGHT)
-+#define KEY_SEMICOLON ((USHORT)::com::sun::star::awt::Key::SEMICOLON)
-
- #define KEY_CAPSLOCK ((USHORT)::com::sun::star::awt::Key::CAPSLOCK)
- #define KEY_NUMLOCK ((USHORT)::com::sun::star::awt::Key::NUMLOCK)
-diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
-index b2b7018..d47d16a 100644
---- vcl/unx/gtk/window/gtkframe.cxx
-+++ vcl/unx/gtk/window/gtkframe.cxx
-@@ -213,6 +213,7 @@ static USHORT GetKeyCode( guint keyval )
- case GDK_quoteleft: nCode = KEY_QUOTELEFT; break;
- case GDK_bracketleft: nCode = KEY_BRACKETLEFT; break;
- case GDK_bracketright: nCode = KEY_BRACKETRIGHT; break;
-+ case GDK_semicolon: nCode = KEY_SEMICOLON; break;
- // some special cases, also see saldisp.cxx
- // - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000
- case 0x1000FF02: // apXK_Copy
-diff --git vcl/unx/source/app/saldisp.cxx vcl/unx/source/app/saldisp.cxx
-index 0ae370e..db57f83 100644
---- vcl/unx/source/app/saldisp.cxx
-+++ vcl/unx/source/app/saldisp.cxx
-@@ -1338,6 +1338,9 @@ XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const
- case KEY_BRACKETRIGHT:
- nKeySym = XK_bracketright;
- break;
-+ case KEY_SEMICOLON:
-+ nKeySym = XK_semicolon;
-+ break;
-
- default:
- nKeySym = 0;
-@@ -1676,6 +1679,10 @@ USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
- nKey = KEY_BRACKETRIGHT;
- *pcPrintable = ']';
- break;
-+ case XK_semicolon:
-+ nKey = KEY_SEMICOLON;
-+ *pcPrintable = ';';
-+ break;
- // case XK_Linefeed:
- // *pcPrintable = '\n';
- // break;
-diff --git vcl/win/source/app/salinst.cxx vcl/win/source/app/salinst.cxx
-index 03011a7..3afbbff 100644
---- vcl/win/source/app/salinst.cxx
-+++ vcl/win/source/app/salinst.cxx
-@@ -378,6 +378,7 @@ void SalData::initKeyCodeMap()
- initKey( '`', KEY_QUOTELEFT );
- initKey( '[', KEY_BRACKETLEFT );
- initKey( ']', KEY_BRACKETRIGHT );
-+ initKey( ';', KEY_SEMICOLON );
- }
-
- // =======================================================================
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list