avmedia/source/viewer/mediawindow.cxx | 4 +-
avmedia/source/viewer/mediawindow.hrc | 3 -
avmedia/source/viewer/mediawindow.src | 6 +--
cui/source/dialogs/cuifmsearch.cxx | 8 ++--
cui/source/dialogs/fmsearch.hrc | 4 +-
cui/source/dialogs/fmsearch.src | 10 ++---
cui/source/inc/cuires.hrc | 11 ++----
cui/source/options/optgdlg.cxx | 4 +-
cui/source/options/optgdlg.src | 6 +--
cui/source/options/optinet2.cxx | 5 +-
cui/source/options/optinet2.src | 5 +-
cui/source/options/optjava.cxx | 10 ++---
cui/source/options/optjava.src | 18 +++------
cui/source/options/optpath.src | 7 ---
dbaccess/source/ext/macromigration/dbmm_global.hrc | 6 ---
dbaccess/source/ext/macromigration/macromigration.src | 5 +-
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 4 +-
dbaccess/source/ui/dlg/indexdialog.cxx | 3 +
dbaccess/source/ui/dlg/indexdialog.src | 8 +---
dbaccess/source/ui/inc/dbu_resource.hrc | 14 +++----
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 4 +-
dbaccess/source/ui/querydesign/query.src | 8 ++--
desktop/source/app/app.cxx | 4 +-
desktop/source/app/desktop.hrc | 4 +-
desktop/source/app/desktop.src | 6 +--
extensions/source/abpilot/abpresid.hrc | 14 +------
extensions/source/abpilot/abspilot.src | 7 +--
extensions/source/abpilot/typeselectionpage.cxx | 4 +-
include/sfx2/sfx.hrc | 1
include/svx/fmresids.hrc | 11 ++----
sfx2/source/appl/app.hrc | 4 +-
sfx2/source/appl/app.src | 12 ++----
sfx2/source/appl/appserv.cxx | 7 +--
sfx2/source/appl/openuriexternally.cxx | 14 +++----
sfx2/source/appl/sfx.src | 5 ++
svx/source/form/datanavi.cxx | 22 ++++--------
svx/source/form/datanavi.src | 20 ++++------
svx/source/src/app.hrc | 4 --
svx/source/src/app.src | 6 ---
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 4 +-
xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc | 2 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 8 +---
42 files changed, 120 insertions(+), 192 deletions(-)
New commits:
commit 0ad58a0a4501e4ee3762479f3d9d501ad85dec6c
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 23:16:36 2014 +0200
WarningBox RID_SVX_MSGBOX_LANGUAGE_RESTART to String
As it's like RID_SVX_MSGBOX_LANGUAGE_RESTART
Change-Id: I49c68537c22b348dd165fd1cfb78b67d8f3f7c88
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 587857c..914841c 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -26,7 +26,7 @@
// Resource-Id's ------------------------------------------------------------
// RID_SVX_START + 0 unused
-#define RID_SVX_MSGBOX_OPTIONS_RESTART (RID_SVX_START + 1)
+#define RID_SVXSTR_OPTIONS_RESTART (RID_SVX_START + 1)
#define RID_SVXSTR_LANGUAGE_RESTART (RID_SVX_START + 2)
#define RID_CUIIMG_HARDDISK (RID_SVX_START + 4)
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 46d36f8..02f5bf7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -776,7 +776,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl)
if (nRet == RET_OK && sOrig != mpCertPathDlg->getDirectory())
{
- WarningBox aWarnBox(this, CUI_RES(RID_SVX_MSGBOX_OPTIONS_RESTART));
+ MessageDialog aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART),
VCL_MESSAGE_INFO);
aWarnBox.Execute();
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 8f5dfc4..92bc52a 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -32,7 +32,6 @@
#include <vcl/help.hxx>
#include <tools/urlobj.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
#include <unotools/pathoptions.hxx>
#include <svtools/imagemgr.hxx>
@@ -322,7 +321,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
(void)eErr;
if ( bRunning )
{
- WarningBox aWarnBox( this, CUI_RES(
RID_SVX_MSGBOX_OPTIONS_RESTART ) );
+ MessageDialog aWarnBox( this, CUI_RES(
RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO );
aWarnBox.Execute();
}
}
@@ -367,7 +366,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
(void)eErr;
if ( bRunning )
{
- WarningBox aWarnBox( this, CUI_RES(
RID_SVX_MSGBOX_OPTIONS_RESTART ) );
+ MessageDialog aWarnBox( this, CUI_RES(
RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO );
aWarnBox.Execute();
}
}
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index c98407a..4f273f6 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -30,11 +30,9 @@ String RID_SVXSTR_JRE_FAILED_VERSION
Text [ en-US ] = "The Java runtime environment you selected is not the
required version.\nPlease select a different folder." ;
};
-WarningBox RID_SVX_MSGBOX_OPTIONS_RESTART
+String RID_SVXSTR_OPTIONS_RESTART
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "You have to restart %PRODUCTNAME so the new or
modified values can take effect.\nPlease restart %PRODUCTNAME now." ;
+ Text [ en-US ] = "You have to restart %PRODUCTNAME so the new or modified
values can take effect.\nPlease restart %PRODUCTNAME now." ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 18f3a1a71dfe76987ec8adaa41f6313b68fe2ed2
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 23:06:48 2014 +0200
InfoBox RID_SVX_MSGBOX_LANGUAGE_RESTART to String
Change-Id: Ideeb3ae8aa6493fc2d2a761d46f95baf0158c6e8
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 7e2d0e2..587857c 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -27,7 +27,7 @@
// RID_SVX_START + 0 unused
#define RID_SVX_MSGBOX_OPTIONS_RESTART (RID_SVX_START + 1)
-#define RID_SVX_MSGBOX_LANGUAGE_RESTART (RID_SVX_START + 2)
+#define RID_SVXSTR_LANGUAGE_RESTART (RID_SVX_START + 2)
#define RID_CUIIMG_HARDDISK (RID_SVX_START + 4)
#define RID_CUIIMG_LIB (RID_SVX_START + 5)
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b083e68..b80faa3 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -27,7 +27,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/imgmgr.hxx>
#include <vcl/configsettings.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <vcl/mnemonic.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -1231,7 +1231,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
xProp->setPropertyValue(sUserLocaleKey, makeAny(aLangString));
Reference< XChangesBatch >(xProp,
UNO_QUERY_THROW)->commitChanges();
// display info
- InfoBox aBox(this, CUI_RES(RID_SVX_MSGBOX_LANGUAGE_RESTART));
+ MessageDialog aBox(this, CUI_RES(RID_SVXSTR_LANGUAGE_RESTART),
VCL_MESSAGE_INFO);
aBox.Execute();
// tell quickstarter to stop being a veto listener
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 537c150..206fb3a 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -20,11 +20,9 @@
#include <cuires.hrc>
#include "helpid.hrc"
-// *******************************************************************
-
-InfoBox RID_SVX_MSGBOX_LANGUAGE_RESTART
+String RID_SVXSTR_LANGUAGE_RESTART
{
- Message [ en-US ] = "The language setting of the user interface has been
updated and will take effect the next time you start %PRODUCTNAME
%PRODUCTVERSION";
+ Text [ en-US ] = "The language setting of the user interface has been
updated and will take effect the next time you start %PRODUCTNAME
%PRODUCTVERSION";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 922ae90234ccdd3c82836d4f7ad5dd3d5ebb9c71
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 22:31:17 2014 +0200
sfx2: bring back resmgr
that was a bit too much removal
partial revert of fd1e9bbc1ebd5040b092aad1d4a68041286fabda
Change-Id: Iabced82fa6aedd25aacf242cafa384e83fd539cb
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 9390ee9..274c12b 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -878,6 +878,13 @@ OUString ChooseMacro( const Reference< XModel >&
rxLimitToDocument, bool bChoose
#endif
+ResMgr* SfxApplication::GetOffResManager_Impl()
+{
+ if ( !pAppData_Impl->pOfaResMgr )
+ pAppData_Impl->pOfaResMgr = ResMgr::CreateResMgr( "ofa");
+ return pAppData_Impl->pOfaResMgr;
+}
+
namespace
{
#ifndef DISABLE_SCRIPTING
commit c806f9042339c7d7634899f886c5635564add33d
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 22:01:33 2014 +0200
fix res id errors
Change-Id: I61095ee034e85150624ac300be539e7f898641be
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 593bc9f..fcece8b 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -62,10 +62,10 @@
#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 414
- 433
#define RID_STR_GEN_START RID_STR_UNO_END
-#define RID_STR_GEN_END RID_STR_GEN_START + 57 // 434
- 490
+#define RID_STR_GEN_END RID_STR_GEN_START + 60 // 434
- 493
#define RID_STR_APP_START RID_STR_GEN_END
-#define RID_STR_APP_END RID_STR_APP_START + 40 //
491 - 530
+#define RID_STR_APP_END RID_STR_APP_START + 40 //
494 - 533
#if RID_STR_GEN_END > RID_DBACCESS_END
#error Resource-Id Ueberlauf in #file, #line
@@ -98,12 +98,6 @@
// FREE
-// error boxes
-
-#define STR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2
-#define STR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3
-#define STR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8
-
// query boxes
#define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0
@@ -230,6 +224,10 @@
#define STR_SPREADSHEET_HELPTEXT RID_STR_GEN_START + 54
#define STR_SPREADSHEETPATH RID_STR_GEN_START + 55
#define STR_RSC_CHARSETS RID_STR_GEN_START + 56
+#define STR_QRY_CRITERIA_ON_ASTERISK RID_STR_GEN_START + 57
+#define STR_QRY_ORDERBY_ON_ASTERISK RID_STR_GEN_START + 58
+#define STR_NEED_INDEX_FIELDS RID_STR_GEN_START + 59
+
// untyped resources
commit 00f6b0e5f96b88a7e1ba982b44d13441cd2bf368
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:54:39 2014 +0200
Final ErrorBox ERR_NEED_INDEX_FIELDS to String
Change-Id: I75e509b89c0cb1d8b4727d55d4ae01048fa7bf8e
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index 7de55fa..8537660 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -26,6 +26,7 @@
#include "dbaccess_helpid.hrc"
#include "indexfieldscontrol.hxx"
#include "indexcollection.hxx"
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <com/sun/star/sdb/SQLContext.hpp>
@@ -676,7 +677,7 @@ namespace dbaui
// need at least one field
if (0 == _rPos->aFields.size())
{
- ErrorBox aError(this, ModuleRes(ERR_NEED_INDEX_FIELDS));
+ MessageDialog aError(this, ModuleRes(STR_NEED_INDEX_FIELDS));
aError.Execute();
m_pFields->GrabFocus();
return false;
diff --git a/dbaccess/source/ui/dlg/indexdialog.src
b/dbaccess/source/ui/dlg/indexdialog.src
index 4c0d269..2ee7a37 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -58,13 +58,9 @@ Image IMG_PKEYICON
MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
-ErrorBox ERR_NEED_INDEX_FIELDS
+String STR_NEED_INDEX_FIELDS
{
- Title [ en-US ] = "Save Index";
-
- Message [ en-US ] = "The index must contain at least one field.";
-
- Buttons = WB_OK;
+ Text [ en-US ] = "The index must contain at least one field.";
};
QueryBox QUERY_SAVE_CURRENT_INDEX
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index dde8e31..593bc9f 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -102,7 +102,7 @@
#define STR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2
#define STR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3
-#define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8
+#define STR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8
// query boxes
commit 140d082fb12c76818b33b360cc95af8094549b9f
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:52:21 2014 +0200
ErrorBoxes from querydesign to String
Change-Id: I2aa9aa5b0d730c0546e8565d03b9b7d3d051235a
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index dc4a6e6..dde8e31 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -100,8 +100,8 @@
// error boxes
-#define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2
-#define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3
+#define STR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2
+#define STR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3
#define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8
// query boxes
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 213fc3e..e33f646 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -759,7 +759,7 @@ namespace
{
// only show the messagebox the first time
if (!bCritsOnAsterikWarning)
- ErrorBox(_pView, ModuleRes(
ERR_QRY_CRITERIA_ON_ASTERISK)).Execute();
+ MessageDialog(_pView, ModuleRes(
STR_QRY_CRITERIA_ON_ASTERISK)).Execute();
bCritsOnAsterikWarning = true;
continue;
}
@@ -918,7 +918,7 @@ namespace
{
// only show the MessageBox the first time
if (!bCritsOnAsterikWarning)
- ErrorBox(_pView, ModuleRes(
ERR_QRY_ORDERBY_ON_ASTERISK)).Execute();
+ MessageDialog(_pView, ModuleRes(
STR_QRY_ORDERBY_ON_ASTERISK)).Execute();
bCritsOnAsterikWarning = true;
continue;
}
diff --git a/dbaccess/source/ui/querydesign/query.src
b/dbaccess/source/ui/querydesign/query.src
index a62ba6e..2a67911 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -221,9 +221,9 @@ String STR_QRY_TOO_MANY_COLUMNS
Text [ en-US ] = "There are too many columns.";
};
-ErrorBox ERR_QRY_CRITERIA_ON_ASTERISK
+String STR_QRY_CRITERIA_ON_ASTERISK
{
- Message [ en-US ] = "A condition cannot be applied to field [*]" ;
+ Text [ en-US ] = "A condition cannot be applied to field [*]" ;
};
String STR_QRY_TOO_LONG_STATEMENT
@@ -251,9 +251,9 @@ String STR_QRY_SYNTAX
Text [ en-US ] = "SQL syntax error" ;
};
-ErrorBox ERR_QRY_ORDERBY_ON_ASTERISK
+String STR_QRY_ORDERBY_ON_ASTERISK
{
- Message [ en-US ] = "[*] cannot be used as a sort criterion.";
+ Text [ en-US ] = "[*] cannot be used as a sort criterion.";
};
String STR_QRY_TOO_MANY_TABLES
commit 2f46431fd044f184809e298a16427d4629ff80e3
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:46:35 2014 +0200
ErrorBoxes from optjava to String
Change-Id: Ia3e200277a8a47b62a1ecbc21d9a83ba35c7ef7e
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 080e1cc..7e2d0e2 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -136,8 +136,8 @@
#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855)
#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320)
#define RID_SVXSTR_OPT_PROXYPORTS (RID_SVX_START + 224)
-#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
-#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257)
+#define RID_SVXSTR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
+#define RID_SVXSTR_JRE_FAILED_VERSION (RID_SVX_START + 257)
#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026)
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 548c8c6..8f5dfc4 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -31,6 +31,7 @@
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
#include <tools/urlobj.hxx>
+#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
#include <unotools/pathoptions.hxx>
@@ -614,12 +615,12 @@ void SvxJavaOptionsPage::AddFolder( const OUString&
_rFolder )
}
else if ( JFW_E_NOT_RECOGNIZED == eErr )
{
- ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_NOT_RECOGNIZED ) );
+ MessageDialog aErrBox( this, CUI_RES( RID_SVXSTR_JRE_NOT_RECOGNIZED )
);
aErrBox.Execute();
}
else if ( JFW_E_FAILED_VERSION == eErr )
{
- ErrorBox aErrBox( this, CUI_RES( RID_SVXERR_JRE_FAILED_VERSION ) );
+ MessageDialog aErrBox( this, CUI_RES( RID_SVXSTR_JRE_FAILED_VERSION )
);
aErrBox.Execute();
}
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index 58cd582..c98407a 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -20,18 +20,14 @@
#include <cuires.hrc>
#include "helpid.hrc"
-ErrorBox RID_SVXERR_JRE_NOT_RECOGNIZED
+String RID_SVXSTR_JRE_NOT_RECOGNIZED
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "The folder you selected does not contain a Java
runtime environment.\nPlease select a different folder." ;
+ Text [ en-US ] = "The folder you selected does not contain a Java runtime
environment.\nPlease select a different folder." ;
};
-ErrorBox RID_SVXERR_JRE_FAILED_VERSION
+String RID_SVXSTR_JRE_FAILED_VERSION
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "The Java runtime environment you selected is not the
required version.\nPlease select a different folder." ;
+ Text [ en-US ] = "The Java runtime environment you selected is not the
required version.\nPlease select a different folder." ;
};
WarningBox RID_SVX_MSGBOX_OPTIONS_RESTART
commit dd97e4266156abe8e8e235feae75e8cd255355cc
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:42:52 2014 +0200
ErrorBoxes from fmsearch to String
Change-Id: I0c2d12a79e8af2125c3aad7f0a6cb873ce3b4d2c
diff --git a/cui/source/dialogs/cuifmsearch.cxx
b/cui/source/dialogs/cuifmsearch.cxx
index b91be84..184e9db 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -18,7 +18,7 @@
*/
#include <tools/debug.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include <tools/shl.hxx>
#include <dialmgr.hxx>
@@ -719,9 +719,9 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress,
FmSearchProgress*, pProgress)
case FmSearchProgress::STATE_NOTHINGFOUND:
{
sal_uInt16 nErrorId = (FmSearchProgress::STATE_ERROR ==
pProgress->aSearchState)
- ? RID_SVXERR_SEARCH_GENERAL_ERROR
- : RID_SVXERR_SEARCH_NORECORD;
- ErrorBox(this, CUI_RES(nErrorId)).Execute();
+ ? RID_STR_SEARCH_GENERAL_ERROR
+ : RID_STR_SEARCH_NORECORD;
+ MessageDialog(this, CUI_RES(nErrorId)).Execute();
}
// NO break !
case FmSearchProgress::STATE_CANCELED:
diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
index c42775f..f17cd76 100644
--- a/cui/source/dialogs/fmsearch.hrc
+++ b/cui/source/dialogs/fmsearch.hrc
@@ -27,8 +27,8 @@
#define RID_STR_SEARCH_WHOLE (RID_FORMS_START + 88)
#define RID_STR_FROM_TOP (RID_FORMS_START + 74)
#define RID_STR_FROM_BOTTOM (RID_FORMS_START + 75)
-#define RID_SVXERR_SEARCH_NORECORD (RID_FORMS_START + 8)
-#define RID_SVXERR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9)
+#define RID_STR_SEARCH_NORECORD (RID_FORMS_START + 8)
+#define RID_STR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9)
#define RID_STR_OVERFLOW_FORWARD (RID_FORMS_START + 34)
#define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35)
#define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76)
diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src
index 48111ec..0a8cf00 100644
--- a/cui/source/dialogs/fmsearch.src
+++ b/cui/source/dialogs/fmsearch.src
@@ -49,16 +49,14 @@ String RID_STR_FROM_BOTTOM
Text [ en-US ] = "From bottom";
};
-ErrorBox RID_SVXERR_SEARCH_NORECORD
+String RID_STR_SEARCH_NORECORD
{
- Buttons = WB_OK;
- Message [ en-US ] = "No records corresponding to your data found.";
+ Text [ en-US ] = "No records corresponding to your data found.";
};
-ErrorBox RID_SVXERR_SEARCH_GENERAL_ERROR
+String RID_STR_SEARCH_GENERAL_ERROR
{
- Buttons = WB_OK;
- Message [ en-US ] = "An unknown error occurred. The search could not be
finished.";
+ Text [ en-US ] = "An unknown error occurred. The search could not be
finished.";
};
String RID_STR_OVERFLOW_FORWARD
commit b64d7c9ecc6511a66fc34d8b031c4f89edfded48
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:35:30 2014 +0200
remove unused RID_SVXERR_OPT_DOUBLEPATHS
Change-Id: I08cf8a3ecfa181fafe03e27fdbe0c43739bd4ad3
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index fbf9629..080e1cc 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -141,7 +141,6 @@
#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026)
-#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //?
#define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209)
#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //?
#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//?
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index 60f7dcc..95f5203 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -20,13 +20,6 @@
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
-ErrorBox RID_SVXERR_OPT_DOUBLEPATHS
-{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "The configuration and mail directories must be
specified as separate directories.\nPlease choose a new path." ;
-};
-
String RID_SVXSTR_KEY_CONFIG_DIR
{
Text [ en-US ] = "Configuration" ;
commit 18b0e91e6cc273c4a7adab3ed89059cd296075bd
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:32:37 2014 +0200
ErrorBox RID_SVXERR_OPT_PROXYPORTS to String
Change-Id: I1ab70b37d54c11023c161f76363a36acad78de62
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 81f4736..fbf9629 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -135,7 +135,7 @@
#define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854)
#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855)
#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320)
-#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224)
+#define RID_SVXSTR_OPT_PROXYPORTS (RID_SVX_START + 224)
#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257)
#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 00dbf79..46d36f8 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -35,6 +35,7 @@
#include <sfx2/objsh.hxx>
#include <unotools/bootstrap.hxx>
#include <vcl/help.hxx>
+#include <vcl/layout.hxx>
#include <sfx2/viewfrm.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/securityoptions.hxx>
@@ -132,7 +133,7 @@ void SvxNoSpaceEdit::Modify()
if ( !comphelper::string::isdigitAsciiString(aValue) ||
(long)aValue.toInt32() > USHRT_MAX )
// the maximum value of a port number is USHRT_MAX
- ErrorBox( this, CUI_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
+ MessageDialog( this, CUI_RES( RID_SVXSTR_OPT_PROXYPORTS )
).Execute();
}
}
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index ffb829b..e1a9ee0 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -21,10 +21,9 @@
#include "helpid.hrc"
#include <cuires.hrc>
-ErrorBox RID_SVXERR_OPT_PROXYPORTS
+String RID_SVXSTR_OPT_PROXYPORTS
{
- BUTTONS = WB_OK ;
- Message [ en-US ] = "Invalid value!\n\nThe maximum value for a port number
is 65535.";
+ Text [ en-US ] = "Invalid value!\n\nThe maximum value for a port number is
65535.";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b5483af985ed8c49b0bb9ebcd096cc9530e35a38
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:28:56 2014 +0200
ErrorBoxes from datanavi to String
Change-Id: Ibb3b11da89468822d64c4c2bc2463ea82339f8af
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 82a792b..eeb0789 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -94,13 +94,12 @@
#define RID_QRY_REMOVE_SUBMISSION (RID_FORMS_START + 7)
#define RID_QRY_REMOVE_BINDING (RID_FORMS_START + 8)
-// ErrorBox-Id's -----------------------------------------------------------
-#define RID_ERR_INVALID_XMLNAME (RID_FORMS_START + 1)
-#define RID_ERR_INVALID_XMLPREFIX (RID_FORMS_START + 2)
-#define RID_ERR_DOUBLE_MODELNAME (RID_FORMS_START + 3)
-#define RID_ERR_EMPTY_SUBMISSIONNAME (RID_FORMS_START + 4)
-
// String-Id's -----------------------------------------------------------
+#define RID_STR_INVALID_XMLNAME (RID_FORMS_START + 1)
+#define RID_STR_INVALID_XMLPREFIX (RID_FORMS_START + 2)
+#define RID_STR_DOUBLE_MODELNAME (RID_FORMS_START + 3)
+#define RID_STR_EMPTY_SUBMISSIONNAME (RID_FORMS_START + 4)
+
#define RID_STR_FORMSHELL (RID_FORMS_START + 10)
#define RID_STR_STDFORMNAME (RID_FORMS_START + 11)
#define RID_STR_REC_TEXT (RID_FORMS_START + 12)
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index a0a2890..6708f90 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1484,10 +1484,8 @@ namespace svxform
if ( m_pModelsBox->GetEntryPos( sNewName ) !=
LISTBOX_ENTRY_NOTFOUND )
{
// error: model name already exists
- ErrorBox aErrBox( this, SVX_RES(
RID_ERR_DOUBLE_MODELNAME ) );
- OUString sMessText = aErrBox.GetMessText();
- sMessText = sMessText.replaceFirst( MSG_VARIABLE,
sNewName );
- aErrBox.SetMessText( sMessText );
+ MessageDialog aErrBox( this, SVX_RES(
RID_STR_DOUBLE_MODELNAME ) );
+
aErrBox.set_primary_text(aErrBox.get_primary_text().replaceFirst(MSG_VARIABLE,
sNewName));
aErrBox.Execute();
bShowDialog = true;
}
@@ -2445,10 +2443,8 @@ namespace svxform
( bIsHandleBinding && sNewName.isEmpty() ) )
{
// Error and don't close the dialog
- ErrorBox aErrBox( this, SVX_RES( RID_ERR_INVALID_XMLNAME ) );
- OUString sMessText = aErrBox.GetMessText();
- sMessText = sMessText.replaceFirst( MSG_VARIABLE, sNewName );
- aErrBox.SetMessText( sMessText );
+ MessageDialog aErrBox( this, SVX_RES( RID_STR_INVALID_XMLNAME ) );
+
aErrBox.set_primary_text(aErrBox.get_primary_text().replaceFirst(MSG_VARIABLE,
sNewName));
aErrBox.Execute();
return 0;
}
@@ -3063,10 +3059,8 @@ namespace svxform
{
if ( !m_pConditionDlg->GetUIHelper()->isValidPrefixName( sPrefix )
)
{
- ErrorBox aErrBox( this, SVX_RES( RID_ERR_INVALID_XMLPREFIX ) );
- OUString sMessText = aErrBox.GetMessText();
- sMessText = sMessText.replaceFirst( MSG_VARIABLE, sPrefix );
- aErrBox.SetMessText( sMessText );
+ MessageDialog aErrBox( this, SVX_RES(
RID_STR_INVALID_XMLPREFIX ) );
+
aErrBox.set_primary_text(aErrBox.get_primary_text().replaceFirst(MSG_VARIABLE,
sPrefix));
aErrBox.Execute();
return 0;
}
@@ -3132,8 +3126,8 @@ namespace svxform
OUString sName(m_pNameED->GetText());
if(sName.isEmpty()) {
- ErrorBox aErrorBox(this,SVX_RES(RID_ERR_EMPTY_SUBMISSIONNAME));
- aErrorBox.SetText( Application::GetDisplayName() );
+ MessageDialog
aErrorBox(this,SVX_RES(RID_STR_EMPTY_SUBMISSIONNAME));
+ aErrorBox.set_primary_text( Application::GetDisplayName() );
aErrorBox.Execute();
return 0;
}
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 62ac609..2f75ef33 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -108,28 +108,24 @@ MessBox RID_QRY_LINK_WARNING
Message [ en-US ] = "This instance is linked with the form.\n\nThe changes
you make to this instance will be lost when the form is reloaded.\n\nHow do you
want to proceed?" ;
};
-ErrorBox RID_ERR_INVALID_XMLNAME
+String RID_STR_INVALID_XMLNAME
{
- Buttons = WB_OK ;
- Message [ en-US ] = "The name '%1' is not valid in XML. Please enter a
different name." ;
+ Text [ en-US ] = "The name '%1' is not valid in XML. Please enter a
different name." ;
};
-ErrorBox RID_ERR_INVALID_XMLPREFIX
+String RID_STR_INVALID_XMLPREFIX
{
- Buttons = WB_OK ;
- Message [ en-US ] = "The prefix '%1' is not valid in XML. Please enter a
different prefix." ;
+ Text [ en-US ] = "The prefix '%1' is not valid in XML. Please enter a
different prefix." ;
};
-ErrorBox RID_ERR_DOUBLE_MODELNAME
+String RID_STR_DOUBLE_MODELNAME
{
- Buttons = WB_OK ;
- Message [ en-US ] = "The name '%1' already exists. Please enter a new
name." ;
+ Text [ en-US ] = "The name '%1' already exists. Please enter a new name." ;
};
-ErrorBox RID_ERR_EMPTY_SUBMISSIONNAME
+String RID_STR_EMPTY_SUBMISSIONNAME
{
- Buttons = WB_OK ;
- Message [ en-US ] = "The submission must have a name." ;
+ Text [ en-US ] = "The submission must have a name." ;
};
Menu RID_MENU_DATANAVIGATOR
commit a332a43ed282db578b48a4e4993756fcfdf13c80
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:21:06 2014 +0200
ErrorBox ERR_INVALID_BACKUP_LOCATION to String
Change-Id: Ied9fcfacc6d2751883d7c4d21582427690ba0f20
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc
b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index d32dafe..3d0d42e 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -24,13 +24,8 @@
//= bases
-#define RID_DBMM_DIALOG_START RID_DBACCESS_START + 0
#define RID_DBMM_STRING_START RID_DBACCESS_START + 0
-//= error boxes
-
-#define ERR_INVALID_BACKUP_LOCATION RID_DBMM_DIALOG_START + 0
-
//= strings
#define STR_FORM ( RID_DBMM_STRING_START + 0 )
@@ -58,6 +53,7 @@
#define STR_STATE_MIGRATE ( RID_DBMM_STRING_START + 22 )
#define STR_STATE_SUMMARY ( RID_DBMM_STRING_START + 23 )
#define STR_TITLE_MACRO_MIGRATION ( RID_DBMM_STRING_START + 24 )
+#define STR_INVALID_BACKUP_LOCATION ( RID_DBMM_STRING_START + 25 )
#endif // DBACCESS_DBMM_GLOBAL_HRC
diff --git a/dbaccess/source/ext/macromigration/macromigration.src
b/dbaccess/source/ext/macromigration/macromigration.src
index 4b797ed..c0c1382 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -131,10 +131,9 @@ String STR_EXCEPTION
Text [ en-US ] = "caught exception:";
};
-ErrorBox ERR_INVALID_BACKUP_LOCATION
+String STR_INVALID_BACKUP_LOCATION
{
- Buttons = WB_OK;
- Message [ en-US ] = "You need to choose a backup location other than the
document location itself.";
+ Text [ en-US ] = "You need to choose a backup location other than the
document location itself.";
};
String STR_INVALID_NUMBER_ARGS
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index ba3611c..136290f 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -43,7 +43,7 @@
#include <svl/filenotation.hxx>
#include <tools/diagnose_ex.h>
#include <ucbhelper/content.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <list>
@@ -406,7 +406,7 @@ namespace dbmm
// check that the backup location isn't the same as the document
itself
if ( lcl_equalURLs_nothrow( m_pData->aContext, sBackupLocation,
m_pData->xDocumentModel->getURL() ) )
{
- ErrorBox aErrorBox( const_cast< MacroMigrationDialog* >( this
), MacroMigrationResId( ERR_INVALID_BACKUP_LOCATION ) );
+ MessageDialog aErrorBox( const_cast< MacroMigrationDialog* >(
this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) );
aErrorBox.Execute();
rBackupPage.grabLocationFocus();
return false;
commit c931bed5f1ab16e758f8da8e4304c9c126a1ca49
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:16:42 2014 +0200
ErrorBox MSG_ERR_NO_ABS_URI_REF to String
Change-Id: Ifc6c6358e327c6ba1e5e552a698568736090e70b
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index bb7552d..74e6226 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -24,7 +24,7 @@
// #defines *****************************************************************
#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7)
-#define MSG_ERR_NO_ABS_URI_REF (RID_SFX_APP_START+8)
+#define STR_NO_ABS_URI_REF (RID_SFX_APP_START+8)
#define MSG_CANT_QUIT (RID_SFX_APP_START+10)
#define STR_ISMODIFIED (RID_SFX_APP_START+11)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index b6c6b96..d1ddf93 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -65,11 +65,9 @@ String STR_NO_WEBBROWSER_FOUND
Text [ en-US ] = "%PRODUCTNAME could not find a web browser on your
system. Please check your Desktop Preferences or install a web browser (for
example, Firefox) in the default location requested during the browser
installation." ;
};
-ErrorBox MSG_ERR_NO_ABS_URI_REF
+String STR_NO_ABS_URI_REF
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message[ en-US ] = "\"$(ARG1)\" is not an absolute URL that can be passed
to an external application to open it." ;
+ Text [ en-US ] = "\"$(ARG1)\" is not an absolute URL that can be passed to
an external application to open it." ;
};
Resource SID_UNKNOWN
diff --git a/sfx2/source/appl/openuriexternally.cxx
b/sfx2/source/appl/openuriexternally.cxx
index 32dfb79..e892c2c 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -45,11 +45,9 @@ bool sfx2::openUriExternally(
+ e.Message);
}
SolarMutexGuard g;
- ErrorBox eb(
- SfxGetpApp()->GetTopWindow(), SfxResId(MSG_ERR_NO_ABS_URI_REF));
- OUString msg(eb.GetMessText());
- msg = msg.replaceFirst("$(ARG1)", uri);
- eb.SetMessText(msg);
+ MessageDialog eb(
+ SfxGetpApp()->GetTopWindow(), SfxResId(STR_NO_ABS_URI_REF));
+ eb.set_primary_text(eb.get_primary_text().replaceFirst("$(ARG1)",
uri));
eb.Execute();
} catch (css::system::SystemShellExecuteException &) {
if (!handleSystemShellExecuteException) {
commit a470c10d88b7824a9d3a986b302beef115fbc303
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 21:09:27 2014 +0200
ErrorBox RID_ERRBOX_MODULENOTINSTALLED to String
And move to sfx2 to stop this ResMgr mangling
Change-Id: I4633766fdcc53189cdb508f9eddaa6b2e8448858
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 5d8e11b..e3307e3 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -154,6 +154,7 @@
#define STR_NONCHECKEDOUT_DOCUMENT (RID_SFX_START+125)
#define BT_CHECKOUT (RID_SFX_START+126)
#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+127)
+#define STR_MODULENOTINSTALLED (RID_SFX_START+128)
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
#define SFX_THUMBNAIL_TEXT (RID_SFX_START+158)
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 90ca409..9390ee9 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -54,7 +54,7 @@
#include <unotools/configmgr.hxx>
#include <tools/diagnose_ex.h>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
@@ -878,16 +878,6 @@ OUString ChooseMacro( const Reference< XModel >&
rxLimitToDocument, bool bChoose
#endif
-
-#define RID_ERRBOX_MODULENOTINSTALLED (RID_OFA_START + 72)
-
-ResMgr* SfxApplication::GetOffResManager_Impl()
-{
- if ( !pAppData_Impl->pOfaResMgr )
- pAppData_Impl->pOfaResMgr = ResMgr::CreateResMgr( "ofa");
- return pAppData_Impl->pOfaResMgr;
-}
-
namespace
{
#ifndef DISABLE_SCRIPTING
@@ -1277,7 +1267,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
SvtModuleOptions aModuleOpt;
if ( !aModuleOpt.IsImpress() )
{
- ErrorBox( 0, ResId( RID_ERRBOX_MODULENOTINSTALLED,
*GetOffResManager_Impl() )).Execute();
+ MessageDialog( 0, SFX2_RESSTR( STR_MODULENOTINSTALLED
)).Execute();
return;
}
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 16f3044..11467c8 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -44,6 +44,11 @@ String STR_PASSWD
Text [ en-US ] = "Password" ;
};
+String STR_MODULENOTINSTALLED
+{
+ Text [ en-US ] = "The action could not be executed. The %PRODUCTNAME
program module needed for this action is currently not installed.";
+};
+
Bitmap ( SFX_THUMBNAIL_TEXT )
{
File = "ott_96_8.png";
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index d19db1c..42190c2 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -25,10 +25,6 @@
#include <svl/solar.hrc>
#include <sfx2/sfxsids.hrc>
-// Errors ----------------------------------------------------------------
-
-#define RID_ERRBOX_MODULENOTINSTALLED (RID_OFA_START + 72)
-
// Dialoge ---------------------------------------------------------------
#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100)
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index b2e90d2..0b52b097 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -27,12 +27,6 @@ String RID_APPTITLE
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue
= 0xFFFF; };
-ErrorBox RID_ERRBOX_MODULENOTINSTALLED
-{
- Buttons = WB_OK ;
- Message [ en-US ] = "The action could not be executed. The %PRODUCTNAME
program module needed for this action is currently not installed.";
-};
-
#define IMAGE_ID_LIST\
IdList = {\
SID_HLINKBAR_LINK; \
commit c584f344b7f810c297da616befdc354b86fbf8b8
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 20:55:14 2014 +0200
ErrorBox MSG_ERR_NO_WEBBROWSER_FOUND to String
Change-Id: Ifbc3dbc48fc291881eeb4306379da2599b6d9e95
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 1e7ea05..bb7552d 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -23,7 +23,7 @@
// #defines *****************************************************************
-#define MSG_ERR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7)
+#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7)
#define MSG_ERR_NO_ABS_URI_REF (RID_SFX_APP_START+8)
#define MSG_CANT_QUIT (RID_SFX_APP_START+10)
#define STR_ISMODIFIED (RID_SFX_APP_START+11)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 5528f8f..b6c6b96 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -60,11 +60,9 @@ QueryBox MSG_QUERY_LASTVERSION
Message [ en-US ] = "Cancel all changes?" ;
};
-ErrorBox MSG_ERR_NO_WEBBROWSER_FOUND
+String STR_NO_WEBBROWSER_FOUND
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message[ en-US ] = "%PRODUCTNAME could not find a web browser on your
system. Please check your Desktop Preferences or install a web browser (for
example, Firefox) in the default location requested during the browser
installation." ;
+ Text [ en-US ] = "%PRODUCTNAME could not find a web browser on your
system. Please check your Desktop Preferences or install a web browser (for
example, Firefox) in the default location requested during the browser
installation." ;
};
ErrorBox MSG_ERR_NO_ABS_URI_REF
diff --git a/sfx2/source/appl/openuriexternally.cxx
b/sfx2/source/appl/openuriexternally.cxx
index 04da015..32dfb79 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -21,7 +21,7 @@
#include <rtl/ustring.hxx>
#include <sfx2/app.hxx>
#include <sfx2/sfxresid.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include "openuriexternally.hxx"
@@ -56,9 +56,9 @@ bool sfx2::openUriExternally(
throw;
}
SolarMutexGuard g;
- ErrorBox(
+ MessageDialog(
SfxGetpApp()->GetTopWindow(),
- SfxResId(MSG_ERR_NO_WEBBROWSER_FOUND)).
+ SfxResId(STR_NO_WEBBROWSER_FOUND)).
Execute();
}
return false;
commit 90aecb31139a6743fd00c87585a82406e7d9f075
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 20:47:00 2014 +0200
ErrorBox EBX_ERR_PRINTDISABLED to String
Change-Id: I7f59091a595a8e8a832b779da56bb53de810f22b
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8eed982..cd5d860 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -92,7 +92,7 @@
#include <svtools/menuoptions.hxx>
#include <rtl/bootstrap.hxx>
#include <vcl/help.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
#include <sfx2/sfx.hrc>
#include <sfx2/app.hxx>
@@ -2434,7 +2434,7 @@ void Desktop::OpenClients()
ResMgr* pDtResMgr = GetDesktopResManager();
if( pDtResMgr )
{
- ErrorBox aBox( NULL, ResId( EBX_ERR_PRINTDISABLED, *pDtResMgr
) );
+ MessageDialog aBox( NULL, ResId( STR_ERR_PRINTDISABLED,
*pDtResMgr ) );
aBox.Execute();
}
}
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index e9caf4a..8a7affc 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -28,8 +28,6 @@
#define QBX_USERDATALOCKED (RID_DESKTOP_DIALOG_START+100)
-#define EBX_ERR_PRINTDISABLED (RID_DESKTOP_DIALOG_START+190)
-
#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)
@@ -52,6 +50,8 @@
#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152)
+#define STR_ERR_PRINTDISABLED (RID_DESKTOP_STRING_START+153)
+
#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161)
#define STR_LO_MUST_BE_RESTARTED (RID_DESKTOP_STRING_START+162)
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 1036b21..b109a0e 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -151,11 +151,9 @@ String STR_TITLE_USERDATALOCKED
Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION";
};
-ErrorBox EBX_ERR_PRINTDISABLED
+String STR_ERR_PRINTDISABLED
{
- Buttons = WB_OK ;
- DefButton = WB_DEF_OK ;
- Message [ en-US ] = "Printing is disabled. No documents can be printed.";
+ Text [ en-US ] = "Printing is disabled. No documents can be printed.";
};
String STR_TITLE_EXPIRED
commit 3236e205f4b0ab43fb11f8ce3ebe8cfa749da6d5
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 20:43:16 2014 +0200
ErrorBox RID_ERR_NEEDTYPESELECTION to String
Change-Id: Ia7b4807bc3847a50f753541b0495d36176603e63
diff --git a/extensions/source/abpilot/abpresid.hrc
b/extensions/source/abpilot/abpresid.hrc
index 2b0681e..ac716b0 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -27,7 +27,6 @@
#define RID_PAGE_START RID_ABP_START
#define RID_STRING_START RID_ABP_START
-#define RID_ERRORBOX_START RID_ABP_START
#define RID_UNTYPED_START RID_ABP_START
#define RID_QUERYBOX_START RID_ABP_START
#define RID_BITMAP_START RID_ABP_START
@@ -46,16 +45,10 @@
#define RID_STR_TABLE_SELECTION ( RID_STRING_START + 9 )
#define RID_STR_MANUAL_FIELD_MAPPING ( RID_STRING_START + 10 )
#define RID_STR_FINAL_CONFIRM ( RID_STRING_START + 11 )
+#define RID_STR_NEEDTYPESELECTION ( RID_STRING_START + 12 )
// please adjust RID_STRING_END (below) when adding new strings
-#define RID_STRING_END RID_STR_FINAL_CONFIRM
-
-// error boxes
-
-#define RID_ERR_NEEDTYPESELECTION ( RID_ERRORBOX_START + 0 )
-// please adjust RID_ERRORBOX_END (below) when adding new error boxes
-
-#define RID_ERRORBOX_END RID_ERR_NEEDTYPESELECTION
+#define RID_STRING_END RID_STR_NEEDTYPESELECTION
// query boxes
@@ -85,9 +78,6 @@
#if RID_STRING_END > RID_ABP_END
#error "please adjust the resource id ranges!!"
#endif
-#if RID_ERRORBOX_END > RID_ABP_END
- #error "please adjust the resource id ranges!!"
-#endif
#if RID_QUERYBOX_END > RID_ABP_END
#error "please adjust the resource id ranges!!"
#endif
diff --git a/extensions/source/abpilot/abspilot.src
b/extensions/source/abpilot/abspilot.src
index 7bf3cbb..985915b 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -49,12 +49,9 @@ String RID_STR_FINAL_CONFIRM
Text [ en-US ] = "Data Source Title";
};
-
-ErrorBox RID_ERR_NEEDTYPESELECTION
+String RID_STR_NEEDTYPESELECTION
{
- Buttons = WB_OK;
-
- Message [ en-US ] = "Please select a type of address book.";
+ Text [ en-US ] = "Please select a type of address book.";
};
QueryBox RID_QRY_NOTABLES
diff --git a/extensions/source/abpilot/typeselectionpage.cxx
b/extensions/source/abpilot/typeselectionpage.cxx
index a2615d8..7936186 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -20,7 +20,7 @@
#include "typeselectionpage.hxx"
#include "addresssettings.hxx"
#include "abspilot.hxx"
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/sdbc/DriverManager.hpp>
#include <comphelper/processfactory.hxx>
@@ -226,7 +226,7 @@ namespace abp
if (AST_INVALID == getSelectedType( ))
{
- ErrorBox aError(this, ModuleRes(RID_ERR_NEEDTYPESELECTION));
+ MessageDialog aError(this, ModuleRes(RID_STR_NEEDTYPESELECTION));
aError.Execute();
return false;
}
commit 113830171478fd01441f8fc20b6132aba535174a
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 20:20:00 2014 +0200
ErrorBox AVMEDIA_ERR_URL to String
Change-Id: Id897c62fbfe9728bef2264769871aade8c82dbdb
diff --git a/avmedia/source/viewer/mediawindow.cxx
b/avmedia/source/viewer/mediawindow.cxx
index e586a58..49e559d 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -25,7 +25,7 @@
#include "mediamisc.hxx"
#include "mediawindow.hrc"
#include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/filedlghelper.hxx>
#include <comphelper/processfactory.hxx>
@@ -322,7 +322,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent
*/,
void MediaWindow::executeFormatErrorBox( Window* pParent )
{
- ErrorBox aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_ERR_URL ) );
+ MessageDialog aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) );
aErrBox.Execute();
}
diff --git a/avmedia/source/viewer/mediawindow.hrc
b/avmedia/source/viewer/mediawindow.hrc
index 8835505..3288eea 100644
--- a/avmedia/source/viewer/mediawindow.hrc
+++ b/avmedia/source/viewer/mediawindow.hrc
@@ -21,10 +21,9 @@
#define AVMEDIA_STR_INSERTMEDIA_DLG 16385
#define AVMEDIA_STR_ALL_MEDIAFILES 16386
#define AVMEDIA_STR_ALL_FILES 16387
+#define AVMEDIA_STR_ERR_URL 16388
#define AVMEDIA_BMP_AUDIOLOGO 20000
#define AVMEDIA_BMP_EMPTYLOGO 20001
-#define AVMEDIA_ERR_URL 21000
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.src
b/avmedia/source/viewer/mediawindow.src
index 6c7b879..368dee1 100644
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
@@ -49,11 +49,9 @@ Bitmap AVMEDIA_BMP_EMPTYLOGO
file = "avemptylogo.png";
};
-ErrorBox AVMEDIA_ERR_URL
+String AVMEDIA_STR_ERR_URL
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message[en-US] = "The format of the selected file is not supported.";
+ Text[en-US] = "The format of the selected file is not supported.";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0494f0029ffbd17c1355437352bf42b193eab27e
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Fri Aug 15 20:16:18 2014 +0200
ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT to String
Change-Id: I474efcf128b990d148584292422cefa71a3c3c76
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 590a2f2..1b516ca 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -54,7 +54,7 @@
#include "helpids.hrc"
#include "resourcemanager.hxx"
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <unotools/configitem.hxx>
using namespace ::com::sun::star::security;
@@ -289,7 +289,7 @@ bool DigitalSignaturesDialog::canAddRemove()
if ( (!bSave1_1 && bDoc1_1) || (bSave1_1 && bDoc1_1) )
{
//#4
- ErrorBox err(NULL, XMLSEC_RES(RID_XMLSECDLG_OLD_ODF_FORMAT));
+ MessageDialog err(NULL, XMLSEC_RES(STR_XMLSECDLG_OLD_ODF_FORMAT));
err.Execute();
ret = false;
}
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
index b6f3cc1..7298555 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
@@ -23,7 +23,7 @@
//global.hrc in xmlsecurity/inc starts at 1000
#define RID_DIGITALSIGNATUREDLG_START 2000
-#define RID_XMLSECDLG_OLD_ODF_FORMAT RID_DIGITALSIGNATUREDLG_START
+#define STR_XMLSECDLG_OLD_ODF_FORMAT RID_DIGITALSIGNATUREDLG_START
#define MSG_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN
(RID_DIGITALSIGNATUREDLG_START + 1)
#endif
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index d4baf8f..37b37db 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*r Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -21,11 +21,9 @@
#include "helpids.hrc"
#include "digitalsignaturesdialog.hrc"
-ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
+String STR_XMLSECDLG_OLD_ODF_FORMAT
{
- Buttons = WB_OK ;
- DefButton = WB_DEF_OK ;
- Message [ en-US ] =
+ Text [ en-US ] =
"This document contains signatures in ODF 1.1 (OpenOffice.org 2.x)
format. "
"Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2
format version. "
"Thus no signatures can be added or removed to this document.\n\n"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
