[Libreoffice-commits] core.git: forms/source

Muhammet Kara muhammet.kara at pardus.org.tr
Mon Jul 4 06:18:21 UTC 2016


 forms/source/inc/frm_resource.hrc          |    2 ++
 forms/source/resource/xforms.src           |    5 +++++
 forms/source/xforms/datatyperepository.cxx |    4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 41051ebbc416aafafec79c6795a8f8587c58d0e5
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date:   Thu Jun 30 15:34:58 2016 +0300

    Localize error message in ODataTypeRepository
    
    Change-Id: I92b5a69daf405d71bf8f72685696c647a64cc9d1
    Reviewed-on: https://gerrit.libreoffice.org/26807
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc
index dd2fb11..d1e1b74 100644
--- a/forms/source/inc/frm_resource.hrc
+++ b/forms/source/inc/frm_resource.hrc
@@ -90,6 +90,8 @@
 #define RID_STR_FEATURE_NOT_EXECUTABLE          ( RID_FRM_STRINGS_START + 58 )
 #define RID_STR_FEATURE_UNKNOWN                 ( RID_FRM_STRINGS_START + 59 )
 
+#define RID_STR_XFORMS_CANT_REMOVE_TYPE         ( RID_FRM_STRINGS_START + 60 )
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src
index b878f21..2b49443 100644
--- a/forms/source/resource/xforms.src
+++ b/forms/source/resource/xforms.src
@@ -184,4 +184,9 @@ String RID_STR_XFORMS_BINDING_UI_NAME
     Text [ en-US ] = "Binding" ;
 };
 
+String RID_STR_XFORMS_CANT_REMOVE_TYPE
+{
+    Text [ en-US ] = "This is a built-in type and cannot be removed." ;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index fe2c371..3bb4794 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -147,8 +147,8 @@ namespace xforms
 
         Repository::iterator aTypePos = implLocate( typeName );
         if ( aTypePos->second->getIsBasic() )
-            throw VetoException("This is a built-in type and cannot be removed.", *this );
-            // TODO: localize this error message
+            // "This is a built-in type and cannot be removed."
+            throw VetoException(FRM_RES_STRING( RID_STR_XFORMS_CANT_REMOVE_TYPE ), *this );
 
         m_aRepository.erase( aTypePos );
     }


More information about the Libreoffice-commits mailing list