Lots more small re-basing issues fixed.

Change-Id: I621567c4596e01092c55d868403910386fa14058

10 files changed, 32 insertions, 34 deletions

diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 668e691d5a97..243161fb2c9e 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -164,14 +164,14 @@ namespace bib
     {
         mpBibView->UpdatePages();
         FormControlContainer::_loaded( _rEvent );
-        Resize();
+        mpBibView->Resize();
     }
 
     void BibViewFormControlContainer::_reloaded( const EventObject& _rEvent )
     {
         mpBibView->UpdatePages();
         FormControlContainer::_loaded( _rEvent );
-        Resize();
+        mpBibView->Resize();
     }
 
     IMPL_STATIC_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG )
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 77f13dc30494..4590b9e4f222 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -185,7 +185,7 @@ private:
     VclPtr<PushButton>            m_pChangePassBtn;
 
     VclPtr<SelectableFixedText>   m_pShowTypeFT;
-    VclPtr<Edit>                  m_pFileValFt;
+    VclPtr<Edit>                  m_pFileValEd;
     VclPtr<SelectableFixedText>   m_pShowSizeFT;
 
     VclPtr<SelectableFixedText>   m_pCreateValFt;
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index b9eb528fcae4..0d121daa364e 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -51,7 +51,7 @@ public:
     void FreeResource (void);
 
 private:
-    const std::unique_ptr<SfxTemplateDialog_Impl> pImpl;
+    std::unique_ptr<SfxTemplateDialog_Impl> pImpl;
     SfxBindings* mpBindings;
 };
 
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index c550ad94e37a..9b18e9937878 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -814,8 +814,7 @@ void SfxDocumentPage::dispose()
     m_pNameED.clear();
     m_pChangePassBtn.clear();
     m_pShowTypeFT.clear();
-    m_pReadOnlyCB.clear();
-    m_pFileValFt.clear();
+    m_pFileValEd.clear();
     m_pShowSizeFT.clear();
     m_pCreateValFt.clear();
     m_pChangeValFt.clear();
@@ -1444,22 +1443,22 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
     m_aValueEdit    ( new Edit( this, WB_BORDER|WB_TABSTOP|WB_LEFT ) ),
     m_aDateField    ( new DateField( this, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT ) ),
     m_aTimeField    ( new TimeField( this, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT ) ),
-    m_aDurationField( new Edit( this, WB_BORDER|WB_TABSTOP|WB_READONLY ),
+    m_aDurationField( new Edit( this, WB_BORDER|WB_TABSTOP|WB_READONLY ) ),
     m_aEditButton   ( new PushButton( this, WB_TABSTOP ) ),
     m_aYesNoButton  ( new CustomPropertiesYesNoButton( this, SfxResId( SFX_WIN_PROPERTY_YESNO )) ),
-    m_aRemoveButton ( new ImageButton( this, 0 ),
+    m_aRemoveButton ( new ImageButton( this, 0 ) ),
     m_nScrollPos (0),
     m_pCurrentLine (NULL),
     m_aNumberFormatter( ::comphelper::getProcessComponentContext(),
                         Application::GetSettings().GetLanguageTag().getLanguageType() )
 
 {
-    m_aEditButton.SetPosSizePixel(
+    m_aEditButton->SetPosSizePixel(
         LogicToPixel(Point(159, 2), MAP_APPFONT),
         LogicToPixel(Size(RSC_CD_TEXTBOX_HEIGHT, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT));
-    m_aRemoveButton.SetSizePixel(LogicToPixel(Size(RSC_CD_PUSHBUTTON_HEIGHT, RSC_CD_PUSHBUTTON_HEIGHT), MAP_APPFONT));
+    m_aRemoveButton->SetSizePixel(LogicToPixel(Size(RSC_CD_PUSHBUTTON_HEIGHT, RSC_CD_PUSHBUTTON_HEIGHT), MAP_APPFONT));
 
-    m_aValueEdit.SetPosSizePixel(
+    m_aValueEdit->SetPosSizePixel(
         LogicToPixel(Point(159, 2), MAP_APPFONT),
         LogicToPixel(Size(61, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT));
 
@@ -2374,7 +2373,7 @@ CmisPropertiesWindow::CmisPropertiesWindow(SfxTabPage* pParent):
     pParent->get(m_pBox, "CmisWindow");
     CmisPropertyLine aTemp( m_pBox );
     m_nItemHeight = aTemp.getItemHeight();
-};
+}
 
 CmisPropertiesWindow::~CmisPropertiesWindow()
 {
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 2b1177a723d0..a9ce3eeb6a35 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -218,9 +218,9 @@ void SfxInfoBarWindow::Resize()
 
     for (auto it = m_aActionBtns.begin(); it != m_aActionBtns.end(); ++it)
     {
-        long nButtonWidth = it->GetSizePixel().getWidth();
+        long nButtonWidth = (*it)->GetSizePixel().getWidth();
         nX -= nButtonWidth;
-        it->SetPosSizePixel(Point(nX, 5 * nScaleFactor), Size(nButtonWidth, 30 * nScaleFactor));
+        (*it)->SetPosSizePixel(Point(nX, 5 * nScaleFactor), Size(nButtonWidth, 30 * nScaleFactor));
         nX -= nButtonGap;
     }
 
@@ -275,8 +275,8 @@ SfxInfoBarWindow* SfxInfoBarContainerWindow::getInfoBar(const OUString& sId)
 {
     for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
     {
-        if (it->getId() == sId)
-            return &(*it);
+        if ((*it)->getId() == sId)
+            return it->get();
     }
     return NULL;
 }
@@ -285,7 +285,7 @@ void SfxInfoBarContainerWindow::removeInfoBar(SfxInfoBarWindow* pInfoBar)
 {
     for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
     {
-        if (pInfoBar == &(*it))
+        if (pInfoBar == it->get())
         {
             m_pInfoBars.erase(it);
             break;
@@ -296,8 +296,8 @@ void SfxInfoBarContainerWindow::removeInfoBar(SfxInfoBarWindow* pInfoBar)
     long nY = 0;
     for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
     {
-        it->SetPosPixel(Point(0, nY));
-        nY += it->GetSizePixel().getHeight();
+        (*it)->SetPosPixel(Point(0, nY));
+        nY += (*it)->GetSizePixel().getHeight();
     }
 
     Size aSize = GetSizePixel();
@@ -314,10 +314,10 @@ void SfxInfoBarContainerWindow::Resize()
 
     for (auto it = m_pInfoBars.begin(); it != m_pInfoBars.end(); ++it)
     {
-        Size aSize = it->GetSizePixel();
+        Size aSize = (*it)->GetSizePixel();
         aSize.setWidth(nWidth);
-        it->SetSizePixel(aSize);
-        it->Resize();
+        (*it)->SetSizePixel(aSize);
+        (*it)->Resize();
     }
 }
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 854493c4f629..cba80496e162 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -410,15 +410,15 @@ void SfxTabDialog::dispose()
     delete [] pRanges;
 
     if (m_bOwnsBaseFmtBtn)
-        m_pBaseFmtBtn.disposeAndClear()
+        m_pBaseFmtBtn.disposeAndClear();
     if (m_bOwnsResetBtn)
-        m_pResetBtn.disposeAndClear()
+        m_pResetBtn.disposeAndClear();
     if (m_bOwnsHelpBtn)
-        m_pHelpBtn.disposeAndClear()
+        m_pHelpBtn.disposeAndClear();
     if (m_bOwnsCancelBtn)
-        m_pCancelBtn.disposeAndClear()
+        m_pCancelBtn.disposeAndClear();
     if (m_bOwnsOKBtn)
-        m_pOKBtn.disposeAndClear()
+        m_pOKBtn.disposeAndClear();
     m_pBox.clear();
     m_pTabCtrl.clear();
     m_pOKBtn.clear();
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 5f7d8155f09c..7cbc5be5a7a1 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -546,8 +546,8 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl
     , xModuleManager(frame::ModuleManager::create(::comphelper::getProcessComponentContext()))
     , m_pDeletionWatcher(NULL)
 
-    , aFmtLb( new SfxActionListBox(this, WB_BORDER | WB_TABSTOP | WB_SORT | WB_QUICK_SEARCH) ),
-    , aFilterLb( new ListBox(pW, WB_BORDER | WB_DROPDOWN | WB_TABSTOP) ),
+    , aFmtLb( new SfxActionListBox(this, WB_BORDER | WB_TABSTOP | WB_SORT | WB_QUICK_SEARCH) )
+    , aFilterLb( new ListBox(pW, WB_BORDER | WB_DROPDOWN | WB_TABSTOP) )
 
     , nActFamily(0xffff)
     , nActFilter(0)
@@ -1835,7 +1835,6 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
             for (; it != itEnd; ++it)
             {
                 const OUString aTemplName(pTreeBox ? pTreeBox->GetEntryText(*it) : aFmtLb->GetEntryText(*it));
-                PrepareDeleteAction();
                 bDontUpdate = true; // To prevent the Treelistbox to shut down while deleting
                 Execute_Impl( SID_STYLE_DELETE, aTemplName,
                               OUString(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 60270b45563c..3997e4f5f0e9 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -628,7 +628,7 @@ IMPL_LINK(SfxTemplateManagerDlg, RepositoryMenuSelectHdl, Menu*, pMenu)
 
         if (dlg->Execute())
         {
-            std::shared_ptr<Place> xPlace = dlg.GetPlace();
+            std::shared_ptr<Place> xPlace = dlg->GetPlace();
 
             if (insertRepository(xPlace->GetName(), xPlace->GetUrl()))
             {
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index b95ad307f1f4..2e9bb385c59b 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -225,7 +225,7 @@ int SfxPrinterController::getPageCount() const
 {
     int nPages = 0;
     VclPtr<Printer> xPrinter( getPrinter() );
-    if( mxRenderable.is() && pPrinter )
+    if( mxRenderable.is() && xPrinter )
     {
         Sequence< beans::PropertyValue > aJobOptions( getMergedOptions() );
         try
@@ -270,7 +270,7 @@ Sequence< beans::PropertyValue > SfxPrinterController::getPageParameters( int i_
 void SfxPrinterController::printPage( int i_nPage ) const
 {
     VclPtr<Printer> xPrinter( getPrinter() );
-    if( mxRenderable.is() && pPrinter )
+    if( mxRenderable.is() && xPrinter )
     {
         Sequence< beans::PropertyValue > aJobOptions( getMergedOptions() );
         try
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 0213942c2467..4fa86884969b 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -148,7 +148,7 @@ namespace sdr
 
             // restore MapModes
             getOutputDevice().EnableMapMode(bMapModeWasEnabledDest);
-            const_cast<OverlayManagerBuffered*>(this)->maBufferDevice->EnableMapMode(bMapModeWasEnabledSource);
+            const_cast<OverlayManagerBuffered*>(this)->mpBufferDevice->EnableMapMode(bMapModeWasEnabledSource);
         }
 
         void OverlayManagerBuffered::ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice)