diff options
| author | obo <obo@openoffice.org> | 2010-06-21 13:30:01 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-21 13:30:01 +0200 |
| commit | fbe60754d1283a3a11307446af0ec0f8011d1af2 (patch) | |
| tree | 420f28268672327ede85a1dd23ba232ad6d416fb /oox | |
| parent | a0d74ba1d291e341413fd8d75824c9122b3b1cc9 (diff) | |
| parent | cc07f6b22a28331eafa2d2ae6ef780221d564cb7 (diff) | |
CWS-TOOLING: integrate CWS calctabcolor
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/token/properties.txt | 1 | ||||
| -rw-r--r-- | oox/source/xls/worksheethelper.cxx | 2 | ||||
| -rw-r--r-- | oox/source/xls/worksheetsettings.cxx | 14 |
3 files changed, 15 insertions, 2 deletions
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index a0f0021d710a..38fa2fc2c02b 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -396,6 +396,7 @@ Suffix SwapXAndYAxis Symbol SymbolColor +TabColor TabIndex TableBorder TableLayout diff --git a/oox/source/xls/worksheethelper.cxx b/oox/source/xls/worksheethelper.cxx index 381def644ce5..efce7f2f385c 100644 --- a/oox/source/xls/worksheethelper.cxx +++ b/oox/source/xls/worksheethelper.cxx @@ -994,6 +994,8 @@ void WorksheetData::finalizeWorksheetImport() maCondFormats.finalizeImport(); maPageSett.finalizeImport(); maSheetViewSett.finalizeImport(); + maSheetSett.finalizeImport(); + lclUpdateProgressBar( mxFinalProgress, 0.5 ); convertColumns(); convertRows(); diff --git a/oox/source/xls/worksheetsettings.cxx b/oox/source/xls/worksheetsettings.cxx index 6a42c38e1647..0cc9d5f17780 100644 --- a/oox/source/xls/worksheetsettings.cxx +++ b/oox/source/xls/worksheetsettings.cxx @@ -26,15 +26,19 @@ ************************************************************************/ #include "oox/xls/worksheetsettings.hxx" -#include <com/sun/star/util/XProtectable.hpp> -#include "properties.hxx" #include "oox/helper/attributelist.hxx" #include "oox/helper/recordinputstream.hxx" #include "oox/xls/biffinputstream.hxx" #include "oox/xls/pagesettings.hxx" #include "oox/xls/workbooksettings.hxx" +#include "oox/core/filterbase.hxx" +#include "properties.hxx" + +#include <com/sun/star/util/XProtectable.hpp> using ::rtl::OUString; +using ::com::sun::star::beans::XPropertySet; +using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; @@ -319,6 +323,12 @@ void WorksheetSettings::finalizeImport() // VBA code name PropertySet aPropSet( getSheet() ); aPropSet.setProperty( PROP_CodeName, maSheetSettings.maCodeName ); + + if (!maSheetSettings.maTabColor.isAuto()) + { + sal_Int32 nColor = maSheetSettings.maTabColor.getColor(getBaseFilter().getGraphicHelper()); + aPropSet.setProperty(PROP_TabColor, nColor); + } } // ============================================================================ |