[Libreoffice-commits] core.git: 2 commits - sc/source vcl/inc

[Michael Meeks]

 sc/source/ui/condformat/condformatdlg.cxx |    9 +++++++++
 sc/source/ui/view/cellsh1.cxx             |    2 +-
 vcl/inc/opengl/program.hxx                |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit f66572b2ff5f27ab938edbe3a2329395aae43c2d
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sun May 3 21:41:41 2015 +0200

    tdf#90982 - repair parts of the conditional formatting dialog.
    
    Change-Id: I5203e8205969004c6c2dd8f1dc438c9e7583a991

diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 59d3431..d4ea0ca 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -56,6 +56,9 @@ void ScCondFormatList::dispose()
 {
     mpDialogParent.clear();
     mpScrollBar.disposeAndClear();
+    for (auto it = maEntries.begin(); it != maEntries.end(); ++it)
+        it->disposeAndClear();
+    maEntries.clear();
     Control::dispose();
 }
 
@@ -250,24 +253,28 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox*, pBox)
             if((*itr)->GetType() == condformat::entry::COLORSCALE2)
                 return 0;
 
+            itr->disposeAndClear();
             *itr = VclPtr<ScColorScale2FrmtEntry>::Create( this, mpDoc, maPos );
             break;
         case 1:
             if((*itr)->GetType() == condformat::entry::COLORSCALE3)
                 return 0;
 
+            itr->disposeAndClear();
             *itr = VclPtr<ScColorScale3FrmtEntry>::Create( this, mpDoc, maPos );
             break;
         case 2:
             if((*itr)->GetType() == condformat::entry::DATABAR)
                 return 0;
 
+            itr->disposeAndClear();
             *itr = VclPtr<ScDataBarFrmtEntry>::Create( this, mpDoc, maPos );
             break;
         case 3:
             if((*itr)->GetType() == condformat::entry::ICONSET)
                 return 0;
 
+            itr->disposeAndClear();
             *itr = VclPtr<ScIconSetFrmtEntry>::Create( this, mpDoc, maPos );
             break;
         default:
@@ -370,6 +377,7 @@ IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl )
     {
         if((*itr)->IsSelected())
         {
+            itr->disposeAndClear();
             maEntries.erase(itr);
             break;
         }
@@ -461,6 +469,7 @@ void ScCondFormatDlg::dispose()
     mpRbRange.clear();
     mpCondFormList.clear();
     mpLastEdit.clear();
+
     ScAnyRefModalDlg::dispose();
 }
 
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 1145e2b..09ef8c7 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1931,7 +1931,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 const ScPatternAttr* pPattern = pDoc->GetPattern(aPos.Col(), aPos.Row(), aPos.Tab());
                 const std::vector<sal_uInt32>& rCondFormats = static_cast<const ScCondFormatItem&>(pPattern->GetItem(ATTR_CONDITIONAL)).GetCondFormatData();
                 bool bContainsCondFormat = !rCondFormats.empty();
-                VclPtr<ScCondFormatDlg> pCondFormatDlg;
+                ScopedVclPtr<ScCondFormatDlg> pCondFormatDlg;
                 if(bContainsCondFormat)
                 {
                     bool bContainsExistingCondFormat = false;
commit 873b6d9d47591ffb7f3de88a3ef67cfe462f4b1c
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sun May 3 18:06:22 2015 +0200

    Use deleted function macro.
    
    Change-Id: Id1c7efc5af7ba335466ff637eac637d7a6c41ed5

diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 438d7e3..3ac0ff4 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -39,7 +39,7 @@ private:
     TextureList     maTextures;
     bool            mbBlending;
 
-    OpenGLProgram(const OpenGLProgram &notImplemented);
+    OpenGLProgram(const OpenGLProgram &) SAL_DELETED_FUNCTION;
 public:
     OpenGLProgram();
     ~OpenGLProgram();