summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2022-06-09 17:49:50 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2022-06-09 17:49:50 -0400
commit1dfbda6ba2992e65f9f3c77033f708acc5821168 (patch)
treeba772b636f49e93bab4e602ad1543857633715c3
parent58bc1b9cf16373edaa9c756b0a1bb3c7cdf03628 (diff)
downloadorcus-1dfbda6ba2992e65f9f3c77033f708acc5821168.tar.gz
Rename number_formatting_context to just number_format_context
-rw-r--r--slickedit/cpp.vpj4
-rw-r--r--src/liborcus/CMakeLists.txt2
-rw-r--r--src/liborcus/Makefile.am4
-rw-r--r--src/liborcus/odf_number_format_context.cpp (renamed from src/liborcus/odf_number_formatting_context.cpp)16
-rw-r--r--src/liborcus/odf_number_format_context.hpp (renamed from src/liborcus/odf_number_formatting_context.hpp)4
-rw-r--r--src/liborcus/odf_styles_context.hpp4
6 files changed, 17 insertions, 17 deletions
diff --git a/slickedit/cpp.vpj b/slickedit/cpp.vpj
index 1e494762..a1fe29cb 100644
--- a/slickedit/cpp.vpj
+++ b/slickedit/cpp.vpj
@@ -315,8 +315,8 @@
<F N="../src/liborcus/odf_namespace_types.hpp"/>
<F N="../src/liborcus/odf_namespace_types_cpp.inl"/>
<F N="../src/liborcus/odf_namespace_types_hpp.inl"/>
- <F N="../src/liborcus/odf_number_formatting_context.cpp"/>
- <F N="../src/liborcus/odf_number_formatting_context.hpp"/>
+ <F N="../src/liborcus/odf_number_format_context.cpp"/>
+ <F N="../src/liborcus/odf_number_format_context.hpp"/>
<F N="../src/liborcus/odf_para_context.cpp"/>
<F N="../src/liborcus/odf_para_context.hpp"/>
<F N="../src/liborcus/odf_styles.cpp"/>
diff --git a/src/liborcus/CMakeLists.txt b/src/liborcus/CMakeLists.txt
index 4e221ffd..aec49ddf 100644
--- a/src/liborcus/CMakeLists.txt
+++ b/src/liborcus/CMakeLists.txt
@@ -82,7 +82,7 @@ add_library(orcus-${ORCUS_API_VERSION} SHARED
odf_para_context.cpp
odf_styles.cpp
odf_styles_context.cpp
- odf_number_formatting_context.cpp
+ odf_number_format_context.cpp
odf_tokens.cpp
ods_content_xml_context.cpp
ods_content_xml_handler.cpp
diff --git a/src/liborcus/Makefile.am b/src/liborcus/Makefile.am
index df4d8e5c..ec794fd4 100644
--- a/src/liborcus/Makefile.am
+++ b/src/liborcus/Makefile.am
@@ -231,8 +231,8 @@ liborcus_@ORCUS_API_VERSION@_la_SOURCES += \
odf_styles.cpp \
odf_styles_context.hpp \
odf_styles_context.cpp \
- odf_number_formatting_context.hpp \
- odf_number_formatting_context.cpp \
+ odf_number_format_context.hpp \
+ odf_number_format_context.cpp \
odf_token_constants.hpp \
odf_token_constants.inl \
odf_tokens.hpp \
diff --git a/src/liborcus/odf_number_formatting_context.cpp b/src/liborcus/odf_number_format_context.cpp
index 5631734e..bc48ae2b 100644
--- a/src/liborcus/odf_number_formatting_context.cpp
+++ b/src/liborcus/odf_number_format_context.cpp
@@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "odf_number_formatting_context.hpp"
+#include "odf_number_format_context.hpp"
#include "odf_namespace_types.hpp"
#include "odf_token_constants.hpp"
#include "odf_helper.hpp"
@@ -390,22 +390,22 @@ public:
}
-number_formatting_context::number_formatting_context(
+number_format_context::number_format_context(
session_context& session_cxt, const tokens& tk, ss::iface::import_styles* iface_styles) :
xml_context_base(session_cxt, tk),
mp_styles(iface_styles)
{}
-xml_context_base* number_formatting_context::create_child_context(xmlns_id_t /*ns*/, xml_token_t /*name*/)
+xml_context_base* number_format_context::create_child_context(xmlns_id_t /*ns*/, xml_token_t /*name*/)
{
return nullptr;
}
-void number_formatting_context::end_child_context(xmlns_id_t /*ns*/, xml_token_t /*name*/, xml_context_base* /*child*/)
+void number_format_context::end_child_context(xmlns_id_t /*ns*/, xml_token_t /*name*/, xml_context_base* /*child*/)
{
}
-void number_formatting_context::start_element(xmlns_id_t ns, xml_token_t name, const std::vector<xml_token_attr_t>& attrs)
+void number_format_context::start_element(xmlns_id_t ns, xml_token_t name, const std::vector<xml_token_attr_t>& attrs)
{
xml_token_pair_t parent = push_stack(ns, name);
(void)parent;
@@ -709,7 +709,7 @@ void number_formatting_context::start_element(xmlns_id_t ns, xml_token_t name, c
}
}
-bool number_formatting_context::end_element(xmlns_id_t ns, xml_token_t name)
+bool number_format_context::end_element(xmlns_id_t ns, xml_token_t name)
{
if (!mp_styles)
return pop_stack(ns, name);
@@ -781,7 +781,7 @@ bool number_formatting_context::end_element(xmlns_id_t ns, xml_token_t name)
}
-void number_formatting_context::characters(std::string_view str, bool transient)
+void number_format_context::characters(std::string_view str, bool transient)
{
if (str != "\n")
{
@@ -792,7 +792,7 @@ void number_formatting_context::characters(std::string_view str, bool transient)
}
}
-void number_formatting_context::reset()
+void number_format_context::reset()
{
m_current_style = odf_number_format{};
}
diff --git a/src/liborcus/odf_number_formatting_context.hpp b/src/liborcus/odf_number_format_context.hpp
index 879f88d1..a0efbce8 100644
--- a/src/liborcus/odf_number_formatting_context.hpp
+++ b/src/liborcus/odf_number_format_context.hpp
@@ -24,10 +24,10 @@ namespace spreadsheet { namespace iface {
/**
* Context that handles <number:xyz> scope.
*/
-class number_formatting_context : public xml_context_base
+class number_format_context : public xml_context_base
{
public:
- number_formatting_context(
+ number_format_context(
session_context& session_cxt, const tokens& tk,
spreadsheet::iface::import_styles* iface_styles);
diff --git a/src/liborcus/odf_styles_context.hpp b/src/liborcus/odf_styles_context.hpp
index 5d50ccf7..09ea2b28 100644
--- a/src/liborcus/odf_styles_context.hpp
+++ b/src/liborcus/odf_styles_context.hpp
@@ -10,7 +10,7 @@
#include "xml_context_base.hpp"
#include "odf_styles.hpp"
-#include "odf_number_formatting_context.hpp"
+#include "odf_number_format_context.hpp"
#include <orcus/global.hpp>
@@ -53,7 +53,7 @@ private:
// an automatic style corresponds to a cell format and not a real style
bool m_automatic_styles;
- number_formatting_context m_cxt_number_format;
+ number_format_context m_cxt_number_format;
};
}