From c21a1d8c48e057ce95cfffed85306471724e73d1 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Wed, 14 Jul 2010 13:35:16 +0200 Subject: impress195: #i101808# Allow unused master pages to be deleted in master pages control. --- sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx (limited to 'sd') diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx old mode 100644 new mode 100755 index 7f4149d7e6fd..a82262307f41 --- 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. -- cgit From a800b0d9fdf41cf11f8dbd91ff04321190bf289d Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Wed, 14 Jul 2010 13:48:47 +0200 Subject: impress195: #i102142# Stop leaking windows. --- sd/source/ui/framework/factories/BasicViewFactory.cxx | 3 ++- sd/source/ui/framework/factories/BasicViewFactory.hxx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 1320df5c827b..44f92622a38d 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -142,7 +142,8 @@ BasicViewFactory::BasicViewFactory ( mpBase(NULL), mpFrameView(NULL), mpViewCache(new ViewCache()), - mxLocalPane(new Pane(Reference(), new WorkWindow(NULL,WB_STDWORK))) + mpWindow(new WorkWindow(NULL,WB_STDWORK)), + mxLocalPane(new Pane(Reference(), mpWindow.get())) { (void)rxContext; } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index e5bb43551a24..74bb04de36e3 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 mpWindow; ::boost::shared_ptr mpViewCache; css::uno::Reference mxLocalPane; -- cgit From cff2fd00939de5cf59ea6b6039b33ff3daf6bfd0 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Wed, 14 Jul 2010 14:03:14 +0200 Subject: impress195: #i112510# Stop leaking task pane FocusManager singleton. --- sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 19 +++++++++++++------ sd/source/ui/toolpanel/TaskPaneFocusManager.hxx | 1 - 2 files changed, 13 insertions(+), 7 deletions(-) mode change 100644 => 100755 sd/source/ui/toolpanel/TaskPaneFocusManager.cxx mode change 100644 => 100755 sd/source/ui/toolpanel/TaskPaneFocusManager.hxx (limited to 'sd') diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx old mode 100644 new mode 100755 index 48882d0f2f9e..d1c5d2c0ff53 --- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx @@ -31,9 +31,9 @@ #include "TaskPaneFocusManager.hxx" #include -#include #include #include +#include #include 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 old mode 100644 new mode 100755 index b9b28154dc5b..0b5199a9a7cc --- 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 mpLinks; -- cgit From c8125819e1b831f36203d8545b49df9041cc106c Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Mon, 9 Aug 2010 15:34:32 +0200 Subject: impress195: #i113720# Break cyclic dependency between DrawController and ModuleController. --- sd/source/ui/framework/module/ModuleController.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sd') 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(); } -- cgit From 0eee4cff9975faf99d72056f6aeab2bae87016b7 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Fri, 15 Oct 2010 14:15:00 +0200 Subject: impress195: #158718# Added some checks to validate pointers. --- .../slidesorter/controller/SlideSorterController.cxx | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 69c2a02ddc24..c779e785c32e 100755 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -351,7 +351,12 @@ bool SlideSorterController::Command ( { bool bEventHasBeenHandled = false; + if (pWindow == NULL) + return false; + ViewShell* pViewShell = mrSlideSorter.GetViewShell(); + if (pViewShell == NULL) + return false; switch (rEvent.GetCommand()) { @@ -409,12 +414,9 @@ bool SlideSorterController::Command ( if (rEvent.IsMouseEvent()) { mbIsContextMenuOpen = true; - if (pViewShell != NULL) - { - SfxDispatcher* pDispatcher = pViewShell->GetDispatcher(); - if (pDispatcher != NULL) - pDispatcher->ExecutePopup(SdResId(nPopupId)); - } + SfxDispatcher* pDispatcher = pViewShell->GetDispatcher(); + if (pDispatcher != NULL) + pDispatcher->ExecutePopup(SdResId(nPopupId)); } else { @@ -432,8 +434,9 @@ bool SlideSorterController::Command ( view::SlideSorterView::BBT_SHAPE)); Point aPosition (aBBox.Center()); mbIsContextMenuOpen = true; - if (pViewShell != NULL) - pViewShell->GetViewFrame()->GetDispatcher()->ExecutePopup( + SfxDispatcher* pDispatcher = pViewShell->GetViewFrame()->GetDispatcher(); + if (pDispatcher != NULL) + pDispatcher->ExecutePopup( SdResId(nPopupId), pWindow, &aPosition); -- cgit From 310424305e9fc3ff81b9c9c789dff5df3717e53e Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 1 Dec 2010 09:57:05 +0100 Subject: dba34b: #i113555# when a button's URL points to a document-local target, properly export this to PDF --- sd/source/ui/unoidl/unomodel.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e11f76a64baa..722f83f09fe9 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++; -- cgit From a9e0f5a1220582e0dac2f6505be70d465f01d055 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 3 Dec 2010 14:27:32 +0100 Subject: dba34c: #i115901#: dispose the local pane's window (after clearing the cache, which will dispose the windows currently anchored to the pane) --- sd/source/ui/framework/factories/BasicViewFactory.cxx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'sd') diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 2dd7689f2b39..b7e5d72b9e6c 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -50,6 +50,7 @@ #include #include #include +#include #include @@ -152,6 +153,20 @@ BasicViewFactory::BasicViewFactory ( BasicViewFactory::~BasicViewFactory (void) { + mpViewCache.reset(); + + Reference< awt::XWindow > xLocalPaneWindow( mxLocalPane->getWindow() ); + try + { + const Reference< XComponent > xLocalPaneComponent( mxLocalPane, UNO_QUERY_THROW ); + xLocalPaneComponent->dispose(); + const Reference< XComponent > xWindowComponent( xLocalPaneWindow, UNO_QUERY_THROW ); + xWindowComponent->dispose(); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } } -- cgit From 9314c9fd9891db08d9588d8ac7e475ea1e2fee5f Mon Sep 17 00:00:00 2001 From: "Herbert Duerr [hdu]" Date: Wed, 8 Dec 2010 14:54:55 +0100 Subject: vcl118: Octree and InverseColorMap are vcl-internal only --- sd/source/ui/dlg/vectdlg.cxx | 3 --- 1 file changed, 3 deletions(-) mode change 100644 => 100755 sd/source/ui/dlg/vectdlg.cxx (limited to 'sd') diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx old mode 100644 new mode 100755 index 7cd0be451c4b..88316c0f03fc --- 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 -#ifndef _SV_OCTREE_HXX //autogen - #include -#endif #include #include #include -- cgit From b3a10141801bd0f2d2b3d5aa04ffe61d43dce46f Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 17 Dec 2010 11:00:57 +0100 Subject: sw34bf03: #i93908#: ODF: fix bogus style:num-suffix on bullet lists: Svx{Bullet,Num}PickTabPage, SwAutoFormat, SwWrtShell::NumOrBulletOn(): clear suffix when bullet lists are created. xmlnumi.cxx: ignore style:num-suffix written by defective OOo versions. --- sd/source/core/stlpool.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sd') diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 205e007d9e97..9dbc353fe60b 100755 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1063,6 +1063,9 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, { SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) ); aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); + // #i93908# clear suffix for bullet lists + aFmt.SetPrefix(::rtl::OUString()); + aFmt.SetSuffix(::rtl::OUString()); aFrmt.SetStart(1); aFrmt.SetBulletRelSize(45); aFrmt.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34 -- cgit From a3f24d231e8f54d4af456f4781e444738f197631 Mon Sep 17 00:00:00 2001 From: "Malte Timmermann [mt]" Date: Thu, 20 Jan 2011 17:18:35 +0100 Subject: accfixes: added more accessibility information and fixed tab orders in multiple dialogs (sd module) --- sd/source/ui/app/strings.src | 7 +++++++ sd/source/ui/dlg/animobjs.cxx | 12 ++++++++---- sd/source/ui/dlg/animobjs.src | 4 ++++ sd/source/ui/dlg/copydlg.cxx | 6 +++--- sd/source/ui/dlg/custsdlg.src | 3 +++ sd/source/ui/dlg/dlgfield.cxx | 2 +- sd/source/ui/dlg/headerfooterdlg.cxx | 13 +++++++++++++ sd/source/ui/dlg/navigatr.cxx | 2 ++ sd/source/ui/dlg/navigatr.src | 5 +++++ sd/source/ui/dlg/present.cxx | 6 ++++++ sd/source/ui/dlg/prntopts.cxx | 3 +++ sd/source/ui/dlg/tpaction.cxx | 3 +++ sd/source/ui/dlg/tpaction.src | 5 ++++- sd/source/ui/dlg/vectdlg.src | 3 +++ sd/source/ui/inc/animobjs.hrc | 3 +++ sd/source/ui/inc/animobjs.hxx | 5 ++--- sd/source/ui/inc/copydlg.hxx | 6 +++--- sd/source/ui/inc/dlgfield.hxx | 2 +- sd/source/ui/inc/navigatr.hrc | 7 +++++++ sd/source/ui/inc/strings.hrc | 3 +++ sd/source/ui/inc/tpaction.hrc | 3 +++ 21 files changed, 87 insertions(+), 16 deletions(-) mode change 100644 => 100755 sd/source/ui/dlg/copydlg.cxx mode change 100644 => 100755 sd/source/ui/dlg/dlgfield.cxx mode change 100644 => 100755 sd/source/ui/dlg/navigatr.src mode change 100644 => 100755 sd/source/ui/dlg/present.cxx mode change 100644 => 100755 sd/source/ui/inc/animobjs.hrc mode change 100644 => 100755 sd/source/ui/inc/copydlg.hxx mode change 100644 => 100755 sd/source/ui/inc/dlgfield.hxx mode change 100644 => 100755 sd/source/ui/inc/navigatr.hrc mode change 100644 => 100755 sd/source/ui/inc/tpaction.hrc (limited to 'sd') diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 7e87b246d371..8e2606a7c7ec 100644 --- 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 e179a0ba9f86..fba26c0bb768 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 --- 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 old mode 100644 new mode 100755 index 6b3c04346f31..0d3cf95d7963 --- 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 --- 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 old mode 100644 new mode 100755 index 6778f073aaa9..a66f62d4d6a1 --- 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 b48a1682bba6..3e4caae6bbad 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 488737fa6b56..29a44273225c 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 old mode 100644 new mode 100755 index 4d4499d3226d..2ae1550ef1df --- 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 old mode 100644 new mode 100755 index 473d2f4b452b..9ab846911c63 --- 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( UINT16 i = 0; diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 3c9aad38c332..ac6761dc3d39 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 c7404b820ed7..88173c7f6c63 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 ( 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 --- 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.src b/sd/source/ui/dlg/vectdlg.src index f66ba0a9454c..17c648bbcad3 100644 --- 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/inc/animobjs.hrc b/sd/source/ui/inc/animobjs.hrc old mode 100644 new mode 100755 index 5c5c8e7852cc..1a6d8291ee59 --- 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 7a7a34362c48..82e4c79f8c55 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 old mode 100644 new mode 100755 index 2732f4f76c38..b726a473b3c5 --- 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 old mode 100644 new mode 100755 index b7f87348ad76..dd08fa5c2d56 --- 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 old mode 100644 new mode 100755 index 47812c304890..f12932255fe5 --- 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 old mode 100644 new mode 100755 index e273b9cb573c..0c4fe8a265d9 --- 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 -- cgit From c8ba0c921140c1afc84cc2703ed229f6fba4f7d9 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Wed, 26 Jan 2011 10:42:37 +0100 Subject: impress195: #i102142# Fixed order of initialization in constructor. --- sd/source/ui/framework/factories/BasicViewFactory.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 sd/source/ui/framework/factories/BasicViewFactory.cxx (limited to 'sd') diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx old mode 100755 new mode 100644 index 155ceec943ba..80f9668fdeea --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -141,8 +141,8 @@ BasicViewFactory::BasicViewFactory ( mpViewShellContainer(new ViewShellContainer()), mpBase(NULL), mpFrameView(NULL), - mpViewCache(new ViewCache()), mpWindow(new WorkWindow(NULL,WB_STDWORK)), + mpViewCache(new ViewCache()), mxLocalPane(new Pane(Reference(), mpWindow.get())) { (void)rxContext; -- cgit From bcc28239b8bbb249ef58331e0cc6f0850781c044 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 14 Feb 2011 14:06:49 +0100 Subject: sw34bf03: stlpool.cxx: fix stupid typo --- sd/source/core/stlpool.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index a3e73d959119..a2abfd199fe9 100755 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1061,8 +1061,8 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) ); aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); // #i93908# clear suffix for bullet lists - aFmt.SetPrefix(::rtl::OUString()); - aFmt.SetSuffix(::rtl::OUString()); + aFrmt.SetPrefix(::rtl::OUString()); + aFrmt.SetSuffix(::rtl::OUString()); aFrmt.SetStart(1); aFrmt.SetBulletRelSize(45); aFrmt.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34 -- cgit From 0d9aa8be6f176b400a0f137ff228964a3f644f39 Mon Sep 17 00:00:00 2001 From: os Date: Fri, 18 Feb 2011 10:06:26 +0100 Subject: os150: SvxFontItem member access changed to Set-methods --- sd/source/ui/func/fuhhconv.cxx | 10 +++++----- sd/source/ui/presenter/PresenterTextView.cxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sd') 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/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; -- cgit From f2aeec8f22f37146c2f9120e8d0ead383049c1fa Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 22 Feb 2011 19:07:34 +0100 Subject: masterfix DEV300: #i10000# usage of L10N build_type --- sd/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') 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 -- cgit From b5cffc10b0b21aa88bcd533bee65d020c6cc0eea Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 1 Mar 2011 16:05:30 +0100 Subject: sw34bf04: #i103539#: always import meta.xml, to extract the BuildId: SvXMLMetaDocumentContext: refactor to not require DocumentProperties, and always set the BuildId from the meta:generator element. {Sc,Sd,Sw}XMLImport::CreateMetaContext(): always create context. sc, sd: add OrganizerMode property to ODF import. --- sd/source/filter/xml/sdxmlwrp.cxx | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'sd') 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, -- cgit From e550fb754b98568cd6df498c5017050101ab7718 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 14 Mar 2011 23:01:23 +0100 Subject: dba34c: removed conflicting fix for a leaking WorkWindow - both changes together cause a crash --- sd/source/ui/framework/factories/BasicViewFactory.cxx | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index ebb55ec3bd57..902c6f48a9a7 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -50,7 +50,6 @@ #include #include #include -#include #include @@ -153,20 +152,6 @@ BasicViewFactory::BasicViewFactory ( BasicViewFactory::~BasicViewFactory (void) { - mpViewCache.reset(); - - Reference< awt::XWindow > xLocalPaneWindow( mxLocalPane->getWindow() ); - try - { - const Reference< XComponent > xLocalPaneComponent( mxLocalPane, UNO_QUERY_THROW ); - xLocalPaneComponent->dispose(); - const Reference< XComponent > xWindowComponent( xLocalPaneWindow, UNO_QUERY_THROW ); - xWindowComponent->dispose(); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } } -- cgit