You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/11/28 19:18:39 UTC
svn commit: r1546437 [10/12] - in /openoffice/branches/rejuvenate01: ./
main/ main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/standard/
main/accessibility/source/extended/ main/accessibility/source/helper/
main/acces...
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/accpara.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/accpara.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/accpara.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/accpara.hxx Thu Nov 28 18:18:30 2013
@@ -29,11 +29,9 @@
#include <com/sun/star/accessibility/XAccessibleHypertext.hpp>
#include <com/sun/star/accessibility/XAccessibleTextMarkup.hpp>
#include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleTextSelection.hpp>
#include <txmsrt.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
-//-----IAccessibility2 Implementation 2009
#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
#include <hash_map>
#include <accselectionhelper.hxx>
@@ -47,7 +45,7 @@ class SwTxtNode;
class SwPaM;
class SwAccessiblePortionData;
class SwAccessibleHyperTextData;
-class SwRedline; //IAccessibility2 Implementation 2009
+class SwRedline;
class SwXTextPortion;
// --> OD 2010-02-19 #i108125#
class SwParaChangeTrackingInfo;
@@ -76,10 +74,8 @@ class SwAccessibleParagraph :
public com::sun::star::accessibility::XAccessibleTextMarkup,
public com::sun::star::accessibility::XAccessibleMultiLineText,
public ::com::sun::star::accessibility::XAccessibleTextAttributes,
- //IAccessibility2 Implementation 2009-----
public com::sun::star::accessibility::XAccessibleTextSelection,
public com::sun::star::accessibility::XAccessibleExtendedAttributes
- //-----IAccessibility2 Implementation 2009
{
friend class SwAccessibleHyperlink;
@@ -98,9 +94,7 @@ class SwAccessibleParagraph :
// mutex)
sal_Bool bIsHeading; // protected by base classes mutex
- //IAccessibility2 Implementation 2009-----
sal_Int32 nHeadingLevel;
- //-----IAccessibility2 Implementation 2009
// implementation for XAccessibleSelection
SwAccessibleSelectionHelper aSelectionHelper;
@@ -159,10 +153,8 @@ class SwAccessibleParagraph :
}
}
- //IAccessibility2 Implementation 2009-----
const SwRedline* GetRedlineAtIndex( sal_Int32 nPos );
String GetFieldTypeNameAtIndex(sal_Int32 nIndex);
- //-----IAccessibility2 Implementation 2009
// --> OD 2006-07-13 #i63870#
void _getDefaultAttributesImpl(
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
@@ -173,7 +165,6 @@ class SwAccessibleParagraph :
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
tAccParaPropValMap& rRunAttrSeq );
// <--
- // IAccessibility2 Implementation 2009----
void _getSupplementalAttributesImpl(
const sal_Int32 nIndex,
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
@@ -182,13 +173,10 @@ class SwAccessibleParagraph :
void _correctValues(
const sal_Int32 nIndex,
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues );
- // ----IAccessibility2 Implementation 2009
public:
- //IAccessibility2 Implementation 2009-----
SwTOXSortTabBase* GetTOXSortTabBase();
short GetTOCLevel();
- //-----IAccessibility2 Implementation 2009
sal_Bool IsHeading() const;
protected:
@@ -273,10 +261,8 @@ public:
virtual sal_Bool HasCursor(); // required by map to remember that object
- //IAccessibility2 Implementation 2009-----
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex );
virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException);
- //-----IAccessibility2 Implementation 2009
// --> OD 2010-02-19 #i108125#
// MT: Solved merge conflict - seems this was removed between 101 and 103?
// virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew);
@@ -447,7 +433,6 @@ public:
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
// <--
- //IAccessibility2 Implementation 2009-----
//====== XAccessibleTextSelection ======================================
virtual sal_Bool SAL_CALL scrollToPosition( const ::com::sun::star::awt::Point& aPoint, sal_Bool isLeftTop )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -469,7 +454,6 @@ public:
//===== XAccessibleComponent ============================================
sal_Bool m_bLastHasSelection;
sal_Bool tabCharInWord(sal_Int32 nIndex, com::sun::star::i18n::Boundary& aBound);
- //-----IAccessibility2 Implementation 2009
// --> OD 2008-05-29 #i89175#
//===== XAccessibleMultiLineText ========================================
virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex )
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/accportions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/accportions.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/accportions.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/accportions.cxx Thu Nov 28 18:18:30 2013
@@ -64,9 +64,7 @@
using namespace ::com::sun::star;
-//IAccessibility2 Implementation 2009-----
//#include "accnote.hxx"
-//-----IAccessibility2 Implementation 2009
using rtl::OUString;
using rtl::OUStringBuffer;
@@ -144,13 +142,11 @@ void SwAccessiblePortionData::Text(sal_u
bLastIsSpecial = sal_False;
}
-//IAccessibility2 Implementation 2009-----
void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType )
{
aAttrFieldType.push_back(nAttrFldType);
return;
}
-//-----IAccessibility2 Implementation 2009
void SwAccessiblePortionData::Special(
sal_uInt16 nLength, const String& rText, sal_uInt16 nType)
@@ -167,7 +163,6 @@ void SwAccessiblePortionData::Special(
switch( nType )
{
case POR_POSTITS:
- //IAccessibility2 Implementation 2009-----
sDisplay = String(sal_Unicode(0xfffc));
break;
@@ -205,7 +200,6 @@ void SwAccessiblePortionData::Special(
m_vecPairPos.push_back(std::make_pair(nStart,nEnd));
break;
}
- //-----IAccessibility2 Implementation 2009
break;
case POR_NUMBER:
{
@@ -722,7 +716,6 @@ sal_uInt16 SwAccessiblePortionData::Fill
return static_cast<sal_uInt16>( nModelPos );
}
-//IAccessibility2 Implementation 2009-----
sal_uInt16 SwAccessiblePortionData::GetAttrFldType( sal_Int32 nPos )
{
if( aFieldPosition.size() < 2 ) return sal_False;
@@ -752,7 +745,6 @@ sal_Bool SwAccessiblePortionData::FillBo
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
void SwAccessiblePortionData::AdjustAndCheck(
sal_Int32 nPos,
size_t& nPortionNo,
@@ -816,7 +808,6 @@ sal_Bool SwAccessiblePortionData::IsVali
( nPos <= aModelPositions[ aModelPositions.size()-1 ] );
}
-//IAccessibility2 Implementation 2009-----
sal_Bool SwAccessiblePortionData::IsZeroCorePositionData()
{
if( aModelPositions.size() < 1 ) return sal_True;
@@ -849,7 +840,7 @@ sal_Int32 SwAccessiblePortionData::GetFi
sal_Int32 nIndex = -1;
if( aFieldPosition.size() >= 2 )
{
- for( sal_Int32 i = 0; i < aFieldPosition.size() - 1; i += 2 )
+ for( sal_uInt32 i = 0; i < aFieldPosition.size() - 1; i += 2 )
{
if( nPos <= aFieldPosition[ i + 1 ] && nPos >= aFieldPosition[ i ] )
{
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/accportions.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/accportions.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/accportions.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/accportions.hxx Thu Nov 28 18:18:30 2013
@@ -61,9 +61,7 @@ class SwAccessiblePortionData : public S
Positions_t aLineBreaks; /// position of line breaks
Positions_t aModelPositions; /// position of portion breaks in the model
Positions_t aAccessiblePositions; /// portion breaks in sAccessibleString
- //IAccessibility2 Implementation 2009-----
Positions_t aFieldPosition;
- //-----IAccessibility2 Implementation 2009
Positions_t aAttrFieldType;
typedef std::vector<sal_uInt8> PortionAttrs_t;
@@ -108,13 +106,11 @@ public:
virtual void Skip(sal_uInt16 nLength);
virtual void Finish();
- //IAccessibility2 Implementation 2009-----
virtual void SetAttrFieldType( sal_uInt16 nAttrFldType );
sal_Bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos );
sal_Bool IsIndexInFootnode(sal_Int32 nIndex);
sal_Bool IsInGrayPortion( sal_Int32 nPos );
sal_Int32 GetFieldIndex(sal_Int32 nPos);
- //-----IAccessibility2 Implementation 2009
sal_Bool IsZeroCorePositionData();
// access to the portion data
@@ -177,12 +173,10 @@ public:
sal_Bool IsValidCorePosition( sal_uInt16 nPos ) const;
sal_uInt16 GetFirstValidCorePosition() const;
sal_uInt16 GetLastValidCorePosition() const;
- //IAccessibility2 Implementation 2009-----
private:
typedef std::pair<sal_Int32,sal_Int32> PAIR_POS;
typedef std::vector<PAIR_POS> VEC_PAIR_POS;
VEC_PAIR_POS m_vecPairPos;
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/accpreview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/accpreview.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/accpreview.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/accpreview.cxx Thu Nov 28 18:18:30 2013
@@ -32,11 +32,9 @@
#endif
#include <accpreview.hxx>
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#endif
-//-----IAccessibility2 Implementation 2009
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentPageView";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentPageView";
@@ -59,9 +57,7 @@ using ::rtl::OUString;
SwAccessiblePreview::SwAccessiblePreview( SwAccessibleMap *pMp ) :
SwAccessibleDocumentBase( pMp )
{
- //IAccessibility2 Implementation 2009-----
SetName( GetResource( STR_ACCESS_PREVIEW_DOC_NAME ) );
- //-----IAccessibility2 Implementation 2009
}
SwAccessiblePreview::~SwAccessiblePreview()
@@ -105,7 +101,6 @@ Sequence< sal_Int8 > SAL_CALL SwAccessib
}
return aId;
}
-//IAccessibility2 Implementation 2009-----
OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException)
{
return GetResource( STR_ACCESS_PREVIEW_DOC_NAME );
@@ -122,4 +117,3 @@ void SwAccessiblePreview::_InvalidateFoc
{
FireStateChangedEvent( ::com::sun::star::accessibility::AccessibleStateType::FOCUSED, sal_True );
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/accpreview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/accpreview.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/accpreview.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/accpreview.hxx Thu Nov 28 18:18:30 2013
@@ -67,11 +67,9 @@ public:
//====== XTypeProvider ====================================================
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException);
::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException);
virtual void _InvalidateFocus();
- //-----IAccessibility2 Implementation 2009
};
#endif
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/accselectionhelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/accselectionhelper.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/accselectionhelper.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/accselectionhelper.cxx Thu Nov 28 18:18:30 2013
@@ -38,12 +38,10 @@
#include <flyfrm.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
#include <fmtanchr.hxx>
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star;
@@ -125,7 +123,6 @@ void SwAccessibleSelectionHelper::select
// return bRet;
}
-//IAccessibility2 Implementation 2009-----
//When the selected state of the SwFrmOrObj is setted, return true.
static sal_Bool lcl_getSelectedState(const SwAccessibleChild& aChild,
SwAccessibleContext* pContext,
@@ -160,7 +157,6 @@ static sal_Bool lcl_getSelectedState(con
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
sal_Int32 nChildIndex )
@@ -188,14 +184,12 @@ sal_Bool SwAccessibleSelectionHelper::is
{
bRet = pFEShell->IsObjSelected( *aChild.GetDrawObject() );
}
- //IAccessibility2 Implementation 2009-----
//If the SwFrmOrObj is not selected directly in the UI, we should check whether it is selected in the selection cursor.
if( !bRet )
{
if( lcl_getSelectedState( aChild, &rContext, rContext.GetMap() ) == sal_True)
bRet = sal_True;
}
- //-----IAccessibility2 Implementation 2009
}
return bRet;
@@ -253,11 +247,9 @@ sal_Int32 SwAccessibleSelectionHelper::g
const SwFlyFrm* pFlyFrm = pFEShell->GetCurrFlyFrm();
if( pFlyFrm )
{
- //IAccessibility2 Implementation 2009-----
//if( rContext.GetParent( SwAccessibleChild(pFlyFrm), rContext.IsInPagePreview()) ==
// rContext.GetFrm() )
nCount = 1;
- //-----IAccessibility2 Implementation 2009
}
else
{
@@ -285,7 +277,6 @@ sal_Int32 SwAccessibleSelectionHelper::g
}
}
}
- //IAccessibility2 Implementation 2009-----
//If the SwFrmOrObj is not selected directly in the UI,
//we should check whether it is selected in the selection cursor.
if( nCount == 0 )
@@ -304,7 +295,6 @@ sal_Int32 SwAccessibleSelectionHelper::g
++aIter;
}
}
- //-----IAccessibility2 Implementation 2009
}
return nCount;
}
@@ -328,7 +318,6 @@ Reference<XAccessible> SwAccessibleSelec
const SwFlyFrm *pFlyFrm = pFEShell->GetCurrFlyFrm();
if( pFlyFrm )
{
- //IAccessibility2 Implementation 2009-----
if( 0 == nSelectedChildIndex )
{
if(rContext.GetParent( SwAccessibleChild(pFlyFrm), rContext.IsInPagePreview()) == rContext.GetFrm() )
@@ -349,7 +338,6 @@ Reference<XAccessible> SwAccessibleSelec
}
}
}
- //-----IAccessibility2 Implementation 2009
}
else
{
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/acctable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/acctable.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/acctable.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/acctable.cxx Thu Nov 28 18:18:30 2013
@@ -72,7 +72,7 @@ typedef ::std::set < sal_Int32, Int32Les
typedef ::std::pair < sal_Int32, sal_Int32 > Int32Pair_Impl;
typedef ::std::list < Int32Pair_Impl > Int32PairList_Impl;
-const int SELECTION_WITH_NUM =10;
+const unsigned int SELECTION_WITH_NUM = 10;
class SwAccTableSelHander_Impl
{
@@ -95,10 +95,8 @@ class SwAccessibleTableData_Impl
bool mbOnlyTableColumnHeader;
void CollectData( const SwFrm *pFrm );
- //IAccessibility2 Implementation 2009-----
void CollectColumnHeaderData( const SwFrm *pFrm );
void CollectRowHeaderData( const SwFrm *pFrm );
- //-----IAccessibility2 Implementation 2009
void CollectExtents( const SwFrm *pFrm );
sal_Bool FindCell( const Point& rPos, const SwFrm *pFrm ,
@@ -193,7 +191,6 @@ void SwAccessibleTableData_Impl::Collect
}
}
-//IAccessibility2 Implementation 2009-----
void SwAccessibleTableData_Impl::CollectRowHeaderData( const SwFrm *pFrm )
{
const SwAccessibleChildSList aList( *pFrm, mrAccMap );
@@ -237,7 +234,6 @@ void SwAccessibleTableData_Impl::Collect
++aIter;
}
}
-//-----IAccessibility2 Implementation 2009
void SwAccessibleTableData_Impl::CollectColumnHeaderData( const SwFrm *pFrm )
{
@@ -285,7 +281,6 @@ void SwAccessibleTableData_Impl::Collect
++aIter;
}
}
-//-----IAccessibility2 Implementation 2009
void SwAccessibleTableData_Impl::CollectExtents( const SwFrm *pFrm )
{
const SwAccessibleChildSList aList( *pFrm, mrAccMap );
@@ -500,10 +495,8 @@ const SwFrm *SwAccessibleTableData_Impl:
inline sal_Int32 SwAccessibleTableData_Impl::GetRowCount() const
{
- //IAccessibility2 Implementation 2009-----
sal_Int32 count = static_cast< sal_Int32 >( maRows.size() ) ;
count = (count <=0)? 1:count;
- //-----IAccessibility2 Implementation 2009
return count;
}
@@ -804,12 +797,10 @@ void SwAccessibleTable::GetStates(
::utl::AccessibleStateSetHelper& rStateSet )
{
SwAccessibleContext::GetStates( rStateSet );
- //IAccessibility2 Implementation 2009-----
//Solution:Add resizable state to table
rStateSet.AddState( AccessibleStateType::RESIZABLE );
// MULTISELECTABLE
rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
- //-----IAccessibility2 Implementation 2009
SwCrsrShell* pCrsrShell = GetCrsrShell();
if( pCrsrShell )
rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
@@ -839,9 +830,7 @@ SwAccessibleTable::SwAccessibleTable(
OUString sArg2( GetFormattedPageNumber() );
sDesc = GetResource( STR_ACCESS_TABLE_DESC, &sArg1, &sArg2 );
- //IAccessibility2 Implementation 2009-----
UpdateTableData();
- //-----IAccessibility2 Implementation 2009
}
SwAccessibleTable::~SwAccessibleTable()
@@ -923,13 +912,11 @@ uno::Any SwAccessibleTable::queryInterfa
uno::Reference<XAccessibleSelection> xSelection( this );
aRet <<= xSelection;
}
- //IAccessibility2 Implementation 2009-----
else if ( rType == ::getCppuType((uno::Reference<XAccessibleTableSelection> *)0) )
{
uno::Reference<XAccessibleTableSelection> xTableExtent( this );
aRet <<= xTableExtent;
}
- //-----IAccessibility2 Implementation 2009
else
{
aRet = SwAccessibleContext::queryInterface(rType);
@@ -1102,9 +1089,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::ge
CHECK_FOR_DEFUNC( XAccessibleTable )
- //IAccessibility2 Implementation 2009-----
UpdateTableData();
- //-----IAccessibility2 Implementation 2009
GetTableData().CheckRowAndCol( nRow, nColumn, this );
Int32Set_Impl::const_iterator aSttCol(
@@ -1135,9 +1120,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::ge
vos::OGuard aGuard(Application::GetSolarMutex());
CHECK_FOR_DEFUNC( XAccessibleTable )
- //IAccessibility2 Implementation 2009-----
UpdateTableData();
- //-----IAccessibility2 Implementation 2009
GetTableData().CheckRowAndCol( nRow, nColumn, this );
@@ -1492,7 +1475,6 @@ void SwAccessibleTable::InvalidatePosOrS
{
vos::OGuard aGuard(Application::GetSolarMutex());
- //IAccessibility2 Implementation 2009-----
//need to update children
SwAccessibleTableData_Impl *pNewTableData = CreateNewTableData();
if( !pNewTableData->CompareExtents( GetTableData() ) )
@@ -1557,7 +1539,6 @@ void SwAccessibleTable::InvalidateChildP
// <--
if( !pNewTableData->CompareExtents( GetTableData() ) )
{
- //IAccessibility2 Implementation 2009-----
if(pNewTableData->GetRowCount()!= mpTableData->GetRowCount())
{
Int32Set_Impl::const_iterator aSttCol( GetTableData().GetColumnIter( 0 ) );
@@ -1584,7 +1565,6 @@ void SwAccessibleTable::InvalidateChildP
}
}
else
- //-----IAccessibility2 Implementation 2009
FireTableChangeEvent( GetTableData() );
ClearTableData();
mpTableData = pNewTableData;
@@ -1857,7 +1837,6 @@ void SAL_CALL SwAccessibleTable::deselec
pCrsrShell->EndAction();
}
-//IAccessibility2 Implementation 2009-----
void SwAccessibleTable::SetTableData(SwAccessibleTableData_Impl* mpNewTableData)
{
mpTableData = mpNewTableData;
@@ -2003,7 +1982,6 @@ sal_Bool SAL_CALL SwAccessibleTable::uns
}
return sal_True;
}
-//-----IAccessibility2 Implementation 2009
// --> OD 2007-06-28 #i77106#
// implementation of class <SwAccessibleTableColHeaders>
SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2,
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/acctable.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/acctable.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/acctable.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/acctable.hxx Thu Nov 28 18:18:30 2013
@@ -23,12 +23,10 @@
#ifndef _ACCTABLE_HXX
#define _ACCTABLE_HXX
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XAccessibleTableSelection_HPP_
#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
#endif
#include <vector>
-//-----IAccessibility2 Implementation 2009
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <acccontext.hxx>
@@ -92,9 +90,7 @@ protected:
// Is table data evailable?
sal_Bool HasTableData() const { return (mpTableData != 0); }
- //IAccessibility2 Implementation 2009-----
void SetTableData(SwAccessibleTableData_Impl* mpNewTableData) ;
- //-----IAccessibility2 Implementation 2009
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
@@ -197,7 +193,6 @@ public:
virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
//===== XAccessibleTableSelection ============================================
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
@@ -207,7 +202,6 @@ public:
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
- //-----IAccessibility2 Implementation 2009
//===== XServiceInfo ====================================================
/** Returns an identifier for the implementation of this object.
@@ -274,7 +268,6 @@ public:
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
- //IAccessibility2 Implementation 2009-----
//===== XAccessibleComponent ============================================
sal_Int32 SAL_CALL getBackground()
throw (::com::sun::star::uno::RuntimeException);
@@ -284,7 +277,6 @@ public:
void FireSelectionEvent( );
void ClearSelectionCellCache();
void AddSelectionCell(const SwAccessibleContext* ,sal_Bool bAddOrRemove);
- //-----IAccessibility2 Implementation 2009
};
inline SwAccessibleTableData_Impl& SwAccessibleTable::GetTableData()
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/acctextframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/acctextframe.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/acctextframe.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/acctextframe.cxx Thu Nov 28 18:18:30 2013
@@ -44,11 +44,9 @@
// <--
#include "acctextframe.hxx"
-//IAccessibility2 Implementation 2009-----
#ifndef _DOC_HXX
#include <doc.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::rtl::OUString;
@@ -157,7 +155,6 @@ void SwAccessibleTextFrame::Modify( cons
}
}
-//IAccessibility2 Implementation 2009-----
//===== XInterface ==========================================================
com::sun::star::uno::Any SAL_CALL
@@ -274,7 +271,6 @@ void SAL_CALL SwAccessibleTextFrame::des
{
DBG_ASSERT( false, "<SwAccessibleTextFrame::selectAllAccessibleChildren( sal_Int32 )> - missing implementation" );
}
-//-----IAccessibility2 Implementation 2009
// --> OD 2009-07-14 #i73249#
OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void)
@@ -300,7 +296,6 @@ OUString SAL_CALL SwAccessibleTextFrame:
CHECK_FOR_DEFUNC( XAccessibleContext )
/* MT: I guess msDesc is correct noadays?
- //IAccessibility2 Implementation 2009-----
OUString longDesc;
const SwFlyFrmFmt* pFlyFmt = GetShell()->GetDoc()->FindFlyByName( GetName(), 0);
if( pFlyFmt )
@@ -311,7 +306,6 @@ OUString SAL_CALL SwAccessibleTextFrame:
return GetName() + OUString(' ') + longDesc;
else
return GetName();
- //-----IAccessibility2 Implementation 2009
*/
return msDesc;
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/access/acctextframe.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/access/acctextframe.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/access/acctextframe.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/access/acctextframe.hxx Thu Nov 28 18:18:30 2013
@@ -24,9 +24,7 @@
#define _ACCTEXTFRAME_HXX
#include "accframebase.hxx"
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-//-----IAccessibility2 Implementation 2009
class SwFlyFrm;
namespace utl { class AccessibleRelationSetHelper; }
@@ -53,7 +51,6 @@ public:
SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm* pFlyFrm );
- //IAccessibility2 Implementation 2009-----
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType )
throw (::com::sun::star::uno::RuntimeException);
@@ -88,7 +85,6 @@ public:
sal_Int32 nSelectedChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
- //-----IAccessibility2 Implementation 2009
//===== XAccessibleContext ==============================================
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/attr/format.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/attr/format.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/attr/format.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/attr/format.cxx Thu Nov 28 18:18:30 2013
@@ -257,9 +257,7 @@ SwFmt::~SwFmt()
}
else
{
- //IAccessibility2 Implementation 2009-----
while( GetDepends() && pParentFmt)
- //-----IAccessibility2 Implementation 2009
{
SwFmtChg aOldFmt(this);
SwFmtChg aNewFmt(pParentFmt);
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/crsr/crsrsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/crsr/crsrsh.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/crsr/crsrsh.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/crsr/crsrsh.cxx Thu Nov 28 18:18:30 2013
@@ -424,7 +424,6 @@ sal_Bool SwCrsrShell::LeftRight( sal_Boo
}
return bRet;
}
-//IAccessibility2 Implementation 2009-----
void SwCrsrShell::FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage)
{
#ifdef ACCESSIBLE_LAYOUT
@@ -452,7 +451,6 @@ void SwCrsrShell::FireSectionChangeEvent
bool SwCrsrShell::bColumnChange()
{
- sal_uInt16 nCurrCol = 0;
SwFrm* pCurrFrm = GetCurrFrm(sal_False);
if (pCurrFrm == NULL)
@@ -483,7 +481,6 @@ bool SwCrsrShell::bColumnChange()
return sal_True;
}
}
-//-----IAccessibility2 Implementation 2009
// --> OD 2008-04-02 #refactorlists#
void SwCrsrShell::MarkListLevel( const String& sListId,
@@ -2666,9 +2663,7 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& r
// UpdateCrsr( 0 );
// OD 11.02.2003 #100556#
mbMacroExecAllowed = rShell.IsMacroExecAllowed();
- //IAccessibility2 Implementation 2009-----
oldColFrm = NULL;
- //-----IAccessibility2 Implementation 2009
}
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/doc/doclay.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/doc/doclay.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/doc/doclay.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/doc/doclay.cxx Thu Nov 28 18:18:30 2013
@@ -1416,8 +1416,8 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtCo
pNewSet->Put( SwFmtSurround( SURROUND_NONE ) );
pNewSet->Put( SvxOpaqueItem( RES_OPAQUE, sal_True ) );
- pNewSet->Put( SwFmtVertOrient( text::VertOrientation::TOP ) );
- pNewSet->Put( SwFmtHoriOrient( text::HoriOrientation::CENTER ) );
+ pNewSet->Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
+ pNewSet->Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ) );
aFrmSize = pOldFmt->GetFrmSize();
aFrmSize.SetWidthPercent( 100 );
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/doc/tblcpy.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/doc/tblcpy.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/doc/tblcpy.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/doc/tblcpy.cxx Thu Nov 28 18:18:30 2013
@@ -1029,11 +1029,9 @@ sal_Bool SwTable::InsTable( const SwTabl
// loesche die Frames
aFndBox.SetTableLines( *this );
- //IAccessibility2 Implementation 2009-----
//Solution:Not dispose accessible table
//aFndBox.DelFrms( *this );
aFndBox.DelFrms( *this,sal_False );
- //-----IAccessibility2 Implementation 2009
if( 1 == rCpyTbl.GetTabSortBoxes().Count() )
{
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/docnode/node.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/docnode/node.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/docnode/node.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/docnode/node.cxx Thu Nov 28 18:18:30 2013
@@ -1041,9 +1041,7 @@ SwCntntNode::~SwCntntNode()
// der Abhaengikeitsliste raus!
// Daher muessen alle Frames in der Abhaengigkeitsliste geloescht werden.
if( GetDepends() )
- //IAccessibility2 Implementation 2009-----
DelFrms(sal_True, sal_False);
- //-----IAccessibility2 Implementation 2009
if( pCondColl )
delete pCondColl;
@@ -1370,12 +1368,10 @@ void SwCntntNode::MakeFrms( SwCntntNode&
*/
-//IAccessibility2 Implementation 2009-----
//Solution:Add a input param to identify if the acc table should be disposed.
//add a flag(bNeedDel) to indicate whether to del corresponding frm even in doc loading process,
//void SwCntntNode::DelFrms()
-void SwCntntNode::DelFrms( sal_Bool bNeedDel, sal_Bool bIsDisposeAccTable )
-//-----IAccessibility2 Implementation 2009
+void SwCntntNode::DelFrms( sal_Bool /* bNeedDel */, sal_Bool bIsDisposeAccTable )
{
if( !GetDepends() )
return;
@@ -1431,14 +1427,12 @@ void SwCntntNode::DelFrms( sal_Bool bNee
((SwTxtFrm*)pCFrm->FindMaster())->Prepare( PREP_FTN_GONE );
}
}
- //IAccessibility2 Implementation 2009-----
//Solution:Set acc table dispose state
pFrm->SetAccTableDispose( bIsDisposeAccTable );
//End Added
pFrm->Cut();
//Solution:Set acc table dispose state to default value
pFrm->SetAccTableDispose( sal_True );
- //-----IAccessibility2 Implementation 2009
delete pFrm;
}
if( IsTxtNode() )
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/docnode/nodes.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/docnode/nodes.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/docnode/nodes.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/docnode/nodes.cxx Thu Nov 28 18:18:30 2013
@@ -897,7 +897,6 @@ sal_Bool SwNodes::_MoveNodes( const SwNo
break;
case ND_TEXTNODE:
- //IAccessibility2 Implementation 2009-----
//Solution:Add special function to text node.
{
if( bNewFrms && pAktNode->GetCntntNode() )
@@ -907,7 +906,6 @@ sal_Bool SwNodes::_MoveNodes( const SwNo
aRg.aEnd--;
}
break;
- //-----IAccessibility2 Implementation 2009
case ND_GRFNODE:
case ND_OLENODE:
{
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/fields/expfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/fields/expfld.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/fields/expfld.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/fields/expfld.cxx Thu Nov 28 18:18:30 2013
@@ -1155,8 +1155,8 @@ SwInputField::SwInputField( SwInputField
, aContent(rContent)
, aPText(rPrompt)
, nSubType(nSub)
- , mpFmtFld( NULL )
, mbIsFormField( bIsFormField )
+ , mpFmtFld( NULL )
{
}
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/frmedt/feshview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/frmedt/feshview.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/frmedt/feshview.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/frmedt/feshview.cxx Thu Nov 28 18:18:30 2013
@@ -1020,7 +1020,6 @@ sal_Bool SwFEShell::IsObjSelected( const
->IsObjMarked( const_cast< SdrObject * >( &rObj ) );
}
-//IAccessibility2 Implementation 2009-----
sal_Bool SwFEShell::IsObjSameLevelWithMarked(const SdrObject* pObj) const
{
if (pObj)
@@ -1040,7 +1039,6 @@ sal_Bool SwFEShell::IsObjSameLevelWithMa
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
|*
|* SwFEShell::EndTextEdit()
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/frmedt/tblsel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/frmedt/tblsel.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/frmedt/tblsel.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/frmedt/tblsel.cxx Thu Nov 28 18:18:30 2013
@@ -2255,11 +2255,9 @@ inline void UnsetFollow( SwFlowFrm *pTab
pTab->bIsFollow = sal_False;
}
-//IAccessibility2 Implementation 2009-----
//Solution:When bAccTableDispose is FALSE,the acc table should not be disposed.
//void _FndBox::DelFrms( SwTable &rTable )
void _FndBox::DelFrms( SwTable &rTable,sal_Bool bAccTableDispose )
-//-----IAccessibility2 Implementation 2009
{
//Alle Lines zwischen pLineBefore und pLineBehind muessen aus dem
//Layout ausgeschnitten und geloescht werden.
@@ -2377,14 +2375,12 @@ void _FndBox::DelFrms( SwTable &rTable,s
// next turn.
((SwTabFrm*)pTabFrm)->SetFollowFlowLine( sal_False );
}
- //IAccessibility2 Implementation 2009-----
//Solution:Set acc table dispose state
pFrm->SetAccTableDispose( bAccTableDispose );
pFrm->Cut();
//Solution:Set acc table dispose state to default value.
pFrm->SetAccTableDispose( sal_True );
delete pFrm;
- //-----IAccessibility2 Implementation 2009
}
}
}
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/inc/SwPortionHandler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/inc/SwPortionHandler.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/inc/SwPortionHandler.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/inc/SwPortionHandler.hxx Thu Nov 28 18:18:30 2013
@@ -92,10 +92,8 @@ public:
* paragraph's portions have been processed.
*/
virtual void Finish() = 0;
- //IAccessibility2 Implementation 2009-----
virtual void SetAttrFieldType( sal_uInt16 )
{ return; }
- //-----IAccessibility2 Implementation 2009
};
#endif
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/inc/doctxm.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/inc/doctxm.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/inc/doctxm.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/inc/doctxm.hxx Thu Nov 28 18:18:30 2013
@@ -102,9 +102,7 @@ public:
const bool _bNewTOX = false ); // Formatieren
void UpdatePageNum(); // Seitennummern einfuegen
TYPEINFO(); // fuers rtti
-//IAccessibility2 Implementation 2009-----
SwTOXSortTabBases* GetTOXSortTabBases() { return &aSortArr; }
-//-----IAccessibility2 Implementation 2009
sal_Bool SetPosAtStartEnd( SwPosition& rPos, sal_Bool bAtStart = sal_True ) const;
};
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/inc/frame.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/inc/frame.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/inc/frame.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/inc/frame.hxx Thu Nov 28 18:18:30 2013
@@ -29,11 +29,9 @@
#include "calbck.hxx" // fuer SwClient
#include <svl/brdcst.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/style/TabStop.hpp>
#include <comphelper/stlunosequence.hxx>
using namespace ::com::sun::star;
-//-----IAccessibility2 Implementation 2009
class SwLayoutFrm;
class SwRootFrm;
class SwPageFrm;
@@ -297,10 +295,8 @@ class SwFrm: public SwClient, public Sfx
//Cache fuer (Umrandungs-)Attribute.
static SwCache *pCache;
- //IAccessibility2 Implementation 2009-----
//Solution:Member to identify if acc table should be disposed
sal_Bool bIfAccTableShouldDisposing;
- //-----IAccessibility2 Implementation 2009
// --> OD 2006-05-10 #i65250#
// frame ID is now in general available - used for layout loop control
@@ -424,12 +420,10 @@ protected:
sal_Bool bRetouche: 1; //Der Frame ist fuer Retusche verantwortlich
//wenn sal_True.
public:
- //IAccessibility2 Implementation 2009-----
virtual uno::Sequence< style::TabStop > GetTabStopInfo( SwTwips )
{
return uno::Sequence< style::TabStop >();
}
- //-----IAccessibility2 Implementation 2009
sal_Bool bUnUsed2: 1;
protected:
sal_Bool bInfInvalid: 1; //InfoFlags sind Invalid.
@@ -784,10 +778,8 @@ public:
virtual Size ChgSize( const Size& aNewSize );
virtual void Cut() = 0;
- //IAccessibility2 Implementation 2009-----
//Solution:Add a method to change the acc table dispose state.
void SetAccTableDispose( sal_Bool bDispose){ bIfAccTableShouldDisposing = bDispose;}
- //-----IAccessibility2 Implementation 2009
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ) = 0;
void ValidateLineNum() { bValidLineNum = sal_True; }
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/inc/tabfrm.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/inc/tabfrm.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/inc/tabfrm.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/inc/tabfrm.hxx Thu Nov 28 18:18:30 2013
@@ -33,33 +33,31 @@ class SwAttrSetChg;
class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
{
- // OD 14.03.2003 #i11760# - adjustment, because of method signature change
- //darf mit den Flags spielen.
friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow );
- //Fuert Spezialbehandlung fuer _Get[Next|Prev]Leaf() durch.
+ //Fuert Spezialbehandlung fuer _Get[Next|Prev]Leaf() durch.
using SwFrm::GetLeaf;
- SwLayoutFrm *GetLeaf( MakePageType eMakePage, sal_Bool bFwd );
+ SwLayoutFrm *GetLeaf( MakePageType eMakePage, sal_Bool bFwd );
SwTable* pTable;
- sal_Bool bComplete :1; //Eintrage als Repaint ohne das CompletePaint
- //der Basisklasse gesetzt werden muss. Damit
- //sollen unertraegliche Tabellen-Repaints
- //vermieden werden.
- sal_Bool bCalcLowers :1; //Im MakeAll auf jedenfall auch fuer Stabilitaet
- //des Inhaltes sorgen.
- sal_Bool bLowersFormatted :1;//Kommunikation zwischen MakeAll und Layact
- sal_Bool bLockBackMove :1; //BackMove-Test hat der Master erledigt.
- sal_Bool bResizeHTMLTable :1; //Resize des HTMLTableLayout rufen im MakeAll
- //Zur Optimierung, damit dies nicht im
- //CntntFrm::Grow gerufen werden muss, denn dann
- //wird es ggf. fuer jede Zelle gerufen #47483#
- sal_Bool bONECalcLowers :1; //Primaer fuer die StarONE-SS. Beim MakeAll werden
- //die Cntnts auf jedenfall per Calc() formatiert.
- //es finden keine zusaetzlichen Invalidierungen
- //statt und dieser Weg kann auch kaum garantien
- //geben.
+ sal_Bool bComplete :1; //Eintrage als Repaint ohne das CompletePaint
+ //der Basisklasse gesetzt werden muss. Damit
+ //sollen unertraegliche Tabellen-Repaints
+ //vermieden werden.
+ sal_Bool bCalcLowers :1; //Im MakeAll auf jedenfall auch fuer Stabilitaet
+ //des Inhaltes sorgen.
+ sal_Bool bLowersFormatted :1;//Kommunikation zwischen MakeAll und Layact
+ sal_Bool bLockBackMove :1; //BackMove-Test hat der Master erledigt.
+ sal_Bool bResizeHTMLTable :1; //Resize des HTMLTableLayout rufen im MakeAll
+ //Zur Optimierung, damit dies nicht im
+ //CntntFrm::Grow gerufen werden muss, denn dann
+ //wird es ggf. fuer jede Zelle gerufen #47483#
+ sal_Bool bONECalcLowers :1; //Primaer fuer die StarONE-SS. Beim MakeAll werden
+ //die Cntnts auf jedenfall per Calc() formatiert.
+ //es finden keine zusaetzlichen Invalidierungen
+ //statt und dieser Weg kann auch kaum garantien
+ //geben.
sal_Bool bHasFollowFlowLine :1; // Means that the first line in the follow
// is indented to contain content from a broken
@@ -76,7 +74,6 @@ class SwTabFrm: public SwLayoutFrm, publ
// is necessary, in order to let the text
// flow into the FollowFlowLine
sal_Bool bRemoveFollowFlowLinePending :1;
- // --> OD 2004-10-04 #i26945#
sal_Bool bConsiderObjsForMinCellHeight :1; // Usually, the floating screen objects
// are considered on the calculation
// for the minimal cell height.
@@ -85,23 +82,24 @@ class SwTabFrm: public SwLayoutFrm, publ
// screen object for the preparation
// of the re-calculation of the
// last table row.
- // <--
- // --> OD 2004-10-15 #i26945#
sal_Bool bObjsDoesFit :1; // For splitting table rows algorithm, this boolean
// indicates, if the floating screen objects fits
- // <--
- sal_Bool bDummy4 :1;
- //Split() spaltet den Frm an der angegebenen Stelle, es wird ein
- //Follow erzeugt und aufgebaut und direkt hinter this gepastet.
- //Join() Holt sich den Inhalt aus dem Follow und vernichtet diesen.
+ bool mbInRecalcLowerRow : 1;
+
+ //Split() spaltet den Frm an der angegebenen Stelle, es wird ein
+ //Follow erzeugt und aufgebaut und direkt hinter this gepastet.
+ //Join() Holt sich den Inhalt aus dem Follow und vernichtet diesen.
bool Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep );
bool Join();
- void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
- SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
+ void _UpdateAttr(
+ const SfxPoolItem*,
+ const SfxPoolItem*, sal_uInt8 &,
+ SwAttrSetChg *pa = 0,
+ SwAttrSetChg *pb = 0 );
- virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool bHead, sal_Bool &rReformat );
+ virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool bHead, sal_Bool &rReformat );
protected:
virtual void MakeAll();
@@ -168,7 +166,15 @@ public:
sal_Bool IsRemoveFollowFlowLinePending() const { return bRemoveFollowFlowLinePending; }
void SetRemoveFollowFlowLinePending( sal_Bool bNew ) { bRemoveFollowFlowLinePending = bNew; }
- // --> OD 2004-10-04 #i26945#
+ bool IsInRecalcLowerRow() const
+ {
+ return mbInRecalcLowerRow;
+ }
+ void SetInRecalcLowerRow( bool bNew )
+ {
+ mbInRecalcLowerRow = bNew;
+ }
+
sal_Bool IsConsiderObjsForMinCellHeight() const
{
return bConsiderObjsForMinCellHeight;
@@ -177,8 +183,7 @@ public:
{
bConsiderObjsForMinCellHeight = _bNewConsiderObjsForMinCellHeight;
}
- // <--
- // --> OD 2004-10-04 #i26945#
+
sal_Bool DoesObjsFit() const
{
return bObjsDoesFit;
@@ -187,29 +192,27 @@ public:
{
bObjsDoesFit = _bNewObjsDoesFit;
}
- // <--
bool RemoveFollowFlowLine();
//
// End: New stuff for breaking table rows
//
- sal_Bool CalcFlyOffsets( SwTwips& rUpper, long& rLeftOffset,
- long& rRightOffset ) const;
+ sal_Bool CalcFlyOffsets(
+ SwTwips& rUpper,
+ long& rLeftOffset,
+ long& rRightOffset ) const;
SwTwips CalcHeightOfFirstContentLine() const;
- bool IsInHeadline( const SwFrm& rFrm ) const;
+ bool IsInHeadline( const SwFrm& rFrm ) const;
SwRowFrm* GetFirstNonHeadlineRow() const;
bool IsLayoutSplitAllowed() const;
- // --> collapsing borders FME 2005-05-27 #i29550#
bool IsCollapsingBorders() const;
- // used for collapsing border lines:
sal_uInt16 GetBottomLineSize() const;
- // <-- collapsing
DECL_FIXEDMEMPOOL_NEWDEL(SwTabFrm)
};
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/inc/txtfrm.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/inc/txtfrm.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/inc/txtfrm.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/inc/txtfrm.hxx Thu Nov 28 18:18:30 2013
@@ -26,9 +26,7 @@
#include <tools/mempool.hxx>
#include <tools/string.hxx>
#include "cntfrm.hxx"
-//IAccessibility2 Implementation 2009-----
#include "com/sun/star/uno/Sequence.hxx"
-//-----IAccessibility2 Implementation 2009
#define STRSIZE(x) (sizeof(x)-1)
class SwCharRange;
@@ -231,9 +229,7 @@ protected:
public:
- //IAccessibility2 Implementation 2009-----
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos );
- //-----IAccessibility2 Implementation 2009
//public, weil der eine oder andere die Methode rufen darf um das
//Prepare zu sparen - mit Vorsicht zu geniessen!
void Init();
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/inc/viewimp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/inc/viewimp.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/inc/viewimp.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/inc/viewimp.hxx Thu Nov 28 18:18:30 2013
@@ -286,11 +286,9 @@ public:
inline void AddAccessibleObj( const SdrObject *pObj );
- //IAccessibility2 Implementation 2009-----
void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection);
void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
- //-----IAccessibility2 Implementation 2009
// Invalidate accessible frame's frame's content
void InvalidateAccessibleFrmContent( const SwFrm *pFrm );
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/layout/tabfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/layout/tabfrm.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/layout/tabfrm.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/layout/tabfrm.cxx Thu Nov 28 18:18:30 2013
@@ -93,10 +93,9 @@ SwTabFrm::SwTabFrm( SwTable &rTab, SwFrm
bComplete = bCalcLowers = bONECalcLowers = bLowersFormatted = bLockBackMove =
bResizeHTMLTable = bHasFollowFlowLine = bIsRebuildLastLine =
bRestrictTableGrowth = bRemoveFollowFlowLinePending = sal_False;
- // --> OD 2004-10-04 #i26945#
bConsiderObjsForMinCellHeight = sal_True;
bObjsDoesFit = sal_True;
- // <--
+ mbInRecalcLowerRow = false;
bFixSize = sal_False; //Nicht nochmal auf die Importfilter hereinfallen.
nType = FRMC_TAB;
@@ -126,10 +125,9 @@ SwTabFrm::SwTabFrm( SwTabFrm &rTab ) :
bLockJoin = bComplete = bONECalcLowers = bCalcLowers = bLowersFormatted = bLockBackMove =
bResizeHTMLTable = bHasFollowFlowLine = bIsRebuildLastLine =
bRestrictTableGrowth = bRemoveFollowFlowLinePending = sal_False;
- // --> OD 2004-10-04 #i26945#
bConsiderObjsForMinCellHeight = sal_True;
bObjsDoesFit = sal_True;
- // <--
+ mbInRecalcLowerRow = false;
bFixSize = sal_False; //Nicht nochmal auf die Importfilter hereinfallen.
nType = FRMC_TAB;
@@ -2039,182 +2037,160 @@ void SwTabFrm::MakeAll()
int nUnSplitted = 5; // Just another loop control :-(
SWRECTFN( this )
- while ( !bValidPos || !bValidSize || !bValidPrtArea )
- {
- if ( sal_True == (bMoveable = IsMoveable()) )
- if ( CheckMoveFwd( bMakePage, bKeep && KEEPTAB, bMovedBwd ) )
- {
- bMovedFwd = sal_True;
- bCalcLowers = sal_True;
+ while ( !bValidPos || !bValidSize || !bValidPrtArea )
+ {
+ if ( sal_True == (bMoveable = IsMoveable()) )
+ if ( CheckMoveFwd( bMakePage, bKeep && KEEPTAB, bMovedBwd ) )
+ {
+ bMovedFwd = sal_True;
+ bCalcLowers = sal_True;
// --> OD 2009-08-12 #i99267#
// reset <bSplit> after forward move to assure that follows
// can be joined, if further space is available.
bSplit = sal_False;
// <--
- }
+ }
Point aOldPos( (Frm().*fnRect->fnGetPos)() );
- MakePos();
+ MakePos();
if ( aOldPos != (Frm().*fnRect->fnGetPos)() )
- {
+ {
if ( aOldPos.Y() != (Frm().*fnRect->fnGetTop)() )
- {
- SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout();
- if( pLayout )
- {
- delete pAccess;
- bCalcLowers |= pLayout->Resize(
- pLayout->GetBrowseWidthByTabFrm( *this ), sal_False );
+ {
+ SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout();
+ if( pLayout )
+ {
+ delete pAccess;
+ bCalcLowers |= pLayout->Resize(
+ pLayout->GetBrowseWidthByTabFrm( *this ), sal_False );
pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this );
- pAttrs = pAccess->Get();
- }
+ pAttrs = pAccess->Get();
+ }
- bValidPrtArea = sal_False;
- aNotify.SetLowersComplete( sal_False );
- }
- SwFrm *pPre;
- if ( bKeep || (0 != (pPre = FindPrev()) &&
- pPre->GetAttrSet()->GetKeep().GetValue()) )
- {
- bCalcLowers = sal_True;
- }
- }
+ bValidPrtArea = sal_False;
+ aNotify.SetLowersComplete( sal_False );
+ }
+ SwFrm *pPre;
+ if ( bKeep || (0 != (pPre = FindPrev()) &&
+ pPre->GetAttrSet()->GetKeep().GetValue()) )
+ {
+ bCalcLowers = sal_True;
+ }
+ }
- //Wir muessen die Hoehe der ersten Zeile kennen, denn nur wenn diese
- //kleiner wird muss ggf. der Master angestossen werden um noetigenfalls
- //die Zeile aufzunehmen.
- long n1StLineHeight = 0;
- if ( IsFollow() )
- {
+ //Wir muessen die Hoehe der ersten Zeile kennen, denn nur wenn diese
+ //kleiner wird muss ggf. der Master angestossen werden um noetigenfalls
+ //die Zeile aufzunehmen.
+ long n1StLineHeight = 0;
+ if ( IsFollow() )
+ {
SwFrm* pFrm = GetFirstNonHeadlineRow();
if ( pFrm )
n1StLineHeight = (pFrm->Frm().*fnRect->fnGetHeight)();
- }
+ }
- if ( !bValidSize || !bValidPrtArea )
- {
+ if ( !bValidSize || !bValidPrtArea )
+ {
const long nOldPrtWidth = (Prt().*fnRect->fnGetWidth)();
const long nOldFrmWidth = (Frm().*fnRect->fnGetWidth)();
const Point aOldPrtPos = (Prt().*fnRect->fnGetPos)();
- Format( pAttrs );
+ Format( pAttrs );
- SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout();
- if ( pLayout &&
- ((Prt().*fnRect->fnGetWidth)() != nOldPrtWidth ||
- (Frm().*fnRect->fnGetWidth)() != nOldFrmWidth) )
- {
- delete pAccess;
- bCalcLowers |= pLayout->Resize(
- pLayout->GetBrowseWidthByTabFrm( *this ), sal_False );
-// GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() ? sal_False : sal_True );
- pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
- pAttrs = pAccess->Get();
- }
+ SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout();
+ if ( pLayout &&
+ ((Prt().*fnRect->fnGetWidth)() != nOldPrtWidth ||
+ (Frm().*fnRect->fnGetWidth)() != nOldFrmWidth) )
+ {
+ delete pAccess;
+ bCalcLowers |= pLayout->Resize(
+ pLayout->GetBrowseWidthByTabFrm( *this ), sal_False );
+ pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
+ pAttrs = pAccess->Get();
+ }
if ( aOldPrtPos != (Prt().*fnRect->fnGetPos)() )
- aNotify.SetLowersComplete( sal_False );
- }
+ aNotify.SetLowersComplete( sal_False );
+ }
- //Wenn ich der erste einer Kette bin koennte ich mal sehen ob
- //ich zurueckfliessen kann (wenn ich mich ueberhaupt bewegen soll).
- //Damit es keine Oszillation gibt, darf ich nicht gerade vorwaerts
- //geflosssen sein.
+ //Wenn ich der erste einer Kette bin koennte ich mal sehen ob
+ //ich zurueckfliessen kann (wenn ich mich ueberhaupt bewegen soll).
+ //Damit es keine Oszillation gibt, darf ich nicht gerade vorwaerts
+ //geflosssen sein.
if ( !bMovedFwd && (bMoveable || bFly) && lcl_NoPrev( *this ) )
- {
- //Bei Follows muss der Master benachrichtigt
- //werden. Der Follow muss nur dann Moven, wenn er leere Blaetter
- //ueberspringen muss.
- if ( IsFollow() )
- {
- //Nur wenn die Hoehe der ersten Zeile kleiner geworder ist.
+ {
+ //Bei Follows muss der Master benachrichtigt
+ //werden. Der Follow muss nur dann Moven, wenn er leere Blaetter
+ //ueberspringen muss.
+ if ( IsFollow() )
+ {
+ //Nur wenn die Hoehe der ersten Zeile kleiner geworder ist.
SwFrm *pFrm = GetFirstNonHeadlineRow();
if( pFrm && n1StLineHeight >(pFrm->Frm().*fnRect->fnGetHeight )() )
- {
- SwTabFrm *pMaster = (SwTabFrm*)FindMaster();
- sal_Bool bDummy;
- if ( ShouldBwdMoved( pMaster->GetUpper(), sal_False, bDummy ) )
- pMaster->InvalidatePos();
- }
- }
- SwFtnBossFrm *pOldBoss = bFtnsInDoc ? FindFtnBossFrm( sal_True ) : 0;
- sal_Bool bReformat;
- if ( MoveBwd( bReformat ) )
- {
+ {
+ SwTabFrm *pMaster = (SwTabFrm*)FindMaster();
+ sal_Bool bDummy;
+ if ( ShouldBwdMoved( pMaster->GetUpper(), sal_False, bDummy ) )
+ pMaster->InvalidatePos();
+ }
+ }
+ SwFtnBossFrm *pOldBoss = bFtnsInDoc ? FindFtnBossFrm( sal_True ) : 0;
+ sal_Bool bReformat;
+ if ( MoveBwd( bReformat ) )
+ {
SWREFRESHFN( this )
- bMovedBwd = sal_True;
- aNotify.SetLowersComplete( sal_False );
- if ( bFtnsInDoc )
- MoveLowerFtns( 0, pOldBoss, 0, sal_True );
- if ( bReformat || bKeep )
- {
+ bMovedBwd = sal_True;
+ aNotify.SetLowersComplete( sal_False );
+ if ( bFtnsInDoc )
+ MoveLowerFtns( 0, pOldBoss, 0, sal_True );
+ if ( bReformat || bKeep )
+ {
long nOldTop = (Frm().*fnRect->fnGetTop)();
MakePos();
if( nOldTop != (Frm().*fnRect->fnGetTop)() )
- {
+ {
SwHTMLTableLayout *pHTMLLayout =
- GetTable()->GetHTMLTableLayout();
+ GetTable()->GetHTMLTableLayout();
if( pHTMLLayout )
- {
- delete pAccess;
+ {
+ delete pAccess;
bCalcLowers |= pHTMLLayout->Resize(
pHTMLLayout->GetBrowseWidthByTabFrm( *this ),
- sal_False );
+ sal_False );
- pAccess= new SwBorderAttrAccess(
- SwFrm::GetCache(), this );
- pAttrs = pAccess->Get();
- }
+ pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this );
+ pAttrs = pAccess->Get();
+ }
- bValidPrtArea = sal_False;
- Format( pAttrs );
- }
+ bValidPrtArea = sal_False;
+ Format( pAttrs );
+ }
lcl_RecalcTable( *this, 0, aNotify );
- bLowersFormatted = sal_True;
- if ( bKeep && KEEPTAB )
- {
- // --> OD 2005-09-28 #b6329202#
- // Consider case that table is inside another table,
- // because it has to be avoided, that superior table
- // is formatted.
- // Thus, find next content, table or section
- // and, if a section is found, get its first
- // content.
-// SwFrm *pNxt = FindNextCnt();
-// if( pNxt && pNxt->IsInTab() )
-// pNxt = pNxt->FindTabFrm();
-// if ( pNxt )
-// {
-// pNxt->Calc();
-// if ( !GetNext() )
-// bValidPos = sal_False;
-// }
+ bLowersFormatted = sal_True;
+ if ( bKeep && KEEPTAB )
+ {
if ( 0 != lcl_FormatNextCntntForKeep( this ) && !GetNext() )
{
bValidPos = sal_False;
}
- // <--
- }
- }
- }
- }
+ }
+ }
+ }
+ }
- //Wieder ein Wert ungueltig? - dann nochmal das ganze...
- if ( !bValidPos || !bValidSize || !bValidPrtArea )
- continue;
+ //Wieder ein Wert ungueltig? - dann nochmal das ganze...
+ if ( !bValidPos || !bValidSize || !bValidPrtArea )
+ continue;
// check, if calculation of table frame is ready.
- /// OD 23.10.2002 #103517# - Local variable <nDistanceToUpperPrtBottom>
- /// Introduce local variable and init it with the distance from the
- /// table frame bottom to the bottom of the upper printing area.
- /// Note: negative values denotes the situation that table frame doesn't
- /// fit in its upper.
-
+ // Local variable <nDistanceToUpperPrtBottom>
+ // Introduce local variable and init it with the distance from the
+ // table frame bottom to the bottom of the upper printing area.
+ // Note: negative values denotes the situation that table frame doesn't fit in its upper.
SwTwips nDistanceToUpperPrtBottom =
(Frm().*fnRect->fnBottomDist)( (GetUpper()->*fnRect->fnGetPrtBottom)());
- /// OD 23.10.2002 #103517# - In online layout try to grow upper of table
- /// frame, if table frame doesn't fit in its upper.
+ // In online layout try to grow upper of table frame, if table frame doesn't fit in its upper.
const ViewShell *pSh = getRootFrm()->GetCurrShell();
const bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
if ( nDistanceToUpperPrtBottom < 0 && bBrowseMode )
@@ -2222,8 +2198,7 @@ void SwTabFrm::MakeAll()
if ( GetUpper()->Grow( -nDistanceToUpperPrtBottom ) )
{
// upper is grown --> recalculate <nDistanceToUpperPrtBottom>
- nDistanceToUpperPrtBottom =
- (Frm().*fnRect->fnBottomDist)( (GetUpper()->*fnRect->fnGetPrtBottom)());
+ nDistanceToUpperPrtBottom = (Frm().*fnRect->fnBottomDist)( (GetUpper()->*fnRect->fnGetPrtBottom)());
}
}
@@ -2233,20 +2208,19 @@ void SwTabFrm::MakeAll()
// the table to be split! Only skip this if condition once.
if( nDistanceToUpperPrtBottom >= 0 && !bLastRowHasToMoveToFollow )
{
- // OD 23.10.2002 - translate german commentary
// If there is space left in the upper printing area, join as for trial
// at least one further row of an existing follow.
- if ( !bSplit && GetFollow() )
- {
- sal_Bool bDummy;
- if ( GetFollow()->ShouldBwdMoved( GetUpper(), sal_False, bDummy ) )
- {
+ if ( !bSplit && GetFollow() )
+ {
+ sal_Bool bDummy;
+ if ( GetFollow()->ShouldBwdMoved( GetUpper(), sal_False, bDummy ) )
+ {
SwFrm *pTmp = GetUpper();
SwTwips nDeadLine = (pTmp->*fnRect->fnGetPrtBottom)();
if ( bBrowseMode )
nDeadLine += pTmp->Grow( LONG_MAX, sal_True );
if( (Frm().*fnRect->fnBottomDist)( nDeadLine ) > 0 )
- {
+ {
//
// First, we remove an existing follow flow line.
//
@@ -2266,7 +2240,7 @@ void SwTabFrm::MakeAll()
SwFrm* pRow = GetFollow()->GetFirstNonHeadlineRow();
if ( !pRow || !pRow->GetNext() )
- //Der Follow wird leer und damit ueberfluessig.
+ //Der Follow wird leer und damit ueberfluessig.
Join();
continue;
@@ -2278,8 +2252,8 @@ void SwTabFrm::MakeAll()
//
SwRowFrm *pRow = GetFollow()->GetFirstNonHeadlineRow();
- //Der Follow wird leer und damit ueberfluessig.
- if ( !pRow )
+ //Der Follow wird leer und damit ueberfluessig.
+ if ( !pRow )
{
Join();
continue;
@@ -2291,28 +2265,29 @@ void SwTabFrm::MakeAll()
while ( pRowToMove && nRowsToMove-- > 0 )
{
- const sal_Bool bMoveFtns = bFtnsInDoc && !GetFollow()->IsJoinLocked();
+ const sal_Bool bMoveFtns = bFtnsInDoc && !GetFollow()->IsJoinLocked();
SwFtnBossFrm *pOldBoss = 0;
- if ( bMoveFtns )
- pOldBoss = pRowToMove->FindFtnBossFrm( sal_True );
+ if ( bMoveFtns )
+ pOldBoss = pRowToMove->FindFtnBossFrm( sal_True );
SwFrm* pNextRow = pRowToMove->GetNext();
- if ( !pNextRow )
- //Der Follow wird leer und damit ueberfluessig.
+ if ( !pNextRow )
+ {
+ //Der Follow wird leer und damit ueberfluessig.
Join();
+ }
else
- {
- pRowToMove->Cut();
- pRowToMove->Paste( this );
+ {
+ pRowToMove->Cut();
+ pRowToMove->Paste( this );
}
- //Die Fussnoten verschieben!
- if ( bMoveFtns )
- if ( ((SwLayoutFrm*)pRowToMove)->MoveLowerFtns(
- 0, pOldBoss, FindFtnBossFrm( sal_True ), sal_True ) )
- GetUpper()->Calc();
+ //Die Fussnoten verschieben!
+ if ( bMoveFtns )
+ if ( ((SwLayoutFrm*)pRowToMove)->MoveLowerFtns( 0, pOldBoss, FindFtnBossFrm( sal_True ), sal_True ) )
+ GetUpper()->Calc();
pRowToMove = pNextRow;
}
@@ -2321,11 +2296,11 @@ void SwTabFrm::MakeAll()
lcl_RecalcTable( *this, (SwLayoutFrm*)pRow, aNotify );
continue;
- }
- }
- }
- else if ( KEEPTAB )
- {
+ }
+ }
+ }
+ else if ( KEEPTAB )
+ {
bool bFormat = false;
if ( bKeep )
bFormat = true;
@@ -2373,61 +2348,61 @@ void SwTabFrm::MakeAll()
bLastRowHasToMoveToFollow = true;
}
}
- }
+ }
- if ( IsValid() )
- {
- if ( bCalcLowers )
- {
+ if ( IsValid() )
+ {
+ if ( bCalcLowers )
+ {
lcl_RecalcTable( *this, 0, aNotify );
- bLowersFormatted = sal_True;
- bCalcLowers = sal_False;
- }
- else if ( bONECalcLowers )
- {
+ bLowersFormatted = sal_True;
+ bCalcLowers = sal_False;
+ }
+ else if ( bONECalcLowers )
+ {
lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), LONG_MAX );
- bONECalcLowers = sal_False;
- }
- }
- continue;
- }
+ bONECalcLowers = sal_False;
+ }
+ }
+ continue;
+ }
//Ich passe nicht mehr in meinen Uebergeordneten, also ist es jetzt
- //an der Zeit moeglichst konstruktive Veranderungen vorzunehmen
+ //an der Zeit moeglichst konstruktive Veranderungen vorzunehmen
- //Wenn ich den uebergeordneten Frm nicht verlassen darf, habe
- //ich ein Problem; Frei nach Artur Dent tun wir das einzige das man
- //mit einen nicht loesbaren Problem tun kann: wir ignorieren es - und
- //zwar mit aller Kraft.
- if ( !bMoveable )
- {
- if ( bCalcLowers && IsValid() )
- {
+ //Wenn ich den uebergeordneten Frm nicht verlassen darf, habe
+ //ich ein Problem; Frei nach Artur Dent tun wir das einzige das man
+ //mit einen nicht loesbaren Problem tun kann: wir ignorieren es - und
+ //zwar mit aller Kraft.
+ if ( !bMoveable )
+ {
+ if ( bCalcLowers && IsValid() )
+ {
lcl_RecalcTable( *this, 0, aNotify );
- bLowersFormatted = sal_True;
- bCalcLowers = sal_False;
- }
- else if ( bONECalcLowers )
- {
+ bLowersFormatted = sal_True;
+ bCalcLowers = sal_False;
+ }
+ else if ( bONECalcLowers )
+ {
lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), LONG_MAX );
- bONECalcLowers = sal_False;
- }
+ bONECalcLowers = sal_False;
+ }
// It does not make sense to cut off the last line if we are
// not moveable:
bLastRowHasToMoveToFollow = false;
- continue;
- }
+ continue;
+ }
if ( bCalcLowers && IsValid() )
- {
+ {
lcl_RecalcTable( *this, 0, aNotify );
- bLowersFormatted = sal_True;
- bCalcLowers = sal_False;
+ bLowersFormatted = sal_True;
+ bCalcLowers = sal_False;
if( !IsValid() )
continue;
- }
+ }
//
// First try to split the table. Condition:
@@ -2471,7 +2446,11 @@ void SwTabFrm::MakeAll()
nDeadLine = (*fnRect->fnYInc)( nDeadLine,
GetUpper()->Grow( LONG_MAX, sal_True ) );
- ::lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), nDeadLine );
+ {
+ SetInRecalcLowerRow( true );
+ ::lcl_RecalcRow( static_cast<SwRowFrm&>(*Lower()), nDeadLine );
+ SetInRecalcLowerRow( false );
+ }
bLowersFormatted = sal_True;
aNotify.SetLowersComplete( sal_True );
@@ -2629,10 +2608,8 @@ void SwTabFrm::MakeAll()
SwFrm* pNxt = ((SwFrm*)GetFollow())->FindNext();
if ( pNxt )
{
- // OD 26.08.2003 #i18103# - no formatting
- // of found next frame, if its a follow
- // section of the 'ColLocked' section,
- // the follow table is in.
+ // no formatting of found next frame, if its a follow
+ // section of the 'ColLocked' section, the follow table is in.
bool bCalcNxt = true;
if ( GetFollow()->IsInSct() && pNxt->IsSctFrm() )
{
@@ -2678,30 +2655,30 @@ void SwTabFrm::MakeAll()
if ( !bMovedFwd && !MoveFwd( bMakePage, sal_False ) )
bMakePage = sal_False;
- // --> FME 2004-06-09 #i29771# Reset bSplitError flag on change of upper
+ // Reset bSplitError flag on change of upper
if ( GetUpper() != pOldUpper )
- {
+ {
bTryToSplit = true;
- nUnSplitted = 5;
- }
- // <--
+ nUnSplitted = 5;
+ }
SWREFRESHFN( this )
bMovedFwd = bCalcLowers = sal_True;
aNotify.SetLowersComplete( sal_False );
- if ( IsFollow() )
- { //Um Oszillationen zu vermeiden sollte kein ungueltiger Master
- //zurueckbleiben.
- SwTabFrm *pTab = FindMaster();
- if ( pTab->GetUpper() )
- pTab->GetUpper()->Calc();
- pTab->Calc();
- pTab->SetLowersFormatted( sal_False );
- }
+ if ( IsFollow() )
+ {
+ //Um Oszillationen zu vermeiden sollte kein ungueltiger Master
+ //zurueckbleiben.
+ SwTabFrm *pTab = FindMaster();
+ if ( pTab->GetUpper() )
+ pTab->GetUpper()->Calc();
+ pTab->Calc();
+ pTab->SetLowersFormatted( sal_False );
+ }
- //Wenn mein direkter Nachbar jetzt gleichzeitig mein Follow ist
- //verleibe ich mir das Teil ein.
- if ( ( GetNext() && GetNext() == GetFollow() ) || !GetLower() )
+ //Wenn mein direkter Nachbar jetzt gleichzeitig mein Follow ist
+ //verleibe ich mir das Teil ein.
+ if ( ( GetNext() && GetNext() == GetFollow() ) || !GetLower() )
{
if ( HasFollowFlowLine() )
RemoveFollowFlowLine();
@@ -2709,17 +2686,18 @@ void SwTabFrm::MakeAll()
Join();
}
- if ( bMovedBwd && GetUpper() )
- //Beim zurueckfliessen wurde der Upper angeregt sich vollstaendig
- //zu Painten, dass koennen wir uns jetzt nach dem hin und her
- //fliessen sparen.
- GetUpper()->ResetCompletePaint();
+ if ( bMovedBwd && GetUpper() )
+ {
+ //Beim zurueckfliessen wurde der Upper angeregt sich vollstaendig
+ //zu Painten, dass koennen wir uns jetzt nach dem hin und her
+ //fliessen sparen.
+ GetUpper()->ResetCompletePaint();
+ }
if ( bCalcLowers && IsValid() )
- {
- // --> OD 2005-05-11 #i44910# - format of lower frames unnecessary
- // and can cause layout loops, if table doesn't fit and isn't
- // allowed to split.
+ {
+ // format of lower frames unnecessary and can cause layout loops,
+ // if table doesn't fit and isn't allowed to split.
SwTwips nDistToUpperPrtBottom =
(Frm().*fnRect->fnBottomDist)( (GetUpper()->*fnRect->fnGetPrtBottom)());
if ( nDistToUpperPrtBottom >= 0 || bTryToSplit )
@@ -2734,25 +2712,24 @@ void SwTabFrm::MakeAll()
ASSERT( false, "debug assertion: <SwTabFrm::MakeAll()> - format of table lowers suppressed by fix i44910" );
}
#endif
- // <--
- }
+ }
- } //while ( !bValidPos || !bValidSize || !bValidPrtArea )
+ } //while ( !bValidPos || !bValidSize || !bValidPrtArea )
- //Wenn mein direkter Vorgaenger jetzt mein Master ist, so kann er mich
- //bei der nachstbesten Gelegenheit vernichten.
- if ( IsFollow() )
- {
- SwFrm *pPre = GetPrev();
- if ( pPre && pPre->IsTabFrm() && ((SwTabFrm*)pPre)->GetFollow() == this)
- pPre->InvalidatePos();
- }
+ //Wenn mein direkter Vorgaenger jetzt mein Master ist, so kann er mich
+ //bei der nachstbesten Gelegenheit vernichten.
+ if ( IsFollow() )
+ {
+ SwFrm *pPre = GetPrev();
+ if ( pPre && pPre->IsTabFrm() && ((SwTabFrm*)pPre)->GetFollow() == this)
+ pPre->InvalidatePos();
+ }
- bCalcLowers = bONECalcLowers = sal_False;
- delete pAccess;
- UnlockJoin();
+ bCalcLowers = bONECalcLowers = sal_False;
+ delete pAccess;
+ UnlockJoin();
if ( bMovedFwd || bMovedBwd || !bOldValidPos )
- aNotify.SetInvaKeep();
+ aNotify.SetInvaKeep();
}
/*************************************************************************
@@ -4815,28 +4792,30 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDi
}
}
- //Geeignet invalidieren und die Hoehe der Zellen auf den neuesten
- //Stand bringen.
- if ( !bTst )
- {
- if ( nReal )
- {
- if ( GetNext() )
- GetNext()->_InvalidatePos();
- _InvalidateAll();
- SetCompletePaint();
+ //Geeignet invalidieren und die Hoehe der Zellen auf den neuesten
+ //Stand bringen.
+ if ( !bTst )
+ {
+ if ( nReal )
+ {
+ if ( GetNext() )
+ GetNext()->_InvalidatePos();
+ _InvalidateAll();
+ SetCompletePaint();
- SwTabFrm *pTab = FindTabFrm();
- if ( !pTab->IsRebuildLastLine() && pTab->IsFollow() &&
- this == pTab->GetFirstNonHeadlineRow() )
+ SwTabFrm *pTab = FindTabFrm();
+ if ( !pTab->IsRebuildLastLine()
+ && pTab->IsFollow()
+ && this == pTab->GetFirstNonHeadlineRow()
+ && !pTab->IsInRecalcLowerRow() )
{
SwTabFrm* pMasterTab = const_cast< SwTabFrm* >( pTab->FindMaster() );
pMasterTab->InvalidatePos();
}
}
AdjustCells( (Prt().*fnRect->fnGetHeight)() - nReal, sal_True );
- }
- return nReal;
+ }
+ return nReal;
}
/*************************************************************************
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/layout/wsfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/layout/wsfrm.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/layout/wsfrm.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/layout/wsfrm.cxx Thu Nov 28 18:18:30 2013
@@ -88,6 +88,8 @@ using namespace ::com::sun::star;
SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) :
SwClient( pMod ),
+ //Solution:Add a member to identify if the acc table should dispose
+ bIfAccTableShouldDisposing( sal_False ),
// --> OD 2006-05-10 #i65250#
mnFrmId( SwFrm::mnLastFrmId++ ),
// <--
@@ -96,10 +98,6 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSi
pNext( 0 ),
pPrev( 0 ),
pDrawObjs( 0 )
- //IAccessibility2 Implementation 2009-----
- //Solution:Add a member to identify if the acc table should dispose
- , bIfAccTableShouldDisposing( sal_False )
- //-----IAccessibility2 Implementation 2009
, bInfBody( sal_False )
, bInfTab ( sal_False )
, bInfFly ( sal_False )
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/ole/ndole.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/ole/ndole.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/ole/ndole.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/ole/ndole.cxx Thu Nov 28 18:18:30 2013
@@ -794,7 +794,6 @@ void SwOLEObj::SetNode( SwOLENode* pNode
}
}
-//IAccessibility2 Implementation 2009-----
String SwOLEObj::GetStyleString()
{
String strStyle;
@@ -802,7 +801,6 @@ String SwOLEObj::GetStyleString()
strStyle = xOLERef.GetChartType();
return strStyle;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool SwOLEObj::IsOleRef() const
{
return xOLERef.is();
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/text/frmform.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/text/frmform.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/text/frmform.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/text/frmform.cxx Thu Nov 28 18:18:30 2013
@@ -57,11 +57,9 @@
#include <frmfmt.hxx> // SwFrmFmt
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
-//IAccessibility2 Implementation 2009-----
#include <portab.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/tstpitem.hxx>
-//-----IAccessibility2 Implementation 2009
class FormatLevel
{
@@ -561,7 +559,6 @@ void SwTxtFrm::AdjustFrm( const SwTwips
UNDO_SWAP( this )
}
-//IAccessibility2 Implementation 2009-----
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTxtFrm::GetTabStopInfo( SwTwips CurrentPos )
{
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs(1);
@@ -601,7 +598,6 @@ com::sun::star::uno::Sequence< ::com::su
tabs[0] = ts;
return tabs;
}
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
* SwTxtFrm::AdjustFollow()
*************************************************************************/
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/text/porfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/text/porfld.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/text/porfld.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/text/porfld.cxx Thu Nov 28 18:18:30 2013
@@ -88,9 +88,7 @@ SwFldPortion::SwFldPortion( const XubStr
, m_bNoLength( sal_False )
{
SetWhichPor( POR_FLD );
- //IAccessibility2 Implementation 2009-----
m_nAttrFldType = 0;
- //-----IAccessibility2 Implementation 2009
}
SwFldPortion::SwFldPortion( const SwFldPortion& rFld )
@@ -471,12 +469,10 @@ sal_Bool SwFldPortion::GetExpTxt( const
void SwFldPortion::HandlePortion( SwPortionHandler& rPH ) const
{
rPH.Special( GetLen(), aExpand, GetWhichPor() );
- //IAccessibility2 Implementation 2009-----
if( GetWhichPor() == POR_FLD )
{
rPH.SetAttrFieldType(m_nAttrFldType);
}
- //-----IAccessibility2 Implementation 2009
}
/*************************************************************************
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/text/porfld.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/text/porfld.hxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/text/porfld.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/text/porfld.hxx Thu Nov 28 18:18:30 2013
@@ -65,9 +65,7 @@ public:
SwFldPortion( const XubString &rExpand, SwFont *pFnt = 0, sal_Bool bPlaceHolder = sal_False );
~SwFldPortion();
- //IAccessibility2 Implementation 2009-----
sal_uInt16 m_nAttrFldType;
- //-----IAccessibility2 Implementation 2009
void TakeNextOffset( const SwFldPortion* pFld );
void CheckScript( const SwTxtSizeInfo &rInf );
inline sal_Bool HasFont() const { return 0 != pFnt; }
Modified: openoffice/branches/rejuvenate01/main/sw/source/core/text/txtfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/text/txtfld.cxx?rev=1546437&r1=1546436&r2=1546437&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/text/txtfld.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/text/txtfld.cxx Thu Nov 28 18:18:30 2013
@@ -59,14 +59,12 @@
#include "fmtmeta.hxx" // lcl_NewMetaPortion
-//IAccessibility2 Implementation 2009-----
#ifndef _REFFLD_HXX
#include "reffld.hxx"
#endif
#ifndef _FLDDAT_HXX
#include "flddat.hxx"
#endif
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
* SwTxtFormatter::NewFldPortion()
*************************************************************************/
@@ -98,9 +96,7 @@ SwExpandPortion *SwTxtFormatter::NewFldP
SwCharFmt* pChFmt = 0;
sal_Bool bNewFlyPor = sal_False,
bINet = sal_False;
- //IAccessibility2 Implementation 2009-----
sal_uInt16 subType;
- //-----IAccessibility2 Implementation 2009
// set language
((SwTxtFormatter*)this)->SeekAndChg( rInf );
if (pFld->GetLanguage() != GetFnt()->GetLanguage())
@@ -172,10 +168,8 @@ SwExpandPortion *SwTxtFormatter::NewFldP
: pFld->ExpandField(bInClipboard) );
pRet = new SwFldPortion( str );
}
- //IAccessibility2 Implementation 2009-----
if(pRet)
((SwFldPortion*)pRet)->m_nAttrFldType= ATTR_PAGECOOUNTFLD;
- //-----IAccessibility2 Implementation 2009
break;
case RES_PAGENUMBERFLD:
@@ -202,10 +196,8 @@ SwExpandPortion *SwTxtFormatter::NewFldP
: pFld->ExpandField(bInClipboard) );
pRet = new SwFldPortion( str );
}
- //IAccessibility2 Implementation 2009-----
if(pRet)
((SwFldPortion*)pRet)->m_nAttrFldType= ATTR_PAGENUMBERFLD;
- //-----IAccessibility2 Implementation 2009
break;
}
case RES_GETEXPFLD:
@@ -281,7 +273,6 @@ SwExpandPortion *SwTxtFormatter::NewFldP
bNewFlyPor = sal_True;
bPlaceHolder = sal_True;
break;
- //IAccessibility2 Implementation 2009-----
case RES_GETREFFLD:
subType = ((SwGetRefField*)pFld)->GetSubType();
{
@@ -314,7 +305,6 @@ SwExpandPortion *SwTxtFormatter::NewFldP
((SwFldPortion*)pRet)->m_nAttrFldType = ATTR_TIMEFLD;
break;
}
- //-----IAccessibility2 Implementation 2009
default:
{
String const str( (bName)