summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-08-18 02:24:39 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-08-18 02:24:39 +0200
commitf739d062932633c04e632e644eeeea865a2d9a1d (patch)
treebd3c6c6d3cb1628062da0d8345ab2be8ae118be4 /sfx2
parent4ca5a663ab36d41fed65c5e708b12937137e3c31 (diff)
InfoBox RID_XMLSEC_INFO_WRONGDOCFORMAT to String
Change-Id: Ieb1c90f2f17b2ce12acf2999743ce4d608076223
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/app.hrc2
-rw-r--r--sfx2/source/appl/app.src4
-rw-r--r--sfx2/source/doc/objserv.cxx5
3 files changed, 6 insertions, 5 deletions
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index b9297a858da4..8d690ba5e36c 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 524628a353d0..439b9342fb7c 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -424,9 +424,9 @@ QueryBox RID_QUERY_CANCELCHECKOUT
Message [ en-US ] = "This will discard all changes on the server since check-out.\nDo you want to proceed?" ;
};
-InfoBox RID_XMLSEC_INFO_WRONGDOCFORMAT
+String STR_INFO_WRONGDOCFORMAT
{
- Message [ en-US ] = "This document must be saved in OpenDocument file format before it can be digitally signed." ;
+ Text [ en-US ] = "This document must be saved in OpenDocument file format before it can be digitally signed." ;
};
String RID_XMLSEC_DOCUMENTSIGNED
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index f389232cd63f..3dcfd32be36f 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -47,6 +47,7 @@
#include <tools/urlobj.hxx>
#include <svl/whiter.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/visitem.hxx>
@@ -1398,7 +1399,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
)
{
// Only OASIS and OOo6.x formats will be handled further
- InfoBox( NULL, SfxResId( RID_XMLSEC_INFO_WRONGDOCFORMAT ) ).Execute();
+ MessageDialog( NULL, SfxResId( STR_INFO_WRONGDOCFORMAT ), VCL_MESSAGE_INFO ).Execute();
return;
}
@@ -1449,7 +1450,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
|| SotStorage::GetVersion( GetMedium()->GetStorage() ) <= SOFFICE_FILEFORMAT_60 ) )
{
// Only OASIS format will be handled further
- InfoBox( NULL, SfxResId( RID_XMLSEC_INFO_WRONGDOCFORMAT ) ).Execute();
+ MessageDialog( NULL, SfxResId( STR_INFO_WRONGDOCFORMAT ), VCL_MESSAGE_INFO ).Execute();
return;
}
}