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 /sw/source/uibase | |
| 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
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/inc/app.hrc | 4 |
2 files changed, 4 insertions, 5 deletions
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 |