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 [5/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/accessibilit...
Modified: openoffice/branches/l10n40/main/sc/source/ui/inc/viewfunc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/inc/viewfunc.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/inc/viewfunc.hxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/inc/viewfunc.hxx Sun Dec 1 11:40:24 2013
@@ -251,11 +251,9 @@ public:
ScAutoFormatData* CreateAutoFormatData();
void AutoFormat( sal_uInt16 nFormatNo, sal_Bool bRecord = sal_True );
-//IAccessibility2 Implementation 2009-----
// void SearchAndReplace( const SvxSearchItem* pSearchItem,
sal_Bool SearchAndReplace( const SvxSearchItem* pSearchItem,
sal_Bool bAddUndo, sal_Bool bIsApi );
-//-----IAccessibility2 Implementation 2009
void Solve( const ScSolveParam& rParam );
void TabOp( const ScTabOpParam& rParam, sal_Bool bRecord = sal_True );
Modified: openoffice/branches/l10n40/main/sc/source/ui/miscdlgs/highred.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/miscdlgs/highred.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/miscdlgs/highred.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/miscdlgs/highred.cxx Sun Dec 1 11:40:24 2013
@@ -258,9 +258,7 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle,
aEdAssign.Show();
aRbAssign.Show();
aEdAssign.SetText(aFilterCtr.GetRange());
- //IAccessibility2 Implementation 2009-----
aEdAssign.GrabFocus();
- //-----IAccessibility2 Implementation 2009
ScAnyRefDlg::RefInputStart(&aEdAssign,&aRbAssign);
}
return 0;
Modified: openoffice/branches/l10n40/main/sc/source/ui/miscdlgs/solveroptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/miscdlgs/solveroptions.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/miscdlgs/solveroptions.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/miscdlgs/solveroptions.cxx Sun Dec 1 11:40:24 2013
@@ -84,15 +84,12 @@ public:
void SetDoubleValue( double fNew ) { mbIsDouble = true; mfDoubleValue = fNew; }
void SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; }
- //IAccessibility2 Implementation 2009-----
// MT: Commented out SV_ITEM_ID_EXTENDRLBOXSTRING and GetExtendText() in svlbitem.hxx - needed?
// virtual USHORT IsA() {return SV_ITEM_ID_EXTENDRLBOXSTRING;}
// virtual XubString GetExtendText() const;
- //-----IAccessibility2 Implementation 2009
virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
};
-//IAccessibility2 Implementation 2009-----
// MT: Commented out SV_ITEM_ID_EXTENDRLBOXSTRING and GetExtendText() in svlbitem.hxx - needed?
/*
XubString ScSolverOptionsString::GetExtendText() const
@@ -110,7 +107,6 @@ XubString ScSolverOptionsString::GetExte
return aNormalStr;
}
*/
-//-----IAccessibility2 Implementation 2009
void ScSolverOptionsString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* /* pEntry */ )
{
Modified: openoffice/branches/l10n40/main/sc/source/ui/navipi/content.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/navipi/content.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/navipi/content.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/navipi/content.cxx Sun Dec 1 11:40:24 2013
@@ -64,10 +64,8 @@
#include "navicfg.hxx"
#include "navsett.hxx"
#include "postit.hxx"
-//IAccessibility2 Implementation 2009-----
#include "tabvwsh.hxx"
#include "drawview.hxx"
-//-----IAccessibility2 Implementation 2009
#include "clipparam.hxx"
using namespace com::sun::star;
@@ -131,9 +129,7 @@ ScContentTree::ScContentTree( Window* pP
nRootType ( SC_CONTENT_ROOT ),
bHiddenDoc ( sal_False ),
pHiddenDocument ( NULL ),
-//IAccessibility2 Implementation 2009-----
bisInNavigatoeDlg ( sal_False )
-//-----IAccessibility2 Implementation 2009
{
sal_uInt16 i;
for (i=0; i<SC_CONTENT_COUNT; i++)
@@ -149,10 +145,8 @@ ScContentTree::ScContentTree( Window* pP
SetDoubleClickHdl( LINK( this, ScContentTree, ContentDoubleClickHdl ) );
- //IAccessibility2 Implementation 2009-----
pTmpEntry= NULL;
m_bFirstPaint=true;
- //-----IAccessibility2 Implementation 2009
SetStyle( GetStyle() | WB_QUICK_SEARCH );
}
@@ -160,7 +154,6 @@ ScContentTree::ScContentTree( Window* pP
ScContentTree::~ScContentTree()
{
}
-//IAccessibility2 Implementation 2009-----
// helper function for GetEntryAltText and GetEntryLongDescription
String ScContentTree::getAltLongDescText( SvLBoxEntry* pEntry , sal_Bool isAltText) const
{
@@ -222,7 +215,6 @@ String ScContentTree::GetEntryLongDescri
{
return getAltLongDescText( pEntry, sal_False);
}
-//-----IAccessibility2 Implementation 2009
void ScContentTree::InitRoot( sal_uInt16 nType )
{
@@ -250,7 +242,6 @@ void ScContentTree::InitRoot( sal_uInt16
void ScContentTree::ClearAll()
{
-//IAccessibility2 Implementation 2009-----
//There are one method in Control::SetUpdateMode(), and one override method SvTreeListBox::SetUpdateMode(). Here although
//SvTreeListBox::SetUpdateMode() is called in refresh method, it only call SvTreeListBox::SetUpdateMode(), not Control::SetUpdateMode().
//In SvTreeList::Clear(), Broadcast( LISTACTION_CLEARED ) will be called and finally, it will be trapped into the event yield() loop. And
@@ -260,7 +251,6 @@ void ScContentTree::ClearAll()
Control::SetUpdateMode(sal_False);
Clear();
Control::SetUpdateMode(bOldUpdate);
-//-----IAccessibility2 Implementation 2009
for (sal_uInt16 i=1; i<SC_CONTENT_COUNT; i++)
InitRoot(i);
}
@@ -488,7 +478,6 @@ void ScContentTree::KeyInput( const KeyE
break;
}
}
-//IAccessibility2 Implementation 2009-----
//Solution: Make KEY_SPACE has same function as DoubleClick
if ( bisInNavigatoeDlg )
{
@@ -550,10 +539,8 @@ void ScContentTree::KeyInput( const KeyE
}
}
//StoreSettings();
- //-----IAccessibility2 Implementation 2009
if( !bUsed )
- //IAccessibility2 Implementation 2009-----
{
if(aCode.GetCode() == KEY_F5 )
{
@@ -566,7 +553,6 @@ void ScContentTree::KeyInput( const KeyE
StoreSettings();
}
}
- //-----IAccessibility2 Implementation 2009
}
//sal_Bool __EXPORT ScContentTree::Drop( const DropEvent& rEvt )
@@ -767,7 +753,6 @@ ScDocument* ScContentTree::GetSourceDocu
return NULL;
}
-//IAccessibility2 Implementation 2009-----
//Solution: move along and draw "*" sign .
void ScContentTree::ObjectFresh( sal_uInt16 nType,SvLBoxEntry* pEntry )
{
@@ -816,7 +801,6 @@ void ScContentTree::ObjectFresh( sal_uIn
}
}
}
-//-----IAccessibility2 Implementation 2009
void ScContentTree::Refresh( sal_uInt16 nType )
{
if ( bHiddenDoc && !pHiddenDocument )
@@ -1004,8 +988,6 @@ void ScContentTree::GetDrawNames( sal_uI
String aName = ScDrawLayer::GetVisibleName( pObject );
if (aName.Len())
{
- //IAccessibility2 Implementation 2009-----
- //InsertContent( nType, aName );
if( bisInNavigatoeDlg )
{
if (nType >= SC_CONTENT_COUNT)
@@ -1042,7 +1024,6 @@ void ScContentTree::GetDrawNames( sal_uI
}
}
}
- //-----IAccessibility2 Implementation 2009
pObject = aIter.Next();
}
}
@@ -1762,7 +1743,6 @@ void ScContentTree::StoreSettings() cons
}
}
-//IAccessibility2 Implementation 2009-----
class ScContentLBoxString : public SvLBoxString
{
public:
@@ -1805,7 +1785,6 @@ void ScContentLBoxString::Paint( const P
*/
SvLBoxString::Paint( rPos, rDev, nFlags, pEntry);
}
-//-----IAccessibility2 Implementation 2009
//
//------------------------------------------------------------------------
//
Modified: openoffice/branches/l10n40/main/sc/source/ui/navipi/navipi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/navipi/navipi.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/navipi/navipi.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/navipi/navipi.cxx Sun Dec 1 11:40:24 2013
@@ -785,9 +785,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindi
aTbxCmd.Select(IID_ZOOMOUT);
aTbxCmd.RemoveItem(aTbxCmd.GetItemPos(IID_ZOOMOUT));
}
- //IAccessibility2 Implementation 2009-----
aLbEntries.SetNavigatorDlgFlag(sal_True);
- //-----IAccessibility2 Implementation 2009
}
//------------------------------------------------------------------------
@@ -986,13 +984,11 @@ void __EXPORT ScNavigatorDlg::Notify( Sf
case FID_ANYDATACHANGED:
aContentTimer.Start(); // Notizen nicht sofort suchen
break;
- //IAccessibility2 Implementation 2009-----
case FID_KILLEDITVIEW:
aLbEntries.ObjectFresh( SC_CONTENT_OLEOBJECT );
aLbEntries.ObjectFresh( SC_CONTENT_DRAWING );
aLbEntries.ObjectFresh( SC_CONTENT_GRAPHIC );
break;
- //-----IAccessibility2 Implementation 2009
default:
break;
}
Modified: openoffice/branches/l10n40/main/sc/source/ui/pagedlg/scuitphfedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/pagedlg/scuitphfedit.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/pagedlg/scuitphfedit.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/pagedlg/scuitphfedit.cxx Sun Dec 1 11:40:24 2013
@@ -166,7 +166,6 @@ ScHFEditPage::ScHFEditPage( Window* p
aWndCenter. SetFont( aPatAttr );
aWndRight. SetFont( aPatAttr );
- //IAccessibility2 Implementation 2009-----
aWndLeft.SetObjectSelectHdl( LINK(this,ScHFEditPage,ObjectSelectHdl) );
aWndCenter.SetObjectSelectHdl( LINK(this,ScHFEditPage,ObjectSelectHdl) );
aWndRight.SetObjectSelectHdl( LINK(this,ScHFEditPage,ObjectSelectHdl) );
@@ -177,7 +176,6 @@ ScHFEditPage::ScHFEditPage( Window* p
aBtnLastPage.SetAccessibleRelationMemberOf( &maFtCustomHF );
aBtnDate.SetAccessibleRelationMemberOf( &maFtCustomHF );
aBtnTime.SetAccessibleRelationMemberOf( &maFtCustomHF );
- //-----IAccessibility2 Implementation 2009
FillCmdArr();
aWndLeft.GrabFocus();
@@ -186,14 +184,12 @@ ScHFEditPage::ScHFEditPage( Window* p
FreeResource();
}
- //IAccessibility2 Implementation 2009-----
IMPL_LINK( ScHFEditPage, ObjectSelectHdl, ScEditWindow*, pEdit )
{
(void)pEdit;
aBtnText.GrabFocus();
return NULL;
}
- //-----IAccessibility2 Implementation 2009
// -----------------------------------------------------------------------
Modified: openoffice/branches/l10n40/main/sc/source/ui/pagedlg/tphfedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/pagedlg/tphfedit.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/pagedlg/tphfedit.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/pagedlg/tphfedit.cxx Sun Dec 1 11:40:24 2013
@@ -553,10 +553,8 @@ void __EXPORT ScEditWindow::Paint( const
Control::Paint( rRec );
pEdView->Paint( rRec );
- //IAccessibility2 Implementation 2009-----
if( HasFocus() )
pEdView->ShowCursor(sal_True,sal_True);
- //-----IAccessibility2 Implementation 2009
}
// -----------------------------------------------------------------------
@@ -598,14 +596,12 @@ void __EXPORT ScEditWindow::KeyInput( co
{
Control::KeyInput( rKEvt );
}
- //IAccessibility2 Implementation 2009-----
else if ( !rKEvt.GetKeyCode().IsMod1() && !rKEvt.GetKeyCode().IsShift() &&
rKEvt.GetKeyCode().IsMod2() && rKEvt.GetKeyCode().GetCode() == KEY_DOWN )
{
if (aObjectSelectLink.IsSet() )
aObjectSelectLink.Call(this);
}
- //-----IAccessibility2 Implementation 2009
}
// -----------------------------------------------------------------------
@@ -619,9 +615,7 @@ void ScEditWindow::Command( const Comman
void __EXPORT ScEditWindow::GetFocus()
{
- //IAccessibility2 Implementation 2009-----
pEdView->ShowCursor(sal_True,sal_True);
- //-----IAccessibility2 Implementation 2009
pActiveEdWnd = this;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTemp = xAcc;
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/drawview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/drawview.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/drawview.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/drawview.cxx Sun Dec 1 11:40:24 2013
@@ -689,7 +689,6 @@ void __EXPORT ScDrawView::UpdateUserView
#pragma optimize ( "", on )
#endif
-//IAccessibility2 Implementation 2009-----
SdrObject* ScDrawView::GetObjectByName(const String& rName)
{
SfxObjectShell* pShell = pDoc->GetDocumentShell();
@@ -772,7 +771,6 @@ sal_Bool ScDrawView::SelectCurrentViewOb
}
return ( bUnMark );
}
-//-----IAccessibility2 Implementation 2009
sal_Bool ScDrawView::SelectObject( const String& rName )
{
UnmarkAll();
@@ -834,7 +832,6 @@ sal_Bool ScDrawView::SelectObject( const
return ( pFound != NULL );
}
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , return true , else return false .
//==================================================
sal_Bool ScDrawView::GetObjectIsMarked( SdrObject* pObject )
@@ -846,7 +843,6 @@ sal_Bool ScDrawView::GetObjectIsMarked(
}
return bisMarked;
}
-//-----IAccessibility2 Implementation 2009
//UNUSED2008-05 String ScDrawView::GetSelectedChartName() const
//UNUSED2008-05 {
//UNUSED2008-05 // used for modifying a chart's data area - PersistName must always be used
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/gridwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/gridwin.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/gridwin.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/gridwin.cxx Sun Dec 1 11:40:24 2013
@@ -866,7 +866,6 @@ void ScGridWindow::DoScenarioMenue( cons
CaptureMouse();
}
-//IAccessibility2 Implementation 2009-----
sal_Bool ScGridWindow::HasScenarioRange( sal_uInt16 nCol, sal_Int32 nRow, ScRange& rScenRange )
{
ScDocument* pDoc = pViewData->GetDocument();
@@ -904,7 +903,6 @@ sal_Bool ScGridWindow::HasScenarioRange(
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, sal_Bool bDataSelect )
{
delete pFilterBox;
@@ -2273,9 +2271,7 @@ void __EXPORT ScGridWindow::MouseButtonU
pViewData->GetView()->InvalidateAttribs();
}
-//IAccessibility2 Implementation 2009-----
pViewData->GetViewShell()->SelectionChanged();
-//-----IAccessibility2 Implementation 2009
return;
}
}
@@ -3110,9 +3106,6 @@ void __EXPORT ScGridWindow::KeyInput(con
if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
{
SC_MOD()->EndReference();
-//IAccessibility2 Implementation 2009-----
- //return;
-//-----IAccessibility2 Implementation 2009
}
else if( pViewData->GetViewShell()->MoveCursorKeyInput( rKEvt ) )
{
@@ -3120,14 +3113,9 @@ void __EXPORT ScGridWindow::KeyInput(con
pViewData->GetRefStartX(), pViewData->GetRefStartY(), pViewData->GetRefStartZ(),
pViewData->GetRefEndX(), pViewData->GetRefEndY(), pViewData->GetRefEndZ() );
SC_MOD()->SetReference( aRef, pViewData->GetDocument() );
-//IAccessibility2 Implementation 2009-----
- //return;
-//-----IAccessibility2 Implementation 2009
}
-//IAccessibility2 Implementation 2009-----
pViewData->GetViewShell()->SelectionChanged();
return ;
-//-----IAccessibility2 Implementation 2009
}
// wenn semi-Modeless-SfxChildWindow-Dialog oben, keine KeyInputs:
else if( !pViewData->IsAnyFillMode() )
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/gridwin3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/gridwin3.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/gridwin3.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/gridwin3.cxx Sun Dec 1 11:40:24 2013
@@ -179,10 +179,8 @@ sal_Bool ScGridWindow::DrawKeyInput(cons
if ( !bOldMarked &&
rKEvt.GetKeyCode().GetCode() == KEY_DELETE )
bUsed = sal_False; // nichts geloescht
-//IAccessibility2 Implementation 2009-----
if(bOldMarked)
GetFocus();
-//-----IAccessibility2 Implementation 2009
}
if (!bLeaveDraw)
UpdateStatusPosSize(); // #108137# for moving/resizing etc. by keyboard
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/gridwin5.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/gridwin5.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/gridwin5.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/gridwin5.cxx Sun Dec 1 11:40:24 2013
@@ -58,9 +58,7 @@
#include "tabvwsh.hxx"
#include "userdat.hxx"
#include "postit.hxx"
-//IAccessibility2 Implementation 2009-----
#include <vcl/svapp.hxx>
-//-----IAccessibility2 Implementation 2009
// -----------------------------------------------------------------------
@@ -426,29 +424,20 @@ void ScGridWindow::HideNoteMarker()
com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
ScGridWindow::CreateAccessible()
{
-//IAccessibility2 Implementation 2009-----
com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc= GetAccessible(sal_False);
if (xAcc.is())
{
return xAcc;
}
-//-----IAccessibility2 Implementation 2009
ScAccessibleDocument* pAccessibleDocument =
new ScAccessibleDocument(GetAccessibleParentWindow()->GetAccessible(),
pViewData->GetViewShell(), eWhich);
-//IAccessibility2 Implementation 2009-----
- //com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccessible = pAccessibleDocument;
xAcc = pAccessibleDocument;
SetAccessible(xAcc);
-//-----IAccessibility2 Implementation 2009
pAccessibleDocument->Init();
-//IAccessibility2 Implementation 2009-----
- //return xAccessible;
return xAcc;
-//-----IAccessibility2 Implementation 2009
}
-//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 ScGridWindow::SwitchView()
@@ -463,5 +452,4 @@ void ScGridWindow::SwitchView()
pAccDoc->SwitchViewFireFocus();
}
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/output.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/output.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/output.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/output.cxx Sun Dec 1 11:40:24 2013
@@ -77,31 +77,6 @@ static ColorData nAuthorColor[ SC_AUTHOR
COL_GREEN, COL_RED, COL_BLUE,
COL_BROWN, COL_MAGENTA, COL_CYAN };
-// Hilfsklasse, fuer die Farbzuordnung,
-// um nicht mehrfach hintereinander denselben User aus der Liste zu suchen
-
-//IAccessibility2 Implementation 2009-----
-//Move this class declare to Chgtrack.hxx
-/*
-class ScActionColorChanger
-{
-private:
- const ScAppOptions& rOpt;
- const ScStrCollection& rUsers;
- String aLastUserName;
- sal_uInt16 nLastUserIndex;
- ColorData nColor;
-
-public:
- ScActionColorChanger( const ScChangeTrack& rTrack );
- ~ScActionColorChanger() {}
-
- void Update( const ScChangeAction& rAction );
- ColorData GetColor() const { return nColor; }
-};
-*/
-//-----IAccessibility2 Implementation 2009
-
//------------------------------------------------------------------
ScActionColorChanger::ScActionColorChanger( const ScChangeTrack& rTrack ) :
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/preview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/preview.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/preview.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/preview.cxx Sun Dec 1 11:40:24 2013
@@ -1474,27 +1474,18 @@ void ScPreview::LoseFocus()
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> ScPreview::CreateAccessible()
{
-//IAccessibility2 Implementation 2009-----
com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> xAcc= GetAccessible(sal_False);
if (xAcc.is())
{
return xAcc;
}
-//-----IAccessibility2 Implementation 2009
ScAccessibleDocumentPagePreview* pAccessible =
new ScAccessibleDocumentPagePreview( GetAccessibleParentWindow()->GetAccessible(), pViewShell );
-//IAccessibility2 Implementation 2009-----
- //com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xAccessible = pAccessible;
xAcc = pAccessible;
SetAccessible(xAcc);
-//-----IAccessibility2 Implementation 2009
pAccessible->Init();
-//IAccessibility2 Implementation 2009-----
- //return xAccessible;
return xAcc;
-//-----IAccessibility2 Implementation 2009
}
-//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 ScPreview::SwitchView()
@@ -1509,7 +1500,6 @@ void ScPreview::SwitchView()
pAccDoc->SwitchViewFireFocus();
}
}
-//-----IAccessibility2 Implementation 2009
//Issue51656 Add resizeable margin on page preview from maoyg
void ScPreview::DragMove( long nDragMovePos, sal_uInt16 nFlags )
{
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/select.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/select.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/select.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/select.cxx Sun Dec 1 11:40:24 2013
@@ -369,9 +369,7 @@ sal_Bool ScViewFunctionSet::SetCursorAtC
}
pView->UpdateRef( nPosX, nPosY, pViewData->GetTabNo() );
-//IAccessibility2 Implementation 2009-----
pView->SelectionChanged();
-//-----IAccessibility2 Implementation 2009
}
}
else if (pViewData->IsFillMode() ||
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/tabview2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/tabview2.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/tabview2.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/tabview2.cxx Sun Dec 1 11:40:24 2013
@@ -129,10 +129,8 @@ void ScTabView::InitBlockMode( SCCOL nCu
SCTAB nTab = aViewData.GetTabNo();
// Teil von Markierung aufheben?
-//IAccessibility2 Implementation 2009-----
if (bForceNeg)
bBlockNeg = sal_True;
-//-----IAccessibility2 Implementation 2009
else if (bTestNeg)
{
if ( bCols )
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/tabvwsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/tabvwsh.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/tabvwsh.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/tabvwsh.cxx Sun Dec 1 11:40:24 2013
@@ -41,10 +41,8 @@
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <avmedia/mediaplayer.hxx>
-//IAccessibility2 Implementation 2009-----
#include "cell.hxx"
#include "docoptio.hxx"
-//-----IAccessibility2 Implementation 2009
#include "tabvwsh.hxx"
#include "docsh.hxx"
@@ -112,7 +110,6 @@ IMPL_LINK( ScTabViewShell, HtmlOptionsHd
return 0;
}
-//IAccessibility2 Implementation 2009-----
rtl::OUString ScTabViewShell::GetFormula(ScAddress& rAddress)
{
String sFormula;
@@ -124,7 +121,6 @@ rtl::OUString ScTabViewShell::GetFormula
}
return sFormula;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/tabvwsh4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/tabvwsh4.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/tabvwsh4.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/tabvwsh4.cxx Sun Dec 1 11:40:24 2013
@@ -93,9 +93,7 @@
#include "sc.hrc" //CHINA001
#include "scabstdlg.hxx" //CHINA001
#include "externalrefmgr.hxx"
-//IAccessibility2 Implementation 2009-----
#include <svx/fmpage.hxx>
-//-----IAccessibility2 Implementation 2009
void ActivateOlk( ScViewData* pViewData );
void DeActivateOlk( ScViewData* pViewData );
@@ -115,9 +113,7 @@ sal_uInt16 ScTabViewShell::nInsObjCtrlSt
void __EXPORT ScTabViewShell::Activate(sal_Bool bMDI)
{
SfxViewShell::Activate(bMDI);
-//IAccessibility2 Implementation 2009-----
bIsActive = sal_True;
-//-----IAccessibility2 Implementation 2009
// hier kein GrabFocus, sonst gibt's Probleme wenn etwas inplace editiert wird!
if ( bMDI )
@@ -247,9 +243,7 @@ void __EXPORT ScTabViewShell::Deactivate
}
SfxViewShell::Deactivate(bMDI);
-//IAccessibility2 Implementation 2009-----
bIsActive = sal_False;
-//-----IAccessibility2 Implementation 2009
ScInputHandler* pHdl = SC_MOD()->GetInputHdl(this);
if( bMDI )
@@ -1488,7 +1482,6 @@ sal_Bool ScTabViewShell::TabKeyInput(con
}
}
-//IAccessibility2 Implementation 2009-----
// use Ctrl+Alt+Shift+arrow keys to move the cursor in cells
// while keeping the last selection
if ( !bUsed && bAlt && bControl && bShift)
@@ -1533,7 +1526,6 @@ sal_Bool ScTabViewShell::TabKeyInput(con
bUsed = sal_True;
}
}
-//-----IAccessibility2 Implementation 2009
if (bHideCursor)
ShowAllCursors();
@@ -1609,9 +1601,7 @@ void ScTabViewShell::Construct( sal_uInt
ScDocument* pDoc = pDocSh->GetDocument();
bReadOnly = pDocSh->IsReadOnly();
-//IAccessibility2 Implementation 2009-----
bIsActive = sal_False;
-//-----IAccessibility2 Implementation 2009
SetName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("View")) ); // fuer SBX
Color aColBlack( COL_BLACK );
@@ -2036,7 +2026,6 @@ void ScTabViewShell::GetTbxState( SfxIte
-//IAccessibility2 Implementation 2009-----
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & ScTabViewShell::GetForms() const
{
if( !pFormShell || !pFormShell->GetCurPage() ){
@@ -2045,4 +2034,3 @@ const ::com::sun::star::uno::Reference<
}
return pFormShell->GetCurPage()->GetForms();
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/tabvwshe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/tabvwshe.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/tabvwshe.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/tabvwshe.cxx Sun Dec 1 11:40:24 2013
@@ -48,9 +48,7 @@
#include "editsh.hxx"
#include "dociter.hxx"
#include "inputhdl.hxx"
-//IAccessibility2 Implementation 2009-----
#include <svx/srchdlg.hxx>
-//-----IAccessibility2 Implementation 2009
#include "document.hxx"
//==================================================================
@@ -257,7 +255,6 @@ void ScTabViewShell::ExecSearch( SfxRequ
const SvxSearchItem* pSearchItem = (const SvxSearchItem*) pItem;
ScGlobal::SetSearchItem( *pSearchItem );
- //IAccessibility2 Implementation 2009-----
//SearchAndReplace( pSearchItem, sal_True, rReq.IsAPI() );
sal_Bool bSuccess = SearchAndReplace( pSearchItem, sal_True, rReq.IsAPI() );
if ( Application::IsAccessibilityEnabled() )
@@ -279,7 +276,6 @@ void ScTabViewShell::ExecSearch( SfxRequ
}
}
}
- //-----IAccessibility2 Implementation 2009
rReq.Done();
}
}
@@ -331,7 +327,6 @@ void ScTabViewShell::ExecSearch( SfxRequ
rReq.IsAPI() ? SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON :
SFX_CALLMODE_STANDARD,
&aSearchItem, 0L );
- //IAccessibility2 Implementation 2009-----
if ( Application::IsAccessibilityEnabled() )
{
SvxSearchDialog* pSearchDlg =
@@ -351,7 +346,6 @@ void ScTabViewShell::ExecSearch( SfxRequ
}
}
}
- //-----IAccessibility2 Implementation 2009
}
else
{
Modified: openoffice/branches/l10n40/main/sc/source/ui/view/viewfun2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/view/viewfun2.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/view/viewfun2.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/view/viewfun2.cxx Sun Dec 1 11:40:24 2013
@@ -1616,11 +1616,8 @@ void ScViewFunc::AutoFormat( sal_uInt16
//----------------------------------------------------------------------------
// Suchen & Ersetzen
-//IAccessibility2 Implementation 2009-----
-//void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
sal_Bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
sal_Bool bAddUndo, sal_Bool bIsApi )
-//-----IAccessibility2 Implementation 2009
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
@@ -1672,10 +1669,7 @@ sal_Bool ScViewFunc::SearchAndReplace( c
if ( pOldSelectedTables )
delete [] pOldSelectedTables;
ErrorMessage(STR_PROTECTIONERR);
- //IAccessibility2 Implementation 2009-----
- //return;
return sal_False;
- //-----IAccessibility2 Implementation 2009
}
}
}
@@ -1849,9 +1843,7 @@ sal_Bool ScViewFunc::SearchAndReplace( c
delete pUndoDoc; // loeschen wenn nicht benutzt
delete pUndoMark; // kann immer geloescht werden
-//IAccessibility2 Implementation 2009-----
return bFound;
-//-----IAccessibility2 Implementation 2009
}
Modified: openoffice/branches/l10n40/main/scaddins/source/analysis/analysis.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/scaddins/source/analysis/analysis.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/scaddins/source/analysis/analysis.cxx (original)
+++ openoffice/branches/l10n40/main/scaddins/source/analysis/analysis.cxx Sun Dec 1 11:40:24 2013
@@ -158,8 +158,7 @@ void AnalysisAddIn::InitData( void )
delete pResMgr;
OString aModName( "analysis" );
- pResMgr = ResMgr::CreateResMgr( ( const sal_Char* ) aModName,
- aFuncLoc );
+ pResMgr = ResMgr::CreateResMgr( aModName.getStr(), aFuncLoc );
if( pFD )
delete pFD;
Modified: openoffice/branches/l10n40/main/scaddins/source/analysis/analysishelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/scaddins/source/analysis/analysishelper.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/scaddins/source/analysis/analysishelper.cxx (original)
+++ openoffice/branches/l10n40/main/scaddins/source/analysis/analysishelper.cxx Sun Dec 1 11:40:24 2013
@@ -1844,7 +1844,7 @@ sal_Bool Complex::ParseString( const STR
{
rCompl.c = '\0'; // do not force a symbol, if only real part present
- const sal_Unicode* pStr = ( const sal_Unicode * ) rStr;
+ const sal_Unicode* pStr = rStr.getStr();
if( IsImagUnit( *pStr ) && rStr.getLength() == 1)
{
Modified: openoffice/branches/l10n40/main/scaddins/source/datefunc/datefunc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/scaddins/source/datefunc/datefunc.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/scaddins/source/datefunc/datefunc.cxx (original)
+++ openoffice/branches/l10n40/main/scaddins/source/datefunc/datefunc.cxx Sun Dec 1 11:40:24 2013
@@ -329,8 +329,7 @@ void ScaDateAddIn::InitData()
delete pResMgr;
OString aModName( "date" );
- pResMgr = ResMgr::CreateResMgr( (const sal_Char*) aModName,
- aFuncLoc );
+ pResMgr = ResMgr::CreateResMgr( aModName.getStr(), aFuncLoc );
if( pFuncDataList )
delete pFuncDataList;
Modified: openoffice/branches/l10n40/main/scp2/source/ooo/registryitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/scp2/source/ooo/registryitem_ooo.scp?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/branches/l10n40/main/scp2/source/ooo/registryitem_ooo.scp Sun Dec 1 11:40:24 2013
@@ -325,78 +325,6 @@ RegistryItem gid_Regitem_Software_OpenOf
Styles = (ALWAYS_REQUIRED);
End
-//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-// ModuleID = gid_Module_Root;
-// Name = "BASISINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]Basis\\";
-// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-//End
-
-//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-// ModuleID = gid_Module_Root;
-// Name = "BASISINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]Basis\\";
-// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-//End
-
-//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
-// ModuleID = gid_Module_Root;
-// Name = "BASISINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]Basis\\";
-// Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
-//End
-
-//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
-// ModuleID = gid_Module_Root;
-// Name = "BASISINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]Basis\\";
-// Styles = (ALWAYS_REQUIRED);
-//End
-
-//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-// ModuleID = gid_Module_Root;
-// Name = "UREINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]URE\\";
-// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-//End
-
-//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-// ModuleID = gid_Module_Root;
-// Name = "UREINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]URE\\";
-// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-//End
-
-//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
-// ModuleID = gid_Module_Root;
-// Name = "UREINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]URE\\";
-// Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
-//End
-
-//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
-// ModuleID = gid_Module_Root;
-// Name = "UREINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]URE\\";
-// Styles = (ALWAYS_REQUIRED);
-//End
-
RegistryItem gid_Regitem_Sog
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".sog";
Modified: openoffice/branches/l10n40/main/sd/inc/drawdoc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/inc/drawdoc.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/inc/drawdoc.hxx (original)
+++ openoffice/branches/l10n40/main/sd/inc/drawdoc.hxx Sun Dec 1 11:40:24 2013
@@ -157,7 +157,6 @@ namespace sd
class SdDrawDocument : public FmFormModel
{
private:
-//IAccessibility2 Implementation 2009-----
String msDocAccTitle;
public:
virtual void setDocAccTitle( const String& rTitle ) { msDocAccTitle = rTitle; }
@@ -168,7 +167,6 @@ public:
virtual void setDocReadOnly( sal_Bool b){ bReadOnly = b; }
virtual sal_Bool getDocReadOnly() const { return bReadOnly; }
private:
-//IAccessibility2 Implementation 2009-----
::sd::Outliner* mpOutliner; // local outliner for outline mode
::sd::Outliner* mpInternalOutliner; // internal outliner for creation of text objects
Timer* mpWorkStartupTimer;
@@ -683,9 +681,7 @@ private:
// #109538#
virtual void PageListChanged();
virtual void MasterPageListChanged();
-//IAccessibility2 Implementation 2009-----
virtual ImageMap* GetImageMapForObject(SdrObject* pObj);
-//-----IAccessibility2 Implementation 2009
};
namespace sd
Modified: openoffice/branches/l10n40/main/sd/inc/glob.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/inc/glob.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/inc/glob.hxx (original)
+++ openoffice/branches/l10n40/main/sd/inc/glob.hxx Sun Dec 1 11:40:24 2013
@@ -38,9 +38,7 @@
#define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + 1
#define SD_IF_SDVIEWSHELL SFX_INTERFACE_SD_START + 2
#define SD_IF_SDDRAWVIEWSHELL SFX_INTERFACE_SD_START + 3
-//IAccessibility2 Implementation 2009-----
#define SD_IF_SDSLIDEVIEWSHELL SFX_INTERFACE_SD_START + 4
-//-----IAccessibility2 Implementation 2009
#define SD_IF_SDOUTLINEVIEWSHELL SFX_INTERFACE_SD_START + 5
#define SD_IF_SDDRAWSTDOBJECTBAR SFX_INTERFACE_SD_START + 6
#define SD_IF_SDDRAWTEXTOBJECTBAR SFX_INTERFACE_SD_START + 7
Modified: openoffice/branches/l10n40/main/sd/source/core/drawdoc2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/core/drawdoc2.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/core/drawdoc2.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/core/drawdoc2.cxx Sun Dec 1 11:40:24 2013
@@ -1198,7 +1198,6 @@ IMapObject* SdDrawDocument::GetHitIMapOb
return pIMapObj;
}
-//IAccessibility2 Implementation 2009-----
ImageMap* SdDrawDocument::GetImageMapForObject(SdrObject* pObj)
{
SdIMapInfo* pIMapInfo = GetIMapInfo( pObj );
@@ -1208,7 +1207,6 @@ ImageMap* SdDrawDocument::GetImageMapFor
}
return NULL;
}
-//-----IAccessibility2 Implementation 2009
/** this method enforces that the masterpages are in the currect order,
that is at position 1 is a PK_STANDARD masterpage followed by a
PK_NOTES masterpage and so on. #
Modified: openoffice/branches/l10n40/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/filter/eppt/epptso.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/filter/eppt/epptso.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/filter/eppt/epptso.cxx Sun Dec 1 11:40:24 2013
@@ -4938,7 +4938,7 @@ void PPTWriter::ImplWritePage( const PHL
mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom );
*mpStrm << (sal_uInt32)EPP_TEXTTYPE_Title;
mpPptEscherEx->AddAtom( mnTextSize << 1, EPP_TextCharsAtom );
- const sal_Unicode* pString = aUString;
+ const sal_Unicode* pString = aUString.getStr();
for ( sal_uInt32 i = 0; i < mnTextSize; i++ )
{
nChar = pString[ i ]; // 0xa -> 0xb weicher Zeilenumbruch
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx Sun Dec 1 11:40:24 2013
@@ -37,10 +37,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <rtl/ustring.h>
#include<sfx2/viewfrm.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <sfx2/objsh.hxx>
-//-----IAccessibility2 Implementation 2009
#include <svx/AccessibleShape.hxx>
#include <svx/svdobj.hxx>
@@ -49,7 +47,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include "Window.hxx"
#include <vcl/svapp.hxx>
-//IAccessibility2 Implementation 2009-----
#include "OutlineViewShell.hxx"
#include "SlideViewShell.hxx"
@@ -58,7 +55,6 @@
#include <editeng/editobj.hxx>
#include "LayerTabBar.hxx"
#include <svtools/colorcfg.hxx>
-//-----IAccessibility2 Implementation 2009
#include "ViewShell.hxx"
#include "View.hxx"
#include <memory>
@@ -99,9 +95,7 @@ AccessibleDocumentViewBase::AccessibleDo
maShapeTreeInfo.SetViewForwarder (&maViewForwarder);
mxWindow = ::VCLUnoHelper::GetInterface (pSdWindow);
-//IAccessibility2 Implementation 2009-----
mpViewShell = pViewShell;
-//-----IAccessibility2 Implementation 2009
}
@@ -173,11 +167,9 @@ void AccessibleDocumentViewBase::Init (v
}
}
}
-//IAccessibility2 Implementation 2009-----
SfxObjectShell* pObjShell = mpViewShell->GetViewFrame()->GetObjectShell();
if(!pObjShell->IsReadOnly())
SetState(AccessibleStateType::EDITABLE);
-//-----IAccessibility2 Implementation 2009
}
@@ -453,10 +445,8 @@ uno::Any SAL_CALL
static_cast<beans::XPropertyChangeListener*>(this),
static_cast<awt::XWindowListener*>(this),
static_cast<awt::XFocusListener*>(this)
-//IAccessibility2 Implementation 2009-----
,static_cast<XAccessibleExtendedAttributes*>(this)
,static_cast<XAccessibleGetAccFlowTo*>(this)
-//-----IAccessibility2 Implementation 2009
);
return aReturn;
}
@@ -858,7 +848,6 @@ void
{
}
-//IAccessibility2 Implementation 2009-----
uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
{
@@ -1003,5 +992,4 @@ sal_Int32 SAL_CALL AccessibleDocumentVie
::osl::MutexGuard aGuard (maMutex);
return mpViewShell->GetView()->getColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
}
-//-----IAccessibility2 Implementation 2009
} // end of namespace accessibility
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx Sun Dec 1 11:40:24 2013
@@ -52,14 +52,12 @@
#include "ViewShell.hxx"
#include "View.hxx"
-//IAccessibility2 Implementation 2009-----
#include "DrawDocShell.hxx"
#include <drawdoc.hxx>
#include <algorithm>
#include "sdpage.hxx"
#include "slideshow.hxx"
#include "anminfo.hxx"
-//-----IAccessibility2 Implementation 2009
#include <memory>
#include "accessibility.hrc"
@@ -78,7 +76,6 @@ class SfxViewFrame;
namespace accessibility {
-//IAccessibility2 Implementation 2009-----
struct XShapePosCompareHelper
{
bool operator() ( const uno::Reference<drawing::XShape>& xshape1,
@@ -93,7 +90,6 @@ struct XShapePosCompareHelper
return 0;
}
};
-//-----IAccessibility2 Implementation 2009
//===== internal ============================================================
AccessibleDrawDocumentView::AccessibleDrawDocumentView (
@@ -285,7 +281,6 @@ uno::Reference<XAccessible> SAL_CALL
static_cast<uno::XWeak*>(this));
}
-//IAccessibility2 Implementation 2009-----
OUString SAL_CALL
AccessibleDrawDocumentView::getAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException)
@@ -322,7 +317,6 @@ OUString SAL_CALL
return sName;
}
-//-----IAccessibility2 Implementation 2009
//===== XEventListener ======================================================
void SAL_CALL
@@ -391,9 +385,7 @@ void SAL_CALL
}
else
OSL_TRACE ("View invalid");
-//IAccessibility2 Implementation 2009-----
CommitChange(AccessibleEventId::PAGE_CHANGED,rEventObject.NewValue,rEventObject.OldValue);
-//-----IAccessibility2 Implementation 2009
}
else if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("VisibleArea")))
{
@@ -403,7 +395,6 @@ void SAL_CALL
IAccessibleViewForwarderListener::VISIBLE_AREA,
&maViewForwarder);
}
-//IAccessibility2 Implementation 2009-----
else if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("ActiveLayer")))
{
CommitChange(AccessibleEventId::PAGE_CHANGED,rEventObject.NewValue,rEventObject.OldValue);
@@ -455,7 +446,6 @@ void SAL_CALL
}
}
}
-//-----IAccessibility2 Implementation 2009
else
{
OSL_TRACE (" unhandled");
@@ -497,7 +487,6 @@ void SAL_CALL
return aServiceNames;
}
-//IAccessibility2 Implementation 2009-----
//===== XInterface ==========================================================
uno::Any SAL_CALL
@@ -627,7 +616,6 @@ uno::Sequence< sal_Int32 > SAL_CALL
}
return aRet;
}
-//-----IAccessibility2 Implementation 2009
/// Create a name for this view.
::rtl::OUString
AccessibleDrawDocumentView::CreateAccessibleName (void)
@@ -883,10 +871,7 @@ void AccessibleDrawDocumentView::Activat
{
if (mpChildrenManager != NULL)
{
-//IAccessibility2 Implementation 2009-----
- //mpChildrenManager->UpdateSelection();
sal_Bool bChange = sal_False;
-//-----IAccessibility2 Implementation 2009
// When none of the children has the focus then claim it for the
// view.
if ( ! mpChildrenManager->HasFocus())
@@ -896,12 +881,10 @@ void AccessibleDrawDocumentView::Activat
}
else
ResetState (AccessibleStateType::FOCUSED);
-//IAccessibility2 Implementation 2009-----
mpChildrenManager->UpdateSelection();
// if the child gets focus in UpdateSelection(), needs to reset the focus on document.
if (mpChildrenManager->HasFocus() && bChange)
ResetState (AccessibleStateType::FOCUSED);
-//-----IAccessibility2 Implementation 2009
}
}
@@ -948,7 +931,6 @@ void SAL_CALL AccessibleDrawDocumentView
AccessibleDocumentViewBase::disposing ();
}
-//IAccessibility2 Implementation 2009-----
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL AccessibleDrawDocumentView::get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException )
@@ -1099,7 +1081,6 @@ uno::Reference<XAccessible> AccessibleDr
return xRet;
}
-//-----IAccessibility2 Implementation 2009
void AccessibleDrawDocumentView::UpdateAccessibleName (void)
{
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx Sun Dec 1 11:40:24 2013
@@ -48,8 +48,6 @@ namespace accessibility
mViewForwarder( rOutlView )
{
// register as listener - need to broadcast state change messages
- // Moved to ::GetTextForwarder()
- //rOutliner.SetNotifyHdl( LINK(this, AccessibleOutlineEditSource, NotifyHdl) );
StartListening(rOutliner);
}
@@ -62,10 +60,7 @@ namespace accessibility
SvxEditSource* AccessibleOutlineEditSource::Clone() const
{
- //IAccessibility2 Implementation 2009-----
- /*return NULL;*/
return new AccessibleOutlineEditSource(*mpOutliner, mrView, *mpOutlinerView, mrWindow);
- //-----IAccessibility2 Implementation 2009
}
SvxTextForwarder* AccessibleOutlineEditSource::GetTextForwarder()
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleOutlineView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleOutlineView.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleOutlineView.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleOutlineView.cxx Sun Dec 1 11:40:24 2013
@@ -150,7 +150,6 @@ uno::Reference<XAccessible> SAL_CALL
return maTextHelper.GetChild(nIndex);
}
-//IAccessibility2 Implementation 2009-----
#include <drawdoc.hxx>
::rtl::OUString SAL_CALL
AccessibleOutlineView::getAccessibleName(void)
@@ -180,7 +179,6 @@ uno::Reference<XAccessible> SAL_CALL
}
return sName;
}
-//-----IAccessibility2 Implementation 2009
//===== XAccessibleEventBroadcaster ========================================
void SAL_CALL AccessibleOutlineView::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
@@ -188,9 +186,7 @@ void SAL_CALL AccessibleOutlineView::add
// delegate listener handling to children manager.
if ( ! IsDisposed())
maTextHelper.AddEventListener(xListener);
-//IAccessibility2 Implementation 2009-----
AccessibleContextBase::addEventListener(xListener);
-//-----IAccessibility2 Implementation 2009
}
void SAL_CALL AccessibleOutlineView::removeEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
@@ -198,9 +194,7 @@ void SAL_CALL AccessibleOutlineView::rem
// forward
if ( ! IsDisposed())
maTextHelper.RemoveEventListener(xListener);
-//IAccessibility2 Implementation 2009-----
AccessibleContextBase::removeEventListener(xListener);
-//-----IAccessibility2 Implementation 2009
}
//===== XServiceInfo ========================================================
@@ -273,9 +267,7 @@ void SAL_CALL
// The current page changed. Update the children accordingly.
UpdateChildren();
-//IAccessibility2 Implementation 2009-----
CommitChange(AccessibleEventId::PAGE_CHANGED,rEventObject.NewValue,rEventObject.OldValue);
-//-----IAccessibility2 Implementation 2009
}
else if (rEventObject.PropertyName == ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("VisibleArea")))
{
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx Sun Dec 1 11:40:24 2013
@@ -119,12 +119,10 @@ AccessiblePresentationGraphicShape::~Acc
return aDG();
}
-//IAccessibility2 Implementation 2009-----
sal_Int16 SAL_CALL AccessiblePresentationGraphicShape::getAccessibleRole ()
throw (::com::sun::star::uno::RuntimeException)
{
return AccessibleRole::GRAPHIC ;
}
-//-----IAccessibility2 Implementation 2009
} // end of namespace accessibility
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx Sun Dec 1 11:40:24 2013
@@ -140,7 +140,6 @@ AccessiblePresentationOLEShape::~Accessi
return aDG();
}
-//IAccessibility2 Implementation 2009-----
// Return this object's role.
sal_Int16 SAL_CALL AccessiblePresentationOLEShape::getAccessibleRole ()
throw (::com::sun::star::uno::RuntimeException)
@@ -148,5 +147,4 @@ sal_Int16 SAL_CALL AccessiblePresentatio
return AccessibleRole::EMBEDDED_OBJECT ;
}
-//-----IAccessibility2 Implementation 2009
} // end of namespace accessibility
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx Sun Dec 1 11:40:24 2013
@@ -27,11 +27,9 @@
#include "SdShapeTypes.hxx"
-//IAccessibility2 Implementation 2009-----
#include "accessibility.hrc"
#include "sdresid.hxx"
#include <tools/string.hxx>
-//-----IAccessibility2 Implementation 2009
#include <svx/DescriptionGenerator.hxx>
#include <rtl/ustring.h>
@@ -82,51 +80,38 @@ AccessiblePresentationShape::~Accessible
ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
switch (nShapeType)
{
- //IAccessibility2 Implementation 2009-----
case PRESENTATION_TITLE:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressTitle"));
sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_TITLE_N)));
break;
case PRESENTATION_OUTLINER:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressOutliner"));
sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_OUTLINER_N)));
break;
case PRESENTATION_SUBTITLE:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressSubtitle"));
sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_SUBTITLE_N)));
break;
case PRESENTATION_PAGE:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressPage"));
sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_PAGE_N)));
break;
case PRESENTATION_NOTES:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressNotes"));
sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_NOTES_N)));
break;
case PRESENTATION_HANDOUT:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressHandout"));
sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_HANDOUT_N)));
break;
case PRESENTATION_HEADER:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressHeader"));
sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_HEADER_N)) );
break;
case PRESENTATION_FOOTER:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressFooter"));
sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_FOOTER_N)) );
break;
case PRESENTATION_DATETIME:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressDateAndTime"));
sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_DATE_N)) );
break;
case PRESENTATION_PAGENUMBER:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("ImpressPageNumber"));
sName = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_NUMBER_N)) );
break;
default:
- //sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("UnknownAccessibleImpressShape"));
sName = ::rtl::OUString (String(SdResId(SID_SD_A11Y_P_UNKNOWN_N)));
- //-----IAccessibility2 Implementation 2009
uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
if (xDescriptor.is())
sName += ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM(": "))
@@ -149,14 +134,11 @@ AccessiblePresentationShape::~Accessible
ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
switch (nShapeType)
{
- //IAccessibility2 Implementation 2009-----
case PRESENTATION_TITLE:
- //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTitleShape"));
sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_TITLE_D)) );
aDG.Initialize (sDescription);
break;
case PRESENTATION_OUTLINER:
- //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOutlinerShape"));
sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_OUTLINER_D)) );
aDG.Initialize (sDescription); //PresentationOutlinerShape
break;
@@ -181,30 +163,24 @@ AccessiblePresentationShape::~Accessible
aDG.Initialize (sDescription); //PresentationHandoutShape
break;
case PRESENTATION_HEADER:
- //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHeaderShape"));
sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_HEADER_D)) );
aDG.Initialize (sDescription); //PresentationHeaderShape
break;
case PRESENTATION_FOOTER:
- //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationFooterShape"));
sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_FOOTER_D)) );
aDG.Initialize (sDescription); //PresentationFooterShape
break;
case PRESENTATION_DATETIME:
- //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationDateAndTimeShape"));
sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_DATE_D)) );
aDG.Initialize (sDescription); //PresentationDateShape
break;
case PRESENTATION_PAGENUMBER:
- //aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageNumberShape"));
sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_NUMBER_D)) );
aDG.Initialize (sDescription); //PresentationNumberShape
break;
default:
- //aDG.Initialize (::rtl::OUString::createFromAscii ("Unknown accessible presentation shape"));
sDescription = ::rtl::OUString ( String(SdResId(SID_SD_A11Y_P_UNKNOWN_D)) );
aDG.Initialize (sDescription); //Unknown accessible presentation shape
- //-----IAccessibility2 Implementation 2009
uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
if (xDescriptor.is())
{
@@ -215,7 +191,6 @@ AccessiblePresentationShape::~Accessible
return aDG();
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString AccessiblePresentationShape::GetStyle()
{
::rtl::OUString sName;
@@ -264,5 +239,4 @@ AccessiblePresentationShape::~Accessible
return sName;
}
-//-----IAccessibility2 Implementation 2009
} // end of namespace accessibility
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx Sun Dec 1 11:40:24 2013
@@ -200,7 +200,6 @@ sal_Int16 SAL_CALL AccessibleSlideSorter
{
ThrowIfDisposed();
//set Role = Shape
- //static sal_Int16 nRole = AccessibleRole::LIST_ITEM;
static sal_Int16 nRole = AccessibleRole::SHAPE;
return nRole;
}
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/accessibility.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/accessibility.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/accessibility.hrc (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/accessibility.hrc Sun Dec 1 11:40:24 2013
@@ -44,7 +44,6 @@
#define SID_SD_A11Y_I_HANDOUTVIEW_N (SID_SD_A11Y_START + 10)
#define SID_SD_A11Y_I_HANDOUTVIEW_D (SID_SD_A11Y_START + 11)
-//IAccessibility2 Implementation 2009-----
#define SID_SD_A11Y_P_TITLE_N (SID_SD_A11Y_START + 12)
#define SID_SD_A11Y_P_TITLE_D (SID_SD_A11Y_START + 13)
#define SID_SD_A11Y_P_OUTLINER_N (SID_SD_A11Y_START + 14)
@@ -84,6 +83,5 @@
#define SID_SD_A11Y_I_PREVIEW_D (SID_SD_A11Y_START + 47)
#define SID_SD_A11Y_I_PREVIEW_SUFFIX (SID_SD_A11Y_START + 48)
#define SID_SD_A11Y_D_PRESENTATION_READONLY (SID_SD_A11Y_START + 49)
-//-----IAccessibility2 Implementation 2009
#endif /* _SD_ACCESSIBILITY_HRC */
Modified: openoffice/branches/l10n40/main/sd/source/ui/accessibility/accessibility.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/accessibility/accessibility.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/accessibility/accessibility.src (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/accessibility/accessibility.src Sun Dec 1 11:40:24 2013
@@ -87,7 +87,6 @@ String SID_SD_A11Y_I_HANDOUTVIEW_D
Text [ en-US ] = "This is where you decide on the layout for handouts.";
};
-//IAccessibility2 Implementation 2009-----
String SID_SD_A11Y_P_TITLE_N
{
Text [ en-US ] = "PresentationTitle";
@@ -257,4 +256,3 @@ String SID_SD_A11Y_D_PRESENTATION_READON
{
Text [ en-US ] = "(read-only)";
};
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sd/source/ui/dlg/custsdlg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/dlg/custsdlg.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/dlg/custsdlg.src (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/dlg/custsdlg.src Sun Dec 1 11:40:24 2013
@@ -95,9 +95,7 @@ ModalDialog DLG_CUSTOMSHOW
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 102 + DIFF , 86 + DIFF_Y ) ;
TabStop = TRUE ;
- //IAccessibility2 Implementation 2009-----
QuickHelpText [ en-US ] = "Custom Screen Show" ;
- //-----IAccessibility2 Implementation 2009
};
CheckBox CBX_USE_CUSTOMSHOW
{
Modified: openoffice/branches/l10n40/main/sd/source/ui/dlg/navigatr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/dlg/navigatr.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/dlg/navigatr.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/dlg/navigatr.cxx Sun Dec 1 11:40:24 2013
@@ -119,9 +119,7 @@ SdNavigatorWin::SdNavigatorWin(
// set focus to listbox, otherwise it is in the toolbox which is only useful
// for keyboard navigation
maTlbObjects.GrabFocus();
-//IAccessibility2 Implementation 2009-----
maTlbObjects.SetSdNavigatorWinFlag(sal_True);
-//-----IAccessibility2 Implementation 2009
// DragTypeListBox
maLbDocs.SetSelectHdl( LINK( this, SdNavigatorWin, SelectDocumentHdl ) );
@@ -178,7 +176,6 @@ SdNavigatorWin::~SdNavigatorWin()
// -----------------------------------------------------------------------
-//IAccessibility2 Implementation 2009-----
//Solution: when object is marked , fresh the corresponding entry tree .
//==================================================
void SdNavigatorWin::FreshTree( const SdDrawDocument* pDoc )
@@ -199,7 +196,6 @@ void SdNavigatorWin::FreshEntry( )
maTlbObjects.FreshCurEntry();
}
//==================================================
-//-----IAccessibility2 Implementation 2009
void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
{
SdDrawDocument* pNonConstDoc = (SdDrawDocument*) pDoc; // const as const can...
@@ -270,7 +266,6 @@ NavigatorDragType SdNavigatorWin::GetNav
}
// -----------------------------------------------------------------------
-//IAccessibility2 Implementation 2009-----
//Solution: Get SdDrawDocShell
sd::DrawDocShell* SdNavigatorWin::GetDrawDocShell( const SdDrawDocument* pDoc )
{
@@ -279,7 +274,6 @@ sd::DrawDocShell* SdNavigatorWin::GetDra
sd::DrawDocShell* pDocShell = pDoc->GetDocSh();
return pDocShell;
}
-//-----IAccessibility2 Implementation 2009
IMPL_LINK( SdNavigatorWin, SelectToolboxHdl, void *, EMPTYARG )
{
@@ -437,10 +431,8 @@ IMPL_LINK( SdNavigatorWin, ClickObjectHd
SfxStringItem aItem( SID_NAVIGATOR_OBJECT, aStr );
mpBindings->GetDispatcher()->Execute(
SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
-//IAccessibility2 Implementation 2009-----
//Solution: set sign variable
maTlbObjects.MarkCurEntry(aStr);
-//-----IAccessibility2 Implementation 2009
// #98821# moved here from SetGetFocusHdl. Reset the
// focus only if something has been selected in the
Modified: openoffice/branches/l10n40/main/sd/source/ui/dlg/sdtreelb.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/dlg/sdtreelb.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/dlg/sdtreelb.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/dlg/sdtreelb.cxx Sun Dec 1 11:40:24 2013
@@ -295,7 +295,6 @@ SdPageObjsTLB::~SdPageObjsTLB()
delete mpMedium;
}
-//IAccessibility2 Implementation 2009-----
// helper function for GetEntryAltText and GetEntryLongDescription
String SdPageObjsTLB::getAltLongDescText( SvLBoxEntry* pEntry , sal_Bool isAltText) const
{
@@ -472,7 +471,6 @@ void SdPageObjsTLB::Clear()
}
return SvTreeListBox::Clear();
}
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
|*
|* return name of object
@@ -710,7 +708,6 @@ void SdPageObjsTLB::AddShapeList (
IM_FLAT,
sal_False /*not reverse*/);
- //IAccessibility2 Implementation 2009-----
sal_Bool bMarked=sal_False;
if(bisInSdNavigatorWin)
{
@@ -733,7 +730,6 @@ void SdPageObjsTLB::AddShapeList (
pEntry->SetMarked( sal_False );
}
}
- //-----IAccessibility2 Implementation 2009
while( aIter.IsMore() )
{
SdrObject* pObj = aIter.Next();
@@ -748,7 +744,6 @@ void SdPageObjsTLB::AddShapeList (
{
SvLBoxEntry* pNewEntry = InsertEntry( aStr, maImgOle, maImgOle, pEntry,
sal_False, LIST_APPEND, pObj);
- //IAccessibility2 Implementation 2009-----
if(bisInSdNavigatorWin)
{
Window* pWindow=NULL;
@@ -770,7 +765,6 @@ void SdPageObjsTLB::AddShapeList (
pNewEntry->SetMarked( sal_False );
}
}
- //-----IAccessibility2 Implementation 2009
SetExpandedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
SetCollapsedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
}
@@ -778,7 +772,6 @@ void SdPageObjsTLB::AddShapeList (
{
SvLBoxEntry* pNewEntry = InsertEntry( aStr, maImgGraphic, maImgGraphic, pEntry,
sal_False, LIST_APPEND, pObj );
- //IAccessibility2 Implementation 2009-----
if(bisInSdNavigatorWin)
{
Window* pWindow=NULL;
@@ -804,7 +797,6 @@ void SdPageObjsTLB::AddShapeList (
}
}
}
- //-----IAccessibility2 Implementation 2009
SetExpandedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
SetCollapsedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
}
@@ -822,7 +814,6 @@ void SdPageObjsTLB::AddShapeList (
{
SvLBoxEntry* pNewEntry = InsertEntry( aStr, rIconProvider.maImgObjects, rIconProvider.maImgObjects, pEntry,
sal_False, LIST_APPEND, pObj );
- //IAccessibility2 Implementation 2009-----
if(bisInSdNavigatorWin)
{
Window* pWindow=NULL;
@@ -848,7 +839,6 @@ void SdPageObjsTLB::AddShapeList (
}
}
}
- //-----IAccessibility2 Implementation 2009
SetExpandedEntryBmp( pNewEntry, rIconProvider.maImgObjectsH, BMP_COLOR_HIGHCONTRAST );
SetCollapsedEntryBmp( pNewEntry, rIconProvider.maImgObjectsH, BMP_COLOR_HIGHCONTRAST );
}
@@ -871,7 +861,6 @@ void SdPageObjsTLB::AddShapeList (
pEntry,
bIsExcluded ? rIconProvider.maImgPageObjsExclH : rIconProvider.maImgPageObjsH,
BMP_COLOR_HIGHCONTRAST);
- //IAccessibility2 Implementation 2009-----
if (mbSaveTreeItemState)
{
vector<String>:: iterator iteStart = maTreeItem.begin();
@@ -888,7 +877,6 @@ void SdPageObjsTLB::AddShapeList (
}
else
Expand( pEntry );
- //-----IAccessibility2 Implementation 2009
}
}
@@ -1266,7 +1254,6 @@ void SdPageObjsTLB::KeyInput( const KeyE
DoubleClickHdl();
}
-//IAccessibility2 Implementation 2009-----
else if (rKEvt.GetKeyCode().GetCode() == KEY_SPACE)
{
if(bisInSdNavigatorWin)
@@ -1321,7 +1308,6 @@ void SdPageObjsTLB::KeyInput( const KeyE
Invalidate();
}
}
-//-----IAccessibility2 Implementation 2009
else
SvTreeListBox::KeyInput( rKEvt );
}
Modified: openoffice/branches/l10n40/main/sd/source/ui/docshell/docshel4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/docshell/docshel4.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/docshell/docshel4.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/docshell/docshel4.cxx Sun Dec 1 11:40:24 2013
@@ -93,10 +93,8 @@
#include "sdhtmlfilter.hxx"
#include "framework/FrameworkHelper.hxx"
-//IAccessibility2 Implementation 2009-----
#include <sfx2/viewfrm.hxx>
#include "SdUnoDrawView.hxx"
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using ::sd::framework::FrameworkHelper;
@@ -578,7 +576,6 @@ sal_Bool DrawDocShell::Save()
sal_Bool DrawDocShell::SaveAs( SfxMedium& rMedium )
{
-//IAccessibility2 Implementation 2009-----
mpDoc->setDocAccTitle(String());
SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this );
if (pFrame1)
@@ -593,7 +590,6 @@ sal_Bool DrawDocShell::SaveAs( SfxMedium
}
}
}
-//-----IAccessibility2 Implementation 2009
mpDoc->StopWorkStartupDelay();
//TODO/LATER: why this?!
@@ -928,7 +924,6 @@ sal_Bool DrawDocShell::GotoBookmark(cons
return (bFound);
}
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , return true , else return false .
sal_Bool DrawDocShell::IsMarked( SdrObject* pObject )
{
@@ -1162,7 +1157,6 @@ sal_Bool DrawDocShell::GotoTreeBookmark(
return (bFound);
}
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
|*
|* SaveAsOwnFormat: wenn es eine Dokumentvorlage werden soll,
@@ -1286,7 +1280,6 @@ void DrawDocShell::OpenBookmark( const S
( mpViewShell ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings().Execute( SID_OPENHYPERLINK, ppArgs );
}
-//IAccessibility2 Implementation 2009-----
void DrawDocShell::setDocAccTitle( const String& rTitle )
{
if (mpDoc )
@@ -1320,5 +1313,4 @@ sal_Bool DrawDocShell::getDocReadOnly()
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
} // end of namespace sd
Modified: openoffice/branches/l10n40/main/sd/source/ui/func/fudraw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/func/fudraw.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/func/fudraw.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/func/fudraw.cxx Sun Dec 1 11:40:24 2013
@@ -470,7 +470,6 @@ sal_Bool FuDraw::KeyInput(const KeyEvent
// changeover to the next object
if(!mpView->MarkNextObj( !aCode.IsShift() ))
{
- //IAccessibility2 Implementation 2009-----
//If there is only one object, don't do the UnmarkAlllObj() & MarkNextObj().
if ( mpView->GetMarkableObjCount() > 1 && mpView->AreObjectsMarked() )
{
@@ -479,7 +478,6 @@ sal_Bool FuDraw::KeyInput(const KeyEvent
mpView->UnmarkAllObj();
mpView->MarkNextObj(!aCode.IsShift());
}
- //-----IAccessibility2 Implementation 2009
}
// #97016# II
Modified: openoffice/branches/l10n40/main/sd/source/ui/func/fuediglu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/func/fuediglu.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/func/fuediglu.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/func/fuediglu.cxx Sun Dec 1 11:40:24 2013
@@ -63,12 +63,10 @@ FuEditGluePoints::FuEditGluePoints (
SdDrawDocument* pDoc,
SfxRequest& rReq)
: FuDraw(pViewSh, pWin, pView, pDoc, rReq)
-//IAccessibility2 Implementation 2009-----
//Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
//and SHIFT+ENTER key to decide the postion and draw the new insert point
,bBeginInsertPoint(sal_False),
oldPoint(0,0)
-//-----IAccessibility2 Implementation 2009
{
}
@@ -327,10 +325,8 @@ sal_Bool FuEditGluePoints::KeyInput(cons
{
mpView->SetActualWin( mpWindow );
-//IAccessibility2 Implementation 2009-----
//Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
//and SHIFT+ENTER key to decide the postion and draw the new insert point
- //sal_Bool bReturn = FuDraw::KeyInput(rKEvt);
sal_Bool bReturn = sal_False;
@@ -408,11 +404,9 @@ sal_Bool FuEditGluePoints::KeyInput(cons
}
if(!bReturn)
bReturn = FuDraw::KeyInput(rKEvt);
-//-----IAccessibility2 Implementation 2009
return bReturn;
}
-//IAccessibility2 Implementation 2009-----
//Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
//and SHIFT+ENTER key to decide the postion and draw the new insert point
void FuEditGluePoints::ForcePointer(const MouseEvent* pMEvt)
@@ -428,7 +422,6 @@ void FuEditGluePoints::ForcePointer(cons
FuDraw::ForcePointer(pMEvt);
}
}
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
|*
|* Command-event
Modified: openoffice/branches/l10n40/main/sd/source/ui/func/fusel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/func/fusel.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/func/fusel.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/func/fusel.cxx Sun Dec 1 11:40:24 2013
@@ -113,13 +113,11 @@ FuSelection::FuSelection (
bMirrorSide0(sal_False),
nEditMode(SID_BEZIER_MOVE),
pWaterCanCandidate(NULL)
-//IAccessibility2 Implementation 2009-----
//Solution: Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point,
//and SHIFT+ENTER key to decide the postion and draw the new insert point
,bBeginInsertPoint(sal_False),
oldPoint(0,0)
,bMovedToCenterPoint(sal_False)
-//-----IAccessibility2 Implementation 2009
{
}
@@ -955,7 +953,6 @@ sal_Bool FuSelection::KeyInput(const Key
bReturn = FuSelection::cancel();
}
break;
-//IAccessibility2 Implementation 2009-----
//Solution: add keyboard operation for insert points in drawing curve
case KEY_UP:
case KEY_DOWN:
@@ -1028,7 +1025,6 @@ sal_Bool FuSelection::KeyInput(const Key
}
break;
}
-//-----IAccessibility2 Implementation 2009
if (!bReturn)
{
bReturn = FuDraw::KeyInput(rKEvt);
@@ -1046,7 +1042,6 @@ sal_Bool FuSelection::KeyInput(const Key
}
-//IAccessibility2 Implementation 2009-----
void FuSelection::ForcePointer(const MouseEvent* pMEvt)
{
if(bMovedToCenterPoint && !bBeginInsertPoint && pMEvt)
@@ -1060,7 +1055,6 @@ void FuSelection::ForcePointer(const Mou
FuDraw::ForcePointer(pMEvt);
}
}
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
|*
|* Function aktivieren
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleDocumentViewBase.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleDocumentViewBase.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleDocumentViewBase.hxx Sun Dec 1 11:40:24 2013
@@ -38,7 +38,6 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <tools/link.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
#include "DrawViewShell.hxx"
#include "sdpage.hxx"
@@ -48,7 +47,6 @@
#include <editeng/outlobj.hxx>
#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
class SdViewShell;
-//-----IAccessibility2 Implementation 2009
namespace sd {
class ViewShell;
class Window;
@@ -97,10 +95,8 @@ class AccessibleDocumentViewBase
public ::com::sun::star::beans::XPropertyChangeListener,
public ::com::sun::star::awt::XWindowListener,
public ::com::sun::star::awt::XFocusListener
-//IAccessibility2 Implementation 2009-----
,public ::com::sun::star::accessibility::XAccessibleExtendedAttributes
,public com::sun::star::accessibility::XAccessibleGetAccFlowTo
-//-----IAccessibility2 Implementation 2009
{
public:
//===== internal ========================================================
@@ -265,12 +261,10 @@ public:
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e)
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
//----------------------------xAttribute----------------------------
virtual com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
::sd::ViewShell* mpViewShell;
-//-----IAccessibility2 Implementation 2009
private:
// return the member maMutex;
@@ -379,7 +373,6 @@ protected:
virtual void SetAccessibleOLEObject (
const ::com::sun::star::uno::Reference <
::com::sun::star::accessibility::XAccessible>& xOLEObject);
-//IAccessibility2 Implementation 2009-----
//===== XAccessibleGetAccFromXShape ============================================
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
@@ -392,7 +385,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( )
throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
virtual void impl_dispose (void);
};
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx Sun Dec 1 11:40:24 2013
@@ -26,9 +26,7 @@
#include "AccessibleDocumentViewBase.hxx"
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleGroupPosition.hpp>
-//-----IAccessibility2 Implementation 2009
namespace accessibility {
@@ -43,9 +41,7 @@ namespace accessibility {
*/
class AccessibleDrawDocumentView :
public AccessibleDocumentViewBase
-//IAccessibility2 Implementation 2009-----
,public ::com::sun::star::accessibility::XAccessibleGroupPosition
-//-----IAccessibility2 Implementation 2009
{
public:
//===== internal ========================================================
@@ -80,11 +76,9 @@ public:
throw (::com::sun::star::uno::RuntimeException,
::com::sun::star::lang::IndexOutOfBoundsException);
-//IAccessibility2 Implementation 2009-----
virtual ::rtl::OUString SAL_CALL
getAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
//===== lang::XEventListener ============================================
@@ -98,7 +92,6 @@ public:
virtual void SAL_CALL
propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject)
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
//===== XInterface ======================================================
virtual com::sun::star::uno::Any SAL_CALL
@@ -119,7 +112,6 @@ public:
throw (::com::sun::star::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject )
throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
protected:
@@ -154,10 +146,8 @@ protected:
virtual void
implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
private:
::sd::ViewShell* mpSdViewSh;
-//-----IAccessibility2 Implementation 2009
protected:
/** This object manages the shapes of the represented draw page. It is
@@ -198,14 +188,12 @@ protected:
virtual void impl_dispose (void);
-//IAccessibility2 Implementation 2009-----
//===== XAccessibleGetAccFromXShape ============================================
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
GetSelAccContextInTable();
-//-----IAccessibility2 Implementation 2009
private:
void UpdateAccessibleName (void);
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleOutlineView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleOutlineView.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleOutlineView.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleOutlineView.hxx Sun Dec 1 11:40:24 2013
@@ -75,11 +75,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild (sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
virtual ::rtl::OUString SAL_CALL
getAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
//===== XAccessibleEventBroadcaster ========================================
virtual void SAL_CALL
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx Sun Dec 1 11:40:24 2013
@@ -27,9 +27,7 @@
#include <svx/AccessibleGraphicShape.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-//-----IAccessibility2 Implementation 2009
namespace accessibility {
/** This class makes Impress shapes accessible.
@@ -63,10 +61,8 @@ public:
virtual ::rtl::OUString
CreateAccessibleDescription ()
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
/// Return this object's role.
virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException);
-//-----IAccessibility2 Implementation 2009
};
} // end of namespace accessibility