[Libreoffice-commits] core.git: sw/source

[Samuel Mehrbrodt]

 sw/source/uibase/utlui/content.cxx |   30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

New commits:
commit b78fa03d34734925167112d8ceb6a8b53d6d7735
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Tue Mar 15 12:30:26 2016 +0100

    SwNavigator: Small code cleanup
    
    Change-Id: Iebc0bd9c136205030c80a49c9453e2d57aaed33e
    Reviewed-on: https://gerrit.libreoffice.org/23267
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 2e226c6..8fe42eb 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -467,12 +467,12 @@ const SwContent* SwContentType::GetMember(size_t nIndex)
     return nullptr;
 }
 
-void    SwContentType::Invalidate()
+void SwContentType::Invalidate()
 {
     bDataValid = false;
 }
 
-void    SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
+void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
 {
     SwContentArr*   pOldMember = nullptr;
     size_t nOldMemberCount = 0;
@@ -1281,7 +1281,7 @@ sal_IntPtr SwContentTree::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab)
 
 // Content will be integrated into the Box only on demand.
 
-void  SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
+void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
 {
     // Is this a content type?
     if(lcl_IsContentType(pParent))
@@ -2327,8 +2327,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
                                 pEntry = Prev(pEntry);
                                 if(pEntry &&
                                     (nActLevel >= static_cast<SwOutlineContent*>(pEntry->GetUserData())->GetOutlineLevel()||
-                                     CTYPE_CNT !=
-                                        static_cast<SwTypeNumber*>(pEntry->GetUserData())->GetTypeId()))
+                                     CTYPE_CNT != static_cast<SwTypeNumber*>(pEntry->GetUserData())->GetTypeId()))
                                 {
                                     break;
                                 }
@@ -2374,7 +2373,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
     }
 }
 
-void    SwContentTree::ShowTree()
+void SwContentTree::ShowTree()
 {
     SvTreeListBox::Show();
 }
@@ -2388,7 +2387,7 @@ void SwContentTree::Paint( vcl::RenderContext& rRenderContext,
     SvTreeListBox::Paint( rRenderContext, rRect );
 }
 
-void    SwContentTree::HideTree()
+void SwContentTree::HideTree()
 {
     m_aUpdTimer.Stop();
     SvTreeListBox::Hide();
@@ -2447,8 +2446,8 @@ DragDropMode SwContentTree::NotifyStartDrag(
 {
     DragDropMode eMode = (DragDropMode)0;
     if( m_bIsActive && m_nRootType == ContentTypeId::OUTLINE &&
-        GetModel()->GetAbsPos( pEntry ) > 0
-        && !GetWrtShell()->GetView().GetDocShell()->IsReadOnly())
+            GetModel()->GetAbsPos( pEntry ) > 0
+            && !GetWrtShell()->GetView().GetDocShell()->IsReadOnly())
         eMode = GetDragDropMode();
     else if(!m_bIsActive && GetWrtShell()->GetView().GetDocShell()->HasName())
         eMode = DragDropMode::APP_COPY;
@@ -2542,7 +2541,7 @@ bool  SwContentTree::NotifyAcceptDrop( SvTreeListEntry* pEntry)
 // If a Ctrl + DoubleClick are executed in an open area,
 // then the base function of the control is to be called.
 
-void  SwContentTree::MouseButtonDown( const MouseEvent& rMEvt )
+void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt )
 {
     Point aPos( rMEvt.GetPosPixel());
     SvTreeListEntry* pEntry = GetEntry( aPos, true );
@@ -2554,7 +2553,7 @@ void  SwContentTree::MouseButtonDown( const MouseEvent& rMEvt )
 
 // Update immediately
 
-void  SwContentTree::GetFocus()
+void SwContentTree::GetFocus()
 {
     SwView* pActView = GetParentWindow()->GetCreateView();
     if(pActView)
@@ -2578,7 +2577,7 @@ void  SwContentTree::GetFocus()
     SvTreeListBox::GetFocus();
 }
 
-void  SwContentTree::KeyInput(const KeyEvent& rEvent)
+void SwContentTree::KeyInput(const KeyEvent& rEvent)
 {
     const vcl::KeyCode aCode = rEvent.GetKeyCode();
     if(aCode.GetCode() == KEY_RETURN)
@@ -2713,8 +2712,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                             }
                             if ( !hasObjectMarked )
                             {
-                                SwEditWin& pEditWindow =
-                                    m_pActiveShell->GetView().GetEditWin();
+                                SwEditWin& pEditWindow = m_pActiveShell->GetView().GetEditWin();
                                 vcl::KeyCode tempKeycode( KEY_ESCAPE );
                                 KeyEvent rKEvt( 0 , tempKeycode );
                                 static_cast<vcl::Window*>(&pEditWindow)->KeyInput( rKEvt );
@@ -2735,7 +2733,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
 
 }
 
-void  SwContentTree::RequestHelp( const HelpEvent& rHEvt )
+void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
 {
     bool bCallBase = true;
     if( rHEvt.GetMode() & HelpEventMode::QUICK )
@@ -2851,7 +2849,7 @@ void  SwContentTree::RequestHelp( const HelpEvent& rHEvt )
         Window::RequestHelp( rHEvt );
 }
 
-void    SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry )
+void SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry )
 {
     SvTreeListEntry* pFirst = FirstSelected();
     switch( nSelectedPopupEntry )