sc/Library_scfilt.mk | 1
sc/source/filter/inc/orcus_global.hxx | 42 +
sc/source/filter/inc/orcusinterface.hxx | 308 +++++-----
sc/source/filter/orcus/autofilter.cxx | 2
sc/source/filter/orcus/filterdetect.cxx | 44 -
sc/source/filter/orcus/global.cxx | 118 ++++
sc/source/filter/orcus/interface.cxx | 897 +++++++++++---------------------
sc/source/filter/orcus/xmlcontext.cxx | 95 +--
solenv/clang-format/excludelist | 4
9 files changed, 703 insertions(+), 808 deletions(-)
New commits:
commit bcd544aafc6ae3c3472f056cdb99a4cab6b74d82
Author: Kohei Yoshida <ko...@libreoffice.org>
AuthorDate: Fri Mar 7 23:08:40 2025 -0500
Commit: Kohei Yoshida <ko...@libreoffice.org>
CommitDate: Sat Mar 8 06:19:29 2025 +0100
Apply clang-format to other orcus-related files
Change-Id: If8bc8c79a797027f5e44e36590c36aa30f79c342
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182661
Reviewed-by: Kohei Yoshida <ko...@libreoffice.org>
Tested-by: Jenkins
diff --git a/sc/source/filter/inc/orcusinterface.hxx
b/sc/source/filter/inc/orcusinterface.hxx
index db277e046168..0b0c0c0be371 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -43,14 +43,17 @@ class ScOrcusFactory;
class ScOrcusImportFontStyle;
class ScOrcusSharedStrings;
class SfxItemSet;
-namespace com::sun::star::task { class XStatusIndicator; }
+namespace com::sun::star::task
+{
+class XStatusIndicator;
+}
class ScOrcusRefResolver : public
orcus::spreadsheet::iface::import_reference_resolver
{
const ScOrcusGlobalSettings& mrGlobalSettings;
public:
- ScOrcusRefResolver( const ScOrcusGlobalSettings& rGS );
+ ScOrcusRefResolver(const ScOrcusGlobalSettings& rGS);
orcus::spreadsheet::src_address_t resolve_address(std::string_view
address) override;
orcus::spreadsheet::src_range_t resolve_range(std::string_view range)
override;
@@ -66,7 +69,8 @@ class ScOrcusNamedExpression : public
orcus::spreadsheet::iface::import_named_ex
const SCTAB mnTab; //< negative if global, else >= 0 for sheet-local named
expressions.
public:
- ScOrcusNamedExpression( ScDocumentImport& rDoc, const
ScOrcusGlobalSettings& rGS, SCTAB nTab = -1 );
+ ScOrcusNamedExpression(ScDocumentImport& rDoc, const
ScOrcusGlobalSettings& rGS,
+ SCTAB nTab = -1);
void reset();
@@ -131,11 +135,9 @@ public:
void set_thickness(orcus::spreadsheet::underline_thickness_t e) override;
void set_spacing(orcus::spreadsheet::underline_spacing_t e) override;
void set_count(orcus::spreadsheet::underline_count_t e) override;
- void set_color(
- orcus::spreadsheet::color_elem_t alpha,
- orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
- orcus::spreadsheet::color_elem_t blue) override;
+ void set_color(orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
+ orcus::spreadsheet::color_elem_t green,
+ orcus::spreadsheet::color_elem_t blue) override;
void commit() override;
};
@@ -166,9 +168,9 @@ public:
virtual void set_segment_font_name(std::string_view s) override;
virtual void set_segment_font_size(double point) override;
virtual void set_segment_font_color(orcus::spreadsheet::color_elem_t alpha,
- orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
- orcus::spreadsheet::color_elem_t blue) override;
+ orcus::spreadsheet::color_elem_t red,
+ orcus::spreadsheet::color_elem_t green,
+ orcus::spreadsheet::color_elem_t blue)
override;
virtual orcus::spreadsheet::iface::import_underline* start_underline()
override;
virtual orcus::spreadsheet::iface::import_strikethrough*
start_strikethrough() override;
@@ -184,8 +186,10 @@ public:
ScOrcusConditionalFormat(SCTAB nTab, ScDocument& rDoc);
virtual ~ScOrcusConditionalFormat() override;
- virtual void set_color(orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
orcus::spreadsheet::color_elem_t blue) override;
+ virtual void set_color(orcus::spreadsheet::color_elem_t alpha,
+ orcus::spreadsheet::color_elem_t red,
+ orcus::spreadsheet::color_elem_t green,
+ orcus::spreadsheet::color_elem_t blue) override;
virtual void set_formula(std::string_view formula) override;
@@ -201,11 +205,15 @@ public:
virtual void set_databar_axis(orcus::spreadsheet::databar_axis_t axis)
override;
- virtual void set_databar_color_positive(orcus::spreadsheet::color_elem_t
alpha, orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
orcus::spreadsheet::color_elem_t blue) override;
+ virtual void set_databar_color_positive(orcus::spreadsheet::color_elem_t
alpha,
+ orcus::spreadsheet::color_elem_t
red,
+ orcus::spreadsheet::color_elem_t
green,
+ orcus::spreadsheet::color_elem_t
blue) override;
- virtual void set_databar_color_negative(orcus::spreadsheet::color_elem_t
alpha, orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
orcus::spreadsheet::color_elem_t blue) override;
+ virtual void set_databar_color_negative(orcus::spreadsheet::color_elem_t
alpha,
+ orcus::spreadsheet::color_elem_t
red,
+ orcus::spreadsheet::color_elem_t
green,
+ orcus::spreadsheet::color_elem_t
blue) override;
virtual void set_min_databar_length(double length) override;
@@ -226,12 +234,12 @@ public:
virtual void set_range(std::string_view range) override;
virtual void set_range(orcus::spreadsheet::row_t row_start,
orcus::spreadsheet::col_t col_start,
- orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t
col_end) override;
+ orcus::spreadsheet::row_t row_end,
+ orcus::spreadsheet::col_t col_end) override;
virtual void commit_format() override;
private:
-
SCTAB mnTab;
ScDocument& mrDoc;
@@ -244,31 +252,35 @@ class ScOrcusSheetProperties : public
orcus::spreadsheet::iface::import_sheet_pr
{
ScDocumentImport& mrDoc;
SCTAB mnTab;
+
public:
ScOrcusSheetProperties(SCTAB nTab, ScDocumentImport& rDoc);
virtual ~ScOrcusSheetProperties() override;
- virtual void set_column_width(
- orcus::spreadsheet::col_t col, orcus::spreadsheet::col_t col_span,
- double width, orcus::length_unit_t unit) override;
+ virtual void set_column_width(orcus::spreadsheet::col_t col,
orcus::spreadsheet::col_t col_span,
+ double width, orcus::length_unit_t unit)
override;
- virtual void set_column_hidden(
- orcus::spreadsheet::col_t col, orcus::spreadsheet::col_t col_span,
- bool hidden) override;
+ virtual void set_column_hidden(orcus::spreadsheet::col_t col,
+ orcus::spreadsheet::col_t col_span, bool
hidden) override;
- virtual void set_row_height(
- orcus::spreadsheet::row_t row, orcus::spreadsheet::row_t row_span,
- double height, orcus::length_unit_t unit) override;
+ virtual void set_row_height(orcus::spreadsheet::row_t row,
orcus::spreadsheet::row_t row_span,
+ double height, orcus::length_unit_t unit)
override;
- virtual void set_row_hidden(
- orcus::spreadsheet::row_t row, orcus::spreadsheet::row_t row_span,
bool hidden) override;
+ virtual void set_row_hidden(orcus::spreadsheet::row_t row,
orcus::spreadsheet::row_t row_span,
+ bool hidden) override;
virtual void set_merge_cell_range(const orcus::spreadsheet::range_t&
range) override;
};
class ScOrcusFormula : public orcus::spreadsheet::iface::import_formula
{
- enum class ResultType { NotSet, String, Value, Empty };
+ enum class ResultType
+ {
+ NotSet,
+ String,
+ Value,
+ Empty
+ };
friend class ScOrcusSheet;
@@ -288,11 +300,13 @@ class ScOrcusFormula : public
orcus::spreadsheet::iface::import_formula
void reset();
public:
- ScOrcusFormula( ScOrcusSheet& rSheet );
+ ScOrcusFormula(ScOrcusSheet& rSheet);
virtual ~ScOrcusFormula() override;
- virtual void set_position(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col) override;
- virtual void set_formula(orcus::spreadsheet::formula_grammar_t grammar,
std::string_view formula) override;
+ virtual void set_position(orcus::spreadsheet::row_t row,
+ orcus::spreadsheet::col_t col) override;
+ virtual void set_formula(orcus::spreadsheet::formula_grammar_t grammar,
+ std::string_view formula) override;
virtual void set_shared_formula_index(size_t index) override;
virtual void set_result_value(double value) override;
virtual void set_result_string(std::string_view value) override;
@@ -317,15 +331,20 @@ class ScOrcusArrayFormula : public
orcus::spreadsheet::iface::import_array_formu
void reset();
public:
- ScOrcusArrayFormula( ScOrcusSheet& rSheet );
+ ScOrcusArrayFormula(ScOrcusSheet& rSheet);
virtual ~ScOrcusArrayFormula() override;
virtual void set_range(const orcus::spreadsheet::range_t& range) override;
- virtual void set_formula(orcus::spreadsheet::formula_grammar_t grammar,
std::string_view formula) override;
- virtual void set_result_value(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col, double value) override;
- virtual void set_result_string(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col, std::string_view value) override;
- virtual void set_result_empty(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col) override;
- virtual void set_result_bool(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col, bool value) override;
+ virtual void set_formula(orcus::spreadsheet::formula_grammar_t grammar,
+ std::string_view formula) override;
+ virtual void set_result_value(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ double value) override;
+ virtual void set_result_string(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ std::string_view value) override;
+ virtual void set_result_empty(orcus::spreadsheet::row_t row,
+ orcus::spreadsheet::col_t col) override;
+ virtual void set_result_bool(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ bool value) override;
virtual void commit() override;
};
@@ -354,7 +373,8 @@ class ScOrcusSheet : public
orcus::spreadsheet::iface::import_sheet
ScDocumentImport& getDoc();
public:
- ScOrcusSheet(ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS,
SCTAB nTab, ScOrcusFactory& rFactory);
+ ScOrcusSheet(ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS,
SCTAB nTab,
+ ScOrcusFactory& rFactory);
virtual orcus::spreadsheet::iface::import_sheet_properties*
get_sheet_properties() override;
virtual orcus::spreadsheet::iface::import_conditional_format*
get_conditional_format() override;
@@ -363,26 +383,35 @@ public:
virtual orcus::spreadsheet::iface::import_array_formula*
get_array_formula() override;
// Orcus import interface
- virtual void set_auto(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col, std::string_view value) override;
- virtual void set_string(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col, orcus::spreadsheet::string_id_t sindex) override;
- virtual void set_value(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col, double value) override;
- virtual void set_bool(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col, bool value) override;
- virtual void set_date_time(
- orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int
year, int month, int day, int hour, int minute, double second) override;
-
- virtual void set_format(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col, size_t xf_index) override;
- virtual void set_format(orcus::spreadsheet::row_t row_start,
orcus::spreadsheet::col_t col_start,
- orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t
col_end, size_t xf_index) override;
- virtual void set_column_format(
- orcus::spreadsheet::col_t col, orcus::spreadsheet::col_t col_span,
std::size_t xf_index) override;
+ virtual void set_auto(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ std::string_view value) override;
+ virtual void set_string(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ orcus::spreadsheet::string_id_t sindex) override;
+ virtual void set_value(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ double value) override;
+ virtual void set_bool(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ bool value) override;
+ virtual void set_date_time(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ int year, int month, int day, int hour, int
minute,
+ double second) override;
+
+ virtual void set_format(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ size_t xf_index) override;
+ virtual void set_format(orcus::spreadsheet::row_t row_start,
+ orcus::spreadsheet::col_t col_start,
orcus::spreadsheet::row_t row_end,
+ orcus::spreadsheet::col_t col_end, size_t
xf_index) override;
+ virtual void set_column_format(orcus::spreadsheet::col_t col,
+ orcus::spreadsheet::col_t col_span,
+ std::size_t xf_index) override;
virtual void set_row_format(orcus::spreadsheet::row_t row, std::size_t
xf_index) override;
virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
- virtual void fill_down_cells(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col, orcus::spreadsheet::row_t range_size) override;
+ virtual void fill_down_cells(orcus::spreadsheet::row_t row,
orcus::spreadsheet::col_t col,
+ orcus::spreadsheet::row_t range_size)
override;
virtual orcus::spreadsheet::iface::import_auto_filter*
- start_auto_filter(const orcus::spreadsheet::range_t& range) override;
+ start_auto_filter(const orcus::spreadsheet::range_t& range) override;
SCTAB getIndex() const { return mnTab; }
@@ -410,7 +439,7 @@ struct ScOrcusFont
std::optional<Color> maUnderlineColor;
std::optional<FontStrikeout> meStrikeout;
- void applyToItemSet( SfxItemSet& rSet ) const;
+ void applyToItemSet(SfxItemSet& rSet) const;
};
struct ScOrcusFill
@@ -419,7 +448,7 @@ struct ScOrcusFill
std::optional<Color> maFgColor;
std::optional<Color> maBgColor; // currently not used.
- void applyToItemSet( SfxItemSet& rSet ) const;
+ void applyToItemSet(SfxItemSet& rSet) const;
};
struct ScOrcusBorder
@@ -433,7 +462,7 @@ struct ScOrcusBorder
std::map<orcus::spreadsheet::border_direction_t, BorderLine> maBorders;
- void applyToItemSet( SfxItemSet& rSet ) const;
+ void applyToItemSet(SfxItemSet& rSet) const;
};
struct ScOrcusProtection
@@ -443,14 +472,14 @@ struct ScOrcusProtection
std::optional<bool> mbPrintContent;
std::optional<bool> mbFormulaHidden;
- void applyToItemSet( SfxItemSet& rSet ) const;
+ void applyToItemSet(SfxItemSet& rSet) const;
};
struct ScOrcusNumberFormat
{
std::optional<OUString> maCode;
- void applyToItemSet( SfxItemSet& rSet, const ScDocument& rDoc ) const;
+ void applyToItemSet(SfxItemSet& rSet, const ScDocument& rDoc) const;
};
struct ScOrcusXf
@@ -500,11 +529,9 @@ public:
void set_thickness(orcus::spreadsheet::underline_thickness_t e) override;
void set_spacing(orcus::spreadsheet::underline_spacing_t e) override;
void set_count(orcus::spreadsheet::underline_count_t e) override;
- void set_color(
- orcus::spreadsheet::color_elem_t alpha,
- orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
- orcus::spreadsheet::color_elem_t blue) override;
+ void set_color(orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
+ orcus::spreadsheet::color_elem_t green,
+ orcus::spreadsheet::color_elem_t blue) override;
void commit() override;
};
@@ -535,7 +562,7 @@ class ScOrcusImportFontStyle : public
orcus::spreadsheet::iface::import_font_sty
ScOrcusImportFontStrikethroughStyle maStrikeoutImport;
public:
- ScOrcusImportFontStyle( ScOrcusFactory& rFactory,
std::vector<ScOrcusFont>& rFonts );
+ ScOrcusImportFontStyle(ScOrcusFactory& rFactory, std::vector<ScOrcusFont>&
rFonts);
void reset();
@@ -552,11 +579,9 @@ public:
void set_size_asian(double point) override;
void set_size_complex(double point) override;
- void set_color(
- orcus::spreadsheet::color_elem_t alpha,
- orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
- orcus::spreadsheet::color_elem_t blue) override;
+ void set_color(orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
+ orcus::spreadsheet::color_elem_t green,
+ orcus::spreadsheet::color_elem_t blue) override;
orcus::spreadsheet::iface::import_underline* start_underline() override;
orcus::spreadsheet::iface::import_strikethrough* start_strikethrough()
override;
@@ -570,21 +595,17 @@ class ScOrcusImportFillStyle : public
orcus::spreadsheet::iface::import_fill_sty
std::vector<ScOrcusFill>& mrFills;
public:
- ScOrcusImportFillStyle( std::vector<ScOrcusFill>& rFills );
+ ScOrcusImportFillStyle(std::vector<ScOrcusFill>& rFills);
void reset();
void set_pattern_type(orcus::spreadsheet::fill_pattern_t fp) override;
- void set_fg_color(
- orcus::spreadsheet::color_elem_t alpha,
- orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
- orcus::spreadsheet::color_elem_t blue) override;
- void set_bg_color(
- orcus::spreadsheet::color_elem_t alpha,
- orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
- orcus::spreadsheet::color_elem_t blue) override;
+ void set_fg_color(orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
+ orcus::spreadsheet::color_elem_t green,
+ orcus::spreadsheet::color_elem_t blue) override;
+ void set_bg_color(orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
+ orcus::spreadsheet::color_elem_t green,
+ orcus::spreadsheet::color_elem_t blue) override;
std::size_t commit() override;
};
@@ -594,20 +615,18 @@ class ScOrcusImportBorderStyle : public
orcus::spreadsheet::iface::import_border
std::vector<ScOrcusBorder>& mrBorders;
public:
- ScOrcusImportBorderStyle( std::vector<ScOrcusBorder>& rBorders );
+ ScOrcusImportBorderStyle(std::vector<ScOrcusBorder>& rBorders);
void reset();
- void set_width(
- orcus::spreadsheet::border_direction_t dir, double width,
orcus::length_unit_t unit) override;
- void set_style(
- orcus::spreadsheet::border_direction_t dir,
orcus::spreadsheet::border_style_t style) override;
- void set_color(
- orcus::spreadsheet::border_direction_t dir,
- orcus::spreadsheet::color_elem_t alpha,
- orcus::spreadsheet::color_elem_t red,
- orcus::spreadsheet::color_elem_t green,
- orcus::spreadsheet::color_elem_t blue) override;
+ void set_width(orcus::spreadsheet::border_direction_t dir, double width,
+ orcus::length_unit_t unit) override;
+ void set_style(orcus::spreadsheet::border_direction_t dir,
+ orcus::spreadsheet::border_style_t style) override;
+ void set_color(orcus::spreadsheet::border_direction_t dir,
+ orcus::spreadsheet::color_elem_t alpha,
orcus::spreadsheet::color_elem_t red,
+ orcus::spreadsheet::color_elem_t green,
+ orcus::spreadsheet::color_elem_t blue) override;
std::size_t commit() override;
};
@@ -617,7 +636,7 @@ class ScOrcusImportCellProtection : public
orcus::spreadsheet::iface::import_cel
std::vector<ScOrcusProtection>& mrProtections;
public:
- ScOrcusImportCellProtection( std::vector<ScOrcusProtection>& rProtections
);
+ ScOrcusImportCellProtection(std::vector<ScOrcusProtection>& rProtections);
void reset();
@@ -635,7 +654,7 @@ class ScOrcusImportNumberFormat : public
orcus::spreadsheet::iface::import_numbe
std::vector<ScOrcusNumberFormat>& mrNumberFormats;
public:
- ScOrcusImportNumberFormat( ScOrcusFactory& rFactory,
std::vector<ScOrcusNumberFormat>& rFormats );
+ ScOrcusImportNumberFormat(ScOrcusFactory& rFactory,
std::vector<ScOrcusNumberFormat>& rFormats);
void reset();
@@ -652,8 +671,8 @@ class ScOrucsImportCellStyle : public
orcus::spreadsheet::iface::import_cell_sty
const std::vector<ScOrcusXf>& mrXfs;
public:
- ScOrucsImportCellStyle(
- ScOrcusFactory& rFactory, ScOrcusStyles& rStyles, const
std::vector<ScOrcusXf>& rXfs );
+ ScOrucsImportCellStyle(ScOrcusFactory& rFactory, ScOrcusStyles& rStyles,
+ const std::vector<ScOrcusXf>& rXfs);
void reset();
@@ -671,7 +690,7 @@ class ScOrcusImportXf : public
orcus::spreadsheet::iface::import_xf
std::vector<ScOrcusXf>* mpXfs = nullptr;
public:
- void reset( std::vector<ScOrcusXf>& rXfs );
+ void reset(std::vector<ScOrcusXf>& rXfs);
void set_font(std::size_t index) override;
void set_fill(std::size_t index) override;
@@ -710,17 +729,18 @@ private:
ScOrcusImportXf maXf;
public:
- ScOrcusStyles( ScOrcusFactory& rFactory, bool bSkipDefaultStyles=false );
+ ScOrcusStyles(ScOrcusFactory& rFactory, bool bSkipDefaultStyles = false);
- void applyXfToItemSet( SfxItemSet& rSet, const ScOrcusXf& rXf );
- void applyXfToItemSet( SfxItemSet& rSet, std::size_t xfId );
+ void applyXfToItemSet(SfxItemSet& rSet, const ScOrcusXf& rXf);
+ void applyXfToItemSet(SfxItemSet& rSet, std::size_t xfId);
virtual orcus::spreadsheet::iface::import_font_style* start_font_style()
override;
virtual orcus::spreadsheet::iface::import_fill_style* start_fill_style()
override;
virtual orcus::spreadsheet::iface::import_border_style*
start_border_style() override;
virtual orcus::spreadsheet::iface::import_cell_protection*
start_cell_protection() override;
virtual orcus::spreadsheet::iface::import_number_format*
start_number_format() override;
- virtual orcus::spreadsheet::iface::import_xf*
start_xf(orcus::spreadsheet::xf_category_t cat) override;
+ virtual orcus::spreadsheet::iface::import_xf*
+ start_xf(orcus::spreadsheet::xf_category_t cat) override;
virtual orcus::spreadsheet::iface::import_cell_style* start_cell_style()
override;
virtual void set_font_count(size_t n) override;
@@ -748,7 +768,6 @@ class ScOrcusFactory : public
orcus::spreadsheet::iface::import_factory
FillDownCells
};
-
OUString maStr1;
OUString maStr2;
double mfValue;
@@ -760,10 +779,11 @@ class ScOrcusFactory : public
orcus::spreadsheet::iface::import_factory
uint32_t mnIndex2;
formula::FormulaGrammar::Grammar meGrammar;
- CellStoreToken( const ScAddress& rPos, Type eType );
- CellStoreToken( const ScAddress& rPos, double fValue );
- CellStoreToken( const ScAddress& rPos, uint32_t nIndex );
- CellStoreToken( const ScAddress& rPos, OUString aFormula,
formula::FormulaGrammar::Grammar eGrammar );
+ CellStoreToken(const ScAddress& rPos, Type eType);
+ CellStoreToken(const ScAddress& rPos, double fValue);
+ CellStoreToken(const ScAddress& rPos, uint32_t nIndex);
+ CellStoreToken(const ScAddress& rPos, OUString aFormula,
+ formula::FormulaGrammar::Grammar eGrammar);
};
using StringValueType = std::variant<OUString,
std::unique_ptr<EditTextObject>>;
@@ -788,18 +808,20 @@ class ScOrcusFactory : public
orcus::spreadsheet::iface::import_factory
css::uno::Reference<css::task::XStatusIndicator> mxStatusIndicator;
public:
- ScOrcusFactory(ScDocument& rDoc, bool bSkipDefaultStyles=false);
-
- virtual orcus::spreadsheet::iface::import_sheet* append_sheet(
- orcus::spreadsheet::sheet_t sheet_index, std::string_view sheet_name)
override;
- virtual orcus::spreadsheet::iface::import_sheet*
get_sheet(std::string_view sheet_name) override;
- virtual orcus::spreadsheet::iface::import_sheet*
get_sheet(orcus::spreadsheet::sheet_t sheet_index) override;
+ ScOrcusFactory(ScDocument& rDoc, bool bSkipDefaultStyles = false);
+
+ virtual orcus::spreadsheet::iface::import_sheet*
+ append_sheet(orcus::spreadsheet::sheet_t sheet_index, std::string_view
sheet_name) override;
+ virtual orcus::spreadsheet::iface::import_sheet*
+ get_sheet(std::string_view sheet_name) override;
+ virtual orcus::spreadsheet::iface::import_sheet*
+ get_sheet(orcus::spreadsheet::sheet_t sheet_index) override;
virtual orcus::spreadsheet::iface::import_global_settings*
get_global_settings() override;
virtual orcus::spreadsheet::iface::import_shared_strings*
get_shared_strings() override;
virtual orcus::spreadsheet::iface::import_named_expression*
get_named_expression() override;
virtual orcus::spreadsheet::iface::import_styles* get_styles() override;
- virtual orcus::spreadsheet::iface::import_reference_resolver*
get_reference_resolver(
- orcus::spreadsheet::formula_ref_context_t cxt) override;
+ virtual orcus::spreadsheet::iface::import_reference_resolver*
+ get_reference_resolver(orcus::spreadsheet::formula_ref_context_t cxt)
override;
virtual void finalize() override;
ScDocumentImport& getDoc();
@@ -810,20 +832,20 @@ public:
const OUString* getString(size_t nIndex) const;
- void pushCellStoreAutoToken( const ScAddress& rPos, const OUString& rVal );
- void pushCellStoreToken( const ScAddress& rPos, uint32_t nStrIndex );
- void pushCellStoreToken( const ScAddress& rPos, double fValue );
- void pushCellStoreToken(
- const ScAddress& rPos, const OUString& rFormula,
formula::FormulaGrammar::Grammar eGrammar );
- void pushFillDownCellsToken( const ScAddress& rPos, uint32_t nFillSize );
+ void pushCellStoreAutoToken(const ScAddress& rPos, const OUString& rVal);
+ void pushCellStoreToken(const ScAddress& rPos, uint32_t nStrIndex);
+ void pushCellStoreToken(const ScAddress& rPos, double fValue);
+ void pushCellStoreToken(const ScAddress& rPos, const OUString& rFormula,
+ formula::FormulaGrammar::Grammar eGrammar);
+ void pushFillDownCellsToken(const ScAddress& rPos, uint32_t nFillSize);
- void pushSharedFormulaToken( const ScAddress& rPos, uint32_t nIndex );
- void pushMatrixFormulaToken(
- const ScAddress& rPos, const OUString& rFormula,
formula::FormulaGrammar::Grammar eGrammar,
- uint32_t nRowRange, uint32_t nColRange );
+ void pushSharedFormulaToken(const ScAddress& rPos, uint32_t nIndex);
+ void pushMatrixFormulaToken(const ScAddress& rPos, const OUString&
rFormula,
+ formula::FormulaGrammar::Grammar eGrammar,
uint32_t nRowRange,
+ uint32_t nColRange);
- void pushFormulaResult( const ScAddress& rPos, double fValue );
- void pushFormulaResult( const ScAddress& rPos, const OUString& rValue );
+ void pushFormulaResult(const ScAddress& rPos, double fValue);
+ void pushFormulaResult(const ScAddress& rPos, const OUString& rValue);
void incrementProgress();
diff --git a/sc/source/filter/orcus/filterdetect.cxx
b/sc/source/filter/orcus/filterdetect.cxx
index 0b11bf2dff3e..6d04089e7ee3 100644
--- a/sc/source/filter/orcus/filterdetect.cxx
+++ b/sc/source/filter/orcus/filterdetect.cxx
@@ -19,32 +19,32 @@
#include <orcus/format_detection.hpp>
-namespace com::sun::star::uno { class XComponentContext; }
-
-namespace {
+namespace com::sun::star::uno
+{
+class XComponentContext;
+}
-class OrcusFormatDetect : public ::cppu::WeakImplHelper<
- css::document::XExtendedFilterDetection,
- css::lang::XServiceInfo >
+namespace
+{
+class OrcusFormatDetect : public
::cppu::WeakImplHelper<css::document::XExtendedFilterDetection,
+
css::lang::XServiceInfo>
{
public:
- explicit OrcusFormatDetect();
+ explicit OrcusFormatDetect();
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName)
override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
virtual OUString SAL_CALL
- detect( css::uno::Sequence< css::beans::PropertyValue
>& rMediaDescSeq ) override;
+ detect(css::uno::Sequence<css::beans::PropertyValue>& rMediaDescSeq)
override;
private:
};
-OrcusFormatDetect::OrcusFormatDetect()
-{
-}
+OrcusFormatDetect::OrcusFormatDetect() {}
OUString OrcusFormatDetect::getImplementationName()
{
@@ -58,23 +58,25 @@ sal_Bool OrcusFormatDetect::supportsService(const OUString&
rServiceName)
css::uno::Sequence<OUString> OrcusFormatDetect::getSupportedServiceNames()
{
- return {u"com.sun.star.frame.ExtendedTypeDetection"_ustr};
+ return { u"com.sun.star.frame.ExtendedTypeDetection"_ustr };
}
OUString
OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue>&
rMediaDescSeq)
{
- utl::MediaDescriptor aMediaDescriptor( rMediaDescSeq );
- bool bAborted =
aMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ABORTED,
false);
+ utl::MediaDescriptor aMediaDescriptor(rMediaDescSeq);
+ bool bAborted
+ =
aMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ABORTED,
false);
if (bAborted)
return OUString();
- css::uno::Reference<css::io::XInputStream>
xInputStream(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM],
css::uno::UNO_QUERY );
+ css::uno::Reference<css::io::XInputStream> xInputStream(
+ aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM],
css::uno::UNO_QUERY);
SvMemoryStream aContent(xInputStream->available());
static const sal_Int32 nBytes = 4096;
css::uno::Sequence<sal_Int8> aSeq(nBytes);
bool bEnd = false;
- while(!bEnd)
+ while (!bEnd)
{
sal_Int32 nReadBytes = xInputStream->readBytes(aSeq, nBytes);
bEnd = (nReadBytes != nBytes);
@@ -92,18 +94,16 @@ OUString
OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue>
return u"calc_MS_Excel_2003_XML"_ustr;
case orcus::format_t::parquet:
return u"Apache Parquet"_ustr;
- default:
- ;
+ default:;
}
return OUString();
}
-
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
-com_sun_star_comp_sc_OrcusFormatDetect_get_implementation(css::uno::XComponentContext*
,
-
css::uno::Sequence<css::uno::Any> const &)
+com_sun_star_comp_sc_OrcusFormatDetect_get_implementation(css::uno::XComponentContext*,
+
css::uno::Sequence<css::uno::Any> const&)
{
return cppu::acquire(new OrcusFormatDetect());
}
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index f655f8b53175..3c5a7da94620 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -62,8 +62,10 @@ using namespace com::sun::star;
namespace os = orcus::spreadsheet;
-ScOrcusRefResolver::ScOrcusRefResolver( const ScOrcusGlobalSettings& rGS ) :
- mrGlobalSettings(rGS) {}
+ScOrcusRefResolver::ScOrcusRefResolver(const ScOrcusGlobalSettings& rGS)
+ : mrGlobalSettings(rGS)
+{
+}
os::src_address_t ScOrcusRefResolver::resolve_address(std::string_view address)
{
@@ -71,8 +73,7 @@ os::src_address_t
ScOrcusRefResolver::resolve_address(std::string_view address)
ScAddress aAddr;
aAddr.Parse(aStr, mrGlobalSettings.getDoc().getDoc(),
- formula::FormulaGrammar::extractRefConvention(
- mrGlobalSettings.getCalcGrammar()));
+
formula::FormulaGrammar::extractRefConvention(mrGlobalSettings.getCalcGrammar()));
if (!aAddr.IsValid())
{
@@ -95,8 +96,7 @@ os::src_range_t
ScOrcusRefResolver::resolve_range(std::string_view range)
ScRange aRange;
aRange.Parse(aStr, mrGlobalSettings.getDoc().getDoc(),
- formula::FormulaGrammar::extractRefConvention(
- mrGlobalSettings.getCalcGrammar()));
+
formula::FormulaGrammar::extractRefConvention(mrGlobalSettings.getCalcGrammar()));
if (!aRange.IsValid())
{
@@ -106,19 +106,23 @@ os::src_range_t
ScOrcusRefResolver::resolve_range(std::string_view range)
}
os::src_range_t ret;
- ret.first.sheet = aRange.aStart.Tab();
+ ret.first.sheet = aRange.aStart.Tab();
ret.first.column = aRange.aStart.Col();
- ret.first.row = aRange.aStart.Row();
- ret.last.sheet = aRange.aEnd.Tab();
- ret.last.column = aRange.aEnd.Col();
- ret.last.row = aRange.aEnd.Row();
+ ret.first.row = aRange.aStart.Row();
+ ret.last.sheet = aRange.aEnd.Tab();
+ ret.last.column = aRange.aEnd.Col();
+ ret.last.row = aRange.aEnd.Row();
return ret;
}
-ScOrcusNamedExpression::ScOrcusNamedExpression(
- ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS, SCTAB nTab ) :
- mrDoc(rDoc), mrGlobalSettings(rGS), mnTab(nTab) {}
+ScOrcusNamedExpression::ScOrcusNamedExpression(ScDocumentImport& rDoc,
+ const ScOrcusGlobalSettings&
rGS, SCTAB nTab)
+ : mrDoc(rDoc)
+ , mrGlobalSettings(rGS)
+ , mnTab(nTab)
+{
+}
void ScOrcusNamedExpression::reset()
{
@@ -136,7 +140,8 @@ void ScOrcusNamedExpression::set_base_position(const
orcus::spreadsheet::src_add
maBasePos.SetRow(pos.row);
}
-void ScOrcusNamedExpression::set_named_expression(std::string_view name,
std::string_view expression)
+void ScOrcusNamedExpression::set_named_expression(std::string_view name,
+ std::string_view expression)
{
maName = OUString(name.data(), name.size(),
mrGlobalSettings.getTextEncoding());
maExpr = OUString(expression.data(), expression.size(),
mrGlobalSettings.getTextEncoding());
@@ -149,13 +154,14 @@ void
ScOrcusNamedExpression::set_named_range(std::string_view /*name*/, std::str
void ScOrcusNamedExpression::commit()
{
- ScRangeName* pNames = mnTab >= 0 ? mrDoc.getDoc().GetRangeName(mnTab) :
mrDoc.getDoc().GetRangeName();
+ ScRangeName* pNames
+ = mnTab >= 0 ? mrDoc.getDoc().GetRangeName(mnTab) :
mrDoc.getDoc().GetRangeName();
if (!pNames)
return;
- ScRangeData* pRange = new ScRangeData(
- mrDoc.getDoc(), maName, maExpr, maBasePos, ScRangeData::Type::Name,
- mrGlobalSettings.getCalcGrammar());
+ ScRangeData* pRange
+ = new ScRangeData(mrDoc.getDoc(), maName, maExpr, maBasePos,
ScRangeData::Type::Name,
+ mrGlobalSettings.getCalcGrammar());
pNames->insert(pRange, false);
@@ -193,7 +199,7 @@ ScOrcusFactory::CellStoreToken::CellStoreToken(const
ScAddress& rPos, uint32_t n
}
ScOrcusFactory::CellStoreToken::CellStoreToken(const ScAddress& rPos, OUString
aFormula,
- formula::FormulaGrammar::Grammar eGrammar)
+
formula::FormulaGrammar::Grammar eGrammar)
: maStr1(std::move(aFormula))
, mfValue(std::numeric_limits<double>::quiet_NaN())
, maPos(rPos)
@@ -204,17 +210,19 @@ ScOrcusFactory::CellStoreToken::CellStoreToken(const
ScAddress& rPos, OUString a
{
}
-ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc, bool bSkipDefaultStyles) :
- maDoc(rDoc),
- maGlobalSettings(maDoc),
- maRefResolver(maGlobalSettings),
- maSharedStrings(*this),
- maNamedExpressions(maDoc, maGlobalSettings),
- maStyles(*this, bSkipDefaultStyles),
- mnProgress(0) {}
+ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc, bool bSkipDefaultStyles)
+ : maDoc(rDoc)
+ , maGlobalSettings(maDoc)
+ , maRefResolver(maGlobalSettings)
+ , maSharedStrings(*this)
+ , maNamedExpressions(maDoc, maGlobalSettings)
+ , maStyles(*this, bSkipDefaultStyles)
+ , mnProgress(0)
+{
+}
-orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
- orcus::spreadsheet::sheet_t sheet_index, std::string_view sheet_name)
+orcus::spreadsheet::iface::import_sheet*
+ScOrcusFactory::append_sheet(orcus::spreadsheet::sheet_t sheet_index,
std::string_view sheet_name)
{
OUString aTabName(sheet_name.data(), sheet_name.size(),
maGlobalSettings.getTextEncoding());
@@ -235,19 +243,22 @@ orcus::spreadsheet::iface::import_sheet*
ScOrcusFactory::append_sheet(
return maSheets.back().get();
}
-namespace {
-
+namespace
+{
class FindSheetByIndex
{
SCTAB mnTab;
+
public:
- explicit FindSheetByIndex(SCTAB nTab) : mnTab(nTab) {}
- bool operator() (const std::unique_ptr<ScOrcusSheet>& rSheet) const
+ explicit FindSheetByIndex(SCTAB nTab)
+ : mnTab(nTab)
+ {
+ }
+ bool operator()(const std::unique_ptr<ScOrcusSheet>& rSheet) const
{
return rSheet->getIndex() == mnTab;
}
};
-
}
orcus::spreadsheet::iface::import_sheet*
ScOrcusFactory::get_sheet(std::string_view sheet_name)
@@ -259,8 +270,8 @@ orcus::spreadsheet::iface::import_sheet*
ScOrcusFactory::get_sheet(std::string_v
return nullptr;
// See if we already have an orcus sheet instance by that index.
- std::vector< std::unique_ptr<ScOrcusSheet> >::iterator it =
- std::find_if(maSheets.begin(), maSheets.end(), FindSheetByIndex(nTab));
+ std::vector<std::unique_ptr<ScOrcusSheet>>::iterator it
+ = std::find_if(maSheets.begin(), maSheets.end(),
FindSheetByIndex(nTab));
if (it != maSheets.end())
// We already have one. Return it.
@@ -271,12 +282,13 @@ orcus::spreadsheet::iface::import_sheet*
ScOrcusFactory::get_sheet(std::string_v
return maSheets.back().get();
}
-orcus::spreadsheet::iface::import_sheet*
ScOrcusFactory::get_sheet(orcus::spreadsheet::sheet_t sheet_index)
+orcus::spreadsheet::iface::import_sheet*
+ScOrcusFactory::get_sheet(orcus::spreadsheet::sheet_t sheet_index)
{
SCTAB nTab = static_cast<SCTAB>(sheet_index);
// See if we already have an orcus sheet instance by that index.
- std::vector< std::unique_ptr<ScOrcusSheet> >::iterator it =
- std::find_if(maSheets.begin(), maSheets.end(), FindSheetByIndex(nTab));
+ std::vector<std::unique_ptr<ScOrcusSheet>>::iterator it
+ = std::find_if(maSheets.begin(), maSheets.end(),
FindSheetByIndex(nTab));
if (it != maSheets.end())
// We already have one. Return it.
@@ -302,12 +314,10 @@ orcus::spreadsheet::iface::import_named_expression*
ScOrcusFactory::get_named_ex
return &maNamedExpressions;
}
-orcus::spreadsheet::iface::import_styles* ScOrcusFactory::get_styles()
-{
- return &maStyles;
-}
+orcus::spreadsheet::iface::import_styles* ScOrcusFactory::get_styles() {
return &maStyles; }
-os::iface::import_reference_resolver*
ScOrcusFactory::get_reference_resolver(os::formula_ref_context_t cxt)
+os::iface::import_reference_resolver*
+ScOrcusFactory::get_reference_resolver(os::formula_ref_context_t cxt)
{
switch (cxt)
{
@@ -324,8 +334,7 @@ os::iface::import_reference_resolver*
ScOrcusFactory::get_reference_resolver(os:
void ScOrcusFactory::finalize()
{
- auto toFormulaCell = [this]( const CellStoreToken& rToken ) ->
std::unique_ptr<ScFormulaCell>
- {
+ auto toFormulaCell = [this](const CellStoreToken& rToken) ->
std::unique_ptr<ScFormulaCell> {
const ScOrcusSheet& rSheet = *maSheets.at(rToken.maPos.Tab());
const sc::SharedFormulaGroups& rSFG = rSheet.getSharedFormulaGroups();
const ScTokenArray* pArray = rSFG.get(rToken.mnIndex1);
@@ -374,8 +383,7 @@ void ScOrcusFactory::finalize()
}
case CellStoreToken::Type::Formula:
{
- maDoc.setFormulaCell(
- rToken.maPos, rToken.maStr1, rToken.meGrammar);
+ maDoc.setFormulaCell(rToken.maPos, rToken.maStr1,
rToken.meGrammar);
++nCellCount;
break;
@@ -383,9 +391,11 @@ void ScOrcusFactory::finalize()
case CellStoreToken::Type::FormulaWithResult:
{
if (std::isfinite(rToken.mfValue))
- maDoc.setFormulaCell(rToken.maPos, rToken.maStr1,
rToken.meGrammar, &rToken.mfValue);
+ maDoc.setFormulaCell(rToken.maPos, rToken.maStr1,
rToken.meGrammar,
+ &rToken.mfValue);
else
- maDoc.setFormulaCell(rToken.maPos, rToken.maStr1,
rToken.meGrammar, rToken.maStr2);
+ maDoc.setFormulaCell(rToken.maPos, rToken.maStr1,
rToken.meGrammar,
+ rToken.maStr2);
++nCellCount;
break;
@@ -424,8 +434,8 @@ void ScOrcusFactory::finalize()
break;
ScRange aRange(rToken.maPos);
- aRange.aEnd.IncCol(rToken.mnIndex1-1);
- aRange.aEnd.IncRow(rToken.mnIndex2-1);
+ aRange.aEnd.IncCol(rToken.mnIndex1 - 1);
+ aRange.aEnd.IncRow(rToken.mnIndex2 - 1);
ScCompiler aComp(maDoc.getDoc(), aRange.aStart,
rToken.meGrammar);
std::unique_ptr<ScTokenArray>
pArray(aComp.CompileString(rToken.maStr1));
@@ -443,8 +453,7 @@ void ScOrcusFactory::finalize()
maDoc.fillDownCells(rToken.maPos, rToken.mnIndex1);
break;
}
- default:
- ;
+ default:;
}
if (nCellCount == 100000)
@@ -460,10 +469,7 @@ void ScOrcusFactory::finalize()
maDoc.finalize();
}
-ScDocumentImport& ScOrcusFactory::getDoc()
-{
- return maDoc;
-}
+ScDocumentImport& ScOrcusFactory::getDoc() { return maDoc; }
size_t ScOrcusFactory::appendString(const OUString& rStr)
{
@@ -503,43 +509,43 @@ const OUString* ScOrcusFactory::getString(size_t nIndex)
const
return &std::get<OUString>(rStr);
}
-void ScOrcusFactory::pushCellStoreAutoToken( const ScAddress& rPos, const
OUString& rVal )
+void ScOrcusFactory::pushCellStoreAutoToken(const ScAddress& rPos, const
OUString& rVal)
{
maCellStoreTokens.emplace_back(rPos, CellStoreToken::Type::Auto);
maCellStoreTokens.back().maStr1 = rVal;
}
-void ScOrcusFactory::pushCellStoreToken( const ScAddress& rPos, uint32_t
nStrIndex )
+void ScOrcusFactory::pushCellStoreToken(const ScAddress& rPos, uint32_t
nStrIndex)
{
maCellStoreTokens.emplace_back(rPos, nStrIndex);
}
-void ScOrcusFactory::pushCellStoreToken( const ScAddress& rPos, double fValue )
+void ScOrcusFactory::pushCellStoreToken(const ScAddress& rPos, double fValue)
{
maCellStoreTokens.emplace_back(rPos, fValue);
}
-void ScOrcusFactory::pushCellStoreToken(
- const ScAddress& rPos, const OUString& rFormula,
formula::FormulaGrammar::Grammar eGrammar )
+void ScOrcusFactory::pushCellStoreToken(const ScAddress& rPos, const OUString&
rFormula,
+ formula::FormulaGrammar::Grammar
eGrammar)
{
maCellStoreTokens.emplace_back(rPos, rFormula, eGrammar);
}
-void ScOrcusFactory::pushFillDownCellsToken( const ScAddress& rPos, uint32_t
nFillSize )
+void ScOrcusFactory::pushFillDownCellsToken(const ScAddress& rPos, uint32_t
nFillSize)
{
maCellStoreTokens.emplace_back(rPos, CellStoreToken::Type::FillDownCells);
maCellStoreTokens.back().mnIndex1 = nFillSize;
}
-void ScOrcusFactory::pushSharedFormulaToken( const ScAddress& rPos, uint32_t
nIndex )
+void ScOrcusFactory::pushSharedFormulaToken(const ScAddress& rPos, uint32_t
nIndex)
{
maCellStoreTokens.emplace_back(rPos, CellStoreToken::Type::SharedFormula);
maCellStoreTokens.back().mnIndex1 = nIndex;
}
-void ScOrcusFactory::pushMatrixFormulaToken(
- const ScAddress& rPos, const OUString& rFormula,
formula::FormulaGrammar::Grammar eGrammar,
- uint32_t nRowRange, uint32_t nColRange )
+void ScOrcusFactory::pushMatrixFormulaToken(const ScAddress& rPos, const
OUString& rFormula,
+ formula::FormulaGrammar::Grammar
eGrammar,
+ uint32_t nRowRange, uint32_t
nColRange)
{
maCellStoreTokens.emplace_back(rPos, CellStoreToken::Type::Matrix);
CellStoreToken& rT = maCellStoreTokens.back();
@@ -549,7 +555,7 @@ void ScOrcusFactory::pushMatrixFormulaToken(
rT.mnIndex2 = nRowRange;
}
-void ScOrcusFactory::pushFormulaResult( const ScAddress& rPos, double fValue )
+void ScOrcusFactory::pushFormulaResult(const ScAddress& rPos, double fValue)
{
// Formula result is expected to be pushed immediately following the
// formula token it belongs.
@@ -575,7 +581,7 @@ void ScOrcusFactory::pushFormulaResult( const ScAddress&
rPos, double fValue )
rToken.mfValue = fValue;
}
-void ScOrcusFactory::pushFormulaResult( const ScAddress& rPos, const OUString&
rValue )
+void ScOrcusFactory::pushFormulaResult(const ScAddress& rPos, const OUString&
rValue)
{
// Formula result is expected to be pushed immediately following the
// formula token it belongs.
@@ -625,26 +631,21 @@ void ScOrcusFactory::setStatusIndicator(const
uno::Reference<task::XStatusIndica
mxStatusIndicator = rIndicator;
}
-const ScOrcusGlobalSettings& ScOrcusFactory::getGlobalSettings() const
-{
- return maGlobalSettings;
-}
-
-ScOrcusSheetProperties::ScOrcusSheetProperties(SCTAB nTab, ScDocumentImport&
rDoc):
- mrDoc(rDoc),
- mnTab(nTab)
-{
-}
+const ScOrcusGlobalSettings& ScOrcusFactory::getGlobalSettings() const {
return maGlobalSettings; }
-ScOrcusSheetProperties::~ScOrcusSheetProperties()
+ScOrcusSheetProperties::ScOrcusSheetProperties(SCTAB nTab, ScDocumentImport&
rDoc)
+ : mrDoc(rDoc)
+ , mnTab(nTab)
{
}
-namespace {
+ScOrcusSheetProperties::~ScOrcusSheetProperties() {}
+namespace
+{
double translateToInternal(double nVal, orcus::length_unit_t unit)
{
- switch(unit)
+ switch (unit)
{
case orcus::length_unit_t::inch:
return o3tl::convert(nVal, o3tl::Length::in, o3tl::Length::twip);
@@ -665,11 +666,10 @@ double translateToInternal(double nVal,
orcus::length_unit_t unit)
}
return nVal;
}
-
-
}
-void ScOrcusSheetProperties::set_column_width(os::col_t col, os::col_t
col_span, double width, orcus::length_unit_t unit)
+void ScOrcusSheetProperties::set_column_width(os::col_t col, os::col_t
col_span, double width,
+ orcus::length_unit_t unit)
{
double nNewWidth = translateToInternal(width, unit);
@@ -683,8 +683,8 @@ void ScOrcusSheetProperties::set_column_hidden(os::col_t
col, os::col_t col_span
mrDoc.getDoc().SetColHidden(col, col + col_span - 1, mnTab, hidden);
}
-void ScOrcusSheetProperties::set_row_height(
- os::row_t row, os::row_t row_span, double height, orcus::length_unit_t
unit)
+void ScOrcusSheetProperties::set_row_height(os::row_t row, os::row_t row_span,
double height,
+ orcus::length_unit_t unit)
{
double nNewHeight = translateToInternal(height, unit);
SCROW nStartRow = row;
@@ -701,23 +701,22 @@ void ScOrcusSheetProperties::set_row_hidden(os::row_t
row, os::row_t row_span, b
void ScOrcusSheetProperties::set_merge_cell_range(const
orcus::spreadsheet::range_t& range)
{
- mrDoc.setMergedCells(mnTab, range.first.column, range.first.row,
range.last.column, range.last.row);
+ mrDoc.setMergedCells(mnTab, range.first.column, range.first.row,
range.last.column,
+ range.last.row);
}
-ScOrcusConditionalFormat::ScOrcusConditionalFormat(SCTAB nTab, ScDocument&
rDoc):
- mnTab(nTab),
- mrDoc(rDoc),
- mpCurrentFormat(new ScConditionalFormat(0, &mrDoc)),
- meEntryType(ScFormatEntry::Type::Condition)
+ScOrcusConditionalFormat::ScOrcusConditionalFormat(SCTAB nTab, ScDocument&
rDoc)
+ : mnTab(nTab)
+ , mrDoc(rDoc)
+ , mpCurrentFormat(new ScConditionalFormat(0, &mrDoc))
+ , meEntryType(ScFormatEntry::Type::Condition)
{
}
-ScOrcusConditionalFormat::~ScOrcusConditionalFormat()
-{
-}
+ScOrcusConditionalFormat::~ScOrcusConditionalFormat() {}
void ScOrcusConditionalFormat::set_color(os::color_elem_t /*alpha*/,
os::color_elem_t /*red*/,
- os::color_elem_t /*green*/, os::color_elem_t /*blue*/)
+ os::color_elem_t /*green*/,
os::color_elem_t /*blue*/)
{
SAL_INFO("sc.orcus.condformat", "set_color");
}
@@ -762,15 +761,19 @@ void
ScOrcusConditionalFormat::set_databar_axis(os::databar_axis_t /*axis*/)
SAL_INFO("sc.orcus.condformat", "set_databar_axis");
}
-void ScOrcusConditionalFormat::set_databar_color_positive(os::color_elem_t
/*alpha*/, os::color_elem_t /*red*/,
- os::color_elem_t /*green*/, os::color_elem_t /*blue*/)
+void ScOrcusConditionalFormat::set_databar_color_positive(os::color_elem_t
/*alpha*/,
+ os::color_elem_t
/*red*/,
+ os::color_elem_t
/*green*/,
+ os::color_elem_t
/*blue*/)
{
assert(meEntryType == ScFormatEntry::Type::Databar);
SAL_INFO("sc.orcus.condformat", "set_databar_color_positive");
}
-void ScOrcusConditionalFormat::set_databar_color_negative(os::color_elem_t
/*alpha*/, os::color_elem_t /*red*/,
- os::color_elem_t /*green*/, os::color_elem_t /*blue*/)
+void ScOrcusConditionalFormat::set_databar_color_negative(os::color_elem_t
/*alpha*/,
+ os::color_elem_t
/*red*/,
+ os::color_elem_t
/*green*/,
+ os::color_elem_t
/*blue*/)
{
assert(meEntryType == ScFormatEntry::Type::Databar);
SAL_INFO("sc.orcus.condformat", "set_databar_color_negative");
@@ -817,26 +820,23 @@ void
ScOrcusConditionalFormat::set_type(os::conditional_format_t type)
case os::conditional_format_t::formula:
meEntryType = ScFormatEntry::Type::Condition;
// mpCurrentEntry.reset(new ScCondFormatEntry());
- break;
+ break;
case os::conditional_format_t::date:
- break;
+ break;
case os::conditional_format_t::colorscale:
- break;
+ break;
case os::conditional_format_t::databar:
- break;
+ break;
case os::conditional_format_t::iconset:
- break;
+ break;
default:
SAL_INFO("sc.orcus.condformat", "unknown conditional_format_t
value");
- break;
+ break;
}
SAL_INFO("sc.orcus.condformat", "set_type");
}
-void ScOrcusConditionalFormat::commit_entry()
-{
- SAL_INFO("sc.orcus.condformat", "commit_entry");
-}
+void ScOrcusConditionalFormat::commit_entry() {
SAL_INFO("sc.orcus.condformat", "commit_entry"); }
void ScOrcusConditionalFormat::set_range(std::string_view /*range*/)
{
@@ -844,7 +844,7 @@ void ScOrcusConditionalFormat::set_range(std::string_view
/*range*/)
}
void ScOrcusConditionalFormat::set_range(os::row_t row_start, os::col_t
col_start,
- os::row_t row_end, os::col_t col_end)
+ os::row_t row_end, os::col_t col_end)
{
SAL_INFO("sc.orcus.condformat", "set_range");
ScRange aRange(col_start, row_start, mnTab, col_end, row_end, mnTab);
@@ -857,18 +857,19 @@ void ScOrcusConditionalFormat::commit_format()
mpCurrentFormat.reset(new ScConditionalFormat(0, &mrDoc));
}
-ScOrcusSheet::ScOrcusSheet(ScDocumentImport& rDoc, const
ScOrcusGlobalSettings& rGS, SCTAB nTab, ScOrcusFactory& rFactory) :
- mrDoc(rDoc),
- mnTab(nTab),
- mrFactory(rFactory),
- mrStyles(static_cast<ScOrcusStyles&>(*mrFactory.get_styles())),
- maProperties(mnTab, mrDoc),
- maConditionalFormat(mnTab, rDoc.getDoc()),
- maNamedExpressions(rDoc, rFactory.getGlobalSettings(), nTab),
- maFormula(*this),
- maArrayFormula(*this),
- maAutoFilter(rDoc, rGS, nTab),
- mnCellCount(0)
+ScOrcusSheet::ScOrcusSheet(ScDocumentImport& rDoc, const
ScOrcusGlobalSettings& rGS, SCTAB nTab,
+ ScOrcusFactory& rFactory)
+ : mrDoc(rDoc)
+ , mnTab(nTab)
+ , mrFactory(rFactory)
+ , mrStyles(static_cast<ScOrcusStyles&>(*mrFactory.get_styles()))
+ , maProperties(mnTab, mrDoc)
+ , maConditionalFormat(mnTab, rDoc.getDoc())
+ , maNamedExpressions(rDoc, rFactory.getGlobalSettings(), nTab)
+ , maFormula(*this)
+ , maArrayFormula(*this)
+ , maAutoFilter(rDoc, rGS, nTab)
+ , mnCellCount(0)
{
}
@@ -885,15 +886,17 @@ void ScOrcusFormula::reset()
mfResult = 0.0;
}
-ScOrcusFormula::ScOrcusFormula( ScOrcusSheet& rSheet ) :
- mrSheet(rSheet),
- mnCol(-1),
- mnRow(-1),
- meGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED),
- mnSharedFormulaIndex(0),
- mbShared(false),
- meResType(ResultType::NotSet),
- mfResult(0.0) {}
+ScOrcusFormula::ScOrcusFormula(ScOrcusSheet& rSheet)
+ : mrSheet(rSheet)
+ , mnCol(-1)
+ , mnRow(-1)
+ , meGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED)
+ , mnSharedFormulaIndex(0)
+ , mbShared(false)
+ , meResType(ResultType::NotSet)
+ , mfResult(0.0)
+{
+}
ScOrcusFormula::~ScOrcusFormula() {}
@@ -905,7 +908,8 @@ void ScOrcusFormula::set_position(os::row_t row, os::col_t
col)
void ScOrcusFormula::set_formula(os::formula_grammar_t grammar,
std::string_view formula)
{
- maFormula = OUString(formula.data(), formula.size(),
mrSheet.getFactory().getGlobalSettings().getTextEncoding());
+ maFormula = OUString(formula.data(), formula.size(),
+
mrSheet.getFactory().getGlobalSettings().getTextEncoding());
meGrammar = getCalcGrammarFromOrcus(grammar);
}
@@ -924,13 +928,11 @@ void ScOrcusFormula::set_result_value(double value)
void ScOrcusFormula::set_result_string(std::string_view value)
{
meResType = ResultType::String;
- maResult = OUString(value.data(), value.size(),
mrSheet.getFactory().getGlobalSettings().getTextEncoding());
+ maResult = OUString(value.data(), value.size(),
+
mrSheet.getFactory().getGlobalSettings().getTextEncoding());
}
-void ScOrcusFormula::set_result_empty()
-{
- meResType = ResultType::Empty;
-}
+void ScOrcusFormula::set_result_empty() { meResType = ResultType::Empty; }
void ScOrcusFormula::set_result_bool(bool value)
{
@@ -984,8 +986,7 @@ void ScOrcusFormula::commit()
case ResultType::Value:
rFactory.pushFormulaResult(aPos, mfResult);
break;
- default:
- ;
+ default:;
}
mrSheet.cellInserted();
@@ -1002,13 +1003,15 @@ void ScOrcusArrayFormula::reset()
meGrammar = formula::FormulaGrammar::GRAM_UNSPECIFIED;
}
-ScOrcusArrayFormula::ScOrcusArrayFormula( ScOrcusSheet& rSheet ) :
- mrSheet(rSheet),
- mnCol(-1),
- mnRow(-1),
- mnColRange(0),
- mnRowRange(0),
- meGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED) {}
+ScOrcusArrayFormula::ScOrcusArrayFormula(ScOrcusSheet& rSheet)
+ : mrSheet(rSheet)
+ , mnCol(-1)
+ , mnRow(-1)
+ , mnColRange(0)
+ , mnRowRange(0)
+ , meGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED)
+{
+}
ScOrcusArrayFormula::~ScOrcusArrayFormula() {}
@@ -1024,7 +1027,8 @@ void ScOrcusArrayFormula::set_range(const os::range_t&
range)
void ScOrcusArrayFormula::set_formula(os::formula_grammar_t grammar,
std::string_view formula)
{
meGrammar = getCalcGrammarFromOrcus(grammar);
- maFormula = OUString(formula.data(), formula.size(),
mrSheet.getFactory().getGlobalSettings().getTextEncoding());
+ maFormula = OUString(formula.data(), formula.size(),
+
mrSheet.getFactory().getGlobalSettings().getTextEncoding());
}
void ScOrcusArrayFormula::set_result_value(os::row_t /*row*/, os::col_t
/*col*/, double /*value*/)
@@ -1032,7 +1036,8 @@ void ScOrcusArrayFormula::set_result_value(os::row_t
/*row*/, os::col_t /*col*/,
// TODO : implement result cache for matrix
}
-void ScOrcusArrayFormula::set_result_string(os::row_t /*row*/, os::col_t
/*col*/, std::string_view /*value*/)
+void ScOrcusArrayFormula::set_result_string(os::row_t /*row*/, os::col_t
/*col*/,
+ std::string_view /*value*/)
{
// TODO : implement result cache for matrix
}
@@ -1064,15 +1069,9 @@ void ScOrcusSheet::cellInserted()
}
}
-ScDocumentImport& ScOrcusSheet::getDoc()
-{
- return mrDoc;
-}
+ScDocumentImport& ScOrcusSheet::getDoc() { return mrDoc; }
-os::iface::import_sheet_properties* ScOrcusSheet::get_sheet_properties()
-{
- return &maProperties;
-}
+os::iface::import_sheet_properties* ScOrcusSheet::get_sheet_properties() {
return &maProperties; }
os::iface::import_conditional_format* ScOrcusSheet::get_conditional_format()
{
@@ -1121,8 +1120,8 @@ void ScOrcusSheet::set_bool(os::row_t row, os::col_t col,
bool value)
cellInserted();
}
-void ScOrcusSheet::set_date_time(
- os::row_t row, os::col_t col, int year, int month, int day, int hour, int
minute, double second)
+void ScOrcusSheet::set_date_time(os::row_t row, os::col_t col, int year, int
month, int day,
+ int hour, int minute, double second)
{
SvNumberFormatter* pFormatter = mrDoc.getDoc().GetFormatTable();
@@ -1132,11 +1131,9 @@ void ScOrcusSheet::set_date_time(
tools::Time aTime(hour, minute, nSec, nNanoSec);
tools::Long nDateDiff = aDate - pFormatter->GetNullDate();
- double fTime =
- static_cast<double>(aTime.GetNanoSec()) / ::tools::Time::nanoSecPerSec
+
- aTime.GetSec() +
- aTime.GetMin() * ::tools::Time::secondPerMinute +
- aTime.GetHour() * ::tools::Time::secondPerHour;
+ double fTime = static_cast<double>(aTime.GetNanoSec()) /
::tools::Time::nanoSecPerSec
+ + aTime.GetSec() + aTime.GetMin() *
::tools::Time::secondPerMinute
+ + aTime.GetHour() * ::tools::Time::secondPerHour;
fTime /= DATE_TIME_FACTOR;
@@ -1153,8 +1150,8 @@ void ScOrcusSheet::set_format(os::row_t row, os::col_t
col, size_t xf_index)
mrDoc.getDoc().ApplyPattern(col, row, mnTab, aPattern);
}
-void ScOrcusSheet::set_format(os::row_t row_start, os::col_t col_start,
- os::row_t row_end, os::col_t col_end, size_t xf_index)
+void ScOrcusSheet::set_format(os::row_t row_start, os::col_t col_start,
os::row_t row_end,
+ os::col_t col_end, size_t xf_index)
{
SAL_INFO("sc.orcus.style", "set format range: " << xf_index);
ScPatternAttr aPattern(mrDoc.getDoc().getCellAttributeHelper());
@@ -1162,14 +1159,13 @@ void ScOrcusSheet::set_format(os::row_t row_start,
os::col_t col_start,
mrDoc.getDoc().ApplyPatternAreaTab(col_start, row_start, col_end, row_end,
mnTab, aPattern);
}
-void ScOrcusSheet::set_column_format(
- os::col_t col, os::col_t col_span, std::size_t xf_index)
+void ScOrcusSheet::set_column_format(os::col_t col, os::col_t col_span,
std::size_t xf_index)
{
ScPatternAttr aPattern(mrDoc.getDoc().getCellAttributeHelper());
mrStyles.applyXfToItemSet(aPattern.GetItemSet(), xf_index);
- mrDoc.getDoc().ApplyPatternAreaTab(
- col, 0, col + col_span - 1, mrDoc.getDoc().MaxRow(), mnTab, aPattern);
+ mrDoc.getDoc().ApplyPatternAreaTab(col, 0, col + col_span - 1,
mrDoc.getDoc().MaxRow(), mnTab,
+ aPattern);
}
void ScOrcusSheet::set_row_format(os::row_t row, std::size_t xf_index)
@@ -1177,8 +1173,7 @@ void ScOrcusSheet::set_row_format(os::row_t row,
std::size_t xf_index)
ScPatternAttr aPattern(mrDoc.getDoc().getCellAttributeHelper());
mrStyles.applyXfToItemSet(aPattern.GetItemSet(), xf_index);
- mrDoc.getDoc().ApplyPatternAreaTab(
- 0, row, mrDoc.getDoc().MaxCol(), row, mnTab, aPattern);
+ mrDoc.getDoc().ApplyPatternAreaTab(0, row, mrDoc.getDoc().MaxCol(), row,
mnTab, aPattern);
}
orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
@@ -1207,15 +1202,9 @@ const sc::SharedFormulaGroups&
ScOrcusSheet::getSharedFormulaGroups() const
return maFormulaGroups;
}
-sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups()
-{
- return maFormulaGroups;
-}
+sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() { return
maFormulaGroups; }
-ScOrcusFactory& ScOrcusSheet::getFactory()
-{
- return mrFactory;
-}
+ScOrcusFactory& ScOrcusSheet::getFactory() { return mrFactory; }
void ScOrcusStrikethrough::reset()
{
@@ -1277,7 +1266,6 @@ std::optional<FontStrikeout>
ScOrcusStrikethrough::toFontStrikeout() const
return eStrikeout;
}
-
void ScOrcusUnderline::reset()
{
meStyle.reset();
@@ -1397,8 +1385,7 @@ std::optional<FontLineStyle>
ScOrcusUnderline::toFontLineStyle() const
case LINESTYLE_WAVE:
eUnderline = LINESTYLE_BOLDWAVE;
break;
- default:
- ;
+ default:;
}
}
}
@@ -1412,25 +1399,13 @@ void ScOrcusSegmentStrikethrough::reset(SfxItemSet*
pDestFormat)
maAttrs.reset();
}
-void ScOrcusSegmentStrikethrough::set_style(os::strikethrough_style_t s)
-{
- maAttrs.meStyle = s;
-}
+void ScOrcusSegmentStrikethrough::set_style(os::strikethrough_style_t s) {
maAttrs.meStyle = s; }
-void ScOrcusSegmentStrikethrough::set_type(os::strikethrough_type_t s)
-{
- maAttrs.meType = s;
-}
+void ScOrcusSegmentStrikethrough::set_type(os::strikethrough_type_t s) {
maAttrs.meType = s; }
-void ScOrcusSegmentStrikethrough::set_width(os::strikethrough_width_t s)
-{
- maAttrs.meWidth = s;
-}
+void ScOrcusSegmentStrikethrough::set_width(os::strikethrough_width_t s) {
maAttrs.meWidth = s; }
-void ScOrcusSegmentStrikethrough::set_text(os::strikethrough_text_t s)
-{
- maAttrs.meText = s;
-}
+void ScOrcusSegmentStrikethrough::set_text(os::strikethrough_text_t s) {
maAttrs.meText = s; }
void ScOrcusSegmentStrikethrough::commit()
{
@@ -1448,28 +1423,19 @@ void ScOrcusSegmentUnderline::reset(SfxItemSet*
pDestFormat)
maColor.reset();
}
-void ScOrcusSegmentUnderline::set_style(os::underline_style_t e)
-{
- maAttrs.meStyle = e;
-}
+void ScOrcusSegmentUnderline::set_style(os::underline_style_t e) {
maAttrs.meStyle = e; }
void ScOrcusSegmentUnderline::set_thickness(os::underline_thickness_t e)
{
maAttrs.meThickness = e;
}
-void ScOrcusSegmentUnderline::set_spacing(os::underline_spacing_t e)
-{
- maAttrs.meSpacing = e;
-}
+void ScOrcusSegmentUnderline::set_spacing(os::underline_spacing_t e) {
maAttrs.meSpacing = e; }
-void ScOrcusSegmentUnderline::set_count(os::underline_count_t e)
-{
- maAttrs.meCount = e;
-}
+void ScOrcusSegmentUnderline::set_count(os::underline_count_t e) {
maAttrs.meCount = e; }
-void ScOrcusSegmentUnderline::set_color(
- os::color_elem_t alpha, os::color_elem_t red, os::color_elem_t green,
os::color_elem_t blue)
+void ScOrcusSegmentUnderline::set_color(os::color_elem_t alpha,
os::color_elem_t red,
+ os::color_elem_t green,
os::color_elem_t blue)
{
maColor = Color(ColorAlpha, alpha, red, green, blue);
}
@@ -1490,13 +1456,13 @@ void ScOrcusSegmentUnderline::commit()
OUString ScOrcusSharedStrings::toOUString(std::string_view s)
{
- return {s.data(), sal_Int32(s.size()),
mrFactory.getGlobalSettings().getTextEncoding()};
+ return { s.data(), sal_Int32(s.size()),
mrFactory.getGlobalSettings().getTextEncoding() };
}
-ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory) :
- mrFactory(rFactory),
- mrEditEngine(rFactory.getDoc().getDoc().GetEditEngine()),
- maCurFormat(mrEditEngine.GetEmptyItemSet())
+ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory)
+ : mrFactory(rFactory)
+ , mrEditEngine(rFactory.getDoc().getDoc().GetEditEngine())
+ , maCurFormat(mrEditEngine.GetEmptyItemSet())
{
mrEditEngine.Clear();
}
@@ -1506,14 +1472,9 @@ size_t ScOrcusSharedStrings::append(std::string_view s)
return mrFactory.appendString(toOUString(s));
}
-size_t ScOrcusSharedStrings::add(std::string_view s)
-{
- return mrFactory.addString(toOUString(s));
-}
+size_t ScOrcusSharedStrings::add(std::string_view s) { return
mrFactory.addString(toOUString(s)); }
-void ScOrcusSharedStrings::set_segment_font(size_t /*font_index*/)
-{
-}
+void ScOrcusSharedStrings::set_segment_font(size_t /*font_index*/) {}
void ScOrcusSharedStrings::set_segment_bold(bool b)
{
@@ -1542,13 +1503,8 @@ void ScOrcusSharedStrings::set_segment_subscript(bool b)
void ScOrcusSharedStrings::set_segment_font_name(std::string_view s)
{
OUString aName = toOUString(s);
- maCurFormat.Put(
- SvxFontItem(
- FAMILY_DONTKNOW, aName, aName, PITCH_DONTKNOW,
- mrFactory.getGlobalSettings().getTextEncoding(),
- EE_CHAR_FONTINFO
- )
- );
+ maCurFormat.Put(SvxFontItem(FAMILY_DONTKNOW, aName, aName, PITCH_DONTKNOW,
+
mrFactory.getGlobalSettings().getTextEncoding(), EE_CHAR_FONTINFO));
}
void ScOrcusSharedStrings::set_segment_font_size(double point)
@@ -1558,8 +1514,8 @@ void ScOrcusSharedStrings::set_segment_font_size(double
point)
maCurFormat.Put(SvxFontHeightItem(nMM, 100, EE_CHAR_FONTHEIGHT));
}
-void ScOrcusSharedStrings::set_segment_font_color(
- os::color_elem_t alpha, os::color_elem_t red, os::color_elem_t green,
os::color_elem_t blue)
+void ScOrcusSharedStrings::set_segment_font_color(os::color_elem_t alpha,
os::color_elem_t red,
+ os::color_elem_t green,
os::color_elem_t blue)
{
Color aColor(ColorAlpha, alpha, red, green, blue);
maCurFormat.Put(SvxColorItem(aColor, EE_CHAR_COLOR));
@@ -1591,7 +1547,7 @@ void
ScOrcusSharedStrings::append_segment(std::string_view s)
size_t ScOrcusSharedStrings::commit_segments()
{
- for (const auto& [rSel, rFormat] : maFormatSegments)
+ for (const auto & [ rSel, rFormat ] : maFormatSegments)
mrEditEngine.QuickSetAttribs(rFormat, rSel);
auto nPos =
mrFactory.appendFormattedString(mrEditEngine.CreateTextObject());
@@ -1600,7 +1556,7 @@ size_t ScOrcusSharedStrings::commit_segments()
return nPos;
}
-void ScOrcusFont::applyToItemSet( SfxItemSet& rSet ) const
+void ScOrcusFont::applyToItemSet(SfxItemSet& rSet) const
{
if (mbBold)
{
@@ -1639,16 +1595,19 @@ void ScOrcusFont::applyToItemSet( SfxItemSet& rSet )
const
}
if (maColor)
- rSet.Put( SvxColorItem(*maColor, ATTR_FONT_COLOR));
+ rSet.Put(SvxColorItem(*maColor, ATTR_FONT_COLOR));
if (maName && !maName->isEmpty())
- rSet.Put( SvxFontItem( FAMILY_DONTKNOW, *maName, *maName,
PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ));
+ rSet.Put(SvxFontItem(FAMILY_DONTKNOW, *maName, *maName, PITCH_DONTKNOW,
+ RTL_TEXTENCODING_DONTKNOW, ATTR_FONT));
if (maNameAsian && !maNameAsian->isEmpty())
- rSet.Put( SvxFontItem( FAMILY_DONTKNOW, *maNameAsian, *maNameAsian,
PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, ATTR_CJK_FONT ));
+ rSet.Put(SvxFontItem(FAMILY_DONTKNOW, *maNameAsian, *maNameAsian,
PITCH_DONTKNOW,
+ RTL_TEXTENCODING_DONTKNOW, ATTR_CJK_FONT));
if (maNameComplex && !maNameComplex->isEmpty())
- rSet.Put( SvxFontItem( FAMILY_DONTKNOW, *maNameComplex,
*maNameComplex, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, ATTR_CTL_FONT ));
+ rSet.Put(SvxFontItem(FAMILY_DONTKNOW, *maNameComplex, *maNameComplex,
PITCH_DONTKNOW,
+ RTL_TEXTENCODING_DONTKNOW, ATTR_CTL_FONT));
if (mnSize)
{
@@ -1684,7 +1643,7 @@ void ScOrcusFont::applyToItemSet( SfxItemSet& rSet ) const
rSet.Put(SvxCrossedOutItem(*meStrikeout, ATTR_FONT_CROSSEDOUT));
}
-void ScOrcusFill::applyToItemSet( SfxItemSet& rSet ) const
+void ScOrcusFill::applyToItemSet(SfxItemSet& rSet) const
{
if (!mePattern || !maFgColor)
return;
@@ -1693,10 +1652,9 @@ void ScOrcusFill::applyToItemSet( SfxItemSet& rSet )
const
rSet.Put(SvxBrushItem(*maFgColor, ATTR_BACKGROUND));
}
-void ScOrcusBorder::applyToItemSet( SfxItemSet& rSet ) const
+void ScOrcusBorder::applyToItemSet(SfxItemSet& rSet) const
{
- auto getDirection = [](os::border_direction_t dir) -> SvxBoxItemLine
- {
+ auto getDirection = [](os::border_direction_t dir) -> SvxBoxItemLine {
switch (dir)
{
case os::border_direction_t::right:
@@ -1707,8 +1665,7 @@ void ScOrcusBorder::applyToItemSet( SfxItemSet& rSet )
const
return SvxBoxItemLine::TOP;
case os::border_direction_t::bottom:
return SvxBoxItemLine::BOTTOM;
- default:
- ;
+ default:;
}
return SvxBoxItemLine::RIGHT;
};
@@ -1720,7 +1677,7 @@ void ScOrcusBorder::applyToItemSet( SfxItemSet& rSet )
const
SvxLineItem aDiagonal_TLBR(ATTR_BORDER_TLBR);
SvxLineItem aDiagonal_BLTR(ATTR_BORDER_BLTR);
- for (const auto& [dir, attrs] : maBorders)
+ for (const auto & [ dir, attrs ] : maBorders)
{
SvxBoxItemLine eDir = getDirection(dir);
@@ -1755,9 +1712,10 @@ void ScOrcusBorder::applyToItemSet( SfxItemSet& rSet )
const
rSet.Put(aBoxItem);
}
-void ScOrcusProtection::applyToItemSet( SfxItemSet& rSet ) const
+void ScOrcusProtection::applyToItemSet(SfxItemSet& rSet) const
{
- if (!mbLocked.has_value() && !mbHidden.has_value() &&
!mbPrintContent.has_value() && !mbFormulaHidden.has_value())
+ if (!mbLocked.has_value() && !mbHidden.has_value() &&
!mbPrintContent.has_value()
+ && !mbFormulaHidden.has_value())
return;
bool bLocked = mbLocked.value_or(true); // defaults to true.
@@ -1767,7 +1725,7 @@ void ScOrcusProtection::applyToItemSet( SfxItemSet& rSet
) const
rSet.Put(ScProtectionAttr(bLocked, bFormulaHidden, bHidden,
bPrintContent));
}
-void ScOrcusNumberFormat::applyToItemSet( SfxItemSet& rSet, const ScDocument&
rDoc ) const
+void ScOrcusNumberFormat::applyToItemSet(SfxItemSet& rSet, const ScDocument&
rDoc) const
{
if (!maCode)
return;
@@ -1775,7 +1733,8 @@ void ScOrcusNumberFormat::applyToItemSet( SfxItemSet&
rSet, const ScDocument& rD
sal_uInt32 nKey;
sal_Int32 nCheckPos;
SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
- OUString Code = *maCode; /* <-- Done because the
SvNumberFormatter::PutEntry demands a non const NumFormat Code*/
+ OUString Code
+ = *maCode; /* <-- Done because the SvNumberFormatter::PutEntry demands
a non const NumFormat Code*/
SvNumFormatType type = SvNumFormatType::ALL;
pFormatter->PutEntry(Code, nCheckPos, type, nKey, LANGUAGE_ENGLISH_US);
@@ -1783,27 +1742,27 @@ void ScOrcusNumberFormat::applyToItemSet( SfxItemSet&
rSet, const ScDocument& rD
rSet.Put(SfxUInt32Item(ATTR_VALUE_FORMAT, nKey));
}
-ScOrcusXf::ScOrcusXf() :
- mnFontId(0),
- mnFillId(0),
- mnBorderId(0),
- mnProtectionId(0),
- mnNumberFormatId(0),
- mnStyleXf(0),
- mbApplyAlignment(false),
- mbWrapText(false),
- mbShrinkToFit(false),
- meHorAlignment(SvxCellHorJustify::Standard),
- meVerAlignment(SvxCellVerJustify::Standard),
- meHorAlignMethod(SvxCellJustifyMethod::Auto),
- meVerAlignMethod(SvxCellJustifyMethod::Auto)
+ScOrcusXf::ScOrcusXf()
+ : mnFontId(0)
+ , mnFillId(0)
+ , mnBorderId(0)
+ , mnProtectionId(0)
+ , mnNumberFormatId(0)
+ , mnStyleXf(0)
+ , mbApplyAlignment(false)
+ , mbWrapText(false)
+ , mbShrinkToFit(false)
+ , meHorAlignment(SvxCellHorJustify::Standard)
+ , meVerAlignment(SvxCellVerJustify::Standard)
+ , meHorAlignMethod(SvxCellJustifyMethod::Auto)
+ , meVerAlignMethod(SvxCellJustifyMethod::Auto)
{
}
-ScOrcusCellStyle::ScOrcusCellStyle() :
- maParentName(SC_STYLE_PROG_STANDARD),
- mnXFId(0),
- mnBuiltInId(0)
+ScOrcusCellStyle::ScOrcusCellStyle()
+ : maParentName(SC_STYLE_PROG_STANDARD)
+ , mnXFId(0)
+ , mnBuiltInId(0)
{
}
@@ -1815,10 +1774,7 @@ void ScOrcusImportFontUnderlineStyle::reset(ScOrcusFont*
pDest)
maColor.reset();
}
-void ScOrcusImportFontUnderlineStyle::set_style(os::underline_style_t e)
-{
- maAttrs.meStyle = e;
-}
+void ScOrcusImportFontUnderlineStyle::set_style(os::underline_style_t e) {
maAttrs.meStyle = e; }
void ScOrcusImportFontUnderlineStyle::set_thickness(os::underline_thickness_t
e)
{
@@ -1830,13 +1786,10 @@ void
ScOrcusImportFontUnderlineStyle::set_spacing(os::underline_spacing_t e)
maAttrs.meSpacing = e;
}
-void ScOrcusImportFontUnderlineStyle::set_count(os::underline_count_t e)
-{
- maAttrs.meCount = e;
-}
+void ScOrcusImportFontUnderlineStyle::set_count(os::underline_count_t e) {
maAttrs.meCount = e; }
-void ScOrcusImportFontUnderlineStyle::set_color(
- os::color_elem_t alpha, os::color_elem_t red, os::color_elem_t green,
os::color_elem_t blue)
+void ScOrcusImportFontUnderlineStyle::set_color(os::color_elem_t alpha,
os::color_elem_t red,
+ os::color_elem_t green,
os::color_elem_t blue)
{
maColor = Color(ColorAlpha, alpha, red, green, blue);
}
@@ -1878,46 +1831,26 @@ void ScOrcusImportFontStrikethroughStyle::commit()
mpDestFont->meStrikeout = maAttrs.toFontStrikeout();
}
-ScOrcusImportFontStyle::ScOrcusImportFontStyle( ScOrcusFactory& rFactory,
std::vector<ScOrcusFont>& rFonts ) :
- mrFactory(rFactory),
- mrFonts(rFonts)
+ScOrcusImportFontStyle::ScOrcusImportFontStyle(ScOrcusFactory& rFactory,
+ std::vector<ScOrcusFont>&
rFonts)
+ : mrFactory(rFactory)
+ , mrFonts(rFonts)
{
}
-void ScOrcusImportFontStyle::reset()
-{
- maCurrentFont = ScOrcusFont();
-}
+void ScOrcusImportFontStyle::reset() { maCurrentFont = ScOrcusFont(); }
-void ScOrcusImportFontStyle::set_bold(bool b)
-{
- maCurrentFont.mbBold = b;
-}
+void ScOrcusImportFontStyle::set_bold(bool b) { maCurrentFont.mbBold = b; }
-void ScOrcusImportFontStyle::set_bold_asian(bool b)
-{
- maCurrentFont.mbBoldAsian = b;
-}
+void ScOrcusImportFontStyle::set_bold_asian(bool b) {
maCurrentFont.mbBoldAsian = b; }
-void ScOrcusImportFontStyle::set_bold_complex(bool b)
-{
- maCurrentFont.mbBoldComplex = b;
-}
+void ScOrcusImportFontStyle::set_bold_complex(bool b) {
maCurrentFont.mbBoldComplex = b; }
-void ScOrcusImportFontStyle::set_italic(bool b)
-{
- maCurrentFont.mbItalic = b;
-}
+void ScOrcusImportFontStyle::set_italic(bool b) { maCurrentFont.mbItalic = b; }
-void ScOrcusImportFontStyle::set_italic_asian(bool b)
-{
- maCurrentFont.mbItalicAsian = b;
-}
+void ScOrcusImportFontStyle::set_italic_asian(bool b) {
maCurrentFont.mbItalicAsian = b; }
-void ScOrcusImportFontStyle::set_italic_complex(bool b)
-{
- maCurrentFont.mbItalicComplex = b;
-}
+void ScOrcusImportFontStyle::set_italic_complex(bool b) {
maCurrentFont.mbItalicComplex = b; }
void ScOrcusImportFontStyle::set_name(std::string_view name)
{
@@ -1937,23 +1870,14 @@ void
ScOrcusImportFontStyle::set_name_complex(std::string_view name)
maCurrentFont.maNameComplex = aName;
}
-void ScOrcusImportFontStyle::set_size(double point)
-{
- maCurrentFont.mnSize = point;
-}
+void ScOrcusImportFontStyle::set_size(double point) { maCurrentFont.mnSize =
point; }
-void ScOrcusImportFontStyle::set_size_asian(double point)
-{
- maCurrentFont.mnSizeAsian = point;
-}
+void ScOrcusImportFontStyle::set_size_asian(double point) {
maCurrentFont.mnSizeAsian = point; }
-void ScOrcusImportFontStyle::set_size_complex(double point)
-{
- maCurrentFont.mnSizeComplex = point;
-}
+void ScOrcusImportFontStyle::set_size_complex(double point) {
maCurrentFont.mnSizeComplex = point; }
-void ScOrcusImportFontStyle::set_color(
- os::color_elem_t alpha, os::color_elem_t red, os::color_elem_t green,
os::color_elem_t blue)
+void ScOrcusImportFontStyle::set_color(os::color_elem_t alpha,
os::color_elem_t red,
+ os::color_elem_t green,
os::color_elem_t blue)
{
maCurrentFont.maColor = Color(ColorAlpha, alpha, red, green, blue);
}
@@ -1978,29 +1902,26 @@ std::size_t ScOrcusImportFontStyle::commit()
return mrFonts.size() - 1;
}
-ScOrcusImportFillStyle::ScOrcusImportFillStyle( std::vector<ScOrcusFill>&
rFills ) :
- mrFills(rFills)
+ScOrcusImportFillStyle::ScOrcusImportFillStyle(std::vector<ScOrcusFill>&
rFills)
+ : mrFills(rFills)
{
}
-void ScOrcusImportFillStyle::reset()
-{
- maCurrentFill = ScOrcusFill();
-}
+void ScOrcusImportFillStyle::reset() { maCurrentFill = ScOrcusFill(); }
void ScOrcusImportFillStyle::set_pattern_type(os::fill_pattern_t fp)
{
maCurrentFill.mePattern = fp;
}
-void ScOrcusImportFillStyle::set_fg_color(
- os::color_elem_t alpha, os::color_elem_t red, os::color_elem_t green,
os::color_elem_t blue)
+void ScOrcusImportFillStyle::set_fg_color(os::color_elem_t alpha,
os::color_elem_t red,
+ os::color_elem_t green,
os::color_elem_t blue)
{
maCurrentFill.maFgColor = Color(ColorAlpha, alpha, red, green, blue);
}
-void ScOrcusImportFillStyle::set_bg_color(
- os::color_elem_t alpha, os::color_elem_t red, os::color_elem_t green,
os::color_elem_t blue)
+void ScOrcusImportFillStyle::set_bg_color(os::color_elem_t alpha,
os::color_elem_t red,
+ os::color_elem_t green,
os::color_elem_t blue)
{
maCurrentFill.maBgColor = Color(ColorAlpha, alpha, red, green, blue);
}
@@ -2013,13 +1934,12 @@ std::size_t ScOrcusImportFillStyle::commit()
return mrFills.size() - 1;
}
-ScOrcusImportBorderStyle::ScOrcusImportBorderStyle(
std::vector<ScOrcusBorder>& rBorders ) :
- mrBorders(rBorders)
+ScOrcusImportBorderStyle::ScOrcusImportBorderStyle(std::vector<ScOrcusBorder>&
rBorders)
+ : mrBorders(rBorders)
{
}
-void ScOrcusImportBorderStyle::set_style(
- os::border_direction_t dir, os::border_style_t style)
+void ScOrcusImportBorderStyle::set_style(os::border_direction_t dir,
os::border_style_t style)
{
ScOrcusBorder::BorderLine& rBorderLine = maCurrentBorder.maBorders[dir];
@@ -2082,25 +2002,22 @@ void ScOrcusImportBorderStyle::set_style(
case os::border_style_t::none:
rBorderLine.mnWidth = oox::xls::API_LINE_NONE;
break;
- default:
- ;
+ default:;
}
}
-void ScOrcusImportBorderStyle::set_color(
- os::border_direction_t dir, os::color_elem_t alpha, os::color_elem_t red,
- os::color_elem_t green, os::color_elem_t blue)
+void ScOrcusImportBorderStyle::set_color(os::border_direction_t dir,
os::color_elem_t alpha,
+ os::color_elem_t red,
os::color_elem_t green,
+ os::color_elem_t blue)
{
ScOrcusBorder::BorderLine& rBorderLine = maCurrentBorder.maBorders[dir];
rBorderLine.maColor = Color(ColorAlpha, alpha, red, green, blue);
}
-void ScOrcusImportBorderStyle::reset()
-{
- maCurrentBorder = ScOrcusBorder();
-}
+void ScOrcusImportBorderStyle::reset() { maCurrentBorder = ScOrcusBorder(); }
-void ScOrcusImportBorderStyle::set_width(os::border_direction_t dir, double
val, orcus::length_unit_t unit)
+void ScOrcusImportBorderStyle::set_width(os::border_direction_t dir, double
val,
+ orcus::length_unit_t unit)
{
ScOrcusBorder::BorderLine& rBorderLine = maCurrentBorder.maBorders[dir];
rBorderLine.mnWidth = translateToInternal(val, unit);
@@ -2114,32 +2031,24 @@ std::size_t ScOrcusImportBorderStyle::commit()
return mrBorders.size() - 1;
}
-ScOrcusImportCellProtection::ScOrcusImportCellProtection(
std::vector<ScOrcusProtection>& rProtections ) :
- mrProtections(rProtections)
+ScOrcusImportCellProtection::ScOrcusImportCellProtection(
+ std::vector<ScOrcusProtection>& rProtections)
+ : mrProtections(rProtections)
{
}
-void ScOrcusImportCellProtection::reset()
-{
- maCurrentProtection = ScOrcusProtection();
-}
+void ScOrcusImportCellProtection::reset() { maCurrentProtection =
ScOrcusProtection(); }
-void ScOrcusImportCellProtection::set_hidden(bool b)
-{
- maCurrentProtection.mbHidden = b;
-}
+void ScOrcusImportCellProtection::set_hidden(bool b) {
maCurrentProtection.mbHidden = b; }
-void ScOrcusImportCellProtection::set_locked(bool b)
-{
- maCurrentProtection.mbLocked = b;
-}
+void ScOrcusImportCellProtection::set_locked(bool b) {
maCurrentProtection.mbLocked = b; }
-void ScOrcusImportCellProtection::set_print_content(bool b )
+void ScOrcusImportCellProtection::set_print_content(bool b)
{
maCurrentProtection.mbPrintContent = b;
}
-void ScOrcusImportCellProtection::set_formula_hidden(bool b )
+void ScOrcusImportCellProtection::set_formula_hidden(bool b)
{
maCurrentProtection.mbFormulaHidden = b;
}
@@ -2152,19 +2061,16 @@ std::size_t ScOrcusImportCellProtection::commit()
return mrProtections.size() - 1;
}
-ScOrcusImportNumberFormat::ScOrcusImportNumberFormat( ScOrcusFactory&
rFactory, std::vector<ScOrcusNumberFormat>& rFormats ) :
- mrFactory(rFactory), mrNumberFormats(rFormats)
+ScOrcusImportNumberFormat::ScOrcusImportNumberFormat(ScOrcusFactory& rFactory,
+
std::vector<ScOrcusNumberFormat>& rFormats)
+ : mrFactory(rFactory)
+ , mrNumberFormats(rFormats)
{
}
-void ScOrcusImportNumberFormat::reset()
-{
- maCurrentFormat = ScOrcusNumberFormat();
-}
+void ScOrcusImportNumberFormat::reset() { maCurrentFormat =
ScOrcusNumberFormat(); }
-void ScOrcusImportNumberFormat::set_identifier(std::size_t /*id*/)
-{
-}
+void ScOrcusImportNumberFormat::set_identifier(std::size_t /*id*/) {}
void ScOrcusImportNumberFormat::set_code(std::string_view s)
{
@@ -2180,42 +2086,36 @@ std::size_t ScOrcusImportNumberFormat::commit()
return mrNumberFormats.size() - 1;
}
-ScOrucsImportCellStyle::ScOrucsImportCellStyle(
- ScOrcusFactory& rFactory, ScOrcusStyles& rStyles, const
std::vector<ScOrcusXf>& rXfs ) :
- mrFactory(rFactory),
- mrStyles(rStyles),
- mrXfs(rXfs)
+ScOrucsImportCellStyle::ScOrucsImportCellStyle(ScOrcusFactory& rFactory,
ScOrcusStyles& rStyles,
+ const std::vector<ScOrcusXf>&
rXfs)
+ : mrFactory(rFactory)
+ , mrStyles(rStyles)
+ , mrXfs(rXfs)
{
}
-void ScOrucsImportCellStyle::reset()
-{
- maCurrentStyle = ScOrcusCellStyle();
-}
+void ScOrucsImportCellStyle::reset() { maCurrentStyle = ScOrcusCellStyle(); }
void ScOrucsImportCellStyle::set_name(std::string_view name)
{
- maCurrentStyle.maName = OUString(name.data(), name.size(),
mrFactory.getGlobalSettings().getTextEncoding());
+ maCurrentStyle.maName
+ = OUString(name.data(), name.size(),
mrFactory.getGlobalSettings().getTextEncoding());
}
void ScOrucsImportCellStyle::set_display_name(std::string_view name)
{
- maCurrentStyle.maDisplayName = OUString(name.data(), name.size(),
mrFactory.getGlobalSettings().getTextEncoding());
+ maCurrentStyle.maDisplayName
+ = OUString(name.data(), name.size(),
mrFactory.getGlobalSettings().getTextEncoding());
}
-void ScOrucsImportCellStyle::set_xf(size_t index)
-{
- maCurrentStyle.mnXFId = index;
-}
+void ScOrucsImportCellStyle::set_xf(size_t index) { maCurrentStyle.mnXFId =
index; }
-void ScOrucsImportCellStyle::set_builtin(size_t index)
-{
- maCurrentStyle.mnBuiltInId = index;
-}
+void ScOrucsImportCellStyle::set_builtin(size_t index) {
maCurrentStyle.mnBuiltInId = index; }
void ScOrucsImportCellStyle::set_parent_name(std::string_view name)
{
- maCurrentStyle.maParentName = OUString(name.data(), name.size(),
mrFactory.getGlobalSettings().getTextEncoding());
+ maCurrentStyle.maParentName
+ = OUString(name.data(), name.size(),
mrFactory.getGlobalSettings().getTextEncoding());
}
void ScOrucsImportCellStyle::commit()
@@ -2233,9 +2133,8 @@ void ScOrucsImportCellStyle::commit()
ScStyleSheetPool* pPool = mrFactory.getDoc().getDoc().GetStyleSheetPool();
SfxStyleSheetBase& rBase = pPool->Make(maCurrentStyle.maName,
SfxStyleFamily::Para);
// Need to convert the parent name to localized UI name, see tdf#139205.
- rBase.SetParent(
- ScStyleNameConversion::ProgrammaticToDisplayName(
- maCurrentStyle.maParentName, SfxStyleFamily::Para));
+
rBase.SetParent(ScStyleNameConversion::ProgrammaticToDisplayName(maCurrentStyle.maParentName,
+
SfxStyleFamily::Para));
SfxItemSet& rSet = rBase.GetItemSet();
const ScOrcusXf& rXf = mrXfs[maCurrentStyle.mnXFId];
@@ -2244,46 +2143,25 @@ void ScOrucsImportCellStyle::commit()
maCurrentStyle = ScOrcusCellStyle();
}
-void ScOrcusImportXf::reset( std::vector<ScOrcusXf>& rXfs )
+void ScOrcusImportXf::reset(std::vector<ScOrcusXf>& rXfs)
{
mpXfs = &rXfs;
maCurrentXf = ScOrcusXf();
}
-void ScOrcusImportXf::set_font(std::size_t index)
-{
- maCurrentXf.mnFontId = index;
-}
+void ScOrcusImportXf::set_font(std::size_t index) { maCurrentXf.mnFontId =
index; }
-void ScOrcusImportXf::set_fill(std::size_t index)
-{
- maCurrentXf.mnFillId = index;
-}
+void ScOrcusImportXf::set_fill(std::size_t index) { maCurrentXf.mnFillId =
index; }
-void ScOrcusImportXf::set_border(std::size_t index)
-{
- maCurrentXf.mnBorderId = index;
-}
+void ScOrcusImportXf::set_border(std::size_t index) { maCurrentXf.mnBorderId =
index; }
-void ScOrcusImportXf::set_protection(std::size_t index)
-{
- maCurrentXf.mnProtectionId = index;
-}
+void ScOrcusImportXf::set_protection(std::size_t index) {
maCurrentXf.mnProtectionId = index; }
-void ScOrcusImportXf::set_number_format(std::size_t index)
-{
- maCurrentXf.mnNumberFormatId = index;
-}
+void ScOrcusImportXf::set_number_format(std::size_t index) {
maCurrentXf.mnNumberFormatId = index; }
-void ScOrcusImportXf::set_style_xf(std::size_t index)
-{
- maCurrentXf.mnStyleXf = index;
-}
+void ScOrcusImportXf::set_style_xf(std::size_t index) { maCurrentXf.mnStyleXf
= index; }
-void ScOrcusImportXf::set_apply_alignment(bool b)
-{
- maCurrentXf.mbApplyAlignment = b;
-}
+void ScOrcusImportXf::set_apply_alignment(bool b) {
maCurrentXf.mbApplyAlignment = b; }
void ScOrcusImportXf::set_horizontal_alignment(os::hor_alignment_t align)
{
@@ -2308,8 +2186,7 @@ void
ScOrcusImportXf::set_horizontal_alignment(os::hor_alignment_t align)
case os::hor_alignment_t::unknown:
maCurrentXf.meHorAlignment = SvxCellHorJustify::Standard;
break;
- default:
- ;
+ default:;
}
maCurrentXf.mbApplyAlignment = true;
}
@@ -2337,21 +2214,14 @@ void
ScOrcusImportXf::set_vertical_alignment(os::ver_alignment_t align)
case os::ver_alignment_t::unknown:
maCurrentXf.meVerAlignment = SvxCellVerJustify::Standard;
break;
- default:
- ;
+ default:;
}
maCurrentXf.mbApplyAlignment = true;
}
-void ScOrcusImportXf::set_wrap_text(bool b)
-{
- maCurrentXf.mbWrapText = b;
-}
+void ScOrcusImportXf::set_wrap_text(bool b) { maCurrentXf.mbWrapText = b; }
-void ScOrcusImportXf::set_shrink_to_fit(bool b)
-{
- maCurrentXf.mbShrinkToFit = b;
-}
+void ScOrcusImportXf::set_shrink_to_fit(bool b) { maCurrentXf.mbShrinkToFit =
b; }
std::size_t ScOrcusImportXf::commit()
{
@@ -2359,15 +2229,14 @@ std::size_t ScOrcusImportXf::commit()
return mpXfs->size() - 1;
}
-
-ScOrcusStyles::ScOrcusStyles( ScOrcusFactory& rFactory, bool
bSkipDefaultStyles ) :
- mrFactory(rFactory),
- maFontStyle(rFactory, maFonts),
- maFillStyle(maFills),
- maBorderStyle(maBorders),
- maCellProtection(maProtections),
- maNumberFormat(rFactory, maNumberFormats),
- maCellStyle(rFactory, *this, maCellStyleXfs)
+ScOrcusStyles::ScOrcusStyles(ScOrcusFactory& rFactory, bool bSkipDefaultStyles)
+ : mrFactory(rFactory)
+ , maFontStyle(rFactory, maFonts)
+ , maFillStyle(maFills)
+ , maBorderStyle(maBorders)
+ , maCellProtection(maProtections)
+ , maNumberFormat(rFactory, maNumberFormats)
+ , maCellStyle(rFactory, *this, maCellStyleXfs)
{
ScDocument& rDoc = rFactory.getDoc().getDoc();
if (!bSkipDefaultStyles && !rDoc.GetStyleSheetPool()->HasStandardStyles())
@@ -2386,7 +2255,7 @@ std::ostream& operator<<(std::ostream& rStrm, const
Color& rColor)
}
*/
-void ScOrcusStyles::applyXfToItemSet( SfxItemSet& rSet, const ScOrcusXf& rXf )
+void ScOrcusStyles::applyXfToItemSet(SfxItemSet& rSet, const ScOrcusXf& rXf)
{
size_t nFontId = rXf.mnFontId;
if (nFontId >= maFonts.size())
@@ -2447,7 +2316,7 @@ void ScOrcusStyles::applyXfToItemSet( SfxItemSet& rSet,
const ScOrcusXf& rXf )
rSet.Put(ScShrinkToFitCell(*rXf.mbShrinkToFit));
}
-void ScOrcusStyles::applyXfToItemSet( SfxItemSet& rSet, std::size_t xfId )
+void ScOrcusStyles::applyXfToItemSet(SfxItemSet& rSet, std::size_t xfId)
{
SAL_INFO("sc.orcus.style", "applyXfToitemSet: " << xfId);
if (maCellXfs.size() <= xfId)
@@ -2516,28 +2385,16 @@ os::iface::import_cell_style*
ScOrcusStyles::start_cell_style()
return &maCellStyle;
}
-void ScOrcusStyles::set_font_count(size_t /*n*/)
-{
-}
+void ScOrcusStyles::set_font_count(size_t /*n*/) {}
-void ScOrcusStyles::set_fill_count(size_t /*n*/)
-{
-}
+void ScOrcusStyles::set_fill_count(size_t /*n*/) {}
-void ScOrcusStyles::set_border_count(size_t /*n*/)
-{
-}
+void ScOrcusStyles::set_border_count(size_t /*n*/) {}
-void ScOrcusStyles::set_number_format_count(size_t /*n*/)
-{
-}
+void ScOrcusStyles::set_number_format_count(size_t /*n*/) {}
-void ScOrcusStyles::set_xf_count(os::xf_category_t /*cat*/, size_t /*n*/)
-{
-}
+void ScOrcusStyles::set_xf_count(os::xf_category_t /*cat*/, size_t /*n*/) {}
-void ScOrcusStyles::set_cell_style_count(size_t /*n*/)
-{
-}
+void ScOrcusStyles::set_cell_style_count(size_t /*n*/) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/orcus/xmlcontext.cxx
b/sc/source/filter/orcus/xmlcontext.cxx
index 1588fad3424f..8a15a52ad3a4 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -31,30 +31,36 @@
#include <string>
#include <sstream>
-namespace com::sun::star::ucb { class XCommandEnvironment; }
+namespace com::sun::star::ucb
+{
+class XCommandEnvironment;
+}
#define BUFFER_SIZE 4096
using namespace com::sun::star;
-namespace {
-
+namespace
+{
ScOrcusXMLTreeParam::EntryData& setUserDataToEntry(weld::TreeView& rControl,
- const weld::TreeIter& rEntry, ScOrcusXMLTreeParam::UserDataStoreType&
rStore, ScOrcusXMLTreeParam::EntryType eType)
+ const weld::TreeIter&
rEntry,
+
ScOrcusXMLTreeParam::UserDataStoreType& rStore,
+
ScOrcusXMLTreeParam::EntryType eType)
{
rStore.push_back(std::make_unique<ScOrcusXMLTreeParam::EntryData>(eType));
rControl.set_id(rEntry, weld::toId(rStore.back().get()));
return *rStore.back();
}
-void setEntityNameToUserData(
- ScOrcusXMLTreeParam::EntryData& rEntryData,
- const orcus::xml_structure_tree::entity_name& entity, const
orcus::xml_structure_tree::walker& walker)
+void setEntityNameToUserData(ScOrcusXMLTreeParam::EntryData& rEntryData,
+ const orcus::xml_structure_tree::entity_name&
entity,
+ const orcus::xml_structure_tree::walker& walker)
{
rEntryData.mnNamespaceID = walker.get_xmlns_index(entity.ns);
}
-OUString toString(const orcus::xml_structure_tree::entity_name& entity, const
orcus::xml_structure_tree::walker& walker)
+OUString toString(const orcus::xml_structure_tree::entity_name& entity,
+ const orcus::xml_structure_tree::walker& walker)
{
OUStringBuffer aBuf;
if (entity.ns)
@@ -68,18 +74,17 @@ OUString toString(const
orcus::xml_structure_tree::entity_name& entity, const or
return aBuf.makeStringAndClear();
}
-void populateTree(
- weld::TreeView& rTreeCtrl, orcus::xml_structure_tree::walker& rWalker,
- const orcus::xml_structure_tree::entity_name& rElemName, bool bRepeat,
- const weld::TreeIter* pParent, ScOrcusXMLTreeParam& rParam)
+void populateTree(weld::TreeView& rTreeCtrl,
orcus::xml_structure_tree::walker& rWalker,
+ const orcus::xml_structure_tree::entity_name& rElemName,
bool bRepeat,
+ const weld::TreeIter* pParent, ScOrcusXMLTreeParam& rParam)
{
OUString sEntry(toString(rElemName, rWalker));
std::unique_ptr<weld::TreeIter> xEntry(rTreeCtrl.make_iterator());
rTreeCtrl.insert(pParent, -1, &sEntry, nullptr, nullptr, nullptr, false,
xEntry.get());
rTreeCtrl.set_image(*xEntry, rParam.maImgElementDefault, -1);
- ScOrcusXMLTreeParam::EntryData& rEntryData = setUserDataToEntry(rTreeCtrl,
- *xEntry, rParam.m_UserDataStore,
+ ScOrcusXMLTreeParam::EntryData& rEntryData = setUserDataToEntry(
+ rTreeCtrl, *xEntry, rParam.m_UserDataStore,
bRepeat ? ScOrcusXMLTreeParam::ElementRepeat :
ScOrcusXMLTreeParam::ElementDefault);
setEntityNameToUserData(rEntryData, rElemName, rWalker);
@@ -87,7 +92,7 @@ void populateTree(
if (bRepeat)
{
// Recurring elements use different icon.
- rTreeCtrl.set_image(*xEntry, rParam.maImgElementRepeat, -1);
+ rTreeCtrl.set_image(*xEntry, rParam.maImgElementRepeat, -1);
}
orcus::xml_structure_tree::entity_names_type aNames =
rWalker.get_attributes();
@@ -99,8 +104,8 @@ void populateTree(
std::unique_ptr<weld::TreeIter> xAttr(rTreeCtrl.make_iterator());
rTreeCtrl.insert(xEntry.get(), -1, &sAttr, nullptr, nullptr, nullptr,
false, xAttr.get());
- ScOrcusXMLTreeParam::EntryData& rAttrData =
- setUserDataToEntry(rTreeCtrl, *xAttr, rParam.m_UserDataStore,
ScOrcusXMLTreeParam::Attribute);
+ ScOrcusXMLTreeParam::EntryData& rAttrData = setUserDataToEntry(
+ rTreeCtrl, *xAttr, rParam.m_UserDataStore,
ScOrcusXMLTreeParam::Attribute);
setEntityNameToUserData(rAttrData, rAttrName, rWalker);
rTreeCtrl.set_image(*xAttr, rParam.maImgAttribute, -1);
@@ -123,22 +128,21 @@ void populateTree(
class TreeUpdateSwitch
{
weld::TreeView& mrTreeCtrl;
+
public:
- explicit TreeUpdateSwitch(weld::TreeView& rTreeCtrl) :
mrTreeCtrl(rTreeCtrl)
+ explicit TreeUpdateSwitch(weld::TreeView& rTreeCtrl)
+ : mrTreeCtrl(rTreeCtrl)
{
mrTreeCtrl.freeze();
}
- ~TreeUpdateSwitch()
- {
- mrTreeCtrl.thaw();
- }
+ ~TreeUpdateSwitch() { mrTreeCtrl.thaw(); }
};
void loadContentFromURL(const OUString& rURL, std::string& rStrm)
{
- ucbhelper::Content aContent(
- rURL, uno::Reference<ucb::XCommandEnvironment>(),
comphelper::getProcessComponentContext());
+ ucbhelper::Content aContent(rURL,
uno::Reference<ucb::XCommandEnvironment>(),
+ comphelper::getProcessComponentContext());
uno::Reference<io::XInputStream> xStrm = aContent.openStream();
std::ostringstream aStrmBuf;
@@ -149,16 +153,18 @@ void loadContentFromURL(const OUString& rURL,
std::string& rStrm)
nBytesRead = xStrm->readBytes(aBytes, BUFFER_SIZE);
const sal_Int8* p = aBytes.getConstArray();
aStrmBuf << std::string(p, p + nBytesRead);
- }
- while (nBytesRead == BUFFER_SIZE);
+ } while (nBytesRead == BUFFER_SIZE);
rStrm = aStrmBuf.str();
}
-
}
-ScOrcusXMLContextImpl::ScOrcusXMLContextImpl(ScDocument& rDoc, OUString aPath)
:
- ScOrcusXMLContext(), mrDoc(rDoc), maPath(std::move(aPath)) {}
+ScOrcusXMLContextImpl::ScOrcusXMLContextImpl(ScDocument& rDoc, OUString aPath)
+ : ScOrcusXMLContext()
+ , mrDoc(rDoc)
+ , maPath(std::move(aPath))
+{
+}
ScOrcusXMLContextImpl::~ScOrcusXMLContextImpl() {}
@@ -196,7 +202,7 @@ void
ScOrcusXMLContextImpl::loadXMLStructure(weld::TreeView& rTreeCtrl, ScOrcusX
SAL_WARN("sc.orcus", "parsing failed with an unknown error " <<
e.what());
}
- rTreeCtrl.all_foreach([&rTreeCtrl](weld::TreeIter& rEntry){
+ rTreeCtrl.all_foreach([&rTreeCtrl](weld::TreeIter& rEntry) {
rTreeCtrl.expand_row(rEntry);
return false;
});
@@ -235,10 +241,8 @@ void ScOrcusXMLContextImpl::importXML(const
ScOrcusImportXMLParam& rParam)
{
OUString aTabName;
mrDoc.GetName(rLink.maPos.Tab(), aTabName);
- filter.set_cell_link(
- rLink.maPath,
- aTabName.toUtf8(),
- rLink.maPos.Row(), rLink.maPos.Col());
+ filter.set_cell_link(rLink.maPath, aTabName.toUtf8(),
rLink.maPos.Row(),
+ rLink.maPos.Col());
}
// Set range links.
@@ -246,23 +250,16 @@ void ScOrcusXMLContextImpl::importXML(const
ScOrcusImportXMLParam& rParam)
{
OUString aTabName;
mrDoc.GetName(rLink.maPos.Tab(), aTabName);
- filter.start_range(
- aTabName.toUtf8(),
- rLink.maPos.Row(), rLink.maPos.Col());
+ filter.start_range(aTabName.toUtf8(), rLink.maPos.Row(),
rLink.maPos.Col());
std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(),
- [&filter](const OString& rFieldPath)
- {
- filter.append_field_link(rFieldPath, std::string_view());
- }
- );
-
- std::for_each(rLink.maRowGroups.begin(), rLink.maRowGroups.end(),
- [&filter] (const OString& rRowGroup)
- {
- filter.set_range_row_group(rRowGroup);
- }
- );
+ [&filter](const OString& rFieldPath) {
+ filter.append_field_link(rFieldPath,
std::string_view());
+ });
+
+ std::for_each(
+ rLink.maRowGroups.begin(), rLink.maRowGroups.end(),
-e
... etc. - the rest is truncated
