[Libreoffice-commits] core.git: 2 commits - scaddins/source scripting/source sd/qa sd/source sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 10 09:03:44 UTC 2018
scaddins/source/analysis/analysis.cxx | 4 ----
scaddins/source/datefunc/datefunc.cxx | 4 +---
scaddins/source/pricing/pricing.cxx | 4 +---
scripting/source/basprov/basprov.cxx | 2 --
scripting/source/dlgprov/dlgprov.cxx | 1 -
scripting/source/provider/MasterScriptProvider.cxx | 2 +-
sd/qa/unit/uimpress.cxx | 1 -
sd/source/core/drawdoc.cxx | 8 --------
sd/source/core/sdpage.cxx | 1 -
sd/source/core/undo/undoobjects.cxx | 1 -
sd/source/filter/eppt/eppt.cxx | 4 ----
sd/source/filter/eppt/pptx-epptbase.cxx | 4 +---
sd/source/filter/eppt/pptx-text.cxx | 4 ----
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 1 -
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 3 +--
sd/source/ui/animations/CustomAnimationDialog.cxx | 3 +--
sd/source/ui/annotations/annotationwindow.cxx | 2 --
sd/source/ui/app/optsitem.cxx | 1 -
sd/source/ui/app/sdxfer.cxx | 5 -----
sd/source/ui/dlg/navigatr.cxx | 2 --
sd/source/ui/dlg/prltempl.cxx | 1 -
sd/source/ui/docshell/docshell.cxx | 6 ------
sd/source/ui/func/fudspord.cxx | 1 -
sd/source/ui/func/fuhhconv.cxx | 2 +-
sd/source/ui/func/fupage.cxx | 1 -
sd/source/ui/presenter/PresenterTextView.cxx | 1 -
sd/source/ui/remotecontrol/Communicator.cxx | 4 +---
sd/source/ui/sidebar/LayoutMenu.cxx | 1 -
sd/source/ui/sidebar/MasterPageContainer.cxx | 2 --
sd/source/ui/unoidl/DrawController.cxx | 4 ++--
sd/source/ui/view/OutlinerIterator.cxx | 6 ++----
sd/source/ui/view/ToolBarManager.cxx | 1 -
sd/source/ui/view/outlnvsh.cxx | 1 -
sd/source/ui/view/outlview.cxx | 1 -
sd/source/ui/view/sdview.cxx | 2 --
sw/source/uibase/docvw/edtwin.cxx | 8 +++++++-
36 files changed, 19 insertions(+), 80 deletions(-)
New commits:
commit 6a85925841feffdefead52ba35acd3379c8aa8ce
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Sep 10 09:20:08 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Sep 10 11:03:26 2018 +0200
loplugin:simplifyconstruct in scaddins..sd
Change-Id: Ia2c04ef9fe5113b8b04304d0f495b948b5371fb4
Reviewed-on: https://gerrit.libreoffice.org/60237
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 0576fc38158c..52ff6924f3a7 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -82,10 +82,6 @@ void AnalysisAddIn::InitData()
}
AnalysisAddIn::AnalysisAddIn( const uno::Reference< uno::XComponentContext >& xContext ) :
- pDefLocales( nullptr ),
- pFD( nullptr ),
- pFactDoubles( nullptr ),
- pCDL( nullptr ),
aAnyConv( xContext )
{
}
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index bcf5102faf9f..407b8425fe10 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -123,9 +123,7 @@ SAL_DLLPUBLIC_EXPORT void * date_component_getFactory(
} // extern C
// "normal" service implementation
-ScaDateAddIn::ScaDateAddIn() :
- pDefLocales( nullptr ),
- pFuncDataList( nullptr )
+ScaDateAddIn::ScaDateAddIn()
{
}
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index ced28ba974a8..eaf76ff60418 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -126,9 +126,7 @@ SAL_DLLPUBLIC_EXPORT void * pricing_component_getFactory(
} // extern C
// "normal" service implementation
-ScaPricingAddIn::ScaPricingAddIn() :
- pDefLocales( nullptr ),
- pFuncDataList( nullptr )
+ScaPricingAddIn::ScaPricingAddIn()
{
}
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index e63a47f00841..6180fa333627 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -100,8 +100,6 @@ namespace basprov
BasicProviderImpl::BasicProviderImpl( const Reference< XComponentContext >& xContext )
:m_pAppBasicManager( nullptr )
,m_pDocBasicManager( nullptr )
- ,m_xLibContainerApp( nullptr )
- ,m_xLibContainerDoc( nullptr )
,m_xContext( xContext )
,m_bIsAppScriptCtx( true )
,m_bIsUserCtx(true)
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 92bea89e5733..537499cbd0df 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -196,7 +196,6 @@ namespace dlgprov
DialogProviderImpl::DialogProviderImpl( const Reference< XComponentContext >& rxContext )
:m_xContext( rxContext )
- ,m_xModel( nullptr )
{
}
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index ee08adecd50a..d06833d7a6dd 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -70,7 +70,7 @@ bool endsWith( const OUString& target, const OUString& item )
MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext > & xContext ):
m_xContext( xContext ), m_bIsValid( false ), m_bInitialised( false ),
- m_bIsPkgMSP( false ), m_pPCache( nullptr )
+ m_bIsPkgMSP( false )
{
ENSURE_OR_THROW( m_xContext.is(), "MasterScriptProvider::MasterScriptProvider: No context available\n" );
m_xMgr = m_xContext->getServiceManager();
diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx
index ec39b2abe626..9567df577c45 100644
--- a/sd/qa/unit/uimpress.cxx
+++ b/sd/qa/unit/uimpress.cxx
@@ -52,7 +52,6 @@ private:
};
Test::Test()
- : m_pDoc(nullptr)
{
m_xContext = cppu::defaultBootstrap_InitialComponentContext();
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 600102981ade..0598fe22e37a 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -134,13 +134,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
: FmFormModel(
nullptr,
pDrDocSh)
-, mpOutliner(nullptr)
-, mpInternalOutliner(nullptr)
-, mpWorkStartupTimer(nullptr)
-, mpOnlineSpellingIdle(nullptr)
-, mpOnlineSpellingList(nullptr)
-, mpOnlineSearchItem(nullptr)
-, mpCustomShowList(nullptr)
, mpDocSh(static_cast< ::sd::DrawDocShell*>(pDrDocSh))
, mpCreatingTransferable( nullptr )
, mbHasOnlineSpellErrors(false)
@@ -155,7 +148,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
, mePageNumType(SVX_NUM_ARABIC)
, mbAllocDocSh(false)
, meDocType(eType)
-, mpCharClass(nullptr)
, mbEmbedFonts(false)
, mbEmbedUsedFontsOnly(false)
, mbEmbedFontScriptLatin(true)
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 718cb8a463de..7f9c18e72978 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -117,7 +117,6 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage)
, meCharSet(osl_getThreadTextEncoding())
, mnPaperBin(PAPERBIN_PRINTER_SETTINGS)
, mpPageLink(nullptr)
-, mpItems(nullptr)
, mnTransitionType(0)
, mnTransitionSubtype(0)
, mbTransitionDirection(true)
diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx
index 9a342680ae76..b497f1a06d71 100644
--- a/sd/source/core/undo/undoobjects.cxx
+++ b/sd/source/core/undo/undoobjects.cxx
@@ -173,7 +173,6 @@ void UndoReplaceObject::Redo()
UndoObjectSetText::UndoObjectSetText( SdrObject& rObject, sal_Int32 nText )
: SdrUndoObjSetText( rObject, nText )
-, mpUndoAnimation(nullptr)
, mbNewEmptyPresObj(false)
, mxSdrObject( &rObject )
{
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 7fb0e3df3e59..1ec8b3d11d75 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -87,10 +87,6 @@ PPTWriter::PPTWriter( tools::SvRef<SotStorage> const & rSvStorage,
mbFontIndependentLineSpacing( false ),
mnTextSize( 0 ),
mrStg ( rSvStorage ),
- mpCurUserStrm ( nullptr ),
- mpStrm ( nullptr ),
- mpPicStrm ( nullptr ),
- mpPptEscherEx ( nullptr ),
mnVBAOleOfs ( 0 ),
mpVBA ( pVBA ),
mnExEmbed ( 0 ),
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 0d20f0f68e13..4940bf855754 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -125,9 +125,7 @@ static PHLayout pPHLayout[] =
};
PPTWriterBase::PPTWriterBase()
- : mXModel(nullptr)
- , mXStatusIndicator(nullptr)
- , mbStatusIndicator(false)
+ : mbStatusIndicator(false)
, mbPresObj(false)
, mbEmptyPresObj(false)
, mbIsBackgroundDark(false)
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 00e8c483c327..bbcc1a1a7312 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -73,8 +73,6 @@ PortionObj::PortionObj(const css::uno::Reference< css::beans::XPropertySet > & r
, mnAsianOrComplexFont(0xffff)
, mnTextSize(0)
, mbLastPortion(true)
- , mpText(nullptr)
- , mpFieldEntry(nullptr)
{
mXPropSet = rXPropSet;
@@ -96,8 +94,6 @@ PortionObj::PortionObj(css::uno::Reference< css::text::XTextRange > & rXTextRang
, mnAsianOrComplexFont(0xffff)
, mnCharEscapement(0)
, mbLastPortion(bLast)
- , mpText(nullptr)
- , mpFieldEntry(nullptr)
{
OUString aString( rXTextRange->getString() );
OUString aURL;
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index f4cc1a71b0b6..bf9fd9b89f7a 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -73,7 +73,6 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase (
AccessibleRole::DOCUMENT),
mpWindow (pSdWindow),
mxController (rxController),
- mxModel (nullptr),
maViewForwarder (
static_cast<SdrPaintView*>(pViewShell->GetView()),
*pSdWindow)
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 7724c75b9511..8e0124f53641 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -86,8 +86,7 @@ AccessibleDrawDocumentView::AccessibleDrawDocumentView (
const uno::Reference<frame::XController>& rxController,
const uno::Reference<XAccessible>& rxParent)
: AccessibleDocumentViewBase (pSdWindow, pViewShell, rxController, rxParent),
- mpSdViewSh( pViewShell ),
- mpChildrenManager (nullptr)
+ mpSdViewSh( pViewShell )
{
UpdateAccessibleName();
}
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index dea31a7edce4..b1e03f4452f3 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2157,7 +2157,6 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl, ListBox&, void)
CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OString& sPage)
: TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui")
, mpSet( std::move(pSet) )
-, mpResultSet( nullptr )
{
get(mpTabControl, "tabs");
@@ -2268,7 +2267,7 @@ std::unique_ptr<STLPropertySet> CustomAnimationDialog::createDefaultSet()
}
PropertyControl::PropertyControl( vcl::Window* pParent )
-: ListBox( pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN ), mpSubControl(nullptr)
+: ListBox( pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN )
{
}
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index aefa5b680a64..e8f518582ef1 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -265,8 +265,6 @@ AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShel
, mrManager( rManager )
, mpDocShell( pDocShell )
, mpDoc( pDocShell->GetDoc() )
-, mpOutlinerView(nullptr)
-, mpOutliner(nullptr)
, mpVScrollbar(nullptr)
, mbReadonly(pDocShell->IsReadOnly())
, mbProtected(false)
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 0a6f4b5656da..a00c357f7f08 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -76,7 +76,6 @@ bool SdOptionsItem::PutProperties( const Sequence< OUString >& rNames, const Seq
SdOptionsGeneric::SdOptionsGeneric(bool bImpress, const OUString& rSubTree)
: maSubTree(rSubTree)
- , mpCfgItem( nullptr)
, mbImpress(bImpress)
, mbInit(rSubTree.isEmpty())
, mbEnableModify(false)
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 1fc338954cae..90d651c257b5 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -76,17 +76,12 @@ constexpr sal_uInt32 SDTRANSFER_OBJECTTYPE_DRAWOLE = 2;
SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, bool bInitOnGetData )
: mpPageDocShell( nullptr )
-, mpOLEDataHelper( nullptr )
-, mpObjDesc( nullptr )
, mpSdView( pWorkView )
, mpSdViewIntern( pWorkView )
, mpSdDrawDocument( nullptr )
, mpSdDrawDocumentIntern( nullptr )
, mpSourceDoc( pSrcDoc )
, mpVDev( nullptr )
-, mpBookmark( nullptr )
-, mpGraphic( nullptr )
-, mpImageMap( nullptr )
, mbInternalMove( false )
, mbOwnDocument( false )
, mbOwnView( false )
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 754a198caf82..3bac4eee91cd 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -69,8 +69,6 @@ SdNavigatorWin::SdNavigatorWin(vcl::Window* pParent, SfxBindings* pInBindings)
// On changes of the DragType: adjust SelectionMode of TLB!
, meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED )
, mpBindings ( pInBindings )
- , mpNavigatorCtrlItem( nullptr )
- , mpPageNameCtrlItem( nullptr )
{
get(maToolbox, "toolbox");
get(maTlbObjects, "tree");
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 44b0a1320a15..030439b41341 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -61,7 +61,6 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell const * pDocSh,
mpDocShell ( pDocSh ),
ePO ( _ePO ),
aInputSet ( *rStyleBase.GetItemSet().GetPool(), svl::Items<SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL>{} ),
- pOutSet ( nullptr ),
pOrgSet ( &rStyleBase.GetItemSet() )
{
if( IS_OUTLINE(ePO))
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 09f460c994f2..4bc7339b037e 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -132,10 +132,8 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode,
DocumentType eDocumentType) :
SfxObjectShell( eMode == SfxObjectCreateMode::INTERNAL ? SfxObjectCreateMode::EMBEDDED : eMode),
mpDoc(nullptr),
- mpUndoManager(nullptr),
mpPrinter(nullptr),
mpViewShell(nullptr),
- mpFontList(nullptr),
meDocType(eDocumentType),
mbSdDataObj(bDataObject),
mbOwnPrinter(false)
@@ -146,10 +144,8 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode,
DrawDocShell::DrawDocShell( SfxModelFlags nModelCreationFlags, bool bDataObject, DocumentType eDocumentType ) :
SfxObjectShell( nModelCreationFlags ),
mpDoc(nullptr),
- mpUndoManager(nullptr),
mpPrinter(nullptr),
mpViewShell(nullptr),
- mpFontList(nullptr),
meDocType(eDocumentType),
mbSdDataObj(bDataObject),
mbOwnPrinter(false)
@@ -162,10 +158,8 @@ DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode,
DocumentType eDocumentType) :
SfxObjectShell(eMode == SfxObjectCreateMode::INTERNAL ? SfxObjectCreateMode::EMBEDDED : eMode),
mpDoc(pDoc),
- mpUndoManager(nullptr),
mpPrinter(nullptr),
mpViewShell(nullptr),
- mpFontList(nullptr),
meDocType(eDocumentType),
mbSdDataObj(bDataObject),
mbOwnPrinter(false)
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index 163125587546..369fb95423f8 100644
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -35,7 +35,6 @@ namespace sd {
FuDisplayOrder::FuDisplayOrder( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq)
: FuPoor(pViewSh, pWin, pView, pDoc, rReq)
, mpRefObj(nullptr)
-, mpOverlay(nullptr)
{
}
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index e3516b2e1bee..971cd0e2f24d 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -202,7 +202,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
if( xInit.is() )
{
// initialize dialog
- Reference< awt::XWindow > xDialogParentWindow(nullptr);
+ Reference< awt::XWindow > xDialogParentWindow;
Sequence<Any> aSeq(comphelper::InitAnyPropertySequence(
{
{"ParentWindow", uno::Any(xDialogParentWindow)}
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index aba72b39782e..5376b61e6588 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -111,7 +111,6 @@ FuPage::FuPage( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView,
: FuPoor(pViewSh, pWin, pView, pDoc, rReq),
mrReq(rReq),
mpArgs( rReq.GetArgs() ),
- mpBackgroundObjUndoAction( nullptr ),
mbPageBckgrdDeleted( false ),
mbMasterPage( false ),
mbDisplayBackgroundTabPage( true ),
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index d41cd15a2dfc..9c4fec708b5f 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -217,7 +217,6 @@ PresenterTextView::Implementation::Implementation()
: mxBitmap(),
mpCanvas(),
mpOutputDevice(VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT)),
- mpEditEngine(nullptr),
mpEditEngineItemPool(EditEngine::CreatePool()),
maSize(100,100),
maBackgroundColor(0xffffffff),
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index f1431d26991a..9ff90b6e7e3f 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -31,9 +31,7 @@ using namespace osl;
Communicator::Communicator( std::unique_ptr<IBluetoothSocket> pSocket ):
Thread( "CommunicatorThread" ),
- mpSocket( std::move(pSocket) ),
- pTransmitter( nullptr ),
- mListener( nullptr )
+ mpSocket( std::move(pSocket) )
{
}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 8c9642c65435..c2e597551f86 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -129,7 +129,6 @@ LayoutMenu::LayoutMenu (
DragSourceHelper(this),
DropTargetHelper(this),
mrBase(rViewShellBase),
- mxListener(nullptr),
mbIsMainViewChangePending(false),
mxSidebar(rxSidebar),
mbIsDisposed(false)
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 2beabbe98cdc..16cc04b26294 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -478,8 +478,6 @@ MasterPageContainer::Implementation::Implementation()
: maMutex(),
maContainer(),
meInitializationState(NOT_INITIALIZED),
- mpRequestQueue(nullptr),
- mxModel(nullptr),
mpDocument(nullptr),
maPreviewRenderer(),
mbFirstPageObjectSeen(false),
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 97305d9183c8..915c804ff91e 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -669,7 +669,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFor
std::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : nullptr;
- uno::Reference< form::runtime::XFormController > xController( nullptr );
+ uno::Reference< form::runtime::XFormController > xController;
if ( pFormShell && pSdrView && pWindow )
xController = FmFormShell::GetFormController( Form, *pSdrView, *pWindow );
return xController;
@@ -706,7 +706,7 @@ uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno::
std::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : nullptr;
- uno::Reference< awt::XControl > xControl( nullptr );
+ uno::Reference< awt::XControl > xControl;
if ( pFormShell && pSdrView && pWindow )
pFormShell->GetFormControl( xModel, *pSdrView, *pWindow, xControl );
return xControl;
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 5458eca52d28..da5e7b35096a 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -516,8 +516,7 @@ ViewIteratorImpl::ViewIteratorImpl (
bool bDirectionIsForward)
: IteratorImplBase (pDocument, rpViewShellWeak, bDirectionIsForward),
mbPageChangeOccurred(false),
- mpPage(nullptr),
- mpObjectIterator(nullptr)
+ mpPage(nullptr)
{
SetPage (nPageIndex);
}
@@ -531,8 +530,7 @@ ViewIteratorImpl::ViewIteratorImpl (
EditMode eEditMode)
: IteratorImplBase (pDocument, rpViewShellWeak, bDirectionIsForward, ePageKind, eEditMode),
mbPageChangeOccurred(false),
- mpPage(nullptr),
- mpObjectIterator(nullptr)
+ mpPage(nullptr)
{
SetPage (nPageIndex);
}
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 2b90c9b15252..607249f81023 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -522,7 +522,6 @@ ToolBarManager::Implementation::Implementation (
mbIsValid(false),
maToolBarList(),
maToolBarShellList(),
- mxLayouter(nullptr),
mnLockCount(0),
mbPreUpdatePending(false),
mbPostUpdatePending(false),
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 54918ec30a42..97e34e69ccc7 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -188,7 +188,6 @@ OutlineViewShell::OutlineViewShell (
vcl::Window* pParentWindow,
FrameView* pFrameViewArgument)
: ViewShell(pParentWindow, rViewShellBase),
- pOlView(nullptr),
pLastPage( nullptr ),
bPastePossible(false),
mbInitialized(false)
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 1fe54a21146e..da65b1b355a3 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -84,7 +84,6 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
, mnPagesToProcess(0)
, mnPagesProcessed(0)
, mbFirstPaint(true)
-, mpProgress(nullptr)
, maDocColor( COL_WHITE )
, maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE )
{
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 527c1e06f2a1..30ea493b2732 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -113,9 +113,7 @@ View::View(
mrDoc(rDrawDoc),
mpDocSh(rDrawDoc.GetDocSh()),
mpViewSh(pViewShell),
- mpDragSrcMarkList(nullptr),
mpDropMarkerObj(nullptr),
- mpDropMarker(nullptr),
mnDragSrcPgNum(SDRPAGE_NOTFOUND),
mnAction(DND_ACTION_NONE),
maDropErrorIdle("sd View DropError"),
commit 66838c2418df4d016be0da0ef1c7e54934c03421
Author: Ilhan Yesil <ilhanyesil at gmx.de>
AuthorDate: Tue Jul 31 14:36:28 2018 +0200
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon Sep 10 11:03:21 2018 +0200
tdf#119016 Editing a read-only section shall popup a dialog
While processing the key input, an additional if statement for the
paste command (Ctrl+V) is added.
Change-Id: If205589256855422ac93f8a5ed8a1ee394ca9310
Reviewed-on: https://gerrit.libreoffice.org/58360
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 93d922967bd7..b14bad0a80d8 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2250,7 +2250,13 @@ KEYINPUT_CHECKTABLE_INSDEL:
if( !m_aInBuffer.isEmpty() && ( !bNormalChar || bIsDocReadOnly ))
FlushInBuffer();
- if( m_rView.KeyInput( aKeyEvent ) )
+ if (rSh.HasReadonlySel() && rKeyCode.GetFunction() == KeyFuncType::PASTE)
+ {
+ auto xInfo(std::make_shared<weld::GenericDialogController>(GetFrameWeld(), "modules/swriter/ui/inforeadonlydialog.ui", "InfoReadonlyDialog"));
+ weld::DialogController::runAsync(xInfo, [](int) {});
+ eKeyState = SwKeyState::End;
+ }
+ else if( m_rView.KeyInput( aKeyEvent ) )
{
bFlushBuffer = true;
bNormalChar = false;
More information about the Libreoffice-commits
mailing list