[Libreoffice-commits] .: Branch 'libreoffice-3-5' - reportdesign/source

2012-07-05 Thread Miklos Vajna 
 reportdesign/source/ui/inspection/GeometryHandler.cxx |   19 ++
 1 file changed, 19 insertions(+)

New commits:
commit 2c37b5ba27d5289b3ec5c0ad3273cdb7d7fa9848
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jul 4 17:46:44 2012 +0200

fdo#43556 round posdim of report controls  sections to nearest 10^-4m

Change-Id: I3fa331d246160935f4feed21de69f9ec0c2e9994
Signed-off-by: Miklos Vajna vmik...@suse.cz

diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index fe765ca..a3d32cd 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -129,6 +129,7 @@ namespace rptui
 //
 using namespace ::com::sun::star;
 
+namespace{
 // comparing two property instances
 struct PropertyCompare : public ::std::binary_function beans::Property, 
::rtl::OUString , bool 
 {
@@ -196,6 +197,22 @@ void lcl_convertFormulaTo(const uno::Any 
_aPropertyValue,uno::Any _rControlVal
 _rControlValue = aFormula.getUndecoratedContent();
 }
 }
+
+// return value rounded to the nearest multiple of base
+// if equidistant of two multiples, round up (for positive numbers)
+// T is assumed to be an integer type
+template typename T, T base T lcl_round(T value)
+{
+OSL_ENSURE(value = 0, lcl_round: positive numbers only please);
+const T threshold = (base % 2 == 0) ? (base/2) : (base/2 + 1);
+const T rest = value % base;
+if ( rest = threshold )
+return value + (base - rest);
+else
+return value - rest;
+}
+
+} // anonymous namespace
 // 
-
 bool GeometryHandler::impl_isDataField(const ::rtl::OUString _sName) const
 {
@@ -635,6 +652,8 @@ void SAL_CALL GeometryHandler::setPropertyValue(const 
::rtl::OUString  Property
 {
 sal_Int32 nNewValue = 0;
 Value = nNewValue;
+OSL_ENSURE(nNewValue = 0, A position/dimension should 
not be negative!);
+nNewValue = lcl_roundsal_Int32, 10(nNewValue);
 awt::Point aAwtPoint = 
xSourceReportComponent-getPosition();
 awt::Size aAwtSize = xSourceReportComponent-getSize();
 if ( nId == PROPERTY_ID_POSITIONX )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

logerrit review bug

2012-07-05 Thread Miklos Vajna 
On Fri, Jun 29, 2012 at 09:59:57AM +0200, Miklos Vajna vmik...@suse.cz wrote:
 Anyway, this is the first time I tried to use logerrit review, and I
 found 3 issues. The generated commandline should be like:
 
 ssh logerrit gerrit review -m \looks good\ --verified=+1 --code-review=2 
 1080c131c0c512a9d5273e860a48af13667bc9e8
 
 But logerrit:
 
 - prints  instead of \
 - uses codereview insead of code-review (who tested this? ;) )
 - tries to use the changeid instead of the sha1 of the commit
 
 The first two is trivial and I fixed it, the last one is something I'm
 not sure about - Norbert/Björn, care to have a look? The error message
 is:
 
 fatal: I7605eda6ef8111612ceb1ded79c0811de9ca7b25 is not a valid patch set
 
 Just getting the sha1 from FETCH_HEAD is what I did manually for now,
 but that's not a solution - if I gerrit-cherry-pick two independent
 patches, then I have no idea how to get the original sha1 for the first
 one, unless we make gerrit-cherry-pick use git cherry-pick -x.

Hi Björn,

I want to point out that this is still an issue:

~/git/libreoffice/libreoffice-3-5$ ../master/logerrit review
no Change-Id given on the command line, reviewing change 
I3fa331d246160935f4feed21de69f9ec0c2e9994
was the change verified to build sucessfully (+) or found not to build (-) or 
none of that ()? +
is the code looking good (+), bad (-) or none of that ()? +
do you approve the change (+) too, or prefer someone else to do that ()? +
please type a friendly comment: looks ok
ssh logerrit gerrit review -m \looks ok\ --verified=+1 --code-review=2 
I3fa331d246160935f4feed21de69f9ec0c2e9994
~/git/libreoffice/libreoffice-3-5$ ssh logerrit gerrit review -m \looks ok\ 
--verified=+1 --code-review=2 I3fa331d246160935f4feed21de69f9ec0c2e9994
fatal: I3fa331d246160935f4feed21de69f9ec0c2e9994 is not a valid patch set
~/git/libreoffice/libreoffice-3-5$ cat .git/FETCH_HEAD 
281f3ec0a105175fb41e2b0455042fd29c7dc069'refs/changes/57/257/1' 
of ssh://logerrit/core
~/git/libreoffice/libreoffice-3-5$ ssh logerrit gerrit review -m \looks ok\ 
--verified=+1 --code-review=2 281f3ec0a105175fb41e2b0455042fd29c7dc069

(i.e. no error with the sha1, but still no idea how to get the original
sha1, in case i cherry-picked two change for review.)

Thanks for looking at it,

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

Re: help with tail_build

2012-07-05 Thread Noel Grandin 


On 2012-07-05 03:03, Olivier Hallot wrote:

Given I don't have a second drive, what figures should I improve here?
(Notebook with i5 and 6 GB RAM)


By yourself an SSD drive - laptop hard drives are generally very slow 
beasts, typical 5400rpm drives.

Seriously, it will completely transform your experience :-)
I'm using an OCZ Vertex and I'm a very happy user.

Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: help with tail_build

2012-07-05 Thread Lionel Elie Mamane 
On Wed, Jul 04, 2012 at 10:03:25PM -0300, Olivier Hallot wrote:

 About ccache, I have this

 tdf@olivier-Vostro-3500:~/git/core$ ccache -s
 cache directory /home/tdf/.ccache
 cache hit (direct) 38119
 cache hit (preprocessed)2777
 cache miss555377
 cache size 924.3 Mbytes
 max cache size   1.0 Gbytes

The max cache size if far too low to be useful for LibreOffice
development, especially if you do a debug / symbols build. The cache
needs to be at least big enough to hold all  LibreOffice .o files, and
then some (to support switching between branches).

If you are low on disks space, enable compression.

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

[Libreoffice-commits] .: 2 commits - basic/inc sw/inc

2012-07-05 Thread Michael Stahl 
 basic/inc/basic/sbxvar.hxx |   22 +++---
 sw/inc/calc.hxx|   10 ++
 2 files changed, 9 insertions(+), 23 deletions(-)

New commits:
commit c3dc9a3ef3cb9bc28051ef11d8b7fa5afaf819ef
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jul 5 10:48:19 2012 +0200

clean up include guards in sbxvar.hxx

Change-Id: I802d142ae93b3e9c7d42ab98d5c757df94a82196

diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 2416216..366e61a 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -26,8 +26,8 @@
  *
  /
 
-#ifndef _SBXVAR_HXX
-#define _SBXVAR_HXX
+#ifndef SBXVAR_HXX
+#define SBXVAR_HXX
 
 #include rtl/ustring.hxx
 #include tools/string.hxx
@@ -35,8 +35,6 @@
 #include basic/sbxcore.hxx
 #include basicdllapi.h
 
-#ifndef __SBX_SBXVALUES_HXX
-#define __SBX_SBXVALUES_HXX
 
 class SbxDecimal;
 
@@ -99,13 +97,6 @@ struct SbxValues
 
 };
 
-#endif
-
-#ifndef __SBX_SBXVALUE
-#define __SBX_SBXVALUE
-
-struct SbxValues;
-
 class BASIC_DLLPUBLIC SbxValue : public SbxBase
 {
 // #55226 Transport additional infos
@@ -285,11 +276,6 @@ inline SbxValue SbxValue::operator|=( const SbxValue r )
 inline SbxValue SbxValue::operator^=( const SbxValue r )
 { Compute( SbxXOR, r ); return *this; }
 
-#endif
-
-#ifndef __SBX_SBXVARIABLE_HXX
-#define __SBX_SBXVARIABLE_HXX
-
 class SbxArray;
 class SbxInfo;
 
@@ -379,8 +365,6 @@ public:
 SV_DECL_REF(SbxVariable)
 #endif
 
-#endif
-
-#endif  // _SBXVAR_HXX
+#endif  // SBXVAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 12d08ed2880020bb9ec2dec82dd26bccd63605ff
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jul 5 10:42:47 2012 +0200

fix Windows build, include vector

Change-Id: Ia07e12c9fa5430d7f8fa02a2a8ab6cde3aafa41a

diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 191480c..fe9512d 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -25,14 +25,16 @@
  * for a copy of the LGPLv3 License.
  *
  /
-#ifndef _CALC_HXX
-#define _CALC_HXX
+
+#ifndef SW_CALC_HXX
+#define SW_CALC_HXX
+
+#include vector
 
 #include unotools/syslocale.hxx
 
-#ifndef __SBX_SBXVALUE //autogen
 #include basic/sbxvar.hxx
-#endif
+
 #include swdllapi.h
 
 class CharClass;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LibreOffice 3.5.5 RC3 available

2012-07-05 Thread Thorsten Behrens 
Dear Community,

The Document Foundation is happy to announce the third release
candidate of LibreOffice 3.5.5. The upcoming 3.5.5 will be the fifth
in a series of frequent bugfix releases for our 3.5 code line. Please
be aware that LibreOffice 3.5.5 RC3 is not yet ready for production
use, you should continue to use LibreOffice 3.5.4 for that.

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the beta quality is to run some specific manual
tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

 (and the announcement mail: 
http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html)
 
For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/get-involved/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/Translation_for_3.5

or help with funding our operations:

  http://challenge.documentfoundation.org/

A list of known issues and fixed bugs with 3.5.5 RC3 is available
from our wiki:

  https://wiki.documentfoundation.org/Releases/3.5.5/RC3

Please find the list of changes against LibreOffice 3.5.5 RC2 here:

  
http://download.documentfoundation.org/libreoffice/src/bugfixes-libreoffice-3-5-5-release-3.5.5.3.log

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

Yours,

The Document Foundation Board of Directors


pgpzufxjunsju.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: rediscovered: missing writer documentation

2012-07-05 Thread Michael Meeks 

On Wed, 2012-07-04 at 21:59 +0100, Caolán McNamara wrote:
 So, I found some old class diagrams for writer which I think I got from
 khz who I think got them from jp. They're drawn on some printouts which
 have a 1998 date on them. Coffee ring around SwClient is probably not
 significant. http://blogs.linux.ie/caolan/files/2012/07/writer.pdf

Fun ! :-) We just need some artist to turn them into something
beautiful and electronic I guess.

Good find,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: xmloff/inc xmloff/source

2012-07-05 Thread Miklos Vajna 
 xmloff/inc/XMLTextHeaderFooterContext.hxx |5 +-
 xmloff/inc/xmloff/XMLTextMasterPageContext.hxx|7 ++
 xmloff/inc/xmloff/XMLTextMasterPageExport.hxx |4 +
 xmloff/inc/xmloff/txtimp.hxx  |2 
 xmloff/inc/xmloff/xmltoken.hxx|2 
 xmloff/source/core/xmltoken.cxx   |2 
 xmloff/source/text/XMLTextHeaderFooterContext.cxx |   53 +-
 xmloff/source/text/XMLTextMasterPageContext.cxx   |   22 +++--
 xmloff/source/text/XMLTextMasterPageExport.cxx|   50 
 xmloff/source/text/txtimp.cxx |2 
 10 files changed, 131 insertions(+), 18 deletions(-)

New commits:
commit 7ac60704206d229b45dd002ca3b9d70c4c64034e
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 5 11:37:26 2012 +0200

xmloff: implement first page header/footer import/export

Change-Id: I920c236125ae044fe66cf0eacafdfc94ef81a4fd

diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx 
b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 7a7c98f..73102fc 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -36,11 +36,14 @@ class XMLTextHeaderFooterContext: public SvXMLImportContext
 
 const ::rtl::OUString sOn;
 const ::rtl::OUString sShareContent;
+const ::rtl::OUString sShareContentFirst;
 const ::rtl::OUString sText;
+const ::rtl::OUString sTextFirst;
 const ::rtl::OUString sTextLeft;
 
 sal_BoolbInsertContent : 1;
 sal_BoolbLeft : 1;
+sal_BoolbFirst : 1;
 
 public:
 TYPEINFO();
@@ -51,7 +54,7 @@ public:
 ::com::sun::star::xml::sax::XAttributeList   xAttrList,
 const ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySet   
rPageStylePropSet,
-   sal_Bool bFooter, sal_Bool bLft );
+   sal_Bool bFooter, sal_Bool bLft, sal_Bool bFrst );
 
 virtual ~XMLTextHeaderFooterContext();
 
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx 
b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
index ff4898f..16ae310 100644
--- a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
@@ -43,10 +43,14 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public 
SvXMLStyleContext
 sal_Bool bInsertFooter;
 sal_Bool bInsertHeaderLeft;
 sal_Bool bInsertFooterLeft;
+sal_Bool bInsertHeaderFirst;
+sal_Bool bInsertFooterFirst;
 sal_Bool bHeaderInserted;
 sal_Bool bFooterInserted;
 sal_Bool bHeaderLeftInserted;
 sal_Bool bFooterLeftInserted;
+sal_Bool bHeaderFirstInserted;
+sal_Bool bFooterFirstInserted;
 
 SAL_DLLPRIVATE ::com::sun::star::uno::Reference 
 ::com::sun::star::style::XStyle  Create();
@@ -74,7 +78,8 @@ public:
 const ::rtl::OUString rLocalName,
 const ::com::sun::star::uno::Reference 
::com::sun::star::xml::sax::XAttributeList   xAttrList,
 const sal_Bool bFooter,
-const sal_Bool bLeft );
+const sal_Bool bLeft,
+const sal_Bool bFirst );
 
 virtual void Finish( sal_Bool bOverwrite );
 };
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx 
b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
index d88b85f..02b2b6c 100644
--- a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
@@ -35,11 +35,15 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageExport : public 
XMLPageExport
 const ::rtl::OUString sHeaderText;
 const ::rtl::OUString sHeaderOn;
 const ::rtl::OUString sHeaderShareContent;
+const ::rtl::OUString sHeaderShareContentFirst;
+const ::rtl::OUString sHeaderTextFirst;
 const ::rtl::OUString sHeaderTextLeft;
 
 const ::rtl::OUString sFooterText;
 const ::rtl::OUString sFooterOn;
 const ::rtl::OUString sFooterShareContent;
+const ::rtl::OUString sFooterShareContentFirst;
+const ::rtl::OUString sFooterTextFirst;
 const ::rtl::OUString sFooterTextLeft;
 
 protected:
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index f364402..f01c0ec 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.hxx
@@ -343,6 +343,8 @@ enum XMLTextPageMasterElemTokens
 XML_TOK_TEXT_MP_FOOTER,
 XML_TOK_TEXT_MP_HEADER_LEFT,
 XML_TOK_TEXT_MP_FOOTER_LEFT,
+XML_TOK_TEXT_MP_HEADER_FIRST,
+XML_TOK_TEXT_MP_FOOTER_FIRST,
 XML_TOK_TEXT_MP_END=XML_TOK_UNKNOWN
 };
 
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index e45091e..73dcd95 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -831,6 +831,7 @@ namespace xmloff { namespace token {
 XML_FONTWORK_START,
 XML_FONTWORK_STYLE,
 XML_FOOTER,
+XML_FOOTER_FIRST,
 XML_FOOTER_LEFT,
 XML_FOOTER_STYLE,
 XML_FOOTNOTE,
@@ -923,6 +924,7 @@

[Libreoffice] [GSoC 2012][svg export filter] Repeated animations issue

2012-07-05 Thread Marco Cecchetti 


Hi everyone,
while playing with repeated animations I caught the following issue:

Use case:
Create two shape animations the first repeated 2 or more times,
the second starts soon after the previous one is ended (no click
needed).
Problem:
The second effect start when the first iteration of the first
effect is ended.

By watching the exported svg document I can see that this problem
is due to the fact that the 'begin' attribute is not set to the
sync value '(id-previous-effect).end' but to an absolute time
value expressed in seconds.
So when a 'after previous' effect is created, somewhere the
duration time of previous effects is computed and then used for
setting up the 'begin' attribute value of the created effect, the
problem is that this computation doesn't take into account the
'repeatCount' attribute.
I can see that the same problem is present for the C++ presentation
engine too.
Indeed in the CustomAnimationEffect::createAfterEffectNode method
the 'begin' attribute is set up correctly to EventTrigger::END_EVENT,
so the substitution with the real time value is performed later.
I'd like to fix it if I know where it is the related source code.

Cheers,
-- Marco


--
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Change in core[master]: Replaced deprecated tools/String with OUString in ScMatrix

2012-07-05 Thread Gerrit 
From Sören Möller soerenmoeller2...@gmail.com:

Sören Möller has posted comments on this change.

Change subject: Replaced deprecated tools/String with OUString in ScMatrix
..


Patch Set 2:

I followed Eike's suggestion and added EMPTY_OUSTRING and 
ScGlobal::GetEmptyOUString() and changed the returns of empty strings to use 
these. That should remove the memleak. Thanks for the reviews

--
To view, visit https://gerrit.libreoffice.org/242
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If431e5ef8b5c97384a1bb1c7fa36c6894ece8343
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Sören Möller soerenmoeller2...@gmail.com

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

Change in core[master]: Replaced deprecated tools/String with OUString in ScAddInCol

2012-07-05 Thread Gerrit 
From Sören Möller soerenmoeller2...@gmail.com:

Sören Möller has uploaded a new change for review.

Change subject: Replaced deprecated tools/String with OUString in ScAddInCol
..

Replaced deprecated tools/String with OUString in ScAddInCol

Change-Id: I7059f10617b9a33ba63690c980b96d95d9023c55
---
M sc/inc/addincol.hxx
M sc/source/core/tool/addincol.cxx
M sc/source/core/tool/compiler.cxx
M sc/source/filter/excel/xeformula.cxx
M sc/source/filter/excel/xiroot.cxx
5 files changed, 99 insertions(+), 99 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/258/1
--
To view, visit https://gerrit.libreoffice.org/258
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7059f10617b9a33ba63690c980b96d95d9023c55
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com

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

[Libreoffice-commits] .: xmloff/source

2012-07-05 Thread Miklos Vajna 
 xmloff/source/text/txtimp.cxx |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit a99e3134aa253977b5112cc903d4097907bf3801
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 5 11:49:19 2012 +0200

xmloff: unused includes in txtimp

Change-Id: I0a4feed51067f6b222d60f569dd794f2439fc790

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index d80ed05..e751058 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -30,40 +30,21 @@
 #include vector
 
 #include boost/scoped_array.hpp
-#include boost/tuple/tuple.hpp
 
-#include tools/solar.h
-#include tools/debug.hxx
 #include svl/svstdarr.hxx
-#include com/sun/star/beans/XPropertySet.hpp
-#include com/sun/star/beans/PropertyValue.hpp
 #include com/sun/star/container/XEnumerationAccess.hpp
-#include com/sun/star/container/XNameContainer.hpp
 #include com/sun/star/style/XStyleFamiliesSupplier.hpp
-#include com/sun/star/text/XTextCursor.hpp
 #include com/sun/star/text/XChapterNumberingSupplier.hpp
 #include com/sun/star/text/XTextFramesSupplier.hpp
 #include com/sun/star/text/XTextGraphicObjectsSupplier.hpp
 #include com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp
-#include com/sun/star/text/TextContentAnchorType.hpp
-#include com/sun/star/text/XTextFrame.hpp
 #include com/sun/star/text/XFormField.hpp
-#include com/sun/star/drawing/XShapes.hpp
-#include com/sun/star/util/DateTime.hpp
-#include com/sun/star/lang/XMultiServiceFactory.hpp
 #include com/sun/star/ucb/XAnyCompareFactory.hpp
-#include com/sun/star/container/XNamed.hpp
-#include xmloff/xmltoken.hxx
 #include xmloff/xmlnmspe.hxx
 #include xmloff/txtstyli.hxx
-#include xmloff/families.hxx
-#include xmloff/xmlnumfi.hxx
 #include xmloff/xmlnumi.hxx
-#include xmloff/xmlictxt.hxx
-#include xmloff/xmlimppr.hxx
 
 #include txtparai.hxx
-#include xmloff/txtimp.hxx
 #include xmloff/txtprmap.hxx
 #include xmloff/txtimppr.hxx
 #include xmloff/xmlimp.hxx
@@ -72,13 +53,10 @@
 #include XMLTextListItemContext.hxx
 #include XMLTextListBlockContext.hxx
 #include XMLTextFrameContext.hxx
-#include XMLPropertyBackpatcher.hxx
 #include XMLTextFrameHyperlinkContext.hxx
 #include XMLSectionImportContext.hxx
 #include XMLIndexTOCContext.hxx
 #include xmloff/XMLFontStylesContext.hxx
-#include xmloff/ProgressBarHelper.hxx
-#include xmloff/nmspmap.hxx
 #include xmloff/XMLEventsImportContext.hxx
 #include XMLTrackedChangesImportContext.hxx
 #include XMLChangeImportContext.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/inc dbaccess/source embeddedobj/source jvmfwk/source

2012-07-05 Thread Takeshi Abe 
 dbaccess/inc/dataview.hxx |1 -
 dbaccess/inc/genericcontroller.hxx|1 -
 dbaccess/source/core/api/RowSetCache.hxx  |2 --
 dbaccess/source/core/dataaccess/datasource.hxx|1 -
 dbaccess/source/core/dataaccess/myucp_datasupplier.hxx|1 -
 dbaccess/source/core/inc/DatabaseDataProvider.hxx |1 -
 dbaccess/source/core/inc/querycomposer.hxx|8 
 dbaccess/source/core/inc/querycontainer.hxx   |2 --
 dbaccess/source/core/inc/tablecontainer.hxx   |2 --
 dbaccess/source/filter/xml/xmlDataSourceSetting.hxx   |1 -
 dbaccess/source/ui/app/AppController.hxx  |2 --
 dbaccess/source/ui/app/AppView.hxx|1 -
 dbaccess/source/ui/app/IApplicationController.hxx |1 -
 dbaccess/source/ui/browser/dbtreeview.hxx |1 -
 dbaccess/source/ui/dlg/ConnectionHelper.hxx   |2 --
 dbaccess/source/ui/dlg/ConnectionPage.hxx |1 -
 dbaccess/source/ui/dlg/ConnectionPageSetup.hxx|1 -
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |3 ---
 dbaccess/source/ui/dlg/UserAdmin.hxx  |6 --
 dbaccess/source/ui/dlg/generalpage.hxx|1 -
 dbaccess/source/ui/inc/ConnectionLine.hxx |2 --
 dbaccess/source/ui/inc/DExport.hxx|3 ---
 dbaccess/source/ui/inc/FieldDescControl.hxx   |3 ---
 dbaccess/source/ui/inc/IItemSetHelper.hxx |3 ---
 dbaccess/source/ui/inc/JoinController.hxx |3 ---
 dbaccess/source/ui/inc/JoinDesignView.hxx |2 --
 dbaccess/source/ui/inc/QueryDesignView.hxx|5 -
 dbaccess/source/ui/inc/QueryTableView.hxx |1 -
 dbaccess/source/ui/inc/RelationControl.hxx|2 --
 dbaccess/source/ui/inc/RelationController.hxx |6 --
 dbaccess/source/ui/inc/RelationDesignView.hxx |4 
 dbaccess/source/ui/inc/RelationDlg.hxx|1 -
 dbaccess/source/ui/inc/TableController.hxx|2 --
 dbaccess/source/ui/inc/TableDesignControl.hxx |1 -
 dbaccess/source/ui/inc/TableRow.hxx   |1 -
 dbaccess/source/ui/inc/UITools.hxx|9 -
 dbaccess/source/ui/inc/UserAdminDlg.hxx   |3 ---
 dbaccess/source/ui/inc/brwctrlr.hxx   |1 -
 dbaccess/source/ui/inc/brwview.hxx|1 -
 dbaccess/source/ui/inc/callbacks.hxx  |1 -
 dbaccess/source/ui/inc/dbadmin.hxx|1 -
 dbaccess/source/ui/inc/dlgsave.hxx|5 -
 dbaccess/source/ui/inc/querycontainerwindow.hxx   |1 -
 dbaccess/source/ui/inc/querycontroller.hxx|6 --
 dbaccess/source/ui/inc/queryorder.hxx |5 -
 dbaccess/source/ui/inc/sbagrid.hxx|1 -
 dbaccess/source/ui/inc/unoadmin.hxx   |2 --
 dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx |1 -
 dbaccess/source/ui/querydesign/querydlg.hxx   |1 -
 dbaccess/source/ui/tabledesign/TableUndo.hxx  |1 -
 embeddedobj/source/inc/commonembobj.hxx   |4 
 embeddedobj/source/inc/dummyobject.hxx|7 ---
 jvmfwk/source/fwkutil.hxx |5 -
 53 files changed, 133 deletions(-)

New commits:
commit eecb5ac9a4a965dbd7cb5a2104becc8217ff6f80
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Jul 5 19:07:23 2012 +0900

removed useless forward declarations of class

Change-Id: I13cf52cc4e1cf8d5e2453d7ac4b68cc8c64cd011

diff --git a/dbaccess/inc/dataview.hxx b/dbaccess/inc/dataview.hxx
index 4559aee..11e7fc0 100644
--- a/dbaccess/inc/dataview.hxx
+++ b/dbaccess/inc/dataview.hxx
@@ -29,7 +29,6 @@
 #include memory
 
 class FixedLine;
-class SvtMiscOptions;
 namespace dbaui
 {
 class IController;
diff --git a/dbaccess/inc/genericcontroller.hxx 
b/dbaccess/inc/genericcontroller.hxx
index 8ab991d..86fcd0d 100644
--- a/dbaccess/inc/genericcontroller.hxx
+++ b/dbaccess/inc/genericcontroller.hxx
@@ -62,7 +62,6 @@ namespace dbtools
 }
 
 class Window;
-class VCLXWindow;
 namespace dbaui
 {
 class ODataView;
diff --git a/dbaccess/source/core/api/RowSetCache.hxx 
b/dbaccess/source/core/api/RowSetCache.hxx
index e36c938..2a315d9 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -50,8 +50,6 @@ namespace connectivity
 namespace dbaccess
 {
 class OCacheSet;
-class ORowSetDataColumns;
-class ORowSetCacheClone;
 
 class ORowSetCache
 {
diff --git

ccache (was: Re: help with tail_build)

2012-07-05 Thread Michael Stahl 
On 05/07/12 10:43, Lionel Elie Mamane wrote:
 On Wed, Jul 04, 2012 at 10:03:25PM -0300, Olivier Hallot wrote:
 
 About ccache, I have this
 
 tdf@olivier-Vostro-3500:~/git/core$ ccache -s
 cache directory /home/tdf/.ccache
 cache hit (direct) 38119
 cache hit (preprocessed)2777
 cache miss555377
 cache size 924.3 Mbytes
 max cache size   1.0 Gbytes
 
 The max cache size if far too low to be useful for LibreOffice
 development, especially if you do a debug / symbols build. The cache
 needs to be at least big enough to hold all  LibreOffice .o files, and
 then some (to support switching between branches).
 
 If you are low on disks space, enable compression.

the documentation on this was a bit short on details, so i've added some
more here:

https://wiki.documentfoundation.org/Development/Native_Build#ccache


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

Re: rediscovered: missing writer documentation

2012-07-05 Thread Philipp Riemer 
I am currently working on a simple DOT representation... Seams to be
trickier than expected.

What would be in your eyes the best kind of visualization? Classical
UML class diagrams?

-- Philipp

2012/7/5 Michael Meeks michael.me...@suse.com:

 On Wed, 2012-07-04 at 21:59 +0100, Caolán McNamara wrote:
 So, I found some old class diagrams for writer which I think I got from
 khz who I think got them from jp. They're drawn on some printouts which
 have a 1998 date on them. Coffee ring around SwClient is probably not
 significant. http://blogs.linux.ie/caolan/files/2012/07/writer.pdf

 Fun ! :-) We just need some artist to turn them into something
 beautiful and electronic I guess.

 Good find,

 Michael.

 --
 michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

Re: Questions regarding code peculiarities

2012-07-05 Thread Michael Stahl 
On 30/06/12 23:37, Philipp Riemer wrote:

 = sw/source/core/attr/calbck.cxx
 (2) The two functions SwClient* SwClientIter::First and SwClient*
 SwClientIter::Last seem to differ in their logic. Same seems to be
 true for SwClientIter::Next and SwClientIter::Previous. Or is this
 marginal change in each case correct? Can please anyone more
 experienced than me take a quick look at those functions?

my experience tells me that SwClient is completely crazy and that
changing it in any way probably breaks stuff.

 = sw/source/core/attr/cellatr.cxx
 (3) The switch statement in SwTblBoxFormula::ChangeState has no
 default case. This might be helpful to capture bogus behaviour...

hmm... it depends on whether it currently handles all possible values,
or only some values.  sadly i don't know what it does...

 (4) The function SwTblBoxFormula::Calc has only an if statement
 with no else case and also no other code outside. Is this intended?
 If so, wouldn't it be more readable if the logic is reversed, e.g.
 if( rCalcPara.rCalc.IsCalcError() ) return; //explanation why, and
 everything else is written without being in an if block?

yes, i tend to prefer early returns, because it makes it immediately
obvious that the method is not going to do anything any more in this
case.  ok, that is not so important in this 10 line function, but when
the function is 500 lines long it helps.

 = sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
 (5) The switch statement in SwFmtWrapInfluenceOnObjPos::QueryValue
 has only one case and thus can be replaced by an if/else; same for
 switch statement in SwFmtWrapInfluenceOnObjPos::PutValue.
 See https://gerrit.libreoffice.org/#/c/251/.

hmmm why not...

 = sw/source/core/attr/format.cxx
 (7) Switch case 0 in SwFmt::Modify seems to be strange since it
 seems to be unexpected (from the comment) but returns directly without
 logging an error or the like...

yeah, looks like it wants to be an assert()...

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

Re: rediscovered: missing writer documentation

2012-07-05 Thread David Tardon 
On Thu, Jul 05, 2012 at 10:36:59AM +0100, Michael Meeks wrote:
 
 On Wed, 2012-07-04 at 21:59 +0100, Caolán McNamara wrote:
  So, I found some old class diagrams for writer which I think I got from
  khz who I think got them from jp. They're drawn on some printouts which
  have a 1998 date on them. Coffee ring around SwClient is probably not
  significant.

I really should buy a teaproof keyboard...

  http://blogs.linux.ie/caolan/files/2012/07/writer.pdf
 
   Fun ! :-) We just need some artist to turn them into something
 beautiful and electronic I guess.

I think it has already been done:
http://wiki.services.openoffice.org/wiki/Writer_Core_And_Layout#Some_UML_Diagrams

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

Re: rediscovered: missing writer documentation

2012-07-05 Thread Michael Meeks 

On Thu, 2012-07-05 at 12:27 +0200, Philipp Riemer wrote:
 I am currently working on a simple DOT representation... Seams to be
 trickier than expected.
 
 What would be in your eyes the best kind of visualization? Classical
 UML class diagrams?

That's totally unclear to me ;-) I'm none the wiser having read the UML
distilled book though, so whatever makes the structure and relationships
most obvious I suppose :-)

ATB,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

Re: New way to modify nested uno structs in LibreOffice BASIC

2012-07-05 Thread Michael Meeks 
Hi Noel,

On Wed, 2012-07-04 at 20:23 +0100, Noel Power wrote:
 before this change the following macro snippet would not work.

It would be -wonderful- to start some basic / UNO unit tests right here
- are there really no unit tests for (what should be) something
eminently unit-test-able ? or am I looking in the wrong place :-)

Anyhow - thanks for the improvement ! :-)

Regards,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: sc/source

2012-07-05 Thread Miklos Vajna 
 sc/source/filter/xml/xmlstyli.cxx |3 ++-
 sc/source/filter/xml/xmlstyli.hxx |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b103aeb9de34ae790e6055ba49adcc9b679d7516
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 5 12:58:09 2012 +0200

sc: fix sc_subsequent_filters_test

Change-Id: I4dc88ff0d5e191b27b18f8ce3a9e9175fbd8c6ed

diff --git a/sc/source/filter/xml/xmlstyli.cxx 
b/sc/source/filter/xml/xmlstyli.cxx
index 460f642..9bf6de7 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -987,7 +987,8 @@ SvXMLImportContext 
*ScMasterPageContext::CreateHeaderFooterContext(
 const ::rtl::OUString rLocalName,
 const ::com::sun::star::uno::Reference 
::com::sun::star::xml::sax::XAttributeList   xAttrList,
 const sal_Bool bFooter,
-const sal_Bool bLeft )
+const sal_Bool bLeft,
+const sal_Bool /*bFirst*/ )
 {
 if (!bLeft)
 {
diff --git a/sc/source/filter/xml/xmlstyli.hxx 
b/sc/source/filter/xml/xmlstyli.hxx
index 156ff0e..d6f57df 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -296,7 +296,8 @@ public:
 const ::rtl::OUString rLocalName,
 const ::com::sun::star::uno::Reference 
::com::sun::star::xml::sax::XAttributeList   xAttrList,
 const sal_Bool bFooter,
-const sal_Bool bLeft );
+const sal_Bool bLeft,
+const sal_Bool bFirst );
 
 virtual void Finish( sal_Bool bOverwrite );
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: rediscovered: missing writer documentation

2012-07-05 Thread Philipp Riemer 
2012/7/5 David Tardon dtar...@redhat.com:
 On Thu, Jul 05, 2012 at 10:36:59AM +0100, Michael Meeks wrote:

 On Wed, 2012-07-04 at 21:59 +0100, Caolán McNamara wrote:
  So, I found some old class diagrams for writer which I think I got from
  khz who I think got them from jp. They're drawn on some printouts which
  have a 1998 date on them. Coffee ring around SwClient is probably not
  significant.

 I really should buy a teaproof keyboard...

  http://blogs.linux.ie/caolan/files/2012/07/writer.pdf

   Fun ! :-) We just need some artist to turn them into something
 beautiful and electronic I guess.

 I think it has already been done:
 http://wiki.services.openoffice.org/wiki/Writer_Core_And_Layout#Some_UML_Diagrams

 D.

Jep, seems as if you're right. So I'll stop my current work on a
graphical representation.

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

Re: rediscovered: missing writer documentation

2012-07-05 Thread Italo Vignoli 
Michael Meeks wrote:

   Fun ! :-) We just need some artist to turn them into something
 beautiful and electronic I guess.

I have an idea to leverage the document for a LibreOffice Story which
connects 1998 to 2012, and introduces LibreOffice 3.6. It would be nice
to find some other LO paraphernalia, from the early conferences. I have
something in my archive, but others might have additional stuff.

-- 
Italo Vignoli - italo.vign...@gmail.com
mob +39.348.5653829 - VoIP 5316...@messagenet.it
skype italovignoli - gtalk italo.vign...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - logerrit

2012-07-05 Thread Miklos Vajna 
 logerrit |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2fab1a73b11a500c38e9df67d1b2061e9a6c9232
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 5 13:22:47 2012 +0200

logerrit: for review, we need to grep for revision, not ref

Change-Id: I0fb8b1e4f14e153adae7a2ec1b3adbb0dab5c847

diff --git a/logerrit b/logerrit
index cc24c76..e5b2ba5 100755
--- a/logerrit
+++ b/logerrit
@@ -8,6 +8,10 @@ get_SHA_for_change() {
SHA=`ssh ${GERRITHOST?} gerrit query --all-approvals change:$1|grep 
ref|tail -1|cut -d: -f2`
 }
 
+get_REVISION_for_change() {
+   REVISION=`ssh ${GERRITHOST?} gerrit query --all-approvals 
change:$1|grep revision|tail -1|cut -d: -f2`
+}
+
 ask_tristate() {
case $1 in
[yY] | [yY][Ee][Ss] | [+] )
@@ -159,8 +163,8 @@ case $1 in
;;
esac
read -p please type a friendly comment$MESSAGEREQ:  MESSAGE
-   get_SHA_for_change $CHANGEID
-   ssh ${GERRITHOST?} gerrit review -m \$MESSAGE\ $VERIFIEDFLAG 
$CODEREVIEWFLAG $SHA
+   get_REVISION_for_change $CHANGEID
+   ssh ${GERRITHOST?} gerrit review -m \$MESSAGE\ $VERIFIEDFLAG 
$CODEREVIEWFLAG $REVISION
;;
checkout)
get_SHA_for_change $2
commit f3b1a1581324085257f3eb8290a086b22dcca8f5
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Jul 5 12:41:59 2012 +0200

fix ./logerrit review

 * ./logerrit review did not resolve the ChangeId to a SHA
 * ./logerrit did still echo the command instead of executing it.

Change-Id: Ie4f8630f7a83134d6eb7992f4a61b5d3faf7e138

diff --git a/logerrit b/logerrit
index 851af7d..cc24c76 100755
--- a/logerrit
+++ b/logerrit
@@ -159,7 +159,8 @@ case $1 in
;;
esac
read -p please type a friendly comment$MESSAGEREQ:  MESSAGE
-   echo ssh ${GERRITHOST?} gerrit review -m '\'$MESSAGE'\' 
$VERIFIEDFLAG $CODEREVIEWFLAG $CHANGEID
+   get_SHA_for_change $CHANGEID
+   ssh ${GERRITHOST?} gerrit review -m \$MESSAGE\ $VERIFIEDFLAG 
$CODEREVIEWFLAG $SHA
;;
checkout)
get_SHA_for_change $2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Libreoffice build error tail_build

2012-07-05 Thread Michael Stahl 
On 04/07/12 18:44, angelv wrote:
   internal build errors:
 
 ERROR: error 65280 occurred while making
 /usr/ports/editors/libreoffice/work/libreoffice-core-3.5.4.2/sdext/source/presenter
 ERROR: error 65280 occurred while making
 /usr/ports/editors/libreoffice/work/libreoffice-core-3.5.4.2/sdext/source/pdfimport
 ERROR: error 65280 occurred while making
 /usr/ports/editors/libreoffice/work/libreoffice-core-3.5.4.2/tail_build/prj
 ERROR: error 65280 occurred while making
 /usr/ports/editors/libreoffice/work/libreoffice-core-3.5.4.2/sdext/source/minimizer

that just says where the problems happened, but not what they are;
please provide more details.  e.g. the lines that show the compiler or
make error output from (cd sdext  make -r) and (cd tail_build 
make -r).

please also provide your autogen.lastrun


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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - config_host.mk.source

2012-07-05 Thread David Tardon 
 config_host.mk.source |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f6ce48485c6dc5d278f94565de3745b18bda9992
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 21 08:56:52 2012 +0200

specify the sourced file with path

man source says:

If filename does not contain a slash, file names  in  PATH  are used to
find the directory containing file‐ name.  The file searched for in PATH
need not  be  executable. When  bash  is  not  in posix  mode,  the
current directory is searched if no file is found in PATH.

Change-Id: I7dc15d30ba925c71d02da2cd8b91ea08192730fc

diff --git a/config_host.mk.source b/config_host.mk.source
index 042ffa2..10dd617 100644
--- a/config_host.mk.source
+++ b/config_host.mk.source
@@ -6,5 +6,5 @@
 
 temp_conf=`mktemp config_host.mk.XX`
 sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_host.mk $temp_conf
-source $temp_conf
+source ./$temp_conf
 rm $temp_conf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New way to modify nested uno structs in LibreOffice BASIC

2012-07-05 Thread Noel Power 

On 05/07/12 11:49, Michael Meeks wrote:

Hi Noel,

On Wed, 2012-07-04 at 20:23 +0100, Noel Power wrote:

before this change the following macro snippet would not work.

It would be -wonderful- to start some basic / UNO unit tests right here

I already signalled my intention in the previous mail
[*] have to admit I only tested one level of indirection. I didn't 
find a suitable structure that contains a structure that contains a 
structure to test, if you know of one off hand let me know Also I have 
yet to write some unit tests for this ( but will do ) 



- are there really no unit tests for (what should be) something
eminently unit-test-able ? or am I looking in the wrong place :-)
I did some work on allowing some deeper unit tests ( compile/runtime 
level ) to be written, 
http://opengrok.libreoffice.org/xref/core/basic/qa/cppunit/test_append.cxx. 
I'll split some of the reuslable stuff into a common header for the test 
I will write for this one. Also August did another for testing some 
scanner related functionality 
http://opengrok.libreoffice.org/xref/core/basic/qa/cppunit/test_scanner.cxx. 



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

Change in core[libreoffice-3-5]: fdo#39415: sw: fix collapsing border painting:

2012-07-05 Thread Gerrit 
From Björn Michaelsen bjoern.michael...@canonical.com:

Björn Michaelsen has abandoned this change.

Change subject: fdo#39415: sw: fix collapsing border painting:
..


Patch Set 1: Abandoned

abondoning this change, it is already in (likely missed by gerrit, because of 
missing change-id)

--
To view, visit https://gerrit.libreoffice.org/239
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I7605eda6ef8111612ceb1ded79c0811de9ca7b25
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

Change in core[master]: polishing user interface

2012-07-05 Thread Gerrit 
From Björn Michaelsen bjoern.michael...@canonical.com:

Björn Michaelsen has posted comments on this change.

Change subject: polishing user interface
..


Patch Set 4: Do not submit

Hi David, please update the patch:
- leave out the rename for now -- people seem to be happy with the ./logerrit 
name and it is on the mailing lists etc. -- we can change that later
- please redo your changes on top of the fixes done by vmiklos on master

--
To view, visit https://gerrit.libreoffice.org/233
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I078ad7bcd2b5dff39969deb44fd8a11076ce27c2
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Sebastian Spaeth sebast...@sspaeth.de

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

Change in core[master]: fix ./logerrit review

2012-07-05 Thread Gerrit 
From Björn Michaelsen bjoern.michael...@canonical.com:

Björn Michaelsen has uploaded a new change for review.

Change subject: fix ./logerrit review
..

fix ./logerrit review

 * ./logerrit review did not resolve the ChangeId to a SHA
 * ./logerrit did still echo the command instead of executing it.

Change-Id: Ie4f8630f7a83134d6eb7992f4a61b5d3faf7e138
---
M logerrit
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/259/1
--
To view, visit https://gerrit.libreoffice.org/259
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4f8630f7a83134d6eb7992f4a61b5d3faf7e138
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com

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

Re: New way to modify nested uno structs in LibreOffice BASIC

2012-07-05 Thread Markus Mohrhard 
Hey,


 On Wed, 2012-07-04 at 20:23 +0100, Noel Power wrote:

 before this change the following macro snippet would not work.

 It would be -wonderful- to start some basic / UNO unit tests right
 here

 I already signalled my intention in the previous mail

 [*] have to admit I only tested one level of indirection. I didn't find a
 suitable structure that contains a structure that contains a structure to
 test, if you know of one off hand let me know Also I have yet to write some
 unit tests for this ( but will do )


 - are there really no unit tests for (what should be) something
 eminently unit-test-able ? or am I looking in the wrong place :-)

 I did some work on allowing some deeper unit tests ( compile/runtime level )
 to be written,
 http://opengrok.libreoffice.org/xref/core/basic/qa/cppunit/test_append.cxx.
 I'll split some of the reuslable stuff into a common header for the test I
 will write for this one. Also August did another for testing some scanner
 related functionality
 http://opengrok.libreoffice.org/xref/core/basic/qa/cppunit/test_scanner.cxx.


We also have the higher level tests in sc and sw which can execute
basic macros but I'm not sure how helpful it is. IMHO as long as we
can test the same with smaller tests we should do it.

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

[Libreoffice-commits] .: basic/Module_basic.mk basic/qa

2012-07-05 Thread Noel Power 
 basic/Module_basic.mk   |1 
 basic/qa/cppunit/basictest.hxx  |   51 +++
 basic/qa/cppunit/test_append.cxx|   70 ++--
 basic/qa/cppunit/test_nested_struct.cxx |   63 
 4 files changed, 139 insertions(+), 46 deletions(-)

New commits:
commit cac7e7cdc203a93954a32e477cfdc3f9b83a242b
Author: Noel Power noel.po...@novell.com
Date:   Thu Jul 5 13:54:17 2012 +0100

split out some common basic test stuff, add intial nested struct test

Change-Id: I8da6b3166e40e92c31ee001ce19938f286e057b9

diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index fe430ff..b837973 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_targets,basic,\
 $(eval $(call gb_Module_add_check_targets,basic,\
  CppunitTest_basic_scanner \
  CppunitTest_basic_enable \
+ CppunitTest_basic_nested_struct \
 ))
 
 endif
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
new file mode 100644
index 000..79a3fe3
--- /dev/null
+++ b/basic/qa/cppunit/basictest.hxx
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright 2012 LibreOffice contributors.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#ifndef _BASICTEST_HXX
+#define _BASICTEST_HXX
+
+#include sal/types.h
+#include cppunit/TestFixture.h
+#include cppunit/extensions/HelperMacros.h
+#include cppunit/plugin/TestPlugIn.h
+#include test/bootstrapfixture.hxx
+#include basic/sbstar.hxx
+#include basic/basrdll.hxx
+
+class BasicTestBase : public test::BootstrapFixture
+{
+private:
+bool mbError;
+public:
+BasicTestBase() : mbError(false) {};
+
+
+DECL_LINK( BasicErrorHdl, StarBASIC * );
+bool HasError() { return mbError; }
+void ResetError()
+{
+StarBASIC::SetGlobalErrorHdl( Link() );
+mbError = false;
+}
+BasicDLL basicDLL()
+{
+static BasicDLL maDll; // we need a dll instance for resouce manager 
etc.
+return maDll;
+}
+};
+
+IMPL_LINK( BasicTestBase, BasicErrorHdl, StarBASIC *, /*pBasic*/)
+{
+fprintf(stderr,Got error: \n\t%s!!!\n, rtl::OUStringToOString( 
StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
+mbError = true;
+return 0;
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx
index f7b7275..3993598 100644
--- a/basic/qa/cppunit/test_append.cxx
+++ b/basic/qa/cppunit/test_append.cxx
@@ -6,30 +6,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-
-#include sal/types.h
-#include cppunit/TestAssert.h
-#include cppunit/TestFixture.h
-#include cppunit/extensions/HelperMacros.h
-#include cppunit/plugin/TestPlugIn.h
-
-#include test/bootstrapfixture.hxx
-
+#include basictest.hxx
 #include osl/file.hxx
 #include osl/process.h
 
-#include basic/sbstar.hxx
 #include basic/sbmod.hxx
 #include basic/sbmeth.hxx
-#include basic/basrdll.hxx
 namespace
 {
-class EnableTest : public test::BootstrapFixture
+class EnableTest : public BasicTestBase
 {
-private:
-bool mbError;
 public:
-EnableTest() : mbError(false) {};
+EnableTest() {};
 void testDimEnable();
 void testEnableRuntime();
 // Adds code needed to register the test suite
@@ -41,63 +29,53 @@ namespace
 
 // End of test suite definition
 CPPUNIT_TEST_SUITE_END();
-
-DECL_LINK( BasicErrorHdl, StarBASIC * );
-bool HasError() { return mbError; }
-BasicDLL basicDLL()
-{
-static BasicDLL maDll; // we need a dll instance for resouce 
manager etc.
-return maDll;
-}
 };
 
-IMPL_LINK( EnableTest, BasicErrorHdl, StarBASIC *, /*pBasic*/)
-{
-fprintf(stderr,Got error: \n\t%s!!!\n, rtl::OUStringToOString( 
StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
-mbError = true;
-return 0;
-}
+rtl::OUString sTestEnableRuntime(
+Function Test as Integer\n
+Dim Enable as Integer\n
+Enable = 1\n
+Enable = Enable + 2\n
+Test = Enable\n
+End Function\n
+);
+
+rtl::OUString sTestDimEnable(
+Sub Test\n
+Dim Enable as String\n
+End Sub\n
+);
 
 void EnableTest::testEnableRuntime()
 {
 CPPUNIT_ASSERT_MESSAGE( No resource manager, basicDLL().GetBasResMgr() 
!= NULL );
 StarBASICRef pBasic = new StarBASIC();
+ResetError();
 StarBASIC::SetGlobalErrorHdl( LINK( this, EnableTest, BasicErrorHdl ) );
 
-rtl::OUStringsSource(Function Test as Integer\n);
-sSource += rtl::OUString(Dim Enable as

[Libreoffice-commits] .: sw/inc sw/source

2012-07-05 Thread Bjoern Michaelsen 
 sw/inc/shellres.hxx |4 
 sw/source/core/bastyp/SwSmartTagMgr.cxx |5 
 sw/source/core/bastyp/bparr.cxx |5 
 sw/source/core/bastyp/breakit.cxx   |   10 -
 sw/source/core/bastyp/calc.cxx  |   45 
 sw/source/core/bastyp/checkit.cxx   |4 
 sw/source/core/bastyp/index.cxx |4 
 sw/source/core/bastyp/init.cxx  |  175 +++-
 sw/source/core/bastyp/swcache.cxx   |2 
 sw/source/core/bastyp/swrect.cxx|6 -
 sw/source/core/bastyp/swregion.cxx  |2 
 sw/source/core/bastyp/swtypes.cxx   |   35 +++---
 sw/source/core/bastyp/tabcol.cxx|2 
 13 files changed, 150 insertions(+), 149 deletions(-)

New commits:
commit 4a9c5b336a95fd10261e8e24b22137eec2257a3f
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Mon Jul 2 02:23:04 2012 +0200

sorted all include statements alphabetically in sw/source/core/bastyp/

* fixing the missing include statements in shellres.hxx (bjoern-michaelsen)

Change-Id: I976586b346facf38905391bd336b7f08b218f4a4

diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 688fe08..654a541 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -28,9 +28,11 @@
 #ifndef _SHELLRES_HXX
 #define _SHELLRES_HXX
 
+#include svl/svstdarr.hxx
+#include swdllapi.h
 #include tools/string.hxx
+#include tools/rc.hxx
 #include vcl/bitmap.hxx
-#include svl/svstdarr.hxx
 
 struct SW_DLLPUBLIC ShellResource : public Resource
 {
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx 
b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index 389deac..b2caf30 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -28,11 +28,10 @@
 
 #include SwSmartTagMgr.hxx
 
+#include docsh.hxx
 #include osl/mutex.hxx
-#include vcl/svapp.hxx
 #include swmodule.hxx
-
-#include docsh.hxx
+#include vcl/svapp.hxx
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 015a0d7..72d066e 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -26,10 +26,11 @@
  *
  /
 
-#include string.h
-#include limits.h
 #include bparr.hxx
 
+#include limits.h
+#include string.h
+
 /** Resize block management by this constant.
 As a result there are approx. 20 * MAXENTRY == 2 entries available */
 const sal_uInt16 nBlockGrowSize = 20;
diff --git a/sw/source/core/bastyp/breakit.cxx 
b/sw/source/core/bastyp/breakit.cxx
index 1e4d398..805b342 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -27,15 +27,15 @@
  /
 
 #include breakit.hxx
-#include unicode/uchar.h
-#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include swtypes.hxx
+
 #include com/sun/star/i18n/ScriptType.hpp
 #include com/sun/star/i18n/CharacterIteratorMode.hpp
-#include unotools/localedatawrapper.hxx
-
+#include com/sun/star/lang/XMultiServiceFactory.hpp
 #include editeng/unolingu.hxx
 #include editeng/scripttypeitem.hxx
-#include swtypes.hxx
+#include unicode/uchar.h
+#include unotools/localedatawrapper.hxx
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index a4676ec..47a6f78 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -26,38 +26,39 @@
  *
  /
 
-#include cctype
 #if defined(MACOSX)
 #include stdlib.h
 #endif
-#include cstdlib
-#include climits
+
+#include calc.hxx
+#include cctype
 #include cfloat
-#include hintids.hxx
-#include osl/diagnose.hxx
-#include rtl/math.hxx
-#include editeng/langitem.hxx
-#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include climits
 #include comphelper/processfactory.hxx
 #include comphelper/string.hxx
-#include unotools/localedatawrapper.hxx
-#include unotools/charclass.hxx
-#include editeng/unolingu.hxx
-#include editeng/scripttypeitem.hxx
-#include unotools/useroptions.hxx
-#include svl/zforlist.hxx
-#include swmodule.hxx
-#include doc.hxx
-#include viewsh.hxx
-#include docstat.hxx
-#include calc.hxx
-#include shellres.hxx
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include cstdlib
 #include dbfld.hxx
-#include expfld.hxx
-#include usrfld.hxx
 #include dbmgr.hxx
 #include docfld.hxx
+#include docstat.hxx
+#include doc.hxx
+#include editeng/langitem.hxx
+#include editeng/scripttypeitem.hxx
+#include editeng/unolingu.hxx
+#include expfld.hxx
+#include hintids.hxx
+#include osl/diagnose.hxx
+#include rtl/math.hxx
+#include shellres.hxx
+#include svl/zforlist.hxx
+#include swmodule.hxx
 #include swtypes.hxx
+#include unotools/charclass.hxx
+#include unotools/localedatawrapper.hxx
+#include unotools/useroptions.hxx
+#include

[michael.me...@suse.com: LibreOffice ESC call, Thur Jul 5th - 14:00UTC]

2012-07-05 Thread Bjoern Michaelsen 
Hi Norbert,

- Forwarded message from Michael Meeks michael.me...@suse.com -

+ notify all committers when we have a nice simple, minimal
  statement of what is required for gerrit written (Bjoern)
- End forwarded message -

IIRC you had a way to get all 'our' freedesktop accounts so that we can
recheckeveryone moved over?

Best,

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

[Libreoffice-commits] .: basic/CppunitTest_basic_nested_struct.mk basic/qa

2012-07-05 Thread Noel Power 
 basic/CppunitTest_basic_nested_struct.mk |   49 +++
 basic/qa/cppunit/test_nested_struct.cxx  |   38 
 2 files changed, 87 insertions(+)

New commits:
commit 8e9e166d35191eaacfe2001fa0d50fb8c29394f4
Author: Noel Power noel.po...@novell.com
Date:   Thu Jul 5 15:02:06 2012 +0100

fix missing makefile, also add a further test to test_nested_struct.cxx

Change-Id: I7da88595fd3024f72b260267e34200375358e401

diff --git a/basic/CppunitTest_basic_nested_struct.mk 
b/basic/CppunitTest_basic_nested_struct.mk
new file mode 100644
index 000..904e666
--- /dev/null
+++ b/basic/CppunitTest_basic_nested_struct.mk
@@ -0,0 +1,49 @@
+$(eval $(call gb_CppunitTest_CppunitTest,basic_nested_struct))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,basic_nested_struct, \
+basic/qa/cppunit/test_nested_struct \
+))
+
+# add a list of all needed libraries here
+$(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+salhelper \
+sb \
+sot \
+svl \
+svt \
+tl \
+utl \
+vcl \
+xcr \
+test \
+$(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
+   oleaut32 \
+))
+endif
+
+$(eval $(call gb_CppunitTest_set_include,basic_nested_struct,\
+-I$(SRCDIR)/basic/source/inc \
+-I$(SRCDIR)/basic/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,basic_nested_struct,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,basic_nested_struct))
+
+$(eval $(call gb_CppunitTest_use_components,basic_nested_struct,\
+configmgr/source/configmgr \
+ucb/source/core/ucb1 \
+))
+$(eval $(call gb_CppunitTest_use_configuration,basic_nested_struct))
diff --git a/basic/qa/cppunit/test_nested_struct.cxx 
b/basic/qa/cppunit/test_nested_struct.cxx
index f0684bf..defcaf1 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -19,16 +19,20 @@ namespace
 public:
 Nested_Struct() {};
 void testAssign1();
+void testOldAssign();
 // Adds code needed to register the test suite
 CPPUNIT_TEST_SUITE(Nested_Struct);
 
 // Declares the method as a test to call
 CPPUNIT_TEST(testAssign1);
+CPPUNIT_TEST(testOldAssign);
 
 // End of test suite definition
 CPPUNIT_TEST_SUITE_END();
 };
 
+// tests the new behaviour, we should be able to
+// directly modify the value of the nested 'HorizontalLine' struct
 rtl::OUString sTestSource1(
 Function simpleNestStructAccess() as Integer\n
 Dim b0 as new \com.sun.star.table.TableBorder\\n
@@ -37,6 +41,22 @@ rtl::OUString sTestSource1(
 End Function\n
 );
 
+// tests the old behaviour, we should still be able
+// to use the old workaround of
+// a) creating a new instance BorderLine,
+// b) cloning the new instance with the value of b0.HorizontalLine
+// c) modifying the new instance
+// d) setting b0.HorizontalLine with the value of the new instance
+rtl::OUString sTestSource2(
+Function simpleRegressionTestOld()\n
+Dim b0 as new \com.sun.star.table.TableBorder\, l as new 
\com.sun.star.table.BorderLine\\n
+l = b0.HorizontalLine\n
+l.OuterLineWidth = 9\n
+b0.HorizontalLine = l\n
+simpleRegressionTestOld = b0.HorizontalLine.OuterLineWidth\n
+End Function\n
+);
+
 void Nested_Struct::testAssign1()
 {
 CPPUNIT_ASSERT_MESSAGE( No resource manager, basicDLL().GetBasResMgr() 
!= NULL );
@@ -55,6 +75,24 @@ void Nested_Struct::testAssign1()
 CPPUNIT_ASSERT(pNew-GetInteger() == 9 );
 }
 
+void Nested_Struct::testOldAssign()
+{
+CPPUNIT_ASSERT_MESSAGE( No resource manager, basicDLL().GetBasResMgr() 
!= NULL );
+StarBASICRef pBasic = new StarBASIC();
+ResetError();
+StarBASIC::SetGlobalErrorHdl( LINK( this, Nested_Struct, BasicErrorHdl ) );
+
+SbModule* pMod = pBasic-MakeModule( rtl::OUString( TestModule ), 
sTestSource2 );
+pMod-Compile();
+CPPUNIT_ASSERT_MESSAGE(testOldAssign fails with compile 
error,!HasError() );
+SbMethod* pMeth = static_castSbMethod*(pMod-Find( 
rtl::OUString(simpleRegressionTestOld),  SbxCLASS_METHOD ));
+CPPUNIT_ASSERT_MESSAGE(testOldAssign no method found, pMeth );
+SbxVariableRef refTemp = pMeth;
+// forces a broadcast
+SbxVariableRef pNew = new  SbxMethod( *((SbxMethod*)pMeth));
+CPPUNIT_ASSERT(pNew-GetInteger() == 9 );
+}
+
   // Put the test suite in the registry
   CPPUNIT_TEST_SUITE_REGISTRATION(Nested_Struct);
 } // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Change in core[master]: sorted all include statements alphabetically in sw/source/co...

2012-07-05 Thread Gerrit 
From Björn Michaelsen bjoern.michael...@canonical.com:

Björn Michaelsen has posted comments on this change.

Change subject: sorted all include statements alphabetically in 
sw/source/core/bastyp/
..


Patch Set 1:

added the missing include, verified build, pushed to master with that.

--
To view, visit https://gerrit.libreoffice.org/255
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I976586b346facf38905391bd336b7f08b218f4a4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer ruderphil...@gmail.com
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Philipp Riemer ruderphil...@gmail.com

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

Change in core[master]: Replaced deprecated tools/String with OUString in ScMatrix

2012-07-05 Thread Gerrit 
From Eike Rathke er...@redhat.com:

Eike Rathke has posted comments on this change.

Change subject: Replaced deprecated tools/String with OUString in ScMatrix
..


Patch Set 2: Verified; Looks good to me, approved

Nice one :-)  Thanks for the patch!

--
To view, visit https://gerrit.libreoffice.org/242
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If431e5ef8b5c97384a1bb1c7fa36c6894ece8343
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Sören Möller soerenmoeller2...@gmail.com

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

Change in core[master]: Replaced deprecated tools/String with OUString in ScAddInCol

2012-07-05 Thread Gerrit 
From Eike Rathke er...@redhat.com:

Eike Rathke has posted comments on this change.

Change subject: Replaced deprecated tools/String with OUString in ScAddInCol
..


Patch Set 1: I would prefer that you didn't submit this

(15 inline comments)

Please do the changes lined out, thanks.
Sorry for nitpicking ;-)


File sc/source/core/tool/addincol.cxx
Line 462: aFuncName += ::rtl::OUString( pFuncNameArray[nFuncPos] );
Just a hint: these operator+= lines create temporary OUString instances 
(actually two per statement in this case) de/allocating memory that could be 
avoided by using an OUStringBuffer of a sufficient initial size (i.e. length of 
aServiceName plus '.' plus length of pFuncNameArray[nFuncPos]) and use 
OUStringBuffer::append() to concatenate and a final 
OUStringBuffer::makeStringAndClear() call to create the OUString. However, I 
think it doesn't matter that much here, just to make you aware of how that 
could be done.

Line 643: xub_StrLen nPos = aFullName.lastIndexOf( (sal_Unicode) '.' );
The xub_StrLen (defined to sal_uInt16) is wrong now, OUString positions such as 
returned by lastIndexOf() are sal_Int32 instead.

Line 644: if ( nPos != STRING_NOTFOUND  nPos  0 )
So that means to also change comparisons with STRING_NOTFOUND (which is defined 
to 0x), lastIndexOf() returns -1 if not found, so the condition here can be 
simplified to

if (nPos  0)

Line 934: aLocalU = 
rtl::OUString(###);
This should not need another temporary OUString anymore (not related to your 
changes, proper operator=() have been implemented meanwhile) and instead simply 
be
 aLocalU = ###;

Line 946: aDescU = 
rtl::OUString(###);
Same here,
 aDescU = ###;

Line 948: ::rtl::OUString aDescription 
= ::rtl::OUString( aDescU );
This can simply be
 ::rtl::OUString aDescription( aDescU );

Line 971: aArgName = 
rtl::OUString(###);
aArgName = ###;

Line 981: aArgName = 
rtl::OUString(###);
aArgName = ###;

Line 990: 
aDesc.aDescription = ::rtl::OUString( aArgDesc );
Temporary conversion ctors are unnecessary here now, so
 aDesc.aName = aArgName;
 aDesc.aDescription = aArgDesc;

Line 1165: aDesc.aName = 
aDesc.aDescription = ::rtl::OUString::createFromAscii( ### );
aDesc.aName = aDesc.aDescription = ###;

Line 1319: if (!aDesc.getLength())
For this !...getLength() we now have isEmpty(), so
 if (aDesc.isEmpty())

Line 1609: aString = ::rtl::OUString( aUStr );
As the aString member variable now is of type OUString the temporary isn't 
needed anymore, so this

 rtl::OUString aUStr;
 rNewRes = aUStr;
 aString = ::rtl::OUString( aUStr );

instead can simply be

 rNewRes = aString;


File sc/source/core/tool/compiler.cxx
Line 5199: rName = String(prName);
In our convention a leading small p indicates a pointer, this should be aName 
instead of prName. There's also a converting String::operator=(const OUString) 
so this temporary String can be simplified to

 ::rtl::OUString aName(rName);
 ScGlobal::GetAddInCollection()-LocalizeString( aName );
 rName = aName;

Line 5245: aEntry.Name = String(aName);
Same here,

 aEntry.Name = aName;

is sufficient, with the additional benefit that once we also converted 
aEntry.Name to OUString there wouldn't be a superfluous automatic back and 
forth conversion.


File sc/source/filter/excel/xiroot.cxx
Line 282: return String(aScName);
Using the automatic conversion should work here

 return aScName;

--
To view, visit https://gerrit.libreoffice.org/258
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7059f10617b9a33ba63690c980b96d95d9023c55
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com

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

Change in core[master]: Replaced deprecated tools/String with OUString in ScMatrix

2012-07-05 Thread Gerrit 
From Eike Rathke er...@redhat.com:

Eike Rathke has posted comments on this change.

Change subject: Replaced deprecated tools/String with OUString in ScMatrix
..


Patch Set 3:

Note that an additional change was needed to actually make things compile:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3bdaf6168dc304b5a01bf196f3c695540a72537b

--
To view, visit https://gerrit.libreoffice.org/242
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If431e5ef8b5c97384a1bb1c7fa36c6894ece8343
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Sören Möller soerenmoeller2...@gmail.com

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

[Libreoffice-commits] .: sw/source

2012-07-05 Thread Miklos Vajna 
 sw/source/core/layout/laycache.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 40faf88cf0bef76e653e7e9dab707b4c936e7a3e
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 5 17:04:08 2012 +0200

SwLayHelper: when the page style name changes, we have a first page

Previously we only considered the first page of the whole document as
first page, which was incorrect.

Change-Id: I2e37fe504a5baee986d63d0cdef166f836877174

diff --git a/sw/source/core/layout/laycache.cxx 
b/sw/source/core/layout/laycache.cxx
index 8416c89..06cde2f 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -651,8 +651,9 @@ sal_Bool SwLayHelper::CheckInsertPage()
 bNextPageOdd = !bNextPageOdd;
 bInsertEmpty = sal_True;
 }
+bool bNextPageFirst = pDesc != rpPage-GetPageDesc();
 ::InsertNewPage( (SwPageDesc)*pDesc, rpPage-GetUpper(),
- bNextPageOdd, nPgNum == 1, bInsertEmpty, sal_False, 
rpPage-GetNext() );
+ bNextPageOdd, bNextPageFirst, bInsertEmpty, 
sal_False, rpPage-GetNext() );
 if ( bEnd )
 {
 OSL_ENSURE( rpPage-GetNext(), No new page? );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New way to modify nested uno structs in LibreOffice BASIC

2012-07-05 Thread Andrew Douglas Pitonyak 


On 07/05/2012 04:22 AM, Noel Power wrote:

On 05/07/12 02:47, Andrew Douglas Pitonyak wrote:

On 07/04/2012 03:23 PM, Noel Power wrote:
with 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=1720641bf36306fc296635925e571556ced8a302 
a long standing wrinkle with modifying nested structs in basic 
should be eliminated



[ blah blah blah ]
The behavior change scares me a bit. I seem to remember some time 
back that there was a reason for this behavior, but I was given that 
information many years back. I discussed it in Berlin

I'd be interested if you can recall
Do you intend to change UNO so that structures return as a reference 
(very dangerous, don't do it), or only when used in basic as 
object.structure.property? This may be workable / safe, but may break 
some existing code (although I can't think of any code that it would 
break).
there is no change to uno only how basic handles an already acquired 
uno structure ( either one defined locally or fetched from some other 
uno operation )


I feel silly asking this, since if you know how to change the 
behavior, then you likely know more about this than I (I don't know 
how to change the behavior).


being bitten ( often ) by changing basic I understand the fear :-) 
But, I can't see that this change would be 'dangerous' it surely is 
the correct and desired behaviour ( but maybe indeed I am missing 
something and perhaps influenced by a long irritation with the way it 
worked before ). Of course the caveat is there is always a risk of 
some unexpected side-effect with any change ( especially true in basic )


Noel


The best that I can remember is that it is common to do things such as 
initialize one structure from another. For example, set the value of the 
top border to the value of the bottom border and then make some changes. 
What if structures now copy by reference Consider this code:


Case 0:
tempBorder = table.topBorder
tempBorder.someValue = something
table.bottomBorder = tempBorder

At this point, the top and bottom border will be the same because they 
reference the same object.


This is why I asked if the intention is to change the copy semantics, or 
to simply change it so that in basic when you use


Case 1:
table.topBorder.someValue = something

THe example immediately above, is not likely to cause a problem, in 
fact, it will probably eliminate bugs.


I expect that as long as copy by value semantics is retained apart from 
use in a dot notation in basic, then something like this will still 
work without introducing bugs


Case 2:
tempBorder = table.topBorder

If the code above causes tempBorder to reference the topBorder object in 
the table, then there will likely be numerous bugs.


So, with your changes, how will it affect Case 0, Case 1, and Case 2?

I consider Case 0 and Case 2 the same. I believe that you are saying 
that your change only affects Case 1, which will then work as expected 
without changing case 0 / case 2.


I was probably exchanging email with Mathias Bauer, but was unable to 
find the exchange. I did spend time looking for it.





--
Andrew Pitonyak
My Macro Document: http://www.pitonyak.org/AndrewMacro.odt
Info:  http://www.pitonyak.org/oo.php



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

minutes of ESC call ...

2012-07-05 Thread Michael Meeks 
* Present
+ Rainer, Markus, Mirek, Mitch, Michael, Michael S, Eike,
  Ellie, Thorsten, Bjoern, Kohei, Cedric

* Completed action items
+ file GSoC / mentor session for Berlin (Cedric)
+ look into cppunit related build issues on Win32 / master (Michael)
+ poke SPI wrt. sysadmin contract (Michael)
+ mail the winning / new splash images to Thorsten (Astron)
+ new master builds for Windows (Fridrich)
+ the Bytemark builds should produce a test-able build
+ work on unifying spaetz + David's gerrit related tools (Bjoern)
+ stick with horror shell / logerrit for now in master
+ moving to 'git review' from openstack in future (David)
  http://wiki.documentfoundation.org/Development/GitReview
+ disable cxx0x options in our builds by default (Bjoern)
+ obsolete - gcc maintainers got it together
+ [pending] merge the new pretty templates in place of the old ugly 
ones (Astron)
+ new problems shown up with this -
+ Caolan has tool for templates to strip lang tags so it works
+ try template lang tag stripping tool
+ need to fix  merge for Beta3

* Pending Action Items
+ check new templates are using auto-fitting functionality (Thorsten)
+ notify all committers when we have a nice simple, minimal
  statement of what is required for gerrit written (Bjoern)
+ adapt  bring closer the 3.5.6 schedule (Petr)

* UI / design update (Astron)
+ templates
+ have merged much nicer templates (Astron)
+ slightly different set to those previewed, but good
+ crediting: get --author right when pushing git commits
AI: + crediting: can we separate tempates in the credits page 
(Spaetz?)
+ pretty new splash-screen and shell artwork committed to master
+ can we detect if there is no need for a splash
+ lots of thinking going on about improving the options dialog
+ take Mango icon update under CC-By-SA (for now)
+ push what we want for now
+ add credits to the license file.

* GSOC update (Cedric)
+ next week - mid-term evaluations for both students  mentors
+ every student must file their evaluation
+ every mentor -must- file their evaluations to pass/fail etc.
  not filing is a 'no' and bad-karma for the project.
+ features need merging into master.
+ ideally the 2nd half of the work should
  be done directly in master.

* Release Engineering update (Thorsten)
+ 3.5.5 status
+ RC3 is announced  live, including a few new fixes
= final absent drastic new showstoppers
+ 3.6.0 Beta 3
+ being sent to the mirrors, announce tonight/saturday
+ new artwork will be delayed until RC1.
+ RC1 tagging ~mid next week.
+ final release at end of month

* re-basing update (Michael)
+ ~68/~70 modules complete.
+ will incorporate migrate of idlc - uccp
+ discuss other migrations as/when/next

* gerrit update (Bjoern)
+ lots of fixes / reports from Miklos - thanks
+ firehose gerrit updates to the mailing list
  until complaints.
+ quite a number blocked by moderation
AI: + look at gerrit moderation issues / regex's (Thorsten)

* un-merged patches in bugzilla (Michael S / Caolan)
+ several committed, patch flags removed for patches
  not intended to be integrated (debug, sample), or patches
  integrated but not completely fixing the bug
+ ongoing work to clean up.

* MSI cross-compilation (Eilidh)
+ feature/crossmsi branch created
+ an msidb subset using Wine created
+ links to LGPL wine libraries
+ blog post to follow

* QA update (Rainer)
+ contracting bugzilla improvements (blocking on SPI)
+ funding approved
+ openhatch - do we have feedback ?
+ not much coming as of now
+ interest in attracting low-frequency code contributors to QA

* Mac installer icon theme (Mirek)
AA: + help Mirek updating artwork for that (Thorsten)

* new masterpages (Bjoern)
+ crash when opening vector-art templates fixed.
AA: + be nice if design team blog about new templates - mention B3 (Mirek)

* ohloh non-updating (Eike)
+ they have been poked about it  are working on it.

* 4.0 - when is it ? (Kendy)
+ punted until Kendy  SBerg are back from vacation ...
+ Berlin conference is a bit late for this ...

* 3.5 most annoying bugs ...
+ 70 open (of 243) older 73/241 72/238 68/231 67/229 67/226 62/219

[Libreoffice-commits] .: sc/inc sc/source

2012-07-05 Thread Kohei Yoshida 
 sc/inc/dpcachetable.hxx|6 +++
 sc/inc/dpgroup.hxx |1 
 sc/inc/dpobject.hxx|6 +++
 sc/inc/dpsave.hxx  |5 ++
 sc/inc/dpsdbtab.hxx|1 
 sc/inc/dpshttab.hxx|1 
 sc/inc/dptabdat.hxx|1 
 sc/source/core/data/dpgroup.cxx|5 ++
 sc/source/core/data/dpobject.cxx   |   17 +
 sc/source/core/data/dpsave.cxx |   65 +
 sc/source/core/data/dpsdbtab.cxx   |5 ++
 sc/source/core/data/dpshttab.cxx   |5 ++
 sc/source/ui/docshell/dbdocfun.cxx |1 
 13 files changed, 119 insertions(+)

New commits:
commit fa2b7eff2d40b6455970b521306c5961e4e3cec4
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 5 11:17:19 2012 -0400

fdo#51266: Sync dimension members in several places upon refresh.

Or else the pivot table would generate erroneous results or crash
after refresh.

Change-Id: Ia14a6e3d25112e6ecd62d21928639f75e6a8ba7c

diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index f104d3b..d834910 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -56,6 +56,12 @@ class ScRange;
 struct ScDPValueData;
 struct ScQueryParam;
 
+/**
+ * Despite the name, this class is only a wrapper to the actual cache, to
+ * provide filtering on the raw data based on the query filter and/or page
+ * field filters. I will rename this class to a more appropriate name in the
+ * future.
+ */
 class SC_DLLPUBLIC ScDPCacheTable
 {
 struct RowFlag
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 4bf9972..5d48af0 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -182,6 +182,7 @@ public:
  
::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Any   rData);
 virtual voidCalcResults(CalcInfo rInfo, bool 
bAutoShow);
 virtual const ScDPCacheTable   GetCacheTable() const;
+virtual void ClearCacheTable();
 
 virtual sal_BoolIsBaseForGroup(long nDim) const;
 virtual longGetGroupBase(long nGroupDim) const;
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index da0fc09..e163ef1 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -239,6 +239,12 @@ public:
 
 voidBuildAllDimensionMembers();
 
+/**
+ * Remove in the save data entries for members that don't exist anymore.
+ * This is called during pivot table refresh.
+ */
+void SyncAllDimensionMembers();
+
 static bool HasRegisteredSources();
 static com::sun::star::uno::Sequencertl::OUString GetRegisteredSources();
 static 
com::sun::star::uno::Referencecom::sun::star::sheet::XDimensionsSupplier
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index c4df4ed..28bfafd 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -33,6 +33,7 @@
 
 #include boost/ptr_container/ptr_vector.hpp
 #include boost/unordered_map.hpp
+#include boost/unordered_set.hpp
 #include boost/scoped_ptr.hpp
 
 #include com/sun/star/sheet/XDimensionsSupplier.hpp
@@ -122,6 +123,7 @@ private:
 ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level)
 
 public:
+typedef boost::unordered_setrtl::OUString, rtl::OUStringHash 
MemberSetType;
 typedef boost::unordered_map rtl::OUString, ScDPSaveMember*, 
rtl::OUStringHash MemberHash;
 typedef std::list ScDPSaveMember* MemberList;
 
@@ -230,6 +232,8 @@ public:
 void UpdateMemberVisibility(const ::boost::unordered_map ::rtl::OUString, 
bool, ::rtl::OUStringHash rData);
 
 bool HasInvisibleMember() const;
+
+void RemoveObsoleteMembers(const MemberSetType rMembers);
 };
 
 
@@ -344,6 +348,7 @@ public:
 SC_DLLPUBLIC ScDPDimensionSaveData* GetDimensionData(); // create if not 
there
 void SetDimensionData( const ScDPDimensionSaveData* pNew ); // copied
 void BuildAllDimensionMembers(ScDPTableData* pData);
+void SyncAllDimensionMembers(ScDPTableData* pData);
 
 /**
  * Check whether a dimension has one or more invisible members.
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index eba6da2..a96b011 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -88,6 +88,7 @@ public:
  
::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Any   rData);
 virtual voidCalcResults(CalcInfo rInfo, bool 
bAutoShow);
 virtual const ScDPCacheTable   GetCacheTable() const;
+virtual void ClearCacheTable();
 };
 
 
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 3a0fcb3..510105d 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -128,6 +128,7 @@ public:
  
::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/inc sc/source

2012-07-05 Thread Kohei Yoshida 
 sc/inc/dpcachetable.hxx|6 +++
 sc/inc/dpgroup.hxx |1 
 sc/inc/dpobject.hxx|6 +++
 sc/inc/dpsave.hxx  |5 ++
 sc/inc/dpsdbtab.hxx|1 
 sc/inc/dpshttab.hxx|1 
 sc/inc/dptabdat.hxx|1 
 sc/source/core/data/dpgroup.cxx|5 ++
 sc/source/core/data/dpobject.cxx   |   17 +
 sc/source/core/data/dpsave.cxx |   65 +
 sc/source/core/data/dpsdbtab.cxx   |5 ++
 sc/source/core/data/dpshttab.cxx   |5 ++
 sc/source/ui/docshell/dbdocfun.cxx |1 
 13 files changed, 119 insertions(+)

New commits:
commit fcc90b132168405e5a862fa4db8cfdcdcf632f65
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 5 11:17:19 2012 -0400

fdo#51266: Sync dimension members in several places upon refresh.

Or else the pivot table would generate erroneous results or crash
after refresh.

Change-Id: Ia14a6e3d25112e6ecd62d21928639f75e6a8ba7c

diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index f104d3b..d834910 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -56,6 +56,12 @@ class ScRange;
 struct ScDPValueData;
 struct ScQueryParam;
 
+/**
+ * Despite the name, this class is only a wrapper to the actual cache, to
+ * provide filtering on the raw data based on the query filter and/or page
+ * field filters. I will rename this class to a more appropriate name in the
+ * future.
+ */
 class SC_DLLPUBLIC ScDPCacheTable
 {
 struct RowFlag
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index fe5fd62..219e2e3 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -183,6 +183,7 @@ public:
  
::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Any   rData);
 virtual voidCalcResults(CalcInfo rInfo, bool 
bAutoShow);
 virtual const ScDPCacheTable   GetCacheTable() const;
+virtual void ClearCacheTable();
 
 virtual sal_BoolIsBaseForGroup(long nDim) const;
 virtual longGetGroupBase(long nGroupDim) const;
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 64525fd..86aa8aa 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -241,6 +241,12 @@ public:
 
 voidBuildAllDimensionMembers();
 
+/**
+ * Remove in the save data entries for members that don't exist anymore.
+ * This is called during pivot table refresh.
+ */
+void SyncAllDimensionMembers();
+
 static bool HasRegisteredSources();
 static com::sun::star::uno::Sequencertl::OUString GetRegisteredSources();
 static 
com::sun::star::uno::Referencecom::sun::star::sheet::XDimensionsSupplier
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index c4df4ed..28bfafd 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -33,6 +33,7 @@
 
 #include boost/ptr_container/ptr_vector.hpp
 #include boost/unordered_map.hpp
+#include boost/unordered_set.hpp
 #include boost/scoped_ptr.hpp
 
 #include com/sun/star/sheet/XDimensionsSupplier.hpp
@@ -122,6 +123,7 @@ private:
 ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level)
 
 public:
+typedef boost::unordered_setrtl::OUString, rtl::OUStringHash 
MemberSetType;
 typedef boost::unordered_map rtl::OUString, ScDPSaveMember*, 
rtl::OUStringHash MemberHash;
 typedef std::list ScDPSaveMember* MemberList;
 
@@ -230,6 +232,8 @@ public:
 void UpdateMemberVisibility(const ::boost::unordered_map ::rtl::OUString, 
bool, ::rtl::OUStringHash rData);
 
 bool HasInvisibleMember() const;
+
+void RemoveObsoleteMembers(const MemberSetType rMembers);
 };
 
 
@@ -344,6 +348,7 @@ public:
 SC_DLLPUBLIC ScDPDimensionSaveData* GetDimensionData(); // create if not 
there
 void SetDimensionData( const ScDPDimensionSaveData* pNew ); // copied
 void BuildAllDimensionMembers(ScDPTableData* pData);
+void SyncAllDimensionMembers(ScDPTableData* pData);
 
 /**
  * Check whether a dimension has one or more invisible members.
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index eba6da2..a96b011 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -88,6 +88,7 @@ public:
  
::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Any   rData);
 virtual voidCalcResults(CalcInfo rInfo, bool 
bAutoShow);
 virtual const ScDPCacheTable   GetCacheTable() const;
+virtual void ClearCacheTable();
 };
 
 
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 38a0d58..f3cf2fd 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -130,6 +130,7 @@ public:
  
::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence

Re: minutes of ESC call ...

2012-07-05 Thread Bjoern Michaelsen 
On Thu, Jul 05, 2012 at 04:13:32PM +0100, Michael Meeks wrote:
 * gerrit update (Bjoern)
   + lots of fixes / reports from Miklos - thanks
   + firehose gerrit updates to the mailing list
 until complaints.
   + quite a number blocked by moderation
 AI:   + look at gerrit moderation issues / regex's (Thorsten)

https://gerrit.libreoffice.org/#/q/status:merged+project:core,n,z
shows 45 patches already merged via gerrit and 3-4 per day on average right
now, which is encouraging. Hopefully this will get more still in a healthy and
steady growth, so that once we switch over to gerrit completely this is not
disruptive.

Best,

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

Re: New way to modify nested uno structs in LibreOffice BASIC

2012-07-05 Thread Noel Power 

On 05/07/12 16:09, Andrew Douglas Pitonyak wrote:


On 07/05/2012 04:22 AM, Noel Power wrote:

On 05/07/12 02:47, Andrew Douglas Pitonyak wrote:
The behavior change scares me a bit. I seem to remember some time 
back that there was a reason for this behavior, but I was given that 
information many years back. I discussed it in Berlin

I'd be interested if you can recall



I consider Case 0 and Case 2 the same. I believe that you are saying 
that your change only affects Case 1, which will then work as expected 
without changing case 0 / case 2.


I was probably exchanging email with Mathias Bauer, but was unable to 
find the exchange. I did spend time looking for it.


interesting examples :-) I am writing some unit tests at the moment so I 
will try to incorporate som elements of the above in them, anyway to 
clarify the situation, copy of structures is by value, this will not and 
should not have changed, what has changed is it is now possible to 
access the elements of a structure by reference ( same as in c/c++ and 
probably any sensible scripting language )
Please check out the latest master and try out the feature, that's the 
idea of this heads-up, you are pretty qualified to give it a good test 
:-) ( you won't surprise or disappoint me if you find a bug :-) )


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

Re: Removal of throbber.src

2012-07-05 Thread Thomas Arnhold 

To be sure I reverted the change.

On Tue, 03 Jul 2012 19:26:35 +0200, Stefan Knorr wrote:

Hello Thomas, Michael,

AFAIK, LibO uses a throbber in its extension manager, e.g. when 
looking

for extension updates. I believe the application update checker also
uses a throbber.
I can't really say if that's the one you are trying to remove (I 
think

there were multiple throbber directories)... but, as Michael says,
images.zip tends to become stale on subsequent builds.

Stefan.


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

[Libreoffice-commits] .: vcl/source

2012-07-05 Thread Thomas Arnhold 
 vcl/source/src/throbber.src |  106 
 1 file changed, 106 insertions(+)

New commits:
commit e1c6c2fb32e59441441843247402ac744683e3d4
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu Jul 5 17:55:55 2012 +0200

Revert Remove unused throbber.src

This reverts commit 0d53a8336bd6b55fb89873ce7e2cd623468f282e.

This file isn't referenced in any other file. For me those icon
files are not in any images*.zip file. But the update extension
seems to use the Throbber class, which refers to this icons.

To be absolutely sure I revert the change. Maybe someone else wants
to have a look at this.

diff --git a/vcl/source/src/throbber.src b/vcl/source/src/throbber.src
new file mode 100644
index 000..b5f6721
--- /dev/null
+++ b/vcl/source/src/throbber.src
@@ -0,0 +1,106 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+// TODO: we need a mechanism to add images to images.zip, *without*
+// referring them in resource files. The below resources are never loaded
+// at runtime, instead, the images in images.zip are accessed via
+// private:graphicrepository/* URLs.
+
+Resource 1000
+{
+Image 1 { ImageBitmap = Bitmap{ file = shared/spinner-16-01.png; }; };
+Image 2 { ImageBitmap = Bitmap{ file = shared/spinner-16-02.png; }; };
+Image 3 { ImageBitmap = Bitmap{ file = shared/spinner-16-03.png; }; };
+Image 4 { ImageBitmap = Bitmap{ file = shared/spinner-16-04.png; }; };
+Image 5 { ImageBitmap = Bitmap{ file = shared/spinner-16-05.png; }; };
+Image 6 { ImageBitmap = Bitmap{ file = shared/spinner-16-06.png; }; };
+};
+
+Resource 1001
+{
+Image 1 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-16-01.png; }; };
+Image 2 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-16-02.png; }; };
+Image 3 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-16-03.png; }; };
+Image 4 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-16-04.png; }; };
+Image 5 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-16-05.png; }; };
+Image 6 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-16-06.png; }; };
+};
+
+Resource 1002
+{
+Image  1 { ImageBitmap = Bitmap{ file = shared/spinner-32-01.png; }; };
+Image  2 { ImageBitmap = Bitmap{ file = shared/spinner-32-02.png; }; };
+Image  3 { ImageBitmap = Bitmap{ file = shared/spinner-32-03.png; }; };
+Image  4 { ImageBitmap = Bitmap{ file = shared/spinner-32-04.png; }; };
+Image  5 { ImageBitmap = Bitmap{ file = shared/spinner-32-05.png; }; };
+Image  6 { ImageBitmap = Bitmap{ file = shared/spinner-32-06.png; }; };
+Image  7 { ImageBitmap = Bitmap{ file = shared/spinner-32-07.png; }; };
+Image  8 { ImageBitmap = Bitmap{ file = shared/spinner-32-08.png; }; };
+Image  9 { ImageBitmap = Bitmap{ file = shared/spinner-32-09.png; }; };
+Image 10 { ImageBitmap = Bitmap{ file = shared/spinner-32-10.png; }; };
+Image 11 { ImageBitmap = Bitmap{ file = shared/spinner-32-11.png; }; };
+Image 12 { ImageBitmap = Bitmap{ file = shared/spinner-32-12.png; }; };
+};
+
+Resource 1003
+{
+Image  1 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-01.png; }; };
+Image  2 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-02.png; }; };
+Image  3 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-03.png; }; };
+Image  4 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-04.png; }; };
+Image  5 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-05.png; }; };
+Image  6 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-06.png; }; };
+Image  7 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-07.png; }; };
+Image  8 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-08.png; }; };
+Image  9 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-09.png; }; };
+Image 10 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-10.png; }; };
+Image 11 { ImageBitmap = Bitmap{ file = 
hicontrast/shared/spinner-32-11.png; }; };
+Image 12 { ImageBitmap = Bitmap{ file =

[Libreoffice-commits] .: sw/source

2012-07-05 Thread Miklos Vajna 
 sw/source/core/layout/laycache.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 3de25305a8a495fb63012d36f86461ce003bb5ef
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 5 18:29:54 2012 +0200

sw: SwLayHelper should not consider the page after first page a first page

Change-Id: Ic82dc11cca65692e221f49d43adb8b72a07aec7d

diff --git a/sw/source/core/layout/laycache.cxx 
b/sw/source/core/layout/laycache.cxx
index 06cde2f..a05572a 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -60,6 +60,7 @@
 //
 #include pam.hxx
 #include docsh.hxx
+#include poolfmt.hxx
 #include com/sun/star/document/XDocumentInfoSupplier.hpp
 #include com/sun/star/beans/XPropertySet.hpp
 
@@ -651,7 +652,11 @@ sal_Bool SwLayHelper::CheckInsertPage()
 bNextPageOdd = !bNextPageOdd;
 bInsertEmpty = sal_True;
 }
+// If the page style is changing, we'll have a first page.
 bool bNextPageFirst = pDesc != rpPage-GetPageDesc();
+// Considering the page after the first page would be confusing.
+if (rpPage-GetPageDesc() == 
pDoc-GetPageDescFromPool(RES_POOLPAGE_FIRST))
+bNextPageFirst = false;
 ::InsertNewPage( (SwPageDesc)*pDesc, rpPage-GetUpper(),
  bNextPageOdd, bNextPageFirst, bInsertEmpty, 
sal_False, rpPage-GetNext() );
 if ( bEnd )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Writing extension with the SDK

2012-07-05 Thread Henri Hebeisen 
Hi all,

I'm a student at Dublin City University and I am working on a project where
I have to write an extension for LibreOffice. I would like to use the Java
API to manipulate data from LibreOffice. Unfortunately, I can't find any
information specific to Libre Office extension : all the online
documentation is for OpenOffice. I have installed SDK and configured all
the paths for Java JDK, gmake... But what to do next ?

I have followed steps in this tutorial (
http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/First_Contact),
but of course, the Netbean's plugin for OpenOffice doesn't work with a
LibreOffice installation, and the ant script provided in the tutorial is
also configured for OpenOffice and doesn't work too. (I've tried to modify
paths in the script in order to make it work, without any success).

So, I would like to know where I can find a basic example of a working
extension for LibreOffice that could help me understand how we compile
extensions using the SDK and Java.

Thanks a lot for your help,

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

[ANN] LibreOffice 3.6.0.0 beta3 available for testing

2012-07-05 Thread Fridrich Strba 
Hi *,

for the upcoming new version 3.6.0, we today upload a third beta3
build that is (almost) feature-complete. For further milestones on the
way towards 3.6.0, please refer to our release plan timings here:

 http://wiki.documentfoundation.org/ReleasePlan#3.6_release

Builds are now being uploaded to a public (but non-mirrored - so don't
spread news too widely!) place, as soon as they're available. Grab
them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try  report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

The list of fixed bugs relative to 3.6.0 beta2 is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-release-3.6.0.0.beta3.log

So playing with the areas touched there also greatly appreciated - and
validation that those bugs are really fixed.

Thanks a lot for your help,

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

Change in core[master]: Replaced deprecated tools/String with OUString in ScMatrix

2012-07-05 Thread Gerrit 
From Sören Möller soerenmoeller2...@gmail.com:

Sören Möller has posted comments on this change.

Change subject: Replaced deprecated tools/String with OUString in ScMatrix
..


Patch Set 3:

Thanks for fixing the errors, it appears I compiled without --enable-werror and 
didn't notice the warning on the first one. But I have no idea why I didn't get 
an error on the second one.

Thanks for the all the helpfull reviews.

--
To view, visit https://gerrit.libreoffice.org/242
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If431e5ef8b5c97384a1bb1c7fa36c6894ece8343
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sören Möller soerenmoeller2...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Sören Möller soerenmoeller2...@gmail.com

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

Re: rediscovered: missing writer documentation

2012-07-05 Thread Thorsten Behrens 
Italo Vignoli wrote:
 I have an idea to leverage the document for a LibreOffice Story which
 connects 1998 to 2012, and introduces LibreOffice 3.6. It would be nice
 to find some other LO paraphernalia, from the early conferences. I have
 something in my archive, but others might have additional stuff.
 
Have some SO 4.0/5.1/5.2/6.0 and the odd StarMedia cliparts
collection CDs around + boxes - can mail you pictures. :)

Cheers,

-- Thorsten


pgpm9sdwmk1Qc.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Windows Build Error

2012-07-05 Thread Amy Chapman 

Hello,

I was asked to submit this build error to the mailing list.

I attempted to build LO from Master on Windows 7 x64 using Cygwin 1.71 
and MS Visual Studio 2008 Professional, with the git repository in 
C:\lo, using the LO patched version of make for Cygwin (3.82), and using 
these options for the autogen script: --with-max-jobs=4 
--with-num-cpus=4 --with-vendor=Amy --disable-binfilter --with-help=no 
--disable-mozilla --disable-xmlsec --with-ant-home=/WinAnt 
--without-myspell-dicts --without-junit --enable-ccache --without-java 
--disable-dependency-tracking


My build failed with the error fatal error RC1106: invalid option: 
-ologo when building sal. Make clean and making sal again did not 
resolve the error.


This is the tail end of my error log (link expires in 2 months): 
http://pastebin.ca/2167431


Thank you,
Amy
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Change in core[master]: Replaced deprecated tools/String with OUString in ScMatrix

2012-07-05 Thread Eike Rathke 
Hi Sören,

On Thursday, 2012-07-05 16:30:39 +, Gerrit wrote:

 From Sören Möller soerenmoeller2...@gmail.com:
 
 Thanks for fixing the errors, it appears I compiled without --enable-werror 
 and didn't notice the warning on the first one. But I have no idea why I 
 didn't get an error on the second one.

Indeed, that's odd. What platform/compiler/version do you use? Here
x86_64 GNU/Linux with gcc 4.6.3

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpkY9RwTQEXi.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Windows Build Error

2012-07-05 Thread Michael Stahl 
On 05/07/12 19:33, Amy Chapman wrote:
 Hello,
 
 I was asked to submit this build error to the mailing list.
 
 I attempted to build LO from Master on Windows 7 x64 using Cygwin 1.71 
 and MS Visual Studio 2008 Professional, with the git repository in 
 C:\lo, using the LO patched version of make for Cygwin (3.82), and using 
 these options for the autogen script: --with-max-jobs=4 
 --with-num-cpus=4 --with-vendor=Amy --disable-binfilter --with-help=no 
 --disable-mozilla --disable-xmlsec --with-ant-home=/WinAnt 
 --without-myspell-dicts --without-junit --enable-ccache --without-java 
 --disable-dependency-tracking

by the way, --disable-dependency-tracking is a bad idea if you intend to
modify the code.

 My build failed with the error fatal error RC1106: invalid option: 
 -ologo when building sal. Make clean and making sal again did not 
 resolve the error.
 
 This is the tail end of my error log (link expires in 2 months): 
 http://pastebin.ca/2167431

that is most odd; this can only be the -nologo in
solenv/gbuild/platform/WNT_INTEL_MSC.mk line 674, but why would it be
mangled to become -ologo?  (i don't have a MSVC build environment here.)

can you try the following:

1. remove the line 674 with -nologo (i expect this to work)

2. leave -nologo in but remove line 671
   $(call gb_Helper_abbreviate_dirs,\ plus one closing parenthesis
   at the end of line 678 $(RCFILE) )

3. revert commit c42a8d41afbd8c49b68046eeb8480e04d4f072c4

which of these result in a working build in sal?  (best to try with
make sal.clean sal)

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

[Libreoffice-commits] .: basic/qa basic/source

2012-07-05 Thread Noel Power 
 basic/qa/cppunit/test_nested_struct.cxx |   69 
 basic/source/runtime/step0.cxx  |   63 +++--
 2 files changed, 102 insertions(+), 30 deletions(-)

New commits:
commit 0996c0d3193352fe65414ea5577f804dbad8d07b
Author: Noel Power noel.po...@novell.com
Date:   Thu Jul 5 19:30:00 2012 +0100

make unoCheckStruct uglier but detect unfixed type assignment + add new 
tests

Change-Id: I6160e7d1abeeda1ea89e2fe15a9155041f2e5adb

diff --git a/basic/qa/cppunit/test_nested_struct.cxx 
b/basic/qa/cppunit/test_nested_struct.cxx
index defcaf1..21b4913 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -20,12 +20,16 @@ namespace
 Nested_Struct() {};
 void testAssign1();
 void testOldAssign();
+void testUnfixedVarAssign();
+void testFixedVarAssign();
 // Adds code needed to register the test suite
 CPPUNIT_TEST_SUITE(Nested_Struct);
 
 // Declares the method as a test to call
 CPPUNIT_TEST(testAssign1);
 CPPUNIT_TEST(testOldAssign);
+CPPUNIT_TEST(testUnfixedVarAssign);
+CPPUNIT_TEST(testFixedVarAssign);
 
 // End of test suite definition
 CPPUNIT_TEST_SUITE_END();
@@ -57,6 +61,35 @@ rtl::OUString sTestSource2(
 End Function\n
 );
 
+// it should be legal to assign a variant to a struct ( and copy by val )
+// make sure we aren't copying by reference, we make sure that l is not
+// a reference copy of b0.HorizontalLine, each one should have an
+// OuterLineWidth of 4  9 respectively and we should be returning
+// 13 the sum of the two ( hopefully unique values if we haven't copied by 
reference )
+rtl::OUString sTestSource3(
+Function testUnfixedVarAssign()\n
+Dim b0 as new \com.sun.star.table.TableBorder\\n
+l = b0.HorizontalLine\n
+l.OuterLineWidth = 9\n
+b0.HorizontalLine = l\n
+l.OuterLineWidth = 4\n
+testUnfixedVarAssign = b0.HorizontalLine.OuterLineWidth + 
l.OuterLineWidth\n
+End Function\n
+);
+
+// nearly the same as above but this time for a fixed type
+// variable
+rtl::OUString sTestSource4(
+Function testFixedVarAssign()\n
+Dim b0 as new \com.sun.star.table.TableBorder\, l as new 
\com.sun.star.table.BorderLine\\n
+l = b0.HorizontalLine\n
+l.OuterLineWidth = 9\n
+b0.HorizontalLine = l\n
+l.OuterLineWidth = 4\n
+testFixedVarAssign = b0.HorizontalLine.OuterLineWidth + 
l.OuterLineWidth\n
+End Function\n
+);
+
 void Nested_Struct::testAssign1()
 {
 CPPUNIT_ASSERT_MESSAGE( No resource manager, basicDLL().GetBasResMgr() 
!= NULL );
@@ -93,6 +126,42 @@ void Nested_Struct::testOldAssign()
 CPPUNIT_ASSERT(pNew-GetInteger() == 9 );
 }
 
+void Nested_Struct::testUnfixedVarAssign()
+{
+CPPUNIT_ASSERT_MESSAGE( No resource manager, basicDLL().GetBasResMgr() 
!= NULL );
+StarBASICRef pBasic = new StarBASIC();
+ResetError();
+StarBASIC::SetGlobalErrorHdl( LINK( this, Nested_Struct, BasicErrorHdl ) );
+
+SbModule* pMod = pBasic-MakeModule( rtl::OUString( TestModule ), 
sTestSource3 );
+pMod-Compile();
+CPPUNIT_ASSERT_MESSAGE(testUnfixedVarAssign fails with compile 
error,!HasError() );
+SbMethod* pMeth = static_castSbMethod*(pMod-Find( 
rtl::OUString(testUnfixedVarAssign),  SbxCLASS_METHOD ));
+CPPUNIT_ASSERT_MESSAGE(testUnfixedVarAssign no method found, pMeth );
+SbxVariableRef refTemp = pMeth;
+// forces a broadcast
+SbxVariableRef pNew = new SbxMethod( *((SbxMethod*)pMeth));
+CPPUNIT_ASSERT(pNew-GetInteger() == 13 );
+}
+
+void Nested_Struct::testFixedVarAssign()
+{
+CPPUNIT_ASSERT_MESSAGE( No resource manager, basicDLL().GetBasResMgr() 
!= NULL );
+StarBASICRef pBasic = new StarBASIC();
+ResetError();
+StarBASIC::SetGlobalErrorHdl( LINK( this, Nested_Struct, BasicErrorHdl ) );
+
+SbModule* pMod = pBasic-MakeModule( rtl::OUString( TestModule ), 
sTestSource4 );
+pMod-Compile();
+CPPUNIT_ASSERT_MESSAGE(testFixedVarAssign fails with compile 
error,!HasError() );
+SbMethod* pMeth = static_castSbMethod*(pMod-Find( 
rtl::OUString(testFixedVarAssign),  SbxCLASS_METHOD ));
+CPPUNIT_ASSERT_MESSAGE(testFixedVarAssign no method found, pMeth );
+SbxVariableRef refTemp = pMeth;
+// forces a broadcast
+SbxVariableRef pNew = new SbxMethod( *((SbxMethod*)pMeth));
+CPPUNIT_ASSERT(pNew-GetInteger() == 13 );
+}
+
   // Put the test suite in the registry
   CPPUNIT_TEST_SUITE_REGISTRATION(Nested_Struct);
 } // namespace
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 9149248..74b528a 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -335,54 +335,57 @@ void SbiRuntime::StepGET()
 inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef refVal, 
SbxVariableRef refVar )
 {
 SbxDataType eVarType = refVar-GetType();
+SbxDataType eValType = refVal-GetType();
 
-if (

[Libreoffice-commits] .: sc/inc sc/source

2012-07-05 Thread Eike Rathke 
 sc/inc/cell.hxx|8 
 sc/inc/formularesult.hxx   |   12 +++-
 sc/source/filter/excel/excform.cxx |2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 757a346159dd51ae65767bce98a12826fef179b6
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 5 20:26:20 2012 +0200

resolved fdo#51664 some matrix cases broken in binary Excel import

Import (ab)used ScFormulaCell::SetHybridDouble() in the sense that
actually it is not a hybrid (no formula string, the token array is
present in binary import) and during interpretation a matrix was
expected but instead the hybrid encountered.

Introduced ScFormulaCell::SetResultDouble() for exactly this case as a
workaround.

Change-Id: I4da3812ef4974380224b5a2bf42d0b62c14d121b

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 1717d8d..f609a46 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -500,6 +500,14 @@ public:
 voidSetHybridFormula( const rtl::OUString r,
 const formula::FormulaGrammar::Grammar 
eGrammar )
 { aResult.SetHybridFormula( r); eTempGrammar = 
eGrammar; }
+
+/** For import only: set a double result.
+Use this instead of SetHybridDouble() if there is no (temporary)
+formula string because the formula is present as a token array, as it
+is the case for binary Excel import.
+ */
+voidSetResultDouble( double n ) { aResult.SetDouble( n); }
+
 voidSetErrCode( sal_uInt16 n );
 inline bool IsHyperLinkCell() const { return pCode  
pCode-IsHyperLink(); }
 EditTextObject* CreateURLObject() ;
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 2983176..e0f586c 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -151,11 +151,13 @@ public:
 void SetResultError( sal_uInt16 nErr );
 
 /** Set direct double. Shouldn't be used externally except in
-ScFormulaCell for rounded CalcAsShown or SetErrCode(). If
-ScMatrixFormulaCellToken the token isn't replaced but upper left result
-is modified instead, but only if it was of type formula::svDouble 
before or not
-set at all. */
-void SetDouble( double f );
+ScFormulaCell for rounded CalcAsShown or SetErrCode() or
+SetResultDouble(), see there for condition. If
+ScMatrixFormulaCellToken the token isn't replaced but upper
+left result is modified instead, but only if it was of type
+formula::svDouble before or not set at all.
+ */
+SC_DLLPUBLIC void SetDouble( double f );
 
 /** Return value if type formula::svDouble or formula::svHybridCell or 
formula::svMatrixCell and upper
 left formula::svDouble, else 0.0 */
diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index 4fcf976..416d46f 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -160,7 +160,7 @@ void ImportExcel::Formula(
 ExcelToSc::SetError( *pCell, eErr );
 
 if (!rtl::math::isNan(fCurVal))
-pCell-SetHybridDouble(fCurVal);
+pCell-SetResultDouble(fCurVal);
 }
 
 GetXFRangeBuffer().SetXF( aScPos, nXF );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/inc sc/source

2012-07-05 Thread Eike Rathke 
 sc/inc/cell.hxx|8 
 sc/inc/formularesult.hxx   |   12 +++-
 sc/source/filter/excel/excform.cxx |2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit d5bd0ff8450985d0adadfdb13b4d97249b1b4bf4
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 5 20:26:20 2012 +0200

resolved fdo#51664 some matrix cases broken in binary Excel import

Import (ab)used ScFormulaCell::SetHybridDouble() in the sense that
actually it is not a hybrid (no formula string, the token array is
present in binary import) and during interpretation a matrix was
expected but instead the hybrid encountered.

Introduced ScFormulaCell::SetResultDouble() for exactly this case as a
workaround.

Change-Id: I4da3812ef4974380224b5a2bf42d0b62c14d121b

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index de4d1ad..5d750d8 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -503,6 +503,14 @@ public:
 voidSetHybridFormula( const rtl::OUString r,
 const formula::FormulaGrammar::Grammar 
eGrammar )
 { aResult.SetHybridFormula( r); eTempGrammar = 
eGrammar; }
+
+/** For import only: set a double result.
+Use this instead of SetHybridDouble() if there is no (temporary)
+formula string because the formula is present as a token array, as it
+is the case for binary Excel import.
+ */
+voidSetResultDouble( double n ) { aResult.SetDouble( n); }
+
 voidSetErrCode( sal_uInt16 n );
 inline bool IsHyperLinkCell() const { return pCode  
pCode-IsHyperLink(); }
 EditTextObject* CreateURLObject() ;
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 2983176..e0f586c 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -151,11 +151,13 @@ public:
 void SetResultError( sal_uInt16 nErr );
 
 /** Set direct double. Shouldn't be used externally except in
-ScFormulaCell for rounded CalcAsShown or SetErrCode(). If
-ScMatrixFormulaCellToken the token isn't replaced but upper left result
-is modified instead, but only if it was of type formula::svDouble 
before or not
-set at all. */
-void SetDouble( double f );
+ScFormulaCell for rounded CalcAsShown or SetErrCode() or
+SetResultDouble(), see there for condition. If
+ScMatrixFormulaCellToken the token isn't replaced but upper
+left result is modified instead, but only if it was of type
+formula::svDouble before or not set at all.
+ */
+SC_DLLPUBLIC void SetDouble( double f );
 
 /** Return value if type formula::svDouble or formula::svHybridCell or 
formula::svMatrixCell and upper
 left formula::svDouble, else 0.0 */
diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index 4fcf976..416d46f 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -160,7 +160,7 @@ void ImportExcel::Formula(
 ExcelToSc::SetError( *pCell, eErr );
 
 if (!rtl::math::isNan(fCurVal))
-pCell-SetHybridDouble(fCurVal);
+pCell-SetResultDouble(fCurVal);
 }
 
 GetXFRangeBuffer().SetXF( aScPos, nXF );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Document conversion engine

2012-07-05 Thread Michael Stahl 
hi Flavio,

On 03/07/12 12:45, Flavio Moringa wrote:

 I chose as my masters dissertation investigation topic trying to improve
 the document conversion engine in LibreOffice (ex: converting docx to
 odt), and as such I would like to know who is working on the conversion
 engines and how can I help.

the document conversion engines in LibreOffice are called Writer, Calc,
Draw and Impress.  conversion from e.g. DOCX to ODT happens by importing
the DOCX file with the DOCX import filter into Writer, and then
exporting the document from Writer with the ODF export filter.

there are also a few filters (such as XSLT filters, and writerperfect if
i remember correctly) that use ODF as an intermediate format, i.e., they
import by converting their format to ODF and then importing that into
the LO application, and export the reverse way.

 I'm not a programmer, so what I'm interested in doing is something in
 the lines of investigating the main conversion problems, identifying the
 possible conversion flows, analysing the way the conversion flow is
 implemented in LibreOffice, and eventually trying to improve this flow
 somehow.

it seems to me the main conversion problem is a lack of manpower to
improve the filters.  oh, and more regression tests would be useful.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Writing extension with the SDK

2012-07-05 Thread Michael Stahl 
hi Henri,

On 05/07/12 18:32, Henri Hebeisen wrote:
 Hi all,
 
 I'm a student at Dublin City University and I am working on a project
 where I have to write an extension for LibreOffice. I would like to use
 the Java API to manipulate data from LibreOffice. Unfortunately, I can't
 find any information specific to Libre Office extension : all the online
 documentation is for OpenOffice. I have installed SDK and configured all
 the paths for Java JDK, gmake... But what to do next ?

the LibreOffice API is (with very few exceptions that nobody is likely
to use) compatible with OpenOffice.org, so most documentation such as
the OOo Development Guide apply to LibreOffice as well.

 I have followed steps in this tutorial
 (http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/First_Contact
 http://wiki.services..openoffice.org/wiki/Documentation/DevGuide/FirstSteps/First_Contact),
 but of course, the Netbean's plugin for OpenOffice doesn't work with a
 LibreOffice installation, and the ant script provided in the tutorial is
 also configured for OpenOffice and doesn't work too. (I've tried to
 modify paths in the script in order to make it work, without any success).

hmm... perhaps nobody has adopted the Netbeans plugin to LO, and it
still contains hard-coded assumptions about OOo.  perhaps you could get
the source code for it and try to fix it to work with LO as well?  i
don't know if it is still maintained in any way...

Cedric, does your Eclipse plugin work with LO?

 So, I would like to know where I can find a basic example of a working
 extension for LibreOffice that could help me understand how we compile
 extensions using the SDK and Java.

there are various Java extensions in the LO repository, but all of these
are build using the LO build system which is not available to LO users.

iirc LanguageTool is a Java extension; Daniel, what is used to develop that?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Change in core[master]: fdo#42986 - UI wide screen format (16:10): Add Page size

2012-07-05 Thread Gerrit 
From Rob Snelders libreoff...@ertai.nl:

Rob Snelders has uploaded a new change for review.

Change subject: fdo#42986 - UI wide screen format (16:10): Add Page size
..

fdo#42986 - UI wide screen format (16:10): Add Page size

Change-Id: Ie769c9a65e85f91395b3495fadb6f5e688cbe9af
---
M cui/source/tabpages/page.cxx
M cui/source/tabpages/page.h
M cui/source/tabpages/page.src
M i18nutil/inc/i18nutil/paper.hxx
M i18nutil/source/utility/paper.cxx
5 files changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/260/1
--
To view, visit https://gerrit.libreoffice.org/260
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie769c9a65e85f91395b3495fadb6f5e688cbe9af
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rob Snelders libreoff...@ertai.nl

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

Re: Windows Build Error

2012-07-05 Thread Amy Chapman 

On 05/07/12 19:33, Amy Chapman wrote:

 Hello,

 I was asked to submit this build error to the mailing list.

 I attempted to build LO from Master on Windows 7 x64 using Cygwin 1.71
 and MS Visual Studio 2008 Professional, with the git repository in
 C:\lo, using the LO patched version of make for Cygwin (3.82), and 
using

 these options for the autogen script: --with-max-jobs=4
 --with-num-cpus=4 --with-vendor=Amy --disable-binfilter --with-help=no
 --disable-mozilla --disable-xmlsec --with-ant-home=/WinAnt
 --without-myspell-dicts --without-junit --enable-ccache --without-java
 --disable-dependency-tracking

by the way, --disable-dependency-tracking is a bad idea if you intend to
modify the code.

 My build failed with the error fatal error RC1106: invalid option:
 -ologo when building sal. Make clean and making sal again did not
 resolve the error.

 This is the tail end of my error log (link expires in 2 months):
 http://pastebin.ca/2167431

that is most odd; this can only be the -nologo in
solenv/gbuild/platform/WNT_INTEL_MSC.mk line 674, but why would it be
mangled to become -ologo?  (i don't have a MSVC build environment here.)

can you try the following:

1. remove the line 674 with -nologo (i expect this to work)

2. leave -nologo in but remove line 671
   $(call gb_Helper_abbreviate_dirs,\ plus one closing parenthesis
   at the end of line 678 $(RCFILE) )

3. revert commit c42a8d41afbd8c49b68046eeb8480e04d4f072c4

which of these result in a working build in sal?  (best to try with
make sal.clean sal) 


Removing line 674 (-nologo /) made building sal work.

I am currently retrying the overall build.

Thank you for the warning about --disable-dependency-tracking; I do plan 
to edit the source code, but right now I'm trying to get a minimal build 
to work at all.


Thank you!
Amy
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Change in core[libreoffice-3-5]: writerfilter: workaround for double border import regression...

2012-07-05 Thread Gerrit 
From Michael Stahl mst...@redhat.com:

Michael Stahl has uploaded a new change for review.

Change subject: writerfilter: workaround for double border import regression:
..

writerfilter: workaround for double border import regression:

70a6a4d425558340bb49507975343a3e0a1bdde8 broke the import of double
borders from DOCX and RTF, because writerfilter ends up calling the same
API as the ODF import filter; unfortunately the proper fix for that is
2d045cdb69176b280812dda0b813371cf1ac72e2 is more than i would like to
backport to libreoffice-3-5 so add a compensating workaround that
makes the DOCX and RTF import filter work again.

Change-Id: I9435760e7d11f09cf54883039fa3af05af308b33
---
M writerfilter/source/dmapper/ConversionHelper.cxx
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/261/1
--
To view, visit https://gerrit.libreoffice.org/261
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9435760e7d11f09cf54883039fa3af05af308b33
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Michael Stahl mst...@redhat.com

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

Locating Backing Window Recent Documents Object

2012-07-05 Thread Joel Madero 
Hi All,

Summary: Trying to find out how libreoffice is handling Open vs. Recent
Documents on the backing window that comes up with ./soffice

Details:

I spent time in the IRC chat a couple days ago trying to get help on this
one and another hour or two looking at code has gotten me no where
(although a few times I thought I was somewhere).

All I need to find is the code that is handling how pushing Open is handled
on the Backing Window (I always called it the OOo Splash Screen). With help
from some of the experienced devs on the chat I was able to look through
http://opengrok.libreoffice.org/xref/core/framework/source/services/backingwindow.cxx

I didn't see the code that is actually determining the location of the
click that brings up the open dialog vs. the recent documents dialog.
Currently if you click on the arrow to the right of the vertical line next
to open, a recent documents list comes up, but if you are to the right of
the vertical line and click slightly off the arrow, the open dialog comes
up. Intuitively the vertical line makes it seem like any click left of the
line brings up the open, any push to the right should bring up recent
documents and the arrow is just there for a nicer look.

Any help locating the cxx file greatly appreciated as this has gotten under
my skin a bit.


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

[Libreoffice-commits] .: editeng/source

2012-07-05 Thread Michael Stahl 
 editeng/source/items/borderline.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 927f1e56d57ef9238a4574699ae36626b3daaf22
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jul 5 18:28:41 2012 +0200

ConvertBorderWidthToWord: fix wrong INSET/OUSET conversion:

This should do the inverse of ConvertBorderWidthFromWord.

Change-Id: If0b2a8a83a7faa6600a07ecfcb13a124d7cdeab6

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 225d914..704bbfa 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -224,11 +224,11 @@ ConvertBorderWidthToWord(SvxBorderStyle const eStyle, 
double const fWidth)
 break;
 
 case OUTSET:
-return (fWidth / 2.0) - OUTSET_line1;
+return (fWidth - OUTSET_line1) / 2.0;
 break;
 
 case INSET:
-return (fWidth / 2.0) - INSET_line2;
+return (fWidth - INSET_line2) / 2.0;
 break;
 
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - editeng/source

2012-07-05 Thread Michael Stahl 
 editeng/source/items/borderline.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b7179e78ede390bd87425e828beeabb2a8be93a3
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jul 5 18:28:41 2012 +0200

ConvertBorderWidthToWord: fix wrong INSET/OUSET conversion:

This should do the inverse of ConvertBorderWidthFromWord.

Change-Id: If0b2a8a83a7faa6600a07ecfcb13a124d7cdeab6
(cherry picked from commit 927f1e56d57ef9238a4574699ae36626b3daaf22)

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index f6e184f..9f538c2 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -227,11 +227,11 @@ ConvertBorderWidthToWord(SvxBorderStyle const eStyle, 
double const fWidth)
 break;
 
 case OUTSET:
-return (fWidth / 2.0) - OUTSET_line1;
+return (fWidth - OUTSET_line1) / 2.0;
 break;
 
 case INSET:
-return (fWidth / 2.0) - INSET_line2;
+return (fWidth - INSET_line2) / 2.0;
 break;
 
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: moz/makefile.mk moz/patches

2012-07-05 Thread Michael Stahl 
 moz/makefile.mk|   11 ++-
 moz/patches/ssl-linux-no_as_needed_linker_option.patch |   10 ++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit e5ac3107e1bef08f619f42c099424a70a9ade281
Author: David Ostrovsky david.ostrov...@gmx.de
Date:   Sat Jun 30 20:03:47 2012 +0200

moz build fixed on Ubuntu

Change-Id: I48a4f43cc2e675d0f72bb7d87893f39f39450488

diff --git a/moz/makefile.mk b/moz/makefile.mk
index 76296ad..f154b95 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -88,7 +88,8 @@ PATCH_FILES = \
 patches/nss-linux3.patch \
 
patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
 patches/clang_missing_this_pointers.patch \
-patches/seamonkey-1.1.14.source-macosx10.6and7.patch
+patches/seamonkey-1.1.14.source-macosx10.6and7.patch \
+patches/ssl-linux-no_as_needed_linker_option.patch
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
@@ -152,6 +153,14 @@ LDFLAGS+=$(foreach,name,$(echo nspr4 nss3 nssutil3 plc4 
plds4) -Wl,-dylib_file,@
 .ENDIF
 .ENDIF
 
+# how can we do it only on Debian/Ubuntu?
+.IF $(OS)==LINUX
+.IF $(COM)==GCC
+LDFLAG_NO_AS_NEEDED=-Wl,--no-as-needed
+.EXPORT : LDFLAG_NO_AS_NEEDED
+.ENDIF
+.ENDIF
+
 #disable profilelocking to share profile with mozilla
 #disable activex and activex-scripting to remove the dependence of 
Microsoft_SDK\src\mfc\atlbase.h
 #disable gnomevfs to remove the needed of gnome develop files
diff --git a/moz/patches/ssl-linux-no_as_needed_linker_option.patch 
b/moz/patches/ssl-linux-no_as_needed_linker_option.patch
new file mode 100644
index 000..3abce6d
--- /dev/null
+++ b/moz/patches/ssl-linux-no_as_needed_linker_option.patch
@@ -0,0 +1,10 @@
+--- misc/mozilla/security/manager/ssl/src/Makefile.in  2012-06-30 
19:47:42.190501730 +0200
 misc/build/mozilla/security/manager/ssl/src/Makefile.in2012-06-30 
19:44:08.654510143 +0200
+@@ -137,6 +137,7 @@
+   $(MOZ_UNICHARUTIL_LIBS) \
+   $(MOZ_COMPONENT_LIBS) \
+   $(MOZ_JS_LIBS) \
++  $(LDFLAG_NO_AS_NEEDED) \
+   $(NSS_LIBS) \
+   $(NULL)
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-07-05 Thread Markus Mohrhard 
 sc/source/filter/excel/xistream.cxx  |4 +++-
 sc/source/filter/xcl97/XclImpChangeTrack.cxx |   13 -
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 1b57e80858dd61986bea6da7358d9f8433d9685e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Jul 5 21:59:55 2012 +0200

prevent invalid memory when loading change tracking from xls, fdo#45209

when loading broken xls files with change tracking we may crash because
of invalid memory access that results from loading to few bytes and then
using the originally created array

the patch changes it to check for the right amount of loaded bytes and
otherwise skips this change tracking record

Change-Id: I0795104284479368e26b8411336cee690abffd06

diff --git a/sc/source/filter/excel/xistream.cxx 
b/sc/source/filter/excel/xistream.cxx
index 753839c..8cd9980 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -822,7 +822,9 @@ sal_Size XclImpStream::CopyToStream( SvStream rOutStrm, 
sal_Size nBytes )
 {
 sal_Size nReadSize = ::std::min( nBytesLeft, nMaxBuffer );
 nRet += Read( pnBuffer, nReadSize );
-rOutStrm.Write( pnBuffer, nReadSize );
+// writing more bytes than read results in invalid memory access
+SAL_WARN_IF(nRet != nReadSize, sc, read less bytes than 
requested);
+rOutStrm.Write( pnBuffer, nRet );
 nBytesLeft -= nReadSize;
 }
 
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx 
b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 926c537..ecb8b6e 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -197,7 +197,18 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray* 
rpTokenArray, const ScAddres
 // converter in each formula)
 SvMemoryStream aMemStrm;
 aMemStrm  (sal_uInt16) 0x0001  nFmlSize;
-pStrm-CopyToStream( aMemStrm, nFmlSize );
+size_t nRead = pStrm-CopyToStream( aMemStrm, nFmlSize );
+
+// survive reading invalid streams!
+// if we can't read as many bytes as required just don't use them and
+// assume that this part is broken
+if(nRead != nFmlSize)
+{
+rpTokenArray = NULL;
+pStrm-Ignore(1);
+return;
+}
+
 XclImpStream aFmlaStrm( aMemStrm, GetRoot() );
 aFmlaStrm.StartNextRecord();
 XclImpChTrFmlConverter aFmlConv( GetRoot(), *this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - libcmis/makefile.mk sd/source

2012-07-05 Thread Caolán McNamara 
 libcmis/makefile.mk  |6 ++
 sd/source/core/CustomAnimationEffect.cxx |5 +
 2 files changed, 11 insertions(+)

New commits:
commit 63f00d37a20169743d9709977b382c379560ef9e
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 5 21:08:09 2012 +0100

Related: fdo#51247 bandaid to not crash

Change-Id: I1f98a6a1e5ede6fcd9a3570788969edcb251384b

diff --git a/sd/source/core/CustomAnimationEffect.cxx 
b/sd/source/core/CustomAnimationEffect.cxx
index 16756a5..2ed6115 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2819,6 +2819,11 @@ void EffectSequenceHelper::setAnimateForm( 
CustomAnimationTextGroupPtr pTextGrou
 EffectSequence aEffects( pTextGroup-maEffects );
 pTextGroup-reset();
 
+SAL_WARN_IF(aEffects.empty(), sd, 
EffectSequenceHelper::setAnimateForm effects empty );
+
+if (aEffects.empty())
+return;
+
 EffectSequence::iterator aIter( aEffects.begin() );
 const EffectSequence::iterator aEnd( aEffects.end() );
 
commit 428056b9685f34bba6b4181c6a15d20931b273b7
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 4 09:19:37 2012 +0100

add depend on makefile.mk

Change-Id: If065fe11b708d8c7135b5740169cc2ce17581000

diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index b5ffd5d..a65123b 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -68,3 +68,9 @@ BUILD_DIR=src$/libcmis
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
+# Since you never know what will be in a patch (for example, it may already
+# patch at configure level) or in the case of a binary patch, we remove the
+# entire package directory if a patch is newer.
+# Changes in this makefile could also make a complete build necessary if
+# configure is affected.
+$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : makefile.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-07-05 Thread Caolán McNamara 
 sw/source/ui/config/uinums.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7a891d591f6977c04136a0b4ccde0b87a89237f
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 4 21:28:38 2012 +0100

sal_uInt16 matches UniString sal_Unicode ctor, not FontFamily enum

i.e. totally the wrong thing entire

Change-Id: I24c6f7ca625affe808f865b8962cb690ce1c8755

diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 763327e..d3a736e 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -387,7 +387,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( 
SvStream rStream,
 
 if( aName.Len() )
 {
-Font aFont( nFamily, Size( nWidth, nHeight ) );
+Font aFont( static_castFontFamily(nFamily), Size( nWidth, 
nHeight ) );
 aFont.SetName( aName );
 aFont.SetCharSet( (CharSet)nCharSet );
 aFont.SetPitch( (FontPitch)nPitch );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sd/source

2012-07-05 Thread Caolán McNamara 
 sd/source/ui/func/fubullet.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ea440349f0d1319a2eaacc4c77b5149aea98ae80
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 4 23:24:17 2012 +0100

useless aStr string

Change-Id: I8b7848ebaef65a0f462a63276ed4160f3e3a991d

diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index ecf4d64..2d8ac1d 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -137,8 +137,8 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
 aEmptyStr );
 
 // insert given text
-String aStr( cMark );
-pOV-InsertText( cMark, sal_True);
+rtl::OUString aStr( cMark );
+pOV-InsertText( aStr, sal_True);
 
 ESelection aSel = pOV-GetSelection();
 aSel.nStartPara = aSel.nEndPara;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sc/source

2012-07-05 Thread Kohei Yoshida 
 sc/source/core/data/dpcache.cxx |   22 +-
 sc/source/core/data/dpsave.cxx  |1 -
 2 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 6747dd33754a15e7d9f5aae01bb8299b6a05e365
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 5 16:08:36 2012 -0400

Use correct row indices to keep track of empty rows.

In pivot table cache, data rows are always zero-based, and are
different from the rows of cells from which the data are pulled.

This error resulted in incorrect pivot table result when the skip
empty rows option was set.

Change-Id: I4fccb37a8667f7e40d6130ac641d7b2a1daa7694

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 9163dde..d04adf1 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -412,7 +412,7 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const 
ScRange rRange)
 
 if (!aData.IsEmpty())
 {
-maEmptyRows.insert_back(nRow, nRow+1, false);
+maEmptyRows.insert_back(i, i+1, false);
 rField.mnNumFormat = nNumFormat;
 }
 }
@@ -1212,6 +1212,26 @@ void ScDPCache::Dump() const
 }
 
 {
+struct { SCROW start; SCROW end; bool empty; } aRange;
+cout  * empty rows:   endl;
+mdds::flat_segment_treeSCROW, bool::const_iterator it = 
maEmptyRows.begin(), itEnd = maEmptyRows.end();
+if (it != itEnd)
+{
+aRange.start = it-first;
+aRange.empty = it-second;
+++it;
+}
+
+for (; it != itEnd; ++it)
+{
+aRange.end = it-first-1;
+cout  rows   aRange.start  -  aRange.end  :  
 (aRange.empty ? empty : not-empty)  endl;
+aRange.start = it-first;
+aRange.empty = it-second;
+}
+}
+
+{
 GroupFieldsType::const_iterator it = maGroupFields.begin(), itEnd = 
maGroupFields.end();
 for (size_t i = maFields.size(); it != itEnd; ++it, ++i)
 {
commit 46776932d8118ae0f64945a9a1ee6ff46094067e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 5 14:47:46 2012 -0400

Unnecessary header include.

Change-Id: I3f25f2275d8351b16d955941bc2cee13eb34d504

diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 62bda08..5feec06 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -34,7 +34,6 @@
 #include global.hxx
 #include dptabsrc.hxx
 #include dputil.hxx
-#include stlalgorithm.hxx
 
 #include sal/types.h
 #include comphelper/string.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/source

2012-07-05 Thread Kohei Yoshida 
 sc/source/core/data/dpcache.cxx |   22 +-
 sc/source/core/data/dpsave.cxx  |1 -
 2 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 3988c35c9635dfc38f6a2125e5664f60f164951b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 5 16:08:36 2012 -0400

Use correct row indices to keep track of empty rows.

In pivot table cache, data rows are always zero-based, and are
different from the rows of cells from which the data are pulled.

This error resulted in incorrect pivot table result when the skip
empty rows option was set.

Change-Id: I4fccb37a8667f7e40d6130ac641d7b2a1daa7694

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 2d2a0a3..3299ba0 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -412,7 +412,7 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const 
ScRange rRange)
 
 if (!aData.IsEmpty())
 {
-maEmptyRows.insert_back(nRow, nRow+1, false);
+maEmptyRows.insert_back(i, i+1, false);
 rField.mnNumFormat = nNumFormat;
 }
 }
@@ -1212,6 +1212,26 @@ void ScDPCache::Dump() const
 }
 
 {
+struct { SCROW start; SCROW end; bool empty; } aRange;
+cout  * empty rows:   endl;
+mdds::flat_segment_treeSCROW, bool::const_iterator it = 
maEmptyRows.begin(), itEnd = maEmptyRows.end();
+if (it != itEnd)
+{
+aRange.start = it-first;
+aRange.empty = it-second;
+++it;
+}
+
+for (; it != itEnd; ++it)
+{
+aRange.end = it-first-1;
+cout  rows   aRange.start  -  aRange.end  :  
 (aRange.empty ? empty : not-empty)  endl;
+aRange.start = it-first;
+aRange.empty = it-second;
+}
+}
+
+{
 GroupFieldsType::const_iterator it = maGroupFields.begin(), itEnd = 
maGroupFields.end();
 for (size_t i = maFields.size(); it != itEnd; ++it, ++i)
 {
commit 1d29c97313988b4e128030f2e7011891725c8fe7
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 5 14:47:46 2012 -0400

Unnecessary header include.

Change-Id: I3f25f2275d8351b16d955941bc2cee13eb34d504

diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index fc289b9..5c987da 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -37,7 +37,6 @@
 #include global.hxx
 #include dptabsrc.hxx
 #include dputil.hxx
-#include stlalgorithm.hxx
 
 #include sal/types.h
 #include comphelper/string.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[slightly OT] Re: rediscovered: missing writer documentation

2012-07-05 Thread Christoph Noack 
Hi Thorsten, all!

Am Donnerstag, den 05.07.2012, 19:42 +0200 schrieb Thorsten Behrens:
 Italo Vignoli wrote:
  I have an idea to leverage the document for a LibreOffice Story which
  connects 1998 to 2012, and introduces LibreOffice 3.6. It would be nice
  to find some other LO paraphernalia, from the early conferences. I have
  something in my archive, but others might have additional stuff.
  
 Have some SO 4.0/5.1/5.2/6.0 and the odd StarMedia cliparts
 collection CDs around + boxes - can mail you pictures. :)

If one needs additional pictures, I still have some older pre-StarOffice
software boxes from DOS times:
http://uxopenofficeorg.blogspot.de/2010/09/stuff-on-shelf.html

Cheers,
Christoph

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

License declaration for Attach animation to styles feature and future work

2012-07-05 Thread Larisa Raicevic 
 I declare that all my past and future contributions to LibreOffice
 are licensed under MPL/LGPLv3+ - specifically my contributions
 during the GSoC 2010 term.

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

[Libreoffice-commits] .: 2 commits - svtools/source tools/inc tools/source writerfilter/source

2012-07-05 Thread Caolán McNamara 
 svtools/source/misc/transfer.cxx  |6 +++---
 tools/inc/tools/string.hxx|9 ++---
 tools/source/fsys/dirent.cxx  |   12 ++--
 tools/source/string/strucvt.cxx   |   12 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |9 -
 5 files changed, 23 insertions(+), 25 deletions(-)

New commits:
commit 7e3923520c27ff139bc3abab35a1c01e1a785fb1
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 5 21:37:49 2012 +0100

Resolves: fdo#49587 apparent loop in style hierarchy

Change-Id: I32317a1a6500377f7e7bb98d1dcc65ad86feb9a2

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5c33f7b..a69e911 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -561,7 +561,14 @@ uno::Any 
DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId)
 }
 }
 //search until the property is set or no parent is available
-pEntry = 
GetStyleSheetTable()-FindParentStyleSheet(pEntry-sBaseStyleIdentifier);
+StyleSheetEntryPtr pNewEntry = 
GetStyleSheetTable()-FindParentStyleSheet(pEntry-sBaseStyleIdentifier);
+
+SAL_WARN_IF( pEntry == pNewEntry, writerfilter, circular loop in 
style hierarchy?);
+
+if (pEntry == pNewEntry) //fdo#49587
+break;
+
+pEntry = pNewEntry;
 }
 return uno::Any();
 }
commit 5218c0d6a8171400bee0d972ff05757849df4d19
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 4 09:23:10 2012 +0100

UniString(const rtl::OString ...) no longer implemented

Change-Id: Ie4fc4ed1a54889c1745a0d71d02211d6868340fa

diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 373df6d..aadd6bf 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -2012,7 +2012,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const 
::com::sun::star::datatr
 
 if( ( aDesc.getLength()  4 )  
aDesc.copy(aDesc.getLength() - 
4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(.URL)) )
 {
-SvStream* pStream = 
::utl::UcbStreamHelper::CreateStream( INetURLObject( String( aDesc, 
eTextEncoding ) ).GetMainURL( INetURLObject::NO_DECODE ),
+SvStream* pStream = 
::utl::UcbStreamHelper::CreateStream( INetURLObject( 
rtl::OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( 
INetURLObject::NO_DECODE ),

   STREAM_STD_READ );
 
 if( !pStream || pStream-GetError() )
@@ -2042,8 +2042,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const 
::com::sun::star::datatr
 bSttFnd = sal_True;
 else if (bSttFnd  aLine.copy(0, 
4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(URL=)))
 {
-rBmk = INetBookmark( String( 
aLine.copy(4), eTextEncoding ),
- String( aDesc.copy(0, 
aDesc.getLength() - 4), eTextEncoding ) );
+rBmk = INetBookmark( 
rtl::OStringToOUString(aLine.copy(4), eTextEncoding),
+ 
rtl::OStringToOUString(aDesc.copy(0, aDesc.getLength() - 4), eTextEncoding) );
 bRet = sal_True;
 break;
 }
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index c4a8c2a..ed641d0 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -156,6 +156,12 @@ private:
 //a rtl::OString
 TOOLS_DLLPRIVATE UniString(const rtl::OString rByteStr, xub_StrLen nPos, 
xub_StrLen nLen,
 sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS);
+
+//no longer implemented
+TOOLS_DLLPRIVATE UniString( const rtl::OString rByteStr,
+   rtl_TextEncoding eTextEncoding,
+   sal_uInt32 nCvtFlags = 
BYTESTRING_TO_UNISTRING_CVTFLAGS );
+
 public:
 UniString();
 UniString( const ResId rResId );
@@ -166,9 +172,6 @@ public:
 UniString( const sal_Unicode* pCharStr, xub_StrLen 
nLen );
 UniString( sal_Unicode c );
 UniString(char c); // ...but allow UniString('a')
-UniString( const rtl::OString rByteStr,
-   rtl_TextEncoding eTextEncoding,
-   sal_uInt32 nCvtFlags = 
BYTESTRING_TO_UNISTRING_CVTFLAGS );
 UniString( const sal_Char* pByteStr,

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - writerfilter/source

2012-07-05 Thread Michael Stahl 
 writerfilter/source/dmapper/ConversionHelper.cxx |5 +
 writerfilter/source/dmapper/DomainMapper.cxx |9 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 0fe856fdbf7696b00ed3fe32890cdb0f7e46c9a5
Author: Muhammad Haggag mhag...@gmail.com
Date:   Wed Feb 1 20:56:12 2012 +0200

fdo#43398: dmapper: Switch paragraphs to RTL based on the value of w:BiDi.

This is a fix for 43398: FORMATTING: Documents opened in LibreOffice Writer 
incorrectly appear as right justified.

Cause: dmapper used to treat the presence of a w:BiDi element in a 
paragraph's properties as an indicator of RTL directionality, which is 
incorrect. A w:BiDi  element may have a value of 0, indicating LTR.

Fix: Inspect the integral value of w:BiDi elements before switching to RTL.
(cherry picked from commit d8cb61f5f32247a8bbaf89fb910c015b6107f051)

Change-Id: Id948d9fc9dfb818a502b9de283ac265d0c80cb37
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index c2820ee..24cb353 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1837,8 +1837,13 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 }
 break;  // sprmPOutLvl
 case NS_sprm::LN_PFBiDi:
-rContext-Insert(PROP_WRITING_MODE, false, uno::makeAny( 
text::WritingMode2::RL_TB ));
-rContext-Insert(PROP_PARA_ADJUST, false, uno::makeAny( 
style::ParagraphAdjust_RIGHT ));
+{
+if (nIntValue != 0)
+{
+rContext-Insert(PROP_WRITING_MODE, false, uno::makeAny( 
text::WritingMode2::RL_TB ));
+rContext-Insert(PROP_PARA_ADJUST, false, uno::makeAny( 
style::ParagraphAdjust_RIGHT ));
+}
+}
 
 break;  // sprmPFBiDi
 case NS_ooxml::LN_EG_SectPrContents_bidi:
commit 33de264435f2f9a92b27222d33c35d85d5c64167
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jul 5 21:12:16 2012 +0200

writerfilter: workaround for double border import regression:

70a6a4d425558340bb49507975343a3e0a1bdde8 broke the import of double
borders from DOCX and RTF, because writerfilter ends up calling the same
API as the ODF import filter; unfortunately the proper fix for that is
2d045cdb69176b280812dda0b813371cf1ac72e2 is more than i would like to
backport to libreoffice-3-5 so add a compensating workaround that
makes the DOCX and RTF import filter work again.

Change-Id: I9435760e7d11f09cf54883039fa3af05af308b33

diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx 
b/writerfilter/source/dmapper/ConversionHelper.cxx
index 4996f00..d87f89d 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -177,6 +177,11 @@ void MakeBorderLine( sal_Int32 nLineThickness,   sal_Int32 
nLineType,
 case 21:
 case 23:
 nLineStyle = DOUBLE;
+// HACK HACK HACK - only for libreoffice-3-5!
+// this is a workaround for the fix for fdo#46112, which actually
+// broke the DOCX/RTF import because the ODF import calls the
+// same UNO API function: multiply by 3 here to offset divide by 3.
+nLineThickness *= 3;
 break;
 case 11:
 case 13: //Don't have thin thick thin, so use thick thin
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

2012-07-05 Thread Noel Power 
 basic/source/runtime/step0.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6ee44323ce7f6bcb583872019314915cf73103ca
Author: Noel Power noel.po...@novell.com
Date:   Thu Jul 5 21:40:34 2012 +0100

fix wae

Change-Id: I924c23853916cc26f151f1cfd3091dcbcf3899dd

diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 74b528a..b5f9a6b 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -364,7 +364,6 @@ inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef 
refVal, SbxVariableRe
 {
 refVar-SetType( SbxOBJECT );
 SbxObjectRef xVarObj = (SbxObject*)refVar-GetObject();
-SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)xVarObj);
 SbUnoStructRefObject* pUnoStructObj = 
PTR_CAST(SbUnoStructRefObject,(SbxObject*)xVarObj);
 
 if ( ( !pUnoVal  !pUnoStructVal ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

2012-07-05 Thread Markus Mohrhard 
 sc/source/filter/excel/xistream.cxx  |4 +++-
 sc/source/filter/xcl97/XclImpChangeTrack.cxx |   13 -
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit b45e528cb70d1f908b8ff6ec156ac1a816287075
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Jul 5 21:59:55 2012 +0200

prevent invalid memory when loading change tracking from xls, fdo#45209

when loading broken xls files with change tracking we may crash because
of invalid memory access that results from loading to few bytes and then
using the originally created array

the patch changes it to check for the right amount of loaded bytes and
otherwise skips this change tracking record

Change-Id: I0795104284479368e26b8411336cee690abffd06

diff --git a/sc/source/filter/excel/xistream.cxx 
b/sc/source/filter/excel/xistream.cxx
index 753839c..8cd9980 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -822,7 +822,9 @@ sal_Size XclImpStream::CopyToStream( SvStream rOutStrm, 
sal_Size nBytes )
 {
 sal_Size nReadSize = ::std::min( nBytesLeft, nMaxBuffer );
 nRet += Read( pnBuffer, nReadSize );
-rOutStrm.Write( pnBuffer, nReadSize );
+// writing more bytes than read results in invalid memory access
+SAL_WARN_IF(nRet != nReadSize, sc, read less bytes than 
requested);
+rOutStrm.Write( pnBuffer, nRet );
 nBytesLeft -= nReadSize;
 }
 
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx 
b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 926c537..ecb8b6e 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -197,7 +197,18 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray* 
rpTokenArray, const ScAddres
 // converter in each formula)
 SvMemoryStream aMemStrm;
 aMemStrm  (sal_uInt16) 0x0001  nFmlSize;
-pStrm-CopyToStream( aMemStrm, nFmlSize );
+size_t nRead = pStrm-CopyToStream( aMemStrm, nFmlSize );
+
+// survive reading invalid streams!
+// if we can't read as many bytes as required just don't use them and
+// assume that this part is broken
+if(nRead != nFmlSize)
+{
+rpTokenArray = NULL;
+pStrm-Ignore(1);
+return;
+}
+
 XclImpStream aFmlaStrm( aMemStrm, GetRoot() );
 aFmlaStrm.StartNextRecord();
 XclImpChTrFmlConverter aFmlConv( GetRoot(), *this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] updates for the bugzilla-assistant

2012-07-05 Thread Rob Snelders 

Hi All,

Here 3 small patches for the bugzilla assistant.

- The first fixes the problem that some debug-options (set with the 
skin-variable) didn't give the correct screen

- The second removes trailing white-spaces
- The thirth solves a bug when the bugzilla can't be reached. It gives 
an error now, while it used to give java-script errors.


--
Greetings,
Rob Snelders
From 2e922d4f9f81fe129ee2d613295c3184ca4058e3 Mon Sep 17 00:00:00 2001
From: Rob Snelders programm...@ertai.nl
Date: Thu, 5 Jul 2012 21:04:54 +0200
Subject: [PATCH] Select the first options in the select-boxes so the
 skin-options always work.

---
 bug/bug/skin.js |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bug/bug/skin.js b/bug/bug/skin.js
index 1399fac..7858f67 100644
--- a/bug/bug/skin.js
+++ b/bug/bug/skin.js
@@ -26,18 +26,18 @@
   }
   function subcomponent() {
   component();
-  $('.state_component .choice:nth(3)').click();
+  $('.state_component .choice:nth(0)').click();
   }
   function version() {
   subcomponent();
   $.bug.ajax = function(settings) {
   return $.Deferred().resolve('NUM,DESC\n100,BUG 1\n200,BUG 2\n');
   };
-  $('.state_subcomponent .active_subcomponent .choice:nth(2)').click();
+  $('.state_subcomponent .active_subcomponent .choice:nth(0)').click();
   }
   function description() {
   version();
-  $('.state_version .choice:nth(2)').click();
+  $('.state_version .choice:nth(0)').click();
   $('.state_description .short').val('12');
   }
   function submit() {
-- 
1.7.9.5

From 52c3e6d644b08e669edd7fb8873c09ccc1a7de62 Mon Sep 17 00:00:00 2001
From: Rob Snelders programm...@ertai.nl
Date: Thu, 5 Jul 2012 22:19:47 +0200
Subject: [PATCH] Remove trailing whitespaces

---
 bug/bug.xhtml |4 ++--
 bug/bug/bug.css   |2 +-
 bug/bug/bug.js|   14 +++---
 bug/bug/qunit.css |   10 +-
 bug/bug/select.js |2 +-
 bug/bug/test.html |2 +-
 bug/bug/test.js   |2 +-
 bug/subcomponents.xsl |2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index 254731a..d43008b 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -92,12 +92,12 @@
   /div
 /div
   /div
-
+
   div class=state_success
 pThe bug report has been successfully submitted./p
 pYou can edit it or add attachments using a class=bugthe corresponding bugzilla page/a./p
   /div
-  
+
   div class=username/div
 
   div class=state signin
diff --git a/bug/bug/bug.css b/bug/bug/bug.css
index 6fde858..a932f2a 100644
--- a/bug/bug/bug.css
+++ b/bug/bug/bug.css
@@ -15,7 +15,7 @@
  along with this program.  If not, see http:www.gnu.org/licenses/.
 */
 /* javascript and old browsers fallback */
-.javascript, .unsupported, .compatibility .version { 
+.javascript, .unsupported, .compatibility .version {
 display: none;
 }
 
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index d670092..9b7f906 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -53,7 +53,7 @@
 $.bug.error_set(error[1]);
 throw error;
 } else {
-var success = data.match(success_regexp);
+var success = data.match(success_regexp);
 if(success !== null) {
 return success[1];
 } else {
@@ -114,23 +114,23 @@
 element.show();
 $('.select', element).select();
 $('.select .choice, img', element).hover(function() {
-var component = $(this).attr('data');
+var component = $(this).attr('data');
 $('.comment', element).hide();
 $('.comment.' + component, element).show();
 });
 $('.select .choice', element).click(function() {
 $(this).mouseenter();
-var component = $(this).attr('data');
+var component = $(this).attr('data');
 $('img', element).removeClass('selected');
 $('img[data=' + component + ']').addClass('selected');
 $.bug.state_subcomponent();
 });
 $('img', element).click(function() {
-var component = $(this).attr('data');
+var component = $(this).attr('data');
 $(.select .choice[data=' + component + '], element).click();
 });
 $('.components_icons').mouseleave(function() {
-$('img.selected', element).mouseenter();
+$('img.selected', element).mouseenter();
 });
 },
 
@@ -263,7 +263,7 @@
 element.show();
 },
 
-// if this string is found in the

[Libreoffice-commits] .: vcl/source

2012-07-05 Thread Michael Stahl 
 vcl/source/glyphs/graphite_layout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b25385a671ed43580a360570981ac1d52446a615
Author: Martin Hosken martin_hos...@sil.org
Date:   Thu Jul 5 23:10:23 2012 +0200

fdo#49486: fix graphite2 hyphenation regression

Change-Id: I6d5901f28b66c8edc0c16e7ec04d574a5d59dedc

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index e3bd926..b9977ed 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -715,8 +715,8 @@ int GraphiteLayout::GetTextBreak(long maxmnWidth, long 
char_extra, int factor) c
 if (mvChar2BaseGlyph[i] != -1)
 {
 if (
-(mvCharBreaks[i]  -25 || (mvCharBreaks[i-1]  0  
mvCharBreaks[i-1]  25)) 
-(mvCharBreaks[i-1]  25 || (mvCharBreaks[i]  0  
mvCharBreaks[i]  -25))
+(mvCharBreaks[i]  -35 || (mvCharBreaks[i-1]  0  
mvCharBreaks[i-1]  35)) 
+(mvCharBreaks[i-1]  35 || (mvCharBreaks[i]  0  
mvCharBreaks[i]  -35))
)
 {
 nLastBreak = static_castint(i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source

2012-07-05 Thread Michael Stahl 
 vcl/source/glyphs/graphite_layout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a0c5a0b7ece71c849d714a03cdc74362cff7c2e0
Author: Martin Hosken martin_hos...@sil.org
Date:   Thu Jul 5 23:10:23 2012 +0200

fdo#49486: fix graphite2 hyphenation regression

Change-Id: I6d5901f28b66c8edc0c16e7ec04d574a5d59dedc
(cherry picked from commit b25385a671ed43580a360570981ac1d52446a615)

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index e3bd926..b9977ed 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -715,8 +715,8 @@ int GraphiteLayout::GetTextBreak(long maxmnWidth, long 
char_extra, int factor) c
 if (mvChar2BaseGlyph[i] != -1)
 {
 if (
-(mvCharBreaks[i]  -25 || (mvCharBreaks[i-1]  0  
mvCharBreaks[i-1]  25)) 
-(mvCharBreaks[i-1]  25 || (mvCharBreaks[i]  0  
mvCharBreaks[i]  -25))
+(mvCharBreaks[i]  -35 || (mvCharBreaks[i-1]  0  
mvCharBreaks[i-1]  35)) 
+(mvCharBreaks[i-1]  35 || (mvCharBreaks[i]  0  
mvCharBreaks[i]  -35))
)
 {
 nLastBreak = static_castint(i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source

2012-07-05 Thread Michael Stahl 
 vcl/source/glyphs/graphite_layout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e30425b674034824bff78d40192776eee1bc23cd
Author: Martin Hosken martin_hos...@sil.org
Date:   Thu Jul 5 23:10:23 2012 +0200

fdo#49486: fix graphite2 hyphenation regression

Change-Id: I6d5901f28b66c8edc0c16e7ec04d574a5d59dedc
(cherry picked from commit b25385a671ed43580a360570981ac1d52446a615)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index fd46d22..d9deb5a 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -711,8 +711,8 @@ int GraphiteLayout::GetTextBreak(long maxmnWidth, long 
char_extra, int factor) c
 if (mvChar2BaseGlyph[i] != -1)
 {
 if (
-(mvCharBreaks[i]  -25 || (mvCharBreaks[i-1]  0  
mvCharBreaks[i-1]  25)) 
-(mvCharBreaks[i-1]  25 || (mvCharBreaks[i]  0  
mvCharBreaks[i]  -25))
+(mvCharBreaks[i]  -35 || (mvCharBreaks[i-1]  0  
mvCharBreaks[i-1]  35)) 
+(mvCharBreaks[i-1]  35 || (mvCharBreaks[i]  0  
mvCharBreaks[i]  -35))
)
 {
 nLastBreak = static_castint(i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: EasyHack #41291 playterm build session

2012-07-05 Thread Bjoern Michaelsen 
Hi Pietro,

On Fri, Jun 29, 2012 at 09:16:34AM -0700, Pietro F. Menna wrote:
 I will do this by the end of this weekend.
 
 Thanks a lot for your comments.

any progress or success already? Do you need some support?

Best,

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

Re: [slightly OT] Re: rediscovered: missing writer documentation

2012-07-05 Thread Italo Vignoli 
Christoph Noack wrote:

 I have an idea to leverage the document for a LibreOffice Story which
 connects 1998 to 2012, and introduces LibreOffice 3.6. It would be nice
 to find some other LO paraphernalia, from the early conferences. I have
 something in my archive, but others might have additional stuff.

 Have some SO 4.0/5.1/5.2/6.0 and the odd StarMedia cliparts
 collection CDs around + boxes - can mail you pictures. :)
 
 If one needs additional pictures, I still have some older pre-StarOffice
 software boxes from DOS times:
 http://uxopenofficeorg.blogspot.de/2010/09/stuff-on-shelf.html

More than pictures of old products, I look for old pictures of people
who show that TDF project members were there before - or at the same
time - of Apache OO members, or paraphernalia like Caolan's paper.

-- 
Italo Vignoli - italo.vign...@gmail.com
mob +39.348.5653829 - VoIP 5316...@messagenet.it
skype italovignoli - gtalk italo.vign...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Change in core[master]: git-review integration: .gitreview for core repository added

2012-07-05 Thread Gerrit 
From David Ostrovsky david.ostrov...@gmx.de:

David Ostrovsky has uploaded a new change for review.

Change subject: git-review integration: .gitreview for core repository added
..

git-review integration: .gitreview for core repository added

Change-Id: Iecb72ef80f66f1d84a764bdc2629ad45f14acfe7
---
A .gitreview
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/262/1
--
To view, visit https://gerrit.libreoffice.org/262
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecb72ef80f66f1d84a764bdc2629ad45f14acfe7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de

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

[Libreoffice-commits] .: writerperfect/source

2012-07-05 Thread Fridrich Strba 
 writerperfect/source/draw/CDRImportFilter.cxx   |   12 ++--
 writerperfect/source/draw/CMXImportFilter.cxx   |   12 ++--
 writerperfect/source/draw/MSPUBImportFilter.cxx |   12 ++--
 writerperfect/source/draw/VisioImportFilter.cxx |   12 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 14ca2a853cde386bea8cf8bf45d803933592aeaf
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Jul 6 00:36:13 2012 +0200

Bin RTL_CONSTASCII_USTRINGPARAM

Change-Id: Idba2f900f962da57f9e9254b71b68f9b64f6ba6c

diff --git a/writerperfect/source/draw/CDRImportFilter.cxx 
b/writerperfect/source/draw/CDRImportFilter.cxx
index 431b18d..7fc2288 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -86,7 +86,7 @@ throw (RuntimeException)
 sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
 
 // An XML import service: what we push sax messages to..
-OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( 
com.sun.star.comp.Draw.XMLOasisImporter ) );
+OUString sXMLImportService ( com.sun.star.comp.Draw.XMLOasisImporter );
 Reference  XDocumentHandler  xInternalHandler( 
comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), 
UNO_QUERY );
 
 // The XImporter sets up an empty target document for XDocumentHandler to 
write to..
@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException )
 WPXSvInputStream input( xInputStream );
 
 if (libcdr::CDRDocument::isSupported(input))
-sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( 
draw_CorelDraw_Document ) );
+sTypeName = OUString( draw_CorelDraw_Document );
 
 if (sTypeName.getLength())
 {
 if ( location == Descriptor.getLength() )
 {
 Descriptor.realloc(nLength+1);
-Descriptor[location].Name = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TypeName));
+Descriptor[location].Name = ::rtl::OUString( TypeName );
 }
 
 Descriptor[location].Value =sTypeName;
@@ -190,7 +190,7 @@ throw (RuntimeException)
 #ifdef DEBUG
 std::cerr  CDRImportFilter_getImplementationName  std::endl;
 #endif
-return OUString ( RTL_CONSTASCII_USTRINGPARAM ( 
com.sun.star.comp.Draw.CDRImportFilter ) );
+return OUString ( com.sun.star.comp.Draw.CDRImportFilter );
 }
 
 #define SERVICE_NAME1 com.sun.star.document.ImportFilter
@@ -211,8 +211,8 @@ throw (RuntimeException)
 #endif
 Sequence  OUString  aRet(2);
 OUString *pArray = aRet.getArray();
-pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
-pArray[1] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) );
+pArray[0] =  OUString ( SERVICE_NAME1 );
+pArray[1] =  OUString ( SERVICE_NAME2 );
 return aRet;
 }
 #undef SERVICE_NAME2
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx 
b/writerperfect/source/draw/CMXImportFilter.cxx
index 1658c36..d3ae6ff 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -86,7 +86,7 @@ throw (RuntimeException)
 sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
 
 // An XML import service: what we push sax messages to..
-OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( 
com.sun.star.comp.Draw.XMLOasisImporter ) );
+OUString sXMLImportService ( com.sun.star.comp.Draw.XMLOasisImporter );
 Reference  XDocumentHandler  xInternalHandler( 
comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), 
UNO_QUERY );
 
 // The XImporter sets up an empty target document for XDocumentHandler to 
write to..
@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException )
 WPXSvInputStream input( xInputStream );
 
 if (libcdr::CMXDocument::isSupported(input))
-sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( 
draw_Corel_Presentation_Exchange ) );
+sTypeName = OUString( draw_Corel_Presentation_Exchange );
 
 if (sTypeName.getLength())
 {
 if ( location == Descriptor.getLength() )
 {
 Descriptor.realloc(nLength+1);
-Descriptor[location].Name = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TypeName));
+Descriptor[location].Name = ::rtl::OUString( TypeName );
 }
 
 Descriptor[location].Value =sTypeName;
@@ -190,7 +190,7 @@ throw (RuntimeException)
 #ifdef DEBUG
 std::cerr  CMXImportFilter_getImplementationName  std::endl;
 #endif
-return OUString ( RTL_CONSTASCII_USTRINGPARAM ( 
com.sun.star.comp.Draw.CMXImportFilter ) );
+return OUString ( com.sun.star.comp.Draw.CMXImportFilter );
 }
 
 #define SERVICE_NAME1 com.sun.star.document.ImportFilter
@@ -211,8 +211,8 @@ throw (RuntimeException)
 #endif
 Sequence  OUString  aRet(2);
 OUString *pArray = aRet.getArray();
-pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM (

Change in core[master]: git-review integration: .gitreview for core repository added

2012-07-05 Thread Gerrit 
From James E. Blair cor...@gnu.org:

James E. Blair has posted comments on this change.

Change subject: git-review integration: .gitreview for core repository added
..


Patch Set 1: (3 inline comments)

Hi.  Hope you don't mind, I left a couple of inline comments.


File .gitreview
Line 2: host=logerrit
If you set this to 'gerrit.libreoffice.org', you won't need an ssh host alias 
(but then you might need to set the gerrit username either using git config or 
by manually entering it, if your username is different than your workstation 
login).  Even so, that strikes me as being preferable to requiring an ssh host 
alias.

Line 5: defaultremote=logerrit
This will cause git-review to use logerrit as the name of the git remote, 
instead of gerrit.  That's fine, but I'm curious why?

Line 6: defaultbranch=master
This should already be the default, but I guess it doesn't hurt.

--
To view, visit https://gerrit.libreoffice.org/262
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iecb72ef80f66f1d84a764bdc2629ad45f14acfe7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: James E. Blair cor...@gnu.org
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] .: .gitreview

2012-07-05 Thread Bjoern Michaelsen 
 .gitreview |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7a31136c0da182c53275d36c0a3aa8946e295197
Author: David Ostrovsky david.ostrov...@gmx.de
Date:   Fri Jul 6 00:24:46 2012 +0200

git-review integration: .gitreview for core repository added

Change-Id: Iecb72ef80f66f1d84a764bdc2629ad45f14acfe7

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..094c974
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,7 @@
+[gerrit]
+host=logerrit
+port=29418
+project=core
+defaultremote=logerrit
+defaultbranch=master
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Change in core[master]: git-review integration: .gitreview for core repository added

2012-07-05 Thread Gerrit 
From Björn Michaelsen bjoern.michael...@canonical.com:

Björn Michaelsen has posted comments on this change.

Change subject: git-review integration: .gitreview for core repository added
..


Patch Set 1: Looks good to me, but someone else must approve

(1 inline comment)


File .gitreview
Line 5: defaultremote=logerrit
We are already asking devs to setup an alias:
https://wiki.documentfoundation.org/Development/gerrit/setup

In the end you need to write something into your .ssh/config for nontrivial 
work anyway to set the port and the ssh key, so I used an alias there -- esp. 
to make direct use of the ssh logerrit gerrit ... easily possible for 
(nonscripted) ad-hoc actions.

--
To view, visit https://gerrit.libreoffice.org/262
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iecb72ef80f66f1d84a764bdc2629ad45f14acfe7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: James E. Blair cor...@gnu.org
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - sc/inc sc/source

2012-07-05 Thread Daniel Bankston 
 sc/inc/document.hxx   |3 ---
 sc/source/core/data/cell.cxx  |3 +--
 sc/source/core/data/documen2.cxx  |1 -
 sc/source/core/data/document.cxx  |1 -
 sc/source/filter/xml/xmlcelli.cxx |9 +++--
 sc/source/filter/xml/xmlimprt.cxx |8 +---
 sc/source/ui/docshell/docsh.cxx   |   14 +-
 7 files changed, 18 insertions(+), 21 deletions(-)

New commits:
commit 93319669a0c7892af96221bc1e832ba01c5e2d54
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Thu Jul 5 18:15:45 2012 -0500

Use cached formula results instead of recalculating

This commit undoes some of previous commit in attempt to be less hackish.
-When importing LibreOffice generated ODS documents, use cached formula
 results instead of always recalcuating.
-For other generators, do hard-recalc.

Still need to:
-Stop matrix formula cells from being set dirty to avoid recalculating them.
-Implement special cases for functions that should always be recalculated.

Change-Id: I959872aa2f446b80f9204ee26e94de7140f1f6f9

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7559a4e..b4df35b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -371,7 +371,6 @@ private:
 boolbInsertingFromOtherDoc;
 boolbLoadingMedium;
 boolbImportingXML;  // special handling of formula text
-boolbImportingLiboGenDoc; //to avoid recalculating formula 
results of libo generated docs
 boolbXMLFromWrapper;// distinguish ScXMLImportWrapper 
from external component
 boolbCalcingAfterLoad;  // in CalcAfterLoad 
TRUE
 // don't construct/destruct listeners temporarily
@@ -1564,8 +1563,6 @@ public:
 voidSetLoadingMedium( bool bVal );
 voidSetImportingXML( bool bVal );
 boolIsImportingXML() const { return bImportingXML; }
-voidSetImportingLiboGenDoc( bool bVal ) { bImportingLiboGenDoc 
= bVal; };
-boolIsImportingLiboGenDoc() const { return 
bImportingLiboGenDoc; }
 voidSetXMLFromWrapper( bool bVal );
 boolIsXMLFromWrapper() const { return bXMLFromWrapper; }
 voidSetCalcingAfterLoad( bool bVal ) { bCalcingAfterLoad = 
bVal; }
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 4d12292..338b0ab 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -1830,8 +1830,7 @@ void ScFormulaCell::SetDirty()
 
 void ScFormulaCell::SetDirtyVar()
 {
-if(!pDocument-IsImportingLiboGenDoc())
-bDirty = true;
+bDirty = true;
 // mark the sheet of this cell to be calculated
 //#FIXME do we need to revert this remnant of old fake vba events? 
pDocument-AddCalculateTable( aPos.Tab() );
 }
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 0921f20..2419859 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -188,7 +188,6 @@ ScDocument::ScDocument( ScDocumentMode  eMode,
 bInsertingFromOtherDoc( false ),
 bLoadingMedium( false ),
 bImportingXML( false ),
-bImportingLiboGenDoc( false ),
 bXMLFromWrapper( false ),
 bCalcingAfterLoad( false ),
 bNoListening( false ),
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 475a49f..b5e5cc1 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3410,7 +3410,6 @@ void ScDocument::CompileXML()
 if ( pValidationList )
 pValidationList-CompileXML();
 
-SetDirty();
 SetAutoCalc( bOldAutoCalc );
 }
 
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index fac8481..86c7034 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -757,8 +757,7 @@ void ScXMLTableRowCellContext::AddTextCellToDoc( const 
ScAddress rCurrentPos,
 pFCell-SetHybridString( *pOUText );
 else
 bDoIncrement = false;
-if(rXMLImport.GetDocument()-IsImportingLiboGenDoc())
-pFCell-ResetDirty();
+pFCell-ResetDirty();
 }
 }
 else
@@ -793,8 +792,7 @@ void ScXMLTableRowCellContext::AddNumberCellToDoc( const 
ScAddress rCurrentPos
 {
 ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
 pFCell-SetHybridDouble( fValue );
-if(rXMLImport.GetDocument()-IsImportingLiboGenDoc())
-pFCell-ResetDirty();
+pFCell-ResetDirty();
 }
 }
 else
@@ -1025,8 +1023,7 @@ void ScXMLTableRowCellContext::AddNonMatrixFormulaCell( 
const ScAddress rCellPo
 pFCell-SetHybridString( *pOUTextValue );
 else
 pFCell-SetHybridDouble( fValue );
-

[Libreoffice-commits] .: 2 commits - sc/qa sc/source

2012-07-05 Thread Markus Mohrhard 
 sc/qa/unit/data/xlsx/singlecontrol.xlsx |binary
 sc/qa/unit/subsequent_filters-test.cxx  |   33 
 sc/source/ui/view/gridwin.cxx   |9 ++--
 3 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit c433fa0639ccf5caeb0c128c8a3794322e2a1c81
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Jul 6 02:04:44 2012 +0200

adjust the calculation of the cursor pos if ALT is used, fdo#48869

Change-Id: I6316717c860d999270aa7f0fb50af5f6dfc7efd7

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6187397..c98b89e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4113,6 +4113,9 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* 
pTransObj, SCCOL nDestPos
 String aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE 
: STR_UNDO_COPY );
 pDocSh-GetUndoManager()-EnterListAction( aUndo, aUndo );
 
+SCsCOL nCorrectCursorPosCol = 0;
+SCsROW nCorrectCursorPosRow = 0;
+
 bDone = sal_True;
 if ( meDragInsertMode != INS_NONE )
 {
@@ -4126,11 +4129,13 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* 
pTransObj, SCCOL nDestPos
  nDestPosX == aSource.aStart.Col()  
nDestPosY  aSource.aStart.Row() )
 {
 bDone = aSource.Move( 0, nSizeY, 0, pSourceDoc 
);
+nCorrectCursorPosRow = nSizeY;
 }
 else if ( meDragInsertMode == INS_CELLSRIGHT 
   nDestPosY == aSource.aStart.Row()  
nDestPosX  aSource.aStart.Col() )
 {
 bDone = aSource.Move( nSizeX, 0, 0, pSourceDoc 
);
+nCorrectCursorPosCol = nSizeX;
 }
 }
 pDocSh-UpdateOle( pViewData );
@@ -4189,8 +4194,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* 
pTransObj, SCCOL nDestPos
 {
 pView-MarkRange( aDest, false, false );
 
-SCCOL nDCol = pViewData-GetCurX() - aSource.aStart.Col();
-SCROW nDRow = pViewData-GetCurY() - aSource.aStart.Row();
+SCCOL nDCol = pViewData-GetCurX() - aSource.aStart.Col() 
+ nCorrectCursorPosCol;
+SCROW nDRow = pViewData-GetCurY() - aSource.aStart.Row() 
+ nCorrectCursorPosRow;
 pView-SetCursor( aDest.aStart.Col() + nDCol, 
aDest.aStart.Row() + nDRow );
 }
 
commit dd209b77391903cb6f9f04c44e10a05f31076f4a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Jul 6 02:04:21 2012 +0200

add a import test for control shapes

Change-Id: I2ac5e1bdd1c681c8ba58edded3ab1b57ac30c512

diff --git a/sc/qa/unit/data/xlsx/singlecontrol.xlsx 
b/sc/qa/unit/data/xlsx/singlecontrol.xlsx
new file mode 100644
index 000..513c05b
Binary files /dev/null and b/sc/qa/unit/data/xlsx/singlecontrol.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 62a9970..2fab37a 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -45,6 +45,12 @@
 #include dbdata.hxx
 #include validat.hxx
 
+#include com/sun/star/drawing/XDrawPageSupplier.hpp
+#include com/sun/star/drawing/XControlShape.hpp
+#include com/sun/star/sheet/XSpreadsheetDocument.hpp
+#include com/sun/star/container/XIndexAccess.hpp
+#include com/sun/star/frame/XModel.hpp
+
 #define CALC_DEBUG_OUTPUT 0
 #define TEST_BUG_FILES 0
 
@@ -127,6 +133,8 @@ public:
 void testPasswordNew();
 void testPasswordOld();
 
+//test shape import
+void testControlImport();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testRangeNameXLS);
@@ -154,6 +162,7 @@ public:
 #endif
 CPPUNIT_TEST(testSharedFormulaXLSX);
 CPPUNIT_TEST(testCellValueXLSX);
+CPPUNIT_TEST(testControlImport);
 
 //disable testPassword on MacOSX due to problems with libsqlite3
 //also crashes on DragonFly due to problems with nss/nspr headers
@@ -1060,6 +1069,30 @@ void ScFiltersTest::testPasswordOld()
 testPassword_Impl(aFileNameBase);
 }
 
+void ScFiltersTest::testControlImport()
+{
+const rtl::OUString 
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(singlecontrol.));
+rtl::OUString aFileExtension(aFileFormats[XLSX].pName, 
strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 );
+rtl::OUString aFilterName(aFileFormats[XLSX].pFilterName, 
strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ;
+rtl::OUString aFileName;
+createFileURL(aFileNameBase, aFileExtension, aFileName);
+rtl::OUString aFilterType(aFileFormats[XLSX].pTypeName,

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

2012-07-05 Thread Markus Mohrhard 
 sc/source/ui/view/gridwin.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit f99a10d45331c8f007fd521880e7a61546c02fb8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Jul 6 02:04:44 2012 +0200

adjust the calculation of the cursor pos if ALT is used, fdo#48869

Change-Id: I6316717c860d999270aa7f0fb50af5f6dfc7efd7

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 40e8f38..64555e6 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4114,6 +4114,9 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* 
pTransObj, SCCOL nDestPos
 String aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE 
: STR_UNDO_COPY );
 pDocSh-GetUndoManager()-EnterListAction( aUndo, aUndo );
 
+SCsCOL nCorrectCursorPosCol = 0;
+SCsROW nCorrectCursorPosRow = 0;
+
 bDone = sal_True;
 if ( meDragInsertMode != INS_NONE )
 {
@@ -4127,11 +4130,13 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* 
pTransObj, SCCOL nDestPos
  nDestPosX == aSource.aStart.Col()  
nDestPosY  aSource.aStart.Row() )
 {
 bDone = aSource.Move( 0, nSizeY, 0, pSourceDoc 
);
+nCorrectCursorPosRow = nSizeY;
 }
 else if ( meDragInsertMode == INS_CELLSRIGHT 
   nDestPosY == aSource.aStart.Row()  
nDestPosX  aSource.aStart.Col() )
 {
 bDone = aSource.Move( nSizeX, 0, 0, pSourceDoc 
);
+nCorrectCursorPosCol = nSizeX;
 }
 }
 pDocSh-UpdateOle( pViewData );
@@ -4190,8 +4195,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* 
pTransObj, SCCOL nDestPos
 {
 pView-MarkRange( aDest, false, false );
 
-SCCOL nDCol = pViewData-GetCurX() - aSource.aStart.Col();
-SCROW nDRow = pViewData-GetCurY() - aSource.aStart.Row();
+SCCOL nDCol = pViewData-GetCurX() - aSource.aStart.Col() 
+ nCorrectCursorPosCol;
+SCROW nDRow = pViewData-GetCurY() - aSource.aStart.Row() 
+ nCorrectCursorPosRow;
 pView-SetCursor( aDest.aStart.Col() + nDCol, 
aDest.aStart.Row() + nDRow );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/template-dialog' - 4 commits - sfx2/inc sfx2/source

2012-07-05 Thread Rafael Dominguez 
 sfx2/inc/sfx2/templatefolderview.hxx   |2 
 sfx2/source/control/templatefolderview.cxx |   73 +
 sfx2/source/doc/templatedlg.cxx|   14 +
 3 files changed, 70 insertions(+), 19 deletions(-)

New commits:
commit 551948e6239926c414e2f26c95d0a71f7b88a355
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Thu Jul 5 20:14:00 2012 -0430

Fix moving templates between folders.

Change-Id: I1befe0add1bdff518c4553a8116d4fed235fd1b8

diff --git a/sfx2/source/control/templatefolderview.cxx 
b/sfx2/source/control/templatefolderview.cxx
index 4f39428..022fb47 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -519,17 +519,18 @@ bool TemplateFolderView::moveTemplates(std::setconst 
ThumbnailViewItem * rIte
 std::setconst ThumbnailViewItem*::iterator aSelIter;
 for ( aSelIter = rItems.begin(); aSelIter != rItems.end(); ++aSelIter )
 {
+const TemplateViewItem *pViewItem = static_castconst 
TemplateViewItem*(*aSelIter);
+
 sal_uInt16 nTargetRegion = pTarget-mnId-1;
-sal_uInt16 nTargetIdx = pTarget-maTemplates.back()-mnId; // Last 
Assigned in filesystem is mnId-1
+sal_uInt16 nTargetIdx = mpDocTemplates-GetCount(nTargetRegion);   
 // Next Idx
 
-if 
(!mpDocTemplates-Move(nTargetRegion,nTargetIdx,mpItemView-getRegionId(),(*aSelIter)-mnId-1))
+if 
(!mpDocTemplates-Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem-mnId-1))
 {
 ret = false;
 continue;
 }
 
 // move template to destination
-const TemplateViewItem *pViewItem = static_castconst 
TemplateViewItem*(*aSelIter);
 
 TemplateViewItem *pTemplateItem = new 
TemplateViewItem(*mpItemView,mpItemView);
 pTemplateItem-mnId = nTargetIdx + 1;
commit 2691b4db8242aa82c7c77a54902ae112fae635d0
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Thu Jul 5 19:44:40 2012 -0430

Display all folders even if theyre empty.

Change-Id: I3b7db9adf513d0c3aa8c70c7f6edc5b690504eff

diff --git a/sfx2/source/control/templatefolderview.cxx 
b/sfx2/source/control/templatefolderview.cxx
index 1035944..4f39428 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -288,15 +288,15 @@ void TemplateFolderView::Populate ()
 aRegionName += ...;
 }
 
+TemplateFolderViewItem* pItem = new TemplateFolderViewItem( *this, 
this );
+pItem-mnId = i+1;
+pItem-maText = aRegionName;
+pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnFolderSelected));
+
 sal_uInt16 nEntries = mpDocTemplates-GetCount(i);
 
 if (nEntries)
 {
-TemplateFolderViewItem* pItem = new TemplateFolderViewItem( *this, 
this );
-pItem-mnId = i+1;
-pItem-maText = aRegionName;
-
pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnFolderSelected));
-
 /// Preview first 2 thumbnails for folder
 pItem-maPreview1 = 
lcl_fetchThumbnail(mpDocTemplates-GetPath(i,0),
THUMBNAIL_MAX_WIDTH*0.75,
@@ -328,9 +328,9 @@ void TemplateFolderView::Populate ()
 
 pItem-maTemplates.push_back(pTemplateItem);
 }
-
-mItemList.push_back(pItem);
 }
+
+mItemList.push_back(pItem);
 }
 
 CalculateItemPositions();
commit e1301a4087bcba029665a3a8dd99888470c980dc
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Thu Jul 5 18:55:41 2012 -0430

Implement move templates to a new region.

Change-Id: I57597a39e3af80e6e25f46eac17e888f99b5482a

diff --git a/sfx2/inc/sfx2/templatefolderview.hxx 
b/sfx2/inc/sfx2/templatefolderview.hxx
index ae5f6a1..dac804b 100644
--- a/sfx2/inc/sfx2/templatefolderview.hxx
+++ b/sfx2/inc/sfx2/templatefolderview.hxx
@@ -57,7 +57,7 @@ public:
 
 void setTemplateStateHdl (const Link aLink) { maTemplateStateHdl = aLink; 
}
 
-bool createRegion (const rtl::OUString rName, const std::setconst 
ThumbnailViewItem* rItems);
+sal_uInt16 createRegion (const rtl::OUString rName);
 
 bool removeTemplate (const sal_uInt16 nItemId);
 
diff --git a/sfx2/source/control/templatefolderview.cxx 
b/sfx2/source/control/templatefolderview.cxx
index fc9b372..1035944 100644
--- a/sfx2/source/control/templatefolderview.cxx
+++ b/sfx2/source/control/templatefolderview.cxx
@@ -36,6 +36,18 @@
 #define INIT_VIEW_COLS 3
 #define INIT_VIEW_LINES 1
 
+BitmapEx lcl_ScaleImg (const BitmapEx rImg, long width, long height)
+{
+BitmapEx aImg = rImg;
+
+int sWidth = std::min(aImg.GetSizePixel().getWidth(),width);
+int sHeight = std::min(aImg.GetSizePixel().getHeight(),height);
+
+aImg.Scale(Size(sWidth,sHeight),BMP_SCALE_INTERPOLATE);
+
+return aImg;
+}
+
 BitmapEx lcl_fetchThumbnail (const

[Bug 35673] LibreOffice 3.4 most annoying bugs

2012-07-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=35673

Bug 35673 depends on bug 45355, which changed state.

Bug 45355 Summary: CRASH if characters in text of BENGALI, TIBETAN, MALAYALAM, 
MARATHI, NEPALI, ORIYA, TAMIL, TELUGU
https://bugs.freedesktop.org/show_bug.cgi?id=45355

   What|Old Value   |New Value

 Resolution|WORKSFORME  |
 Status|RESOLVED|REOPENED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-07-05 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=6

Rainer Bielefeld libreoff...@bielefeldundbuss.de changed:

   What|Removed |Added

 Depends on||45355

--- Comment #38 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 
2012-07-05 22:34:34 PDT ---
Add Bug 45355 - CRASH if characters in text of BENGALI, TIBETAN, MALAYALAM,
MARATHI, NEPALI, ORIYA, TAMIL, TELUGU, KHMER, what reappeared from 3.4

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Writing extension with the SDK

2012-07-05 Thread Miklos Vajna 
On Thu, Jul 05, 2012 at 08:53:37PM +0200, Michael Stahl mst...@redhat.com 
wrote:
 Cedric, does your Eclipse plugin work with LO?

Yes, available at http://people.freedesktop.org/~cbosdo/ooeclipse/.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] minutes of the LibreOffice QA Call 2012-06-29 1400UTC

2012-07-05 Thread Rainer Bielefeld 



- NEEDINFO wrapup (Rainer)


Hi all,

I created a draft of a manual for a bulk close action on
http://wiki.documentfoundation.org/QA/MassCloseNeedinfoBugs

Please add you Ideas so that we finally get an optimum proceeding for 
the closing.


In between I Started to review NEEDINFO bugs reported by

jacobsallans...@gmail.com,  br...@canonical.com, 
libreoff...@bielefeldundbuss.de, lio...@mamane.lu, wp...@gte.net, 
bha...@gmail.com, bjoern.michael...@canonical.com, a6569...@nepwk.com, 
anonym...@dodgeit.com, ipla...@yahoo.co.uk, jgsylveste...@alumni.nd.edu,
olivier.hal...@documentfoundation.org, r...@debian.org, 
toddrme2...@gmail.com, d...@yost.com, jaxsonle...@gmail.com, 
nalimi...@club.fr, paolobe...@gmail.com, rb.hensc...@t-online.de, 
sergio.calleg...@gmail.com, st...@edmondsfamily.co.nz, 
tobias.bur...@physik.fu-berlin.de, ville...@t-online.de,
aguel...@pyrshep.ca, and...@laposte.net, baldti...@hotmail.com, 
guang.a.y...@intel.com, luchot...@gmail.com, r...@skolelinux.de, 
robert.down...@guardian-shield.com, yfji...@novell.com


who are active and / or experienced users.

Please feel invited to join this reviewing and to leave a short comment 
concerning your rewults on the wiki page.


Best regards

Rainer

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] [ANN] LibreOffice 3.5.5 RC3 available

2012-07-05 Thread Thorsten Behrens 
Dear Community,

The Document Foundation is happy to announce the third release
candidate of LibreOffice 3.5.5. The upcoming 3.5.5 will be the fifth
in a series of frequent bugfix releases for our 3.5 code line. Please
be aware that LibreOffice 3.5.5 RC3 is not yet ready for production
use, you should continue to use LibreOffice 3.5.4 for that.

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the beta quality is to run some specific manual
tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

 (and the announcement mail: 
http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html)
 
For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/get-involved/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/Translation_for_3.5

or help with funding our operations:

  http://challenge.documentfoundation.org/

A list of known issues and fixed bugs with 3.5.5 RC3 is available
from our wiki:

  https://wiki.documentfoundation.org/Releases/3.5.5/RC3

Please find the list of changes against LibreOffice 3.5.5 RC2 here:

  
http://download.documentfoundation.org/libreoffice/src/bugfixes-libreoffice-3-5-5-release-3.5.5.3.log

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

Yours,

The Document Foundation Board of Directors


pgpRhFV72jcAi.pgp
Description: PGP signature
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Crash screencasts

2012-07-05 Thread Michael Stahl 
hi bfo,

On 25/06/12 23:57, bfo wrote:
 Hi.
 Very interesting screencasts available at air mozilla:
 The Life Cycle of a Firefox Crash https://air.mozilla.org/crash-life-cycl/
 Mozilla CrashKill Investigation and Analysis
 https://air.mozilla.org/crashkill/

that is a very interesting video, i'd *love* to have something like this
Mozilla crash database/web UI running for LO as well (the Sun Hamburg
internal crash report web UI was a complete joke in comparison).

 Hope LibreOffice own crash reporter will be enabled soon...

yes, that would be great; but it requires somebody to put in the work to
set this up on some server.

also, the crash reporter in the LO codebase will probably need to be
adapted to write the format that the Mozilla thing can understand, but
that should be doable very quickly i hope.

until that happens we'll have to make do with Linux distribution tools
like ABRT which naturally don't work on upstream Mac/Windows builds.

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

  1   2   3   >