Remove visual noise from sw

Conflicts:
sw/inc/unodraw.hxx
sw/inc/unoframe.hxx
sw/sdi/swriter.sdi
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/ui/inc/unotxvw.hxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/lingu/sdrhhcwrap.cxx
sw/source/ui/uno/swdetect.hxx

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

24 files changed, 3 insertions, 43 deletions

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index f91e22d17f3c..4037f748d740 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -416,7 +416,6 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton)
             }
             xStore->storeAsURL(sTmpName, Sequence< PropertyValue >());
 
-
             uno::Reference<XNamingService> xNaming(m_xDBContext, UNO_QUERY);
             xNaming->registerObject( sFind, xNewInstance );
             //now insert the new source into the ListBox
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index c9d8cf152956..7d8205a72582 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -27,7 +27,6 @@
 #include <swdbdata.hxx>
 #include "sharedconnection.hxx"
 
-
 namespace com{namespace sun{namespace star{
     namespace container{
         class XNameAccess;
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index cdb0354d8881..1f4f99cd8c20 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -41,7 +41,6 @@
 #include <helpid.h>
 #include <unomid.h>
 
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ui::dialogs;
 
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index bd5b36392a18..199e67ed6eb7 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -158,7 +158,6 @@ struct _DB_Column
     }
 };
 
-
 struct _DB_ColumnConfigData
 {
     SwInsDBColumns aDBColumns;
@@ -1026,7 +1025,6 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
         sal_Bool bIsAutoUpdateCells = rSh.IsAutoUpdateCells();
         rSh.SetAutoUpdateCells( sal_False );
 
-
         if( m_pCbTableHeadon->IsChecked() )
         {
             for( n = 0; n < nCols; ++n )
@@ -1230,7 +1228,6 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                                         GetFldType( 0, RES_DBNEXTSETFLD ),
                                         OUString("1"), aEmptyOUStr, aDBData );
 
-
             bool bSetCrsr = true;
             sal_uInt16 n = 0, nCols = aColArr.size();
             ::sw::mark::IMark* pMark = NULL;
@@ -1256,7 +1253,6 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                 if(bBreak)
                     break;
 
-
                 for( n = 0; n < nCols; ++n )
                 {
                     _DB_Column* pDBCol = &aColArr[ n ];
@@ -1733,7 +1729,6 @@ void SwInsertDBColAutoPilot::Load()
                 pInsDBColumn->nUsrNumFmt = rNFmtr.GetEntryKey( pInsDBColumn->sUsrNumFmt,
                                                         pInsDBColumn->eUsrNumFmtLng );
 
-
                 pNewData->aDBColumns.insert(pInsDBColumn);
             }
             sal_Int32 n = 0;
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 8023f22a128d..2905c6799529 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -155,7 +155,6 @@ const sal_Char cDataSourceName[] = "DataSourceName";
 const sal_Char cSelection[] = "Selection";
 const sal_Char cActiveConnection[] = "ActiveConnection";
 
-
 // Use nameless namespace to avoid to rubbish the global namespace
 
 namespace
@@ -1820,7 +1819,6 @@ sal_Bool SwNewDBMgr::GetColumnCnt(const OUString& rSourceName, const OUString& r
     return bRet;
 }
 
-
 // reads the column data at the current position
 sal_Bool    SwNewDBMgr::GetMergeColumnCnt(const OUString& rColumnName, sal_uInt16 nLanguage,
                                 OUString &rResult, double *pNumber, sal_uInt32 * /*pFormat*/)
@@ -2067,7 +2065,6 @@ sal_uInt32      SwNewDBMgr::GetSelectedRecordId(
     return nRet;
 }
 
-
 // close all data sources - after fields were updated
 void    SwNewDBMgr::CloseAll(sal_Bool bIncludingMerge)
 {
@@ -2674,7 +2671,6 @@ uno::Reference<XResultSet> SwNewDBMgr::createCursor(const OUString& _sDataSource
     return xResultSet;
 }
 
-
 // merge all data into one resulting document and return the number of merged documents
 sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
                             SwView& rSourceView )
@@ -2759,13 +2755,11 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
         bool bPageStylesWithHeaderFooter = rMaster.GetHeader().IsActive()  ||
                                         rMaster.GetFooter().IsActive();
 
-
         // copy compatibility options
         lcl_CopyCompatibilityOptions( rSourceShell, *pTargetShell);
         // #72821# copy dynamic defaults
         lcl_CopyDynamicDefaults( *rSourceShell.GetDoc(), *pTargetShell->GetDoc() );
 
-
         long nStartRow, nEndRow;
         sal_uLong nDocNo = 1;
         sal_Int32 nDocCount = 0;
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index cb2e0f5579fd..7eb15a02c677 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <sot/formats.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx
index fd45bbca5f06..8247f5c8bfe0 100644
--- a/sw/source/ui/dbui/dbui.cxx
+++ b/sw/source/ui/dbui/dbui.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "wrtsh.hxx"
 
 #include "dbui.hrc"
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 8ddda2de4f6a..48761c615d2b 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -125,7 +125,6 @@ struct SwSendMailDialog_Impl
     uno::Reference< mail::XMailService >        xConnectedInMailService;
     Timer                                       aRemoveTimer;
 
-
     SwSendMailDialog_Impl() :
         nCurrentDescriptor(0),
         nDocumentCount(0)
@@ -307,7 +306,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
     m_aStopPB.SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl));
     m_aClosePB.SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl));
 
-
     Size aLBSize(m_aStatusLB.GetSizePixel());
     m_aStatusHB.SetSizePixel(aLBSize);
     Size aHeadSize(m_aStatusHB.CalcWindowSizePixel());
@@ -665,5 +663,4 @@ void SwSendMailDialog::AllMailsSent()
     m_aStopPB.Enable(false);
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx
index c25d09ce3c4b..26e60f2537f4 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -49,7 +49,6 @@ using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 
-
 namespace SwMailMergeHelper
 {
 
@@ -167,7 +166,6 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer(
     return xSmtpServer;
 }
 
-
 } //namespace
 
 SwBoldFixedInfo::SwBoldFixedInfo(Window* pParent, const ResId& rResId) :
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 25880d41e879..cd3cb79f4c0d 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1367,7 +1367,6 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
     }
 }
 
-
 // Insert the new entry in front of the entry at the beginning of the selection
 void AddressMultiLineEdit::InsertNewEntry( const OUString& rStr )
 {
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 4451bae26997..e46c1203d2e3 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -296,5 +296,4 @@ public:
 };
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 05fa5155ae9a..ad8a2393adec 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -149,7 +149,6 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
     sal_Bool                                bIsGreetingLineInMail_LastUserSetting;
     sal_Bool                                bIsGreetingLine_LastUserSetting;
 
-
     const Sequence< OUString>&       GetPropertyNames();
 
 public:
@@ -503,7 +502,7 @@ void  SwMailMergeConfigItem_Impl::Commit()
     {
         switch(nProp)
         {
-            case 0: pValues[nProp] <<= bIsOutputToLetter; break;//
+            case 0: pValues[nProp] <<= bIsOutputToLetter; break;
             case 1: pValues[nProp] <<= bIncludeCountry; break;
             case 2: pValues[nProp] <<= sExcludeCountry; break;
             case 3: pValues[nProp] <<= GetAddressBlocks(sal_True); break;
@@ -1239,7 +1238,6 @@ Sequence< OUString> SwMailMergeConfigItem::GetColumnAssignment(
     return aRet;
 }
 
-
 // returns the name that is assigned as e-mail column of the current data base
 OUString     SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const
 {
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index f869b14bfa5f..feed6f6aeb04 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -145,7 +145,6 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton)
                     xFltMgr->setCurrentFilter( pFlt->GetUIName() ) ;
             }
 
-
             pFlt = aIter.Next();
         }
 
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index 41c0df0f9c98..88381a2429b5 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -57,5 +57,4 @@ public:
 
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 5b2752825c5d..037da8c6e999 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -302,7 +302,6 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent)
     m_aPrevSetIB.SetClickHdl(aDataLink);
     m_aNextSetIB.SetClickHdl(aDataLink);
 
-
     SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
     m_aGreetingLineCB.Check(rConfig.IsGreetingLine(sal_False));
     m_aPersonalizedCB.Check(rConfig.IsIndividualGreeting(sal_False));
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index f5216a8a86b7..93d3abdf0a9d 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -158,5 +158,4 @@ public:
 };
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 71df56b64526..3dd2016cf303 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -334,7 +334,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
         const OUString* pAssignment = aAssignment.getConstArray();
         if(aAssignment.getLength() > MM_PART_COUNTRY && !aAssignment[MM_PART_COUNTRY].isEmpty())
             sCountryColumn = aAssignment[MM_PART_COUNTRY];
-        //
+
         OUString sHideParagraphsExpression;
         SwAddressIterator aIter(aBlocks[0]);
         while(aIter.HasMore())
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 3ff1f0d3d21c..10c772eb81c2 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -98,5 +98,4 @@ public:
 
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx
index 3c6e9b6c6e06..d9624e862f2e 100644
--- a/sw/source/ui/dbui/mmmergepage.hxx
+++ b/sw/source/ui/dbui/mmmergepage.hxx
@@ -55,8 +55,6 @@ public:
 
 };
 
-
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index b18aa7a0473c..8a5c7756e035 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -110,7 +110,6 @@ class SwMailMergeOutputPage : public svt::OWizardPage
     OUString        m_sCC;
     OUString        m_sBCC;
 
-
     DECL_LINK(OutputTypeHdl_Impl, RadioButton*);
     DECL_LINK(CopyToHdl_Impl, PushButton*);
     DECL_LINK(SaveStartHdl_Impl, PushButton* );
@@ -142,7 +141,6 @@ struct SwMailDescriptor
     OUString                             sBodyMimeType;
     OUString                             sBodyContent;
 
-
     OUString                             sCC;
     OUString                             sBCC;
 };
@@ -221,5 +219,4 @@ public:
 };
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 2265b3b19054..aae6621816c0 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -58,5 +58,4 @@ IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl)
     return 0;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 75f7077109d9..218d158c4422 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <swabstdlg.hxx>
 
-
 #include <mmpreparemergepage.hrc>
 
 #include <unomid.h>
diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx
index 4a89e6c04f7c..34b7c8ce2873 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.hxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.hxx
@@ -44,7 +44,6 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage
     FixedInfo       m_aEditFI;
     PushButton      m_aEditPB;
 
-
     SwMailMergeWizard*  m_pWizard;
 
     DECL_LINK(EditDocumentHdl_Impl, void *);
@@ -62,5 +61,4 @@ public:
 
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx
index 3f513397769b..9fdc6a3ce930 100644
--- a/sw/source/ui/dbui/swdbtoolsclient.cxx
+++ b/sw/source/ui/dbui/swdbtoolsclient.cxx
@@ -34,9 +34,8 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdb;
 
-//====================================================================
 //= SwDbtoolsClient
-//====================================================================
+
 namespace
 {