From 19bacff27bd2201fb136963e11e865b8a31d849e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 25 Jun 2016 16:00:41 +0200 Subject: loplugin:singlevalfields in sd Change-Id: Idde7bdbd57080518fc416ce97a062ab979393d8e Reviewed-on: https://gerrit.libreoffice.org/26656 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sd/inc/drawdoc.hxx | 6 +- sd/source/core/drawdoc.cxx | 1 - sd/source/filter/eppt/eppt.cxx | 36 ++++----- sd/source/filter/eppt/eppt.hxx | 1 - sd/source/filter/eppt/epptso.cxx | 12 --- sd/source/filter/eppt/pptx-text.cxx | 2 - sd/source/ui/dlg/prltempl.cxx | 25 ++---- sd/source/ui/dlg/tabtempl.cxx | 23 ++---- sd/source/ui/func/fusel.cxx | 13 ---- sd/source/ui/func/unoaprms.cxx | 2 - sd/source/ui/inc/ViewShell.hxx | 2 - sd/source/ui/inc/Window.hxx | 1 - sd/source/ui/inc/fusel.hxx | 1 - sd/source/ui/inc/prltempl.hxx | 9 --- sd/source/ui/inc/tabtempl.hxx | 6 -- sd/source/ui/inc/unoaprms.hxx | 4 - sd/source/ui/sidebar/MasterPageContainer.cxx | 10 +-- .../controller/SlideSorterController.cxx | 1 - .../ui/slidesorter/controller/SlsFocusManager.cxx | 46 +---------- .../ui/slidesorter/controller/SlsProperties.cxx | 1 - .../slidesorter/controller/SlsSelectionManager.cxx | 6 -- .../ui/slidesorter/controller/SlsSlotManager.cxx | 91 ++++++++++------------ .../slidesorter/inc/controller/SlsFocusManager.hxx | 6 -- .../slidesorter/inc/controller/SlsProperties.hxx | 7 -- .../inc/controller/SlsSelectionManager.hxx | 10 --- .../ui/slidesorter/inc/model/SlideSorterModel.hxx | 2 - .../ui/slidesorter/inc/model/SlsVisualState.hxx | 2 - .../ui/slidesorter/inc/view/SlideSorterView.hxx | 1 - .../ui/slidesorter/model/SlideSorterModel.cxx | 9 +-- sd/source/ui/slidesorter/model/SlsVisualState.cxx | 10 +-- .../ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 +- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 5 -- sd/source/ui/view/sdwindow.cxx | 7 +- sd/source/ui/view/viewshel.cxx | 3 +- 34 files changed, 85 insertions(+), 278 deletions(-) diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 476be4de258e..a7bdff182cc3 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -135,16 +135,12 @@ namespace sd // SdDrawDocument class SD_DLLPUBLIC SdDrawDocument : public FmFormModel { -private: - OUString msDocAccTitle; public: SAL_DLLPRIVATE void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } SAL_DLLPRIVATE const OUString& getDocAccTitle() const { return msDocAccTitle; } -private: - bool bReadOnly; -public: SAL_DLLPRIVATE bool getDocReadOnly() const { return bReadOnly; } private: + OUString msDocAccTitle; ::sd::Outliner* mpOutliner; ///< local outliner for outline mode ::sd::Outliner* mpInternalOutliner; ///< internal outliner for creation of text objects Timer* mpWorkStartupTimer; diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 2bf77d946ece..a507402b56c7 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -152,7 +152,6 @@ PresentationSettings::PresentationSettings( const PresentationSettings& r ) SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) : FmFormModel( !utl::ConfigManager::IsAvoidConfig() ? SvtPathOptions().GetPalettePath() : OUString(), nullptr, pDrDocSh ) -, bReadOnly(false) , mpOutliner(nullptr) , mpInternalOutliner(nullptr) , mpWorkStartupTimer(nullptr) diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 27184fd7cfc4..b3f57a82521b 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -76,7 +76,6 @@ PPTWriter::PPTWriter( tools::SvRef& rSvStorage, PPTWriterBase ( rXModel, rXStatInd ), mnCnvrtFlags ( nCnvrtFlags ), mbStatus ( false ), - mbUseNewAnimations ( true ), mnStatMaxValue ( 0 ), mnLatestStatValue ( 0 ), mnTextStyle( 0 ), @@ -320,27 +319,24 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ SvMemoryStream aBinaryTagData10Atom; ImplExportComments( mXDrawPage, aBinaryTagData10Atom ); - if ( mbUseNewAnimations ) + SvMemoryStream amsofbtAnimGroup; + ppt::AnimationExporter aExporter( aSolverContainer, maSoundCollection ); + aExporter.doexport( mXDrawPage, amsofbtAnimGroup ); + sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell(); + if ( nmsofbtAnimGroupSize ) { - SvMemoryStream amsofbtAnimGroup; - ppt::AnimationExporter aExporter( aSolverContainer, maSoundCollection ); - aExporter.doexport( mXDrawPage, amsofbtAnimGroup ); - sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell(); - if ( nmsofbtAnimGroupSize ) { - { - EscherExAtom aMagic2( aBinaryTagData10Atom, 0x2eeb ); - aBinaryTagData10Atom.WriteUInt32( 0x01c45df9 ) - .WriteUInt32( 0xe1471b30 ); - } - { - EscherExAtom aMagic( aBinaryTagData10Atom, 0x2b00 ); - aBinaryTagData10Atom.WriteUInt32( 0 ); - } - aBinaryTagData10Atom.WriteBytes(amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell()); - { - EscherExContainer aMagic2( aBinaryTagData10Atom, 0x2b02 ); - } + EscherExAtom aMagic2( aBinaryTagData10Atom, 0x2eeb ); + aBinaryTagData10Atom.WriteUInt32( 0x01c45df9 ) + .WriteUInt32( 0xe1471b30 ); + } + { + EscherExAtom aMagic( aBinaryTagData10Atom, 0x2b00 ); + aBinaryTagData10Atom.WriteUInt32( 0 ); + } + aBinaryTagData10Atom.WriteBytes(amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell()); + { + EscherExContainer aMagic2( aBinaryTagData10Atom, 0x2b02 ); } } if ( aBinaryTagData10Atom.Tell() ) diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 4f6958cc42d6..f8e2b25316d5 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -157,7 +157,6 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider { sal_uInt32 mnCnvrtFlags; bool mbStatus; - bool mbUseNewAnimations; sal_uInt32 mnStatMaxValue; sal_uInt32 mnLatestStatValue; diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 4a3555aab14f..33ad99f9977c 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2232,11 +2232,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { SvMemoryStream* pTmp = nullptr; - if ( bEffect && !mbUseNewAnimations ) - { - pTmp = new SvMemoryStream( 0x200, 0x200 ); - ImplWriteObjectEffect( *pTmp, eAe, eTe, ++nEffectCount ); - } if ( eCa != css::presentation::ClickAction_NONE ) { if ( !pTmp ) @@ -3185,11 +3180,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else if ( (mType == "drawing.Table") || (mType == "presentation.Table") ) { SvMemoryStream* pTmp = nullptr; - if ( bEffect && !mbUseNewAnimations ) - { - pTmp = new SvMemoryStream( 0x200, 0x200 ); - ImplWriteObjectEffect( *pTmp, eAe, eTe, ++nEffectCount ); - } if ( eCa != css::presentation::ClickAction_NONE ) { if ( !pTmp ) @@ -3279,8 +3269,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a eAe = eTe; } } - if ( !mbUseNewAnimations ) - ImplWriteObjectEffect( *pClientData, eAe, eTe, ++nEffectCount ); } if ( eCa != css::presentation::ClickAction_NONE ) diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index fb10c867ef5a..3ec1dc4884aa 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -1276,7 +1276,6 @@ struct ImplTextObj int mnInstance; std::vector maList; bool mbHasExtendedBullets; - bool mbFixedCellHeightUsed; explicit ImplTextObj( int nInstance ); ~ImplTextObj(); @@ -1288,7 +1287,6 @@ ImplTextObj::ImplTextObj( int nInstance ) mnTextSize = 0; mnInstance = nInstance; mbHasExtendedBullets = false; - mbFixedCellHeightUsed = false; } ImplTextObj::~ImplTextObj() diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 5bcccc558887..1363cbdd05d8 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -210,15 +210,6 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, break; } SetText( aTitle ); - - nDlgType = 1; // template dialog - nPageType = 0; - nPos = 0; - - nColorTableState = ChangeType::NONE; - nBitmapListState = ChangeType::NONE; - nGradientListState = ChangeType::NONE; - nHatchingListState = ChangeType::NONE; } SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg() @@ -241,7 +232,7 @@ void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) aSet.Put (SvxColorListItem(pColorTab,SID_COLOR_TABLE)); aSet.Put (SvxDashListItem(pDashList,SID_DASH_LIST)); aSet.Put (SvxLineEndListItem(pLineEndList,SID_LINEEND_LIST)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); rPage.PageCreated(aSet); } else if (nId == mnArea) @@ -250,22 +241,22 @@ void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) aSet.Put (SvxGradientListItem(pGradientList,SID_GRADIENT_LIST)); aSet.Put (SvxHatchListItem(pHatchingList,SID_HATCH_LIST)); aSet.Put (SvxBitmapListItem(pBitmapList,SID_BITMAP_LIST)); - aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); - aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); + aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); + aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0)); rPage.PageCreated(aSet); } else if (nId == mnShadow) { aSet.Put (SvxColorListItem(pColorTab,SID_COLOR_TABLE)); - aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); rPage.PageCreated(aSet); } else if (nId == mnTransparency) { - aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); rPage.PageCreated(aSet); } else if (nId == mnFont) diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 9a06ecef9cab..5b6ca348e489 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -99,14 +99,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent, else RemoveTabPage("asiantypo"); - nDlgType = 1; - nPageType = 0; - nPos = 0; - - nColorTableState = ChangeType::NONE; nBitmapListState = ChangeType::NONE; - nGradientListState = ChangeType::NONE; - nHatchingListState = ChangeType::NONE; } void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) @@ -117,7 +110,7 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) aSet.Put (SvxColorListItem(pColorList,SID_COLOR_TABLE)); aSet.Put (SvxDashListItem(pDashList,SID_DASH_LIST)); aSet.Put (SvxLineEndListItem(pLineEndList,SID_LINEEND_LIST)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); rPage.PageCreated(aSet); } else if (nId == m_nAreaId) @@ -126,22 +119,22 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) aSet.Put (SvxGradientListItem(pGradientList,SID_GRADIENT_LIST)); aSet.Put (SvxHatchListItem(pHatchingList,SID_HATCH_LIST)); aSet.Put (SvxBitmapListItem(pBitmapList,SID_BITMAP_LIST)); - aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); - aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); + aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); + aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0)); rPage.PageCreated(aSet); } else if (nId == m_nShadowId) { aSet.Put (SvxColorListItem(pColorList,SID_COLOR_TABLE)); - aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); rPage.PageCreated(aSet); } else if (nId == m_nTransparencyId) { - aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - aSet.Put (SfxUInt16Item(SID_DLG_TYPE,nDlgType)); + aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,0)); + aSet.Put (SfxUInt16Item(SID_DLG_TYPE,1)); rPage.PageCreated(aSet); } else if (nId == m_nFontId) diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 992edf1cc63d..f8d20b8b9a37 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -87,7 +87,6 @@ FuSelection::FuSelection ( : FuDraw(pViewSh, pWin, pView, pDoc, rReq), bTempRotation(false), bSelectionChanged(false), - bHideAndAnimate(false), pHdl(nullptr), bSuppressChangesOfSelection(false), bMirrorSide0(false), @@ -129,9 +128,6 @@ FuSelection::~FuSelection() bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { - // Hack for #?????# - bHideAndAnimate = false; - pHdl = nullptr; bool bReturn = FuDraw::MouseButtonDown(rMEvt); bool bWaterCan = SD_MOD()->GetWaterCan(); @@ -628,15 +624,6 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) // menu. const bool bSelectionOnly = rMEvt.IsRight(); - if (bHideAndAnimate) - { - // Animation is still running -> return immediately - bHideAndAnimate = false; - pHdl = nullptr; - mpWindow->ReleaseMouse(); - return true; - } - if (aDragTimer.IsActive() ) { aDragTimer.Stop(); diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index 9b64fe909554..9ffa9761c3d4 100644 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx @@ -45,7 +45,6 @@ void SdAnimationPrmsUndoAction::Undo() pInfo->meClickAction = eOldClickAction; pInfo->SetBookmark( aOldBookmark ); pInfo->mnVerb = nOldVerb; - pInfo->mnPresOrder = nOldPresOrder; pInfo->meSecondEffect = eOldSecondEffect; pInfo->meSecondSpeed = eOldSecondSpeed; @@ -82,7 +81,6 @@ void SdAnimationPrmsUndoAction::Redo() pInfo->meClickAction = eNewClickAction; pInfo->SetBookmark( aNewBookmark ); pInfo->mnVerb = nNewVerb; - pInfo->mnPresOrder = nNewPresOrder; pInfo->meSecondEffect = eNewSecondEffect; pInfo->meSecondSpeed = eNewSecondSpeed; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 4dd4fd992ccc..b20e4e3f99e9 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -476,8 +476,6 @@ protected: Size maViewSize; Size maScrBarWH; - bool mbCenterAllowed; // will be forwarded to window - bool mbStartShowWithDialog; // presentation is started by dialog sal_uInt16 mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. sal_uInt16 mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed. diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index bfd38f430031..e76762011a87 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -162,7 +162,6 @@ protected: depending on the current zoom factor. Its default value is now false. */ bool mbMinZoomAutoCalc; - bool mbCalcMinZoomByMinSide; bool mbCenterAllowed; long mnTicks; diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index 034bfa9ccc6e..9aabd0816ec4 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -74,7 +74,6 @@ protected: bool bTempRotation; bool bSelectionChanged; - bool bHideAndAnimate; SdrHdl* pHdl; bool bSuppressChangesOfSelection; bool bMirrorSide0; diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index 1647423b095e..105b465eae01 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -45,10 +45,6 @@ private: XDashListRef pDashList; XLineEndListRef pLineEndList; - sal_uInt16 nPageType; - sal_uInt16 nDlgType; - sal_uInt16 nPos; - sal_uInt16 mnLine; sal_uInt16 mnArea; sal_uInt16 mnShadow; @@ -65,11 +61,6 @@ private: sal_uInt16 mnAsian; sal_uInt16 mnAlign; - ChangeType nColorTableState; - ChangeType nBitmapListState; - ChangeType nGradientListState; - ChangeType nHatchingListState; - PresentationObjects ePO; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override; diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index 5a634a4f8b3d..d1ea3b4cc36e 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -42,13 +42,7 @@ private: XDashListRef pDashList; XLineEndListRef pLineEndList; - sal_uInt16 nPageType; - sal_uInt16 nDlgType; - sal_uInt16 nPos; - ChangeType nColorTableState; ChangeType nBitmapListState; - ChangeType nGradientListState; - ChangeType nHatchingListState; sal_uInt16 m_nLineId; sal_uInt16 m_nAreaId; diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 3b22345d6bcc..998e1b36be45 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -69,8 +69,6 @@ class SdAnimationPrmsUndoAction : public SdUndoAction OUString aNewBookmark; sal_uInt16 nOldVerb; sal_uInt16 nNewVerb; - sal_uLong nOldPresOrder; - sal_uLong nNewPresOrder; bool bInfoCreated; @@ -109,8 +107,6 @@ public: , eNewClickAction(css::presentation::ClickAction_NONE) , nOldVerb(0) , nNewVerb(0) - , nOldPresOrder(0) - , nNewPresOrder(0) , bInfoCreated(bCreated) { } diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index c4a451fb60c8..d7bc6e5c5a25 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -165,8 +165,6 @@ private: Size maSmallPreviewSizePixel; Size maLargePreviewSizePixel; - bool mbContainerCleaningPending; - typedef ::std::pair EventData; Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize); @@ -494,9 +492,7 @@ MasterPageContainer::Implementation::Implementation() maSmallPreviewNotAvailable(), maChangeListeners(), maSmallPreviewSizePixel(), - maLargePreviewSizePixel(), - mbContainerCleaningPending(true) - + maLargePreviewSizePixel() { UpdatePreviewSizePixel(); } @@ -639,8 +635,7 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( if ( ! bIgnore) { - if (mbContainerCleaningPending) - CleanContainer(); + CleanContainer(); aResult = maContainer.size(); rpDescriptor->SetToken(aResult); @@ -997,7 +992,6 @@ void MasterPageContainer::Implementation::ReleaseDescriptor (Token aToken) if (aToken>=0 && (unsigned)aTokenIsOnlyPreviewTriggersMouseOver() && ! pDescriptorAtPoint->HasState(PageDescriptor::ST_Selected)) { // Make sure that the mouse is over the preview area. diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 83e764b3ec66..385246228ffb 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -38,8 +38,7 @@ namespace sd { namespace slidesorter { namespace controller { FocusManager::FocusManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), mnPageIndex(0), - mbPageIsFocused(false), - mbIsVerticalWrapActive(false) + mbPageIsFocused(false) { if (mrSlideSorter.GetModel().GetPageCount() > 0) mnPageIndex = 0; @@ -66,44 +65,17 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) case FMD_LEFT: if (mnPageIndex > 0) mnPageIndex -= 1; - else if (mbIsVerticalWrapActive) - mnPageIndex = nPageCount-1; break; case FMD_RIGHT: if (mnPageIndex < nPageCount-1) mnPageIndex += 1; - else if (mbIsVerticalWrapActive) - mnPageIndex = 0; break; case FMD_UP: { const sal_Int32 nCandidate (mnPageIndex - nColumnCount); - if (nCandidate < 0) - { - if (mbIsVerticalWrapActive) - { - // Wrap around to the bottom row or the one above - // and go to the correct column. - const sal_Int32 nLastIndex (nPageCount-1); - const sal_Int32 nLastColumn (nLastIndex % nColumnCount); - const sal_Int32 nCurrentColumn (mnPageIndex%nColumnCount); - if (nLastColumn >= nCurrentColumn) - { - // The last row contains the current column. - mnPageIndex = nLastIndex - (nLastColumn-nCurrentColumn); - } - else - { - // Only the second to last row contains the current column. - mnPageIndex = nLastIndex - nLastColumn - - nColumnCount - + nCurrentColumn; - } - } - } - else + if (nCandidate >= 0) { // Move the focus the previous row. mnPageIndex = nCandidate; @@ -114,19 +86,7 @@ void FocusManager::MoveFocus (FocusMoveDirection eDirection) case FMD_DOWN: { const sal_Int32 nCandidate (mnPageIndex + nColumnCount); - if (nCandidate >= nPageCount) - { - if (mbIsVerticalWrapActive) - { - // Wrap around to the correct column. - mnPageIndex = mnPageIndex % nColumnCount; - } - else - { - // Do not move the focus. - } - } - else + if (nCandidate < nPageCount) { // Move the focus to the next row. mnPageIndex = nCandidate; diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index a876bd2ae37f..284f50ac8547 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -35,7 +35,6 @@ Properties::Properties() maSelectionColor(Application::GetSettings().GetStyleSettings().GetHighlightColor()), maHighlightColor(Application::GetSettings().GetStyleSettings().GetMenuHighlightColor()), mbIsUIReadOnly(false), - mbIsOnlyPreviewTriggersMouseOver(true), mbIsHighContrastModeActive( Application::GetSettings().GetStyleSettings().GetHighContrastMode()) { diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index c861fbfc919c..b6135a34d43f 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -62,17 +62,13 @@ namespace sd { namespace slidesorter { namespace controller { SelectionManager::SelectionManager (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), mrController(rSlideSorter.GetController()), - mbIsMakeSelectionVisiblePending(true), mnInsertionPosition(-1), - mnAnimationId(Animator::NotAnAnimationId), mpSelectionObserver(new SelectionObserver(rSlideSorter)) { } SelectionManager::~SelectionManager() { - if (mnAnimationId != Animator::NotAnAnimationId) - mrController.GetAnimator()->RemoveAnimation(mnAnimationId); } void SelectionManager::DeleteSelectedPages (const bool bSelectFollowingPage) @@ -219,8 +215,6 @@ void SelectionManager::DeleteSelectedMasterPages (const ::std::vector& void SelectionManager::SelectionHasChanged () { - mbIsMakeSelectionVisiblePending = true; - ViewShell* pViewShell = mrSlideSorter.GetViewShell(); if (pViewShell != nullptr) { diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 1f54ce0f5fe2..7d25663460b5 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -251,7 +251,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) case SID_ASSIGN_LAYOUT: { - pShell->mpImpl->AssignLayout( rRequest, mrSlideSorter.GetModel().GetPageType() ); + pShell->mpImpl->AssignLayout( rRequest, PK_STANDARD ); rRequest.Done (); } break; @@ -674,14 +674,9 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) } } - PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); - if ((eEditMode == EM_MASTERPAGE) && (ePageKind != PK_HANDOUT)) + if (eEditMode == EM_MASTERPAGE) { rSet.DisableItem(SID_ASSIGN_LAYOUT); - } - - if ((eEditMode == EM_MASTERPAGE) || (ePageKind==PK_NOTES)) - { rSet.DisableItem(SID_INSERTPAGE); } @@ -868,57 +863,53 @@ void SlotManager::ShowSlideShow( SfxRequest& rReq) void SlotManager::RenameSlide() { - PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); View* pDrView = &mrSlideSorter.GetView(); - if (ePageKind==PK_STANDARD || ePageKind==PK_NOTES) + if ( pDrView->IsTextEdit() ) { - if ( pDrView->IsTextEdit() ) - { - pDrView->SdrEndTextEdit(); - } + pDrView->SdrEndTextEdit(); + } - SdPage* pSelectedPage = nullptr; - model::PageEnumeration aSelectedPages ( + SdPage* pSelectedPage = nullptr; + model::PageEnumeration aSelectedPages ( model::PageEnumerationProvider::CreateSelectedPagesEnumeration( mrSlideSorter.GetModel())); - if (aSelectedPages.HasMoreElements()) - pSelectedPage = aSelectedPages.GetNextElement()->GetPage(); - if (pSelectedPage != nullptr) - { - OUString aTitle( SdResId( STR_TITLE_RENAMESLIDE ) ); - OUString aDescr( SdResId( STR_DESC_RENAMESLIDE ) ); - OUString aPageName = pSelectedPage->GetName(); + if (aSelectedPages.HasMoreElements()) + pSelectedPage = aSelectedPages.GetNextElement()->GetPage(); + if (pSelectedPage != nullptr) + { + OUString aTitle( SdResId( STR_TITLE_RENAMESLIDE ) ); + OUString aDescr( SdResId( STR_DESC_RENAMESLIDE ) ); + OUString aPageName = pSelectedPage->GetName(); - SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialog creation failed!"); - std::unique_ptr aNameDlg(pFact->CreateSvxNameDialog( + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + DBG_ASSERT(pFact, "Dialog creation failed!"); + std::unique_ptr aNameDlg(pFact->CreateSvxNameDialog( mrSlideSorter.GetContentWindow(), aPageName, aDescr)); - DBG_ASSERT(aNameDlg, "Dialog creation failed!"); - aNameDlg->SetText( aTitle ); - aNameDlg->SetCheckNameHdl( LINK( this, SlotManager, RenameSlideHdl ), true ); - aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE ); + DBG_ASSERT(aNameDlg, "Dialog creation failed!"); + aNameDlg->SetText( aTitle ); + aNameDlg->SetCheckNameHdl( LINK( this, SlotManager, RenameSlideHdl ), true ); + aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE ); - if( aNameDlg->Execute() == RET_OK ) + if( aNameDlg->Execute() == RET_OK ) + { + OUString aNewName; + aNameDlg->GetName( aNewName ); + if (aNewName != aPageName) { - OUString aNewName; - aNameDlg->GetName( aNewName ); - if (aNewName != aPageName) - { - bool bResult = + bool bResult = RenameSlideFromDrawViewShell( pSelectedPage->GetPageNum()/2, aNewName ); - DBG_ASSERT( bResult, "Couldn't rename slide" ); - } + DBG_ASSERT( bResult, "Couldn't rename slide" ); } - aNameDlg.reset(); + } + aNameDlg.reset(); - // Tell the slide sorter about the name change (necessary for - // accessibility.) - mrSlideSorter.GetController().PageNameHasChanged( + // Tell the slide sorter about the name change (necessary for + // accessibility.) + mrSlideSorter.GetController().PageNameHasChanged( (pSelectedPage->GetPageNum()-1)/2, aPageName); - } } } @@ -946,7 +937,6 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri return false; SdPage* pPageToRename = nullptr; - PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); ::svl::IUndoManager* pManager = pDocument->GetDocSh()->GetUndoManager(); @@ -976,19 +966,16 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri // rename pPageToRename->SetName( rName ); - if( ePageKind == PK_STANDARD ) - { - // also rename notes-page - SdPage* pNotesPage = pDocument->GetSdPage( nPageId, PK_NOTES ); - if (pNotesPage != nullptr) - pNotesPage->SetName (rName); - } + // also rename notes-page + SdPage* pNotesPage = pDocument->GetSdPage( nPageId, PK_NOTES ); + if (pNotesPage != nullptr) + pNotesPage->SetName (rName); } } else { // rename MasterPage -> rename LayoutTemplate - pPageToRename = pDocument->GetMasterSdPage( nPageId, ePageKind ); + pPageToRename = pDocument->GetMasterSdPage( nPageId, PK_STANDARD ); if (pPageToRename != nullptr) { const OUString aOldLayoutName( pPageToRename->GetLayoutName() ); @@ -1048,7 +1035,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) { pNewPage = pShell->CreateOrDuplicatePage ( rRequest, - mrSlideSorter.GetModel().GetPageType(), + PK_STANDARD, nInsertionIndex>=0 ? mrSlideSorter.GetModel().GetPageDescriptor(nInsertionIndex)->GetPage() : nullptr); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index dd022e92d3cb..5572ca2e835f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -181,12 +181,6 @@ private: ::std::vector> maFocusChangeListeners; - /** When vertical wrap is active then pressing UP in the top row moves - the focus to the bottom row, DOWN in the bottom row moves the focus - to the top row. - */ - bool mbIsVerticalWrapActive; - /** Reset the focus state of the given descriptor and request a repaint so that the focus indicator is hidden. @param pDescriptor diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 23b336c7af7e..136d7fd5dfd2 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -105,12 +105,6 @@ public: bool IsUIReadOnly() const { return mbIsUIReadOnly;} void SetUIReadOnly (const bool bIsUIReadOnly); - /** The mouse over effect (and whether a mouse motion starts a multi - selection or a drag-and-drop) can be triggered by just the preview - area or the whole page object area. - */ - bool IsOnlyPreviewTriggersMouseOver() const { return mbIsOnlyPreviewTriggersMouseOver;} - private: bool mbIsHighlightCurrentSlide; bool mbIsShowSelection; @@ -123,7 +117,6 @@ private: Color maSelectionColor; Color maHighlightColor; bool mbIsUIReadOnly; - bool mbIsOnlyPreviewTriggersMouseOver; bool mbIsHighContrastModeActive; }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index 25f2a99ffd8e..4cd0c6ca9054 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx @@ -111,22 +111,12 @@ private: ::std::vector> maSelectionChangeListeners; - /** When this flag is set then on the next call to Paint() the selection - is moved into the visible area. - */ - bool mbIsMakeSelectionVisiblePending; - /** The insertion position is only temporarily valid. Negative values indicate that the explicit insertion position is not valid. In this case GetInsertionPosition() calculates it from the current selection. */ sal_Int32 mnInsertionPosition; - /** Animation id for a scroll animation the will eventually set the top - and left of the visible area to maRequestedTopLeft. - */ - Animator::AnimationId mnAnimationId; - std::shared_ptr mpSelectionObserver; /** Delete the given list of normal pages. This method is a helper diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 5b54f9cd03b8..148a89c87fa2 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -74,7 +74,6 @@ public: bool SetEditMode (EditMode eEditMode); EditMode GetEditMode() const { return meEditMode;} - PageKind GetPageType() const { return mePageKind;} /** Return the number of slides in the document regardless of whether they are visible or not or whether they are hidden or not. @@ -208,7 +207,6 @@ private: mutable ::osl::Mutex maMutex; SlideSorter& mrSlideSorter; css::uno::Reference mxSlides; - PageKind mePageKind; EditMode meEditMode; mutable ::std::vector maPageDescriptors; diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx index d76113e2dd45..3759aca64dbb 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx @@ -56,10 +56,8 @@ public: private: State meCurrentVisualState; State meOldVisualState; - sal_Int32 mnStateAnimationId; Point maLocationOffset; - sal_Int32 mnLocationAnimationId; }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index b1f3d5d5f55e..816dc14740ce 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -220,7 +220,6 @@ private: std::shared_ptr mpPreviewCache; std::shared_ptr mpLayeredDevice; Range maVisiblePageRange; - bool mbModelChangedWhileModifyEnabled; Size maPreviewSize; bool mbPreciousFlagUpdatePending; Layouter::Orientation meOrientation; diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index cd8c2df16de4..682904fbb8d9 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -103,7 +103,6 @@ SlideSorterModel::SlideSorterModel (SlideSorter& rSlideSorter) : maMutex(), mrSlideSorter(rSlideSorter), mxSlides(), - mePageKind(PK_STANDARD), meEditMode(EM_PAGE), maPageDescriptors(0) { @@ -279,7 +278,7 @@ void SlideSorterModel::Resync() // Check if document and this model really differ. bool bIsUpToDate (true); SdDrawDocument* pDocument = GetDocument(); - if (pDocument!=nullptr && maPageDescriptors.size()==pDocument->GetSdPageCount(mePageKind)) + if (pDocument!=nullptr && maPageDescriptors.size()==pDocument->GetSdPageCount(PK_STANDARD)) { for (sal_Int32 nIndex=0,nCount=maPageDescriptors.size(); nIndexGetPageKind() != mePageKind) + if (pPage->GetPageKind() != PK_STANDARD) return false; if (pPage->IsMasterPage() != (meEditMode==EM_MASTERPAGE)) return false; @@ -637,9 +636,9 @@ SdPage* SlideSorterModel::GetPage (const sal_Int32 nSdIndex) const if (pModel != nullptr) { if (meEditMode == EM_PAGE) - return pModel->GetSdPage ((sal_uInt16)nSdIndex, mePageKind); + return pModel->GetSdPage ((sal_uInt16)nSdIndex, PK_STANDARD); else - return pModel->GetMasterSdPage ((sal_uInt16)nSdIndex, mePageKind); + return pModel->GetMasterSdPage ((sal_uInt16)nSdIndex, PK_STANDARD); } else return nullptr; diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index 180358fa15f9..d4a89b4f55d0 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -27,20 +27,12 @@ VisualState::VisualState (const sal_Int32 nPageId) : mnPageId(nPageId), meCurrentVisualState(VS_None), meOldVisualState(VS_None), - mnStateAnimationId(controller::Animator::NotAnAnimationId), - maLocationOffset(0,0), - mnLocationAnimationId(controller::Animator::NotAnAnimationId) + maLocationOffset(0,0) { } VisualState::~VisualState() { - if (mnStateAnimationId != controller::Animator::NotAnAnimationId - || mnLocationAnimationId != controller::Animator::NotAnAnimationId) - { - OSL_ASSERT(mnStateAnimationId == controller::Animator::NotAnAnimationId); - OSL_ASSERT(mnLocationAnimationId == controller::Animator::NotAnAnimationId); - } } void VisualState::SetVisualState (const State eState) diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index ac9a8fccb960..50fa6a7fca6a 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -401,7 +401,7 @@ void SlideSorterViewShell::FuTemporary (SfxRequest& rRequest) mpImpl->ProcessModifyPageSlot ( rRequest, pCurrentPage, - mpSlideSorter->GetModel().GetPageType()); + PK_STANDARD); Cancel(); rRequest.Done (); } diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 31cb6ca290da..2abafe28dcc1 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -140,7 +140,6 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) mpPreviewCache(), mpLayeredDevice(new LayeredDevice(rSlideSorter.GetContentWindow())), maVisiblePageRange(-1,-1), - mbModelChangedWhileModifyEnabled(true), maPreviewSize(0,0), mbPreciousFlagUpdatePending(true), meOrientation(Layouter::GRID), @@ -747,10 +746,6 @@ void SlideSorterView::DragFinished (sal_Int8 nDropAction) void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) { - ::sd::DrawDocShell* pDocShell = mrModel.GetDocument()->GetDocSh(); - if (pDocShell!=nullptr && pDocShell->IsEnableSetModified()) - mbModelChangedWhileModifyEnabled = true; - ::sd::View::Notify(rBroadcaster, rHint); } diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index f400e7816945..5133f8f94a85 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -65,7 +65,6 @@ Window::Window(vcl::Window* pParent) mnMinZoom(MIN_ZOOM), mnMaxZoom(MAX_ZOOM), mbMinZoomAutoCalc(false), - mbCalcMinZoomByMinSide(true), mbCenterAllowed(true), mnTicks (0), mpViewShell(nullptr), @@ -161,11 +160,7 @@ void Window::CalcMinZoom() * (double) ZOOM_MULTIPLICATOR / (double) maViewSize.Height()); // Decide whether to take the larger or the smaller factor. - sal_uLong nFact; - if (mbCalcMinZoomByMinSide) - nFact = std::min(nX, nY); - else - nFact = std::max(nX, nY); + sal_uLong nFact = std::min(nX, nY); // The factor is tansfomed according to the current zoom factor. nFact = nFact * nZoom / ZOOM_MULTIPLICATOR; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 84d5d19053e3..32eb612f3aef 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -143,7 +143,6 @@ SfxViewFrame* ViewShell::GetViewFrame() const ViewShell::ViewShell( SfxViewFrame*, vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) : SfxShell(&rViewShellBase) -, mbCenterAllowed(true) , mpParentWindow(pParentWindow) { construct(); @@ -209,7 +208,7 @@ void ViewShell::construct() GetParentWindow()->SetBackground (Wallpaper()); mpContentWindow->SetBackground (Wallpaper()); - mpContentWindow->SetCenterAllowed(mbCenterAllowed); + mpContentWindow->SetCenterAllowed(true); mpContentWindow->SetViewShell(this); mpContentWindow->SetPosSizePixel( GetParentWindow()->GetPosPixel(),GetParentWindow()->GetSizePixel()); -- cgit