[Libreoffice-commits] core.git: 26 commits - avmedia/source configmgr/qa cui/source dbaccess/source desktop/source include/sfx2 include/svx officecfg/registry sd/source sfx2/sdi sfx2/source starmath/inc starmath/source svx/source sw/AllLangResTarget_sw.mk sw/inc sw/source uui/source
Thomas Arnhold
thomas at arnhold.org
Sun Aug 17 20:37:46 PDT 2014
avmedia/source/viewer/mediawindow.src | 2
configmgr/qa/unit/data.xcd | 5
cui/source/customize/cfg.cxx | 5
cui/source/customize/cfg.hrc | 3
cui/source/customize/cfg.src | 22 -
cui/source/inc/cuires.hrc | 1
dbaccess/source/ui/app/AppController.cxx | 5
dbaccess/source/ui/app/app.src | 7
dbaccess/source/ui/browser/sbabrw.src | 6
dbaccess/source/ui/inc/dbu_resource.hrc | 4
dbaccess/source/ui/tabledesign/table.src | 6
desktop/source/app/desktop.hrc | 1
desktop/source/app/desktop.src | 5
desktop/source/deployment/gui/dp_gui_dialog.src | 6
include/sfx2/sfxsids.hrc | 7
include/svx/dialogs.hrc | 1
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5
sd/source/ui/app/strings.src | 16 -
sd/source/ui/app/tbxids_tmpl.src | 10
sd/source/ui/app/toolbox.src | 5
sd/source/ui/app/toolbox2_tmpl.src | 110 -------
sd/source/ui/inc/ToolBarManager.hxx | 4
sd/source/ui/inc/cfgids.hxx | 6
sd/source/ui/inc/strings.hrc | 3
sfx2/sdi/sfx.sdi | 155 ----------
sfx2/source/appl/app.hrc | 12
sfx2/source/appl/app.src | 66 ----
sfx2/source/appl/appquit.cxx | 4
sfx2/source/appl/newhelp.cxx | 5
sfx2/source/appl/newhelp.src | 12
sfx2/source/dialog/dialog.hrc | 10
sfx2/source/dialog/dialog.src | 22 -
sfx2/source/dialog/mgetempl.cxx | 7
sfx2/source/dialog/newstyle.cxx | 3
sfx2/source/doc/doc.hrc | 12
sfx2/source/doc/doc.src | 57 ---
sfx2/source/doc/objserv.cxx | 5
sfx2/source/inc/helpid.hrc | 3
sfx2/source/menu/menu.hrc | 2
sfx2/source/view/view.hrc | 6
sfx2/source/view/view.src | 13
sfx2/source/view/viewsh.cxx | 7
starmath/inc/starmath.hrc | 1
starmath/source/smres.src | 5
svx/source/sidebar/line/LinePropertyPanel.src | 29 -
sw/AllLangResTarget_sw.mk | 3
sw/inc/chrdlg.hrc | 2
sw/inc/dochdl.hrc | 3
sw/inc/globals.hrc | 4
sw/source/core/doc/doc.cxx | 3
sw/source/ui/app/app.src | 21 +
sw/source/ui/app/error.src | 4
sw/source/ui/chrdlg/break.cxx | 3
sw/source/ui/chrdlg/chrdlg.src | 7
sw/source/ui/dialog/uiregionsw.cxx | 7
sw/source/ui/dochdl/dochdl.src | 9
sw/source/ui/misc/glossary.cxx | 6
sw/source/ui/misc/glossary.src | 8
sw/source/ui/misc/srtdlg.cxx | 3
sw/source/ui/misc/srtdlg.src | 31 --
sw/source/ui/table/table.src | 26 -
sw/source/ui/table/tabledlg.cxx | 3
sw/source/ui/table/tabledlg.src | 27 -
sw/source/uibase/app/docsh.cxx | 3
sw/source/uibase/dialog/regionsw.hrc | 4
sw/source/uibase/dialog/regionsw.src | 12
sw/source/uibase/dochdl/gloshdl.cxx | 4
sw/source/uibase/dochdl/swdtflvr.cxx | 17 -
sw/source/uibase/inc/app.hrc | 5
sw/source/uibase/inc/misc.hrc | 6
sw/source/uibase/inc/table.hrc | 6
sw/source/uibase/shells/tabsh.cxx | 5
sw/source/uibase/uiview/srcview.cxx | 3
sw/source/uibase/uiview/uivwimp.cxx | 3
sw/source/uibase/uiview/view.hrc | 13
sw/source/uibase/uiview/view.src | 20 -
sw/source/uibase/uiview/view2.cxx | 5
sw/source/uibase/uiview/viewprt.cxx | 7
uui/source/ids.src | 16 -
79 files changed, 172 insertions(+), 808 deletions(-)
New commits:
commit 8a822b86b3826cede5dabe734abcd1266b814d98
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 05:33:27 2014 +0200
remove unused Control
Change-Id: I4f6dfe478ba6dd009153d77af26507e0e1795262
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index bd2fbe1..0c7f4d3 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -211,7 +211,6 @@
#define RID_SIDEBAR_LINE_PANEL (RID_SVX_START + 321)
#define RID_POPUPPANEL_LINEPAGE_COLOR (RID_SVX_START + 322)
-#define RID_POPUPPANEL_LINEPAGE_STYLE (RID_SVX_START + 323)
#define RID_POPUPPANEL_LINEPAGE_WIDTH (RID_SVX_START + 324)
#define RID_SIDEBAR_POSSIZE_PANEL (RID_SVX_START + 325)
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index c13dfa7..b36f30c 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -84,35 +84,6 @@ Control RID_POPUPPANEL_LINEPAGE_COLOR
Text = "Color";
};
};
-Control RID_POPUPPANEL_LINEPAGE_STYLE
-{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
-
- Size = MAP_APPFONT(
- POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH ,
- 13 + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE);
-
- Control VS_STYLE
- {
- HelpId = HID_PPROPERTYPANEL_LINE_VS_STYLE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y );
- Size = MAP_APPFONT ( 93 , 13 * 12);
- TabStop = TRUE ;
- Text = "Style";
- };
-
- PushButton PB_OPTIONS
- {
- HelpId = HID_PPROPERTYPANEL_LINE_BTN_STYLE;
- Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_LARGE + OFFSET_X , POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y );
- Size = MAP_APPFONT ( 93 , 13 );
- TabStop = TRUE;
- Text [ en-US ] = "~More Options...";
- };
-};
Control RID_POPUPPANEL_LINEPAGE_WIDTH
{
OutputSize = TRUE;
commit 58e6fbe1a8a4fa4f25d68f0d2f5f9dade9c64ddb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 05:23:52 2014 +0200
remove unused WarningBoxes
Change-Id: I07c457a49646703af5d13f83ba033340309ee655
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 8a7affc..08ac1a0 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -30,7 +30,6 @@
#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0)
#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1)
-#define STR_RECOVER_PREPARED (RID_DESKTOP_STRING_START+2)
#define STR_BOOTSTRAP_ERR_CANNOT_START (RID_DESKTOP_STRING_START+100)
#define STR_BOOTSTRAP_ERR_DIR_MISSING (RID_DESKTOP_STRING_START+101)
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index b109a0e..988af1b 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -29,11 +29,6 @@ String STR_RECOVER_TITLE
Text [ en-US ] = "File Recovery" ;
};
-WarningBox STR_RECOVER_PREPARED
-{
- Message [ en-US ] = "An unrecoverable error has occurred.\n\nAll modified files have been saved and can\nprobably be recovered at program restart." ;
-};
-
String STR_BOOTSTRAP_ERR_CANNOT_START
{
Text [ en-US ] = "The application cannot be started. ";
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index f33bfc1..f1ec60e 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -96,7 +96,6 @@
#define IMG_HELP_TOOLBOX_L_SEARCHDIALOG (RID_SFX_APP_START+167)
#define IMG_HELP_TOOLBOX_L_COPY (RID_SFX_APP_START+168)
-#define RID_SECURITY_WARNING_HYPERLINK (RID_SFX_APP_START + 180)
#define RID_SECURITY_WARNING_TITLE (RID_SFX_APP_START + 181)
#define RID_DESKTOP (RID_SFX_APP_START + 184)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 501e416..66f22b6 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -328,14 +328,6 @@ String STR_DDE_ERROR
Text [ en-US ] = "DDE link to % for % area % are not available." ;
};
-WarningBox RID_SECURITY_WARNING_HYPERLINK
-{
- HelpId = HID_WARNING_SECURITY_HYPERLINK;
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_NO ;
- Message [ en-US ] = "This hyperlink is going to open \"%s\". Do you want to proceed?" ;
-};
-
WarningBox RID_SECURITY_WARNING_NO_HYPERLINKS
{
Buttons = WB_OK ;
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 00600b0..b6989fa 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -52,8 +52,6 @@
#define HID_DID_SAVE_PACKED_XML "SFX2_HID_DID_SAVE_PACKED_XML"
#define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE"
-#define HID_WARNING_SECURITY_HYPERLINK "SFX2_HID_WARNING_SECURITY_HYPERLINK"
-
#define HID_CONFIG_SAVE "SFX2_HID_CONFIG_SAVE"
#define HID_XMLSECDLG_MACROWARN "SFX2_HID_XMLSECDLG_MACROWARN"
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index e31c68c..768c9be 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -79,7 +79,6 @@
#define RID_MATH_TOOLBOX (RID_APP_START + 50)
-#define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204)
#define RID_OBJECTNAME (RID_APP_START + 501)
// free
#define RID_UNDOEDITNAME (RID_APP_START + 503)
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 434ac2d..37649f0 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -23,11 +23,6 @@
#include "toolbox.hrc"
#include "smcommands.h"
-WarningBox RID_NOMATHTYPEFACEWARNING
-{
- Message [ en-US ] = "The 'StarMath' font has not been installed.\nWithout this font %PRODUCTNAME Math cannot function correctly.\nPlease install this font and restart %PRODUCTNAME Math." ;
-};
-
String RID_FONTREGULAR
{
Text [ en-US ] = "Standard" ;
commit 3352a88c8c173acbb15dd95f4738362332107ab7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 05:14:05 2014 +0200
remove dead ToolBox RID_HELPBAR
Change-Id: Ide31f67c346f9a82bf6aa8282caa7cfcee65d9fd
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index da8707e..4236cf9 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -1644,11 +1644,6 @@
<value>7</value>
</prop>
</node>
- <node oor:name=".uno:HelpChooseFile" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Choose Help File</value>
- </prop>
- </node>
<node oor:name=".uno:SpacePara1" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">Line Spacing: 1</value>
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 374cad9..4996d49 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -614,7 +614,6 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = getContainer()->getElementType() == E_TABLE && !isDataSourceReadOnly() && !isConnectionReadOnly() && isTableFormat();
break;
case SID_OPENDOC:
- case SID_HELP_INDEX:
aReturn.bEnabled = true;
break;
case ID_BROWSER_SAVEDOC:
@@ -1101,7 +1100,6 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
}
break;
case SID_OPENDOC:
- case SID_HELP_INDEX:
{
Reference < XDispatchProvider > xProv( getFrame(), UNO_QUERY );
if ( xProv.is() )
@@ -1109,9 +1107,6 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
URL aURL;
switch(_nId)
{
- case SID_HELP_INDEX:
- aURL.Complete = ".uno:HelpIndex";
- break;
case SID_OPENDOC:
aURL.Complete = ".uno:Open";
break;
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 1257b58..0ecdffa 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -91,14 +91,7 @@
#define SID_HELPBALLOONS (SID_SFX_START + 403)
#define SID_HELPTIPS (SID_SFX_START + 404)
#define SID_HELPMENU (SID_SFX_START + 410)
-#define SID_HELP_INDEX (SID_SFX_START + 411)
-#define SID_HELP_SEARCH (SID_SFX_START + 412)
-#define SID_HELP_ANNOTATE (SID_SFX_START + 413)
-#define SID_HELP_BOOKMARK (SID_SFX_START + 414)
#define SID_HELP_DOWNLOAD (SID_SFX_START + 415)
-#define SID_HELP_ZOOMIN (SID_SFX_START + 417)
-#define SID_HELP_ZOOMOUT (SID_SFX_START + 418)
-#define SID_HELP_HELPFILEBOX (SID_SFX_START + 419)
#define SID_SEND_FEEDBACK (SID_SFX_START + 421)
#define SID_SHOW_LICENSE (SID_SFX_START + 1683)
#define SID_SHOW_CREDITS (SID_SFX_START + 1711)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index f9e33bf..60fed19 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1590,11 +1590,6 @@
<value>15</value>
</prop>
</node>
- <node oor:name=".uno:HelpChooseFile" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Choose Help File</value>
- </prop>
- </node>
<node oor:name=".uno:SpacePara1" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Spacing: 1</value>
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 4ce0378..d5abfb8 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2696,86 +2696,6 @@ SfxVoidItem GoUpSel SID_CURSORUP_SEL
]
-SfxVoidItem HelpAnnotate SID_HELP_ANNOTATE
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
-SfxVoidItem HelpBookmark SID_HELP_BOOKMARK
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
-SfxStringItem HelpChooseFile SID_HELP_HELPFILEBOX
-
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* status: */
- SlotType = SfxStringItem
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MACRO;
-]
-
-
SfxVoidItem HelpDownload SID_HELP_DOWNLOAD
()
[
@@ -2876,31 +2796,6 @@ SfxVoidItem HelpOnHelp SID_HELPONHELP
]
-SfxVoidItem HelpSearch SID_HELP_SEARCH
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
SfxBoolItem HelpTip SID_HELPTIPS
[
@@ -2928,56 +2823,6 @@ SfxBoolItem HelpTip SID_HELPTIPS
]
-SfxVoidItem HelpZoomIn SID_HELP_ZOOMIN
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
-SfxVoidItem HelpZoomOut SID_HELP_ZOOMOUT
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
SfxVoidItem HideCurPage SID_BASICIDE_HIDECURPAGE
()
[
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 53cdbd4..f33bfc1 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -35,7 +35,6 @@
#define RID_STR_HELP (RID_SFX_APP_START+79)
#define RID_STR_NOAUTOSTARTHELPAGENT (RID_SFX_APP_START+80)
-#define RID_HELPBAR (RID_SFX_APP_START+81)
#define CONFIG_PATH_START (RID_SFX_APP_START+98)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 439b934..501e416 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -265,56 +265,6 @@ String RID_STR_NOAUTOSTARTHELPAGENT
Text [ en-US ] = "No automatic start at 'XX'" ;
};
-String RID_HELPBAR
-{
- Text [ en-US ] = "Help Bar" ;
-};
-
-ToolBox RID_HELPBAR
-{
- HelpId = HID_HELPBAR ;
- Hide = TRUE ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_HELP_INDEX ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_HELPFILEBOX ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_ZOOMOUT;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_ZOOMIN;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_SEARCH ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_BOOKMARK ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_ANNOTATE ;
- };
- };
-};
-
String RID_STR_HLPFILENOTEXIST
{
Text [ en-US ] = "The help file for this topic is not installed." ;
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 89d395e..00600b0 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -27,7 +27,6 @@
#define HID_TEMPLDLG_UPDATEBYEXAMPLE "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE"
#define HID_TEMPLDLG_WATERCAN "SFX2_HID_TEMPLDLG_WATERCAN"
#define HID_FULLSCREENTOOLBOX "SFX2_HID_FULLSCREENTOOLBOX"
-#define HID_HELPBAR "SFX2_HID_HELPBAR"
#define HID_NAVIGATOR_WINDOW "SFX2_HID_NAVIGATOR_WINDOW"
#define HID_TABDLG_RESET_BTN "SFX2_HID_TABDLG_RESET_BTN"
#define HID_TABDLG_STANDARD_BTN "SFX2_HID_TABDLG_STANDARD_BTN"
commit 83656eb5f7b5c56c973ed961a4d9d58f8b7516dd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 05:12:15 2014 +0200
fix string resource
Change-Id: I96861e0d31c75587892d13818f536acb1a05d24e
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 686efcd..530f8eb 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -56,6 +56,7 @@
#include <editeng/acorrcfg.hxx>
#include "swabstdlg.hxx"
#include <misc.hrc>
+#include <view.hrc>
#include <IDocumentFieldsAccess.hxx>
#include <boost/scoped_ptr.hpp>
commit 7ebdd05613de2b779ff28a9fa3ae8115701a7cee
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 04:57:25 2014 +0200
SD_TOOLBOX is never defined outside toolbox2_tmpl.src
Change-Id: Ie6d05762baae87794e9320a6b123ef326289e4c1
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index e1b977a..6cb0564 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -24,10 +24,6 @@ String STR_DRAW_TOOLBOX
{
Text [ en-US ] = "Drawings Toolbar" ;
};
-String STR_GRAPHIC_TOOLBOX
-{
- Text [ en-US ] = "Draw Toolbar/Image" ;
-};
String STR_SLIDE_TOOLBOX
{
Text [ en-US ] = "Slide Bar" ;
@@ -48,10 +44,6 @@ String STR_DRAW_OPTIONS_TOOLBOX
{
Text [ en-US ] = "Options Bar" ;
};
-String STR_GRAPHIC_OPTIONS_TOOLBOX
-{
- Text [ en-US ] = "Options Bar/Image" ;
-};
String STR_DRAW_COMMONTASK_TOOLBOX
{
Text [ en-US ] = "Presentation" ;
@@ -72,10 +64,6 @@ String STR_DRAW_TEXT_TOOLBOX
{
Text [ en-US ] = "Text Object Bar" ;
};
-String STR_GRAPHIC_TEXT_TOOLBOX
-{
- Text [ en-US ] = "Text Object Bar/Draw" ;
-};
String RID_APPTITLE
{
Text = "StarImpress 4.0" ;
diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src
index 218225a..524419b 100644
--- a/sd/source/ui/app/tbxids_tmpl.src
+++ b/sd/source/ui/app/tbxids_tmpl.src
@@ -42,16 +42,6 @@
RadioCheck = TRUE ; \
};
-#define TBI_OBJECT_CHOOSE_MODE \
- ToolBoxItem\
- {\
- Identifier = SID_OBJECT_CHOOSE_MODE ; \
- HelpID = SID_OBJECT_CHOOSE_MODE ; \
- DropDown = TRUE ; \
- Checkable = TRUE ; \
- RadioCheck = TRUE ; \
- };
-
#define TBI_OBJECT_ALIGN \
ToolBoxItem\
{\
diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src
index e794388..f0f7c6a 100644
--- a/sd/source/ui/app/toolbox.src
+++ b/sd/source/ui/app/toolbox.src
@@ -26,11 +26,6 @@ String RID_DRAW_VIEWER_TOOLBOX
Text [ en-US ] = "Function Bar (viewing mode)" ;
};
-String RID_GRAPHIC_VIEWER_TOOLBOX
-{
- Text [ en-US ] = "Function Bar (viewing mode)" ;
-};
-
String RID_DRAW_MEDIA_TOOLBOX
{
Text [ en-US ] = "Media Playback" ;
diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src
index aaed1af..ca7bd0c 100644
--- a/sd/source/ui/app/toolbox2_tmpl.src
+++ b/sd/source/ui/app/toolbox2_tmpl.src
@@ -17,15 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SD_TOOLBOX
-#define SD_TOOLBOX RID_DRAW_TOOLBOX
#include "tbxids_tmpl.src"
#include <svx/svxids.hrc>
#include <svx/globlmn.hrc>
-#endif
// toolbox bar
-ToolBox SD_TOOLBOX
+ToolBox RID_DRAW_TOOLBOX
{
HelpId = HID_SD_DRAW_TOOLBOX ;
LineSpacing = TRUE ;
@@ -64,17 +61,12 @@ ToolBox SD_TOOLBOX
TBI_DRAWTBX_CS_CALLOUT
TBI_DRAWTBX_CS_STAR
SEPARATOR
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
- TBI_OBJECT_CHOOSE_MODE
-#endif
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
ToolBoxItem
{
ITEM_TOOLBAR_OBJECT_ROTATE
Checkable = TRUE ;
RadioCheck = TRUE ;
};
-#endif
TBI_OBJECT_ALIGN
TBI_POSITION
SEPARATOR
@@ -85,16 +77,12 @@ ToolBox SD_TOOLBOX
Hide = TRUE;
};
SEPARATOR
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
/* TBI_EFFECT_WIN */
TBI_ANIMATION_EFFECTS
TBI_ANIMATION_OBJECTS
-#endif
TBI_3D_WIN
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
SEPARATOR
TBI_PRESENTATION
-#endif
TBI_ZOOM_IN
TBI_ZOOM_OUT
TBI_ATTR_TRANSFORM
@@ -128,11 +116,7 @@ ToolBox SD_TOOLBOX
};
// object bar
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
ToolBox RID_DRAW_OBJ_TOOLBOX
-#elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX
-ToolBox RID_GRAPHIC_OBJ_TOOLBOX
-#endif
{
HelpId = HID_SD_DRAW_OBJ_TOOLBOX ;
LineSpacing = TRUE ;
@@ -163,19 +147,13 @@ ToolBox RID_GRAPHIC_OBJ_TOOLBOX
TBI ( ITEM_TOOLBAR_ATTR_FILL_STYLE )
SEPARATOR
TBI_ATTR_FILL_SHADOW
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
TBI_TOGGLECOMMONTASKBAR
-#endif
TBI_IMAGEMAP
};
};
// option bar
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
ToolBox RID_DRAW_OPTIONS_TOOLBOX
-#elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX
-ToolBox RID_GRAPHIC_OPTIONS_TOOLBOX
-#endif
{
HelpId = HID_SD_DRAW_OPTIONS_TOOLBOX ;
LineSpacing = TRUE ;
@@ -213,18 +191,10 @@ ToolBox RID_GRAPHIC_OPTIONS_TOOLBOX
TBI_PICK_THROUGH
TBI_DOUBLECLICK_TEXTEDIT
SEPARATOR
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
- TBI_SOLID_CREATE
-#endif
- SEPARATOR
TBI_LEAVE_ALL_GROUPS
};
};
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
ToolBox RID_DRAW_TEXT_TOOLBOX
-#elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX
-ToolBox RID_GRAPHIC_TEXT_TOOLBOX
-#endif
{
HelpId = HID_SD_TEXT_TOOLBOX ;
LineSpacing = TRUE ;
@@ -338,29 +308,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
{
Type = TOOLBOXITEM_SEPARATOR ;
};
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
- ToolBoxItem
- {
- ITEM_FORMAT_PARA_LINESPACE_10
- };
- ToolBoxItem
- {
- ITEM_FORMAT_PARA_LINESPACE_15
- };
- ToolBoxItem
- {
- ITEM_FORMAT_PARA_LINESPACE_20
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = FN_NUM_BULLET_ON ;
- HelpID = FN_NUM_BULLET_ON ;
- };
-#else
ToolBoxItem
{
ITEM_FORMAT_PARA_LINESPACE_10
@@ -405,7 +352,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
Identifier = SID_OUTLINE_DOWN ;
HelpID = SID_OUTLINE_DOWN ;
};
-#endif
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
@@ -436,13 +382,11 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
{
Type = TOOLBOXITEM_SEPARATOR ;
};
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
ToolBoxItem
{
Identifier = SID_OUTLINE_BULLET ;
HelpID = SID_OUTLINE_BULLET ;
};
-#endif
ToolBoxItem
{
Identifier = SID_CHARMAP;
@@ -547,29 +491,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
{
Type = TOOLBOXITEM_SEPARATOR ;
};
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
- ToolBoxItem
- {
- ITEM_FORMAT_PARA_LINESPACE_10
- };
- ToolBoxItem
- {
- ITEM_FORMAT_PARA_LINESPACE_15
- };
- ToolBoxItem
- {
- ITEM_FORMAT_PARA_LINESPACE_20
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = FN_NUM_BULLET_ON ;
- HelpID = FN_NUM_BULLET_ON ;
- };
-#else
ToolBoxItem
{
ITEM_FORMAT_PARA_LINESPACE_10
@@ -614,7 +535,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
Identifier = SID_OUTLINE_DOWN ;
HelpID = SID_OUTLINE_DOWN ;
};
-#endif
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
@@ -645,13 +565,11 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
{
Type = TOOLBOXITEM_SEPARATOR ;
};
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
ToolBoxItem
{
Identifier = SID_OUTLINE_BULLET ;
HelpID = SID_OUTLINE_BULLET ;
};
-#endif
ToolBoxItem
{
Identifier = SID_CHARMAP;
@@ -756,29 +674,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
{
Type = TOOLBOXITEM_SEPARATOR ;
};
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
- ToolBoxItem
- {
- ITEM_FORMAT_PARA_LINESPACE_10
- };
- ToolBoxItem
- {
- ITEM_FORMAT_PARA_LINESPACE_15
- };
- ToolBoxItem
- {
- ITEM_FORMAT_PARA_LINESPACE_20
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = FN_NUM_BULLET_ON ;
- HelpID = FN_NUM_BULLET_ON ;
- };
-#else
ToolBoxItem
{
ITEM_FORMAT_PARA_LINESPACE_10
@@ -823,7 +718,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
Identifier = SID_OUTLINE_DOWN ;
HelpID = SID_OUTLINE_DOWN ;
};
-#endif
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
@@ -854,13 +748,11 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
{
Type = TOOLBOXITEM_SEPARATOR ;
};
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
ToolBoxItem
{
Identifier = SID_OUTLINE_BULLET ;
HelpID = SID_OUTLINE_BULLET ;
};
-#endif
ToolBoxItem
{
Identifier = SID_CHARMAP;
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index 2c5cb30..5d3e392 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -104,12 +104,9 @@ public:
/** The set of tool bars that are handled by this manager class.
*/
const static OUString msToolBar; // RID_DRAW_TOOLBOX, 23011
- // RID_GRAPHIC_TOOLBOX, 23025
const static OUString msOptionsToolBar; // RID_DRAW_OPTIONS_TOOLBOX, 23020
- // RID_GRAPHIC_OPTIONS_TOOLBOX, 23026
const static OUString msCommonTaskToolBar; // RID_DRAW_COMMONTASK_TOOLBOX, 23021
const static OUString msViewerToolBar; // RID_DRAW_VIEWER_TOOLBOX, 23023
- // RID_GRAPHIC_VIEWER_TOOLBOX, 23024
const static OUString msSlideSorterToolBar; // RID_SLIDE_TOOLBOX, 23012
const static OUString msSlideSorterObjectBar; // RID_SLIDE_OBJ_TOOLBOX, 23014
const static OUString msOutlineToolBar; // RID_OUTLINE_TOOLBOX, 23017
@@ -117,7 +114,6 @@ public:
const static OUString msDrawingObjectToolBar; // RID_DRAW_OBJ_TOOLBOX, 23013
const static OUString msGluePointsToolBar; // RID_GLUEPOINTS_TOOLBOX, 23019
const static OUString msTextObjectBar; // RID_DRAW_TEXT_TOOLBOX, 23016
- // RID_GRAPHIC_TEXT_TOOLBOX, 23028
const static OUString msBezierObjectBar; // RID_BEZIER_TOOLBOX, 23015
const static OUString msGraphicObjectBar; // RID_DRAW_GRAF_TOOLBOX, 23030
const static OUString msMediaObjectBar; // RID_DRAW_MEDIA_TOOLBOX, 23031
diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx
index ec8fa23..c53771d 100644
--- a/sd/source/ui/inc/cfgids.hxx
+++ b/sd/source/ui/inc/cfgids.hxx
@@ -43,13 +43,7 @@
#define RID_DRAW_COMMONTASK_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 21)
#define RID_FORMLAYER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 22)
#define RID_DRAW_VIEWER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 23)
-#define RID_GRAPHIC_VIEWER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 24)
-
-#define RID_GRAPHIC_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 25)
-#define RID_GRAPHIC_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 26)
#define RID_GRAPHIC_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 27)
-#define RID_GRAPHIC_TEXT_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 28)
-
#define RID_DRAW_GRAF_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 30)
#define RID_DRAW_MEDIA_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 31)
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 276e3a0..1fa282c 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -126,10 +126,7 @@
#define STR_DRAW_OPTIONS_TOOLBOX RID_DRAW_OPTIONS_TOOLBOX
#define STR_DRAW_COMMONTASK_TOOLBOX RID_DRAW_COMMONTASK_TOOLBOX
-#define STR_GRAPHIC_TOOLBOX RID_GRAPHIC_TOOLBOX
-#define STR_GRAPHIC_OPTIONS_TOOLBOX RID_GRAPHIC_OPTIONS_TOOLBOX
#define STR_GRAPHIC_OBJ_TOOLBOX RID_GRAPHIC_OBJ_TOOLBOX
-#define STR_GRAPHIC_TEXT_TOOLBOX RID_GRAPHIC_TEXT_TOOLBOX
#define STR_DRAW_GRAF_TOOLBOX RID_DRAW_GRAF_TOOLBOX
commit bdf6acced0a7f6c5f959235dc5e1b7231cff35e9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 04:47:05 2014 +0200
fix build
Change-Id: I9db0befd075089f346b504f91657a67dc01c9808
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index c4b1ccb..12b50d7 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -18,6 +18,7 @@
*/
#include <doc.hxx>
+#include <DocumentFieldsManager.hxx>
#include <DocumentSettingManager.hxx>
#include <DocumentDrawModelManager.hxx>
#include <DocumentTimerManager.hxx>
@@ -1555,7 +1556,7 @@ bool SwDoc::ConvertFieldsToText()
aInsertPam.SetMark();
// go to the end of the field
- const SwTxtFld *pTxtField = GetTxtFldAtPos( *aInsertPam.End() );
+ const SwTxtFld *pTxtField = sw::DocumentFieldsManager::GetTxtFldAtPos( *aInsertPam.End() );
if (pTxtField && pTxtField->Which() == RES_TXTATR_INPUTFIELD)
{
SwPosition &rEndPos = *aInsertPam.GetPoint();
commit e50bcaf729eed26b0fe0f19d4b6839f67b6ca619
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 04:31:05 2014 +0200
STRING -> String
Change-Id: I084d99fdd1a34842178b59c17ab108750f7bd11d
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
index 368dee1..0e66f04 100644
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
@@ -24,7 +24,7 @@ String AVMEDIA_STR_INSERTMEDIA_DLG
Text[en-US] = "Insert Movie and Sound";
};
-STRING AVMEDIA_STR_OPENMEDIA_DLG
+String AVMEDIA_STR_OPENMEDIA_DLG
{
Text[en-US] = "Open Movie and Sound";
};
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 38c3725..e1b977a 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -952,12 +952,12 @@ String STR_PRES_PAUSE
Text [ en-US ] = "Pause..." ;
};
-STRING STR_WIZARD_ORIGINAL
+String STR_WIZARD_ORIGINAL
{
Text [ en-US ] = "<Original>";
};
-STRING STR_ISLOADING
+String STR_ISLOADING
{
Text [ en-US ] = "Loading...";
};
diff --git a/uui/source/ids.src b/uui/source/ids.src
index 26fe73b..13e2bab 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -332,7 +332,7 @@ Resource RID_UUI_ERRHDL
Text [ en-US ] = "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly.\nDo you want to continue startup of %PRODUCTNAME without the missing configuration data?";
};
- STRING (ERRCODE_UUI_INVALID_XFORMS_SUBMISSION_DATA & ERRCODE_RES_MASK)
+ String (ERRCODE_UUI_INVALID_XFORMS_SUBMISSION_DATA & ERRCODE_RES_MASK)
{
Text [ en-US ] = "The form contains invalid data. Do you still want to continue?";
};
@@ -358,36 +358,36 @@ Resource RID_UUI_ERRHDL
Text [ en-US ] = "The previously obtained lock for file $(ARG1) has expired.\nThis can happen due to problems on the server managing the file lock. It cannot be guaranteed that write operations on this file will not overwrite changes done by other users!";
};
- STRING (ERRCODE_UUI_UNKNOWNAUTH_UNTRUSTED)
+ String (ERRCODE_UUI_UNKNOWNAUTH_UNTRUSTED)
{
Text [ en-US ] = "Unable to verify the identity of $(ARG1) site.\n\nBefore accepting this certificate, you should examine this site's certificate carefully. Are you willing to accept this certificate for the purpose of identifying the Web site $(ARG1)?";
};
- STRING (ERRCODE_UUI_SSLWARN_EXPIRED_1)
+ String (ERRCODE_UUI_SSLWARN_EXPIRED_1)
{
Text [ en-US ] = "$(ARG1) is a site that uses a security certificate to encrypt data during transmission, but its certificate expired on $(ARG2).\n\nYou should check to make sure that your computer's time is correct.";
};
- STRING (ERRCODE_UUI_SSLWARN_DOMAINMISMATCH_1)
+ String (ERRCODE_UUI_SSLWARN_DOMAINMISMATCH_1)
{
Text [ en-US ] = "You have attempted to establish a connection with $(ARG1). However, the security certificate presented belongs to $(ARG2). It is possible, though unlikely, that someone may be trying to intercept your communication with this web site.\n\nIf you suspect the certificate shown does not belong to $(ARG1), please cancel the connection and notify the site administrator.\n\nWould you like to continue anyway?";
};
- STRING (ERRCODE_UUI_SSLWARN_INVALID_1)
+ String (ERRCODE_UUI_SSLWARN_INVALID_1)
{
Text [ en-US ] = "The certificate could not be validated. You should examine this site's certificate carefully.\n\nIf you suspect the certificate shown, please cancel the connection and notify the site administrator.";
};
- STRING (TITLE_UUI_SSLWARN_DOMAINMISMATCH)
+ String (TITLE_UUI_SSLWARN_DOMAINMISMATCH)
{
Text [ en-US ] = "Security Warning: Domain Name Mismatch";
};
- STRING (TITLE_UUI_SSLWARN_EXPIRED)
+ String (TITLE_UUI_SSLWARN_EXPIRED)
{
Text [ en-US ] = "Security Warning: Server Certificate Expired";
};
- STRING (TITLE_UUI_SSLWARN_INVALID)
+ String (TITLE_UUI_SSLWARN_INVALID)
{
Text [ en-US ] = "Security Warning: Server Certificate Invalid";
};
commit bf866b0ad6c57a44616e762d7c9781d2078bc6e6
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 04:22:28 2014 +0200
WARNINGBOX -> WarningBox
Change-Id: Id39add923b94bcf43e64ffbf4940625efe4d35a0
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index 3dc90cd..caa23d2 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -137,7 +137,7 @@ WarningBox RID_WARNINGBOX_REMOVE_EXTENSION {
"Click 'Cancel' to stop removing the extension.";
};
-WARNINGBOX RID_WARNINGBOX_REMOVE_SHARED_EXTENSION
+WarningBox RID_WARNINGBOX_REMOVE_SHARED_EXTENSION
{
Buttons = WB_OK_CANCEL;
DefButton = WB_DEF_CANCEL;
@@ -147,7 +147,7 @@ WARNINGBOX RID_WARNINGBOX_REMOVE_SHARED_EXTENSION
"Click 'Cancel' to stop removing the extension.";
};
-WARNINGBOX RID_WARNINGBOX_ENABLE_SHARED_EXTENSION
+WarningBox RID_WARNINGBOX_ENABLE_SHARED_EXTENSION
{
Buttons = WB_OK_CANCEL;
DefButton = WB_DEF_CANCEL;
@@ -157,7 +157,7 @@ WARNINGBOX RID_WARNINGBOX_ENABLE_SHARED_EXTENSION
"Click 'Cancel' to stop enabling the extension.";
};
-WARNINGBOX RID_WARNINGBOX_DISABLE_SHARED_EXTENSION
+WarningBox RID_WARNINGBOX_DISABLE_SHARED_EXTENSION
{
Buttons = WB_OK_CANCEL;
DefButton = WB_DEF_CANCEL;
commit bf6c743fb63d5473e1175e8cce6d76144e33887a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 04:16:57 2014 +0200
various unused QueryBoxes
Change-Id: I6ce6aa7cc4420bf8f82a578b7985e795c99e0898
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 0ba1be1..44d8f87 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -37,8 +37,6 @@
#define MODIFY_TOOLBAR (60 + CFG_OFFSET)
#define MODIFY_TOOLBAR_CONTENT (61 + CFG_OFFSET)
-#define QBX_CONFIRM_RESET (64 + CFG_OFFSET)
-#define QBX_CONFIRM_DELETE_MENU (65 + CFG_OFFSET)
#define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET)
#define QBX_CONFIRM_DELETE_TOOLBAR (67 + CFG_OFFSET)
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 1c3317e..a61a82c 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -217,14 +217,6 @@ String RID_SVXSTR_TOOLBAR_NAME
Text [ en-US ] = "Toolbar Name" ;
};
-/* %MENUNAME will be replaced at runtime by the name of the selected menu. */
-QueryBox QBX_CONFIRM_DELETE_MENU
-{
- Message [ en-US ] = "Are you sure you want to delete the '%MENUNAME' menu?";
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_NO ;
-};
-
QueryBox QBX_CONFIRM_DELETE_TOOLBAR
{
Message [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
@@ -232,16 +224,6 @@ QueryBox QBX_CONFIRM_DELETE_TOOLBAR
DEFBUTTON = WB_DEF_NO ;
};
-/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder and will be
- replaced at runtime by the name of the selected application or document.
-*/
-QueryBox QBX_CONFIRM_RESET
-{
- Message [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?";
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_NO ;
-};
-
/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
and will be replaced at runtime by the name of the selected application
or document.
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 36f8145..c3000d0 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -351,13 +351,6 @@ String STR_DISABLEPREVIEW
Text [ en-US ] = "Disable Preview" ;
};
-QueryBox APP_SAVEMODIFIED
-{
- Buttons = WB_YES_NO_CANCEL ;
- DefButton = WB_DEF_YES ;
- Message [ en-US ] = "The database has been modified.\nDo you want to save the changes?" ;
-};
-
QueryBox APP_CLOSEDOCUMENTS
{
Buttons = WB_YES_NO ;
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 3f9ea39..ba2620e 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -118,12 +118,6 @@ String STR_QUERY_DELETE_TABLE
Text [ en-US ] = "Do you want to delete the table '%1'?" ;
};
-QueryBox QUERY_BRW_DELETE_QUERY_CONFIRM
-{
- Buttons = WB_YES_NO ;
- Message [ en-US ] = "The query already exists. Do you want to delete it?" ;
-};
-
QueryBox QUERY_CONNECTION_LOST
{
Buttons = WB_YES_NO ;
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index fcece8b..fb81c4b 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -103,14 +103,10 @@
#define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0
#define QUERY_BRW_SAVEMODIFIED RID_QUERYBOX_START + 1
#define QUERY_CONNECTION_LOST RID_QUERYBOX_START + 2
-#define QUERY_BRW_DELETE_QUERY_CONFIRM RID_QUERYBOX_START + 3
-#define APP_SAVEMODIFIED RID_QUERYBOX_START + 4
#define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5
-#define TABLE_QUERY_CONNECTION_LOST RID_QUERYBOX_START + 6
#define QUERY_SAVE_CURRENT_INDEX RID_QUERYBOX_START + 7
#define QUERY_SAVE_TABLE_EDIT_INDEXES RID_QUERYBOX_START + 8
#define RELATION_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 9
- // FREE
#define APP_CLOSEDOCUMENTS RID_QUERYBOX_START + 11
#define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12
#define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index 3a0d7c0..ffe5403 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -333,12 +333,6 @@ QueryBox TABLE_DESIGN_SAVEMODIFIED
Message [ en-US ] = "The table has been changed.\nDo you want to save the changes?" ;
};
-QueryBox TABLE_QUERY_CONNECTION_LOST
-{
- Buttons = WB_YES_NO ;
- Message [ en-US ] = "The connection to the database was lost! The table design can only be used with limited functionality without a connection.\nReconnect?" ;
-};
-
String STR_TABLEDESIGN_CONNECTION_MISSING
{
Text [ en-US ] = "The table could not be saved due to problems connecting to the database.";
commit 76f7bc12fa68585ab4a5b53e7891e4f9863123a4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 03:44:59 2014 +0200
InfoBox to String final
Change-Id: I42f97a12052f4a173b05173fdd2c3079c517f78e
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 26d7a77..6969166 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -25,6 +25,7 @@
#include <comphelper/string.hxx>
#include <unotools/tempfile.hxx>
#include <tools/urlobj.hxx>
+#include <vcl/layout.hxx>
#include <vcl/print.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/wrkwin.hxx>
@@ -828,7 +829,7 @@ void SwSrcView::Load(SwDocShell* pDocShell)
else
{
Window *pTmpWindow = &GetViewFrame()->GetWindow();
- InfoBox(pTmpWindow, SW_RES(MSG_ERR_SRCSTREAM)).Execute();
+ MessageDialog(pTmpWindow, SW_RES(STR_ERR_SRCSTREAM), VCL_MESSAGE_INFO).Execute();
}
}
else
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index e2915e3..3c121f6 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <osl/mutex.hxx>
+#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/msgbox.hxx>
@@ -182,7 +183,7 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq )
if( !bDone )
{
- InfoBox( 0, SW_RES(MSG_SCAN_NOSOURCE) ).Execute();
+ MessageDialog( 0, SW_RES(STR_SCAN_NOSOURCE), VCL_MESSAGE_INFO ).Execute();
rReq.Ignore();
}
else
diff --git a/sw/source/uibase/uiview/view.hrc b/sw/source/uibase/uiview/view.hrc
index b90d5da..8f7e78d 100644
--- a/sw/source/uibase/uiview/view.hrc
+++ b/sw/source/uibase/uiview/view.hrc
@@ -31,13 +31,13 @@
#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14)
#define STR_NB_REPLACED (RC_VIEW_BEGIN + 20)
-#define MSG_SCAN_NOSOURCE (RC_VIEW_BEGIN + 21)
+#define STR_SCAN_NOSOURCE (RC_VIEW_BEGIN + 21)
#define STR_SRCVIEW_ROW (RC_VIEW_BEGIN + 22)
#define STR_SRCVIEW_COL (RC_VIEW_BEGIN + 23)
#define STR_SAVEAS_SRC (RC_VIEW_BEGIN + 24)
-#define MSG_NO_MERGE_ENTRY (RC_VIEW_BEGIN + 25)
+#define STR_NO_MERGE_ENTRY (RC_VIEW_BEGIN + 25)
#define STR_PRINT_TITLE (RC_VIEW_BEGIN + 26)
#define STR_PRINT_MSG (RC_VIEW_BEGIN + 27)
@@ -51,11 +51,8 @@
#define STR_SAVEACOPY_SRC (RC_VIEW_BEGIN + 34)
#define STR_ERR_INSERT_GLOS (RC_VIEW_BEGIN + 35)
-
-// MSG
-
-#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5)
-#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6)
+#define STR_ERR_NO_FAX (RC_VIEW_BEGIN + 36)
+#define STR_ERR_SRCSTREAM (RC_VIEW_BEGIN + 37)
// DLG
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
index e85ad5d..70dcff1 100644
--- a/sw/source/uibase/uiview/view.src
+++ b/sw/source/uibase/uiview/view.src
@@ -32,21 +32,21 @@ QueryBox DLG_SPECIAL_FORCED
DEFBUTTON = WB_DEF_NO ;
Message [ en-US ] = "Check special regions is deactivated. Check anyway?" ;
};
-InfoBox MSG_NO_MERGE_ENTRY
+String STR_NO_MERGE_ENTRY
{
- Message [ en-US ] = "Could not merge documents." ;
+ Text [ en-US ] = "Could not merge documents." ;
};
String STR_ERR_INSERT_GLOS
{
Text [ en-US ] = "AutoText could not be created." ;
};
-InfoBox MSG_ERR_SRCSTREAM
+String STR_ERR_SRCSTREAM
{
- Message [ en-US ] = "The source cannot be loaded." ;
+ Text [ en-US ] = "The source cannot be loaded." ;
};
-InfoBox MSG_ERR_NO_FAX
+String STR_ERR_NO_FAX
{
- Message [ en-US ] = "No fax printer has been set under Tools/Options/%1/Print." ;
+ Text [ en-US ] = "No fax printer has been set under Tools/Options/%1/Print." ;
};
String STR_WEBOPTIONS
{
@@ -56,9 +56,9 @@ String STR_TEXTOPTIONS
{
Text [ en-US ] = "Text document";
};
-InfoBox MSG_SCAN_NOSOURCE
+String STR_SCAN_NOSOURCE
{
- Message [ en-US ] = "Source not specified." ;
+ Text [ en-US ] = "Source not specified." ;
};
String STR_NUM_LEVEL
{
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 4fbf93c..5b5c97f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -57,6 +57,7 @@
#include <editeng/lrspitem.hxx>
#include <unotools/textsearch.hxx>
#include <editeng/unolingu.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <editeng/tstpitem.hxx>
#include <sfx2/event.hxx>
@@ -500,7 +501,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
{
if( bShowError )
{
- InfoBox aInfoBox( GetWindow(), SW_RESSTR( nResId ));
+ MessageDialog aInfoBox( GetWindow(), SW_RESSTR( nResId ), VCL_MESSAGE_INFO);
aInfoBox.Execute();
}
rReq.Ignore();
@@ -2265,7 +2266,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
if (!bCompare && !nFound)
{
Window* pWin = &GetEditWin();
- InfoBox(pWin, SW_RES(MSG_NO_MERGE_ENTRY)).Execute();
+ MessageDialog(pWin, SW_RES(STR_NO_MERGE_ENTRY), VCL_MESSAGE_INFO).Execute();
}
if( nRet==2 && xDocSh.Is() )
xDocSh->DoClose();
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index ac0b151..39af799 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -23,6 +23,7 @@
#include <sfx2/request.hxx>
#include <sfx2/progress.hxx>
#include <sfx2/app.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/oldprintadaptor.hxx>
#include <sfx2/printer.hxx>
@@ -175,11 +176,9 @@ void SwView::ExecutePrint(SfxRequest& rReq)
}
else
{
- InfoBox aInfoBox(&GetEditWin(), SW_RES(MSG_ERR_NO_FAX));
- OUString sMsg = aInfoBox.GetMessText();
+ MessageDialog aInfoBox(&GetEditWin(), SW_RES(STR_ERR_NO_FAX), VCL_MESSAGE_INFO);
sal_uInt16 nResNo = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS;
- sMsg = sMsg.replaceFirst("%1", OUString(SW_RES(nResNo)));
- aInfoBox.SetMessText(sMsg);
+ aInfoBox.set_primary_text(aInfoBox.get_primary_text().replaceFirst("%1", OUString(SW_RES(nResNo))));
aInfoBox.Execute();
SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE);
GetViewFrame()->GetDispatcher()->Execute(SID_SW_EDITOPTIONS,
commit 8807796e45084e560babb5f4da6f72262024398d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 03:34:54 2014 +0200
InfoBox REG_WRONG_PASSWORD and REG_WRONG_PASSWD_REPEAT to String
Change-Id: I64d2b73744401baafd7dd037187ba3d7c604a535
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 79e9e5a..6e0a027 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -22,6 +22,7 @@
#include <svl/urihelper.hxx>
#include <svl/PasswordHelper.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
@@ -417,7 +418,7 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
}
else
{
- InfoBox(this, SW_RES(REG_WRONG_PASSWORD)).Execute();
+ MessageDialog(this, SW_RES(STR_WRONG_PASSWORD), VCL_MESSAGE_INFO).Execute();
}
}
}
@@ -1242,7 +1243,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
}
else
{
- InfoBox(pBox, SW_RES(REG_WRONG_PASSWD_REPEAT)).Execute();
+ MessageDialog(pBox, SW_RES(STR_WRONG_PASSWD_REPEAT), VCL_MESSAGE_INFO).Execute();
ChangePasswdHdl(pBox);
break;
}
@@ -1681,7 +1682,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
}
else
{
- InfoBox(pButton, SW_RES(REG_WRONG_PASSWD_REPEAT)).Execute();
+ MessageDialog(pButton, SW_RES(STR_WRONG_PASSWD_REPEAT), VCL_MESSAGE_INFO).Execute();
}
}
else if(!bChange)
diff --git a/sw/source/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc
index b7d45f3..bc7f188 100644
--- a/sw/source/uibase/dialog/regionsw.hrc
+++ b/sw/source/uibase/dialog/regionsw.hrc
@@ -28,8 +28,8 @@
#define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7)
#define QB_CONNECT (RC_REGIONSW_BEGIN+10)
-#define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11)
-#define REG_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12)
+#define STR_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11)
+#define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12)
//ImageList elements
#define BMP_HIDE 1
diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src
index f23fe2b..65b45b1 100644
--- a/sw/source/uibase/dialog/regionsw.src
+++ b/sw/source/uibase/dialog/regionsw.src
@@ -53,17 +53,13 @@ QueryBox QB_CONNECT
DefButton = WB_DEF_NO ;
Message [ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ;
};
-InfoBox REG_WRONG_PASSWORD
+String STR_WRONG_PASSWORD
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "The password entered is invalid." ;
+ Text [ en-US ] = "The password entered is invalid." ;
};
-InfoBox REG_WRONG_PASSWD_REPEAT
+String STR_WRONG_PASSWD_REPEAT
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "The password has not been set." ;
+ Text [ en-US ] = "The password has not been set." ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d6baf2ce1a1f188cbd85dea8e691751b2b1edcb0
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 03:31:53 2014 +0200
move strings to global file
Change-Id: I6e1b54a66d0b669ecbba4eb305c1dd8925747edd
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 1fd4a17..c4c7780 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -107,13 +107,10 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/index/idxmrk.src \
sw/source/ui/misc/glossary.src \
sw/source/ui/misc/numberingtypelistbox.src \
- sw/source/ui/misc/srtdlg.src \
sw/source/ui/misc/swruler.src \
sw/source/ui/ribbar/tbxanchr.src \
sw/source/ui/shells/shells.src \
sw/source/ui/sidebar/PagePropertyPanel.src \
- sw/source/ui/table/table.src \
- sw/source/ui/table/tabledlg.src \
sw/source/ui/utlui/poolfmt.src \
sw/source/ui/utlui/utlui.src \
sw/source/ui/web/web.src \
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index c4a86ba..e8f7b71 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -720,4 +720,19 @@ String STR_CAPTION_OLE
Text [ en-US ] = "Other OLE Objects";
};
+String STR_WRONG_TABLENAME
+{
+ Text [ en-US ] = "The name of the table must not contain spaces." ;
+};
+
+String STR_ERR_TABLE_MERGE
+{
+ Text [ en-US ] = "Selected table cells are too complex to merge." ;
+};
+
+String STR_SRTERR
+{
+ Text [ en-US ] = "Cannot sort selection" ;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src
deleted file mode 100644
index 82ea0dc..0000000
--- a/sw/source/ui/misc/srtdlg.src
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "misc.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-
-String STR_SRTERR
-{
- Text [ en-US ] = "Cannot sort selection" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/table.src b/sw/source/ui/table/table.src
deleted file mode 100644
index a81454b..0000000
--- a/sw/source/ui/table/table.src
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "table.hrc"
-String STR_ERR_TABLE_MERGE
-{
- Text [ en-US ] = "Selected table cells are too complex to merge." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
deleted file mode 100644
index af7f01f..0000000
--- a/sw/source/ui/table/tabledlg.src
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "table.hrc"
-
-String STR_WRONG_TABLENAME
-{
- Text [ en-US ] = "The name of the table must not contain spaces." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc
index 95cf3a9..5ffc2dc 100644
--- a/sw/source/uibase/inc/app.hrc
+++ b/sw/source/uibase/inc/app.hrc
@@ -103,8 +103,11 @@
#define STR_CAPTION_FRAME (RC_APP_BEGIN + 134)
#define STR_CAPTION_GRAPHIC (RC_APP_BEGIN + 135)
#define STR_CAPTION_OLE (RC_APP_BEGIN + 136)
+#define STR_ERR_TABLE_MERGE (RC_APP_BEGIN + 137)
+#define STR_WRONG_TABLENAME (RC_APP_BEGIN + 138)
+#define STR_SRTERR (RC_APP_BEGIN + 139)
-#define APP_ACT_END STR_CAPTION_OLE
+#define APP_ACT_END STR_SRTERR
#if APP_ACT_END > RC_APP_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc
index eb553dc..01e1e3d 100644
--- a/sw/source/uibase/inc/misc.hrc
+++ b/sw/source/uibase/inc/misc.hrc
@@ -34,8 +34,6 @@
#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33)
#define STR_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
-#define STR_SRTERR (RC_MISC_BEGIN + 42)
-
#define STR_GLOSSARY (RC_MISC_BEGIN + 43)
#define STR_CHANGE_START (RC_MISC_BEGIN + 44)
#define STR_CHANGE_END (RC_MISC_BEGIN + 45)
diff --git a/sw/source/uibase/inc/table.hrc b/sw/source/uibase/inc/table.hrc
index d01c992..cdd17a4 100644
--- a/sw/source/uibase/inc/table.hrc
+++ b/sw/source/uibase/inc/table.hrc
@@ -21,11 +21,7 @@
#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4)
-#define STR_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7)
-
-#define STR_WRONG_TABLENAME (RC_TABLE_BEGIN + 13)
-
-#define TABLE_ACT_END STR_WRONG_TABLENAME
+#define TABLE_ACT_END DLG_ROW_HEIGHT
#if TABLE_ACT_END > RC_TABLE_END
#error Resource-Id Ueberlauf in #file, #line
commit b99e3c5c739cfbb5001da66283f0e9cc6c53ba76
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 03:23:37 2014 +0200
InfoBox MSG_WRONG_TABLENAME and MSG_ERR_TABLE_MERGE to String
Change-Id: I36fc0ed4f67c0af467a8dc593950a9c53a5ec53b
diff --git a/sw/source/ui/table/table.src b/sw/source/ui/table/table.src
index e9ade93..a81454b 100644
--- a/sw/source/ui/table/table.src
+++ b/sw/source/ui/table/table.src
@@ -18,9 +18,9 @@
*/
#include "table.hrc"
-InfoBox MSG_ERR_TABLE_MERGE
+String STR_ERR_TABLE_MERGE
{
- Message [ en-US ] = "Selected table cells are too complex to merge." ;
+ Text [ en-US ] = "Selected table cells are too complex to merge." ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index ab8aa95..aecc3bd 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -19,6 +19,7 @@
#include <hintids.hxx>
#include <comphelper/string.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
@@ -601,7 +602,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
OUString sTblName = m_pNameED->GetText();
if(sTblName.indexOf(' ') != -1)
{
- InfoBox(this, SW_RES(MSG_WRONG_TABLENAME)).Execute();
+ MessageDialog(this, SW_RES(STR_WRONG_TABLENAME), VCL_MESSAGE_INFO).Execute();
m_pNameED->GrabFocus();
return KEEP_PAGE;
}
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 0de5c88..af7f01f 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -19,9 +19,9 @@
#include "table.hrc"
-InfoBox MSG_WRONG_TABLENAME
+String STR_WRONG_TABLENAME
{
- Message [ en-US ] = "The name of the table must not contain spaces." ;
+ Text [ en-US ] = "The name of the table must not contain spaces." ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/table.hrc b/sw/source/uibase/inc/table.hrc
index f7ce08d..d01c992 100644
--- a/sw/source/uibase/inc/table.hrc
+++ b/sw/source/uibase/inc/table.hrc
@@ -21,11 +21,11 @@
#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4)
-#define MSG_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7)
+#define STR_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7)
-#define MSG_WRONG_TABLENAME (RC_TABLE_BEGIN + 13)
+#define STR_WRONG_TABLENAME (RC_TABLE_BEGIN + 13)
-#define TABLE_ACT_END MSG_WRONG_TABLENAME
+#define TABLE_ACT_END STR_WRONG_TABLENAME
#if TABLE_ACT_END > RC_TABLE_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index da67f6f..283808f 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -40,6 +40,7 @@
#include <svx/svxdlg.hxx>
#include <svl/zformat.hxx>
#include <sfx2/bindings.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
@@ -734,8 +735,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
break;
case TBLMERGE_TOOCOMPLEX:
{
- InfoBox aInfoBox( GetView().GetWindow(),
- SW_RES( MSG_ERR_TABLE_MERGE ) );
+ MessageDialog aInfoBox( GetView().GetWindow(),
+ SW_RES( STR_ERR_TABLE_MERGE ), VCL_MESSAGE_INFO );
aInfoBox.Execute();
break;
}
commit d18c577162efa7bcef98d1c2ae4498b334c1c04c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 03:18:20 2014 +0200
InfoBox STR_SRTERR to String
Change-Id: Ic3b7de3d26e91b260d775e629602758f63a40b85
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index f5f05dd..3129703 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -19,6 +19,7 @@
#include "srtdlg.hxx"
+#include <vcl/listbox.hxx>
#include <vcl/msgbox.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
@@ -351,7 +352,7 @@ void SwSortDlg::Apply()
}
if( !bRet )
- InfoBox( this->GetParent(), SW_RES(MSG_SRTERR)).Execute();
+ MessageDialog( this->GetParent(), SW_RES(STR_SRTERR), VCL_MESSAGE_INFO).Execute();
}
IMPL_LINK( SwSortDlg, DelimHdl, RadioButton*, pButton )
diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src
index ad8f149..82ea0dc 100644
--- a/sw/source/ui/misc/srtdlg.src
+++ b/sw/source/ui/misc/srtdlg.src
@@ -21,11 +21,9 @@
#include "cmdid.h"
#include "helpid.h"
-InfoBox MSG_SRTERR
+String STR_SRTERR
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "Cannot sort selection" ;
+ Text [ en-US ] = "Cannot sort selection" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc
index dac7b97..eb553dc 100644
--- a/sw/source/uibase/inc/misc.hrc
+++ b/sw/source/uibase/inc/misc.hrc
@@ -34,7 +34,7 @@
#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33)
#define STR_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
-#define MSG_SRTERR (RC_MISC_BEGIN + 42)
+#define STR_SRTERR (RC_MISC_BEGIN + 42)
#define STR_GLOSSARY (RC_MISC_BEGIN + 43)
#define STR_CHANGE_START (RC_MISC_BEGIN + 44)
commit cf65baa920e67578f706750989a8686220e36c14
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 03:16:06 2014 +0200
InfoBox MSG_DOUBLE_SHORTNAME and MSG_NO_GLOSSARIES to String
Change-Id: Ie3934ebc3209b8ba0358cca5fad9883e3b8cd262
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 187029f..0e83851 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -430,7 +430,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
const OUString aShortName(m_pShortNameEdit->GetText());
if(pGlossaryHdl->HasShortName(aShortName))
{
- InfoBox(this, SW_RES(MSG_DOUBLE_SHORTNAME)).Execute();
+ MessageDialog(this, SW_RES(STR_DOUBLE_SHORTNAME), VCL_MESSAGE_INFO).Execute();
m_pShortNameEdit->SetSelection(Selection(0, SELECTION_MAX));
m_pShortNameEdit->GrabFocus();
return 1;
@@ -567,7 +567,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
Init();
else
{
- InfoBox(this, SW_RES( MSG_NO_GLOSSARIES )).Execute();
+ MessageDialog(this, SW_RES( STR_NO_GLOSSARIES ), VCL_MESSAGE_INFO).Execute();
}
}
}
@@ -785,7 +785,7 @@ IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename)
if( pDlg->pGlossaryHdl->HasShortName(m_pNewShort->GetText())
&& sNew != m_pOldShort->GetText() )
{
- InfoBox(this, SW_RES(MSG_DOUBLE_SHORTNAME)).Execute();
+ MessageDialog(this, SW_RES(STR_DOUBLE_SHORTNAME), VCL_MESSAGE_INFO).Execute();
m_pNewShort->GrabFocus();
}
else
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
index 020f03e..28d8f5b 100644
--- a/sw/source/ui/misc/glossary.src
+++ b/sw/source/ui/misc/glossary.src
@@ -22,9 +22,9 @@
#include "helpid.h"
#include "access.hrc"
-InfoBox MSG_DOUBLE_SHORTNAME
+String STR_DOUBLE_SHORTNAME
{
- Message [ en-US ] = "Shortcut name already exists. Please choose another name." ;
+ Text [ en-US ] = "Shortcut name already exists. Please choose another name." ;
};
QueryBox MSG_QUERY_DELETE
{
@@ -48,9 +48,9 @@ String STR_SAVE_GLOSSARY
{
Text[ en-US ] = "Save AutoText";
};
-InfoBox MSG_NO_GLOSSARIES
+String STR_NO_GLOSSARIES
{
- Message [ en-US ] = "There is no AutoText in this file.";
+ Text [ en-US ] = "There is no AutoText in this file.";
};
String STR_MY_AUTOTEXT
diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc
index 7112850..dac7b97 100644
--- a/sw/source/uibase/inc/misc.hrc
+++ b/sw/source/uibase/inc/misc.hrc
@@ -28,11 +28,11 @@
#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31)
-#define MSG_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30)
+#define STR_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30)
#define MSG_QUERY_DELETE (RC_MISC_BEGIN + 31)
#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32)
#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33)
-#define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
+#define STR_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
#define MSG_SRTERR (RC_MISC_BEGIN + 42)
commit 15344d0415f153ba579ad132266c47990a8c9515
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 03:12:06 2014 +0200
InfoBox MSG_ERR_INSERT_GLOS to String
Change-Id: Ie72cb6796e3996d7050b771f7ab92e4ab5a6d72b
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
index fb59d4c..0372003 100644
--- a/sw/inc/dochdl.hrc
+++ b/sw/inc/dochdl.hrc
@@ -23,7 +23,6 @@
#include "rcid.hrc"
#define STR_NOGLOS (RC_DOCHDL_BEGIN + 1)
-#define MSG_ERR_INSERT_GLOS (RC_DOCHDL_BEGIN + 3)
#define STR_CLPBRD_FORMAT_ERROR (RC_DOCHDL_BEGIN + 4)
#define STR_NO_TABLE (RC_DOCHDL_BEGIN + 7)
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
index 30e92f4..1cecbbf 100644
--- a/sw/source/ui/dochdl/dochdl.src
+++ b/sw/source/ui/dochdl/dochdl.src
@@ -29,11 +29,6 @@ String STR_NO_TABLE
Text [ en-US ] = "A table cannot be inserted into another table. However, you can paste the data into the document when the cursor is not in a table.";
};
-InfoBox MSG_ERR_INSERT_GLOS
-{
- Message [ en-US ] = "AutoText could not be created." ;
-};
-
String STR_CLPBRD_FORMAT_ERROR
{
Text [ en-US ] = "Requested clipboard format is not available." ;
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 3ab01b1..686efcd 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -50,6 +50,7 @@
#include <dochdl.hrc>
#include <swerror.h>
#include <frmmgr.hxx>
+#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <editeng/acorrcfg.hxx>
@@ -331,7 +332,7 @@ bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShortNam
rCfg.IsSaveRelFile(), pOnlyTxt );
if(nSuccess == (sal_uInt16) -1 )
{
- InfoBox(pWrtShell->GetView().GetWindow(), SW_RES(MSG_ERR_INSERT_GLOS)).Execute();
+ MessageDialog(pWrtShell->GetView().GetWindow(), SW_RES(STR_ERR_INSERT_GLOS), VCL_MESSAGE_INFO).Execute();
}
if( !pCurGrp )
rStatGlossaries.PutGroupDoc( pTmp );
diff --git a/sw/source/uibase/uiview/view.hrc b/sw/source/uibase/uiview/view.hrc
index aa55887e..b90d5da 100644
--- a/sw/source/uibase/uiview/view.hrc
+++ b/sw/source/uibase/uiview/view.hrc
@@ -50,9 +50,9 @@
#define STR_SAVEACOPY_SRC (RC_VIEW_BEGIN + 34)
-// MSG
+#define STR_ERR_INSERT_GLOS (RC_VIEW_BEGIN + 35)
-#define MSG_ERR_INSERT_GLOS (RC_VIEW_BEGIN)
+// MSG
#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5)
#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6)
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
index 17794b0..e85ad5d 100644
--- a/sw/source/uibase/uiview/view.src
+++ b/sw/source/uibase/uiview/view.src
@@ -36,9 +36,9 @@ InfoBox MSG_NO_MERGE_ENTRY
{
Message [ en-US ] = "Could not merge documents." ;
};
-InfoBox MSG_ERR_INSERT_GLOS
+String STR_ERR_INSERT_GLOS
{
- Message [ en-US ] = "AutoText could not be created." ;
+ Text [ en-US ] = "AutoText could not be created." ;
};
InfoBox MSG_ERR_SRCSTREAM
{
commit 94cbfebdc62c3862e502c28dbd65de02fcab5730
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 03:07:25 2014 +0200
InfoBox MSG_ILLEGAL_PAGENUM to String
Change-Id: Idef182a43e7aa631aeea92870e3c51a7c2b8b7c5
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 1435c89..279b2a7 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -22,7 +22,7 @@
#include "rcid.hrc"
-#define MSG_ILLEGAL_PAGENUM (RC_CHRDLG_BEGIN + 1)
+#define STR_ILLEGAL_PAGENUM (RC_CHRDLG_BEGIN + 1)
#define STR_TEXTCOLL_HEADER (RC_CHRDLG_BEGIN + 2)
#define STR_PAGEFMT_HEADER (RC_CHRDLG_BEGIN + 4)
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index cb9b0f5..8f3caa0 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -19,6 +19,7 @@
#include <sfx2/request.hxx>
#include <svl/stritem.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <cmdid.h>
@@ -114,7 +115,7 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl)
default:; //prevent warning
}
if(!bOk) {
- InfoBox(this, SW_RES(MSG_ILLEGAL_PAGENUM)).Execute();
+ MessageDialog(this, SW_RES(STR_ILLEGAL_PAGENUM), VCL_MESSAGE_INFO).Execute();
m_pPageNumEdit->GrabFocus();
return 0;
}
diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src
index c39f4d0..6f19fc4 100644
--- a/sw/source/ui/chrdlg/chrdlg.src
+++ b/sw/source/ui/chrdlg/chrdlg.src
@@ -18,6 +18,7 @@
*/
#include "chrdlg.hrc"
+
String STR_TEXTCOLL_HEADER
{
Text [ en-US ] = "(Paragraph Style: " ;
@@ -26,11 +27,9 @@ String STR_PAGEFMT_HEADER
{
Text [ en-US ] = "(Page Style: " ;
};
-InfoBox MSG_ILLEGAL_PAGENUM
+String STR_ILLEGAL_PAGENUM
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ;
+ Text [ en-US ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5116b8f6bd0d154b9af8ba0ebdba066a02d14a0b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 02:59:05 2014 +0200
InfoBoxes to String
Change-Id: Iccaf0cd1adbe5a2b1ff81c466ca3c81c00390c10
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
index 41a8591..fb59d4c 100644
--- a/sw/inc/dochdl.hrc
+++ b/sw/inc/dochdl.hrc
@@ -24,7 +24,7 @@
#define STR_NOGLOS (RC_DOCHDL_BEGIN + 1)
#define MSG_ERR_INSERT_GLOS (RC_DOCHDL_BEGIN + 3)
-#define MSG_CLPBRD_FORMAT_ERROR (RC_DOCHDL_BEGIN + 4)
+#define STR_CLPBRD_FORMAT_ERROR (RC_DOCHDL_BEGIN + 4)
#define STR_NO_TABLE (RC_DOCHDL_BEGIN + 7)
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 4f391bf..5121a62 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -82,8 +82,8 @@
// INFOBOX ------------------------------------------------------------
-#define ERR_CLPBRD_READ (RC_GLOBALS_BEGIN + 1)
-#define STR_ERROR_PASSWD (RC_GLOBALS_BEGIN + 3)
+#define STR_ERROR_CLPBRD_READ (RC_GLOBALS_BEGIN + 49)
+#define STR_ERROR_PASSWD (RC_GLOBALS_BEGIN + 50)
// ACC ---------------------------------------------------------------
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index df68e4d..530a9b6 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -33,9 +33,9 @@ String STR_COMCORE_CANT_SHOW
Text [ en-US ] = "Image cannot be displayed." ;
};
-InfoBox ERR_CLPBRD_READ
+String STR_ERROR_CLPBRD_READ
{
- Message [ en-US ] = "Error reading from the clipboard." ;
+ Text [ en-US ] = "Error reading from the clipboard." ;
};
#define ERR_CODE( class, err ) (class | (err - ERROR_SW_BASE))
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
index 5e56e44..30e92f4 100644
--- a/sw/source/ui/dochdl/dochdl.src
+++ b/sw/source/ui/dochdl/dochdl.src
@@ -34,9 +34,9 @@ InfoBox MSG_ERR_INSERT_GLOS
Message [ en-US ] = "AutoText could not be created." ;
};
-InfoBox MSG_CLPBRD_FORMAT_ERROR
+String STR_CLPBRD_FORMAT_ERROR
{
- Message [ en-US ] = "Requested clipboard format is not available." ;
+ Text [ en-US ] = "Requested clipboard format is not available." ;
};
String STR_PRIVATETEXT
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 89193f8..99b7b416 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -41,6 +41,7 @@
#include <sfx2/linkmgr.hxx>
#include <tools/urlobj.hxx>
#include <vcl/wrkwin.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/stritem.hxx>
@@ -1624,7 +1625,7 @@ sal_uInt16 SwTransferable::GetSotDestination( const SwWrtShell& rSh,
bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
SwWrtShell& rSh, sal_uLong nFmt, bool bMsg )
{
- sal_uInt16 nResId = MSG_CLPBRD_FORMAT_ERROR;
+ sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR;
bool nRet = false;
MSE40HTMLClipFormatObj aMSE40ClpObj;
@@ -1695,7 +1696,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCrsr() );
rSh.SaveTblBoxCntnt( &rInsPos );
if( IsError( aReader.Read( *pRead )) )
- nResId = ERR_CLPBRD_READ;
+ nResId = STR_ERROR_CLPBRD_READ;
else
nResId = 0, nRet = true;
@@ -1704,7 +1705,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
rSh.CallChgLnk();
}
else
- nResId = MSG_CLPBRD_FORMAT_ERROR;
+ nResId = STR_CLPBRD_FORMAT_ERROR;
// Exist a SvMemoryStream? (data in the OUString and xStrm is empty)
if( pStream && !xStrm.Is() )
@@ -1712,7 +1713,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
if( bMsg && nResId )
{
- InfoBox( 0, SW_RES( nResId )).Execute();
+ MessageDialog( 0, SW_RES( nResId ), VCL_MESSAGE_INFO).Execute();
}
return nRet;
}
@@ -1788,7 +1789,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
if( !IsError( aReader.Read( *pRead )) )
nRet = true;
else if( bMsg )
- InfoBox( 0, SW_RES(ERR_CLPBRD_READ) ).Execute();
+ MessageDialog( 0, SW_RES(STR_ERROR_CLPBRD_READ), VCL_MESSAGE_INFO ).Execute();
}
else
{
@@ -2170,7 +2171,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
if( !nRows || !nCols )
{
if( bMsg )
- InfoBox(0, SW_RESSTR(STR_NO_TABLE)).Execute();
+ MessageDialog(0, SW_RESSTR(STR_NO_TABLE), VCL_MESSAGE_INFO).Execute();
pDDETyp = 0;
break;
}
@@ -2716,7 +2717,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
}
else if( bMsg )
{
- InfoBox( 0, SW_RES(MSG_CLPBRD_FORMAT_ERROR)).Execute();
+ MessageDialog( 0, SW_RES(STR_CLPBRD_FORMAT_ERROR), VCL_MESSAGE_INFO).Execute();
}
return nRet;
}
@@ -2755,7 +2756,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
}
else if( bMsg )
{
- InfoBox( 0, SW_RES(MSG_CLPBRD_FORMAT_ERROR)).Execute();
+ MessageDialog( 0, SW_RES(STR_CLPBRD_FORMAT_ERROR), VCL_MESSAGE_INFO).Execute();
}
return nRet;
}
commit 5f8da7d0e61b4e0947d9259cde6668676e44e00a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 02:52:38 2014 +0200
InfoBox MSG_ERROR_PASSWD to String
Change-Id: I88a34ad1d54066c30523c6493cbe5f0502adb3fb
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index f00f775..4f391bf 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -83,7 +83,7 @@
// INFOBOX ------------------------------------------------------------
#define ERR_CLPBRD_READ (RC_GLOBALS_BEGIN + 1)
-#define MSG_ERROR_PASSWD (RC_GLOBALS_BEGIN + 3)
+#define STR_ERROR_PASSWD (RC_GLOBALS_BEGIN + 3)
// ACC ---------------------------------------------------------------
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 2b19c9f..c4a86ba 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -264,11 +264,9 @@ String STR_READONLY_PATH
Text [ en-US ] = "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?";
};
-InfoBox MSG_ERROR_PASSWD
+String STR_ERROR_PASSWD
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "Invalid password" ;
+ Text [ en-US ] = "Invalid password" ;
};
String STR_FMT_STD
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index e93add0..e3491cb 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -18,6 +18,7 @@
*/
#include <hintids.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
@@ -207,7 +208,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
if (!(*ppRdr)->CheckPasswd( aPasswd, *pRead ))
{
- InfoBox( 0, SW_RES(MSG_ERROR_PASSWD)).Execute();
+ MessageDialog( 0, SW_RES(STR_ERROR_PASSWD), VCL_MESSAGE_INFO).Execute();
delete *ppRdr;
return 0;
}
commit 3d52e47c7348aec13453a5e08a7878cb6f45e3a8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 02:49:48 2014 +0200
remove lots of dead boxes
Change-Id: Ia0e5930b9bbf0c81a5d2974d45730b5af75019f0
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 001e2e8..997c78c 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -29,12 +29,8 @@
#define STR_ERROR_PRINTER_BUSY (RID_SFX_DOC_START+ 1)
#define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 2)
-#define MSG_CONFIRM_FILTER (RID_SFX_DOC_START+11)
-#define MSG_CONFIRM_OVERWRITE_TEMPLATE (RID_SFX_DOC_START+12)
-
#define STR_DELETE_REGION (RID_SFX_DOC_START+14)
#define STR_DELETE_TEMPLATE (RID_SFX_DOC_START+15)
-#define MSG_REGION_NOTEMPTY (RID_SFX_DOC_START+17)
#define BMP_STYLES_CLOSED (RID_SFX_DOC_START+ 0)
#define BMP_STYLES_OPENED (RID_SFX_DOC_START+ 1)
@@ -50,8 +46,6 @@
#define STR_PRINT_STYLES (RID_SFX_DOC_START+ 20)
#define STR_PRINT_STYLES_HEADER (RID_SFX_DOC_START+ 21)
#define STR_BACKUP_COPY (RID_SFX_DOC_START+ 23)
-#define MSG_CANT_OPEN_TEMPLATE (RID_SFX_DOC_START+ 25)
-#define MSG_VIEW_OPEN_CANT_SAVE (RID_SFX_DOC_START+ 26)
#define STR_ERROR_SAVE (RID_SFX_DOC_START+ 27)
#define STR_TEMPLATE_FILTER (RID_SFX_DOC_START+ 28)
#define STR_ERROR_COPY_TEMPLATE (RID_SFX_DOC_START+ 29)
@@ -61,9 +55,6 @@
#define STR_ERROR_SAVE_TEMPLATE (RID_SFX_DOC_START+ 34)
#define STR_CONFIG (RID_SFX_DOC_START+ 37)
#define STR_QUERY_DEFAULT_TEMPLATE (RID_SFX_DOC_START+ 39)
-#define MSG_QUERY_RESET_DEFAULT_TEMPLATE (RID_SFX_DOC_START+ 39)
-#define MSG_TEMPLATE_DIR_NOT_EXIST (RID_SFX_DOC_START+ 40)
-#define MSG_DOCINFO_CANTREAD (RID_SFX_DOC_START+ 41)
#define STR_ERROR_NOSTORAGE (RID_SFX_DOC_START+ 42)
#define STR_QUERY_MUSTOWNFORMAT (RID_SFX_DOC_START+ 44)
#define STR_SAVEDOC (RID_SFX_DOC_START+ 45)
@@ -78,8 +69,6 @@
#define RID_STR_WARNSTYLEOVERWRITE (RID_SFX_DOC_START+ 54)
#define STR_SAVEACOPY (RID_SFX_DOC_START+ 55)
-#define MSG_OPEN_READONLY (RID_SFX_DOC_START+ 58)
-
#define RID_OFFICEFILTER (RID_SFX_DOC_START+ 59)
#define RID_OFFICEFILTER_WILDCARD (RID_SFX_DOC_START+ 60)
#define RID_OFFICEFILTER_MACTYPE (RID_SFX_DOC_START+ 61)
@@ -111,7 +100,6 @@
#define STR_OBJECT (RID_SFX_DOC_START+ 84)
-#define DLG_MACROQUERY (RID_SFX_DOC_START+87)
#define BTN_OK (RID_SFX_DOC_START+88)
#define BTN_CANCEL (RID_SFX_DOC_START+89)
#define FT_OK (RID_SFX_DOC_START+90)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index e6aac7e..7c71343 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -20,18 +20,6 @@
#include "doc.hrc"
#define __RSC
-QueryBox MSG_CONFIRM_FILTER
-{
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_YES ;
- Message [ en-US ] = "Saving in external formats may have caused\n information loss. Do you still want to close?" ;
-};
-QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE
-{
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_NO ;
- Message [ en-US ] = "Name already in use.\nDo you want to overwrite document template?" ;
-};
String STR_DELETE_REGION
{
Text [ en-US ] = "Are you sure you want to delete the region \"$1\"?" ;
@@ -40,12 +28,7 @@ String STR_DELETE_TEMPLATE
{
Text [ en-US ] = "Are you sure you want to delete the entry \"$1\"?" ;
};
-QueryBox MSG_REGION_NOTEMPTY
-{
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_NO ;
- Message [ en-US ] = "The category is not empty.\nDelete anyway?" ;
-};
+
Bitmap BMP_STYLES_CLOSED { File = "newex.bmp" ; };
Bitmap BMP_STYLES_OPENED { File = "newex.bmp" ; };
@@ -78,16 +61,6 @@ String STR_BACKUP_COPY
{
Text [ en-US ] = "Copy" ;
};
-InfoBox MSG_CANT_OPEN_TEMPLATE
-{
- Message [ en-US ] = "The template could not be opened." ;
-};
-InfoBox MSG_VIEW_OPEN_CANT_SAVE
-{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "Document already open for editing." ;
-};
String STR_ERROR_SAVE
{
Text [ en-US ] = "Error recording document " ;
@@ -116,20 +89,6 @@ String STR_QUERY_DEFAULT_TEMPLATE
{
Text [ en-US ] = "Should the template \"$(TEXT)\" become the default template?" ;
};
-QueryBox MSG_QUERY_RESET_DEFAULT_TEMPLATE
-{
- Buttons = WB_YES_NO ;
- DefButton = WB_DEF_NO ;
- Message [ en-US ] = "Do you want to reset the default template?" ;
-};
-InfoBox MSG_TEMPLATE_DIR_NOT_EXIST
-{
- Message [ en-US ] = "Template directory\n$(DIR)\ndoes not exist." ;
-};
-InfoBox MSG_DOCINFO_CANTREAD
-{
- Message [ en-US ] = "Document info cannot be read." ;
-};
String STR_ERROR_NOSTORAGE
{
Text [ en-US ] = "The selected file has an incorrect format." ;
@@ -182,12 +141,6 @@ String RID_STR_WARNSTYLEOVERWRITE
{
Text [ en-US ] = "Should the \"$(ARG1)\" Style be replaced?" ;
};
-QueryBox MSG_OPEN_READONLY
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_YES ;
- Message [ en-US ] = "Document cannot be opened for editing.\nDo you want to open it as read-only?" ;
-};
String STR_EDIT
{
Text [ en-US ] = "Edit" ;
@@ -284,14 +237,6 @@ String STR_OBJECT
Text [ en-US ] = "Object" ;
};
-QueryBox DLG_MACROQUERY
-{
- Buttons = WB_OK_CANCEL;
- Title [ en-US ] = "Run Macro" ;
-
- Message [ en-US ] = "This document contains macros. $(TEXT)";
-};
-
String BTN_OK
{
Text [ en-US ] = "Run" ;
commit d731f30e1d1da7d4e6f138d000b9ad5d008896e0
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 02:40:51 2014 +0200
InfoBox to String
Change-Id: Ic12f04bf80639d89ecc531bceb8378c7d97e9325
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index d9f461a..1cf86cd 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -35,12 +35,12 @@
#define RID_DLG_ALIEN_WARNING ( RC_DIALOG_BEGIN + 0)
#define STR_RESET ( RC_DIALOG_BEGIN + 0)
#define MSG_OVERWRITE ( RC_DIALOG_BEGIN + 1)
-#define MSG_TABPAGE_INVALIDNAME ( RC_DIALOG_BEGIN + 13)
-#define MSG_TABPAGE_INVALIDSTYLE ( RC_DIALOG_BEGIN + 14)
-#define MSG_POOL_STYLE_NAME ( RC_DIALOG_BEGIN + 16)
-#define MSG_TABPAGE_INVALIDPARENT ( RC_DIALOG_BEGIN + 18)
+#define STR_TABPAGE_INVALIDNAME ( RC_DIALOG_BEGIN + 13)
+#define STR_TABPAGE_INVALIDSTYLE ( RC_DIALOG_BEGIN + 14)
+#define STR_POOL_STYLE_NAME ( RC_DIALOG_BEGIN + 16)
+#define STR_TABPAGE_INVALIDPARENT ( RC_DIALOG_BEGIN + 18)
-#define STR_DELETE_STYLE ( RC_DIALOG_BEGIN + 18)
+#define STR_DELETE_STYLE ( RC_DIALOG_BEGIN + 19)
#define STR_DELETE_STYLE_USED ( RC_DIALOG_BEGIN + 20)
#define MN_CONTEXT_TEMPLDLG ( RC_DIALOG_BEGIN + 46)
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index 8d8273a..83e2589 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -30,27 +30,21 @@ String STR_APPLY
{
Text [ en-US ] = "Apply";
};
-InfoBox MSG_TABPAGE_INVALIDNAME
+String STR_TABPAGE_INVALIDNAME
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "This name is already in use." ;
+ Text [ en-US ] = "This name is already in use." ;
};
-InfoBox MSG_TABPAGE_INVALIDSTYLE
+String STR_TABPAGE_INVALIDSTYLE
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "This Style does not exist." ;
+ Text [ en-US ] = "This Style does not exist." ;
};
-InfoBox MSG_TABPAGE_INVALIDPARENT
+String STR_TABPAGE_INVALIDPARENT
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference." ;
+ Text [ en-US ] = "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference." ;
};
-InfoBox MSG_POOL_STYLE_NAME
+String STR_POOL_STYLE_NAME
{
- Message [ en-US ] = "Name already exists as a default Style.\nPlease choose another name." ;
+ Text [ en-US ] = "Name already exists as a default Style.\nPlease choose another name." ;
};
String STR_DELETE_STYLE_USED
{
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 2a7aff7..90c11e8 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -18,6 +18,7 @@
*/
#include <comphelper/string.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/field.hxx>
#include <svl/eitem.hxx>
@@ -538,7 +539,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
if (!pStyle->SetName(comphelper::string::stripStart(m_pNameRw->GetText(), ' ')))
{
- InfoBox aBox( this, SfxResId( MSG_TABPAGE_INVALIDNAME ) );
+ MessageDialog aBox( this, SfxResId( STR_TABPAGE_INVALIDNAME ), VCL_MESSAGE_INFO );
aBox.Execute();
m_pNameRw->GrabFocus();
m_pNameRw->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
@@ -555,7 +556,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
{
if ( !pStyle->SetFollow( aFollowEntry ) )
{
- InfoBox aBox( this, SfxResId( MSG_TABPAGE_INVALIDSTYLE ) );
+ MessageDialog aBox( this, SfxResId( STR_TABPAGE_INVALIDSTYLE ), VCL_MESSAGE_INFO );
aBox.Execute();
m_pFollowLb->GrabFocus();
return SfxTabPage::KEEP_PAGE;
@@ -575,7 +576,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
{
if ( !pStyle->SetParent( aParentEntry ) )
{
- InfoBox aBox( this, SfxResId( MSG_TABPAGE_INVALIDPARENT ) );
+ MessageDialog aBox( this, SfxResId( STR_TABPAGE_INVALIDPARENT ), VCL_MESSAGE_INFO );
aBox.Execute();
m_pBaseLb->GrabFocus();
return SfxTabPage::KEEP_PAGE;
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index c8fd34a..b2927b6 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -24,6 +24,7 @@
#include <sfx2/newstyle.hxx>
#include "dialog.hrc"
#include <sfx2/sfxresid.hxx>
+#include <vcl/layout.hxx>
// PRIVATE METHODES ------------------------------------------------------
@@ -36,7 +37,7 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
{
if ( !pStyle->IsUserDefined() )
{
- InfoBox( this, SfxResId( MSG_POOL_STYLE_NAME ) ).Execute();
+ MessageDialog( this, SfxResId( STR_POOL_STYLE_NAME ), VCL_MESSAGE_INFO ).Execute();
return 0;
}
commit 58c7c4c290799effa8abcaee5f71cdf35fb3efdd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 02:33:50 2014 +0200
InfoBox MSG_ERROR_SEND_MAIL and MSG_CANT_CLOSE to String
Change-Id: If033f0ccca636a3ab3080a01a11467ce1ce9b24e
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 4efc0ea..42fe1a16 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.hrc
@@ -21,8 +21,6 @@
#include <sfx2/sfx.hrc>
-// #defines *****************************************************************
-
#define STR_NODEFPRINTER (RID_SFX_VIEW_START+ 0)
#define STR_ERROR_PRINTER_BUSY (RID_SFX_VIEW_START+ 1)
#define STR_NOSTARTPRINTER (RID_SFX_VIEW_START+ 2)
@@ -33,12 +31,12 @@
#define STR_PRINT_NEWSIZE (RID_SFX_VIEW_START+23)
#define STR_PRINT_NEWORISIZE (RID_SFX_VIEW_START+24)
-#define MSG_ERROR_SEND_MAIL (RID_SFX_VIEW_START+31)
+#define STR_ERROR_SEND_MAIL (RID_SFX_VIEW_START+31)
#define STR_ERROR_SAVE_TEMPLATE (RID_SFX_VIEW_START+33)
#define MSG_QUERY_OPENASTEMPLATE (RID_SFX_VIEW_START+41)
-#define MSG_CANT_CLOSE (RID_SFX_VIEW_START+42)
+#define STR_CANT_CLOSE (RID_SFX_VIEW_START+42)
#endif
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index 7f0b599..d2ea1f7 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -22,7 +22,6 @@
#include "helpid.hrc"
#include "sfxlocal.hrc"
- // Strings ---------------------------------------------------------------
String STR_NODEFPRINTER
{
Text [ en-US ] = "No default printer found.\nPlease choose a printer and try again." ;
@@ -64,18 +63,14 @@ String STR_PRINT_NEWORISIZE
Text [ en-US ] = "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?" ;
};
-InfoBox MSG_CANT_CLOSE
+String STR_CANT_CLOSE
{
- Message [ en-US ] = "The document cannot be closed because a\n print job is being carried out." ;
+ Text [ en-US ] = "The document cannot be closed because a\n print job is being carried out." ;
};
- // MSG_ERROR_SEND_MAIL ---------------------------------------------------
-
-InfoBox MSG_ERROR_SEND_MAIL
+String STR_ERROR_SEND_MAIL
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ;
+ Text [ en-US ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ;
};
QueryBox MSG_QUERY_OPENASTEMPLATE
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c4cd7c2..4d1b807 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -20,6 +20,7 @@
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <svl/whiter.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/toolbox.hxx>
#include <svl/intitem.hxx>
@@ -556,7 +557,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
if ( eResult == SfxMailModel::SEND_MAIL_ERROR )
{
- InfoBox aBox( SfxGetpApp()->GetTopWindow(), SfxResId( MSG_ERROR_SEND_MAIL ));
+ MessageDialog aBox( SfxGetpApp()->GetTopWindow(), SfxResId( STR_ERROR_SEND_MAIL ), VCL_MESSAGE_INFO);
aBox.Execute();
rReq.Ignore();
}
@@ -576,7 +577,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
SfxMailModel::SendMailResult eResult = aModel.SaveAndSend( xFrame, OUString() );
if( eResult == SfxMailModel::SEND_MAIL_ERROR )
{
- InfoBox aBox( SfxGetpApp()->GetTopWindow(), SfxResId( MSG_ERROR_SEND_MAIL ));
+ MessageDialog aBox( SfxGetpApp()->GetTopWindow(), SfxResId( STR_ERROR_SEND_MAIL ), VCL_MESSAGE_INFO);
aBox.Execute();
rReq.Ignore();
}
@@ -1284,7 +1285,7 @@ bool SfxViewShell::PrepareClose
{
if ( bUI )
{
- InfoBox aInfoBox( &GetViewFrame()->GetWindow(), SfxResId( MSG_CANT_CLOSE ) );
+ MessageDialog aInfoBox( &GetViewFrame()->GetWindow(), SfxResId( STR_CANT_CLOSE ), VCL_MESSAGE_INFO );
aInfoBox.Execute();
}
commit 36a36444aea744626115668f63dc8164a6f83e82
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 02:28:17 2014 +0200
InfoBox RID_INFO_NOSEARCHRESULTS and RID_INFO_NOSEARCHTEXTFOUND to String
Change-Id: If1bf07016864a856ad15d84db0fffc34dc52ecbe
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 8d690ba..53cdbd4 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -40,8 +40,8 @@
#define CONFIG_PATH_START (RID_SFX_APP_START+98)
#define MENU_HELP_BOOKMARKS (RID_SFX_APP_START+105)
-#define RID_INFO_NOSEARCHRESULTS (RID_SFX_APP_START+106)
-#define RID_INFO_NOSEARCHTEXTFOUND (RID_SFX_APP_START+107)
+#define STR_INFO_NOSEARCHRESULTS (RID_SFX_APP_START+106)
+#define STR_INFO_NOSEARCHTEXTFOUND (RID_SFX_APP_START+107)
#define IMG_HELP_TOOLBOX_INDEX_ON (RID_SFX_APP_START+110)
#define IMG_HELP_TOOLBOX_INDEX_OFF (RID_SFX_APP_START+111)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index b3dcc26..a10c8a8 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1044,8 +1044,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl)
if ( aFactories.empty() )
{
- InfoBox aBox( this, SfxResId( RID_INFO_NOSEARCHRESULTS ) );
- aBox.SetText( SfxResId( STR_HELP_WINDOW_TITLE ).toString() );
+ MessageDialog aBox( this, SfxResId( STR_INFO_NOSEARCHRESULTS ), VCL_MESSAGE_INFO );
aBox.Execute();
}
}
@@ -2269,7 +2268,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg )
else
{
DBG_ASSERT( pSrchDlg, "no search dialog" );
- InfoBox aBox( pSrchDlg, SfxResId( RID_INFO_NOSEARCHTEXTFOUND ) );
+ MessageDialog aBox( pSrchDlg, SfxResId( STR_INFO_NOSEARCHTEXTFOUND ), VCL_MESSAGE_INFO );
aBox.Execute();
pSrchDlg->SetFocusOnEdit();
}
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 96b8d41..0420003 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -195,18 +195,14 @@ Menu MENU_HELP_BOOKMARKS
};
};
-InfoBox RID_INFO_NOSEARCHRESULTS
+String STR_INFO_NOSEARCHRESULTS
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "No topics found.";
+ Text [ en-US ] = "No topics found.";
};
-InfoBox RID_INFO_NOSEARCHTEXTFOUND
+String STR_INFO_NOSEARCHTEXTFOUND
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "The text you entered was not found.";
+ Text [ en-US ] = "The text you entered was not found.";
};
Image IMG_HELP_TOOLBOX_L_INDEX_ON
commit f739d062932633c04e632e644eeeea865a2d9a1d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Aug 18 02:24:39 2014 +0200
InfoBox RID_XMLSEC_INFO_WRONGDOCFORMAT to String
Change-Id: Ieb1c90f2f17b2ce12acf2999743ce4d608076223
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index b9297a8..8d690ba 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -106,7 +106,7 @@
#define RID_XMLSEC_QUERY_SAVEBEFORESIGN (RID_SFX_APP_START + 187)
#define RID_QUERY_CANCELCHECKOUT (RID_SFX_APP_START + 188)
-#define RID_XMLSEC_INFO_WRONGDOCFORMAT (RID_SFX_APP_START + 190)
+#define STR_INFO_WRONGDOCFORMAT (RID_SFX_APP_START + 190)
#define STR_QUERY_UPDATE_LINKS (RID_SFX_APP_START + 192)
#define STR_DDE_ERROR (RID_SFX_APP_START + 193)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 524628a..439b934 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -424,9 +424,9 @@ QueryBox RID_QUERY_CANCELCHECKOUT
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list