sc/source/filter/xml/xmlimprt.hxx | 1 -
sc/source/filter/xml/xmlstyli.hxx | 2 --
sc/source/ui/docshell/docfunc.cxx | 3 +++
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 462451a4256d01072c4fface64b590b7be05f718
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Wed Sep 5 20:27:56 2012 +0200
remove two useless definitions
Change-Id: Idf804207c2af46dee30d4eff3704b8d61fbe485f
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index d9d86fc..f3706d9 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -852,7 +852,6 @@ class ScXMLImport: public SvXMLImport
com::sun::star::uno::Reference <com::sun::star::util::XNumberFormats>
xNumberFormats;
com::sun::star::uno::Reference <com::sun::star::util::XNumberFormatTypes>
xNumberFormatTypes;
- ScRangeList maSheetRanges;
com::sun::star::uno::Reference
<com::sun::star::sheet::XSheetCellRangeContainer> xSheetCellRanges;
rtl::OUString sEmpty;
diff --git a/sc/source/filter/xml/xmlstyli.hxx
b/sc/source/filter/xml/xmlstyli.hxx
index edc5794..def3509 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -143,8 +143,6 @@ public:
private:
using XMLPropStyleContext::SetStyle;
-
- ScConditionalFormat* CreateCondFormat();
};
class XMLTableStylesContext : public SvXMLStylesContext
commit 5129d01a7fb85390d925c084488493ac19c8b217
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Wed Sep 5 20:27:21 2012 +0200
only allow to change conditional formatting if sheet is not protected
Change-Id: I38a812a4d4ce24fb9ad65c438f6e001b376f319e
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 70d2456..0472145 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -5063,6 +5063,9 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong
nOldFormat, ScConditionalFor
{
ScDocShellModificator aModificator(rDocShell);
ScDocument* pDoc = rDocShell.GetDocument();
+ if(pDoc->IsTabProtected(nTab))
+ return;
+
if(nOldFormat)
{
pDoc->DeleteConditionalFormat(nOldFormat, nTab);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
