summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/inc/app.hrc2
-rw-r--r--sd/sdi/SlideSorterController.sdi4
-rw-r--r--sd/sdi/_drvwsh.sdi4
-rw-r--r--sd/sdi/makefile.mk18
-rw-r--r--sd/sdi/sdraw.sdi32
-rw-r--r--sd/source/ui/app/app.src20
-rw-r--r--sd/source/ui/app/makefile.mk2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx12
-rw-r--r--sd/source/ui/view/PrintManager.cxx4
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx27
-rw-r--r--sd/source/ui/view/drviews1.cxx7
-rw-r--r--sd/source/ui/view/drviews7.cxx8
-rw-r--r--sd/source/ui/view/drviews8.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
-rw-r--r--sd/uiconfig/sdraw/menubar/menubar.xml2
-rw-r--r--sd/uiconfig/simpress/menubar/menubar.xml2
17 files changed, 44 insertions, 106 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index d1852a5e9992..0ccbbf921b6b 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -38,7 +38,6 @@
#define SID_BACKGROUND (SID_SD_START)
#define SID_LASTVERSION (SID_SD_START+1)
#define SID_PAGESETUP (SID_SD_START+2)
-#define SID_PASTE2 (SID_SD_START+3)
#define SID_COPYOBJECTS (SID_SD_START+4)
#define SID_MANAGE_LINKS (SID_SD_START+5)
#define SID_CHOOSE (SID_SD_START+7)
@@ -112,7 +111,6 @@
#define SID_DISMANTLE (SID_SD_START+82)
#define SID_SD_HELP_PI (SID_SD_START+83)
#define SID_TIPHELP (SID_SD_START+84)
-#define SID_OBJECT_MIRROR (SID_SD_START+85)
#define SID_STATUS_PAGE (SID_SD_START+86)
#define SID_STATUS_LAYOUT (SID_SD_START+87)
#define SID_STATUS_SELMODE (SID_SD_START+88)
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index be2a86160124..ff64d80bd8af 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -128,7 +128,7 @@ interface SlideSorterView
ExecMethod = FuSupport ;
StateMethod = GetClipboardState ;
]
- SID_PASTE2 // ole : no, status : ?
+ SID_PASTE_SPECIAL // ole : no, status : ?
[
ExecMethod = FuSupport ;
StateMethod = GetClipboardState ;
@@ -199,7 +199,7 @@ interface SlideSorterView
GroupId = GID_DOCUMENT ;
ExecMethod = ExecCtrl ;
StateMethod = GetCtrlState ;
- Asynchron , Volatile , AutoUpdate ,
+ Asynchron , AutoUpdate ,
MenuConfig , AccelConfig , ToolBoxConfig ;
]
SID_SEARCH_DLG // ole : no, status : ?
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 8f758dda5858..b641ab64a1a0 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -62,7 +62,7 @@ interface DrawView
GroupId = GID_DOCUMENT ;
ExecMethod = ExecCtrl ;
StateMethod = GetCtrlState ;
- Asynchron , Volatile , AutoUpdate ,
+ Asynchron , AutoUpdate ,
MenuConfig , AccelConfig , ToolBoxConfig ;
]
SID_PAGEMODE // ole : no, status : play rec
@@ -281,7 +281,7 @@ interface DrawView
StateMethod = GetMenuState ;
]
- SID_PASTE2 // ole : no, status : ?
+ SID_PASTE_SPECIAL // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
index f49d5103e2f5..8a2c8fd971d7 100644
--- a/sd/sdi/makefile.mk
+++ b/sd/sdi/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -56,17 +56,18 @@ SVSDI1DEPEND= \
_docsh.sdi \
docshell.sdi \
drtxtob.sdi \
- drbezob.sdi \
- drgrfob.sdi \
+ drbezob.sdi \
+ drgrfob.sdi \
_drvwsh.sdi \
drviewsh.sdi \
- mediaob.sdi \
- tables.sdi\
+ mediaob.sdi \
+ tables.sdi\
outlnvsh.sdi \
SlideSorterController.sdi \
ViewShellBase.sdi \
TaskPaneViewShell.sdi \
sdslots.hrc \
+ $(SOLARINCXDIR)$/svxslots.ilb \
$(PRJ)$/inc$/app.hrc
SVSDI2DEPEND= \
@@ -75,15 +76,16 @@ SVSDI2DEPEND= \
_docsh.sdi \
grdocsh.sdi \
drtxtob.sdi \
- drbezob.sdi \
- drgrfob.sdi \
+ drbezob.sdi \
+ drgrfob.sdi \
_drvwsh.sdi \
grviewsh.sdi \
- mediaob.sdi \
+ mediaob.sdi \
outlnvsh.sdi \
ViewShellBase.sdi \
TaskPaneViewShell.sdi \
sdslots.hrc \
+ $(SOLARINCXDIR)$/svxslots.ilb \
$(PRJ)$/inc$/app.hrc
# --- Targets -------------------------------------------------------
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 515b5b6b84ce..7c37e455276c 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -339,7 +339,6 @@ SfxVoidItem Break SID_BREAK
GroupId = GID_MODIFY;
]
-//--------------------------------------------------------------------------
SfxVoidItem CapturePoint SID_CAPTUREPOINT
()
[
@@ -1921,7 +1920,7 @@ SfxVoidItem DeleteLayer SID_DELETE_LAYER
[
/* flags: */
AutoUpdate = FALSE,
- Cachable = Volatile,
+ Cachable = Cachable,
FastCall = FALSE,
HasCoreId = FALSE,
HasDialog = TRUE,
@@ -1946,7 +1945,7 @@ SfxVoidItem DeletePage SID_DELETE_PAGE
[
/* flags: */
AutoUpdate = FALSE,
- Cachable = Volatile,
+ Cachable = Cachable,
FastCall = FALSE,
HasCoreId = FALSE,
HasDialog = TRUE,
@@ -5261,31 +5260,6 @@ SfxBoolItem ParaspaceIncrease SID_PARASPACE_INCREASE
]
//--------------------------------------------------------------------------
-SfxVoidItem PasteClipboard SID_PASTE2
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Volatile,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
-]
-
-//--------------------------------------------------------------------------
SfxBoolItem PickThrough SID_PICK_THROUGH
[
@@ -6772,7 +6746,7 @@ SfxVoidItem DeleteMasterPage SID_DELETE_MASTER_PAGE()
[
/* flags: */
AutoUpdate = FALSE,
- Cachable = Volatile,
+ Cachable = Cachable,
FastCall = FALSE,
HasCoreId = FALSE,
HasDialog = TRUE,
diff --git a/sd/source/ui/app/app.src b/sd/source/ui/app/app.src
index c8991caffd51..957cd6c25f53 100644
--- a/sd/source/ui/app/app.src
+++ b/sd/source/ui/app/app.src
@@ -36,23 +36,3 @@
#include "misc.hxx"
#include <svx/svxids.hrc>
-//
-// Acceleratorn
-//
-
-//
-// Menu
-//
-
-// Menu (Impress)
-#include "menu.src"
-#include "menuportal.src"
-
-// Menu (Draw (Graphic))
-#undef SD_MENU
-#define SD_MENU RID_GRAPHIC_DEFAULTMENU
-#undef SD_MENU_PORTAL
-#define SD_MENU_PORTAL RID_GRAPHIC_PORTALMENU
-
-#include "menu.src"
-#include "menuportal.src"
diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk
index af9e230704cb..82a6177a9e95 100644
--- a/sd/source/ui/app/makefile.mk
+++ b/sd/source/ui/app/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index f1d3162ca034..2eac8b757780 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -292,6 +292,8 @@ void SelectionManager::SelectionHasChanged (const bool bMakeSelectionVisible)
pViewShell->Invalidate (SID_SUMMARY_PAGE);
pViewShell->Invalidate(SID_SHOW_SLIDE);
pViewShell->Invalidate(SID_HIDE_SLIDE);
+ pViewShell->Invalidate(SID_DELETE_PAGE);
+ pViewShell->Invalidate(SID_DELETE_MASTER_PAGE);
// StatusBar
pViewShell->Invalidate (SID_STATUS_PAGE);
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index a9a4d6b2d385..ba8dbb278ca4 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -703,13 +703,13 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
SdTransferable* pTransferClip = SD_MOD()->pTransferClip;
if (rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_PASTE2) == SFX_ITEM_AVAILABLE)
+ || rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE)
{
// Keine eigenen Clipboard-Daten?
if ( !pTransferClip || !pTransferClip->GetDocShell() )
{
rSet.DisableItem(SID_PASTE);
- rSet.DisableItem(SID_PASTE2);
+ rSet.DisableItem(SID_PASTE_SPECIAL);
}
else
{
@@ -739,7 +739,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
if ( ! bIsPastingSupported)
{
rSet.DisableItem(SID_PASTE);
- rSet.DisableItem(SID_PASTE2);
+ rSet.DisableItem(SID_PASTE_SPECIAL);
}
}
}
@@ -748,7 +748,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
// Cut, copy and paste of master pages is not yet implemented properly
if (rSet.GetItemState(SID_COPY) == SFX_ITEM_AVAILABLE
|| rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_PASTE2) == SFX_ITEM_AVAILABLE
+ || rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE
|| rSet.GetItemState(SID_CUT) == SFX_ITEM_AVAILABLE)
{
if (mrSlideSorter.GetModel().GetEditMode() == EM_MASTERPAGE)
@@ -759,8 +759,8 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
rSet.DisableItem(SID_COPY);
if (rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE)
rSet.DisableItem(SID_PASTE);
- if (rSet.GetItemState(SID_PASTE2) == SFX_ITEM_AVAILABLE)
- rSet.DisableItem(SID_PASTE2);
+ if (rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE)
+ rSet.DisableItem(SID_PASTE_SPECIAL);
}
}
diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx
index 5056d48b2e8e..797518473ebd 100644
--- a/sd/source/ui/view/PrintManager.cxx
+++ b/sd/source/ui/view/PrintManager.cxx
@@ -161,6 +161,10 @@ USHORT PrintManager::SetPrinterOptDlg (
USHORT nDiffFlags,
BOOL _bShowDialog)
{
+ SfxPrinter* pOld = mrBase.GetDocShell()->GetPrinter( FALSE );
+ if ( pOld && pOld->IsPrinting() )
+ return SFX_PRINTERROR_BUSY;
+
mrBase.GetDocShell()->SetPrinter(pNewPrinter);
if ( (nDiffFlags & SFX_PRINTER_CHG_ORIENTATION ||
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 2cf8164743a6..25fca9e0bae7 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -503,32 +503,7 @@ void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
}
break;
- case SFX_EVENT_CREATEDOC:
- // mpPaneManager->InitPanes();
- break;
-
- case SFX_EVENT_ACTIVATEDOC:
- break;
-
- case SFX_EVENT_STARTAPP:
- case SFX_EVENT_CLOSEAPP:
- case SFX_EVENT_CLOSEDOC:
- case SFX_EVENT_SAVEDOC:
- case SFX_EVENT_SAVEASDOC:
- case SFX_EVENT_DEACTIVATEDOC:
- case SFX_EVENT_PRINTDOC:
- case SFX_EVENT_ONERROR:
- case SFX_EVENT_LOADFINISHED:
- case SFX_EVENT_SAVEFINISHED:
- case SFX_EVENT_MODIFYCHANGED:
- case SFX_EVENT_PREPARECLOSEDOC:
- case SFX_EVENT_NEWMESSAGE:
- case SFX_EVENT_TOGGLEFULLSCREENMODE:
- case SFX_EVENT_SAVEDOCDONE:
- case SFX_EVENT_SAVEASDOCDONE:
- case SFX_EVENT_MOUSEOVER_OBJECT:
- case SFX_EVENT_MOUSECLICK_OBJECT:
- case SFX_EVENT_MOUSEOUT_OBJECT:
+ default:
break;
}
}
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index b6459b58a87f..2077a852f960 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -165,8 +165,6 @@ void DrawViewShell::Deactivate(BOOL bIsMDIActivate)
void DrawViewShell::SelectionHasChanged (void)
{
- // Um die Performance zu steigern wird jetzt die komplette
- // Shell invalidiert statt alle Slots einzeln
Invalidate();
//Update3DWindow(); // 3D-Controller
@@ -492,6 +490,8 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
Invalidate( SID_PAGEMODE );
Invalidate( SID_LAYERMODE );
Invalidate( SID_MASTERPAGE );
+ Invalidate( SID_DELETE_MASTER_PAGE );
+ Invalidate( SID_DELETE_PAGE );
Invalidate( SID_SLIDE_MASTERPAGE );
Invalidate( SID_TITLE_MASTERPAGE );
Invalidate( SID_NOTES_MASTERPAGE );
@@ -1229,6 +1229,8 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage)
SfxBindings& rBindings = GetViewFrame()->GetBindings();
rBindings.Invalidate(SID_NAVIGATOR_PAGENAME, TRUE, FALSE);
rBindings.Invalidate(SID_STATUS_PAGE, TRUE, FALSE);
+ rBindings.Invalidate(SID_DELETE_MASTER_PAGE, TRUE, FALSE);
+ rBindings.Invalidate(SID_DELETE_PAGE, TRUE, FALSE);
UpdatePreview( mpActualPage );
mpDrawView->AdjustMarkHdl();
@@ -1358,6 +1360,7 @@ void DrawViewShell::ResetActualLayer()
pLayerBar->SetCurPageId(nActiveLayer + 1);
GetViewFrame()->GetBindings().Invalidate( SID_MODIFYLAYER );
+ GetViewFrame()->GetBindings().Invalidate( SID_DELETE_LAYER );
}
}
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index d6629a784688..983033be7b8c 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -210,7 +210,7 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
SfxBindings& rBindings = GetViewFrame()->GetBindings();
rBindings.Invalidate( SID_PASTE );
- rBindings.Invalidate( SID_PASTE2 );
+ rBindings.Invalidate( SID_PASTE_SPECIAL );
rBindings.Invalidate( SID_CLIPBOARD_FORMAT_ITEMS );
}
return 0;
@@ -570,7 +570,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
// clipboard (paste)
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE2 ) ||
+ SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE_SPECIAL ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) )
{
if ( !mpClipEvtLstnr )
@@ -596,7 +596,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if( !mbPastePossible )
{
rSet.DisableItem( SID_PASTE );
- rSet.DisableItem( SID_PASTE2 );
+ rSet.DisableItem( SID_PASTE_SPECIAL );
rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS );
}
else if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) )
@@ -1017,7 +1017,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
SD_MOD()->GetWaterCan() )
{
rSet.DisableItem( SID_PASTE );
- rSet.DisableItem( SID_PASTE2 );
+ rSet.DisableItem( SID_PASTE_SPECIAL );
rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS );
rSet.DisableItem( SID_INSERT_FLD_DATE_FIX );
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index d2ea0daf06b7..047c1f90f3d5 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -167,7 +167,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
}
break;
- case SID_PASTE2:
+ case SID_PASTE_SPECIAL:
{
SetCurrentFunction( FuInsertClipboard::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
Cancel();
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index d4f921d369dc..d14f6ed9dc34 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -793,7 +793,7 @@ IMPL_LINK( OutlineViewShell, ClipboardChanged, TransferableDataHelper*, pDataHel
SfxBindings& rBindings = GetViewFrame()->GetBindings();
rBindings.Invalidate( SID_PASTE );
- rBindings.Invalidate( SID_PASTE2 );
+ rBindings.Invalidate( SID_PASTE_SPECIAL );
rBindings.Invalidate( SID_CLIPBOARD_FORMAT_ITEMS );
}
return 0;
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 8f5cebde373d..fcc7246bb427 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -52,7 +52,7 @@
<menu:menuitem menu:id=".uno:Cut"/>
<menu:menuitem menu:id=".uno:Copy"/>
<menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteClipboard"/>
+ <menu:menuitem menu:id=".uno:PasteSpecial"/>
<menu:menuitem menu:id=".uno:SelectAll"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SearchDialog"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index ead8960586dc..d762a075abd4 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -54,7 +54,7 @@
<menu:menuitem menu:id=".uno:Cut"/>
<menu:menuitem menu:id=".uno:Copy"/>
<menu:menuitem menu:id=".uno:Paste"/>
- <menu:menuitem menu:id=".uno:PasteClipboard"/>
+ <menu:menuitem menu:id=".uno:PasteSpecial"/>
<menu:menuitem menu:id=".uno:SelectAll"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SearchDialog"/>
generated by cgit (git 2.34.1) at 2025-01-16 22:16:37 +0000