Modified: openoffice/branches/alg/aw080/main/sd/source/ui/view/sdwindow.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/view/sdwindow.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sd/source/ui/view/sdwindow.cxx (original) +++ openoffice/branches/alg/aw080/main/sd/source/ui/view/sdwindow.cxx Wed Nov 27 17:25:40 2013 @@ -45,6 +45,10 @@ #include "AccessibleDrawDocumentView.hxx" #include "WindowUpdater.hxx" +//IAccessibility2 Implementation 2009----- +#include <vcl/svapp.hxx> +//-----IAccessibility2 Implementation 2009 + namespace sd { #define SCROLL_LINE_FACT 0.05 // Faktor fuer Zeilenscrolling @@ -1170,8 +1174,25 @@ void Window::DropScroll(const basegfx::B ::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 && dynamic_cast< PresentationViewShell* >(mpViewShell)) + { + return ::Window::CreateAccessible (); + } + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(sal_False); + if (xAcc.get()) + { + return xAcc; + } if (mpViewShell != NULL) - return mpViewShell->CreateAccessibleDocumentView (this); + //return mpViewShell->CreateAccessibleDocumentView (this); + { + xAcc = mpViewShell->CreateAccessibleDocumentView (this); + SetAccessible(xAcc); + return xAcc; + } +//-----IAccessibility2 Implementation 2009 else { OSL_TRACE ("::sd::Window::CreateAccessible: no view shell"); @@ -1179,6 +1200,22 @@ void Window::DropScroll(const basegfx::B } } +//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() +{ + if (!Application::IsAccessibilityEnabled()) + { + return ; + } + if (mpViewShell) + { + mpViewShell->SwitchViewFireFocus(GetAccessible(sal_False)); + } +} +//-----IAccessibility2 Implementation 2009 + XubString Window::GetSurroundingText() const { if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/view/tabcontr.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/view/tabcontr.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sd/source/ui/view/tabcontr.cxx (original) +++ openoffice/branches/alg/aw080/main/sd/source/ui/view/tabcontr.cxx Wed Nov 27 17:25:40 2013 @@ -92,6 +92,7 @@ TabControl::TabControl(DrawViewShell* pV TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE | WB_DRAG) ), DragSourceHelper( this ), DropTargetHelper( this ), + RrePageID(1), pDrViewSh(pViewSh), bInternalMove(false) { @@ -136,6 +137,12 @@ 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/alg/aw080/main/sd/source/ui/view/viewshel.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/view/viewshel.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sd/source/ui/view/viewshel.cxx (original) +++ openoffice/branches/alg/aw080/main/sd/source/ui/view/viewshel.cxx Wed Nov 27 17:25:40 2013 @@ -95,7 +95,9 @@ #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) @@ -470,6 +472,9 @@ bool ViewShell::KeyInput(const KeyEvent& bReturn = GetViewShell()->KeyInput(rKEvt); } +//IAccessibility2 Implementation 2009----- + const sal_uInt32 OriCount(GetView()->getSelectedSdrObjectCount()); +//-----IAccessibility2 Implementation 2009 if(!bReturn) { rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) ); @@ -499,6 +504,14 @@ bool ViewShell::KeyInput(const KeyEvent& } } } +//IAccessibility2 Implementation 2009----- + const sal_uInt32 EndCount(GetView()->getSelectedSdrObjectCount()); + // 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()) { @@ -1604,7 +1617,36 @@ 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()) + { + ::accessibility::AccessibleDocumentViewBase* pBase = static_cast< ::accessibility::AccessibleDocumentViewBase* >(xAcc.get()); + if (pBase) + { + pBase->SwitchViewActivated(); + } + } +} +void ViewShell::SwitchActiveViewFireFocus() +{ + if (mpContentWindow) + { + SwitchViewFireFocus(mpContentWindow->GetAccessible(sal_False)); + } +} +// move these two methods from DrawViewShell. +void ViewShell::fireSwitchCurrentPage(sal_Int32 pageIndex) +{ + GetViewShellBase().GetDrawController().fireSwitchCurrentPage(pageIndex); +} +void ViewShell::NotifyAccUpdate( ) +{ + GetViewShellBase().GetDrawController().NotifyAccUpdate(); +} +//-----IAccessibility2 Implementation 2009 } // end of namespace sd Modified: openoffice/branches/alg/aw080/main/set_soenv.in URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/set_soenv.in?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/set_soenv.in (original) +++ openoffice/branches/alg/aw080/main/set_soenv.in Wed Nov 27 17:25:40 2013 @@ -94,8 +94,7 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNA my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC, - $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB, - $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH ); + $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $PERL_PATH ); # Environment variables. my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, @@ -109,7 +108,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, $USE_DIRECTX5, $ATL_LIB, $ATL_LIB_X64, $HAVE_ATLTHUNK, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, - $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLABUILD, + $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLABUILD, $PROEXT, $TARFILE_LOCATION, $ENABLE_HUNSPELL, $ENABLE_HYPHEN, $SYSTEM_PYTHON, $EPM_FLAGS); @@ -145,10 +144,8 @@ $I = " -I"; # in $L = " -L"; # library search path $D = " -D"; # define search path $empty = ""; # used as argument -$no_stl = "NO_STLPORT4"; # possible argument $warnfile = "warn"; # logfile configure warnings. $Warning = ""; # container for warning messages -$STLPORT4 = '@STLPORT4@'; # Location of STLport4 $SYSTEM_PYTHON = '@SYSTEM_PYTHON@'; $JDK = '@JDK@'; $JAVAFLAGS = '@JAVAFLAGS@'; @@ -857,11 +854,6 @@ else $OOO_SHELL = '@SHELLPATH@'."\/bash"; } -if ( '@STLPORT4@' eq $no_stl ) -{ - $STLPORT4 = "$no_stl"; -} - # ml.exe assembler path for Windows users. if ($platform =~ m/cygwin/) { $ASM_PATH = PathFormat('@ASM_HOME@'); @@ -909,19 +901,6 @@ if ($GUI eq "OS2") $outfile_bat =~ s/set$/cmd/i; } -if ($STLPORT4 ne $no_stl) { - $ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64; - $L_STLPORT_LIB = $L.'$STLPORT4'.$LIB64; - $STLPORT_stlport = $I.'$STLPORT4'.$ds.'stlport'; - $STLPORT_inc_stlport = $I.'$STLPORT4'.$ds.'include'.$ds.'stlport'; -} else { - $ps_STLPORT_LIB = ""; - $L_STLPORT_LIB = ""; - $STLPORT_stlport = $I.$SRC_ROOT.$SOLVER.$ds.$UPD.$ds.$INPATH.$INC.$ds."stl"; - $STLPORT_inc_stlport = ""; -} - - # Windows NT only variables if ($platform =~ m/cygwin/) { @@ -1061,10 +1040,6 @@ if ($platform =~ m/cygwin|os2/) $ILIB = $cur_dir; - if ($STLPORT4 ne $no_stl) { - $ILIB .= $wps.$STLPORT4.$LIB64; - } - # Mingw is different if ( $COM eq "MSC" ) { $ILIB .= $wps.$SOLARVER.$ds.$INPATH.$LIB. @@ -1219,7 +1194,6 @@ elsif ($platform =~ m/cygwin/) if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) { $PATH .= $ps.$tmppath; } - $PATH .= $ps_STLPORT_LIB; # nsis path for Windows users. $NSIS_PATH = PathFormat('@NSIS_PATH@'); $tmppath = CygFormat($NSIS_PATH); @@ -1334,7 +1308,6 @@ if ($platform =~ m/solaris/) $L.$JRELIBDIR. $L.$JRETOOLKITDIR. $L.$JRETHREADDIR. - $L_STLPORT_LIB. $L.$XLIB; } elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/) @@ -1346,18 +1319,15 @@ elsif ($platform =~ m/linux|netbasd|osf1 $L.$JRELIBDIR. $L.$JRETOOLKITDIR. $L.$JRETHREADDIR. - $L_STLPORT_LIB. $L.$XLIB; } elsif ($platform =~ m/cygwin|os2/) { $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. - $L_STLPORT_LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB; } elsif ($platform =~ m/darwin/) { $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. - $L_STLPORT_LIB. $L.$USR_LIB; # [ed] 6/15/02 Add in X11 libraries onto the library path if ($GUIBASE eq "unx") { @@ -1378,11 +1348,9 @@ $SOLARINC = $I.$cur_dir. if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/) { -$SOLARINC .= $STLPORT_stlport; if ($platform =~ m/linux|freebsd|netbsd/) { # This simply adds an include path, so even cases that break the FHS work -$SOLARINC .= $STLPORT_inc_stlport; } if ($platform =~ m/solaris/ && ! $CC =~ "gcc") { @@ -1396,7 +1364,6 @@ if ($platform =~ m/solaris/) if ($platform =~ m/linux/) { # This simply adds an include path, so even cases that break the FHS work - $SOLARINC .= $STLPORT_inc_stlport; } @@ -1436,8 +1403,7 @@ if ($platform =~ m/linux/) } } elsif ($platform =~ m/cygwin/) -{ $SOLARINC .= $STLPORT_stlport. - $I.'$JAVA_HOME'.$ds."include".$ds."win32". +{ $SOLARINC .= $I.'$JAVA_HOME'.$ds."include".$ds."win32". $I.'$JAVA_HOME'.$ds."include"; # Mingw is different if ( $COM eq "MSC" ) @@ -1477,14 +1443,8 @@ elsif ($platform =~ m/cygwin/) } } elsif ($platform =~ m/darwin/) -{ $SOLARINC .= $STLPORT_stlport. - $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers". - $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers"; - # [ed] 6/15/02 Add in X11 headers as appropriate for the build - if ($GUIBASE eq "unx") { - $SOLARINC .= $I.$XINC. - $I.$XINC.$ds."freetype2"; - } +{ + $SOLARINC .= " " . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers"; } else { AddWarning( "set_soenv", "$platform not configured for system dependant include dir" ); @@ -1550,8 +1510,6 @@ ToFile( "ANT_HOME", PathFormat( ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" ); ToFile( "ANT", PathFormat("@ANT@"), "e" ); ToFile( "JDKLIB", $JAVA_LIB, "e" ); -ToFile( "STLPORT4", $STLPORT4, "e" ); -ToFile( "STLPORT_VER", "@STLPORT_VER@", "e" ); ToFile( "ASM_PATH", $ASM_PATH, "e" ); ToFile( "BUILD_SOSL", $BUILD_SOSL, "e" ); ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" ); @@ -1716,7 +1674,7 @@ if ( $platform =~ m/darwin/ ) { # MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build, # build can assume functions/libraries of that version to be available -# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk +# unless you want to do runtime checks for 10.5 api, you also want to use the 10.7 sdk # (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro) # http://developer.apple.com/technotes/tn2002/tn2064.html ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.4", "e" ); Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/languagepacks/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/languagepacks/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/languagepacks/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/languagepacks/makefile.mk Wed Nov 27 17:25:40 2013 @@ -35,10 +35,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - #Disable precompiled header CDEFS+=-Dnot_used_define_to_disable_pch @@ -61,10 +57,6 @@ STDSHL+= \ $(MSILIB) \ $(SHELL32LIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL+=$(LIBSTLPORTST) -.ENDIF - SHL1OBJS = $(SLOFILES) \ $(SLO)$/seterror.obj Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/patch/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/patch/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/patch/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/patch/makefile.mk Wed Nov 27 17:25:40 2013 @@ -34,10 +34,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - #Disable precompiled header CDEFS+=-Dnot_used_define_to_disable_pch @@ -59,10 +55,6 @@ STDSHL += \ $(MSILIB)\ $(SHELL32LIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL += $(LIBSTLPORTST) -.ENDIF - .IF "$(COM)"=="GCC" STDSHL+= \ $(KERNEL32LIB)\ Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/quickstarter/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/quickstarter/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/quickstarter/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/quickstarter/makefile.mk Wed Nov 27 17:25:40 2013 @@ -37,10 +37,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - UWINAPILIB= # --- Files -------------------------------------------------------- @@ -56,10 +52,6 @@ STDSHL += \ $(SHELL32LIB)\ $(MSILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL += $(LIBSTLPORTST) -.ENDIF - .IF "$(COM)"=="GCC" STDSHL+= \ $(KERNEL32LIB)\ Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/rebase/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/rebase/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/rebase/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/rebase/makefile.mk Wed Nov 27 17:25:40 2013 @@ -36,10 +36,6 @@ MINGW_NODLL=YES .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - UWINAPILIB= # --- Files -------------------------------------------------------- @@ -55,10 +51,6 @@ STDSHL += \ $(SHELL32LIB)\ $(MSILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL += $(LIBSTLPORTST) -.ENDIF - .IF "$(COM)"=="GCC" STDSHL+= \ $(KERNEL32LIB)\ Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk Wed Nov 27 17:25:40 2013 @@ -35,9 +35,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk CFLAGS+=-DUNICODE -D_UNICODE -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF # --- Files -------------------------------------------------------- @@ -58,10 +55,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\ $(MSILIB)\ $(SHLWAPILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -SHL1STDLIBS+=$(LIBSTLPORTST) -.ENDIF - SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1TARGET = $(TARGET) Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg4msdoc/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg4msdoc/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg4msdoc/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg4msdoc/makefile.mk Wed Nov 27 17:25:40 2013 @@ -36,9 +36,6 @@ MINGW_NODLL=YES .INCLUDE : settings.mk CFLAGS+=-DUNICODE -D_UNICODE -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF # --- Files -------------------------------------------------------- @@ -67,10 +64,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\ $(MSILIB)\ $(SHLWAPILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -SHL1STDLIBS+=$(LIBSTLPORTST) -.ENDIF - SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1TARGET = $(TARGET) Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg64/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg64/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg64/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/reg64/makefile.mk Wed Nov 27 17:25:40 2013 @@ -35,10 +35,6 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - #Disable precompiled header CDEFS+=-Dnot_used_define_to_disable_pch Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/regactivex/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/regactivex/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/regactivex/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/regactivex/makefile.mk Wed Nov 27 17:25:40 2013 @@ -38,11 +38,6 @@ USE_DEFFILE=TRUE .IF "$(GUI)"=="WNT" -.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = "" -CDEFS+=-D_DEBUG -.ENDIF - - UWINAPILIB= SLOFILES = $(SLO)$/regactivex.obj Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/relnotes/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/relnotes/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/relnotes/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/relnotes/makefile.mk Wed Nov 27 17:25:40 2013 @@ -36,9 +36,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk CDEFS+=-DUNICODE -.IF "$(USE_SYSTEM_STL)" != "YES" -CDEFS+=-D_STLP_USE_STATIC_LIB -.ENDIF UWINAPILIB= @@ -57,10 +54,6 @@ STDSHL+= \ $(SHELL32LIB)\ $(MSILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL+=$(LIBSTLPORTST) -.ENDIF - SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1TARGET = $(TARGET) Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/shellextensions/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/shellextensions/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/shellextensions/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/shellextensions/makefile.mk Wed Nov 27 17:25:40 2013 @@ -34,10 +34,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - #Disable precompiled header CDEFS+=-Dnot_used_define_to_disable_pch @@ -75,10 +71,6 @@ STDSHL += \ $(MSILIB)\ $(SHELL32LIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL += $(LIBSTLPORTST) -.ENDIF - .IF "$(COM)"=="GCC" STDSHL+= \ $(KERNEL32LIB)\ Modified: openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/tools/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/tools/makefile.mk?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/tools/makefile.mk (original) +++ openoffice/branches/alg/aw080/main/setup_native/source/win32/customactions/tools/makefile.mk Wed Nov 27 17:25:40 2013 @@ -35,10 +35,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - # --- Files -------------------------------------------------------- .IF "$(GUI)"=="WNT" @@ -58,10 +54,6 @@ STDSHL+= \ $(ADVAPI32LIB)\ $(MSILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL+=$(LIBSTLPORTST) -.ENDIF - #SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1TARGET = $(TARGET) Modified: openoffice/branches/alg/aw080/main/sfx2/inc/sfx2/dinfdlg.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sfx2/inc/sfx2/dinfdlg.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sfx2/inc/sfx2/dinfdlg.hxx (original) +++ openoffice/branches/alg/aw080/main/sfx2/inc/sfx2/dinfdlg.hxx Wed Nov 27 17:25:40 2013 @@ -548,7 +548,7 @@ class SfxCustomPropertiesPage : public S private: CustomPropertiesControl m_aPropertiesCtrl; PushButton m_aAddBtn; - FixedText m_aPropertiesFT; // Sym2_5121----, Moved by Steve Yin + FixedText m_aPropertiesFT; DECL_LINK( AddHdl, PushButton* ); Modified: openoffice/branches/alg/aw080/main/sfx2/source/dialog/newstyle.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sfx2/source/dialog/newstyle.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sfx2/source/dialog/newstyle.cxx (original) +++ openoffice/branches/alg/aw080/main/sfx2/source/dialog/newstyle.cxx Wed Nov 27 17:25:40 2013 @@ -87,7 +87,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( Window* aOKBtn.SetClickHdl(LINK(this, SfxNewStyleDlg, OKHdl)); aColBox.SetModifyHdl(LINK(this, SfxNewStyleDlg, ModifyHdl)); aColBox.SetDoubleClickHdl(LINK(this, SfxNewStyleDlg, OKHdl)); - // aColBox.SetAccessibleName(SfxResId(FL_COL)); + aColBox.SetAccessibleName(SfxResId(FL_COL)); SfxStyleSheetBase *pStyle = rPool.First(); while ( pStyle ) Modified: openoffice/branches/alg/aw080/main/sfx2/source/dialog/tabdlg.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sfx2/source/dialog/tabdlg.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sfx2/source/dialog/tabdlg.cxx (original) +++ openoffice/branches/alg/aw080/main/sfx2/source/dialog/tabdlg.cxx Wed Nov 27 17:25:40 2013 @@ -745,6 +745,10 @@ void SfxTabDialog::Start( sal_Bool bShow if ( bShow ) Show(); + +// IAccessibility2 implementation 2009 + if ( IsVisible() && ( !HasChildPathFocus() || HasFocus() ) ) + GrabFocusToFirstControl(); } // ----------------------------------------------------------------------- Modified: openoffice/branches/alg/aw080/main/sfx2/source/dialog/templdlg.hrc URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sfx2/source/dialog/templdlg.hrc?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sfx2/source/dialog/templdlg.hrc (original) +++ openoffice/branches/alg/aw080/main/sfx2/source/dialog/templdlg.hrc Wed Nov 27 17:25:40 2013 @@ -44,3 +44,8 @@ #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/alg/aw080/main/sfx2/source/menu/mnuitem.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sfx2/source/menu/mnuitem.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sfx2/source/menu/mnuitem.cxx (original) +++ openoffice/branches/alg/aw080/main/sfx2/source/menu/mnuitem.cxx Wed Nov 27 17:25:40 2013 @@ -291,6 +291,10 @@ 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 ( dynamic_cast< const SfxEnumItemInterface* >(pState) && ((SfxEnumItemInterface *)pState)->HasBoolValue() ) @@ -299,6 +303,10 @@ 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 ) && dynamic_cast< const SfxStringItem* >(pState) ) { Modified: openoffice/branches/alg/aw080/main/sfx2/source/view/viewfrm.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sfx2/source/view/viewfrm.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/sfx2/source/view/viewfrm.cxx (original) +++ openoffice/branches/alg/aw080/main/sfx2/source/view/viewfrm.cxx Wed Nov 27 17:25:40 2013 @@ -676,7 +676,13 @@ void SfxViewFrame::ExecReload_Impl( SfxR if( pSalvageItem ) { aURL = pSalvageItem->GetValue(); - pNewSet->ClearItem( SID_DOC_SALVAGE ); + // 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 @@ -3373,13 +3379,17 @@ 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 if ( !pShowItem || bShow != bHasChild ) ToggleChildWindow( nSID ); GetBindings().Invalidate( nSID ); - GetDispatcher()->Update_Impl( sal_True ); + // Move to the before show() + //GetDispatcher()->Update_Impl( sal_True ); + // ------ IAccessibility2 implementation 2009. // ggf. recorden if ( nSID == SID_HYPERLINK_DIALOG || nSID == SID_SEARCH_DLG ) Modified: openoffice/branches/alg/aw080/main/slideshow/source/engine/animationfactory.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/slideshow/source/engine/animationfactory.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/slideshow/source/engine/animationfactory.cxx (original) +++ openoffice/branches/alg/aw080/main/slideshow/source/engine/animationfactory.cxx Wed Nov 27 17:25:40 2013 @@ -611,8 +611,8 @@ namespace slideshow pGetValue, pSetValue, // no modification necessary, use identity functor here - ::std::identity< typename AnimationBase::ValueType >(), - ::std::identity< typename AnimationBase::ValueType >() ) ); + std::identity< typename AnimationBase::ValueType >(), + std::identity< typename AnimationBase::ValueType >())); } class Scaler Modified: openoffice/branches/alg/aw080/main/soldep/source/soldep.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/soldep/source/soldep.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff ============================================================================== --- openoffice/branches/alg/aw080/main/soldep/source/soldep.cxx (original) +++ openoffice/branches/alg/aw080/main/soldep/source/soldep.cxx Wed Nov 27 17:25:40 2013 @@ -981,7 +981,7 @@ sal_Bool SolDep::MarkObjects( ObjectWin* void SolDep::Resize() { -//funzt! muß aber von der applikation aufgerufen werden. +//funzt! mu?aber von der applikation aufgerufen werden. Point aOutPos = Point( 0, 0 ); Size aOutSize = mpProcessWin->GetOutputSizePixel(); // calculate output size @@ -993,7 +993,7 @@ void SolDep::Resize() Point aGraphWinPos = Point(0,0); Size aGraphWinSize = Size(0,0); -//weiß nicht wie: nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Höhe des Menues +//wei?nicht wie: nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Höhe des Menues //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize ); // Set Docking-Rectangle for ToolBar @@ -1716,7 +1716,7 @@ sal_uInt16 SolDep::OptimizePos(SolIdMapp sal_uIntPtr nNewXSize = ( DEPPER_MAX_WIDTH + 1 ) * ( OBJWIN_X_SPACING + GetDefSize().Width() ); - // sal_uIntPtr aObjID = GetStart(pIdMapper, pObjLst) //hier muß man switchen GetStart/GetPrjStart oder so + // sal_uIntPtr aObjID = GetStart(pIdMapper, pObjLst) //hier mu?man switchen GetStart/GetPrjStart oder so ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID); @@ -1765,7 +1765,7 @@ sal_uInt16 SolDep::OptimizePos(SolIdMapp aWorkList.Clear(); GetDepWin()->EnablePaint( sal_True ); GetDepWin()->Invalidate(); -//LevelListen loeschen Hä? Welche Levellisten? +//LevelListen loeschen H? Welche Levellisten? //Update all Connectors // --> To be done: Don't call twice Object1-Connector-Object2
