include/svtools/svtools.hrc | 17 ++++-------------
sfx2/source/dialog/dialog.hrc | 2 +-
sfx2/source/dialog/dialog.src | 6 ++----
sfx2/source/dialog/passwd.cxx | 4 ++--
sfx2/source/doc/doc.hrc | 1 -
sfx2/source/doc/doc.src | 6 ------
svtools/source/java/javaerror.src | 14 +++++---------
svtools/source/java/javainteractionhandler.cxx | 7 ++++---
svtools/source/misc/langtab.cxx | 10 ----------
9 files changed, 18 insertions(+), 49 deletions(-)
New commits:
commit a53061deb1c2d81e0657fa8e1637cbbada285076
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Aug 15 09:05:18 2014 +0100
archetype for ErrorBox + resource -> MessageDialog + string conversion
in this case the .src has WB_OK for "ok button only" which is the
default for MessageDialog so no arguments apart from the string and
the parent dialog (null in this case) are needed
Change-Id: I63ddafddfcc448e3502b19d657dcad040a56c845
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index a634438..d9f461a 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -47,7 +47,7 @@
#define STR_VIEWVERSIONCOMMENT ( RC_DIALOG_BEGIN + 71 )
-#define MSG_ERROR_WRONG_CONFIRM ( RC_DIALOG_BEGIN + 76 )
+#define STR_ERROR_WRONG_CONFIRM ( RC_DIALOG_BEGIN + 76 )
#define STR_APPLY ( RC_DIALOG_BEGIN + 87 )
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index d9dda37..8d8273a 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -108,11 +108,9 @@ String SID_SIDEBAR
Text [ en-US ] = "Sidebar";
};
-ErrorBox MSG_ERROR_WRONG_CONFIRM
+String STR_ERROR_WRONG_CONFIRM
{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "Faulty password confirmation";
+ Text [ en-US ] = "Faulty password confirmation";
};
String STR_PDF_EXPORT_SEND
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index d55700f..1b746fb 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -19,7 +19,7 @@
// Include ---------------------------------------------------------------
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <sfx2/passwd.hxx>
#include "sfxtypes.hxx"
@@ -71,7 +71,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
bConfirmFailed = true;
if ( bConfirmFailed )
{
- ErrorBox aBox( this, SfxResId( MSG_ERROR_WRONG_CONFIRM ) );
+ MessageDialog aBox(this, SfxResId(STR_ERROR_WRONG_CONFIRM));
aBox.Execute();
mpConfirm1ED->SetText( OUString() );
mpConfirm1ED->GrabFocus();
commit 1eb84514fd25e8482bdc56185f96a06fe52155f4
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Aug 15 08:53:00 2014 +0100
MSG_ERROR_RENAME_TEMPLATE resource unused
since
commit b4c18dc0ea32af9f070d43278e547ee0b2e540a4
Author: Cédric Bosdonnat <cedric.bosdon...@free.fr>
Date: Thu Dec 20 09:51:59 2012 +0100
Templates Manager: removed the old dialogs and menu entries
Change-Id: Id1007004d5a3522891e66d408c2276c43bbc7f84
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index a7a7827..001e2e8 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -59,7 +59,6 @@
#define STR_ERROR_DELETE_TEMPLATE (RID_SFX_DOC_START+ 30)
#define STR_ERROR_MOVE_TEMPLATE (RID_SFX_DOC_START+ 32)
#define STR_ERROR_SAVE_TEMPLATE (RID_SFX_DOC_START+ 34)
-#define MSG_ERROR_RENAME_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)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index b72d055..e6aac7e 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -112,12 +112,6 @@ String STR_ERROR_SAVE_TEMPLATE
{
Text [ en-US ] = "Error saving template " ;
};
-ErrorBox MSG_ERROR_RENAME_TEMPLATE
-{
- BUTTONS = WB_OK ;
- DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "Error renaming template." ;
-};
String STR_QUERY_DEFAULT_TEMPLATE
{
Text [ en-US ] = "Should the template \"$(TEXT)\" become the default
template?" ;
commit e159d0bb53ea265e3813b06bf7a050f73b3ce616
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Aug 15 08:49:57 2014 +0100
ErrorBox resources -> MessageDialog + strings
Change-Id: I0e4e8e0393a5a86dc3125f6dccc9e4e7b47973a9
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
index 5705c6b..2887e54 100644
--- a/include/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
@@ -198,10 +198,12 @@
//String - Ids for Java errors, messages
#define STR_SVT_JAVAERROR_START (STR_SVT_INDEXENTRY_END + 1)
#define STR_QUESTION_JAVADISABLED (STR_SVT_JAVAERROR_START+0)
-#define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+1)
+#define STR_ERROR_JVMCREATIONFAILED_TITLE (STR_SVT_JAVAERROR_START+1)
#define STR_WARNING_JAVANOTFOUND (STR_SVT_JAVAERROR_START+2)
#define STR_WARNING_INVALIDJAVASETTINGS (STR_SVT_JAVAERROR_START+3)
-#define STR_SVT_JAVAERROR_END (STR_WARNING_INVALIDJAVASETTINGS)
+#define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+4)
+#define STR_ERROR_JVMCREATIONFAILED_MAC (STR_SVT_JAVAERROR_START+5)
+#define STR_SVT_JAVAERROR_END (STR_ERROR_JVMCREATIONFAILED_MAC)
// String array to match UI language names to LanguageType values and vice
versa
#define STR_ARR_SVT_LANGUAGE_TABLE_START (STR_SVT_JAVAERROR_END + 1)
@@ -262,12 +264,10 @@
// Java message boxes
#define QBX_JAVADISABLED (RID_SVTOOLS_START+20)
-#define ERRORBOX_JVMCREATIONFAILED (RID_SVTOOLS_START+21)
#define WARNINGBOX_JAVANOTFOUND (RID_SVTOOLS_START+22)
#define WARNINGBOX_INVALIDJAVASETTINGS (RID_SVTOOLS_START+23)
// RID_SVTOOLS_START + 24 unused
#define WARNINGBOX_INVALIDJAVASETTINGS_MAC (RID_SVTOOLS_START+25)
-#define ERRORBOX_JVMCREATIONFAILED_MAC (RID_SVTOOLS_START+26)
// images
#define RID_IMG_TREENODE_COLLAPSED (RID_SVTOOLS_START + 0)
diff --git a/svtools/source/java/javaerror.src
b/svtools/source/java/javaerror.src
index c8c0fc1..40d4194 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -47,18 +47,14 @@ QueryBox QBX_JAVADISABLED
Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE)
to perform this task. However, use of a JRE has been disabled. Do you want to
enable the use of a JRE now?";
};
-ErrorBox ERRORBOX_JVMCREATIONFAILED_MAC
+String STR_ERROR_JVMCREATIONFAILED_MAC
{
- Buttons = WB_OK;
- DefButton = WB_DEF_OK ;
- Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE)
to perform this task. The selected JRE is defective. Please select another
version or install a new JRE and select it under %PRODUCTNAME - Preferences -
%PRODUCTNAME - Advanced.";
+ Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to
perform this task. The selected JRE is defective. Please select another version
or install a new JRE and select it under %PRODUCTNAME - Preferences -
%PRODUCTNAME - Advanced.";
};
-ErrorBox ERRORBOX_JVMCREATIONFAILED
+String STR_ERROR_JVMCREATIONFAILED
{
- Buttons = WB_OK;
- DefButton = WB_DEF_OK ;
- Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE)
to perform this task. The selected JRE is defective. Please select another
version or install a new JRE and select it under Tools - Options - %PRODUCTNAME
- Advanced.";
+ Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to
perform this task. The selected JRE is defective. Please select another version
or install a new JRE and select it under Tools - Options - %PRODUCTNAME -
Advanced.";
};
String STR_WARNING_JAVANOTFOUND
@@ -76,7 +72,7 @@ String STR_QUESTION_JAVADISABLED
Text[ en-US ] = "Enable JRE" ;
};
-String STR_ERROR_JVMCREATIONFAILED
+String STR_ERROR_JVMCREATIONFAILED_TITLE
{
Text[ en-US ] = "JRE is Defective" ;
};
diff --git a/svtools/source/java/javainteractionhandler.cxx
b/svtools/source/java/javainteractionhandler.cxx
index 6d2e549..beda635 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/java/JavaVMCreationFailureException.hpp>
#include <com/sun/star/java/RestartRequiredException.hpp>
#include <comphelper/processfactory.hxx>
+#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <osl/mutex.hxx>
@@ -182,11 +183,11 @@ void SAL_CALL JavaInteractionHandler::handle( const
Reference< XInteractionReque
SolarMutexGuard aSolarGuard;
m_bVMCreationFailure_Handled = true;
#ifdef MACOSX
- ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED_MAC
) );
+ MessageDialog aErrorBox(NULL,
SvtResId(STR_ERROR_JVMCREATIONFAILED_MAC));
#else
- ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) );
+ MessageDialog aErrorBox(NULL,
SvtResId(STR_ERROR_JVMCREATIONFAILED));
#endif
- aErrorBox.SetText(SvtResId( STR_ERROR_JVMCREATIONFAILED
).toString());
+ aErrorBox.SetText(SvtResId(STR_ERROR_JVMCREATIONFAILED_TITLE));
nResult = aErrorBox.Execute();
}
else
commit 9bf3ef7cd875d11cc5ca57372716597c51d52a23
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Aug 15 08:44:03 2014 +0100
more mad archaic drivil
Change-Id: Ib0ad9e5831637651dc110d06cbd0a5f225f96977
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
index f181cf1..5705c6b 100644
--- a/include/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
@@ -261,9 +261,6 @@
#define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX
(RID_SVTOOLS_IMAGELIST_START + 3)
// Java message boxes
-//These strings come from project desktop
-//There was no time for translation, therefore the defines needed to
-//remain the same.
#define QBX_JAVADISABLED (RID_SVTOOLS_START+20)
#define ERRORBOX_JVMCREATIONFAILED (RID_SVTOOLS_START+21)
#define WARNINGBOX_JAVANOTFOUND (RID_SVTOOLS_START+22)
commit 7b61f9f09db809ba074336b60f883477760980aa
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Aug 15 08:37:35 2014 +0100
use of STR_ARR_SVT_LANGUAGE_TABLE in wizards is gone
since
commit 65e104060b2bd46259f0307263aa3d8eba4c0ace
Author: Xisco Fauli <aniste...@gmail.com>
Date: Sun Oct 21 20:35:05 2012 +0200
pyletter: remove java letter wizard
Change-Id: I77065cd277233b78b90c23a6545854a83cd17b16
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
index 2b94447..f181cf1 100644
--- a/include/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
@@ -196,22 +196,16 @@
#define STR_SVT_INDEXENTRY_END (STR_SVT_INDEXENTRY_PHONETIC_LC)
//String - Ids for Java errors, messages
-//These strings come from project desktop
-//There was no time for translation, therefore the defines needed to
-//remain the same.
#define STR_SVT_JAVAERROR_START (STR_SVT_INDEXENTRY_END + 1)
#define STR_QUESTION_JAVADISABLED (STR_SVT_JAVAERROR_START+0)
#define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+1)
#define STR_WARNING_JAVANOTFOUND (STR_SVT_JAVAERROR_START+2)
#define STR_WARNING_INVALIDJAVASETTINGS (STR_SVT_JAVAERROR_START+3)
-// STR_SVT_JAVAERROR_START + 4 unused
-#define STR_SVT_JAVAERROR_END (STR_SVT_JAVAERROR_START+4)
+#define STR_SVT_JAVAERROR_END (STR_WARNING_INVALIDJAVASETTINGS)
// String array to match UI language names to LanguageType values and vice
versa
#define STR_ARR_SVT_LANGUAGE_TABLE_START (STR_SVT_JAVAERROR_END + 1)
#define STR_ARR_SVT_LANGUAGE_TABLE (STR_ARR_SVT_LANGUAGE_TABLE_START
+ 0)
-//due to some horror wizards/com/sun/star/wizards/letter/LocaleCodes.java
needs to be kept
-//manually in sync with STR_ARR_SVT_LANGUAGE_TABLE
#define STR_ARR_SVT_LANGUAGE_TABLE_END (STR_ARR_SVT_LANGUAGE_TABLE)
#define STR_SVT_ADDRESSTEMPLATE_START (STR_ARR_SVT_LANGUAGE_TABLE_END+1)
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 3cd6b93..7000ef0 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -129,21 +129,11 @@ SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding(
const OUString &rText )
return aRes;
}
-
-
-namespace {
- BOOST_STATIC_ASSERT(
- 16642 == STR_ARR_SVT_LANGUAGE_TABLE);
-// "The value of STR_ARR_SVT_LANGUAGE_TABLE has changed.
wizards/com/sun/star/wizards/letter/LocaleCodes.java has this value hard coded,
please adapt it to your change."
-}
-
SvtLanguageTableImpl::SvtLanguageTableImpl() :
ResStringArray( SvtResId( STR_ARR_SVT_LANGUAGE_TABLE ) )
{
}
-
-
SvtLanguageTableImpl::~SvtLanguageTableImpl()
{
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
