os150: m101 merged

sd/prj/build.lst

-sd      sd      :    filter l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt NULL
+sd      sd      :    filter L10N:l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt NULL
 sd	sd										usr1	-	all	sd_mkout NULL
 sd	sd\inc									nmake		-	all	sd_inc NULL
 sd	sd\prj									get		-	all	sd_prj NULL

sd/source/ui/app/strings.src

@@ -1234,10 +1234,17 @@ String STR_SET_BACKGROUND_PICTURE
 {
     Text [ en-US ] = "Set Background Picture for Slide ..." ;
 };
+
+String STR_ACC_DIALOG_DESC
+{
+    Text [ en-US ] = "Select a template from which to import page designs." ;
+};
+
 String RID_ANNOTATIONS_START
 {
      Text [ en-US ] = "Comments";
 };
+
 String STR_RESET_LAYOUT
 {
     Text[ en-US ] = "Reset Slide Layout";

sd/source/ui/dlg/animobjs.cxx

@@ -157,21 +157,19 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
         aNumFldBitmap       ( this, SdResId( NUM_FLD_BITMAP ) ),
         aTimeField          ( this, SdResId( TIME_FIELD ) ),
         aLbLoopCount        ( this, SdResId( LB_LOOP_COUNT ) ),
-
+        aGrpBitmap          ( this, SdResId( GRP_BITMAP ) ),
         aBtnGetOneObject    ( this, SdResId( BTN_GET_ONE_OBJECT ) ),
         aBtnGetAllObjects   ( this, SdResId( BTN_GET_ALL_OBJECTS ) ),
         aBtnRemoveBitmap    ( this, SdResId( BTN_REMOVE_BITMAP ) ),
         aBtnRemoveAll       ( this, SdResId( BTN_REMOVE_ALL ) ),
         aFtCount            ( this, SdResId( FT_COUNT ) ),
         aFiCount            ( this, SdResId( FI_COUNT ) ),
-        aGrpBitmap          ( this, SdResId( GRP_BITMAP ) ),
-
+        aGrpAnimation       ( this, SdResId( GRP_ANIMATION_GROUP ) ),
         aRbtGroup           ( this, SdResId( RBT_GROUP ) ),
         aRbtBitmap          ( this, SdResId( RBT_BITMAP ) ),
         aFtAdjustment       ( this, SdResId( FT_ADJUSTMENT ) ),
         aLbAdjustment       ( this, SdResId( LB_ADJUSTMENT ) ),
         aBtnCreateGroup     ( this, SdResId( BTN_CREATE_GROUP ) ),
-        aGrpAnimation       ( this, SdResId( GRP_ANIMATION_GROUP ) ),
 
         pWin                ( pParent ),
         pBitmapEx           ( NULL ),
@@ -181,6 +179,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
 
         pBindings           ( pInBindings )
 {
+    aCtlDisplay.SetAccessibleName(String (SdResId(STR_DISPLAY)));
     FreeResource();
 
     aBtnGetOneObject.SetModeImage( Image( SdResId( IMG_GET1OBJECT_H ) ), BMP_COLOR_HIGHCONTRAST );
@@ -226,6 +225,11 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
 
     // der Animator ist leer; es kann keine Animationsgruppe erstellt werden
     aBtnCreateGroup.Disable();
+
+    aBtnGetOneObject.SetAccessibleRelationMemberOf( &aGrpBitmap );
+    aBtnGetAllObjects.SetAccessibleRelationMemberOf( &aGrpBitmap );
+    aBtnRemoveBitmap.SetAccessibleRelationMemberOf( &aGrpBitmap );
+    aBtnRemoveAll.SetAccessibleRelationMemberOf( &aGrpBitmap );
 }
 
 // -----------------------------------------------------------------------

sd/source/ui/dlg/animobjs.src

@@ -319,6 +319,10 @@ DockingWindow FLT_WIN_ANIMATION
         Size = MAP_APPFONT ( 147 , 8 ) ;
         Text [ en-US ] = "Animation group" ;
     };
+    String STR_DISPLAY
+    {
+        Text [ en-US ] = "Preview";
+    };
 };
 
 

sd/source/ui/dlg/copydlg.cxx

@@ -72,23 +72,23 @@ CopyDlg::CopyDlg(
       maFtCopies           ( this, SdResId( FT_COPIES ) ),
       maNumFldCopies       ( this, SdResId( NUM_FLD_COPIES ) ),
       maBtnSetViewData     ( this, SdResId( BTN_SET_VIEWDATA ) ),
+      maGrpMovement        ( this, SdResId( GRP_MOVEMENT ) ),
       maFtMoveX            ( this, SdResId( FT_MOVE_X ) ),
       maMtrFldMoveX        ( this, SdResId( MTR_FLD_MOVE_X ) ),
       maFtMoveY            ( this, SdResId( FT_MOVE_Y ) ),
       maMtrFldMoveY        ( this, SdResId( MTR_FLD_MOVE_Y ) ),
       maFtAngle            ( this, SdResId( FT_ANGLE ) ),
       maMtrFldAngle        ( this, SdResId( MTR_FLD_ANGLE ) ),
-      maGrpMovement        ( this, SdResId( GRP_MOVEMENT ) ),
+      maGrpEnlargement     ( this, SdResId( GRP_ENLARGEMENT ) ),
       maFtWidth            ( this, SdResId( FT_WIDTH ) ),
       maMtrFldWidth        ( this, SdResId( MTR_FLD_WIDTH ) ),
       maFtHeight           ( this, SdResId( FT_HEIGHT ) ),
       maMtrFldHeight       ( this, SdResId( MTR_FLD_HEIGHT ) ),
-      maGrpEnlargement     ( this, SdResId( GRP_ENLARGEMENT ) ),
+      maGrpColor           ( this, SdResId( GRP_COLOR ) ),
       maFtStartColor       ( this, SdResId( FT_START_COLOR ) ),
       maLbStartColor       ( this, SdResId( LB_START_COLOR ) ),
       maFtEndColor         ( this, SdResId( FT_END_COLOR ) ),
       maLbEndColor         ( this, SdResId( LB_END_COLOR ) ),
-      maGrpColor           ( this, SdResId( GRP_COLOR ) ),
       maBtnOK              ( this, SdResId( BTN_OK ) ),
       maBtnCancel          ( this, SdResId( BTN_CANCEL ) ),
       maBtnHelp            ( this, SdResId( BTN_HELP ) ),

sd/source/ui/dlg/custsdlg.src

@@ -99,6 +99,9 @@ ModalDialog DLG_CUSTOMSHOW
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 102 + DIFF , 86 + DIFF_Y ) ;
         TabStop = TRUE ;
+        //IAccessibility2 Implementation 2009-----
+        QuickHelpText [ en-US ] = "Custom Screen Show" ;
+        //-----IAccessibility2 Implementation 2009
     };
     CheckBox CBX_USE_CUSTOMSHOW
     {

sd/source/ui/dlg/dlgfield.cxx

@@ -61,9 +61,9 @@
 
 SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) :
     ModalDialog ( pWindow, SdResId( DLG_FIELD_MODIFY ) ),
+    aGrpType    ( this, SdResId( GRP_TYPE ) ),
     aRbtFix     ( this, SdResId( RBT_FIX ) ),
     aRbtVar     ( this, SdResId( RBT_VAR ) ),
-    aGrpType    ( this, SdResId( GRP_TYPE ) ),
     maFtLanguage( this, SdResId( FT_LANGUAGE ) ),
     maLbLanguage( this, SdResId( LB_LANGUAGE ) ),
     aFtFormat   ( this, SdResId( FT_FORMAT ) ),

sd/source/ui/dlg/headerfooterdlg.cxx

@@ -544,6 +544,19 @@ HeaderFooterTabPage::HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window*
 
     FillFormatList(SVXDATEFORMAT_A);
 
+    maTBHeader.SetAccessibleRelationMemberOf(&maCBHeader);
+    maRBDateTimeFixed.SetAccessibleRelationMemberOf(&maCBDateTime);
+    maRBDateTimeAutomatic.SetAccessibleRelationMemberOf(&maCBDateTime);
+    maTBDateTimeFixed.SetAccessibleName(maRBDateTimeFixed.GetText());
+    maTBDateTimeFixed.SetAccessibleRelationMemberOf(&maCBDateTime);
+    maTBDateTimeFixed.SetAccessibleRelationLabeledBy(&maRBDateTimeFixed);
+    maCBDateTimeFormat.SetAccessibleRelationMemberOf(&maCBDateTime);
+    maCBDateTimeFormat.SetAccessibleName(maRBDateTimeAutomatic.GetText());
+    maCBDateTimeFormat.SetAccessibleRelationLabeledBy(&maRBDateTimeAutomatic);
+    maCBDateTimeLanguage.SetAccessibleRelationMemberOf(&maCBDateTime);
+    maTBFooter.SetAccessibleRelationMemberOf(&maCBFooter);
+    maCBSlideNumber.SetAccessibleRelationMemberOf(&maFLIncludeOnPage);
+    maCBFooter.SetAccessibleRelationMemberOf(&maFLIncludeOnPage);
 }
 // -----------------------------------------------------------------------
 

sd/source/ui/dlg/navigatr.cxx

@@ -93,6 +93,8 @@ SdNavigatorWin::SdNavigatorWin(
 
     FreeResource();
 
+    maTlbObjects.SetAccessibleName(String(SdResId(STR_OBJECTS_TREE)));
+
     mpNavigatorCtrlItem = new SdNavigatorControllerItem( SID_NAVIGATOR_STATE, this, mpBindings );
     mpPageNameCtrlItem = new SdPageNameControllerItem( SID_NAVIGATOR_PAGENAME, this, mpBindings );
     mpDocList = new List();

sd/source/ui/dlg/navigatr.src

@@ -159,3 +159,8 @@ Window FLT_NAVIGATOR
            NAVIGATR_IDLIST
     };
 };
+
+String STR_OBJECTS_TREE
+{
+    Text [ en-US ] = "Page Tree";
+};

sd/source/ui/dlg/present.cxx

@@ -111,6 +111,12 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
     aTmfPause.SetModifyHdl( LINK( this, SdStartPresentationDlg, ChangePauseHdl ) );
     aTmfPause.SetFormat( TIMEF_SEC );
 
+    aLbDias.SetAccessibleRelationLabeledBy( &aRbtAtDia );
+    aLbDias.SetAccessibleName(aRbtAtDia.GetText());
+    aLbCustomshow.SetAccessibleRelationLabeledBy( &aRbtCustomshow );
+    aTmfPause.SetAccessibleRelationLabeledBy( &aRbtAuto );
+    aTmfPause.SetAccessibleName(aRbtAuto.GetText());
+
     // Listbox mit Seitennamen fuellen
     rPageNames.First();
     for( sal_uInt16 i = 0;

sd/source/ui/dlg/prntopts.cxx

@@ -99,6 +99,9 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) :
 #ifndef QUARTZ
     SetDrawMode();
 #endif
+
+    aCbxFront.SetAccessibleRelationLabeledBy( &aRbtBooklet );
+    aCbxBack.SetAccessibleRelationLabeledBy( &aRbtBooklet );
 }
 
 // -----------------------------------------------------------------------

sd/source/ui/dlg/tpaction.cxx

@@ -144,6 +144,9 @@ SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet& rInAttrs ) :
         mpDoc           ( NULL ),
         bTreeUpdated    ( sal_False )
 {
+    aEdtSound.SetAccessibleName(String(SdResId(STR_PATHNAME)));
+    aBtnSeek.SetAccessibleRelationMemberOf( &aFlSeparator );
+
     FreeResource();
 
     aBtnSearch.SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) );

sd/source/ui/dlg/tpaction.src

@@ -173,7 +173,10 @@ TabPage TP_ANIMATION
         Hide = TRUE ;
         Text [ en-US ] = "~Find" ;
     };
-
+    String STR_PATHNAME
+    {
+       Text [ en-US ] = "Path Name";
+    };
     Text [ en-US ] = "Interaction";
 };
 

sd/source/ui/dlg/vectdlg.cxx

@@ -43,9 +43,6 @@
 #include "vectdlg.hxx"
 #include "vectdlg.hrc"
 #include <tools/config.hxx>
-#ifndef _SV_OCTREE_HXX //autogen
- #include <vcl/octree.hxx>
-#endif
 #include <vcl/bmpacc.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/metaact.hxx>

sd/source/ui/dlg/vectdlg.src

@@ -182,6 +182,7 @@ ModalDialog DLG_VECTORIZE
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6, 98 ) ;
         Size = MAP_APPFONT ( 92, 100 ) ;
+        Text [ en-US ] = "Source picture" ;
     };
 
     FixedText FT_VECTORIZED
@@ -196,6 +197,7 @@ ModalDialog DLG_VECTORIZE
         Border = TRUE ;
         Pos = MAP_APPFONT ( 101, 98 ) ;
         Size = MAP_APPFONT ( 93, 100 ) ;
+        Text [ en-US ] = "Vectorized image" ;
     };
 
     FixedText GRP_PRGS
@@ -211,6 +213,7 @@ ModalDialog DLG_VECTORIZE
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 6, 215 ) ;
         Size = MAP_APPFONT ( 188, 10 ) ;
+        Text [ en-US ] = "Progress" ;
     };
 };
 

sd/source/ui/inc/animobjs.hrc

@@ -47,3 +47,6 @@
 #define LB_ADJUSTMENT 2
 #define LB_LOOP_COUNT 3
 #define GRP_ANIMATION_GROUP 2
+//IAccessibility2 Implementation 2009-----
+#define STR_DISPLAY 1
+//-----IAccessibility2 Implementation 2009

sd/source/ui/inc/animobjs.hxx

@@ -124,21 +124,20 @@ private:
     NumericField    aNumFldBitmap;
     TimeField       aTimeField;
     ListBox         aLbLoopCount;
-
+    FixedLine       aGrpBitmap;
     ImageButton     aBtnGetOneObject;
     ImageButton     aBtnGetAllObjects;
     ImageButton     aBtnRemoveBitmap;
     ImageButton     aBtnRemoveAll;
     FixedText       aFtCount;
     FixedInfo       aFiCount;
-    FixedLine       aGrpBitmap;
+    FixedLine       aGrpAnimation;
 
     RadioButton     aRbtGroup;
     RadioButton     aRbtBitmap;
     FixedText       aFtAdjustment;
     ListBox         aLbAdjustment;
     PushButton      aBtnCreateGroup;
-    FixedLine       aGrpAnimation;
 
     ::Window*       pWin;
     List            aBmpExList;

sd/source/ui/inc/copydlg.hxx

@@ -64,25 +64,25 @@ private:
     NumericField        maNumFldCopies;
     ImageButton         maBtnSetViewData;
 
+    FixedLine           maGrpMovement;
     FixedText           maFtMoveX;
     MetricField         maMtrFldMoveX;
     FixedText           maFtMoveY;
     MetricField         maMtrFldMoveY;
     FixedText           maFtAngle;
     MetricField         maMtrFldAngle;
-    FixedLine           maGrpMovement;
+    FixedLine           maGrpEnlargement;
 
     FixedText           maFtWidth;
     MetricField         maMtrFldWidth;
     FixedText           maFtHeight;
     MetricField         maMtrFldHeight;
-    FixedLine           maGrpEnlargement;
 
+    FixedLine           maGrpColor;
     FixedText           maFtStartColor;
     ColorLB             maLbStartColor;
     FixedText           maFtEndColor;
     ColorLB             maLbEndColor;
-    FixedLine           maGrpColor;
 
     OKButton            maBtnOK;
     CancelButton        maBtnCancel;

sd/source/ui/inc/dlgfield.hxx

@@ -57,9 +57,9 @@ class SvxFieldData;
 class SdModifyFieldDlg : public ModalDialog
 {
 private:
+    FixedLine           aGrpType;
     RadioButton         aRbtFix;
     RadioButton         aRbtVar;
-    FixedLine           aGrpType;
     FixedText           maFtLanguage;
     SvxLanguageBox      maLbLanguage;
     FixedText           aFtFormat;

sd/source/ui/inc/navigatr.hrc

@@ -25,6 +25,9 @@
  *
  ************************************************************************/
 #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
@@ -41,3 +44,7 @@
 
 #define IL_NAVIGATR 333
 #define ILH_NAVIGATR 444
+//IAccessibility2 Implementation 2009-----
+#define STR_DRAGMODE 1
+//-----IAccessibility2 Implementation 2009
+

sd/source/ui/inc/strings.hrc

@@ -500,6 +500,9 @@
 #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)

sd/source/ui/inc/tpaction.hrc

@@ -49,3 +49,6 @@
 #define FT_TREE 5
 #define TP_ANIMATION 787
 #define TP_ANIMATION_ACTION 789
+//IAccessibility2 Implementation 2009-----
+#define STR_PATHNAME 1
+ //-----IAccessibility2 Implementation 2009