mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#93005, tdf#100611, remove the incomplete ODC export feature

Browse Source 
Change-Id: I96a3882cd412ea5d993971df7e20b1fd8da73642
Reviewed-on: https://gerrit.libreoffice.org/64283
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Markus Mohrhard
2018-11-29 20:34:56 +01:00
parent 6a04b9298a
commit d543e8dfd3
16 changed files with 10 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
filter/source/config/fragments/filters/chart8.xcu
View File

@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<node oor:name="chart8" oor:op="replace"> <node oor:name="chart8" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT OWN DEFAULT PREFERRED ENCRYPTION</value></prop> <prop oor:name="Flags"><value>IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER PREFERRED ENCRYPTION</value></prop>
<prop oor:name="UIComponent"/> <prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.chart2.XMLFilter</value></prop> <prop oor:name="FilterService"><value>com.sun.star.comp.chart2.XMLFilter</value></prop>
<prop oor:name="UserData"><value>XML</value></prop> <prop oor:name="UserData"><value>XML</value></prop>

2
include/sfx2/objsh.hxx
View File

@@ -602,7 +602,7 @@ public:
*/ */
void SetupStorage( void SetupStorage(
const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::embed::XStorage >& xStorage,
sal_Int32 nVersion, bool bTemplate, bool bChart = false ) const; sal_Int32 nVersion, bool bTemplate ) const;
css::uno::Reference< css::embed::XStorage > const & GetStorage(); css::uno::Reference< css::embed::XStorage > const & GetStorage();

1
include/svx/svxids.hrc
View File

@@ -267,7 +267,6 @@ class SfxStringItem;
#define SID_OBJECT_ALIGN_UP ( SID_SVX_START + 134 ) #define SID_OBJECT_ALIGN_UP ( SID_SVX_START + 134 )
#define SID_OBJECT_ALIGN_MIDDLE ( SID_SVX_START + 135 ) #define SID_OBJECT_ALIGN_MIDDLE ( SID_SVX_START + 135 )
#define SID_OBJECT_ALIGN_DOWN ( SID_SVX_START + 136 ) #define SID_OBJECT_ALIGN_DOWN ( SID_SVX_START + 136 )
#define SID_INSERT_DIAGRAM_FROM_FILE ( SID_SVX_START + 139 )
#define SID_INSERT_DIAGRAM ( SID_SVX_START + 140 ) #define SID_INSERT_DIAGRAM ( SID_SVX_START + 140 )
#define SID_INSERT_TABLE ( SID_SVX_START + 141 ) #define SID_INSERT_TABLE ( SID_SVX_START + 141 )
#define SID_ATTRIBUTES_AREA ( SID_SVX_START + 142 ) #define SID_ATTRIBUTES_AREA ( SID_SVX_START + 142 )

8
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
View File

@@ -2549,14 +2549,6 @@
<value>1</value> <value>1</value>
</prop> </prop>
</node> </node>
<node oor:name=".uno:InsertObjectChartFromFile" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Chart from File...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:DefaultBullet" oor:op="replace"> <node oor:name=".uno:DefaultBullet" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string"> <prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Bullets</value> <value xml:lang="en-US">Bullets</value>

1
sc/Library_sc.mk
View File

@@ -349,7 +349,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/filter/xml/xmltabi \ sc/source/filter/xml/xmltabi \
sc/source/filter/xml/xmltransformationi \ sc/source/filter/xml/xmltransformationi \
sc/source/filter/xml/xmlwrap \ sc/source/filter/xml/xmlwrap \
sc/source/filter/chart/chart_imp \
sc/source/filter/importfilterdata \ sc/source/filter/importfilterdata \
sc/source/ui/Accessibility/AccessibilityHints \ sc/source/ui/Accessibility/AccessibilityHints \
sc/source/ui/Accessibility/AccessibleCell \ sc/source/ui/Accessibility/AccessibleCell \

1
sc/sdi/tabvwsh.sdi
View File

@@ -125,7 +125,6 @@ interface BaseSelection
SID_FM_CREATE_CONTROL [ ExecMethod = ExecDraw ; ] SID_FM_CREATE_CONTROL [ ExecMethod = ExecDraw ; ]
SID_LINKS [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] SID_LINKS [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
SID_DRAW_CHART [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_DRAW_CHART [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ]
SID_INSERT_DIAGRAM_FROM_FILE [ ExecMethod = ExecDrawIns; StateMethod = GetDrawState; ]
SID_FM_CREATE_FIELDCONTROL [ ExecMethod = ExecDrawIns ; ] SID_FM_CREATE_FIELDCONTROL [ ExecMethod = ExecDrawIns ; ]
// } insert objects // } insert objects

32
sc/source/filter/chart/chart_imp.cxx
View File

@@ -1,32 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <sfx2/docfile.hxx>
#include <xmlwrap.hxx>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
using namespace com::sun::star;
ScXMLChartExportWrapper::ScXMLChartExportWrapper( css::uno::Reference< css::frame::XModel > const & xModel, SfxMedium& rMed ):
mxModel(xModel),
mrMedium(rMed)
{
}
void ScXMLChartExportWrapper::Export()
{
if ( !mxStorage.is() )
mxStorage = mrMedium.GetOutputStorage();
uno::Reference< document::XStorageBasedDocument>(mxModel, uno::UNO_QUERY_THROW)->storeToStorage(mxStorage, uno::Sequence< beans::PropertyValue >() );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

39
sc/source/ui/docshell/docsh.cxx
View File

@@ -580,28 +580,6 @@ bool ScDocShell::SaveXML( SfxMedium* pSaveMedium, const css::uno::Reference< css
return bRet; return bRet;
} }
bool ScDocShell::SaveCurrentChart( SfxMedium& rMedium )
{
try
{
uno::Reference< lang::XComponent > xCurrentComponent = frame::Desktop::create( comphelper::getProcessComponentContext() )->getCurrentComponent();
uno::Reference< frame::XStorable2 > xStorable( xCurrentComponent, uno::UNO_QUERY_THROW );
uno::Reference< frame::XModel > xChartDoc ( xCurrentComponent, uno::UNO_QUERY_THROW );
ScXMLChartExportWrapper aExport( xChartDoc, rMedium );
aExport.Export();
return true;
}
catch(...)
{
SAL_WARN("sc", "exception thrown while saving chart. Bug!!!");
return false;
}
}
bool ScDocShell::Load( SfxMedium& rMedium ) bool ScDocShell::Load( SfxMedium& rMedium )
{ {
LoadMediumGuard aLoadGuard(&m_aDocument); LoadMediumGuard aLoadGuard(&m_aDocument);
@@ -1846,21 +1824,10 @@ bool ScDocShell::SaveAs( SfxMedium& rMedium )
PrepareSaveGuard aPrepareGuard( *this); PrepareSaveGuard aPrepareGuard( *this);
OUString aFltName = rMedium.GetFilter()->GetFilterName();
bool bChartExport = aFltName.indexOf("chart8") != -1;
// wait cursor is handled with progress bar // wait cursor is handled with progress bar
bool bRet = false; bool bRet = SfxObjectShell::SaveAs( rMedium );
if(!bChartExport) if (bRet)
{ bRet = SaveXML( &rMedium, nullptr );
bRet = SfxObjectShell::SaveAs( rMedium );
if (bRet)
bRet = SaveXML( &rMedium, nullptr );
}
else
{
bRet = SaveCurrentChart( rMedium );
}
return bRet; return bRet;
} }

37
sc/source/ui/drawfunc/fuins2.cxx
View File

@@ -733,41 +733,4 @@ FuInsertChart::FuInsertChart(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawV
// BM/IHA -- // BM/IHA --
} }
FuInsertChartFromFile::FuInsertChartFromFile(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, const SfxRequest& rReq, const OUString& rURL):
FuPoor(rViewSh, pWin, pViewP, pDoc, rReq)
{
uno::Reference< io::XInputStream > xStorage = comphelper::OStorageHelper::GetInputStreamFromURL(
rURL, comphelper::getProcessComponentContext());
comphelper::EmbeddedObjectContainer& rObjContainer =
rViewShell.GetObjectShell()->GetEmbeddedObjectContainer();
OUString aName;
uno::Reference< embed::XEmbeddedObject > xObj = rObjContainer.InsertEmbeddedObject( xStorage, aName );
const sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
awt::Size aSz = xObj->getVisualAreaSize( nAspect );
Size aSize( aSz.Width, aSz.Height );
ScRange aPositionRange = rViewSh.GetViewData().GetCurPos();
Point aStart = rViewSh.GetChartInsertPos( aSize, aPositionRange );
tools::Rectangle aRect (aStart, aSize);
SdrOle2Obj* pObj = new SdrOle2Obj(
*pDoc, // TTTT should be reference
svt::EmbeddedObjectRef(xObj, nAspect),
aName,
aRect);
SdrPageView* pPV = pView->GetSdrPageView();
// use the page instead of the view to insert, so no undo action is created yet
SdrPage* pInsPage = pPV->GetPage();
pInsPage->InsertObject( pObj );
pView->UnmarkAllObj();
pView->MarkObj( pObj, pPV );
rViewShell.ActivateObject(pObj, embed::EmbedVerbs::MS_OLEVERB_SHOW);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
sc/source/ui/inc/docsh.hxx
View File

@@ -137,8 +137,6 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener
SAL_DLLPRIVATE bool SaveXML( SfxMedium* pMedium, const css::uno::Reference< css::embed::XStorage >& ); SAL_DLLPRIVATE bool SaveXML( SfxMedium* pMedium, const css::uno::Reference< css::embed::XStorage >& );
SAL_DLLPRIVATE SCTAB GetSaveTab(); SAL_DLLPRIVATE SCTAB GetSaveTab();
SAL_DLLPRIVATE static bool SaveCurrentChart( SfxMedium& rMedium );
SAL_DLLPRIVATE ErrCode DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet, SAL_DLLPRIVATE ErrCode DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
std::map<SCCOL, ScColWidthParam>& aColWidthParam, ScFlatBoolRowSegments& rRowHeightsRecalc ); std::map<SCCOL, ScColWidthParam>& aColWidthParam, ScFlatBoolRowSegments& rRowHeightsRecalc );
SAL_DLLPRIVATE ErrCode DBaseExport( SAL_DLLPRIVATE ErrCode DBaseExport(

7
sc/source/ui/inc/fuinsert.hxx
View File

@@ -45,13 +45,6 @@ public:
SdrModel* pDoc, SfxRequest& rReq); SdrModel* pDoc, SfxRequest& rReq);
}; };
class FuInsertChartFromFile : public FuPoor
{
public:
FuInsertChartFromFile(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView,
SdrModel* pDoc, const SfxRequest& rReq, const OUString& rURL);
};
class FuInsertMedia : public FuPoor class FuInsertMedia : public FuPoor
{ {
public: public:

19
sc/source/ui/view/tabvwshb.cxx
View File

@@ -369,25 +369,6 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
break; break;
} }
case SID_INSERT_DIAGRAM_FROM_FILE:
try
{
sfx2::FileDialogHelper aDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
FileDialogFlags::NONE, "com.sun.star.chart2.ChartDocument",
SfxFilterFlags::NONE, SfxFilterFlags::NONE, pWin ? pWin->GetFrameWeld() : nullptr);
if(aDlg.Execute() == ERRCODE_NONE )
{
INetURLObject aURLObj( aDlg.GetPath() );
OUString aURL = aURLObj.GetURLNoPass();
FuInsertChartFromFile(*this, pWin, pView, pDrModel, rReq, aURL);
}
}
catch (const uno::Exception& e)
{
SAL_WARN( "sc", "Cannot Insert Chart: " << e);
}
break;
case SID_OBJECTRESIZE: case SID_OBJECTRESIZE:
{ {
// the server would like to change the client size // the server would like to change the client size

1
sc/uiconfig/scalc/menubar/menubar.xml
View File

@@ -217,7 +217,6 @@
<menu:menupopup> <menu:menupopup>
<menu:menuitem menu:id=".uno:InsertObjectStarMath"/> <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
<menu:menuitem menu:id=".uno:InsertObject"/> <menu:menuitem menu:id=".uno:InsertObject"/>
<menu:menuitem menu:id=".uno:InsertObjectChartFromFile"/>
</menu:menupopup> </menu:menupopup>
</menu:menu> </menu:menu>
<menu:menu menu:id=".uno:ShapesMenu"> <menu:menu menu:id=".uno:ShapesMenu">

21
sfx2/source/doc/guisaveas.cxx
View File

@@ -355,27 +355,6 @@ ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner,
, m_bRecommendReadOnly( false ) , m_bRecommendReadOnly( false )
{ {
CheckInteractionHandler(); CheckInteractionHandler();
try
{
uno::Reference< lang::XComponent > xCurrentComponent = frame::Desktop::create( comphelper::getProcessComponentContext() )->getCurrentComponent();
if (aOwner.GetModuleManager()->identify(xCurrentComponent) == "com.sun.star.chart2.ChartDocument")
{
// let us switch the model and set the xStorable and
// XStorable2 to the old model.
// This is an ugly hack because we have no SfxObjectShell for chart2 yet.
// We need SfxObjectShell for the heavy work around ODF document creation
// because chart2 only writes the basic stream out.
// In future in might make sense to implement a full scale object shell in
// chart2 and make chart2 an own program.
m_xModel.set(xCurrentComponent, uno::UNO_QUERY_THROW );
m_xStorable.set(xModel, uno::UNO_QUERY_THROW );
m_xStorable2.set(xModel, uno::UNO_QUERY_THROW );
}
}
catch(...)
{
// we don't want to pass on any errors;
}
} }

49
sfx2/source/doc/objstor.cxx
View File

@@ -300,38 +300,9 @@ SvGlobalName const & SfxObjectShell::GetClassName() const
return GetFactory().GetClassId(); return GetFactory().GetClassId();
} }
namespace {
/**
* Chart2 does not have an Object shell, so handle this here for now
* If we ever implement a full scale object shell in chart2 move it there
*/
SotClipboardFormatId GetChartVersion( sal_Int32 nVersion, bool bTemplate )
{
if( nVersion == SOFFICE_FILEFORMAT_60)
{
return SotClipboardFormatId::STARCHART_60;
}
else if( nVersion == SOFFICE_FILEFORMAT_8)
{
if (bTemplate)
{
SAL_WARN("sfx.doc", "no chart template support yet");
return SotClipboardFormatId::STARCHART_8;
}
else
return SotClipboardFormatId::STARCHART_8;
}
SAL_WARN("sfx.doc", "unsupported version");
return SotClipboardFormatId::NONE;
}
}
void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xStorage, void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xStorage,
sal_Int32 nVersion, bool bTemplate, bool bChart ) const sal_Int32 nVersion, bool bTemplate ) const
{ {
uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY );
@@ -339,14 +310,9 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
{ {
SotClipboardFormatId nClipFormat = SotClipboardFormatId::NONE; SotClipboardFormatId nClipFormat = SotClipboardFormatId::NONE;
if(!bChart) SvGlobalName aName;
{ OUString aFullTypeName, aShortTypeName, aAppName;
SvGlobalName aName; FillClass( &aName, &nClipFormat, &aAppName, &aFullTypeName, &aShortTypeName, nVersion, bTemplate );
OUString aFullTypeName, aShortTypeName, aAppName;
FillClass( &aName, &nClipFormat, &aAppName, &aFullTypeName, &aShortTypeName, nVersion, bTemplate );
}
else
nClipFormat = GetChartVersion(nVersion, bTemplate);
if ( nClipFormat != SotClipboardFormatId::NONE ) if ( nClipFormat != SotClipboardFormatId::NONE )
{ {
@@ -3069,12 +3035,7 @@ bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium )
const bool bTemplate = rMedium.GetFilter()->IsOwnTemplateFormat() const bool bTemplate = rMedium.GetFilter()->IsOwnTemplateFormat()
&& nVersion > SOFFICE_FILEFORMAT_60; && nVersion > SOFFICE_FILEFORMAT_60;
std::shared_ptr<const SfxFilter> pFilter = rMedium.GetFilter(); SetupStorage( xStorage, nVersion, bTemplate );
bool bChart = false;
if(pFilter->GetName() == "chart8")
bChart = true;
SetupStorage( xStorage, nVersion, bTemplate, bChart );
#if HAVE_FEATURE_SCRIPTING #if HAVE_FEATURE_SCRIPTING
if ( HasBasic() ) if ( HasBasic() )
{ {

19
svx/sdi/svx.sdi
View File

@@ -4789,25 +4789,6 @@ SfxVoidItem InsertObjectChart SID_INSERT_DIAGRAM
] ]
SfxVoidItem InsertObjectChartFromFile SID_INSERT_DIAGRAM_FROM_FILE
()
[
AutoUpdate = FALSE,
FastCall = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Asynchron;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
GroupId = SfxGroupId::Insert;
]
SfxVoidItem InsertSymbol SID_CHARMAP SfxVoidItem InsertSymbol SID_CHARMAP
(SfxStringItem Symbols SID_CHARMAP, SfxStringItem FontName SID_ATTR_SPECIALCHAR) (SfxStringItem Symbols SID_CHARMAP, SfxStringItem FontName SID_ATTR_SPECIALCHAR)
[ [