You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/12/18 14:27:25 UTC
svn commit: r1551937 [10/29] - in /openoffice/branches/ooxml-osba: ./
extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/
extras/l10n/source/th/ main/ main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/...
Modified: openoffice/branches/ooxml-osba/main/sc/source/ui/navipi/content.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/navipi/content.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/navipi/content.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/navipi/content.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/navipi/navipi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/navipi/navipi.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/navipi/navipi.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/navipi/navipi.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/pagedlg/scuitphfedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/pagedlg/scuitphfedit.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/pagedlg/scuitphfedit.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/pagedlg/scuitphfedit.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/pagedlg/tphfedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/pagedlg/tphfedit.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/pagedlg/tphfedit.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/pagedlg/tphfedit.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/drawview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/drawview.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/drawview.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/drawview.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/gridwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/gridwin.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/gridwin.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/gridwin.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/gridwin3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/gridwin3.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/gridwin3.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/gridwin3.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/gridwin5.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/gridwin5.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/gridwin5.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/gridwin5.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/output.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/output.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/output.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/output.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/preview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/preview.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/preview.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/preview.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/select.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/select.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/select.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/select.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/tabview2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabview2.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabview2.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabview2.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/tabvwsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabvwsh.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabvwsh.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabvwsh.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/tabvwsh4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabvwsh4.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabvwsh4.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabvwsh4.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/tabvwshe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabvwshe.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabvwshe.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/tabvwshe.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sc/source/ui/view/viewfun2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sc/source/ui/view/viewfun2.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sc/source/ui/view/viewfun2.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sc/source/ui/view/viewfun2.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/scaddins/source/analysis/analysis.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/scaddins/source/analysis/analysis.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/scaddins/source/analysis/analysis.cxx (original)
+++ openoffice/branches/ooxml-osba/main/scaddins/source/analysis/analysis.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/scaddins/source/analysis/analysishelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/scaddins/source/analysis/analysishelper.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/scaddins/source/analysis/analysishelper.cxx (original)
+++ openoffice/branches/ooxml-osba/main/scaddins/source/analysis/analysishelper.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/scaddins/source/datefunc/datefunc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/scaddins/source/datefunc/datefunc.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/scaddins/source/datefunc/datefunc.cxx (original)
+++ openoffice/branches/ooxml-osba/main/scaddins/source/datefunc/datefunc.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/scp2/source/ooo/registryitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/scp2/source/ooo/registryitem_ooo.scp?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/branches/ooxml-osba/main/scp2/source/ooo/registryitem_ooo.scp Wed Dec 18 13:27:09 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/ooxml-osba/main/sd/inc/drawdoc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/inc/drawdoc.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/inc/drawdoc.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/inc/drawdoc.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sd/inc/glob.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/inc/glob.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/inc/glob.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/inc/glob.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sd/source/core/drawdoc2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/source/core/drawdoc2.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/source/core/drawdoc2.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/source/core/drawdoc2.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sd/source/filter/eppt/epptso.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sd/source/filter/eppt/epptso.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sd/source/filter/eppt/epptso.cxx Wed Dec 18 13:27:09 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