summaryrefslogtreecommitdiff
path: root/sc/source/filter/xml/xmllabri.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
commit912d939b74d4ac436d4eb7a473f8c314c34148d8 (patch)
tree9786710241c767f0f6917200c9318978b0d787dd /sc/source/filter/xml/xmllabri.hxx
parentbc9a24765b3a6f97bda09afc07bf47151fed14e8 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 631630de93e96b82e3b94ee4b5c388e40305ff77 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:03 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 3152922a95e18814e32bcf8bc29c872077d05a65 Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Date: Wed May 4 09:06:08 2011 -0400 lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/core/tool/interpr1.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8f34ffa5677bfc86ef5aa33811955c577f8799c3 Author: Kohei Yoshida <kyoshida@novell.com> Date: Mon Mar 21 16:01:47 2011 -0400 Fix seg faults on sheet deletion. Sometimes a simple sheet removal causes segfault in certain types of documents. Not always reproducible, but this fix is certainly safer. (n#680272) Signed-off-by: Noel Power <nopower@novell.com> sc/source/ui/docshell/docfunc.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e54c3699db11dc1bcc7bd7fa069c9c4124715839 Author: Tibby Lickle <tibbylickle@googlemail.com> Date: Thu Mar 10 19:08:18 2011 +0000 Disabled auto-complete in Calc filter dialog - fix for bug 34898. A hyphen character caused auto-complete to kick in, changing the user's choice of conditional operator to "=". This was not changed back if auto-complete option is overridden. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/ui/dbgui/filtdlg.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Notes
split repo tag: calc_libreoffice-3.3.3.1
Diffstat (limited to 'sc/source/filter/xml/xmllabri.hxx')
-rw-r--r--sc/source/filter/xml/xmllabri.hxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx
index 2876da98b871..3da2d2c0721d 100644
--- a/sc/source/filter/xml/xmllabri.hxx
+++ b/sc/source/filter/xml/xmllabri.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
@@ -38,8 +38,8 @@ class ScXMLImport;
class ScXMLLabelRangesContext : public SvXMLImportContext
{
private:
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLLabelRangesContext(
@@ -48,14 +48,14 @@ public:
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
);
- virtual ~ScXMLLabelRangesContext();
+ virtual ~ScXMLLabelRangesContext();
- virtual SvXMLImportContext* CreateChildContext(
+ virtual SvXMLImportContext* CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
);
- virtual void EndElement();
+ virtual void EndElement();
};
@@ -64,12 +64,12 @@ public:
class ScXMLLabelRangeContext : public SvXMLImportContext
{
private:
- ::rtl::OUString sLabelRangeStr;
- ::rtl::OUString sDataRangeStr;
- sal_Bool bColumnOrientation;
+ ::rtl::OUString sLabelRangeStr;
+ ::rtl::OUString sDataRangeStr;
+ sal_Bool bColumnOrientation;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLLabelRangeContext(
@@ -78,14 +78,14 @@ public:
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
);
- virtual ~ScXMLLabelRangeContext();
+ virtual ~ScXMLLabelRangeContext();
- virtual SvXMLImportContext* CreateChildContext(
+ virtual SvXMLImportContext* CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
);
- virtual void EndElement();
+ virtual void EndElement();
};
#endif