From 9d38207079222ccbf991f2177ac3ff483a2d60e3 Mon Sep 17 00:00:00 2001
From: Thomas Benisch <tbe@openoffice.org>
Date: Tue, 9 Nov 2010 17:27:08 +0100
Subject: chartextensibility: #i113619# Pasting a chart into a spreadsheet is
 not notified

---
 sd/source/ui/view/sdview3.cxx | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 mode change 100644 => 100755 sd/source/ui/view/sdview3.cxx

(limited to 'sd')

diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
old mode 100644
new mode 100755
index 53c0d3636d82..fd709dc22038
--- 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;
                 }
             }
-- 
cgit 


From 9f99bc563a5e9712a2601ba45d01e0762d269f94 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Tue, 14 Dec 2010 13:25:17 +0100
Subject: sb135: #i116122# sd::slidesorter::view::Theme mbIsHighContrastMode
 uninitialized

---
 sd/source/ui/slidesorter/view/SlsTheme.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sd')

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(),
-- 
cgit