diff options
| author | Eike Rathke <erack@redhat.com> | 2012-02-09 14:37:44 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-02-09 14:37:44 +0100 |
| commit | f02f97bcdf7b6789e42f04600fb30daf3e0bfd37 (patch) | |
| tree | 9209d51a9bb20220c97ce463540b7ae2ed9033d6 /sc/inc/cellsuno.hxx | |
| parent | de21b9a50d0ebfc60ea9cade8f67d11d151d6b4e (diff) | |
added TableBorder2 using BorderLine2, implemented BorderLine2 properly
* added com::sun::star::table::TableBorder2 with
com::sun::star::table::BorderLine2 members
* added optional com::sun::star::table::BorderLine2 properties to
com::sun::star::table::CellProperties service
* changes in Calc
* support TableBorder2, additionally to TableBorder
* reverted change that made all BorderLine properties operate with
BorderLine2 structs
* instead support both, BorderLine and BorderLine2
Diffstat (limited to 'sc/inc/cellsuno.hxx')
| -rw-r--r-- | sc/inc/cellsuno.hxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index c2733bdd9557..c631569e24d0 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -75,8 +75,9 @@ #include <com/sun/star/util/XImportable.hpp> #include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/table/XCell2.hpp> -#include <com/sun/star/table/BorderLine.hpp> +#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/TableBorder.hpp> +#include <com/sun/star/table/TableBorder2.hpp> #include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp> #include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp> #include <com/sun/star/sheet/XScenariosSupplier.hpp> @@ -143,10 +144,15 @@ class ScHelperFunctions { public: static const ::editeng::SvxBorderLine* GetBorderLine( ::editeng::SvxBorderLine& rLine, const com::sun::star::table::BorderLine& rStruct ); + static const ::editeng::SvxBorderLine* GetBorderLine( ::editeng::SvxBorderLine& rLine, const com::sun::star::table::BorderLine2& rStruct ); static void FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const com::sun::star::table::TableBorder& rBorder ); + static void FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const com::sun::star::table::TableBorder2& rBorder ); static void FillBorderLine( com::sun::star::table::BorderLine& rStruct, const ::editeng::SvxBorderLine* pLine ); - static void FillTableBorder( com::sun::star::table::TableBorder& rBorder, - const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner ); + static void FillBorderLine( com::sun::star::table::BorderLine2& rStruct, const ::editeng::SvxBorderLine* pLine ); + static void AssignTableBorderToAny( com::sun::star::uno::Any& rAny, + const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner, bool bInvalidateHorVerDist = false ); + static void AssignTableBorder2ToAny( com::sun::star::uno::Any& rAny, + const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner, bool bInvalidateHorVerDist = false ); static void ApplyBorder( ScDocShell* pDocShell, const ScRangeList& rRanges, const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner ); }; |