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

[Caolán McNamara]

 sc/inc/sc.hrc                                           |    2 
 sc/source/ui/inc/miscdlgs.hrc                           |    6 -
 sc/source/ui/src/miscdlgs.src                           |   50 ----------------
 sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx |    7 +-
 4 files changed, 6 insertions(+), 59 deletions(-)

New commits:
commit 40e0b5e458f2aaa92b367785c443a57b06ce094a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 7 15:08:01 2013 +0000

    drop unused resources
    
    Change-Id: I6bd9c1cf56eb7f890c9d2f97819440377b457557

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 180e6da..83895bf 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -998,7 +998,7 @@
 #define RID_SCDLG_HFEDIT_FOOTER         (SC_DIALOGS_START + 69)
 #define RID_SCPAGE_PRINT                (SC_DIALOGS_START + 70)
 #define RID_SCDLG_COLORROW              (SC_DIALOGS_START + 71)
-#define RID_SCDLG_NAMES_PASTE           (SC_DIALOGS_START + 72)
+
 #define RID_SCDLG_NAMES_CREATE          (SC_DIALOGS_START + 73)
 
 #define RID_SCDLG_CHAR                  (SC_DIALOGS_START + 76)
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 2d423ec..7ef7e7f 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -82,12 +82,6 @@
 #define FL_SEP1         51
 #define FL_SEP2         52
 
-#define BTN_CLOSE       60
-#define BTN_PASTE       61
-#define BTN_PASTE_ALL   62
-#define CTRL_TABLE      63
-#define FL_DIV          64
-
 // Insert/Delete Sheet
 #define FT_DEST         1
 #define LB_DEST         2
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index f448b8c..1b78550 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -1399,56 +1399,6 @@ ModalDialog RID_SCDLG_NAMES_CREATE
     Text [ en-US ] = "Create Names" ;
 };
 
-ModalDialog RID_SCDLG_NAMES_PASTE
-{
-    OutputSize = TRUE ;
-    HelpId = CMD_FID_INSERT_NAME ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 228 , 160 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE;
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 6, 140 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_PASTE
-    {
-        Pos = MAP_APPFONT ( 172 , 110 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [en-US] = "Paste";
-    };
-    PushButton BTN_PASTE_ALL
-    {
-        Pos = MAP_APPFONT ( 6 , 110 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [en-US] = "Paste All";
-    };
-    PushButton BTN_CLOSE
-    {
-        Pos = MAP_APPFONT ( 172 , 140 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        Text [en-US] = "Close";
-    };
-    Control CTRL_TABLE
-    {
-        Pos = MAP_APPFONT( 6, 6 );
-        Size = MAP_APPFONT( 210, 100 );
-        Border = TRUE;
-        DialogControl = TRUE;
-    };
-    FixedLine FL_DIV
-    {
-        Pos = MAP_APPFONT( 0, 132 );
-        Size = MAP_APPFONT( 228, 3 );
-    };
-    Text [ en-US ] = "Paste Names" ;
-};
-
 ModalDialog RID_SCDLG_CHARTCOLROW
 {
     HelpID = "sc:ModalDialog:RID_SCDLG_CHARTCOLROW";
commit 7e741f28e5b9d869096b1814108a252006bc23e0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 7 14:30:54 2013 +0000

    Related: rhbz#902884 check for GetSelectedMasterPage failure anyway
    
    backtrace doesn't indicate that its NULL however, but the rest of
    our GetSelectedMasterPage check for NULL so fix that anyway
    
    Change-Id: I9e0b15f4a18523ff1e787ef230de1ca227aa2980

diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
index 512fd1d..58fa05f 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
@@ -553,8 +553,11 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest)
         case SID_TP_EDIT_MASTER:
         {
             using namespace ::com::sun::star;
-            uno::Reference<drawing::XDrawPage> xSelectedMaster (
-                GetSelectedMasterPage()->getUnoPage(), uno::UNO_QUERY);
+            uno::Reference<drawing::XDrawPage> xSelectedMaster;
+            SdPage* pMasterPage = GetSelectedMasterPage();
+            assert(pMasterPage); //rhbz#902884
+            if (pMasterPage)
+                xSelectedMaster = uno::Reference<drawing::XDrawPage>(pMasterPage->getUnoPage(), uno::UNO_QUERY);
             SfxViewFrame* pViewFrame = mrBase.GetViewFrame();
             if (pViewFrame != NULL && xSelectedMaster.is())
             {