summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 21:01:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-27 09:41:00 -0600
commita27462189d1d6a3d22be23a5eee603edca5d8ea3 (patch)
tree065df066de07f3d7194178352f3449702bc34bd5 /sw/source/ui/shells
parent150420cbff39967e9376cab05b6af45b642edae8 (diff)
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>
Diffstat (limited to 'sw/source/ui/shells')
-rw-r--r--sw/source/ui/shells/annotsh.cxx4
-rw-r--r--sw/source/ui/shells/basesh.cxx7
-rw-r--r--sw/source/ui/shells/drawdlg.cxx1
-rw-r--r--sw/source/ui/shells/drformsh.cxx4
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx1
-rw-r--r--sw/source/ui/shells/langhelper.cxx4
-rw-r--r--sw/source/ui/shells/listsh.cxx1
-rw-r--r--sw/source/ui/shells/navsh.cxx1
-rw-r--r--sw/source/ui/shells/olesh.cxx3
-rw-r--r--sw/source/ui/shells/slotadd.cxx3
-rw-r--r--sw/source/ui/shells/tabsh.cxx3
-rw-r--r--sw/source/ui/shells/textdrw.cxx2
-rw-r--r--sw/source/ui/shells/textfld.cxx1
-rw-r--r--sw/source/ui/shells/textidx.cxx2
-rw-r--r--sw/source/ui/shells/textsh1.cxx2
-rw-r--r--sw/source/ui/shells/txtattr.cxx7
-rw-r--r--sw/source/ui/shells/txtnum.cxx1
18 files changed, 2 insertions, 47 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 3247ce98972c..d1e69591744f 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <com/sun/star/i18n/TransliterationModules.hpp>
@@ -519,14 +518,12 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
aDlgAttr.Put(aEditAttr);
-
aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) );
aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
aDlgAttr.Put( SvxFmtSplitItem( true, RES_PARATR_SPLIT ) );
aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
-
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
@@ -1069,7 +1066,6 @@ void SwAnnotationShell::StateInsert(SfxItemSet &rSet)
}
}
-
void SwAnnotationShell::NoteExec(SfxRequest &rReq)
{
SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 7ce08aa87c2a..797f9dee8749 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sot/factory.hxx>
#include <hintids.hxx>
#include <svl/urihelper.hxx>
@@ -137,7 +136,6 @@ static sal_uInt8 nFooterPos;
SvxIMapDlgChildWindow::GetChildWindowId() )-> \
GetWindow() ) )
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
@@ -1818,9 +1816,9 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
break;
case FN_WRAP_ANCHOR_ONLY:
aWrap.SetAnchorOnly(!aWrap.IsAnchorOnly());
- //
+
// keep previous wrapping
- //
+
// switch to wrap SURROUND_PARALLEL, if previous wrap is SURROUND_NONE
if ( nOldSurround != SURROUND_NONE )
{
@@ -2451,7 +2449,6 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
-
// Table cell(s) selected?
if ( rSh.IsTableMode() )
{
diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx
index 9553699b83e1..9ba12d925938 100644
--- a/sw/source/ui/shells/drawdlg.cxx
+++ b/sw/source/ui/shells/drawdlg.cxx
@@ -160,7 +160,6 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
break;
}
-
if (pDoc->IsChanged())
GetShell().SetModified();
else
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx
index 49612e5458ed..117db5a8c69e 100644
--- a/sw/source/ui/shells/drformsh.cxx
+++ b/sw/source/ui/shells/drformsh.cxx
@@ -55,7 +55,6 @@
#include <unomid.h>
-
using namespace ::com::sun::star;
SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM))
@@ -64,10 +63,8 @@ SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFO
SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
}
-
TYPEINIT1(SwDrawFormShell, SwDrawBaseShell)
-
void SwDrawFormShell::Execute(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -142,7 +139,6 @@ void SwDrawFormShell::Execute(SfxRequest &rReq)
xPropSet->setPropertyValue( "TargetFrame", aTmp );
}
-
form::FormButtonType eButtonType = form::FormButtonType_URL;
aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0));
xPropSet->setPropertyValue( "ButtonType", aTmp );
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 30d88e9b7c81..24abc785cf6e 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp>
#include <comphelper/processfactory.hxx>
@@ -994,7 +993,6 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
const bool bCopy = (aSel.nStartPara != aSel.nEndPara) ||
(aSel.nStartPos != aSel.nEndPos);
-
SfxWhichIter aIter(rSet);
sal_uInt16 nWhich = aIter.FirstWhich();
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 4b7ddb2db810..350c4f62c06a 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <i18nlangtag/lang.h>
#include <svl/slstitm.hxx>
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx
index f28c80e13457..8342502e12ae 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <vcl/window.hxx>
@@ -229,7 +228,6 @@ namespace SwLangHelper
return bRestoreSelection;
}
-
void SetLanguage( SwWrtShell &rWrtSh, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet )
{
SetLanguage( rWrtSh, 0 , ESelection(), rLangText, bIsForSelection, rCoreSet );
@@ -406,7 +404,6 @@ namespace SwLangHelper
}
}
-
/// @returns : the language for the selected text that is set for the
/// specified attribute (script type).
/// If there are more than one languages used LANGUAGE_DONTKNOW will be returned.
@@ -588,7 +585,6 @@ namespace SwLangHelper
return aText;
}
-
void SelectPara( EditView &rEditView, const ESelection &rCurSel )
{
ESelection aParaSel( rCurSel.nStartPara, 0, rCurSel.nStartPara, EE_TEXTPOS_ALL );
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index 8f2935489dc6..ae32351c3db8 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -57,7 +57,6 @@ SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST))
SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX));
}
-
TYPEINIT1(SwListShell,SwBaseShell)
// #i35572# Functionality of Numbering/Bullet toolbar
diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx
index 012d919b8d20..c5a9199daa32 100644
--- a/sw/source/ui/shells/navsh.cxx
+++ b/sw/source/ui/shells/navsh.cxx
@@ -29,7 +29,6 @@
#include <unomid.h>
#include "navmgr.hxx"
-
SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell, SW_RES(STR_SHELLNAME_NAVIGATION))
{
}
diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx
index b4f32cec4a81..6014c2fd725a 100644
--- a/sw/source/ui/shells/olesh.cxx
+++ b/sw/source/ui/shells/olesh.cxx
@@ -33,19 +33,16 @@
#include <popup.hrc>
#include <shells.hrc>
-
#define SwOleShell
#include <sfx2/msg.hxx>
#include <swslots.hxx>
-
SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell, SW_RES(STR_SHELLNAME_OBJECT))
{
SFX_POPUPMENU_REGISTRATION(SW_RES(MN_OLE_POPUPMENU));
SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_OLE_TOOLBOX));
}
-
SwOleShell::SwOleShell(SwView &_rView) :
SwFrameShell(_rView)
diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx
index 1fdb41990d25..ed66709a37e5 100644
--- a/sw/source/ui/shells/slotadd.cxx
+++ b/sw/source/ui/shells/slotadd.cxx
@@ -99,7 +99,6 @@
#include <svx/xftshxy.hxx>
#include <svx/grafctrl.hxx>
-
#include <fmtornt.hxx>
#include <paratr.hxx>
#include <fmtinfmt.hxx>
@@ -137,6 +136,4 @@
#include <sfx2/msg.hxx>
#include "swslots.hxx"
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 53b2d3a28ef6..5b60dafb9d50 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -384,14 +384,12 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
if(eOrient != text::HoriOrientation::NONE)
((SfxItemSet&)rSet).ClearItem( SID_ATTR_LRSPACE );
-
if(pRep->HasColsChanged())
{
bTabCols = true;
}
}
-
if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem))
rSh.SetRowsToRepeat( ((SfxUInt16Item*)pItem)->GetValue() );
@@ -497,7 +495,6 @@ void SwTableShell::Execute(SfxRequest &rReq)
aInfo.SetTable( true );
aInfo.SetValid( VALID_DISABLE, false );
-
// The attributes of all lines will be read and the strongest wins.
const SvxBorderLine* pBorderLine;
SvxBorderLine aBorderLine;
diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx
index 394855361d36..fcc12affcb9c 100644
--- a/sw/source/ui/shells/textdrw.cxx
+++ b/sw/source/ui/shells/textdrw.cxx
@@ -79,7 +79,6 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget,
uno::Reference< beans::XPropertySet > xPropSet(xControlModel, uno::UNO_QUERY);
-
uno::Any aTmp;
aTmp <<= OUString(rTxt);
@@ -99,7 +98,6 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget,
xPropSet->setPropertyValue( "TargetFrame", aTmp );
}
-
form::FormButtonType eButtonType = form::FormButtonType_URL;
aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0));
xPropSet->setPropertyValue( "ButtonType", aTmp );
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 2c3c5e8734b3..5b336ff25aee 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <crsskip.hxx>
#include <hintids.hxx>
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index 2b8b4197bf57..05d9fc295c67 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
@@ -235,7 +234,6 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
rSet.Put(SfxBoolItem(FN_INSERT_IDX_ENTRY_DLG,
0 != pIdxMrk));
-
SwField* pField = rSh.GetCurFld();
if(bInReadonly)
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 20107080d00d..7cbe020572f3 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1568,7 +1568,6 @@ void SwTextShell::GetState( SfxItemSet &rSet )
}
break;
-
case FN_INSERT_BREAK:
if ( rSh.HasReadonlySel()
&& !rSh.CrsrInsideInputFld() )
@@ -1577,7 +1576,6 @@ void SwTextShell::GetState( SfxItemSet &rSet )
}
break;
-
case FN_INSERT_BREAK_DLG:
case FN_INSERT_COLUMN_BREAK:
case FN_INSERT_PAGEBREAK:
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 0c1df19d6d21..47d7e9312acb 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -58,9 +58,6 @@
const sal_uInt32 nFontInc = 40; // 2pt
const sal_uInt32 nFontMaxSz = 19998; // 999.9pt
-
-
-
void SwTextShell::ExecCharAttr(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
@@ -76,7 +73,6 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
Get( nWhich )).GetValue() ? STATE_ON : STATE_OFF;
}
-
SfxItemSet aSet( GetPool(), RES_CHRATR_BEGIN, RES_CHRATR_END-1 );
if (STATE_TOGGLE == eState)
rSh.GetCurAttr( aSet );
@@ -168,7 +164,6 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
}
}
-
void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
{
sal_uInt16 nSlot = rReq.GetSlot();
@@ -492,8 +487,6 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
}
}
-
-
void SwTextShell::GetAttrState(SfxItemSet &rSet)
{
SwWrtShell &rSh = GetShell();
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index 551814569ad1..bffbfc2c3583 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -293,7 +293,6 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq)
}
}
-
switch(rReq.GetSlot())
{
case FN_SVX_SET_NUMBER: