diff options
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/DocumentRenderer.src | 10 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 24 | ||||
| -rw-r--r-- | sd/source/ui/view/makefile.mk | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview5.cxx | 29 |
4 files changed, 28 insertions, 36 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src index 5a1030f1c18d..6419cb5c4e90 100644 --- a/sd/source/ui/view/DocumentRenderer.src +++ b/sd/source/ui/view/DocumentRenderer.src @@ -160,7 +160,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { < "Original colors" ; > ; < "Grayscale" ; > ; - < "Black & White" ; > ; + < "Black & white" ; > ; }; }; StringArray _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP @@ -184,8 +184,8 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { < "Original size" ; > ; < "Fit to printable page" ; > ; - < "Distribute on multiple paper sheets" ; > ; - < "Tile paper sheet with repeated slides" ; > ; + < "Distribute on multiple sheets of paper" ; > ; + < "Tile sheet of paper with repeated slides" ; > ; }; }; StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW @@ -194,8 +194,8 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { < "Original size" ; > ; < "Fit to printable page" ; > ; - < "Distribute on multiple paper sheets" ; > ; - < "Tile paper sheet with repeated pages" ; > ; + < "Distribute on multiple sheets of paper" ; > ; + < "Tile sheet of paper with repeated pages" ; > ; }; }; StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 4b9aecb02ac5..55ba07c3fa23 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -154,12 +154,32 @@ void DrawViewShell::Deactivate(BOOL bIsMDIActivate) ViewShell::Deactivate(bIsMDIActivate); } +namespace +{ + class LockUI + { + private: + void Lock(bool bLock); + SfxViewFrame *mpFrame; + public: + LockUI(SfxViewFrame *pFrame) : mpFrame(pFrame) { Lock(true); } + ~LockUI() { Lock(false); } + + }; + + void LockUI::Lock(bool bLock) + { + if (!mpFrame) + return; + mpFrame->Enable( !bLock ); + } +} + /************************************************************************* |* |* Wird gerufen, wenn sich der Selektionszustand der View aendert |* \************************************************************************/ - void DrawViewShell::SelectionHasChanged (void) { Invalidate(); @@ -213,6 +233,8 @@ void DrawViewShell::SelectionHasChanged (void) // we need to deselect it now if (!pOleObj) { + //#i47279# disable frame until after object has completed unload + LockUI aUILock(GetViewFrame()); pIPClient->DeactivateObject(); //HMHmpDrView->ShowMarkHdl(); } diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk index 074497ca1de7..3b3bca4ff3d5 100644 --- a/sd/source/ui/view/makefile.mk +++ b/sd/source/ui/view/makefile.mk @@ -53,7 +53,6 @@ SLOFILES = \ $(SLO)$/sdview2.obj \ $(SLO)$/sdview3.obj \ $(SLO)$/sdview4.obj \ - $(SLO)$/sdview5.obj \ $(SLO)$/viewshel.obj \ $(SLO)$/viewshe2.obj \ $(SLO)$/viewshe3.obj \ diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx deleted file mode 100644 index 51c6725f6d83..000000000000 --- a/sd/source/ui/view/sdview5.cxx +++ /dev/null @@ -1,29 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sd.hxx" |