[Libreoffice-commits] core.git: formula/source include/formula sc/source

[Laurent Charrière]

 formula/source/core/resource/core_resource.src |    8 ++++----
 include/formula/compiler.hrc                   |    2 +-
 include/formula/opcode.hxx                     |    2 +-
 sc/source/ui/src/scfuncs.src                   |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ed20e81a886a13125a551ce24b6f9408d61e8e61
Author: Laurent Charrière <lcharriere at gmail.com>
Date:   Tue Jan 13 10:54:02 2015 +0100

    fd0#85818: rename SC_OPCODE_NBW to SC_OPCODE_NPV
    
    Change-Id: I1f7b51094acf0baf79160f65fdec67c9934930aa
    Reviewed-on: https://gerrit.libreoffice.org/13897
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 062b432..1e9c312 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -182,7 +182,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
     String SC_OPCODE_AVERAGE_A { Text = "AVERAGEA" ; };
     String SC_OPCODE_COUNT { Text = "COUNT" ; };
     String SC_OPCODE_COUNT_2 { Text = "COUNTA" ; };
-    String SC_OPCODE_NBW { Text = "NPV" ; };
+    String SC_OPCODE_NPV { Text = "NPV" ; };
     String SC_OPCODE_IRR { Text = "IRR" ; };
     String SC_OPCODE_MIRR { Text = "MIRR" ; };
     String SC_OPCODE_ISPMT { Text = "ISPMT" ; };
@@ -590,7 +590,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
     String SC_OPCODE_AVERAGE_A { Text = "AVERAGEA" ; };
     String SC_OPCODE_COUNT { Text = "COUNT" ; };
     String SC_OPCODE_COUNT_2 { Text = "COUNTA" ; };
-    String SC_OPCODE_NBW { Text = "NPV" ; };
+    String SC_OPCODE_NPV { Text = "NPV" ; };
     String SC_OPCODE_IRR { Text = "IRR" ; };
     String SC_OPCODE_MIRR { Text = "MIRR" ; };
     String SC_OPCODE_ISPMT { Text = "ISPMT" ; };
@@ -1000,7 +1000,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
     String SC_OPCODE_AVERAGE_A { Text = "AVERAGEA" ; };
     String SC_OPCODE_COUNT { Text = "COUNT" ; };
     String SC_OPCODE_COUNT_2 { Text = "COUNTA" ; };
-    String SC_OPCODE_NBW { Text = "NPV" ; };
+    String SC_OPCODE_NPV { Text = "NPV" ; };
     String SC_OPCODE_IRR { Text = "IRR" ; };
     String SC_OPCODE_MIRR { Text = "MIRR" ; };
     String SC_OPCODE_ISPMT { Text = "ISPMT" ; };
@@ -1814,7 +1814,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
     {
         Text [ en-US ] = "COUNTA" ;
     };
-    String SC_OPCODE_NBW
+    String SC_OPCODE_NPV
     {
         Text [ en-US ] = "NPV" ;
     };
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 7cd6653..2d2dd36 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -227,7 +227,7 @@
 #define SC_OPCODE_AVERAGE           226
 #define SC_OPCODE_COUNT             227
 #define SC_OPCODE_COUNT_2           228
-#define SC_OPCODE_NBW               229
+#define SC_OPCODE_NPV               229
 #define SC_OPCODE_IRR               230
 #define SC_OPCODE_VAR               231
 #define SC_OPCODE_VAR_P             232
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 43f2467..a282dae 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -220,7 +220,7 @@ enum OpCode : sal_uInt16
         ocAverage           = SC_OPCODE_AVERAGE,
         ocCount             = SC_OPCODE_COUNT,
         ocCount2            = SC_OPCODE_COUNT_2,
-        ocNPV               = SC_OPCODE_NBW,
+        ocNPV               = SC_OPCODE_NPV,
         ocIRR               = SC_OPCODE_IRR,
         ocMIRR              = SC_OPCODE_MIRR,
         ocISPMT             = SC_OPCODE_ISPMT,
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index b0c2182..2e5e960 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -2045,7 +2045,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         };
     };
      // -=*# Resource for function NPV #*=-
-    Resource SC_OPCODE_NBW
+    Resource SC_OPCODE_NPV
     {
         String 1 // Description
         {