summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/sdi/sfx.sdi19
-rw-r--r--sfx2/sdi/viwslots.sdi5
-rw-r--r--sfx2/source/view/ipclient.cxx2
-rw-r--r--sfx2/source/view/viewimp.hxx1
-rw-r--r--sfx2/source/view/viewsh.cxx110
5 files changed, 7 insertions, 130 deletions
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index d41c7141338d..97e3523d1ea3 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3198,25 +3198,6 @@ SfxVoidItem PickList SID_PICKLIST
]
-SfxBoolItem PlugInsActive SID_PLUGINS_ACTIVE
-
-[
- AutoUpdate = TRUE,
- FastCall = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
-
-
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
-]
-
-
SfxBoolItem Print SID_PRINTDOC
(SfxStringItem PrinterName SID_PRINTER_NAME,SfxStringItem FileName SID_FILE_NAME,SfxInt16Item From SID_PRINT_FIRST_PAGE,SfxInt16Item To SID_PRINT_LAST_PAGE,SfxInt16Item Copies SID_PRINT_COPIES,SfxStringItem RangeText SID_PRINT_PAGES,SfxBoolItem Selection SID_SELECTION,SfxBoolItem Asynchron SID_ASYNCHRON,SfxBoolItem Collate SID_PRINT_COLLATE,SfxBoolItem Silent SID_SILENT)
[
diff --git a/sfx2/sdi/viwslots.sdi b/sfx2/sdi/viwslots.sdi
index 90092700382c..111180b30d7d 100644
--- a/sfx2/sdi/viwslots.sdi
+++ b/sfx2/sdi/viwslots.sdi
@@ -78,11 +78,6 @@ interface View
[
ExecMethod = ExecMisc_Impl ;
]
- SID_PLUGINS_ACTIVE // ole(no) api(play/rec)
- [
- ExecMethod = ExecMisc_Impl ;
- StateMethod = GetState_Impl ;
- ]
SID_STYLE_FAMILY
[
ExecMethod = ExecMisc_Impl ;
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index de5043e8cfd0..1861d33a0b2f 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -593,7 +593,7 @@ void SfxInPlaceClient_Impl::SizeHasChanged()
IMPL_LINK_NOARG_TYPED(SfxInPlaceClient_Impl, TimerHdl, Timer *, void)
{
if ( m_pClient && m_xObject.is() )
- m_pClient->GetViewShell()->CheckIPClient_Impl( m_pClient, m_pClient->GetViewShell()->GetObjectShell()->GetVisArea() );
+ m_pClient->GetViewShell()->CheckIPClient_Impl( m_pClient );
}
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 0bd8e0069ece..e3e60e228f32 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -48,7 +48,6 @@ struct SfxViewShell_Impl
sal_uInt16 m_nPrinterLocks;
bool m_bCanPrint;
bool m_bHasPrintOptions;
- bool m_bPlugInsActive;
bool m_bIsShowView;
bool m_bGotOwnership;
bool m_bGotFrameOwnership;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index ca3d51a7c505..93a2b8b422a6 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -242,7 +242,6 @@ SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags const nFlags)
, m_nPrinterLocks(0)
, m_bCanPrint(nFlags & SfxViewShellFlags::CAN_PRINT)
, m_bHasPrintOptions(nFlags & SfxViewShellFlags::HAS_PRINTOPTIONS)
-, m_bPlugInsActive(true)
, m_bIsShowView(!(nFlags & SfxViewShellFlags::NO_SHOW))
, m_bGotOwnership(false)
, m_bGotFrameOwnership(false)
@@ -680,70 +679,6 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
return;
}
}
-
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- case SID_PLUGINS_ACTIVE:
- {
- const SfxBoolItem* pShowItem = rReq.GetArg<SfxBoolItem>(nId);
- bool const bActive = (pShowItem)
- ? pShowItem->GetValue()
- : !pImp->m_bPlugInsActive;
- // ggf. recorden
- if ( !rReq.IsAPI() )
- rReq.AppendItem( SfxBoolItem( nId, bActive ) );
-
- // Jetzt schon DONE aufrufen, da die Argumente evtl. einen Pool
- // benutzen, der demn"achst weg ist
- rReq.Done(true);
-
- // ausfuehren
- if (!pShowItem || (bActive != pImp->m_bPlugInsActive))
- {
- SfxFrame* pTopFrame = &GetFrame()->GetTopFrame();
- if ( pTopFrame != &GetFrame()->GetFrame() )
- {
- // FramesetDocument
- SfxViewShell *pShell = pTopFrame->GetCurrentViewFrame()->GetViewShell();
- if ( pShell->GetInterface()->GetSlot( nId ) )
- pShell->ExecuteSlot( rReq );
- break;
- }
-
- SfxFrameIterator aIter( *pTopFrame );
- while ( pTopFrame )
- {
- if ( pTopFrame->GetCurrentViewFrame() )
- {
- SfxViewShell *pView = pTopFrame->GetCurrentViewFrame()->GetViewShell();
- if ( pView )
- {
- pView->pImp->m_bPlugInsActive = bActive;
- Rectangle aVisArea = GetObjectShell()->GetVisArea();
- VisAreaChanged(aVisArea);
-
- // the plugins might need change in their state
- SfxInPlaceClientList *pClients = pView->pImp->GetIPClientList_Impl(false);
- if ( pClients )
- {
- for ( size_t n = 0; n < pClients->size(); n++)
- {
- SfxInPlaceClient* pIPClient = pClients->at( n );
- if ( pIPClient )
- pView->CheckIPClient_Impl( pIPClient, aVisArea );
- }
- }
- }
- }
-
- if ( !pTopFrame->GetParentFrame() )
- pTopFrame = aIter.FirstFrame();
- else
- pTopFrame = aIter.NextFrame( *pTopFrame );
- }
- }
-
- break;
- }
}
}
@@ -803,13 +738,6 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
}
break;
}
-
- // PlugIns running
- case SID_PLUGINS_ACTIVE:
- {
- rSet.Put( SfxBoolItem( SID_PLUGINS_ACTIVE, !pImp->m_bPlugInsActive) );
- break;
- }
case SID_STYLE_FAMILY :
{
rSet.Put( SfxUInt16Item( SID_STYLE_FAMILY, pImp->m_nFamily ) );
@@ -1175,11 +1103,6 @@ SfxViewShell::SfxViewShell
, mbPrinterSettingsModified(false)
{
- if ( pViewFrame->GetParentViewFrame() )
- {
- pImp->m_bPlugInsActive = pViewFrame->GetParentViewFrame()
- ->GetViewShell()->pImp->m_bPlugInsActive;
- }
SetMargin( pViewFrame->GetMargin_Impl() );
SetPool( &pViewFrame->GetObjectShell()->GetPool() );
@@ -1641,7 +1564,7 @@ void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/)
}
-void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectangle& rVisArea )
+void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient )
{
if ( GetObjectShell()->IsInClose() )
return;
@@ -1651,32 +1574,11 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan
bool bActiveWhenVisible =
( (( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) != 0 ) ||
svt::EmbeddedObjectRef::IsGLChart(pIPClient->GetObject()));
-
- // this method is called when either a client is created or the "Edit/Plugins" checkbox is checked
- if ( !pIPClient->IsObjectInPlaceActive() && pImp->m_bPlugInsActive )
- {
- // object in client is currently not active
- // check if the object wants to be activated always or when it becomes at least partially visible
- // TODO/LATER: maybe we should use the scaled area instead of the ObjArea?!
- if ( bAlwaysActive || (bActiveWhenVisible && rVisArea.IsOver(pIPClient->GetObjArea())) )
- {
- try
- {
- pIPClient->GetObject()->changeState( embed::EmbedStates::INPLACE_ACTIVE );
- }
- catch (const uno::Exception&)
- {
- }
- }
- }
- else if (!pImp->m_bPlugInsActive)
- {
- // object in client is currently active and "Edit/Plugins" checkbox is selected
- // check if the object wants to be activated always or when it becomes at least partially visible
- // in this case selecting of the "Edit/Plugin" checkbox should let such objects deactivate
- if ( bAlwaysActive || bActiveWhenVisible )
- pIPClient->GetObject()->changeState( embed::EmbedStates::RUNNING );
- }
+ // object in client is currently active
+ // check if the object wants to be activated always or when it becomes at least partially visible
+ // in this case selecting of the "Edit/Plugin" checkbox should let such objects deactivate
+ if ( bAlwaysActive || bActiveWhenVisible )
+ pIPClient->GetObject()->changeState( embed::EmbedStates::RUNNING );
}
generated by cgit (git 2.34.1) at 2025-01-06 08:24:11 +0000