diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:46:36 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:46:36 +0200 |
| commit | 6b4beb1264c870fe9559490f4faadbe6c70f9019 (patch) | |
| tree | d8da1168a88b1e7d54039672ef659101875461b1 /oox | |
| parent | bcb1ceafcc18aaa8199b21478dde39bdb9ae83dd (diff) | |
| parent | 6630b196941390019b2f015e94c0ce63dd0983f6 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/filters
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/xls/scenariobuffer.hxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/textrun.cxx | 11 | ||||
| -rw-r--r-- | oox/source/xls/workbookhelper.cxx | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/oox/inc/oox/xls/scenariobuffer.hxx b/oox/inc/oox/xls/scenariobuffer.hxx index e9e987db9d31..e484e418473d 100644 --- a/oox/inc/oox/xls/scenariobuffer.hxx +++ b/oox/inc/oox/xls/scenariobuffer.hxx @@ -140,7 +140,7 @@ public: /** Creates and returns a scenario collection for the passed sheet. */ SheetScenarios& createSheetScenarios( sal_Int16 nSheet ); - /** Creates all scenarios in the Calc dcument. */ + /** Creates all scenarios in the Calc document. */ void finalizeImport(); private: diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 931970bcf394..843c1a62f562 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -36,6 +36,7 @@ #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" #include "oox/core/xmlfilterbase.hxx" +#include "oox/token/tokens.hxx" using ::rtl::OUString; using namespace ::com::sun::star::uno; @@ -149,6 +150,16 @@ sal_Int32 TextRun::insertAt( xText->insertTextContent( xStart, xContent, sal_False ); xTextFieldCursor->gotoEnd( sal_True ); + + if ( !maTextCharacterProperties.maCharColor.isUsed() ) + aTextCharacterProps.maCharColor.setSchemeClr( XML_hlink ); + if ( !maTextCharacterProperties.moUnderline.has() ) + aTextCharacterProps.moUnderline.set( XML_sng ); + + Reference< XTextRange > xFieldRange( xTextFieldCursor, UNO_QUERY ); + PropertySet aFieldTextPropSet( xFieldRange ); + aTextCharacterProps.pushToPropSet( aFieldTextPropSet, rFilterBase ); + oox::core::TextField aTextField; aTextField.xText = xText; aTextField.xTextCursor = xTextFieldCursor; diff --git a/oox/source/xls/workbookhelper.cxx b/oox/source/xls/workbookhelper.cxx index bf93ef25608b..d5936d68e57f 100644 --- a/oox/source/xls/workbookhelper.cxx +++ b/oox/source/xls/workbookhelper.cxx @@ -253,7 +253,7 @@ private: FilterType meFilterType; /// File type of the filter. ProgressBarPtr mxProgressBar; /// The progress bar. StorageRef mxVbaPrjStrg; /// Storage containing the VBA project. - sal_Int16 mnCurrSheet; /// Current sheet index in Calc dcument. + sal_Int16 mnCurrSheet; /// Current sheet index in Calc document. bool mbWorkbook; /// True = multi-sheet file. // buffers |