[Libreoffice-commits] core.git: 2 commits - include/sfx2 sc/inc sw/source sw/UIConfig_swriter.mk

[Caolán McNamara]

 include/sfx2/sfxsids.hrc       |    1 +
 sc/inc/sc.hrc                  |    3 ++-
 sw/UIConfig_swriter.mk         |    1 +
 sw/source/ui/envelp/labfmt.cxx |    3 ++-
 sw/source/ui/envelp/labfmt.hrc |    3 +--
 sw/source/ui/envelp/labfmt.src |    6 ------
 6 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 257ba103fb9ffae87189eb5d435969961fe4e98c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 1 11:46:05 2013 +0100

    Resolves: fdo#66263 calc's protect records doesn't do anything, sid collision
    
    Change-Id: I50c9f0bd28f17e5d56c6d6948871042ba64650ef

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index d1227e3..f17124a 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -750,6 +750,7 @@
 #define SC_VIEW_START           (SID_SC_START)
 #endif
 #define FID_CHG_RECORD          (EDIT_MENU_START + 18)
+//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries
 #define SID_CHG_PROTECT         (SC_VIEW_START + 84)
 
 // eof ------------------------------------------------------------------------
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e0bbdca..5bfe313 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -123,6 +123,7 @@
 #define SID_NUMBER_DECDEC       (SC_VIEW_START + 58)
 
 // misc:
+#define SID_COLLABORATION       (SC_VIEW_START + 59)
 #define SID_LINKS               (SC_VIEW_START + 60)
 #define SID_INSERT_SIMAGE       (SC_VIEW_START + 61)
 #define SID_INSERT_SMATH        (SC_VIEW_START + 63)
@@ -153,7 +154,7 @@
 
 #define SID_CHOOSE_DESIGN       (SC_VIEW_START + 82)
 #define SID_EURO_CONVERTER      (SC_VIEW_START + 83)
-#define SID_COLLABORATION       (SC_VIEW_START + 84)
+//See include/sfx2/sfxsids.hrc for reserved usage of (SC_VIEW_START + 84)
 #define SID_EXTERNAL_SOURCE     (SC_VIEW_START + 85)
 
 #define SID_SC_INPUT_TEXTWYSIWYG        (SC_VIEW_START + 86)
commit 14c619f10f88dd42c4f8af05aa6a1daabe11475e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 1 10:38:00 2013 +0100

    convert predefined label warning dialog to .ui
    
    Change-Id: I6f7cbc6aea1acbd7c803cd418ba2e9ed71fb2c50

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index b0a2966..f85c018 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/autotext \
 	sw/uiconfig/swriter/ui/bibliographyentry \
 	sw/uiconfig/swriter/ui/bulletsandnumbering \
+	sw/uiconfig/swriter/ui/cannotsavelabeldialog \
 	sw/uiconfig/swriter/ui/captionoptions \
 	sw/uiconfig/swriter/ui/characterproperties \
 	sw/uiconfig/swriter/ui/charurlpage \
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 770ae65..89d12f4 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/poly.hxx>
+#include <vcl/layout.hxx>
 #include <viewopt.hxx>
 
 #include "swtypes.hxx"
@@ -631,7 +632,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)
         if ( rCfg.IsPredefinedLabel(sMake, sType) )
         {
             SAL_WARN( "sw.envelp", "label is predefined and cannot be overwritten" );
-            WarningBox( this, SW_RES( WB_PREDEFINED_LABEL ) ).Execute();
+            MessageDialog(this, "CannotSaveLabelDialog", "modules/swriter/ui/cannotsavelabeldialog.ui").Execute();
             return 0;
         }
         String sTmp(aQueryMB.GetMessText());
diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc
index 7469b93..00c5eca 100644
--- a/sw/source/ui/envelp/labfmt.hrc
+++ b/sw/source/ui/envelp/labfmt.hrc
@@ -72,11 +72,10 @@
 #define STR_ROWS     (RC_LABFMT_BEGIN +  8)
 #define STR_PWIDTH   (RC_LABFMT_BEGIN +  9)
 #define STR_PHEIGHT  (RC_LABFMT_BEGIN + 10)
-#define WB_PREDEFINED_LABEL (RC_LABFMT_BEGIN + 11)
 
 // overflow check ********************************************************
 
-#define LABFMT_ACT_END WB_PREDEFINED_LABEL
+#define LABFMT_ACT_END STR_PHEIGHT
 
 #if LABFMT_ACT_END > RC_LABFMT_END
 #error Resource overflow in #file, #line
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
index 96efd28..2be92d7 100644
--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -303,12 +303,6 @@ String STR_PHEIGHT
 {
     Text [ en-US ] = "Page Height" ;
 };
-WarningBox WB_PREDEFINED_LABEL
-{
-    BUTTONS = WB_OK;
-    DEFBUTTON = WB_DEF_OK;
-    Message [ en-US ] = "Predefined labels cannot be overwritten, use another name." ;
-};
 ModalDialog DLG_SAVE_LABEL
 {
     HelpID = HID_SAVE_LABEL_DLG ;