[Libreoffice-commits] core.git: 2 commits - framework/inc framework/source sdext/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Feb 24 06:39:33 UTC 2019
framework/inc/helper/titlebarupdate.hxx | 2 -
framework/inc/helper/vclstatusindicator.hxx | 3 -
framework/inc/jobs/jobdata.hxx | 10 -----
framework/inc/services/desktop.hxx | 1
framework/inc/services/layoutmanager.hxx | 1
framework/inc/uielement/toolbarmerger.hxx | 2 -
framework/source/accelerators/presethandler.cxx | 13 ------
framework/source/helper/titlebarupdate.cxx | 1
framework/source/helper/vclstatusindicator.cxx | 3 -
framework/source/inc/accelerators/presethandler.hxx | 32 ----------------
framework/source/jobs/job.cxx | 1
framework/source/jobs/jobdata.cxx | 25 ------------
framework/source/layoutmanager/layoutmanager.cxx | 1
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 1
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 1
framework/source/services/desktop.cxx | 2 -
framework/source/uielement/addonstoolbarmanager.cxx | 1
framework/source/uielement/toolbarmerger.cxx | 2 -
sdext/source/presenter/PresenterController.cxx | 4 --
sdext/source/presenter/PresenterPaneBase.cxx | 8 ----
sdext/source/presenter/PresenterPaneBase.hxx | 2 -
sdext/source/presenter/PresenterPaneContainer.cxx | 9 ----
sdext/source/presenter/PresenterPaneContainer.hxx | 6 ---
sdext/source/presenter/PresenterPaneFactory.cxx | 11 -----
sdext/source/presenter/PresenterScreen.cxx | 3 -
sdext/source/presenter/PresenterScreen.hxx | 1
sdext/source/presenter/PresenterToolBar.cxx | 3 -
sdext/source/presenter/PresenterToolBar.hxx | 1
28 files changed, 5 insertions(+), 145 deletions(-)
New commits:
commit d55fb1552f6ecd5c2f9e817d2b820e1a66410840
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 22 15:50:53 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Feb 24 07:39:23 2019 +0100
loplugin:unusedfields in framework
Change-Id: I7c633bf3e217a71c51bd3781fe716cb06fe92b0c
Reviewed-on: https://gerrit.libreoffice.org/68227
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index ab93896ec273..f835b915d89f 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -54,8 +54,6 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper<
{
/// internal id of this module
OUString sID;
- /// localized name for this module
- OUString sUIName;
/// configured icon for this module
::sal_Int32 nIcon;
};
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index 5665b2a394ee..1462616d7793 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -52,9 +52,6 @@ class VCLStatusIndicator : public ::cppu::WeakImplHelper< css::task::XStatusInd
*/
VclPtr<StatusBar> m_pStatusBar;
- /** knows the current info text of the progress. */
- OUString m_sText;
-
/** knows the current range of the progress. */
sal_Int32 m_nRange;
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 1b5ec7c41dc6..5f36411463c5 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -164,15 +164,6 @@ class JobData final
*/
std::vector< css::beans::NamedValue > m_lArguments;
- /**
- after a job was successfully executed (by any outside code using our
- information) it can return a result. This member make it part of this
- container too. So it can be used for further things.
- We use it also to update our internal state and the configuration
- of the job. But note: only the last result will be saved here!
- */
- JobResult m_aLastExecutionResult;
-
// native interface
public:
@@ -200,7 +191,6 @@ class JobData final
void setEvent ( const OUString& sEvent ,
const OUString& sAlias );
void setJobConfig ( const std::vector< css::beans::NamedValue >& lArguments );
- void setResult ( const JobResult& aResult );
void disableJob ( );
static std::vector< OUString > getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index bbde5e69a237..faf93a6e0126 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -399,7 +399,6 @@ class Desktop : private cppu::BaseMutex,
css::uno::Reference< css::frame::XFrames > m_xFramesHelper; /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer!
css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchHelper; /// helper to dispatch something for new tasks, created by "_blank"!
ELoadState m_eLoadState; /// hold information about state of asynchron loading of component for loadComponentFromURL()!
- css::uno::Any m_aInteractionRequest;
bool m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto
std::unique_ptr<SvtCommandOptions> m_xCommandOptions; /// ref counted class to support disabling commands defined by configuration file
OUString m_sName;
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 6e15d58e2442..ed43e2c31828 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -246,7 +246,6 @@ namespace framework
css::uno::Reference< css::frame::XFrame > m_xFrame;
css::uno::Reference< css::ui::XUIConfigurationManager > m_xModuleCfgMgr;
css::uno::Reference< css::ui::XUIConfigurationManager > m_xDocCfgMgr;
- css::uno::WeakReference< css::frame::XModel > m_xModel;
css::uno::Reference< css::awt::XWindow > m_xContainerWindow;
css::uno::Reference< css::awt::XTopWindow2 > m_xContainerTopWindow;
sal_Int32 m_nLockCount;
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 802b9bd080cb..24017793bede 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -42,7 +42,6 @@ namespace framework
struct AddonsParams
{
OUString aImageId;
- OUString aTarget;
OUString aControlType;
sal_uInt16 nWidth;
};
@@ -62,7 +61,6 @@ typedef ::std::vector< AddonToolbarItem > AddonToolbarItemContainer;
struct ReferenceToolbarPathInfo
{
- VclPtr<ToolBox> pToolbar;
ToolBox::ImplToolItems::size_type nPos;
bool bResult;
};
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 34c94719e6df..fc5f0a19ca30 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -77,25 +77,18 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentCont
: m_xContext(xContext)
, m_eConfigType(E_GLOBAL)
, m_lDocumentStorages()
- , m_aLanguageTag(LANGUAGE_USER_PRIV_NOTRANSLATE)
{
}
PresetHandler::PresetHandler(const PresetHandler& rCopy)
- : m_aLanguageTag( rCopy.m_aLanguageTag)
{
m_xContext = rCopy.m_xContext;
m_eConfigType = rCopy.m_eConfigType;
- m_sResourceType = rCopy.m_sResourceType;
- m_sModule = rCopy.m_sModule;
m_xWorkingStorageShare = rCopy.m_xWorkingStorageShare;
m_xWorkingStorageNoLang = rCopy.m_xWorkingStorageNoLang;
m_xWorkingStorageUser = rCopy.m_xWorkingStorageUser;
- m_lPresets = rCopy.m_lPresets;
- m_lTargets = rCopy.m_lTargets;
m_lDocumentStorages = rCopy.m_lDocumentStorages;
m_sRelPathShare = rCopy.m_sRelPathShare;
- m_sRelPathNoLang = rCopy.m_sRelPathNoLang;
m_sRelPathUser = rCopy.m_sRelPathUser;
}
@@ -324,9 +317,6 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
{
SolarMutexGuard g;
m_eConfigType = eConfigType;
- m_sResourceType = sResource;
- m_sModule = sModule;
- m_aLanguageTag = rLanguageTag;
}
css::uno::Reference< css::embed::XStorage > xShare;
@@ -496,10 +486,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
m_xWorkingStorageShare = xShare;
m_xWorkingStorageNoLang= xNoLang;
m_xWorkingStorageUser = xUser;
- m_lPresets = lPresets;
- m_lTargets = lTargets;
m_sRelPathShare = sRelPathShare;
- m_sRelPathNoLang = sRelPathNoLang;
m_sRelPathUser = sRelPathUser;
}
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index c75e8a32d974..0ab7dee17235 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -186,7 +186,6 @@ bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::frame:
rInfo.sID = xModuleManager->identify(xFrame);
::comphelper::SequenceAsHashMap lProps = xModuleManager->getByName (rInfo.sID);
- rInfo.sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_ASCII_UINAME, OUString());
rInfo.nIcon = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_ASCII_ICON , INVALID_ICON_ID );
// Note: If we could retrieve a module id ... everything is OK.
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index c2eb170bcc8f..8173c3b48e8b 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -60,7 +60,6 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
pParentWindow->Invalidate(InvalidateFlags::Children);
pParentWindow->Flush();
- m_sText = sText;
m_nRange = nRange;
m_nValue = 0;
}
@@ -79,7 +78,6 @@ void SAL_CALL VCLStatusIndicator::end()
{
SolarMutexGuard aSolarGuard;
- m_sText.clear();
m_nRange = 0;
m_nValue = 0;
@@ -95,7 +93,6 @@ void SAL_CALL VCLStatusIndicator::end()
void SAL_CALL VCLStatusIndicator::setText(const OUString& sText)
{
SolarMutexGuard aSolarGuard;
- m_sText = sText;
if (m_pStatusBar)
m_pStatusBar->SetText(sText);
}
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 56a2fc15d403..b41593d41bee 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -76,22 +76,6 @@ class PresetHandler
*/
EConfigType m_eConfigType;
- /** @short specify the type of resource, which configuration sets
- must be provided here.
-
- @descr e.g. menubars, toolbars, accelerators
- */
- OUString m_sResourceType;
-
- /** @short specify the application module for a module
- dependent configuration.
-
- @descr Will be used only, if m_sResourceType is set to
- "module". Further it must be a valid module identifier
- then ...
- */
- OUString m_sModule;
-
/** @short if we run in document mode, we can't use the global root storages!
We have to use a special document storage explicitly. */
StorageHolder m_lDocumentStorages;
@@ -124,24 +108,8 @@ class PresetHandler
*/
css::uno::Reference< css::embed::XStorage > m_xWorkingStorageUser;
- /** @short knows the names of all presets inside the current
- working storage of the share layer. */
- std::vector<OUString> m_lPresets;
-
- /** @short knows the names of all targets inside the current
- working storage of the user layer. */
- std::vector<OUString> m_lTargets;
-
- /** @short it's the current office locale and will be used
- to handle localized presets.
-
- @descr Default is "x-no-translate" which disable any
- localized handling inside this class! */
- LanguageTag m_aLanguageTag;
-
/** @short knows the relative path from the root. */
OUString m_sRelPathShare;
- OUString m_sRelPathNoLang;
OUString m_sRelPathUser;
// native interface
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 574765ad3d22..14c6622a5d33 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -461,7 +461,6 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult )
(aAnalyzedResult.existPart(JobResult::E_DISPATCHRESULT))
)
{
- m_aJobCfg.setResult(aAnalyzedResult);
// Attention: Because the listener expect that the original object send this event ...
// and we nor the job are the right ones ...
// our user has set itself before. So we can fake this source address!
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 823541875399..8984d618a1bc 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -83,7 +83,6 @@ JobData& JobData::operator=( const JobData& rCopy )
m_sContext = rCopy.m_sContext;
m_sEvent = rCopy.m_sEvent;
m_lArguments = rCopy.m_lArguments;
- m_aLastExecutionResult = rCopy.m_aLastExecutionResult;
return *this;
}
@@ -264,30 +263,6 @@ void JobData::setJobConfig( const std::vector< css::beans::NamedValue >& lArgume
}
/**
- @short set a new execution result
- @descr Every executed job can have returned a result.
- We set it here, so our user can use it may be later.
- But the outside code can use it too, to analyze it and
- adopt the configuration of this job too. Because the
- result uses a protocol, which allow that. And we provide
- right functionality to save it.
-
- @param aResult
- the result of last execution
- */
-void JobData::setResult( const JobResult& aResult )
-{
- SolarMutexGuard g;
-
- // overwrite the last saved result
- m_aLastExecutionResult = aResult;
-
- // Don't use his information to update
- // e.g. the arguments of this job. It must be done
- // from outside! Here we save this information only.
-}
-
-/**
@short set a new environment descriptor for this job
@descr It must(!) be done every time this container is initialized
with new job datas e.g.: setAlias()/setEvent()/setService() ...
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 0489804ed5fc..19d97528a263 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -435,7 +435,6 @@ void LayoutManager::implts_reset( bool bAttached )
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aWriteLock;
- m_xModel = xModel;
m_aDockingArea = awt::Rectangle();
m_aModuleIdentifier = aModuleIdentifier;
m_xModuleCfgMgr = xModCfgMgr;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 644eacb8d05b..9396171848f2 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -3268,7 +3268,6 @@ void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e )
m_bDockingInProgress = bWinFound;
m_aDockUIElement = aUIElement;
m_aDockUIElement.m_bUserActive = true;
- m_aStartDockMousePos = aMousePos;
}
awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent& e )
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 12dfffe46e50..c24cee6ee53f 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -271,7 +271,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW
UIElementVector m_aUIElements;
UIElement m_aDockUIElement;
- Point m_aStartDockMousePos;
tools::Rectangle m_aDockingArea;
tools::Rectangle m_aDockingAreaOffsets;
DockingOperation m_eDockOperation;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 460f97a46e7b..7c3823e09f06 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -167,7 +167,6 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon
, m_xFramesHelper ( )
, m_xDispatchHelper ( )
, m_eLoadState ( E_NOTSET )
- , m_aInteractionRequest ( )
, m_bSuspendQuickstartVeto( false )
, m_sName ( )
, m_sTitle ( )
@@ -1293,7 +1292,6 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
{
SolarMutexGuard g;
m_eLoadState = E_INTERACTION;
- m_aInteractionRequest = aRequest;
}
}
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 7a6847e53844..eb3381ce6a04 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -262,7 +262,6 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
// Create TbRuntimeItemData to hold additional information we will need in the future
AddonsParams* pRuntimeItemData = new AddonsParams;
pRuntimeItemData->aImageId = aImageId;
- pRuntimeItemData->aTarget = aTarget;
pRuntimeItemData->aControlType = aControlType;
pRuntimeItemData->nWidth = nWidth;
m_pToolBar->SetItemData( nId, pRuntimeItemData );
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 83416bc5daea..e66a31e77d85 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -229,7 +229,6 @@ ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint(
{
ReferenceToolbarPathInfo aResult;
aResult.bResult = false;
- aResult.pToolbar = pToolbar;
aResult.nPos = ToolBox::ITEM_NOTFOUND;
const ToolBox::ImplToolItems::size_type nSize( pToolbar->GetItemCount() );
@@ -627,7 +626,6 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, ToolBox::ImplToolItems
// Use the user data to store add-on specific data with the toolbar item
AddonsParams* pAddonParams = new AddonsParams;
pAddonParams->aImageId = rItem.aImageIdentifier;
- pAddonParams->aTarget = rItem.aTarget;
pAddonParams->aControlType = rItem.aControlType;
pAddonParams->nWidth = rItem.nWidth;
pToolbar->SetItemData( nItemId, pAddonParams );
commit 40871e226945ff732261fd1437df55b733ecdbc3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 22 13:17:25 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Feb 24 07:39:11 2019 +0100
loplugin:unusedfields in sdext
Change-Id: Ifec87ab2b54fa18c5089bac53457e376826645cb
Reviewed-on: https://gerrit.libreoffice.org/68222
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index cbd4300cc152..99600638cf8d 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -753,9 +753,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
Reference<XView> xView (rEvent.ResourceObject,UNO_QUERY);
if (xView.is())
{
- SharedBitmapDescriptor pViewBackground(
- GetViewBackground(xView->getResourceId()->getResourceURL()));
- mpPaneContainer->StoreView(xView, pViewBackground);
+ mpPaneContainer->StoreView(xView);
UpdateViews();
mpWindowManager->NotifyViewCreation(xView);
}
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 2378f393b0c2..cbf78989e94e 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -53,8 +53,7 @@ PresenterPaneBase::PresenterPaneBase (
mxBorderPainter(),
mxPresenterHelper(),
msTitle(),
- mxComponentContext(rxContext),
- mpViewBackground()
+ mxComponentContext(rxContext)
{
if (mpPresenterController.get() != nullptr)
mxPresenterHelper = mpPresenterController->GetPresenterHelper();
@@ -295,11 +294,6 @@ void PresenterPaneBase::ToTop()
mxPresenterHelper->toTop(mxContentWindow);
}
-void PresenterPaneBase::SetBackground (const SharedBitmapDescriptor& rpBackground)
-{
- mpViewBackground = rpBackground;
-}
-
void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox)
{
OSL_ASSERT(mxPaneId.is());
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index bfe87ed42206..c3bb1d93bb72 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -70,7 +70,6 @@ public:
virtual void SAL_CALL disposing() override;
const css::uno::Reference<css::awt::XWindow>& GetBorderWindow() const;
- void SetBackground (const SharedBitmapDescriptor& rpBackground);
void SetTitle (const OUString& rsTitle);
const OUString& GetTitle() const;
const css::uno::Reference<css::drawing::framework::XPaneBorderPainter>& GetPaneBorderPainter() const;
@@ -111,7 +110,6 @@ protected:
css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
OUString msTitle;
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
- SharedBitmapDescriptor mpViewBackground;
virtual void CreateCanvases (
const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas) = 0;
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index da7cd5db667e..3cef8ac65984 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -85,9 +85,7 @@ void PresenterPaneContainer::PreparePane (
pDescriptor->maViewInitialization = rViewInitialization;
pDescriptor->mbIsActive = true;
pDescriptor->mbIsOpaque = bIsOpaque;
- pDescriptor->maSpriteProvider = PaneDescriptor::SpriteProvider();
pDescriptor->mbIsSprite = false;
- pDescriptor->maCalloutAnchorLocation = awt::Point(-1,-1);
maPanes.push_back(pDescriptor);
}
@@ -155,8 +153,7 @@ PresenterPaneContainer::SharedPaneDescriptor
PresenterPaneContainer::SharedPaneDescriptor
PresenterPaneContainer::StoreView (
- const Reference<XView>& rxView,
- const SharedBitmapDescriptor& rpViewBackground)
+ const Reference<XView>& rxView)
{
SharedPaneDescriptor pDescriptor;
@@ -175,9 +172,6 @@ PresenterPaneContainer::SharedPaneDescriptor
if (pDescriptor.get() != nullptr)
{
pDescriptor->mxView = rxView;
- pDescriptor->mpViewBackground = rpViewBackground;
- if (pDescriptor->mxPane.is())
- pDescriptor->mxPane->SetBackground(rpViewBackground);
try
{
if (pDescriptor->maViewInitialization)
@@ -230,7 +224,6 @@ PresenterPaneContainer::SharedPaneDescriptor
if (pDescriptor.get() != nullptr)
{
pDescriptor->mxView = nullptr;
- pDescriptor->mpViewBackground = SharedBitmapDescriptor();
}
}
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index e7e3ef948fef..f951005ab2ad 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -89,12 +89,9 @@ public:
OUString msAccessibleTitleTemplate;
OUString msTitle;
ViewInitializationFunction maViewInitialization;
- SharedBitmapDescriptor mpViewBackground;
bool mbIsActive;
bool mbIsOpaque;
- SpriteProvider maSpriteProvider;
bool mbIsSprite;
- css::awt::Point maCalloutAnchorLocation;
void SetActivationState (const bool bIsActive);
};
@@ -118,8 +115,7 @@ public:
const css::uno::Reference<css::awt::XWindow>& rxBorderWindow);
SharedPaneDescriptor StoreView (
- const css::uno::Reference<css::drawing::framework::XView>& rxView,
- const SharedBitmapDescriptor& rpViewBackground);
+ const css::uno::Reference<css::drawing::framework::XView>& rxView);
SharedPaneDescriptor RemovePane (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId);
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index 5990babcc18e..3bc43ebbd2cc 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -284,16 +284,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
pContainer->StorePane(xPane);
if (pDescriptor.get() != nullptr)
{
- if (bIsSpritePane)
- {
- auto const pPane(dynamic_cast<PresenterSpritePane*>(xPane.get()));
- pDescriptor->maSpriteProvider = [pPane](){ return pPane->GetSprite(); };
- pDescriptor->mbIsSprite = true;
- }
- else
- {
- pDescriptor->mbIsSprite = false;
- }
+ pDescriptor->mbIsSprite = bIsSpritePane;
// Get the window of the frame and make that visible.
Reference<awt::XWindow> xWindow (pDescriptor->mxBorderWindow, UNO_QUERY_THROW);
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 086f1ce157ec..847919e720bc 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -254,7 +254,6 @@ PresenterScreen::PresenterScreen (
mxController(),
mxConfigurationControllerWeak(),
mxContextWeak(rxContext),
- mxSlideShowControllerWeak(),
mpPresenterController(),
mxSavedConfiguration(),
mpPaneContainer(),
@@ -302,7 +301,6 @@ void SAL_CALL PresenterScreen::disposing()
void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/)
{
- mxSlideShowControllerWeak = WeakReference<presentation::XSlideShowController>();
RequestShutdownPresenterScreen();
}
@@ -317,7 +315,6 @@ void PresenterScreen::InitializePresenterScreen()
Reference<XPresentationSupplier> xPS ( mxModel, UNO_QUERY_THROW);
Reference<XPresentation2> xPresentation(xPS->getPresentation(), UNO_QUERY_THROW);
Reference<presentation::XSlideShowController> xSlideShowController( xPresentation->getController() );
- mxSlideShowControllerWeak = xSlideShowController;
if( !xSlideShowController.is() || !xSlideShowController->isFullScreen() )
return;
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 8cfadd3a4ce9..10cb613d83dd 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -128,7 +128,6 @@ private:
css::uno::WeakReference<css::drawing::framework::XConfigurationController>
mxConfigurationControllerWeak;
css::uno::WeakReference<css::uno::XComponentContext> mxContextWeak;
- css::uno::WeakReference<css::presentation::XSlideShowController> mxSlideShowControllerWeak;
::rtl::Reference<PresenterController> mpPresenterController;
css::uno::Reference<css::drawing::framework::XConfiguration> mxSavedConfiguration;
::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index c7d4ddb5d280..10dfda0bcea4 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1016,7 +1016,6 @@ PresenterToolBarView::PresenterToolBarView (
mxWindow(),
mxCanvas(),
mpPresenterController(rpPresenterController),
- mxSlideShowController(rpPresenterController->GetSlideShowController()),
mpToolBar()
{
try
@@ -1074,8 +1073,6 @@ void SAL_CALL PresenterToolBarView::disposing()
mxViewId = nullptr;
mxPane = nullptr;
mpPresenterController = nullptr;
- mxSlideShowController = nullptr;
-
}
const ::rtl::Reference<PresenterToolBar>& PresenterToolBarView::GetPresenterToolBar() const
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index bf6dcd519053..84c97911f41d 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -247,7 +247,6 @@ private:
css::uno::Reference<css::awt::XWindow> mxWindow;
css::uno::Reference<css::rendering::XCanvas> mxCanvas;
::rtl::Reference<PresenterController> mpPresenterController;
- css::uno::Reference<css::presentation::XSlideShowController> mxSlideShowController;
::rtl::Reference<PresenterToolBar> mpToolBar;
};
More information about the Libreoffice-commits
mailing list