You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/12/01 12:40:35 UTC
svn commit: r1546803 [12/14] - in /openoffice/branches/l10n40: ./ main/
main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/standard/
main/accessibility/source/extended/ main/accessibility/source/helper/
main/accessibili...
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accpara.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accpara.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accpara.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accpara.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/access/accportions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accportions.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accportions.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accportions.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/access/accportions.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accportions.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accportions.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accportions.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/access/accpreview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accpreview.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accpreview.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accpreview.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/access/accpreview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accpreview.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accpreview.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accpreview.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/access/accselectionhelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accselectionhelper.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accselectionhelper.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accselectionhelper.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/access/acctable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/acctable.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/acctable.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/acctable.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/access/acctable.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/acctable.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/acctable.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/acctable.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/access/acctextframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/acctextframe.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/acctextframe.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/acctextframe.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/access/acctextframe.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/acctextframe.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/acctextframe.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/acctextframe.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/attr/format.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/attr/format.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/attr/format.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/attr/format.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/crsr/crsrsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/crsr/crsrsh.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/crsr/crsrsh.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/crsr/crsrsh.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/doc/doclay.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/doc/doclay.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/doc/doclay.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/doc/doclay.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/doc/tblcpy.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/doc/tblcpy.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/doc/tblcpy.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/doc/tblcpy.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/docnode/node.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/docnode/node.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/docnode/node.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/docnode/node.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/docnode/nodes.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/docnode/nodes.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/docnode/nodes.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/docnode/nodes.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/fields/expfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/fields/expfld.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/fields/expfld.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/fields/expfld.cxx Sun Dec 1 11:40:24 2013
@@ -1155,8 +1155,8 @@ SwInputField::SwInputField( SwInputField
, aContent(rContent)
, aPText(rPrompt)
, nSubType(nSub)
- , mpFmtFld( NULL )
, mbIsFormField( bIsFormField )
+ , mpFmtFld( NULL )
{
}
Modified: openoffice/branches/l10n40/main/sw/source/core/frmedt/feshview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/frmedt/feshview.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/frmedt/feshview.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/frmedt/feshview.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/frmedt/tblsel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/frmedt/tblsel.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/frmedt/tblsel.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/frmedt/tblsel.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/inc/SwPortionHandler.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/inc/SwPortionHandler.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/inc/SwPortionHandler.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/inc/SwPortionHandler.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/inc/doctxm.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/inc/doctxm.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/inc/doctxm.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/inc/doctxm.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/inc/frame.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/inc/frame.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/inc/frame.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/inc/frame.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/inc/txtfrm.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/inc/txtfrm.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/inc/txtfrm.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/inc/txtfrm.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/inc/viewimp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/inc/viewimp.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/inc/viewimp.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/inc/viewimp.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/layout/wsfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/layout/wsfrm.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/layout/wsfrm.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/layout/wsfrm.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/ole/ndole.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/ole/ndole.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/ole/ndole.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/ole/ndole.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/swg/SwXMLTextBlocks1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/swg/SwXMLTextBlocks1.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/swg/SwXMLTextBlocks1.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/swg/SwXMLTextBlocks1.cxx Sun Dec 1 11:40:24 2013
@@ -70,7 +70,7 @@ sal_uLong SwXMLTextBlocks::GetDoc( sal_u
try
{
xRoot = xBlkRoot->openStorageElement( aFolderName, embed::ElementModes::READ );
- xMedium = new SfxMedium(xRoot, GetBaseURL(), S2U("writer8"));
+ xMedium = new SfxMedium(xRoot, GetBaseURL(), OUString::createFromAscii("writer8"));
SwReader aReader(*xMedium,aFolderName, pDoc );
ReadXML->SetBlockMode( sal_True );
aReader.Read( *ReadXML );
Modified: openoffice/branches/l10n40/main/sw/source/core/text/frmform.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/text/frmform.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/text/frmform.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/text/frmform.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/text/porfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/text/porfld.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/text/porfld.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/text/porfld.cxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/text/porfld.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/text/porfld.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/text/porfld.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/text/porfld.hxx Sun Dec 1 11:40:24 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/l10n40/main/sw/source/core/text/txtfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/text/txtfld.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/text/txtfld.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/text/txtfld.cxx Sun Dec 1 11:40:24 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)
Modified: openoffice/branches/l10n40/main/sw/source/core/unocore/unodraw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/unocore/unodraw.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/unocore/unodraw.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/unocore/unodraw.cxx Sun Dec 1 11:40:24 2013
@@ -2067,7 +2067,7 @@ void SwXShape::attach(const uno::Referen
{
uno::Any aPos;
aPos <<= xTextRange;
- setPropertyValue(S2U("TextRange"), aPos);
+ setPropertyValue( C2U("TextRange"), aPos);
uno::Reference< drawing::XShape > xTemp( (cppu::OWeakObject*) this, uno::UNO_QUERY );
xDP->add( xTemp );
}
Modified: openoffice/branches/l10n40/main/sw/source/core/unocore/unoframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/unocore/unoframe.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/unocore/unoframe.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/unocore/unoframe.cxx Sun Dec 1 11:40:24 2013
@@ -2582,7 +2582,7 @@ uno::Reference< text::XTextCursor > SwX
if(!pNewStartNode || pNewStartNode != pOwnStartNode)
{
uno::RuntimeException aExcept;
- aExcept.Message = S2U("no text available");
+ aExcept.Message = C2U("no text available");
throw aExcept;
}
Modified: openoffice/branches/l10n40/main/sw/source/core/unocore/unomap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/unocore/unomap.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/unocore/unomap.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/unocore/unomap.cxx Sun Dec 1 11:40:24 2013
@@ -482,7 +482,6 @@ SwUnoPropertyMapProvider::~SwUnoProperty
{ SW_PROP_NMID(UNO_NAME_IS_FIELD_USED), FIELD_PROP_IS_FIELD_USED, CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::READONLY, 0},\
{ SW_PROP_NMID(UNO_NAME_IS_FIELD_DISPLAYED), FIELD_PROP_IS_FIELD_DISPLAYED, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::READONLY, 0},\
-//IAccessibility2 Implementation 2009-----
#define COMMON_ACCESSIBILITY_TEXT_ATTRIBUTE \
{ SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR }, \
{ SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0}, \
@@ -507,7 +506,6 @@ SwUnoPropertyMapProvider::~SwUnoProperty
{ SW_PROP_NMID(UNO_NAME_PARA_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS}, \
{ SW_PROP_NMID(UNO_NAME_TABSTOPS), RES_PARATR_TABSTOP, CPPU_E2T(CPPUTYPE_SEQTABSTOP), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
-//-----IAccessibility2 Implementation 2009
const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(sal_uInt16 nPropertyId)
{
@@ -526,7 +524,6 @@ const SfxItemPropertyMapEntry* SwUnoProp
aMapEntriesArr[nPropertyId] = aCharAndParaMap_Impl;
}
break;
- //IAccessibility2 Implementation 2009-----
case PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE:
{
static SfxItemPropertyMapEntry aAccessibilityTextAttrMap_Impl[] =
@@ -537,7 +534,6 @@ const SfxItemPropertyMapEntry* SwUnoProp
aMapEntriesArr[nPropertyId] = aAccessibilityTextAttrMap_Impl;
}
break;
- //-----IAccessibility2 Implementation 2009
case PROPERTY_MAP_PARAGRAPH:
{
static SfxItemPropertyMapEntry aParagraphMap_Impl[] =
Modified: openoffice/branches/l10n40/main/sw/source/core/unocore/unotext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/unocore/unotext.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/unocore/unotext.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/unocore/unotext.cxx Sun Dec 1 11:40:24 2013
@@ -2874,7 +2874,7 @@ SwXHeadFootText::createTextCursor() thro
if (!pNewStartNode || (pNewStartNode != pOwnStartNode))
{
uno::RuntimeException aExcept;
- aExcept.Message = S2U("no text available");
+ aExcept.Message = C2U("no text available");
throw aExcept;
}
xRet = static_cast<text::XWordCursor*>(pXCursor);
Modified: openoffice/branches/l10n40/main/sw/source/core/view/viewimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/view/viewimp.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/view/viewimp.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/view/viewimp.cxx Sun Dec 1 11:40:24 2013
@@ -446,7 +446,6 @@ void SwViewImp::MoveAccessible( const Sw
} while ( pTmp != pVSh );
}
-//IAccessibility2 Implementation 2009-----
void SwViewImp::FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage)
{
if( IsAccessible() )
@@ -463,7 +462,6 @@ void SwViewImp::FireColumnChangeEvent(sa
if( IsAccessible() )
GetAccessibleMap().FireColumnChangeEvent(nOldColumn, nNewColumn);
}
-//-----IAccessibility2 Implementation 2009
void SwViewImp::InvalidateAccessibleFrmContent( const SwFrm *pFrm )
{
ASSERT( pFrm->IsAccessibleFrm(), "frame is not accessible" );
Modified: openoffice/branches/l10n40/main/sw/source/filter/ww8/rtfexport.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/filter/ww8/rtfexport.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/filter/ww8/rtfexport.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/filter/ww8/rtfexport.hxx Sun Dec 1 11:40:24 2013
@@ -46,6 +46,9 @@ class SwGrfNode;
class SwOLENode;
class SwSectionNode;
class SwNumRuleTbl;
+class SvStream;
+
+inline SvStream& operator<<( SvStream& s, const rtl::OString r) { return (s << r.getStr()); }
namespace com { namespace sun { namespace star {
namespace frame { class XModel; }
Modified: openoffice/branches/l10n40/main/sw/source/filter/ww8/rtfsdrexport.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/filter/ww8/rtfsdrexport.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/filter/ww8/rtfsdrexport.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/filter/ww8/rtfsdrexport.cxx Sun Dec 1 11:40:24 2013
@@ -469,7 +469,7 @@ sal_Int32 RtfSdrExport::StartShape()
m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE);
for(std::map<OString,OString>::reverse_iterator i = m_aShapeProps.rbegin(); i != m_aShapeProps.rend(); i++)
- lcl_AppendSP(m_rAttrOutput.RunText(), (*i).first, (*i).second );
+ lcl_AppendSP(m_rAttrOutput.RunText(), (*i).first.getStr(), (*i).second );
lcl_AppendSP(m_rAttrOutput.RunText(), "wzDescription", RtfExport::OutString( m_pSdrObject->GetDescription(), m_rExport.eCurrentEncoding));
lcl_AppendSP(m_rAttrOutput.RunText(), "wzName", RtfExport::OutString( m_pSdrObject->GetTitle(), m_rExport.eCurrentEncoding));
Modified: openoffice/branches/l10n40/main/sw/source/filter/xml/xmltbli.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/filter/xml/xmltbli.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/filter/xml/xmltbli.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/filter/xml/xmltbli.cxx Sun Dec 1 11:40:24 2013
@@ -2081,7 +2081,7 @@ SwTableBox *SwXMLTableContext::MakeTable
{
// set style
const SfxItemSet *pAutoItemSet = 0;
- if( pCell->GetStartNode() && sStyleName &&
+ if( pCell->GetStartNode() && !sStyleName.isEmpty() &&
GetSwImport().FindAutomaticStyle(
XML_STYLE_FAMILY_TABLE_CELL, sStyleName, &pAutoItemSet ) )
{
Modified: openoffice/branches/l10n40/main/sw/source/ui/app/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/app/docsh.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/app/docsh.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/app/docsh.cxx Sun Dec 1 11:40:24 2013
@@ -103,9 +103,7 @@
#include <unotools/fltrcfg.hxx>
#include <svtools/htmlcfg.hxx>
#include <sfx2/fcontnr.hxx>
-//IAccessibility2 Implementation 2009-----
#include <sfx2/viewfrm.hxx>
-//-----IAccessibility2 Implementation 2009
#include <sfx2/objface.hxx>
#include <comphelper/storagehelper.hxx>
@@ -404,7 +402,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium&
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SaveAs" );
- //IAccessibility2 Implementation 2009-----
pDoc->setDocAccTitle(String());
SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this );
if (pFrame1)
@@ -419,7 +416,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium&
}
}
}
- //-----IAccessibility2 Implementation 2009
SwWait aWait( *this, sal_True );
//#i3370# remove quick help to prevent saving of autocorrection suggestions
if(pView)
@@ -1285,7 +1281,6 @@ uno::Reference< frame::XController >
/* -----------------------------12.02.01 12:08--------------------------------
---------------------------------------------------------------------------*/
-//IAccessibility2 Implementation 2009-----
void SwDocShell::setDocAccTitle( const String& rTitle )
{
if (pDoc )
@@ -1320,7 +1315,6 @@ sal_Bool SwDocShell::getDocReadOnly() co
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
static const char* s_EventNames[] =
{
Modified: openoffice/branches/l10n40/main/sw/source/ui/cctrl/actctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/cctrl/actctrl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/cctrl/actctrl.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/cctrl/actctrl.cxx Sun Dec 1 11:40:24 2013
@@ -105,13 +105,11 @@ void NoSpaceEdit::Modify()
SetText(sTemp);
SetSelection(aSel);
}
-//IAccessibility2 Impplementaton 2009-----
Edit::Modify();
/*
if(GetModifyHdl().IsSet())
GetModifyHdl().Call(this);
*/
-//-----IAccessibility2 Impplementaton 2009
}
/* -----------------25.06.2003 15:57-----------------
Modified: openoffice/branches/l10n40/main/sw/source/ui/cctrl/swlbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/cctrl/swlbox.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/cctrl/swlbox.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/cctrl/swlbox.cxx Sun Dec 1 11:40:24 2013
@@ -223,11 +223,9 @@ String SwComboBox::GetText() const
return aTxt;
}
-//IAccessibility2 Impplementaton 2009-----
void SwComboBox::SetText( const XubString& rStr )
{
ComboBox::SetText(rStr);
// MT: CallEventListeners stay protected for now. Probably not needed at all, as the implementation of VCLXAccessibelEdit/ComboBox should do it on text changed nowadays anyway. Verify.
// CallEventListeners( VCLEVENT_EDIT_MODIFY );
}
-//-----IAccessibility2 Impplementaton 2009
Modified: openoffice/branches/l10n40/main/sw/source/ui/chrdlg/swuiccoll.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/chrdlg/swuiccoll.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/chrdlg/swuiccoll.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/chrdlg/swuiccoll.cxx Sun Dec 1 11:40:24 2013
@@ -127,7 +127,6 @@ SwCondCollPage::SwCondCollPage(Window *p
break;
}
-//IAccessibility2 Impplementaton 2009-----
if( pFamilyItem )
{
const SfxStyleFilter& rFilterList = pFamilyItem->GetFilterList();
@@ -137,7 +136,6 @@ SwCondCollPage::SwCondCollPage(Window *p
sal_uInt16* pFilter = new sal_uInt16(rFilterList.GetObject(i)->nFlags);
aFilterLB.SetEntryData(i, pFilter);
}
-//-----IAccessibility2 Impplementaton 2009
}
aFilterLB.SelectEntryPos(1);
Modified: openoffice/branches/l10n40/main/sw/source/ui/config/optpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/config/optpage.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/config/optpage.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/config/optpage.cxx Sun Dec 1 11:40:24 2013
@@ -1974,13 +1974,11 @@ SwRedlineOptionsTabPage::SwRedlineOption
aLk = LINK(this, SwRedlineOptionsTabPage, ChangedMaskPrevHdl);
aMarkPosLB.SetSelectHdl( aLk );
aMarkColorLB.SetSelectHdl( aLk );
-//IAccessibility2 Impplementaton 2009-----
//solution: set different accessible name of four color box
aInsertColorLB.SetAccessibleName(::rtl::OUString( aInsertFT.GetDisplayText()) + ::rtl::OUString(aInsertColorFT.GetDisplayText()));
aDeletedColorLB.SetAccessibleName(::rtl::OUString( aDeletedFT.GetDisplayText()) + ::rtl::OUString( aDeletedColorFT.GetDisplayText()));
aChangedColorLB.SetAccessibleName(::rtl::OUString( aChangedFT.GetDisplayText()) + ::rtl::OUString( aChangedColorFT.GetDisplayText()));
aMarkColorLB.SetAccessibleName(::rtl::OUString( aMarkPosFT.GetDisplayText()) + ::rtl::OUString( aMarkColorFT.GetDisplayText()));
-//-----IAccessibility2 Impplementaton 2009
}
SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
Modified: openoffice/branches/l10n40/main/sw/source/ui/dialog/uiregionsw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/dialog/uiregionsw.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/dialog/uiregionsw.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/dialog/uiregionsw.cxx Sun Dec 1 11:40:24 2013
@@ -457,9 +457,7 @@ SwEditRegionDlg::SwEditRegionDlg( Window
aPasswdPB.SetAccessibleRelationMemberOf(&aProtectFL);
aPasswdPB.SetAccessibleRelationLabeledBy(&aPasswdCB);
aSubRegionED.SetAccessibleName(aSubRegionFT.GetText());
-//IAccessibility2 Impplementaton 2009-----
aTree.SetAllEntriesAccessibleRoleType(TREEBOX_ALLITEM_ACCROLE_TYPE_TREE);
-//-----IAccessibility2 Impplementaton 2009
}
/* -----------------------------26.04.01 14:56--------------------------------
Modified: openoffice/branches/l10n40/main/sw/source/ui/docvw/access.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/docvw/access.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/docvw/access.src (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/docvw/access.src Sun Dec 1 11:40:24 2013
@@ -96,7 +96,6 @@ String STR_ACCESS_ANNOTATION_BUTTON_DESC
Text [ en-US ] = "Activate this button to open a list of actions which can be performed on this comment and other comments";
};
-//IAccessibility2 Implementation 2009-----
String STR_ACCESS_PREVIEW_DOC_NAME
{
Text [ en-US ] = "Document preview";
@@ -113,5 +112,4 @@ String STR_ACCESS_DOC_WORDPROCESSING_REA
{
Text [ en-US ] = "(read-only)";
};
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/ui/docvw/edtwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/docvw/edtwin.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/docvw/edtwin.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/docvw/edtwin.cxx Sun Dec 1 11:40:24 2013
@@ -5759,7 +5759,6 @@ Selection SwEditWin::GetSurroundingTextS
return Selection( nPos - nStartPos, nPos - nStartPos );
}
}
-//IAccessibility2 Implementation 2009-----
// MT: Removed Windows::SwitchView() introduced with IA2 CWS.
// There are other notifications for this when the active view has chnaged, so please update the code to use that event mechanism
void SwEditWin::SwitchView()
@@ -5772,4 +5771,3 @@ void SwEditWin::SwitchView()
rView.GetWrtShell().InvalidateAccessibleFocus();
#endif
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/ui/docvw/edtwin3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/docvw/edtwin3.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/docvw/edtwin3.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/docvw/edtwin3.cxx Sun Dec 1 11:40:24 2013
@@ -142,7 +142,6 @@ sal_Bool SwEditWin::RulerMarginDrag( con
return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
}
// <--
-//IAccessibility2 Impplementaton 2009-----
void AccessibilityScrollMDI(ViewShell* pVwSh, const SwRect& rRect , sal_uInt16 nRangeX, sal_uInt16 nRangeY, sal_Bool isLeftTop)
{
SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
@@ -169,7 +168,6 @@ void AccessibilityScrollMDI(ViewShell* p
}
}
-//-----IAccessibility2 Impplementaton 2009
LAYOUT_NS Dialog* GetSearchDialog()
{
Modified: openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.cxx Sun Dec 1 11:40:24 2013
@@ -517,7 +517,6 @@ SwColumnPage::SwColumnPage(Window *pPare
| WB_ITEMBORDER
| WB_DOUBLEBORDER );
-//IAccessibility2 Impplementaton 2009-----
for( i = 0; i < 5; i++)
//Solution:Set accessible name one be one
//aDefaultVS.InsertItem( i + 1, i );
@@ -545,7 +544,6 @@ SwColumnPage::SwColumnPage(Window *pPare
}
aDefaultVS.InsertItem( i + 1, aItemText, i );
}
-//-----IAccessibility2 Impplementaton 2009
aDefaultVS.SetSelectHdl(LINK(this, SwColumnPage, SetDefaultsHdl));
@@ -995,14 +993,12 @@ IMPL_LINK( SwColumnPage, ColModify, Nume
// #i17816# changing the displayed types within the ValueSet
//from two columns to two columns with different settings doesn't invalidate the
// example windows in ::ColModify()
-//IAccessibility2 Impplementaton 2009-----
// the pColMgr->GetCount()'s return is some how bugged,
// it will return 0 when actual count is 1, so fix it.
//if(!pNF ||(pColMgr->GetCount() != nCols))
int nTemp = pColMgr->GetCount();
if(nTemp == 0) nTemp = 1;
if( nTemp != nCols )
-//-----IAccessibility2 Impplementaton 2009
{
if(pNF)
aDefaultVS.SetNoSelection();
Modified: openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.hrc (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.hrc Sun Dec 1 11:40:24 2013
@@ -75,15 +75,11 @@
#define FT_TEXTDIRECTION 60
#define LB_TEXTDIRECTION 61
#define FL_VERT 62
-//IAccessibility2 Impplementaton 2009-----
#define STR_PAGESETUP_SPACING 32765
-//-----IAccessibility2 Impplementaton 2009
#define LISTBOX_SELECTION 0
#define LISTBOX_SECTION 1
#define LISTBOX_SECTIONS 2
#define LISTBOX_PAGE 3
#define LISTBOX_FRAME 4
-//IAccessibility2 Impplementaton 2009-----
#define STR_COLUMN_WIDTH 63
-//-----IAccessibility2 Impplementaton 2009
Modified: openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.src (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/frmdlg/column.src Sun Dec 1 11:40:24 2013
@@ -414,7 +414,6 @@ ModalDialog DLG_COLUMN
Text [ en-US ] = "Columns";
};
-//IAccessibility2 Impplementaton 2009-----
String STR_ACCESS_PAGESETUP_SPACING
{
Text [ en-US ] = "Spacing between %1 and %2";
@@ -424,4 +423,3 @@ String STR_ACCESS_COLUMN_WIDTH
{
Text [ en-US ] = "Column %1 Width";
};
-//-----IAccessibility2 Impplementaton 2009
Modified: openoffice/branches/l10n40/main/sw/source/ui/frmdlg/frmpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/frmdlg/frmpage.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/frmdlg/frmpage.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/frmdlg/frmpage.cxx Sun Dec 1 11:40:24 2013
@@ -639,7 +639,6 @@ sal_uLong lcl_GetLBRelationsForStrID( co
namespace
{
- //IAccessibility2 Implementation 2009-----
void HandleAutoCB( sal_Bool _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto, PercentField& _rPF_Edit)
{
_rFT_man.Show( !_bChecked );
@@ -647,7 +646,6 @@ namespace
String accName = _bChecked ? _rFT_auto.GetText() : _rFT_man.GetText();
_rPF_Edit.SetAccessibleName(accName);
}
- //-----IAccessibility2 Implementation 2009
}
@@ -2095,18 +2093,14 @@ IMPL_LINK_INLINE_END( SwFrmPage, RealSiz
IMPL_LINK( SwFrmPage, AutoWidthClickHdl, void*, EMPTYARG )
{
if( !IsInGraficMode() )
- //IAccessibility2 Implementation 2009-----
HandleAutoCB( aAutoWidthCB.IsChecked(), aWidthFT, aWidthAutoFT, aWidthED );
- //-----IAccessibility2 Implementation 2009
return 0;
}
IMPL_LINK( SwFrmPage, AutoHeightClickHdl, void*, EMPTYARG )
{
if( !IsInGraficMode() )
- //IAccessibility2 Implementation 2009-----
HandleAutoCB( aAutoHeightCB.IsChecked(), aHeightFT, aHeightAutoFT, aWidthED );
- //-----IAccessibility2 Implementation 2009
return 0;
}
@@ -2255,18 +2249,14 @@ void SwFrmPage::Init(const SfxItemSet& r
SwFrmSize eSize = rSize.GetHeightSizeType();
sal_Bool bCheck = eSize != ATT_FIX_SIZE;
aAutoHeightCB.Check( bCheck );
- //IAccessibility2 Implementation 2009-----
HandleAutoCB( bCheck, aHeightFT, aHeightAutoFT, aWidthED );
- //-----IAccessibility2 Implementation 2009
if( eSize == ATT_VAR_SIZE )
aHeightED.SetValue( aHeightED.GetMin(), FUNIT_NONE );
eSize = rSize.GetWidthSizeType();
bCheck = eSize != ATT_FIX_SIZE;
aAutoWidthCB.Check( bCheck );
- //IAccessibility2 Implementation 2009-----
HandleAutoCB( bCheck, aWidthFT, aWidthAutoFT, aWidthED );
- //-----IAccessibility2 Implementation 2009
if( eSize == ATT_VAR_SIZE )
aWidthED.SetValue( aWidthED.GetMin(), FUNIT_NONE );
Modified: openoffice/branches/l10n40/main/sw/source/ui/inc/conttree.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/inc/conttree.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/inc/conttree.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/inc/conttree.hxx Sun Dec 1 11:40:24 2013
@@ -36,10 +36,8 @@ class SwGlblDocContents;
class SwGlblDocContent;
class SfxObjectShell;
-//IAccessibility2 Implementation 2009-----
//Solution: Include SdrObject class
class SdrObject;
-//-----IAccessibility2 Implementation 2009
#define EDIT_MODE_EDIT 0
#define EDIT_MODE_UPD_IDX 1
@@ -93,10 +91,8 @@ class SwContentTree : public SvTreeListB
sal_Bool bIsImageListInitialized : 1;
static sal_Bool bIsInDrag;
- //IAccessibility2 Implementation 2009-----
sal_Bool bIsKeySpace;
Rectangle oldRectangle;
- //-----IAccessibility2 Implementation 2009
void FindActiveTypeAndRemoveUserData();
using SvLBox::ExecuteDrop;
@@ -151,11 +147,9 @@ protected:
public:
SwContentTree(Window* pParent, const ResId& rResId);
~SwContentTree();
- //IAccessibility2 Implementation 2009-----
String GetEntryAltText( SvLBoxEntry* pEntry ) const;
String GetEntryLongDescription( SvLBoxEntry* pEntry ) const;
SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt);
- //-----IAccessibility2 Implementation 2009
sal_Bool ToggleToRoot();
sal_Bool IsRoot() const {return bIsRoot;}
@@ -208,9 +202,7 @@ public:
virtual void KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
- //IAccessibility2 Implementation 2009-----
virtual sal_Int32 GetEntryRealChildsNum( SvLBoxEntry* pEntry ) const;
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/l10n40/main/sw/source/ui/inc/edtwin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/inc/edtwin.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/inc/edtwin.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/inc/edtwin.hxx Sun Dec 1 11:40:24 2013
@@ -297,9 +297,7 @@ public:
SwEditWin(Window *pParent, SwView &);
virtual ~SwEditWin();
- //IAccessibility2 Implementation 2009-----
virtual void SwitchView();
- //-----IAccessibility2 Implementation 2009
};
#endif
Modified: openoffice/branches/l10n40/main/sw/source/ui/inc/pview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/inc/pview.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/inc/pview.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/inc/pview.hxx Sun Dec 1 11:40:24 2013
@@ -164,9 +164,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
CreateAccessible();
- //IAccessibility2 Implementation 2009-----
virtual void SwitchView();
- //-----IAccessibility2 Implementation 2009
};
@@ -178,8 +176,7 @@ class SW_DLLPUBLIC SwPagePreView: public
{
// ViewWindow und Henkel zur Core
// aktuelle Dispatcher-Shell
- SwPagePreViewWin* pViewWin;//IAccessibility2 Implementation 2009
- //viewdata of the previous SwView and the new crsrposition
+ SwPagePreViewWin* pViewWin; //viewdata of the previous SwView and the new crsrposition
String sSwViewData,
//and the new cursor position if the user double click in the PagePreView
sNewCrsrPos;
Modified: openoffice/branches/l10n40/main/sw/source/ui/inc/swlbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/inc/swlbox.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/inc/swlbox.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/inc/swlbox.hxx Sun Dec 1 11:40:24 2013
@@ -115,7 +115,6 @@ public:
void SetStyle(const sal_uInt16 nSt) { nStyle = nSt; }
String GetText() const;
-//IAccessibility2 Impplementaton 2009-----
void SetText( const XubString& rStr );
void SetText( const XubString& rStr, const Selection& rNewSelection ) { ComboBox::SetText( rStr, rNewSelection ); };
};
Modified: openoffice/branches/l10n40/main/sw/source/ui/inc/swuicnttab.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/inc/swuicnttab.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/inc/swuicnttab.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/inc/swuicnttab.hxx Sun Dec 1 11:40:24 2013
@@ -286,12 +286,10 @@ class SwTokenWindow : public Window
Link aButtonSelectedHdl;
Control* pActiveCtrl;
Link aModifyHdl;
-//IAccessibility2 Impplementaton 2009-----
String accessibleName;
String sAdditionalAccnameString1;
String sAdditionalAccnameString2;
String sAdditionalAccnameString3;
-//-----IAccessibility2 Impplementaton 2009
SwTOXEntryTabPage* m_pParent;
@@ -343,11 +341,9 @@ public:
virtual void Resize();
virtual void GetFocus();
-//IAccessibility2 Impplementaton 2009-----
void SetFocus2theAllBtn();
private:
sal_uInt32 GetControlIndex(FormTokenType eType, const Control* pCurControl) const;
-//-----IAccessibility2 Impplementaton 2009
};
/* -----------------------------23.12.99 14:16--------------------------------
@@ -493,10 +489,8 @@ public:
String GetLevelHelp(sal_uInt16 nLevel) const;
void PreTokenButtonRemoved(const SwFormToken& rToken);
-//IAccessibility2 Impplementaton 2009-----
void SetFocus2theAllBtn();
virtual long Notify( NotifyEvent& rNEvt );
-//-----IAccessibility2 Impplementaton 2009
};
/* -----------------05.07.99 13:00-------------------
Modified: openoffice/branches/l10n40/main/sw/source/ui/inc/view.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/inc/view.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/inc/view.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/inc/view.hxx Sun Dec 1 11:40:24 2013
@@ -200,10 +200,8 @@ class SW_DLLPUBLIC SwView: public SfxVie
sNewCrsrPos;
// to support keyboard the number of the page to go to can be set too
sal_uInt16 nNewPage;
- //IAccessibility2 Implementation 2009-----
sal_uInt16 nOldPageNum;
String nOldSectionName;
- //-----IAccessibility2 Implementation 2009
Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus
//aus dem Dokument heraus.
SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule #i23726#