21 files changed, 17 insertions, 64 deletions
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index ebb6ae19af07..1eb7e5107a52 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -29,7 +29,6 @@
 
 using namespace ::com::sun::star;
 
-
 /*--------------------------------------------------------------------
     Description: edit insert-field
  --------------------------------------------------------------------*/
@@ -56,7 +55,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS,
     }
     if( RES_DROPDOWN == pField->GetTyp()->Which() )
     {
-        //
+
         pDropField = (SwDropDownField*)pField;
         OUString sTitle = GetText();
         sTitle += pDropField->GetPar2();
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx
index 1bb07a7bec3e..aa4021b2614f 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.cxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <FldRefTreeListBox.hxx>
 
 #include <helpid.h>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 4115bc6f12be..f304d9077206 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -49,7 +49,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::uno;
 
-
 /*--------------------------------------------------------------------
     Description: edit insert-field
  --------------------------------------------------------------------*/
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 8ccfe3bea86d..2874f4e65697 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -83,7 +83,6 @@ public:
     void                SetWrtShell(SwWrtShell& rSh);
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 53ac270281f5..78ccac188032 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -472,6 +472,4 @@ void    SwFldDokInfPage::FillUserData()
     SetUserData(sData);
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index cd37f9366c2a..8e5727cd4033 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -71,7 +71,6 @@ public:
     virtual void        FillUserData();
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 39f016842f63..522599524996 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -73,7 +73,6 @@ public:
     virtual void        FillUserData();
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 71491a805d7d..053ea40fe929 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -37,7 +37,6 @@
 #include <fldedt.hxx>
 #include <crsskip.hxx>
 
-
 #include <cmdid.h>
 #include <helpid.h>
 #include <globals.hrc>
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 101f58f35740..6c172a2cf846 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -37,7 +37,6 @@
 
 using namespace ::com::sun::star;
 
-
 SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet)
     : SwFldPage(pParent, "FldFuncPage",
         "modules/swriter/ui/fldfuncpage.ui", rCoreSet)
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 9f38cefc784c..2923fd2c7fd6 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -95,7 +95,6 @@ public:
     virtual void        FillUserData();
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 72615a1989ae..d4a0b5c4fb09 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <cmdid.h>
 #include <hintids.hxx>
 #include <svl/stritem.hxx>
@@ -236,7 +235,6 @@ SwFldMgr::SwFldMgr(SwWrtShell* pSh ) :
     GetCurFld();
 }
 
-
 SwFldMgr::~SwFldMgr()
 {
 }
@@ -282,7 +280,6 @@ sal_uInt16 SwFldMgr::GetFldTypeCount(sal_uInt16 nResId) const
     return pSh ? pSh->GetFldTypeCount(nResId) : 0;
 }
 
-
 SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, sal_uInt16 nId) const
 {
     SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell();
@@ -290,7 +287,6 @@ SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, sal_uInt16 nId) const
     return pSh ? pSh->GetFldType(nId, nResId) : 0;
 }
 
-
 SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const OUString& rName) const
 {
     SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell();
@@ -298,7 +294,6 @@ SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const OUString& rName) cons
     return pSh ? pSh->GetFldType(nResId, rName) : 0;
 }
 
-
 /*--------------------------------------------------------------------
     Description: determine current field
  --------------------------------------------------------------------*/
@@ -344,7 +339,6 @@ SwField* SwFldMgr::GetCurFld()
     Description: provide group range
  --------------------------------------------------------------------*/
 
-
 const SwFldGroupRgn& SwFldMgr::GetGroupRange(sal_Bool bHtmlMode, sal_uInt16 nGrpId) const
 {
 static SwFldGroupRgn const aRanges[] =
@@ -407,14 +401,12 @@ sal_uInt16 SwFldMgr::GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16
                   ACCESS over TYP_....
  --------------------------------------------------------------------*/
 
-
 sal_uInt16 SwFldMgr::GetTypeId(sal_uInt16 nPos)
 {
     OSL_ENSURE(nPos < ::GetPackCount(), "forbidden Pos");
     return aSwFlds[ nPos ].nTypeId;
 }
 
-
 OUString SwFldMgr::GetTypeStr(sal_uInt16 nPos)
 {
     OSL_ENSURE(nPos < ::GetPackCount(), "forbidden TypeId");
@@ -440,7 +432,6 @@ OUString SwFldMgr::GetTypeStr(sal_uInt16 nPos)
     Description: determine Pos in the list
  --------------------------------------------------------------------*/
 
-
 sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId)
 {
     switch( nTypeId )
@@ -571,7 +562,6 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
                   ACCESS over TYP_....
  --------------------------------------------------------------------*/
 
-
 sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool bHtmlMode) const
 {
     OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId");
@@ -628,7 +618,6 @@ sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, sal_Bool b
     Description:    determine FormatString to a type
  --------------------------------------------------------------------*/
 
-
 OUString SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
 {
     OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId");
@@ -771,7 +760,6 @@ sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const
     Description: Traveling
  --------------------------------------------------------------------*/
 
-
 sal_Bool SwFldMgr::GoNextPrev( sal_Bool bNext, SwFieldType* pTyp )
 {
     SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
@@ -802,7 +790,6 @@ sal_Bool SwFldMgr::GoNextPrev( sal_Bool bNext, SwFieldType* pTyp )
     Description: insert field types
  --------------------------------------------------------------------*/
 
-
 void SwFldMgr::InsertFldType(SwFieldType& rType)
 {
     SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
@@ -815,7 +802,6 @@ void SwFldMgr::InsertFldType(SwFieldType& rType)
     Description: determine current TypeId
  --------------------------------------------------------------------*/
 
-
 sal_uInt16 SwFldMgr::GetCurTypeId() const
 {
     return pCurFld ? pCurFld->GetTypeId() : USHRT_MAX;
@@ -825,7 +811,6 @@ sal_uInt16 SwFldMgr::GetCurTypeId() const
     Description: Over string  insert field or update
  --------------------------------------------------------------------*/
 
-
 sal_Bool SwFldMgr::InsertFld(
     const SwInsertFld_Data& rData)
 {
@@ -1395,7 +1380,6 @@ sal_Bool SwFldMgr::InsertFld(
     }
     OSL_ENSURE(pFld, "field not available");
 
-
     //the auto language flag has to be set prior to the language!
     pFld->SetAutomaticLanguage(rData.bIsAutomaticLanguage);
     sal_uInt16 nLang = GetCurrLanguage();
@@ -1431,7 +1415,6 @@ sal_Bool SwFldMgr::InsertFld(
     Description: fields update
  --------------------------------------------------------------------*/
 
-
 void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
                             const OUString& rPar1,
                             const OUString& rPar2,
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 226a3f8d8e6c..364dad36c7ad 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -90,7 +90,6 @@ public:
     virtual sal_uInt16      GetGroup() = 0;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index ccd742513f85..dbfd35cfc660 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -152,7 +152,6 @@ sal_uInt16 SwFldRefPage::GetSavedSelectedPos() const
     return mnSavedSelectedPos;
 }
 
-
 void SwFldRefPage::Reset(const SfxItemSet& )
 {
     if (!IsFldEdit())
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index fb88d16f5dcc..453ca8ada11b 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -89,7 +89,6 @@ public:
     virtual void        FillUserData();
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 32b3ab1410dd..9fa310f42093 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -46,12 +46,10 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
-
 /*--------------------------------------------------------------------
     Description:    carrier of the dialog
  --------------------------------------------------------------------*/
 
-
 SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent)
     : SfxTabDialog(pParent, "FieldDialog", "modules/swriter/ui/fielddialog.ui")
     , m_pChildWin(pCW)
@@ -207,7 +205,6 @@ IMPL_LINK_NOARG(SwFldDlg, CancelHdl)
     return 0;
 }
 
-
 /*--------------------------------------------------------------------
     Description: newly initialise dialog after Doc-Switch
  --------------------------------------------------------------------*/
@@ -342,5 +339,4 @@ void SwFldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
     }
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src
index 0660727f15d8..a564a8e36180 100644
--- a/sw/source/ui/fldui/fldui.src
+++ b/sw/source/ui/fldui/fldui.src
@@ -24,9 +24,9 @@
 /*--------------------------------------------------------------------
     Description: strings for the types
  --------------------------------------------------------------------*/
- //
+
  // range document
- //
+
 String STR_DATEFLD
 {
     Text [ en-US ] = "Date" ;
@@ -67,9 +67,9 @@ String STR_EXTUSERFLD
 {
     Text [ en-US ] = "Sender" ;
 };
- //
+
  // range functions
- //
+
 String STR_SETFLD
 {
     Text [ en-US ] = "Set variable" ;
@@ -134,9 +134,9 @@ String STR_DROPDOWN
 {
     Text [ en-US ] = "Input list" ;
 };
- //
+
  // range references
- //
+
 String STR_SETREFFLD
 {
     Text [ en-US ] = "Set Reference" ;
@@ -145,9 +145,9 @@ String STR_GETREFFLD
 {
     Text [ en-US ] = "Insert Reference" ;
 };
- //
+
  //  range database
- //
+
 String STR_DBFLD
 {
     Text [ en-US ] = "Mail merge fields" ;
@@ -176,9 +176,9 @@ String STR_HIDDENTXTFLD
 {
     Text [ en-US ] = "Hidden text" ;
 };
- //
+
  //  range user fields
- //
+
 String STR_USERFLD
 {
     Text [ en-US ] = "User Field" ;
@@ -199,9 +199,9 @@ String STR_HIDDENPARAFLD
 {
     Text [ en-US ] = "Hidden Paragraph" ;
 };
- //
+
  // range DocumentInfo
- //
+
 String STR_DOCINFOFLD
 {
     Text [ en-US ] = "DocInformation" ;
@@ -225,9 +225,9 @@ String FLD_TIME_FIX
 {
     Text [ en-US ] = "Time (fixed)" ;
 };
- //
+
  //  SubCmd Statistic
- //
+
 String FLD_STAT_TABLE
 {
     Text [ en-US ] = "Tables" ;
@@ -257,7 +257,7 @@ String FLD_STAT_PAGE
     Text [ en-US ] = "Pages" ;
 };
  //  SubCmd DDETypes
- //
+
 String FMT_DDE_HOT
 {
     Text [ en-US ] = "DDE automatic" ;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 7e90bec09d6f..a400560258c2 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -825,7 +825,6 @@ IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
         break;
     }
 
-
     // check buttons
     switch (nTypeId)
     {
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 2d85f0ae2254..295a6d42f896 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -102,7 +102,6 @@ public:
     virtual void        FillUserData();
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 66c8982ced13..2ebbb9880035 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -63,7 +63,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
     OUString aStr;
     if( RES_INPUTFLD == pField->GetTyp()->Which() )
     {   // it is an input field
-        //
+
         pInpFld = (SwInputField*)pField;
         m_pLabelED->SetText( pInpFld->GetPar2() );
         sal_uInt16 nSubType = pInpFld->GetSubType();
@@ -157,12 +157,10 @@ void SwFldInputDlg::Apply()
     rSh.EndAllAction();
 }
 
-
 IMPL_LINK_NOARG(SwFldInputDlg, NextHdl)
 {
     EndDialog(RET_OK);
     return 0;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 42f3fc5552e8..fad10ca8b6b3 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -36,15 +36,12 @@
 #include <fldui.hrc>
 #include <globals.hrc>
 
-
 using namespace ::com::sun::star;
 
 // static ----------------------------------------------------------------
 
 // class SwJavaEditDialog ------------------------------------------------
 
-
-
 SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) :
     SvxStandardDialog(pParent, "InsertScriptDialog", "modules/swriter/ui/insertscript.ui"),
 
diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx
index 5a033d1a8542..000a5b75a54c 100644
--- a/sw/source/ui/fldui/xfldui.cxx
+++ b/sw/source/ui/fldui/xfldui.cxx
@@ -33,7 +33,6 @@
 #include <view.hxx>
 #include <swmodule.hxx>
 
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
@@ -42,13 +41,10 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::beans;
 
-
-
 // This file contains all routines of the fldui directory, which must compile
 // with exceptions. So we can reduce the code of the other files, which don't
 // need any exception handling.
 
-
 /*--------------------------------------------------------------------
      Description: Is the database field numeric?
      remark: in case of error sal_True is returned
@@ -169,5 +165,4 @@ sal_Bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQry
     return bNumeric;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */