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 [6/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/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx Sun Dec 1 11:40:24 2013
@@ -27,9 +27,7 @@
#include <svx/AccessibleOLEShape.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
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationShape.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationShape.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationShape.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/AccessiblePresentationShape.hxx Sun Dec 1 11:40:24 2013
@@ -59,9 +59,7 @@ public:
virtual ::rtl::OUString
CreateAccessibleDescription ()
throw (::com::sun::star::uno::RuntimeException);
-//IAccessibility2 Implementation 2009-----
::rtl::OUString GetStyle();
-//-----IAccessibility2 Implementation 2009
private:
/** Don't use the default constructor. Use the public constructor that
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx Sun Dec 1 11:40:24 2013
@@ -286,7 +286,6 @@ public:
getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException);
- // IAccessibility2 Implementation 2009
virtual void SwitchViewActivated (void);
private:
class Implementation;
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleSlideView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleSlideView.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleSlideView.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/AccessibleSlideView.hxx Sun Dec 1 11:40:24 2013
@@ -25,10 +25,8 @@
#define SD_ACCESSIBILITY_ACCESSIBLE_SLIDE_VIEW_HXX
#include <cppuhelper/implbase6.hxx>
-//IAccessibility2 Implementation 2009-----
#include <cppuhelper/implbase9.hxx>
//#include <cppuhelper/implbase7.hxx>
-//-----IAccessibility2 Implementation 2009
#include "SlideView.hxx"
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -38,9 +36,7 @@
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
-//-----IAccessibility2 Implementation 2009
#include <vector>
class SdDrawDocument;
@@ -170,10 +166,8 @@ class AccessibleSlideView : public ::cpp
::com::sun::star::accessibility::XAccessibleComponent,
::com::sun::star::accessibility::XAccessibleSelection,
::com::sun::star::lang::XServiceInfo
-//IAccessibility2 Implementation 2009-----
,::com::sun::star::accessibility::XAccessibleExtendedAttributes
,::com::sun::star::awt::XFocusListener >
-//-----IAccessibility2 Implementation 2009
{
public:
@@ -199,7 +193,6 @@ public:
void SetPageVisible( sal_uInt16 nPage, sal_Bool bVisible );
void Reset();
void FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage );
-//IAccessibility2 Implementation 2009-----
void SelectionHasChanged (sal_uInt16 nPage, sal_Bool bSelect );
//===== XFocusListener =================================================
virtual void SAL_CALL focusGained (const ::com::sun::star::awt::FocusEvent& e)
@@ -210,7 +203,6 @@ public:
virtual void SAL_CALL disposing (const struct com::sun::star::lang::EventObject &) throw (::com::sun::star::uno::RuntimeException);
// This method is called from the component helper base class while disposing.
virtual void SAL_CALL disposing (void);
-//-----IAccessibility2 Implementation 2009
private:
::osl::Mutex maMutex;
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > maSlidePageObjects;
@@ -219,10 +211,8 @@ private:
::sd::Window* mpParentWindow;
/// client id in the AccessibleEventNotifier queue
sal_uInt32 mnClientId;
-//IAccessibility2 Implementation 2009-----
sal_uInt32 nFocusPageIndex;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> mxWindow;
-//-----IAccessibility2 Implementation 2009
// internal
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
@@ -277,11 +267,9 @@ private:
//===== XServiceInfo ====================================================
-//IAccessibility2 Implementation 2009-----
//----------------------------xAttribute----------------------------
virtual com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
-//-----IAccessibility2 Implementation 2009
/** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/DrawController.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/DrawController.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/DrawController.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/DrawController.hxx Sun Dec 1 11:40:24 2013
@@ -44,9 +44,7 @@
#include <memory>
#include <vector>
#include <boost/scoped_ptr.hpp>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/drawing/XLayer.hpp>
-//-----IAccessibility2 Implementation 2009
class SfxViewShell;
class SdXImpressDocument;
@@ -105,10 +103,8 @@ public:
PROPERTY_ZOOMVALUE = 7,
PROPERTY_VIEWOFFSET = 8,
PROPERTY_DRAWVIEWMODE = 9
- //IAccessibility2 Implementation 2009-----
,PROPERTY_UPDATEACC = 10
,PROPERTY_PAGE_CHANGE = 11
- //-----IAccessibility2 Implementation 2009
};
/** Create a new DrawController object for the given ViewShellBase.
@@ -154,14 +150,12 @@ public:
switch.
*/
void BroadcastContextChange (void) const;
-//IAccessibility2 Implementation 2009-----
void NotifyAccUpdate();
void fireChangeLayer( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* pCurrentLayer ) throw();
// change the parameter to int
//void fireSwitchCurrentPage( String pageName) throw();
void fireSwitchCurrentPage( sal_Int32 pageIndex) throw();
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* mpCurrentLayer;
-//-----IAccessibility2 Implementation 2009
/** Return a pointer to the ViewShellBase object that the DrawController
is connected to.
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/DrawDocShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/DrawDocShell.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/DrawDocShell.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/DrawDocShell.hxx Sun Dec 1 11:40:24 2013
@@ -136,12 +136,10 @@ public:
sal_Bool GotoBookmark(const String& rBookmark);
-//IAccessibility2 Implementation 2009-----
//Solution: realize multi-selection of objects
sal_Bool GotoTreeBookmark(const String& rBookmark);
sal_Bool IsMarked( SdrObject* pObject );
sal_Bool GetObjectIsmarked(const String& rBookmark);
-//-----IAccessibility2 Implementation 2009
Bitmap GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel);
/** checks, if the given name is a valid new name for a slide
@@ -231,13 +229,11 @@ protected:
bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor
void Construct(bool bClipboard);
virtual void InPlaceActivate( sal_Bool bActive );
-//IAccessibility2 Implementation 2009-----
public:
virtual void setDocAccTitle( const String& rTitle );
virtual const String getDocAccTitle() const;
virtual void setDocReadOnly( sal_Bool bReadOnly);
virtual sal_Bool getDocReadOnly() const;
-//-----IAccessibility2 Implementation 2009
};
#ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/DrawViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/DrawViewShell.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/DrawViewShell.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/DrawViewShell.hxx Sun Dec 1 11:40:24 2013
@@ -252,12 +252,10 @@ public:
sal_Bool IsSwitchPageAllowed() const;
sal_Bool GotoBookmark(const String& rBookmark);
-//IAccessibility2 Implementation 2009-----
//Solution: realize multi-selection of objects ,If object is marked ,
//the corresponding entry is set true ,else the corresponding entry is set false .
void FreshNavigatrEntry();
void FreshNavigatrTree();
-//-----IAccessibility2 Implementation 2009
void MakeVisible(const Rectangle& rRect, ::Window& rWin);
virtual void ReadFrameViewData(FrameView* pView);
@@ -378,10 +376,8 @@ public:
::rtl::OUString GetSidebarContextName (void) const;
-//IAccessibility2 Implementation 2009-----
//move this method to ViewShell.
//void NotifyAccUpdate();
-//-----IAccessibility2 Implementation 2009
protected:
DrawView* mpDrawView;
SdPage* mpActualPage;
@@ -508,9 +504,7 @@ private:
using ViewShell::Notify;
-//IAccessibility2 Implementation 2009-----
//const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & GetForms() const;
-//-----IAccessibility2 Implementation 2009
::std::auto_ptr< AnnotationManager > mpAnnotationManager;
::std::auto_ptr< ViewOverlayManager > mpViewOverlayManager;
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/OutlineViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/OutlineViewShell.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/OutlineViewShell.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/OutlineViewShell.hxx Sun Dec 1 11:40:24 2013
@@ -139,9 +139,7 @@ public:
::com::sun::star::accessibility::XAccessible>
CreateAccessibleDocumentView (::sd::Window* pWindow);
-//IAccessibility2 Implementation 2009-----
String m_StrOldPageName;
-//-----IAccessibility2 Implementation 2009
/** Update the preview to show the specified page.
*/
virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False);
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/SlideSorterViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/SlideSorterViewShell.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/SlideSorterViewShell.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/SlideSorterViewShell.hxx Sun Dec 1 11:40:24 2013
@@ -174,10 +174,8 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
CreateAccessibleDocumentView (::sd::Window* pWindow);
- //IAccessibility2 Implementation 2009-----
// handle SlideSorterView specially because AccessibleSlideSorterView doesn't inherit from AccessibleDocumentViewBase
virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc );
- //-----IAccessibility2 Implementation 2009
SlideSorter& GetSlideSorter (void) const;
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/SlideViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/SlideViewShell.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/SlideViewShell.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/SlideViewShell.hxx Sun Dec 1 11:40:24 2013
@@ -140,10 +140,8 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessibleDocumentView( ::sd::Window* pWindow );
void SelectionHasChanged();
-//IAccessibility2 Implementation 2009-----
//Notify the SELECTION_CHANGE, SELECTION_ADD, SELECTION_REMOVE events
void SelectionHasChanged(sal_uInt16 nPage, sal_Bool bSelect);
-//-----IAccessibility2 Implementation 2009
void PageLayoutHasChanged();
void FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage );
void PageVisibilityHasChanged( sal_uInt16 nPage, sal_Bool bVisible );
@@ -152,9 +150,7 @@ public:
*/
virtual void Activate (sal_Bool IsMDIActivate);
-//IAccessibility2 Implementation 2009-----
void SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc );
-//-----IAccessibility2 Implementation 2009
protected:
virtual Size GetOptimalSizePixel() const;
virtual long VirtHScrollHdl(ScrollBar* pHScroll);
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/TabControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/TabControl.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/TabControl.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/TabControl.hxx Sun Dec 1 11:40:24 2013
@@ -42,10 +42,8 @@ class TabControl
public DragSourceHelper,
public DropTargetHelper
{
-//IAccessibility2 Implementation 2009-----
//Solution: declare bIsMarked variable
sal_uInt16 RrePageID;
-//-----IAccessibility2 Implementation 2009
public:
TabControl (DrawViewShell* pDrViewSh, ::Window* pParent);
virtual ~TabControl (void);
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/ViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/ViewShell.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/ViewShell.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/ViewShell.hxx Sun Dec 1 11:40:24 2013
@@ -317,13 +317,11 @@ public:
::com::sun::star::accessibility::XAccessible>
CreateAccessibleDocumentView (::sd::Window* pWindow);
-//IAccessibility2 Implementation 2009-----
virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc );
virtual void SwitchActiveViewFireFocus( );
// Move these two methods from DrawViewShell to enable slide show view
void NotifyAccUpdate();
void fireSwitchCurrentPage(sal_Int32 pageIndex);
-//-----IAccessibility2 Implementation 2009
void SetWinViewPos(const Point& rWinPos, bool bUpdate);
Point GetWinViewPos() const;
Point GetViewOrigin() const;
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/Window.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/Window.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/Window.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/Window.hxx Sun Dec 1 11:40:24 2013
@@ -202,9 +202,7 @@ protected:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
CreateAccessible (void);
-//IAccessibility2 Implementation 2009-----
virtual void SwitchView();
-//-----IAccessibility2 Implementation 2009
XubString GetSurroundingText() const;
Selection GetSurroundingTextSelection() const;
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/animobjs.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/animobjs.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/animobjs.hrc (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/animobjs.hrc Sun Dec 1 11:40:24 2013
@@ -43,6 +43,4 @@
#define LB_ADJUSTMENT 2
#define LB_LOOP_COUNT 3
#define GRP_ANIMATION_GROUP 2
-//IAccessibility2 Implementation 2009-----
#define STR_DISPLAY 1
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/fuediglu.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/fuediglu.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/fuediglu.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/fuediglu.hxx Sun Dec 1 11:40:24 2013
@@ -54,14 +54,12 @@ public:
virtual void Activate(); // Function aktivieren
virtual void Deactivate(); // Function deaktivieren
-//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
virtual void ForcePointer(const MouseEvent* pMEvt = NULL);
private:
sal_Bool bBeginInsertPoint;
Point oldPoint;
-//-----IAccessibility2 Implementation 2009
protected:
FuEditGluePoints (
ViewShell* pViewSh,
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/fusel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/fusel.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/fusel.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/fusel.hxx Sun Dec 1 11:40:24 2013
@@ -68,10 +68,8 @@ public:
*/
virtual bool cancel();
-//IAccessibility2 Implementation 2009-----
//Solution: let mouse cursor move
virtual void ForcePointer(const MouseEvent* pMEvt = NULL);
-//-----IAccessibility2 Implementation 2009
protected:
FuSelection (ViewShell* pViewSh,
::sd::Window* pWin,
@@ -104,14 +102,12 @@ private:
position then NULL is returned.
*/
SdrObject* pickObject (const Point& rTestPoint);
-//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 bBeginInsertPoint;
Point oldPoint;
//Solution: let mouse cursor move
sal_Bool bMovedToCenterPoint;
-//-----IAccessibility2 Implementation 2009
};
} // end of namespace sd
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/navigatr.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/navigatr.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/navigatr.hrc (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/navigatr.hrc Sun Dec 1 11:40:24 2013
@@ -21,9 +21,7 @@
#define FLT_NAVIGATOR 575
-//IAccessibility2 Implementation 2009-----
#define STR_OBJECTS_TREE (FLT_NAVIGATOR+1)
-//-----IAccessibility2 Implementation 2009
#define TLB_OBJECTS 1
#define TBI_PEN 2
#define TBI_FIRST 3
@@ -40,7 +38,5 @@
#define IL_NAVIGATR 333
#define ILH_NAVIGATR 444
-//IAccessibility2 Implementation 2009-----
#define STR_DRAGMODE 1
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/navigatr.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/navigatr.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/navigatr.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/navigatr.hxx Sun Dec 1 11:40:24 2013
@@ -165,13 +165,11 @@ private:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
void SetDragImage();
void ApplyImageList();
-//IAccessibility2 Implementation 2009-----
public:
//Solution: when object is marked , fresh the corresponding entry tree .
sd::DrawDocShell* GetDrawDocShell(const SdDrawDocument*);
void FreshTree ( const SdDrawDocument* pDoc );
void FreshEntry( );
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/sdtreelb.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/sdtreelb.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/sdtreelb.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/sdtreelb.hxx Sun Dec 1 11:40:24 2013
@@ -36,10 +36,8 @@
#include <svl/urlbmk.hxx>
#include <tools/ref.hxx>
#include "sdxfer.hxx"
-//IAccessibility2 Implementation 2009-----
#include <vector>
using namespace std;
-//-----IAccessibility2 Implementation 2009
#include <boost/scoped_ptr.hpp>
#include <boost/function.hpp>
@@ -74,10 +72,8 @@ private:
static sal_Bool SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird
-//IAccessibility2 Implementation 2009-----
//Solution: set contenttree in SdNavigatorWin
sal_Bool bisInSdNavigatorWin;
-//-----IAccessibility2 Implementation 2009
public:
// nested class to implement the TransferableHelper
@@ -152,11 +148,9 @@ protected:
::sd::DrawDocShell* mpDropDocSh;
SdNavigatorWin* mpDropNavWin;
SfxViewFrame* mpFrame;
- //IAccessibility2 Implementation 2009-----
vector<String> maTreeItem;
sal_Bool mbSaveTreeItemState;
String maSelectionEntryText;
- //-----IAccessibility2 Implementation 2009
// DragSourceHelper
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
@@ -201,20 +195,16 @@ protected:
using Window::GetDropTarget;
virtual SvLBoxEntry* GetDropTarget (const Point& rLocation);
-//IAccessibility2 Implementation 2009-----
virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind );
-//-----IAccessibility2 Implementation 2009
public:
SdPageObjsTLB( Window* pParent, const SdResId& rSdResId );
~SdPageObjsTLB();
-//IAccessibility2 Implementation 2009-----
// helper function for GetEntryAltText and GetEntryLongDescription
String getAltLongDescText( SvLBoxEntry* pEntry , sal_Bool isAltText) const;
String GetEntryAltText( SvLBoxEntry* pEntry ) const;
String GetEntryLongDescription( SvLBoxEntry* pEntry ) const;
-//-----IAccessibility2 Implementation 2009
virtual void SelectHdl();
virtual void KeyInput( const KeyEvent& rKEvt );
@@ -229,7 +219,6 @@ public:
sal_Bool HasSelectedChilds( const String& rName );
sal_Bool SelectEntry( const String& rName );
String GetSelectEntry();
-//IAccessibility2 Implementation 2009-----
//Solution: Mark Current Entry
void MarkCurEntry( const String& rName );
void SetSdNavigatorWinFlag(sal_Bool isInSdNavigatorWin){bisInSdNavigatorWin =isInSdNavigatorWin;};
@@ -238,7 +227,6 @@ public:
void Clear();
void SetSaveTreeItemStateFlag(sal_Bool bState){mbSaveTreeItemState = bState;}
void SaveExpandedTreeItemState(SvLBoxEntry* pEntry, vector<String>& vectTreeItem);
-//-----IAccessibility2 Implementation 2009
List* GetSelectEntryList( sal_uInt16 nDepth );
SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL);
::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); }
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/strings.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/strings.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/strings.hrc (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/strings.hrc Sun Dec 1 11:40:24 2013
@@ -496,9 +496,7 @@
#define STR_NAVIGATOR_SHOW_NAMED_SHAPES (RID_APP_START+718)
#define STR_NAVIGATOR_SHOW_ALL_SHAPES (RID_APP_START+719)
#define STR_NAVIGATOR_SHAPE_BASE_NAME (RID_APP_START+720)
-//IAccessibility2 Implementation 2009-----
#define STR_ACC_DIALOG_DESC (RID_APP_START + 730)
-//-----IAccessibility2 Implementation 2009
#define STR_RESET_LAYOUT (RID_APP_START+721)
#define STR_INSERT_TABLE (RID_APP_START+722)
Modified: openoffice/branches/l10n40/main/sd/source/ui/inc/tpaction.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/inc/tpaction.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/inc/tpaction.hrc (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/inc/tpaction.hrc Sun Dec 1 11:40:24 2013
@@ -45,6 +45,4 @@
#define FT_TREE 5
#define TP_ANIMATION 787
#define TP_ANIMATION_ACTION 789
-//IAccessibility2 Implementation 2009-----
#define STR_PATHNAME 1
- //-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sd/source/ui/slideshow/showwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/slideshow/showwin.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/slideshow/showwin.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/slideshow/showwin.cxx Sun Dec 1 11:40:24 2013
@@ -738,7 +738,6 @@ void ShowWindow::AddWindowToPaintView()
GetChild( nChild )->Show( sal_True );
}
-//IAccessibility2 Implementation 2009-----
// Overload the sd::Window's CreateAccessible to create a different accessible object
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
@@ -761,5 +760,4 @@ void ShowWindow::AddWindowToPaintView()
return ::Window::CreateAccessible ();
}
}
-//-----IAccessibility2 Implementation 2009
} // end of namespace sd
Modified: openoffice/branches/l10n40/main/sd/source/ui/slideshow/showwindow.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/slideshow/showwindow.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/slideshow/showwindow.hxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/slideshow/showwindow.hxx Sun Dec 1 11:40:24 2013
@@ -102,7 +102,6 @@ public:
virtual void MouseButtonDown(const MouseEvent& rMEvt);
virtual void Paint(const Rectangle& rRect);
virtual long Notify(NotifyEvent& rNEvt);
- //IAccessibility2 Implementation 2009-----
//Overload the sd::Window's CreateAccessible to create a different accessible object
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
Modified: openoffice/branches/l10n40/main/sd/source/ui/slideshow/slideshow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/slideshow/slideshow.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/slideshow/slideshow.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/slideshow/slideshow.cxx Sun Dec 1 11:40:24 2013
@@ -818,12 +818,10 @@ void SAL_CALL SlideShow::end() throw(Run
}
}
}
- //IAccessibility2 Implementation 2009-----
//Fire the acc focus event when focus is switched back. The above method mpCurrentViewShellBase->GetWindow()->GrabFocus() will
//set focus to WorkWindow instead of the sd::window, so here call Shell's method to fire the focus event
if (pViewShell)
pViewShell->SwitchActiveViewFireFocus();
- //-----IAccessibility2 Implementation 2009
}
mpCurrentViewShellBase = 0;
}
@@ -1050,10 +1048,8 @@ void SlideShow::activate( ViewShellBase&
if( mxController->startShow(mxCurrentSettings.get()) )
{
pShell->Resize();
- //IAccessibility2 Implementation 2009-----
// Defer the sd::ShowWindow's GrabFocus to here. so that the accessible event can be fired correctly.
pShell->GetActiveWindow()->GrabFocus();
- //-----IAccessibility2 Implementation 2009
}
else
{
@@ -1228,13 +1224,11 @@ void SlideShow::StartInPlacePresentation
if( !bSuccess )
end();
- //IAccessibility2 Implementation 2009-----
else
{
if(mpCurrentViewShellBase)
mpCurrentViewShellBase->GetWindow()->GrabFocus();
}
- //-----IAccessibility2 Implementation 2009
}
}
Modified: openoffice/branches/l10n40/main/sd/source/ui/slideshow/slideshowimpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/slideshow/slideshowimpl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/slideshow/slideshowimpl.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/slideshow/slideshowimpl.cxx Sun Dec 1 11:40:24 2013
@@ -1096,10 +1096,8 @@ bool SlideshowImpl::startShow( Presentat
pBindings->Invalidate( SID_REHEARSE_TIMINGS );
}
- //IAccessibility2 Implementation 2009-----
// Defer the sd::ShowWindow's GrabFocus to SlideShow::activate. so that the accessible event can be fired correctly.
//mpShowWindow->GrabFocus();
- //-----IAccessibility2 Implementation 2009
std::vector<beans::PropertyValue> aProperties;
aProperties.reserve( 4 );
@@ -1475,7 +1473,6 @@ void SlideshowImpl::displayCurrentSlide
pBindings->Invalidate( SID_NAVIGATOR_PAGENAME );
}
}
- //IAccessibility2 Implementation 2009-----
// send out page change event and notity to update all acc info for current page
if (mpViewShell)
{
@@ -1483,7 +1480,6 @@ void SlideshowImpl::displayCurrentSlide
mpViewShell->fireSwitchCurrentPage(currentPageIndex);
mpViewShell->NotifyAccUpdate();
}
- //-----IAccessibility2 Implementation 2009
}
// ---------------------------------------------------------
Modified: openoffice/branches/l10n40/main/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx Sun Dec 1 11:40:24 2013
@@ -285,10 +285,8 @@ void FocusManager::HideFocusIndicator (c
{
mrSlideSorter.GetView().SetState(rpDescriptor, model::PageDescriptor::ST_Focused, false);
- //IAccessibility2 Implementation 2009-----
// Hide focus should also fire the focus event, Currently, only accessibility add the focus listener
NotifyFocusChangeListeners();
- //-----IAccessibility2 Implementation 2009
}
}
Modified: openoffice/branches/l10n40/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx Sun Dec 1 11:40:24 2013
@@ -215,12 +215,10 @@ void SlideSorterViewShell::Init (bool bI
{
ViewShell::Init(bIsMainViewShell);
-//IAccessibility2 Implementation 2009-----
// since the updatePageList will show focus, the window.show() must be called ahead. This show is deferred from Init()
::sd::Window* pActiveWindow = GetActiveWindow();
if (pActiveWindow)
pActiveWindow->Show();
-//-----IAccessibility2 Implementation 2009
mpSlideSorter->GetModel().UpdatePageList();
if (mpContentWindow.get() != NULL)
@@ -302,7 +300,6 @@ Reference<drawing::XDrawSubController> S
pWindow);
}
-//IAccessibility2 Implementation 2009-----
void SlideSorterViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc )
{
if (xAcc.get())
@@ -314,7 +311,6 @@ void SlideSorterViewShell::SwitchViewFir
}
}
}
-//-----IAccessibility2 Implementation 2009
SlideSorter& SlideSorterViewShell::GetSlideSorter (void) const
Modified: openoffice/branches/l10n40/main/sd/source/ui/unoidl/DrawController.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/unoidl/DrawController.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/unoidl/DrawController.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/unoidl/DrawController.cxx Sun Dec 1 11:40:24 2013
@@ -539,7 +539,6 @@ void DrawController::FireSwitchCurrentPa
}
}
}
-//IAccessibility2 Implementation 2009-----
void DrawController::NotifyAccUpdate()
{
sal_Int32 nHandle = PROPERTY_UPDATEACC;
@@ -577,7 +576,6 @@ void DrawController::fireSwitchCurrentPa
sal_Int32 nHandles = PROPERTY_PAGE_CHANGE;
fire( &nHandles, &aNewValue, &aOldValue, 1, sal_False );
}
-//-----IAccessibility2 Implementation 2009
void DrawController::FirePropertyChange (
sal_Int32 nHandle,
@@ -786,7 +784,6 @@ void DrawController::FillPropertyTable (
PROPERTY_DRAWVIEWMODE,
::getCppuType((const ::com::sun::star::awt::Point*)0),
beans::PropertyAttribute::BOUND|beans::PropertyAttribute::READONLY|beans::PropertyAttribute::MAYBEVOID ));
- //IAccessibility2 Implementation 2009-----
// add new property to update current page's acc information
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("UpdateAcc") ),
@@ -798,7 +795,6 @@ void DrawController::FillPropertyTable (
PROPERTY_PAGE_CHANGE,
::getCppuType((const sal_Int16*)0),
beans::PropertyAttribute::BOUND ));
- //-----IAccessibility2 Implementation 2009
}
Modified: openoffice/branches/l10n40/main/sd/source/ui/unoidl/SdUnoDrawView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/unoidl/SdUnoDrawView.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/unoidl/SdUnoDrawView.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/unoidl/SdUnoDrawView.cxx Sun Dec 1 11:40:24 2013
@@ -151,9 +151,7 @@ Reference<drawing::XLayer> SdUnoDrawView
xCurrentLayer = pManager->GetLayer (pLayer);
}
while (false);
-//IAccessibility2 Implementation 2009-----
mrController.mpCurrentLayer = &(xCurrentLayer) ;
-//-----IAccessibility2 Implementation 2009
return xCurrentLayer;
}
Modified: openoffice/branches/l10n40/main/sd/source/ui/unoidl/unosrch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/unoidl/unosrch.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/unoidl/unosrch.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/unoidl/unosrch.cxx Sun Dec 1 11:40:24 2013
@@ -489,7 +489,7 @@ uno::Reference< text::XTextRange > SdUn
sal_Int32* pConvertPara = new sal_Int32[nTextLen+2];
int ndbg = 0;
- const sal_Unicode* pText = aText;
+ const sal_Unicode* pText = aText.getStr();
sal_Int32* pPos = pConvertPos;
sal_Int32* pPara = pConvertPara;
Modified: openoffice/branches/l10n40/main/sd/source/ui/view/Outliner.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/view/Outliner.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/view/Outliner.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/view/Outliner.cxx Sun Dec 1 11:40:24 2013
@@ -535,7 +535,6 @@ bool Outliner::StartSearchAndReplace (co
else
mnStartPageIndex = (sal_uInt16)-1;
}
-//IAccessibility2 Implementation 2009-----
if ( Application::IsAccessibilityEnabled() )
{
SvxSearchDialog* pSearchDlg =
@@ -544,7 +543,6 @@ bool Outliner::StartSearchAndReplace (co
pSearchDlg->SetDocWin( pViewShell->GetActiveWindow() );
pSearchDlg->SetSrchFlag();
}
-//-----IAccessibility2 Implementation 2009
}
else
mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False );
Modified: openoffice/branches/l10n40/main/sd/source/ui/view/drviews4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/view/drviews4.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/view/drviews4.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/view/drviews4.cxx Sun Dec 1 11:40:24 2013
@@ -79,9 +79,7 @@
// #97016# IV
#include <svx/svditer.hxx>
-//IAccessibility2 Implementation 2009-----
#include <navigatr.hxx>
-//-----IAccessibility2 Implementation 2009
namespace sd {
#define PIPETTE_RANGE 0
@@ -230,14 +228,12 @@ sal_Bool DrawViewShell::KeyInput (const
else
{
bRet = ViewShell::KeyInput(rKEvt, pWin);
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
if(KEY_TAB == rKEvt.GetKeyCode().GetCode())
{
FreshNavigatrTree();
}
-//-----IAccessibility2 Implementation 2009
}
}
@@ -282,7 +278,6 @@ void DrawViewShell::StartRulerDrag (
mbIsRulerDrag = sal_True;
}
}
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
void DrawViewShell::FreshNavigatrEntry()
@@ -308,7 +303,6 @@ void DrawViewShell::FreshNavigatrTree()
pNavWin->FreshTree( GetDoc() );
}
}
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
|*
|* MouseButtonDown event
@@ -335,11 +329,9 @@ void DrawViewShell::MouseButtonDown(cons
{
ViewShell::MouseButtonDown(rMEvt, pWin);
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
FreshNavigatrTree();
-//-----IAccessibility2 Implementation 2009
if ( mbPipette )
( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )->PipetteClicked();
}
@@ -509,11 +501,9 @@ void DrawViewShell::MouseButtonUp(const
}
else
ViewShell::MouseButtonUp(rMEvt, pWin);
-//IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
FreshNavigatrTree();
-//-----IAccessibility2 Implementation 2009
}
}
Modified: openoffice/branches/l10n40/main/sd/source/ui/view/drviews5.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/view/drviews5.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/view/drviews5.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/view/drviews5.cxx Sun Dec 1 11:40:24 2013
@@ -705,7 +705,6 @@ void DrawViewShell::SetActiveTabLayerInd
// Tell the draw view and the tab control of the new active layer.
mpDrawView->SetActiveLayer (pBar->GetPageText (pBar->GetPageId ((sal_uInt16)nIndex)));
pBar->SetCurPageId (pBar->GetPageId ((sal_uInt16)nIndex));
- //IAccessibility2 Implementation 2009-----
SdUnoDrawView* pUnoDrawView = new SdUnoDrawView (
GetViewShellBase().GetDrawController(),
*this,
@@ -713,7 +712,6 @@ void DrawViewShell::SetActiveTabLayerInd
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> rLayer = pUnoDrawView->getActiveLayer();
GetViewShellBase().GetDrawController().fireChangeLayer( &rLayer );
delete pUnoDrawView;
- //-----IAccessibility2 Implementation 2009
}
}
}
Modified: openoffice/branches/l10n40/main/sd/source/ui/view/outlnvsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/view/outlnvsh.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/view/outlnvsh.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/view/outlnvsh.cxx Sun Dec 1 11:40:24 2013
@@ -235,9 +235,7 @@ OutlineViewShell::OutlineViewShell (
Construct(GetDocSh());
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OutlineText));
-//IAccessibility2 Implementation 2009-----
m_StrOldPageName.EmptyString();
-//-----IAccessibility2 Implementation 2009
}
/*************************************************************************
@@ -1475,14 +1473,12 @@ void OutlineViewShell::GetStatusBarState
aLayoutStr = pPage->GetLayoutName();
aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
- //IAccessibility2 Implementation 2009-----
//Now, CurrentPage property change is already sent for DrawView and OutlineView, so it is not necessary to send again here
if(m_StrOldPageName!=aPageStr)
{
GetViewShellBase().GetDrawController().fireSwitchCurrentPage(nPos);
m_StrOldPageName = aPageStr;
}
- //-----IAccessibility2 Implementation 2009
}
rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr ) );
rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );
Modified: openoffice/branches/l10n40/main/sd/source/ui/view/sdwindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/view/sdwindow.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/view/sdwindow.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/view/sdwindow.cxx Sun Dec 1 11:40:24 2013
@@ -45,9 +45,7 @@
#include "AccessibleDrawDocumentView.hxx"
#include "WindowUpdater.hxx"
-//IAccessibility2 Implementation 2009-----
#include <vcl/svapp.hxx>
-//-----IAccessibility2 Implementation 2009
namespace sd {
@@ -1164,7 +1162,6 @@ void Window::DropScroll(const Point& rMo
::com::sun::star::accessibility::XAccessible>
Window::CreateAccessible (void)
{
-//IAccessibility2 Implementation 2009-----
// If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later.
if (mpViewShell && mpViewShell->ISA(PresentationViewShell))
{
@@ -1176,13 +1173,11 @@ void Window::DropScroll(const Point& rMo
return xAcc;
}
if (mpViewShell != NULL)
- //return mpViewShell->CreateAccessibleDocumentView (this);
{
xAcc = mpViewShell->CreateAccessibleDocumentView (this);
SetAccessible(xAcc);
return xAcc;
}
-//-----IAccessibility2 Implementation 2009
else
{
OSL_TRACE ("::sd::Window::CreateAccessible: no view shell");
@@ -1190,7 +1185,6 @@ void Window::DropScroll(const Point& rMo
}
}
-//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 Window::SwitchView()
@@ -1204,7 +1198,6 @@ void Window::SwitchView()
mpViewShell->SwitchViewFireFocus(GetAccessible(sal_False));
}
}
-//-----IAccessibility2 Implementation 2009
XubString Window::GetSurroundingText() const
{
Modified: openoffice/branches/l10n40/main/sd/source/ui/view/tabcontr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/view/tabcontr.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/view/tabcontr.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/view/tabcontr.cxx Sun Dec 1 11:40:24 2013
@@ -137,12 +137,10 @@ void TabControl::MouseButtonDown(const
Point aPos = PixelToLogic( rMEvt.GetPosPixel() );
sal_uInt16 aPageId = GetPageId(aPos);
-//IAccessibility2 Implementation 2009-----
//Solution: initialize
if(RrePageID!=aPageId)
pDrViewSh->FreshNavigatrEntry();
RrePageID=aPageId;
-//-----IAccessibility2 Implementation 2009
if (aPageId == 0)
{
SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
Modified: openoffice/branches/l10n40/main/sd/source/ui/view/viewshel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/view/viewshel.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/view/viewshel.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/view/viewshel.cxx Sun Dec 1 11:40:24 2013
@@ -95,9 +95,7 @@
#include <editeng/eeitem.hxx>
#include <svl/poolitem.hxx>
#include <glob.hrc>
-//IAccessibility2 Implementation 2009-----
#include "AccessibleDocumentViewBase.hxx"
-//-----IAccessibility2 Implementation 2009
#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
#define SO2_DECL_SVINPLACEOBJECT_DEFINED
SO2_DECL_REF(SvInPlaceObject)
@@ -481,9 +479,7 @@ sal_Bool ViewShell::KeyInput(const KeyEv
bReturn = (sal_Bool)GetViewShell()->KeyInput(rKEvt);
}
-//IAccessibility2 Implementation 2009-----
sal_Int32 OriCount = GetView()->GetMarkedObjectList().GetMarkCount();
-//-----IAccessibility2 Implementation 2009
if(!bReturn)
{
rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) );
@@ -513,14 +509,12 @@ sal_Bool ViewShell::KeyInput(const KeyEv
}
}
}
-//IAccessibility2 Implementation 2009-----
sal_Int32 EndCount = GetView()->GetMarkedObjectList().GetMarkCount();
// Here, oriCount or endCount must have one value=0, another value > 0, then to switch focus between Document and shape objects
if(bReturn && (OriCount + EndCount > 0) && (OriCount * EndCount == 0))
{
SwitchActiveViewFireFocus();
}
-//-----IAccessibility2 Implementation 2009
if(!bReturn && GetActiveWindow())
{
@@ -1637,7 +1631,6 @@ bool ViewShell::RelocateToParentWindow (
return true;
}
-//IAccessibility2 Implementation 2009-----
void ViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc )
{
if (xAcc.get())
@@ -1666,7 +1659,6 @@ void ViewShell::NotifyAccUpdate( )
GetViewShellBase().GetDrawController().NotifyAccUpdate();
}
-//-----IAccessibility2 Implementation 2009
} // end of namespace sd
Modified: openoffice/branches/l10n40/main/sfx2/inc/sfx2/sfx.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/inc/sfx2/sfx.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/inc/sfx2/sfx.hrc (original)
+++ openoffice/branches/l10n40/main/sfx2/inc/sfx2/sfx.hrc Sun Dec 1 11:40:24 2013
@@ -250,9 +250,7 @@
#define STR_ERRUNOEVENTBINDUNG (RID_SFX_START+119)
#define STR_SHARED (RID_SFX_START+120)
#define RID_XMLSEC_DOCUMENTSIGNED (RID_SFX_START+121)
-// IAccessibility2 implementation 2009. ------
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
-// ------ IAccessibility2 implementation 2009.
//=========================================================================
Modified: openoffice/branches/l10n40/main/sfx2/inc/sfx2/sfxuno.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/inc/sfx2/sfxuno.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/inc/sfx2/sfxuno.hxx (original)
+++ openoffice/branches/l10n40/main/sfx2/inc/sfx2/sfxuno.hxx Sun Dec 1 11:40:24 2013
@@ -105,11 +105,6 @@ bool GetEncryptionData_Impl( const SfxIt
#define FrameSearchFlags sal_Int32
-// Macros to convert string -> unicode and unicode -> string.
-// We use UTF8 everytime. Its the best way to do this!
-#define S2U(STRING) ::rtl::OStringToOUString(STRING, RTL_TEXTENCODING_UTF8)
-#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
-
// Macro to define const unicode a'la "..."
// It's better then "OUString::createFromAscii(...)" !!!
#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
Modified: openoffice/branches/l10n40/main/sfx2/source/appl/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/appl/app.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/appl/app.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/appl/app.cxx Sun Dec 1 11:40:24 2013
@@ -553,8 +553,7 @@ short SfxApplication::QuerySave_Impl( Sf
ResMgr* SfxApplication::CreateResManager( const char *pPrefix )
{
- String aMgrName = String::CreateFromAscii( pPrefix );
- return ResMgr::CreateResMgr(U2S(aMgrName));
+ return ResMgr::CreateResMgr( pPrefix);
}
//---------------------------------------------------------------------
Modified: openoffice/branches/l10n40/main/sfx2/source/appl/appdde.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/appl/appdde.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/appl/appdde.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/appl/appdde.cxx Sun Dec 1 11:40:24 2013
@@ -54,14 +54,14 @@
String SfxDdeServiceName_Impl( const String& sIn )
{
- ByteString sTemp = U2S( sIn );
+ ByteString sTemp( sIn, RTL_TEXTENCODING_UTF8 );
ByteString sReturn;
for ( sal_uInt16 n = sTemp.Len(); n; --n )
if ( sTemp.Copy( n-1, 1 ).IsAlphaNumericAscii() )
sReturn += sTemp.GetChar(n-1);
- return S2U( sReturn );
+ return String( sReturn, RTL_TEXTENCODING_UTF8 );
}
@@ -159,7 +159,7 @@ sal_Bool SfxAppEvent_Impl( ApplicationEv
}
aData.EraseAllChars( 0x0022 );
ApplicationAddress aAddr;
- rAppEvent = ApplicationEvent( String(), aAddr, U2S(rEvent), aData );
+ rAppEvent = ApplicationEvent( String(), aAddr, ByteString( rEvent, RTL_TEXTENCODING_UTF8), aData );
return sal_True;
}
}
Modified: openoffice/branches/l10n40/main/sfx2/source/appl/sfxhelp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/appl/sfxhelp.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/appl/sfxhelp.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/appl/sfxhelp.cxx Sun Dec 1 11:40:24 2013
@@ -274,7 +274,7 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl
::rtl::OUString aCodedList;
if ( pValues[nProp] >>= aCodedList )
{
- rtl::OString aTmp( aCodedList, aCodedList.getLength(), RTL_TEXTENCODING_UTF8 );
+ const rtl::OString aTmp( OUStringToOString( aCodedList, RTL_TEXTENCODING_UTF8 ));
sal_Int32 nIndex = 0;
do
{
Modified: openoffice/branches/l10n40/main/sfx2/source/appl/shutdownicon.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/appl/shutdownicon.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/appl/shutdownicon.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/appl/shutdownicon.cxx Sun Dec 1 11:40:24 2013
@@ -904,10 +904,10 @@ void ShutdownIcon::SetAutostart( bool bA
osl_getThreadTextEncoding() );
OString aShortcutUnx = OUStringToOString( aShortcut,
osl_getThreadTextEncoding() );
- if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
+ if ((0 != symlink( aDesktopFileUnx.getStr(), aShortcutUnx.getStr())) && (errno == EEXIST))
{
- unlink(aShortcutUnx);
- symlink(aDesktopFileUnx, aShortcutUnx);
+ unlink( aShortcutUnx.getStr());
+ symlink( aDesktopFileUnx.getStr(), aShortcutUnx.getStr());
}
ShutdownIcon *pIcon = ShutdownIcon::createInstance();
Modified: openoffice/branches/l10n40/main/sfx2/source/appl/shutdowniconunx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/appl/shutdowniconunx.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/appl/shutdowniconunx.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/appl/shutdowniconunx.cxx Sun Dec 1 11:40:24 2013
@@ -176,7 +176,7 @@ static void add_item( GtkMenuShell *pMen
GtkWidget *pImage = gtk_image_new_from_pixbuf( pPixbuf );
g_object_unref( G_OBJECT( pPixbuf ) );
- GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label( aLabel );
+ GtkWidget* pMenuItem = gtk_image_menu_item_new_with_label( aLabel.getStr() );
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage );
g_signal_connect_data( pMenuItem, "activate", pFnCallback, pURL,
oustring_delete, GConnectFlags(0));
@@ -224,11 +224,9 @@ add_image_menu_item( GtkMenuShell *pMenu
{
OString aUtfLabel = rtl::OUStringToOString (aLabel, RTL_TEXTENCODING_UTF8 );
- GtkWidget *pImage;
- pImage = gtk_image_new_from_stock( stock_id, GTK_ICON_SIZE_MENU );
+ GtkWidget* pImage = gtk_image_new_from_stock( stock_id, GTK_ICON_SIZE_MENU );
- GtkWidget *pMenuItem;
- pMenuItem = gtk_image_menu_item_new_with_label( aUtfLabel );
+ GtkWidget* pMenuItem = gtk_image_menu_item_new_with_label( aUtfLabel.getStr() );
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage );
gtk_menu_shell_append( pMenuShell, pMenuItem );
Modified: openoffice/branches/l10n40/main/sfx2/source/bastyp/mieclip.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/bastyp/mieclip.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/bastyp/mieclip.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/bastyp/mieclip.cxx Sun Dec 1 11:40:24 2013
@@ -63,7 +63,7 @@ SvStream* MSE40HTMLClipFormatObj::IsVali
else if( sTmp == "EndHTML" )
nEnd = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
else if( sTmp == "SourceURL" )
- sBaseURL = String(S2U(sLine.Erase( 0, nIndex )));
+ sBaseURL = String( sLine.Erase( 0, nIndex ), RTL_TEXTENCODING_UTF8);
if( nEnd && nStt &&
( sBaseURL.Len() || rStream.Tell() >= nStt ))
Modified: openoffice/branches/l10n40/main/sfx2/source/bastyp/sfxhtml.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/bastyp/sfxhtml.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/bastyp/sfxhtml.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/bastyp/sfxhtml.cxx Sun Dec 1 11:40:24 2013
@@ -325,7 +325,7 @@ sal_Bool SfxHTMLParser::FinishFileDownlo
sal_Char* pBuffer = sBuffer.AllocBuffer(nLen);
aStream.Seek( 0 );
aStream.Read((void*)pBuffer, nLen);
- rStr = String( S2U(pBuffer) );
+ rStr = String( pBuffer, RTL_TEXTENCODING_UTF8);
}
delete pDLMedium;
Modified: openoffice/branches/l10n40/main/sfx2/source/control/macro.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/control/macro.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/control/macro.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/control/macro.cxx Sun Dec 1 11:40:24 2013
@@ -334,7 +334,7 @@ void SfxMacroStatement::GenerateNameAndA
aStatement += '.';
// der Name des Slots ist der Name der Methode / des Properties
- aStatement += String::CreateFromAscii(rSlot.pName);
+ aStatement += String( rtl::OStringToOUString( rSlot.pName, RTL_TEXTENCODING_UTF8));
if ( rSlot.IsMode(SFX_SLOT_METHOD) )
aStatement += DEFINE_CONST_UNICODE("( ");
else
Modified: openoffice/branches/l10n40/main/sfx2/source/control/msg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/control/msg.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/control/msg.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/control/msg.cxx Sun Dec 1 11:40:24 2013
@@ -65,7 +65,6 @@ sal_uInt16 SfxSlot::GetWhich( const SfxI
::rtl::OUString SfxSlot::GetCommandString() const
{
- rtl::OString aCmd(GetCommand());
- return rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 );
+ return rtl::OStringToOUString( GetCommand(), RTL_TEXTENCODING_UTF8);
}
Modified: openoffice/branches/l10n40/main/sfx2/source/control/shell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/control/shell.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/control/shell.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/control/shell.cxx Sun Dec 1 11:40:24 2013
@@ -1115,7 +1115,7 @@ void SfxShell::SetVerbs(const com::sun::
pNewSlot->fnExec = SFX_STUB_PTR(SfxShell,VerbExec);
pNewSlot->fnState = SFX_STUB_PTR(SfxShell,VerbState);
pNewSlot->pType = 0; HACK(SFX_TYPE(SfxVoidItem))
- pNewSlot->pName = U2S(aVerbs[n].VerbName);
+ pNewSlot->pName = OUStringToOString( aVerbs[n].VerbName, RTL_TEXTENCODING_UTF8).getStr(); // TODO: life time of temp is suspicious!!!
pNewSlot->pLinkedSlot = 0;
pNewSlot->nArgDefCount = 0;
pNewSlot->pFirstArgDef = 0;
Modified: openoffice/branches/l10n40/main/sfx2/source/dialog/dinfdlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/dialog/dinfdlg.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/dialog/dinfdlg.hrc (original)
+++ openoffice/branches/l10n40/main/sfx2/source/dialog/dinfdlg.hrc Sun Dec 1 11:40:24 2013
@@ -149,9 +149,7 @@
#define STR_HEADER_VALUE 92
#define STR_HEADER_ACTION 93
-//IAccessibility2 Implementation 2009-----
#define EDIT_FILE_NAME 94
-//-----IAccessibility2 Implementation 2009
#define PB_OK 100
#define PB_CANCEL 101
Modified: openoffice/branches/l10n40/main/sfx2/source/dialog/passwd.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/dialog/passwd.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/dialog/passwd.hrc (original)
+++ openoffice/branches/l10n40/main/sfx2/source/dialog/passwd.hrc Sun Dec 1 11:40:24 2013
@@ -42,9 +42,7 @@
#define FT_PASSWD_CONFIRM2 27
#define ED_PASSWD_CONFIRM2 28
-//IAccessibility2 Implementation 2009-----
#define TEXT_PASSWD 31
-//-----IAccessibility2 Implementation 2009
#endif
// ******************************************************************* EOF
Modified: openoffice/branches/l10n40/main/sfx2/source/dialog/tabdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/dialog/tabdlg.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/dialog/tabdlg.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/dialog/tabdlg.cxx Sun Dec 1 11:40:24 2013
@@ -748,7 +748,6 @@ void SfxTabDialog::Start( sal_Bool bShow
if ( bShow )
Show();
-// IAccessibility2 implementation 2009
if ( IsVisible() && ( !HasChildPathFocus() || HasFocus() ) )
GrabFocusToFirstControl();
}
Modified: openoffice/branches/l10n40/main/sfx2/source/dialog/templdlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/dialog/templdlg.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/dialog/templdlg.hrc (original)
+++ openoffice/branches/l10n40/main/sfx2/source/dialog/templdlg.hrc Sun Dec 1 11:40:24 2013
@@ -44,8 +44,3 @@
#define BT_FLIST 8
#define BT_VLIST 9
#define BT_TOOL 10
-
-//IAccessibility2 Implementation 2009-----
-#define STR_STYLE_ELEMTLIST 18
-//-----IAccessibility2 Implementation 2009
-
Modified: openoffice/branches/l10n40/main/sfx2/source/menu/mnuitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/menu/mnuitem.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/menu/mnuitem.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/menu/mnuitem.cxx Sun Dec 1 11:40:24 2013
@@ -291,10 +291,8 @@ void SfxMenuControl::StateChanged
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxBoolItem not allowed for SID_OBJECTMENUx" );
bCheck = ((const SfxBoolItem*)pState)->GetValue();
- // IAccessibility2 implementation 2009. ------
Menu* pMenu = pOwnMenu->GetSVMenu();
pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE);
- // ------ IAccessibility2 implementation 2009.
}
else if ( pState->ISA(SfxEnumItemInterface) &&
((SfxEnumItemInterface *)pState)->HasBoolValue() )
@@ -303,10 +301,8 @@ void SfxMenuControl::StateChanged
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxEnumItem not allowed for SID_OBJECTMENUx" );
bCheck = ((SfxEnumItemInterface *)pState)->GetBoolValue();
- // IAccessibility2 implementation 2009. ------
Menu* pMenu = pOwnMenu->GetSVMenu();
pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE);
- // ------ IAccessibility2 implementation 2009.
}
else if ( ( b_ShowStrings || bIsObjMenu ) && pState->ISA(SfxStringItem) )
{
Modified: openoffice/branches/l10n40/main/sfx2/source/view/viewfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/view/viewfrm.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/view/viewfrm.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/view/viewfrm.cxx Sun Dec 1 11:40:24 2013
@@ -683,13 +683,11 @@ void SfxViewFrame::ExecReload_Impl( SfxR
if( pSalvageItem )
{
aURL = pSalvageItem->GetValue();
- // IAccessibility2 implementation 2009. ------
if (pNewSet)
{
pNewSet->ClearItem( SID_ORIGURL );
pNewSet->ClearItem( SID_DOC_SALVAGE );
}
- // ------ IAccessibility2 implementation 2009.
}
// TODO/LATER: Temporary solution, the SfxMedium must know the original URL as aLogicName
@@ -3385,7 +3383,6 @@ void SfxViewFrame::ChildWindowExecute( S
sal_Bool bShow = sal_False;
sal_Bool bHasChild = HasChildWindow(nSID);
bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
- // IAccessibility2 implementation 2009. ------
GetDispatcher()->Update_Impl( sal_True );
// ausf"uhren
@@ -3393,9 +3390,6 @@ void SfxViewFrame::ChildWindowExecute( S
ToggleChildWindow( nSID );
GetBindings().Invalidate( nSID );
- // Move to the before show()
- //GetDispatcher()->Update_Impl( sal_True );
- // ------ IAccessibility2 implementation 2009.
// ggf. recorden
if ( nSID == SID_HYPERLINK_DIALOG || nSID == SID_SEARCH_DLG )