fix format for code consistency

Conflicts:
sw/source/core/doc/docglbl.cxx
sw/source/filter/ww8/ww8par2.cxx

Change-Id: I8deb4ecf2714f29d53e0653ecaeabac251e9f071
Reviewed-on: https://gerrit.libreoffice.org/6082
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 27 insertions, 29 deletions

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index dd1225c40189..091fb231e8d5 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -167,7 +167,7 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base
     bool    bModified;
 
 
-    void                        SetModified() {bModified = true;}
+    void                            SetModified() {bModified = true;}
 
 protected:
     virtual sal_Bool                SeekRow( long nRow );
@@ -180,14 +180,14 @@ protected:
 
 public:
     SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilder);
-    void    ReadEntries(SvStream& rInStr);
-    void    WriteEntries(SvStream& rOutStr);
+    void                            ReadEntries(SvStream& rInStr);
+    void                            WriteEntries(SvStream& rOutStr);
 
     sal_Bool                        IsModified()const;
 
     virtual OUString GetCellText( long nRow, sal_uInt16 nColumn ) const;
-    virtual void Resize();
-    virtual Size GetOptimalSize() const;
+    virtual void                    Resize();
+    virtual Size                    GetOptimalSize() const;
 };
 
 class SwAutoMarkDlg_Impl : public ModalDialog
@@ -349,7 +349,7 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog()
     delete pExampleFrame;
 }
 
-void    SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
+void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     if (nId == m_nBackGroundId)
     {
@@ -373,7 +373,7 @@ void    SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
 }
 
-short   SwMultiTOXTabDialog::Ok()
+short SwMultiTOXTabDialog::Ok()
 {
     short nRet = SfxTabDialog::Ok();
     SwTOXDescription& rDesc = GetTOXDescription(eCurrentTOXType);
@@ -412,7 +412,7 @@ SwForm* SwMultiTOXTabDialog::GetForm(CurTOXType eType)
     return pFormArr[nIndex];
 }
 
-SwTOXDescription&   SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
+SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
 {
     sal_uInt16 nIndex = eType.GetFlatIndex();
     if(!pDescArr[nIndex])
@@ -1000,7 +1000,7 @@ static CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData)
     return eRet;
 }
 
-void    SwTOXSelectTabPage::ApplyTOXDescription()
+void SwTOXSelectTabPage::ApplyTOXDescription()
 {
     SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
     const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
@@ -1146,7 +1146,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
                 nContentOptions |= nsSwTOXElement::TOX_GRAPHIC;
         }
         break;
-        case  TOX_INDEX:
+        case TOX_INDEX:
         {
             nContentOptions = nsSwTOXElement::TOX_MARK;
 
@@ -1255,7 +1255,7 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet& )
         m_pTypeLB->Enable(sal_False);
     }
 
-    if (!m_bWaitingInitialSettings)
+    if(!m_bWaitingInitialSettings)
     {
         // save current values into the proper TOXDescription
         FillTOXDescription();
@@ -1527,13 +1527,13 @@ public:
     void    AdjustSize();
 };
 
-void    SwTOXEdit::RequestHelp( const HelpEvent& rHEvt )
+void SwTOXEdit::RequestHelp( const HelpEvent& rHEvt )
 {
     if(!m_pParent->CreateQuickHelp(this, aFormToken, rHEvt))
         Edit::RequestHelp(rHEvt);
 }
 
-void    SwTOXEdit::KeyInput( const KeyEvent& rKEvt )
+void SwTOXEdit::KeyInput( const KeyEvent& rKEvt )
 {
     const Selection& rSel = GetSelection();
     sal_Int32 nTextLen = GetText().getLength();
@@ -1585,8 +1585,8 @@ public:
     {
     }
 
-    virtual void    KeyInput( const KeyEvent& rKEvt );
-    virtual void    RequestHelp( const HelpEvent& rHEvt );
+    virtual void KeyInput( const KeyEvent& rKEvt );
+    virtual void RequestHelp( const HelpEvent& rHEvt );
 
     bool IsNextControl() const          {return bNextControl;}
     void SetPrevNextLink(const Link& rLink) {aPrevNextControlLink = rLink;}
@@ -1661,7 +1661,7 @@ public:
         }
 };
 
-void    SwTOXButton::KeyInput( const KeyEvent& rKEvt )
+void SwTOXButton::KeyInput( const KeyEvent& rKEvt )
 {
     bool bCall = false;
     KeyCode aCode = rKEvt.GetKeyCode();
@@ -1687,7 +1687,7 @@ void    SwTOXButton::KeyInput( const KeyEvent& rKEvt )
         PushButton::KeyInput(rKEvt);
 }
 
-void    SwTOXButton::RequestHelp( const HelpEvent& rHEvt )
+void SwTOXButton::RequestHelp( const HelpEvent& rHEvt )
 {
     if(!m_pParent->CreateQuickHelp(this, aFormToken, rHEvt))
         Button::RequestHelp(rHEvt);
@@ -1708,7 +1708,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwIdxTreeListBox(Window *pP
     return new SwIdxTreeListBox(pParent, nWinStyle);
 }
 
-void    SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt )
+void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt )
 {
     if( rHEvt.GetMode() & HELPMODE_QUICK )
     {
@@ -1921,7 +1921,7 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage()
 {
 }
 
-sal_Bool    SwTOXEntryTabPage::FillItemSet( SfxItemSet& )
+sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& )
 {
     // nothing to do
     return sal_True;
@@ -2637,7 +2637,7 @@ SwTokenWindow::~SwTokenWindow()
     }
 }
 
-void    SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
+void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
 {
     SetActiveControl(0);
     bValid = sal_True;
@@ -2802,9 +2802,7 @@ Control*    SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rT
     return pRet;
 }
 
-void    SwTokenWindow::InsertAtSelection(
-            const String& rText,
-            const SwFormToken& rToken)
+void SwTokenWindow::InsertAtSelection(const String& rText, const SwFormToken& rToken)
 {
     OSL_ENSURE(pActiveCtrl, "no active control!");
 
@@ -3538,7 +3536,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
     EnableSelectHdl(m_pParaLayLB);
 }
 
-int     SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/  )
+int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/  )
 {
     GetForm() = *m_pCurrentForm;
     return LEAVE_PAGE;
@@ -3776,7 +3774,7 @@ Size SwEntryBrowseBox::GetOptimalSize() const
     return aSize;
 }
 
-sal_Bool    SwEntryBrowseBox::SeekRow( long nRow )
+sal_Bool SwEntryBrowseBox::SeekRow( long nRow )
 {
     nCurrentRow = nRow;
     return sal_True;
@@ -3802,7 +3800,7 @@ OUString SwEntryBrowseBox::GetCellText(long nRow, sal_uInt16 nColumn) const
     return *pRet;
 }
 
-void    SwEntryBrowseBox::PaintCell(OutputDevice& rDev,
+void SwEntryBrowseBox::PaintCell(OutputDevice& rDev,
                                 const Rectangle& rRect, sal_uInt16 nColumnId) const
 {
     String sPaint = GetCellText( nCurrentRow, nColumnId );
@@ -3859,7 +3857,7 @@ sal_Bool SwEntryBrowseBox::SaveModified()
     return sal_True;
 }
 
-void    SwEntryBrowseBox::InitController(
+void SwEntryBrowseBox::InitController(
                 ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol)
 {
     String rTxt = GetCellText( nRow, nCol );
@@ -3878,7 +3876,7 @@ void    SwEntryBrowseBox::InitController(
      }
 }
 
-void    SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
+void SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
 {
     AutoMarkEntry* pToInsert = 0;
     rtl_TextEncoding  eTEnc = osl_getThreadTextEncoding();
@@ -3930,7 +3928,7 @@ void    SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
     RowInserted(0, aEntryArr.size() + 1, sal_True);
 }
 
-void    SwEntryBrowseBox::WriteEntries(SvStream& rOutStr)
+void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr)
 {
     //check if the current controller is modified
     sal_uInt16 nCol = GetCurColumnId();