diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-13 11:12:50 -0400 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-06-23 15:02:14 +0000 |
| commit | 22cd19eeeb476c40b68bb1ff040fce6103fdeba4 (patch) | |
| tree | c4550dfcfbc10ebb75e3b6130ca44d44a28484ec /dbaccess/source/ui/querydesign | |
| parent | a28256553dcc29d67c530b29727bfbf3ba6aa81a (diff) | |
fdo#71076, fdo#71767: Preserve number formats when charts are copied.
(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9)
Conflicts:
sd/source/ui/view/sdview3.cxx
xmloff/source/chart/SchXMLExport.cxx
Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a
Reviewed-on: https://gerrit.libreoffice.org/9836
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'dbaccess/source/ui/querydesign')
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinExchange.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 12b5dcdaa01a..e2531a5dce60 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -113,7 +113,7 @@ namespace dbaui AddFormat( SOT_FORMATSTR_ID_SBA_TABID ); } - bool OJoinExchObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) + bool OJoinExchObj::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ ) { sal_uInt32 nFormat = SotExchange::GetFormat(rFlavor); if ( SOT_FORMATSTR_ID_SBA_JOIN == nFormat ) |