summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sfx2/source/appl/appdata.cxx7
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx2
-rw-r--r--sfx2/source/control/bindings.cxx12
-rw-r--r--sfx2/source/control/dispatch.cxx1
-rw-r--r--sfx2/source/dialog/templdlg.cxx4
-rw-r--r--sfx2/source/doc/docfac.cxx7
-rw-r--r--sfx2/source/doc/docfile.cxx18
-rw-r--r--sfx2/source/doc/objxtor.cxx2
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx2
-rw-r--r--sfx2/source/inc/appdata.hxx9
-rw-r--r--sfx2/source/inc/objshimp.hxx6
-rw-r--r--sfx2/source/inc/sfxpicklist.hxx6
-rw-r--r--sfx2/source/inc/templdgi.hxx3
-rw-r--r--sfx2/source/inc/workwin.hxx9
-rw-r--r--sfx2/source/view/frame.cxx2
-rw-r--r--sfx2/source/view/impframe.hxx6
16 files changed, 22 insertions, 74 deletions
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index b2635fca95f0..77e6a9571aec 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -102,8 +102,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
, pAppDispatch(nullptr)
, pTemplates( nullptr )
, pPool(nullptr)
- , pSaveOptions( nullptr )
- , pHelpOptions( nullptr )
, pProgress(nullptr)
, nDocModalMode(0)
, nAutoTabPageId(0)
@@ -116,20 +114,15 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
, pViewFrames(nullptr)
, pViewShells(nullptr)
, pObjShells(nullptr)
- , pSfxResManager(nullptr)
, pBasicManager( new SfxBasicManagerHolder )
, pBasMgrListener( new SfxBasicManagerCreationListener( *this ) )
, pViewFrame( nullptr )
, pSlotPool( nullptr )
, pAppDispat( nullptr )
, pInterfaces( nullptr )
- , nDocNo(0)
, nInterfaces( 0 )
- , bDispatcherLocked( false )
, bDowning( true )
, bInQuit( false )
- , bInvalidateOnUnlock( false )
- , bODFVersionWarningLater( false )
{
#if HAVE_FEATURE_SCRIPTING
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index e78fad714138..9e9b16400ec6 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -300,7 +300,7 @@ void SfxPickList::CreatePickListEntries()
aURL.SetSmartURL( sURL );
aURL.SetPass( OUString() );
- PickListEntry *pPick = new PickListEntry( aURL.GetMainURL( INetURLObject::NO_DECODE ), sFilter, sTitle );
+ PickListEntry *pPick = new PickListEntry( aURL.GetMainURL( INetURLObject::NO_DECODE ), sFilter );
m_aPicklistVector.push_back( pPick );
}
}
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index fabf45f1b36f..5d1369315421 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -85,13 +85,11 @@ typedef std::vector<SfxStateCache*> SfxStateCacheArr_Impl;
struct SfxFoundCache_Impl
{
- sal_uInt16 nSlotId; // the Slot-Id
sal_uInt16 nWhichId; // If available: Which-Id, else: nSlotId
const SfxSlot* pSlot; // Pointer to <Master-Slot>
SfxStateCache* pCache; // Pointer to StatusCache, if possible NULL
- SfxFoundCache_Impl(sal_uInt16 nS, sal_uInt16 nW, const SfxSlot *pS, SfxStateCache *pC ):
- nSlotId(nS),
+ SfxFoundCache_Impl(sal_uInt16 nW, const SfxSlot *pS, SfxStateCache *pC ):
nWhichId(nW),
pSlot(pS),
pCache(pC)
@@ -444,9 +442,7 @@ void SfxBindings::Update_Impl
// When pCache == NULL and no SlotServer
// (for example due to locked Dispatcher! ),
// obviously do not try to update
- SfxFoundCache_Impl aFoundCache(
- pCache->GetId(), 0,
- pRealSlot, pCache );
+ SfxFoundCache_Impl aFoundCache(0, pRealSlot, pCache );
UpdateControllers_Impl( nullptr, aFoundCache, nullptr, SfxItemState::DISABLED);
}
}
@@ -1360,7 +1356,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl
// the RealSlot is always on
SfxFoundCache_Impl *pFound = new SfxFoundCache_Impl(
- pRealSlot->GetSlotId(), pRealSlot->GetWhich(rPool), pRealSlot, pCache );
+ pRealSlot->GetWhich(rPool), pRealSlot, pCache );
rFound.push_back( pFound );
// Search through the bindings for slots served by the same function. This , // will only affect slots which are present in the found interface.
@@ -1420,7 +1416,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl
if ( bInsert && bSameMethod )
{
SfxFoundCache_Impl *pFoundCache = new SfxFoundCache_Impl(
- pSibling->GetSlotId(), pSibling->GetWhich(rPool),
+ pSibling->GetWhich(rPool),
pSibling, pSiblingCache );
rFound.push_back( pFoundCache );
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 8ec2ce8d3054..023b4cb4542c 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -126,7 +126,6 @@ struct SfxDispatcher_Impl
SfxObjectBars_Impl aObjBars[SFX_OBJECTBAR_MAX];
SfxObjectBars_Impl aFixedObjBars[SFX_OBJECTBAR_MAX];
std::vector<sal_uInt32> aChildWins;
- sal_uInt32 nEventId; // EventId UserEvent
bool bNoUI; // UI only from Parent Dispatcher
bool bReadOnly; // Document is ReadOnly
bool bQuiet; // Only use parent dispatcher
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index fea4f79652ea..aafe9c7ddd5f 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -657,8 +657,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox,
// Constructor
SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window* pW, bool )
- : mbIgnoreSelect(false)
- , pBindings(pB)
+ : pBindings(pB)
, pWindow(pW)
, pModule(nullptr)
, pIdle(nullptr)
@@ -679,7 +678,6 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl
, bDontUpdate(false)
, bIsWater(false)
- , bEnabled(true)
, bUpdate(false)
, bUpdateFamily(false)
, bCanEdit(false)
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index f9426b8e81f1..953369d86ea3 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -65,17 +65,12 @@ struct SfxObjectFactory_Impl
OUString aServiceName;
SfxFilterContainer* pFilterContainer;
SfxModule* pModule;
- sal_uInt16 nImageId;
- OUString aStandardTemplate;
- bool bTemplateInitialized;
SvGlobalName aClassName;
SfxObjectFactory_Impl() :
pNameResId ( nullptr ),
pFilterContainer ( nullptr ),
- pModule ( nullptr ),
- nImageId ( 0 ),
- bTemplateInitialized( false )
+ pModule ( nullptr )
{}
};
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 563803abafd1..94633e6d5873 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -203,7 +203,6 @@ public:
const SfxFilter* m_pFilter;
std::unique_ptr<SfxFilter> m_pCustomFilter;
- SfxMedium* pAntiImpl;
SvStream* m_pInStream;
SvStream* m_pOutStream;
@@ -239,7 +238,7 @@ public:
util::DateTime m_aDateTime;
- explicit SfxMedium_Impl( SfxMedium* pAntiImplP );
+ explicit SfxMedium_Impl();
~SfxMedium_Impl();
OUString getFilterMimeType()
@@ -247,7 +246,7 @@ public:
};
-SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
+SfxMedium_Impl::SfxMedium_Impl() :
m_nStorOpenMode(SFX_STREAM_READWRITE),
m_eError(SVSTREAM_OK),
bUpdatePickList(true),
@@ -272,7 +271,6 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
m_pSet(nullptr),
m_pURLObj(nullptr),
m_pFilter(nullptr),
- pAntiImpl( pAntiImplP ),
m_pInStream(nullptr),
m_pOutStream(nullptr),
pOrigFilter( nullptr ),
@@ -2602,7 +2600,7 @@ void SfxMedium::Init_Impl()
}
-SfxMedium::SfxMedium() : pImp(new SfxMedium_Impl(this))
+SfxMedium::SfxMedium() : pImp(new SfxMedium_Impl)
{
Init_Impl();
}
@@ -2943,7 +2941,7 @@ void SfxMedium::CompleteReOpen()
}
SfxMedium::SfxMedium(const OUString &rName, StreamMode nOpenMode, const SfxFilter *pFlt, SfxItemSet *pInSet) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
pImp->m_pSet = pInSet;
pImp->m_pFilter = pFlt;
@@ -2953,7 +2951,7 @@ SfxMedium::SfxMedium(const OUString &rName, StreamMode nOpenMode, const SfxFilte
}
SfxMedium::SfxMedium(const OUString &rName, const OUString &rReferer, StreamMode nOpenMode, const SfxFilter *pFlt, SfxItemSet *pInSet) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
pImp->m_pSet = pInSet;
SfxItemSet * s = GetItemSet();
@@ -2967,7 +2965,7 @@ SfxMedium::SfxMedium(const OUString &rName, const OUString &rReferer, StreamMode
}
SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
SfxAllItemSet *pParams = new SfxAllItemSet( SfxGetpApp()->GetPool() );
pImp->m_pSet = pParams;
@@ -3037,7 +3035,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) :
SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const SfxItemSet* p ) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
OUString aType = SfxFilter::GetTypeFromStorage(rStor);
pImp->m_pFilter = SfxGetpApp()->GetFilterMatcher().GetFilter4EA( aType );
@@ -3056,7 +3054,7 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS
SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const OUString &rTypeName, const SfxItemSet* p ) :
- pImp(new SfxMedium_Impl(this))
+ pImp(new SfxMedium_Impl)
{
pImp->m_pFilter = SfxGetpApp()->GetFilterMatcher().GetFilter4EA( rTypeName );
DBG_ASSERT( pImp->m_pFilter, "No Filter for storage found!" );
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index d9523d52ebf8..9a75ed9e3bd4 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -226,7 +226,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
,bBasicInitialized( false )
,bIsPrintJobCancelable( true )
,bOwnsStorage( true )
- ,bNoBaseURL( false )
,bInitialized( false )
,bSignatureErrorIsShown( false )
,bModelInitialized( false )
@@ -252,7 +251,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
,bRunningMacro( false )
,bReloadAvailable( false )
,nAutoLoadLocks( 0 )
- ,pModule( nullptr )
,eFlags( SfxObjectShellFlags::UNDEFINED )
,bReadOnlyUI( false )
,nStyleFilter( 0 )
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 3e10656578ce..56ae242f1d50 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -204,7 +204,6 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
bool m_bClosing ;
bool m_bSaving ;
bool m_bSuicide ;
- bool m_bInitialized ;
bool m_bExternalTitle ;
bool m_bModifiedSinceLastSave ;
Reference< view::XPrintable> m_xPrintable ;
@@ -227,7 +226,6 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
, m_bClosing ( false )
, m_bSaving ( false )
, m_bSuicide ( false )
- , m_bInitialized ( false )
, m_bExternalTitle ( false )
, m_bModifiedSinceLastSave( false )
, m_pStorageModifyListen ( nullptr )
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 3c17d3b49259..46834b3fb057 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -98,8 +98,6 @@ public:
// global pointers
SfxItemPool* pPool;
- SvtSaveOptions* pSaveOptions;
- SvtHelpOptions* pHelpOptions;
// "current" functionality
SfxProgress* pProgress;
@@ -117,7 +115,6 @@ public:
SfxViewFrameArr_Impl* pViewFrames;
SfxViewShellArr_Impl* pViewShells;
SfxObjectShellArr_Impl* pObjShells;
- ResMgr* pSfxResManager;
SfxBasicManagerHolder* pBasicManager;
SfxBasicManagerCreationListener*
pBasMgrListener;
@@ -127,14 +124,10 @@ public:
SfxInterface** pInterfaces;
::rtl::Reference<sfx2::sidebar::Theme> m_pSidebarTheme;
- sal_uInt16 nDocNo; // current Doc-Number (AutoName)
- sal_uInt16 nInterfaces;
+ sal_uInt16 nInterfaces;
- bool bDispatcherLocked:1; // do nothing
bool bDowning:1; // sal_True on Exit and afterwards
bool bInQuit : 1;
- bool bInvalidateOnUnlock : 1;
- bool bODFVersionWarningLater : 1;
SfxAppData_Impl( SfxApplication* );
~SfxAppData_Impl();
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 6e2f568d28e5..a6310037d760 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -78,7 +78,6 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
bBasicInitialized :1,
bIsPrintJobCancelable :1, // Stampit disable/enable cancel button for print jobs ... default = true = enable!
bOwnsStorage:1,
- bNoBaseURL:1,
bInitialized:1,
bSignatureErrorIsShown:1,
bModelInitialized:1, // whether the related model is initialized
@@ -107,12 +106,11 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
bool bRunningMacro;
bool bReloadAvailable;
sal_uInt16 nAutoLoadLocks;
- SfxModule* pModule;
- SfxObjectShellFlags eFlags;
+ SfxObjectShellFlags eFlags;
bool bReadOnlyUI;
tools::SvRef<SvRefBase> xHeaderAttributes;
::rtl::Reference< SfxBaseModel >
- pBaseModel;
+ pBaseModel;
sal_uInt16 nStyleFilter;
bool bDisposing;
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 9a870745ea18..c7c70e2eb5fe 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -33,13 +33,11 @@ class SfxPickList : public SfxListener
{
struct PickListEntry
{
- PickListEntry( const OUString& _aName, const OUString& _aFilter, const OUString& _aTitle ) :
- aName( _aName ), aFilter( _aFilter ), aTitle( _aTitle ) {}
+ PickListEntry( const OUString& _aName, const OUString& _aFilter ) :
+ aName( _aName ), aFilter( _aFilter ) {}
OUString aName;
OUString aFilter;
- OUString aTitle;
- OUString aOptions;
};
std::vector< PickListEntry* > m_aPicklistVector;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 54190385efae..8b640c2150a4 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -159,8 +159,6 @@ private:
class DeletionWatcher;
friend class DeletionWatcher;
- bool mbIgnoreSelect;
-
void ReadResource();
void ClearResource();
void impl_clear();
@@ -202,7 +200,6 @@ protected:
bool bDontUpdate :1;
bool bIsWater :1;
- bool bEnabled :1;
bool bUpdate :1;
bool bUpdateFamily :1;
bool bCanEdit :1;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 3dc52554d3b7..55334bfa0797 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -156,15 +156,6 @@ enum class SfxDockingConfig
};
-struct SfxObjectBarList_Impl
-{
- std::deque<SfxObjectBar_Impl> aArr;
- sal_uInt16 nAct;
-
- SfxObjectBar_Impl operator[] ( sal_uInt16 n )
- { return aArr[n]; }
-};
-
#define SFX_SPLITWINDOWS_LEFT 0
#define SFX_SPLITWINDOWS_TOP 2
#define SFX_SPLITWINDOWS_RIGHT 1
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 33d4d7904893..ee08b52c1058 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -83,7 +83,7 @@ SfxPoolItem* SfxUnoFrameItem::CreateDefault()
}
void SfxFrame::Construct_Impl()
{
- pImp = new SfxFrame_Impl( this );
+ pImp = new SfxFrame_Impl;
if ( !pFramesArr_Impl )
pFramesArr_Impl = new SfxFrameArr_Impl;
pFramesArr_Impl->push_back( this );
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 18a3ec2e0b60..1229b4469733 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -40,14 +40,12 @@ public:
sal_uInt32 nType;
SfxViewFrame* pCurrentViewFrame;
SfxFrameDescriptor* pDescr;
- sal_uInt16 nLocks;
bool bClosing : 1;
bool bPrepClosing : 1;
bool bInCancelTransfers : 1;
bool bOwnsBindings : 1;
bool bReleasingComponent : 1;
bool bInPlace : 1;
- SfxFrame* pFrame;
SfxWorkWindow* pWorkWin;
SvBorder aBorder;
// formerly SfxTopFrame
@@ -56,18 +54,16 @@ public:
bool bLockResize;
bool bMenuBarOn;
- explicit SfxFrame_Impl( SfxFrame* pAntiImplP )
+ explicit SfxFrame_Impl()
:nType( 0L )
,pCurrentViewFrame( nullptr )
,pDescr( nullptr )
- ,nLocks( 0 )
,bClosing(false)
,bPrepClosing(false)
,bInCancelTransfers( false )
,bOwnsBindings( false )
,bReleasingComponent( false )
,bInPlace( false )
- ,pFrame( pAntiImplP )
,pWorkWin( nullptr )
,pExternalContainerWindow( nullptr )
,bHidden( false )
generated by cgit (git 2.34.1) at 2025-01-08 16:58:24 +0000