Re: [Libreoffice] [PATCH] Remove obsolete Hyperlink Bar - final patches

2011-02-24 Thread Alfonso Eusebio
Hi Kendy,

Thanks for the pointer.

My main concern is more related to the creation of the actual text that should 
replace the current one.
What I've seen in the help text is that there are sections that speak about 
hyperlinks and mention the hyperlink bar as a way for creating them.
On the same text or page there would be a reference to the insert hyperlink 
icon 
and dialogue as well (which should be maintained).

In summary, my problem is not necessarily with finding and changing the text. 
My 
problem is that I don't think it should be me deciding what that text should 
say 
now.
Unfortunately, is not a clean removal of a whole page/section.

Regards,
Alfonso



- Original Message 
From: Jan Holesovsky ke...@suse.cz
To: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Cc: LibreOffice List libreoffice@lists.freedesktop.org
Sent: Tue, 22 February, 2011 21:57:06
Subject: Re: [Libreoffice] Re: [PATCH] Remove obsolete Hyperlink Bar - final 
patches

Hi Alfonso,

On 2011-02-12 at 09:41 +, Alfonso Eusebio wrote:

 Is there anything that could be done about the help text that still talks 
 about 

 the Hyperlink Bar?
 I'll be happy to give it a try, but I guess we need somebody with copywriter 
 skills as it is a change of help text.

Sure, it is easy - just grep the helpcontent2/source for some strings
that you see in the help as wrong, and fix it there.  Hopefully you'll
be able to guess the meaning of the xml tags, if not, there is some
documentation here:

http://documentation.openoffice.org/online_help/helpers/helpauthoring/guide/OOo2HelpAuthoring.pdf


[And sorry for the late answer :-(]

Thank you,
Kendy


  
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] [PATCH] Conditional compilation of legacy Addin mechanism in calc

2011-02-19 Thread Alfonso Eusebio
Hi,

Please find attached patches for the conditional removal of legacy calc addins.
As always, these changes are made available under LGPLv3+/MPL.

Kohei, I have used a macro definition to conditionally compile the code in/out.
In this patch the macro (SC_WITHOUT_LEGACY_ADDIN) is undefined, so the 
mechanism 
is left untouched.

Defining SC_WITHOUT_LEGACY_ADDIN in global.hxx (both in calc and in binfilter) 
will remove the legacy addin mechanism.

The changes are not optimal from a code point of view, but I've tried to ensure 
that it is clear what needs to be removed when (and if) the mechanism is 
finally 
eliminated.
Searching for SC_WITHOUT_LEGACY_ADDIN will find all the pieces of code that 
should be removed.

Regards,
Alfonso



- Original Message 
From: Kohei Yoshida kyosh...@novell.com
To: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Cc: michael.me...@novell.com
Sent: Thu, 17 February, 2011 15:31:03
Subject: Re: [Libreoffice] [PATCH] Remove legacy Addin mechanism from calc

On Thu, 2011-02-17 at 13:39 +, Alfonso Eusebio wrote:
 Hi Michael,
 
 Don't worry: it was a bit of work, but it was a good exercise as well.
 I'm happy to change it to conditionally compiled if you think it's worth  it, 

My preferred approach is indeed to make this code conditionally
compiled, and at some point experimentally ship a release without this
piece to see how many users complain. ;-)

And yes, that would be worth the effort IMO.

 The only problem I see is that the version with this piece excluded  might 
 not 

 get that much testing and hide some issues (I did only limited  testing).

If we can make that a build time option with --enable-calc-addin (or
similar), and then default to on, then we can still test this piece.  If
you are not too familiar with these autoconf stuff, simply defining a
switch somewhere in sc/inc/global.hxx would be fine.  Then one of us
will work on making that a configure/autogen.sh option.

Thanks a lot for looking into this, BTW.

Kohei

-- 
Kohei Yoshida, LibreOffice hacker, Calc
kyosh...@novell.com


  From a034cf51de6e1decb36da9b2a07dbdf06d161102 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Date: Sat, 19 Feb 2011 09:15:23 +
Subject: [PATCH] Conditional compilation of legacy addins in calc

Introduces conditional compilation of legacy addin mechanism in calc.
Controlled through a macro definition in global.hxx
---
 sc/inc/callform.hxx  |5 +
 sc/inc/global.hxx|7 +++
 sc/source/core/data/documen2.cxx |6 ++
 sc/source/core/data/funcdesc.cxx |   10 +-
 sc/source/core/data/global.cxx   |   17 -
 sc/source/core/data/globalx.cxx  |9 ++---
 sc/source/core/inc/addinlis.hxx  |   11 +++
 sc/source/core/inc/adiasync.hxx  |5 -
 sc/source/core/inc/core_pch.hxx  |9 +
 sc/source/core/inc/interpre.hxx  |3 +++
 sc/source/core/tool/addinlis.cxx |5 +
 sc/source/core/tool/adiasync.cxx |7 ++-
 sc/source/core/tool/callform.cxx |   12 ++--
 sc/source/core/tool/compiler.cxx |   10 ++
 sc/source/core/tool/interpr4.cxx |   19 ---
 sc/source/core/tool/parclass.cxx |   12 ++--
 sc/source/ui/unoobj/funcuno.cxx  |7 +++
 17 files changed, 132 insertions(+), 22 deletions(-)

diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx
index df22605..4add518 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -29,6 +29,9 @@
 #ifndef SC_CALLFORM_HXX
 #define SC_CALLFORM_HXX
 
+#include global.hxx  // for SC_WITHOUT_LEGACY_ADDIN definition
+#ifndef SC_WITHOUT_LEGACY_ADDIN  //Conditionally removes legacy addin
+
 #include collect.hxx
 
 #include rtl/ustring.hxx
@@ -125,6 +128,8 @@ public:
 BOOL InitExternalFunc(const rtl::OUString rModuleName);
 void ExitExternalFunc();
 
+#endif //SC_WITHOUT_LEGACY_ADDIN
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 80e4ccc..3143e42 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -29,6 +29,9 @@
 #ifndef SC_SCGLOB_HXX
 #define SC_SCGLOB_HXX
 
+// Remove comment below to remove legacy addins mechanism
+//#define SC_WITHOUT_LEGACY_ADDIN //When defined the legacy addin mechanism is not compiled in
+
 #include address.hxx
 #include i18npool/lang.h
 #include tools/stream.hxx
@@ -555,7 +558,9 @@ public:
 SC_DLLPUBLIC static void	SetSearchItem( const SvxSearchItem rNew );
 SC_DLLPUBLIC static ScAutoFormat*		GetAutoFormat();
 static void	ClearAutoFormat(); //BugId 54209
+#ifndef SC_WITHOUT_LEGACY_ADDIN
 static FuncCollection*		GetFuncCollection();
+#endif
 SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection();
 SC_DLLPUBLIC static ScUserList*			GetUserList();
 static void	SetUserList( const ScUserList* pNewList );
@@ -582,7 +587,9 @@ public:
 static longnLastColWidthExtra;
 
 static void Init();		// during

Re: [Libreoffice] [PATCH] Remove legacy Addin mechanism from calc

2011-02-16 Thread Alfonso Eusebio
Hi Regina,

I understand that this addin mechanism was used to add functions to calc. I 
wasn't aware of whether it was used that much.
The general consensus, before implementing the patch, was that it wasn't 
probably used that much. In fact, it was marked and deprecated back in 2006.

However, I can't determine whether this is something that we can or can't 
remove. I just went ahead with the patch based on feedback from Michael, Kohei 
and Caolan.

If the final decision is to throw the patch away and keep things the way they 
are, that is not a problem.
I think it is a good thing that we have this other perspective on the subject.

Regards,
Alfonso

- Original Message 

Hi Alfonso,

Alfonso Eusebio schrieb:
 Hi,

 Please find attached two patches for the removal of the legacy Addin Mechanism
 from calc.
 One of the patches removes the code from binfilter. I have now read what this
 module is about and I guess it might not have been necessary to remove stuff
 from here, but I hope this will keep it aligned with calc.

 As always, these changes are made available under LGPLv3+/MPL.

 I have rebased, compiled and tested scalc after the changes. I've had no 
issues
 with uploading spreadsheets and creating formulas with scaddin functions.
 If there is a more systematic way of testing this, or some documents that 
could
 be used to test that everything still works, please let me know.

The old scaddin is different from using functions of the Add-in 
category of the wizard. It is about writing own functions, that are 
wrapped into a dll. The issue
http://www.openoffice.org/issues/show_bug.cgi?id=98149
has attached such an addin.

Kind regards
Regina


  
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] [PATCH] Remove legacy Addin functions from calc

2011-02-14 Thread Alfonso Eusebio
Thanks all for the input!

For what I can see, the quoted comment was introduced by Kurt Zenker in 
Sep-2006.

ROT13 and the other date management functions present in the calc/addin code 
seem to be part of the newer (UNO based?) scadding functions.
I've tested ROT13 and a couple of the others succesfully. In fact, after 
removing the calc/addin directory there seems to be no change to the actual 
list 
of functions in calc.

If you prefer to wait until this patch (removing calc/addin) has been tested 
for 
a while, that should be fine.
I get the impression that this old mechanism is no longer used, but it might be 
worth waiting a little bit before removing (?).

Happy to proceed either way.

Thanks  regards,
Alfonso



- Original Message 
From: Caolán McNamara caol...@redhat.com
To: michael.me...@novell.com
Cc: Alfonso Eusebio alfonso_euse...@yahoo.co.uk; Kohei Yoshida 
kyosh...@novell.com; LibreOffice List libreoffice@lists.freedesktop.org
Sent: Mon, 14 February, 2011 10:20:55
Subject: Re: [Libreoffice] [PATCH] Remove legacy Addin functions from calc

On Mon, 2011-02-14 at 10:13 +, Michael Meeks wrote:
 Hi Alfonso,
 
 On Mon, 2011-02-14 at 09:19 +, Alfonso Eusebio wrote:
  /* #i54546# The code belonging to this resource file is sample code for the
  * legacy AddIn interface. The interface is still supported, but deprecated.
  * The strings here were displayed in the function wizard.
 
 We should probably examine the history on the legay AddIn interface,
 and see quite how legacy it is ;-) ie. if it has been marked deprecated
 for five years - I'd be happy to loose it.

I've a (very) vague memory of something like ROT13 implemented through
this ?

e.g. =ROT13(apple)

I'm probably wrong, or a decade out of date on that one, but see if that
works before/after AddIn disabling.

C.


  
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] [PUSHED] Re: [PATCH] Remove obsolete Hyperlink Bar - final patches

2011-02-12 Thread Alfonso Eusebio
Thanks Jan!

I only performed functional tests, i.e. re-built all modules, dev-installed and 
checked that all apps were opening properly and not providing the option to 
enable the bar.
At the same time I checked that the Insert Hyperlink dialogue (open from the 
icon in the standard bar) was opening fine.

Is there anything that could be done about the help text that still talks about 
the Hyperlink Bar?
I'll be happy to give it a try, but I guess we need somebody with copywriter 
skills as it is a change of help text.

Thanks again and regards,
Alfonso



- Original Message 
From: Jan Holesovsky ke...@suse.cz
To: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Cc: LibreOffice List libreoffice@lists.freedesktop.org
Sent: Fri, 11 February, 2011 18:31:14
Subject: [PUSHED] Re: [Libreoffice] [PATCH] Remove obsolete Hyperlink Bar - 
final patches

Hi Alfonso,

On 2011-02-10 at 08:38 +, Alfonso Eusebio wrote:

 Please find attached a set of patches that remove the Hyperlink Bar from the 
 core modules. 

Thank you!  Pushed :-)  Unfortunately I was unable to test the
installation, as the unit tests are failing for me (not your fault, even
without your patches), but the patches look right, so no reason to hold
them back :-)

Regards,
Kendy


  
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] Segfault in regcomp while creating registry

2011-02-09 Thread Alfonso Eusebio
Hi,

I'm getting a Segmentation fault error when running make dev-install'
I've rebased with origin/master and done a full build (successful), but the 
problem is still there.

Does anybody know what could be causing this?

Please find below that point the shows the error in the log:

Segmentation fault
ERROR: /home/alfonso/git/libo/solver/330/unxlngi6.pro/bin/regcomp -register -r 
/tmp/ooopackaging/i_285791297250440/unxlngi6.pro/LibreOffice//gid_Starregistry_Services_Rdb_servicesrdb/en-US_inprogress_1/services.rdb
 -c 
'file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libdbacfgli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libdbaseli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libdbaxmlli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libdbmmli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libdbpli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libdbpool2.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libdbtoolsli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libdbuli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/deploymentli.uno.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/deploymentguili.uno.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/dlgprovli.uno.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libembobj.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libemboleobj.so;file:///home
/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libevtatt.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/fastsax.uno.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libfileacc.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libfilterconfig1.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libflashli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libflatli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libforli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/fpicker.uno.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/fps_office.uno.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libfrmli.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/fsstorage.uno.so;file:///home/alfonso/git/libo/solver/330/unxlngi6.pro/lib/libfwkli.so'
 -wop='vnd.sun.star.expand:$OOO_BASE_DIR/program/' 21 |


Thanks and regards,
Alfonso



  
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] [PATCH] [PUSHED] Remove obsolete Hyperlink Bar from calc

2011-02-09 Thread Alfonso Eusebio
Hi Kohei,

Thanks for you support.

I've created a small patch that removes the references to hyperlink header 
files 
(includes).
Please find that patch attached. Changes provided under LGPLv3+/MPL.

I'll be sending the patches for impress, draw and write shortly on separate 
emails.

Regards,
Alfonso



- Original Message 
From: Kohei Yoshida kyosh...@novell.com
To: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Cc: LibreOffice List libreoffice@lists.freedesktop.org
Sent: Wed, 9 February, 2011 2:45:50
Subject: Re: [Libreoffice] [PATCH] [PUSHED] Remove obsolete Hyperlink Bar from 
calc

Hi Alfonso,

On Tue, 2011-02-08 at 21:41 +, Alfonso Eusebio wrote:

 Please find attached patch that removes the Hyperlink Bar from calc (made 
 available under LGPLv3+/MPL).
 Patch has been rebased with origin/master and compiled before submission.

Looks all good. Pushed.

 I've started removing the references to the Hyperlink Bar from the apps. Once 
 that's done I'll remove the implementation and menu entries in core modules.
 After applying this patch the menu entry to activate the bar is still present 
 but greyed out. This should dissapear once core modules are done.
 I'll be making one patch per app/module.

Gotcha.  I like your strategy.  Go for it!

Kohei

-- 
Kohei Yoshida, LibreOffice hacker, Calc
kyosh...@novell.com


  From 1a65472f1c35c8bb456e0611c8133cba77d785f6 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Date: Wed, 9 Feb 2011 17:23:38 +
Subject: [PATCH] Remove includes related to Hyperlink Bar from calc

Removed includes for hyperlink headers.
---
 sc/source/ui/app/scdll.cxx |1 -
 sc/source/ui/app/scmod.cxx |1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 83f3e96..53e3eb4 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -116,7 +116,6 @@
 #include spelldialog.hxx
 #include svx/fontwork.hxx
 #include svx/srchdlg.hxx
-#include svx/hyprlink.hxx
 #include svx/hyperdlg.hxx
 #include svx/imapdlg.hxx
 
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 0b603c7..f384ffa 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -49,7 +49,6 @@
 #include sfx2/viewfrm.hxx
 #include sfx2/objface.hxx
 
-#include svx/hyprlink.hxx
 #include IAnyRefDialog.hxx
 
 #include svtools/ehdl.hxx
-- 
1.7.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] Fw: [PATCH] Removed unused functions and classes from calc 3last

2011-02-08 Thread Alfonso Eusebio
Hi,

Could somebody advise if the patch below is acceptable or if I should change it 
somehow?


If it can't be committed for some reason, please let me know so that I can 
focus 
on some other area.

Thanks  regards,
Alfonso


- Forwarded Message 
From: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
To: LibreOffice List libreoffice@lists.freedesktop.org
Sent: Sun, 6 February, 2011 19:08:22
Subject: [PATCH] Removed unused functions and classes from calc 3last

Hi,

Please find attached a new patch that removes several unused functions and 
classes from calc.
Both functions and classes have been found through the call-catcher list.

Please notice that this patch removes three entire classes: 
ScSummableCompressedArray, ScVbaCharts and ScVbaSeriesCollection.
For the last two classes the corresponding .cxx and .hxx files have been 
removed.

This patch has been rebased with origin/master and compiled before submission.

On a related note:
Several of the unused functions identified by call-catcher live in the addin 
module within calc (calc/sc/addin). These functions seem to be called 
indirectly by the function add-in mechanism.
I have not removed these functions, however, it seems that this addin module 
is obsolete now, with the scaddins (calc/scaddins) module replacing it (?).
In any case, if somebody can confirm that the addin module can be removed, I 
could work on it.

Regards,
Alfonso


  From 666869f92707dcfe9ecbbe4f224ac2f3dec1b780 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Date: Sun, 6 Feb 2011 17:58:59 +
Subject: [PATCH] Removed unused functions and classes form calc 3last

Removed unused function and some entire classes from calc.
The functions removed are some of those identified by call-catcher.
---
 sc/inc/compressedarray.hxx |   45 ---
 sc/inc/tabbgcolor.hxx  |3 -
 sc/inc/validat.hxx |4 -
 sc/source/core/data/compressedarray.cxx|   58 -
 sc/source/core/data/tabbgcolor.cxx |   10 --
 sc/source/core/data/validat.cxx|9 --
 sc/source/filter/excel/xechart.cxx |   10 --
 sc/source/filter/excel/xeformula.cxx   |   12 --
 sc/source/filter/inc/xechart.hxx   |5 -
 .../AccessibleDocumentPagePreview.cxx  |   13 +--
 sc/source/ui/inc/viewdata.hxx  |2 -
 sc/source/ui/vba/makefile.mk   |2 -
 sc/source/ui/vba/vbacharts.cxx |  122 
 sc/source/ui/vba/vbacharts.hxx |   63 --
 sc/source/ui/vba/vbaformatconditions.cxx   |   12 --
 sc/source/ui/vba/vbaformatconditions.hxx   |1 -
 sc/source/ui/vba/vbarange.cxx  |5 -
 sc/source/ui/vba/vbarange.hxx  |1 -
 sc/source/ui/vba/vbaseriescollection.cxx   |   82 -
 sc/source/ui/vba/vbaseriescollection.hxx   |   57 -
 sc/source/ui/vba/vbawindows.cxx|5 -
 sc/source/ui/vba/vbawindows.hxx|2 +-
 sc/source/ui/view/viewdata.cxx |   13 --
 23 files changed, 2 insertions(+), 534 deletions(-)
 delete mode 100644 sc/source/ui/vba/vbacharts.cxx
 delete mode 100644 sc/source/ui/vba/vbacharts.hxx
 delete mode 100644 sc/source/ui/vba/vbaseriescollection.cxx
 delete mode 100644 sc/source/ui/vba/vbaseriescollection.hxx

diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index 12a5940..d45c0b2 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -349,51 +349,6 @@ void ScCompressedArrayIteratorA,D::Resync( A nPos )
 }
 
 
-// === ScSummableCompressedArray =
-
-/** Data type D must be of a type that is convertable to unsigned long. The
-advantage is that specialized methods exist to act on a region of values
-for performance reasons.
- */
-
-template typename A, typename D  class ScSummableCompressedArray : public ScCompressedArrayA,D
-{
-public:
-ScSummableCompressedArray( A nMaxAccessP,
-const D rValue,
-size_t nDeltaP = nScCompressedArrayDelta )
-: ScCompressedArrayA,D( nMaxAccessP,
-rValue, nDeltaP)
-{}
-ScSummableCompressedArray( A nMaxAccessP,
-const D* pDataArray, size_t nDataCount )
-: ScCompressedArrayA,D( nMaxAccessP,
-pDataArray, nDataCount)
-{}
-
-/** Returns the sum of all values for a region. If an overflow would occur,
-::std

[Libreoffice] [PATCH] Remove obsolete Hyperlink Bar from calc

2011-02-08 Thread Alfonso Eusebio
Hi,


Please find attached patch that removes the Hyperlink Bar from calc (made 
available under LGPLv3+/MPL).
Patch has been rebased with origin/master and compiled before submission.

I've started removing the references to the Hyperlink Bar from the apps. Once 
that's done I'll remove the implementation and menu entries in core modules.
After applying this patch the menu entry to activate the bar is still present 
but greyed out. This should dissapear once core modules are done.
I'll be making one patch per app/module.

Regards,
Alfonso


  From ed73ec23fa974da110ad5827f06dd313f9cb7cad Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Date: Tue, 8 Feb 2011 21:30:10 +
Subject: [PATCH] Remove obsolete Hyperlink Bar from calc

Removed hyperlink bar references from calc (removing from apps first).
Menu entry appears greyed out until it gets removed from core modules.
---
 sc/source/ui/app/scdll.cxx  |1 -
 sc/source/ui/app/scmod.cxx  |1 -
 sc/source/ui/docshell/docsh.cxx |1 -
 3 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index a022978..83f3e96 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -288,7 +288,6 @@ void ScDLL::Init()
 SvxSearchDialogWrapper  ::RegisterChildWindow(FALSE, pMod);
 SvxHlinkDlgWrapper  ::RegisterChildWindow(FALSE, pMod);
 SvxFontWorkChildWindow		::RegisterChildWindow(FALSE, pMod);
-SvxHyperlinkDlgWrapper		::RegisterChildWindow(FALSE, pMod, SFX_CHILDWIN_FORCEDOCK);
 SvxIMapDlgChildWindow		::RegisterChildWindow(FALSE, pMod);
 GalleryChildWindow			::RegisterChildWindow(FALSE, pMod);
 ScSpellDialogChildWindow::RegisterChildWindow(FALSE, pMod);
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 99b872d..0b603c7 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -128,7 +128,6 @@ SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) )
 SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
 ScResId(RID_OBJECTBAR_APP) );
 SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) );		// nur ID wichtig
-SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() );
 }
 
 //--
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 674905e..bcfe9d1 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -191,7 +191,6 @@ static const sal_Char pFilterRtf[]		= Rich Text Format (StarCalc);
 
 SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell, ScResId(SCSTR_DOCSHELL))
 {
-SFX_CHILDWINDOW_REGISTRATION( SID_HYPERLINK_INSERT );
 }
 
 //	GlobalName der aktuellen Version:
-- 
1.7.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] [PATCH] Removed unused functions and classes from calc 3last

2011-02-06 Thread Alfonso Eusebio
Hi,

Please find attached a new patch that removes several unused functions and 
classes from calc.
Both functions and classes have been found through the call-catcher list.

Please notice that this patch removes three entire classes: 
ScSummableCompressedArray, ScVbaCharts and ScVbaSeriesCollection.
For the last two classes the corresponding .cxx and .hxx files have been 
removed.

This patch has been rebased with origin/master and compiled before submission.

On a related note:
Several of the unused functions identified by call-catcher live in the addin 
module within calc (calc/sc/addin). These functions seem to be called 
indirectly by the function add-in mechanism.
I have not removed these functions, however, it seems that this addin module 
is obsolete now, with the scaddins (calc/scaddins) module replacing it (?).
In any case, if somebody can confirm that the addin module can be removed, I 
could work on it.

Regards,
Alfonso


  From 666869f92707dcfe9ecbbe4f224ac2f3dec1b780 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Date: Sun, 6 Feb 2011 17:58:59 +
Subject: [PATCH] Removed unused functions and classes form calc 3last

Removed unused function and some entire classes from calc.
The functions removed are some of those identified by call-catcher.
---
 sc/inc/compressedarray.hxx |   45 ---
 sc/inc/tabbgcolor.hxx  |3 -
 sc/inc/validat.hxx |4 -
 sc/source/core/data/compressedarray.cxx|   58 -
 sc/source/core/data/tabbgcolor.cxx |   10 --
 sc/source/core/data/validat.cxx|9 --
 sc/source/filter/excel/xechart.cxx |   10 --
 sc/source/filter/excel/xeformula.cxx   |   12 --
 sc/source/filter/inc/xechart.hxx   |5 -
 .../AccessibleDocumentPagePreview.cxx  |   13 +--
 sc/source/ui/inc/viewdata.hxx  |2 -
 sc/source/ui/vba/makefile.mk   |2 -
 sc/source/ui/vba/vbacharts.cxx |  122 
 sc/source/ui/vba/vbacharts.hxx |   63 --
 sc/source/ui/vba/vbaformatconditions.cxx   |   12 --
 sc/source/ui/vba/vbaformatconditions.hxx   |1 -
 sc/source/ui/vba/vbarange.cxx  |5 -
 sc/source/ui/vba/vbarange.hxx  |1 -
 sc/source/ui/vba/vbaseriescollection.cxx   |   82 -
 sc/source/ui/vba/vbaseriescollection.hxx   |   57 -
 sc/source/ui/vba/vbawindows.cxx|5 -
 sc/source/ui/vba/vbawindows.hxx|2 +-
 sc/source/ui/view/viewdata.cxx |   13 --
 23 files changed, 2 insertions(+), 534 deletions(-)
 delete mode 100644 sc/source/ui/vba/vbacharts.cxx
 delete mode 100644 sc/source/ui/vba/vbacharts.hxx
 delete mode 100644 sc/source/ui/vba/vbaseriescollection.cxx
 delete mode 100644 sc/source/ui/vba/vbaseriescollection.hxx

diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index 12a5940..d45c0b2 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -349,51 +349,6 @@ void ScCompressedArrayIteratorA,D::Resync( A nPos )
 }
 
 
-// === ScSummableCompressedArray =
-
-/** Data type D must be of a type that is convertable to unsigned long. The
-advantage is that specialized methods exist to act on a region of values
-for performance reasons.
- */
-
-template typename A, typename D  class ScSummableCompressedArray : public ScCompressedArrayA,D
-{
-public:
-ScSummableCompressedArray( A nMaxAccessP,
-const D rValue,
-size_t nDeltaP = nScCompressedArrayDelta )
-: ScCompressedArrayA,D( nMaxAccessP,
-rValue, nDeltaP)
-{}
-ScSummableCompressedArray( A nMaxAccessP,
-const D* pDataArray, size_t nDataCount )
-: ScCompressedArrayA,D( nMaxAccessP,
-pDataArray, nDataCount)
-{}
-
-/** Returns the sum of all values for a region. If an overflow would occur,
-::std::numeric_limitsunsigned long::max() is returned. */
-unsigned long   SumValues( A nStart, A nEnd ) const;
-
-/** Returns the sum of all values for a region. If an overflow would occur,
-::std::numeric_limitsunsigned long::max() is returned.
-The caller has to assure that nIndex matches an entry belonging to
-nStart, for example, by calling Search(nStart) first! */
-unsigned long   SumValuesContinuation

[Libreoffice] [PATCH] Removed unused functions in calc 2

2011-02-02 Thread Alfonso Eusebio
Hi,

Please find attached second patch (made available under LGPLv3+/MPL) removing 
unused functions in calc (based on call-catcher list).
Patch has been rebased with origin/master and compiled before submission.

Regards,
Alfonso


  From cb18b2e862d65c6d578c61b2a7c036f2102cae5c Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Date: Wed, 2 Feb 2011 18:24:01 +
Subject: [PATCH] Removed unused functions from calc 2

Removed some more unused functions from calc as identified
by call-catcher.
---
 sc/inc/document.hxx  |3 -
 sc/inc/dptabsrc.hxx  |4 -
 sc/inc/externalrefmgr.hxx|2 -
 sc/inc/segmenttree.hxx   |2 -
 sc/source/core/data/documen3.cxx |   10 ---
 sc/source/core/data/document.cxx |   14 
 sc/source/core/data/dptabsrc.cxx |   23 --
 sc/source/core/data/segmenttree.cxx  |   20 +
 sc/source/ui/docshell/externalrefmgr.cxx |   11 ---
 sc/source/ui/vba/vbachart.cxx|  120 --
 sc/source/ui/vba/vbachart.hxx|9 --
 sc/source/ui/vba/vbachartobject.cxx  |   54 -
 sc/source/ui/vba/vbachartobject.hxx  |   12 ---
 13 files changed, 5 insertions(+), 279 deletions(-)

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 26d7707..02d27c3 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1311,7 +1311,6 @@ public:
 SC_DLLPUBLIC void			ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow);
 SC_DLLPUBLIC void			ShowRow(SCROW nRow, SCTAB nTab, BOOL bShow);
 SC_DLLPUBLIC void			ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, BOOL bShow);
-SC_DLLPUBLIC void			SetColFlags( SCCOL nCol, SCTAB nTab, BYTE nNewFlags );
 SC_DLLPUBLIC void			SetRowFlags( SCROW nRow, SCTAB nTab, BYTE nNewFlags );
 SC_DLLPUBLIC void			SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BYTE nNewFlags );
 
@@ -1347,7 +1346,6 @@ public:
 boolHasFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
 boolColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL);
 SC_DLLPUBLIC void   SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bFiltered);
-SC_DLLPUBLIC void   SetColFiltered(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bFiltered);
 SCROW   FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
 SCROW   LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
 SCROW   CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
@@ -1456,7 +1454,6 @@ public:
 
 void			Sort( SCTAB nTab, const ScSortParam rSortParam, BOOL bKeepQuery );
 SCSIZE			Query( SCTAB nTab, const ScQueryParam rQueryParam, BOOL bKeepSub );
-BOOL			ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam rQueryParam, BOOL* pSpecial = NULL );
 SC_DLLPUBLIC BOOL			CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 SCTAB nTab, ScQueryParam rQueryParam );
 void 			GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String rStr);
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 4ca3050..4f7defe 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -164,7 +164,6 @@ public:
 ScDPTableData*			GetData()		{ return pData; }
 const ScDPTableData*	GetData() const	{ return pData; }
 
-voidSetGrandTotalName(const ::rtl::OUString rName);
 const ::rtl::OUString*  GetGrandTotalName() const;
 
 USHORT	GetOrientation(long nColumn);
@@ -182,7 +181,6 @@ public:
 USHORT	GetDataLayoutOrientation();
 
 BOOL	IsDateDimension(long nDim);
-UINT32	GetNumberFormat(long nDim);
 
 BOOL	SubTotalAllowed(long nColumn);		//! move to ScDPResultData
 
@@ -442,8 +440,6 @@ public:
 const ScDPItemData GetSelectedData();
 
 const ::com::sun::star::sheet::DataPilotFieldReference GetReferenceValue() const;
-
-BOOL  IsVisible( const ScDPItemData rData );
 };
 
 class ScDPHierarchies : public cppu::WeakImplHelper2
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 1a6..478fb51 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -180,7 +180,6 @@ public:
 /// Returns the half-open range of used columns in the specified row. Returns [0,0) if row is empty.
 SC_DLLPUBLIC ::std::pair SCCOL, SCCOL  getColRange( SCROW nRow ) const;
 void getAllNumberFormats(::std::vectorsal_uInt32 rNumFmts) const;
-const ScRangeList getCachedRanges() const;
 bool isRangeCached(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
 
 void setCachedCell(SCCOL nCol, SCROW nRow);
@@ -299,7 +298,6 @@ private:
 bool mbAllReferenced

[Libreoffice] [PATCH] Call-catcher: removed unused functions in calc

2011-02-01 Thread Alfonso Eusebio
Hi,

Please find attached patch (made available under LGPLv3+/MPL) containing 
removal 
of unused functions in calc as identified by call-catcher.
Patch has been rebased and compiled without errors.

Please, disregard my previous patch commenting out these calc functions, as 
Cedric suggested, this new patch directly removes the functions.

Thanks  regards,
Alfonso



  From 18e45467342802383fa944c469141f4042bd0c8b Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Date: Tue, 1 Feb 2011 08:20:47 +
Subject: [PATCH] Call-catcher: removed unused functions in calc

Removed unused functions from calc using the call-catcher list available
in Easy Tasks (first batch).
---
 sc/inc/compressedarray.hxx |  154 ---
 sc/source/core/data/attarray.cxx   |1 -
 sc/source/core/data/compressedarray.cxx|  155 
 sc/source/filter/excel/xestream.cxx|   11 +--
 sc/source/filter/excel/xestring.cxx|   16 ---
 sc/source/filter/excel/xihelper.cxx|5 -
 sc/source/filter/excel/xipivot.cxx |   18 ---
 sc/source/filter/excel/xistream.cxx|   19 
 sc/source/filter/excel/xltracer.cxx|6 -
 sc/source/filter/inc/XclImpChangeTrack.hxx |6 -
 sc/source/filter/inc/xestream.hxx  |2 -
 sc/source/filter/inc/xestring.hxx  |   20 +---
 sc/source/filter/inc/xihelper.hxx  |7 --
 sc/source/filter/inc/xipivot.hxx   |4 -
 sc/source/filter/inc/xistream.hxx  |4 -
 sc/source/filter/inc/xltracer.hxx  |1 -
 16 files changed, 4 insertions(+), 425 deletions(-)

diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index efc5cd7..12a5940 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -89,18 +89,11 @@ public:
 /** Get value for a row, and it's region end row */
 const DGetValue( A nPos, size_t nIndex, A nEnd ) const;
 
-/** Get value for a row, and it's region start row and end row */
-const DGetValue( A nPos, size_t nIndex, A nStart, A nEnd ) const;
-
 /** Get next value and it's region end row. If nIndexnCount, nIndex is
 incremented first. If the resulting nIndex=nCount, the value of the
 last entry is returned again. */
 const DGetNextValue( size_t nIndex, A nEnd ) const;
 
-/** Get previous value and it's region start row. If nIndex==0, nIndex is
-not decremented and the value of the first entry is returned again. */
-const DGetPrevValue( size_t nIndex, A nStart ) const;
-
 /** Insert rows before nStart and copy value for inserted rows from
 nStart-1, return that value. */
 const DInsert( A nStart, size_t nCount );
@@ -117,8 +110,6 @@ public:
 SC_DLLPUBLIC size_t  Search( A nPos ) const;
 /** Get number of entries */
 size_t  GetEntryCount() const;
-/** Get data entry for an index */
-const DataEntryGetDataEntry( size_t nIndex ) const;
 
 protected:
 
@@ -171,17 +162,6 @@ const D ScCompressedArrayA,D::GetValue( A nPos, size_t nIndex, A nEnd ) con
 
 
 template typename A, typename D 
-const D ScCompressedArrayA,D::GetValue( A nPos, size_t nIndex, A nStart,
-A nEnd ) const
-{
-nIndex = Search( nPos);
-nStart = (nIndex  0 ? pData[nIndex-1].nEnd + 1 : 0);
-nEnd = pData[nIndex].nEnd;
-return pData[nIndex].aValue;
-}
-
-
-template typename A, typename D 
 const D ScCompressedArrayA,D::GetNextValue( size_t nIndex, A nEnd ) const
 {
 if (nIndex  nCount)
@@ -193,30 +173,12 @@ const D ScCompressedArrayA,D::GetNextValue( size_t nIndex, A nEnd ) const
 
 
 template typename A, typename D 
-const D ScCompressedArrayA,D::GetPrevValue( size_t nIndex, A nStart ) const
-{
-if (nIndex  0)
---nIndex;
-nStart = (nIndex  0 ? pData[nIndex-1].nEnd + 1 : 0);
-return pData[nIndex].aValue;
-}
-
-
-template typename A, typename D 
 size_t ScCompressedArrayA,D::GetEntryCount() const
 {
 return nCount;
 }
 
 
-template typename A, typename D 
-const typename ScCompressedArrayA,D::DataEntry
-ScCompressedArrayA,D::GetDataEntry( size_t nIndex ) const
-{
-return pData[nIndex];
-}
-
-
 // === ScCompressedArrayIterator =
 
 /** Iterator for ScCompressedArray.
@@ -474,21 +436,6 @@ public:
 meets this condition, ::std::numeric_limitsA::max() is returned. */
 A   GetLastAnyBitAccess( A nStart,
 const D rBitMask ) const;
-
-/** Sum values of a ScSummableCompressedArray for each row where in *this*
-array the condition is met: ((aValue  rBitMask) == rMaskedCompare). */
-template typename S 
-SC_DLLPUBLIC unsigned long   SumCoupledArrayForCondition( A nStart, A nEnd

[Libreoffice] [PATCH] Commented out some unused functions in calc

2011-01-29 Thread Alfonso Eusebio
Hi,

I've been going through the list of identified unused functions in calc and 
commenting out those that don't seem to be used anywhere.
Attached is the patch (LGPLv3+/MPL) that comments out some 10 functions and a 
text file with those investigated so far, and the results.

I chose to comment out, rather than delete, to allow for some extra testing 
once 
it's committed. Commented functions can be easily identified later on and 
removed.
Please let me know if direct removal would be preferred.

After committing my changes locally I've built module sc and done a make 
dev-install. Everything seems to be working fine, but the test wasn't 
exhaustive.
The changes have been rebased with current master.

There are a few functions that belong to some addin mechanism now obsolete. 
I'm not sure if it can be removed completely, but it looks like a good 
candidate 
(details in attached text file).

Thanks  regards,
Alfonso


  From ad7008e740baf43ebad80a3be2f50b5fe73e584a Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio alfonso_euse...@yahoo.co.uk
Date: Sat, 29 Jan 2011 13:42:07 +
Subject: [PATCH] Commented out some unused functions in calc

Commented out some unused functions in calc before proceeding to final removal.
---
 sc/inc/compressedarray.hxx |6 --
 sc/source/core/data/attarray.cxx   |1 -
 sc/source/core/data/compressedarray.cxx|8 
 sc/source/filter/excel/xipivot.cxx |9 ++---
 sc/source/filter/excel/xistream.cxx|9 ++---
 sc/source/filter/excel/xltracer.cxx|3 ++-
 sc/source/filter/inc/XclImpChangeTrack.hxx |5 +++--
 sc/source/filter/inc/xipivot.hxx   |4 ++--
 sc/source/filter/inc/xistream.hxx  |6 +++---
 sc/source/filter/inc/xltracer.hxx  |3 ++-
 10 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index efc5cd7..941ae1a 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -477,18 +477,20 @@ public:
 
 /** Sum values of a ScSummableCompressedArray for each row where in *this*
 array the condition is met: ((aValue  rBitMask) == rMaskedCompare). */
+/* [AE] seems unused - commenting out for now
 template typename S 
 SC_DLLPUBLIC unsigned long   SumCoupledArrayForCondition( A nStart, A nEnd,
 const D rBitMask, const D rMaskedCompare,
-const ScSummableCompressedArrayA,S rArray ) const;
+const ScSummableCompressedArrayA,S rArray ) const;*/
 
 /** Sum scaled values of a ScSummableCompressedArray for each row where in
 *this* array the condition is met: ((aValue  rBitMask) == rMaskedCompare). */
+/* [AE] seems unused - commenting out for now
 template typename S 
 SC_DLLPUBLIC unsigned long   SumScaledCoupledArrayForCondition( A nStart, A nEnd,
 const D rBitMask, const D rMaskedCompare,
 const ScSummableCompressedArrayA,S rArray,
-double fScale ) const;
+double fScale ) const; */
 };
 
 
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index bd52f4b..bb411ab 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1183,7 +1183,6 @@ long lcl_LineSize( const SvxBorderLine rLine )
 return nTotal;
 }
 
-
 BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle rSizes,
 BOOL bLeft, BOOL bRight ) const
 {
diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx
index 1c4d8bd..b935f40 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -515,7 +515,7 @@ A ScBitMaskCompressedArrayA,D::GetLastAnyBitAccess( A nStart,
 return nEnd;
 }
 
-
+/* [AE] seems unused - commenting out for now
 template typename A, typename D 
 template typename S 
 unsigned long ScBitMaskCompressedArrayA,D::SumCoupledArrayForCondition(
@@ -549,7 +549,6 @@ unsigned long ScBitMaskCompressedArrayA,D::SumCoupledArrayForCondition(
 return nSum;
 }
 
-
 template typename A, typename D 
 template typename S 
 unsigned long ScBitMaskCompressedArrayA,D::SumScaledCoupledArrayForCondition(
@@ -582,7 +581,7 @@ unsigned long ScBitMaskCompressedArrayA,D::SumScaledCoupledArrayForCondition(
 (rArray.GetDataEntry(rArray.GetEntryCount()-1).aValue * fScale) *
 (nEnd - this-nMaxAccess);
 return nSum;
-}
+} */
 
 
 // === ScCompressedArrayIterator =
@@ -694,13 +693,14 @@ template class ScCompressedArray SCROW, USHORT;   // heights, base cla
 template class ScSummableCompressedArray SCROW, USHORT;   // heights
 template class ScCompressedArray