CWS-TOOLING: integrate CWS macshortcuts01

2009-04-02 18:13:38 +0200 pl  r270430 : CWS-TOOLING: rebase CWS macshortcuts01 to trunk@270033 (milestone: DEV300:m45)
2009-03-04 13:02:01 +0100 pl  r268816 : make compile with oldish gtk headers
2009-03-04 11:23:41 +0100 rvojta  r268799 : Remove #ifndef MACOSX as Mac OS X X11 port is obsolote, no need to check for non Mac OS X
2009-03-03 16:33:34 +0100 rvojta  r268764 : Meta/Super to MOD3 on all Unix platforms except Mac OS X
2009-03-03 16:08:46 +0100 rvojta  r268744 : Map GDK_Meta_L/R and GDK_Super_L/R keys to KEY_MOD3 on Unix systems except Mac OS X
2009-03-03 16:04:23 +0100 rvojta  r268742 : IsMod3(), IsLeftMod3(), IsRightMod3() added
2009-03-03 16:03:48 +0100 rvojta  r268741 : MODKEY_LMOD3, MODKEY_RMOD3, MODKEY_MOD3 support
2009-02-28 00:09:26 +0100 rvojta  r268620 : New KeyCode constructors support, by default MOD3 is not used here (probably temporary solution)
2009-02-25 22:53:02 +0100 rvojta  r268469 : MOD3 support (META_DOWN_MASK)
2009-02-25 13:22:13 +0100 rvojta  r268435 : Cmd-M to minimize window, Cmd-Option-M to minimize all windows
2009-02-25 11:09:20 +0100 rvojta  r268417 : Add back F11 for non Mac OS X platforms (removed by accident in r268405)
2009-02-24 18:32:31 +0100 rvojta  r268405 : F11 replaced by Cmd-T on Mac OS X
2009-02-23 15:21:53 +0100 sb  r268358 : #i99296# support values with both xml:lang and install:module (which are moved into the spool tree, not the res tree)
2009-02-16 22:45:34 +0100 rvojta  r267839 : Multiplatform shortcuts support
2009-02-16 22:41:03 +0100 rvojta  r267838 : Use install:module instead of separate xcu file
2009-02-16 18:35:36 +0100 rvojta  r267833 : Removed accelerators target
2009-02-16 09:27:42 +0100 rvojta  r267776 : MOD3 added
2009-02-16 09:18:32 +0100 rvojta  r267775 : MOD3 support
2009-02-16 09:17:11 +0100 rvojta  r267774 : MOD3 support
2009-02-15 22:11:37 +0100 rvojta  r267773 : Check for MOD3 too
2009-02-15 22:11:15 +0100 rvojta  r267772 : Check for MOD3 too
2009-02-15 22:10:37 +0100 rvojta  r267771 : Check for MOD3 too
2009-02-15 22:10:15 +0100 rvojta  r267770 : Check for MOD3 during mouse event too
2009-02-15 22:09:54 +0100 rvojta  r267769 : IsMod3() added
2009-02-15 19:34:59 +0100 rvojta  r267768 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:33:43 +0100 rvojta  r267767 : Cmd-M -> Ctrl-M for default format
2009-02-15 19:32:19 +0100 rvojta  r267766 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:31:30 +0100 rvojta  r267765 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:31:04 +0100 rvojta  r267764 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:30:33 +0100 rvojta  r267763 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:30:09 +0100 rvojta  r267762 : MOD3 added (Ctrl on Mac OS X)
2009-02-13 22:11:22 +0100 rvojta  r267751 : Cmd-Shift-Z for .uno:Redo
2009-02-13 22:04:19 +0100 rvojta  r267748 : F11 -> Cmd-T for .uno:DesignerDialog
2009-02-13 21:09:11 +0100 rvojta  r267743 : F11 -> Cmd-T (all occurences)
2009-02-13 19:47:21 +0100 rvojta  r267741 : accelerators target added for Mac OS X shortcuts
2009-02-13 19:46:58 +0100 rvojta  r267740 : Spreadsheet - replace F11 with Cmd-T
2009-02-13 19:24:19 +0100 rvojta  r267739 : Remove Accelerators-Mac.xcs
2009-02-13 18:50:01 +0100 rvojta  r267738 : Accelerators-Mac.xcs test
2009-02-13 18:48:10 +0100 rvojta  r267737 : Accelerators-Mac.xcu added
2009-02-13 18:46:48 +0100 rvojta  r267736 : F11 -> Cmd-T for stylist in Spreadsheet

8 files changed, 35 insertions, 3 deletions

diff --git a/framework/collector/cmduicollector.cxx b/framework/collector/cmduicollector.cxx
index fac5fa1c69c8..e6d9fd0a726c 100644
--- a/framework/collector/cmduicollector.cxx
+++ b/framework/collector/cmduicollector.cxx
@@ -828,13 +828,14 @@ KeyCode impl_KeyCodeAWT2VCL(const css::awt::KeyEvent& aAWTKey)
     BOOL   bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
     BOOL   bMod1  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  );
     BOOL   bMod2  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
+    BOOL   bMod3  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
     USHORT nKey   = (USHORT)aAWTKey.KeyCode;
     // unfortunately MENU and CONTEXTMENU are twisted between vcl and awt
     if( aAWTKey.KeyCode == css::awt::Key::MENU )
         nKey = KEY_CONTEXTMENU;
     else if( aAWTKey.KeyCode == css::awt::Key::CONTEXTMENU )
         nKey = KEY_MENU;
-    return KeyCode(nKey, bShift, bMod1, bMod2);
+    return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
 }
 
 css::awt::KeyEvent impl_KeyCodeVCL2AWT(const KeyCode& aVCLKey)
@@ -854,6 +855,8 @@ css::awt::KeyEvent impl_KeyCodeVCL2AWT(const KeyCode& aVCLKey)
         aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1;
     if (aVCLKey.IsMod2())
         aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2;
+        if (aVCLKey.IsMod3())
+        aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3;
 
     return aAWTKey;
 }
@@ -1911,6 +1914,7 @@ bool ReadResourceWriteAcceleratorXMLLang( const ::rtl::OUString& aOutDirURL,
         BOOL   bShift = ((aInfo.aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
         BOOL   bMod1  = ((aInfo.aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  );
         BOOL   bMod2  = ((aInfo.aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
+        BOOL   bMod3  = ((aInfo.aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
 
         if (bShift)
             sAccBuf.appendAscii(" accel:shift=\"true\"");
@@ -1918,6 +1922,8 @@ bool ReadResourceWriteAcceleratorXMLLang( const ::rtl::OUString& aOutDirURL,
             sAccBuf.appendAscii(" accel:mod1=\"true\"");
         if (bMod2)
             sAccBuf.appendAscii(" accel:mod2=\"true\"");
+        if (bMod3)
+            sAccBuf.appendAscii(" accel:mod3=\"true\"");
 
         sAccBuf.appendAscii(" xlink:href=\"");
         sAccBuf.append(aInfo.sCommand);
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index bf9eed06ad66..de1066202576 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -60,6 +60,7 @@ namespace framework{
 #define ATTRIBUTE_MOD_SHIFT             DECLARE_ASCII("shift")
 #define ATTRIBUTE_MOD_MOD1              DECLARE_ASCII("mod1" )
 #define ATTRIBUTE_MOD_MOD2              DECLARE_ASCII("mod2" )
+#define ATTRIBUTE_MOD_MOD3              DECLARE_ASCII("mod3" )
 
 // same items with a name space alias
 #define AL_ELEMENT_ACCELERATORLIST      DECLARE_ASCII("accel:acceleratorlist")
@@ -73,6 +74,7 @@ namespace framework{
 #define AL_ATTRIBUTE_MOD_SHIFT          DECLARE_ASCII("accel:shift")
 #define AL_ATTRIBUTE_MOD_MOD1           DECLARE_ASCII("accel:mod1" )
 #define AL_ATTRIBUTE_MOD_MOD2           DECLARE_ASCII("accel:mod2" )
+#define AL_ATTRIBUTE_MOD_MOD3           DECLARE_ASCII("accel:mod3" )
 
 // same items with full qualified name space
 #define NS_ELEMENT_ACCELERATORLIST      DECLARE_ASCII("http://openoffice.org/2001/accel^acceleratorlist")
@@ -86,6 +88,7 @@ namespace framework{
 #define NS_ATTRIBUTE_MOD_SHIFT          DECLARE_ASCII("http://openoffice.org/2001/accel^shift")
 #define NS_ATTRIBUTE_MOD_MOD1           DECLARE_ASCII("http://openoffice.org/2001/accel^mod1" )
 #define NS_ATTRIBUTE_MOD_MOD2           DECLARE_ASCII("http://openoffice.org/2001/accel^mod2" )
+#define NS_ATTRIBUTE_MOD_MOD3           DECLARE_ASCII("http://openoffice.org/2001/accel^mod3" )
 
 // some storage related values (pathes, names of sub storages etcpp).
 #define PRESET_DEFAULT_XML              DECLARE_ASCII("default.xml")
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index a89b0392270e..2f32386be404 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -84,6 +84,7 @@ class AcceleratorConfigurationReader : public  css::xml::sax::XDocumentHandler
             E_ATTRIBUTE_MOD_SHIFT,
             E_ATTRIBUTE_MOD_MOD1,
             E_ATTRIBUTE_MOD_MOD2,
+                        E_ATTRIBUTE_MOD_MOD3,
             E_ATTRIBUTE_URL
         };
 
diff --git a/framework/inc/xml/acceleratorconst.hxx b/framework/inc/xml/acceleratorconst.hxx
index 70139a545bc3..c2a04d3ccaee 100644
--- a/framework/inc/xml/acceleratorconst.hxx
+++ b/framework/inc/xml/acceleratorconst.hxx
@@ -61,6 +61,7 @@ namespace framework{
 #define ATTRIBUTE_MOD_SHIFT             DECLARE_ASCII("shift")
 #define ATTRIBUTE_MOD_MOD1              DECLARE_ASCII("mod1" )
 #define ATTRIBUTE_MOD_MOD2              DECLARE_ASCII("mod2" )
+#define ATTRIBUTE_MOD_MOD3              DECLARE_ASCII("mod3" )
 
 // same items with a name space alias
 #define AL_ELEMENT_ACCELERATORLIST      DECLARE_ASCII("accel:acceleratorlist")
@@ -74,6 +75,7 @@ namespace framework{
 #define AL_ATTRIBUTE_MOD_SHIFT          DECLARE_ASCII("accel^shift")
 #define AL_ATTRIBUTE_MOD_MOD1           DECLARE_ASCII("accel^mod1" )
 #define AL_ATTRIBUTE_MOD_MOD2           DECLARE_ASCII("accel^mod2" )
+#define AL_ATTRIBUTE_MOD_MOD3           DECLARE_ASCII("accel^mod3" )
 
 // same items with full qualified name space
 #define NS_ELEMENT_ACCELERATORLIST      DECLARE_ASCII("http://openoffice.org/2001/accel^acceleratorlist")
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 368bcb738984..e589022f9b64 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1319,6 +1319,8 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
                 else if (sToken[k].equalsAscii("MOD2"))
                     aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
+        else if (sToken[k].equalsAscii("MOD3"))
+            aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
                 else
                 {
                     bValid = sal_False;
@@ -1468,7 +1470,8 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
         sKey += ::rtl::OUString::createFromAscii("_MOD1");
     if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  )
         sKey += ::rtl::OUString::createFromAscii("_MOD2");
-
+        if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  )
+                sKey += ::rtl::OUString::createFromAscii("_MOD3");
     css::uno::Reference< css::container::XNameAccess > xKey;
     css::uno::Reference< css::container::XNameContainer > xCommand;
     if ( !xContainer->hasByName(sKey) )
@@ -1519,6 +1522,8 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
         sKey += ::rtl::OUString::createFromAscii("_MOD1");
     if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  )
         sKey += ::rtl::OUString::createFromAscii("_MOD2");
+        if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  )
+                sKey += ::rtl::OUString::createFromAscii("_MOD3");
 
     xContainer->removeByName(sKey);
 }
@@ -1563,6 +1568,8 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
             aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1;
         else if (sToken[i].equalsAscii("MOD2"))
             aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2;
+                else if (sToken[i].equalsAscii("MOD3"))
+                        aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3;
     }
 
     css::uno::Reference< css::container::XNameAccess > xKey;
@@ -1666,3 +1673,4 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
 }
 
 } // namespace framework
+
diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx
index d53138613317..89f43cebc65d 100644
--- a/framework/source/accelerators/acceleratorexecute.cxx
+++ b/framework/source/accelerators/acceleratorexecute.cxx
@@ -208,6 +208,8 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey)
         aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1;
     if (aVCLKey.IsMod2())
         aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2;
+        if (aVCLKey.IsMod3())
+        aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3;
 
     return aAWTKey;
 }
@@ -223,9 +225,10 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
     sal_Bool bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
     sal_Bool bMod1  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  );
     sal_Bool bMod2  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
+    sal_Bool bMod3  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
     USHORT   nKey   = (USHORT)aAWTKey.KeyCode;
 
-    return KeyCode(nKey, bShift, bMod1, bMod2);
+    return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
 }
 
 //-----------------------------------------------
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 9fb996ac90eb..155c57ea6314 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -174,6 +174,9 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString
                 case E_ATTRIBUTE_MOD_MOD2  :
                     aEvent.Modifiers |= css::awt::KeyModifier::MOD2;
                     break;
+
+                case E_ATTRIBUTE_MOD_MOD3  :
+                    aEvent.Modifiers |= css::awt::KeyModifier::MOD3;
             }
         }
 
@@ -307,6 +310,9 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im
     if (sAttribute.equals(NS_ATTRIBUTE_MOD_MOD2))
         eAttribute = E_ATTRIBUTE_MOD_MOD2;
     else
+    if (sAttribute.equals(NS_ATTRIBUTE_MOD_MOD3))
+        eAttribute = E_ATTRIBUTE_MOD_MOD3;
+    else
     if (sAttribute.equals(NS_ATTRIBUTE_URL))
         eAttribute = E_ATTRIBUTE_URL;
     else
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 2d3fb9f427e6..0de3cda46de3 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -146,6 +146,9 @@ void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt:
     if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2)
         pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
 
+    if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3)
+        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
+
     xConfig->ignorableWhitespace(::rtl::OUString());
     xConfig->startElement(AL_ELEMENT_ITEM, xAttribs);
     xConfig->ignorableWhitespace(::rtl::OUString());