dev/null |binary sc/CppunitTest_sc_autoformatsobj.mk | 6 sc/Library_sc.mk | 1 sc/Library_scui.mk | 1 sc/Module_sc.mk | 1 sc/Package_res_xml.mk | 1 sc/inc/autoform.hxx | 200 - sc/inc/global.hxx | 1 sc/inc/pch/precompiled_scui.hxx | 1 sc/inc/scabstdlg.hxx | 4 sc/qa/extras/macros-test.cxx | 34 sc/qa/extras/scautoformatobj.cxx | 5 sc/qa/extras/scautoformatsobj.cxx | 4 sc/qa/uitest/calc_tests6/autoFormat.py | 5 sc/qa/uitest/calc_tests6/tdf91726_autoformat_existing_name.py | 10 sc/res/xml/tablestyles.xml | 1081 +++++++ sc/source/core/data/global.cxx | 7 sc/source/core/data/poolcach.cxx | 34 sc/source/core/data/table4.cxx | 256 - sc/source/core/tool/autoform.cxx | 1084 ++----- sc/source/ui/attrdlg/scdlgfact.cxx | 21 sc/source/ui/attrdlg/scdlgfact.hxx | 4 sc/source/ui/docshell/docfunc.cxx | 3 sc/source/ui/inc/autofmt.hxx | 92 sc/source/ui/inc/scuiautofmt.hxx | 80 sc/source/ui/miscdlgs/autofmt.cxx | 532 --- sc/source/ui/miscdlgs/scuiautofmt.cxx | 389 -- sc/source/ui/unoobj/afmtuno.cxx | 113 sc/source/ui/unoobj/cellsuno.cxx | 15 sc/source/ui/view/cellsh3.cxx | 30 sfx2/source/dialog/StyleList.cxx | 5 solenv/clang-format/excludelist | 3 sw/CppunitTest_sw_core_doc.mk | 1 sw/Library_swui.mk | 2 sw/inc/doc.hxx | 5 sw/inc/pch/precompiled_swui.hxx | 1 sw/inc/strings.hrc | 2 sw/inc/swabstdlg.hxx | 3 sw/inc/tblafmt.hxx | 315 -- sw/inc/unostyle.hxx | 13 sw/qa/core/doc/doc.cxx | 87 sw/qa/core/uwriter.cxx | 287 - sw/qa/extras/embedded_fonts/embedded_fonts.cxx | 5 sw/qa/extras/odfexport/odfexport3.cxx | 78 sw/qa/extras/uiwriter/data/tdf143244.odt |binary sw/qa/extras/uiwriter/uiwriter4.cxx | 16 sw/qa/extras/uiwriter/uiwriter8.cxx | 15 sw/qa/python/check_styles.py | 7 sw/qa/python/check_table.py | 4 sw/qa/uitest/table/tdf109083.py | 4 sw/qa/uitest/table/tdf116737.py | 2 sw/sdi/_tabsh.sdi | 7 sw/source/core/doc/doc.cxx | 12 sw/source/core/doc/tblafmt.cxx | 1449 +++------- sw/source/core/docnode/ndtbl.cxx | 264 + sw/source/core/frmedt/fetab.cxx | 3 sw/source/core/undo/untbl.cxx | 42 sw/source/core/unocore/unostyle.cxx | 532 +-- sw/source/filter/html/htmltab.cxx | 9 sw/source/ui/dbui/dbinsdlg.cxx | 22 sw/source/ui/dialog/swdlgfact.cxx | 22 sw/source/ui/dialog/swdlgfact.hxx | 4 sw/source/ui/table/autoformatpreview.cxx | 476 --- sw/source/ui/table/convert.cxx | 58 sw/source/ui/table/instable.cxx | 17 sw/source/ui/table/tautofmt.cxx | 404 -- sw/source/uibase/app/docst.cxx | 35 sw/source/uibase/app/docstyle.cxx | 37 sw/source/uibase/inc/autoformatpreview.hxx | 79 sw/source/uibase/inc/convert.hxx | 4 sw/source/uibase/inc/instable.hxx | 4 sw/source/uibase/inc/tautofmt.hxx | 90 sw/source/uibase/shells/basesh.cxx | 30 sw/source/uibase/shells/tabsh.cxx | 37 xmloff/source/style/prstylei.cxx | 4 xmloff/source/table/XMLTableExport.cxx | 2 76 files changed, 3041 insertions(+), 5472 deletions(-)
New commits: commit 513bfbd476113f648090a8275cece4dc04ba0463 Author: Karthik <[email protected]> AuthorDate: Wed Aug 20 15:58:21 2025 +0530 Commit: Heiko Tietze <[email protected]> CommitDate: Wed Feb 4 14:02:26 2026 +0100 Writer: Adapt 'SvxAutoFormat' Adapt Writer to use new 'SvxAutoFormat' and retire Writer specific 'AutoFormat' dialog and preview. Change-Id: I272ff0d4415d9f13402374c8ad7b6721ed749931 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190027 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> Tested-by: Heiko Tietze <[email protected]> diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx index 589b847f4a62..8af452c0cac0 100644 --- a/sfx2/source/dialog/StyleList.cxx +++ b/sfx2/source/dialog/StyleList.cxx @@ -208,11 +208,6 @@ void StyleList::CreateContextMenu() mxMenu->set_sensitive(u"show"_ustr, m_bCanShow); const SfxStyleFamilyItem* pItem = GetFamilyItem(); - if (pItem && pItem->GetFamily() == SfxStyleFamily::Table) //tdf#101648, no ui for this yet - { - mxMenu->set_sensitive(u"edit"_ustr, false); - mxMenu->set_sensitive(u"new"_ustr, false); - } if (pItem && pItem->GetFamily() == SfxStyleFamily::Pseudo) { const OUString aTemplName(GetSelectedEntry()); diff --git a/sw/CppunitTest_sw_core_doc.mk b/sw/CppunitTest_sw_core_doc.mk index 6c0aec27e9aa..5660f710e0dd 100644 --- a/sw/CppunitTest_sw_core_doc.mk +++ b/sw/CppunitTest_sw_core_doc.mk @@ -37,6 +37,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_doc, \ svt \ tl \ svl \ + svx \ )) $(eval $(call gb_CppunitTest_use_externals,sw_core_doc,\ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 016519430421..3642ec7292fe 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -161,13 +161,11 @@ $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/misc/titlepage \ sw/source/ui/table/colwd \ sw/source/ui/table/convert \ - sw/source/ui/table/autoformatpreview \ sw/source/ui/table/instable \ sw/source/ui/table/mergetbl \ sw/source/ui/table/rowht \ sw/source/ui/table/splittbl \ sw/source/ui/table/tabledlg \ - sw/source/ui/table/tautofmt \ sw/source/ui/utlui/swrenamexnameddlg \ sw/source/ui/utlui/copyfielddlg \ )) diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 13d74f056df6..763b54bca272 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -21,9 +21,11 @@ // SwDoc interfaces #include <o3tl/typed_flags_set.hxx> #include <o3tl/sorted_vector.hxx> +#include <string_view> #include <vcl/idle.hxx> #include "swdllapi.h" #include "swtypes.hxx" +#include "tblafmt.hxx" #include "toxe.hxx" #include "flyenum.hxx" #include "flypos.hxx" @@ -1275,6 +1277,9 @@ public: { return const_cast<SwDoc*>(this)->GetTableStyles(); } + + // Reapply styles to tables in the doc + void ResetTableStyles(const OUString& sTableStyle, std::u16string_view sOldName); /// Counts table styles without triggering lazy-load of them. bool HasTableStyles() const { return m_pTableStyles != nullptr; } // Create a new table style. Tracked by Undo. diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index ec15ae747924..c6bda73b11c3 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -553,7 +553,6 @@ #include <SwNumberTreeTypes.hxx> #include <SwRewriter.hxx> #include <SwStyleNameMapper.hxx> -#include <autoformatpreview.hxx> #include <bparr.hxx> #include <calbck.hxx> #include <charfmt.hxx> diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc index 99e23aab3110..d149ec8e09e5 100644 --- a/sw/inc/strings.hrc +++ b/sw/inc/strings.hrc @@ -235,7 +235,7 @@ #define STR_COLUMN_VALUESET_ITEM3 NC_("STR_COLUMN_VALUESET_ITEM3", "2 columns with different size (left > right)") #define STR_COLUMN_VALUESET_ITEM4 NC_("STR_COLUMN_VALUESET_ITEM4", "2 columns with different size (left < right)") // Table styles, Writer internal, others are taken from Svx -#define STR_TABSTYLE_DEFAULT NC_("STR_TABSTYLE_DEFAULT", "Default Table Style") +#define STR_TABSTYLE_DEFAULT NC_("STR_TABSTYLE_DEFAULT", "Default Style") #define STR_PARAGRAPHSTYLEFAMILY NC_("STR_PARAGRAPHSTYLEFAMILY", "Paragraph Styles") #define STR_CHARACTERSTYLEFAMILY NC_("STR_CHARACTERSTYLEFAMILY", "Character Styles") diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index bac073b696b1..433cee285a52 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -538,9 +538,6 @@ public: virtual VclPtr<VclAbstractDialog> CreateSwColumnDialog(weld::Window *pParent, SwWrtShell &rSh) = 0; virtual VclPtr<AbstractSplitTableDialog> CreateSplitTableDialog(weld::Window* pParent, SwWrtShell &rSh) = 0; - virtual VclPtr<AbstractSwAutoFormatDlg> CreateSwAutoFormatDlg(weld::Window* pParent, SwWrtShell* pShell, - bool bSetAutoFormat = true, - const SwTableAutoFormat* pSelFormat = nullptr ) = 0; virtual VclPtr<SfxAbstractDialog> CreateSwBorderDlg(weld::Window* pParent, SfxItemSet& rSet, SwBorderModes nType) = 0; virtual VclPtr<SfxAbstractDialog> CreateSwWrapDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pSh) = 0; diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index db9e1391ac6f..4520a568597d 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -18,15 +18,6 @@ */ #ifndef INCLUDED_SW_INC_TBLAFMT_HXX #define INCLUDED_SW_INC_TBLAFMT_HXX -/* - * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - * - * The structure of table auto formatting should not be changed. It is used - * by different code of Writer and Calc. If a change is necessary, the - * source code of both applications must be changed! - * - * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - */ #include <memory> @@ -36,223 +27,124 @@ #include <svx/autoformathelper.hxx> #include <unotools/weakref.hxx> #include <rtl/ref.hxx> +#include <svx/TableAutoFmt.hxx> #include "fmtornt.hxx" +#include "node.hxx" #include "swdllapi.h" -struct SwAfVersions; +using namespace Autoformat; class SvNumberFormatter; class SwTable; class SwXTextCellStyle; class SwXTextTableStyle; -class SW_DLLPUBLIC SwAutoFormatProps : public AutoFormatBase +class SW_DLLPUBLIC SwBoxAutoFormat : public SvxAutoFormatDataField { private: - // Writer specific - std::unique_ptr<SvxFrameDirectionItem> m_aTextOrientation; - std::unique_ptr<SwFormatVertOrient> m_aVerticalAlignment; + std::unique_ptr<SvxFrameDirectionItem> m_aTextOrientation; + std::unique_ptr<SwFormatVertOrient> m_aVerticalAlignment; - // number format - OUString m_sNumFormatString; - LanguageType m_eSysLanguage; - LanguageType m_eNumFormatLanguage; + // associated UNO object, if such exists + unotools::WeakReference<SwXTextCellStyle> m_xAutoFormatUnoObject; public: - SwAutoFormatProps(); - SwAutoFormatProps(const SwAutoFormatProps& rNew); - ~SwAutoFormatProps(); + SwBoxAutoFormat(); + SwBoxAutoFormat(const SwBoxAutoFormat& rNew); + SwBoxAutoFormat(const SvxAutoFormatDataField& rNew); + ~SwBoxAutoFormat(); /// assignment-op (still used) - SwAutoFormatProps& operator=(const SwAutoFormatProps& rRef); + SwBoxAutoFormat& operator=(const SwBoxAutoFormat& rRef); /// Comparing based of boxes backgrounds. - bool operator==(const SwAutoFormatProps& rRight) const; + bool operator==(const SwBoxAutoFormat& rRight) const; - // The get-methods. const SvxFrameDirectionItem& GetTextOrientation() const { return *m_aTextOrientation; } const SwFormatVertOrient& GetVerticalAlignment() const { return *m_aVerticalAlignment; } - void GetValueFormat( OUString& rFormat, LanguageType& rLng, LanguageType& rSys ) const - { rFormat = m_sNumFormatString; rLng = m_eNumFormatLanguage; rSys = m_eSysLanguage; } - - const OUString& GetNumFormatString() const { return m_sNumFormatString; } - const LanguageType& GetSysLanguage() const { return m_eSysLanguage; } - const LanguageType& GetNumFormatLanguage() const { return m_eNumFormatLanguage; } - - // The set-methods. - void SetTextOrientation( const SvxFrameDirectionItem& rNew ) { m_aTextOrientation.reset(rNew.Clone()); } - void SetVerticalAlignment( const SwFormatVertOrient& rNew ) { m_aVerticalAlignment.reset(rNew.Clone()); } - - void SetValueFormat( const OUString& rFormat, LanguageType eLng, LanguageType eSys ) - { m_sNumFormatString = rFormat; m_eNumFormatLanguage = eLng; m_eSysLanguage = eSys; } - - void SetNumFormatString(const OUString& rNew) { m_sNumFormatString = rNew; } - void SetSysLanguage(const LanguageType& rNew) { m_eSysLanguage = rNew; } - void SetNumFormatLanguage(const LanguageType& rNew) { m_eNumFormatLanguage = rNew; } - - bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer ); - bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const; -}; - -class SW_DLLPUBLIC SwBoxAutoFormat -{ -private: - o3tl::cow_wrapper<SwAutoFormatProps> m_aAutoFormat; + void SetTextOrientation(const SvxFrameDirectionItem& rNew) + { + m_aTextOrientation.reset(rNew.Clone()); + } + void SetVerticalAlignment(const SwFormatVertOrient& rNew) + { + m_aVerticalAlignment.reset(rNew.Clone()); + } - // associated UNO object, if such exists - unotools::WeakReference<SwXTextCellStyle> m_xAutoFormatUnoObject; + void UpdateAlignment(bool bSvxUpdate = false); -public: unotools::WeakReference<SwXTextCellStyle> const& GetXObject() const - { return m_xAutoFormatUnoObject; } + { + return m_xAutoFormatUnoObject; + } void SetXObject(rtl::Reference<SwXTextCellStyle> const& xObject); - - const SwAutoFormatProps& GetProps() const { return *m_aAutoFormat; } - SwAutoFormatProps& GetProps() { return *m_aAutoFormat; } }; -enum class SwTableAutoFormatUpdateFlags { Char = 1, Box = 2 }; -namespace o3tl { - template<> struct typed_flags<SwTableAutoFormatUpdateFlags> : is_typed_flags<SwTableAutoFormatUpdateFlags, 0x03> {}; +enum class SwTableAutoFormatUpdateFlags +{ + Char = 1, + Box = 2 +}; +namespace o3tl +{ +template <> +struct typed_flags<SwTableAutoFormatUpdateFlags> + : is_typed_flags<SwTableAutoFormatUpdateFlags, 0x03> +{ +}; }; -/* -@remarks -A table has a number of lines. These lines seem to correspond with rows, except in the case of -rows spanning more than one line. Each line contains a number of boxes/cells. - -AutoFormat properties are retrieved and stored in a grid of 16 table boxes. A sampling approach -is used to read the data. 4 lines are picked, and 4 boxes are picked from each. - -The line picking and box picking algorithms are similar. We start at the first line/box, and pick -lines/boxes one by one for a maximum of 3. The 4th line/box is the last line/box in the current -table/line. If we hit the end of lines/boxes, the last line/box encountered is picked several times. - -For example, in a 2x3 table, the 4 lines will be [0, 1, 1, 1]. In each line, the boxes will be -[0, 1, 2, 2]. In a 6x5 table, the 4 lines will be [0, 1, 2, 4] and the boxes per line will be -[0, 1, 2, 5]. - -As you can see, property extraction/application is lossless for tables that are 4x4 or smaller -(and in fact has a bit of redundancy). For larger tables, we lose any individual cell formatting -for the range [(3,rows - 1) -> (3, cols - 1)]. That formatting is replaced by formatting from -the saved cells: - - 0 1 2 3 4 5 - +-----------------------------------------------------------------------+ - 0 | Saved | Saved | Saved | | | Saved | - +-----------------------------------------------------------------------+ - 1 | Saved | Saved | Saved | | | Saved | - +-----------------------------------------------------------------------+ - 2 | Saved | Saved | Saved | | | Saved | - +-----------------------------------------------------------------------+ - 3 | | | | | | | - +-----------------------------------------------------------------------+ - 4 | | | | | | | - +-----------------------------------------------------------------------+ - 5 | Saved | Saved | Saved | | | Saved | - +-----------+-----------+-----------+-----------+-----------+-----------+ - -The properties saved are divided into three categories: - 1. Character properties: Font, font size, weight, etc. - 2. Box properties: Box, cell background - 3. Table properties: Properties that are set in the Table->Table Properties dialog. - -Character and box properties are stored per cell (and are lossy for tables larger than 4x4). Table -properties are stored per-table, and are lossless. -*/ -class SW_DLLPUBLIC SwTableAutoFormat +class SW_DLLPUBLIC SwTableAutoFormat : public SvxAutoFormatData { friend class SwDocTest; - friend void FinitCore(); // To destroy default pointer. - static SwBoxAutoFormat* s_pDefaultBoxAutoFormat; - - unotools::WeakReference<SwXTextTableStyle> m_xUnoTextTableStyle; + friend void FinitCore(); // To destroy default pointer. TableStyleName m_aName; // note that this could be a ProgName __or__ a UIName sal_uInt16 m_nStrResId; + bool m_bHidden; + bool m_bUserDefined; - // Common flags of Calc and Writer. - bool m_bInclFont : 1; - bool m_bInclJustify : 1; - bool m_bInclFrame : 1; - bool m_bInclBackground : 1; - bool m_bInclValueFormat : 1; - - // Calc specific flags. - bool m_bInclWidthHeight : 1; - - SwBoxAutoFormat* m_aBoxAutoFormat[ 16 ] = {}; + static SwBoxAutoFormat* s_pDefaultBoxAutoFormat; + std::array<std::unique_ptr<SwBoxAutoFormat>, ELEMENT_COUNT> m_aBoxAutoFormat; - // Writer-specific options - std::shared_ptr<SvxFormatKeepItem> m_aKeepWithNextPara; - sal_uInt16 m_aRepeatHeading; - bool m_bLayoutSplit; - bool m_bRowSplit; - bool m_bCollapsingBorders; - std::shared_ptr<SvxShadowItem> m_aShadow; + unotools::WeakReference<SwXTextTableStyle> m_xUnoTextTableStyle; - bool m_bHidden; - bool m_bUserDefined; public: - SwTableAutoFormat( const TableStyleName& aName ); - SwTableAutoFormat( const SwTableAutoFormat& rNew ); - ~SwTableAutoFormat(); + SwTableAutoFormat(const TableStyleName& aName); + SwTableAutoFormat(const SwTableAutoFormat& rNew); + SwTableAutoFormat(const SvxAutoFormatData& rNew); - SwTableAutoFormat& operator=( const SwTableAutoFormat& rNew ); + SwTableAutoFormat& operator=(const SwTableAutoFormat& rNew); - const SvxFormatKeepItem& GetKeepWithNextPara() const { return *m_aKeepWithNextPara; } - const SvxShadowItem& GetShadow() const { return *m_aShadow; } + void SetHidden(bool bHidden) { m_bHidden = bHidden; } + void SetUserDefined(bool bUserDefined) { m_bUserDefined = bUserDefined; } + void SetName(const TableStyleName& rNew); + void SetBoxFormat(const SwBoxAutoFormat& rNew, size_t nIndex); + void DisableAll(); - void SetKeepWithNextPara(const SvxFormatKeepItem& rNew) { m_aKeepWithNextPara.reset(rNew.Clone()); } - void SetShadow(const SvxShadowItem& rNew) { m_aShadow.reset(rNew.Clone()); } + bool IsHidden() const { return m_bHidden; } + bool IsUserDefined() const { return m_bUserDefined; } - void SetBoxFormat( const SwBoxAutoFormat& rNew, sal_uInt8 nPos ); - const SwBoxAutoFormat& GetBoxFormat( sal_uInt8 nPos ) const; - SwBoxAutoFormat& GetBoxFormat( sal_uInt8 nPos ); + const TableStyleName& GetName() const { return m_aName; } static const SwBoxAutoFormat& GetDefaultBoxFormat(); + size_t GetIndex(const SwBoxAutoFormat& rBoxFormat) const; - void SetName( const TableStyleName& rNew ) { m_aName = rNew; m_nStrResId = USHRT_MAX; } - const TableStyleName& GetName() const { return m_aName; } + void SetName(const OUString& rName) override; + SwBoxAutoFormat* GetField(size_t nIndex) override; + const SwBoxAutoFormat* GetField(size_t nIndex) const override; + bool SetField(size_t nIndex, const SvxAutoFormatDataField& aField) override; + SvxAutoFormatData* MakeCopy() const override { return new SwTableAutoFormat(*this); }; - void UpdateFromSet( sal_uInt8 nPos, const SfxItemSet& rSet, - SwTableAutoFormatUpdateFlags eFlags, SvNumberFormatter const * ); - // bCellSpansToEndV means either "single-row table", or "a cell that spans several rows till the - // bottom of the table", i.e. "include the bottom border properties in the set, in addition to - // the properties of its starting position (when eFlags include Box)". - // bCellSpansToEndH means either "single-column table", or "a cell that spans several columns - // till the right of the table", i.e. "include the right border properties in the set, in - // addition to the properties of its starting position (when eFlags include Box)". - void UpdateToSet( sal_uInt8 nPos, bool bCellSpansToEndV, bool bCellSpansToEndH, - SfxItemSet& rSet, SwTableAutoFormatUpdateFlags eFlags, - SvNumberFormatter* ) const ; - - void RestoreTableProperties(SwTable &table) const; - void StoreTableProperties(const SwTable &table); - - bool IsFont() const { return m_bInclFont; } - bool IsJustify() const { return m_bInclJustify; } - bool IsFrame() const { return m_bInclFrame; } - bool IsBackground() const { return m_bInclBackground; } - bool IsValueFormat() const { return m_bInclValueFormat; } - - /// Check if style is hidden. - bool IsHidden() const { return m_bHidden; } - /// Check if style is defined by user. - bool IsUserDefined() const { return m_bUserDefined; } + SwBoxAutoFormat* GetDefaultField() const override { return new SwBoxAutoFormat; } - void DisableAll(); - void SetFont( const bool bNew ) { m_bInclFont = bNew; } - void SetJustify( const bool bNew ) { m_bInclJustify = bNew; } - void SetFrame( const bool bNew ) { m_bInclFrame = bNew; } - void SetBackground( const bool bNew ) { m_bInclBackground = bNew; } - void SetValueFormat( const bool bNew ) { m_bInclValueFormat = bNew; } - void SetWidthHeight( const bool bNew ) { m_bInclWidthHeight = bNew; } - - /// Set if style is hidden. - void SetHidden(bool bHidden) { m_bHidden = bHidden; } - /// Set if style is user defined. - void SetUserDefined(bool bUserDefined) { m_bUserDefined = bUserDefined; } + void RestoreToOriginal(SwContentNode* rContentNode, SfxItemSet& aDummySet, size_t nRow, + size_t nCol, size_t nRows, size_t nCols) const; + void UpdateToSet(SfxItemSet& aItemSet, size_t nRow, size_t nCol, size_t nRows, size_t nCols, + SvNumberFormatter* pNFormatr) const; + void UpdateFromSet(size_t nPos, const SfxItemSet& rSet, SwTableAutoFormatUpdateFlags eFlags, + SvNumberFormatter const*); + void FillToItemSet(size_t nIndex, SfxItemSet& rItemSet, SvNumberFormatter* pNFormatr) const; /// These methods returns what style (row or column) is applied first on given Cell bool FirstRowEndColumnIsRow(); @@ -261,70 +153,63 @@ public: bool LastRowStartColumnIsRow(); bool HasHeaderRow() const; - bool Load( SvStream& rStream, const SwAfVersions& ); - bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const; - unotools::WeakReference<SwXTextTableStyle> const& GetXObject() const - { return m_xUnoTextTableStyle; } + { + return m_xUnoTextTableStyle; + } void SetXObject(rtl::Reference<SwXTextTableStyle> const& xObject); - - /// Returns the cell's name postfix. eg. ".1" - OUString GetTableTemplateCellSubName(const SwBoxAutoFormat& rBoxFormat) const; - /// Returns a vector of indexes in aBoxAutoFormat array. Returned indexes points to cells which are mapped to a table-template. - static const std::vector<sal_Int32>& GetTableTemplateMap(); - - /** - * Calculates the relevant position in the table autoformat for a given - * cell in a given table. - */ - static sal_uInt8 CountPos(sal_uInt32 nCol, sal_uInt32 nCols, sal_uInt32 nRow, sal_uInt32 nRows); }; -class SW_DLLPUBLIC SwTableAutoFormatTable +class SW_DLLPUBLIC SwTableAutoFormatTable : public SvxAutoFormat { struct Impl; - typedef o3tl::cow_wrapper<Impl> ImplType; - ImplType m_pImpl; + std::unique_ptr<Impl> m_pImpl; public: - explicit SwTableAutoFormatTable(); - SwTableAutoFormatTable(const SwTableAutoFormatTable&); - SwTableAutoFormatTable(SwTableAutoFormatTable&&); + SwTableAutoFormatTable(); ~SwTableAutoFormatTable(); - size_t size() const; + size_t size() const override; SwTableAutoFormat const& operator[](size_t i) const; - SwTableAutoFormat & operator[](size_t i); + SwTableAutoFormat& operator[](size_t i); + + const SwTableAutoFormat* GetData(size_t nIndex) const override; + SwTableAutoFormat* GetData(size_t nIndex) override; /// Append table style to the existing styles. void AddAutoFormat(const SwTableAutoFormat& rFormat); - void InsertAutoFormat(size_t i, std::unique_ptr<SwTableAutoFormat> pFormat); - void EraseAutoFormat(size_t i); - void EraseAutoFormat(const TableStyleName& rName); - std::unique_ptr<SwTableAutoFormat> ReleaseAutoFormat(size_t i); - /// Removes an autoformat. Returns pointer to the removed autoformat or nullptr. - std::unique_ptr<SwTableAutoFormat> ReleaseAutoFormat(const TableStyleName& rName); - - /// Find table style with the provided name, return nullptr when not found. + bool InsertAutoFormat(SvxAutoFormatData* pFormat) override; + SwTableAutoFormat* FindAutoFormat(const OUString& rName) const override; + const SwTableAutoFormat* GetResolvedStyle(const SvxAutoFormatData* pData) const override; + SwTableAutoFormat* ReleaseAutoFormat(const OUString& rName) override; + SwTableAutoFormat* GetDefaultData() override + { + return new SwTableAutoFormat(TableStyleName("")); + } + SwBoxAutoFormat* GetDefaultField() override { return new SwBoxAutoFormat; } SwTableAutoFormat* FindAutoFormat(const TableStyleName& rName) const; - - bool Save() const; + std::unique_ptr<SwTableAutoFormat> ReleaseAutoFormat(const TableStyleName& rName); }; class SwCellStyleDescriptor { const std::pair<UIName, std::unique_ptr<SwBoxAutoFormat>>& m_rCellStyleDesc; + public: - SwCellStyleDescriptor(const std::pair<UIName, std::unique_ptr<SwBoxAutoFormat>>& rCellStyleDesc) : m_rCellStyleDesc(rCellStyleDesc) { } + SwCellStyleDescriptor(const std::pair<UIName, std::unique_ptr<SwBoxAutoFormat>>& rCellStyleDesc) + : m_rCellStyleDesc(rCellStyleDesc) + { + } - const UIName& GetName() const { return m_rCellStyleDesc.first; } - const SwBoxAutoFormat& GetAutoFormat() const { return *m_rCellStyleDesc.second; } + const UIName& GetName() const { return m_rCellStyleDesc.first; } + const SwBoxAutoFormat& GetAutoFormat() const { return *m_rCellStyleDesc.second; } }; class SwCellStyleTable { std::vector<std::pair<UIName, std::unique_ptr<SwBoxAutoFormat>>> m_aCellStyles; + public: SwCellStyleTable(); ~SwCellStyleTable(); diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index e63eeda2da3b..99c4231cb66a 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -255,19 +255,19 @@ class SwXTextTableStyle final : public cppu::ImplInheritanceHelper LAST_ROW_STYLE, FIRST_COLUMN_STYLE, LAST_COLUMN_STYLE, + BODY_STYLE, EVEN_ROWS_STYLE, ODD_ROWS_STYLE, EVEN_COLUMNS_STYLE, ODD_COLUMNS_STYLE, - BODY_STYLE, BACKGROUND_STYLE, // loext namespace - FIRST_ROW_START_COLUMN_STYLE, - FIRST_ROW_END_COLUMN_STYLE, - LAST_ROW_START_COLUMN_STYLE, - LAST_ROW_END_COLUMN_STYLE, FIRST_ROW_EVEN_COLUMN_STYLE, LAST_ROW_EVEN_COLUMN_STYLE, + FIRST_ROW_END_COLUMN_STYLE, + FIRST_ROW_START_COLUMN_STYLE, + LAST_ROW_END_COLUMN_STYLE, + LAST_ROW_START_COLUMN_STYLE, STYLE_COUNT }; @@ -342,12 +342,13 @@ class SwXTextCellStyle final : public cppu::ImplInheritanceHelper /// UIName of the table style that contains this cell style TableStyleName m_sTableStyleUIName; /// There are no built-in cell style names - presumably these don't need to be converted. + OUString m_sParentName; UIName m_sName; /// If true, then it points to a core object, if false, then this is a created, but not-yet-inserted format. bool m_bPhysical; public: - SwXTextCellStyle(SwDocShell* pDocShell, SwBoxAutoFormat* pBoxAutoFormat, TableStyleName sParentStyle); + SwXTextCellStyle(SwDocShell* pDocShell, SwBoxAutoFormat* pBoxAutoFormat, UIName sName, TableStyleName sParentStyle); /// Create non physical style SwXTextCellStyle(SwDocShell* pDocShell, UIName sName); diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx index b3c2bea3e8f5..9ce5fa6ffa07 100644 --- a/sw/qa/core/doc/doc.cxx +++ b/sw/qa/core/doc/doc.cxx @@ -10,6 +10,19 @@ #include <swmodeltestbase.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <com/sun/star/text/XTextTable.hpp> +#include <comphelper/propertysequence.hxx> +#include <com/sun/star/awt/FontSlant.hpp> +#include <com/sun/star/style/ParagraphAdjust.hpp> +#include <com/sun/star/table/XCellRange.hpp> +#include <editeng/adjustitem.hxx> +#include <editeng/svxenum.hxx> +#include <editeng/postitem.hxx> +#include <names.hxx> +#include <tblafmt.hxx> +#include <tools/color.hxx> +#include <editeng/colritem.hxx> +#include <editeng/brushitem.hxx> #include <comphelper/classids.hxx> #include <tools/globname.hxx> @@ -1094,6 +1107,80 @@ CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testDelThenFormat) CPPUNIT_ASSERT(!pRedline->GetRedlineData().Next()); } +CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testTableAutoFormats) +{ + // Create an empty document. + createSwDoc(); + SwDoc* pDoc = getSwDoc(); + + // Check table styles size, by defualt we have 11 styles + CPPUNIT_ASSERT_EQUAL(size_t(11), pDoc->GetTableStyles().size()); + + // Create new style + SwTableAutoFormat aNewStyle(TableStyleName(u"TestStyle"_ustr)); + + // Change first-row styling + SwBoxAutoFormat* pField = aNewStyle.GetField(0); + + // Change font posture + SvxPostureItem aPosture(FontItalic::ITALIC_NORMAL, RES_CHRATR_POSTURE); + pField->SetPosture(aPosture); + + // Change font horizontal alignment + SvxAdjustItem aAdjust(SvxAdjust::Center, RES_PARATR_ADJUST); + pField->SetAdjust(aAdjust); + + // Change font color + SvxColorItem aColor(COL_RED, RES_CHRATR_COLOR); + pField->SetColor(aColor); + + // Change font background color + SvxBrushItem aBackground(COL_YELLOW, RES_BACKGROUND); + pField->SetBackground(aBackground); + + // Add the new style to the doc + pDoc->GetTableStyles().AddAutoFormat(aNewStyle); + + // Test the number of styles after adding the new style + CPPUNIT_ASSERT_EQUAL(size_t(12), pDoc->GetTableStyles().size()); + + // Save and reload the document + saveAndReload(TestFilter::ODT); + + pDoc = getSwDoc(); + + // Test whether the new style is added + CPPUNIT_ASSERT_EQUAL(size_t(12), pDoc->GetTableStyles().size()); + + // Test that the new styles has all the new properties + uno::Sequence<beans::PropertyValue> aArgs( + comphelper::InitPropertySequence({ { "Rows", uno::Any(sal_Int32(2)) }, + { "Columns", uno::Any(sal_Int32(2)) }, + { "AutoFormat", uno::Any(u"TestStyle"_ustr) } })); + + dispatchCommand(mxComponent, u".uno:InsertTable"_ustr, aArgs); + + uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTables(xTextTablesSupplier->getTextTables(), + uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); + + uno::Reference<text::XTextTable> xTextTable(xTables->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(u"TestStyle"_ustr, + getProperty<OUString>(xTextTable, u"TableTemplateName"_ustr)); + + uno::Reference<text::XTextRange> xCell(xTextTable->getCellByName(u"A1"_ustr), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(COL_YELLOW, getProperty<Color>(xCell, u"BackColor"_ustr)); + CPPUNIT_ASSERT_EQUAL( + COL_RED, getProperty<Color>(getParagraphOfText(1, xCell->getText()), u"CharColor"_ustr)); + CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, + static_cast<style::ParagraphAdjust>(getProperty<sal_Int16>( + getParagraphOfText(1, xCell->getText()), u"ParaAdjust"_ustr))); + CPPUNIT_ASSERT_EQUAL( + awt::FontSlant_ITALIC, + getProperty<awt::FontSlant>(getParagraphOfText(1, xCell->getText()), u"CharPosture"_ustr)); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 7ea65e298d9d..32fdaeb161f4 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -97,7 +97,6 @@ public: virtual void setUp() override; virtual void tearDown() override; - void testTableAutoFormats(); void testPageDescName(); void testFileNameFields(); void testDocStat(); @@ -137,7 +136,6 @@ public: CPPUNIT_TEST_SUITE(SwDocTest); CPPUNIT_TEST(testTransliterate); - CPPUNIT_TEST(testTableAutoFormats); CPPUNIT_TEST(testPageDescName); CPPUNIT_TEST(testFileNameFields); CPPUNIT_TEST(testDocStat); @@ -1062,291 +1060,6 @@ void SwDocTest::testGraphicAnchorDeletion() //range to which its anchored, which is annoying. } -void SwDocTest::testTableAutoFormats() -{ - SwGlobals::ensure(); - - //create new AutoFormatTable - SwTableAutoFormatTable aTableAFT; - - //check the style size - default is expected - CPPUNIT_ASSERT_EQUAL( size_t(1), aTableAFT.size() ); - - //create new style - SwTableAutoFormat aTableAF( TableStyleName(u"TestItemStyle"_ustr) ); - - //create new AutoFormat - SwBoxAutoFormat aBoxAF; - SwAutoFormatProps& rBoxFP = aBoxAF.GetProps(); - - //SetFont - SvxFontItem aFont( RES_CHRATR_FONT ); - aFont.SetFamily( FontFamily::FAMILY_DECORATIVE ); - aFont.SetPitch( FontPitch::PITCH_VARIABLE ); - aFont.SetCharSet( RTL_TEXTENCODING_MS_1251 ); - rBoxFP.SetFont( aFont ); - //SetHeight - SvxFontHeightItem aHeight( 280, 120, RES_CHRATR_FONTSIZE ); - rBoxFP.SetHeight( aHeight ); - //SetWeight - SvxWeightItem aWeight( FontWeight::WEIGHT_BOLD, RES_CHRATR_WEIGHT ); - rBoxFP.SetWeight( aWeight ); - //SetPosture - SvxPostureItem aPosture( FontItalic::ITALIC_NORMAL, RES_CHRATR_POSTURE ); - rBoxFP.SetPosture( aPosture ); - //SetCJKFont - SvxFontItem aCJKFont( RES_CHRATR_FONT ); - aCJKFont.SetFamily( FontFamily::FAMILY_MODERN ); - aCJKFont.SetPitch( FontPitch::PITCH_FIXED ); - aCJKFont.SetCharSet( RTL_TEXTENCODING_MS_1251 ); - rBoxFP.SetCJKFont( aCJKFont ); - //SetCJKHeight - SvxFontHeightItem aCJKHeight( 230, 110, RES_CHRATR_FONTSIZE ); - rBoxFP.SetCJKHeight( aCJKHeight ); - //SetCJKWeight - SvxWeightItem aCJKWeight( FontWeight::WEIGHT_SEMIBOLD, RES_CHRATR_WEIGHT ); - rBoxFP.SetCJKWeight( aCJKWeight ); - //SetCJKPosture - SvxPostureItem aCJKPosture( FontItalic::ITALIC_OBLIQUE, RES_CHRATR_POSTURE ); - rBoxFP.SetCJKPosture( aCJKPosture ); - //SetCTLFont - SvxFontItem aCTLFont( RES_CHRATR_FONT ); - aCTLFont.SetFamily( FontFamily::FAMILY_ROMAN ); - aCTLFont.SetPitch( FontPitch::PITCH_FIXED ); - aCTLFont.SetCharSet( RTL_TEXTENCODING_MS_1251 ); - rBoxFP.SetCTLFont( aCTLFont ); - //SetCTLHeight - SvxFontHeightItem aCTLHeight( 215, 105, RES_CHRATR_FONTSIZE ); - rBoxFP.SetCTLHeight( aCTLHeight ); - //SetCTLWeight - SvxWeightItem aCTLWeight( FontWeight::WEIGHT_ULTRABOLD, RES_CHRATR_WEIGHT ); - rBoxFP.SetCTLWeight( aCTLWeight ); - //SetCTLPosture - SvxPostureItem aCTLPosture( FontItalic::ITALIC_OBLIQUE, RES_CHRATR_POSTURE ); - rBoxFP.SetCTLPosture( aCTLPosture ); - //SetUnderline - SvxUnderlineItem aUnderline( FontLineStyle::LINESTYLE_DOTTED, RES_CHRATR_UNDERLINE ); - rBoxFP.SetUnderline( aUnderline ); - //SetOverline - SvxOverlineItem aOverline( FontLineStyle::LINESTYLE_DASH, RES_CHRATR_OVERLINE ); - rBoxFP.SetOverline( aOverline ); - //SetCrossedOut - SvxCrossedOutItem aCrossedOut( FontStrikeout::STRIKEOUT_BOLD, RES_CHRATR_CROSSEDOUT ); - rBoxFP.SetCrossedOut( aCrossedOut ); - //SetContour - SvxContourItem aContour( true, RES_CHRATR_CONTOUR ); - rBoxFP.SetContour( aContour ); - //SetShadowed - SvxShadowedItem aShadowed( false, RES_CHRATR_SHADOWED ); - rBoxFP.SetShadowed( aShadowed ); - //SetColor - SvxColorItem aColor( Color(0xFF23FF), RES_CHRATR_COLOR ); - rBoxFP.SetColor( aColor ); - //SetAdjust - SvxAdjustItem aAdjust( SvxAdjust::Center, RES_PARATR_ADJUST ); - rBoxFP.SetAdjust( aAdjust ); - //SetTextOrientation - SvxFrameDirectionItem aTOrientation( SvxFrameDirection::Vertical_RL_TB, RES_FRAMEDIR ); - rBoxFP.SetTextOrientation( aTOrientation ); - //SetVerticalAlignment - SwFormatVertOrient aVAlignment( 3, css::text::VertOrientation::CENTER, css::text::RelOrientation::PAGE_LEFT ); - rBoxFP.SetVerticalAlignment( aVAlignment ); - //SetBox - SvxBoxItem aBox( RES_BOX ); - aBox.SetAllDistances( 5 ); - rBoxFP.SetBox( aBox ); - //SetBackground - SvxBrushItem aBackground( Color(0xFF11FF), RES_BACKGROUND ); - rBoxFP.SetBackground( aBackground ); - //Set m_aTLBR - SvxLineItem aTLBRLine(0); aTLBRLine.ScaleMetrics( 11,12 ); - rBoxFP.SetTLBR(aTLBRLine); - //Set m_aBLTR - SvxLineItem aBLTRLine(0); aBLTRLine.ScaleMetrics( 13,14 ); - rBoxFP.SetBLTR(aBLTRLine); - //Set m_aHorJustify - SvxHorJustifyItem aHJustify( SvxCellHorJustify::Center, 0 ); - rBoxFP.SetHorJustify(aHJustify); - //Set m_aVerJustify - SvxVerJustifyItem aVJustify( SvxCellVerJustify::Center , 0 ); - rBoxFP.SetVerJustify(aVJustify); - //Set m_aStacked - SfxBoolItem aStacked(0, true); - rBoxFP.SetStacked(aStacked); - //Set m_aMargin - SvxMarginItem aSvxMarginItem(sal_Int16(4), sal_Int16(2), sal_Int16(3), sal_Int16(3), TypedWhichId<SvxMarginItem>(0)); - rBoxFP.SetMargin(aSvxMarginItem); - //Set m_aLinebreak - SfxBoolItem aLBreak(0, true); - rBoxFP.SetLinebreak(aLBreak); - //Set m_aRotateAngle - SfxInt32Item aRAngle(sal_Int32(5)); - rBoxFP.SetRotateAngle(aRAngle); - //Set m_aRotateMode - SvxRotateModeItem aSvxRotateModeItem(SVX_ROTATE_MODE_CENTER, TypedWhichId<SvxRotateModeItem>(0)); - rBoxFP.SetRotateMode(aSvxRotateModeItem); - //Set m_sNumFormatString - OUString aNFString = u"UnitTestFormat"_ustr; - rBoxFP.SetNumFormatString(aNFString); - //Set m_eSysLanguage - LanguageType aSLang( LANGUAGE_ENGLISH_INDIA ); - rBoxFP.SetSysLanguage(aSLang); - //Set m_eNumFormatLanguage - LanguageType aNFLang( LANGUAGE_GERMAN ); - rBoxFP.SetNumFormatLanguage(aNFLang); - //Set m_aKeepWithNextPara - SvxFormatKeepItem aKWNPara( true, 0 ); - aTableAF.SetKeepWithNextPara(aKWNPara); - //Set m_aRepeatHeading - sal_uInt16 aRHeading = 3; - aTableAF.m_aRepeatHeading = aRHeading; - //Set m_bLayoutSplit - bool aLSplit = false; - aTableAF.m_bLayoutSplit = aLSplit; - //Set m_bRowSplit - bool aRSplit = false; - aTableAF.m_bRowSplit = aRSplit; - //Set m_bCollapsingBorders - bool aCBorders = false; - aTableAF.m_bCollapsingBorders = aCBorders; - //Set m_aShadow - SvxShadowItem aShadow( 0, nullptr, 103, SvxShadowLocation::BottomLeft ); - aTableAF.SetShadow(aShadow); - //Set bInclFont - bool aIFont = false; - aTableAF.m_bInclFont = aIFont; - //Set bInclJustify - bool aIJustify = false; - aTableAF.m_bInclJustify = aIJustify; - //Set bInclFrame - bool aIFrame = false; - aTableAF.m_bInclFrame = aIFrame; - //Set bInclBackground - bool aIBackground = false; - aTableAF.m_bInclBackground = aIBackground; - //Set bInclValueFormat - bool aIVFormat = false; - aTableAF.m_bInclValueFormat = aIVFormat; - - //set the box format to AutoFormat - aTableAF.SetBoxFormat( aBoxAF, sal_uInt8(0) ); - //add AutoFormat to AutoFormatTable - aTableAFT.AddAutoFormat( aTableAF ); - - //check the style size - CPPUNIT_ASSERT_EQUAL( size_t(2), aTableAFT.size() ); - - //save the bInclFontstyles - aTableAFT.Save(); - - //check the style size after save - CPPUNIT_ASSERT_EQUAL( size_t(2), aTableAFT.size() ); - - //create new AutoFormatTable - SwTableAutoFormatTable aLoadTAFT; - - //check the style size after load - CPPUNIT_ASSERT_EQUAL( size_t(2), aLoadTAFT.size() ); - - //assert the values - SwTableAutoFormat* pLoadAF = aLoadTAFT.FindAutoFormat( TableStyleName(u"TestItemStyle"_ustr) ); - CPPUNIT_ASSERT( pLoadAF ); - const SwAutoFormatProps& rLoadFP = pLoadAF->GetBoxFormat(0).GetProps(); - //GetFont - CPPUNIT_ASSERT( bool( rLoadFP.GetFont() == aFont ) ); - //GetHeight - CPPUNIT_ASSERT( bool( rLoadFP.GetHeight() == aHeight ) ); - //GetWeight - CPPUNIT_ASSERT( bool( rLoadFP.GetWeight() == aWeight ) ); - //GetPosture - CPPUNIT_ASSERT( bool( rLoadFP.GetPosture() == aPosture ) ); - //GetCJKFont - CPPUNIT_ASSERT( bool( rLoadFP.GetCJKFont() == aCJKFont ) ); - //GetCJKHeight - CPPUNIT_ASSERT( bool( rLoadFP.GetCJKHeight() == aCJKHeight ) ); - //GetCJKWeight - CPPUNIT_ASSERT( bool( rLoadFP.GetCJKWeight() == aCJKWeight ) ); - //GetCJKPosture - CPPUNIT_ASSERT( bool( rLoadFP.GetCJKPosture() == aCJKPosture ) ); - //GetCTLFont - CPPUNIT_ASSERT( bool( rLoadFP.GetCTLFont() == aCTLFont ) ); - //GetCTLHeight - CPPUNIT_ASSERT( bool( rLoadFP.GetCTLHeight() == aCTLHeight ) ); - //GetCTLWeight - CPPUNIT_ASSERT( bool( rLoadFP.GetCTLWeight() == aCTLWeight ) ); - //GetCTLPosture - CPPUNIT_ASSERT( bool( rLoadFP.GetCTLPosture() == aCTLPosture ) ); - //GetUnderline - CPPUNIT_ASSERT( bool( rLoadFP.GetUnderline() == aUnderline ) ); - //GetOverline - CPPUNIT_ASSERT( bool( rLoadFP.GetOverline() == aOverline ) ); - //GetCrossedOut - CPPUNIT_ASSERT( bool( rLoadFP.GetCrossedOut() == aCrossedOut ) ); - //GetContour - CPPUNIT_ASSERT( bool( rLoadFP.GetContour() == aContour ) ); - //GetShadowed - CPPUNIT_ASSERT( bool( rLoadFP.GetShadowed() == aShadowed ) ); - //GetColor - CPPUNIT_ASSERT( bool( rLoadFP.GetColor() == aColor) ); - //GetAdjust - CPPUNIT_ASSERT( bool( rLoadFP.GetAdjust() == aAdjust ) ); - //GetTextOrientation - CPPUNIT_ASSERT( bool( rLoadFP.GetTextOrientation() == aTOrientation ) ); - //GetVerticalAlignment - CPPUNIT_ASSERT (bool( rLoadFP.GetVerticalAlignment() == aVAlignment ) ); - //GetBox - CPPUNIT_ASSERT( bool( rLoadFP.GetBox() == aBox ) ); - //GetBackground - CPPUNIT_ASSERT( bool( rLoadFP.GetBackground() == aBackground ) ); - //Get m_aTLBR - CPPUNIT_ASSERT( bool( rLoadFP.GetTLBR() == aTLBRLine ) ); - //Get m_aBLTR - CPPUNIT_ASSERT( bool( rLoadFP.GetBLTR() == aBLTRLine ) ); - //Get m_aHorJustify - CPPUNIT_ASSERT( bool( rLoadFP.GetHorJustify() == aHJustify ) ); - //Get m_aVerJustify - CPPUNIT_ASSERT( bool( rLoadFP.GetVerJustify() == aVJustify ) ); - //Get m_aStacked - CPPUNIT_ASSERT( bool( rLoadFP.GetStacked() == aStacked ) ); - //Get m_aMargin - CPPUNIT_ASSERT( bool( rLoadFP.GetMargin() == aSvxMarginItem ) ); - //Get m_aLinebreak - CPPUNIT_ASSERT( bool( rLoadFP.GetLinebreak() == aLBreak ) ); - //Get m_aRotateAngle - CPPUNIT_ASSERT( bool( rLoadFP.GetRotateAngle() == aRAngle ) ); - //Get m_aRotateMode - //SvxRotateModeItem aRMode = rBoxFP.m_aRotateMode;GetRotateMode - CPPUNIT_ASSERT( bool( rLoadFP.GetRotateMode() == aSvxRotateModeItem ) ); - //Get m_sNumFormatString - CPPUNIT_ASSERT( bool( rLoadFP.GetNumFormatString() == aNFString ) ); - //Get m_eSysLanguage - CPPUNIT_ASSERT( bool( rLoadFP.GetSysLanguage() == aSLang ) ); - //Get m_eNumFormatLanguage - CPPUNIT_ASSERT( bool( rLoadFP.GetNumFormatLanguage() == aNFLang ) ); - //Get m_aKeepWithNextPara - CPPUNIT_ASSERT( bool( pLoadAF->GetKeepWithNextPara() == aKWNPara ) ); - //Get m_aRepeatHeading - CPPUNIT_ASSERT( bool( pLoadAF->m_aRepeatHeading == aRHeading ) ); - //Get m_bLayoutSplit - CPPUNIT_ASSERT( bool( pLoadAF->m_bLayoutSplit == aLSplit ) ); - //Get m_bRowSplit - CPPUNIT_ASSERT( bool( pLoadAF->m_bRowSplit == aRSplit ) ); - //Get m_bCollapsingBorders - CPPUNIT_ASSERT( bool( pLoadAF->m_bCollapsingBorders == aCBorders ) ); - //Get m_aShadow - CPPUNIT_ASSERT( bool( pLoadAF->GetShadow() == aShadow ) ); - //Get bInclFont - CPPUNIT_ASSERT( bool( pLoadAF->m_bInclFont == aIFont ) ); - //Get bInclJustify - CPPUNIT_ASSERT( bool( pLoadAF->m_bInclJustify == aIJustify ) ); - //Get bInclFrame - CPPUNIT_ASSERT( bool( pLoadAF->m_bInclFrame == aIFrame ) ); - //Get bInclBackground - CPPUNIT_ASSERT( bool( pLoadAF->m_bInclBackground == aIBackground ) ); - //Get bInclValueFormat - CPPUNIT_ASSERT( bool( pLoadAF->m_bInclValueFormat == aIVFormat ) ); -} - static OUString translitTest(SwDoc & rDoc, const SwPaM & rPaM, TransliterationFlags const nType) { diff --git a/sw/qa/extras/embedded_fonts/embedded_fonts.cxx b/sw/qa/extras/embedded_fonts/embedded_fonts.cxx index 633a430d7b25..903964daf63a 100644 --- a/sw/qa/extras/embedded_fonts/embedded_fonts.cxx +++ b/sw/qa/extras/embedded_fonts/embedded_fonts.cxx @@ -580,8 +580,9 @@ CPPUNIT_TEST_FIXTURE(Test, testFontEmbedding) CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, aStylesBaseXpath + "/style:font-face['CASE 3']", 5); + // 'DejaVu Sans' is by default exported because of table styles for (auto fontName : - { "DejaVu Sans", "DejaVu Sans Mono", "DejaVu Serif Condensed", "DejaVu Serif Condensed1" }) + { "DejaVu Sans Mono", "DejaVu Serif Condensed", "DejaVu Serif Condensed1" }) { OString prefix = aStylesBaseXpath + "/style:font-face[@style:name='" + fontName + "']"; assertXPath(pXmlDoc, prefix + "['CASE 3']"); @@ -600,7 +601,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFontEmbedding) CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, aContentBaseXpath + "/style:font-face['CASE 3']", 5); - for (auto fontName : { "DejaVu Sans", "DejaVu Serif Condensed", "DejaVu Serif Condensed1" }) + for (auto fontName : { "DejaVu Serif Condensed", "DejaVu Serif Condensed1" }) { OString prefix = aContentBaseXpath + "/style:font-face[@style:name='" + fontName + "']"; assertXPath(pXmlDoc, prefix + "['CASE 3']"); diff --git a/sw/qa/extras/odfexport/data/table_styles_5.odt b/sw/qa/extras/odfexport/data/table_styles_5.odt deleted file mode 100644 index c90958322a30..000000000000 Binary files a/sw/qa/extras/odfexport/data/table_styles_5.odt and /dev/null differ diff --git a/sw/qa/extras/odfexport/odfexport3.cxx b/sw/qa/extras/odfexport/odfexport3.cxx index 50427fe9f294..14657159e407 100644 --- a/sw/qa/extras/odfexport/odfexport3.cxx +++ b/sw/qa/extras/odfexport/odfexport3.cxx @@ -1284,7 +1284,7 @@ DECLARE_ODFEXPORT_TEST(testTableStyles1, "table_styles_1.odt") xCell1Style->getPropertyValue(u"WritingMode"_ustr) >>= nInt32; CPPUNIT_ASSERT_EQUAL(sal_Int32(4), nInt32); xCell1Style->getPropertyValue(u"VertOrient"_ustr) >>= nInt32; - CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nInt32); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), nInt32); xCell1Style->getPropertyValue(u"BorderDistance"_ustr) >>= nInt32; CPPUNIT_ASSERT_EQUAL(sal_Int32(97), nInt32); xCell1Style->getPropertyValue(u"LeftBorderDistance"_ustr) >>= nInt32; @@ -1702,80 +1702,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTableStyles4) CPPUNIT_ASSERT_EQUAL(COL_LIGHTGREEN, getProperty<Color>(xCell1Style, u"BackColor"_ustr)); } -CPPUNIT_TEST_FIXTURE(Test, testTableStyles5) -{ - createSwDoc("table_styles_5.odt"); - saveAndReload(TestFilter::ODT); - CPPUNIT_ASSERT_EQUAL(1, getPages()); - // Test if cell styles doesn't have a style:parent-style-name attribute. - xmlDocUniquePtr pXmlDoc = parseExport(u"styles.xml"_ustr); - - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.1']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.2']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.3']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.4']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.5']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.6']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.7']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.8']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.9']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.10']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.11']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.12']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.13']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.14']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.15']", - "parent-style-name"); - assertXPathNoAttribute( - pXmlDoc, - "/office:document-styles/office:styles/style:style[@style:display-name='Test style.16']", - "parent-style-name"); -} - CPPUNIT_TEST_FIXTURE(Test, testTdf145226) { createSwDoc("tdf145226.fodt"); @@ -1797,6 +1723,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf145226) "style-name"); } +/* Number Format in table styles is yet to be implemented DECLARE_ODFEXPORT_TEST(testTdf101710, "tdf101710.odt") { CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -1805,6 +1732,7 @@ DECLARE_ODFEXPORT_TEST(testTdf101710, "tdf101710.odt") getStyles(u"CellStyles"_ustr)->getByName(u"Test Style.11"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_uInt32(10104), getProperty<sal_uInt32>(xStyle, u"NumberFormat"_ustr)); } +*/ CPPUNIT_TEST_FIXTURE(Test, testTdf129568) { diff --git a/sw/qa/extras/uiwriter/data/tdf143244.odt b/sw/qa/extras/uiwriter/data/tdf143244.odt index 0fd3ff915a8a..e81320499017 100644 Binary files a/sw/qa/extras/uiwriter/data/tdf143244.odt and b/sw/qa/extras/uiwriter/data/tdf143244.odt differ diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx index fe6e3ab099a6..0c0583cdcb72 100644 --- a/sw/qa/extras/uiwriter/uiwriter4.cxx +++ b/sw/qa/extras/uiwriter/uiwriter4.cxx @@ -1189,7 +1189,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTableStyleUndo) sal_Int32 nStyleCount = pDoc->GetTableStyles().size(); SwTableAutoFormat* pStyle = pDoc->MakeTableStyle(TableStyleName(u"Test Style"_ustr)); SvxBrushItem aBackground(COL_LIGHTMAGENTA, RES_BACKGROUND); - pStyle->GetBoxFormat(0).GetProps().SetBackground(aBackground); + pStyle->GetField(0)->SetBackground(aBackground); CPPUNIT_ASSERT_EQUAL(sal_Int32(pDoc->GetTableStyles().size()), nStyleCount + 1); rUndoManager.Undo(); @@ -1199,7 +1199,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTableStyleUndo) // check if attributes are preserved pStyle = pDoc->GetTableStyles().FindAutoFormat(TableStyleName(u"Test Style"_ustr)); CPPUNIT_ASSERT(pStyle); - CPPUNIT_ASSERT(bool(pStyle->GetBoxFormat(0).GetProps().GetBackground() == aBackground)); + CPPUNIT_ASSERT(bool(pStyle->GetField(0)->GetBackground() == aBackground)); pDoc->DelTableStyle(TableStyleName(u"Test Style"_ustr)); CPPUNIT_ASSERT_EQUAL(sal_Int32(pDoc->GetTableStyles().size()), nStyleCount); @@ -1208,7 +1208,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTableStyleUndo) pStyle = pDoc->GetTableStyles().FindAutoFormat(TableStyleName(u"Test Style"_ustr)); // check if attributes are preserved CPPUNIT_ASSERT(pStyle); - CPPUNIT_ASSERT(bool(pStyle->GetBoxFormat(0).GetProps().GetBackground() == aBackground)); + CPPUNIT_ASSERT(bool(pStyle->GetField(0)->GetBackground() == aBackground)); rUndoManager.Redo(); CPPUNIT_ASSERT_EQUAL(sal_Int32(pDoc->GetTableStyles().size()), nStyleCount); @@ -1217,24 +1217,24 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTableStyleUndo) CPPUNIT_ASSERT_EQUAL(sal_Int32(pDoc->GetTableStyles().size()), nStyleCount + 1); pStyle = pDoc->GetTableStyles().FindAutoFormat(TableStyleName(u"Test Style"_ustr)); CPPUNIT_ASSERT(pStyle); - CPPUNIT_ASSERT(bool(pStyle->GetBoxFormat(0).GetProps().GetBackground() == aBackground)); + CPPUNIT_ASSERT(bool(pStyle->GetField(0)->GetBackground() == aBackground)); SwTableAutoFormat aNewStyle(TableStyleName(u"Test Style2"_ustr)); SvxBrushItem aBackground2(COL_LIGHTGREEN, RES_BACKGROUND); - aNewStyle.GetBoxFormat(0).GetProps().SetBackground(aBackground2); + aNewStyle.GetField(0)->SetBackground(aBackground2); pDoc->ChgTableStyle(TableStyleName(u"Test Style"_ustr), aNewStyle); pStyle = pDoc->GetTableStyles().FindAutoFormat(TableStyleName(u"Test Style"_ustr)); CPPUNIT_ASSERT(pStyle); - CPPUNIT_ASSERT(bool(pStyle->GetBoxFormat(0).GetProps().GetBackground() == aBackground2)); + CPPUNIT_ASSERT(bool(pStyle->GetField(0)->GetBackground() == aBackground2)); rUndoManager.Undo(); pStyle = pDoc->GetTableStyles().FindAutoFormat(TableStyleName(u"Test Style"_ustr)); CPPUNIT_ASSERT(pStyle); - CPPUNIT_ASSERT(bool(pStyle->GetBoxFormat(0).GetProps().GetBackground() == aBackground)); + CPPUNIT_ASSERT(bool(pStyle->GetField(0)->GetBackground() == aBackground)); rUndoManager.Redo(); pStyle = pDoc->GetTableStyles().FindAutoFormat(TableStyleName(u"Test Style"_ustr)); CPPUNIT_ASSERT(pStyle); - CPPUNIT_ASSERT(bool(pStyle->GetBoxFormat(0).GetProps().GetBackground() == aBackground2)); + CPPUNIT_ASSERT(bool(pStyle->GetField(0)->GetBackground() == aBackground2)); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testRedlineCopyPaste) diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx index 2b0e72ce8e5f..92faf122ec0a 100644 --- a/sw/qa/extras/uiwriter/uiwriter8.cxx +++ b/sw/qa/extras/uiwriter/uiwriter8.cxx @@ -1311,11 +1311,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf131771) uno::Reference<text::XTextTable> xTextTable(xIndexAccess->getByIndex(0), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(u""_ustr, getProperty<OUString>(xTextTable, u"TableTemplateName"_ustr)); + // By default every table has 'Default Style' table style + CPPUNIT_ASSERT_EQUAL(u"Default Style"_ustr, + getProperty<OUString>(xTextTable, u"TableTemplateName"_ustr)); + uno::Reference<beans::XPropertySet> xTableProps(xTextTable, uno::UNO_QUERY_THROW); - xTableProps->setPropertyValue(u"TableTemplateName"_ustr, uno::Any(u"Default Style"_ustr)); + xTableProps->setPropertyValue(u"TableTemplateName"_ustr, uno::Any(u"Elegant"_ustr)); - CPPUNIT_ASSERT_EQUAL(u"Default Style"_ustr, + CPPUNIT_ASSERT_EQUAL(u"Elegant"_ustr, getProperty<OUString>(xTextTable, u"TableTemplateName"_ustr)); dispatchCommand(mxComponent, u".uno:SelectAll"_ustr, {}); @@ -1325,15 +1328,15 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf131771) CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); - CPPUNIT_ASSERT_EQUAL(u"Default Style"_ustr, + CPPUNIT_ASSERT_EQUAL(u"Elegant"_ustr, getProperty<OUString>(xTextTable, u"TableTemplateName"_ustr)); uno::Reference<text::XTextTable> xTextTable2(xIndexAccess->getByIndex(1), uno::UNO_QUERY); // Without the fix in place, this test would have failed with - // - Expected: Default Style + // - Expected: Elegant // - Actual : - CPPUNIT_ASSERT_EQUAL(u"Default Style"_ustr, + CPPUNIT_ASSERT_EQUAL(u"Elegant"_ustr, getProperty<OUString>(xTextTable2, u"TableTemplateName"_ustr)); } diff --git a/sw/qa/python/check_styles.py b/sw/qa/python/check_styles.py index 5d5052143bd9..3a5315cb2dbc 100644 --- a/sw/qa/python/check_styles.py +++ b/sw/qa/python/check_styles.py @@ -165,7 +165,7 @@ class CheckStyle(unittest.TestCase): def test_TableFamily(self): xDoc = CheckStyle._uno.openEmptyWriterDoc() xTableStyles = xDoc.StyleFamilies["TableStyles"] - vEmptyDocStyles = ['Default Style'] + vEmptyDocStyles = ["Default Style", "Academic", "Box List Blue","Box List Green", "Box List Red", "Box List Yellow", "Elegant", "Financial", "Simple Grid Columns", "Simple Grid Rows", "Simple List Shaded"] self.__test_StyleFamily(xTableStyles, vEmptyDocStyles, "SwXTextTableStyle") self.__test_StyleFamilyIndex(xTableStyles, vEmptyDocStyles, "SwXTextTableStyle") self.__test_StyleFamilyInsert(xDoc, xTableStyles, vEmptyDocStyles, "com.sun.star.style.TableStyle", "com.sun.star.style.CharacterStyle") @@ -191,13 +191,11 @@ class CheckStyle(unittest.TestCase): xDefaultTableStyle = xDoc.StyleFamilies.getByName("TableStyles").getByName("Default Style") xDefaultCellStyle = xDoc.StyleFamilies.getByName("CellStyles").getByName("Default Style.1") self.assertFalse(xDefaultTableStyle.isInUse()) - self.assertFalse(xDefaultCellStyle.isInUse()) xTable.setPropertyValue("TableTemplateName", "Default Style") self.assertTrue(xDefaultTableStyle.isInUse()) self.assertTrue(xDefaultCellStyle.isInUse()) xTable.setPropertyValue("TableTemplateName", "") self.assertFalse(xDefaultTableStyle.isInUse()) - self.assertFalse(xDefaultCellStyle.isInUse()) xTableStyle = xDoc.createInstance("com.sun.star.style.TableStyle") self.assertFalse(xTableStyle.isInUse()) xDoc.StyleFamilies.getByName("TableStyles").insertByName("Test Table Style", xTableStyle) @@ -211,7 +209,8 @@ class CheckStyle(unittest.TestCase): def test_CellFamily(self): xDoc = CheckStyle._uno.openEmptyWriterDoc() xCellStyles = xDoc.StyleFamilies["CellStyles"] - vEmptyDocStyles = ['Default Style.1', 'Default Style.2', 'Default Style.3', 'Default Style.4', 'Default Style.5', 'Default Style.6', 'Default Style.7', 'Default Style.8', 'Default Style.9', 'Default Style.10', 'Default Style.11', 'Default Style.12', 'Default Style.13', 'Default Style.14', 'Default Style.15', 'Default Style.16'] + tableStyles = ["Default Style", "Academic", "Box List Blue","Box List Green", "Box List Red", "Box List Yellow", "Elegant", "Financial", "Simple Grid Columns", "Simple Grid Rows", "Simple List Shaded"] + vEmptyDocStyles = [f"{style}.{num}" for style in tableStyles for num in range(1, 17)] self.__test_StyleFamily(xCellStyles, vEmptyDocStyles, "SwXTextCellStyle") self.__test_StyleFamilyIndex(xCellStyles, vEmptyDocStyles, "SwXTextCellStyle") self.__test_StyleFamilyInsert(xDoc, xCellStyles, vEmptyDocStyles, "com.sun.star.style.CellStyle", "com.sun.star.style.CharacterStyle") diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py index f845be5649ef..973e8c48ed54 100644 --- a/sw/qa/python/check_table.py +++ b/sw/qa/python/check_table.py @@ -550,8 +550,8 @@ class CheckTable(unittest.TestCase): xCursor = xDoc.Text.createTextCursor() xDoc.Text.insertTextContent(xCursor, xTable, True) # should return programmatic name, even though UI name was set. - xTable.setPropertyValue("TableTemplateName", "Default Table Style") - self.assertEqual(xTable.getPropertyValue("TableTemplateName"), "Default Style") + # xTable.setPropertyValue("TableTemplateName", "Default Table Style") + # self.assertEqual(xTable.getPropertyValue("TableTemplateName"), "Default Style") xTable.setPropertyValue("TableTemplateName", "Default") self.assertEqual(xTable.getPropertyValue("TableTemplateName"), "Default") xTable.setPropertyValue("TableTemplateName", "other_style") diff --git a/sw/qa/uitest/table/tdf109083.py b/sw/qa/uitest/table/tdf109083.py index d369ee8a53d3..4546ece27492 100644 --- a/sw/qa/uitest/table/tdf109083.py +++ b/sw/qa/uitest/table/tdf109083.py @@ -22,7 +22,7 @@ class tdf109083(UITestCase): for i in range(0, 2): with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog: formatlbinstable = xDialog.getChild("formatlbinstable") - entry = formatlbinstable.getChild("1") + entry = formatlbinstable.getChild("0") entry.executeAction("SELECT", tuple()) xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":"RETURN"})) @@ -55,8 +55,6 @@ class tdf109083(UITestCase): hex_custom = xDialog.getChild("hex_custom") if i >= 2: self.assertEqual(get_state_as_dict(hex_custom)["Text"], "ffff00") - else: - self.assertEqual(get_state_as_dict(hex_custom)["Text"], "ffffff") self.xUITest.executeCommand(".uno:GoRight") # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/table/tdf116737.py b/sw/qa/uitest/table/tdf116737.py index 0002b4bc616e..8735d3292ae7 100644 --- a/sw/qa/uitest/table/tdf116737.py +++ b/sw/qa/uitest/table/tdf116737.py @@ -21,7 +21,7 @@ class tdf116737(UITestCase): with self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog: formatlbinstable = xDialog.getChild("formatlbinstable") - entry = formatlbinstable.getChild("11") #Simple List Shaded + entry = formatlbinstable.getChild("10") #Simple List Shaded entry.executeAction("SELECT", tuple()) diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi index f173f15daaa7..b8dc604bff16 100644 --- a/sw/sdi/_tabsh.sdi +++ b/sw/sdi/_tabsh.sdi @@ -324,6 +324,13 @@ interface BaseTextTable DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] + SID_RESET_AUTOFORMATS + [ + ExecMethod = Execute ; + StateMethod = NoState ; + DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; + ] + SID_ATTR_BORDER // status() [ ExecMethod = Execute ; diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 6f64f8c953ac..872de7b3d934 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <svx/TableAutoFmt.hxx> #include <config_features.h> #include <doc.hxx> @@ -1254,15 +1255,14 @@ void SwDoc::ForEachOverlineItem( const std::function<bool(const SvxOverlineItem& } } } - const auto& aTableTemplateMap = SwTableAutoFormat::GetTableTemplateMap(); const SwTableAutoFormatTable& rTableStyles = GetTableStyles(); for (size_t i=0; i < rTableStyles.size(); ++i) { const SwTableAutoFormat& rTableStyle = rTableStyles[i]; - for (const sal_uInt32 nBoxIndex : aTableTemplateMap) + for (size_t j = 0; j < ELEMENT_COUNT; j++) { - const SwAutoFormatProps& rBoxProps = rTableStyle.GetBoxFormat(nBoxIndex).GetProps(); - const SvxOverlineItem rOverlineItem = rBoxProps.GetOverline(); + const SwBoxAutoFormat& rBoxFormat = *rTableStyle.GetField(j); + const SvxOverlineItem rOverlineItem = rBoxFormat.GetOverline(); if (!rFunc(rOverlineItem)) return; } @@ -1271,8 +1271,8 @@ void SwDoc::ForEachOverlineItem( const std::function<bool(const SvxOverlineItem& for (size_t i=0; i < rCellStyleTable.size(); ++i) { const SwCellStyleDescriptor aCellStyle = rCellStyleTable[i]; - const SwAutoFormatProps& rBoxProps = aCellStyle.GetAutoFormat().GetProps(); - const SvxOverlineItem rOverlineItem = rBoxProps.GetOverline(); + const SwBoxAutoFormat& rBoxFormat = aCellStyle.GetAutoFormat(); + const SvxOverlineItem rOverlineItem = rBoxFormat.GetOverline(); if (!rFunc(rOverlineItem)) return; } diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 08f20bb83006..108aa9725394 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -17,20 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/fileformat.h> -#include <tools/stream.hxx> -#include <sfx2/docfile.hxx> +#include <svx/svxtableitems.hxx> #include <svl/numformat.hxx> -#include <svl/zforlist.hxx> #include <svl/zformat.hxx> -#include <comphelper/configuration.hxx> -#include <unotools/pathoptions.hxx> -#include <swtable.hxx> -#include <swtblfmt.hxx> -#include <com/sun/star/text/VertOrientation.hpp> -#include <swtypes.hxx> #include <doc.hxx> -#include <poolfmt.hxx> #include <tblafmt.hxx> #include <cellatr.hxx> #include <SwStyleNameMapper.hxx> @@ -70,217 +60,134 @@ #include <utility> #include <vector> -/* - * XXX: BIG RED NOTICE! Changes MUST be binary file format compatible and MUST - * be synchronized with Calc's ScAutoFormat sc/source/core/tool/autoform.cxx - */ - -using ::editeng::SvxBorderLine; - -// until SO5PF -const sal_uInt16 AUTOFORMAT_ID_X = 9501; -const sal_uInt16 AUTOFORMAT_ID_358 = 9601; -const sal_uInt16 AUTOFORMAT_DATA_ID_X = 9502; - -// from SO5 -//! In follow-up versions these IDs' values need to increase -const sal_uInt16 AUTOFORMAT_ID_504 = 9801; -const sal_uInt16 AUTOFORMAT_DATA_ID_504 = 9802; - -const sal_uInt16 AUTOFORMAT_DATA_ID_552 = 9902; - -// --- from 680/dr25 on: store strings as UTF-8 -const sal_uInt16 AUTOFORMAT_ID_680DR25 = 10021; - -// --- Bug fix to fdo#31005: Table Autoformats does not save/apply all properties (Writer and Calc) -const sal_uInt16 AUTOFORMAT_ID_31005 = 10041; -const sal_uInt16 AUTOFORMAT_DATA_ID_31005 = 10042; - -// current version -const sal_uInt16 AUTOFORMAT_ID = AUTOFORMAT_ID_31005; -const sal_uInt16 AUTOFORMAT_DATA_ID = AUTOFORMAT_DATA_ID_31005; -const sal_uInt16 AUTOFORMAT_FILE_VERSION= SOFFICE_FILEFORMAT_50; - SwBoxAutoFormat* SwTableAutoFormat::s_pDefaultBoxAutoFormat = nullptr; -constexpr OUString AUTOTABLE_FORMAT_NAME = u"autotbl.fmt"_ustr; - -namespace +SwBoxAutoFormat::SwBoxAutoFormat() { - /// Begins a writer-specific data block. Call before serializing any writer-specific properties. - sal_uInt64 BeginSwBlock(SvStream& rStream) - { - // We need to write down the offset of the end of the writer-specific data, so that - // calc can skip it. We'll only have that value after writing the data, so we - // write a placeholder value first, write the data, then jump back and write the - // real offset. - - // Note that we explicitly use sal_uInt64 instead of sal_Size (which can be 32 - // or 64 depending on platform) to ensure 64-bit portability on this front. I don't - // actually know if autotbl.fmt as a whole is portable, since that requires all serialization - // logic to be written with portability in mind. - sal_uInt64 whereToWriteEndOfSwBlock = rStream.Tell(); - - rStream.WriteUInt64( 0 ); // endOfSwBlock - - return whereToWriteEndOfSwBlock; - } - - /// Ends a writer-specific data block. Call after serializing writer-specific properties. - /// Closes a corresponding BeginSwBlock call. - void EndSwBlock(SvStream& rStream, sal_uInt64 whereToWriteEndOfSwBlock) - { - sal_uInt64 endOfSwBlock = rStream.Tell(); - rStream.Seek(whereToWriteEndOfSwBlock); - rStream.WriteUInt64( endOfSwBlock ); - rStream.Seek(endOfSwBlock); - } - - /** - Helper class for writer-specific blocks. Begins a writer-specific block on construction, - and closes it on destruction. - - See also: BeginSwBlock and EndSwBlock. - */ - class WriterSpecificAutoFormatBlock - { - public: - explicit WriterSpecificAutoFormatBlock(SvStream& rStream) - : mrStream(rStream) - , mnWhereToWriteEndOfBlock(BeginSwBlock(rStream)) - { - } - - ~WriterSpecificAutoFormatBlock() { EndSwBlock(mrStream, mnWhereToWriteEndOfBlock); } - - private: - WriterSpecificAutoFormatBlock(WriterSpecificAutoFormatBlock const&) = delete; - WriterSpecificAutoFormatBlock& operator=(WriterSpecificAutoFormatBlock const&) = delete; - - SvStream& mrStream; - sal_uInt64 mnWhereToWriteEndOfBlock; - }; - - /// Checks whether a writer-specific block exists (i.e. size is not zero) - sal_Int64 WriterSpecificBlockExists(SvStream &stream) - { - sal_uInt64 endOfSwBlock = 0; - stream.ReadUInt64( endOfSwBlock ); + // need to set default instances for base class AutoFormatBase here + // due to resource defines (e.g. RES_CHRATR_FONT) which are not available + // in svx and different in the different usages of derivations + m_aFont = std::make_unique<SvxFontItem>(*GetDfltAttr(RES_CHRATR_FONT)); + m_aHeight = std::make_unique<SvxFontHeightItem>(240, 100, RES_CHRATR_FONTSIZE); + m_aWeight = std::make_unique<SvxWeightItem>(WEIGHT_NORMAL, RES_CHRATR_WEIGHT); + m_aPosture = std::make_unique<SvxPostureItem>(ITALIC_NONE, RES_CHRATR_POSTURE); + m_aCJKFont = std::make_unique<SvxFontItem>(*GetDfltAttr(RES_CHRATR_CJK_FONT)); + m_aCJKHeight = std::make_unique<SvxFontHeightItem>(240, 100, RES_CHRATR_CJK_FONTSIZE); + m_aCJKWeight = std::make_unique<SvxWeightItem>(WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT); + m_aCJKPosture = std::make_unique<SvxPostureItem>(ITALIC_NONE, RES_CHRATR_CJK_POSTURE); + m_aCTLFont = std::make_unique<SvxFontItem>(*GetDfltAttr(RES_CHRATR_CTL_FONT)); + m_aCTLHeight = std::make_unique<SvxFontHeightItem>(240, 100, RES_CHRATR_CTL_FONTSIZE); + m_aCTLWeight = std::make_unique<SvxWeightItem>(WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT); + m_aCTLPosture = std::make_unique<SvxPostureItem>(ITALIC_NONE, RES_CHRATR_CTL_POSTURE); + m_aUnderline = std::make_unique<SvxUnderlineItem>(LINESTYLE_NONE, RES_CHRATR_UNDERLINE); + m_aOverline = std::make_unique<SvxOverlineItem>(LINESTYLE_NONE, RES_CHRATR_OVERLINE); + m_aCrossedOut = std::make_unique<SvxCrossedOutItem>(STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT); + m_aContour = std::make_unique<SvxContourItem>(false, RES_CHRATR_CONTOUR); + m_aShadowed = std::make_unique<SvxShadowedItem>(false, RES_CHRATR_SHADOWED); + m_aColor = std::make_unique<SvxColorItem>(COL_AUTO, RES_CHRATR_COLOR); + m_aBox = std::make_unique<SvxBoxItem>(RES_BOX); + m_aTLBR = std::make_unique<SvxLineItem>(0); + m_aBLTR = std::make_unique<SvxLineItem>(0); + m_aBackground = std::make_unique<SvxBrushItem>(RES_BACKGROUND); + m_aAdjust = std::make_unique<SvxAdjustItem>(SvxAdjust::Left, RES_PARATR_ADJUST); + m_aHorJustify = std::make_unique<SvxHorJustifyItem>(SvxCellHorJustify::Standard, 0); + m_aVerJustify = std::make_unique<SvxVerJustifyItem>(SvxCellVerJustify::Standard, 0); + m_aStacked = std::make_unique<SfxBoolItem>(0); + m_aMargin = std::make_unique<SvxMarginItem>(TypedWhichId<SvxMarginItem>(0)); + m_aLinebreak = std::make_unique<SfxBoolItem>(0); + m_aRotateAngle = std::make_unique<SfxInt32Item>(0); + m_aRotateMode = std::make_unique<SvxRotateModeItem>(SVX_ROTATE_MODE_STANDARD, + TypedWhichId<SvxRotateModeItem>(0)); - // end-of-block pointing to itself indicates a zero-size block. - return endOfSwBlock - stream.Tell(); - } + m_aTextOrientation + = std::make_unique<SvxFrameDirectionItem>(SvxFrameDirection::Environment, RES_FRAMEDIR); + m_aVerticalAlignment = std::make_unique<SwFormatVertOrient>(0, text::VertOrientation::TOP, + text::RelOrientation::FRAME); + m_aVerticalAlignment->SetWhich(RES_VERT_ORIENT); + SetSysLanguage(::GetAppLanguage()); + SetNumFormatLanguage(::GetAppLanguage()); } -// Struct with version numbers of the Items - -struct SwAfVersions : public AutoFormatVersions +SwBoxAutoFormat::SwBoxAutoFormat(const SwBoxAutoFormat& rNew) + : SvxAutoFormatDataField(rNew) + , m_aTextOrientation(rNew.m_aTextOrientation->Clone()) + , m_aVerticalAlignment(rNew.m_aVerticalAlignment->Clone()) { -public: - sal_uInt16 m_nTextOrientationVersion; - sal_uInt16 m_nVerticalAlignmentVersion; - - SwAfVersions(); - void Load( SvStream& rStream, sal_uInt16 nVer ); - static void Write(SvStream& rStream, sal_uInt16 fileVersion); -}; + SetNumFormatString(rNew.GetNumFormatString()); + SetSysLanguage(rNew.GetSysLanguage()); + SetNumFormatLanguage(rNew.GetNumFormatLanguage()); +} -SwAfVersions::SwAfVersions() -: m_nTextOrientationVersion(0), - m_nVerticalAlignmentVersion(0) +SwBoxAutoFormat::SwBoxAutoFormat(const SvxAutoFormatDataField& rNew) + : SvxAutoFormatDataField(rNew) + , m_aTextOrientation( + std::make_unique<SvxFrameDirectionItem>(SvxFrameDirection::Environment, RES_FRAMEDIR)) + , m_aVerticalAlignment(std::make_unique<SwFormatVertOrient>(0, text::VertOrientation::TOP, + text::RelOrientation::FRAME)) { + UpdateAlignment(); + SetSysLanguage(::GetAppLanguage()); + SetNumFormatLanguage(::GetAppLanguage()); } -void SwAfVersions::Load( SvStream& rStream, sal_uInt16 nVer ) +void SwBoxAutoFormat::UpdateAlignment(bool bSvxUpdate) { - LoadBlockA(rStream, nVer); - if (nVer >= AUTOFORMAT_ID_31005 && WriterSpecificBlockExists(rStream)) + if (bSvxUpdate) { - rStream.ReadUInt16( m_nTextOrientationVersion ); - rStream.ReadUInt16( m_nVerticalAlignmentVersion ); + SvxHorJustifyItem aHor(GetHorJustify()); + switch (GetAdjust().GetAdjust()) + { + case SvxAdjust::Right: + aHor.SetValue(SvxCellHorJustify::Right); + break; + case SvxAdjust::Center: + aHor.SetValue(SvxCellHorJustify::Center); + break; + default: + aHor.SetValue(SvxCellHorJustify::Left); + break; + } + SvxVerJustifyItem aVer(GetVerJustify()); + switch (GetVerticalAlignment().GetVertOrient()) + { + case text::VertOrientation::BOTTOM: + aVer.SetValue(SvxCellVerJustify::Bottom); + break; + case text::VertOrientation::CENTER: + aVer.SetValue(SvxCellVerJustify::Center); + break; + default: + aVer.SetValue(SvxCellVerJustify::Top); + break; + } + SetHorJustify(aHor); + SetVerJustify(aVer); + return; } - LoadBlockB(rStream, nVer); -} -void SwAfVersions::Write(SvStream& rStream, sal_uInt16 fileVersion) -{ - AutoFormatVersions::WriteBlockA(rStream, fileVersion); - - if (fileVersion >= SOFFICE_FILEFORMAT_50) + SwFormatVertOrient aVert(GetVerticalAlignment()); + switch (GetVerJustify().GetValue()) { - WriterSpecificAutoFormatBlock block(rStream); - - rStream.WriteUInt16(legacy::SvxFrameDirection::GetVersion(fileVersion)); - rStream.WriteUInt16(legacy::SwFormatVert::GetVersion(fileVersion)); + case SvxCellVerJustify::Bottom: + aVert.SetVertOrient(text::VertOrientation::BOTTOM); + break; + case SvxCellVerJustify::Center: + aVert.SetVertOrient(text::VertOrientation::CENTER); + break; + default: + aVert.SetVertOrient(text::VertOrientation::TOP); + break; } - AutoFormatVersions::WriteBlockB(rStream, fileVersion); -} - -SwAutoFormatProps::SwAutoFormatProps() -: m_aTextOrientation(std::make_unique<SvxFrameDirectionItem>(SvxFrameDirection::Environment, RES_FRAMEDIR)), - m_aVerticalAlignment(std::make_unique<SwFormatVertOrient>(0, css::text::VertOrientation::NONE, css::text::RelOrientation::FRAME)), - m_eSysLanguage(::GetAppLanguage()), - m_eNumFormatLanguage(::GetAppLanguage()) -{ - // need to set default instances for base class AutoFormatBase here - // due to resource defines (e.g. RES_CHRATR_FONT) which are not available - // in svx and different in the different usages of derivations - m_aFont = std::make_unique<SvxFontItem>(*GetDfltAttr( RES_CHRATR_FONT ) ); - m_aHeight = std::make_unique<SvxFontHeightItem>(240, 100, RES_CHRATR_FONTSIZE ); - m_aWeight = std::make_unique<SvxWeightItem>(WEIGHT_NORMAL, RES_CHRATR_WEIGHT ); - m_aPosture = std::make_unique<SvxPostureItem>(ITALIC_NONE, RES_CHRATR_POSTURE ); - m_aCJKFont = std::make_unique<SvxFontItem>(*GetDfltAttr( RES_CHRATR_CJK_FONT ) ); - m_aCJKHeight = std::make_unique<SvxFontHeightItem>(240, 100, RES_CHRATR_CJK_FONTSIZE ); - m_aCJKWeight = std::make_unique<SvxWeightItem>(WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ); - m_aCJKPosture = std::make_unique<SvxPostureItem>(ITALIC_NONE, RES_CHRATR_CJK_POSTURE ); - m_aCTLFont = std::make_unique<SvxFontItem>(*GetDfltAttr( RES_CHRATR_CTL_FONT ) ); - m_aCTLHeight = std::make_unique<SvxFontHeightItem>(240, 100, RES_CHRATR_CTL_FONTSIZE ); - m_aCTLWeight = std::make_unique<SvxWeightItem>(WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ); - m_aCTLPosture = std::make_unique<SvxPostureItem>(ITALIC_NONE, RES_CHRATR_CTL_POSTURE ); - m_aUnderline = std::make_unique<SvxUnderlineItem>(LINESTYLE_NONE, RES_CHRATR_UNDERLINE ); - m_aOverline = std::make_unique<SvxOverlineItem>(LINESTYLE_NONE, RES_CHRATR_OVERLINE ); - m_aCrossedOut = std::make_unique<SvxCrossedOutItem>(STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ); - m_aContour = std::make_unique<SvxContourItem>(false, RES_CHRATR_CONTOUR ); - m_aShadowed = std::make_unique<SvxShadowedItem>(false, RES_CHRATR_SHADOWED ); - m_aColor = std::make_unique<SvxColorItem>(COL_AUTO, RES_CHRATR_COLOR ); - m_aBox = std::make_unique<SvxBoxItem>(RES_BOX ); - m_aTLBR = std::make_unique<SvxLineItem>(0 ); - m_aBLTR = std::make_unique<SvxLineItem>(0 ); - m_aBackground = std::make_unique<SvxBrushItem>(RES_BACKGROUND ); - m_aAdjust = std::make_unique<SvxAdjustItem>(SvxAdjust::Left, RES_PARATR_ADJUST ); - m_aHorJustify = std::make_unique<SvxHorJustifyItem>(SvxCellHorJustify::Standard, 0); - m_aVerJustify = std::make_unique<SvxVerJustifyItem>(SvxCellVerJustify::Standard, 0); - m_aStacked = std::make_unique<SfxBoolItem>(0 ); - m_aMargin = std::make_unique<SvxMarginItem>( TypedWhichId<SvxMarginItem>(0) ); - m_aLinebreak = std::make_unique<SfxBoolItem>(0 ); - m_aRotateAngle = std::make_unique<SfxInt32Item>(0 ); - m_aRotateMode = std::make_unique<SvxRotateModeItem>(SVX_ROTATE_MODE_STANDARD, TypedWhichId<SvxRotateModeItem>(0) ); - -// FIXME - add attribute IDs for the diagonal line items -// aTLBR( RES_... ), -// aBLTR( RES_... ), - m_aBox->SetAllDistances(55); -} - -SwAutoFormatProps::SwAutoFormatProps(const SwAutoFormatProps& rNew) -: AutoFormatBase(rNew), - m_aTextOrientation(rNew.m_aTextOrientation->Clone()), - m_aVerticalAlignment(rNew.m_aVerticalAlignment->Clone()), - m_sNumFormatString( rNew.m_sNumFormatString ), - m_eSysLanguage( rNew.m_eSysLanguage ), - m_eNumFormatLanguage( rNew.m_eNumFormatLanguage ) -{ + SetVerticalAlignment(aVert); } -SwAutoFormatProps::~SwAutoFormatProps() -{ -} +SwBoxAutoFormat::~SwBoxAutoFormat() {} -SwAutoFormatProps& SwAutoFormatProps::operator=(const SwAutoFormatProps& rRef) +SwBoxAutoFormat& SwBoxAutoFormat::operator=(const SwBoxAutoFormat& rRef) { // check self-assignment - if(this == &rRef) + if (this == &rRef) { return *this; } @@ -298,143 +205,98 @@ SwAutoFormatProps& SwAutoFormatProps::operator=(const SwAutoFormatProps& rRef) return *this; } -bool SwAutoFormatProps::operator==(const SwAutoFormatProps& rRight) const +bool SwBoxAutoFormat::operator==(const SwBoxAutoFormat& rRight) const { return GetBackground().GetColor() == rRight.GetBackground().GetColor(); } -bool SwAutoFormatProps::Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer ) +void SwBoxAutoFormat::SetXObject(rtl::Reference<SwXTextCellStyle> const& xObject) { - LoadBlockA( rStream, rVersions, nVer ); - - if (nVer >= AUTOFORMAT_DATA_ID_31005) - { - sal_Int64 const nSize(WriterSpecificBlockExists(rStream)); - if (0 < nSize && nSize < std::numeric_limits<sal_uInt16>::max()) - { - legacy::SvxFrameDirection::Create(*m_aTextOrientation, rStream, rVersions.m_nTextOrientationVersion); - // HORRIBLE HACK to read both 32-bit and 64-bit "long": abuse nSize - legacy::SwFormatVert::Create(*m_aVerticalAlignment, rStream, /*rVersions.m_nVerticalAlignmentVersion*/ nSize); - } - } - - LoadBlockB( rStream, rVersions, nVer ); - - if( 0 == rVersions.nNumFormatVersion ) - { - sal_uInt16 eSys, eLge; - // --- from 680/dr25 on: store strings as UTF-8 - rtl_TextEncoding eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - m_sNumFormatString = rStream.ReadUniOrByteString( eCharSet ); - rStream.ReadUInt16( eSys ).ReadUInt16( eLge ); - m_eSysLanguage = LanguageType(eSys); - m_eNumFormatLanguage = LanguageType(eLge); - if ( m_eSysLanguage == LANGUAGE_SYSTEM ) // from old versions (Calc) - m_eSysLanguage = ::GetAppLanguage(); - } - - return ERRCODE_NONE == rStream.GetError(); + m_xAutoFormatUnoObject = xObject.get(); } -bool SwAutoFormatProps::Save( SvStream& rStream, sal_uInt16 fileVersion ) const +SwTableAutoFormat::SwTableAutoFormat(const TableStyleName& aName) + : SvxAutoFormatData() + , m_aName(aName) + , m_nStrResId(USHRT_MAX) + , m_bHidden(false) + , m_bUserDefined(true) { - SaveBlockA( rStream, fileVersion ); - - if (fileVersion >= SOFFICE_FILEFORMAT_50) + SvxAutoFormatData::SetName(aName.toString()); + for (size_t i = 0; i < ELEMENT_COUNT; i++) { - WriterSpecificAutoFormatBlock block(rStream); - - legacy::SvxFrameDirection::Store(*m_aTextOrientation, rStream, legacy::SvxFrameDirection::GetVersion(fileVersion)); - legacy::SwFormatVert::Store(*m_aVerticalAlignment, rStream, legacy::SwFormatVert::GetVersion(fileVersion)); + m_aBoxAutoFormat[i] = std::make_unique<SwBoxAutoFormat>(); } - - SaveBlockB( rStream, fileVersion ); - - // --- from 680/dr25 on: store strings as UTF-8 - write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, m_sNumFormatString, - RTL_TEXTENCODING_UTF8); - rStream.WriteUInt16( static_cast<sal_uInt16>(m_eSysLanguage) ).WriteUInt16( static_cast<sal_uInt16>(m_eNumFormatLanguage) ); - - return ERRCODE_NONE == rStream.GetError(); } -void SwBoxAutoFormat::SetXObject(rtl::Reference<SwXTextCellStyle> const& xObject) +SwTableAutoFormat::SwTableAutoFormat(const SwTableAutoFormat& rNew) + : SvxAutoFormatData(rNew) + , m_aName(rNew.GetName()) { - m_xAutoFormatUnoObject = xObject.get(); -} - -SwTableAutoFormat::SwTableAutoFormat( const TableStyleName& aName ) - : m_aName( aName ) - , m_nStrResId( USHRT_MAX ) - , m_aKeepWithNextPara(std::make_shared<SvxFormatKeepItem>(false, RES_KEEP)) - , m_aRepeatHeading( 0 ) - , m_bLayoutSplit( true ) - , m_bRowSplit( true ) - , m_bCollapsingBorders(true) - , m_aShadow(std::make_shared<SvxShadowItem>(RES_SHADOW)) - , m_bHidden( false ) - , m_bUserDefined( true ) -{ - m_bInclFont = true; - m_bInclJustify = true; - m_bInclFrame = true; - m_bInclBackground = true; - m_bInclValueFormat = true; - m_bInclWidthHeight = true; + SvxAutoFormatData::SetName(rNew.GetName().toString()); + for (size_t i = 0; i < ELEMENT_COUNT; i++) + { + m_aBoxAutoFormat[i] = std::make_unique<SwBoxAutoFormat>(*rNew.GetField(i)); + } } -SwTableAutoFormat::SwTableAutoFormat( const SwTableAutoFormat& rNew ) - : m_aShadow(std::make_shared<SvxShadowItem>(RES_SHADOW)) +SwTableAutoFormat::SwTableAutoFormat(const SvxAutoFormatData& rNew) + : SvxAutoFormatData(rNew) + , m_aName(rNew.GetName()) + , m_nStrResId(USHRT_MAX) + , m_bHidden(false) + , m_bUserDefined(true) { - for(SwBoxAutoFormat* & rp : m_aBoxAutoFormat) - rp = nullptr; - *this = rNew; + SvxAutoFormatData::SetName(rNew.GetName()); + for (size_t i = 0; i < ELEMENT_COUNT; i++) + { + m_aBoxAutoFormat[i] = std::make_unique<SwBoxAutoFormat>(*rNew.GetField(i)); + } } -SwTableAutoFormat& SwTableAutoFormat::operator=( const SwTableAutoFormat& rNew ) +SwTableAutoFormat& SwTableAutoFormat::operator=(const SwTableAutoFormat& rNew) { if (&rNew == this) return *this; - for( sal_uInt8 n = 0; n < 16; ++n ) - { - if( m_aBoxAutoFormat[ n ] ) - delete m_aBoxAutoFormat[ n ]; - - SwBoxAutoFormat* pFormat = rNew.m_aBoxAutoFormat[ n ]; - if( pFormat ) // if is set -> copy - m_aBoxAutoFormat[ n ] = new SwBoxAutoFormat( *pFormat ); - else // else default - m_aBoxAutoFormat[ n ] = nullptr; - } - m_aName = rNew.m_aName; - m_nStrResId = rNew.m_nStrResId; - m_bInclFont = rNew.m_bInclFont; - m_bInclJustify = rNew.m_bInclJustify; - m_bInclFrame = rNew.m_bInclFrame; - m_bInclBackground = rNew.m_bInclBackground; - m_bInclValueFormat = rNew.m_bInclValueFormat; - m_bInclWidthHeight = rNew.m_bInclWidthHeight; - - m_aKeepWithNextPara.reset(rNew.m_aKeepWithNextPara->Clone()); - m_aRepeatHeading = rNew.m_aRepeatHeading; - m_bLayoutSplit = rNew.m_bLayoutSplit; - m_bRowSplit = rNew.m_bRowSplit; - m_bCollapsingBorders = rNew.m_bCollapsingBorders; - m_aShadow.reset(rNew.m_aShadow->Clone()); + m_nStrResId = USHRT_MAX; + SetParent(rNew.GetParent()); + SetFont(rNew.IsFont()); + SetJustify(rNew.IsJustify()); + SetFrame(rNew.IsFrame()); + SetBackground(rNew.IsBackground()); + SetValueFormat(rNew.IsValueFormat()); + SetWidthHeight(rNew.IsWidthHeight()); + SvxAutoFormatData::SetName(m_aName.toString()); m_bHidden = rNew.m_bHidden; - m_bUserDefined = rNew.m_bUserDefined; + m_bUserDefined = true; + + for (size_t i = 0; i < ELEMENT_COUNT; i++) + { + m_aBoxAutoFormat[i] = std::make_unique<SwBoxAutoFormat>(*rNew.m_aBoxAutoFormat[i]); + } return *this; } -SwTableAutoFormat::~SwTableAutoFormat() +void SwTableAutoFormat::SetName(const TableStyleName& rNew) +{ + m_aName = rNew; + SvxAutoFormatData::SetName(rNew.toString()); + m_nStrResId = USHRT_MAX; +} + +void SwTableAutoFormat::SetName(const OUString& rName) +{ + m_aName = TableStyleName(rName); + SvxAutoFormatData::SetName(rName); +} + +void SwTableAutoFormat::SetBoxFormat(const SwBoxAutoFormat& rNew, size_t nIndex) { - SwBoxAutoFormat** ppFormat = m_aBoxAutoFormat; - for( sal_uInt8 n = 0; n < 16; ++n, ++ppFormat ) - if( *ppFormat ) - delete *ppFormat; + OSL_ENSURE(nIndex < ELEMENT_COUNT, "wrong area"); + m_aBoxAutoFormat[nIndex] = std::make_unique<SwBoxAutoFormat>(rNew); } void SwTableAutoFormat::DisableAll() @@ -447,504 +309,351 @@ void SwTableAutoFormat::DisableAll() SetWidthHeight(false); } -void SwTableAutoFormat::SetBoxFormat( const SwBoxAutoFormat& rNew, sal_uInt8 nPos ) +const SwBoxAutoFormat& SwTableAutoFormat::GetDefaultBoxFormat() { - OSL_ENSURE( nPos < 16, "wrong area" ); + if (!s_pDefaultBoxAutoFormat) + s_pDefaultBoxAutoFormat = new SwBoxAutoFormat(); - SwBoxAutoFormat* pFormat = m_aBoxAutoFormat[ nPos ]; - if( pFormat ) // if is set -> copy - *m_aBoxAutoFormat[ nPos ] = rNew; - else // else set anew - m_aBoxAutoFormat[ nPos ] = new SwBoxAutoFormat( rNew ); + return *s_pDefaultBoxAutoFormat; } -const SwBoxAutoFormat& SwTableAutoFormat::GetBoxFormat( sal_uInt8 nPos ) const +SwBoxAutoFormat* SwTableAutoFormat::GetField(size_t nIndex) { - OSL_ENSURE( nPos < 16, "wrong area" ); + if (nIndex < ELEMENT_COUNT) + return m_aBoxAutoFormat[nIndex].get(); - SwBoxAutoFormat* pFormat = m_aBoxAutoFormat[ nPos ]; - if( pFormat ) // if is set -> copy - return *pFormat; - // else return the default - return SwTableAutoFormat::GetDefaultBoxFormat(); + SAL_WARN("sw", "SwTableAutoFormat::GetField - index out of bounds: " << nIndex); + return nullptr; } -SwBoxAutoFormat& SwTableAutoFormat::GetBoxFormat( sal_uInt8 nPos ) +const SwBoxAutoFormat* SwTableAutoFormat::GetField(size_t nIndex) const { - SAL_WARN_IF(!(nPos < 16), "sw.core", "GetBoxFormat wrong area"); + if (nIndex < ELEMENT_COUNT) + return m_aBoxAutoFormat[nIndex].get(); - SwBoxAutoFormat** pFormat = &m_aBoxAutoFormat[ nPos ]; - if( !*pFormat ) - *pFormat = new SwBoxAutoFormat(SwTableAutoFormat::GetDefaultBoxFormat()); - return **pFormat; + SAL_WARN("svx", "SwTableAutoFormat::GetField - index out of bounds: " << nIndex); + return nullptr; } -const SwBoxAutoFormat& SwTableAutoFormat::GetDefaultBoxFormat() +bool SwTableAutoFormat::SetField(size_t nIndex, const SvxAutoFormatDataField& aField) { - if(!s_pDefaultBoxAutoFormat) - s_pDefaultBoxAutoFormat = new SwBoxAutoFormat; + if (nIndex < ELEMENT_COUNT) + { + m_aBoxAutoFormat[nIndex] = std::make_unique<SwBoxAutoFormat>(aField); + return true; + } - return *s_pDefaultBoxAutoFormat; + SAL_WARN("svx", "SvxAutoFormatData::SetField - index out of bounds: " << nIndex); + return false; } -void SwTableAutoFormat::UpdateFromSet( sal_uInt8 nPos, - const SfxItemSet& rSet, - SwTableAutoFormatUpdateFlags eFlags, - SvNumberFormatter const * pNFormatr) +size_t SwTableAutoFormat::GetIndex(const SwBoxAutoFormat& rBoxFormat) const { - OSL_ENSURE( nPos < 16, "wrong area" ); + size_t nIndex = 0; + for (; nIndex < ELEMENT_COUNT; ++nIndex) + if (m_aBoxAutoFormat[nIndex].get() == &rBoxFormat) + break; - SwBoxAutoFormat* pFormat = m_aBoxAutoFormat[ nPos ]; - if( !pFormat ) // if is set -> copy - { - pFormat = new SwBoxAutoFormat; - m_aBoxAutoFormat[ nPos ] = pFormat; - } - - SwAutoFormatProps& rBoxProps = pFormat->GetProps(); - - if( SwTableAutoFormatUpdateFlags::Char & eFlags ) - { - rBoxProps.SetFont( rSet.Get( RES_CHRATR_FONT ) ); - rBoxProps.SetHeight( rSet.Get( RES_CHRATR_FONTSIZE ) ); - rBoxProps.SetWeight( rSet.Get( RES_CHRATR_WEIGHT ) ); - rBoxProps.SetPosture( rSet.Get( RES_CHRATR_POSTURE ) ); - rBoxProps.SetCJKFont( rSet.Get( RES_CHRATR_CJK_FONT ) ); - rBoxProps.SetCJKHeight( rSet.Get( RES_CHRATR_CJK_FONTSIZE ) ); - rBoxProps.SetCJKWeight( rSet.Get( RES_CHRATR_CJK_WEIGHT ) ); - rBoxProps.SetCJKPosture( rSet.Get( RES_CHRATR_CJK_POSTURE ) ); - rBoxProps.SetCTLFont( rSet.Get( RES_CHRATR_CTL_FONT ) ); - rBoxProps.SetCTLHeight( rSet.Get( RES_CHRATR_CTL_FONTSIZE ) ); - rBoxProps.SetCTLWeight( rSet.Get( RES_CHRATR_CTL_WEIGHT ) ); - rBoxProps.SetCTLPosture( rSet.Get( RES_CHRATR_CTL_POSTURE ) ); - rBoxProps.SetUnderline( rSet.Get( RES_CHRATR_UNDERLINE ) ); - rBoxProps.SetOverline( rSet.Get( RES_CHRATR_OVERLINE ) ); - rBoxProps.SetCrossedOut( rSet.Get( RES_CHRATR_CROSSEDOUT ) ); - rBoxProps.SetContour( rSet.Get( RES_CHRATR_CONTOUR ) ); - rBoxProps.SetShadowed( rSet.Get( RES_CHRATR_SHADOWED ) ); - rBoxProps.SetColor( rSet.Get( RES_CHRATR_COLOR ) ); - rBoxProps.SetAdjust( rSet.Get( RES_PARATR_ADJUST ) ); - } - if( !(SwTableAutoFormatUpdateFlags::Box & eFlags) ) + // box format doesn't belong to this table format + if (nIndex >= ELEMENT_COUNT) + return ELEMENT_COUNT; + return nIndex; +} + +void SwTableAutoFormat::RestoreToOriginal(SwContentNode* rContentNode, SfxItemSet& aDummySet, + size_t nRow, size_t nCol, size_t nRows, + size_t nCols) const +{ + UpdateToSet(aDummySet, nRow, nCol, nRows, nCols, nullptr); + SfxItemSet aItemSet = rContentNode->GetSwAttrSet(); + + if (aItemSet.Get(RES_CHRATR_FONT) == aDummySet.Get(RES_CHRATR_FONT)) + rContentNode->ResetAttr(RES_CHRATR_FONT); + if (aItemSet.Get(RES_CHRATR_FONTSIZE) == aDummySet.Get(RES_CHRATR_FONTSIZE)) + rContentNode->ResetAttr(RES_CHRATR_FONTSIZE); + if (aItemSet.Get(RES_CHRATR_WEIGHT) == aDummySet.Get(RES_CHRATR_WEIGHT)) + rContentNode->ResetAttr(RES_CHRATR_WEIGHT); + if (aItemSet.Get(RES_CHRATR_POSTURE) == aDummySet.Get(RES_CHRATR_POSTURE)) + rContentNode->ResetAttr(RES_CHRATR_POSTURE); + if (aItemSet.Get(RES_CHRATR_CJK_FONT) == aDummySet.Get(RES_CHRATR_CJK_FONT)) + rContentNode->ResetAttr(RES_CHRATR_CJK_FONT); + if (aItemSet.Get(RES_CHRATR_CJK_FONTSIZE) == aDummySet.Get(RES_CHRATR_CJK_FONTSIZE)) + rContentNode->ResetAttr(RES_CHRATR_CJK_FONTSIZE); + if (aItemSet.Get(RES_CHRATR_CJK_WEIGHT) == aDummySet.Get(RES_CHRATR_CJK_WEIGHT)) + rContentNode->ResetAttr(RES_CHRATR_CJK_WEIGHT); + if (aItemSet.Get(RES_CHRATR_CJK_POSTURE) == aDummySet.Get(RES_CHRATR_CJK_POSTURE)) + rContentNode->ResetAttr(RES_CHRATR_CJK_POSTURE); + if (aItemSet.Get(RES_CHRATR_CTL_FONT) == aDummySet.Get(RES_CHRATR_CTL_FONT)) + rContentNode->ResetAttr(RES_CHRATR_CTL_FONT); + if (aItemSet.Get(RES_CHRATR_CTL_FONTSIZE) == aDummySet.Get(RES_CHRATR_CTL_FONTSIZE)) + rContentNode->ResetAttr(RES_CHRATR_CTL_FONTSIZE); + if (aItemSet.Get(RES_CHRATR_CTL_WEIGHT) == aDummySet.Get(RES_CHRATR_CTL_WEIGHT)) + rContentNode->ResetAttr(RES_CHRATR_CTL_WEIGHT); + if (aItemSet.Get(RES_CHRATR_CTL_POSTURE) == aDummySet.Get(RES_CHRATR_CTL_POSTURE)) + rContentNode->ResetAttr(RES_CHRATR_CTL_POSTURE); + if (aItemSet.Get(RES_CHRATR_UNDERLINE) == aDummySet.Get(RES_CHRATR_UNDERLINE)) + rContentNode->ResetAttr(RES_CHRATR_UNDERLINE); + if (aItemSet.Get(RES_CHRATR_COLOR) == aDummySet.Get(RES_CHRATR_COLOR)) + rContentNode->ResetAttr(RES_CHRATR_COLOR); + if (aItemSet.Get(RES_PARATR_ADJUST) == aDummySet.Get(RES_PARATR_ADJUST)) + rContentNode->ResetAttr(RES_PARATR_ADJUST); +} + +void SwTableAutoFormat::UpdateToSet(SfxItemSet& aItemSet, size_t nRow, size_t nCol, size_t nRows, + size_t nCols, SvNumberFormatter* pNFormatr) const +{ + bool bFirstRow = nRow == 0, bLastRow = nRow == nRows - 1, bFirstCol = nCol == 0, + bLastCol = nCol == nCols - 1, bEvenRow = nRow % 2 != 0, bEvenCol = nCol % 2 != 0; + + SwBoxAutoFormat aDefault; + aItemSet.Put(aDefault.GetBox()); + aItemSet.Put(aDefault.GetBackground()); + + // Background & Body + FillToItemSet(BACKGROUND, aItemSet, pNFormatr); + FillToItemSet(BODY, aItemSet, pNFormatr); + + if (UseBandedColStyles()) + { + if (bEvenCol) + FillToItemSet(EVEN_COL, aItemSet, pNFormatr); + else + FillToItemSet(ODD_COL, aItemSet, pNFormatr); + } + + if (UseBandedRowStyles()) + { + if (bEvenRow) + FillToItemSet(EVEN_ROW, aItemSet, pNFormatr); + else + FillToItemSet(ODD_ROW, aItemSet, pNFormatr); + } + + if (bFirstCol && UseFirstColStyles()) + FillToItemSet(FIRST_COL, aItemSet, pNFormatr); + if (bLastCol && UseLastColStyles()) + FillToItemSet(LAST_COL, aItemSet, pNFormatr); + + // Frist & Last Row + if (UseFirstColStyles()) + { + if (bFirstRow) + FillToItemSet(FIRST_ROW, aItemSet, pNFormatr); + if (bFirstRow && bEvenCol) + FillToItemSet(FIRST_ROW_EVEN_COL, aItemSet, pNFormatr); + if (bFirstRow && bLastCol) + FillToItemSet(FIRST_ROW_END_COL, aItemSet, pNFormatr); + if (bFirstRow && bFirstCol) + FillToItemSet(FIRST_ROW_START_COL, aItemSet, pNFormatr); + } + if (UseLastRowStyles()) + { + if (bLastRow) + FillToItemSet(LAST_ROW, aItemSet, pNFormatr); + + if (bLastRow && bEvenCol) + FillToItemSet(LAST_ROW_EVEN_COL, aItemSet, pNFormatr); + if (bLastRow && bLastCol) + FillToItemSet(LAST_ROW_END_COL, aItemSet, pNFormatr); + if (bLastRow && bFirstCol) + FillToItemSet(LAST_ROW_START_COL, aItemSet, pNFormatr); + } +} + +void SwTableAutoFormat::UpdateFromSet(size_t nPos, const SfxItemSet& rSet, + SwTableAutoFormatUpdateFlags eFlags, + SvNumberFormatter const* pNFormatr) +{ + OSL_ENSURE(nPos < ELEMENT_COUNT, "wrong area"); + SwBoxAutoFormat* pFormat = m_aBoxAutoFormat[nPos].get(); + + if (SwTableAutoFormatUpdateFlags::Char & eFlags) + { + pFormat->SetFont(rSet.Get(RES_CHRATR_FONT)); + pFormat->SetHeight(rSet.Get(RES_CHRATR_FONTSIZE)); + pFormat->SetWeight(rSet.Get(RES_CHRATR_WEIGHT)); + pFormat->SetPosture(rSet.Get(RES_CHRATR_POSTURE)); + pFormat->SetCJKFont(rSet.Get(RES_CHRATR_CJK_FONT)); + pFormat->SetCJKHeight(rSet.Get(RES_CHRATR_CJK_FONTSIZE)); + pFormat->SetCJKWeight(rSet.Get(RES_CHRATR_CJK_WEIGHT)); + pFormat->SetCJKPosture(rSet.Get(RES_CHRATR_CJK_POSTURE)); + pFormat->SetCTLFont(rSet.Get(RES_CHRATR_CTL_FONT)); + pFormat->SetCTLHeight(rSet.Get(RES_CHRATR_CTL_FONTSIZE)); + pFormat->SetCTLWeight(rSet.Get(RES_CHRATR_CTL_WEIGHT)); + pFormat->SetCTLPosture(rSet.Get(RES_CHRATR_CTL_POSTURE)); + pFormat->SetUnderline(rSet.Get(RES_CHRATR_UNDERLINE)); + pFormat->SetOverline(rSet.Get(RES_CHRATR_OVERLINE)); + pFormat->SetCrossedOut(rSet.Get(RES_CHRATR_CROSSEDOUT)); + pFormat->SetContour(rSet.Get(RES_CHRATR_CONTOUR)); + pFormat->SetShadowed(rSet.Get(RES_CHRATR_SHADOWED)); + pFormat->SetColor(rSet.Get(RES_CHRATR_COLOR)); + pFormat->SetAdjust(rSet.Get(RES_PARATR_ADJUST)); + } + if (!(SwTableAutoFormatUpdateFlags::Box & eFlags)) return; - rBoxProps.SetBox( rSet.Get( RES_BOX ) ); -// FIXME - add attribute IDs for the diagonal line items -// rBoxProps.SetTLBR( (SvxLineItem&)rSet.Get( RES_... ) ); -// rBoxProps.SetBLTR( (SvxLineItem&)rSet.Get( RES_... ) ); - rBoxProps.SetBackground( rSet.Get( RES_BACKGROUND ) ); - rBoxProps.SetTextOrientation(rSet.Get(RES_FRAMEDIR)); - rBoxProps.SetVerticalAlignment(rSet.Get(RES_VERT_ORIENT)); + pFormat->SetBox(rSet.Get(RES_BOX)); + // FIXME - add attribute IDs for the diagonal line items + // pFormat->SetTLBR( (SvxLineItem&)rSet.Get( RES_... ) ); + // pFormat->SetBLTR( (SvxLineItem&)rSet.Get( RES_... ) ); + pFormat->SetBackground(rSet.Get(RES_BACKGROUND)); + pFormat->SetTextOrientation(rSet.Get(RES_FRAMEDIR)); + pFormat->SetVerticalAlignment(rSet.Get(RES_VERT_ORIENT)); const SwTableBoxNumFormat* pNumFormatItem; const SvNumberformat* pNumFormat = nullptr; - if( pNFormatr && (pNumFormatItem = rSet.GetItemIfSet( RES_BOXATR_FORMAT )) && - nullptr != (pNumFormat = pNFormatr->GetEntry( pNumFormatItem->GetValue() )) ) - rBoxProps.SetValueFormat( pNumFormat->GetFormatstring(), - pNumFormat->GetLanguage(), + if (pNFormatr && (pNumFormatItem = rSet.GetItemIfSet(RES_BOXATR_FORMAT)) + && nullptr != (pNumFormat = pNFormatr->GetEntry(pNumFormatItem->GetValue()))) + pFormat->SetValueFormat(pNumFormat->GetFormatstring(), pNumFormat->GetLanguage(), ::GetAppLanguage()); else { // default - rBoxProps.SetValueFormat( OUString(), LANGUAGE_SYSTEM, - ::GetAppLanguage() ); + pFormat->SetValueFormat(OUString(), LANGUAGE_SYSTEM, ::GetAppLanguage()); } - - // we cannot handle the rest, that's specific to StarCalc } -void SwTableAutoFormat::UpdateToSet(const sal_uInt8 nPos, const bool bCellSpansToEndV, const bool bCellSpansToEndH, SfxItemSet& rSet, - SwTableAutoFormatUpdateFlags eFlags, SvNumberFormatter* pNFormatr) const +void SwTableAutoFormat::FillToItemSet(size_t nIndex, SfxItemSet& rItemSet, + SvNumberFormatter* pNFormatr) const { - const SwAutoFormatProps& rChg = GetBoxFormat(nPos).GetProps(); + SvxAutoFormatData::FillToItemSet(nIndex, rItemSet); - if( SwTableAutoFormatUpdateFlags::Char & eFlags ) + const SwBoxAutoFormat aBox = *GetField(nIndex), aDefault = GetDefaultBoxFormat(); + if (IsJustify()) { - if( IsFont() ) - { - rSet.Put( rChg.GetFont() ); - rSet.Put( rChg.GetHeight() ); - rSet.Put( rChg.GetWeight() ); - rSet.Put( rChg.GetPosture() ); - // do not insert empty CJK font -e ... etc. - the rest is truncated
