Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2776
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/2776/1
comment cleanups
hope this is helpful
Change-Id: Ib887329de1e5788b1a39139725dca0b3de25e81c
---
M sw/source/core/access/acccell.cxx
M sw/source/core/access/acccell.hxx
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/accgraphic.hxx
M sw/source/core/access/accheaderfooter.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.hxx
M sw/source/core/access/accpara.cxx
M sw/source/core/access/accpara.hxx
M sw/source/core/access/accportions.cxx
16 files changed, 135 insertions(+), 215 deletions(-)
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 43abdb3..8ac279b 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -258,7 +258,7 @@
}
-// ===== XAccessibleInterface ===========================================
+// XAccessibleInterface
uno::Any SwAccessibleCell::queryInterface( const uno::Type& rType )
throw( uno::RuntimeException )
@@ -276,7 +276,7 @@
}
}
-//====== XTypeProvider ====================================================
+// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL SwAccessibleCell::getTypes()
throw(uno::RuntimeException)
{
@@ -302,7 +302,7 @@
return theSwAccessibleCellImplementationId::get().getSeq();
}
-// ===== XAccessibleValue ===============================================
+// XAccessibleValue
SwFrmFmt* SwAccessibleCell::GetTblBoxFormat() const
{
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 99942c1..d62e21c 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -52,30 +52,27 @@
virtual sal_Bool HasCursor(); // required by map to remember that object
- //===== XAccessibleContext ==============================================
+ // XAccessibleContext
/// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
- //===== XServiceInfo ====================================================
+ // XServiceInfo
- /** Returns an identifier for the implementation of this object.
- */
+ // Returns an identifier for the implementation of this object.
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
- */
+ // Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
- /** Returns a list of all supported services. In this case that is just
- the AccessibleContext service.
- */
+ // Returns a list of all supported services. In this case that is just
+ // the AccessibleContext service.
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
@@ -84,7 +81,7 @@
virtual void InvalidatePosOrSize( const SwRect& rFrm );
- //===== XInterface ======================================================
+ // XInterface
// (XInterface methods need to be implemented to disambiguate
// between those inherited through SwAcessibleContext and
@@ -100,11 +97,11 @@
virtual void SAL_CALL release( ) throw ()
{ SwAccessibleContext::release(); };
- //====== XTypeProvider ====================================================
+ // XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
- //===== XAccessibleValue ================================================
+ // XAccessibleValue
private:
SwFrmFmt* GetTblBoxFormat() const;
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 5cce5bd..5cdc305 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -198,56 +198,56 @@
SwAccessibleContext( SwAccessibleMap *pMap, sal_Int16 nRole,
const SwFrm *pFrm );
- //===== XAccessible =====================================================
+ // XAccessible
- /// Return the XAccessibleContext.
+ // Return the XAccessibleContext.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext>
SAL_CALL
getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException);
- //===== XAccessibleContext ==============================================
+ // XAccessibleContext
- /// Return the number of currently visible children.
+ // Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ // Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>
SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IndexOutOfBoundsException);
- /// Return a reference to the parent.
+ // Return a reference to the parent.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>
SAL_CALL
getAccessibleParent (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this objects index among the parents children.
+ // Return this objects index among the parents children.
virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's role.
+ // Return this object's role.
virtual sal_Int16 SAL_CALL
getAccessibleRole (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's description.
+ // Return this object's description.
virtual OUString SAL_CALL
getAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ // Return the object's current name.
virtual OUString SAL_CALL
getAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return NULL to indicate that an empty relation set.
+ // Return NULL to indicate that an empty relation set.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the set of current states.
+ // Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet (void)
@@ -260,7 +260,7 @@
getLocale (void)
throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException,
::com::sun::star::uno::RuntimeException);
- //===== XAccessibleEventBroadcaster =====================================
+ // XAccessibleEventBroadcaster
virtual void SAL_CALL addAccessibleEventListener(
const ::com::sun::star::uno::Reference<
@@ -271,7 +271,7 @@
::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
throw (::com::sun::star::uno::RuntimeException);
- //===== XAccessibleComponent ============================================
+ // XAccessibleComponent
virtual sal_Bool SAL_CALL containsPoint(
const ::com::sun::star::awt::Point& aPoint )
throw (::com::sun::star::uno::RuntimeException);
@@ -304,7 +304,7 @@
throw (::com::sun::star::uno::RuntimeException);
- //===== XServiceInfo ====================================================
+ // XServiceInfo
/** Returns an identifier for the implementation of this object.
*/
@@ -325,7 +325,7 @@
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
- //====== thread safe C++ interface ========================================
+ // thread safe C++ interface
// The object is not visible an longer and should be destroyed
virtual void Dispose( sal_Bool bRecursive = sal_False );
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index f2ab001..1847689 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -47,12 +47,8 @@
using lang::IndexOutOfBoundsException;
-
-
-//
// SwAccessibleDocumentBase: base class for SwAccessibleDocument and
// SwAccessiblePreview
-//
SwAccessibleDocumentBase::SwAccessibleDocumentBase ( SwAccessibleMap *_pMap ) :
SwAccessibleContext( _pMap, AccessibleRole::DOCUMENT,
@@ -77,7 +73,7 @@
SwAccessibleFrame::SetVisArea( GetMap()->GetVisArea() );
// #i58139# - showing state of document view needs also be updated.
// Thus, call method <Scrolled(..)> instead of <ChildrenScrolled(..)>
-// ChildrenScrolled( GetFrm(), aOldVisArea );
+ // ChildrenScrolled( GetFrm(), aOldVisArea );
Scrolled( aOldVisArea );
}
}
@@ -282,9 +278,7 @@
return SwAccessibleContext::getAccessibleAtPoint( aPoint );
}
-//
// SwAccessibeDocument
-//
void SwAccessibleDocument::GetStates(
::utl::AccessibleStateSetHelper& rStateSet )
@@ -401,7 +395,7 @@
return aRet;
}
-//===== XInterface ======================================================
+// XInterface
uno::Any SwAccessibleDocument::queryInterface(
const uno::Type& rType )
@@ -418,7 +412,7 @@
return aRet;
}
-//====== XTypeProvider ====================================================
+// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes()
throw(uno::RuntimeException)
{
@@ -444,7 +438,7 @@
return theSwAccessibleDocumentImplementationId::get().getSeq();
}
-//===== XAccessibleSelection ============================================
+// XAccessibleSelection
void SwAccessibleDocument::selectAccessibleChild(
sal_Int32 nChildIndex )
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 4e3656f..617bebf 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -24,10 +24,9 @@
class VclSimpleEvent;
-/**
- * base class for SwAccessibleDocument (in this same header file) and
- * SwAccessiblePreview
- */
+// base class for SwAccessibleDocument (in this same header file) and
+// SwAccessiblePreview
+
class SwAccessibleDocumentBase : public SwAccessibleContext
{
::com::sun::star::uno::Reference<
@@ -50,33 +49,33 @@
virtual void AddChild( Window *pWin, sal_Bool bFireEvent = sal_True );
virtual void RemoveChild( Window *pWin );
- //===== XAccessibleContext ==============================================
+ // XAccessibleContext
- /// Return the number of currently visible children.
+ // Return the number of currently visible children.
virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ // Return the specified child or NULL if index is invalid.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>
SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IndexOutOfBoundsException);
- /// Return a reference to the parent.
+ // Return a reference to the parent.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>
SAL_CALL
getAccessibleParent (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this objects index among the parents children.
+ // Return this objects index among the parents children.
virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent (void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's description.
+ // Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException);
- //===== XAccessibleComponent ==============================================
+ // XAccessibleComponent
virtual sal_Bool SAL_CALL containsPoint(
const ::com::sun::star::awt::Point& aPoint )
throw (::com::sun::star::uno::RuntimeException);
@@ -124,28 +123,25 @@
DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
- //===== XServiceInfo ====================================================
+ // XServiceInfo
- /** Returns an identifier for the implementation of this object.
- */
+ // Returns an identifier for the implementation of this object.
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
- */
+ // Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
- /** Returns a list of all supported services. In this case that is just
- the AccessibleContext service.
- */
+ // Returns a list of all supported services. In this case that is just
+ // the AccessibleContext service.
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
- //===== XInterface ======================================================
+ // XInterface
// XInterface is inherited through SwAcessibleContext and
// XAccessibleSelection. These methods are needed to avoid
@@ -161,11 +157,11 @@
virtual void SAL_CALL release( ) throw ()
{ SwAccessibleContext::release(); };
- //====== XTypeProvider ====================================================
+ // XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
- //===== XAccessibleSelection ============================================
+ // XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
@@ -193,7 +189,7 @@
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
- //====== thread safe C++ interface ========================================
+ // thread safe C++ interface
// The object is not visible an longer and should be destroyed
virtual void Dispose( sal_Bool bRecursive = sal_False );
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index 829dee0..402b757 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -32,28 +32,25 @@
SwAccessibleEmbeddedObject( SwAccessibleMap* pInitMap,
const SwFlyFrm* pFlyFrm );
- //===== XServiceInfo ====================================================
+ // XServiceInfo
- /** Returns an identifier for the implementation of this object.
- */
+ // Returns an identifier for the implementation of this object.
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
- */
+ // Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
- /** Returns a list of all supported services. In this case that is just
- the AccessibleContext service.
- */
+ // Returns a list of all supported services. In this case that is just
+ // the AccessibleContext service.
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
- //===== XTypeProvider ====================================================
+ // XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index a227cae..a2030db 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -41,14 +41,14 @@
const SwFtnFrm *pFtnFrm );
- //===== XAccessibleContext ==============================================
+ // XAccessibleContext
/// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
- //===== XServiceInfo ====================================================
+ // XServiceInfo
/** Returns an identifier for the implementation of this object.
*/
@@ -69,7 +69,7 @@
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
- //===== XTypeProvider ====================================================
+ // XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
static sal_Bool IsEndnote( const SwFtnFrm *pFrm );
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index 389564f..11aa87c 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -32,7 +32,7 @@
SwAccessibleGraphic( SwAccessibleMap* pInitMap,
const SwFlyFrm *pFlyFrm );
- //===== XServiceInfo ====================================================
+ // XServiceInfo
/** Returns an identifier for the implementation of this object.
*/
@@ -53,7 +53,7 @@
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
- //===== XTypeProvider ====================================================
+ // XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index d9cfb2e..e5f37a6 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -38,14 +38,14 @@
const SwFooterFrm* pFtFrm );
- //===== XAccessibleContext ==============================================
+ // XAccessibleContext
/// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
- //===== XServiceInfo ====================================================
+ // XServiceInfo
/** Returns an identifier for the implementation of this object.
*/
@@ -66,7 +66,7 @@
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
- //===== XTypeProvider ====================================================
+ // XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 3a50c9f..9193396 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -96,7 +96,6 @@
};
-//------------------------------------------------------------------------------
class SwDrawModellListener_Impl : public SfxListener,
public ::cppu::WeakImplHelper1< document::XEventBroadcaster >
{
@@ -186,7 +185,6 @@
mpDrawModel = 0;
}
-//------------------------------------------------------------------------------
struct SwShapeFunc
{
bool operator()( const SdrObject * p1,
@@ -292,7 +290,6 @@
return pShapes;
}
-//------------------------------------------------------------------------------
struct SwAccessibleEvent_Impl
{
public:
@@ -446,7 +443,6 @@
};
-//------------------------------------------------------------------------------
typedef ::std::list < SwAccessibleEvent_Impl > _SwAccessibleEventList_Impl;
class SwAccessibleEventList_Impl: public _SwAccessibleEventList_Impl
@@ -469,7 +465,6 @@
}
};
-//------------------------------------------------------------------------------
// The shape list is filled if an accessible shape is destroyed. It
// simply keeps a reference to the accessible shape's XShape. These
// references are destroyed within the EndAction when firing events,
@@ -490,8 +485,6 @@
SwShapeList_Impl() {}
};
-
-//------------------------------------------------------------------------------
struct SwAccessibleChildFunc
{
bool operator()( const SwAccessibleChild& r1,
@@ -516,8 +509,6 @@
class SwAccessibleEventMap_Impl: public _SwAccessibleEventMap_Impl
{
};
-
-//------------------------------------------------------------------------------
struct SwAccessibleParaSelection
{
@@ -744,7 +735,6 @@
_iorLogicPgSwRect.Bottom( _iorLogicPgSwRect.Bottom() - nTmpDiff );
}
-//------------------------------------------------------------------------------
static bool AreInSameTable( const uno::Reference< XAccessible >& rAcc,
const SwFrm *pFrm )
{
@@ -1101,7 +1091,6 @@
SwAccessibleObjShape_Impl *pSelShape = 0;
size_t nShapes = 0;
-
{
osl::MutexGuard aGuard( maMutex );
if( mpShapeMap )
@@ -1130,7 +1119,6 @@
delete[] pShapes;
}
}
-
SwAccessibleMap::SwAccessibleMap( ViewShell *pSh ) :
mpFrmMap( 0 ),
@@ -1554,7 +1542,6 @@
return xAccImpl;
}
-
void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
{
osl::MutexGuard aGuard( maMutex );
@@ -1616,7 +1603,6 @@
}
}
}
-
void SwAccessibleMap::Dispose( const SwFrm *pFrm,
const SdrObject *pObj,
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index eddcc3b..d86aec4 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -181,11 +181,7 @@
return msDesc;
}
-
-
-//
// XInterface
-//
uno::Any SAL_CALL SwAccessibleNoTextFrame::queryInterface( const uno::Type& aType )
throw (uno::RuntimeException)
@@ -203,7 +199,8 @@
}
-//====== XTypeProvider ====================================================
+// XTypeProvider
+
uno::Sequence< uno::Type > SAL_CALL SwAccessibleNoTextFrame::getTypes()
throw(uno::RuntimeException)
{
uno::Sequence< uno::Type > aTypes( SwAccessibleFrameBase::getTypes() );
@@ -217,14 +214,10 @@
return aTypes;
}
-
-//
-// XAccessibleImage
-//
-
-// implementation of the XAccessibleImage methods is a no-brainer, as
-// all releveant information is already accessible through other
-// methods. So we just delegate to those.
+/// XAccessibleImage
+/** implementation of the XAccessibleImage methods is a no-brainer, as
+ all releveant information is already accessible through other
+ methods. So we just delegate to those. */
OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageDescription()
throw ( uno::RuntimeException )
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 3cdebfe..19329fc 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -45,7 +45,7 @@
sal_Int16 nInitRole,
const SwFlyFrm *pFlyFrm );
- //===== XAccessibleContext ==============================================
+ // XAccessibleContext
// #i73249# - Return the object's current name.
virtual ::rtl::OUString SAL_CALL
@@ -56,8 +56,6 @@
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
-
- //===== XInterface ======================================================
// XInterface methods need to be implemented to disambiguate
// between those inherited through SwAcessibleContext and
@@ -73,11 +71,10 @@
virtual void SAL_CALL release( ) throw ()
{ SwAccessibleContext::release(); };
- //====== XTypeProvider ====================================================
+ // XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException);
- //===== XAccessibleImage ================================================
-
+ // XAccessibleImage
virtual ::rtl::OUString SAL_CALL
getAccessibleImageDescription( )
throw ( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index 09dc0c8..077c567 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -57,18 +57,12 @@
// may only be called with SwPageFrm argument
SwAccessiblePage( SwAccessibleMap* pInitMap, const SwFrm* pFrame );
-
-
- //
// XAccessibleContext methods that need to be overridden
- //
virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException);
- //
// XServiceInfo
- //
virtual ::rtl::OUString SAL_CALL getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
@@ -79,7 +73,7 @@
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
- //===== XTypeProvider ====================================================
+ // XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool HasCursor(); // required by map to remember that object
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index c4df0e2..a1c2829 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -388,7 +388,6 @@
bIsHeading = bNewIsHeading;
}
-
if( bNewIsHeading != bOldIsHeading || rText != sOldText )
{
OUString sNewDesc( GetDescription() );
@@ -437,7 +436,6 @@
// The cursor's node position is sumilated by the focus!
if( pWin && pWin->HasFocus() && -1 == nOld )
FireStateChangedEvent( AccessibleStateType::FOCUSED, sal_True );
-
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CARET_CHANGED;
@@ -531,7 +529,6 @@
pHyperTextData = 0;
}
-
void SwAccessibleParagraph::ExecuteAtViewShell( sal_uInt16 nSlot )
{
OSL_ENSURE( GetMap() != NULL, "no map?" );
@@ -587,10 +584,7 @@
return pPortion;
}
-
-//
// range checking for parameter
-//
sal_Bool SwAccessibleParagraph::IsValidChar(
sal_Int32 nPos, sal_Int32 nLength)
@@ -610,11 +604,7 @@
return IsValidPosition(nBegin, nLength) && IsValidPosition(nEnd, nLength);
}
-
-//
// text boundaries
-//
-
sal_Bool SwAccessibleParagraph::GetCharBoundary(
i18n::Boundary& rBound,
@@ -831,7 +821,7 @@
return aLoc;
}
-/** #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO */
+// #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO
uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccessibleRelationSet()
throw ( uno::RuntimeException )
{
@@ -896,15 +886,14 @@
// set PaM at cursor shell
Select( aPaM );
-
}
- /* ->#i13955# */
+ // ->#i13955#
Window * pWindow = GetWindow();
if (pWindow != NULL)
pWindow->GrabFocus();
- /* <-#i13955# */
+ // <-#i13955#
}
// #i71385#
@@ -999,9 +988,7 @@
return aRet;
}
-//
-//===== XInterface =======================================================
-//
+// XInterface
uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType )
throw (uno::RuntimeException)
@@ -1055,7 +1042,7 @@
return aRet;
}
-//====== XTypeProvider ====================================================
+// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno::RuntimeException)
{
uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() );
@@ -1088,10 +1075,7 @@
return theSwAccessibleParagraphImplementationId::get().getSeq();
}
-
-//
-//===== XAccesibleText ===================================================
-//
+// XAccesibleText
sal_Int32 SwAccessibleParagraph::getCaretPosition()
throw (uno::RuntimeException)
@@ -1241,7 +1225,7 @@
// attributes are the character attributes, which are set at the paragraph style
// of the paragraph. The character attributes set at the automatic paragraph
// style of the paragraph are treated as run attributes.
-// pTxtNode->SwCntntNode::GetAttr( *pSet );
+ // pTxtNode->SwCntntNode::GetAttr( *pSet );
// get default paragraph attributes, if needed, and merge these into <pSet>
if ( !bOnlyCharAttrs )
{
@@ -1468,7 +1452,7 @@
// From the perspective of the a11y API the character attributes, which
// are set at the automatic paragraph style of the paragraph are treated
// as run attributes.
-// SwXTextCursor::GetCrsrAttr( *pPaM, aSet, sal_True, sal_True );
+ // SwXTextCursor::GetCrsrAttr( *pPaM, aSet, sal_True, sal_True );
// get character attributes from automatic paragraph style and merge these into <aSet>
{
const SwTxtNode* pTxtNode( GetTxtNode() );
@@ -1596,13 +1580,12 @@
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
- /* #i12332# The position after the string needs special treatment.
- IsValidChar -> IsValidPosition
- */
+ // #i12332# The position after the string needs special treatment.
+ // IsValidChar -> IsValidPosition
if( ! (IsValidPosition( nIndex, GetString().getLength() ) ) )
throw lang::IndexOutOfBoundsException();
- /* #i12332# */
+ // #i12332#
sal_Bool bBehindText = sal_False;
if ( nIndex == GetString().getLength() )
bBehindText = sal_True;
@@ -1616,7 +1599,7 @@
sal_uInt16 nPos = 0;
- /* #i12332# FillSpecialPos does not accept nIndex ==
+ /** #i12332# FillSpecialPos does not accept nIndex ==
GetString().getLength(). In that case nPos is set to the
length of the string in the core. This way GetCharRect
returns the rectangle for a cursor at the end of the
@@ -1686,8 +1669,8 @@
Point aCorePoint( GetMap()->PixelToCore( aPoint ) );
if( !aLogBounds.IsInside( aCorePoint ) )
{
- /* #i12332# rPoint is may also be in rectangle returned by
- getCharacterBounds(getCharacterCount() */
+ // #i12332# rPoint is may also be in rectangle returned by
+ // getCharacterBounds(getCharacterCount()
awt::Rectangle aRectEndPos =
getCharacterBounds(getCharacterCount());
@@ -1973,10 +1956,7 @@
return sal_True;
}
-
-//
-//===== XAccesibleEditableText ==========================================
-//
+// XAccesibleEditableText
sal_Bool SwAccessibleParagraph::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -2080,7 +2060,6 @@
}
};
-
sal_Bool SwAccessibleParagraph::setAttributes(
sal_Int32 nStartIndex,
sal_Int32 nEndIndex,
@@ -2097,7 +2076,6 @@
if( !IsEditableState() )
return sal_False;
-
// create a (dummy) text portion for the sole purpose of calling
// setPropertyValue on it
@@ -2147,7 +2125,7 @@
return replaceText(0, GetString().getLength(), sText);
}
-//===== XAccessibleSelection ============================================
+// XAccessibleSelection
void SwAccessibleParagraph::selectAccessibleChild(
sal_Int32 nChildIndex )
@@ -2214,7 +2192,7 @@
aSelectionHelper.deselectAccessibleChild( nChildIndex );
}
-//===== XAccessibleHypertext ============================================
+// XAccessibleHypertext
class SwHyperlinkIter_Impl
{
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 56b43f5..a1b426e 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -63,11 +63,11 @@
::rtl::OUString sDesc; // protected by base classes mutex
- /// data for this paragraph's text portions; this contains the
- /// mapping from the core 'model string' to the accessible text
- /// string.
- /// pPortionData may be NULL; it should only be accessed through the
- /// Get/Clear/Has/UpdatePortionData() methods
+ // data for this paragraph's text portions; this contains the
+ // mapping from the core 'model string' to the accessible text
+ // string.
+ // pPortionData may be NULL; it should only be accessed through the
+ // Get/Clear/Has/UpdatePortionData() methods
SwAccessiblePortionData* pPortionData;
SwAccessibleHyperTextData *pHyperTextData;
@@ -93,8 +93,8 @@
// get the current care position
sal_Int32 GetCaretPos();
- /// determine the current selection. Fill the values with
- /// -1 if there is no selection in the this paragraph
+ // determine the current selection. Fill the values with
+ // -1 if there is no selection in the this paragraph
sal_Bool GetSelection(sal_Int32& nStart, sal_Int32& nEnd);
// helper for GetSelection and getCaretPosition
@@ -102,27 +102,27 @@
// if the cursor is retrieved for selection or for caret position.
SwPaM* GetCursor( const bool _bForSelection );
- /// for cut/copy/paste: execute a particular slot at the view shell
+ // for cut/copy/paste: execute a particular slot at the view shell
void ExecuteAtViewShell( sal_uInt16 nSlot );
- /// helper method for get/setAttributes
- /// (for the special case of (nEndIndex==-1) a single character will
- /// be selected)
+ // helper method for get/setAttributes
+ // (for the special case of (nEndIndex==-1) a single character will
+ // be selected)
SwXTextPortion* CreateUnoPortion( sal_Int32 nStart, sal_Int32 nEnd );
// methods for checking the parameter range:
- /// does nPos point to a char?
+ // does nPos point to a char?
sal_Bool IsValidChar(sal_Int32 nPos, sal_Int32 nLength);
- /// does nPos point to a position? (may be behind the last character)
+ // does nPos point to a position? (may be behind the last character)
sal_Bool IsValidPosition(sal_Int32 nPos, sal_Int32 nLength);
- /// is nBegin...nEnd a valid range? (nEnd points past the last character)
+ // is nBegin...nEnd a valid range? (nEnd points past the last character)
sal_Bool IsValidRange(sal_Int32 nBegin, sal_Int32 nEnd, sal_Int32 nLength);
- /// Ensure ordered range (i.e. nBegin is smaller then nEnd)
+ // Ensure ordered range (i.e. nBegin is smaller then nEnd)
inline void OrderRange(sal_Int32& nBegin, sal_Int32& nEnd)
{
if( nBegin > nEnd )
@@ -159,16 +159,16 @@
virtual ~SwAccessibleParagraph();
- //===== handling of data for the text portions ===========================
+ // handling of data for the text portions
- /// force update of new portion data
+ // force update of new portion data
void UpdatePortionData()
throw( com::sun::star::uno::RuntimeException );
- /// remove the current portion data
+ // remove the current portion data
void ClearPortionData();
- /// get portion data; update if necessary
+ // get portion data; update if necessary
SwAccessiblePortionData& GetPortionData()
throw( com::sun::star::uno::RuntimeException )
{
@@ -177,11 +177,10 @@
return *pPortionData;
}
- /// determine if portion data is currently available
+ // determine if portion data is currently available
sal_Bool HasPortionData() { return (pPortionData != NULL); }
-
- //===== helpers for word boundaries ====================================
+ //helpers for word boundaries
sal_Bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound,
const rtl::OUString& rText,
@@ -205,8 +204,8 @@
const rtl::OUString& rText,
sal_Int32 nPos );
- /// get boundaries of word/sentence/etc. for specified text type
- /// Does all argument checking, and then delegates to helper methods above.
+ // get boundaries of word/sentence/etc. for specified text type
+ // Does all argument checking, and then delegates to helper methods above.
sal_Bool GetTextBoundary( com::sun::star::i18n::Boundary& rBound,
const rtl::OUString& rText,
sal_Int32 nPos,
@@ -227,27 +226,26 @@
virtual sal_Bool HasCursor(); // required by map to remember that object
- //===== XAccessibleContext ==============================================
+ // XAccessibleContext
- /// Return this object's description.
+ // Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void)
throw (com::sun::star::uno::RuntimeException);
- /** Return the parents locale or throw exception if this object has no
- parent yet/anymore.
- */
+ // Return the parents locale or throw exception if this object has no
+ // parent yet/anymore.
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale (void)
throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException,
::com::sun::star::uno::RuntimeException);
- /** #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO */
+ // #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
throw (::com::sun::star::uno::RuntimeException);
- //===== XAccessibleComponent ============================================
+ // XAccessibleComponent
virtual void SAL_CALL grabFocus()
throw (::com::sun::star::uno::RuntimeException);
@@ -257,29 +255,26 @@
virtual sal_Int32 SAL_CALL getBackground()
throw (::com::sun::star::uno::RuntimeException);
- //===== XServiceInfo ====================================================
+ // XServiceInfo
- /** Returns an identifier for the implementation of this object.
- */
+ // Returns an identifier for the implementation of this object.
virtual ::rtl::OUString SAL_CALL
getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
- */
+ // Return whether the specified service is supported by this class.
virtual sal_Bool SAL_CALL
supportsService (const ::rtl::OUString& sServiceName)
throw (::com::sun::star::uno::RuntimeException);
- /** Returns a list of all supported services. In this case that is just
- the AccessibleContext service.
- */
+ // Returns a list of all supported services. In this case that is just
+ // the AccessibleContext service.
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
- //===== XInterface ======================================================
+ // XInterface
// (XInterface methods need to be implemented to disambiguate
// between those inherited through SwAcessibleContext and
@@ -295,11 +290,11 @@
virtual void SAL_CALL release( ) throw ()
{ SwAccessibleContext::release(); };
- //====== XTypeProvider ====================================================
+ // XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
throw(::com::sun::star::uno::RuntimeException);
- //===== XAccesibleText ==================================================
+ // XAccessibleText
virtual sal_Int32 SAL_CALL getCaretPosition( ) throw
(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw
(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw
(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
@@ -318,7 +313,7 @@
virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32
nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw
(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- //===== XAccesibleEditableText ==========================================
+ // XAccessibleEditableText
virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw
(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw
(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw
(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
@@ -327,7 +322,7 @@
virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw
(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL setText( const ::rtl::OUString& sText ) throw
(::com::sun::star::uno::RuntimeException);
- //===== XAccessibleSelection ============================================
+ // XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
@@ -354,7 +349,7 @@
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
- //===== XAccessibleHypertext ============================================
+ // XAccessibleHypertext
virtual sal_Int32 SAL_CALL getHyperLinkCount()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference<
@@ -367,7 +362,7 @@
::com::sun::star::uno::RuntimeException);
// #i71360#
- //===== XAccesibleTextMarkup ============================================
+ // XAccesibleTextMarkup
virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
@@ -387,7 +382,7 @@
::com::sun::star::uno::RuntimeException);
// #i89175#
- //===== XAccessibleMultiLineText ========================================
+ // XAccessibleMultiLineText
virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
@@ -405,7 +400,7 @@
throw (::com::sun::star::uno::RuntimeException);
// #i63870#
- //===== XAccesibleTextAttributes ========================================
+ // XAccesibleTextAttributes
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
};
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 529d069..692b04e 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -52,17 +52,14 @@
#include "frmfmt.hxx"
#include "fmtcntnt.hxx"
-
using namespace ::com::sun::star;
using rtl::OUString;
using rtl::OUStringBuffer;
using i18n::Boundary;
-
// 'portion type' for terminating portions
#define POR_TERMINATE 0
-
// portion attributes
#define PORATTR_SPECIAL 1
@@ -230,7 +227,6 @@
bFinished = sal_True;
}
-
sal_Bool SwAccessiblePortionData::IsPortionAttrSet(
size_t nPortionNo, sal_uInt8 nAttr ) const
{
@@ -277,7 +273,6 @@
}
return bGray;
}
-
const OUString& SwAccessiblePortionData::GetAccessibleString() const
{
@@ -455,7 +450,6 @@
return nResult;
}
-
void SwAccessiblePortionData::GetSentenceBoundary(
Boundary& rBound,
sal_Int32 nPos )
@@ -521,7 +515,6 @@
FillBoundary( rBound, aAccessiblePositions,
FindBreak( aAccessiblePositions, nPos ) );
}
-
sal_Int32 SwAccessiblePortionData::GetAccessiblePosition( sal_uInt16 nPos ) const
{
--
To view, visit https://gerrit.libreoffice.org/2776
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib887329de1e5788b1a39139725dca0b3de25e81c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx@yahoo.de>
Context
- [PATCH] comment cleanups · Matthias Freund (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.