diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-01-25 18:35:57 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-01-25 18:35:57 +0100 |
| commit | 911d360e2a4a723a46d729a2bb5eea1596a07c1c (patch) | |
| tree | c493bf2a614fe0c440c30b1fd28b546d7b0948c4 /sd | |
| parent | 40738f11f412b62b52277ffbcf6166bf7421460c (diff) | |
| parent | fa27b2da2f8e7bd9bafb4a057318ac22577727dd (diff) | |
CWS gnumake3: resync to m98
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsTheme.cxx | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/view/sdview3.cxx | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 7357d7ea00b8..2aaa7f23af95 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -73,7 +73,8 @@ ColorData HGBAdapt ( Theme::Theme (const ::boost::shared_ptr<controller::Properties>& rpProperties) - : maBackgroundColor(rpProperties->GetBackgroundColor().GetColor()), + : mbIsHighContrastMode(false), + maBackgroundColor(rpProperties->GetBackgroundColor().GetColor()), maPageBackgroundColor(COL_WHITE), maGradients(), maIcons(), diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 53c0d3636d82..fd709dc22038 100644..100755 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1006,6 +1006,27 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pImageMap ) pObj->InsertUserData( new SdIMapInfo( *pImageMap ) ); + if ( pObj && pObj->IsChart() ) + { + bool bDisableDataTableDialog = false; + svt::EmbeddedObjectRef::TryRunningState( xObj ); + uno::Reference< beans::XPropertySet > xProps( xObj->getComponent(), uno::UNO_QUERY ); + if ( xProps.is() && + ( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>= bDisableDataTableDialog ) && + bDisableDataTableDialog ) + { + xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ), + uno::makeAny( sal_False ) ); + xProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableComplexChartTypes" ) ), + uno::makeAny( sal_False ) ); + uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY ); + if ( xModifiable.is() ) + { + xModifiable->setModified( sal_True ); + } + } + } + bReturn = TRUE; } } |