Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2879
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/2879/1
remove/add blank lines in sw/source/core
Change-Id: I4d0aa521fc4c24f954d2636aa68e968456a829e7
Signed-off-by: Philipp Riemer <ruderphilipp@gmail.com>
---
M sw/source/core/access/acccell.cxx
M sw/source/core/access/acccell.hxx
M sw/source/core/access/acccontext.cxx
M sw/source/core/access/acccontext.hxx
M sw/source/core/access/accdoc.cxx
M sw/source/core/access/accdoc.hxx
M sw/source/core/access/accembedded.hxx
M sw/source/core/access/accfootnote.hxx
M sw/source/core/access/accframe.hxx
M sw/source/core/access/accframebase.cxx
M sw/source/core/access/accframebase.hxx
M sw/source/core/access/accfrmobj.cxx
M sw/source/core/access/accfrmobj.hxx
M sw/source/core/access/accfrmobjmap.cxx
M sw/source/core/access/accfrmobjmap.hxx
M sw/source/core/access/accfrmobjslist.cxx
M sw/source/core/access/accfrmobjslist.hxx
M sw/source/core/access/accgraphic.hxx
M sw/source/core/access/accheaderfooter.hxx
M sw/source/core/access/acchyperlink.cxx
M sw/source/core/access/acchyperlink.hxx
M sw/source/core/access/acchypertextdata.hxx
M sw/source/core/access/accmap.cxx
M sw/source/core/access/accnotextframe.cxx
M sw/source/core/access/accnotextframe.hxx
M sw/source/core/access/accpage.cxx
M sw/source/core/access/accpage.hxx
M sw/source/core/access/accpara.cxx
M sw/source/core/access/accpara.hxx
M sw/source/core/access/accportions.cxx
M sw/source/core/access/accportions.hxx
M sw/source/core/access/accpreview.cxx
M sw/source/core/access/accpreview.hxx
M sw/source/core/access/accselectionhelper.cxx
M sw/source/core/access/accselectionhelper.hxx
M sw/source/core/access/acctable.cxx
M sw/source/core/access/acctable.hxx
M sw/source/core/access/acctextframe.cxx
M sw/source/core/access/acctextframe.hxx
M sw/source/core/access/parachangetrackinginfo.cxx
M sw/source/core/access/parachangetrackinginfo.hxx
M sw/source/core/access/textmarkuphelper.cxx
M sw/source/core/attr/calbck.cxx
M sw/source/core/attr/hints.cxx
M sw/source/core/bastyp/init.cxx
M sw/source/core/bastyp/swcache.cxx
M sw/source/core/bastyp/swrect.cxx
M sw/source/core/bastyp/tabcol.cxx
M sw/source/core/crsr/BlockCursor.cxx
M sw/source/core/crsr/IBlockCursor.hxx
M sw/source/core/crsr/bookmrk.cxx
M sw/source/core/crsr/callnk.cxx
M sw/source/core/crsr/callnk.hxx
M sw/source/core/crsr/crbm.cxx
M sw/source/core/crsr/crossrefbookmark.cxx
M sw/source/core/crsr/crsrsh.cxx
M sw/source/core/crsr/crstrvl.cxx
M sw/source/core/crsr/crstrvl1.cxx
M sw/source/core/crsr/findattr.cxx
M sw/source/core/crsr/findcoll.cxx
M sw/source/core/crsr/findfmt.cxx
M sw/source/core/crsr/findtxt.cxx
M sw/source/core/crsr/pam.cxx
M sw/source/core/crsr/paminit.cxx
M sw/source/core/crsr/swcrsr.cxx
M sw/source/core/crsr/trvlcol.cxx
M sw/source/core/crsr/trvlfnfl.cxx
M sw/source/core/crsr/trvlreg.cxx
M sw/source/core/crsr/trvltbl.cxx
M sw/source/core/crsr/unocrsr.cxx
M sw/source/core/crsr/viscrs.cxx
71 files changed, 42 insertions(+), 367 deletions(-)
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 8ac279b..f1bf980 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -257,7 +257,6 @@
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 d62e21c..feb789b 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 @@
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 @@
virtual ~SwAccessibleCell();
public:
-
SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrm *pCellFrm );
virtual sal_Bool HasCursor(); // required by map to remember that object
@@ -120,7 +119,6 @@
virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( )
throw (::com::sun::star::uno::RuntimeException);
};
-
#endif
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 86f9da8..cf8a0f3 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -122,7 +122,6 @@
return pCrsrShell;
}
-
enum Action { NONE, SCROLLED, SCROLLED_WITHIN,
SCROLLED_IN, SCROLLED_OUT };
@@ -792,7 +791,6 @@
return xAcc;
}
-
/**
Get bounding box.
@@ -855,7 +853,6 @@
return aBox;
}
-
awt::Rectangle SAL_CALL SwAccessibleContext::getBounds()
throw (uno::RuntimeException)
{
@@ -871,8 +868,6 @@
return aPoint;
}
-
-
awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen()
throw (uno::RuntimeException)
{
@@ -886,7 +881,6 @@
return aPoint;
}
-
awt::Size SAL_CALL SwAccessibleContext::getSize()
throw (uno::RuntimeException)
@@ -938,7 +932,6 @@
}
}
-
uno::Any SAL_CALL SwAccessibleContext::getAccessibleKeyBinding()
throw (uno::RuntimeException)
{
@@ -957,7 +950,6 @@
{
return 0xffffff;
}
-
OUString SAL_CALL SwAccessibleContext::getImplementationName()
throw( uno::RuntimeException )
@@ -1444,6 +1436,7 @@
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 5cdc305..44ae9a2 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 @@
// 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 @@
virtual void _InvalidateFocus();
public:
-
void FireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventObject& rEvent );
protected:
-
// broadcast visual data event
void FireVisibleDataEvent();
@@ -194,7 +191,6 @@
virtual ~SwAccessibleContext();
public:
-
SwAccessibleContext( SwAccessibleMap *pMap, sal_Int16 nRole,
const SwFrm *pFrm );
@@ -303,7 +299,6 @@
virtual sal_Int32 SAL_CALL getBackground()
throw (::com::sun::star::uno::RuntimeException);
-
// XServiceInfo
/** Returns an identifier for the implementation of this object.
@@ -384,8 +379,6 @@
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 1847689..5230232 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>
@@ -39,7 +38,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;
@@ -146,7 +144,6 @@
return SwAccessibleContext::getAccessibleChild( nIndex );
}
-
uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessibleParent (void)
throw (uno::RuntimeException)
{
@@ -192,7 +189,6 @@
return aBox;
}
-
awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
throw (uno::RuntimeException)
{
@@ -208,7 +204,6 @@
return aLoc;
}
-
::com::sun::star::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen()
throw (uno::RuntimeException)
{
@@ -223,7 +218,6 @@
return aLoc;
}
-
::com::sun::star::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize()
throw (uno::RuntimeException)
@@ -288,7 +282,6 @@
// MULTISELECTABLE
rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
}
-
SwAccessibleDocument::SwAccessibleDocument ( SwAccessibleMap* pInitMap ) :
SwAccessibleDocumentBase( pInitMap ),
@@ -367,7 +360,6 @@
}
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 617bebf..2c80b22 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 @@
// base class for SwAccessibleDocument (in this same header file) and
// SwAccessiblePreview
-
class SwAccessibleDocumentBase : public SwAccessibleContext
{
::com::sun::star::uno::Reference<
@@ -37,11 +38,9 @@
using SwAccessibleFrame::SetVisArea;
protected:
-
virtual ~SwAccessibleDocumentBase();
public:
-
SwAccessibleDocumentBase( SwAccessibleMap* pInitMap );
void SetVisArea();
@@ -98,8 +97,6 @@
throw (::com::sun::star::uno::RuntimeException);
};
-
-
/**
* access to an accessible Writer document
*/
@@ -110,7 +107,6 @@
SwAccessibleSelectionHelper maSelectionHelper;
protected:
-
// Set states for getAccessibleStateSet.
// This drived class additinaly sets MULTISELECTABLE(1)
virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
@@ -118,7 +114,6 @@
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 402b757..2f77e96 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 );
@@ -53,7 +52,6 @@
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
};
-
#endif
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index a2030db..71d47cf 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,18 +28,14 @@
class SwAccessibleFootnote : public SwAccessibleContext
{
-
protected:
-
virtual ~SwAccessibleFootnote();
public:
-
SwAccessibleFootnote( SwAccessibleMap* pInitMap,
sal_Bool bIsEndnote,
sal_Int32 nFootEndNote,
const SwFtnFrm *pFtnFrm );
-
// XAccessibleContext
@@ -74,7 +70,6 @@
static sal_Bool IsEndnote( const SwFtnFrm *pFrm );
};
-
#endif
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 @@
sal_Bool bInPagePreview );
protected:
-
sal_Bool IsEditable( ViewShell *pVSh ) const;
sal_Bool IsOpaque( ViewShell *pVSh ) const;
@@ -111,7 +111,6 @@
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,
@@ -140,7 +139,6 @@
{
return maVisArea;
}
-
String GetFormattedPageNumber() const;
};
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index c688991..6614e53 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -87,7 +87,6 @@
}
}
-
sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm )
{
sal_uInt8 nType = ND_TEXTNODE;
@@ -198,7 +197,6 @@
osl::MutexGuard aGuard( aMutex );
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 @@
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 @@
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
-
SwAccessibleFrameBase( SwAccessibleMap* pInitMap,
sal_Int16 nInitRole,
const SwFlyFrm *pFlyFrm );
@@ -58,7 +55,6 @@
// The object is not visible an longer and should be destroyed
virtual void Dispose( sal_Bool bRecursive = sal_False );
};
-
#endif
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>
@@ -67,7 +66,6 @@
{
Init( pWindow );
}
-
SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
const SdrObject* pDrawObj,
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
@@ -77,7 +78,6 @@
void Init( const SwFrm* pFrm );
void Init( Window* pWindow );
};
-
} } // eof of namespace sw::access
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index cd71ebc..16d639d 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 @@
}
private:
-
LayerId eLayerId;
sal_uInt32 nOrdNum;
@@ -75,7 +73,6 @@
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 @@
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 @@
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 11aa87c..f20c31b 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 );
@@ -56,7 +55,6 @@
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
};
-
#endif
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index e5f37a6..fbe7fdc 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,18 +27,14 @@
class SwAccessibleHeaderFooter : public SwAccessibleContext
{
-
protected:
-
virtual ~SwAccessibleHeaderFooter();
public:
-
SwAccessibleHeaderFooter( SwAccessibleMap* pInitMap,
const SwHeaderFrm* pHdFrm );
SwAccessibleHeaderFooter( SwAccessibleMap* pInitMap,
const SwFooterFrm* pFtFrm );
-
// XAccessibleContext
@@ -69,7 +67,6 @@
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
};
-
#endif
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 3d0a05d..9299a28 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -57,7 +57,6 @@
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 e23c5d2..7163d14 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 @@
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 9193396..ae3a837 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -104,10 +104,9 @@
SdrModel *mpDrawModel;
protected:
virtual ~SwDrawModellListener_Impl();
+
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);
@@ -440,7 +439,6 @@
{
return mnStates;
}
-
};
typedef ::std::list < SwAccessibleEvent_Impl > _SwAccessibleEventList_Impl;
@@ -450,7 +448,6 @@
bool mbFiring;
public:
-
SwAccessibleEventList_Impl()
: mbFiring( false )
{}
@@ -481,7 +478,6 @@
class SwShapeList_Impl: public _SwShapeList_Impl
{
public:
-
SwShapeList_Impl() {}
};
@@ -503,6 +499,7 @@
return p1 < p2;
}
};
+
typedef ::std::map < SwAccessibleChild, SwAccessibleEventList_Impl::iterator,
SwAccessibleChildFunc > _SwAccessibleEventMap_Impl;
@@ -2255,12 +2252,10 @@
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 d86aec4..076bd14 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -198,7 +198,6 @@
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 19329fc..72c574c 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 @@
::rtl::OUString msDesc;
protected:
-
virtual ~SwAccessibleNoTextFrame();
const SwNoTxtNode *GetNoTxtNode() const;
@@ -40,7 +41,6 @@
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
-
SwAccessibleNoTextFrame( SwAccessibleMap* pInitMap,
sal_Int16 nInitRole,
const SwFlyFrm *pFlyFrm );
@@ -90,7 +90,6 @@
// The object is not visible an longer and should be destroyed
virtual void Dispose( sal_Bool bRecursive = sal_False );
};
-
#endif
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 861e557..df322d1 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -36,7 +36,6 @@
using uno::Sequence;
using ::rtl::OUString;
-
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 077c567..6a0dd73 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.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 _ACCPAGE_HXX
#define _ACCPAGE_HXX
#include "acccontext.hxx"
-
/**
* accessibility implementation for the page (SwPageFrm)
@@ -38,7 +38,6 @@
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 a1c2829..06d16d0 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 @@
class XText;
}
} } }
-
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleParagraphView";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView";
@@ -733,7 +731,6 @@
return bRet;
}
-
sal_Bool SwAccessibleParagraph::GetTextBoundary(
i18n::Boundary& rBound,
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index a1b426e..58bb241 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.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 _ACCPARA_HXX
#define _ACCPARA_HXX
@@ -37,7 +38,6 @@
class SwAccessibleHyperTextData;
class SwXTextPortion;
class SwParaChangeTrackingInfo; //#i108125#
-
namespace rtl { class OUString; }
namespace com { namespace sun { namespace star {
namespace i18n { struct Boundary; }
@@ -110,7 +110,6 @@
// be selected)
SwXTextPortion* CreateUnoPortion( sal_Int32 nStart, sal_Int32 nEnd );
-
// methods for checking the parameter range:
// does nPos point to a char?
@@ -142,11 +141,9 @@
tAccParaPropValMap& rRunAttrSeq );
public:
-
sal_Bool IsHeading() const;
protected:
-
// Set states for getAccessibleStateSet.
// This drived class additinaly sets MULTILINE(1), MULTISELECTABLE(+),
// FOCUSABLE(+) and FOCUSED(+)
@@ -218,7 +215,6 @@
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew);
public:
-
SwAccessibleParagraph( SwAccessibleMap& rInitMap,
const SwTxtFrm& rTxtFrm );
@@ -272,7 +268,6 @@
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
-
// XInterface
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 692b04e..96ee1f1 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -281,7 +281,6 @@
return sAccessibleString;
}
-
void SwAccessiblePortionData::GetLineBoundary(
Boundary& rBound,
sal_Int32 nPos ) const
@@ -374,7 +373,6 @@
rBound.startPos = rPositions[nPos];
rBound.endPos = rPositions[nPos+1];
}
-
size_t SwAccessiblePortionData::FindBreak(
const Positions_t& rPositions,
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index 021b338..3c67c72 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 @@
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 @@
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,
@@ -160,7 +160,6 @@
sal_uInt16 GetFirstValidCorePosition() const;
sal_uInt16 GetLastValidCorePosition() const;
};
-
#endif
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 79a496e..cafa70f 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 c699054..6a246a8 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,10 +35,7 @@
virtual ~SwAccessiblePreview();
public:
-
SwAccessiblePreview( SwAccessibleMap *pMap );
-
-
//===== XServiceInfo ====================================================
diff --git a/sw/source/core/access/accselectionhelper.cxx
b/sw/source/core/access/accselectionhelper.cxx
index 13397a6..6e4759d 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,17 +16,19 @@
* 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
{
/// the context on which this helper works
SwAccessibleContext& rContext;
-
/// get FE-Shell
SwFEShell* GetFEShell();
@@ -35,10 +37,8 @@
throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
public:
-
SwAccessibleSelectionHelper( SwAccessibleContext& rContext );
~SwAccessibleSelectionHelper();
-
//===== XAccessibleSelection ============================================
@@ -67,7 +67,6 @@
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
};
-
#endif
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 05569cc..21a2561 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -71,7 +71,6 @@
~SwAccTableSelHander_Impl() {}
};
-
//------------------------------------------------------------------------------
class SwAccessibleTableData_Impl
@@ -515,7 +514,6 @@
sal_Int32 nCount;
public:
-
inline SwAccAllTableSelHander_Impl( sal_Int32 nSize );
uno::Sequence < sal_Int32 > GetSelSequence();
@@ -604,7 +602,6 @@
FireAccessibleEvent( aEvent );
}
-
const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int32 nChildIndex ) const
{
@@ -1271,7 +1268,6 @@
return nRet;
}
-
OUString SAL_CALL SwAccessibleTable::getImplementationName()
throw( uno::RuntimeException )
{
@@ -1371,7 +1367,6 @@
SwAccessibleContext::InvalidateChildPosOrSize( rChildFrmOrObj, rOldBox );
}
-
//
// XAccessibleSelection
//
@@ -1454,7 +1449,6 @@
}
}
-
sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected(
sal_Int32 nChildIndex )
@@ -1697,7 +1691,6 @@
}
//===== XServiceInfo ====================================================
-
OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName (void)
throw (uno::RuntimeException)
{
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index 3db34e4..1c349b1 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 @@
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 @@
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
-
SwAccessibleTable( SwAccessibleMap* pInitMap, const SwTabFrm* pTableFrm );
//===== XInterface ======================================================
@@ -261,7 +261,6 @@
class SwAccessibleTableColHeaders : public SwAccessibleTable
{
protected:
-
virtual ~SwAccessibleTableColHeaders()
{}
@@ -269,7 +268,6 @@
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 e6a96b2..3ed30fc 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>
@@ -157,6 +156,7 @@
return SwAccessibleFrameBase::getAccessibleName();
}
+
OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
@@ -205,11 +205,9 @@
return theSwAccessibleTextFrameImplementationId::get().getSeq();
}
-
//
// XAccessibleRelationSet
//
-
SwFlyFrm* SwAccessibleTextFrame::getFlyFrm() const
{
@@ -231,7 +229,6 @@
aSequence[0] = GetMap()->GetContext( pFrm );
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 e81a2f0..d93fed3 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 @@
::rtl::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 @@
//====== 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,13 +90,11 @@
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
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx
b/sw/source/core/access/parachangetrackinginfo.cxx
index 70d5b97..190ebe8 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>
@@ -151,7 +150,6 @@
, mpChangeTrackFormatChangeTextMarkupList( 0 )
{
}
-
SwParaChangeTrackingInfo::~SwParaChangeTrackingInfo()
{
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 a7118d3..0a1f215 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <textmarkuphelper.hxx>
#include <accportions.hxx>
#include <vector>
#include <algorithm>
#include <comphelper/stlunosequence.hxx>
-
#include <com/sun/star/text/TextMarkupType.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
@@ -108,6 +106,7 @@
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 @@
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 @@
{
}
-
/** 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 c8ab4d8..1a202fe 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -778,7 +778,6 @@
delete SwStyleNameMapper::pFrameProgMap;
delete SwStyleNameMapper::pNumRuleProgMap;
-
// delete all default attributes
SfxPoolItem* pHt;
for( sal_uInt16 n = 0; n < POOLATTR_END - POOLATTR_BEGIN; n++ )
@@ -840,6 +839,7 @@
}
return *pCollator;
}
+
CollatorWrapper& GetAppCaseCollator()
{
if( !pCaseCollator )
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 7fc8909..a26e7df 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -65,7 +65,6 @@
#define CHECK
#endif
-
SwCache::SwCache( const sal_uInt16 nInitSize
#ifdef DBG_UTIL
, const rtl::OString &rNm
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index 40db66c..42ee73d 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -127,7 +127,6 @@
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 @@
*/
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 09f3438..412b3a4 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;
@@ -191,7 +190,6 @@
// putting the counter in front of the random parts will speed up string comparisons
return aResult.append(nCount++).append(sUniquePostfix).makeStringAndClear();
}
-
void MarkBase::Modify( const SfxPoolItem *pOld, const SfxPoolItem *pNew )
{
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index eb2afe5..6419143 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 ),
@@ -46,7 +45,6 @@
bHasSelection( bAktSelection )
{
}
-
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
@@ -43,8 +44,6 @@
static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, xub_StrLen nCntPos, sal_Bool
bCalcFrm );
};
-
-
#endif // _CALLNK_HXX
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 8716f18..e186a1a 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -68,7 +68,6 @@
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 0e8a08d..201abd0 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 8f0c03c..a1eb110 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,13 +66,11 @@
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.
@@ -114,10 +111,6 @@
// -----------
// SwCrsrShell
// -----------
-
-
-
-
SwPaM * SwCrsrShell::CreateCrsr()
{
// don't create Crsr in a table Selection (sic!)
@@ -136,7 +129,6 @@
UpdateCrsr( SwCrsrShell::SCROLLWIN );
return pNew;
}
-
/**
* Delete current Cursor, making the following one the current.
@@ -159,7 +151,6 @@
UpdateCrsr();
return true;
}
-
/**
* Create and return a new shell cursor.
@@ -215,7 +206,6 @@
return pCurCrsr;
}
-
void SwCrsrShell::StartAction()
{
if( !ActionPend() )
@@ -233,7 +223,6 @@
}
ViewShell::StartAction(); // to the ViewShell
}
-
void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
{
@@ -315,9 +304,7 @@
}
}
-
#ifdef DBG_UTIL
-
void SwCrsrShell::SttCrsrMove()
{
OSL_ENSURE( nCrsrMove < USHRT_MAX, "To many nested CrsrMoves." );
@@ -332,9 +319,7 @@
if( !--nCrsrMove )
bInCMvVisportChgd = sal_False;
}
-
#endif
-
sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
sal_Bool bVisualAllowed )
@@ -511,7 +496,6 @@
return pTmpCrsr->IsAtLeftRightMargin( bLeft, bAPI );
}
-
sal_Bool SwCrsrShell::SttEndDoc( sal_Bool bStt )
{
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
@@ -570,7 +554,6 @@
return bRet;
}
-
sal_Bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
{
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
@@ -580,7 +563,6 @@
UpdateCrsr();
return bRet;
}
-
sal_Bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
SwPosSection fnPosSect)
@@ -594,9 +576,7 @@
}
-
// position cursor
-
static SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
{
@@ -757,7 +737,6 @@
return bRet;
}
-
void SwCrsrShell::TblCrsrToCursor()
{
OSL_ENSURE( pTblCrsr, "TblCrsrToCursor: Why?" );
@@ -838,7 +817,6 @@
}
}
-
void SwCrsrShell::NormalizePam(sal_Bool bPointFirst)
{
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
@@ -899,7 +877,6 @@
return sal_False;
}
-
void SwCrsrShell::KillPams()
{
// Does any exist for deletion?
@@ -931,7 +908,6 @@
}
UpdateCrsr( SwCrsrShell::SCROLLWIN );
}
-
int SwCrsrShell::CompareCursor( CrsrCompareType eType ) const
{
@@ -979,14 +955,11 @@
return nRet;
}
-
bool SwCrsrShell::IsSttPara() const
{ return pCurCrsr->GetPoint()->nContent == 0; }
-
bool SwCrsrShell::IsEndPara() const
{ return pCurCrsr->GetPoint()->nContent == pCurCrsr->GetCntntNode()->Len(); }
-
bool SwCrsrShell::IsInFrontOfLabel() const
{
@@ -1017,7 +990,6 @@
return bRet;
}
-
void SwCrsrShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
sal_Bool bAtCrsrPos, const sal_Bool bCalcFrm )
{
@@ -1037,7 +1009,6 @@
rnPhyNum = pPg? pPg->GetPhyPageNum() : 1;
rnVirtNum = pPg? pPg->GetVirtPageNum() : 1;
}
-
sal_uInt16 SwCrsrShell::GetNextPrevPageNum( sal_Bool bNext )
{
@@ -1077,7 +1048,6 @@
// pPg has to exist with a default of 1 for the special case "Writerstart"
return pPg ? pPg->GetPhyPageNum() : USHRT_MAX;
}
-
sal_uInt16 SwCrsrShell::GetPageCnt()
{
@@ -1127,7 +1097,6 @@
return sal_True;
}
-
void SwCrsrShell::Paint( const Rectangle &rRect)
{
SET_CURR_SHELL( this );
@@ -1163,8 +1132,6 @@
if( bSVCrsrVis && bVis ) // also show SV cursor again
pVisCrsr->Show();
}
-
-
void SwCrsrShell::VisPortChgd( const SwRect & rRect )
{
@@ -1544,7 +1511,6 @@
pCmp = static_cast<SwPaM*>( pCmp->GetNext() );
}
while( pCmp != pCurCrsr );
-
SwRect aOld( aCharRect );
bool bFirst = true;
@@ -1968,7 +1934,6 @@
}
}
-
void SwCrsrShell::HideCrsrs()
{
if( !bHasFocus || bBasicHideCrsr )
@@ -1985,8 +1950,6 @@
pAktCrsr->Hide();
}
-
-
void SwCrsrShell::ShowCrsrs( sal_Bool bCrsrVis )
{
if( !bHasFocus || bAllProtect || bBasicHideCrsr )
@@ -2000,8 +1963,6 @@
pVisCrsr->Show();
}
-
-
void SwCrsrShell::ShowCrsr()
{
if( !bBasicHideCrsr )
@@ -2010,7 +1971,6 @@
UpdateCrsr();
}
}
-
void SwCrsrShell::HideCrsr()
{
@@ -2023,14 +1983,12 @@
}
}
-
void SwCrsrShell::ShLooseFcs()
{
if( !bBasicHideCrsr )
HideCrsrs();
bHasFocus = sal_False;
}
-
void SwCrsrShell::ShGetFcs( sal_Bool bUpdate )
{
@@ -2108,7 +2066,6 @@
*pCrsr->GetPoint() != *pCrsr->GetMark())
? sal_True : sal_False );
}
-
void SwCrsrShell::CallChgLnk()
{
@@ -2308,7 +2265,6 @@
return n;
}
-
sal_Bool SwCrsrShell::IsStartOfDoc() const
{
if( pCurCrsr->GetPoint()->nContent.GetIndex() )
@@ -2320,7 +2276,6 @@
GetDoc()->GetNodes().GoNext( &aIdx );
return aIdx == pCurCrsr->GetPoint()->nNode;
}
-
sal_Bool SwCrsrShell::IsEndOfDoc() const
{
@@ -2486,7 +2441,6 @@
delete pNew;
}
-
/** Copy constructor
Copy cursor position and add it to the ring.
@@ -2546,8 +2500,6 @@
pVisCrsr = new SwVisCrsr( this );
mbMacroExecAllowed = true;
}
-
-
SwCrsrShell::~SwCrsrShell()
{
@@ -2828,7 +2780,6 @@
}
return bOk;
}
-
sal_Bool SwCrsrShell::IsCrsrReadonly() const
{
@@ -3370,6 +3321,5 @@
}
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 9747423..41216bb 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -107,7 +107,6 @@
return bRet;
}
-
bool SwCrsrShell::GotoPrevNum()
{
bool bRet = GetDoc()->GotoPrevNum( *pCurCrsr->GetPoint() );
@@ -619,7 +618,6 @@
}
}
-
sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext,
sal_uInt16 nSubType, sal_uInt16 nResType )
{
@@ -747,7 +745,6 @@
return bRet;
}
-
sal_Bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
{
sal_Bool bRet = sal_False;
@@ -770,7 +767,6 @@
return bRet;
}
-
void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
{
SwCursor* pCrsr = getShellCrsr( true );
@@ -787,7 +783,6 @@
if( !pCrsr->IsSelOvr() )
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
}
-
bool SwCrsrShell::GotoOutline( const String& rName )
{
@@ -888,7 +883,6 @@
return USHRT_MAX; // no more left
}
-
sal_Bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
sal_Bool bWithChildren )
{
@@ -946,7 +940,6 @@
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
return bRet;
}
-
/// jump to reference marker
sal_Bool SwCrsrShell::GotoRefMark( const String& rRefMark, sal_uInt16 nSubType,
@@ -1634,7 +1627,6 @@
return bRet;
}
-
bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
{
bool bRet = false;
@@ -1655,7 +1647,6 @@
}
return bRet;
}
-
const SwFmtINetFmt* SwCrsrShell::FindINetAttr( const String& rName ) const
{
@@ -2038,7 +2029,6 @@
}
return pFnd;
}
-
bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
{
diff --git a/sw/source/core/crsr/crstrvl1.cxx b/sw/source/core/crsr/crstrvl1.cxx
index 27a3bce..210ab40 100644
--- a/sw/source/core/crsr/crstrvl1.cxx
+++ b/sw/source/core/crsr/crstrvl1.cxx
@@ -46,7 +46,6 @@
return 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 3a9a791..95e07d8 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 @@
return rItem1 == rItem2;
}
-
const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
xub_StrLen nCntntPos )
{
@@ -82,7 +80,6 @@
}
return 0; // invalid text attribute
}
-
const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
xub_StrLen nCntntPos )
@@ -198,8 +195,6 @@
int SetAttrFwd( const SwTxtAttr& rAttr );
int SetAttrBwd( const SwTxtAttr& rAttr );
};
-
-
SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, int bFwd,
int bNoCollections )
@@ -461,7 +456,6 @@
return Found();
}
-
int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
{
_SwSrchChrAttr aTmp( rAttr.GetAttr(), *rAttr.GetStart(), *rAttr.GetAnyEnd() );
@@ -611,7 +605,6 @@
return Found();
}
-
xub_StrLen SwAttrCheckArr::Start() const
{
xub_StrLen nStart = nNdStt;
@@ -623,7 +616,6 @@
return nStart;
}
-
xub_StrLen SwAttrCheckArr::End() const
{
_SwSrchChrAttr* pArrPtr = pFndArr;
@@ -634,7 +626,6 @@
return nEnd;
}
-
int SwAttrCheckArr::CheckStack()
{
@@ -668,8 +659,6 @@
}
return nFound == aCmpSet.Count();
}
-
-
static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
SwPaM& rPam )
@@ -740,7 +729,6 @@
lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_True );
return sal_True;
}
-
static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
SwPaM& rPam )
@@ -817,7 +805,6 @@
return sal_True;
}
-
static int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, sal_Bool bNoColls )
{
// search only hard attribution?
@@ -853,7 +840,6 @@
}
return sal_True; // found
}
-
sal_Bool SwPaM::Find( const SfxPoolItem& rAttr, sal_Bool bValue, SwMoveFn fnMove,
const SwPaM *pRegion, sal_Bool bInReadOnly )
@@ -937,7 +923,6 @@
delete pPam;
return bFound;
}
-
typedef int (*FnSearchAttr)( const SwTxtNode&, SwAttrCheckArr&, SwPaM& );
@@ -1053,7 +1038,6 @@
virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, sal_Bool bInReadOnly );
virtual int IsReplaceMode() const;
};
-
int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
sal_Bool bInReadOnly )
@@ -1194,7 +1178,6 @@
return FIND_FOUND;
}
-
int SwFindParaAttr::IsReplaceMode() const
{
return ( pSearchOpt && !pSearchOpt->replaceString.isEmpty() ) ||
@@ -1237,7 +1220,5 @@
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 @@
virtual int IsReplaceMode() const;
};
-
int SwFindParaFmtColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
sal_Bool bInReadOnly )
{
@@ -59,7 +57,6 @@
}
return nRet;
}
-
int SwFindParaFmtColl::IsReplaceMode() const
{
@@ -103,7 +100,5 @@
}
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 fc8396a..531534c 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>
-
sal_Bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
const SwPaM *pRegion, sal_Bool bInReadOnly )
{
@@ -69,6 +68,5 @@
delete pPam;
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 537292e..d21fd6b64 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>
@@ -614,12 +613,10 @@
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,
@@ -678,6 +675,5 @@
}
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 182521d..6dd1eb1 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -83,7 +83,6 @@
return *this;
}
-
bool SwPosition::operator<(const SwPosition &rPos) const
{
if( nNode < rPos.nNode )
@@ -105,7 +104,6 @@
}
return false;
}
-
bool SwPosition::operator>(const SwPosition &rPos) const
{
@@ -129,7 +127,6 @@
return false;
}
-
bool SwPosition::operator<=(const SwPosition &rPos) const
{
if(nNode < rPos.nNode )
@@ -151,7 +148,6 @@
}
return false;
}
-
bool SwPosition::operator>=(const SwPosition &rPos) const
{
@@ -175,7 +171,6 @@
return false;
}
-
bool SwPosition::operator==(const SwPosition &rPos) const
{
return (nNode == rPos.nNode)
@@ -183,7 +178,6 @@
&& (nContent.GetIdxReg() == rPos.nContent.GetIdxReg())
&& (nContent == rPos.nContent);
}
-
bool SwPosition::operator!=(const SwPosition &rPos) const
{
@@ -198,9 +192,7 @@
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 )
{
@@ -210,7 +202,6 @@
return( eSec == Chk_One ? Chk_Both : Chk_One );
return eSec;
}
-
static sal_Bool lcl_ChkOneRange( CHKSECTION eSec, sal_Bool bChkSections,
const SwNode& rBaseEnd, sal_uLong nStt, sal_uLong nEnd )
@@ -243,7 +234,6 @@
nSttIdx <= nEnd && nEnd <= nEndIdx ? sal_True : sal_False;
}
-
sal_Bool CheckNodesRange( const SwNodeIndex& rStt,
const SwNodeIndex& rEnd, sal_Bool bChkSection )
{
@@ -275,7 +265,6 @@
return sal_False; // somewhere in between => error
}
-
sal_Bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
{
if( pNd->IsCntntNode() )
@@ -283,14 +272,12 @@
return sal_False;
}
-
sal_Bool GoPrevious( SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
{
if( pNd->IsCntntNode() )
return ((SwCntntNode*)pNd)->GoPrevious( pIdx, nMode );
return sal_False;
}
-
SwCntntNode* GoNextNds( SwNodeIndex* pIdx, sal_Bool bChk )
{
@@ -307,7 +294,6 @@
return pNd;
}
-
SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, sal_Bool bChk )
{
SwNodeIndex aIdx( *pIdx );
@@ -322,7 +308,6 @@
}
return pNd;
}
-
SwPaM::SwPaM( const SwPosition& rPos, SwPaM* pRing )
: Ring( pRing )
@@ -481,7 +466,6 @@
}
#ifdef DBG_UTIL
-
void SwPaM::Exchange()
{
if (m_pPoint != m_pMark)
@@ -825,7 +809,6 @@
return pNd;
}
-
void GoStartDoc( SwPosition * pPos )
{
SwNodes& rNodes = pPos->nNode.GetNodes();
@@ -836,7 +819,6 @@
pCNd->MakeStartIndex( &pPos->nContent );
}
-
void GoEndDoc( SwPosition * pPos )
{
SwNodes& rNodes = pPos->nNode.GetNodes();
@@ -845,7 +827,6 @@
if( pCNd )
pCNd->MakeEndIndex( &pPos->nContent );
}
-
void GoStartSection( SwPosition * pPos )
{
@@ -875,21 +856,17 @@
pPos->nNode.GetNode().GetCntntNode()->MakeEndIndex( &pPos->nContent );
}
-
-
sal_Bool GoInDoc( SwPaM & rPam, SwMoveFn fnMove )
{
(*fnMove->fnDoc)( rPam.GetPoint() );
return sal_True;
}
-
sal_Bool GoInSection( SwPaM & rPam, SwMoveFn fnMove )
{
(*fnMove->fnSections)( (SwPosition*)rPam.GetPoint() );
return sal_True;
}
-
sal_Bool GoInNode( SwPaM & rPam, SwMoveFn fnMove )
{
@@ -899,7 +876,6 @@
::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
return 0 != pNd;
}
-
sal_Bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove )
{
@@ -933,10 +909,6 @@
return GoInNode( rPam, fnMove );
}
-
-
-
-
sal_Bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
{
if( rPam.Move( fnMoveBackward, fnGoNode ) )
@@ -950,7 +922,6 @@
}
return sal_False;
}
-
sal_Bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
{
@@ -980,7 +951,6 @@
return sal_False;
}
-
sal_Bool GoNextPara( SwPaM & rPam, SwPosPara aPosPara )
{
if( rPam.Move( fnMoveForward, fnGoNode ) )
@@ -994,8 +964,6 @@
}
return sal_False;
}
-
-
sal_Bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
{
@@ -1016,7 +984,6 @@
return aSavePos != rPos;
}
-
sal_Bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
{
SwPosition& rPos = *rPam.GetPoint();
@@ -1036,7 +1003,6 @@
::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
return sal_True;
}
-
sal_Bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
{
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index 2093c3e..20008d1 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -19,7 +19,6 @@
#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 0ee9974..47673b4 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 @@
}
}
}
-
}
const SwNode* pNd = &GetPoint()->nNode.GetNode();
@@ -487,7 +485,6 @@
#else
#define IDX aCellStt
#endif
-
sal_Bool SwCursor::IsInProtectTable( sal_Bool bMove, sal_Bool bChgCrsr )
{
@@ -701,7 +698,6 @@
? fnMoveForward : fnMoveBackward;
}
-
static sal_uLong lcl_FindSelection( SwFindParas& rParas, SwCursor* pCurCrsr,
SwMoveFn fnMove, SwCursor*& pFndRing,
SwPaM& aRegion, FindRanges eFndRngs,
@@ -826,7 +822,6 @@
return nFound;
}
-
static int lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
SwPaM& rPam, int bFirst )
{
@@ -858,7 +853,6 @@
return *rPam.GetMark() < *rPam.GetPoint();
}
-
static int lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
SwPaM& rPam, int bFirst )
@@ -1051,7 +1045,6 @@
return nFound;
}
-
void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
{
bool bIsStart = true;
@@ -1098,7 +1091,6 @@
{
return RET_YES;
}
-
sal_Bool SwCursor::IsStartWord( sal_Int16 nWordType ) const
{
@@ -1479,7 +1471,6 @@
return bRet;
}
-
sal_Bool SwCursor::ExpandToSentenceBorders()
{
sal_Bool bRes = sal_False;
@@ -1523,14 +1514,12 @@
return bRes;
}
-
sal_Bool SwTableCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 /*nMode*/,
sal_Bool /*bVisualAllowed*/, sal_Bool /*bSkipHidden*/, sal_Bool /*bInsertCrsr*/ )
{
return bLeft ? GoPrevCell( nCnt )
: GoNextCell( nCnt );
}
-
// calculate cursor bidi level: extracted from LeftRight()
const SwCntntFrm*
@@ -2039,7 +2028,6 @@
nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
}
-
sal_Bool SwCursor::MoveSection( SwWhichSection fnWhichSect,
SwPosSection fnPosSect)
{
@@ -2077,8 +2065,6 @@
}
}
-
-
SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing )
: SwCursor( rPos, pRing, false )
{
@@ -2089,7 +2075,6 @@
}
SwTableCursor::~SwTableCursor() {}
-
static bool
lcl_SeekEntry(const SwSelBoxes& rTmp, SwStartNode const*const pSrch,
@@ -2120,7 +2105,6 @@
}
return sal_False;
}
-
SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
{
@@ -2229,14 +2213,12 @@
return pAktCrsr;
}
-
void SwTableCursor::InsertBox( const SwTableBox& rTblBox )
{
SwTableBox* pBox = (SwTableBox*)&rTblBox;
m_SelectedBoxes.insert(pBox);
bChg = sal_True;
}
-
void SwTableCursor::DeleteBox(size_t const nPos)
{
@@ -2331,7 +2313,6 @@
bChg = sal_True;
bParked = sal_True;
}
-
sal_Bool SwTableCursor::HasReadOnlyBoxSel() const
{
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index 262ab7b..77331be 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,13 +32,11 @@
return (SwLayoutFrm*)pLayFrm;
}
-
SwLayoutFrm* GetNextColumn( const SwLayoutFrm* pLayFrm )
{
SwLayoutFrm* pActCol = GetCurrColumn( pLayFrm );
return pActCol ? (SwLayoutFrm*)pActCol->GetNext() : 0;
}
-
SwLayoutFrm* GetPrevColumn( const SwLayoutFrm* pLayFrm )
{
@@ -48,12 +44,10 @@
return pActCol ? (SwLayoutFrm*)pActCol->GetPrev() : 0;
}
-
SwCntntFrm* GetColumnStt( const SwLayoutFrm* pColFrm )
{
return pColFrm ? (SwCntntFrm*)pColFrm->ContainsCntnt() : 0;
}
-
SwCntntFrm* GetColumnEnd( const SwLayoutFrm* pColFrm )
{
@@ -70,13 +64,11 @@
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 )
{
@@ -115,7 +107,5 @@
}
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 5355769..52a5a10 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -121,7 +121,6 @@
return bRet;
}
-
sal_Bool SwCursor::GotoFtnAnchor()
{
// jump from footnote to anchor
@@ -336,8 +335,5 @@
SwCrsrShell::READONLY );
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 c917413..f84630f 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 )
{
@@ -82,7 +80,6 @@
} while( pNd );
return sal_False;
}
-
sal_Bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
sal_Bool bInReadOnly )
@@ -139,7 +136,6 @@
return sal_False;
}
-
sal_Bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
sal_Bool bInReadOnly )
{
@@ -170,7 +166,6 @@
}
return 0 != pCNd;
}
-
sal_Bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
sal_Bool bInReadOnly )
@@ -218,8 +213,6 @@
return sal_False;
}
-
-
sal_Bool SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
{
SwCrsrSaveState aSaveState( *this );
@@ -238,7 +231,6 @@
UpdateCrsr();
return bRet;
}
-
bool SwCursor::GotoRegion( const String& rName )
{
@@ -274,7 +266,5 @@
SwCrsrShell::READONLY );
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 57b944f..42591b8 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>
@@ -100,7 +99,6 @@
}
return bRet;
}
-
sal_Bool SwCrsrShell::GoPrevCell()
{
@@ -282,7 +280,6 @@
return sal_True;
}
-
sal_Bool SwCrsrShell::SelTblBox()
{
// if we're in a table, create a table cursor, and select the cell
@@ -303,7 +300,6 @@
if( pStartNode == NULL )
return sal_False;
-
SET_CURR_SHELL( this );
@@ -484,7 +480,6 @@
return true;
}
-
sal_Bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
sal_Bool bInReadOnly )
{
@@ -548,7 +543,6 @@
return sal_False;
}
-
sal_Bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
sal_Bool bInReadOnly )
{
@@ -601,7 +595,6 @@
return sal_False;
}
-
sal_Bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
sal_Bool bInReadOnly )
{
@@ -635,7 +628,6 @@
return sal_True;
}
-
sal_Bool SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
{
@@ -766,7 +758,6 @@
return sNm;
}
-
bool SwCrsrShell::GotoTable( const String& rName )
{
SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -779,7 +770,6 @@
}
return bRet;
}
-
sal_Bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
{
@@ -844,7 +834,6 @@
return 0 != pChkBox;
}
-
void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
{
if( IsSelTblCells() || !IsAutoUpdateCells() )
@@ -884,7 +873,6 @@
}
}
-
void SwCrsrShell::ClearTblBoxCntnt()
{
delete pBoxIdx, pBoxIdx = 0;
@@ -903,8 +891,5 @@
} while( this != (pSh = (ViewShell *)pSh->GetNext()) );
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 @@
return pNewCrsr;
}
-
bool SwUnoCrsr::IsReadOnlyAvailable() const
{
return true;
@@ -185,8 +184,6 @@
}
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 7566f40..cd04047 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -63,8 +63,6 @@
aTxtCrsr.SetWidth( 0 );
}
-
-
SwVisCrsr::~SwVisCrsr()
{
if( bIsVisible && aTxtCrsr.IsVisible() )
@@ -72,9 +70,6 @@
pCrsrShell->GetWin()->SetCursor( 0 );
}
-
-
-
void SwVisCrsr::Show()
{
@@ -87,8 +82,6 @@
_SetPosAndShow();
}
}
-
-
void SwVisCrsr::Hide()
{
@@ -189,7 +182,6 @@
aTxtCrsr.Show();
}
}
-
SwSelPaintRects::SwSelPaintRects( const SwCrsrShell& rCSh )
: SwRects(),
@@ -336,7 +328,6 @@
// 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,
@@ -363,12 +354,9 @@
*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 )
@@ -376,14 +364,12 @@
aPtPt(rPtPos), pPt(SwPaM::GetPoint())
{}
-
SwShellCrsr::SwShellCrsr( SwShellCrsr& rICrsr )
: SwCursor(rICrsr), SwSelPaintRects(*rICrsr.GetShell()),
aMkPt(rICrsr.GetMkPos()), aPtPt(rICrsr.GetPtPos()), pPt(SwPaM::GetPoint())
{}
SwShellCrsr::~SwShellCrsr() {}
-
bool SwShellCrsr::IsReadOnlyAvailable() const
{
@@ -410,7 +396,6 @@
GetMark()->nNode.GetNode().GetCntntNode()->getLayoutFrm( GetShell()->GetLayout() ) ) ))
GetShell()->GetLayout()->CalcFrmRects( *this, GetShell()->IsTableMode() ); //swmod
071107//swmod 071225
}
-
void SwShellCrsr::Show()
{
@@ -444,7 +429,6 @@
while( this != pTmp );
}
-
void SwShellCrsr::Hide()
{
SwShellCrsr * pTmp = this;
@@ -457,7 +441,6 @@
{
return new SwShellCrsr( *GetShell(), *GetPoint(), GetPtPos(), pRing );
}
-
short SwShellCrsr::MaxReplaceArived()
{
@@ -518,7 +501,6 @@
return SwCursor::IsAtValidPos( bPoint );
}
-
SwShellTableCrsr::SwShellTableCrsr( const SwCrsrShell& rCrsrSh,
const SwPosition& rPos )
: SwCursor(rPos,0,false), SwShellCrsr(rCrsrSh, rPos), SwTableCursor(rPos)
@@ -552,7 +534,6 @@
{
SwShellCrsr::SaveTblBoxCntnt( pPos );
}
-
void SwShellTableCrsr::FillRects()
{
@@ -601,7 +582,6 @@
aReg.Invert();
insert( begin(), aReg.begin(), aReg.end() );
}
-
// Check if the SPoint is within the Table-SSelection.
sal_Bool SwShellTableCrsr::IsInside( const Point& rPt ) const
--
To view, visit https://gerrit.libreoffice.org/2879
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d0aa521fc4c24f954d2636aa68e968456a829e7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer <ruderphilipp@gmail.com>
Context
- [PATCH] remove/add blank lines in sw/source/core · Philipp Riemer (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.