diff options
28 files changed, 30 insertions, 71 deletions
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 0db7a04f82d5..0327f27fe486 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -54,8 +54,7 @@ SfxViewShell* GraphicViewShellBase::CreateInstance ( } void GraphicViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { - pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,"Default"); + pFactory = new SfxViewFactory(&CreateInstance,nPrio,"Default"); InitFactory(); } void GraphicViewShellBase::InitFactory() diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index eebc01af9c28..e9f570bdc03c 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -55,8 +55,7 @@ SfxViewShell* ImpressViewShellBase::CreateInstance ( } void ImpressViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { - pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,"Default"); + pFactory = new SfxViewFactory(&CreateInstance,nPrio,"Default"); InitFactory(); } void ImpressViewShellBase::InitFactory() diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx index 4783b45f30fc..8e74361432df 100644 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -52,8 +52,7 @@ SfxViewShell* OutlineViewShellBase::CreateInstance ( } void OutlineViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { - pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,"Outline"); + pFactory = new SfxViewFactory(&CreateInstance,nPrio,"Outline"); InitFactory(); } void OutlineViewShellBase::InitFactory() diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index bd431606101a..d15bec7a85b5 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -61,7 +61,7 @@ SfxViewShell* PresentationViewShellBase::CreateInstance ( void PresentationViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,"FullScreenPresentation"); + &CreateInstance,nPrio,"FullScreenPresentation"); InitFactory(); } void PresentationViewShellBase::InitFactory() diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx index a52b4d4ff2db..fb3133e4df53 100644 --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -56,8 +56,7 @@ SfxViewShell* SlideSorterViewShellBase::CreateInstance ( void SlideSorterViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { - pFactory = new SfxViewFactory( - &CreateInstance,&InitFactory,nPrio,"SlideSorter"); + pFactory = new SfxViewFactory(&CreateInstance,nPrio,"SlideSorter"); InitFactory(); } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index aa7cbbc5ef6a..3b4114e411b5 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -240,7 +240,7 @@ SfxViewShell* ViewShellBase::CreateInstance ( } void ViewShellBase::RegisterFactory( sal_uInt16 nPrio ) { - pFactory = new SfxViewFactory( &CreateInstance,&InitFactory,nPrio,"Default" ); + pFactory = new SfxViewFactory( &CreateInstance,nPrio,"Default" ); InitFactory(); } void ViewShellBase::InitFactory() diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index 13a482a4d669..cc90161cb78c 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -187,7 +187,6 @@ public: private: GetTabPageRanges fnGetRanges; - sal_uInt16* pRanges; OKButton* pOKBtn; CancelButton* pCancelBtn; diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx index a46065c62c27..25adb3ea3d58 100644 --- a/sfx2/inc/sfx2/hintpost.hxx +++ b/sfx2/inc/sfx2/hintpost.hxx @@ -43,7 +43,6 @@ class SfxHintPoster: public SvRefBase */ { - sal_uIntPtr nId; GenLink aLink; private: diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx index e3f426ab0c7c..e65220be2a13 100644 --- a/sfx2/inc/sfx2/mnuitem.hxx +++ b/sfx2/inc/sfx2/mnuitem.hxx @@ -39,7 +39,6 @@ class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem SfxVirtualMenu* pOwnMenu; SfxVirtualMenu* pSubMenu; sal_Bool b_ShowStrings; - sal_Bool b_UnusedDummy; public: SfxMenuControl(); diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 7426d7a254b1..5e96dc80a828 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -768,11 +768,10 @@ SV_IMPL_REF(SfxObjectShell) class AutoReloadTimer_Impl : public Timer { String aUrl; - sal_Bool bReload; SfxObjectShell* pObjSh; public: - AutoReloadTimer_Impl( const String& rURL, sal_uInt32 nTime, sal_Bool bReloadP, + AutoReloadTimer_Impl( const String& rURL, sal_uInt32 nTime, SfxObjectShell* pSh ); virtual void Timeout(); }; diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index 971d79390b42..e5e8c174caf3 100644 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -39,7 +39,6 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser SfxMedium* pMedium; SfxMedium *pDLMedium; // Medium for Download Files - sal_uInt16 nMetaTags; // Number of previously read Meta-Tags ScriptType eScriptType; SAL_DLLPRIVATE void GetScriptType_Impl( SvKeyValueIterator* ); diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index e8a11c434f67..b0c35990c0e2 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -347,7 +347,6 @@ protected: DECL_LINK( Activate, Menu * ); private: String aLastURL; - sal_Bool bBigImages; PopupMenu* pMenu; sal_uIntPtr m_nSymbolsStyle; sal_Bool m_bShowMenuImages; diff --git a/sfx2/inc/sfx2/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx index b5dae35fc714..3348cb69d199 100644 --- a/sfx2/inc/sfx2/viewfac.hxx +++ b/sfx2/inc/sfx2/viewfac.hxx @@ -29,13 +29,12 @@ class SfxViewShell; class Window; typedef SfxViewShell* (*SfxViewCtor)(SfxViewFrame*, SfxViewShell*); -typedef void (*SfxViewInit)(); // CLASS ----------------------------------------------------------------- class SFX2_DLLPUBLIC SfxViewFactory { public: - SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, + SfxViewFactory( SfxViewCtor fnC, sal_uInt16 nOrdinal, const sal_Char* asciiViewName ); SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh); @@ -53,7 +52,6 @@ public: private: SfxViewCtor fnCreate; - SfxViewInit fnInit; sal_uInt16 nOrd; const String m_sViewName; }; diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index ff42068596ff..3c9387c4149d 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -113,7 +113,7 @@ public: \ { return new Class(pFrame, pOldView); } \ void Class::RegisterFactory( sal_uInt16 nPrio ) \ { \ - pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,AsciiViewName);\ + pFactory = new SfxViewFactory(&CreateInstance,nPrio,AsciiViewName);\ InitFactory(); \ } \ void Class::InitFactory() diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index b1b56997d32c..c3e98e01a7d1 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -46,7 +46,6 @@ class SvFileObject : public sfx2::SvLinkSource sal_Bool bWaitForData : 1; sal_Bool bInNewData : 1; sal_Bool bDataReady : 1; - sal_Bool bMedUseCache : 1; sal_Bool bNativFormat : 1; sal_Bool bClearMedium : 1; sal_Bool bStateChangeCalled : 1; diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 88c4563e6634..eb6f06cef991 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -298,21 +298,19 @@ void SfxHelpOptions_Impl::Commit() class SfxHelp_Impl { private: - sal_Bool m_bIsDebug; // environment variable "help_debug=1" SfxHelpOptions_Impl* m_pOpt; // the options ::std::vector< ::rtl::OUString > m_aModulesList; // list of all installed modules public: - SfxHelp_Impl( sal_Bool bDebug ); + SfxHelp_Impl(); ~SfxHelp_Impl(); SfxHelpOptions_Impl* GetOptions(); static String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ); }; -SfxHelp_Impl::SfxHelp_Impl( sal_Bool bDebug ) : +SfxHelp_Impl::SfxHelp_Impl() : - m_bIsDebug ( bDebug ), m_pOpt ( NULL ) { @@ -356,7 +354,7 @@ SfxHelp::SfxHelp() : bIsDebug = !sHelpDebug.isEmpty(); } - pImp = new SfxHelp_Impl( bIsDebug ); + pImp = new SfxHelp_Impl(); ::rtl::OUString aLocaleStr = HelpLocaleString(); diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 9c6425957b50..8bc4946ca118 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -65,8 +65,7 @@ static HTMLOptionEnum const aAreaShapeOptEnums[] = SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc, SfxMedium *pMed ) : HTMLParser( rStream, bIsNewDoc ), - pMedium( pMed ), pDLMedium( 0 ), - nMetaTags( 0 ) + pMedium( pMed ), pDLMedium( 0 ) { DBG_ASSERT( RTL_TEXTENCODING_UTF8 == GetSrcEncoding( ), "SfxHTMLParser::SfxHTMLParser: From where comes ZS?" ); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index cd6efdf61047..6d77417dfd14 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -61,19 +61,16 @@ extern sal_Bool GetSplitSizeFromString( const String& rStr, Size& rSize ); // - Add new slot definitions to sfx.sdi static const int NUM_OF_DOCKINGWINDOWS = 10; -class SfxTitleDockingWindow; class SfxTitleDockingWindow : public SfxDockingWindow { Window* m_pWrappedWindow; - sal_uInt16 m_nID; public: SfxTitleDockingWindow( SfxBindings* pBindings , SfxChildWindow* pChildWin , Window* pParent , - WinBits nBits, - sal_uInt16 nID); + WinBits nBits); virtual ~SfxTitleDockingWindow(); Window* GetWrappedWindow() const { return m_pWrappedWindow; } @@ -134,7 +131,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , const rtl::OUString aDockWindowResourceURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/dockingwindow/" )); SfxTitleDockingWindow* pTitleDockWindow = new SfxTitleDockingWindow( pBindings, this, pParentWnd, - WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE, nId); + WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); pWindow = pTitleDockWindow; eChildAlignment = SFX_ALIGN_NOALIGNMENT; @@ -266,14 +263,12 @@ SfxChildWinInfo SfxDockingWrapper::GetInfo() const SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind , SfxChildWindow* pChildWin , Window* pParent , - WinBits nBits, - sal_uInt16 nID ) : + WinBits nBits ) : SfxDockingWindow( pBind , pChildWin , pParent , nBits ), - m_pWrappedWindow(0), - m_nID(nID) + m_pWrappedWindow(0) { } diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 10ff4e34ab7c..49690dab556d 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -178,7 +178,6 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( pChildWin, pParent, SfxResId( SID_RECORDING_FLOATWINDOW ) ) - , pWrapper( pChildWin ) , aTbx( this, SfxResId(SID_RECORDING_FLOATWINDOW) ) { // Retrieve label from helper function diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index baef6c0c6d40..3982e2e3f24b 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -421,7 +421,6 @@ class StyleTreeListBox_Impl : public DropListBox_Impl { private: SvLBoxEntry* pCurEntry; - SfxCommonTemplateDialog_Impl* pCommon; Link aDoubleClickLink; Link aDropLink; String aParent; @@ -589,8 +588,7 @@ void StyleTreeListBox_Impl::ExpandedHdl() StyleTreeListBox_Impl::StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle) : DropListBox_Impl(pParent->GetWindow(), nWinStyle, pParent), - pCurEntry(0), - pCommon(pParent) + pCurEntry(0) /* [Description] diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index eb7ad552d121..2515e673250d 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -43,7 +43,6 @@ namespace sfx2 class IFrameWindow_Impl : public Window { uno::Reference < frame::XFrame > mxFrame; - sal_Bool bActive; sal_Bool bBorder; public: @@ -57,7 +56,6 @@ public: IFrameWindow_Impl::IFrameWindow_Impl( Window *pParent, sal_Bool bHasBorder, WinBits nWinBits ) : Window( pParent, nWinBits | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER ) - , bActive(sal_False) , bBorder(bHasBorder) { if ( !bHasBorder ) diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 8eada2398550..ada681f1883d 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1166,7 +1166,7 @@ void SfxObjectShell::SetAutoLoad( { pImp->pReloadTimer = new AutoReloadTimer_Impl( rUrl.GetMainURL( INetURLObject::DECODE_TO_IURI ), - nTime, bReload, this ); + nTime, this ); pImp->pReloadTimer->Start(); } } @@ -1442,8 +1442,8 @@ void SfxObjectShell::CancelTransfers() //------------------------------------------------------------------------- AutoReloadTimer_Impl::AutoReloadTimer_Impl( - const String& rURL, sal_uInt32 nTime, sal_Bool bReloadP, SfxObjectShell* pSh ) - : aUrl( rURL ), bReload( bReloadP ), pObjSh( pSh ) + const String& rURL, sal_uInt32 nTime, SfxObjectShell* pSh ) + : aUrl( rURL ), pObjSh( pSh ) { SetTimeout( nTime ); } diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx index 47a30361a008..256c96c58cfc 100644 --- a/sfx2/source/inc/recfloat.hxx +++ b/sfx2/source/inc/recfloat.hxx @@ -39,7 +39,6 @@ public: class SfxRecordingFloat_Impl : public SfxFloatingWindow { - SfxChildWindow* pWrapper; ToolBox aTbx; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xStopRecTbxCtrl; public: diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 035de641d1b7..934c0c0ead2e 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1399,7 +1399,6 @@ void SfxPopupWindow::Delete() SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ) : SfxToolBoxControl( nSlotId, nId, rBox ) - , bBigImages( sal_False ) , pMenu( 0 ) { rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW ); diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index 207ad17badf0..079b84a991d6 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -71,13 +71,11 @@ struct SfxViewFrame_Impl class SfxFrameViewWindow_Impl : public Window { - sal_Bool bActive; SfxViewFrame* pFrame; public: SfxFrameViewWindow_Impl( SfxViewFrame* p, Window& rParent, WinBits nBits=0 ) : Window( &rParent, nBits | WB_BORDER | WB_CLIPCHILDREN ), - bActive( sal_False ), pFrame( p ) { SetBorderStyle( WINDOW_BORDER_TOPBOTTOM ); diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index b66ef6718cec..33cc346acab4 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -323,15 +323,13 @@ void SAL_CALL SfxStatusIndicator::disposing( const com::sun::star::lang::EventOb class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFrameActionListener > { public: - IMPL_SfxBaseController_ListenerHelper( MUTEX& aMutex , - SfxBaseController* pController ) ; + IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) ; virtual ~IMPL_SfxBaseController_ListenerHelper() ; virtual void SAL_CALL frameAction( const FRAMEACTIONEVENT& aEvent ) throw (RUNTIMEEXCEPTION) ; virtual void SAL_CALL disposing( const EVENTOBJECT& aEvent ) throw (RUNTIMEEXCEPTION) ; private: - MUTEX& m_aMutex ; SfxBaseController* m_pController ; } ; // class IMPL_SfxBaseController_ListenerContainer @@ -339,8 +337,7 @@ private: class IMPL_SfxBaseController_CloseListenerHelper : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener > { public: - IMPL_SfxBaseController_CloseListenerHelper( MUTEX& aMutex , - SfxBaseController* pController ) ; + IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController* pController ) ; virtual ~IMPL_SfxBaseController_CloseListenerHelper() ; virtual void SAL_CALL queryClosing( const EVENTOBJECT& aEvent, sal_Bool bDeliverOwnership ) throw (RUNTIMEEXCEPTION, com::sun::star::util::CloseVetoException) ; @@ -349,15 +346,12 @@ public: private: - MUTEX& m_aMutex; SfxBaseController* m_pController; } ; // class IMPL_SfxBaseController_ListenerContainer -IMPL_SfxBaseController_CloseListenerHelper::IMPL_SfxBaseController_CloseListenerHelper( MUTEX& aMutex , - SfxBaseController* pController ) - : m_aMutex ( aMutex ) - , m_pController ( pController ) +IMPL_SfxBaseController_CloseListenerHelper::IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController* pController ) + : m_pController ( pController ) { } @@ -421,8 +415,8 @@ struct IMPL_SfxBaseController_DataContainer IMPL_SfxBaseController_DataContainer( MUTEX& aMutex , SfxViewShell* pViewShell , SfxBaseController* pController ) - : m_xListener ( new IMPL_SfxBaseController_ListenerHelper( aMutex, pController ) ) - , m_xCloseListener ( new IMPL_SfxBaseController_CloseListenerHelper( aMutex, pController ) ) + : m_xListener ( new IMPL_SfxBaseController_ListenerHelper( pController ) ) + , m_xCloseListener ( new IMPL_SfxBaseController_CloseListenerHelper( pController ) ) , m_aUserInputInterception ( *pController, aMutex ) , m_aListenerContainer ( aMutex ) , m_aInterceptorContainer ( aMutex ) @@ -439,10 +433,8 @@ struct IMPL_SfxBaseController_DataContainer // IMPL_SfxBaseController_ListenerHelper constructor //________________________________________________________________________________________________________ -IMPL_SfxBaseController_ListenerHelper::IMPL_SfxBaseController_ListenerHelper( MUTEX& aMutex , - SfxBaseController* pController ) - : m_aMutex ( aMutex ) - , m_pController ( pController ) +IMPL_SfxBaseController_ListenerHelper::IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) + : m_pController ( pController ) { } diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index a7e15a1e4a06..d1b9528fbdbd 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -52,10 +52,9 @@ String SfxViewFactory::GetAPIViewName() const // CTOR / DTOR ----------------------------------------------------------- -SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, +SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, sal_uInt16 nOrdinal, const sal_Char* asciiViewName ): fnCreate(fnC), - fnInit(fnI), nOrd(nOrdinal), m_sViewName( rtl::OUString::createFromAscii( asciiViewName ) ) { diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index cb8a2e8a994d..5bc80c36073c 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -420,7 +420,6 @@ private: SfxViewShell* _pViewSh; PrinterSetupDialog* _pSetupParent; SfxItemSet* _pOptions; - sal_Bool _bModified; sal_Bool _bHelpDisabled; DECL_LINK( Execute, void * ); @@ -441,7 +440,6 @@ SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSe _pViewSh ( pViewSh ), _pSetupParent ( pParent ), _pOptions ( NULL ), - _bModified ( sal_False ), _bHelpDisabled ( sal_False ) { |