diff options
| author | Noel Power <noel.power@suse.com> | 2013-06-26 10:36:53 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-06-26 16:45:29 +0100 |
| commit | 0a686a9bb54b5c1b3a45810e2601a098c0272c33 (patch) | |
| tree | 4feb4c990502743544c312a074269c64702e6e9f /oox/source/ole/olehelper.cxx | |
| parent | #119467# Form controls cannot be saved into .ppt file in AOO3.4 (diff) | |
| download | core-0a686a9bb54b5c1b3a45810e2601a098c0272c33.tar.gz core-0a686a9bb54b5c1b3a45810e2601a098c0272c33.zip | |
tweak ppt ole import for libreoffice codebase
a) make sure backcolor is skipped when libreoffice backcolor
is default. Libreoffice default is 0 ( but if we write that out mso
reads it as black )
b) don't take the label default backcolor in exchange for the
libreoffice default. Libreoffice default backcolor for label is white,
mso's default is rather different ( and never seems to be used )
c) re-enable compObj export ( seemed this was disabled unintentionally
except for buttons )
Change-Id: Ie68267809cee2e92bd06e88e698f17a10eeeb6ad
Diffstat (limited to 'oox/source/ole/olehelper.cxx')
| -rw-r--r-- | oox/source/ole/olehelper.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 8dc8f7ce8e7a..433b88462f8e 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -461,7 +461,7 @@ void OleFormCtrlExportHelper::exportName( const Reference< XOutputStream >& rxOu void OleFormCtrlExportHelper::exportCompObj( const Reference< XOutputStream >& rxOut ) { oox::BinaryXOutputStream aOut( rxOut, false ); - if ( mpModel && mpModel->getControlType() == API_CONTROL_BUTTON ) + if ( mpModel ) mpModel->exportCompObj( aOut ); } |