filter/source/msfilter/msoleexp.cxx | 2 +- filter/source/msfilter/svdfppt.cxx | 2 +- include/filter/msfilter/msoleexp.hxx | 1 - include/filter/msfilter/mstoolbar.hxx | 3 +-- include/filter/msfilter/svdfppt.hxx | 3 +-- include/formula/tokenarray.hxx | 6 +++--- include/oox/dump/dumperbase.hxx | 4 ---- include/oox/helper/propertyset.hxx | 4 ---- include/sfx2/basedlgs.hxx | 1 - include/sfx2/frame.hxx | 2 -- include/sfx2/objsh.hxx | 1 - include/sfx2/recentdocsview.hxx | 2 -- include/sfx2/templatelocalview.hxx | 3 --- include/sfx2/viewfrm.hxx | 5 ----- include/sfx2/viewsh.hxx | 1 - oox/source/dump/dumperbase.cxx | 16 +++------------- oox/source/helper/propertyset.cxx | 2 +- sc/source/core/data/formulacell.cxx | 4 ++-- sfx2/source/control/recentdocsview.cxx | 2 +- sfx2/source/control/templatelocalview.cxx | 4 ++-- sfx2/source/dialog/basedlgs.cxx | 7 +------ sfx2/source/doc/objmisc.cxx | 8 +------- sfx2/source/view/frame.cxx | 7 +------ sfx2/source/view/frame2.cxx | 2 +- sfx2/source/view/viewfrm.cxx | 23 ++++------------------- sfx2/source/view/viewprn.cxx | 7 +------ 26 files changed, 25 insertions(+), 97 deletions(-)
New commits: commit 7999da76a66eab687cfe152dc63cf93a2a8b0cd8 Author: Noel Grandin <[email protected]> Date: Fri Oct 21 13:22:25 2016 +0200 loplugin:expandablemethodds in include/filter Change-Id: I92f0e19845e921701eb139e19493effa47908b39 diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 0e0fd26..7f8ca54 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -171,7 +171,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt aOwnGlobalName = aGlbNm; // flags for checking if conversion is wanted at all (SaveOptions?!) - if( GetFlags() & pArr->nFlag ) + if( nConvertFlags & pArr->nFlag ) { pExpFilter = SfxFilterMatcher().GetFilter4FilterName(OUString::createFromAscii(pArr->pFilterNm)); break; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 479c374..2f57c2b 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -351,7 +351,7 @@ void PptNotesAtom::Clear() nFlags = 0; } -void PptColorSchemeAtom::Clear() +PptColorSchemeAtom::PptColorSchemeAtom() { memset(&aData[0], 0, 32); } diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx index 445e86d..6043bae 100644 --- a/include/filter/msfilter/msoleexp.hxx +++ b/include/filter/msfilter/msoleexp.hxx @@ -45,7 +45,6 @@ class MSFILTER_DLLPUBLIC SvxMSExportOLEObjects sal_uInt32 nConvertFlags; public: SvxMSExportOLEObjects( sal_uInt32 nCnvrtFlgs ) : nConvertFlags(nCnvrtFlgs) {} - sal_uInt32 GetFlags() const { return nConvertFlags; } void ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotStorage& rDestStg ); void ExportOLEObject( const css::uno::Reference < css::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg ); diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 3495a05..0f35c5c 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -98,12 +98,11 @@ public: Indent( bool binit = false ) { if ( binit ) - init(); + TBBase::nIndent = 0; else TBBase::nIndent = TBBase::nIndent + 2; } ~Indent() { TBBase::nIndent = TBBase::nIndent - 2; } - static void init() { TBBase::nIndent = 0; } }; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index edab0cb..22ab642 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -270,8 +270,7 @@ struct PptColorSchemeAtom sal_uInt8 aData[32]; public: - PptColorSchemeAtom () { Clear(); } - void Clear(); + PptColorSchemeAtom(); Color GetColor( sal_uInt16 nNum ) const; friend SvStream& ReadPptColorSchemeAtom(SvStream& rIn, PptColorSchemeAtom& rAtom); commit cd0e227a326f0571f157dde8678a253bcf172204 Author: Noel Grandin <[email protected]> Date: Fri Oct 21 12:51:41 2016 +0200 rename RECALCMODE_EMASK to ScRecalcMode::EMask much neater this way Change-Id: I0af38f8bc0d7be4f2f1be9899dd8739493cf66d5 diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index cdb4e34..65b12a9 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -59,13 +59,13 @@ enum class ScRecalcMode : sal_uInt8 ONLOAD_ONCE = 0x08, // exclusive, once after load FORCED = 0x10, // combined, also if cell isn't visible ONREFMOVE = 0x20, // combined, if reference was moved + EMask = NORMAL | ALWAYS | ONLOAD | ONLOAD_ONCE // mask of exclusive bits }; // If new bits are to be defined, AddRecalcMode has to be adjusted! namespace o3tl { template<> struct typed_flags<ScRecalcMode> : is_typed_flags<ScRecalcMode, 0x3f> {}; } -#define RECALCMODE_EMASK (ScRecalcMode(ScRecalcMode::NORMAL | ScRecalcMode::ALWAYS | ScRecalcMode::ONLOAD | ScRecalcMode::ONLOAD_ONCE)) // mask of exclusive bits namespace formula { @@ -173,9 +173,9 @@ protected: sal_uInt16 RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount ); inline void SetCombinedBitsRecalcMode( ScRecalcMode nBits ) - { nMode |= (nBits & ~RECALCMODE_EMASK); } + { nMode |= (nBits & ~ScRecalcMode::EMask); } inline ScRecalcMode GetCombinedBitsRecalcMode() const - { return nMode & ~RECALCMODE_EMASK; } + { return nMode & ~ScRecalcMode::EMask; } /** Exclusive bits already set in nMode are zero'ed, nBits may contain combined bits, but only one exclusive bit may be set! */ diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 7ca01db..b95417b 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -2448,11 +2448,11 @@ void ScFormulaCell::SetResultError( FormulaError n ) void ScFormulaCell::AddRecalcMode( ScRecalcMode nBits ) { - if ( (nBits & RECALCMODE_EMASK) != ScRecalcMode::NORMAL ) + if ( (nBits & ScRecalcMode::EMask) != ScRecalcMode::NORMAL ) SetDirtyVar(); if ( nBits & ScRecalcMode::ONLOAD_ONCE ) { // OnLoadOnce is used only to set Dirty after filter import. - nBits = (nBits & ~RECALCMODE_EMASK) | ScRecalcMode::NORMAL; + nBits = (nBits & ~ScRecalcMode::EMask) | ScRecalcMode::NORMAL; } pCode->AddRecalcMode( nBits ); } commit f3fab399da4035e910ae701bd1a3e9a6898f13a9 Author: Noel Grandin <[email protected]> Date: Fri Oct 21 12:38:55 2016 +0200 loplugin:expandablemethodds in include/oox Change-Id: I06b82e8b927d24204e5a952474a2dfd780b3cae6 diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 3b86e9b..917835f 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -585,8 +585,6 @@ class ConstList : public NameListBase public: explicit ConstList( const SharedConfigData& rCfgData ); - /** Sets a default name for unknown keys. */ - void setDefaultName( const String& rDefName ) { maDefName = rDefName; } /** Enables or disables automatic quotation of returned names. */ void setQuoteNames( bool bQuoteNames ) { mbQuoteNames = bQuoteNames; } @@ -770,7 +768,6 @@ public: const StorageRef& getRootStorage() const { return mxRootStrg; } const OUString& getSysFileName() const { return maSysFileName; } - void setOption( const OUString& rKey, const OUString& rData ); const OUString* getOption( const OUString& rKey ) const; template< typename ListType > @@ -871,7 +868,6 @@ public: protected: Config() {} - void construct( const Config& rParent ); void construct( const sal_Char* pcEnvVar, const ::oox::core::FilterBase& rFilter ); diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx index 750e5f7..39dbf85 100644 --- a/include/oox/helper/propertyset.hxx +++ b/include/oox/helper/propertyset.hxx @@ -78,10 +78,6 @@ public: /** Returns true, if the contained XPropertySet interface is valid. */ bool is() const { return mxPropSet.is(); } - /** Returns the contained XPropertySet interface. */ - const css::uno::Reference< css::beans::XPropertySet >& - getXPropertySet() const { return mxPropSet; } - /** Returns true, if the specified property is supported by the property set. */ bool hasProperty( sal_Int32 nPropId ) const; diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 8f8474c..a63fe32 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -950,7 +950,7 @@ void ConstList::implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, const OUString& rData ) { if ( rKey == "default" ) - setDefaultName( rData ); + maDefName = rData; // Sets a default name for unknown keys. else if ( rKey == "quote-names" ) setQuoteNames( StringHelper::convertStringToBool( rData ) ); else @@ -1275,11 +1275,6 @@ SharedConfigData::~SharedConfigData() { } -void SharedConfigData::setOption( const OUString& rKey, const OUString& rData ) -{ - maConfigData[ rKey ] = rData; -} - const OUString* SharedConfigData::getOption( const OUString& rKey ) const { ConfigDataMap::const_iterator aIt = maConfigData.find( rKey ); @@ -1329,7 +1324,7 @@ void SharedConfigData::implProcessConfigItemStr( else if ( rKey == "unitconverter" ) createUnitConverter( rData ); else - setOption( rKey, rData ); + maConfigData[ rKey ] = rData; } bool SharedConfigData::readConfigFile( const OUString& rFileUrl ) @@ -1395,7 +1390,7 @@ void SharedConfigData::createUnitConverter( const OUString& rData ) Config::Config( const Config& rParent ) : Base() // c'tor needs to be called explicitly to avoid compiler warning { - construct( rParent ); + *this = rParent; } Config::Config( const sal_Char* pcEnvVar, const FilterBase& rFilter ) @@ -1412,11 +1407,6 @@ Config::~Config() { } -void Config::construct( const Config& rParent ) -{ - *this = rParent; -} - void Config::construct( const sal_Char* pcEnvVar, const FilterBase& rFilter ) { if( !rFilter.getFileUrl().isEmpty() ) diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx index b66de7a..52b44d7 100644 --- a/oox/source/helper/propertyset.cxx +++ b/oox/source/helper/propertyset.cxx @@ -142,7 +142,7 @@ bool PropertySet::implSetPropertyValue( const OUString& rPropName, const Any& rV #ifdef DBG_UTIL void PropertySet::dump() { - PropertyMap::dump( Reference< XPropertySet >( getXPropertySet(), UNO_QUERY ) ); + PropertyMap::dump( mxPropSet ); } #endif commit 1f7c5d2a55486bcbcd066111cea9b91ec348baf1 Author: Noel Grandin <[email protected]> Date: Fri Oct 21 11:09:41 2016 +0200 loplugin:expandablemethodds in include/sfx2 Change-Id: I1ec3ae33a71d154276e213a68c735476daa606b9 diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 04f642c9c..0f282a7 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -55,7 +55,6 @@ private: SAL_DLLPRIVATE void SetDialogData_Impl(); SAL_DLLPRIVATE void GetDialogData_Impl(); - SAL_DLLPRIVATE void init(); protected: SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 98bd845..284075a 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -173,7 +173,6 @@ public: SAL_DLLPRIVATE Rectangle GetTopOuterRectPixel_Impl() const; SAL_DLLPRIVATE void CreateWorkWindow_Impl(); SAL_DLLPRIVATE void GrabFocusOnComponent_Impl(); - SAL_DLLPRIVATE void SetInPlace_Impl( bool ); SAL_DLLPRIVATE void PrepareForDoc_Impl( SfxObjectShell& i_rDoc ); SAL_DLLPRIVATE void LockResize_Impl( bool bLock ); @@ -191,7 +190,6 @@ class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem { SfxFrame* pFrame; SfxFrameWeakRef wFrame; - SAL_DLLPRIVATE void SetFramePtr_Impl( SfxFrame* /*pFrameP*/ ) { pFrame = wFrame; } public: diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 7276339..0c4d5b3 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -463,7 +463,6 @@ public: void AvoidRecentDocs(bool bAvoid = true) { mbAvoidRecentDocs = bAvoid; } // Transfer IFace - void AbortImport(); bool IsAbortingImport() const; void FinishedLoading( SfxLoadedFlags nWhich = SfxLoadedFlags::ALL ); void TemplateDisconnectionAfterLoad(); diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 1d316bf..0c2a238 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -61,8 +61,6 @@ public: void insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId); - long GetThumbnailSize() const { return mnItemMaxSize;} - static bool typeMatchesExtension(ApplicationType type, const OUString &rExt); static BitmapEx getDefaultThumbnail(const OUString &rURL); diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index f4e31ef..b0ab881 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -159,9 +159,6 @@ public: void updateThumbnailDimensions(long itemMaxSize); - long getThumbnailWidth() const { return mnThumbnailWidth;} - long getThumbnailHeight() const {return mnThumbnailHeight;} - void RemoveDefaultTemplateIcon( const OUString& rPath); static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index bb7ffd5..67fdadf 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -120,8 +120,6 @@ public: SfxProgress* GetProgress() const; - SfxObjectShell* GetObjectShell() const { return m_xObjSh.get(); } - void LockAdjustPosSizePixel() { m_nAdjustPosPixelLock++; } void UnlockAdjustPosSizePixel() @@ -182,9 +180,7 @@ public: WinBits nMessageStyle = 0); void RemoveInfoBar(const OUString& sId); - SAL_DLLPRIVATE void SetDowning_Impl(); SAL_DLLPRIVATE void GetDocNumber_Impl(); - SAL_DLLPRIVATE bool IsDowning_Impl() const; SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell *pVSh ); SAL_DLLPRIVATE void ReleaseObjectShell_Impl(); @@ -196,7 +192,6 @@ public: SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq ); SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE void ForceOuterResize_Impl(); - SAL_DLLPRIVATE bool IsResizeInToOut_Impl() const; SAL_DLLPRIVATE void UpdateDocument_Impl(); SAL_DLLPRIVATE void LockObjectShell_Impl(); diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 253c77c..84f73ce 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -242,7 +242,6 @@ public: virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ); virtual bool HasPrintOptionsPage() const; virtual VclPtr<SfxTabPage> CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ); - static JobSetup GetJobSetup(); Printer* GetActivePrinter() const; // Working set diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 623e261..8ff3953 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -159,7 +159,7 @@ BitmapEx RecentDocsView::getDefaultThumbnail(const OUString &rURL) void RecentDocsView::insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId) { - RecentDocsViewItem *pChild = new RecentDocsViewItem(*this, rURL, rTitle, rThumbnail, nId, GetThumbnailSize()); + RecentDocsViewItem *pChild = new RecentDocsViewItem(*this, rURL, rTitle, rThumbnail, nId, mnItemMaxSize); AppendItem(pChild); } diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index f60a480..a37dab2 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -152,8 +152,8 @@ void TemplateLocalView::Populate () aProperties.aPath = aURL; aProperties.aRegionName = aRegionName; aProperties.aThumbnail = TemplateLocalView::fetchThumbnail(aURL, - getThumbnailWidth(), - getThumbnailHeight()); + mnThumbnailWidth, + mnThumbnailHeight); pItem->maTemplates.push_back(aProperties); maAllTemplates.push_back(aProperties); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 2fdeef8..dd35973 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -144,18 +144,13 @@ void SfxModalDialog::GetDialogData_Impl() } } -void SfxModalDialog::init() -{ - GetDialogData_Impl(); -} - SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription ) : ModalDialog(pParent, rID, rUIXMLDescription), nUniqId(0), //todo: remove this member when the ResId using ctor is removed pInputSet(nullptr), pOutputSet(nullptr) { - init(); + GetDialogData_Impl(); } SfxModalDialog::~SfxModalDialog() diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index b93fd17..3e8ee22 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -170,12 +170,6 @@ sal_uInt16 const aTitleMap_Impl[3][2] = }; -void SfxObjectShell::AbortImport() -{ - pImpl->bIsAbortingImport = true; -} - - bool SfxObjectShell::IsAbortingImport() const { return pImpl->bIsAbortingImport; @@ -1341,7 +1335,7 @@ void SfxObjectShell::CancelTransfers() { if( ( pImpl->nLoadedFlags & SfxLoadedFlags::ALL ) != SfxLoadedFlags::ALL ) { - AbortImport(); + pImpl->bIsAbortingImport = true; if( IsLoading() ) FinishedLoading(); } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index a4617bf..fa2376f 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -549,7 +549,7 @@ bool SfxFrameItem::operator==( const SfxPoolItem &rItem ) const SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const { SfxFrameItem* pNew = new SfxFrameItem( wFrame); - pNew->SetFramePtr_Impl( pFrame ); + pNew->pFrame = pFrame; return pNew; } @@ -817,11 +817,6 @@ bool SfxFrame::IsInPlace() const return pImpl->bInPlace; } -void SfxFrame::SetInPlace_Impl( bool bSet ) -{ - pImpl->bInPlace = bSet; -} - void SfxFrame::Resize() { if ( IsClosing_Impl() ) diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 6d00c6f..2672aa5 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -401,7 +401,7 @@ void SfxFrame::PrepareForDoc_Impl( SfxObjectShell& i_rDoc ) // plugin mode sal_Int16 nPluginMode = aDocumentArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) ); if ( nPluginMode && ( nPluginMode != 2 ) ) - SetInPlace_Impl( true ); + pImpl->bInPlace = true; } bool SfxFrame::IsMarkedHidden_Impl() const diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 9f024b5..da20f40 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -202,16 +202,6 @@ static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHa return bResult; } -void SfxViewFrame::SetDowning_Impl() -{ - m_pImpl->bIsDowning = true; -} - -bool SfxViewFrame::IsDowning_Impl() const -{ - return m_pImpl->bIsDowning; -} - void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { SfxFrame *pParent = GetFrame().GetParentFrame(); @@ -1083,7 +1073,7 @@ void SfxViewFrame::SetBorderPixelImpl { m_pImpl->aBorder = rBorder; - if ( IsResizeInToOut_Impl() && !GetFrame().IsInPlace() ) + if ( m_pImpl->bResizeInToOut && !GetFrame().IsInPlace() ) { Size aSize = pVSh->GetWindow()->GetOutputSizePixel(); if ( aSize.Width() && aSize.Height() ) @@ -1121,7 +1111,7 @@ const SvBorder& SfxViewFrame::GetBorderPixelImpl() const void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { - if( IsDowning_Impl()) + if(m_pImpl->bIsDowning) return; // we know only SfxEventHint or simple SfxHint @@ -1352,7 +1342,7 @@ SfxViewFrame::SfxViewFrame SfxViewFrame::~SfxViewFrame() { - SetDowning_Impl(); + m_pImpl->bIsDowning = true; if ( SfxViewFrame::Current() == this ) SfxViewFrame::SetViewFrame( nullptr ); @@ -1454,7 +1444,7 @@ SfxViewFrame* SfxViewFrame::GetNext SfxProgress* SfxViewFrame::GetProgress() const { - SfxObjectShell *pObjSh = GetObjectShell(); + SfxObjectShell *pObjSh = m_xObjSh.get(); return pObjSh ? pObjSh->GetProgress() : nullptr; } @@ -1507,11 +1497,6 @@ void SfxViewFrame::ForceOuterResize_Impl() m_pImpl->bResizeInToOut = true; } -bool SfxViewFrame::IsResizeInToOut_Impl() const -{ - return m_pImpl->bResizeInToOut; -} - void SfxViewFrame::GetDocNumber_Impl() { DBG_ASSERT( GetObjectShell(), "No Document!" ); diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 616af3e..ca5baf7 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -614,7 +614,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro StartPrint( rProps, bIsAPI, bIsDirect ); // FIXME: job setup SfxPrinter* pDocPrt = GetPrinter(); - JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup(); + JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : JobSetup(); Printer::PrintJob( GetPrinterController(), aJobSetup ); } @@ -899,9 +899,4 @@ bool SfxViewShell::HasPrintOptionsPage() const return false; } -JobSetup SfxViewShell::GetJobSetup() -{ - return JobSetup(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
