aw084: resync to DEV300_m104

35 files changed, 145 insertions, 41 deletions

diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index 0816f2de7255..72ee2777a8f8 100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -1,4 +1,4 @@
-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
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 52b9723bc178..a2abfd199fe9 100755
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1060,6 +1060,9 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
                 {
                     SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) );
                     aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+                    // #i93908# clear suffix for bullet lists
+                    aFrmt.SetPrefix(::rtl::OUString());
+                    aFrmt.SetSuffix(::rtl::OUString());
                     aFrmt.SetStart(1);
                     aFrmt.SetBulletRelSize(45);
                     aFrmt.SetBulletChar( 0x25CF );  // StarBats: 0xF000 + 34
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 0ebc716e863b..53c95050ec8a 100755
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -513,6 +513,9 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
         { MAP_LEN( "BuildId" ), 0,
               &::getCppuType( (OUString *)0 ),
               ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+        { MAP_LEN( "OrganizerMode" ), 0,
+              &::getBooleanCppuType(),
+              ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
         { NULL, 0, 0, NULL, 0, 0 }
     };
 
@@ -630,6 +633,13 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
         }
     }
 
+    if (SDXMLMODE_Organizer == meFilterMode)
+    {
+        ::rtl::OUString const sOrganizerMode(
+            RTL_CONSTASCII_USTRINGPARAM("OrganizerMode"));
+        xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True));
+    }
+
     // -------------------------------------
 
     if( 0 == nRet )
@@ -655,13 +665,14 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
         sal_uInt32 nWarn = 0;
         sal_uInt32 nWarn2 = 0;
         // read storage streams
+        // #i103539#: always read meta.xml for generator
+        nWarn = ReadThroughComponent(
+            xStorage, xModelComp, "meta.xml", "Meta.xml", xServiceFactory,
+            pServices->mpMeta,
+            aEmptyArgs, aName, sal_False );
+
         if( meFilterMode != SDXMLMODE_Organizer )
         {
-            nWarn = ReadThroughComponent(
-                xStorage, xModelComp, "meta.xml", "Meta.xml", xServiceFactory,
-                pServices->mpMeta,
-                aEmptyArgs, aName, sal_False );
-
             nWarn2 = ReadThroughComponent(
                 xStorage, xModelComp, "settings.xml", NULL, xServiceFactory,
                 pServices->mpSettings,
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 4fc88c3a6049..3b6b2e4d5670 100755
--- a/sd/source/ui/app/strings.src
+++ b/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";
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index e5e27928f520..bd3bdb2243c0 100755
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/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 );
 }
 
 // -----------------------------------------------------------------------
diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src
index efbd75ac9003..66bb46a22ed0 100644..100755
--- a/sd/source/ui/dlg/animobjs.src
+++ b/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";
+    };
 };
 
 
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index c32083d71dfe..2152572470dc 100755
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/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 ) ),
diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src
index 5d05b63f6287..275a47b38397 100644..100755
--- a/sd/source/ui/dlg/custsdlg.src
+++ b/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
     {
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 5316d5a87ede..5fd5fd45628d 100755
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/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 ) ),
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 9707ecb2c300..d5c2fa4c8890 100755
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/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);
 }
 // -----------------------------------------------------------------------
 
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 3248504a61ab..6240bb734e92 100755
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/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();
diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src
index 4d4499d3226d..2ae1550ef1df 100644..100755
--- a/sd/source/ui/dlg/navigatr.src
+++ b/sd/source/ui/dlg/navigatr.src
@@ -159,3 +159,8 @@ Window FLT_NAVIGATOR
            NAVIGATR_IDLIST
     };
 };
+
+String STR_OBJECTS_TREE
+{
+    Text [ en-US ] = "Page Tree";
+};
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 1ad9e29d4662..aa44dd340a00 100755
--- a/sd/source/ui/dlg/present.cxx
+++ b/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;
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index c792b1554e5b..a1417180b654 100755
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/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 );
 }
 
 // -----------------------------------------------------------------------
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 6ed87ba105ea..c36ab0687d7f 100755
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/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 ) );
diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src
index a567afebdf5c..79cd333c9300 100644..100755
--- a/sd/source/ui/dlg/tpaction.src
+++ b/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";
 };
 
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 0eb30d78e45f..f1e5b446f796 100755
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/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>
diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src
index f66ba0a9454c..17c648bbcad3 100644..100755
--- a/sd/source/ui/dlg/vectdlg.src
+++ b/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" ;
     };
 };
 
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 902c6f48a9a7..95c2833a2d12 100755..100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -141,8 +141,9 @@ BasicViewFactory::BasicViewFactory (
       mpViewShellContainer(new ViewShellContainer()),
       mpBase(NULL),
       mpFrameView(NULL),
+      mpWindow(new WorkWindow(NULL,WB_STDWORK)),
       mpViewCache(new ViewCache()),
-      mxLocalPane(new Pane(Reference<XResourceId>(), new WorkWindow(NULL,WB_STDWORK)))
+      mxLocalPane(new Pane(Reference<XResourceId>(), mpWindow.get()))
 {
     (void)rxContext;
 }
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 0cdb45ffc7c1..50edcc919899 100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -119,6 +119,7 @@ private:
     FrameView* mpFrameView;
 
     class ViewCache;
+    ::boost::shared_ptr<Window> mpWindow;
     ::boost::shared_ptr<ViewCache> mpViewCache;
 
     css::uno::Reference<css::drawing::framework::XPane> mxLocalPane;
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index e910a8df7496..27d18fec51c1 100755
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -143,6 +143,10 @@ ModuleController::~ModuleController (void) throw()
 
 void SAL_CALL ModuleController::disposing (void)
 {
+    // Break the cyclic reference back to DrawController object
+    mpLoadedFactories.reset();
+    mpResourceToFactoryMap.reset();
+    mxController.clear();
 }
 
 
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index abe45670c100..c4efbbba1612 100755
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -203,11 +203,11 @@ void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const Fo
         {
             // set new font attribute
             SvxFontItem aFontItem( (SvxFontItem&) rSet.Get( EE_CHAR_FONTINFO_CJK ) );
-            aFontItem.GetFamilyName()   = pTargetFont->GetName();
-            aFontItem.GetFamily()       = pTargetFont->GetFamily();
-            aFontItem.GetStyleName()    = pTargetFont->GetStyleName();
-            aFontItem.GetPitch()        = pTargetFont->GetPitch();
-            aFontItem.GetCharSet()      = pTargetFont->GetCharSet();
+            aFontItem.SetFamilyName(   pTargetFont->GetName());
+            aFontItem.SetFamily(       pTargetFont->GetFamily());
+            aFontItem.SetStyleName(    pTargetFont->GetStyleName());
+            aFontItem.SetPitch(        pTargetFont->GetPitch());
+            aFontItem.SetCharSet(      pTargetFont->GetCharSet());
             rSet.Put( aFontItem );
         }
 
diff --git a/sd/source/ui/inc/animobjs.hrc b/sd/source/ui/inc/animobjs.hrc
index 5c5c8e7852cc..1a6d8291ee59 100644..100755
--- a/sd/source/ui/inc/animobjs.hrc
+++ b/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
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 030f0a3eb845..c03a785775e6 100755
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/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;
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index 2732f4f76c38..b726a473b3c5 100644..100755
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/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;
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index b7f87348ad76..dd08fa5c2d56 100644..100755
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/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;
diff --git a/sd/source/ui/inc/navigatr.hrc b/sd/source/ui/inc/navigatr.hrc
index 47812c304890..f12932255fe5 100644..100755
--- a/sd/source/ui/inc/navigatr.hrc
+++ b/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
+
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 7f5086057e5c..97693308ee07 100755
--- a/sd/source/ui/inc/strings.hrc
+++ b/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)
diff --git a/sd/source/ui/inc/tpaction.hrc b/sd/source/ui/inc/tpaction.hrc
index e273b9cb573c..0c4fe8a265d9 100644..100755
--- a/sd/source/ui/inc/tpaction.hrc
+++ b/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
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 991beade0f2f..7134358e80bc 100755
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -498,7 +498,7 @@ void PresenterTextView::Implementation::SetFontDescriptor (
     mpEditEngineItemPool->SetPoolDefaultItem( aFontHeight);
 
     SvxFontItem aSvxFontItem (EE_CHAR_FONTINFO);
-    aSvxFontItem.GetFamilyName() = rFontDescriptor.Name;
+    aSvxFontItem.SetFamilyName( rFontDescriptor.Name );
     mpEditEngineItemPool->SetPoolDefaultItem(aSvxFontItem);
 
     mnTotalHeight = -1;
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 43d5928df349..390ade9c7a7e 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -372,7 +372,12 @@ bool SlideSorterController::Command (
 {
     bool bEventHasBeenHandled = false;
 
+    if (pWindow == NULL)
+        return false;
+
     ViewShell* pViewShell = mrSlideSorter.GetViewShell();
+    if (pViewShell == NULL)
+        return false;
 
     switch (rEvent.GetCommand())
     {
diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
index 48882d0f2f9e..d1c5d2c0ff53 100644..100755
--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
@@ -31,9 +31,9 @@
 #include "TaskPaneFocusManager.hxx"
 
 #include <vcl/window.hxx>
-#include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
+#include <rtl/instance.hxx>
 #include <hash_map>
 
 namespace {
@@ -70,16 +70,23 @@ class FocusManager::LinkMap
 
 
 
-FocusManager* FocusManager::spInstance = NULL;
-
-
 FocusManager& FocusManager::Instance (void)
 {
+    static FocusManager* spInstance = NULL;
+
     if (spInstance == NULL)
     {
-        ::vos::OGuard aGuard (::Application::GetSolarMutex());
+        ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex());
         if (spInstance == NULL)
-            spInstance = new FocusManager ();
+        {
+            static FocusManager aInstance;
+            OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+            spInstance = &aInstance;
+        }
+    }
+    else
+    {
+        OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
     }
     return *spInstance;
 }
diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx
index b9b28154dc5b..0b5199a9a7cc 100644..100755
--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx
+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx
@@ -103,7 +103,6 @@ public:
     bool TransferFocus (::Window* pSource, const KeyCode& rCode);
 
 private:
-    static FocusManager* spInstance;
     class LinkMap;
     ::std::auto_ptr<LinkMap> mpLinks;
 
diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
index 29018cb3a3ca..9b6e45c35194 100755
--- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
@@ -227,7 +227,7 @@ void CurrentMasterPagesSelector::Execute (SfxRequest& rRequest)
             // i.e. is not used.
             SdPage* pMasterPage = GetSelectedMasterPage();
             if (pMasterPage != NULL
-                && mrDocument.GetMasterPageUserCount(pMasterPage) > 0)
+                && mrDocument.GetMasterPageUserCount(pMasterPage) == 0)
             {
                 // Removing the precious flag so that the following call to
                 // RemoveUnnessesaryMasterPages() will remove this master page.
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c10c64a02145..f04c3df51b7f 100755
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2111,7 +2111,12 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
                             {
                                 sal_Int32 nPage = ImplPDFGetBookmarkPage( aIBeg->aBookmark, *mpDoc );
                                 if ( nPage != -1 )
-                                    pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) );
+                                {
+                                    if ( aIBeg->nLinkId != -1 )
+                                        pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) );
+                                    else
+                                        pPDFExtOutDevData->DescribeRegisteredDest( aIBeg->nDestId, aPageRect, nPage, vcl::PDFWriter::FitRectangle );
+                                }
                                 else
                                     pPDFExtOutDevData->SetLinkURL( aIBeg->nLinkId, aIBeg->aBookmark );
                                 aIBeg++;