diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-05-30 13:57:02 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-31 10:14:59 +0200 |
commit | 2a0d8106a558845357d39648656e08ec6f091cf8 (patch) | |
tree | 1706b234c481d77005201a2f2a7d1f611db27368 | |
parent | f5f182e6d0894576d9e16d3de26eaacb2236a171 (diff) |
tdf#117864 TransferableHelper::GetSystemClipboard requires a focus window
Change-Id: Ibd9b9218cf12e80db1fc9a70bdbab38d3df950f7
Reviewed-on: https://gerrit.libreoffice.org/55074
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | chart2/source/controller/main/ChartController_Tools.cxx | 3 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 8c19e816dad4..0616dba18644 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -526,7 +526,8 @@ void ChartController::executeDispatch_Copy() } if ( xTransferable.is() ) { - Reference< datatransfer::clipboard::XClipboard > xClipboard( TransferableHelper::GetSystemClipboard() ); + SolarMutexGuard aSolarGuard; + Reference<datatransfer::clipboard::XClipboard> xClipboard(GetChartWindow()->GetClipboard()); if ( xClipboard.is() ) { xClipboard->setContents( xTransferable, Reference< datatransfer::clipboard::XClipboardOwner >() ); diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 836aaaba3002..edf0190d75fc 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -266,6 +266,10 @@ OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel) OUString aCID; aAny >>= aCID; + + if (aCID.isEmpty()) + return OUString(); + #ifdef DBG_UTIL ObjectType eType = ObjectIdentifier::getObjectType(aCID); assert(eType == OBJECTTYPE_DATA_SERIES); |