[Libreoffice-commits] core.git: sw/source
Philipp Riemer
ruderphilipp at gmail.com
Sat Sep 7 15:16:58 PDT 2013
sw/source/core/access/acccell.cxx | 1
sw/source/core/access/acccell.hxx | 4 -
sw/source/core/access/acccontext.cxx | 9 ----
sw/source/core/access/acccontext.hxx | 11 -----
sw/source/core/access/accdoc.cxx | 8 ---
sw/source/core/access/accdoc.hxx | 9 ----
sw/source/core/access/accembedded.hxx | 6 --
sw/source/core/access/accfootnote.hxx | 7 ---
sw/source/core/access/accframe.hxx | 4 -
sw/source/core/access/accframebase.cxx | 2
sw/source/core/access/accframebase.hxx | 6 --
sw/source/core/access/accfrmobj.cxx | 2
sw/source/core/access/accfrmobj.hxx | 2
sw/source/core/access/accfrmobjmap.cxx | 1
sw/source/core/access/accfrmobjmap.hxx | 5 --
sw/source/core/access/accfrmobjslist.cxx | 1
sw/source/core/access/accfrmobjslist.hxx | 4 -
sw/source/core/access/accgraphic.hxx | 6 --
sw/source/core/access/accheaderfooter.hxx | 7 ---
sw/source/core/access/acchyperlink.cxx | 1
sw/source/core/access/acchyperlink.hxx | 3 -
sw/source/core/access/acchypertextdata.hxx | 3 -
sw/source/core/access/accmap.cxx | 9 ----
sw/source/core/access/accnotextframe.cxx | 1
sw/source/core/access/accnotextframe.hxx | 5 --
sw/source/core/access/accpage.cxx | 1
sw/source/core/access/accpage.hxx | 3 -
sw/source/core/access/accpara.cxx | 3 -
sw/source/core/access/accportions.cxx | 2
sw/source/core/access/accportions.hxx | 5 --
sw/source/core/access/accpreview.cxx | 1
sw/source/core/access/accpreview.hxx | 4 -
sw/source/core/access/accselectionhelper.cxx | 1
sw/source/core/access/accselectionhelper.hxx | 7 +--
sw/source/core/access/acctable.cxx | 6 --
sw/source/core/access/acctable.hxx | 6 --
sw/source/core/access/acctextframe.cxx | 5 --
sw/source/core/access/acctextframe.hxx | 8 ---
sw/source/core/access/parachangetrackinginfo.cxx | 2
sw/source/core/access/parachangetrackinginfo.hxx | 1
sw/source/core/access/textmarkuphelper.cxx | 3 -
sw/source/core/attr/calbck.cxx | 2
sw/source/core/attr/hints.cxx | 1
sw/source/core/bastyp/init.cxx | 2
sw/source/core/bastyp/swcache.cxx | 1
sw/source/core/bastyp/swrect.cxx | 1
sw/source/core/bastyp/tabcol.cxx | 1
sw/source/core/crsr/BlockCursor.cxx | 1
sw/source/core/crsr/IBlockCursor.hxx | 1
sw/source/core/crsr/bookmrk.cxx | 2
sw/source/core/crsr/callnk.cxx | 2
sw/source/core/crsr/callnk.hxx | 3 -
sw/source/core/crsr/crbm.cxx | 1
sw/source/core/crsr/crossrefbookmark.cxx | 1
sw/source/core/crsr/crsrsh.cxx | 47 -----------------------
sw/source/core/crsr/crstrvl.cxx | 10 ----
sw/source/core/crsr/crstrvl1.cxx | 1
sw/source/core/crsr/findattr.cxx | 19 ---------
sw/source/core/crsr/findcoll.cxx | 5 --
sw/source/core/crsr/findfmt.cxx | 2
sw/source/core/crsr/findtxt.cxx | 4 -
sw/source/core/crsr/pam.cxx | 34 ----------------
sw/source/core/crsr/paminit.cxx | 1
sw/source/core/crsr/swcrsr.cxx | 18 --------
sw/source/core/crsr/trvlcol.cxx | 10 ----
sw/source/core/crsr/trvlfnfl.cxx | 4 -
sw/source/core/crsr/trvlreg.cxx | 10 ----
sw/source/core/crsr/trvltbl.cxx | 15 -------
sw/source/core/crsr/unocrsr.cxx | 3 -
sw/source/core/crsr/viscrs.cxx | 20 ---------
70 files changed, 42 insertions(+), 355 deletions(-)
New commits:
commit 314924a2047d2642b2e5163cc5b12074b1763df4
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Wed Mar 20 18:29:12 2013 +0100
remove/add blank lines in sw/source/core
Change-Id: I4d0aa521fc4c24f954d2636aa68e968456a829e7
Reviewed-on: https://gerrit.libreoffice.org/2879
Reviewed-by: Philipp Riemer <ruderphilipp at gmail.com>
Tested-by: Philipp Riemer <ruderphilipp at gmail.com>
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 5cd3ba1..734abda 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -256,7 +256,6 @@ void SwAccessibleCell::InvalidatePosOrSize( const SwRect& rOldBox )
SwAccessibleContext::InvalidatePosOrSize( rOldBox );
}
-
// XAccessibleInterface
uno::Any SwAccessibleCell::queryInterface( const uno::Type& rType )
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 88e2f49..74ae197 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCCELL_HXX
#define _ACCCELL_HXX
@@ -37,7 +38,6 @@ class SwAccessibleCell : public SwAccessibleContext,
sal_Bool _InvalidateChildrenCursorPos( const SwFrm *pFrm );
protected:
-
// Set states for getAccessibleStateSet.
// This drived class additionaly sets SELECTABLE(1) and SELECTED(+)
virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
@@ -47,7 +47,6 @@ protected:
virtual ~SwAccessibleCell();
public:
-
SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrm *pCellFrm );
virtual sal_Bool HasCursor(); // required by map to remember that object
@@ -121,7 +120,6 @@ public:
throw (::com::sun::star::uno::RuntimeException);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 8753289..e664fbf 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -121,7 +121,6 @@ const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const
return pCrsrShell;
}
-
enum Action { NONE, SCROLLED, SCROLLED_WITHIN,
SCROLLED_IN, SCROLLED_OUT };
@@ -791,7 +790,6 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint
return xAcc;
}
-
/**
Get bounding box.
@@ -854,7 +852,6 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative)
return aBox;
}
-
awt::Rectangle SAL_CALL SwAccessibleContext::getBounds()
throw (uno::RuntimeException)
{
@@ -870,8 +867,6 @@ awt::Point SAL_CALL SwAccessibleContext::getLocation()
return aPoint;
}
-
-
awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen()
throw (uno::RuntimeException)
{
@@ -886,7 +881,6 @@ awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen()
return aPoint;
}
-
awt::Size SAL_CALL SwAccessibleContext::getSize()
throw (uno::RuntimeException)
{
@@ -937,7 +931,6 @@ void SAL_CALL SwAccessibleContext::grabFocus()
}
}
-
uno::Any SAL_CALL SwAccessibleContext::getAccessibleKeyBinding()
throw (uno::RuntimeException)
{
@@ -957,7 +950,6 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground()
return 0xffffff;
}
-
OUString SAL_CALL SwAccessibleContext::getImplementationName()
throw( uno::RuntimeException )
{
@@ -1443,6 +1435,7 @@ bool SwAccessibleContext::HasAdditionalAccessibleChildren()
return bRet;
}
+
/** #i88070# - get additional accessible child by index */
Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32 nIndex )
{
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 95798fc..ff6c849 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -16,8 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCBASE_HXX
#define _ACCBASE_HXX
+
#include <accframe.hxx>
#include <accmap.hxx>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
@@ -56,14 +58,11 @@ class SwAccessibleContext :
// GetMap, GetChild, GetParent, and GetFrm.
friend class SwAccessibleSelectionHelper;
-
protected:
-
mutable ::osl::Mutex aListenerMutex;
mutable ::osl::Mutex aMutex;
private:
-
OUString sName; // immutable outside constructor
// The parent if it has been retrieved. This is always an
@@ -162,11 +161,9 @@ protected:
virtual void _InvalidateFocus();
public:
-
void FireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventObject& rEvent );
protected:
-
// broadcast visual data event
void FireVisibleDataEvent();
@@ -194,7 +191,6 @@ protected:
virtual ~SwAccessibleContext();
public:
-
SwAccessibleContext( SwAccessibleMap *pMap, sal_Int16 nRole,
const SwFrm *pFrm );
@@ -302,7 +298,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground()
throw (::com::sun::star::uno::RuntimeException);
-
// XServiceInfo
/** Returns an identifier for the implementation of this object. */
@@ -380,8 +375,6 @@ public:
static OUString GetResource( sal_uInt16 nResId,
const OUString *pArg1 = 0,
const OUString *pArg2 = 0 );
-
-
};
// some heaviliy used exception support
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 746146b..a792739 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -20,7 +20,6 @@
#include <vcl/window.hxx>
#include <rootfrm.hxx>
-
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -40,7 +39,6 @@
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentView";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentView";
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -145,7 +143,6 @@ uno::Reference< XAccessible> SAL_CALL
return SwAccessibleContext::getAccessibleChild( nIndex );
}
-
uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessibleParent (void)
throw (uno::RuntimeException)
{
@@ -191,7 +188,6 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds()
return aBox;
}
-
awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
throw (uno::RuntimeException)
{
@@ -207,7 +203,6 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
return aLoc;
}
-
::com::sun::star::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen()
throw (uno::RuntimeException)
{
@@ -223,7 +218,6 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
return aLoc;
}
-
::com::sun::star::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize()
throw (uno::RuntimeException)
{
@@ -288,7 +282,6 @@ void SwAccessibleDocument::GetStates(
rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
}
-
SwAccessibleDocument::SwAccessibleDocument ( SwAccessibleMap* pInitMap ) :
SwAccessibleDocumentBase( pInitMap ),
maSelectionHelper( *this )
@@ -367,7 +360,6 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve
return 0;
}
-
OUString SAL_CALL SwAccessibleDocument::getImplementationName()
throw( uno::RuntimeException )
{
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index ed2b160..fe73a90 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -16,8 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCDOC_HXX
#define _ACCDOC_HXX
+
#include "acccontext.hxx"
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <accselectionhelper.hxx>
@@ -26,7 +28,6 @@ class VclSimpleEvent;
// base class for SwAccessibleDocument (in this same header file) and
// SwAccessiblePreview
-
class SwAccessibleDocumentBase : public SwAccessibleContext
{
::com::sun::star::uno::Reference<
@@ -37,11 +38,9 @@ class SwAccessibleDocumentBase : public SwAccessibleContext
using SwAccessibleFrame::SetVisArea;
protected:
-
virtual ~SwAccessibleDocumentBase();
public:
-
SwAccessibleDocumentBase( SwAccessibleMap* pInitMap );
void SetVisArea();
@@ -98,8 +97,6 @@ public:
throw (::com::sun::star::uno::RuntimeException);
};
-
-
/**
* access to an accessible Writer document
*/
@@ -110,7 +107,6 @@ class SwAccessibleDocument : public SwAccessibleDocumentBase,
SwAccessibleSelectionHelper maSelectionHelper;
protected:
-
// Set states for getAccessibleStateSet.
// This drived class additinaly sets MULTISELECTABLE(1)
virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
@@ -118,7 +114,6 @@ protected:
virtual ~SwAccessibleDocument();
public:
-
SwAccessibleDocument( SwAccessibleMap* pInitMap );
DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index 5341a4e..a301f85 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -16,19 +16,18 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCEMBEDDED_HXX
#define _ACCEMBEDDED_HXX
+
#include "accnotextframe.hxx"
class SwAccessibleEmbeddedObject : public SwAccessibleNoTextFrame
{
-
protected:
-
virtual ~SwAccessibleEmbeddedObject();
public:
-
SwAccessibleEmbeddedObject( SwAccessibleMap* pInitMap,
const SwFlyFrm* pFlyFrm );
@@ -54,7 +53,6 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index 316ce6d..ae0256d 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCFOOTNOTE_HXX
#define _ACCFOOTNOTE_HXX
#include <sal/types.h>
-
#include <acccontext.hxx>
class SwAccessibleMap;
@@ -28,19 +28,15 @@ class SwFtnFrm;
class SwAccessibleFootnote : public SwAccessibleContext
{
-
protected:
-
virtual ~SwAccessibleFootnote();
public:
-
SwAccessibleFootnote( SwAccessibleMap* pInitMap,
sal_Bool bIsEndnote,
sal_Int32 nFootEndNote,
const SwFtnFrm *pFtnFrm );
-
// XAccessibleContext
/// Return this object's description.
@@ -72,7 +68,6 @@ public:
static sal_Bool IsEndnote( const SwFtnFrm *pFrm );
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx
index d3b83fa..77093d1 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCFRAME_HXX
#define _ACCFRAME_HXX
@@ -75,7 +76,6 @@ private:
sal_Bool bInPagePreview );
protected:
-
sal_Bool IsEditable( ViewShell *pVSh ) const;
sal_Bool IsOpaque( ViewShell *pVSh ) const;
@@ -111,7 +111,6 @@ public:
const sw::access::SwAccessibleChild& rChild ) const;
protected:
-
// Return the bounding box of the frame clipped to the vis area. If
// no frame is specified, use this' frame.
SwRect GetBounds( const SwAccessibleMap& rAccMap,
@@ -141,7 +140,6 @@ protected:
return maVisArea;
}
-
String GetFormattedPageNumber() const;
};
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index cd5297f..97e15d2 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -86,7 +86,6 @@ void SwAccessibleFrameBase::GetStates(
}
}
-
sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm )
{
sal_uInt8 nType = ND_TEXTNODE;
@@ -198,7 +197,6 @@ sal_Bool SwAccessibleFrameBase::HasCursor()
return bIsSelected;
}
-
SwAccessibleFrameBase::~SwAccessibleFrameBase()
{
}
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index 2843520..a1ee392 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -16,11 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCFRAMEBASE_HXX
#define _ACCFRAMEBASE_HXX
#include <acccontext.hxx>
-
#include <calbck.hxx>
class SwFlyFrm;
@@ -29,11 +29,9 @@ class SwAccessibleFrameBase : public SwAccessibleContext,
public SwClient
{
sal_Bool bIsSelected; // protected by base class mutex
-
sal_Bool IsSelected();
protected:
-
// Set states for getAccessibleStateSet.
// This drived class additionaly sets SELECTABLE(1), SELECTED(+),
// FOCUSABLE(1) and FOCUSED(+)
@@ -46,7 +44,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
-
SwAccessibleFrameBase( SwAccessibleMap* pInitMap,
sal_Int16 nInitRole,
const SwFlyFrm *pFlyFrm );
@@ -59,7 +56,6 @@ public:
virtual void Dispose( sal_Bool bRecursive = sal_False );
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index 2936edc..0f3cf5b 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <accfrmobj.hxx>
#include <accmap.hxx>
@@ -68,7 +67,6 @@ SwAccessibleChild::SwAccessibleChild( Window* pWindow )
Init( pWindow );
}
-
SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
const SdrObject* pDrawObj,
Window* pWindow )
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index 4934590..355c9ae 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCFRMOBJ_HXX
#define _ACCFRMOBJ_HXX
@@ -78,7 +79,6 @@ class SwAccessibleChild
void Init( Window* pWindow );
};
-
} } // eof of namespace sw::access
#endif
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 316b029..b4be792 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <accfrmobjmap.hxx>
#include <accframe.hxx>
#include <accmap.hxx>
diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx
index e324b33..39f03b9 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -16,13 +16,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCFRMOBJMAP_HXX
#define _ACCFRMOBJMAP_HXX
#include <accfrmobj.hxx>
-
#include <svx/svdtypes.hxx>
-
#include <map>
class SwAccessibleMap;
@@ -54,7 +53,6 @@ public:
}
private:
-
LayerId eLayerId;
sal_uInt32 nOrdNum;
@@ -75,7 +73,6 @@ class SwAccessibleChildMap : public _SwAccessibleChildMap
const sw::access::SwAccessibleChild& rLower );
public:
-
SwAccessibleChildMap( const SwRect& rVisArea,
const SwFrm& rFrm,
SwAccessibleMap& rAccMap );
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index a94834c..60c28ab 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <accfrmobjslist.hxx>
#include <accmap.hxx>
#include <acccontext.hxx>
diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx
index d7ce57d..bebaafe 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCFRMOBJSLIST_HXX
#define _ACCFRMOBJSLIST_HXX
@@ -23,7 +24,6 @@
#include <swrect.hxx>
class SwAccessibleMap;
-
class SwAccessibleChildSList;
class SwAccessibleChildSList_const_iterator
@@ -47,7 +47,6 @@ private:
SwAccessibleChildSList_const_iterator& next_visible();
public:
-
inline SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList_const_iterator& rIter )
: rList( rIter.rList )
, aCurr( rIter.aCurr )
@@ -82,7 +81,6 @@ class SwAccessibleChildSList
SwAccessibleMap& mrAccMap;
public:
-
typedef SwAccessibleChildSList_const_iterator const_iterator;
inline SwAccessibleChildSList( const SwFrm& rFrm,
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index 8e1eff5..f8c3ac4 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -16,19 +16,18 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCGRAPHIC_HXX
#define _ACCGRAPHIC_HXX
+
#include "accnotextframe.hxx"
class SwAccessibleGraphic : public SwAccessibleNoTextFrame
{
-
protected:
-
virtual ~SwAccessibleGraphic();
public:
-
SwAccessibleGraphic( SwAccessibleMap* pInitMap,
const SwFlyFrm *pFlyFrm );
@@ -54,7 +53,6 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index 81ec109..07d84ed 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -16,8 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCHEADERFOOTER_HXX
#define _ACCHEADERFOOTER_HXX
+
#include "acccontext.hxx"
class SwHeaderFrm;
@@ -25,19 +27,15 @@ class SwFooterFrm;
class SwAccessibleHeaderFooter : public SwAccessibleContext
{
-
protected:
-
virtual ~SwAccessibleHeaderFooter();
public:
-
SwAccessibleHeaderFooter( SwAccessibleMap* pInitMap,
const SwHeaderFrm* pHdFrm );
SwAccessibleHeaderFooter( SwAccessibleMap* pInitMap,
const SwFooterFrm* pFtFrm );
-
// XAccessibleContext
/// Return this object's description.
@@ -67,7 +65,6 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index d93217e..60e201f 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -56,7 +56,6 @@ const SwTxtAttr *SwAccessibleHyperlink::GetTxtAttr() const
return pTxtAttr;
}
-
// XAccessibleAction
sal_Int32 SAL_CALL SwAccessibleHyperlink::getAccessibleActionCount()
throw (uno::RuntimeException)
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index 28f1165..21b60eb 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -16,8 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCHYPERLINK_HXX
#define _ACCHYPERLINK_HXX
+
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
#include <rtl/ref.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -45,7 +47,6 @@ class SwAccessibleHyperlink :
void Invalidate();
public:
-
// XAccessibleAction
virtual sal_Int32 SAL_CALL getAccessibleActionCount()
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx
index 4969a97..1e106ad 100644
--- a/sw/source/core/access/acchypertextdata.hxx
+++ b/sw/source/core/access/acchypertextdata.hxx
@@ -16,15 +16,14 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCHYPERTEXTDATA_HXX
#define _ACCHYPERTEXTDATA_HXX
#include <cppuhelper/weakref.hxx>
-
#include <map>
class SwTxtAttr;
-
namespace com { namespace sun { namespace star {
namespace accessibility { class XAccessibleHyperlink; }
} } }
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 5435961..abbf52d 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -103,11 +103,10 @@ class SwDrawModellListener_Impl : public SfxListener,
SdrModel *mpDrawModel;
protected:
virtual ~SwDrawModellListener_Impl();
-public:
+public:
SwDrawModellListener_Impl( SdrModel *pDrawModel );
-
virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException);
virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException);
@@ -436,7 +435,6 @@ public:
{
return mnStates;
}
-
};
typedef ::std::list < SwAccessibleEvent_Impl > _SwAccessibleEventList_Impl;
@@ -446,7 +444,6 @@ class SwAccessibleEventList_Impl: public _SwAccessibleEventList_Impl
bool mbFiring;
public:
-
SwAccessibleEventList_Impl()
: mbFiring( false )
{}
@@ -477,7 +474,6 @@ typedef ::std::list < uno::Reference < drawing::XShape > > _SwShapeList_Impl;
class SwShapeList_Impl: public _SwShapeList_Impl
{
public:
-
SwShapeList_Impl() {}
};
@@ -499,6 +495,7 @@ struct SwAccessibleChildFunc
return p1 < p2;
}
};
+
typedef ::std::map < SwAccessibleChild, SwAccessibleEventList_Impl::iterator,
SwAccessibleChildFunc > _SwAccessibleEventMap_Impl;
@@ -2251,13 +2248,11 @@ void SwAccessibleMap::InvalidatePreViewSelection( sal_uInt16 nSelPage )
InvalidateCursorPosition( xAcc );
}
-
bool SwAccessibleMap::IsPageSelected( const SwPageFrm *pPageFrm ) const
{
return mpPreview && mpPreview->GetSelPage() == pPageFrm;
}
-
void SwAccessibleMap::FireEvents()
{
{
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 34224f5..9277c72 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -197,7 +197,6 @@ uno::Any SAL_CALL SwAccessibleNoTextFrame::queryInterface( const uno::Type& aTyp
return SwAccessibleContext::queryInterface( aType );
}
-
// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL SwAccessibleNoTextFrame::getTypes() throw(uno::RuntimeException)
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index d41a7d5..4e86e39 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -16,8 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCNOTEXTFRAME_HXX
#define _ACCNOTEXTFRAME_HXX
+
#include "accframebase.hxx"
#include <com/sun/star/accessibility/XAccessibleImage.hpp>
@@ -32,7 +34,6 @@ class SwAccessibleNoTextFrame : public SwAccessibleFrameBase,
OUString msDesc;
protected:
-
virtual ~SwAccessibleNoTextFrame();
const SwNoTxtNode *GetNoTxtNode() const;
@@ -40,7 +41,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
-
SwAccessibleNoTextFrame( SwAccessibleMap* pInitMap,
sal_Int16 nInitRole,
const SwFlyFrm *pFlyFrm );
@@ -91,7 +91,6 @@ public:
virtual void Dispose( sal_Bool bRecursive = sal_False );
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 72995a7..cc1ee1d 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -35,7 +35,6 @@ using uno::Reference;
using uno::RuntimeException;
using uno::Sequence;
-
const sal_Char sServiceName[] = "com.sun.star.text.AccessiblePageView";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessiblePageView";
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index aa0c6b9..ffd3cd4 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -16,12 +16,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCPAGE_HXX
#define _ACCPAGE_HXX
#include "acccontext.hxx"
-
/**
* accessibility implementation for the page (SwPageFrm)
* The page is _only_ visible in the page preview. For the regular
@@ -38,7 +38,6 @@ class SwAccessiblePage : public SwAccessibleContext
using SwAccessibleFrame::GetBounds;
protected:
-
// return the bounding box for the page in page preview mode
SwRect GetBounds( /* const SwFrm *pFrm =0 */ );
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index f9afed9..2e4d424 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <txtfrm.hxx>
#include <flyfrm.hxx>
#include <ndtxt.hxx>
@@ -92,7 +91,6 @@ namespace com { namespace sun { namespace star {
}
} } }
-
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleParagraphView";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView";
const xub_StrLen MAX_DESC_TEXT_LEN = 40;
@@ -733,7 +731,6 @@ sal_Bool SwAccessibleParagraph::GetGlyphBoundary(
return bRet;
}
-
sal_Bool SwAccessibleParagraph::GetTextBoundary(
i18n::Boundary& rBound,
const OUString& rText,
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 590d03c..2aa55bd 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -279,7 +279,6 @@ const OUString& SwAccessiblePortionData::GetAccessibleString() const
return sAccessibleString;
}
-
void SwAccessiblePortionData::GetLineBoundary(
Boundary& rBound,
sal_Int32 nPos ) const
@@ -373,7 +372,6 @@ void SwAccessiblePortionData::FillBoundary(
rBound.endPos = rPositions[nPos+1];
}
-
size_t SwAccessiblePortionData::FindBreak(
const Positions_t& rPositions,
sal_Int32 nValue ) const
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index 7b4fcd5..5da3186 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -16,8 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCPORTIONS_HXX
#define _ACCPORTIONS_HXX
+
#include <SwPortionHandler.hxx>
#include <sal/types.h>
#include <rtl/ustrbuf.hxx>
@@ -100,7 +102,6 @@ public:
virtual void Skip(sal_uInt16 nLength);
virtual void Finish();
-
// access to the portion data
/// get the text string, as presented by the layout
@@ -134,7 +135,6 @@ public:
SwSpecialPos& rPos,
SwSpecialPos*& rpPos ) const;
-
// get boundaries of words/sentences. The data structures are
// created on-demand.
void GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound,
@@ -161,7 +161,6 @@ public:
sal_uInt16 GetLastValidCorePosition() const;
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 9eeb588..5ce1976 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/svapp.hxx>
#include <comphelper/servicehelper.hxx>
#include "access.hrc"
diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx
index f699ce9..4c0f431 100644
--- a/sw/source/core/access/accpreview.hxx
+++ b/sw/source/core/access/accpreview.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCPREVIEW_HXX
#define _ACCPREVIEW_HXX
@@ -34,11 +35,8 @@ class SwAccessiblePreview : public SwAccessibleDocumentBase
virtual ~SwAccessiblePreview();
public:
-
SwAccessiblePreview( SwAccessibleMap *pMap );
-
-
//===== XServiceInfo ====================================================
/** Returns an identifier for the implementation of this object.
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 06665f3..f7f0332 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -28,7 +28,6 @@
#include <vcl/svapp.hxx> // for SolarMutex
#include <flyfrm.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx
index b7cc4a6..2b1e643 100644
--- a/sw/source/core/access/accselectionhelper.hxx
+++ b/sw/source/core/access/accselectionhelper.hxx
@@ -16,10 +16,13 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCSELECTIONHELPER_HXX_
#define _ACCSELECTIONHELPER_HXX_
+
class SwAccessibleContext;
class SwFEShell;
+
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
class SwAccessibleSelectionHelper
@@ -27,7 +30,6 @@ class SwAccessibleSelectionHelper
/// the context on which this helper works
SwAccessibleContext& rContext;
-
/// get FE-Shell
SwFEShell* GetFEShell();
@@ -35,11 +37,9 @@ class SwAccessibleSelectionHelper
throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
public:
-
SwAccessibleSelectionHelper( SwAccessibleContext& rContext );
~SwAccessibleSelectionHelper();
-
//===== XAccessibleSelection ============================================
void selectAccessibleChild(
@@ -68,7 +68,6 @@ public:
::com::sun::star::uno::RuntimeException );
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 214ba18..4380713 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -69,7 +69,6 @@ protected:
~SwAccTableSelHander_Impl() {}
};
-
class SwAccessibleTableData_Impl
{
SwAccessibleMap& mrAccMap;
@@ -507,7 +506,6 @@ class SwAccAllTableSelHander_Impl : public SwAccTableSelHander_Impl
sal_Int32 nCount;
public:
-
inline SwAccAllTableSelHander_Impl( sal_Int32 nSize );
uno::Sequence < sal_Int32 > GetSelSequence();
@@ -595,7 +593,6 @@ void SwAccessibleTable::FireTableChangeEvent(
FireAccessibleEvent( aEvent );
}
-
const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int32 nChildIndex ) const
{
OSL_ENSURE( nChildIndex >= 0, "Illegal child index." );
@@ -1257,7 +1254,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn(
return nRet;
}
-
OUString SAL_CALL SwAccessibleTable::getImplementationName()
throw( uno::RuntimeException )
{
@@ -1357,7 +1353,6 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil
SwAccessibleContext::InvalidateChildPosOrSize( rChildFrmOrObj, rOldBox );
}
-
// XAccessibleSelection
void SAL_CALL SwAccessibleTable::selectAccessibleChild(
@@ -1439,7 +1434,6 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
}
}
-
sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected(
sal_Int32 nChildIndex )
throw ( lang::IndexOutOfBoundsException,
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index 36a91b0..d71f45c 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -16,8 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCTABLE_HXX
#define _ACCTABLE_HXX
+
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
@@ -52,7 +54,6 @@ class SwAccessibleTable :
sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const;
protected:
-
// Set states for getAccessibleStateSet.
// This drived class additinaly sets MULTISELECTABLE(+)
virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
@@ -82,7 +83,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
-
SwAccessibleTable( SwAccessibleMap* pInitMap, const SwTabFrm* pTableFrm );
//===== XInterface ======================================================
@@ -261,7 +261,6 @@ inline SwAccessibleTableData_Impl& SwAccessibleTable::GetTableData()
class SwAccessibleTableColHeaders : public SwAccessibleTable
{
protected:
-
virtual ~SwAccessibleTableColHeaders()
{}
@@ -269,7 +268,6 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
-
SwAccessibleTableColHeaders( SwAccessibleMap *pMap, const SwTabFrm *pTabFrm );
//===== XInterface ======================================================
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index b805e56..f1ba231 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <comphelper/servicehelper.hxx>
#include <osl/mutex.hxx>
@@ -156,6 +155,7 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void)
return SwAccessibleFrameBase::getAccessibleName();
}
+
OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
@@ -204,8 +204,8 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId()
return theSwAccessibleTextFrameImplementationId::get().getSeq();
}
-
// XAccessibleRelationSet
+
SwFlyFrm* SwAccessibleTextFrame::getFlyFrm() const
{
SwFlyFrm* pFlyFrm = NULL;
@@ -227,7 +227,6 @@ AccessibleRelation SwAccessibleTextFrame::makeRelation( sal_Int16 nType, const S
return AccessibleRelation( nType, aSequence );
}
-
uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleTextFrame::getAccessibleRelationSet( )
throw ( uno::RuntimeException )
{
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index 7d6b13e..e0568c1 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -16,8 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _ACCTEXTFRAME_HXX
#define _ACCTEXTFRAME_HXX
+
#include "accframebase.hxx"
class SwFlyFrm;
@@ -34,13 +36,10 @@ private:
OUString msDesc;
protected:
-
virtual ~SwAccessibleTextFrame();
-
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
-
SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm* pFlyFrm );
//===== XAccessibleContext ==============================================
@@ -78,7 +77,6 @@ public:
//====== XTypeProvider ====================================================
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
-
//===== XAccessibleContext::getAccessibleRelationSet ====================
// text frame may have accessible relations to their
@@ -92,14 +90,12 @@ private:
sal_Int16 nType, const SwFlyFrm* pFrm );
public:
-
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
throw (::com::sun::star::uno::RuntimeException);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index b20e789..fa9abed 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <parachangetrackinginfo.hxx>
#include <wrong.hxx>
@@ -152,7 +151,6 @@ SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTxtFrm& rTxtFrm )
{
}
-
SwParaChangeTrackingInfo::~SwParaChangeTrackingInfo()
{
reset();
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index 1220845..b95759d 100644
--- a/sw/source/core/access/parachangetrackinginfo.hxx
+++ b/sw/source/core/access/parachangetrackinginfo.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _PARACHANGETRACKINGINFO_HXX_
#define _PARACHANGETRACKINGINFO_HXX_
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index c3aa81a..0a8fa9b 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <textmarkuphelper.hxx>
#include <accportions.hxx>
@@ -25,7 +24,6 @@
#include <algorithm>
#include <comphelper/stlunosequence.hxx>
-
#include <com/sun/star/text/TextMarkupType.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
@@ -108,6 +106,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
return nTextMarkupCount;
}
+
::com::sun::star::accessibility::TextSegment
SwTextMarkupHelper::getTextMarkup( const sal_Int32 nTextMarkupIndex,
const sal_Int32 nTextMarkupType )
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 23226cb..d270d42 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -411,8 +411,6 @@ SwClientIter::SwClientIter( const SwModify& rModify )
pDelNext = pAct;
}
-
-
SwClientIter::~SwClientIter()
{
if( pClientIters )
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 1db49a4..734ba21 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -49,7 +49,6 @@ SwUpdateAttr::SwUpdateAttr( xub_StrLen nS, xub_StrLen nE, sal_uInt16 nW )
{
}
-
/** Is sent if reference marks should be updated.
To get the page/chapter number, the frame has to be asked. For that we need
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index c9624f2..4bdc84e 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -802,7 +802,6 @@ void _FinitCore()
delete SwStyleNameMapper::pFrameProgMap;
delete SwStyleNameMapper::pNumRuleProgMap;
-
// delete all default attributes
SfxPoolItem* pHt;
for( sal_uInt16 n = 0; n < POOLATTR_END - POOLATTR_BEGIN; n++ )
@@ -865,6 +864,7 @@ CollatorWrapper& GetAppCollator()
}
return *pCollator;
}
+
CollatorWrapper& GetAppCaseCollator()
{
if( !pCaseCollator )
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index cd4614b..f5aab3e 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -65,7 +65,6 @@ void SwCache::Check()
#define CHECK
#endif
-
SwCache::SwCache( const sal_uInt16 nInitSize
#ifdef DBG_UTIL
, const OString &rNm
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index a403c46..e37f0cf 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -127,7 +127,6 @@ sal_Bool SwRect::IsNear( const Point& rPoint, long nTolerance ) const
return IsInside(rPoint) || bIsNearby;
}
-
sal_Bool SwRect::IsOver( const SwRect& rRect ) const
{
return (Top() <= rRect.Bottom()) &&
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index 0b6f74d..c985310 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -18,7 +18,6 @@
*/
#include "tabcol.hxx"
-
#include <limits.h>
#include <osl/diagnose.h>
diff --git a/sw/source/core/crsr/BlockCursor.cxx b/sw/source/core/crsr/BlockCursor.cxx
index a02cb37..5edbd9f 100644
--- a/sw/source/core/crsr/BlockCursor.cxx
+++ b/sw/source/core/crsr/BlockCursor.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <IBlockCursor.hxx>
#include <viscrs.hxx>
#include "BlockCursor.hxx"
diff --git a/sw/source/core/crsr/IBlockCursor.hxx b/sw/source/core/crsr/IBlockCursor.hxx
index 4f51b54..cbe91ad 100644
--- a/sw/source/core/crsr/IBlockCursor.hxx
+++ b/sw/source/core/crsr/IBlockCursor.hxx
@@ -63,7 +63,6 @@ class Point;
*/
virtual const Point* getStartPoint() const = 0;
-
/** The document coordinates where the block selection ends (at the moment)
@return 0, if no end point has been set
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 8c8f450..e67b5dc 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -31,7 +31,6 @@
#include <rtl/random.h>
#include <xmloff/odffields.hxx>
-
SV_IMPL_REF( SwServerObject )
using namespace ::sw::mark;
@@ -186,7 +185,6 @@ namespace sw { namespace mark
return aResult.append(nCount++).append(sUniquePostfix).makeStringAndClear();
}
-
void MarkBase::Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew )
{
NotifyClients(pOld, pNew);
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 2ee6108..0ac66f5 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -38,7 +38,6 @@
#include<vcl/window.hxx>
-
SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, xub_StrLen nAktCntnt,
sal_uInt8 nAktNdTyp, long nLRPos, bool bAktSelection )
: rShell( rSh ), nNode( nAktNode ), nCntnt( nAktCntnt ),
@@ -47,7 +46,6 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, xub_StrLen nAktCn
{
}
-
SwCallLink::SwCallLink( SwCrsrShell & rSh )
: rShell( rSh )
{
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index ef1165e..1fe5f09 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _CALLNK_HXX
#define _CALLNK_HXX
@@ -44,8 +45,6 @@ public:
static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, xub_StrLen nCntPos, sal_Bool bCalcFrm );
};
-
-
#endif // _CALLNK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index b61575f..ba96a35 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -67,7 +67,6 @@ namespace
SwCrsrSaveState m_aSaveState;
};
-
static bool lcl_ReverseMarkOrderingByEnd(const IDocumentMarkAccess::pMark_t& rpFirst,
const IDocumentMarkAccess::pMark_t& rpSecond)
{
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 32442ff..8ef73ad 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <crossrefbookmark.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 44de565..56134b1 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -59,7 +59,6 @@
#include <IGrammarContact.hxx>
#include <globals.hrc>
-
#include <comcore.hrc>
using namespace com::sun::star;
@@ -67,14 +66,12 @@ using namespace util;
TYPEINIT2(SwCrsrShell,ViewShell,SwModify);
-
/**
* Delete all overlapping Cursors from a Cursor ring.
* @param pointer to SwCursor (ring)
*/
void CheckRange( SwCursor* );
-
/**
* Check if pCurCrsr points into already existing ranges and delete those.
* @param Pointer to SwCursor object
@@ -114,10 +111,6 @@ void CheckRange( SwCursor* pCurCrsr )
// -----------
// SwCrsrShell
// -----------
-
-
-
-
SwPaM * SwCrsrShell::CreateCrsr()
{
// don't create Crsr in a table Selection (sic!)
@@ -137,7 +130,6 @@ SwPaM * SwCrsrShell::CreateCrsr()
return pNew;
}
-
/**
* Delete current Cursor, making the following one the current.
* Note, this function does not delete anything if there is no other cursor.
@@ -160,7 +152,6 @@ bool SwCrsrShell::DestroyCrsr()
return true;
}
-
/**
* Create and return a new shell cursor.
* Simply returns the current shell cursor if there is no selection
@@ -215,7 +206,6 @@ SwPaM* SwCrsrShell::GetCrsr( sal_Bool bMakeTblCrsr ) const
return m_pCurCrsr;
}
-
void SwCrsrShell::StartAction()
{
if( !ActionPend() )
@@ -234,7 +224,6 @@ void SwCrsrShell::StartAction()
ViewShell::StartAction(); // to the ViewShell
}
-
void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
{
sal_Bool bVis = m_bSVCrsrVis;
@@ -315,9 +304,7 @@ void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
}
}
-
#ifdef DBG_UTIL
-
void SwCrsrShell::SttCrsrMove()
{
OSL_ENSURE( m_nCrsrMove < USHRT_MAX, "To many nested CrsrMoves." );
@@ -332,10 +319,8 @@ void SwCrsrShell::EndCrsrMove( const sal_Bool bIdleEnd )
if( !--m_nCrsrMove )
m_bInCMvVisportChgd = sal_False;
}
-
#endif
-
sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
sal_Bool bVisualAllowed )
{
@@ -511,7 +496,6 @@ sal_Bool SwCrsrShell::IsAtLRMargin( sal_Bool bLeft, sal_Bool bAPI ) const
return pTmpCrsr->IsAtLeftRightMargin( bLeft, bAPI );
}
-
sal_Bool SwCrsrShell::SttEndDoc( sal_Bool bStt )
{
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
@@ -601,7 +585,6 @@ sal_Bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
return bRet;
}
-
sal_Bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
SwPosSection fnPosSect)
{
@@ -614,10 +597,8 @@ sal_Bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
}
-
// position cursor
-
static SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
{
SwFrm* pFrm = 0;
@@ -777,7 +758,6 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock )
return bRet;
}
-
void SwCrsrShell::TblCrsrToCursor()
{
OSL_ENSURE( m_pTblCrsr, "TblCrsrToCursor: Why?" );
@@ -845,7 +825,6 @@ void SwCrsrShell::ClearMark()
}
}
-
void SwCrsrShell::NormalizePam(sal_Bool bPointFirst)
{
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
@@ -906,7 +885,6 @@ sal_Bool SwCrsrShell::ChgCurrPam( const Point & rPt,
return sal_False;
}
-
void SwCrsrShell::KillPams()
{
// Does any exist for deletion?
@@ -939,7 +917,6 @@ void SwCrsrShell::KillPams()
UpdateCrsr( SwCrsrShell::SCROLLWIN );
}
-
int SwCrsrShell::CompareCursor( CrsrCompareType eType ) const
{
int nRet = 0;
@@ -987,11 +964,9 @@ int SwCrsrShell::CompareCursor( CrsrCompareType eType ) const
return nRet;
}
-
bool SwCrsrShell::IsSttPara() const
{ return m_pCurCrsr->GetPoint()->nContent == 0; }
-
bool SwCrsrShell::IsEndPara() const
{ return m_pCurCrsr->GetPoint()->nContent == m_pCurCrsr->GetCntntNode()->Len(); }
@@ -1068,7 +1043,6 @@ void SwCrsrShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
rnVirtNum = pPg? pPg->GetVirtPageNum() : 1;
}
-
sal_uInt16 SwCrsrShell::GetNextPrevPageNum( sal_Bool bNext )
{
SET_CURR_SHELL( this );
@@ -1108,7 +1082,6 @@ sal_uInt16 SwCrsrShell::GetNextPrevPageNum( sal_Bool bNext )
return pPg ? pPg->GetPhyPageNum() : USHRT_MAX;
}
-
sal_uInt16 SwCrsrShell::GetPageCnt()
{
SET_CURR_SHELL( this );
@@ -1157,7 +1130,6 @@ sal_Bool SwCrsrShell::GoPrevCrsr()
return sal_True;
}
-
void SwCrsrShell::Paint( const Rectangle &rRect)
{
SET_CURR_SHELL( this );
@@ -1194,8 +1166,6 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
m_pVisCrsr->Show();
}
-
-
void SwCrsrShell::VisPortChgd( const SwRect & rRect )
{
SET_CURR_SHELL( this );
@@ -1572,7 +1542,6 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
}
while( pCmp != m_pCurCrsr );
-
SwRect aOld( m_aCharRect );
bool bFirst = true;
SwCntntFrm *pFrm;
@@ -2000,7 +1969,6 @@ void SwCrsrShell::Combine()
}
}
-
void SwCrsrShell::HideCrsrs()
{
if( !m_bHasFocus || m_bBasicHideCrsr )
@@ -2017,8 +1985,6 @@ void SwCrsrShell::HideCrsrs()
pAktCrsr->Hide();
}
-
-
void SwCrsrShell::ShowCrsrs( sal_Bool bCrsrVis )
{
if( !m_bHasFocus || m_bAllProtect || m_bBasicHideCrsr )
@@ -2032,8 +1998,6 @@ void SwCrsrShell::ShowCrsrs( sal_Bool bCrsrVis )
m_pVisCrsr->Show();
}
-
-
void SwCrsrShell::ShowCrsr()
{
if( !m_bBasicHideCrsr )
@@ -2043,7 +2007,6 @@ void SwCrsrShell::ShowCrsr()
}
}
-
void SwCrsrShell::HideCrsr()
{
if( !m_bBasicHideCrsr )
@@ -2055,7 +2018,6 @@ void SwCrsrShell::HideCrsr()
}
}
-
void SwCrsrShell::ShLooseFcs()
{
if( !m_bBasicHideCrsr )
@@ -2063,7 +2025,6 @@ void SwCrsrShell::ShLooseFcs()
m_bHasFocus = sal_False;
}
-
void SwCrsrShell::ShGetFcs( sal_Bool bUpdate )
{
m_bHasFocus = sal_True;
@@ -2141,7 +2102,6 @@ sal_Bool SwCrsrShell::HasSelection() const
? sal_True : sal_False );
}
-
void SwCrsrShell::CallChgLnk()
{
// Do not make any call in start/end action but just remember the change.
@@ -2340,7 +2300,6 @@ sal_uInt16 SwCrsrShell::GetCrsrCnt( sal_Bool bAll ) const
return n;
}
-
sal_Bool SwCrsrShell::IsStartOfDoc() const
{
if( m_pCurCrsr->GetPoint()->nContent.GetIndex() )
@@ -2353,7 +2312,6 @@ sal_Bool SwCrsrShell::IsStartOfDoc() const
return aIdx == m_pCurCrsr->GetPoint()->nNode;
}
-
sal_Bool SwCrsrShell::IsEndOfDoc() const
{
SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfContent(), -1 );
@@ -2504,7 +2462,6 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
delete pNew;
}
-
/** Copy constructor
Copy cursor position and add it to the ring.
@@ -2565,8 +2522,6 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
m_bMacroExecAllowed = true;
}
-
-
SwCrsrShell::~SwCrsrShell()
{
// if it is not the last view then at least the field should be updated
@@ -2847,7 +2802,6 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
return bOk;
}
-
sal_Bool SwCrsrShell::IsCrsrReadonly() const
{
if ( GetViewOptions()->IsReadonly() ||
@@ -3381,5 +3335,4 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 9e5630b1e5..3deb573 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -107,7 +107,6 @@ bool SwCrsrShell::GotoNextNum()
return bRet;
}
-
bool SwCrsrShell::GotoPrevNum()
{
bool bRet = GetDoc()->GotoPrevNum( *m_pCurCrsr->GetPoint() );
@@ -631,7 +630,6 @@ static void lcl_MakeFldLst( _SetGetExpFlds& rLst, const SwFieldType& rFldType,
}
}
-
sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext,
sal_uInt16 nSubType, sal_uInt16 nResType )
{
@@ -759,7 +757,6 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext,
return bRet;
}
-
sal_Bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
{
sal_Bool bRet = sal_False;
@@ -782,7 +779,6 @@ sal_Bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
return bRet;
}
-
void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
{
SwCursor* pCrsr = getShellCrsr( true );
@@ -800,7 +796,6 @@ void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
}
-
bool SwCrsrShell::GotoOutline( const String& rName )
{
SwCursor* pCrsr = getShellCrsr( true );
@@ -900,7 +895,6 @@ sal_uInt16 SwCrsrShell::GetOutlinePos( sal_uInt8 nLevel )
return USHRT_MAX; // no more left
}
-
sal_Bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
sal_Bool bWithChildren )
{
@@ -959,7 +953,6 @@ sal_Bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
return bRet;
}
-
/// jump to reference marker
sal_Bool SwCrsrShell::GotoRefMark( const String& rRefMark, sal_uInt16 nSubType,
sal_uInt16 nSeqNo )
@@ -1646,7 +1639,6 @@ sal_Bool SwCrsrShell::SelectTxtAttr( sal_uInt16 nWhich, sal_Bool bExpand,
return bRet;
}
-
bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
{
bool bRet = false;
@@ -1668,7 +1660,6 @@ bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
return bRet;
}
-
const SwFmtINetFmt* SwCrsrShell::FindINetAttr( const OUString& rName ) const
{
return mpDoc->FindINetAttr( rName );
@@ -2051,7 +2042,6 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect
return pFnd;
}
-
bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
{
SwNodes& rNds = GetDoc()->GetNodes();
diff --git a/sw/source/core/crsr/crstrvl1.cxx b/sw/source/core/crsr/crstrvl1.cxx
index 495d3ea..4ccb0fa 100644
--- a/sw/source/core/crsr/crstrvl1.cxx
+++ b/sw/source/core/crsr/crstrvl1.cxx
@@ -46,7 +46,6 @@ sal_Bool SwCrsrShell::IsEndSentence() const
return m_pCurCrsr->IsStartEndSentence( true );
}
-
sal_Bool SwCrsrShell::GoStartWord()
{
return CallCrsrFN( &SwCursor::GoStartWord );
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index ce86579..347c5f3 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -41,7 +41,6 @@
#include <swundo.hxx>
#include <crsskip.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
@@ -69,7 +68,6 @@ int CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
return rItem1 == rItem2;
}
-
const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
xub_StrLen nCntntPos )
{
@@ -83,7 +81,6 @@ const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
return 0; // invalid text attribute
}
-
const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
xub_StrLen nCntntPos )
{
@@ -199,8 +196,6 @@ public:
int SetAttrBwd( const SwTxtAttr& rAttr );
};
-
-
SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, int bFwd,
int bNoCollections )
: aCmpSet( *rSet.GetPool(), RES_CHRATR_BEGIN, RES_TXTATR_END-1 )
@@ -461,7 +456,6 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
return Found();
}
-
int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
{
_SwSrchChrAttr aTmp( rAttr.GetAttr(), *rAttr.GetStart(), *rAttr.GetAnyEnd() );
@@ -611,7 +605,6 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
return Found();
}
-
xub_StrLen SwAttrCheckArr::Start() const
{
xub_StrLen nStart = nNdStt;
@@ -623,7 +616,6 @@ xub_StrLen SwAttrCheckArr::Start() const
return nStart;
}
-
xub_StrLen SwAttrCheckArr::End() const
{
_SwSrchChrAttr* pArrPtr = pFndArr;
@@ -635,7 +627,6 @@ xub_StrLen SwAttrCheckArr::End() const
return nEnd;
}
-
int SwAttrCheckArr::CheckStack()
{
if( !nStackCnt )
@@ -669,8 +660,6 @@ int SwAttrCheckArr::CheckStack()
return nFound == aCmpSet.Count();
}
-
-
static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
SwPaM& rPam )
{
@@ -741,7 +730,6 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
return sal_True;
}
-
static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
SwPaM& rPam )
{
@@ -817,7 +805,6 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
return sal_True;
}
-
static int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, sal_Bool bNoColls )
{
// search only hard attribution?
@@ -854,7 +841,6 @@ static int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, sal_B
return sal_True; // found
}
-
bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
const SwPaM *pRegion, bool bInReadOnly )
{
@@ -938,7 +924,6 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
return bFound;
}
-
typedef int (*FnSearchAttr)( const SwTxtNode&, SwAttrCheckArr&, SwPaM& );
bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
@@ -1054,7 +1039,6 @@ struct SwFindParaAttr : public SwFindParas
virtual int IsReplaceMode() const;
};
-
int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
sal_Bool bInReadOnly )
{
@@ -1194,7 +1178,6 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
return FIND_FOUND;
}
-
int SwFindParaAttr::IsReplaceMode() const
{
return ( pSearchOpt && !pSearchOpt->replaceString.isEmpty() ) ||
@@ -1238,6 +1221,4 @@ sal_uLong SwCursor::Find( const SfxItemSet& rSet, sal_Bool bNoCollections,
return nRet;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index 665113f..1dc6884 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/resid.hxx>
#include <swcrsr.hxx>
@@ -42,7 +41,6 @@ struct SwFindParaFmtColl : public SwFindParas
virtual int IsReplaceMode() const;
};
-
int SwFindParaFmtColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
sal_Bool bInReadOnly )
{
@@ -60,7 +58,6 @@ int SwFindParaFmtColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion
return nRet;
}
-
int SwFindParaFmtColl::IsReplaceMode() const
{
return 0 != pReplColl;
@@ -104,6 +101,4 @@ sal_uLong SwCursor::Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart,
return nRet;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index e92f71c..2da57d2 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -20,7 +20,6 @@
#include <doc.hxx>
#include <pamtyp.hxx>
-
bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
const SwPaM *pRegion, bool bInReadOnly )
{
@@ -71,5 +70,4 @@ bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
return bFound;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 9518f4f..16a62be 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/util/SearchOptions.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
@@ -621,13 +620,11 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
return bFnd ? FIND_FOUND : FIND_NOT_FOUND;
}
-
int SwFindParaText::IsReplaceMode() const
{
return bReplace;
}
-
sal_uLong SwCursor::Find( const SearchOptions& rSearchOpt, sal_Bool bSearchInNotes,
SwDocPositions nStart, SwDocPositions nEnd,
sal_Bool& bCancel, FindRanges eFndRngs, int bReplace )
@@ -686,5 +683,4 @@ String *ReplaceBackReferences( const SearchOptions& rSearchOpt, SwPaM* pPam )
return pRet;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 9d7761d..ccbb0a9 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -83,7 +83,6 @@ SwPosition &SwPosition::operator=(const SwPosition &rPos)
return *this;
}
-
bool SwPosition::operator<(const SwPosition &rPos) const
{
if( nNode < rPos.nNode )
@@ -106,7 +105,6 @@ bool SwPosition::operator<(const SwPosition &rPos) const
return false;
}
-
bool SwPosition::operator>(const SwPosition &rPos) const
{
if(nNode > rPos.nNode )
@@ -129,7 +127,6 @@ bool SwPosition::operator>(const SwPosition &rPos) const
return false;
}
-
bool SwPosition::operator<=(const SwPosition &rPos) const
{
if(nNode < rPos.nNode )
@@ -152,7 +149,6 @@ bool SwPosition::operator<=(const SwPosition &rPos) const
return false;
}
-
bool SwPosition::operator>=(const SwPosition &rPos) const
{
if(nNode > rPos.nNode )
@@ -175,7 +171,6 @@ bool SwPosition::operator>=(const SwPosition &rPos) const
return false;
}
-
bool SwPosition::operator==(const SwPosition &rPos) const
{
return (nNode == rPos.nNode)
@@ -184,7 +179,6 @@ bool SwPosition::operator==(const SwPosition &rPos) const
&& (nContent == rPos.nContent);
}
-
bool SwPosition::operator!=(const SwPosition &rPos) const
{
return (nNode != rPos.nNode)
@@ -198,10 +192,8 @@ SwDoc * SwPosition::GetDoc() const
return nNode.GetNode().GetDoc();
}
-
enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
-
static CHKSECTION lcl_TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, const SwNode& rEndNd )
{
sal_uLong nStt = rEndNd.StartOfSectionIndex(), nEnd = rEndNd.GetIndex();
@@ -211,7 +203,6 @@ static CHKSECTION lcl_TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, const SwNode
return eSec;
}
-
static bool lcl_ChkOneRange( CHKSECTION eSec, bool bChkSections,
const SwNode& rBaseEnd, sal_uLong nStt, sal_uLong nEnd )
{
@@ -243,7 +234,6 @@ static bool lcl_ChkOneRange( CHKSECTION eSec, bool bChkSections,
nSttIdx <= nEnd && nEnd <= nEndIdx;
}
-
bool CheckNodesRange( const SwNodeIndex& rStt,
const SwNodeIndex& rEnd, bool bChkSection )
{
@@ -276,7 +266,6 @@ bool CheckNodesRange( const SwNodeIndex& rStt,
return false; // somewhere in between => error
}
-
sal_Bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
{
if( pNd->IsCntntNode() )
@@ -284,7 +273,6 @@ sal_Bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
return sal_False;
}
-
sal_Bool GoPrevious( SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
{
if( pNd->IsCntntNode() )
@@ -292,7 +280,6 @@ sal_Bool GoPrevious( SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
return sal_False;
}
-
SwCntntNode* GoNextNds( SwNodeIndex* pIdx, sal_Bool bChk )
{
SwNodeIndex aIdx( *pIdx );
@@ -308,7 +295,6 @@ SwCntntNode* GoNextNds( SwNodeIndex* pIdx, sal_Bool bChk )
return pNd;
}
-
SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, sal_Bool bChk )
{
SwNodeIndex aIdx( *pIdx );
@@ -324,7 +310,6 @@ SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, sal_Bool bChk )
return pNd;
}
-
SwPaM::SwPaM( const SwPosition& rPos, SwPaM* pRing )
: Ring( pRing )
, m_Bound1( rPos )
@@ -482,7 +467,6 @@ void SwPaM::SetMark()
}
#ifdef DBG_UTIL
-
void SwPaM::Exchange()
{
if (m_pPoint != m_pMark)
@@ -826,7 +810,6 @@ SwCntntNode* GetNode( SwPaM & rPam, sal_Bool& rbFirst, SwMoveFn fnMove,
return pNd;
}
-
void GoStartDoc( SwPosition * pPos )
{
SwNodes& rNodes = pPos->nNode.GetNodes();
@@ -837,7 +820,6 @@ void GoStartDoc( SwPosition * pPos )
pCNd->MakeStartIndex( &pPos->nContent );
}
-
void GoEndDoc( SwPosition * pPos )
{
SwNodes& rNodes = pPos->nNode.GetNodes();
@@ -847,7 +829,6 @@ void GoEndDoc( SwPosition * pPos )
pCNd->MakeEndIndex( &pPos->nContent );
}
-
void GoStartSection( SwPosition * pPos )
{
// jump to section's beginning
@@ -876,22 +857,18 @@ void GoEndSection( SwPosition * pPos )
pPos->nNode.GetNode().GetCntntNode()->MakeEndIndex( &pPos->nContent );
}
-
-
bool GoInDoc( SwPaM & rPam, SwMoveFn fnMove )
{
(*fnMove->fnDoc)( rPam.GetPoint() );
return true;
}
-
bool GoInSection( SwPaM & rPam, SwMoveFn fnMove )
{
(*fnMove->fnSections)( (SwPosition*)rPam.GetPoint() );
return true;
}
-
bool GoInNode( SwPaM & rPam, SwMoveFn fnMove )
{
SwCntntNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, sal_True );
@@ -901,7 +878,6 @@ bool GoInNode( SwPaM & rPam, SwMoveFn fnMove )
return pNd;
}
-
bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove )
{
if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
@@ -934,10 +910,6 @@ bool GoInCntntCellsSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
return GoInNode( rPam, fnMove );
}
-
-
-
-
sal_Bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
{
if( rPam.Move( fnMoveBackward, fnGoNode ) )
@@ -952,7 +924,6 @@ sal_Bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
return sal_False;
}
-
sal_Bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
{
SwPosition& rPos = *rPam.GetPoint();
@@ -981,7 +952,6 @@ sal_Bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
return sal_False;
}
-
sal_Bool GoNextPara( SwPaM & rPam, SwPosPara aPosPara )
{
if( rPam.Move( fnMoveForward, fnGoNode ) )
@@ -996,8 +966,6 @@ sal_Bool GoNextPara( SwPaM & rPam, SwPosPara aPosPara )
return sal_False;
}
-
-
sal_Bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
{
SwPosition& rPos = *rPam.GetPoint();
@@ -1017,7 +985,6 @@ sal_Bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
return aSavePos != rPos;
}
-
sal_Bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
{
SwPosition& rPos = *rPam.GetPoint();
@@ -1038,7 +1005,6 @@ sal_Bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
return sal_True;
}
-
sal_Bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
{
SwPosition& rPos = *rPam.GetPoint();
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index 0e3e161..dbaa126 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -20,7 +20,6 @@
#include <pam.hxx>
#include <pamtyp.hxx>
-
static SwMoveFnCollection aFwrd = {
/* fnNd */ &GoNext,
/* fnNds */ &GoNextNds,
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 9dadc67..2cbe925 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -52,7 +52,6 @@
using namespace ::com::sun::star::i18n;
-
static const sal_uInt16 coSrchRplcThreshold = 60000;
struct _PercentHdl
@@ -318,7 +317,6 @@ sal_Bool SwCursor::IsSelOvr( int eFlags )
}
}
}
-
}
const SwNode* pNd = &GetPoint()->nNode.GetNode();
@@ -672,7 +670,6 @@ SwMoveFnCollection* SwCursor::MakeFindRange( SwDocPositions nStart,
? fnMoveForward : fnMoveBackward;
}
-
static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
SwMoveFn fnMove, SwCursor*& pFndRing,
SwPaM& aRegion, FindRanges eFndRngs,
@@ -797,7 +794,6 @@ static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
return nFound;
}
-
static int lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
SwPaM& rPam, int bFirst )
{
@@ -830,7 +826,6 @@ static int lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
return *rPam.GetMark() < *rPam.GetPoint();
}
-
static int lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
SwPaM& rPam, int bFirst )
{
@@ -1022,7 +1017,6 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas,
return nFound;
}
-
void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
{
bool bIsStart = true;
@@ -1070,7 +1064,6 @@ short SwCursor::MaxReplaceArived()
return RET_YES;
}
-
sal_Bool SwCursor::IsStartWord( sal_Int16 nWordType ) const
{
return IsStartWordWT( nWordType );
@@ -1450,7 +1443,6 @@ sal_Bool SwCursor::GoSentence( SentenceMoveType eMoveType )
return bRet;
}
-
sal_Bool SwCursor::ExpandToSentenceBorders()
{
sal_Bool bRes = sal_False;
@@ -1494,7 +1486,6 @@ sal_Bool SwCursor::ExpandToSentenceBorders()
return bRes;
}
-
sal_Bool SwTableCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 /*nMode*/,
sal_Bool /*bVisualAllowed*/, sal_Bool /*bSkipHidden*/, sal_Bool /*bInsertCrsr*/ )
{
@@ -1502,7 +1493,6 @@ sal_Bool SwTableCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 /
: GoNextCell( nCnt );
}
-
// calculate cursor bidi level: extracted from LeftRight()
const SwCntntFrm*
SwCursor::DoSetBidiLevelLeftRight(
@@ -2007,7 +1997,6 @@ sal_Bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
}
-
sal_Bool SwCursor::MoveSection( SwWhichSection fnWhichSect,
SwPosSection fnPosSect)
{
@@ -2045,8 +2034,6 @@ void SwCursor::RestoreSavePos()
}
}
-
-
SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing )
: SwCursor( rPos, pRing, false )
{
@@ -2058,7 +2045,6 @@ SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing )
SwTableCursor::~SwTableCursor() {}
-
static bool
lcl_SeekEntry(const SwSelBoxes& rTmp, SwStartNode const*const pSrch,
size_t & o_rFndPos)
@@ -2089,7 +2075,6 @@ lcl_SeekEntry(const SwSelBoxes& rTmp, SwStartNode const*const pSrch,
return sal_False;
}
-
SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
{
if( bChg )
@@ -2197,7 +2182,6 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
return pAktCrsr;
}
-
void SwTableCursor::InsertBox( const SwTableBox& rTblBox )
{
SwTableBox* pBox = (SwTableBox*)&rTblBox;
@@ -2205,7 +2189,6 @@ void SwTableCursor::InsertBox( const SwTableBox& rTblBox )
bChg = sal_True;
}
-
void SwTableCursor::DeleteBox(size_t const nPos)
{
m_SelectedBoxes.erase(m_SelectedBoxes.begin() + nPos);
@@ -2300,7 +2283,6 @@ void SwTableCursor::ParkCrsr()
bParked = sal_True;
}
-
sal_Bool SwTableCursor::HasReadOnlyBoxSel() const
{
sal_Bool bRet = sal_False;
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index d45d593..babac21 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -25,8 +25,6 @@
#include <viscrs.hxx>
#include <callnk.hxx>
-
-
SwLayoutFrm* GetCurrColumn( const SwLayoutFrm* pLayFrm )
{
while( pLayFrm && !pLayFrm->IsColumnFrm() )
@@ -34,27 +32,23 @@ SwLayoutFrm* GetCurrColumn( const SwLayoutFrm* pLayFrm )
return (SwLayoutFrm*)pLayFrm;
}
-
SwLayoutFrm* GetNextColumn( const SwLayoutFrm* pLayFrm )
{
SwLayoutFrm* pActCol = GetCurrColumn( pLayFrm );
return pActCol ? (SwLayoutFrm*)pActCol->GetNext() : 0;
}
-
SwLayoutFrm* GetPrevColumn( const SwLayoutFrm* pLayFrm )
{
SwLayoutFrm* pActCol = GetCurrColumn( pLayFrm );
return pActCol ? (SwLayoutFrm*)pActCol->GetPrev() : 0;
}
-
SwCntntFrm* GetColumnStt( const SwLayoutFrm* pColFrm )
{
return pColFrm ? (SwCntntFrm*)pColFrm->ContainsCntnt() : 0;
}
-
SwCntntFrm* GetColumnEnd( const SwLayoutFrm* pColFrm )
{
SwCntntFrm *pRet = GetColumnStt( pColFrm );
@@ -70,14 +64,12 @@ SwCntntFrm* GetColumnEnd( const SwLayoutFrm* pColFrm )
return pRet;
}
-
SwWhichColumn fnColumnPrev = &GetPrevColumn;
SwWhichColumn fnColumnCurr = &GetCurrColumn;
SwWhichColumn fnColumnNext = &GetNextColumn;
SwPosColumn fnColumnStart = &GetColumnStt;
SwPosColumn fnColumnEnd = &GetColumnEnd;
-
sal_Bool SwCrsrShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol )
{
sal_Bool bRet = sal_False;
@@ -116,6 +108,4 @@ sal_Bool SwCrsrShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol
return bRet;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 40a17ed..23d74f9 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -121,7 +121,6 @@ sal_Bool SwCrsrShell::GotoFtnTxt()
return bRet;
}
-
sal_Bool SwCursor::GotoFtnAnchor()
{
// jump from footnote to anchor
@@ -337,7 +336,4 @@ sal_Bool SwCrsrShell::GotoFlyAnchor()
return bRet;
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 43be99a..eeee756 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -27,8 +27,6 @@
#include <pamtyp.hxx>
#include <section.hxx>
-
-
sal_Bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
sal_Bool bInReadOnly )
{
@@ -83,7 +81,6 @@ sal_Bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
return sal_False;
}
-
sal_Bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
sal_Bool bInReadOnly )
{
@@ -139,7 +136,6 @@ sal_Bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
return sal_False;
}
-
sal_Bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
sal_Bool bInReadOnly )
{
@@ -171,7 +167,6 @@ sal_Bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
return 0 != pCNd;
}
-
sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
sal_Bool bInReadOnly )
{
@@ -218,8 +213,6 @@ sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
return sal_False;
}
-
-
sal_Bool SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
{
SwCrsrSaveState aSaveState( *this );
@@ -239,7 +232,6 @@ sal_Bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPos
return bRet;
}
-
bool SwCursor::GotoRegion( const String& rName )
{
bool bRet = false;
@@ -275,6 +267,4 @@ bool SwCrsrShell::GotoRegion( const String& rName )
return bRet;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 5d86e85..6330fe9 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-
#include <vcl/svapp.hxx>
#include <editeng/protitem.hxx>
#include <crsrsh.hxx>
@@ -101,7 +100,6 @@ sal_Bool SwCrsrShell::GoNextCell( sal_Bool bAppendLine )
return bRet;
}
-
sal_Bool SwCrsrShell::GoPrevCell()
{
sal_Bool bRet = sal_False;
@@ -282,7 +280,6 @@ sal_Bool SwCrsrShell::SelTbl()
return sal_True;
}
-
sal_Bool SwCrsrShell::SelTblBox()
{
// if we're in a table, create a table cursor, and select the cell
@@ -304,7 +301,6 @@ sal_Bool SwCrsrShell::SelTblBox()
if( pStartNode == NULL )
return sal_False;
-
SET_CURR_SHELL( this );
// create a table cursor, if there isn't one already
@@ -484,7 +480,6 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly )
return true;
}
-
sal_Bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
sal_Bool bInReadOnly )
{
@@ -548,7 +543,6 @@ sal_Bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
return sal_False;
}
-
sal_Bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
sal_Bool bInReadOnly )
{
@@ -601,7 +595,6 @@ sal_Bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
return sal_False;
}
-
sal_Bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
sal_Bool bInReadOnly )
{
@@ -636,7 +629,6 @@ sal_Bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
return sal_True;
}
-
sal_Bool SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
{
sal_Bool bRet = sal_False;
@@ -766,7 +758,6 @@ String SwCrsrShell::GetBoxNms() const
return sNm;
}
-
bool SwCrsrShell::GotoTable( const String& rName )
{
SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -780,7 +771,6 @@ bool SwCrsrShell::GotoTable( const String& rName )
return bRet;
}
-
sal_Bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
{
if( !m_pBoxIdx || !m_pBoxPtr || IsSelTblCells() || !IsAutoUpdateCells() )
@@ -844,7 +834,6 @@ sal_Bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
return 0 != pChkBox;
}
-
void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
{
if( IsSelTblCells() || !IsAutoUpdateCells() )
@@ -884,7 +873,6 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
}
}
-
void SwCrsrShell::ClearTblBoxCntnt()
{
delete m_pBoxIdx, m_pBoxIdx = 0;
@@ -904,7 +892,4 @@ sal_Bool SwCrsrShell::EndAllTblBoxEdit()
return bRet;
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index bb4c5db..1b2d541 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -80,7 +80,6 @@ SwUnoTableCrsr * SwUnoTableCrsr::Clone() const
return pNewCrsr;
}
-
bool SwUnoCrsr::IsReadOnlyAvailable() const
{
return true;
@@ -186,8 +185,6 @@ sal_Bool SwUnoCrsr::IsSelOvr( int eFlags )
return SwCursor::IsSelOvr( eFlags );
}
-
-
SwUnoTableCrsr::SwUnoTableCrsr(const SwPosition& rPos)
: SwCursor(rPos,0,false), SwUnoCrsr(rPos), SwTableCursor(rPos), aTblSel(rPos,0,false)
{
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 0dd5300..b2d4801 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -63,8 +63,6 @@ SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
m_aTxtCrsr.SetWidth( 0 );
}
-
-
SwVisCrsr::~SwVisCrsr()
{
if( m_bIsVisible && m_aTxtCrsr.IsVisible() )
@@ -73,9 +71,6 @@ SwVisCrsr::~SwVisCrsr()
m_pCrsrShell->GetWin()->SetCursor( 0 );
}
-
-
-
void SwVisCrsr::Show()
{
if( !m_bIsVisible )
@@ -88,8 +83,6 @@ void SwVisCrsr::Show()
}
}
-
-
void SwVisCrsr::Hide()
{
if( m_bIsVisible )
@@ -190,7 +183,6 @@ void SwVisCrsr::_SetPosAndShow()
}
}
-
SwSelPaintRects::SwSelPaintRects( const SwCrsrShell& rCSh )
: SwRects(),
pCShell( &rCSh ),
@@ -319,7 +311,6 @@ void SwSelPaintRects::Paint( const Rectangle& /*rRect*/ )
// nothing to do with overlays
}
-
// check current MapMode of the shell and set possibly the static members.
// Optional set the parameters pX, pY
void SwSelPaintRects::Get1PixelInLogic( const ViewShell& rSh,
@@ -346,20 +337,16 @@ void SwSelPaintRects::Get1PixelInLogic( const ViewShell& rSh,
*pY = nPixPtY;
}
-
-
SwShellCrsr::SwShellCrsr( const SwCrsrShell& rCShell, const SwPosition &rPos )
: SwCursor(rPos,0,false), SwSelPaintRects(rCShell), pPt(SwPaM::GetPoint())
{}
-
SwShellCrsr::SwShellCrsr( const SwCrsrShell& rCShell, const SwPosition &rPos,
const Point& rPtPos, SwPaM* pRing )
: SwCursor(rPos, pRing, false), SwSelPaintRects(rCShell), aMkPt(rPtPos),
aPtPt(rPtPos), pPt(SwPaM::GetPoint())
{}
-
SwShellCrsr::SwShellCrsr( SwShellCrsr& rICrsr )
: SwCursor(rICrsr), SwSelPaintRects(*rICrsr.GetShell()),
aMkPt(rICrsr.GetMkPos()), aPtPt(rICrsr.GetPtPos()), pPt(SwPaM::GetPoint())
@@ -367,7 +354,6 @@ SwShellCrsr::SwShellCrsr( SwShellCrsr& rICrsr )
SwShellCrsr::~SwShellCrsr() {}
-
bool SwShellCrsr::IsReadOnlyAvailable() const
{
return GetShell()->IsReadOnlyAvailable();
@@ -394,7 +380,6 @@ void SwShellCrsr::FillRects()
GetShell()->GetLayout()->CalcFrmRects( *this, GetShell()->IsTableMode() ); //swmod 071107//swmod 071225
}
-
void SwShellCrsr::Show()
{
SwShellCrsr * pTmp = this;
@@ -427,7 +412,6 @@ void SwShellCrsr::Invalidate( const SwRect& rRect )
while( this != pTmp );
}
-
void SwShellCrsr::Hide()
{
SwShellCrsr * pTmp = this;
@@ -441,7 +425,6 @@ SwCursor* SwShellCrsr::Create( SwPaM* pRing ) const
return new SwShellCrsr( *GetShell(), *GetPoint(), GetPtPos(), pRing );
}
-
short SwShellCrsr::MaxReplaceArived()
{
short nRet = RET_YES;
@@ -501,7 +484,6 @@ sal_Bool SwShellCrsr::IsAtValidPos( sal_Bool bPoint ) const
return SwCursor::IsAtValidPos( bPoint );
}
-
SwShellTableCrsr::SwShellTableCrsr( const SwCrsrShell& rCrsrSh,
const SwPosition& rPos )
: SwCursor(rPos,0,false), SwShellCrsr(rCrsrSh, rPos), SwTableCursor(rPos)
@@ -536,7 +518,6 @@ void SwShellTableCrsr::SaveTblBoxCntnt( const SwPosition* pPos )
SwShellCrsr::SaveTblBoxCntnt( pPos );
}
-
void SwShellTableCrsr::FillRects()
{
// Calculate the new rectangles. If the cursor is still "parked" do nothing
@@ -585,7 +566,6 @@ void SwShellTableCrsr::FillRects()
insert( begin(), aReg.begin(), aReg.end() );
}
-
// Check if the SPoint is within the Table-SSelection.
sal_Bool SwShellTableCrsr::IsInside( const Point& rPt ) const
{
More information about the Libreoffice-commits
mailing list