more the png into the .ui so it isn't garbage collected

Change-Id: If0d3829bfc14c602a0167967cbe215782c75f549

extensions/source/scanner/grid.cxx

@@ -119,7 +119,7 @@ class GridWindow : public Window
     void drawLine( double x1, double y1, double x2, double y2 );
 public:
     GridWindow(Window* pParent);
-    void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues);
+    void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap);
     virtual ~GridWindow();
 
     void setBoundings( double fMinX, double fMinY, double fMaxX, double fMaxY );
@@ -159,13 +159,13 @@ GridWindow::GridWindow(Window* pParent)
     , m_bCutValues(false)
     , m_aHandles()
     , m_nDragIndex(0xffffffff)
-    , m_aMarkerBitmap( FixedImage::loadThemeImage("extensions/source/scanner/handle.png").GetBitmapEx() )
 {
     SetMapMode(MapMode(MAP_PIXEL));
 }
 
-void GridWindow::Init(double* pXValues, double* pYValues, int nValues, bool bCutValues)
+void GridWindow::Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap)
 {
+    m_aMarkerBitmap = rMarkerBitmap;
     m_pXValues = pXValues;
     m_pOrigYValues = pYValues;
     m_nValues = nValues;
@@ -214,7 +214,7 @@ GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, Window*
     get(m_pResetTypeBox, "resetTypeCombobox");
     get(m_pResetButton, "resetButton");
     get(m_pGridWindow, "gridwindow");
-    m_pGridWindow->Init(pXValues, pYValues, nValues, bCutValues);
+    m_pGridWindow->Init(pXValues, pYValues, nValues, bCutValues, get<FixedImage>("handle")->GetImage().GetBitmapEx());
 
     m_pResetTypeBox->SelectEntryPos( 0 );
 

extensions/uiconfig/scanner/ui/griddialog.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires LibreOffice 1.0 -->
   <requires lib="gtk+" version="3.0"/>
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="GridDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -80,6 +80,18 @@
                 <property name="position">3</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkImage" id="handle">
+                <property name="can_focus">False</property>
+                <property name="no_show_all">True</property>
+                <property name="pixbuf">extensions/source/scanner/handle.png</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>