diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-09 15:38:03 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-09 15:58:35 +0100 |
commit | 1f7af133d9bade2cf226b65fab501d68113f8cc6 (patch) | |
tree | 71684b3d7679da5fc5745d6eee0017009b795e10 | |
parent | 2e1a6ba26fd0cb251f831dd2a0f60103ca1342e2 (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
-rw-r--r-- | include/sfx2/sfx.hrc | 2 | ||||
-rw-r--r-- | sfx2/source/view/view.src | 10 | ||||
-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 |
5 files changed, 16 insertions, 15 deletions
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index a0d1ae3c3324..af7fb1e1362e 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -154,6 +154,8 @@ #define STR_PASSWD_MIN_LEN1 (RID_SFX_START+129) #define STR_MODULENOTINSTALLED (RID_SFX_START+130) #define STR_CLASSIFIED_DOCUMENT (RID_SFX_START+131) +#define STR_TARGET_DOC_NOT_CLASSIFIED (RID_SFX_START+132) +#define STR_DOC_CLASSIFICATION_TOO_LOW (RID_SFX_START+133) #define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157) #define SFX_THUMBNAIL_TEXT (RID_SFX_START+158) diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src index 26dbbbdad3ff..81718cc81ff5 100644 --- a/sfx2/source/view/view.src +++ b/sfx2/source/view/view.src @@ -96,6 +96,16 @@ String STR_CLASSIFIED_DOCUMENT Text [ en-US ] = "The classification label of this document is %1." ; }; +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." ; +}; + PushButton BT_CHECKOUT { Pos = MAP_APPFONT( 0 , 0 ); diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index 0b56c96baff3..74c3ce18916f 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -647,14 +647,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 fb46de918bfe..76ffde6c01b8 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> @@ -3231,13 +3232,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 aab6fd9be9e2..b5264d69f7e9 100644 --- a/sw/source/uibase/inc/app.hrc +++ b/sw/source/uibase/inc/app.hrc @@ -91,10 +91,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 |