Skip to content

C
core
Kaydet (Commit) d55fb155 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:unusedfields in framework 

Change-Id: I7c633bf3e217a71c51bd3781fe716cb06fe92b0c
Reviewed-on: https://gerrit.libreoffice.org/68227
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 40871e22
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 102 deletions
framework/inc/helper/titlebarupdate.hxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
};
......
framework/inc/helper/vclstatusindicator.hxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
......
framework/inc/jobs/jobdata.hxx
Dosyayı görüntüle @ d55fb155
......@@ -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,
......
framework/inc/services/desktop.hxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
......
framework/inc/services/layoutmanager.hxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
......
framework/inc/uielement/toolbarmerger.hxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
};
......
framework/source/accelerators/presethandler.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
}
......
framework/source/helper/titlebarupdate.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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.
......
framework/source/helper/vclstatusindicator.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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);
}
......
framework/source/inc/accelerators/presethandler.hxx
Dosyayı görüntüle @ d55fb155
......@@ -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
......
framework/source/jobs/job.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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!
......
framework/source/jobs/jobdata.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
}
......@@ -263,30 +262,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
......
framework/source/layoutmanager/layoutmanager.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
......
framework/source/layoutmanager/toolbarlayoutmanager.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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 )
......
framework/source/layoutmanager/toolbarlayoutmanager.hxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
......
framework/source/services/desktop.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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;
}
}
......
framework/source/uielement/addonstoolbarmanager.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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 );
......
framework/source/uielement/toolbarmerger.cxx
Dosyayı görüntüle @ d55fb155
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment