summaryrefslogtreecommitdiff
path: root/sfx2/source/view
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-16 09:13:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-16 10:15:36 +0200
commit27dadc070ec2c2a602d3c5b3494dd0bdc15c785f (patch)
tree79d9acfb57f8431b0ab224d9d2c6a5d2c840c540 /sfx2/source/view
parent20a872d21602409cda873bb1f4830d50be3b6f8b (diff)
loplugin:singlevalfields in sfx2
pParent in SfxDispatch_Impl was always nullptr, which led to a bunch of dead code similarly with pParent in SfxWorkWindow Change-Id: I964a43fe094409ab4b6d1eda7225af997092e81c Reviewed-on: https://gerrit.libreoffice.org/61811 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/view')
-rw-r--r--sfx2/source/view/printer.cxx30
-rw-r--r--sfx2/source/view/viewfrm2.cxx2
2 files changed, 2 insertions, 30 deletions
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 31139afaca0d..cc96ee0e6c46 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -34,20 +34,6 @@
// struct SfxPrinter_Impl ------------------------------------------------
-struct SfxPrinter_Impl
-{
- bool mbAll;
- bool mbSelection;
- bool mbFromTo;
- bool mbRange;
-
- SfxPrinter_Impl() :
- mbAll ( true ),
- mbSelection ( true ),
- mbFromTo ( true ),
- mbRange ( true ) {}
-};
-
struct SfxPrintOptDlg_Impl
{
bool mbHelpDisabled;
@@ -101,7 +87,6 @@ SfxPrinter::SfxPrinter( std::unique_ptr<SfxItemSet>&& pTheOptions ) :
This constructor creates a default printer.
*/
pOptions( std::move(pTheOptions) ),
- pImpl( new SfxPrinter_Impl ),
bKnown( true )
{
assert(pOptions);
@@ -111,8 +96,7 @@ SfxPrinter::SfxPrinter( std::unique_ptr<SfxItemSet>&& pTheOptions ) :
SfxPrinter::SfxPrinter( std::unique_ptr<SfxItemSet>&& pTheOptions,
const JobSetup& rTheOrigJobSetup ) :
Printer( rTheOrigJobSetup.GetPrinterName() ),
- pOptions( std::move(pTheOptions) ),
- pImpl( new SfxPrinter_Impl )
+ pOptions( std::move(pTheOptions) )
{
assert(pOptions);
bKnown = GetName() == rTheOrigJobSetup.GetPrinterName();
@@ -126,7 +110,6 @@ SfxPrinter::SfxPrinter( std::unique_ptr<SfxItemSet>&& pTheOptions,
const OUString& rPrinterName ) :
Printer( rPrinterName ),
pOptions( std::move(pTheOptions) ),
- pImpl( new SfxPrinter_Impl ),
bKnown( GetName() == rPrinterName )
{
assert(pOptions);
@@ -137,18 +120,12 @@ SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) :
VclReferenceBase(),
Printer( rPrinter.GetName() ),
pOptions( rPrinter.GetOptions().Clone() ),
- pImpl( new SfxPrinter_Impl ),
bKnown( rPrinter.IsKnown() )
{
assert(pOptions);
SetJobSetup( rPrinter.GetJobSetup() );
SetPrinterProps( &rPrinter );
SetMapMode( rPrinter.GetMapMode() );
-
- pImpl->mbAll = rPrinter.pImpl->mbAll;
- pImpl->mbSelection = rPrinter.pImpl->mbSelection;
- pImpl->mbFromTo = rPrinter.pImpl->mbFromTo;
- pImpl->mbRange = rPrinter.pImpl->mbRange;
}
@@ -160,10 +137,6 @@ VclPtr<SfxPrinter> SfxPrinter::Clone() const
pNewPrinter->SetJobSetup( GetJobSetup() );
pNewPrinter->SetPrinterProps( this );
pNewPrinter->SetMapMode( GetMapMode() );
- pNewPrinter->pImpl->mbAll = pImpl->mbAll;
- pNewPrinter->pImpl->mbSelection =pImpl->mbSelection;
- pNewPrinter->pImpl->mbFromTo = pImpl->mbFromTo;
- pNewPrinter->pImpl->mbRange =pImpl->mbRange;
return pNewPrinter;
}
else
@@ -179,7 +152,6 @@ SfxPrinter::~SfxPrinter()
void SfxPrinter::dispose()
{
pOptions.reset();
- pImpl.reset();
Printer::dispose();
}
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 0357d90c987e..af3b990234a5 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -172,7 +172,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
}
else
{
- pWorkWin->HidePopups_Impl( !bShow, true );
+ pWorkWin->HidePopups_Impl( !bShow );
pWorkWin->MakeChildrenVisible_Impl( bShow );
}