diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index fd20e1f441a7..f7d589692111 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -68,55 +68,37 @@ public: css::uno::Sequence< css::beans::PropertyValue > m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor - //@todo define this for debug only, except URL - bool AsTemplate; //document is a template. + css::uno::Any ComponentData; + css::uno::Any FilterData; + OUString FilterName; //internal filter name. + bool ISSET_FilterName; - css::uno::Any - ComponentData; - css::uno::Any - FilterData; - OUString FilterName; //internal filter name. - bool ISSET_FilterName; - bool Hidden; //load document, invisible. - - OUString HierarchicalDocumentName; + OUString HierarchicalDocumentName; css::uno::Reference< css::io::XOutputStream > OutputStream; //a stream to receive the document data for saving - bool ISSET_OutputStream; + bool ISSET_OutputStream; css::uno::Reference< css::io::XInputStream > InputStream; //content of document. - bool ISSET_InputStream; + bool ISSET_InputStream; - bool OpenNewView; //opens a new view for an already loaded document. - bool Overwrite; //opens a new view for an already loaded document. + bool ReadOnly; //open document readonly. - bool Preview; //show preview. - bool ReadOnly; //open document readonly. + OUString URL;// FileName, URL of the document. + bool ISSET_URL; - //not documented ... @todo remove? - bool Silent; //prevents dialogs to query for more information. - bool Unpacked; - OUString URL;// FileName, URL of the document. - bool ISSET_URL; - sal_Int16 Version; //storage version. - - css::uno::Any - ViewData; - sal_Int16 ViewId; //id of the initial view. + css::uno::Any ViewData; // new framework objects css::uno::Reference< css::embed::XStorage > Storage; - bool ISSET_Storage; + bool ISSET_Storage; css::uno::Reference< css::io::XStream > Stream; - bool ISSET_Stream; - - bool SetEmbedded; + bool ISSET_Stream; protected: -SAL_DLLPRIVATE void impl_init(); + SAL_DLLPRIVATE void impl_init(); }; } diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx index a96dddf731b7..78fa5d14d007 100644 --- a/chart2/source/tools/MediaDescriptorHelper.cxx +++ b/chart2/source/tools/MediaDescriptorHelper.cxx @@ -61,7 +61,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< if (rProp.Name == "AsTemplate") { - rProp.Value >>= AsTemplate; addModelProp(rProp); } else if (rProp.Name == "Author") @@ -109,7 +108,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "Hidden") { - rProp.Value >>= Hidden; addModelProp(rProp); } else if (rProp.Name == "HierarchicalDocumentName") @@ -145,12 +143,10 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "OpenNewView") { - rProp.Value >>= OpenNewView; addRegularProp(rProp); } else if (rProp.Name == "Overwrite") { - rProp.Value >>= Overwrite; addModelProp(rProp); } else if (rProp.Name == "Password") @@ -171,7 +167,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "Preview") { - rProp.Value >>= Preview; addModelProp(rProp); } else if (rProp.Name == "ReadOnly") @@ -185,12 +180,10 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "SetEmbedded") { - rProp.Value >>= SetEmbedded; addRegularProp(rProp); } else if (rProp.Name == "Silent") { - rProp.Value >>= Silent; addRegularProp(rProp); } else if (rProp.Name == "StatusIndicator") @@ -217,7 +210,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "Unpacked") { - rProp.Value >>= Unpacked; addModelProp(rProp); } else if (rProp.Name == "URL") @@ -227,7 +219,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "Version") { - rProp.Value >>= Version; addModelProp(rProp); } else if (rProp.Name == "ViewData") @@ -237,7 +228,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< } else if (rProp.Name == "ViewId") { - rProp.Value >>= ViewId; addModelProp(rProp); } else if (rProp.Name == "WinExtent") @@ -259,26 +249,13 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence< void MediaDescriptorHelper::impl_init() { - AsTemplate = false; - ISSET_FilterName = false; - Hidden = false; ISSET_OutputStream = false; ISSET_InputStream = false; - OpenNewView = false; - Overwrite = false; - Preview = false; ReadOnly = false; - Silent = false; - Unpacked = false; ISSET_URL = false; - Version = 0; - - ViewId = 0; - - SetEmbedded = false; ISSET_Storage = false; ISSET_Stream = false;