summaryrefslogtreecommitdiff
path: root/chart2/source/inc/MediaDescriptorHelper.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:32 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:32 +0200
commitc9ac7489ec5fd4652f0cff09722561ba5a27bcda (patch)
treee9fb41b01f699d5a4202e719d5dc7e087fa701c1 /chart2/source/inc/MediaDescriptorHelper.hxx
parent69bb367315288b644439dc46d34743a2575a3527 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 5e369f0d3b306be13606c1558ecf7d0aac0048f4 (tag: refs/tags/libreoffice-3.3.0.4) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:15 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 2df81fdef39f29be15dc0a6e12031916de963f08 Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:18:07 2011 -0500 Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c. I created a patch between before and after the merge commit, and reverse-applied it. This is because if you revert a merge commit in git you are denying all future merges from that branch. I wasn't sure if we really wanted that. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/inc/document.hxx | 22 +------ sc/inc/drwlayer.hxx | 2 +- sc/inc/table.hxx | 16 +----- sc/source/core/data/document.cxx | 7 +-- sc/source/core/data/drwlayer.cxx | 6 +- sc/source/core/data/table1.cxx | 38 ++++-------- sc/source/core/data/table2.cxx | 91 ++++++------------------------ sc/source/core/data/table3.cxx | 71 +---------------------- sc/source/filter/xml/xmlrowi.cxx | 17 +---- sc/source/ui/docshell/externalrefmgr.cxx | 7 +- sc/source/ui/view/dbfunc.cxx | 5 +- sc/source/ui/view/tabvwshe.cxx | 4 +- 12 files changed, 52 insertions(+), 234 deletions(-) commit 9ce94f52e8c404a5e19154d38c18a44281d961f0 Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:04:14 2011 -0500 Revert "This is also part of the merge." This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/source/core/data/table3.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 1e03f54cc4f8939867869a3570f56d0645b515f5 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:36 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: calc_libreoffice-3.3.0.4
Diffstat (limited to 'chart2/source/inc/MediaDescriptorHelper.hxx')
-rw-r--r--chart2/source/inc/MediaDescriptorHelper.hxx134
1 files changed, 67 insertions, 67 deletions
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index c5b6861c2542..6ce9a250c790 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -88,101 +88,101 @@ public:
//@todo define this for debug only, except URL
- sal_Bool AsTemplate; //document is a template.
- sal_Bool ISSET_AsTemplate;
- ::rtl::OUString Author; //
- sal_Bool ISSET_Author;
- ::rtl::OUString CharacterSet; //identifier of used character set.
- sal_Bool ISSET_CharacterSet;
- ::rtl::OUString Comment;//
- sal_Bool ISSET_Comment;
+ sal_Bool AsTemplate; //document is a template.
+ sal_Bool ISSET_AsTemplate;
+ ::rtl::OUString Author; //
+ sal_Bool ISSET_Author;
+ ::rtl::OUString CharacterSet; //identifier of used character set.
+ sal_Bool ISSET_CharacterSet;
+ ::rtl::OUString Comment;//
+ sal_Bool ISSET_Comment;
::com::sun::star::uno::Any
ComponentData;//
- sal_Bool ISSET_ComponentData;
- ::rtl::OUString FileName; //deprecated, same as url
- sal_Bool ISSET_FileName;
+ sal_Bool ISSET_ComponentData;
+ ::rtl::OUString FileName; //deprecated, same as url
+ sal_Bool ISSET_FileName;
::com::sun::star::uno::Any
FilterData;//
- sal_Bool ISSET_FilterData;
- ::rtl::OUString FilterName; //internal filter name.
- sal_Bool ISSET_FilterName;
- ::rtl::OUString FilterFlags;//deprecated,
- sal_Bool ISSET_FilterFlags;
- ::rtl::OUString FilterOptions;//
- sal_Bool ISSET_FilterOptions;
+ sal_Bool ISSET_FilterData;
+ ::rtl::OUString FilterName; //internal filter name.
+ sal_Bool ISSET_FilterName;
+ ::rtl::OUString FilterFlags;//deprecated,
+ sal_Bool ISSET_FilterFlags;
+ ::rtl::OUString FilterOptions;//
+ sal_Bool ISSET_FilterOptions;
//not documented ... @todo remove?
- ::rtl::OUString FrameName; //name of target frame.
- sal_Bool ISSET_FrameName;
- sal_Bool Hidden; //load document, invisible.
- sal_Bool ISSET_Hidden;
+ ::rtl::OUString FrameName; //name of target frame.
+ sal_Bool ISSET_FrameName;
+ sal_Bool Hidden; //load document, invisible.
+ sal_Bool ISSET_Hidden;
- ::rtl::OUString HierarchicalDocumentName;
- sal_Bool ISSET_HierarchicalDocumentName;
+ ::rtl::OUString HierarchicalDocumentName;
+ sal_Bool ISSET_HierarchicalDocumentName;
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
OutputStream; //a stream to receive the document data for saving
- sal_Bool ISSET_OutputStream;
+ sal_Bool ISSET_OutputStream;
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
InputStream; //content of document.
- sal_Bool ISSET_InputStream;
+ sal_Bool ISSET_InputStream;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- InteractionHandler; // //::com::sun::star::task::XInteractionHandler
- sal_Bool ISSET_InteractionHandler;
-
- ::rtl::OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself.
- sal_Bool ISSET_JumpMark;
- ::rtl::OUString MediaType; //mime type.
- sal_Bool ISSET_MediaType;
- ::rtl::OUString OpenFlags; //deprecated
- sal_Bool ISSET_OpenFlags;
- sal_Bool OpenNewView; //opens a new view for an already loaded document.
- sal_Bool ISSET_OpenNewView;
- sal_Bool Overwrite; //opens a new view for an already loaded document.
- sal_Bool ISSET_Overwrite;
- ::rtl::OUString Password; //
- sal_Bool ISSET_Password;
+ InteractionHandler; // //::com::sun::star::task::XInteractionHandler
+ sal_Bool ISSET_InteractionHandler;
+
+ ::rtl::OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself.
+ sal_Bool ISSET_JumpMark;
+ ::rtl::OUString MediaType; //mime type.
+ sal_Bool ISSET_MediaType;
+ ::rtl::OUString OpenFlags; //deprecated
+ sal_Bool ISSET_OpenFlags;
+ sal_Bool OpenNewView; //opens a new view for an already loaded document.
+ sal_Bool ISSET_OpenNewView;
+ sal_Bool Overwrite; //opens a new view for an already loaded document.
+ sal_Bool ISSET_Overwrite;
+ ::rtl::OUString Password; //
+ sal_Bool ISSET_Password;
//not documented ... @todo remove?
::com::sun::star::awt::Rectangle
PosSize; //position and size of document window.
- sal_Bool ISSET_PosSize;
+ sal_Bool ISSET_PosSize;
::com::sun::star::uno::Sequence< sal_Int8 >
PostData; //contains the data for HTTP post method as a sequence of bytes.
- sal_Bool ISSET_PostData;
- ::rtl::OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes.
- sal_Bool ISSET_PostString;
- sal_Bool Preview; //show preview.
- sal_Bool ISSET_Preview;
- sal_Bool ReadOnly; //open document readonly.
- sal_Bool ISSET_ReadOnly;
- ::rtl::OUString Referer; //name of document referrer.
- sal_Bool ISSET_Referer;
+ sal_Bool ISSET_PostData;
+ ::rtl::OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes.
+ sal_Bool ISSET_PostString;
+ sal_Bool Preview; //show preview.
+ sal_Bool ISSET_Preview;
+ sal_Bool ReadOnly; //open document readonly.
+ sal_Bool ISSET_ReadOnly;
+ ::rtl::OUString Referer; //name of document referrer.
+ sal_Bool ISSET_Referer;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
StatusIndicator; // //::com::sun::star::task::XStatusIndicator
- sal_Bool ISSET_StatusIndicator;
+ sal_Bool ISSET_StatusIndicator;
//not documented ... @todo remove?
- sal_Bool Silent; //prevents dialogs to query for more information.
- sal_Bool ISSET_Silent;
- ::rtl::OUString TemplateName; //deprecated, name of the template instead of the URL.
- sal_Bool ISSET_TemplateName;
- ::rtl::OUString TemplateRegionName; //deprecated, name of the region of the template.
- sal_Bool ISSET_TemplateRegionName;
- sal_Bool Unpacked;
- sal_Bool ISSET_Unpacked;
+ sal_Bool Silent; //prevents dialogs to query for more information.
+ sal_Bool ISSET_Silent;
+ ::rtl::OUString TemplateName; //deprecated, name of the template instead of the URL.
+ sal_Bool ISSET_TemplateName;
+ ::rtl::OUString TemplateRegionName; //deprecated, name of the region of the template.
+ sal_Bool ISSET_TemplateRegionName;
+ sal_Bool Unpacked;
+ sal_Bool ISSET_Unpacked;
::rtl::OUString URL;// FileName, URL of the document.
- sal_Bool ISSET_URL;
- sal_Int16 Version; //storage version.
- sal_Bool ISSET_Version;
+ sal_Bool ISSET_URL;
+ sal_Int16 Version; //storage version.
+ sal_Bool ISSET_Version;
::com::sun::star::uno::Any
ViewData;//
- sal_Bool ISSET_ViewData;
- sal_Int16 ViewId; //id of the initial view.
- sal_Bool ISSET_ViewId;
+ sal_Bool ISSET_ViewData;
+ sal_Int16 ViewId; //id of the initial view.
+ sal_Bool ISSET_ViewId;
// new framework objects
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >