summaryrefslogtreecommitdiff
path: root/sd/source/ui/docshell
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-21 14:42:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-22 08:44:08 +0200
commit60f3e9b67e688e6f7f304cc7fb14fc28af83f351 (patch)
tree41e29cb2a424e38af454690c4fc9c7c7cd6f31fd /sd/source/ui/docshell
parent450bf26c23bf2bb4346236778ef066c6e215eafe (diff)
loplugin:unusedfields in sd part3
Change-Id: Id8277e4b3dc9776715a7bd85e1a4f6610aad9b19 Reviewed-on: https://gerrit.libreoffice.org/39061 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/docshell')
-rw-r--r--sd/source/ui/docshell/docshel4.cxx6
-rw-r--r--sd/source/ui/docshell/docshell.cxx9
-rw-r--r--sd/source/ui/docshell/sdclient.cxx3
3 files changed, 4 insertions, 14 deletions
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index afaacaf55dec..40575d52a566 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -267,8 +267,6 @@ bool DrawDocShell::InitNew( const css::uno::Reference< css::embed::XStorage >& x
*/
bool DrawDocShell::Load( SfxMedium& rMedium )
{
- mbNewDocument = false;
-
// If this is an ODF file being loaded, then by default, use legacy processing
// for tdf#99729 (if required, it will be overridden in *::ReadUserDataSequence())
if (IsOwnStorageFormat(rMedium))
@@ -356,8 +354,6 @@ bool DrawDocShell::Load( SfxMedium& rMedium )
*/
bool DrawDocShell::LoadFrom( SfxMedium& rMedium )
{
- mbNewDocument = false;
-
WaitObject* pWait = nullptr;
if( mpViewShell )
pWait = new WaitObject( static_cast<vcl::Window*>(mpViewShell->GetActiveWindow()) );
@@ -438,8 +434,6 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium,
*/
bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
{
- mbNewDocument = false;
-
const OUString aFilterName( rMedium.GetFilter()->GetFilterName() );
bool bRet = false;
bool bStartPresentation = false;
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 77d7cf641c8b..fa35e3a9808b 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -125,8 +125,7 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode,
mpFontList(nullptr),
meDocType(eDocumentType),
mbSdDataObj(bDataObject),
- mbOwnPrinter(false),
- mbNewDocument( true )
+ mbOwnPrinter(false)
{
Construct( eMode == SfxObjectCreateMode::INTERNAL );
}
@@ -140,8 +139,7 @@ DrawDocShell::DrawDocShell( SfxModelFlags nModelCreationFlags, bool bDataObject,
mpFontList(nullptr),
meDocType(eDocumentType),
mbSdDataObj(bDataObject),
- mbOwnPrinter(false),
- mbNewDocument( true )
+ mbOwnPrinter(false)
{
Construct( false );
}
@@ -157,8 +155,7 @@ DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode,
mpFontList(nullptr),
meDocType(eDocumentType),
mbSdDataObj(bDataObject),
- mbOwnPrinter(false),
- mbNewDocument( true )
+ mbOwnPrinter(false)
{
Construct( eMode == SfxObjectCreateMode::INTERNAL );
}
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 68c7dbacb428..2f0c132fef79 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -40,8 +40,7 @@ namespace sd {
Client::Client(SdrOle2Obj* pObj, ViewShell* pViewShell, vcl::Window* pWindow) :
SfxInPlaceClient(pViewShell->GetViewShell(), pWindow, pObj->GetAspect() ),
mpViewShell(pViewShell),
- pSdrOle2Obj(pObj),
- pSdrGrafObj(nullptr)
+ pSdrOle2Obj(pObj)
{
SetObject( pObj->GetObjRef() );
DBG_ASSERT( GetObject().is(), "No object connected!" );