[Libreoffice-commits] core.git: 10 commits - cui/source include/sfx2 include/svtools include/svx sfx2/source svtools/source svx/source sw/source

Wed, 08 Apr 2015 18:46:09 -0700 

 cui/source/customize/acccfg.cxx       | 1334 ++++++++++++++++------------------
 include/sfx2/templdlg.hxx             |   11 
 include/svtools/svlbitm.hxx           |  173 ++--
 include/svtools/treelistbox.hxx       |   38 
 include/svx/tbcontrl.hxx              |  111 +-
 sfx2/source/dialog/templdlg.cxx       |  323 ++------
 sfx2/source/inc/templdgi.hxx          |  421 ++++++----
 svtools/source/contnr/treelistbox.cxx |   10 
 svx/source/tbxctrls/tbcontrl.cxx      |   19 
 sw/source/uibase/utlui/content.cxx    |   77 -
 10 files changed, 1234 insertions(+), 1283 deletions(-)

New commits:
commit 1b0c1943788f6083b27a1e5a4d6d76373f08459b
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date:   Tue Apr 7 15:20:14 2015 +0900

    some cleanup in treelistbox
    
    Change-Id: I24720adfc7c1c38ba7d804baef3c1e01e01d64cb

diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index 4c49f3b..4e08291 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -108,21 +108,37 @@ class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem
 {
 protected:
     OUString maText;
+
 public:
-                    SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const 
OUString& rStr);
-                    SvLBoxString();
-    virtual         ~SvLBoxString();
-    virtual sal_uInt16 GetType() const SAL_OVERRIDE;
-    virtual void    InitViewData(SvTreeListBox*, SvTreeListEntry*, 
SvViewDataItem*) SAL_OVERRIDE;
-    OUString   GetText() const { return maText; }
-    OUString GetExtendText() const { return OUString(); }
-    void            SetText( const OUString& rText ) { maText = rText; }
+    SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const OUString& rText);
+    SvLBoxString();
+    virtual ~SvLBoxString();
 
-    virtual void Paint(
-        const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* 
pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
+    virtual sal_uInt16 GetType() const SAL_OVERRIDE;
+    virtual void InitViewData(SvTreeListBox* pView,
+                              SvTreeListEntry* pEntry,
+                              SvViewDataItem* pViewData) SAL_OVERRIDE;
+
+    OUString GetText() const
+    {
+        return maText;
+    }
+    OUString GetExtendText() const
+    {
+        return OUString();
+    }
+    void SetText(const OUString& rText)
+    {
+        maText = rText;
+    }
+
+    virtual void Paint(const Point& rPos,
+                       SvTreeListBox& rOutDev,
+                       const SvViewDataEntry* pView,
+                       const SvTreeListEntry* pEntry) SAL_OVERRIDE;
 
     virtual SvLBoxItem* Create() const SAL_OVERRIDE;
-    virtual void    Clone( SvLBoxItem* pSource ) SAL_OVERRIDE;
+    virtual void Clone(SvLBoxItem* pSource) SAL_OVERRIDE;
 };
 
 class SvLBoxBmp : public SvLBoxItem
@@ -149,39 +165,65 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem
 
     void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, 
vcl::Window* pParent );
 public:
-                    // An SvLBoxButton can be of three different kinds: an
-                    // enabled checkbox (the normal kind), a disabled checkbox
-                    // (which cannot be modified via UI), or a static image
-                    // (see SV_BMP_STATICIMAGE; nFlags are effectively ignored
-                    // for that kind).
-                    SvLBoxButton( SvTreeListEntry* pEntry,
-                                  SvLBoxButtonKind eTheKind, sal_uInt16 nFlags,
-                                  SvLBoxButtonData* pBData );
-                    SvLBoxButton();
-    virtual         ~SvLBoxButton();
-    virtual void    InitViewData( 
SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE;
+    // An SvLBoxButton can be of three different kinds: an
+    // enabled checkbox (the normal kind), a disabled checkbox
+    // (which cannot be modified via UI), or a static image
+    // (see SV_BMP_STATICIMAGE; nFlags are effectively ignored
+    // for that kind).
+    SvLBoxButton( SvTreeListEntry* pEntry,
+                  SvLBoxButtonKind eTheKind, sal_uInt16 nFlags,
+                  SvLBoxButtonData* pBData );
+    SvLBoxButton();
+    virtual ~SvLBoxButton();
+    virtual void InitViewData(SvTreeListBox* pView,
+                              SvTreeListEntry* pEntry,
+                              SvViewDataItem* pViewData) SAL_OVERRIDE;
+
     virtual sal_uInt16 GetType() const SAL_OVERRIDE;
-    bool    ClickHdl(SvTreeListBox* pView, SvTreeListEntry* );
-    virtual void Paint(
-        const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* 
pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
+    bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* );
+
+    virtual void Paint(const Point& rPos,
+                       SvTreeListBox& rOutDev,
+                       const SvViewDataEntry* pView,
+                       const SvTreeListEntry* pEntry) SAL_OVERRIDE;
+
     virtual SvLBoxItem* Create() const SAL_OVERRIDE;
-    virtual void    Clone( SvLBoxItem* pSource ) SAL_OVERRIDE;
-    SvItemStateFlags GetButtonFlags() const { return nItemFlags; }
-    bool            IsStateChecked() const { return bool(nItemFlags & 
SvItemStateFlags::CHECKED); }
-    bool            IsStateUnchecked() const { return bool(nItemFlags & 
SvItemStateFlags::UNCHECKED); }
-    bool            IsStateTristate() const { return bool(nItemFlags & 
SvItemStateFlags::TRISTATE); }
-    bool            IsStateHilighted() const { return bool(nItemFlags & 
SvItemStateFlags::HILIGHTED); }
-    void            SetStateChecked();
-    void            SetStateUnchecked();
-    void            SetStateTristate();
-    void            SetStateHilighted( bool bHilight );
-    void            SetStateInvisible();
+
+    virtual void Clone(SvLBoxItem* pSource) SAL_OVERRIDE;
+    SvItemStateFlags GetButtonFlags() const
+    {
+        return nItemFlags;
+    }
+    bool IsStateChecked() const
+    {
+        return bool(nItemFlags & SvItemStateFlags::CHECKED);
+    }
+    bool IsStateUnchecked() const
+    {
+        return bool(nItemFlags & SvItemStateFlags::UNCHECKED);
+    }
+    bool IsStateTristate() const
+    {
+        return bool(nItemFlags & SvItemStateFlags::TRISTATE);
+    }
+    bool IsStateHilighted() const
+    {
+        return bool(nItemFlags & SvItemStateFlags::HILIGHTED);
+    }
+    void SetStateChecked();
+    void SetStateUnchecked();
+    void SetStateTristate();
+    void SetStateHilighted(bool bHilight);
+    void SetStateInvisible();
 
     SvLBoxButtonKind GetKind() const { return eKind; }
 
     // Check whether this button can be modified via UI
-    bool            CheckModification() const;
-    SvLBoxButtonData* GetButtonData() const{ return pData;}
+    bool CheckModification() const;
+    SvLBoxButtonData* GetButtonData() const
+    {
+        return pData;
+    }
 };
 
 inline void SvLBoxButton::SetStateChecked()
@@ -189,6 +231,7 @@ inline void SvLBoxButton::SetStateChecked()
     nItemFlags &= SvItemStateFlags::HILIGHTED;
     nItemFlags |= SvItemStateFlags::CHECKED;
 }
+
 inline void SvLBoxButton::SetStateUnchecked()
 {
     nItemFlags &= SvItemStateFlags::HILIGHTED;
@@ -207,56 +250,64 @@ inline void SvLBoxButton::SetStateHilighted( bool 
bHilight )
         nItemFlags &= ~SvItemStateFlags::HILIGHTED;
 }
 
-
 struct SvLBoxContextBmp_Impl;
+
 class SVT_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem
 {
     SvLBoxContextBmp_Impl*  m_pImpl;
 public:
-    SvLBoxContextBmp(
-        SvTreeListEntry* pEntry, sal_uInt16 nItemFlags, Image aBmp1, Image 
aBmp2, bool bExpanded);
+    SvLBoxContextBmp(SvTreeListEntry* pEntry,
+                     sal_uInt16 nItemFlags,
+                     Image aBmp1,
+                     Image aBmp2,
+                     bool bExpanded);
     SvLBoxContextBmp();
+    virtual ~SvLBoxContextBmp();
 
-    virtual         ~SvLBoxContextBmp();
     virtual sal_uInt16 GetType() const SAL_OVERRIDE;
-    virtual void    InitViewData( 
SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE;
-    virtual void Paint(
-        const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* 
pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
+    virtual void InitViewData(SvTreeListBox* pView,
+                              SvTreeListEntry* pEntry,
+                              SvViewDataItem* pViewData) SAL_OVERRIDE;
+    virtual void Paint(const Point& rPos,
+                       SvTreeListBox& rOutDev,
+                       const SvViewDataEntry* pView,
+                       const SvTreeListEntry* pEntry) SAL_OVERRIDE;
+
     virtual SvLBoxItem* Create() const SAL_OVERRIDE;
-    virtual void    Clone( SvLBoxItem* pSource ) SAL_OVERRIDE;
+    virtual void Clone(SvLBoxItem* pSource) SAL_OVERRIDE;
 
 
-    bool            SetModeImages( const Image& _rBitmap1, const Image& 
_rBitmap2 );
-    void            GetModeImages(       Image& _rBitmap1,       Image& 
_rBitmap2 ) const;
+    bool SetModeImages(const Image& rBitmap1, const Image& rBitmap2);
+    void  GetModeImages(Image& rBitmap1, Image& rBitmap2) const;
 
-    inline void         SetBitmap1( const Image& _rImage );
-    inline void         SetBitmap2( const Image& _rImage );
-    inline const Image& GetBitmap1( ) const;
-    inline const Image& GetBitmap2( ) const;
+    inline void SetBitmap1(const Image& rImage);
+    inline void SetBitmap2(const Image& rImage);
+    inline const Image& GetBitmap1() const;
+    inline const Image& GetBitmap2() const;
 
 private:
-    Image& implGetImageStore( bool _bFirst );
+    Image& implGetImageStore(bool bFirst);
 };
 
-inline void SvLBoxContextBmp::SetBitmap1( const Image& _rImage  )
+inline void SvLBoxContextBmp::SetBitmap1(const Image& _rImage)
 {
-    implGetImageStore( true ) = _rImage;
+    implGetImageStore(true) = _rImage;
 }
 
-inline void SvLBoxContextBmp::SetBitmap2( const Image& _rImage )
+inline void SvLBoxContextBmp::SetBitmap2(const Image& _rImage)
 {
-    implGetImageStore( false ) = _rImage;
+    implGetImageStore(false) = _rImage;
 }
 
-inline const Image& SvLBoxContextBmp::GetBitmap1( ) const
+inline const Image& SvLBoxContextBmp::GetBitmap1() const
 {
-    Image& rImage = const_cast< SvLBoxContextBmp* >( this 
)->implGetImageStore( true );
+    Image& rImage = 
const_cast<SvLBoxContextBmp*>(this)->implGetImageStore(true);
     return rImage;
 }
 
-inline const Image& SvLBoxContextBmp::GetBitmap2( ) const
+inline const Image& SvLBoxContextBmp::GetBitmap2() const
 {
-    Image& rImage = const_cast< SvLBoxContextBmp* >( this 
)->implGetImageStore( false );
+    Image& rImage = 
const_cast<SvLBoxContextBmp*>(this)->implGetImageStore(false);
     return rImage;
 }
 
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 43b81fb..bdf27d1 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -337,19 +337,39 @@ public:
     SvTreeListBox( vcl::Window* pParent, const ResId& rResId );
     virtual ~SvTreeListBox();
 
-    SvTreeList* GetModel() const { return pModel; }
+    SvTreeList* GetModel() const
+    {
+        return pModel;
+    }
+
     using SvListView::SetModel;
+
     void SetModel(SvTreeList* pNewModel) SAL_OVERRIDE;
 
-    sal_uLong           GetEntryCount() const {return pModel->GetEntryCount();}
-    SvTreeListEntry*    First() const { return pModel->First(); }
-    SvTreeListEntry*    Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) 
const { return pModel->Next(pEntry,pDepth); }
-    SvTreeListEntry*    Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) 
const { return pModel->Prev(pEntry,pDepth); }
-    SvTreeListEntry*    Last() const { return pModel->Last(); }
+    sal_uLong GetEntryCount() const
+    {
+        return pModel->GetEntryCount();
+    }
+    SvTreeListEntry* First() const
+    {
+        return pModel->First();
+    }
+    SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth = 0 ) 
const
+    {
+         return pModel->Next(pEntry, pDepth);
+    }
+    SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth = 0 ) 
const
+    {
+        return pModel->Prev(pEntry, pDepth);
+    }
+    SvTreeListEntry* Last() const
+    {
+        return pModel->Last();
+    }
 
-    SvTreeListEntry*    FirstChild( SvTreeListEntry* pParent ) const;
-    SvTreeListEntry*    NextSibling( SvTreeListEntry* pEntry ) const;
-    SvTreeListEntry*    PrevSibling( SvTreeListEntry* pEntry ) const;
+    SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const;
+    SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const;
+    SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const;
 
     bool            CopySelection( SvTreeListBox* pSource, SvTreeListEntry* 
pTarget );
     bool            MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* 
pTarget );
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index bc58e2d..1e31187 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -961,8 +961,6 @@ void SvTreeListBox::InitViewData( SvViewDataEntry* pData, 
SvTreeListEntry* pEntr
     }
 }
 
-
-
 void SvTreeListBox::EnableSelectionAsDropTarget( bool bEnable, bool 
bWithChildren )
 {
     sal_uInt16 nRefDepth;
@@ -2566,13 +2564,11 @@ void SvTreeListBox::Paint( const Rectangle& rRect )
         if( HasFocus() )
         {
             long tempHeight = GetTextHeight();
-            Rectangle tempRect(
-                                
Point(0,0),Size(GetSizePixel().Width(),tempHeight)
-                               );
+            Rectangle tempRect(Point(0, 0), Size(GetSizePixel().Width(), 
tempHeight));
             ShowFocus(tempRect);
         }
-
-        else{
+        else
+        {
             HideFocus();
         }
     }
commit 7e1d93056be5d43a6307dd75744cd006144f5cb8
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date:   Mon Apr 6 13:52:02 2015 +0900

    cleanup templdgi
    
    Change-Id: I1148321236ba3ea5ed3e8df478800686c40e00ea

diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 580f3ad..a983a7f 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -57,70 +57,83 @@ private:
 
 protected:
     SfxCommonTemplateDialog_Impl* pDialog;
-    sal_uInt16                    nModifier;
+    sal_uInt16 nModifier;
 
 public:
-    DropListBox_Impl( vcl::Window* pParent, const ResId& rId, 
SfxCommonTemplateDialog_Impl* pD )
+    DropListBox_Impl(vcl::Window* pParent, const ResId& rId, 
SfxCommonTemplateDialog_Impl* pD)
         : SvTreeListBox(pParent, rId)
         , pDialog(pD)
         , nModifier(0)
     {}
-    DropListBox_Impl( vcl::Window* pParent, WinBits nWinBits, 
SfxCommonTemplateDialog_Impl* pD )
+
+    DropListBox_Impl(vcl::Window* pParent, WinBits nWinBits, 
SfxCommonTemplateDialog_Impl* pD)
         : SvTreeListBox(pParent, nWinBits)
         , pDialog(pD)
         , nModifier(0)
     {}
-    virtual void     MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
+
+    virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvt) SAL_OVERRIDE;
     using SvTreeListBox::ExecuteDrop;
-    virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
+    virtual sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt) SAL_OVERRIDE;
 
-    sal_uInt16           GetModifier() const { return nModifier; }
+    sal_uInt16 GetModifier() const
+    {
+        return nModifier;
+    }
 
-    virtual bool     Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 };
 
 typedef std::vector<OUString> ExpandedEntries_t;
 
-/*  [Description]
-
-    TreeListBox class for displaying the hierarchical view of the templates
+/** TreeListBox class for displaying the hierarchical view of the templates
 */
-
 class StyleTreeListBox_Impl : public DropListBox_Impl
 {
 private:
-    SvTreeListEntry*                pCurEntry;
-    Link                            aDoubleClickLink;
-    Link                            aDropLink;
-    OUString                        aParent;
-    OUString                        aStyle;
+    SvTreeListEntry* pCurEntry;
+    Link  aDoubleClickLink;
+    Link aDropLink;
+    OUString  aParent;
+    OUString aStyle;
 
 protected:
-    virtual void    Command( const CommandEvent& rMEvt ) SAL_OVERRIDE;
-    virtual bool    Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
-    virtual bool    DoubleClickHdl() SAL_OVERRIDE;
-    virtual bool    ExpandingHdl() SAL_OVERRIDE;
-    virtual void    ExpandedHdl() SAL_OVERRIDE;
-    virtual TriState NotifyMoving(SvTreeListEntry*  pTarget,
-                                     SvTreeListEntry*  pEntry,
-                                     SvTreeListEntry*& rpNewParent,
-                                     sal_uIntPtr&        rNewChildPos) 
SAL_OVERRIDE;
+    virtual void Command(const CommandEvent& rMEvt) SAL_OVERRIDE;
+    virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE;
+    virtual bool DoubleClickHdl() SAL_OVERRIDE;
+    virtual bool ExpandingHdl() SAL_OVERRIDE;
+    virtual void ExpandedHdl() SAL_OVERRIDE;
+    virtual TriState NotifyMoving(
+                SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+                SvTreeListEntry*& rpNewParent, sal_uIntPtr& rNewChildPos) 
SAL_OVERRIDE;
 public:
     StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits 
nWinStyle = 0);
 
-    void            SetDoubleClickHdl(const Link &rLink) { aDoubleClickLink = 
rLink; }
-    void            SetDropHdl(const Link &rLink) { aDropLink = rLink; }
+    void SetDoubleClickHdl(const Link &rLink)
+    {
+        aDoubleClickLink = rLink;
+    }
+    void SetDropHdl(const Link &rLink)
+    {
+        aDropLink = rLink;
+    }
+
     using SvTreeListBox::GetParent;
-    const OUString& GetParent() const { return aParent; }
-    const OUString& GetStyle() const { return aStyle; }
-    void            MakeExpanded_Impl(ExpandedEntries_t& rEntries) const;
+
+    const OUString& GetParent() const
+    {
+        return aParent;
+    }
+    const OUString& GetStyle() const
+    {
+        return aStyle;
+    }
+    void MakeExpanded_Impl(ExpandedEntries_t& rEntries) const;
 
     virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE;
 };
 
-// class SfxActionListBox ------------------------------------------------
-
 class SfxActionListBox : public DropListBox_Impl
 {
 protected:
@@ -130,19 +143,18 @@ public:
     virtual PopupMenu*  CreateContextMenu( void ) SAL_OVERRIDE;
 };
 
-// class SfxCommonTemplateDialog_Impl ------------------------------------
-
 class SfxCommonTemplateDialog_Impl : public SfxListener
 {
 private:
     class DeletionWatcher;
     friend class DeletionWatcher;
+
     bool mbIgnoreSelect;
 
-    void    ReadResource();
-    void    ClearResource();
+    void ReadResource();
+    void ClearResource();
     void impl_clear();
-    DeletionWatcher * impl_setDeletionWatcher(DeletionWatcher* pNewWatcher);
+    DeletionWatcher* impl_setDeletionWatcher(DeletionWatcher* pNewWatcher);
 
 protected:
 #define MAX_FAMILIES            5
@@ -154,109 +166,120 @@ protected:
     friend class DropListBox_Impl;
     friend class SfxTemplateControllerItem;
 
-    SfxBindings*                pBindings;
-    SfxTemplateControllerItem*  pBoundItems[COUNT_BOUND_FUNC];
-
-    vcl::Window*                     pWindow;
-    SfxModule*                  pModule;
-    Idle*                       pIdle;
-
-    ResId*                      m_pStyleFamiliesId;
-    SfxStyleFamilies*           pStyleFamilies;
-    SfxTemplateItem*            pFamilyState[MAX_FAMILIES];
-    SfxStyleSheetBasePool*      pStyleSheetPool;
-    StyleTreeListBox_Impl*      pTreeBox;
-    SfxObjectShell*             pCurObjShell;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2 
>
-                                xModuleManager;
-    DeletionWatcher*            m_pDeletionWatcher;
-
-    SfxActionListBox            aFmtLb;
-    ListBox                     aFilterLb;
-    Size                        aSize;
-
-    sal_uInt16                      nActFamily; // Id in the ToolBox = 
Position - 1
-    sal_uInt16                      nActFilter; // FilterIdx
-    sal_uInt16                      nAppFilter; // Filter, which has set the 
application (for automatic)
-
-    bool                        bDontUpdate             :1,
-                                bIsWater                :1,
-                                bEnabled                :1,
-                                bUpdate                 :1,
-                                bUpdateFamily           :1,
-                                bCanEdit                :1,
-                                bCanDel                 :1,
-                                bCanNew                 :1,
-                                bCanHide                :1,
-                                bCanShow                :1,
-                                bWaterDisabled          :1,
-                                bNewByExampleDisabled   :1,
-                                bUpdateByExampleDisabled:1,
-                                bTreeDrag               :1,
-                                bHierarchical           :1,
-                                m_bWantHierarchical     :1,
-                                bBindingUpdate          :1;
-
-    DECL_LINK( FilterSelectHdl, ListBox * );
-    DECL_LINK( FmtSelectHdl, SvTreeListBox * );
-    DECL_LINK( ApplyHdl, Control * );
-    DECL_LINK( DropHdl, StyleTreeListBox_Impl * );
-    DECL_LINK( TimeOut, Timer * );
-
-
-    virtual void        EnableItem( sal_uInt16 /*nMesId*/, bool /*bCheck*/ = 
true ) {}
-    virtual void        CheckItem( sal_uInt16 /*nMesId*/, bool /*bCheck*/ = 
true ) {}
-    virtual bool        IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return true; }
-    virtual void        LoadedFamilies() {}
-    void                Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); }
-    void                InvalidateBindings();
-    virtual void        InsertFamilyItem( sal_uInt16 nId, const 
SfxStyleFamilyItem* pIten ) = 0;
-    virtual void        EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true 
) = 0;
-    virtual void        ClearFamilyList() = 0;
-    virtual void        ReplaceUpdateButtonByMenu();
-
-    void                NewHdl( void* );
-    void                EditHdl( void* );
-    void                DeleteHdl( void* );
-    void                HideHdl( void* );
-    void                ShowHdl( void* );
-
-    bool                Execute_Impl( sal_uInt16 nId, const OUString& rStr, 
const OUString& rRefStr,
-                                      sal_uInt16 nFamily, sal_uInt16 nMask = 0,
-                                      sal_uInt16* pIdx = NULL, const 
sal_uInt16* pModifier = NULL );
-
-    void                        UpdateStyles_Impl(sal_uInt16 nFlags);
-    const SfxStyleFamilyItem*   GetFamilyItem_Impl() const;
-    bool                    IsInitialized() const { return nActFamily != 
0xffff; }
-    void                        ResetFocus();
-    void                        EnableDelete();
-    void                        Initialize();
-    void                        EnableHierarchical(bool);
-
-    void                FilterSelect( sal_uInt16 nFilterIdx, bool bForce = 
false );
-    void                SetFamilyState( sal_uInt16 nSlotId, const 
SfxTemplateItem* );
-    void                SetWaterCanState( const SfxBoolItem* pItem );
-
-    void                SelectStyle( const OUString& rStyle );
-    bool            HasSelectedStyle() const;
-    SfxStyleSheetBase  *GetSelectedStyle() const;
-    void                FillTreeBox();
-    void                Update_Impl();
-    void                UpdateFamily_Impl();
+    SfxBindings* pBindings;
+    SfxTemplateControllerItem* pBoundItems[COUNT_BOUND_FUNC];
+
+    vcl::Window* pWindow;
+    SfxModule* pModule;
+    Idle* pIdle;
+
+    ResId* m_pStyleFamiliesId;
+    SfxStyleFamilies* pStyleFamilies;
+    SfxTemplateItem* pFamilyState[MAX_FAMILIES];
+    SfxStyleSheetBasePool* pStyleSheetPool;
+    StyleTreeListBox_Impl* pTreeBox;
+    SfxObjectShell* pCurObjShell;
+    css::uno::Reference<css::frame::XModuleManager2> xModuleManager;
+    DeletionWatcher* m_pDeletionWatcher;
+
+    SfxActionListBox aFmtLb;
+    ListBox aFilterLb;
+    Size aSize;
+
+    sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1
+    sal_uInt16 nActFilter; // FilterIdx
+    sal_uInt16 nAppFilter; // Filter, which has set the application (for 
automatic)
+
+    bool bDontUpdate :1;
+    bool bIsWater :1;
+    bool bEnabled :1;
+    bool bUpdate :1;
+    bool bUpdateFamily :1;
+    bool bCanEdit :1;
+    bool bCanDel :1;
+    bool bCanNew :1;
+    bool bCanHide :1;
+    bool bCanShow :1;
+    bool bWaterDisabled :1;
+    bool bNewByExampleDisabled :1;
+    bool bUpdateByExampleDisabled :1;
+    bool bTreeDrag :1;
+    bool bHierarchical :1;
+    bool m_bWantHierarchical :1;
+    bool bBindingUpdate :1;
+
+    DECL_LINK( FilterSelectHdl, ListBox* );
+    DECL_LINK( FmtSelectHdl, SvTreeListBox* );
+    DECL_LINK( ApplyHdl, Control* );
+    DECL_LINK( DropHdl, StyleTreeListBox_Impl* );
+    DECL_LINK( TimeOut, Timer* );
+
+    virtual void EnableItem(sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true)
+    {}
+    virtual void CheckItem(sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true)
+    {}
+    virtual bool IsCheckedItem(sal_uInt16 /*nMesId*/ )
+    {
+        return true;
+    }
+    virtual void LoadedFamilies()
+    {}
+    void Update()
+    {
+        UpdateStyles_Impl(UPDATE_FAMILY_LIST);
+    }
+
+    void InvalidateBindings();
+    virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* 
pItem ) = 0;
+    virtual void EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true ) = 0;
+    virtual void ClearFamilyList() = 0;
+    virtual void ReplaceUpdateButtonByMenu();
+
+    void NewHdl( void* );
+    void EditHdl( void* );
+    void DeleteHdl( void* );
+    void HideHdl( void* );
+    void ShowHdl( void* );
+
+    bool Execute_Impl(sal_uInt16 nId, const OUString& rStr, const OUString& 
rRefStr,
+                      sal_uInt16 nFamily, sal_uInt16 nMask = 0,
+                      sal_uInt16* pIdx = NULL, const sal_uInt16* pModifier = 
NULL );
+
+    void UpdateStyles_Impl(sal_uInt16 nFlags);
+    const SfxStyleFamilyItem* GetFamilyItem_Impl() const;
+    bool IsInitialized() const
+    {
+        return nActFamily != 0xffff;
+    }
+    void ResetFocus();
+    void EnableDelete();
+    void Initialize();
+    void EnableHierarchical(bool);
+
+    void FilterSelect( sal_uInt16 nFilterIdx, bool bForce = false );
+    void SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* );
+    void SetWaterCanState( const SfxBoolItem* pItem );
+
+    void SelectStyle( const OUString& rStyle );
+    bool HasSelectedStyle() const;
+    SfxStyleSheetBase* GetSelectedStyle() const;
+    void FillTreeBox();
+    void Update_Impl();
+    void UpdateFamily_Impl();
 
     // In which FamilyState do I have to look , in order to get the
     // information of the ith Family in the pStyleFamilies.
-    sal_uInt16              StyleNrToInfoOffset( sal_uInt16 i );
+    sal_uInt16 StyleNrToInfoOffset( sal_uInt16 i );
 
-    void                Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 
SAL_OVERRIDE;
+    void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
-    void                FamilySelect( sal_uInt16 nId );
-    void                SetFamily( sal_uInt16 nId );
-    void                ActionSelect( sal_uInt16 nId );
+    void FamilySelect( sal_uInt16 nId );
+    void SetFamily( sal_uInt16 nId );
+    void ActionSelect( sal_uInt16 nId );
 
-    sal_Int32           LoadFactoryStyleFilter( SfxObjectShell* i_pObjSh );
-    void                SaveFactoryStyleFilter( SfxObjectShell* i_pObjSh, 
sal_Int32 i_nFilter );
-    SfxObjectShell *    SaveSelection();
+    sal_Int32 LoadFactoryStyleFilter( SfxObjectShell* i_pObjSh );
+    void SaveFactoryStyleFilter( SfxObjectShell* i_pObjSh, sal_Int32 i_nFilter 
);
+    SfxObjectShell* SaveSelection();
 
 public:
     TYPEINFO_OVERRIDE();
@@ -266,28 +289,67 @@ public:
 
     DECL_LINK( MenuSelectHdl, Menu * );
 
-    virtual void        EnableEdit( bool b = true ) { bCanEdit = b; }
-    void                EnableDel( bool b = true )  { bCanDel = b; }
-    void                EnableNew( bool b = true )  { bCanNew = b; }
-    void                EnableHide( bool b = true )  { bCanHide = b; }
-    void                EnableShow( bool b = true )  { bCanShow = b; }
-
-    vcl::Window*        GetWindow() { return pWindow; }
-
-    void                EnableTreeDrag( bool b = true );
-    void                EnableExample_Impl( sal_uInt16 nId, bool bEnable );
-    SfxStyleFamily      GetActualFamily() const;
-    OUString            GetSelectedEntry() const;
-    SfxObjectShell*     GetObjectShell() const { return pCurObjShell; }
-
-    inline bool         CanEdit( void ) const   { return bCanEdit; }
-    inline bool         CanDel( void ) const    { return bCanDel; }
-    inline bool         CanNew( void ) const    { return bCanNew; }
-    inline bool         CanHide( void ) const    { return bCanHide; }
-    inline bool         CanShow( void ) const    { return bCanShow; }
+    virtual void EnableEdit( bool b = true )
+    {
+        bCanEdit = b;
+    }
+    void EnableDel( bool b = true )
+    {
+        bCanDel = b;
+    }
+    void EnableNew( bool b = true )
+    {
+        bCanNew = b;
+    }
+    void EnableHide( bool b = true )
+    {
+        bCanHide = b;
+    }
+    void EnableShow( bool b = true )
+    {
+        bCanShow = b;
+    }
+
+    vcl::Window* GetWindow()
+    {
+        return pWindow;
+    }
+
+    void EnableTreeDrag(bool b = true);
+    void EnableExample_Impl(sal_uInt16 nId, bool bEnable);
+    SfxStyleFamily GetActualFamily() const;
+    OUString GetSelectedEntry() const;
+
+    SfxObjectShell* GetObjectShell() const
+    {
+        return pCurObjShell;
+    }
+
+    inline bool CanEdit( void ) const
+    {
+        return bCanEdit;
+    }
+    inline bool CanDel( void ) const
+    {
+        return bCanDel;
+    }
+    inline bool CanNew( void ) const
+    {
+        return bCanNew;
+    }
+
+    inline bool CanHide( void ) const
+    {
+        return bCanHide;
+    }
+
+    inline bool CanShow( void ) const
+    {
+        return bCanShow;
+    }
 
     // normally for derivates from SvTreeListBoxes, but in this case the 
dialog handles context menus
-    PopupMenu*           CreateContextMenu( void );
+    PopupMenu*  CreateContextMenu( void );
 };
 
 class DropToolBox_Impl : public ToolBox, public DropTargetHelper
@@ -309,31 +371,31 @@ private:
     friend class SfxTemplatePanelControl;
 
     vcl::Window* m_pFloat;
-    bool            m_bZoomIn;
-    DropToolBox_Impl    m_aActionTbL;
-    ToolBox             m_aActionTbR;
+    bool m_bZoomIn;
+    DropToolBox_Impl m_aActionTbL;
+    ToolBox m_aActionTbR;
 
-    DECL_LINK( ToolBoxLSelect, ToolBox * );
-    DECL_LINK( ToolBoxRSelect, ToolBox * );
-    DECL_LINK( ToolBoxRClick, ToolBox * );
+    DECL_LINK( ToolBoxLSelect, ToolBox* );
+    DECL_LINK( ToolBoxRSelect, ToolBox* );
+    DECL_LINK( ToolBoxRClick, ToolBox* );
     DECL_LINK( MenuSelectHdl, Menu* );
 
 protected:
-    virtual void    EnableEdit( bool = true ) SAL_OVERRIDE;
-    virtual void    EnableItem( sal_uInt16 nMesId, bool bCheck = true ) 
SAL_OVERRIDE;
-    virtual void    CheckItem( sal_uInt16 nMesId, bool bCheck = true ) 
SAL_OVERRIDE;
-    virtual bool    IsCheckedItem( sal_uInt16 nMesId ) SAL_OVERRIDE;
-    virtual void    LoadedFamilies() SAL_OVERRIDE;
-    virtual void    InsertFamilyItem( sal_uInt16 nId, const 
SfxStyleFamilyItem* pIten ) SAL_OVERRIDE;
-    virtual void    EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true ) 
SAL_OVERRIDE;
-    virtual void    ClearFamilyList() SAL_OVERRIDE;
-    virtual void    ReplaceUpdateButtonByMenu() SAL_OVERRIDE;
-
-    void            Resize();
-    Size            GetMinOutputSizePixel();
-
-    void            updateFamilyImages();
-    void            updateNonFamilyImages();
+    virtual void EnableEdit( bool = true ) SAL_OVERRIDE;
+    virtual void EnableItem( sal_uInt16 nMesId, bool bCheck = true ) 
SAL_OVERRIDE;
+    virtual void CheckItem( sal_uInt16 nMesId, bool bCheck = true ) 
SAL_OVERRIDE;
+    virtual bool IsCheckedItem( sal_uInt16 nMesId ) SAL_OVERRIDE;
+    virtual void LoadedFamilies() SAL_OVERRIDE;
+    virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* 
pIten ) SAL_OVERRIDE;
+    virtual void EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true ) 
SAL_OVERRIDE;
+    virtual void ClearFamilyList() SAL_OVERRIDE;
+    virtual void ReplaceUpdateButtonByMenu() SAL_OVERRIDE;
+
+    void Resize();
+    Size GetMinOutputSizePixel();
+
+    void updateFamilyImages();
+    void updateNonFamilyImages();
 
 public:
     friend class SfxTemplateDialog;
commit 49a7470417d8ba32140b35318176e0e2593a66a5
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date:   Mon Apr 6 12:56:58 2015 +0900

    cleanup templdlg
    
    Change-Id: Idb594da1bbd3aba34ff6391b36deacaea34b7842

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index bcb7b11..cc726c4d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -64,11 +64,10 @@
 
 #include <comphelper/string.hxx>
 
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::uno;
-
+using namespace css;
+using namespace css::beans;
+using namespace css::frame;
+using namespace css::uno;
 
 // Window is now created dynamically. So here margins, etc.
 
@@ -86,11 +85,9 @@ static sal_uInt16 nLastItemId = USHRT_MAX;
 #define MAX_FILTER_ENTRIES          14
 
 
-
 TYPEINIT0(SfxCommonTemplateDialog_Impl);
 TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl);
 
-
 class SfxCommonTemplateDialog_Impl::DeletionWatcher : private 
boost::noncopyable
 {
     typedef void (DeletionWatcher::* bool_type)();
@@ -138,13 +135,10 @@ void DropListBox_Impl::MouseButtonDown( const MouseEvent& 
rMEvt )
         SvTreeListBox::MouseButtonDown( rMEvt );
 }
 
-sal_Int8 DropListBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
-
-/*  [Description: ]
-    Drop is enabled as long as it is allowed to create a new style by example, 
i.e. to
+/** Drop is enabled as long as it is allowed to create a new style by example, 
i.e. to
     create a style out of the current selection.
 */
-
+sal_Int8 DropListBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
 {
     if ( IsDropFormatSupported( SotClipboardFormatId::OBJECTDESCRIPTOR ) )
     {
@@ -159,8 +153,6 @@ sal_Int8 DropListBox_Impl::AcceptDrop( const 
AcceptDropEvent& rEvt )
     return SvTreeListBox::AcceptDrop( rEvt );
 }
 
-
-
 sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
     sal_Int8 nRet = DND_ACTION_NONE;
@@ -196,7 +188,6 @@ sal_Int8 DropListBox_Impl::ExecuteDrop( const 
ExecuteDropEvent& rEvt )
     return nRet;
 }
 
-
 IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop)
 {
     pDialog->ActionSelect( SID_STYLE_NEW_BY_EXAMPLE );
@@ -228,30 +219,15 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-
-
-
-
-SfxActionListBox::SfxActionListBox
-(
-    SfxCommonTemplateDialog_Impl* pParent,
-    WinBits nWinBits
-)
-
-/*  [Description]
-
-    ListBox class that starts a PopupMenu (designer specific) in the
+/** ListBox class that starts a PopupMenu (designer specific) in the
     command handler.
 */
-
-:       DropListBox_Impl(pParent->GetWindow(), nWinBits, pParent)
-
+SfxActionListBox::SfxActionListBox(SfxCommonTemplateDialog_Impl* pParent, 
WinBits nWinBits)
+    : DropListBox_Impl(pParent->GetWindow(), nWinBits, pParent)
 {
     EnableContextMenuHandling();
 }
 
-
-
 PopupMenu* SfxActionListBox::CreateContextMenu( void )
 {
 
@@ -263,14 +239,10 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
     return pDialog->CreateContextMenu();
 }
 
-
-//===== SfxTemplatePanelControl ===============================================
-SfxTemplatePanelControl::SfxTemplatePanelControl (
-    SfxBindings* pBindings,
-    vcl::Window* pParentWindow)
-    : DockingWindow(pParentWindow, SfxResId(DLG_STYLE_DESIGNER)),
-      pImpl(new SfxTemplateDialog_Impl(pBindings, this)),
-      mpBindings(pBindings)
+SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, 
vcl::Window* pParentWindow)
+    : DockingWindow(pParentWindow, SfxResId(DLG_STYLE_DESIGNER))
+    , pImpl(new SfxTemplateDialog_Impl(pBindings, this))
+    , mpBindings(pBindings)
 {
     OSL_ASSERT(mpBindings!=NULL);
 
@@ -328,10 +300,10 @@ void SfxTemplatePanelControl::StateChanged( 
StateChangedType nStateChange )
 
 void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries_t& rEntries) 
const
 {
-    SvTreeListEntry *pEntry;
-    
for(pEntry=(SvTreeListEntry*)FirstVisible();pEntry;pEntry=(SvTreeListEntry*)NextVisible(pEntry))
+    SvTreeListEntry* pEntry;
+    for (pEntry = FirstVisible(); pEntry; pEntry = NextVisible(pEntry))
     {
-        if(IsExpanded(pEntry))
+        if (IsExpanded(pEntry))
         {
             rEntries.push_back(GetEntryText(pEntry));
         }
@@ -343,33 +315,23 @@ PopupMenu* StyleTreeListBox_Impl::CreateContextMenu()
     return pDialog->CreateContextMenu();
 }
 
-bool StyleTreeListBox_Impl::DoubleClickHdl()
-
-/*  [Description]
-
-    DoubleClick-Handler; calls the link.
+/** DoubleClick-Handler; calls the link.
     SV virtual method.
 */
+bool StyleTreeListBox_Impl::DoubleClickHdl()
 {
     aDoubleClickLink.Call(this);
     return false;
 }
 
-
-
-void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt )
-
-/*  [Description]
-
-    Command Handler; this executes a PopupMenu (designer-specific)
+/** Command Handler; this executes a PopupMenu (designer-specific)
     SV virtual method.
 */
+void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt )
 {
     SvTreeListBox::Command(rCEvt);
 }
 
-
-
 bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
 {
     // handle <RETURN> as double click
@@ -391,17 +353,13 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-
-
+/** NotifyMoving Handler; This leads via a link on the event to the dialog.
+    SV virtual method.
+*/
 TriState StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry*  pTarget,
                                          SvTreeListEntry*  pEntry,
                                          SvTreeListEntry*& rpNewParent,
                                          sal_uIntPtr& lPos)
-/*  [Description]
-
-    NotifyMoving Handler; This leads via a link on the event to the dialog.
-    SV virtual method.
-*/
 {
     if(!pTarget || !pEntry)
         return TRISTATE_FALSE;
@@ -420,34 +378,25 @@ TriState 
StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry*  pTarget,
     return bRet ? TRISTATE_INDET : TRISTATE_FALSE;
 }
 
-bool  StyleTreeListBox_Impl::ExpandingHdl()
-
-/*  [Description]
-
-    ExpandingHdl Handler; the current entry is noticed.
+/** ExpandingHdl Handler; the current entry is noticed.
     SV virtual method.
 
     [Cross-reference]
     <StyleTreeListBox_Impl::ExpandedHdl()>
 */
+bool  StyleTreeListBox_Impl::ExpandingHdl()
 {
     pCurEntry = GetCurEntry();
     return true;
 }
 
-
-
-void  StyleTreeListBox_Impl::ExpandedHdl()
-
-/*  [Description]
-
-    ExpandedHdl Handler;
+/**  ExpandedHdl Handler;
     SV virtual method.
 
     [Cross-reference]
     <StyleTreeListBox_Impl::ExpandingHdl()>
 */
-
+void  StyleTreeListBox_Impl::ExpandedHdl()
 {
     SvTreeListEntry *pEntry = GetHdlEntry();
     if(!IsExpanded(pEntry) && pCurEntry != GetCurEntry())
@@ -455,25 +404,15 @@ void  StyleTreeListBox_Impl::ExpandedHdl()
     pCurEntry = 0;
 }
 
-
-
-StyleTreeListBox_Impl::StyleTreeListBox_Impl(
-    SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle) :
-    DropListBox_Impl(pParent->GetWindow(), nWinStyle, pParent),
-    pCurEntry(0)
-
-/*  [Description]
-
-    Constructor StyleTreeListBox_Impl
-*/
+/** Constructor StyleTreeListBox_Impl */
+StyleTreeListBox_Impl::StyleTreeListBox_Impl(SfxCommonTemplateDialog_Impl* 
pParent, WinBits nWinStyle)
+    : DropListBox_Impl(pParent->GetWindow(), nWinStyle, pParent)
+    , pCurEntry(0)
 {
     EnableContextMenuHandling();
 }
 
-/*  [Description]
-
-    Internal structure for the establishment of the hierarchical view
-*/
+/** Internal structure for the establishment of the hierarchical view */
 class StyleTree_Impl;
 typedef std::vector<StyleTree_Impl*> StyleTreeArr_Impl;
 
@@ -520,7 +459,7 @@ void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr 
lPos)
 
 
 
-StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
+StyleTreeArr_Impl& MakeTree_Impl(StyleTreeArr_Impl& rArr)
 {
     const sal_uInt16 nCount = rArr.size();
 
@@ -562,9 +501,6 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
     return rArr;
 }
 
-
-
-
 inline bool IsExpanded_Impl( const ExpandedEntries_t& rEntries,
                              const OUString &rStr)
 {
@@ -576,8 +512,6 @@ inline bool IsExpanded_Impl( const ExpandedEntries_t& 
rEntries,
     return false;
 }
 
-
-
 SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox,
                                  StyleTree_Impl* pEntry,
                                  const ExpandedEntries_t& rEntries,
@@ -589,47 +523,46 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox,
     return pNewEntry;
 }
 
-
 // Constructor
 
-SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, 
vcl::Window* pW, bool ) :
-    mbIgnoreSelect( false ),
-    pBindings               ( pB ),
-    pWindow                 ( pW ),
-    pModule                 ( NULL ),
-    pIdle                   ( NULL ),
-    m_pStyleFamiliesId      ( NULL ),
-    pStyleFamilies          ( NULL ),
-    pStyleSheetPool         ( NULL ),
-    pTreeBox                ( NULL ),
-    pCurObjShell            ( NULL ),
-    xModuleManager          ( 
frame::ModuleManager::create(::comphelper::getProcessComponentContext()) ),
-    m_pDeletionWatcher      ( NULL ),
-
-    aFmtLb                  ( this, WB_BORDER | WB_TABSTOP | WB_SORT | 
WB_QUICK_SEARCH ),
-    aFilterLb               ( pW, WB_BORDER | WB_DROPDOWN | WB_TABSTOP ),
-
-    nActFamily              ( 0xffff ),
-    nActFilter              ( 0 ),
-    nAppFilter              ( 0 ),
-
-    bDontUpdate             ( false ),
-    bIsWater                ( false ),
-    bEnabled                ( true ),
-    bUpdate                 ( false ),
-    bUpdateFamily           ( false ),
-    bCanEdit                ( false ),
-    bCanDel                 ( false ),
-    bCanNew                 ( true ),
-    bCanHide                ( true ),
-    bCanShow                ( false ),
-    bWaterDisabled          ( false ),
-    bNewByExampleDisabled   ( false ),
-    bUpdateByExampleDisabled( false ),
-    bTreeDrag               ( true ),
-    bHierarchical           ( false ),
-    m_bWantHierarchical     ( false ),
-    bBindingUpdate          ( true )
+SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, 
vcl::Window* pW, bool )
+    : mbIgnoreSelect(false)
+    , pBindings(pB)
+    , pWindow(pW)
+    , pModule(NULL)
+    , pIdle(NULL)
+    , m_pStyleFamiliesId(NULL)
+    , pStyleFamilies(NULL)
+    , pStyleSheetPool(NULL)
+    , pTreeBox(NULL)
+    , pCurObjShell(NULL)
+    , 
xModuleManager(frame::ModuleManager::create(::comphelper::getProcessComponentContext()))
+    , m_pDeletionWatcher(NULL)
+
+    , aFmtLb(this, WB_BORDER | WB_TABSTOP | WB_SORT | WB_QUICK_SEARCH)
+    , aFilterLb(pW, WB_BORDER | WB_DROPDOWN | WB_TABSTOP)
+
+    , nActFamily(0xffff)
+    , nActFilter(0)
+    , nAppFilter(0)
+
+    , bDontUpdate(false)
+    , bIsWater(false)
+    , bEnabled(true)
+    , bUpdate(false)
+    , bUpdateFamily(false)
+    , bCanEdit(false)
+    , bCanDel(false)
+    , bCanNew(true)
+    , bCanHide(true)
+    , bCanShow(false)
+    , bWaterDisabled(false)
+    , bNewByExampleDisabled(false)
+    , bUpdateByExampleDisabled(false)
+    , bTreeDrag(true)
+    , bHierarchical(false)
+    , m_bWantHierarchical(false)
+    , bBindingUpdate(true)
 {
     aFmtLb.SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST).toString());
     aFmtLb.SetHelpId( HID_TEMPLATE_FMT );
@@ -656,8 +589,6 @@ void SfxTemplateDialog_Impl::EnableEdit(bool bEnable)
         EnableItem( SID_STYLE_UPDATE_BY_EXAMPLE, bEnable);
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::ReadResource()
 {
     // Read global user resource
@@ -691,16 +622,21 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
     pBindings->ENTERREGISTRATIONS();
 
     size_t i;
-    for(i = 0; i < nCount; ++i)
+    for (i = 0; i < nCount; ++i)
     {
         sal_uInt16 nSlot = 0;
         switch( (sal_uInt16)pStyleFamilies->at( i )->GetFamily() )
         {
-            case SFX_STYLE_FAMILY_CHAR: nSlot = SID_STYLE_FAMILY1; break;
-            case SFX_STYLE_FAMILY_PARA: nSlot = SID_STYLE_FAMILY2; break;
-            case SFX_STYLE_FAMILY_FRAME:nSlot = SID_STYLE_FAMILY3; break;
-            case SFX_STYLE_FAMILY_PAGE: nSlot = SID_STYLE_FAMILY4; break;
-            case SFX_STYLE_FAMILY_PSEUDO: nSlot = SID_STYLE_FAMILY5; break;
+            case SFX_STYLE_FAMILY_CHAR:
+                nSlot = SID_STYLE_FAMILY1; break;
+            case SFX_STYLE_FAMILY_PARA:
+                nSlot = SID_STYLE_FAMILY2; break;
+            case SFX_STYLE_FAMILY_FRAME:
+                nSlot = SID_STYLE_FAMILY3; break;
+            case SFX_STYLE_FAMILY_PAGE:
+                nSlot = SID_STYLE_FAMILY4; break;
+            case SFX_STYLE_FAMILY_PSEUDO:
+                nSlot = SID_STYLE_FAMILY5; break;
             default: OSL_FAIL("unknown StyleFamily"); break;
         }
         pBoundItems[i] =
@@ -880,8 +816,6 @@ SfxStyleSheetBase 
*SfxCommonTemplateDialog_Impl::GetSelectedStyle() const
     return pStyleSheetPool->Find( aTemplName, pItem->GetFamily(), 
SFXSTYLEBIT_ALL );
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr)
 {
     const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
@@ -955,8 +889,6 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const 
OUString &rStr)
     }
 }
 
-
-
 OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
 {
     OUString aRet;
@@ -975,8 +907,6 @@ OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() 
const
     return aRet;
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::EnableTreeDrag( bool bEnable )
 {
     if ( pStyleSheetPool )
@@ -993,8 +923,6 @@ void SfxCommonTemplateDialog_Impl::EnableTreeDrag( bool 
bEnable )
     bTreeDrag = bEnable;
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::FillTreeBox()
 {
     OSL_ENSURE( pTreeBox, "FillTreeBox() without treebox");
@@ -1048,16 +976,12 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
     }
 }
 
-
 bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
 {
     return pTreeBox? pTreeBox->FirstSelected() != 0:
             aFmtLb.GetSelectionCount() != 0;
 }
 
-
-
-
 // internal: Refresh the display
 // nFlags: what we should update.
 void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
@@ -1201,8 +1125,6 @@ void 
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
     }
 }
 
-
-
 // Updated display: Watering the house
 void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
 {
@@ -1242,12 +1164,9 @@ void 
SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
     pBindings->LeaveRegistrations();
 }
 
-
-
 // Item with the status of a Family is copied and noted
 // (is updated when all states have also been updated.)
 // See also: <SfxBindings::AddDoneHdl(const Link &)>
-
 void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const 
SfxTemplateItem* pItem )
 {
     sal_uInt16 nIdx = nSlotId - SID_STYLE_FAMILY_START;
@@ -1260,10 +1179,8 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( 
sal_uInt16 nSlotId, const Sfx
     bUpdateFamily = true;
 }
 
-
 // Notice from SfxBindings that the update is completed. Pushes out the update
 // of the display.
-
 void SfxCommonTemplateDialog_Impl::Update_Impl()
 {
     bool bDocChanged=false;
@@ -1362,8 +1279,6 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
      EnableNew( bCanNew );
 }
 
-
-
 IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
 {
     (void)pTim; // unused
@@ -1391,8 +1306,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer 
*, pTim )
     return 0;
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint)
 {
     // tap update
@@ -1487,8 +1400,6 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& 
/*rBC*/, const SfxHint
     }
 }
 
-
-
 // Other filters; can be switched by the users or as a result of new or
 // editing, if the current document has been assigned a different filter.
 void SfxCommonTemplateDialog_Impl::FilterSelect(
@@ -1514,8 +1425,6 @@ void SfxCommonTemplateDialog_Impl::FilterSelect(
     }
 }
 
-
-
 // Internal: Perform functions through the Dispatcher
 bool SfxCommonTemplateDialog_Impl::Execute_Impl(
     sal_uInt16 nId, const OUString &rStr, const OUString& rRefStr, sal_uInt16 
nFamily,
@@ -1580,8 +1489,6 @@ bool SfxCommonTemplateDialog_Impl::Execute_Impl(
     return true;
 }
 
-
-
 // Handler der Listbox der Filter
 void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
 {
@@ -1642,8 +1549,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, 
ListBox *, pBox )
     return 0;
 }
 
-
-
 // Select-Handler for the Toolbox
 void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
 {
@@ -1660,8 +1565,6 @@ void 
SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
     }
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
 {
     OUString aEmpty;
@@ -1738,8 +1641,6 @@ void 
SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
     }
 }
 
-
-
 static OUString getModuleIdentifier( const Reference< XModuleManager2 >& 
i_xModMgr, SfxObjectShell* i_pObjSh )
 {
     OSL_ENSURE( i_xModMgr.is(), "getModuleIdentifier(): no XModuleManager" );
@@ -1763,8 +1664,6 @@ static OUString getModuleIdentifier( const Reference< 
XModuleManager2 >& i_xModM
     return sIdentifier;
 }
 
-
-
 sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( 
SfxObjectShell* i_pObjSh )
 {
     OSL_ENSURE( i_pObjSh, 
"SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter(): no ObjectShell" );
@@ -1782,8 +1681,6 @@ sal_Int32 
SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell*
     return nFilter;
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* 
i_pObjSh, sal_Int32 i_nFilter )
 {
     OSL_ENSURE( i_pObjSh, 
"SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter(): no ObjectShell" );
@@ -1806,8 +1703,6 @@ SfxObjectShell* 
SfxCommonTemplateDialog_Impl::SaveSelection()
     return pDocShell;
 }
 
-
-
 IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, 
pBox )
 {
     bDontUpdate=true;
@@ -1818,8 +1713,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, 
StyleTreeListBox_Impl *, pBox
     return ret;
 }
 
-
-
 // Handler for the New-Buttons
 void SfxCommonTemplateDialog_Impl::NewHdl(void *)
 {
@@ -1856,8 +1749,6 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
     }
 }
 
-
-
 // Handler for the edit-Buttons
 void SfxCommonTemplateDialog_Impl::EditHdl(void *)
 {
@@ -1881,8 +1772,6 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
     }
 }
 
-
-
 // Handler for the Delete-Buttons
 void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
 {
@@ -1992,9 +1881,7 @@ void SfxCommonTemplateDialog_Impl::ShowHdl(void *)
     }
 }
 
-
-
-void    SfxCommonTemplateDialog_Impl::EnableDelete()
+void SfxCommonTemplateDialog_Impl::EnableDelete()
 {
     if(IsInitialized() && HasSelectedStyle())
     {
@@ -2026,9 +1913,8 @@ void    SfxCommonTemplateDialog_Impl::EnableDelete()
     }
 }
 
-
 // After selecting a focused item if possible again on the app window
-void    SfxCommonTemplateDialog_Impl::ResetFocus()
+void SfxCommonTemplateDialog_Impl::ResetFocus()
 {
     if(ISA(SfxTemplateDialog_Impl))
     {
@@ -2040,9 +1926,7 @@ void    SfxCommonTemplateDialog_Impl::ResetFocus()
     }
 }
 
-
-
-// Doppelclick on a style sheet in the ListBox is applied.
+// Double-click on a style sheet in the ListBox is applied.
 IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
 {
     (void)pControl; //unused
@@ -2060,8 +1944,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, 
Control *, pControl )
     return 0;
 }
 
-
-
 // Selection of a template during the Watercan-Status
 IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, 
pListBox )
 {
@@ -2197,16 +2079,12 @@ void SfxTemplateDialog_Impl::Initialize (void)
     m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT );
 }
 
-
-
 void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, bool bEnable )
 {
     m_aActionTbL.EnableItem( nId, bEnable );
 }
 
-
 // Insert element into dropdown filter "Frame Styles", "List Styles", etc.
-
 void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const 
SfxStyleFamilyItem *pItem)
 {
     OString sHelpId;
@@ -2223,8 +2101,6 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 
nId,const SfxStyleFamil
     m_aActionTbL.SetHelpId( nId, sHelpId );
 }
 
-
-
 void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
 {
     m_aActionTbR.HideItem(SID_STYLE_UPDATE_BY_EXAMPLE);
@@ -2232,7 +2108,6 @@ void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
             ToolBoxItemBits::DROPDOWNONLY|m_aActionTbR.GetItemBits( 
SID_STYLE_NEW_BY_EXAMPLE ));
 }
 
-
 void SfxTemplateDialog_Impl::updateFamilyImages()
 {
     if ( !m_pStyleFamiliesId )
@@ -2252,21 +2127,16 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
     }
 }
 
-
 void SfxTemplateDialog_Impl::updateNonFamilyImages()
 {
     m_aActionTbR.SetImageList( ImageList( SfxResId( DLG_STYLE_DESIGNER ) ) );
 }
 
-
-
 void SfxTemplateDialog_Impl::ClearFamilyList()
 {
     m_aActionTbL.Clear();
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::InvalidateBindings()
 {
     pBindings->Invalidate(SID_STYLE_NEW_BY_EXAMPLE, true, false);
@@ -2281,22 +2151,16 @@ void SfxCommonTemplateDialog_Impl::InvalidateBindings()
     pBindings->Update( SID_STYLE_DRAGHIERARCHIE );
 }
 
-
-
 SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl()
 {
 }
 
-
-
 void SfxTemplateDialog_Impl::LoadedFamilies()
 {
     updateFamilyImages();
     Resize();
 }
 
-
-
 // Override Resize-Handler ( StarView )
 // The size of the Listboxen is adjusted
 void SfxTemplateDialog_Impl::Resize()
@@ -2413,8 +2277,6 @@ void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, 
bool bCheck)
     }
 }
 
-
-
 bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
 {
     switch(nMesId)
@@ -2426,8 +2288,6 @@ bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 
nMesId)
     }
 }
 
-
-
 IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, 
pBox )
 {
     const sal_uInt16 nEntry = pBox->GetCurItemId();
@@ -2436,7 +2296,6 @@ IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, 
ToolBoxLSelect, ToolBox *, pBox
 }
 IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
 
-
 static OUString lcl_GetLabel(uno::Any& rAny)
 {
     OUString sRet;
@@ -2455,7 +2314,6 @@ static OUString lcl_GetLabel(uno::Any& rAny)
     return sRet;
 }
 
-
 IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
 {
     const sal_uInt16 nEntry = pBox->GetCurItemId();
@@ -2524,8 +2382,6 @@ IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, 
pMenu)
     return 0;
 }
 
-
-
 void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId )
 {
     if ( nId != nActFamily )
@@ -2580,6 +2436,7 @@ void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
         Execute_Impl( SID_STYLE_APPLY, GetSelectedEntry(),
                       OUString(), 
(sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
 }
+
 void SfxCommonTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
 {
     //does nothing
@@ -2596,7 +2453,7 @@ DropToolBox_Impl::~DropToolBox_Impl()
 {
 }
 
-sal_Int8    DropToolBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
+sal_Int8 DropToolBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
 {
     sal_Int8 nReturn = DND_ACTION_NONE;
     sal_uInt16 nItemId = GetItemId( rEvt.maPosPixel );
@@ -2616,7 +2473,7 @@ sal_Int8    DropToolBox_Impl::AcceptDrop( const 
AcceptDropEvent& rEvt )
     return nReturn;
 }
 
-sal_Int8    DropToolBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
+sal_Int8 DropToolBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
      return rParent.aFmtLb.ExecuteDrop(rEvt);
 }
commit 5e4cb2bc63e656e47096c631b01a82eab26c1368
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date:   Mon Apr 6 12:21:40 2015 +0900

    cleanup templdgi.hxx
    
    Change-Id: I75a9444faa8136ed333adc2b0b47c9b91b1c7a3e

diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index df406d2..580f3ad 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -46,9 +46,9 @@ class SfxTemplateDialog_Impl;
 class SfxCommonTemplateDialog_Impl;
 class SfxDockingWindow;
 
-namespace com { namespace sun { namespace star { namespace frame { class 
XModuleManager2; } } } }
-
-// class DropListBox_Impl ------------------------------------------------
+namespace com { namespace sun { namespace star { namespace frame {
+    class XModuleManager2;
+}}}}
 
 class DropListBox_Impl : public SvTreeListBox
 {
@@ -300,7 +300,6 @@ public:
     DropToolBox_Impl(vcl::Window* pParent, SfxTemplateDialog_Impl* 
pTemplateDialog);
     virtual ~DropToolBox_Impl();
 };
-// class SfxTemplateDialog_Impl ------------------------------------------
 
 class SfxTemplateDialog_Impl :  public SfxCommonTemplateDialog_Impl
 {
commit 7380228751ea2af89489f0bad5739d83a9900196
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date:   Mon Apr 6 12:20:30 2015 +0900

    clean-up acccfg
    
    Change-Id: I23aad7cb2d70f81d39757f62e906f4a22e1b0145

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index f2df5f2..8baa1c2 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
-
 // include other projects
 #include <comphelper/processfactory.hxx>
 #include <svtools/acceleratorexecute.hxx>
@@ -70,13 +69,9 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 
-
 // namespaces
 
-using namespace com::sun::star;
-
-
-
+using namespace css;
 
 static const char MODULEPROP_SHORTNAME  [] = "ooSetupFactoryShortName";
 static const char MODULEPROP_UINAME     [] = "ooSetupFactoryUIName";
@@ -87,527 +82,530 @@ static const char FOLDERNAME_UICONFIG   [] = 
"Configurations2";
 static const char MEDIATYPE_PROPNAME    [] = "MediaType";
 static const char MEDIATYPE_UICONFIG    [] = 
"application/vnd.sun.xml.ui.configuration";
 
-
 static const sal_uInt16 KEYCODE_ARRAY[] =
 {
-    KEY_F1       ,
-    KEY_F2       ,
-    KEY_F3       ,
-    KEY_F4       ,
-    KEY_F5       ,
-    KEY_F6       ,
-    KEY_F7       ,
-    KEY_F8       ,
-    KEY_F9       ,
-    KEY_F10      ,
-    KEY_F11      ,
-    KEY_F12      ,
-    KEY_F13      ,
-    KEY_F14      ,
-    KEY_F15      ,
-    KEY_F16      ,
-
-    KEY_DOWN     ,
-    KEY_UP       ,
-    KEY_LEFT     ,
-    KEY_RIGHT    ,
-    KEY_HOME     ,
-    KEY_END      ,
-    KEY_PAGEUP   ,
-    KEY_PAGEDOWN ,
-    KEY_RETURN   ,
-    KEY_ESCAPE   ,
+    KEY_F1,
+    KEY_F2,
+    KEY_F3,
+    KEY_F4,
+    KEY_F5,
+    KEY_F6,
+    KEY_F7,
+    KEY_F8,
+    KEY_F9,
+    KEY_F10,
+    KEY_F11,
+    KEY_F12,
+    KEY_F13,
+    KEY_F14,
+    KEY_F15,
+    KEY_F16,
+
+    KEY_DOWN,
+    KEY_UP,
+    KEY_LEFT,
+    KEY_RIGHT,
+    KEY_HOME,
+    KEY_END,
+    KEY_PAGEUP,
+    KEY_PAGEDOWN,
+    KEY_RETURN,
+    KEY_ESCAPE,
     KEY_BACKSPACE,
-    KEY_INSERT   ,
-    KEY_DELETE   ,
-
-    KEY_OPEN        ,
-    KEY_CUT         ,
-    KEY_COPY        ,
-    KEY_PASTE       ,
-    KEY_UNDO        ,
-    KEY_REPEAT      ,
-    KEY_FIND        ,
-    KEY_PROPERTIES  ,
-    KEY_FRONT       ,
-    KEY_CONTEXTMENU ,
-    KEY_MENU        ,
-    KEY_HELP        ,
-
-    KEY_F1        | KEY_SHIFT,
-    KEY_F2        | KEY_SHIFT,
-    KEY_F3        | KEY_SHIFT,
-    KEY_F4        | KEY_SHIFT,
-    KEY_F5        | KEY_SHIFT,
-    KEY_F6        | KEY_SHIFT,
-    KEY_F7        | KEY_SHIFT,
-    KEY_F8        | KEY_SHIFT,
-    KEY_F9        | KEY_SHIFT,
-    KEY_F10       | KEY_SHIFT,
-    KEY_F11       | KEY_SHIFT,
-    KEY_F12       | KEY_SHIFT,
-    KEY_F13       | KEY_SHIFT,
-    KEY_F14       | KEY_SHIFT,
-    KEY_F15       | KEY_SHIFT,
-    KEY_F16       | KEY_SHIFT,
-
-    KEY_DOWN      | KEY_SHIFT,
-    KEY_UP        | KEY_SHIFT,
-    KEY_LEFT      | KEY_SHIFT,
-    KEY_RIGHT     | KEY_SHIFT,
-    KEY_HOME      | KEY_SHIFT,
-    KEY_END       | KEY_SHIFT,
-    KEY_PAGEUP    | KEY_SHIFT,
-    KEY_PAGEDOWN  | KEY_SHIFT,
-    KEY_RETURN    | KEY_SHIFT,
-    KEY_SPACE     | KEY_SHIFT,
-    KEY_ESCAPE    | KEY_SHIFT,
-    KEY_BACKSPACE | KEY_SHIFT,
-    KEY_INSERT    | KEY_SHIFT,
-    KEY_DELETE    | KEY_SHIFT,
-
-    KEY_0         | KEY_MOD1 ,
-    KEY_1         | KEY_MOD1 ,
-    KEY_2         | KEY_MOD1 ,
-    KEY_3         | KEY_MOD1 ,
-    KEY_4         | KEY_MOD1 ,
-    KEY_5         | KEY_MOD1 ,
-    KEY_6         | KEY_MOD1 ,
-    KEY_7         | KEY_MOD1 ,
-    KEY_8         | KEY_MOD1 ,
-    KEY_9         | KEY_MOD1 ,
-    KEY_A         | KEY_MOD1 ,
-    KEY_B         | KEY_MOD1 ,
-    KEY_C         | KEY_MOD1 ,
-    KEY_D         | KEY_MOD1 ,
-    KEY_E         | KEY_MOD1 ,
-    KEY_F         | KEY_MOD1 ,
-    KEY_G         | KEY_MOD1 ,
-    KEY_H         | KEY_MOD1 ,
-    KEY_I         | KEY_MOD1 ,
-    KEY_J         | KEY_MOD1 ,
-    KEY_K         | KEY_MOD1 ,
-    KEY_L         | KEY_MOD1 ,
-    KEY_M         | KEY_MOD1 ,
-    KEY_N         | KEY_MOD1 ,
-    KEY_O         | KEY_MOD1 ,
-    KEY_P         | KEY_MOD1 ,
-    KEY_Q         | KEY_MOD1 ,
-    KEY_R         | KEY_MOD1 ,
-    KEY_S         | KEY_MOD1 ,
-    KEY_T         | KEY_MOD1 ,
-    KEY_U         | KEY_MOD1 ,
-    KEY_V         | KEY_MOD1 ,
-    KEY_W         | KEY_MOD1 ,
-    KEY_X         | KEY_MOD1 ,
-    KEY_Y         | KEY_MOD1 ,
-    KEY_Z         | KEY_MOD1 ,
-    KEY_SEMICOLON    | KEY_MOD1 ,
-    KEY_QUOTERIGHT   | KEY_MOD1 ,
-    KEY_BRACKETLEFT  | KEY_MOD1 ,
-    KEY_BRACKETRIGHT | KEY_MOD1,
-    KEY_POINT    | KEY_MOD1 ,
-
-    KEY_F1        | KEY_MOD1 ,
-    KEY_F2        | KEY_MOD1 ,
-    KEY_F3        | KEY_MOD1 ,
-    KEY_F4        | KEY_MOD1 ,
-    KEY_F5        | KEY_MOD1 ,
-    KEY_F6        | KEY_MOD1 ,
-    KEY_F7        | KEY_MOD1 ,
-    KEY_F8        | KEY_MOD1 ,
-    KEY_F9        | KEY_MOD1 ,
-    KEY_F10       | KEY_MOD1 ,
-    KEY_F11       | KEY_MOD1 ,
-    KEY_F12       | KEY_MOD1 ,
-    KEY_F13       | KEY_MOD1 ,
-    KEY_F14       | KEY_MOD1 ,
-    KEY_F15       | KEY_MOD1 ,
-    KEY_F16       | KEY_MOD1 ,
-
-    KEY_DOWN      | KEY_MOD1 ,
-    KEY_UP        | KEY_MOD1 ,
-    KEY_LEFT      | KEY_MOD1 ,
-    KEY_RIGHT     | KEY_MOD1 ,
-    KEY_HOME      | KEY_MOD1 ,
-    KEY_END       | KEY_MOD1 ,
-    KEY_PAGEUP    | KEY_MOD1 ,
-    KEY_PAGEDOWN  | KEY_MOD1 ,
-    KEY_RETURN    | KEY_MOD1 ,
-    KEY_SPACE     | KEY_MOD1 ,
-    KEY_BACKSPACE | KEY_MOD1 ,
-    KEY_INSERT    | KEY_MOD1 ,
-    KEY_DELETE    | KEY_MOD1 ,
-
-    KEY_ADD       | KEY_MOD1 ,
-    KEY_SUBTRACT  | KEY_MOD1 ,
-    KEY_MULTIPLY  | KEY_MOD1 ,
-    KEY_DIVIDE    | KEY_MOD1 ,
-
-    KEY_0         | KEY_SHIFT | KEY_MOD1,
-    KEY_1         | KEY_SHIFT | KEY_MOD1,
-    KEY_2         | KEY_SHIFT | KEY_MOD1,
-    KEY_3         | KEY_SHIFT | KEY_MOD1,
-    KEY_4         | KEY_SHIFT | KEY_MOD1,
-    KEY_5         | KEY_SHIFT | KEY_MOD1,
-    KEY_6         | KEY_SHIFT | KEY_MOD1,
-    KEY_7         | KEY_SHIFT | KEY_MOD1,
-    KEY_8         | KEY_SHIFT | KEY_MOD1,
-    KEY_9         | KEY_SHIFT | KEY_MOD1,
-    KEY_A         | KEY_SHIFT | KEY_MOD1,
-    KEY_B         | KEY_SHIFT | KEY_MOD1,
-    KEY_C         | KEY_SHIFT | KEY_MOD1,
-    KEY_D         | KEY_SHIFT | KEY_MOD1,
-    KEY_E         | KEY_SHIFT | KEY_MOD1,
-    KEY_F         | KEY_SHIFT | KEY_MOD1,
-    KEY_G         | KEY_SHIFT | KEY_MOD1,
-    KEY_H         | KEY_SHIFT | KEY_MOD1,
-    KEY_I         | KEY_SHIFT | KEY_MOD1,
-    KEY_J         | KEY_SHIFT | KEY_MOD1,
-    KEY_K         | KEY_SHIFT | KEY_MOD1,
-    KEY_L         | KEY_SHIFT | KEY_MOD1,
-    KEY_M         | KEY_SHIFT | KEY_MOD1,
-    KEY_N         | KEY_SHIFT | KEY_MOD1,
-    KEY_O         | KEY_SHIFT | KEY_MOD1,
-    KEY_P         | KEY_SHIFT | KEY_MOD1,
-    KEY_Q         | KEY_SHIFT | KEY_MOD1,
-    KEY_R         | KEY_SHIFT | KEY_MOD1,
-    KEY_S         | KEY_SHIFT | KEY_MOD1,
-    KEY_T         | KEY_SHIFT | KEY_MOD1,
-    KEY_U         | KEY_SHIFT | KEY_MOD1,
-    KEY_V         | KEY_SHIFT | KEY_MOD1,
-    KEY_W         | KEY_SHIFT | KEY_MOD1,
-    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_QUOTERIGHT   | KEY_SHIFT | KEY_MOD1 ,
-    KEY_BRACKETLEFT  | KEY_SHIFT | KEY_MOD1 ,
-    KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1,
-    KEY_POINT    | KEY_SHIFT | KEY_MOD1,
-
-    KEY_F1        | KEY_SHIFT | KEY_MOD1,
-    KEY_F2        | KEY_SHIFT | KEY_MOD1,
-    KEY_F3        | KEY_SHIFT | KEY_MOD1,
-    KEY_F4        | KEY_SHIFT | KEY_MOD1,
-    KEY_F5        | KEY_SHIFT | KEY_MOD1,
-    KEY_F6        | KEY_SHIFT | KEY_MOD1,
-    KEY_F7        | KEY_SHIFT | KEY_MOD1,
-    KEY_F8        | KEY_SHIFT | KEY_MOD1,
-    KEY_F9        | KEY_SHIFT | KEY_MOD1,
-    KEY_F10       | KEY_SHIFT | KEY_MOD1,
-    KEY_F11       | KEY_SHIFT | KEY_MOD1,
-    KEY_F12       | KEY_SHIFT | KEY_MOD1,
-    KEY_F13       | KEY_SHIFT | KEY_MOD1,
-    KEY_F14       | KEY_SHIFT | KEY_MOD1,
-    KEY_F15       | KEY_SHIFT | KEY_MOD1,
-    KEY_F16       | KEY_SHIFT | KEY_MOD1,
-
-    KEY_DOWN      | KEY_SHIFT | KEY_MOD1,
-    KEY_UP        | KEY_SHIFT | KEY_MOD1,
-    KEY_LEFT      | KEY_SHIFT | KEY_MOD1,
-    KEY_RIGHT     | KEY_SHIFT | KEY_MOD1,
-    KEY_HOME      | KEY_SHIFT | KEY_MOD1,
-    KEY_END       | KEY_SHIFT | KEY_MOD1,
-    KEY_PAGEUP    | KEY_SHIFT | KEY_MOD1,
-    KEY_PAGEDOWN  | KEY_SHIFT | KEY_MOD1,
-    KEY_RETURN    | KEY_SHIFT | KEY_MOD1,
-    KEY_SPACE     | KEY_SHIFT | KEY_MOD1,
-    KEY_BACKSPACE | KEY_SHIFT | KEY_MOD1,
-    KEY_INSERT    | KEY_SHIFT | KEY_MOD1,
-    KEY_DELETE    | KEY_SHIFT | KEY_MOD1,
-
-    KEY_0         | KEY_MOD2 ,
-    KEY_1         | KEY_MOD2 ,
-    KEY_2         | KEY_MOD2 ,
-    KEY_3         | KEY_MOD2 ,
-    KEY_4         | KEY_MOD2 ,
-    KEY_5         | KEY_MOD2 ,
-    KEY_6         | KEY_MOD2 ,
-    KEY_7         | KEY_MOD2 ,
-    KEY_8         | KEY_MOD2 ,
-    KEY_9         | KEY_MOD2 ,
-    KEY_A         | KEY_MOD2 ,
-    KEY_B         | KEY_MOD2 ,
-    KEY_C         | KEY_MOD2 ,
-    KEY_D         | KEY_MOD2 ,
-    KEY_E         | KEY_MOD2 ,
-    KEY_F         | KEY_MOD2 ,
-    KEY_G         | KEY_MOD2 ,
-    KEY_H         | KEY_MOD2 ,
-    KEY_I         | KEY_MOD2 ,
-    KEY_J         | KEY_MOD2 ,
-    KEY_K         | KEY_MOD2 ,
-    KEY_L         | KEY_MOD2 ,
-    KEY_M         | KEY_MOD2 ,
-    KEY_N         | KEY_MOD2 ,
-    KEY_O         | KEY_MOD2 ,
-    KEY_P         | KEY_MOD2 ,
-    KEY_Q         | KEY_MOD2 ,
-    KEY_R         | KEY_MOD2 ,
-    KEY_S         | KEY_MOD2 ,
-    KEY_T         | KEY_MOD2 ,
-    KEY_U         | KEY_MOD2 ,
-    KEY_V         | KEY_MOD2 ,
-    KEY_W         | KEY_MOD2 ,
-    KEY_X         | KEY_MOD2 ,
-    KEY_Y         | KEY_MOD2 ,
-    KEY_Z         | KEY_MOD2 ,
-    KEY_SEMICOLON    | KEY_MOD2 ,
-    KEY_QUOTERIGHT   | KEY_MOD2 ,
-    KEY_BRACKETLEFT  | KEY_MOD2 ,
-    KEY_BRACKETRIGHT | KEY_MOD2,
-    KEY_POINT    | KEY_MOD2 ,
-
-    KEY_F1        | KEY_MOD2 ,
-    KEY_F2        | KEY_MOD2 ,
-    KEY_F3        | KEY_MOD2 ,
-    KEY_F4        | KEY_MOD2 ,
-    KEY_F5        | KEY_MOD2 ,
-    KEY_F6        | KEY_MOD2 ,
-    KEY_F7        | KEY_MOD2 ,
-    KEY_F8        | KEY_MOD2 ,
-    KEY_F9        | KEY_MOD2 ,
-    KEY_F10       | KEY_MOD2 ,
-    KEY_F11       | KEY_MOD2 ,
-    KEY_F12       | KEY_MOD2 ,
-    KEY_F13       | KEY_MOD2 ,
-    KEY_F14       | KEY_MOD2 ,
-    KEY_F15       | KEY_MOD2 ,
-    KEY_F16       | KEY_MOD2 ,
-
-    KEY_DOWN      | KEY_MOD2 ,
-    KEY_UP        | KEY_MOD2 ,
-    KEY_LEFT      | KEY_MOD2 ,
-    KEY_RIGHT     | KEY_MOD2 ,
-    KEY_HOME      | KEY_MOD2 ,
-    KEY_END       | KEY_MOD2 ,
-    KEY_PAGEUP    | KEY_MOD2 ,
-    KEY_PAGEDOWN  | KEY_MOD2 ,
-    KEY_RETURN    | KEY_MOD2 ,
-    KEY_SPACE     | KEY_MOD2 ,
-    KEY_BACKSPACE | KEY_MOD2 ,
-    KEY_INSERT    | KEY_MOD2 ,
-    KEY_DELETE    | KEY_MOD2 ,
-
-    KEY_0         | KEY_SHIFT | KEY_MOD2,
-    KEY_1         | KEY_SHIFT | KEY_MOD2,
-    KEY_2         | KEY_SHIFT | KEY_MOD2,
-    KEY_3         | KEY_SHIFT | KEY_MOD2,
-    KEY_4         | KEY_SHIFT | KEY_MOD2,
-    KEY_5         | KEY_SHIFT | KEY_MOD2,
-    KEY_6         | KEY_SHIFT | KEY_MOD2,
-    KEY_7         | KEY_SHIFT | KEY_MOD2,
-    KEY_8         | KEY_SHIFT | KEY_MOD2,
-    KEY_9         | KEY_SHIFT | KEY_MOD2,
-    KEY_A         | KEY_SHIFT | KEY_MOD2,
-    KEY_B         | KEY_SHIFT | KEY_MOD2,
-    KEY_C         | KEY_SHIFT | KEY_MOD2,
-    KEY_D         | KEY_SHIFT | KEY_MOD2,
-    KEY_E         | KEY_SHIFT | KEY_MOD2,
-    KEY_F         | KEY_SHIFT | KEY_MOD2,
-    KEY_G         | KEY_SHIFT | KEY_MOD2,
-    KEY_H         | KEY_SHIFT | KEY_MOD2,
-    KEY_I         | KEY_SHIFT | KEY_MOD2,
-    KEY_J         | KEY_SHIFT | KEY_MOD2,
-    KEY_K         | KEY_SHIFT | KEY_MOD2,
-    KEY_L         | KEY_SHIFT | KEY_MOD2,
-    KEY_M         | KEY_SHIFT | KEY_MOD2,
-    KEY_N         | KEY_SHIFT | KEY_MOD2,
-    KEY_O         | KEY_SHIFT | KEY_MOD2,
-    KEY_P         | KEY_SHIFT | KEY_MOD2,
-    KEY_Q         | KEY_SHIFT | KEY_MOD2,
-    KEY_R         | KEY_SHIFT | KEY_MOD2,
-    KEY_S         | KEY_SHIFT | KEY_MOD2,
-    KEY_T         | KEY_SHIFT | KEY_MOD2,
-    KEY_U         | KEY_SHIFT | KEY_MOD2,
-    KEY_V         | KEY_SHIFT | KEY_MOD2,
-    KEY_W         | KEY_SHIFT | KEY_MOD2,
-    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_QUOTERIGHT   | KEY_SHIFT | KEY_MOD2 ,
-    KEY_BRACKETLEFT  | KEY_SHIFT | KEY_MOD2 ,
-    KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2,
-    KEY_POINT    | KEY_SHIFT | KEY_MOD2,
-
-    KEY_F1        | KEY_SHIFT | KEY_MOD2,
-    KEY_F2        | KEY_SHIFT | KEY_MOD2,
-    KEY_F3        | KEY_SHIFT | KEY_MOD2,
-    KEY_F4        | KEY_SHIFT | KEY_MOD2,
-    KEY_F5        | KEY_SHIFT | KEY_MOD2,
-    KEY_F6        | KEY_SHIFT | KEY_MOD2,
-    KEY_F7        | KEY_SHIFT | KEY_MOD2,
-    KEY_F8        | KEY_SHIFT | KEY_MOD2,
-    KEY_F9        | KEY_SHIFT | KEY_MOD2,
-    KEY_F10       | KEY_SHIFT | KEY_MOD2,
-    KEY_F11       | KEY_SHIFT | KEY_MOD2,
-    KEY_F12       | KEY_SHIFT | KEY_MOD2,
-    KEY_F13       | KEY_SHIFT | KEY_MOD2,
-    KEY_F14       | KEY_SHIFT | KEY_MOD2,
-    KEY_F15       | KEY_SHIFT | KEY_MOD2,
-    KEY_F16       | KEY_SHIFT | KEY_MOD2,
-
-    KEY_DOWN      | KEY_SHIFT | KEY_MOD2,
-    KEY_UP        | KEY_SHIFT | KEY_MOD2,
-    KEY_LEFT      | KEY_SHIFT | KEY_MOD2,
-    KEY_RIGHT     | KEY_SHIFT | KEY_MOD2,
-    KEY_HOME      | KEY_SHIFT | KEY_MOD2,
-    KEY_END       | KEY_SHIFT | KEY_MOD2,
-    KEY_PAGEUP    | KEY_SHIFT | KEY_MOD2,
-    KEY_PAGEDOWN  | KEY_SHIFT | KEY_MOD2,
-    KEY_RETURN    | KEY_SHIFT | KEY_MOD2,
-    KEY_SPACE     | KEY_SHIFT | KEY_MOD2,
-    KEY_BACKSPACE | KEY_SHIFT | KEY_MOD2,
-    KEY_INSERT    | KEY_SHIFT | KEY_MOD2,
-    KEY_DELETE    | KEY_SHIFT | KEY_MOD2,
-
-    KEY_0         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_1         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_2         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_3         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_4         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_5         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_6         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_7         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_8         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_9         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_A         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_B         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_C         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_D         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_E         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_G         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_H         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_I         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_J         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_K         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_L         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_M         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_N         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_O         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_P         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_Q         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_R         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_S         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_T         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_U         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_V         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_W         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_X         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_Y         | KEY_MOD1 | KEY_MOD2 ,
-    KEY_Z         | KEY_MOD1 | KEY_MOD2 ,
-
-    KEY_F1        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F2        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F3        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F4        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F5        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F6        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F7        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F8        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F9        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F10       | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F11       | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F12       | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F13       | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F14       | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F15       | KEY_MOD1 | KEY_MOD2 ,
-    KEY_F16       | KEY_MOD1 | KEY_MOD2 ,
-
-    KEY_DOWN      | KEY_MOD1 | KEY_MOD2 ,
-    KEY_UP        | KEY_MOD1 | KEY_MOD2 ,
-    KEY_LEFT      | KEY_MOD1 | KEY_MOD2 ,
-    KEY_RIGHT     | KEY_MOD1 | KEY_MOD2 ,
-    KEY_HOME      | KEY_MOD1 | KEY_MOD2 ,
-    KEY_END       | KEY_MOD1 | KEY_MOD2 ,
-    KEY_PAGEUP    | KEY_MOD1 | KEY_MOD2 ,
-    KEY_PAGEDOWN  | KEY_MOD1 | KEY_MOD2 ,
-    KEY_RETURN    | KEY_MOD1 | KEY_MOD2 ,
-    KEY_SPACE     | KEY_MOD1 | KEY_MOD2 ,
-    KEY_BACKSPACE | KEY_MOD1 | KEY_MOD2 ,
-    KEY_INSERT    | KEY_MOD1 | KEY_MOD2 ,
-    KEY_DELETE    | KEY_MOD1 | KEY_MOD2 ,
-
-    KEY_0         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_1         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_2         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_3         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_4         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_5         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_6         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_7         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_8         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_9         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_A         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_B         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_C         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_D         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_E         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_G         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_H         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_I         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_J         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_K         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_L         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_M         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_N         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_O         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_P         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_Q         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_R         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_S         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_T         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_U         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_V         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_W         | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    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_QUOTERIGHT   | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_BRACKETLEFT  | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_POINT    | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-
-    KEY_F1        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F2        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F3        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F4        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F5        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F6        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F7        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F8        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F9        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F10       | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F11       | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F12       | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F13       | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F14       | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F15       | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_F16       | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-
-    KEY_DOWN      | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_UP        | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_LEFT      | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_RIGHT     | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_HOME      | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_END       | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_PAGEUP    | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_PAGEDOWN  | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_RETURN    | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_SPACE     | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_BACKSPACE | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_INSERT    | KEY_SHIFT | KEY_MOD1 | KEY_MOD2,
-    KEY_DELETE    | KEY_SHIFT | KEY_MOD1 | KEY_MOD2
+    KEY_INSERT,
+    KEY_DELETE,
+
+    KEY_OPEN,
+    KEY_CUT,
+    KEY_COPY,
+    KEY_PASTE,
+    KEY_UNDO,
+    KEY_REPEAT,
+    KEY_FIND,
+    KEY_PROPERTIES,
+    KEY_FRONT,
+    KEY_CONTEXTMENU,
+    KEY_MENU,
+    KEY_HELP,
+
+    KEY_SHIFT | KEY_F1,
+    KEY_SHIFT | KEY_F2,
+    KEY_SHIFT | KEY_F3,
+    KEY_SHIFT | KEY_F4,
+    KEY_SHIFT | KEY_F5,
+    KEY_SHIFT | KEY_F6,
+    KEY_SHIFT | KEY_F7,
+    KEY_SHIFT | KEY_F8,
+    KEY_SHIFT | KEY_F9,
+    KEY_SHIFT | KEY_F10,
+    KEY_SHIFT | KEY_F11,
+    KEY_SHIFT | KEY_F12,
+    KEY_SHIFT | KEY_F13,
+    KEY_SHIFT | KEY_F14,
+    KEY_SHIFT | KEY_F15,
+    KEY_SHIFT | KEY_F16,
+
+    KEY_SHIFT | KEY_DOWN,
+    KEY_SHIFT | KEY_UP,
+    KEY_SHIFT | KEY_LEFT,
+    KEY_SHIFT | KEY_RIGHT,
+    KEY_SHIFT | KEY_HOME,
+    KEY_SHIFT | KEY_END,
+    KEY_SHIFT | KEY_PAGEUP,
+    KEY_SHIFT | KEY_PAGEDOWN,
+    KEY_SHIFT | KEY_RETURN,
+    KEY_SHIFT | KEY_SPACE,
+    KEY_SHIFT | KEY_ESCAPE,
+    KEY_SHIFT | KEY_BACKSPACE,
+    KEY_SHIFT | KEY_INSERT,
+    KEY_SHIFT | KEY_DELETE,
+
+    KEY_MOD1 | KEY_0,
+    KEY_MOD1 | KEY_1,
+    KEY_MOD1 | KEY_2,
+    KEY_MOD1 | KEY_3,
+    KEY_MOD1 | KEY_4,
+    KEY_MOD1 | KEY_5,
+    KEY_MOD1 | KEY_6,
+    KEY_MOD1 | KEY_7,
+    KEY_MOD1 | KEY_8,
+    KEY_MOD1 | KEY_9,
+    KEY_MOD1 | KEY_A,
+    KEY_MOD1 | KEY_B,
+    KEY_MOD1 | KEY_C,
+    KEY_MOD1 | KEY_D,
+    KEY_MOD1 | KEY_E,
+    KEY_MOD1 | KEY_F,
+    KEY_MOD1 | KEY_G,
+    KEY_MOD1 | KEY_H,
+    KEY_MOD1 | KEY_I,
+    KEY_MOD1 | KEY_J,
+    KEY_MOD1 | KEY_K,
+    KEY_MOD1 | KEY_L,
+    KEY_MOD1 | KEY_M,
+    KEY_MOD1 | KEY_N,
+    KEY_MOD1 | KEY_O,
+    KEY_MOD1 | KEY_P,
+    KEY_MOD1 | KEY_Q,
+    KEY_MOD1 | KEY_R,
+    KEY_MOD1 | KEY_S,
+    KEY_MOD1 | KEY_T,
+    KEY_MOD1 | KEY_U,
+    KEY_MOD1 | KEY_V,
+    KEY_MOD1 | KEY_W,
+    KEY_MOD1 | KEY_X,
+    KEY_MOD1 | KEY_Y,
+    KEY_MOD1 | KEY_Z,
+    KEY_MOD1 | KEY_SEMICOLON,
+    KEY_MOD1 | KEY_QUOTERIGHT,
+    KEY_MOD1 | KEY_BRACKETLEFT,
+    KEY_MOD1 | KEY_BRACKETRIGHT,
+    KEY_MOD1 | KEY_POINT,
+
+    KEY_MOD1 | KEY_F1,
+    KEY_MOD1 | KEY_F2,
+    KEY_MOD1 | KEY_F3,
+    KEY_MOD1 | KEY_F4,
+    KEY_MOD1 | KEY_F5,
+    KEY_MOD1 | KEY_F6,
+    KEY_MOD1 | KEY_F7,
+    KEY_MOD1 | KEY_F8,
+    KEY_MOD1 | KEY_F9,
+    KEY_MOD1 | KEY_F10,
+    KEY_MOD1 | KEY_F11,
+    KEY_MOD1 | KEY_F12,
+    KEY_MOD1 | KEY_F13,
+    KEY_MOD1 | KEY_F14,
+    KEY_MOD1 | KEY_F15,
+    KEY_MOD1 | KEY_F16,
+
+    KEY_MOD1 | KEY_DOWN,
+    KEY_MOD1 | KEY_UP,
+    KEY_MOD1 | KEY_LEFT,
+    KEY_MOD1 | KEY_RIGHT,
+    KEY_MOD1 | KEY_HOME,
+    KEY_MOD1 | KEY_END,
+    KEY_MOD1 | KEY_PAGEUP,
+    KEY_MOD1 | KEY_PAGEDOWN,
+    KEY_MOD1 | KEY_RETURN,
+    KEY_MOD1 | KEY_SPACE,
+    KEY_MOD1 | KEY_BACKSPACE,
+    KEY_MOD1 | KEY_INSERT,
+    KEY_MOD1 | KEY_DELETE,
+
+    KEY_MOD1 | KEY_ADD,
+    KEY_MOD1 | KEY_SUBTRACT,
+    KEY_MOD1 | KEY_MULTIPLY,
+    KEY_MOD1 | KEY_DIVIDE,
+
+    KEY_SHIFT | KEY_MOD1 | KEY_0,
+    KEY_SHIFT | KEY_MOD1 | KEY_1,
+    KEY_SHIFT | KEY_MOD1 | KEY_2,
+    KEY_SHIFT | KEY_MOD1 | KEY_3,
+    KEY_SHIFT | KEY_MOD1 | KEY_4,
+    KEY_SHIFT | KEY_MOD1 | KEY_5,
+    KEY_SHIFT | KEY_MOD1 | KEY_6,
+    KEY_SHIFT | KEY_MOD1 | KEY_7,
+    KEY_SHIFT | KEY_MOD1 | KEY_8,
+    KEY_SHIFT | KEY_MOD1 | KEY_9,
+    KEY_SHIFT | KEY_MOD1 | KEY_A,
+    KEY_SHIFT | KEY_MOD1 | KEY_B,
+    KEY_SHIFT | KEY_MOD1 | KEY_C,
+    KEY_SHIFT | KEY_MOD1 | KEY_D,
+    KEY_SHIFT | KEY_MOD1 | KEY_E,
+    KEY_SHIFT | KEY_MOD1 | KEY_F,
+    KEY_SHIFT | KEY_MOD1 | KEY_G,
+    KEY_SHIFT | KEY_MOD1 | KEY_H,
+    KEY_SHIFT | KEY_MOD1 | KEY_I,
+    KEY_SHIFT | KEY_MOD1 | KEY_J,
+    KEY_SHIFT | KEY_MOD1 | KEY_K,
+    KEY_SHIFT | KEY_MOD1 | KEY_L,
+    KEY_SHIFT | KEY_MOD1 | KEY_M,
+    KEY_SHIFT | KEY_MOD1 | KEY_N,
+    KEY_SHIFT | KEY_MOD1 | KEY_O,
+    KEY_SHIFT | KEY_MOD1 | KEY_P,
+    KEY_SHIFT | KEY_MOD1 | KEY_Q,
+    KEY_SHIFT | KEY_MOD1 | KEY_R,
+    KEY_SHIFT | KEY_MOD1 | KEY_S,
+    KEY_SHIFT | KEY_MOD1 | KEY_T,
+    KEY_SHIFT | KEY_MOD1 | KEY_U,
+    KEY_SHIFT | KEY_MOD1 | KEY_V,
+    KEY_SHIFT | KEY_MOD1 | KEY_W,
+    KEY_SHIFT | KEY_MOD1 | 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_QUOTERIGHT,
+    KEY_SHIFT | KEY_MOD1 | KEY_BRACKETLEFT,
+    KEY_SHIFT | KEY_MOD1 | KEY_BRACKETRIGHT,
+    KEY_SHIFT | KEY_MOD1 | KEY_POINT,
+
+    KEY_SHIFT | KEY_MOD1 | KEY_F1,
+    KEY_SHIFT | KEY_MOD1 | KEY_F2,
+    KEY_SHIFT | KEY_MOD1 | KEY_F3,
+    KEY_SHIFT | KEY_MOD1 | KEY_F4,
+    KEY_SHIFT | KEY_MOD1 | KEY_F5,
+    KEY_SHIFT | KEY_MOD1 | KEY_F6,
+    KEY_SHIFT | KEY_MOD1 | KEY_F7,
+    KEY_SHIFT | KEY_MOD1 | KEY_F8,
+    KEY_SHIFT | KEY_MOD1 | KEY_F9,
+    KEY_SHIFT | KEY_MOD1 | KEY_F10,
+    KEY_SHIFT | KEY_MOD1 | KEY_F11,
+    KEY_SHIFT | KEY_MOD1 | KEY_F12,
+    KEY_SHIFT | KEY_MOD1 | KEY_F13,
+    KEY_SHIFT | KEY_MOD1 | KEY_F14,
+    KEY_SHIFT | KEY_MOD1 | KEY_F15,
+    KEY_SHIFT | KEY_MOD1 | KEY_F16,
+
+    KEY_SHIFT | KEY_MOD1 | KEY_DOWN,
+    KEY_SHIFT | KEY_MOD1 | KEY_UP,
+    KEY_SHIFT | KEY_MOD1 | KEY_LEFT,
+    KEY_SHIFT | KEY_MOD1 | KEY_RIGHT,
+    KEY_SHIFT | KEY_MOD1 | KEY_HOME,
+    KEY_SHIFT | KEY_MOD1 | KEY_END,
+    KEY_SHIFT | KEY_MOD1 | KEY_PAGEUP,
+    KEY_SHIFT | KEY_MOD1 | KEY_PAGEDOWN,
+    KEY_SHIFT | KEY_MOD1 | KEY_RETURN,
+    KEY_SHIFT | KEY_MOD1 | KEY_ESCAPE,
+    KEY_SHIFT | KEY_MOD1 | KEY_BACKSPACE,
+    KEY_SHIFT | KEY_MOD1 | KEY_INSERT,
+    KEY_SHIFT | KEY_MOD1 | KEY_DELETE,
+
+    KEY_MOD2 | KEY_0,
+    KEY_MOD2 | KEY_1,
+    KEY_MOD2 | KEY_2,
+    KEY_MOD2 | KEY_3,
+    KEY_MOD2 | KEY_4,
+    KEY_MOD2 | KEY_5,
+    KEY_MOD2 | KEY_6,
+    KEY_MOD2 | KEY_7,
+    KEY_MOD2 | KEY_8,
+    KEY_MOD2 | KEY_9,
+    KEY_MOD2 | KEY_A,
+    KEY_MOD2 | KEY_B,
+    KEY_MOD2 | KEY_C,
+    KEY_MOD2 | KEY_D,
+    KEY_MOD2 | KEY_E,
+    KEY_MOD2 | KEY_F,
+    KEY_MOD2 | KEY_G,
+    KEY_MOD2 | KEY_H,
+    KEY_MOD2 | KEY_I,
+    KEY_MOD2 | KEY_J,
+    KEY_MOD2 | KEY_K,
+    KEY_MOD2 | KEY_L,
+    KEY_MOD2 | KEY_M,
+    KEY_MOD2 | KEY_N,
+    KEY_MOD2 | KEY_O,
+    KEY_MOD2 | KEY_P,
+    KEY_MOD2 | KEY_Q,
+    KEY_MOD2 | KEY_R,
+    KEY_MOD2 | KEY_S,
+    KEY_MOD2 | KEY_T,
+    KEY_MOD2 | KEY_U,
+    KEY_MOD2 | KEY_V,
+    KEY_MOD2 | KEY_W,
+    KEY_MOD2 | KEY_X,
+    KEY_MOD2 | KEY_Y,
+    KEY_MOD2 | KEY_Z,
+    KEY_MOD2 | KEY_SEMICOLON,
+    KEY_MOD2 | KEY_QUOTERIGHT,
+    KEY_MOD2 | KEY_BRACKETLEFT,
+    KEY_MOD2 | KEY_BRACKETRIGHT,
+    KEY_MOD2 | KEY_POINT,
+
+    KEY_MOD2 | KEY_F1,
+    KEY_MOD2 | KEY_F2,
+    KEY_MOD2 | KEY_F3,
+    KEY_MOD2 | KEY_F4,
+    KEY_MOD2 | KEY_F5,
+    KEY_MOD2 | KEY_F6,
+    KEY_MOD2 | KEY_F7,
+    KEY_MOD2 | KEY_F8,
+    KEY_MOD2 | KEY_F9,
+    KEY_MOD2 | KEY_F10,
+    KEY_MOD2 | KEY_F11,
+    KEY_MOD2 | KEY_F12,
+    KEY_MOD2 | KEY_F13,
+    KEY_MOD2 | KEY_F14,
+    KEY_MOD2 | KEY_F15,
+    KEY_MOD2 | KEY_F16,
+
+    KEY_MOD2 | KEY_DOWN,
+    KEY_MOD2 | KEY_UP,
+    KEY_MOD2 | KEY_LEFT,
+    KEY_MOD2 | KEY_RIGHT,
+    KEY_MOD2 | KEY_HOME,
+    KEY_MOD2 | KEY_END,
+    KEY_MOD2 | KEY_PAGEUP,
+    KEY_MOD2 | KEY_PAGEDOWN,
+    KEY_MOD2 | KEY_RETURN,
+    KEY_MOD2 | KEY_SPACE,
+    KEY_MOD2 | KEY_BACKSPACE,
+    KEY_MOD2 | KEY_INSERT,
+    KEY_MOD2 | KEY_DELETE,
+
+    KEY_SHIFT | KEY_MOD2 | KEY_0,
+    KEY_SHIFT | KEY_MOD2 | KEY_1,
+    KEY_SHIFT | KEY_MOD2 | KEY_2,
+    KEY_SHIFT | KEY_MOD2 | KEY_3,
+    KEY_SHIFT | KEY_MOD2 | KEY_4,
+    KEY_SHIFT | KEY_MOD2 | KEY_5,
+    KEY_SHIFT | KEY_MOD2 | KEY_6,
+    KEY_SHIFT | KEY_MOD2 | KEY_7,
+    KEY_SHIFT | KEY_MOD2 | KEY_8,
+    KEY_SHIFT | KEY_MOD2 | KEY_9,
+    KEY_SHIFT | KEY_MOD2 | KEY_A,
+    KEY_SHIFT | KEY_MOD2 | KEY_B,
+    KEY_SHIFT | KEY_MOD2 | KEY_C,
+    KEY_SHIFT | KEY_MOD2 | KEY_D,
+    KEY_SHIFT | KEY_MOD2 | KEY_E,
+    KEY_SHIFT | KEY_MOD2 | KEY_F,
+    KEY_SHIFT | KEY_MOD2 | KEY_G,
+    KEY_SHIFT | KEY_MOD2 | KEY_H,
+    KEY_SHIFT | KEY_MOD2 | KEY_I,
+    KEY_SHIFT | KEY_MOD2 | KEY_J,
+    KEY_SHIFT | KEY_MOD2 | KEY_K,
+    KEY_SHIFT | KEY_MOD2 | KEY_L,
+    KEY_SHIFT | KEY_MOD2 | KEY_M,
+    KEY_SHIFT | KEY_MOD2 | KEY_N,
+    KEY_SHIFT | KEY_MOD2 | KEY_O,
+    KEY_SHIFT | KEY_MOD2 | KEY_P,
+    KEY_SHIFT | KEY_MOD2 | KEY_Q,
+    KEY_SHIFT | KEY_MOD2 | KEY_R,
+    KEY_SHIFT | KEY_MOD2 | KEY_S,
+    KEY_SHIFT | KEY_MOD2 | KEY_T,
+    KEY_SHIFT | KEY_MOD2 | KEY_U,
+    KEY_SHIFT | KEY_MOD2 | KEY_V,
+    KEY_SHIFT | KEY_MOD2 | KEY_W,
+    KEY_SHIFT | KEY_MOD2 | 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_QUOTERIGHT,
+    KEY_SHIFT | KEY_MOD2 | KEY_BRACKETLEFT,
+    KEY_SHIFT | KEY_MOD2 | KEY_BRACKETRIGHT,
+    KEY_SHIFT | KEY_MOD2 | KEY_POINT,
+
+    KEY_SHIFT | KEY_MOD2 | KEY_F1,
+    KEY_SHIFT | KEY_MOD2 | KEY_F2,
+    KEY_SHIFT | KEY_MOD2 | KEY_F3,
+    KEY_SHIFT | KEY_MOD2 | KEY_F4,
+    KEY_SHIFT | KEY_MOD2 | KEY_F5,
+    KEY_SHIFT | KEY_MOD2 | KEY_F6,
+    KEY_SHIFT | KEY_MOD2 | KEY_F7,
+    KEY_SHIFT | KEY_MOD2 | KEY_F8,
+    KEY_SHIFT | KEY_MOD2 | KEY_F9,
+    KEY_SHIFT | KEY_MOD2 | KEY_F10,
+    KEY_SHIFT | KEY_MOD2 | KEY_F11,
+    KEY_SHIFT | KEY_MOD2 | KEY_F12,
+    KEY_SHIFT | KEY_MOD2 | KEY_F13,
+    KEY_SHIFT | KEY_MOD2 | KEY_F14,
+    KEY_SHIFT | KEY_MOD2 | KEY_F15,
+    KEY_SHIFT | KEY_MOD2 | KEY_F16,
+
+    KEY_SHIFT | KEY_MOD2 | KEY_DOWN,
+    KEY_SHIFT | KEY_MOD2 | KEY_UP,
+    KEY_SHIFT | KEY_MOD2 | KEY_LEFT,
+    KEY_SHIFT | KEY_MOD2 | KEY_RIGHT,
+    KEY_SHIFT | KEY_MOD2 | KEY_HOME,
+    KEY_SHIFT | KEY_MOD2 | KEY_END,
+    KEY_SHIFT | KEY_MOD2 | KEY_PAGEUP,
+    KEY_SHIFT | KEY_MOD2 | KEY_PAGEDOWN,
+    KEY_SHIFT | KEY_MOD2 | KEY_RETURN,
+    KEY_SHIFT | KEY_MOD2 | KEY_ESCAPE,
+    KEY_SHIFT | KEY_MOD2 | KEY_BACKSPACE,
+    KEY_SHIFT | KEY_MOD2 | KEY_INSERT,
+    KEY_SHIFT | KEY_MOD2 | KEY_DELETE,
+
+    KEY_MOD1 | KEY_MOD2 | KEY_0,
+    KEY_MOD1 | KEY_MOD2 | KEY_1,
+    KEY_MOD1 | KEY_MOD2 | KEY_2,
+    KEY_MOD1 | KEY_MOD2 | KEY_3,
+    KEY_MOD1 | KEY_MOD2 | KEY_4,
+    KEY_MOD1 | KEY_MOD2 | KEY_5,
+    KEY_MOD1 | KEY_MOD2 | KEY_6,
+    KEY_MOD1 | KEY_MOD2 | KEY_7,
+    KEY_MOD1 | KEY_MOD2 | KEY_8,
+    KEY_MOD1 | KEY_MOD2 | KEY_9,
+    KEY_MOD1 | KEY_MOD2 | KEY_A,
+    KEY_MOD1 | KEY_MOD2 | KEY_B,
+    KEY_MOD1 | KEY_MOD2 | KEY_C,
+    KEY_MOD1 | KEY_MOD2 | KEY_D,
+    KEY_MOD1 | KEY_MOD2 | KEY_E,
+    KEY_MOD1 | KEY_MOD2 | KEY_F,
+    KEY_MOD1 | KEY_MOD2 | KEY_G,
+    KEY_MOD1 | KEY_MOD2 | KEY_H,
+    KEY_MOD1 | KEY_MOD2 | KEY_I,
+    KEY_MOD1 | KEY_MOD2 | KEY_J,
+    KEY_MOD1 | KEY_MOD2 | KEY_K,
+    KEY_MOD1 | KEY_MOD2 | KEY_L,
+    KEY_MOD1 | KEY_MOD2 | KEY_M,
+    KEY_MOD1 | KEY_MOD2 | KEY_N,
+    KEY_MOD1 | KEY_MOD2 | KEY_O,
+    KEY_MOD1 | KEY_MOD2 | KEY_P,
+    KEY_MOD1 | KEY_MOD2 | KEY_Q,
+    KEY_MOD1 | KEY_MOD2 | KEY_R,
+    KEY_MOD1 | KEY_MOD2 | KEY_S,
+    KEY_MOD1 | KEY_MOD2 | KEY_T,
+    KEY_MOD1 | KEY_MOD2 | KEY_U,
+    KEY_MOD1 | KEY_MOD2 | KEY_V,
+    KEY_MOD1 | KEY_MOD2 | KEY_W,
+    KEY_MOD1 | KEY_MOD2 | KEY_X,
+    KEY_MOD1 | KEY_MOD2 | KEY_Y,
+    KEY_MOD1 | KEY_MOD2 | KEY_Z,
+    KEY_MOD1 | KEY_MOD2 | KEY_SEMICOLON,
+    KEY_MOD1 | KEY_MOD2 | KEY_QUOTERIGHT,
+    KEY_MOD1 | KEY_MOD2 | KEY_BRACKETLEFT,
+    KEY_MOD1 | KEY_MOD2 | KEY_BRACKETRIGHT,
+    KEY_MOD1 | KEY_MOD2 | KEY_POINT,
+
+    KEY_MOD1 | KEY_MOD2 | KEY_F1,
+    KEY_MOD1 | KEY_MOD2 | KEY_F2,
+    KEY_MOD1 | KEY_MOD2 | KEY_F3,
+    KEY_MOD1 | KEY_MOD2 | KEY_F4,
+    KEY_MOD1 | KEY_MOD2 | KEY_F5,
+    KEY_MOD1 | KEY_MOD2 | KEY_F6,
+    KEY_MOD1 | KEY_MOD2 | KEY_F7,
+    KEY_MOD1 | KEY_MOD2 | KEY_F8,
+    KEY_MOD1 | KEY_MOD2 | KEY_F9,
+    KEY_MOD1 | KEY_MOD2 | KEY_F10,
+    KEY_MOD1 | KEY_MOD2 | KEY_F11,
+    KEY_MOD1 | KEY_MOD2 | KEY_F12,
+    KEY_MOD1 | KEY_MOD2 | KEY_F13,
+    KEY_MOD1 | KEY_MOD2 | KEY_F14,
+    KEY_MOD1 | KEY_MOD2 | KEY_F15,
+    KEY_MOD1 | KEY_MOD2 | KEY_F16,
+
+    KEY_MOD1 | KEY_MOD2 | KEY_DOWN,
+    KEY_MOD1 | KEY_MOD2 | KEY_UP,
+    KEY_MOD1 | KEY_MOD2 | KEY_LEFT,
+    KEY_MOD1 | KEY_MOD2 | KEY_RIGHT,
+    KEY_MOD1 | KEY_MOD2 | KEY_HOME,
+    KEY_MOD1 | KEY_MOD2 | KEY_END,
+    KEY_MOD1 | KEY_MOD2 | KEY_PAGEUP,
+    KEY_MOD1 | KEY_MOD2 | KEY_PAGEDOWN,
+    KEY_MOD1 | KEY_MOD2 | KEY_RETURN,
+    KEY_MOD1 | KEY_MOD2 | KEY_SPACE,
+    KEY_MOD1 | KEY_MOD2 | KEY_BACKSPACE,
+    KEY_MOD1 | KEY_MOD2 | KEY_INSERT,
+    KEY_MOD1 | KEY_MOD2 | KEY_DELETE,
+
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_0,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_1,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_2,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_3,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_4,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_5,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_6,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_7,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_8,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_9,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_A,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_B,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_C,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_D,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_E,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_G,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_H,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_I,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_J,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_K,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_L,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_M,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_N,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_O,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_P,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_Q,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_R,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_S,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_T,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_U,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_V,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_W,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | 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_QUOTERIGHT,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_BRACKETLEFT,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_BRACKETRIGHT,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_POINT,
+
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F1,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F2,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F3,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F4,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F5,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F6,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F7,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F8,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F9,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F10,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F11,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F12,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F13,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F14,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F15,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_F16,
+
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_DOWN,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_UP,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_LEFT,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_RIGHT,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_HOME,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_END,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_PAGEUP,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_PAGEDOWN,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_RETURN,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_SPACE,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_BACKSPACE,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_INSERT,
+    KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_DELETE
 };
 
 static const sal_uInt16 KEYCODE_ARRAY_SIZE = SAL_N_ELEMENTS(KEYCODE_ARRAY);
 
-
 // seems to be needed to layout the list box, which shows all
 // assignable shortcuts
 static long AccCfgTabs[] =
@@ -620,10 +618,8 @@ static long AccCfgTabs[] =
 
 class SfxAccCfgLBoxString_Impl : public SvLBoxString
 {
-    public:
-    SfxAccCfgLBoxString_Impl(      SvTreeListEntry* pEntry,
-                                   sal_uInt16       nFlags,
-                             const OUString&      sText );
+public:
+    SfxAccCfgLBoxString_Impl(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const 
OUString& sText);
 
     virtual ~SfxAccCfgLBoxString_Impl();
 
@@ -632,17 +628,12 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString
 };
 
 
-SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl(      SvTreeListEntry* 
pEntry,
-                                                         sal_uInt16       
nFlags,
-                                                   const OUString&      sText )
-        : SvLBoxString(pEntry, nFlags, sText)
-{
-}
-
+SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl(SvTreeListEntry* pEntry, 
sal_uInt16 nFlags, const OUString& sText)
+    : SvLBoxString(pEntry, nFlags, sText)
+{}
 
 SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl()
-{
-}
+{}
 
 void SfxAccCfgLBoxString_Impl::Paint(
     const Point& aPos, SvTreeListBox& rDevice, const SvViewDataEntry* 
/*pView*/, const SvTreeListEntry* pEntry)
@@ -672,7 +663,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL 
makeSfxAccCfgTabListBox(vc
     return new SfxAccCfgTabListBox_Impl(pParent, nWinBits);
 }
 
-
 void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry,
                                          const OUString& rText,
                                          const Image& rImage1,
@@ -682,7 +672,6 @@ void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* 
pEntry,
     SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind);
 }
 
-
 /** select the entry, which match the current key input ... excepting
     keys, which are used for the dialog itself.
   */
@@ -710,12 +699,11 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& 
aKey)
             {
                 sal_uInt16 nCode2 = pUserData->m_aKey.GetCode();
                 sal_uInt16 nMod2  = pUserData->m_aKey.GetModifier();
-                if (
-                    (nCode1 == nCode2) &&
-                    (nMod1  == nMod2 )
-                   )
+
+                if ((nCode1 == nCode2) &&
+                    (nMod1  == nMod2 ))
                 {
-                    Select     (pEntry);
+                    Select(pEntry);
                     MakeVisible(pEntry);
                     return;
                 }
@@ -728,7 +716,6 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& 
aKey)
     SvTabListBox::KeyInput(aKey);
 }
 
-
 SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, 
const SfxItemSet& aSet )
     : SfxTabPage(pParent, "AccelConfigPage", "cui/ui/accelconfigpage.ui", 
&aSet)
     , m_pMacroInfoItem()
@@ -770,7 +757,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( 
vcl::Window* pParent, const
 
     aFilterAllStr = SfxResId( STR_SFX_FILTERNAME_ALL );
 
-// install handler functions
+    // install handler functions
     m_pChangeButton->SetClickHdl( LINK( this, SfxAcceleratorConfigPage, 
ChangeHdl ));
     m_pRemoveButton->SetClickHdl( LINK( this, SfxAcceleratorConfigPage, 
RemoveHdl ));
     m_pEntriesBox->SetSelectHdl ( LINK( this, SfxAcceleratorConfigPage, 
SelectHdl ));
@@ -811,7 +798,6 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( 
vcl::Window* pParent, const
     
m_pKeyBox->SetStyle(m_pKeyBox->GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_SORT);
 }
 
-
 SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage()
 {
     // free memory - remove all dynamic user data
@@ -839,7 +825,6 @@ SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage()
     delete m_pFileDlg;
 }
 
-
 void SfxAcceleratorConfigPage::InitAccCfg()
 {
     // already initialized ?
@@ -849,24 +834,24 @@ void SfxAcceleratorConfigPage::InitAccCfg()
     try
     {
         // no - initialize this instance
-        m_xContext = ::comphelper::getProcessComponentContext();
+        m_xContext = comphelper::getProcessComponentContext();
 
-        m_xUICmdDescription = 
css::frame::theUICommandDescription::get(m_xContext);
+        m_xUICmdDescription = frame::theUICommandDescription::get(m_xContext);
 
         // get the current active frame, which should be our "parent"
         // for this session
         m_xFrame = GetFrame();
         if ( !m_xFrame.is() )
         {
-            css::uno::Reference< css::frame::XDesktop2 > xDesktop = 
css::frame::Desktop::create( m_xContext );
+            uno::Reference<frame::XDesktop2> xDesktop = 
frame::Desktop::create( m_xContext );
             m_xFrame = xDesktop->getActiveFrame();
         }
 
         // identify module
-        css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =
-                 css::frame::ModuleManager::create(m_xContext);
+        uno::Reference<frame::XModuleManager2> xModuleManager =
+                 frame::ModuleManager::create(m_xContext);
         m_sModuleLongName = xModuleManager->identify(m_xFrame);
-        ::comphelper::SequenceAsHashMap 
lModuleProps(xModuleManager->getByName(m_sModuleLongName));
+        comphelper::SequenceAsHashMap 
lModuleProps(xModuleManager->getByName(m_sModuleLongName));
         m_sModuleShortName = 
lModuleProps.getUnpackedValueOrDefault(MODULEPROP_SHORTNAME, OUString());
         m_sModuleUIName    = 
lModuleProps.getUnpackedValueOrDefault(MODULEPROP_UINAME   , OUString());
 
@@ -875,24 +860,29 @@ void SfxAcceleratorConfigPage::InitAccCfg()
 
         // get module accelerator configuration
 
-        css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > 
xModuleCfgSupplier( 
css::ui::theModuleUIConfigurationManagerSupplier::get(m_xContext) );

... etc. - the rest is truncated

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to