diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-09 15:38:03 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-07 17:42:40 +0200 |
| commit | 815a35d4750374fbc32f40cd543adda4f9d243d8 (patch) | |
| tree | fd7aad2e008c36e22701332d6b95cde05e8d2980 /sw | |
| parent | 40d8e6bfd4917525213339d9ff329c42ea514770 (diff) | |
Move classified copy/paste strings from sw to sfx2
So that other modules can use them as well. The RTF import in
writerfilter is one potential user.
Change-Id: Ib009e1be2aff14d0fcac643c0c6000d2895515b0
(cherry picked from commit 1f7af133d9bade2cf226b65fab501d68113f8cc6)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/app/app.src | 10 | ||||
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/inc/app.hrc | 4 |
3 files changed, 4 insertions, 15 deletions
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index d264b5ba4320..b60a7b0a32c4 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -638,14 +638,4 @@ String STR_SRTERR Text [ en-US ] = "Cannot sort selection" ; }; -String STR_TARGET_DOC_NOT_CLASSIFIED -{ - Text [ en-US ] = "This document must be classified before the clipboard can be pasted." ; -}; - -String STR_DOC_CLASSIFICATION_TOO_LOW -{ - Text [ en-US ] = "This document has a lower classificaton level than the clipboard." ; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 932ecf1276da..bd7d023eb331 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -128,6 +128,7 @@ #include <vcl/GraphicNativeMetadata.hxx> #include <comphelper/lok.hxx> #include <sfx2/classificationhelper.hxx> +#include <sfx2/sfxresid.hxx> #include <memory> @@ -3247,13 +3248,13 @@ bool lcl_checkClassification(SwDoc* pSourceDoc, SwDoc* pDestinationDoc) break; case SfxClassificationCheckPasteResult::TargetDocNotClassified: { - ScopedVclPtrInstance<MessageDialog>::Create(nullptr, SW_RES(STR_TARGET_DOC_NOT_CLASSIFIED), VCL_MESSAGE_INFO)->Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(nullptr, SfxResId(STR_TARGET_DOC_NOT_CLASSIFIED), VCL_MESSAGE_INFO)->Execute(); return false; } break; case SfxClassificationCheckPasteResult::DocClassificationTooLow: { - ScopedVclPtrInstance<MessageDialog>::Create(nullptr, SW_RES(STR_DOC_CLASSIFICATION_TOO_LOW), VCL_MESSAGE_INFO)->Execute(); + ScopedVclPtrInstance<MessageDialog>::Create(nullptr, SfxResId(STR_DOC_CLASSIFICATION_TOO_LOW), VCL_MESSAGE_INFO)->Execute(); return false; } break; diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc index 7266e2a0a05c..ff5e12d89051 100644 --- a/sw/source/uibase/inc/app.hrc +++ b/sw/source/uibase/inc/app.hrc @@ -102,10 +102,8 @@ #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 STR_TARGET_DOC_NOT_CLASSIFIED (RC_APP_BEGIN + 140) -#define STR_DOC_CLASSIFICATION_TOO_LOW (RC_APP_BEGIN + 141) -#define APP_ACT_END STR_DOC_CLASSIFICATION_TOO_LOW +#define APP_ACT_END STR_SRTERR #if APP_ACT_END > RC_APP_END #error Resource-Id Ueberlauf in #file, #line |