summaryrefslogtreecommitdiff
path: root/sw/source/ui/uiview
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/uiview')
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx2
-rw-r--r--sw/source/ui/uiview/pview.cxx2
-rw-r--r--sw/source/ui/uiview/scroll.cxx3
-rw-r--r--sw/source/ui/uiview/srcview.cxx7
-rw-r--r--sw/source/ui/uiview/uivwimp.cxx2
-rw-r--r--sw/source/ui/uiview/view.cxx2
-rw-r--r--sw/source/ui/uiview/view0.cxx2
-rw-r--r--sw/source/ui/uiview/view1.cxx1
-rw-r--r--sw/source/ui/uiview/view2.cxx7
-rw-r--r--sw/source/ui/uiview/viewcoll.cxx3
-rw-r--r--sw/source/ui/uiview/viewdlg2.cxx1
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx1
-rw-r--r--sw/source/ui/uiview/viewfunc.hxx1
-rw-r--r--sw/source/ui/uiview/viewling.cxx3
-rw-r--r--sw/source/ui/uiview/viewmdi.cxx1
-rw-r--r--sw/source/ui/uiview/viewport.cxx5
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx7
-rw-r--r--sw/source/ui/uiview/viewstat.cxx1
-rw-r--r--sw/source/ui/uiview/viewtab.cxx1
19 files changed, 6 insertions, 46 deletions
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx
index 1ac159852224..b6dd3f5167c6 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -17,10 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "formatclipboard.hxx"
-
#include <svx/svxids.hrc>
#include <cmdid.h>
#include <charfmt.hxx>
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index e2dd9dbfa500..50aa5e1bd92a 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sfx2/objface.hxx>
#include <vcl/timer.hxx>
#include <vcl/field.hxx>
@@ -1105,7 +1104,6 @@ void SwPagePreview::Init(const SwViewOption * pPrefs)
SwEditShell* pESh = (SwEditShell*)GetViewShell();
sal_Bool bIsModified = pESh->IsModified();
-
SwViewOption aOpt( *pPrefs );
aOpt.SetPagePreview(sal_True);
aOpt.SetTab( sal_False );
diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx
index 176ba6f18965..92ba2e43060a 100644
--- a/sw/source/ui/uiview/scroll.cxx
+++ b/sw/source/ui/uiview/scroll.cxx
@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "swtypes.hxx"
#include "swrect.hxx"
#include "scroll.hxx"
#define SCROLL_LINE_SIZE 250
-
SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) :
ScrollBar( pWin,
WinBits( WB_3DLOOK | WB_HIDE | ( bHoriz ? WB_HSCROLL : WB_VSCROLL) ) ),
@@ -38,7 +36,6 @@ SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) :
EnableRTL( false );
}
-
SwScrollbar::~SwScrollbar() {}
// Will be called after a change of the document size
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index a2b0660e8780..c31d1111c41d 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <com/sun/star/util/SearchOptions.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
@@ -96,7 +95,6 @@ using namespace ::com::sun::star::ui::dialogs;
using namespace ::sfx2;
using ::com::sun::star::util::SearchOptions;
-
#define SWSRCVIEWFLAGS ( SFX_VIEW_CAN_PRINT|\
SFX_VIEW_NO_NEWWINDOW )
@@ -153,7 +151,6 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1
Point( nXLeft, nYTop ),
Size( nXRight-nXLeft, aSz.Height() - nYTop - BMARGPRN + nBorder ) ) );
-
long nY = TMARGPRN-2*nBorder;
Point aPos( nLeftMargin, nY );
rOutDev.DrawText( aPos, rTitle );
@@ -170,7 +167,6 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1
rOutDev.DrawText( aPos, aPageStr );
}
-
nY = TMARGPRN-nBorder;
rOutDev.DrawLine( Point( nXLeft, nY ), Point( nXRight, nY ) );
@@ -626,7 +622,6 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
bNotFoundMessage = true;
}
-
if(!bApi)
{
if(bNotFoundMessage)
@@ -857,7 +852,6 @@ void SwSrcView::Load(SwDocShell* pDocShell)
pInStream->Seek(0);
pInStream->SetStreamCharSet( eDestEnc );
-
aEditWin.Read(*pInStream);
}
}
@@ -876,5 +870,4 @@ void SwSrcView::Load(SwDocShell* pDocShell)
aEditWin.GetOutWin()->GrabFocus();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index 3c0f75f0447d..6c6c1911d74e 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <cmdid.h>
#include "globals.hrc"
@@ -303,5 +302,4 @@ void SwClipboardChangeListener::AddRemoveListener( sal_Bool bAdd )
pView->AddRemoveClipboardListener( Reference< XClipboardListener >( this ), bAdd );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 23c6b18d8c1a..868ae5d5e18b 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -224,10 +224,8 @@ IMPL_LINK_NOARG(SwView, FormControlActivated)
void SwView::SelectShell()
{
-
// Attention: Maintain the SelectShell for the WebView additionally
-
if(m_bInDtor)
return;
// Decision if the UpdateTable has to be called
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index aa10ea327808..5363d04bebf9 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "hintids.hxx"
#include <vcl/graph.hxx>
#include <svx/galbrws.hxx>
@@ -436,7 +435,6 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
pOpt->SetSmoothScroll( bFlag );
break;
-
case FN_VLINEAL:
if( STATE_TOGGLE == eState )
bFlag = !pOpt->IsViewVRuler();
diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx
index b7eb3654678d..40e001c6fa4f 100644
--- a/sw/source/ui/uiview/view1.cxx
+++ b/sw/source/ui/uiview/view1.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svx/svdpagv.hxx>
#include <svx/svdview.hxx>
#include <svx/ruler.hxx>
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 58a25d8d8ff7..9133455ca429 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -315,7 +315,7 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
}
// pool formats
- //
+
const ::std::vector<OUString>& rFrmPoolArr(
SwStyleNameMapper::GetFrmFmtUINameArray());
for( i = 0; i < rFrmPoolArr.size(); ++i )
@@ -690,7 +690,7 @@ void SwView::Execute(SfxRequest &rReq)
// FN_REDLINE_PREV_CHANGE leaves the selection point at the start of the redline.
// In such cases, SelNextRedline (which starts searching from the selection point)
// immediately finds the current redline and advances the selection point to its end.
- //
+
// This behavior means that PREV_CHANGE followed by NEXT_CHANGE would not change
// the current redline, so we detect it and select the next redline again.
if (pCurrent && pCurrent == pNext)
@@ -713,7 +713,7 @@ void SwView::Execute(SfxRequest &rReq)
// In such cases, SelPrevRedline (which starts searching from the selection point)
// immediately finds the current redline and advances the selection point to its
// start.
- //
+
// This behavior means that NEXT_CHANGE followed by PREV_CHANGE would not change
// the current redline, so we detect it and move to the previous redline again.
if (initialCursorStart == *pPrev->Start())
@@ -1232,7 +1232,6 @@ void SwView::Execute(SfxRequest &rReq)
}
break;
-
default:
OSL_ENSURE(!this, "wrong dispatcher");
return;
diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx
index be4cbf3b2b2e..1c87105ba737 100644
--- a/sw/source/ui/uiview/viewcoll.cxx
+++ b/sw/source/ui/uiview/viewcoll.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "cmdid.h"
#include "uiitems.hxx"
#include <vcl/window.hxx>
@@ -78,6 +77,4 @@ void SwView::ExecColl(SfxRequest &rReq)
}
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx
index b029a9bcef61..af466021ead5 100644
--- a/sw/source/ui/uiview/viewdlg2.cxx
+++ b/sw/source/ui/uiview/viewdlg2.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index b0aa5335ecda..0e9849c797c4 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "hintids.hxx"
#include <svl/aeitem.hxx>
#include <svl/itempool.hxx>
diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx
index e2eb9c32c396..6036509db172 100644
--- a/sw/source/ui/uiview/viewfunc.hxx
+++ b/sw/source/ui/uiview/viewfunc.hxx
@@ -48,7 +48,6 @@ void ViewResizePixel( const Window &rRef,
SvxRuler* pHRuler = 0,
sal_Bool bVRulerRight = sal_False );
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index da993813e2d4..45b2f12d5fb9 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -447,7 +447,6 @@ void SwView::HyphenateDocument()
Reference< XLinguProperties > xProp( ::GetLinguPropertySet() );
-
m_pWrtShell->StartUndo(UNDO_INSATTR); // valid later
sal_Bool bHyphSpecial = xProp.is() ? xProp->getIsHyphSpecial() : sal_False;
@@ -735,7 +734,6 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
uno::Sequence< beans::PropertyValue > aArgs;
xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
-
if (xDispatch.is())
{
// Execute dispatch asynchronously
@@ -777,7 +775,6 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt )
m_pWrtShell->LockView( sal_True );
m_pWrtShell->Push();
-
// get word that was clicked on
// This data structure maps a smart tag type string to the property bag
SwRect aToFill;
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 57c62941973f..4ff2f9443fea 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string>
#include "hintids.hxx"
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index e428ac7173a7..119e03e05d91 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -163,7 +163,6 @@ void SwView::DocSzChgd(const Size &rSz)
extern int bDocSzUpdated;
-
m_aDocSz = rSz;
if( !m_pWrtShell || m_aVisArea.IsEmpty() ) // no shell -> no change
@@ -340,9 +339,9 @@ void SwView::CheckVisArea()
}
/// Calculate the visible range.
-//
+
// OUT Point *pPt: new position of the visible area
-//
+
// IN Rectangle &rRect: Rectangle, which should be located
// within the new visible area.
// sal_uInt16 nRange optional accurate indication of the
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index d51956b4e98e..5a1e30fd6d69 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string>
#include <boost/scoped_ptr.hpp>
@@ -438,7 +437,6 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
}
}
-
sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
{
SwSearchOptions aOpts( m_pWrtShell, m_pSrchItem->GetBackward() );
@@ -533,7 +531,6 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
return m_bFound;
}
-
sal_Bool SwView::SearchAll(sal_uInt16* pFound)
{
SwWait aWait( *GetDocShell(), true );
@@ -561,7 +558,6 @@ sal_Bool SwView::SearchAll(sal_uInt16* pFound)
return m_bFound;
}
-
void SwView::Replace()
{
SwWait aWait( *GetDocShell(), true );
@@ -716,9 +712,8 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions )
DELETEZ( pReplSet ); // the attributes
}
- //
// build SearchOptions to be used
- //
+
SearchOptions aSearchOpt( m_pSrchItem->GetSearchOptions() );
aSearchOpt.Locale = GetAppLanguageTag().getLocale();
if( !bDoReplace )
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index e32db0bb3049..6314f4784007 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <com/sun/star/linguistic2/XThesaurus.hpp>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 18893ed2d300..e0bc61098195 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -1839,7 +1839,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
// Right is only the margin now.
aRectangle.Right() = 0;
-
}
}
else if ( ((nFrmType & FRMTYPE_TABLE) || IsTabColFromDoc()) &&