summaryrefslogtreecommitdiff
path: root/patches/dev300/cws-calctabcolor-oox.diff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/dev300/cws-calctabcolor-oox.diff')
-rw-r--r--patches/dev300/cws-calctabcolor-oox.diff73
1 files changed, 0 insertions, 73 deletions
diff --git a/patches/dev300/cws-calctabcolor-oox.diff b/patches/dev300/cws-calctabcolor-oox.diff
deleted file mode 100644
index d794be877..000000000
--- a/patches/dev300/cws-calctabcolor-oox.diff
+++ /dev/null
@@ -1,73 +0,0 @@
----
- oox/source/token/properties.txt | 1 +
- oox/source/xls/worksheethelper.cxx | 2 ++
- oox/source/xls/worksheetsettings.cxx | 14 ++++++++++++--
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git oox/source/token/properties.txt oox/source/token/properties.txt
-index 2b32b0a..f702ff6 100644
---- oox/source/token/properties.txt
-+++ oox/source/token/properties.txt
-@@ -394,6 +394,7 @@ Suffix
- SwapXAndYAxis
- Symbol
- SymbolColor
-+TabColor
- TabIndex
- TableBorder
- TableLayout
-diff --git oox/source/xls/worksheethelper.cxx oox/source/xls/worksheethelper.cxx
-index 4975710..0e9b438 100644
---- oox/source/xls/worksheethelper.cxx
-+++ 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 oox/source/xls/worksheetsettings.cxx oox/source/xls/worksheetsettings.cxx
-index 62e52bf..497e511 100644
---- oox/source/xls/worksheetsettings.cxx
-+++ oox/source/xls/worksheetsettings.cxx
-@@ -26,15 +26,18 @@
- ************************************************************************/
-
- #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 "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 +322,13 @@ 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());
-+ PropertySet aSheetProp(getSheet());
-+ aSheetProp.setProperty(PROP_TabColor, nColor);
-+ }
- }
-
- // ============================================================================
---
-1.7.0.1
-