Kaydet (Commit) 14c619f1 authored tarafından Caolán McNamara's avatar Caolán McNamara

convert predefined label warning dialog to .ui

Change-Id: I6f7cbc6aea1acbd7c803cd418ba2e9ed71fb2c50
üst dc7498e4
...@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ ...@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/autotext \ sw/uiconfig/swriter/ui/autotext \
sw/uiconfig/swriter/ui/bibliographyentry \ sw/uiconfig/swriter/ui/bibliographyentry \
sw/uiconfig/swriter/ui/bulletsandnumbering \ sw/uiconfig/swriter/ui/bulletsandnumbering \
sw/uiconfig/swriter/ui/cannotsavelabeldialog \
sw/uiconfig/swriter/ui/captionoptions \ sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/characterproperties \ sw/uiconfig/swriter/ui/characterproperties \
sw/uiconfig/swriter/ui/charurlpage \ sw/uiconfig/swriter/ui/charurlpage \
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <tools/poly.hxx> #include <tools/poly.hxx>
#include <vcl/layout.hxx>
#include <viewopt.hxx> #include <viewopt.hxx>
#include "swtypes.hxx" #include "swtypes.hxx"
...@@ -631,7 +632,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) ...@@ -631,7 +632,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)
if ( rCfg.IsPredefinedLabel(sMake, sType) ) if ( rCfg.IsPredefinedLabel(sMake, sType) )
{ {
SAL_WARN( "sw.envelp", "label is predefined and cannot be overwritten" ); 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; return 0;
} }
String sTmp(aQueryMB.GetMessText()); String sTmp(aQueryMB.GetMessText());
......
...@@ -72,11 +72,10 @@ ...@@ -72,11 +72,10 @@
#define STR_ROWS (RC_LABFMT_BEGIN + 8) #define STR_ROWS (RC_LABFMT_BEGIN + 8)
#define STR_PWIDTH (RC_LABFMT_BEGIN + 9) #define STR_PWIDTH (RC_LABFMT_BEGIN + 9)
#define STR_PHEIGHT (RC_LABFMT_BEGIN + 10) #define STR_PHEIGHT (RC_LABFMT_BEGIN + 10)
#define WB_PREDEFINED_LABEL (RC_LABFMT_BEGIN + 11)
// overflow check ******************************************************** // overflow check ********************************************************
#define LABFMT_ACT_END WB_PREDEFINED_LABEL #define LABFMT_ACT_END STR_PHEIGHT
#if LABFMT_ACT_END > RC_LABFMT_END #if LABFMT_ACT_END > RC_LABFMT_END
#error Resource overflow in #file, #line #error Resource overflow in #file, #line
......
...@@ -303,12 +303,6 @@ String STR_PHEIGHT ...@@ -303,12 +303,6 @@ String STR_PHEIGHT
{ {
Text [ en-US ] = "Page Height" ; 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 ModalDialog DLG_SAVE_LABEL
{ {
HelpID = HID_SAVE_LABEL_DLG ; HelpID = HID_SAVE_LABEL_DLG ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment