date:20130321

Re: Code pointers for replace HSQLDB for Firebird

2013-03-21 Thread David Ostrovsky

On Wed, 2013-03-20 at 22:44 -0300, Marcos Souza wrote:
 Hi guys!
 
 
 As suggested by Cecric and Muthu, I'm here to ask some code pointers
 to work in the HSQLDB replacement for Firebird.
 
 
 I'm reading https://bugs.freedesktop.org/show_bug.cgi?id=51781 from
 Lionel, and trying to understand what needs to be done to achieve
 this, but some code pointers are better!

You find tons of documentation in this bug description
https://bugs.freedesktop.org/show_bug.cgi?id=51780

To be frankly i would divide that task in 2:
1. create native connectivity driver for Firebird.
2. default to Firebird driver.

In connectivity/source/drivers you can find the current drivers.
Your best choice would be to follow the newest postgresql driver.

First steps would be:
1. create a git/gerrit branch, say feature/firebird
2. include firebird in our build machinery, start with system one, and
add internal one later:
 sudo zypper search firebird | grep devel
 firebird-devel | UDF suppperaoort library for Firebird SQL server
 (if you need help with setting things up, just ask on that list)
3. create small cpp unit test that does some CRUD operations against
firebird and include it in the build process, so 
 make CppunitTest_connectivity_firebird
just works (check manually that it really did with isql ;-).
4. create FServices, FDriver, FConnection, FStatement, FTables...
classes for the native driver.
5. ask again at this point ;-)

David

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

[PATCH] Don't complain about missing colon in empty DSN

2013-03-21 Thread Mathias Hasselmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2885

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2885/1

Don't complain about missing colon in empty DSN

Empty datasource names occur with the datasource wizard's first page
when no datasource type has been selected yet.

Change-Id: I9bcd025aab046e6cb79db47564f55ae3f0faed55
---
M dbaccess/source/core/misc/dsntypes.cxx
1 file changed, 6 insertions(+), 2 deletions(-)



diff --git a/dbaccess/source/core/misc/dsntypes.cxx 
b/dbaccess/source/core/misc/dsntypes.cxx
index 77814e5..0c02d64 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -342,8 +342,12 @@
 sal_Int32 nSeparator = sDsn.indexOf(static_castsal_Unicode(':'));
 if (-1 == nSeparator)
 {
-// there should be at least one such separator
-OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the colon 
!);
+if (!sDsn.isEmpty())
+{
+// there should be at least one such separator
+OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the 
colon !);
+}
+
 return DST_UNKNOWN;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bcd025aab046e6cb79db47564f55ae3f0faed55
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com

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

Build failure on master with Linux 32 bit in localize.cxx

2013-03-21 Thread Alex Thurgood

Hi all,


FYI

As of last night, I'm now getting a build failure in localize.cxx with
my build from master, both on make dev-install, and after make clean/make :

[build CXX] l10ntools/source/localize.cxx
[build CXX] l10ntools/source/propmerge.cxx
/home/Development/libo/core/l10ntools/source/localize.cxx: In function
‘void {anonymous}::handleFilesOfDir(std::vectorrtl::OUString, const
rtl::OString, const rtl::OString, const rtl::OString)’:
/home/Development/libo/core/l10ntools/source/localize.cxx:287:55:
erreur: ignoring return value of ‘int system(const char*)’, declared
with attribute warn_unused_result [-Werror=unused-result]
cc1plus: all warnings being treated as errors
make[1]: ***
[/home/Development/libo/core/workdir/unxlngi6.pro/CxxObject/l10ntools/source/localize.o]
Erreur 1


Alex

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

[Libreoffice-commits] core.git: dbaccess/source

2013-03-21 Thread Mathias Hasselmann

 dbaccess/source/core/misc/dsntypes.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 4f6514eb0904f79b7c2db0958dc580bcf716911c
Author: Mathias Hasselmann math...@openismus.com
Date:   Wed Mar 20 00:33:03 2013 +0100

Don't complain about missing colon in empty DSN

Empty datasource names occur with the datasource wizard's first page
when no datasource type has been selected yet.

Change-Id: I9bcd025aab046e6cb79db47564f55ae3f0faed55
Reviewed-on: https://gerrit.libreoffice.org/2885
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/dbaccess/source/core/misc/dsntypes.cxx 
b/dbaccess/source/core/misc/dsntypes.cxx
index 77814e5..0c02d64 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -342,8 +342,12 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const 
OUString _rDsn) const
 sal_Int32 nSeparator = sDsn.indexOf(static_castsal_Unicode(':'));
 if (-1 == nSeparator)
 {
-// there should be at least one such separator
-OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the colon 
!);
+if (!sDsn.isEmpty())
+{
+// there should be at least one such separator
+OSL_FAIL(ODsnTypeCollection::implDetermineType : missing the 
colon !);
+}
+
 return DST_UNKNOWN;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LibreOffice 3.6.6 RC1 test builds available

2013-03-21 Thread Fridrich Strba

Hi *,

for the upcoming new version 3.6.6, the RC1 builds now start to be
available on pre-releases. This build is slated to be first release
candidate build on the way towards 3.6.6, 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.

NOTE: This build is in a release configuration and _will_ replace your
existing LibreOffice install on Windows.

The list of fixed bugs relative to 3.6.5 is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-3-6-6-release-3.6.6.1.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

[PUSHED] Don't complain about missing colon in empty DSN

2013-03-21 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2885

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bcd025aab046e6cb79db47564f55ae3f0faed55
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] core.git: connectivity/Library_tdeab1.mk

2013-03-21 Thread Timothy Pearson

 connectivity/Library_tdeab1.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3e33adc4b09c38f95adc1761cc444c938ce22370
Author: Timothy Pearson kb9...@pearsoncomputing.net
Date:   Wed Mar 20 22:51:14 2013 +

Fix single core builds when TDE integration is enabled

Change-Id: I3a28d843e567db2a905125424615cba0bd28c7b4
Reviewed-on: https://gerrit.libreoffice.org/2882
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 59f2f80..94bafe5 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -33,6 +33,10 @@ $(eval $(call gb_Library_use_externals,tdeab1,\
 
 $(eval $(call 
gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1))
 
+$(eval $(call gb_Library_use_packages,tdeab1,\
+shell_inc \
+))
+
 $(eval $(call gb_Library_set_include,tdeab1,\
-I$(SRCDIR)/connectivity/source/inc \
$$(INCLUDE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Fix single core builds when TDE integration is enabled

2013-03-21 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2882

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a28d843e567db2a905125424615cba0bd28c7b4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Timothy Pearson kb9...@pearsoncomputing.net
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] core.git: sd/source

2013-03-21 Thread Urs Fässler

 sd/source/core/stlsheet.cxx  |  113 +--
 sd/source/filter/eppt/eppt.cxx   |6 +-
 sd/source/filter/eppt/epptso.cxx |9 +--
 3 files changed, 48 insertions(+), 80 deletions(-)

New commits:
commit 08416ff716119dca888087bd38fd9662f4e85f7a
Author: Urs FÃ¤ssler u...@bitzgi.ch
Date:   Thu Mar 21 09:12:38 2013 +0100

translated last missed german comments in sd/

Change-Id: I48102b5e4d41ba786e9f9476b480715d5756ab87

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index bb0e558..ccd29d8 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -144,7 +144,7 @@ SdStyleSheet::SdStyleSheet( const SdStyleSheet  r )
 SdStyleSheet::~SdStyleSheet()
 {
 delete pSet;
-pSet = NULL;// damit nachfolgende Destruktoren eine Chance haben
+pSet = NULL;// that following destructors also get a change
 }
 
 void SdStyleSheet::SetApiName( const OUString rApiName )
@@ -165,31 +165,19 @@ void SdStyleSheet::Load (SvStream rIn, sal_uInt16 
nVersion)
 {
 SfxStyleSheetBase::Load(rIn, nVersion);
 
-// Die Default-Maske war frueher 0xAFFE.
-// Aus dieser Default-Maske wurden die benoetigten Flags ausmaskiert.
-// Nun wurde das Flag SFXSTYLEBIT_READONLY eingefuehrt, was dazu
-// das alle StyleSheets read-only waren.
-// Da im Draw kein StyleSheet read-only sein soll, wird an dieser Stelle
-// das Flag zurueckgesetzt.
+/* previously, the default mask was 0xAFFE. The needed flags were masked
+   from this mask. Now the flag SFXSTYLEBIT_READONLY was introduced and 
with
+   this, all style sheets are read only. Since no style sheet should be 
read
+   only in Draw, we reset the flag here.  */
 nMask = ~SFXSTYLEBIT_READONLY;
 }
 
-/*
-|*
-|* Store
-|*
-\/
 
 void SdStyleSheet::Store(SvStream rOut)
 {
 SfxStyleSheetBase::Store(rOut);
 }
 
-/*
-|*
-|* Parent setzen
-|*
-\/
 
 bool SdStyleSheet::SetParent(const String rParentName)
 {
@@ -197,7 +185,7 @@ bool SdStyleSheet::SetParent(const String rParentName)
 
 if (SfxStyleSheet::SetParent(rParentName))
 {
-// PseudoStyleSheets haben keine eigenen ItemSets
+// PseudoStyleSheets do not have their own ItemSets
 if (nFamily != SD_STYLE_FAMILY_PSEUDO)
 {
 if( rParentName.Len() )
@@ -226,17 +214,14 @@ bool SdStyleSheet::SetParent(const String rParentName)
 return bResult;
 }
 
-/*
-|*
-|* ItemSet ggfs. erzeugen und herausreichen
-|*
-\/
-
+/**
+ * create if necessary and return ItemSets
+ */
 SfxItemSet SdStyleSheet::GetItemSet()
 {
 if (nFamily == SD_STYLE_FAMILY_GRAPHICS || nFamily == 
SD_STYLE_FAMILY_MASTERPAGE)
 {
-// ggfs. das ItemSet 'on demand' anlegen
+// we create the ItemSet 'on demand' if necessary
 if (!pSet)
 {
 sal_uInt16 nWhichPairTable[] = { XATTR_LINE_FIRST,  
XATTR_LINE_LAST,
@@ -288,8 +273,8 @@ SfxItemSet SdStyleSheet::GetItemSet()
 return *pSet;
 }
 
-// dies ist eine Stellvertretervorlage fuer die interne Vorlage des
-// aktuellen Praesentationslayouts: dessen ItemSet returnieren
+// this is a dummy template for the internal template of the
+// current presentation layout; return the ItemSet of that template
 else
 {
 
@@ -329,13 +314,10 @@ SfxItemSet SdStyleSheet::GetItemSet()
 }
 }
 
-/*
-|*
-|* IsUsed(), eine Vorlage gilt als benutzt, wenn sie von eingefuegten Objekten
-|*   oder von benutzten Vorlagen referenziert wird
-|*
-\/
-
+/**
+ * A template is used when it is referenced by inserted object or by a used
+ * template.
+ */
 bool SdStyleSheet::IsUsed() const
 {
 bool bResult = false;
@@ -378,12 +360,9 @@ bool SdStyleSheet::IsUsed() const
 return bResult;
 }
 
-/*
-|*
-|* das StyleSheet ermitteln, fuer das dieses StyleSheet steht
-|*
-\/
-
+/**
+ * Determine the style sheet for which this dummy is for.
+ */
 SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
 {
 OUString aRealStyle;
@@ -421,8 +400,8 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
 }
 else
 {
-// Noch keine Seite vorhanden
-// Dieses kann beim Aktualisieren vonDokumentvorlagen vorkommen
+

Openismus GmbH license statement

2013-03-21 Thread Murray Cumming

Here's the general licensing statement for contributions by Openismus
Gmbh to LibreOffice:

Our company preference is to  contribute code to open source projects
under the terms of that project's existing license.

Therefore, all contributions past, present, and future (while this
choice of project license is in place) made to LibreOffice from
Openismus GmbH are available under the terms of the the MPL and LGPLv3+
licenses.

-- 
Murray Cumming
Managing Director, Openismus GmbH
www.openismus.com

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

[Libreoffice-commits] core.git: sw/qa

2013-03-21 Thread David Ostrovsky

 sw/qa/complex/writer/VarFields.java |   97 
 1 file changed, 67 insertions(+), 30 deletions(-)

New commits:
commit bb59e2e22161fcf66e3c71f58f5b160a24c9
Author: David Ostrovsky da...@ostrovsky.org
Date:   Thu Mar 21 10:21:51 2013 +0100

fdo#55814 improve unit test

Change-Id: I1508cc13bc6f025e671fb0f942a700a37965e242

diff --git a/sw/qa/complex/writer/VarFields.java 
b/sw/qa/complex/writer/VarFields.java
index abc39d1..5cd69c7 100644
--- a/sw/qa/complex/writer/VarFields.java
+++ b/sw/qa/complex/writer/VarFields.java
@@ -17,13 +17,18 @@ import com.sun.star.lang.XServiceInfo;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.container.XEnumeration;
+import com.sun.star.container.XEnumerationAccess;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.container.XIndexAccess;
 import com.sun.star.frame.XStorable;
 import com.sun.star.util.XCloseable;
+import com.sun.star.util.XRefreshable;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextField;
 import com.sun.star.text.XTextFieldsSupplier;
+import com.sun.star.text.XTextSectionsSupplier;
 import com.sun.star.text.XTextRange;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextSection;
@@ -48,20 +53,8 @@ import java.net.URI;
 /**
  * This is the efforts to create a unit test to reproduce fdo#55814
  *
- * To preserve the document, set env var MY_TMP_PATH=file:///tmp/foo and run
- * make JunitTest_sw_complex, then check /tmp/foo/foo.odt.
- *
- * We still have problems programmatically reproduce the original bug 
fdo#61950:
- * 1. variable field is not shown
- *enter Enter and Remove or
- *toggle Invisible/Visible in writer solve it though =
- *0 is shown
- * 2. section is empty
  * TODO:
- * a) fill section with some text
- * b) trigger the value change event of the `foo` var from 0 to 1
- * c) retrieve the section and check that the condition get corrupted:
- *foo EQ 1 = 0
+ * create paragraph outside the section and check that recent fix really works
  **/
 
 public class VarFields
@@ -94,13 +87,7 @@ public class VarFields
 assertNotNull(could not get component context., m_xContext);
 m_xDoc = util.WriterTools.createTextDoc(m_xMSF);
 m_TmpDir = util.utils.getOfficeTemp/*Dir*/(m_xMSF);
-String myPath = System.getenv(MY_TMP_DIR);
-if (myPath != null  myPath.length()  0)
-{
-m_TmpDir = myPath;
-checkTmpDirExists(myPath);
-}
-m_FileName = m_TmpDir + File.separator + foo.odt;
+m_FileName = m_TmpDir + File.separator + VarFields.odt;
 System.out.println(file:  + m_FileName);
 }
 
@@ -119,11 +106,15 @@ public class VarFields
 }
 }
 
+// no paragraph after section: condition get corrupted
 @Test
-public void test_fdo_55814() throws Exception
+public void test_fdo_55814_still_problem_create_new_bz_for_that() throws 
Exception
 {
+// create MSF
 XMultiServiceFactory xDocFactory = 
UnoRuntime.queryInterface(XMultiServiceFactory.class, m_xDoc);
+// create body
 XText xBodyText = m_xDoc.getText();
+// create cursor
 XTextCursor xCursor = xBodyText.createTextCursor();
 // 0. create text field
 Object xField = 
xDocFactory.createInstance(com.sun.star.text.textfield.SetExpression);
@@ -131,10 +122,9 @@ public class VarFields
 XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, 
xField);
 xPropSet.setPropertyValue(Content, 0);
 xPropSet.setPropertyValue(IsVisible, true);
-xPropSet.setPropertyValue(Hint, trying to reproduce fdo#61950);
+xPropSet.setPropertyValue(Hint, trying to reproduce fdo#55814);
 xPropSet.setPropertyValue(SubType, 0);// VAR
 xPropSet.setPropertyValue(Value, 0.0);
-xPropSet.setPropertyValue(Content, 0);
 // 2. create master field
 Object xMaster = 
xDocFactory.createInstance(com.sun.star.text.fieldmaster.SetExpression);
 xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xMaster);
@@ -145,9 +135,6 @@ public class VarFields
 // 5. connect real field to the master
 xDependentTextField.attachTextFieldMaster(xPropSet);
 // 6. insert text field into the document
-
-// TODO: field is no shown (0 is expected). UNO bug?
-
 xBodyText.insertTextContent(xCursor, 
UnoRuntime.queryInterface(XTextContent.class, xField), false);
 // 7. retrieve paragraph cursor
 XParagraphCursor xParagraphCursor = 
UnoRuntime.queryInterface(XParagraphCursor.class, xCursor);
@@ -163,13 +150,63 @@ public class VarFields
 xPropSet.setPropertyValue(IsVisible, false);
 Object readContent = xPropSet.getPropertyValue(Condition);
 assertEquals(foo EQ 1,

[PATCH] Add builder support for a few dbaui controls

2013-03-21 Thread Mathias Hasselmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2886

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/2886/1

Add builder support for a few dbaui controls

This adds the needed methods and catalog definitions for
dbaui::OGenericAdministrationPage, dbaui::OpenDocumentButton
and dbaui::OpenDocumentListBox.

Change-Id: I5b883c39f1cb9623c357e5ebec1632816547ff03
---
M dbaccess/source/ui/control/opendoccontrols.cxx
M dbaccess/source/ui/dlg/adminpages.cxx
M dbaccess/source/ui/dlg/adminpages.hxx
M dbaccess/source/ui/inc/opendoccontrols.hxx
M extras/source/glade/libreoffice-catalog.xml.in
5 files changed, 51 insertions(+), 0 deletions(-)



diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx 
b/dbaccess/source/ui/control/opendoccontrols.cxx
index 1ae7fe7..907840e 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -38,6 +38,7 @@
 #include tools/urlobj.hxx
 #include svl/filenotation.hxx
 #include osl/diagnose.h
+#include vcl/builder.hxx
 
 //
 namespace dbaui
@@ -168,6 +169,19 @@
 }
 
 //
+OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char* 
_pAsciiModuleName )
+:PushButton( _pParent )
+{
+impl_init( _pAsciiModuleName );
+}
+
+//
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentButton( 
Window *pParent, VclBuilder::stringmap  )
+{
+return new OpenDocumentButton( pParent, 
com.sun.star.sdb.OfficeDatabaseDocument );
+}
+
+//
 void OpenDocumentButton::impl_init( const sal_Char* _pAsciiModuleName )
 {
 OSL_ENSURE( _pAsciiModuleName, OpenDocumentButton::impl_init: invalid 
module name! );
@@ -198,6 +212,19 @@
 }
 
 //
+OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const 
sal_Char* _pAsciiModuleName )
+:ListBox( _pParent, WB_BORDER | WB_DROPDOWN )
+{
+impl_init( _pAsciiModuleName );
+}
+
+//
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentListBox( 
Window *pParent, VclBuilder::stringmap  )
+{
+return new OpenDocumentListBox( pParent, 
com.sun.star.sdb.OfficeDatabaseDocument );
+}
+
+//
 void OpenDocumentListBox::impl_init( const sal_Char* _pAsciiModuleName )
 {
 OSL_ENSURE( _pAsciiModuleName, OpenDocumentListBox::impl_init: 
invalid module name! );
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx 
b/dbaccess/source/ui/dlg/adminpages.cxx
index 46840d8..27ce056 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -78,6 +78,19 @@
 }
 
 //-
+OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, 
const rtl::OString _rId, const rtl::OUString _rUIXMLDescription, const 
SfxItemSet _rAttrSet)
+:SfxTabPage(_pParent, _rId, _rUIXMLDescription, _rAttrSet)
+,m_abEnableRoadmap(sal_False)
+,m_pAdminDialog(NULL)
+,m_pItemSetHelper(NULL)
+,m_pFT_HeaderText(NULL)
+{
+DBG_CTOR(OGenericAdministrationPage,NULL);
+
+SetExchangeSupport(sal_True);
+}
+
+//-
 OGenericAdministrationPage::~OGenericAdministrationPage()
 {
 DELETEZ(m_pFT_HeaderText);
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx 
b/dbaccess/source/ui/dlg/adminpages.hxx
index 7e5dcdc..e9e11c8 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -109,6 +109,7 @@
 m_xORB;
 public:
 OGenericAdministrationPage(Window* _pParent, const ResId _rId, const 
SfxItemSet _rAttrSet);
+OGenericAdministrationPage(Window* _pParent, const rtl::OString _rId, 
const rtl::OUString _rUIXMLDescription, const SfxItemSet _rAttrSet);
 ~OGenericAdministrationPage();
 
 /// set a handler which gets called every time something on the page 
has been modified
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx 
b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 501e045..617476d 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -45,6 +45,7 @@
 
 public:
 OpenDocumentButton( Window* _pParent, const sal_Char* 
_pAsciiModuleName, const ResId _rResId );
+OpenDocumentButton( Window*

[PATCH] Remove ResId support for a few dbaui controls

2013-03-21 Thread Mathias Hasselmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2888

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2888/1

Remove ResId support for a few dbaui controls

This removes the ResId constructors of dbaui::OpenDocumentButton
and dbaui::OpenDocumentListBox.

Change-Id: Ib1d80a3ae7757c81ef0ee6f25ee24e91adce532d
---
M dbaccess/source/ui/control/opendoccontrols.cxx
M dbaccess/source/ui/inc/opendoccontrols.hxx
2 files changed, 0 insertions(+), 14 deletions(-)



diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx 
b/dbaccess/source/ui/control/opendoccontrols.cxx
index 907840e..41a458c 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -161,12 +161,6 @@
 //
 //= OpenButton
 //
-//
-OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char* 
_pAsciiModuleName, const ResId _rResId )
-:PushButton( _pParent, _rResId )
-{
-impl_init( _pAsciiModuleName );
-}
 
 //
 OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char* 
_pAsciiModuleName )
@@ -204,12 +198,6 @@
 //
 //= OpenDocumentListBox
 //
-//
-OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const 
sal_Char* _pAsciiModuleName, const ResId _rResId )
-:ListBox( _pParent, _rResId )
-{
-impl_init( _pAsciiModuleName );
-}
 
 //
 OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const 
sal_Char* _pAsciiModuleName )
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx 
b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 617476d..5e2edda 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -44,7 +44,6 @@
 ::rtl::OUString m_sModule;
 
 public:
-OpenDocumentButton( Window* _pParent, const sal_Char* 
_pAsciiModuleName, const ResId _rResId );
 OpenDocumentButton( Window* _pParent, const sal_Char* 
_pAsciiModuleName );
 
 protected:
@@ -64,7 +63,6 @@
 MapIndexToStringPairm_aURLs;
 
 public:
-OpenDocumentListBox( Window* _pParent, const sal_Char* 
_pAsciiModuleName, const ResId _rResId );
 OpenDocumentListBox( Window* _pParent, const sal_Char* 
_pAsciiModuleName );
 
 String  GetSelectedDocumentURL() const;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1d80a3ae7757c81ef0ee6f25ee24e91adce532d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com

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

[PATCH] Disable database wizard's next-button if needed

2013-03-21 Thread Mathias Hasselmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2889

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/2889/1

Disable database wizard's next-button if needed

This disables the database wizard's next-button if the current page cannot
advance yet. This is needed to prevent the wizard from crashing if next gets
pushed when no datasource type is selected yet.

Note that this patch is far from being complete: I am pretty sure that some
of the other datasource pages also could use a custom canAdvance() method.
I'll look at them when transforming the other pages to the UI builder format.

Change-Id: I7f9fc42e534aebf10f4db62e5ae095d04f9be3c7
---
M dbaccess/source/ui/dlg/dbwizsetup.cxx
M dbaccess/source/ui/dlg/generalpage.cxx
M dbaccess/source/ui/dlg/generalpage.hxx
3 files changed, 25 insertions(+), 4 deletions(-)



diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx 
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 5db7e5f..b0fe79d 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -375,7 +375,7 @@
 OSL_FAIL( ODbTypeWizDialogSetup::activateDatabasePath: unknown 
creation mode! );
 }
 
-enableButtons( WZB_NEXT, m_pGeneralPage-GetDatabaseCreationMode() != 
OGeneralPageWizard::eOpenExisting );
+enableButtons( WZB_NEXT, m_pGeneralPage-canAdvance() );
 // TODO: this should go into the base class. Point is, we activate a 
path whose *last*
 // step is also the current one. The base class should automatically 
disable
 // the Next button in such a case. However, not for this patch ...
@@ -597,9 +597,11 @@
 pPage-SetServiceFactory( m_pImpl-getORB() );
 pPage-SetAdminDialog(this, this);
 
-defaultButton( _nState == PAGE_DBSETUPWIZARD_FINAL ? WZB_FINISH : 
WZB_NEXT );
-enableButtons( WZB_FINISH, _nState == PAGE_DBSETUPWIZARD_FINAL );
-enableButtons( WZB_NEXT, _nState == PAGE_DBSETUPWIZARD_FINAL ? 
sal_False : sal_True);
+const bool bEnableFinish = _nState == PAGE_DBSETUPWIZARD_FINAL;
+const bool bEnableNext = !bEnableNext  pPage-canAdvance();
+defaultButton( bEnableFinish ? WZB_FINISH : WZB_NEXT);
+enableButtons( WZB_FINISH, bEnableFinish );
+enableButtons( WZB_NEXT, bEnableNext );
 pPage-Show();
 }
 return pPage;
@@ -670,6 +672,7 @@
 switch(_nState)
 {
 case PAGE_DBSETUPWIZARD_INTRO:
+enableButtons( WZB_NEXT, m_pGeneralPage-canAdvance() );
 m_sOldURL = m_sURL;
 break;
 case PAGE_DBSETUPWIZARD_FINAL:
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index 5117f2e..adca33c 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -634,6 +634,22 @@
 return 0L;
 }
 
+// ---
+bool OGeneralPageWizard::canAdvance() const
+{
+switch ( GetDatabaseCreationMode() )
+{
+case eConnectExternal:
+return !GetSelectedType().isEmpty();
+case eOpenExisting:
+return false;
+case eCreateNew:
+break;
+}
+
+return true;
+}
+
 //.
 }   // namespace dbaui
 //.
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx 
b/dbaccess/source/ui/dlg/generalpage.hxx
index a10e5ff..264b9bf 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -172,6 +172,8 @@
 voidSetChooseDocumentHandler( const Link 
_rHandler) { m_aChooseDocumentHandler = _rHandler; }
 DocumentDescriptor  GetSelectedDocument() const;
 
+virtual boolcanAdvance() const;
+
 protected:
 virtual sal_Bool FillItemSet( SfxItemSet _rCoreAttrs );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f9fc42e534aebf10f4db62e5ae095d04f9be3c7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mathias Hasselmann math...@openismus.com

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

[Libreoffice-commits] core.git: sc/source

2013-03-21 Thread Lennard Wasserthal

 sc/source/ui/drawfunc/fudraw.cxx |   15 +++
 sc/source/ui/drawfunc/futext.cxx |   22 --
 sc/source/ui/inc/fudraw.hxx  |1 +
 3 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit b71d3ad1fd71092e4cc85f5bb96b3bc3347e55d2
Author: Lennard Wasserthal wassert...@nefkom.net
Date:   Sun Mar 17 10:41:15 2013 +0100

fdo#55430 allowing click-from-textmode without causing fdo#61025

the last fix for #55430 caused #61025.
Markus Mohrhardt fixed that with by removing parts of the calc part
in 16f6ef0423cd0fd7c0e50ee28e8b32e72e21e090
I got it back where it causes no harm to the labels.

Change-Id: Ifb366a004701d7ec93b2e14dba850d500e60
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
Reviewed-on: https://gerrit.libreoffice.org/2786
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 59922ae..fc72d7b 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -768,6 +768,21 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
 }
 }
 
+sal_Bool FuDraw::IsEditingANote( const MouseEvent rMEvt ) const
+{
+const SdrMarkList rMarkList = pView-GetMarkedObjectList();
+sal_Int32 backval=rMarkList.GetMarkCount();
+for (sal_Int32 nlv1=0;nlv1backval;nlv1++)
+{
+SdrObject* pObj = rMarkList.GetMark( nlv1 )-GetMarkedSdrObj();
+if ( ScDrawLayer::IsNoteCaption( pObj ) )
+{
+return true;
+}
+}
+return false;
+}
+
 sal_Bool FuDraw::IsSizingOrMovingNote( const MouseEvent rMEvt ) const
 {
 sal_Bool bIsSizingOrMoving = false;
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 02d086a..70be824 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -132,9 +132,19 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent rMEvt)
 
 if ( pView-IsTextEdit() )
 {
-if( !IsSizingOrMovingNote(rMEvt) )
+if ( IsEditingANote(rMEvt) )
 {
-StopEditMode();// Danebengeklickt, Ende mit Edit
+if( !IsSizingOrMovingNote(rMEvt) )
+{
+StopEditMode();// Danebengeklickt, Ende mit Edit
+bStraightEnter = false;
+}
+}
+else
+{
+StopEditMode();// Clicked outside, ending edit.
+pView-UnmarkAll();
+bStraightEnter = false;
 }
 pView-SetCreateMode();
 }
@@ -322,6 +332,8 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent rMEvt)
 else if (pView-PickObj(aMDPos, pView-getHitTolLog(), 
pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_BEFOREMARK))
 {
 pView-UnmarkAllObj();
+ScViewData rViewData = *pViewShell-GetViewData();
+
rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | 
SFX_CALLMODE_RECORD);
 pView-MarkObj(pObj,pPV,false,false);
 
 pHdl=pView-PickHandle(aMDPos);
@@ -343,6 +355,12 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent rMEvt)
 
 pViewShell-SetActivePointer(pView-GetPreferedPointer(
 pWindow-PixelToLogic(rMEvt.GetPosPixel()), pWindow ));
+if (!bStraightEnter)
+{
+pView-UnmarkAll();
+ScViewData rViewData = *pViewShell-GetViewData();
+rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), 
SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
+}
 
 //  return (bReturn);
 return sal_True;
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index 158b032..fdff18a 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -49,6 +49,7 @@ class FuDraw : public FuPoor
 // II
 virtual void SelectionHasChanged();
 
+sal_Bool IsEditingANote( const MouseEvent rMEvt ) const;
 sal_Bool IsSizingOrMovingNote( const MouseEvent rMEvt ) const;
 
  private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#55430 allowing click-from-textmode without causing fdo#6...

2013-03-21 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2786

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb366a004701d7ec93b2e14dba850d500e60
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com

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

Re: fdo#55814: unit test is missing

2013-03-21 Thread David Ostrovsky

Hi Miklos,

On Mon, 2013-03-18 at 11:18 +0100, Miklos Vajna wrote:
 Hi David,
 
 On Sat, Mar 09, 2013 at 02:29:54PM +0100, David Ostrovsky 
 david.ostrov...@gmx.de wrote:
  I wonder why we don't have any unit test for that part of code?
 
 We do have one:
 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=10e02dfdffb5ef3a02a40b52c6cda176f7f4447c
 
 It's just not testing the case we have in fdo#55814.
 

Thank you for that pointer, the question was about programmatic creation
of such a document and not loading an existing one. Guys was laughing at
me that i am trying to create one ;-)

But it turns out, that only 21 steps are needed (well at least in java)
and here we go:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=bb59e2e22161fcf66e3c71f58f5b160a24c9

And yes i am going to migrate it to C++ as you argued that it would be
easier to debug then java. I wonder if it would make sense to establish
Python_test machinery in our build system to be able to write such and
many other tests in python instead and just say make Pytest_sw_complex
instead of make JunitTest_sw_complex (python have got unittest module
that we can start with)?

Last but not least, thank you, Michael Stahl and Stephan for helping me
to set it all up ;-)

David


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

[Libreoffice-commits] core.git: sc/source

2013-03-21 Thread Stephan Bergmann

 sc/source/ui/drawfunc/fudraw.cxx |2 +-
 sc/source/ui/drawfunc/futext.cxx |2 +-
 sc/source/ui/inc/fudraw.hxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7a09d361498abad7d4aba4762e569e27d39e15ad
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 21 09:41:16 2013 +0100

-Werror=unused-parameter

Change-Id: If9e6e4be2d4d0b22b636e355a9f00748cdeb2d55

diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index fc72d7b..64e8c89 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -768,7 +768,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
 }
 }
 
-sal_Bool FuDraw::IsEditingANote( const MouseEvent rMEvt ) const
+sal_Bool FuDraw::IsEditingANote() const
 {
 const SdrMarkList rMarkList = pView-GetMarkedObjectList();
 sal_Int32 backval=rMarkList.GetMarkCount();
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 70be824..75ec4bc 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -132,7 +132,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent rMEvt)
 
 if ( pView-IsTextEdit() )
 {
-if ( IsEditingANote(rMEvt) )
+if ( IsEditingANote() )
 {
 if( !IsSizingOrMovingNote(rMEvt) )
 {
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index fdff18a..2fba1ae 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -49,7 +49,7 @@ class FuDraw : public FuPoor
 // II
 virtual void SelectionHasChanged();
 
-sal_Bool IsEditingANote( const MouseEvent rMEvt ) const;
+sal_Bool IsEditingANote() const;
 sal_Bool IsSizingOrMovingNote( const MouseEvent rMEvt ) const;
 
  private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: NumericBox unsafe double conversion

2013-03-21 Thread Jan Holesovsky

Hi Tamás,

Zolnai Tamás píše v St 20. 03. 2013 v 22:33 +0100:


 Yes, I give it a try.

Great, thanks a lot! :-)

 I think the mentioned multiplication is in
 MetricField::ConvertDoubleValue(), which not need to change, as I see.

So whenever we are converting to and from double, there is the risk of
losing precision.  I guess the best would be to change
ConvertDoubleValue() to sal_Int64 too [and change the name
accordingly ;-)], and use BigInt (see tools/inc/tools/bigint.hxx) for
the computations not to overflow.

Though - looking at BigInt - I am afraid you will have to add
BigInt( long long nVal ) constructor in order to make 32bit
architectures happy when you provide them with sal_Int64.

Similarly, you will have to create an operator long long() const; that
would return the long long - and would do that even in the bIsBig case
when the value is larger than long, but still fits sal_Int64.

I am sorry this is getting complicated - but I believe this is a cleanup
that is still worth doing :-)

All the best,
Kendy


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

[Libreoffice-commits] core.git: sw/source

2013-03-21 Thread Julien Nabet

 sw/source/core/text/porglue.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc0111e5fdc9ecf991420e99b08260ed4f0d2bdb
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Mar 20 22:27:22 2013 +0100

coverity#704931 Explicit null dereferenced

Change-Id: I03fe61ace1ab408d51e93f1e447591bb4eb9449c
Reviewed-on: https://gerrit.libreoffice.org/2881
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index bceadd8..8ce717d 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -218,7 +218,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout 
*pCurr )
 }
 
 // Two adjoining FlyPortions are merged
-if( pRight  pLeft-GetPortion() == pRight )
+if( pRight  pLeft  pLeft-GetPortion() == pRight )
 {
 pRight-MoveAllGlue( pLeft );
 pRight = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] coverity#704931 Explicit null dereferenced

2013-03-21 Thread Noel Power (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2881

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I03fe61ace1ab408d51e93f1e447591bb4eb9449c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

Re: Code pointers for replace HSQLDB for Firebird

2013-03-21 Thread Lionel Elie Mamane

On Thu, Mar 21, 2013 at 08:26:42AM +0100, David Ostrovsky wrote:
 On Wed, 2013-03-20 at 22:44 -0300, Marcos Souza wrote:
  Hi guys!
  
  
  As suggested by Cecric and Muthu, I'm here to ask some code pointers
  to work in the HSQLDB replacement for Firebird.
  
  
  I'm reading https://bugs.freedesktop.org/show_bug.cgi?id=51781 from
  Lionel, and trying to understand what needs to be done to achieve
  this, but some code pointers are better!

 To be frankly i would divide that task in 2:
 1. create native connectivity driver for Firebird.
 2. default to Firebird driver.

I'd add another step between 1 and 2:

1.5: make Firebird embedded in LibreOffice
 subtasks:
   a) redirect Firebird to disk writes to our internal ZIP file
  structure; see how it is done for HSQLDB in

  connectivity/com/sun/star/sdbcx/comp/hsqldb/*.java
  connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
  connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
  connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx

  if that's not possible, write to some temporary file and
  copy that into our internal zip file structure. Can we do
  something intelligent based on mmapped files shared between
  process or some such on each platform?

   b) create sdbc scheme sdbc:embedded:firebird and have it
  recognised; git grep -i embedded|grep -i hsql will give
  you code pointers.

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

[Libreoffice-commits] core.git: sw/source

2013-03-21 Thread Philipp Riemer

 sw/source/core/access/acccontext.hxx  |   12 
 sw/source/core/access/accfootnote.hxx |9 +++--
 sw/source/core/access/accgraphic.hxx  |9 +++--
 sw/source/core/access/accheaderfooter.hxx |9 +++--
 sw/source/core/access/acctable.cxx|4 +---
 5 files changed, 14 insertions(+), 29 deletions(-)

New commits:
commit 75eec37886157e00bb5e176b1bc2aac958aac882
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Thu Mar 21 09:44:20 2013 +

reduce space needed by comments in sw/source/core

Change-Id: Ia9267c50a02acaa60d7514781384623bf17b23bd
Signed-off-by: Philipp Riemer ruderphil...@gmail.com

diff --git a/sw/source/core/access/acccontext.hxx 
b/sw/source/core/access/acccontext.hxx
index 5cdc305..95798fc 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -254,8 +254,7 @@ public:
 throw (::com::sun::star::uno::RuntimeException);
 
 /** Return the parents locale or throw exception if this object has no
-parent yet/anymore.
-*/
+parent yet/anymore. */
 virtual ::com::sun::star::lang::Locale SAL_CALL
 getLocale (void)
 throw 
(::com::sun::star::accessibility::IllegalAccessibleComponentStateException, 
::com::sun::star::uno::RuntimeException);
@@ -306,21 +305,18 @@ public:
 
 // XServiceInfo
 
-/** Returns an identifier for the implementation of this object.
-*/
+/** Returns an identifier for the implementation of this object. */
 virtual OUString SAL_CALL
 getImplementationName (void)
 throw (::com::sun::star::uno::RuntimeException);
 
-/** Return whether the specified service is supported by this class.
-*/
+/** Return whether the specified service is supported by this class. */
 virtual sal_Bool SAL_CALL
 supportsService (const OUString sServiceName)
 throw (::com::sun::star::uno::RuntimeException);
 
 /** Returns a list of all supported services.  In this case that is just
-the AccessibleContext service.
-*/
+the AccessibleContext service. */
 virtual ::com::sun::star::uno::Sequence OUString SAL_CALL
 getSupportedServiceNames (void)
  throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/accfootnote.hxx 
b/sw/source/core/access/accfootnote.hxx
index a2030db..123c32e 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -50,21 +50,18 @@ public:
 
 // XServiceInfo
 
-/** Returns an identifier for the implementation of this object.
-*/
+/** Returns an identifier for the implementation of this object. */
 virtual ::rtl::OUString SAL_CALL
 getImplementationName (void)
 throw (::com::sun::star::uno::RuntimeException);
 
-/** Return whether the specified service is supported by this class.
-*/
+/** Return whether the specified service is supported by this class. */
 virtual sal_Bool SAL_CALL
 supportsService (const ::rtl::OUString sServiceName)
 throw (::com::sun::star::uno::RuntimeException);
 
 /** Returns a list of all supported services.  In this case that is just
-the AccessibleContext service.
-*/
+the AccessibleContext service. */
 virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL
 getSupportedServiceNames (void)
 throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/accgraphic.hxx 
b/sw/source/core/access/accgraphic.hxx
index 11aa87c..a759531 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -34,21 +34,18 @@ public:
 
 // XServiceInfo
 
-/** Returns an identifier for the implementation of this object.
-*/
+/** Returns an identifier for the implementation of this object. */
 virtual ::rtl::OUString SAL_CALL
 getImplementationName (void)
 throw (::com::sun::star::uno::RuntimeException);
 
-/** Return whether the specified service is supported by this class.
-*/
+/** Return whether the specified service is supported by this class. */
 virtual sal_Bool SAL_CALL
 supportsService (const ::rtl::OUString sServiceName)
 throw (::com::sun::star::uno::RuntimeException);
 
 /** Returns a list of all supported services.  In this case that is just
-the AccessibleContext service.
-*/
+the AccessibleContext service. */
 virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL
 getSupportedServiceNames (void)
 throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/access/accheaderfooter.hxx 
b/sw/source/core/access/accheaderfooter.hxx
index e5f37a6..deb6d14 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -47,21 +47,18 @@ public:
 
 // XServiceInfo
 
-/** Returns an

[PUSHED] reduce space needed by comments in sw/source/core

2013-03-21 Thread Noel Power (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2880


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9267c50a02acaa60d7514781384623bf17b23bd
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer ruderphil...@gmail.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Lionel Elie Mamane

On Wed, Mar 20, 2013 at 05:45:30PM +0100, Andreas Radke wrote:
 We are running in a bug with the current package file lists making Calc
 and Base to fail to load without having Writer installed. Check

 https://bugs.archlinux.org/task/34332 and
 https://bugs.archlinux.org/task/34378.

 It turns out that Calc and Base now need 
 /usr/lib/libreoffice/share/registry/writer.xcd present on the system.

 Is this a wanted change or a bug?

Speaking of base, my guess is (but I'd be happy for a tester to
confirm) that one cannot (and never could) create / use any form or
report without Writer installed. So libreoffice-base should at least
recommend libreoffice-writer.

As to the does not run at all, for both Base and Calc, ideally it
would be nice to see *which* setting in writed.xcd they need, and
maybe migrate this to a common/base file?

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

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Rene Engelhard

Hi,

On Thu, Mar 21, 2013 at 10:53:42AM +0100, Lionel Elie Mamane wrote:
  It turns out that Calc and Base now need 
  /usr/lib/libreoffice/share/registry/writer.xcd present on the system.
 
  Is this a wanted change or a bug?
 
 Speaking of base, my guess is (but I'd be happy for a tester to
 confirm) that one cannot (and never could) create / use any form or
 report without Writer installed. So libreoffice-base should at least
 recommend libreoffice-writer.

Yeah, probably we should do that, will do in Debian.

 As to the does not run at all, for both Base and Calc, ideally it
 would be nice to see *which* setting in writed.xcd they need, and
 maybe migrate this to a common/base file?

Yes. I would not like making -base and -calc making it *depending* on writer
hard.

Regards,

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

[Libreoffice-commits] core.git: vcl/unx

2013-03-21 Thread Thorsten Behrens

 vcl/unx/generic/plugadapt/salplug.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf5e1575e81195d1931a6eadd15ab27cc39aadec
Author: Thorsten Behrens tbehr...@suse.com
Date:   Thu Mar 21 11:27:58 2013 +0100

Fix force-choosing gtk3 backend.

Extra parameter got lost in refactoring, if we set envvar, we *do*
want to try that backend.

Change-Id: Ib530a3a6b3e6ee33aab729ce7cd1f93e209d4513

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index 2dbd37f..dc8b586 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -214,7 +214,7 @@ SalInstance *CreateSalInstance()
 aUsePlugin = svp;
 
 if( !aUsePlugin.isEmpty() )
-pInst = tryInstance( aUsePlugin );
+pInst = tryInstance( aUsePlugin, true );
 
 if( ! pInst )
 pInst = autodetect_plugin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Code pointers for replace HSQLDB for Firebird

2013-03-21 Thread Marcos Souza

Hi David,


2013/3/21 David Ostrovsky d.ostrov...@idaia.de

 On Wed, 2013-03-20 at 22:44 -0300, Marcos Souza wrote:
  Hi guys!
 
 
  As suggested by Cecric and Muthu, I'm here to ask some code pointers
  to work in the HSQLDB replacement for Firebird.
 
 
  I'm reading https://bugs.freedesktop.org/show_bug.cgi?id=51781 from
  Lionel, and trying to understand what needs to be done to achieve
  this, but some code pointers are better!

 You find tons of documentation in this bug description
 https://bugs.freedesktop.org/show_bug.cgi?id=51780


 To be frankly i would divide that task in 2:
 1. create native connectivity driver for Firebird.
 2. default to Firebird driver.

 In connectivity/source/drivers you can find the current drivers.
 Your best choice would be to follow the newest postgresql driver.

 First steps would be:
 1. create a git/gerrit branch, say feature/firebird
 2. include firebird in our build machinery, start with system one, and
 add internal one later:
  sudo zypper search firebird | grep devel
  firebird-devel | UDF suppperaoort library for Firebird SQL server
  (if you need help with setting things up, just ask on that list)
 3. create small cpp unit test that does some CRUD operations against
 firebird and include it in the build process, so
  make CppunitTest_connectivity_firebird
 just works (check manually that it really did with isql ;-).
 4. create FServices, FDriver, FConnection, FStatement, FTables...
 classes for the native driver.
 5. ask again at this point ;-)


Thanks a lot for all this information! I'll read some code of postgresql
and try to understand that code.

After some read, I will ask again about the branch and others things!


Thanks again foe the detailed explanation!


 David




-- 
Att,

Marcos Paulo de Souza
Acadêmico de Ciencia da Computação - FURB - SC
Github: https://github.com/marcosps/
Uma vida sem desafios é uma vida sem razão
A life without challenges, is a non reason life
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Code pointers for replace HSQLDB for Firebird

2013-03-21 Thread Marcos Souza

Hi Lionel!


2013/3/21 Lionel Elie Mamane lio...@mamane.lu

 On Thu, Mar 21, 2013 at 08:26:42AM +0100, David Ostrovsky wrote:
  On Wed, 2013-03-20 at 22:44 -0300, Marcos Souza wrote:
   Hi guys!
  
  
   As suggested by Cecric and Muthu, I'm here to ask some code pointers
   to work in the HSQLDB replacement for Firebird.
  
  
   I'm reading https://bugs.freedesktop.org/show_bug.cgi?id=51781 from
   Lionel, and trying to understand what needs to be done to achieve
   this, but some code pointers are better!

  To be frankly i would divide that task in 2:
  1. create native connectivity driver for Firebird.
  2. default to Firebird driver.

 I'd add another step between 1 and 2:

 1.5: make Firebird embedded in LibreOffice
  subtasks:
a) redirect Firebird to disk writes to our internal ZIP file
   structure; see how it is done for HSQLDB in

   connectivity/com/sun/star/sdbcx/comp/hsqldb/*.java
   connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
   connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
   connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx

   if that's not possible, write to some temporary file and
   copy that into our internal zip file structure. Can we do
   something intelligent based on mmapped files shared between
   process or some such on each platform?

b) create sdbc scheme sdbc:embedded:firebird and have it
   recognised; git grep -i embedded|grep -i hsql will give
   you code pointers.


Thanks for all these code pointers! I will read them and after I will ask
again for some information!



 --
 Lionel




-- 
Att,

Marcos Paulo de Souza
Acadêmico de Ciencia da Computação - FURB - SC
Github: https://github.com/marcosps/
Uma vida sem desafios é uma vida sem razão
A life without challenges, is a non reason life
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 6 commits - configure.ac openssl/ExternalProject_openssl.mk sal/osl solenv/gbuild tools/inc tools/source

2013-03-21 Thread Tor Lillqvist

 configure.ac|4 +++-
 openssl/ExternalProject_openssl.mk  |2 +-
 sal/osl/w32/profile.cxx |2 +-
 solenv/gbuild/platform/com_MSC_class.mk |8 +++-
 solenv/gbuild/platform/com_MSC_defs.mk  |7 ++-
 tools/inc/tools/stream.hxx  |3 ++-
 tools/source/stream/strmwnt.cxx |5 -
 7 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit 9477760a38416ef3e50781cc2821a3b1600a6d65
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Mar 21 13:07:07 2013 +0200

Typo

Change-Id: I32c5bc1736305d38fb86b1b8af7606ac6c7f0dd0

diff --git a/openssl/ExternalProject_openssl.mk 
b/openssl/ExternalProject_openssl.mk
index 891dd71..010d2ca 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -31,7 +31,7 @@ OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD 
ANDROID,$(OS)),\
$(if $(filter GCC,$(COM)),\
mingw,\
$(if $(filter I,$(CPU)),\
-   VC-WIN32,VC_WIN64A))
+   VC-WIN32,VC-WIN64A))
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,openssl,build):
commit 9bd80d67de3d76ba89a4eed7c53cb9534a49dbc9
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Mar 21 12:51:02 2013 +0200

The private SvFileStream::GetFileHandle() was used only on UNX

Drop the Windows implementation which wasn't x64-clean anyway.

Change-Id: I1622196dc4c3b940cc8d629016985cf97480a059

diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index f157f90..25e2a732 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -659,8 +659,9 @@ private:
 String  aFilename;
 sal_uInt16  nLockCounter;
 sal_BoolbIsOpen;
+#ifdef UNX
 sal_uInt32  GetFileHandle() const;
-
+#endif
 // Forbidden and not implemented.
 SvFileStream (const SvFileStream);
 SvFileStream  operator= (const SvFileStream);
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index 1d7dfb2..800dae1 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -133,11 +133,6 @@ SvFileStream::~SvFileStream()
 delete pInstanceData;
 }
 
-sal_uIntPtr SvFileStream::GetFileHandle() const
-{
-return (sal_uIntPtr)pInstanceData-hFile;
-}
-
 sal_uInt16 SvFileStream::IsA() const
 {
 return ID_FILESTREAM;
commit 0e07da84299bb48dfc232c2888d176fa558ff58b
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Mar 21 12:30:13 2013 +0200

Use BOOST_MEM_FN_ENABLE_CDECL only for x86

Change-Id: I3f752678f72260d5e481a71164a30cfc96807034

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 6027c94..2466422 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -55,10 +55,15 @@ gb_COMPILERDEFS := \
-D_CRT_SECURE_NO_DEPRECATE \
-D_MT \
-D_DLL \
-   -DBOOST_MEM_FN_ENABLE_CDECL \
-DCPPU_ENV=$(gb_CPPU_ENV) \
-DM1500 \
 
+ifeq ($(CPUNAME),INTEL)
+gb_COMPILERDEFS += \
+   -DBOOST_MEM_FN_ENABLE_CDECL \
+
+endif
+
 gb_RCDEFS := \
 -DWINVER=0x0400 \
 -DWIN32 \
commit 433672d1f4b9198fef362690b195f47822111e21
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Mar 21 12:28:53 2013 +0200

Use subsystem version 5.02 on x64

Change-Id: I957cda779d300449e2110748a516c9662126f761

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 612342d..60855e4 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -173,6 +173,12 @@ cut -f 1001- -d ' ' $${RESPONSEFILE}  $${RESPONSEFILE}.1 
 \
 mv $${RESPONSEFILE}.1 $${RESPONSEFILE} 
 endef
 
+ifeq ($(CPUNAME),X86_64)
+MSC_SUBSYSTEM_VERSION=$(COMMA)5.02
+else
+MSC_SUBSYSTEM_VERSION=$(COMMA)5.01
+endif
+
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
 $(call gb_Helper_abbreviate_dirs,\
@@ -192,7 +198,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter 
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
-   $(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter 
YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(COMMA)5.01, 
-SUBSYSTEM:CONSOLE$(COMMA)5.01)) \
+   $(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter 
YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), 
-SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION))) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
$(if $(filter YES,$(LIBRARY_X64)), \
-LIBPATH:$(OUTDIR)/lib/x64 \
commit 7e056403f7986f09981bf69514548e143bbb94b7
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu

[Libreoffice-commits] core.git: vcl/ios

2013-03-21 Thread Luboš Luňák

 vcl/ios/source/gdi/salgdicommon.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1c3c38122a020a998a92dd15a0870c576a66a8aa
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Mar 21 12:17:00 2013 +0100

avoid Wundef / fix endian detection

diff --git a/vcl/ios/source/gdi/salgdicommon.cxx 
b/vcl/ios/source/gdi/salgdicommon.cxx
index c15346a..947c719 100644
--- a/vcl/ios/source/gdi/salgdicommon.cxx
+++ b/vcl/ios/source/gdi/salgdicommon.cxx
@@ -19,6 +19,7 @@
 
 #include sal/types.h
 #include osl/file.hxx
+#include osl/endian.h
 
 #include basegfx/polygon/b2dpolygon.hxx
 
@@ -1083,7 +1084,7 @@ SalColor QuartzSalGraphics::getPixel( long nX, long nY )
 // prepare creation of matching a CGBitmapContext
 CGColorSpaceRef aCGColorSpace = GetSalData()-mxRGBSpace;
 CGBitmapInfo aCGBmpInfo = kCGImageAlphaNoneSkipFirst | 
kCGBitmapByteOrder32Big;
-#if __BIG_ENDIAN__
+#if defined OSL_BIGENDIAN
 struct{ unsigned char b, g, r, a; } aPixel;
 #else
 struct{ unsigned char a, r, g, b; } aPixel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2013-03-21 Thread Luboš Luňák

 solenv/gbuild/WinResTarget.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27388c9483b5e00b593ac126092c5bbb131492b0
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Mar 21 12:26:15 2013 +0100

do not pass -isystem to winres

In mingw build, the compiler is gcc, so -isystem is supported, but winres
is passed some include flags too and there -isystem should be turned back 
to -I.

diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 268a9e7..48d5b72 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -13,7 +13,7 @@ endef
 
 define gb_WinResTarget_WinResTarget_init
 $(call gb_WinResTarget_get_target,$(1)) : DEFS := 
$(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) 
-I$(SRCDIR)/config_$(gb_Side)
+$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst 
-isystem,-I,$(SOLARINC)) -I$(SRCDIR)/config_$(gb_Side)
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
 $(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/qa

2013-03-21 Thread Noel Power

 basic/qa/basic_coverage/da-DK/cdbl-2.vb |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit f69acf929b4a8131370ab05ab0886334e1fc566d
Author: Noel Power noel.po...@suse.com
Date:   Thu Mar 21 11:08:27 2013 +

another variation of the localised Cdbl test

Change-Id: Icf6dd7428cb88f1891c6d816a24a4126ea2cc135

diff --git a/basic/qa/basic_coverage/da-DK/cdbl-2.vb 
b/basic/qa/basic_coverage/da-DK/cdbl-2.vb
new file mode 100644
index 000..a219304
--- /dev/null
+++ b/basic/qa/basic_coverage/da-DK/cdbl-2.vb
@@ -0,0 +1,14 @@
+Function doUnitTest() as Integer
+Dim A As String
+Dim B As Double
+Dim Expected As Double
+A = 222,222
+' in da-DK locale ',' is the decimal separator
+Expected = 222.222
+B = Cdbl(A)
+If B  Expected Then
+doUnitTest = 0
+Else
+doUnitTest = 1
+End If
+End Function
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk

2013-03-21 Thread Tomas Chvatal

 bridges/Library_cpp_uno.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 7e1053381f6ab8ee7710a6ea90f51d77efcf6edd
Author: Tomas Chvatal tchva...@suse.cz
Date:   Thu Mar 21 12:48:01 2013 +0100

Fix -mno-avx calls by removing weird OS check.

Change-Id: Icecceda1b36110757754bcdbcecaae307d015fc9

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 5a2eae2..9a9b8f0 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -198,9 +198,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
-fno-omit-frame-pointer \
-fno-strict-aliasing \
$(if $(filter TRUE,$(ENABLE_LTO)),-fno-lto) \
-   $(if $(filter I,$(OS)),\
-   $(if $(filter TRUE,$(HAVE_GCC_AVX)),\
-   -mno-avx)) \
+   $(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx)) \
 ))
 
 ifeq ($(filter ANDROID WNT,$(OS)),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk

2013-03-21 Thread Tomas Chvatal

 bridges/Library_cpp_uno.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 452d7b60c48d0cb5a02e9fdb7271f87cf0ac6de2
Author: Tomas Chvatal tchva...@suse.cz
Date:   Thu Mar 21 12:50:07 2013 +0100

Fix typo in previous commit.

Change-Id: I3b4a23dff3c2db14146351513e9fa1ea5ab3e256

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 9a9b8f0..12275f5 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -198,7 +198,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
-fno-omit-frame-pointer \
-fno-strict-aliasing \
$(if $(filter TRUE,$(ENABLE_LTO)),-fno-lto) \
-   $(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx)) \
+   $(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
 ))
 
 ifeq ($(filter ANDROID WNT,$(OS)),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - sd/inc sd/source

2013-03-21 Thread Stephan Bergmann

 sd/inc/sddllapi.h |1 -
 sd/source/filter/html/htmlex.cxx  |6 +++---
 sd/source/filter/html/htmlex.hxx  |4 +---
 sd/source/filter/html/htmlpublishmode.hxx |   28 
 sd/source/filter/html/pubdlg.cxx  |4 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx |5 +
 sd/source/ui/dlg/sdtreelb.cxx |2 +-
 sd/source/ui/inc/WindowUpdater.hxx|2 +-
 sd/source/ui/inc/optsitem.hxx |4 ++--
 sd/source/ui/inc/pubdlg.hxx   |4 
 sd/source/ui/inc/sdtreelb.hxx |   12 ++--
 11 files changed, 51 insertions(+), 21 deletions(-)

New commits:
commit 5a1e2be29d886e821e5727ba185c40be1d24fc12
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 21 12:58:24 2013 +0100

Short-term fix around the SD_DLLIMPLEMTATION debacle

(being defined for three different sd/Library_sd*.mk files), just like it is
done in all the other sd/source/ui/dlg/*.cxx files already.

Change-Id: I1b9e886c12acb1bfd73bea52f40260760a5f46ff

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 03ccd07..8b9bc57 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -6,6 +6,11 @@
 * 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/.
 */
+
+#ifdef SD_DLLIMPLEMENTATION
+#undef SD_DLLIMPLEMENTATION
+#endif
+
 #include PhotoAlbumDialog.hxx
 
 #include com/sun/star/graphic/GraphicProvider.hpp
commit f4de9aba9e13254543109dc7c33ed0417fd5eee2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 21 12:53:48 2013 +0100

SD_DLLPRIVATE - SAL_DLLPRIVATE

Change-Id: Ia5f99e3c7cb5aa11cd33ba7f00afc4b9da10f0b7

diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h
index 70a837a..f2d82e4 100644
--- a/sd/inc/sddllapi.h
+++ b/sd/inc/sddllapi.h
@@ -27,7 +27,6 @@
 #else
 #define SD_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
-#define SD_DLLPRIVATE SAL_DLLPRIVATE
 
 #endif /* INCLUDED_SDDLLAPI_H */
 
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index a90bd9c..42e883e 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -72,7 +72,7 @@ public:
 };
 
 
-sal_Bool SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = sal_False;
+sal_Bool SAL_DLLPRIVATE SdPageObjsTLB::bIsInDrag = sal_False;
 
 sal_Bool SdPageObjsTLB::IsInDrag()
 {
diff --git a/sd/source/ui/inc/WindowUpdater.hxx 
b/sd/source/ui/inc/WindowUpdater.hxx
index 9f18cd2..9d8582c 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -133,7 +133,7 @@ private:
 The output device to update.  When it is null/ then the call
 is ignored.
 */
-SD_DLLPRIVATE void UpdateWindow (OutputDevice* pDevice) const;
+SAL_DLLPRIVATE void UpdateWindow (OutputDevice* pDevice) const;
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 5473ead..8455531 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -84,8 +84,8 @@ private:
 sal_BoolmbInit  : 1;
 sal_BoolmbEnableModify  : 1;
 
-SD_DLLPRIVATE void Commit( SdOptionsItem rCfgItem ) const;
-SD_DLLPRIVATE ::com::sun::star::uno::Sequence ::rtl::OUString  
GetPropertyNames() const;
+SAL_DLLPRIVATE void Commit( SdOptionsItem rCfgItem ) const;
+SAL_DLLPRIVATE ::com::sun::star::uno::Sequence ::rtl::OUString  
GetPropertyNames() const;
 
 protected:
 
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 99dec07..5f8cdcf 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -59,7 +59,7 @@ class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox
 {
 private:
 
-static sal_Bool  SD_DLLPRIVATE bIsInDrag;  /// static, in the case 
the navigator is deleted in ExecuteDrag
+static sal_Bool  SAL_DLLPRIVATE bIsInDrag;  /// static, in the case 
the navigator is deleted in ExecuteDrag
 
 public:
 
@@ -95,13 +95,13 @@ public:
 ::sd::DrawDocShell mrDocShell;
 NavigatorDragType   meDragType;
 const ::com::sun::star::uno::Any maTreeListBoxData;
-SD_DLLPRIVATE virtual   ~SdPageObjsTransferable();
+SAL_DLLPRIVATE virtual   ~SdPageObjsTransferable();
 
-SD_DLLPRIVATE virtual void  AddSupportedFormats();
-SD_DLLPRIVATE virtual sal_Bool  GetData( const 
::com::sun::star::datatransfer::DataFlavor rFlavor );
-SD_DLLPRIVATE virtual void  DragFinished( sal_Int8 nDropAction );
+SAL_DLLPRIVATE virtual void  AddSupportedFormats();
+SAL_DLLPRIVATE virtual sal_Bool  GetData( const 
::com::sun::star::datatransfer::DataFlavor rFlavor );
+SAL_DLLPRIVATE virtual void  DragFinished( sal_Int8

[Libreoffice-commits] core.git: sd/inc

2013-03-21 Thread Stephan Bergmann

 sd/inc/sdpage.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e71c2752e76ee7acc3c4ac2d700bce17aff9b601
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 21 13:17:21 2013 +0100

Revert sd::HeaderFooterSettings: try to make MSVC tinderboxes happy

This reverts commit a9af9b7dbdd3854855904ecc0fbd1041d400b06b, now addressed 
with
5a1e2be29d886e821e5727ba185c40be1d24fc12 Short-term fix around the
SD_DLLIMPLEMTATION debacle.

diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 78299e0..18b58a3 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -68,7 +68,7 @@ namespace boost
 
 namespace sd {
 
-struct HeaderFooterSettings
+struct SD_DLLPUBLIC HeaderFooterSettings
 {
 bool mbHeaderVisible;
 String maHeaderText;
@@ -83,9 +83,9 @@ namespace sd {
 String maDateTimeText;
 int meDateTimeFormat;
 
-SD_DLLPUBLIC HeaderFooterSettings();
+HeaderFooterSettings();
 
-SD_DLLPUBLIC bool operator==(const HeaderFooterSettings rSettings) 
const;
+bool operator==( const HeaderFooterSettings rSettings ) const;
 };
 
 typedef std::vector ::com::sun::star::uno::Reference 
::com::sun::star::office::XAnnotation   AnnotationVector;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - android/sdremote

2013-03-21 Thread Michael Meeks

 
android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java 
|   11 +-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 5c94a1ed371e140c91c0687acc719566055cca3e
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Feb 19 16:26:52 2013 +

sdremote: debugging to get a better handle on failed image allocations.

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

diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
 
b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
index 2135dbf..3925fe2 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
@@ -9,7 +9,9 @@
 package org.libreoffice.impressremote.communication;
 
 import org.libreoffice.impressremote.R;
+import org.libreoffice.impressremote.Globals;
 
+import android.util.Log;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -54,7 +56,14 @@ public class SlideShow {
 return BitmapFactory.decodeResource(mContext.getResources(),
 R.drawable.image_loading);
 }
-Bitmap aBitmap = BitmapFactory.decodeByteArray(aImage, 0, 
aImage.length);
+Bitmap aBitmap = null;
+try {
+aBitmap = BitmapFactory.decodeByteArray(aImage, 0, aImage.length);
+} catch (OutOfMemoryError e) {
+Log.e(Globals.TAG, Bitmap decoding error byte length:  + 
aImage.length +
+  first 4 bytes:  + aImage[0] +   + aImage[1] +   + 
aImage[2] +   + aImage[3] +
+  Exception  + e);
+}
 if (aBitmap == null) {
 return BitmapFactory.decodeResource(mContext.getResources(),
 R.drawable.image_loading);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Petr Mladek

Rene Engelhard píše v Čt 21. 03. 2013 v 11:04 +0100:
 Hi,
 
 On Thu, Mar 21, 2013 at 10:53:42AM +0100, Lionel Elie Mamane wrote:
   It turns out that Calc and Base now need 
   /usr/lib/libreoffice/share/registry/writer.xcd present on the system.
  
   Is this a wanted change or a bug?
  
  Speaking of base, my guess is (but I'd be happy for a tester to
  confirm) that one cannot (and never could) create / use any form or
  report without Writer installed. So libreoffice-base should at least
  recommend libreoffice-writer.
 
 Yeah, probably we should do that, will do in Debian.
 
  As to the does not run at all, for both Base and Calc, ideally it
  would be nice to see *which* setting in writed.xcd they need, and
  maybe migrate this to a common/base file?
 
 Yes. I would not like making -base and -calc making it *depending* on writer
 hard.

I think that it is also the other way around. AFAIK, you could not use
data sources in Writer without Base.

BTW: I wonder if embeded objects are can be used if you do not have
installed the related part. So, I am afraid that all parts depends on
all other parts if you want to use some features.


Best Regards,
Petr

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

[PATCH] Move setupwizard modify handler code.

2013-03-21 Thread Chris Sherlock (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2890

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/2890/1

Move setupwizard modify handler code.

Move setupwizard code into the conditional below it. You can only work
on pPage if it isn't a null pointer anyway, to my mind this looks a
lot cleaner.

Change-Id: If8d910c15c5a1c1da5eb204b5922d074c454978b
---
M dbaccess/source/ui/dlg/dbwizsetup.cxx
1 file changed, 5 insertions(+), 5 deletions(-)



diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx 
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 338e7c0..cb53dfd 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -587,13 +587,13 @@
 break;
 }
 
-if (pPage  (_nState != PAGE_DBSETUPWIZARD_INTRO)  (_nState != 
PAGE_DBSETUPWIZARD_AUTHENTIFICATION))
-{
-pPage-SetModifiedHandler(LINK( this, ODbTypeWizDialogSetup, 
ImplModifiedHdl ) );
-}
-
 if ( pPage )
 {
+if ((_nState != PAGE_DBSETUPWIZARD_INTRO)  (_nState != 
PAGE_DBSETUPWIZARD_AUTHENTIFICATION))
+{
+pPage-SetModifiedHandler(LINK( this, ODbTypeWizDialogSetup, 
ImplModifiedHdl ) );
+}
+
 pPage-SetServiceFactory( m_pImpl-getORB() );
 pPage-SetAdminDialog(this, this);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8d910c15c5a1c1da5eb204b5922d074c454978b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com

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

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Lionel Elie Mamane

On Thu, Mar 21, 2013 at 01:34:51PM +0100, Petr Mladek wrote:
 Rene Engelhard píše v Čt 21. 03. 2013 v 11:04 +0100:
 On Thu, Mar 21, 2013 at 10:53:42AM +0100, Lionel Elie Mamane wrote:

 It turns out that Calc and Base now need 
 /usr/lib/libreoffice/share/registry/writer.xcd present on the system.

 Is this a wanted change or a bug?

 Speaking of base, my guess is (but I'd be happy for a tester to
 confirm) that one cannot (and never could) create / use any form or
 report without Writer installed. So libreoffice-base should at least
 recommend libreoffice-writer.

 Yeah, probably we should do that, will do in Debian.

 As to the does not run at all, for both Base and Calc, ideally it
 would be nice to see *which* setting in writed.xcd they need, and
 maybe migrate this to a common/base file?

 Yes. I would not like making -base and -calc making it *depending* on writer
 hard.

 I think that it is also the other way around. AFAIK, you could not use
 data sources in Writer without Base.

Yes, but data sources are (by far!) not a core feature of Writer;
I'd call this a suggests.

 BTW: I wonder if embeded objects are can be used if you do not have
 installed the related part.

I expect not.

 So, I am afraid that all parts depends on all other parts if you
 want to use some features.

Yes, but in Debian packaging terms, Depends means absolutely
needed, else will not run/work/... at all. If an important feature
needs another package, then recommends. If it enables an
*additional* feature, then Suggests, or (the other way round) the
enhancement-bringer declares an Enhances on the enhanced package.

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

Re: [PATCH] remove/add blank lines in sw/source/core

2013-03-21 Thread Eike Rathke

Hi Philipp,

On Wednesday, 2013-03-20 17:31:03 +, Philipp Riemer (via Code Review) wrote:

 remove/add blank lines in sw/source/core

I'd prefer if such mere cosmetical changes would not be done; while
inserting a blank line mostly is ok for readability, removing a blank
line mostly for the same reason decreases readability. After all it
boils down to personal preferences. i.e. personally I usually use two
blank lines between method implementations, just because browsing the
source on a quick fly in the editor is easier for the eye.

How do others see this?

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
New GnuPG key 0x65632D3A : 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Old GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


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

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Rene Engelhard

hi,
On Thu, Mar 21, 2013 at 01:34:51PM +0100, Petr Mladek wrote:
 I think that it is also the other way around. AFAIK, you could not use
 data sources in Writer without Base.

True. That's why we invented http://packages.debian.org/libreoffice-base-core

 BTW: I wonder if embeded objects are can be used if you do not have
 installed the related part. So, I am afraid that all parts depends on
 all other parts if you want to use some features.

True. But that (and the above) is guessable and can be fixed by just installing
the component is you *need those features*
(oh, database stuff? install base stuff, oh, calc object? maybe I should
install calc...)

This issue here is about calc and base not even starting up. This is more
serious.

Regards,

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

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Stephan Bergmann


On 03/20/2013 05:45 PM, Andreas Radke wrote:

We are running in a bug with the current package file lists making Calc
and Base to fail to load without having Writer installed. Check

https://bugs.archlinux.org/task/34332 and
https://bugs.archlinux.org/task/34378.

It turns out that Calc and Base now need
/usr/lib/libreoffice/share/registry/writer.xcd present on the system.


soffice.bin failing early with terminate called after throwing an 
instance of 'com::sun::star::uno::RuntimeException' when there is no 
share/registry/writer.xcd smells like 
configmgr::Components::parseXcdFiles (configmgr/source/components.cxx) 
throwing because another share/registry/*.xcd file contains a


  dependency file=main/

The only such file I could find is share/registry/librelogo.xcd, for the 
LibreLogo feature introduced in LO 4.0.


And indeed, at least with the official generic Linux downloads from 
http://www.libreoffice.org/download libobasis4.0-librelogo-4.0.1.2-2 
(containing share/registry/librelogo.xcd) only depends on 
libobasis4.0-core01 but not on libobasis4.0-writer.  I'll see to get 
that fixed.


However, for the two archlinux issues mentioned above, I would assume 
that this things are packaged differently there, and 
share/registry/librelogo.xcd erroneously ends up in some core package? 
Which would make those issues downstream ones.


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

Re: [PATCH] remove/add blank lines in sw/source/core

2013-03-21 Thread Michael Meeks

Hi Eike,

On Thu, 2013-03-21 at 14:31 +0100, Eike Rathke wrote:
 On Wednesday, 2013-03-20 17:31:03 +, Philipp Riemer (via Code Review) 
 wrote:
  remove/add blank lines in sw/source/core
 
 I'd prefer if such mere cosmetical changes would not be done; while
 inserting a blank line mostly is ok for readability, removing a blank
 line mostly for the same reason decreases readability.

:-) IMHO 2 newlines is reasonable if it is consistent: to me
inconsistency is more annoying than other things. OTOH - four spaces is
to my mind just silly eg.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=29b6eda7e5909106d8325f75b3ae0cda579385b5

  After all it boils down to personal preferences. i.e. personally I
 usually use two blank lines between method implementations, just
 because browsing the source on a quick fly in the editor is easier
 for the eye.

Seems reasonable to me; IMHO there is enough broken-ness around to not
go fixing whitespace - or at least removing double-line spaces between
methods in consistent calc files for now ;-)

So I'd say that these huge spews of ascii-art don't serve a useful
purpose:

//-

and bulky content-free comments (which we still have plenty of) should
clearly take be a higher priority for being removing ;-) at least to me.

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: [LibreOffice-QA] Conference Call - March 22nd, 2013 - UPDATED TIME (1300 UTC)

2013-03-21 Thread Joel Madero


Hi All,

I hope this isn't a problem for anyone. I forgot two weeks ago we had 
daylight savings time here in the States so 1400 UTC is 7am here, I 
wouldn't be able to make it as I have work. Unless there are complaints, 
*let's do 1300 UTC starting tomorrow.*


Again the time has changed to 1300 UTC unless someone speaks up and says 
that this is a no go.


I'll see you guys tomorrow at 1300.


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

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

2013-03-21 Thread Kohei Yoshida

 sc/inc/cell.hxx   |3 --
 sc/source/core/data/cell.cxx  |8 -
 sc/source/ui/docshell/docfunc.cxx |   53 --
 sc/source/ui/inc/docfunc.hxx  |5 ---
 4 files changed, 69 deletions(-)

New commits:
commit 7631a4ad56216837b23c27d341639b3d0ef81ecb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Mar 21 10:44:50 2013 -0400

Remove unused methods.

Change-Id: I8a7b5513e136a632950c3d41f62020f6b68203ef

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 71aee73..4230272 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -112,9 +112,6 @@ public:
 /** Deletes the own cell broadcaster. */
 voidDeleteBroadcaster();
 
-// String- oder EditCell
-static ScBaseCell* CreateTextCell( const rtl::OUString rString, 
ScDocument* );
-
 // nOnlyNames may be one or more of SC_LISTENING_NAMES_*
 voidStartListeningTo( ScDocument* pDoc );
 voidEndListeningTo( ScDocument* pDoc,
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index a8aab98..4aac6b5 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -277,14 +277,6 @@ void ScBaseCell::DeleteBroadcaster()
 DELETEZ( mpBroadcaster );
 }
 
-ScBaseCell* ScBaseCell::CreateTextCell( const rtl::OUString rString, 
ScDocument* pDoc )
-{
-if ( rString.indexOf('\n') != -1 || rString.indexOf(CHAR_CR) != -1 )
-return new ScEditCell( rString, pDoc );
-else
-return new ScStringCell( rString );
-}
-
 void ScBaseCell::StartListeningTo( ScDocument* pDoc )
 {
 if ( eCellType == CELLTYPE_FORMULA  !pDoc-IsClipOrUndo()
diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index c1ecbc5..c2f3df6 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1109,59 +1109,6 @@ static ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( 
const String rText, con
 return pCode;
 }
 
-
-ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress rPos,
-const String rText, const String rFormulaNmsp, const 
formula::FormulaGrammar::Grammar eGrammar, short* pRetFormatType )
-{
-ScDocument* pDoc = rDocShell.GetDocument();
-ScBaseCell* pNewCell = NULL;
-
-if ( rText.Len()  1  rText.GetChar(0) == '=' )
-{
-ScTokenArray* pCode;
-if ( pDoc-IsImportingXML() )
-{   // temporary formula string as string tokens
-pCode = lcl_ScDocFunc_CreateTokenArrayXML( rText, rFormulaNmsp, 
eGrammar );
-pDoc-IncXMLImportedFormulaCount( rText.Len() );
-}
-else
-{
-ScCompiler aComp( pDoc, rPos );
-aComp.SetGrammar(eGrammar);
-pCode = aComp.CompileString( rText );
-}
-pNewCell = new ScFormulaCell( pDoc, rPos, pCode, eGrammar, MM_NONE );
-delete pCode;   // Zell-ctor hat das TokenArray kopiert
-}
-else if ( rText.Len()  1  rText.GetChar(0) == '\'' )
-{
-//  for bEnglish, ' at the beginning is always interpreted as text
-//  marker and stripped
-pNewCell = ScBaseCell::CreateTextCell( rText.Copy( 1 ), pDoc );
-}
-else// (nur) auf englisches Zahlformat testen
-{
-SvNumberFormatter* pFormatter = pDoc-GetFormatTable();
-sal_uInt32 nEnglish = 
pFormatter-GetStandardIndex(LANGUAGE_ENGLISH_US);
-double fVal;
-if ( pFormatter-IsNumberFormat( rText, nEnglish, fVal ) )
-{
-pNewCell = new ScValueCell( fVal );
-// return the format type from the English format, so a localized 
format can be created
-if ( pRetFormatType )
-*pRetFormatType = pFormatter-GetType( nEnglish );
-}
-else if ( rText.Len() )
-pNewCell = ScBaseCell::CreateTextCell( rText, pDoc );
-
-//  das (englische) Zahlformat wird nicht gesetzt
-//! passendes lokales Format suchen und setzen???
-}
-
-return pNewCell;
-}
-
-
 bool ScDocFunc::SetCellText(
 const ScAddress rPos, const OUString rText, bool bInterpret, bool 
bEnglish, bool bApi,
 const formula::FormulaGrammar::Grammar eGrammar )
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 964a839..da96bb9 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -106,11 +106,6 @@ public:
 const ScAddress rPos, const OUString rText, bool bInterpret, bool 
bEnglish, bool bApi,
 const formula::FormulaGrammar::Grammar eGrammar );
 
-// creates a new cell for use with PutCell
-ScBaseCell* InterpretEnglishString( const ScAddress rPos, const String 
rText,
-const String rFormulaNmsp, const 
formula::FormulaGrammar::Grammar eGrammar,
-short* pRetFormatType = NULL );
-
 virtual boolShowNote( const ScAddress

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-2' - desktop/source

2013-03-21 Thread Stephan Bergmann

 desktop/source/migration/services/oo3extensionmigration.cxx |   54 
 desktop/source/migration/services/oo3extensionmigration.hxx |6 -
 2 files changed, 21 insertions(+), 39 deletions(-)

New commits:
commit c09c5a1e42b898a1d1558377695f609c4426d50c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Mar 20 16:40:46 2013 +0100

deb#703486: Keep migrating more user extensions after one failed

(cherry picked from commit 190b9257367884fa8561410ebe6fb9df7fd9c465)
Conflicts:
desktop/source/migration/services/oo3extensionmigration.cxx

Change-Id: I9cc8acac54bd5a02652462c3967b4c81f7cf8ee3
Reviewed-on: https://gerrit.libreoffice.org/2878
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx 
b/desktop/source/migration/services/oo3extensionmigration.cxx
index aed03fa..508ca25 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -40,6 +40,7 @@
 #include com/sun/star/xml/dom/DocumentBuilder.hpp
 #include com/sun/star/beans/NamedValue.hpp
 #include com/sun/star/deployment/ExtensionManager.hpp
+#include com/sun/star/deployment/XExtensionManager.hpp
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -304,47 +305,28 @@ bool OO3ExtensionMigration::scanDescriptionXml( const 
::rtl::OUString sDescript
 return true;
 }
 
-bool OO3ExtensionMigration::migrateExtension( const ::rtl::OUString 
sSourceDir )
+void OO3ExtensionMigration::migrateExtension( const ::rtl::OUString 
sSourceDir )
 {
-if ( !m_xExtensionManager.is() )
+css::uno::Reference css::deployment::XExtensionManager  extMgr(
+deployment::ExtensionManager::get( m_ctx ) );
+try
 {
-try
-{
-m_xExtensionManager = deployment::ExtensionManager::get( m_ctx );
-}
-catch ( const ucb::CommandFailedException  ){}
-catch ( const uno::RuntimeException  ) {}
+TmpRepositoryCommandEnv* pCmdEnv = new TmpRepositoryCommandEnv();
+
+uno::Reference ucb::XCommandEnvironment  xCmdEnv(
+static_cast cppu::OWeakObject* ( pCmdEnv ), uno::UNO_QUERY );
+uno::Reference task::XAbortChannel  xAbortChannel;
+extMgr-addExtension(
+sSourceDir, uno::Sequencebeans::NamedValue(),
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(user)), 
xAbortChannel, xCmdEnv );
 }
-
-if ( m_xExtensionManager.is() )
+catch ( css::uno::Exception  e )
 {
-try
-{
-TmpRepositoryCommandEnv* pCmdEnv = new TmpRepositoryCommandEnv();
-
-uno::Reference ucb::XCommandEnvironment  xCmdEnv(
-static_cast cppu::OWeakObject* ( pCmdEnv ), uno::UNO_QUERY );
-uno::Reference task::XAbortChannel  xAbortChannel;
-uno::Reference deployment::XPackage  xPackage =
-m_xExtensionManager-addExtension(
-sSourceDir, uno::Sequencebeans::NamedValue(),
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(user)), 
xAbortChannel, xCmdEnv );
-
-if ( xPackage.is() )
-return true;
-}
-catch ( const ucb::CommandFailedException )
-{
-}
-catch ( const ucb::CommandAbortedException )
-{
-}
-catch ( const lang::IllegalArgumentException )
-{
-}
+SAL_WARN(
+desktop.migration,
+Ignoring UNO Exception while migrating extension from 
+ sSourceDir  : \  e.Message  \);
 }
-
-return false;
 }
 
 
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx 
b/desktop/source/migration/services/oo3extensionmigration.hxx
index a3db98a..96a8b22 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -26,7 +26,8 @@
 #include com/sun/star/lang/XInitialization.hpp
 #include com/sun/star/xml/dom/XDocumentBuilder.hpp
 #include com/sun/star/ucb/SimpleFileAccess.hpp
-#include com/sun/star/deployment/XExtensionManager.hpp
+#include com/sun/star/ucb/XCommandEnvironment.hpp
+#include com/sun/star/ucb/XProgressHandler.hpp
 
 #include osl/mutex.hxx
 #include osl/file.hxx
@@ -68,7 +69,6 @@ namespace migration
 ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext   m_ctx;
 ::com::sun::star::uno::Reference 
::com::sun::star::xml::dom::XDocumentBuilder   m_xDocBuilder;
 ::com::sun::star::uno::Reference 
::com::sun::star::ucb::XSimpleFileAccess3m_xSimpleFileAccess;
-::com::sun::star::uno::Reference 
::com::sun::star::deployment::XExtensionManager  m_xExtensionManager;
 ::osl::Mutexm_aMutex;
 ::rtl::OUString

[PUSHED libreoffice-4-0-2] deb#703486: Keep migrating more user extensions after one fa...

2013-03-21 Thread Noel Power (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2878

Approvals:
  Noel Power: Verified; Looks good to me, approved
  Fridrich Strba: Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cc8acac54bd5a02652462c3967b4c81f7cf8ee3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-2
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] core.git: setup_native/source

2013-03-21 Thread Stephan Bergmann

 setup_native/source/packinfo/packinfo_office.txt |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4e69b35674882d8d675a677940805b187cad0bc3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 21 15:57:18 2013 +0100

Missing dependency of librelogo on writer

...at least due to dependency of librelogo.xcd on writer.xcd, see
82c53d537a05dadf4d7fd7ea41292897bf2d47c7 Missing dependency.

Otherwise, having librelogo installed but not writer will cause an uncaught
RuntimeException from configmgr::Components::parseXcdFiles
(configmgr/source/components.cxx) early on in soffice.bin.

Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08

diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 50261aa..9851174 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -269,10 +269,10 @@ End
 Start
 module = gid_Module_Optional_Pyuno_LibreLogo
 solarispackagename = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo
-solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno, 
SUNWPython
+solarisrequires = 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython
 packagename = %BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo
-freebsdrequires = %BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno
-requires = %BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno
+freebsdrequires = 
%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer
+requires = 
%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer
 copyright = 2012 The Document Foundation
 solariscopyright = solariscopyrightfile
 vendor = The Document Foundation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: rsc/source

2013-03-21 Thread Miklos Vajna

 rsc/source/rsc/rsc.cxx |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 3b00a7f87b8d428dc8c3d1d0ddb84b74bb2343d4
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Mar 21 16:10:06 2013 +0100

RscCmdLine: don't use obsolete DirEntry

Change-Id: I49b2ca742da96ced5326b3e31f3cec35bfaabcc2

diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 7489218..3d16351 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -167,11 +167,10 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError 
* pEH )
 ;
 if( *pEqual )
 {
-const rtl::OString aSPath( pEqual + 1 );
-DirEntryaSDir(rtl::OStringToOUString(aSPath, 
RTL_TEXTENCODING_ASCII_US));
-
-m_aReplacements.push_back( std::pair OString, OString ( 
OString( (*ppStr)+4, pEqual - *ppStr - 4 ),
-rtl::OUStringToOString(aSDir.GetFull(), 
RTL_TEXTENCODING_ASCII_US) ) );
+OString aSPath(pEqual + 1);
+if (aSPath.endsWith(OString(SAL_PATHDELIMITER)))
+aSPath = aSPath.copy(0, aSPath.getLength()-1);
+m_aReplacements.push_back( std::pair OString, OString ( 
OString( (*ppStr)+4, pEqual - *ppStr - 4 ), aSPath) );
 }
 }
 else if( !rsc_stricmp( (*ppStr) + 1, PreLoad ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: rsc/source

2013-03-21 Thread Michael Meeks

 rsc/source/tools/rsctools.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5c4bf7a6029da36853fbae1513c9c5ed993059a3
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Mar 21 15:21:28 2013 +

stop uninitialized memory leaking into resource files.

Change-Id: Ifb74ce0c60e0d0796d5d04a67e9d58721b58593c

diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 7e94c6e..dd378e4 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -359,10 +359,13 @@ RscWriteRc :: ~RscWriteRc()
 */
 sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize )
 {
+sal_uInt32 nOrigPos = nLen;
 nLen += nSize;
 if( pMem )
 pMem = (char*)rtl_reallocateMemory( pMem, nLen );
-return( nLen - nSize );
+if( pMem )
+memset( pMem + nOrigPos, 0, nSize );
+return nOrigPos;
 }
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [LibreOffice-QA] Conference Call - March 22nd, 2013 - UPDATED TIME (1300 UTC)

2013-03-21 Thread Florian Reisinger

Well,

I am at School -- 13:30 or 13:20 would be the earliest possible hour for
me...

Liebe Grüße, / Yours,
Florian Reisinger

Am 21.03.2013 um 15:15 schrieb Joel Madero jmadero@gmail.com:

 Hi All,

I hope this isn't a problem for anyone. I forgot two weeks ago we had
daylight savings time here in the States so 1400 UTC is 7am here, I
wouldn't be able to make it as I have work. Unless there are complaints, *let's
do 1300 UTC starting tomorrow.*

Again the time has changed to 1300 UTC unless someone speaks up and says
that this is a no go.

I'll see you guys tomorrow at 1300.


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - rsc/source

2013-03-21 Thread Michael Meeks

 rsc/source/tools/rsctools.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 94ccdf065e910a4f3bb247e5482ece9d85d3c1ab
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Mar 21 15:21:28 2013 +

stop uninitialized memory leaking into resource files.

Change-Id: Ifb74ce0c60e0d0796d5d04a67e9d58721b58593c
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 63d787e..02507cc 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -360,10 +360,13 @@ RscWriteRc :: ~RscWriteRc()
 */
 sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize )
 {
+sal_uInt32 nOrigPos = nLen;
 nLen += nSize;
 if( pMem )
 pMem = (char*)rtl_reallocateMemory( pMem, nLen );
-return( nLen - nSize );
+if( pMem )
+memset( pMem + nOrigPos, 0, nSize );
+return nOrigPos;
 }
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0-2] resolved rhbz#919020 Basic CDbl() and CSng() scan localized ...

2013-03-21 Thread Eike Rathke (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2893

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/2893/1

resolved rhbz#919020 Basic CDbl() and CSng() scan localized number

Code wrongly replaced decimal separator with '.' and used atof() to scan
the number string which itself may be localized on *iX systems but not
on Windows. Hence on *iX the numbers may had been truncated where on
Windows they were not.

Additionally made this work with Unicode separators if defined for the
locale, removed the awkward conversion to ASCII byte string and
eliminated use of toupper() and isdigit() calls. Also eliminated a
possible buffer overflow.

(cherry picked from commit 9e9f39d171cafa035d7b8e74187e25c3581cb89d)

Conflicts:
basic/source/sbx/sbxscan.cxx

replace decimal separator at correct position, rhbz#919020

(cherry picked from commit e96c7a60c88bc1e3008ebdeafd59327933d6707f)

Change-Id: I35d82e8f267ecb925783bf6f2de044a29c08f688
Reviewed-on: https://gerrit.libreoffice.org/2859
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
(cherry picked from commit 96b079e24f86f7f49a624573783c6e103012f942)
---
M basic/source/sbx/sbxscan.cxx
1 file changed, 118 insertions(+), 79 deletions(-)



diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index f9a328e..b59844e 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -55,108 +55,131 @@
 rcThousandSep = rData.getNumThousandSep()[0];
 }
 
+inline bool ImpIsDigit( sal_Unicode c )
+{
+return '0' = c  c = '9';
+}
+
+/** NOTE: slightly differs from strchr() in that it does not consider the
+terminating NULL character to be part of the string and returns bool
+instead of pointer, if character is 0 returns false.
+ */
+bool ImpStrChr( const sal_Unicode* p, sal_Unicode c )
+{
+if (!c)
+return false;
+while (*p)
+{
+if (*p++ == c)
+return true;
+}
+return false;
+}
+
+bool ImpIsAlNum( sal_Unicode c )
+{
+return (c  128) ? isalnum( static_castchar(c) ) : false;
+}
+
 // scanning a string according to BASIC-conventions
-// but exponent may also be a D, so data type is SbxDOUBLED
+// but exponent may also be a D, so data type is SbxDOUBLE
 // conversion error if data type is fixed and it doesn't fit
 
 SbxError ImpScan( const ::rtl::OUString rWSrc, double nVal, SbxDataType 
rType,
   sal_uInt16* pLen, bool bAllowIntntl, bool bOnlyIntntl )
 {
-::rtl::OString aBStr( ::rtl::OUStringToOString( rWSrc, 
RTL_TEXTENCODING_ASCII_US ) );
-
-char cIntntlComma, cIntntl1000;
-char cNonIntntlComma = '.';
-
-sal_Unicode cDecimalSep, cThousandSep = 0;
+sal_Unicode cIntntlDecSep, cIntntlGrpSep;
+sal_Unicode cNonIntntlDecSep = '.';
 if( bAllowIntntl || bOnlyIntntl )
 {
-ImpGetIntntlSep( cDecimalSep, cThousandSep );
-cIntntlComma = (char)cDecimalSep;
-cIntntl1000 = (char)cThousandSep;
+ImpGetIntntlSep( cIntntlDecSep, cIntntlGrpSep );
+if( bOnlyIntntl )
+cNonIntntlDecSep = cIntntlDecSep;
 }
-
 else
 {
-cIntntlComma = cNonIntntlComma;
-cIntntl1000 = cNonIntntlComma;
+cIntntlDecSep = cNonIntntlDecSep;
+cIntntlGrpSep = 0;  // no group separator accepted in non-i18n
 }
 
-if( bOnlyIntntl )
-{
-cNonIntntlComma = cIntntlComma;
-cIntntl1000 = (char)cThousandSep;
-}
-
-const char* pStart = aBStr.getStr();
-const char* p = pStart;
-char buf[ 80 ], *q = buf;
+const sal_Unicode* const pStart = rWSrc.getStr();
+const sal_Unicode* p = pStart;
+OUStringBuffer aBuf( rWSrc.getLength());
 bool bRes = true;
 bool bMinus = false;
 nVal = 0;
 SbxDataType eScanType = SbxSINGLE;
-while( *p ( *p == ' ' || *p == '\t' ) ) p++;
+while( *p == ' ' || *p == '\t' )
+p++;
 if( *p == '-' )
-p++, bMinus = true;
-if( isdigit( *p ) ||( (*p == cNonIntntlComma || *p == cIntntlComma ||
-*p == cIntntl1000)  isdigit( *(p+1 ) ) ) )
+{
+p++;
+bMinus = true;
+}
+if( ImpIsDigit( *p ) || ((*p == cNonIntntlDecSep || *p == cIntntlDecSep ||
+(cIntntlDecSep  *p == cIntntlGrpSep))  ImpIsDigit( 
*(p+1) )))
 {
 short exp = 0;
-short comma = 0;
+short decsep = 0;
 short ndig = 0;
 short ncdig = 0;// number of digits after decimal point
-rtl::OStringBuffer 
aSearchStr(RTL_CONSTASCII_STRINGPARAM(0123456789DEde));
-aSearchStr.append(cNonIntntlComma);
-if( cIntntlComma != cNonIntntlComma )
-aSearchStr.append(cIntntlComma);
+OUStringBuffer aSearchStr(0123456789DEde);
+aSearchStr.append(cNonIntntlDecSep);
+if( cIntntlDecSep != cNonIntntlDecSep )
+aSearchStr.append(cIntntlDecSep);
 if( bOnlyIntntl )
-

[PATCH libreoffice-3-6] fixed a possible crasher

2013-03-21 Thread Eike Rathke (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2894

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/2894/1

fixed a possible crasher

Change-Id: I3b67ba1a8896b4b291e009b4ad680e1342ba9460
---
M basic/source/sbx/sbxscan.cxx
1 file changed, 9 insertions(+), 10 deletions(-)



diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 80276a3..63f6dea 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -97,7 +97,7 @@
 
 const char* pStart = aBStr.getStr();
 const char* p = pStart;
-char buf[ 80 ], *q = buf;
+rtl::OStringBuffer aBuf( rWSrc.getLength());
 sal_Bool bRes = sal_True;
 sal_Bool bMinus = sal_False;
 nVal = 0;
@@ -134,7 +134,7 @@
 if( ++comma  1 )
 continue;
 else
-*q++ = '.';
+aBuf.append('.');
 }
 else if( strchr( DdEe, *p ) )
 {
@@ -144,22 +144,21 @@
 }
 if( toupper( *p ) == 'D' )
 eScanType = SbxDOUBLE;
-*q++ = 'E'; p++;
+aBuf.append('E'); p++;
 
 if( *p == '+' )
 p++;
 else
 if( *p == '-' )
-*q++ = *p++;
+aBuf.append( *p++ );
 }
 else
 {
-*q++ = *p++;
+aBuf.append( *p++ );
 if( comma  !exp ) ncdig++;
 }
 if( !exp ) ndig++;
 }
-*q = 0;
 
 if( comma  1 || exp  1 )
 bRes = sal_False;
@@ -172,7 +171,7 @@
 eScanType = SbxLONG;
 }
 
-nVal = atof( buf );
+nVal = atof( aBuf.makeStringAndClear().getStr() );
 ndig = ndig - comma;
 // too many numbers for SINGLE?
 if( ndig  15 || ncdig  6 )
@@ -202,11 +201,11 @@
 {
 char ch = sal::static_int_cast char ( toupper( *p ) );
 p++;
-if( strchr( cmp, ch ) ) *q++ = ch;
+if( strchr( cmp, ch ) ) aBuf.append( ch );
 else bRes = sal_False;
 }
-*q = 0;
-for( q = buf; *q; q++ )
+rtl::OString aBufStr( aBuf.makeStringAndClear());
+for( const sal_Char* q = aBufStr.getStr(); *q; q++ )
 {
 i =( *q  0xFF ) - '0';
 if( i  9 ) i -= 7;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b67ba1a8896b4b291e009b4ad680e1342ba9460
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Eike Rathke er...@redhat.com

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

[PATCH libreoffice-3-6-6] fixed a possible crasher

2013-03-21 Thread Eike Rathke (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2895

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/2895/1

fixed a possible crasher

Change-Id: I3b67ba1a8896b4b291e009b4ad680e1342ba9460
---
M basic/source/sbx/sbxscan.cxx
1 file changed, 9 insertions(+), 10 deletions(-)



diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 80276a3..63f6dea 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -97,7 +97,7 @@
 
 const char* pStart = aBStr.getStr();
 const char* p = pStart;
-char buf[ 80 ], *q = buf;
+rtl::OStringBuffer aBuf( rWSrc.getLength());
 sal_Bool bRes = sal_True;
 sal_Bool bMinus = sal_False;
 nVal = 0;
@@ -134,7 +134,7 @@
 if( ++comma  1 )
 continue;
 else
-*q++ = '.';
+aBuf.append('.');
 }
 else if( strchr( DdEe, *p ) )
 {
@@ -144,22 +144,21 @@
 }
 if( toupper( *p ) == 'D' )
 eScanType = SbxDOUBLE;
-*q++ = 'E'; p++;
+aBuf.append('E'); p++;
 
 if( *p == '+' )
 p++;
 else
 if( *p == '-' )
-*q++ = *p++;
+aBuf.append( *p++ );
 }
 else
 {
-*q++ = *p++;
+aBuf.append( *p++ );
 if( comma  !exp ) ncdig++;
 }
 if( !exp ) ndig++;
 }
-*q = 0;
 
 if( comma  1 || exp  1 )
 bRes = sal_False;
@@ -172,7 +171,7 @@
 eScanType = SbxLONG;
 }
 
-nVal = atof( buf );
+nVal = atof( aBuf.makeStringAndClear().getStr() );
 ndig = ndig - comma;
 // too many numbers for SINGLE?
 if( ndig  15 || ncdig  6 )
@@ -202,11 +201,11 @@
 {
 char ch = sal::static_int_cast char ( toupper( *p ) );
 p++;
-if( strchr( cmp, ch ) ) *q++ = ch;
+if( strchr( cmp, ch ) ) aBuf.append( ch );
 else bRes = sal_False;
 }
-*q = 0;
-for( q = buf; *q; q++ )
+rtl::OString aBufStr( aBuf.makeStringAndClear());
+for( const sal_Char* q = aBufStr.getStr(); *q; q++ )
 {
 i =( *q  0xFF ) - '0';
 if( i  9 ) i -= 7;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b67ba1a8896b4b291e009b4ad680e1342ba9460
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-6
Gerrit-Owner: Eike Rathke er...@redhat.com

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

[PATCH] unit test for i#116701

2013-03-21 Thread Korrawit Pruegsanusak (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2896

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/2896/1

unit test for i#116701

Change-Id: Id9a9532d0e02b478f7913bc4a687c38f79a3a322
---
M svl/qa/unit/svl.cxx
1 file changed, 45 insertions(+), 0 deletions(-)



diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 26a0b8d..b002e01 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -87,10 +87,12 @@
 
 void testNumberFormat();
 void testFdo60915();
+void testI116701();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testNumberFormat);
 CPPUNIT_TEST(testFdo60915);
+CPPUNIT_TEST(testI116701);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -361,6 +363,49 @@
 }
 }
 
+// https://issues.apache.org/ooo/show_bug.cgi?id=116701
+void Test::testI116701()
+{
+LanguageType eLang = LANGUAGE_CHINESE_TRADITIONAL;
+OUString sCode, sExpected;
+double fPreviewNumber = 40573; // equals 30/01/2011
+SvNumberFormatter aFormatter(m_xContext, eLang);
+// DateFormatskey25 in i18npool/source/localedata/data/zh_TW.xml
+sal_Unicode CODE1[] =
+{
+0x0047, 0x0047, 0x0047, 0x0045, 0x0045, // GGGEE
+0x0022, 0x5E74, 0x0022,
+0x004D, // M
+0x0022, 0x6708, 0x0022,
+0x0044, // D
+0x0022, 0x65E5, 0x0022
+};
+sCode = OUString(CODE1, SAL_N_ELEMENTS(CODE1));
+sal_Unicode EXPECTED[] =
+{
+0x4E2D, 0x83EF, 0x6C11, 0x570B,
+0x0031, 0x0030, 0x0030, // 100
+0x5E74,
+0x0031, // 1
+0x6708,
+0x0033, 0x0030, // 30
+0x65E5
+};
+sExpected = OUString(EXPECTED, SAL_N_ELEMENTS(EXPECTED));
+checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected);
+sal_Unicode CODE2[] =
+{
+0x0047, 0x0047, 0x0047, 0x0045, // GGGE
+0x0022, 0x5E74, 0x0022,
+0x004D, // M
+0x0022, 0x6708, 0x0022,
+0x0044, // D
+0x0022, 0x65E5, 0x0022
+};
+sCode = OUString(CODE2, SAL_N_ELEMENTS(CODE2));
+checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9a9532d0e02b478f7913bc4a687c38f79a3a322
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com

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

Re: Pivot Table data provider extension framework (removal possibility)

2013-03-21 Thread Kohei Yoshida

On Wed, Mar 20, 2013 at 5:20 AM, Eike Rathke er...@redhat.com wrote:
 Hi Kohei,

 On Thursday, 2013-03-14 09:26:55 -0400, Kohei Yoshida wrote:

  I believe the same functionality can be achieve via database
  connectivity, by having such external data provider register as a
  database, and use it to act as a data provider for pivot tables.
  So, I don't see a reason why we need to keep this as a separate data
  source category.
 
  IMHO the advantage of the data provider is that the actual data does not
  have to reside in the spreadsheet, allowing for massive amounts of data
  records but providing only the information necessary for the pivot
  table. This maybe could be accomplished as well using a registered data
  source, but currently we have no means to pull the data without actually
  storing it in the spreadsheet for further processing. Or isn't that the
  case?

 Well, that would depend on what you actually mean by storing (the
 data) in the spreadsheet. When pulling data via database
 connectivity, we don't actually copy the data in the spreadsheet
 document, but generate the pivot table output directly from it. But we
 *do* first populate the pivot cache from the database internally, so a
 copy of the data will sit in memory while the document is open.

 That's my bad then. I assumed the data was stored in a DB range.

 Is that different with the data provider, i.e. does it not need to copy
 all data to populate the pivot cache with an interface to directly
 populate the layouted pivot table?

Well, that's how it is implemented today. It's not per design but due
to how this feature has evolved historically.  This data provider
interface was designed and put in place *before* we added this pivot
cache backend.

This difference actually causes additional headache, since we can't
always assume that the pivot cache be populated, which ties our hands
in many places in the pivot engine.

 Other advantages a data provider could have are a) be able to collect
 data from various e.g. remote sources that a simple data connection
 could not provide,

Yes, but to achieve that, one has to implement the *whole pivot result
calc engine*. To me that's an overkill, just to avoid implementing a
simple data connectivity backend. It would be much simpler to just
write a data connectivity backend and re-use the database connectivity
backend of the pivot table.

and b) access data in means not possible with
 database connectivity, for example if the user shall be restricted to
 a subset of a database or not be able to query using SQL statements.

Sure. But I'm sure that could be implemented via some sort of data
connectivity proxy, which to me would be much simpler than developing
the entire result calc engine from scratch.

 Probably there'll always be _some_ use cases such a provider could have
 (does Excel have that? if yes then there are ...),

Unless I missed something (someone could enlighten me on this), Excel
only provides MS SQL connectivity which is equivalent of our database
connectivity backend.

so if it's ripped out
 maybe offering a new interface adapted to the new data types and
 structures that sits on top of the engine instead of being part of it
 would be good.

Sure. But to justify this enormous design constraint, I'd like to hear
from the actual users / deployers about why this special data provider
was needed in the first place, so that their requirement still will
justify the complexity it imposes on 100% of users of pivot table,
including those who don't use this data provider backend (which I
imagine constitutes 99.9% of all pivot table users).

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

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - basic/source

2013-03-21 Thread Eike Rathke

 basic/source/sbx/sbxscan.cxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 88a2e6260c7e5eb9d96129c7391b9ed2ba8272ba
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 21 16:34:56 2013 +0100

fixed a possible crasher

Change-Id: I3b67ba1a8896b4b291e009b4ad680e1342ba9460
Reviewed-on: https://gerrit.libreoffice.org/2894
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 80276a3..63f6dea 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -97,7 +97,7 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double nVal, 
SbxDataType rType
 
 const char* pStart = aBStr.getStr();
 const char* p = pStart;
-char buf[ 80 ], *q = buf;
+rtl::OStringBuffer aBuf( rWSrc.getLength());
 sal_Bool bRes = sal_True;
 sal_Bool bMinus = sal_False;
 nVal = 0;
@@ -134,7 +134,7 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double 
nVal, SbxDataType rType
 if( ++comma  1 )
 continue;
 else
-*q++ = '.';
+aBuf.append('.');
 }
 else if( strchr( DdEe, *p ) )
 {
@@ -144,22 +144,21 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double 
nVal, SbxDataType rType
 }
 if( toupper( *p ) == 'D' )
 eScanType = SbxDOUBLE;
-*q++ = 'E'; p++;
+aBuf.append('E'); p++;
 
 if( *p == '+' )
 p++;
 else
 if( *p == '-' )
-*q++ = *p++;
+aBuf.append( *p++ );
 }
 else
 {
-*q++ = *p++;
+aBuf.append( *p++ );
 if( comma  !exp ) ncdig++;
 }
 if( !exp ) ndig++;
 }
-*q = 0;
 
 if( comma  1 || exp  1 )
 bRes = sal_False;
@@ -172,7 +171,7 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double 
nVal, SbxDataType rType
 eScanType = SbxLONG;
 }
 
-nVal = atof( buf );
+nVal = atof( aBuf.makeStringAndClear().getStr() );
 ndig = ndig - comma;
 // too many numbers for SINGLE?
 if( ndig  15 || ncdig  6 )
@@ -202,11 +201,11 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double 
nVal, SbxDataType rType
 {
 char ch = sal::static_int_cast char ( toupper( *p ) );
 p++;
-if( strchr( cmp, ch ) ) *q++ = ch;
+if( strchr( cmp, ch ) ) aBuf.append( ch );
 else bRes = sal_False;
 }
-*q = 0;
-for( q = buf; *q; q++ )
+rtl::OString aBufStr( aBuf.makeStringAndClear());
+for( const sal_Char* q = aBufStr.getStr(); *q; q++ )
 {
 i =( *q  0xFF ) - '0';
 if( i  9 ) i -= 7;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-3-6] fixed a possible crasher

2013-03-21 Thread Petr Mladek (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2894

Approvals:
  Petr Mladek: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b67ba1a8896b4b291e009b4ad680e1342ba9460
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Petr Mladek pmla...@suse.cz

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

[PUSHED] remove unused code svtools/bmpmaker

2013-03-21 Thread Noel Power (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2868

Approvals:
  Noel Power: Verified; Looks good to me, approved
  LibreOffice gerrit bot: Verified
  Thomas Arnhold: Verified; Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21c98e7857299aef8c482bb07750f4c13529c937
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Krisztian Pinter pin.termina...@gmail.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

Re: Pivot Table data provider extension framework (removal possibility)

2013-03-21 Thread Kohei Yoshida


On 03/12/2013 11:41 AM, Kohei Yoshida wrote:

Hi there,

I'd like to ask whether someone actually uses this Pivot Table data
provider extension framework, because I'd like to remove this if nobody
is using it, or only few people are using it.


I have a cunning idea. Since one of the difficulties on this is to reach 
out to the actual users of this functionality, I'd like to remove the 
4th check box from the current pivot table data source selection dialog 
in 4.1 (and maybe 4.0.x if you guys agree) and see if anyone reports it 
as a bug.


To recap, the current Select Source dialog offers 4 choices:

* Current selection (cell range in sheet)
* Named range
* Data source registered in LibreOffice (database connectivity)
* External source/interface (data provider)

and I propose to remove the last choice from this dialog as the first step.

If, by 4.1, nobody complains, then we assume it's safe to remove this. 
If someone complains, then we'll start a dialogue with that person (or 
persons).  Even then, I still would like to remove this UNO layer but 
offer some sort of alternative if the current database connectivity is 
not sufficient (for whatever reason).


What do you think of this plan?

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Minutes of ESC call

2013-03-21 Thread Jan Holesovsky

Present: Eike, Kendy, Petr, Astron, Kohei, Eilidh, Cedric, Fridrich, Stephan

* Completed Action Items
+ none :-(

* Pending Action Items
+ Bugzilla attachments not set to autodetect (Bjoern)
+ [ pinging Tollef ]
+ disable Rhino / Beanshell unless in experimental mode (Michael M)
+ look at gradient / clipart issues (Michael)
+ helping out with code-pointers for UI bugs (Kendy)
+ [ still pending ]
+ SLES11 / temporary PTF for the server ? using SP3 toolchain ? (Kendy)
[ pending new packages ]
+ need design for copying styles between templates (Astron/UX)
+ either in that dialog or a new dialog
+ also issue with only editing templates that are
  in the mgr
+ decided: change the default install directory to
  'LibreOffice 4' on master (Pmladek)
+ instead have the global headers in one central global directory
+ check behaviour of git-cherry-pick
+ write up for the mailing list (Bjoern)
+ find out how other big projects:
  Mozilla, linux, etc. do this
+ buy build hardware (Thorsten)

* GSOC applications now open (Cedric)
Page needs updating by 28th Mar.
https://wiki.documentfoundation.org/Development/Gsoc/Ideas
+ UX improvements eg. themes support there ?

+ Fridrich applied, now waiting for Google to decide
+ we will know at April 8th

+ please update the GSoC ideas with code pointers
AI  + Grab Kendy on IRC + file UX ideas together (Astron)

* Dresden Impress Sprint (Thorsten)
+ https://wiki.documentfoundation.org/Marketing/Events/ImpressSprint2013

* Release Engineering update (Petr)
+ 4.0.2 rc1 - any regressions ?
+ Petr not aware of any
+ 4.0.2 rc2 deadline - March 25th
+ 3.6.6 rc1 commit deadline - next Monday (18th)
+ ready, on mirrors
+ 3.6.6 rc2 deadline - April 2nd

* UX input (Astron)
+ GSoC - with Kendy
AI  + Personas - moving to different URL (Kendy)
+ Color picker / themes - not much new
+ Website colors / branding
AI  + Icons for Lionel + template manager is not done yet (Astron/UX)

* Coverity progress (Markus/Julien/Norbert/Caolan)
+ work ongoing, going well.

* Automated crash on import test results (Markus)
+ still suffering memory corruptions, another reliability
  bug elsewhere, nasties ...

* Certification Program (Stephan/Kendy/Bjoern)
+ website update
+ pending on website team
+ sent the list of new Certified Devs to Italo

* Hard Hacks:
+ http://wiki.documentfoundation.org/HardHacks
+ three open slots still.
+ thanks to Markus for fdo#61025
+ plan to have 2 writer, 1 spread, 1 draw/impress etc.
fdo#40594 - FILEOPEN .docx (MSO2010) does not show CHART object 
(Michael)
fdo#59932 - FILEOPEN: Text boxes with bulleted lists containing (Muthu)

+ 2 new hardhacks assigned, 1 pending:
fdo#60922 - FILEOPEN, FILESAVE create document as odt, save as docx , 
corrupts (Miklos)
fdo#62116 - FILEOPEN .ods created with LibO 3.6: Link behind text lost 
(Kohei)
fdo#38147 - FILESAVE File Sharing Password protected MS Word document 
no longer editable after reopen (NOT ASSIGNED)

* Kill include guards in .hxx, and use #pragma once instead
+ makes the headers nicer
+ the benchmark available on the net seems to suggest it speeds
  up MSVC
+ Lubos' test seems to suggest that there is ~no difference for
  gcc
+ consensus: let's just do it after 4.0.2 is out

* QA update (Joel)
+ 140 unconfirmed vs. 4.0, help appreciated with triage.
http://tinyurl.com/a3csc2o (cf. topic in #libreoffice-qa)

+ BSA has now French version
+ such bugs go to the French ML first, they'll translate them to
  English  file

* Open 4.1 MAB / regressions
+ 5 (of 10) older 4/8 4/8 2/5 1/2 3/3
+ 
https://bugs.freedesktop.org/showdependencytree.cgi?id=60270hide_resolved=1

* Open 4.0 MAB / regressions
+ 19 (of 109) older 19/106 17/105 14/99 15/96 16/94 16/91 13/79 17/76 
10/69
 18% 18%16%14%   16%   17%   18%   22%   22%   
14%
+ 
https://bugs.freedesktop.org/showdependencytree.cgi?id=54157hide_resolved=1

* 3.6 most annoying bugs ...
+ 78 (of 217) older 77/215 77/214 75/211 76/210 57/189 44/175 45/175 
43/174
 36% 36%36%36%36%30%25%25%
25%
+ 
https://bugs.freedesktop.org/showdependencytree.cgi?id=6hide_resolved=1

* Bibisected bugs open: whiteboard 'bibsected'
+ 25 (of 78) older 29/78 32/79 27/72
+

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Andreas Radke

Am Thu, 21 Mar 2013 14:55:37 +0100
schrieb Stephan Bergmann sberg...@redhat.com:

 However, for the two archlinux issues mentioned above, I would assume 
 that this things are packaged differently there, and 
 share/registry/librelogo.xcd erroneously ends up in some core
 package? Which would make those issues downstream ones.
 
 Stephan

We rely on the upstream file-lists/*_list.txt files to move all stuff
into our packages.

/usr/lib/libreoffice/share/registry/librelogo.xcd is part of
libreoffice-common.

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

Re: [PATCH] remove/add blank lines in sw/source/core

2013-03-21 Thread Kohei Yoshida


On 03/21/2013 09:31 AM, Eike Rathke wrote:

Hi Philipp,

On Wednesday, 2013-03-20 17:31:03 +, Philipp Riemer (via Code Review) wrote:


remove/add blank lines in sw/source/core


I'd prefer if such mere cosmetical changes would not be done; while
inserting a blank line mostly is ok for readability, removing a blank
line mostly for the same reason decreases readability. After all it
boils down to personal preferences. i.e. personally I usually use two
blank lines between method implementations, just because browsing the
source on a quick fly in the editor is easier for the eye.

How do others see this?


I personally prefer a single blank line.  Having two blank lines doesn't 
really improve readability for me, actually.


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

2013-03-21 Thread Kohei Yoshida

 sc/source/filter/lotus/op.cxx   |   31 ++-
 sc/source/filter/qpro/qpro.cxx  |   11 ++-
 sc/source/filter/starcalc/scflt.cxx |3 ++-
 3 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit 36b194405ee3509dccee33263a9c610aaaf16e93
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Mar 21 12:50:52 2013 -0400

More on reducing use of ScDocument::PutCell().

Change-Id: Ibcbb8690c96c176a31563e7b833fa66412888cb6

diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 8668c9e..5ed2564 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -93,8 +93,8 @@ void OP_Integer( SvStream r, sal_uInt16 /*n*/ )
 
 if (ValidColRow( static_castSCCOL(nCol), nRow))
 {
-ScValueCell*  pZelle = new ScValueCell( ( double ) nValue );
-pDoc-PutCell( static_castSCCOL (nCol), static_castSCROW (nRow), 
nTab, pZelle, true );
+pDoc-EnsureTable(nTab);
+pDoc-SetValue(ScAddress(nCol,nRow,nTab), static_castdouble(nValue));
 
 // 0 Stellen nach'm Komma!
 SetFormat( static_castSCCOL (nCol), static_castSCROW (nRow), nTab, 
nFormat, 0 );
@@ -114,8 +114,8 @@ void OP_Number( SvStream r, sal_uInt16 /*n*/ )
 if (ValidColRow( static_castSCCOL(nCol), nRow))
 {
 fValue = ::rtl::math::round( fValue, 15 );
-ScValueCell*  pZelle = new ScValueCell( fValue );
-pDoc-PutCell( static_castSCCOL (nCol), static_castSCROW (nRow), 
nTab, pZelle, true );
+pDoc-EnsureTable(nTab);
+pDoc-SetValue(ScAddress(nCol,nRow,nTab), fValue);
 
 SetFormat( static_castSCCOL (nCol), static_castSCROW (nRow), nTab, 
nFormat, nDezFloat );
 }
@@ -169,11 +169,10 @@ void OP_Formula( SvStream r, sal_uInt16 /*n*/ )
 
 if (ValidColRow( static_castSCCOL(nCol), nRow))
 {
-ScFormulaCell*pZelle = new ScFormulaCell( pLotusRoot-pDoc, 
aAddress, pErg );
-
-pZelle-AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
-
-pDoc-PutCell( static_castSCCOL (nCol), static_castSCROW (nRow), 
nTab, pZelle, true );
+ScFormulaCell* pCell = new ScFormulaCell( pLotusRoot-pDoc, aAddress, 
pErg );
+pCell-AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
+pDoc-EnsureTable(nTab);
+pDoc-SetFormulaCell(ScAddress(nCol,nRow,nTab), pCell);
 
 // nFormat = Standard - Nachkommastellen wie Float
 SetFormat( static_castSCCOL (nCol), static_castSCROW (nRow), nTab, 
nFormat, nDezFloat );
@@ -391,9 +390,8 @@ void OP_Number123( SvStream r, sal_uInt16 /*n*/ )
 if (ValidColRow( static_castSCCOL(nCol), nRow)  nTab = 
pDoc-GetMaxTableNumber())
 {
 double fValue = Snum32ToDouble( nValue );
-
-ScValueCell *pCell = new ScValueCell( fValue );
-pDoc-PutCell( static_castSCCOL(nCol), static_castSCROW(nRow), 
static_castSCTAB(nTab), pCell, true );
+pDoc-EnsureTable(nTab);
+pDoc-SetValue(ScAddress(nCol,nRow,nTab), fValue);
 }
 }
 
@@ -416,10 +414,9 @@ void OP_Formula123( SvStream r, sal_uInt16 n )
 if (ValidColRow( static_castSCCOL(nCol), nRow)  nTab = 
pDoc-GetMaxTableNumber())
 {
 ScFormulaCell* pCell = new ScFormulaCell( pLotusRoot-pDoc, aAddress, 
pErg );
-
 pCell-AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
-
-pDoc-PutCell( static_castSCCOL(nCol), static_castSCROW(nRow), 
static_castSCTAB(nTab), pCell, true );
+pDoc-EnsureTable(nTab);
+pDoc-SetFormulaCell(ScAddress(nCol,nRow,nTab), pCell);
 }
 }
 
@@ -433,8 +430,8 @@ void OP_IEEENumber123( SvStream r, sal_uInt16 /*n*/ )
 
 if (ValidColRow( static_castSCCOL(nCol), nRow)  nTab = 
pDoc-GetMaxTableNumber())
 {
-ScValueCell *pCell = new ScValueCell(dValue);
-pDoc-PutCell( static_castSCCOL(nCol), static_castSCROW(nRow), 
static_castSCTAB(nTab), pCell, true );
+pDoc-EnsureTable(nTab);
+pDoc-SetValue(ScAddress(nCol,nRow,nTab), dValue);
 }
 }
 
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index e292871..231f1e0 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -82,20 +82,20 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* 
pDoc, ScQProStyle *pSt
 case 0x000d:{ // Integer cell
 sal_Int16 nValue;
 *mpStream  nCol  nDummy  nRow  nStyle  nValue;
-ScValueCell* pInteger = new ScValueCell( ( double ) nValue );
 nStyle = nStyle  3;
 pStyle-SetFormat( pDoc, nCol, nRow, nTab, nStyle );
-pDoc-PutCell(nCol ,nRow, nTab ,pInteger,true);
+pDoc-EnsureTable(nTab);
+pDoc-SetValue(ScAddress(nCol,nRow,nTab), 
static_castdouble(nValue));
 }
 break;
 
 case 0x000e:{ // Floating point cell
 double nValue;
 *mpStream  nCol  nDummy  nRow  nStyle  nValue;
-

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-6' - basic/source

2013-03-21 Thread Eike Rathke

 basic/source/sbx/sbxscan.cxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 636d6ff34b2a3740d96bcb6f19b549e64614ac95
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 21 16:34:56 2013 +0100

fixed a possible crasher

Change-Id: I3b67ba1a8896b4b291e009b4ad680e1342ba9460
Reviewed-on: https://gerrit.libreoffice.org/2895
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 80276a3..63f6dea 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -97,7 +97,7 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double nVal, 
SbxDataType rType
 
 const char* pStart = aBStr.getStr();
 const char* p = pStart;
-char buf[ 80 ], *q = buf;
+rtl::OStringBuffer aBuf( rWSrc.getLength());
 sal_Bool bRes = sal_True;
 sal_Bool bMinus = sal_False;
 nVal = 0;
@@ -134,7 +134,7 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double 
nVal, SbxDataType rType
 if( ++comma  1 )
 continue;
 else
-*q++ = '.';
+aBuf.append('.');
 }
 else if( strchr( DdEe, *p ) )
 {
@@ -144,22 +144,21 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double 
nVal, SbxDataType rType
 }
 if( toupper( *p ) == 'D' )
 eScanType = SbxDOUBLE;
-*q++ = 'E'; p++;
+aBuf.append('E'); p++;
 
 if( *p == '+' )
 p++;
 else
 if( *p == '-' )
-*q++ = *p++;
+aBuf.append( *p++ );
 }
 else
 {
-*q++ = *p++;
+aBuf.append( *p++ );
 if( comma  !exp ) ncdig++;
 }
 if( !exp ) ndig++;
 }
-*q = 0;
 
 if( comma  1 || exp  1 )
 bRes = sal_False;
@@ -172,7 +171,7 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double 
nVal, SbxDataType rType
 eScanType = SbxLONG;
 }
 
-nVal = atof( buf );
+nVal = atof( aBuf.makeStringAndClear().getStr() );
 ndig = ndig - comma;
 // too many numbers for SINGLE?
 if( ndig  15 || ncdig  6 )
@@ -202,11 +201,11 @@ SbxError ImpScan( const ::rtl::OUString rWSrc, double 
nVal, SbxDataType rType
 {
 char ch = sal::static_int_cast char ( toupper( *p ) );
 p++;
-if( strchr( cmp, ch ) ) *q++ = ch;
+if( strchr( cmp, ch ) ) aBuf.append( ch );
 else bRes = sal_False;
 }
-*q = 0;
-for( q = buf; *q; q++ )
+rtl::OString aBufStr( aBuf.makeStringAndClear());
+for( const sal_Char* q = aBufStr.getStr(); *q; q++ )
 {
 i =( *q  0xFF ) - '0';
 if( i  9 ) i -= 7;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-3-6-6] fixed a possible crasher

2013-03-21 Thread Noel Power (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2895

Approvals:
  Noel Power: Verified; Looks good to me, approved
  Petr Mladek: Verified; Looks good to me, but someone else must approve
  Fridrich Strba: Looks good to me, but someone else must approve


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b67ba1a8896b4b291e009b4ad680e1342ba9460
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-6
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Petr Mladek pmla...@suse.cz

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

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Stephan Bergmann


On 03/21/2013 05:39 PM, Andreas Radke wrote:

Am Thu, 21 Mar 2013 14:55:37 +0100
schrieb Stephan Bergmann sberg...@redhat.com:

However, for the two archlinux issues mentioned above, I would assume
that this things are packaged differently there, and
share/registry/librelogo.xcd erroneously ends up in some core
package? Which would make those issues downstream ones.

Stephan


We rely on the upstream file-lists/*_list.txt files to move all stuff
into our packages.

/usr/lib/libreoffice/share/registry/librelogo.xcd is part of
libreoffice-common.


Sorry, I have no idea about those file-lists/*_list.txt files.  Can you 
give a link to them in the LibreOffice git repo at 
http://cgit.freedesktop.org/libreoffice?


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

Re: [PATCH] remove/add blank lines in sw/source/core

2013-03-21 Thread Lubos Lunak

On Thursday 21 of March 2013, Eike Rathke wrote:
 Hi Philipp,

 On Wednesday, 2013-03-20 17:31:03 +, Philipp Riemer (via Code Review) 
wrote:
  remove/add blank lines in sw/source/core

 I'd prefer if such mere cosmetical changes would not be done; while
 inserting a blank line mostly is ok for readability, removing a blank
 line mostly for the same reason decreases readability. After all it
 boils down to personal preferences. i.e. personally I usually use two
 blank lines between method implementations, just because browsing the
 source on a quick fly in the editor is easier for the eye.

 How do others see this?

 I think there is still so much to do before arguing about spaces or other 
similar matter of taste details that have very little practical consequences.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] Missing dependency of librelogo on writer

2013-03-21 Thread Stephan Bergmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2897

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/2897/1

Missing dependency of librelogo on writer

...at least due to dependency of librelogo.xcd on writer.xcd, see
82c53d537a05dadf4d7fd7ea41292897bf2d47c7 Missing dependency.

Otherwise, having librelogo installed but not writer will cause an uncaught
RuntimeException from configmgr::Components::parseXcdFiles
(configmgr/source/components.cxx) early on in soffice.bin.

(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3)
Conflicts:
setup_native/source/packinfo/packinfo_office.txt

Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
---
M setup_native/source/packinfo/packinfo_office.txt
1 file changed, 3 insertions(+), 3 deletions(-)



diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 3e8c89e..cbf8c490 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -314,10 +314,10 @@
 Start
 module = gid_Module_Optional_Pyuno_LibreLogo
 solarispackagename = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo
-solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, 
SUNWPython
+solarisrequires = 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython
 packagename = %BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo
-freebsdrequires = %BASISPACKAGEPREFIX%PRODUCTVERSION-core01
-requires = %BASISPACKAGEPREFIX%PRODUCTVERSION-core01
+freebsdrequires = 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer
+requires = 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer
 copyright = 2012 The Document Foundation
 solariscopyright = solariscopyrightfile
 vendor = The Document Foundation

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com

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

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Stephan Bergmann


On 03/21/2013 02:55 PM, Stephan Bergmann wrote:

And indeed, at least with the official generic Linux downloads from
http://www.libreoffice.org/download libobasis4.0-librelogo-4.0.1.2-2
(containing share/registry/librelogo.xcd) only depends on
libobasis4.0-core01 but not on libobasis4.0-writer.  I'll see to get
that fixed.


Fixed on master towards LO 4.1 as 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e69b35674882d8d675a677940805b187cad0bc3 
Missing dependency of librelogo on writer and requested backports to 
libreoffice-4-0 towards LO 4.0.3 
(https://gerrit.libreoffice.org/#/c/2897/) and libreoffice-4-0-2 
towards LO 4.0.2 (https://gerrit.libreoffice.org/#/c/2898/).


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

Re: [PATCH] remove/add blank lines in sw/source/core

2013-03-21 Thread Tor Lillqvist

  I think there is still so much to do before arguing about spaces or other
 similar matter of taste details that have very little practical consequences.

The practical consequence of inconsistent spacing/alignment, excessive
vertical whitespace, pointless ASCII graphics etc is that developers
get annoyed and waste time cursing the ugliness in their mind. (Yeah,
as if the code wasn't annoying enough from a semantically significant
point of view;)

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

[PATCH libreoffice-4-0-2] Missing dependency of librelogo on writer

2013-03-21 Thread Stephan Bergmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2898

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/2898/1

Missing dependency of librelogo on writer

...at least due to dependency of librelogo.xcd on writer.xcd, see
82c53d537a05dadf4d7fd7ea41292897bf2d47c7 Missing dependency.

Otherwise, having librelogo installed but not writer will cause an uncaught
RuntimeException from configmgr::Components::parseXcdFiles
(configmgr/source/components.cxx) early on in soffice.bin.

(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3)
Conflicts:
setup_native/source/packinfo/packinfo_office.txt

Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
---
M setup_native/source/packinfo/packinfo_office.txt
1 file changed, 3 insertions(+), 3 deletions(-)



diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 3e8c89e..cbf8c490 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -314,10 +314,10 @@
 Start
 module = gid_Module_Optional_Pyuno_LibreLogo
 solarispackagename = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo
-solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, 
SUNWPython
+solarisrequires = 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython
 packagename = %BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo
-freebsdrequires = %BASISPACKAGEPREFIX%PRODUCTVERSION-core01
-requires = %BASISPACKAGEPREFIX%PRODUCTVERSION-core01
+freebsdrequires = 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer
+requires = 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer
 copyright = 2012 The Document Foundation
 solariscopyright = solariscopyrightfile
 vendor = The Document Foundation

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-2
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - setup_native/source

2013-03-21 Thread Stephan Bergmann

 setup_native/source/packinfo/packinfo_office.txt |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 110253379015ec0cbb2bbaf99fde9e2c546f8d06
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 21 15:57:18 2013 +0100

Missing dependency of librelogo on writer

...at least due to dependency of librelogo.xcd on writer.xcd, see
82c53d537a05dadf4d7fd7ea41292897bf2d47c7 Missing dependency.

Otherwise, having librelogo installed but not writer will cause an uncaught
RuntimeException from configmgr::Components::parseXcdFiles
(configmgr/source/components.cxx) early on in soffice.bin.

(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3)
Conflicts:
setup_native/source/packinfo/packinfo_office.txt

Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
Reviewed-on: https://gerrit.libreoffice.org/2897
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 3e8c89e..cbf8c490 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -314,10 +314,10 @@ End
 Start
 module = gid_Module_Optional_Pyuno_LibreLogo
 solarispackagename = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo
-solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, 
SUNWPython
+solarisrequires = 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython
 packagename = %BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo
-freebsdrequires = %BASISPACKAGEPREFIX%PRODUCTVERSION-core01
-requires = %BASISPACKAGEPREFIX%PRODUCTVERSION-core01
+freebsdrequires = 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer
+requires = 
%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer
 copyright = 2012 The Document Foundation
 solariscopyright = solariscopyrightfile
 vendor = The Document Foundation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] Missing dependency of librelogo on writer

2013-03-21 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2897

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] core.git: 3 commits - dbaccess/source tools/inc vcl/source

2013-03-21 Thread Chris

 dbaccess/source/ui/dlg/dbwizsetup.cxx   |   10 +-
 tools/inc/tools/debug.hxx   |5 ++---
 vcl/source/glyphs/graphite_features.cxx |5 +++--
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 3c61c08757208fb9735814dd62ac80f23cf51b86
Author: Chris chris.sherloc...@gmail.com
Date:   Thu Mar 21 23:55:36 2013 +1100

Move setupwizard modify handler code.

Move setupwizard code into the conditional below it. You can only work
on pPage if it isn't a null pointer anyway, to my mind this looks a
lot cleaner.

Change-Id: If8d910c15c5a1c1da5eb204b5922d074c454978b
Reviewed-on: https://gerrit.libreoffice.org/2890
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx 
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 338e7c0..cb53dfd 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -587,13 +587,13 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState 
_nState)
 break;
 }
 
-if (pPage  (_nState != PAGE_DBSETUPWIZARD_INTRO)  (_nState != 
PAGE_DBSETUPWIZARD_AUTHENTIFICATION))
-{
-pPage-SetModifiedHandler(LINK( this, ODbTypeWizDialogSetup, 
ImplModifiedHdl ) );
-}
-
 if ( pPage )
 {
+if ((_nState != PAGE_DBSETUPWIZARD_INTRO)  (_nState != 
PAGE_DBSETUPWIZARD_AUTHENTIFICATION))
+{
+pPage-SetModifiedHandler(LINK( this, ODbTypeWizDialogSetup, 
ImplModifiedHdl ) );
+}
+
 pPage-SetServiceFactory( m_pImpl-getORB() );
 pPage-SetAdminDialog(this, this);
 
commit f9af9abe628dc8886e320fa27421a125886f37a6
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu Mar 21 19:10:52 2013 +0100

debug: remove binfilter debug macro

Change-Id: I419c37860a21ae5ab416a2c8ec3c742fbaf6a980

diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index e956d65..5416050 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -32,8 +32,8 @@
 steps taken while executing some protocol) should use the facilities
 provided by sal/log.hxx.
 
-Because the assertion macros (DBG_ASSERT, DBG_BF_ASSERT) have been used for
-true assertions as well as to log warnings, they map to SAL_WARN instead of
+Because the assertion macro (DBG_ASSERT) has been used for
+true assertions as well as to log warnings, it maps to SAL_WARN instead of
 standard assert.  The warning and error macros (DBG_ASSERTWARNING,
 DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING3, DBG_ERRORFILE) all map to
 SAL_INFO.
@@ -477,7 +477,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
 
 #define DBG_ASSERTWARNING( sCon, aWarning ) ((void)0)
 #define DBG_ASSERT( sCon, aError ) ((void)0)
-#define DBG_BF_ASSERT( sCon, aError ) ((void)0)
 #define DBG_WARNING( aWarning ) ((void)0)
 #define DBG_WARNING1( aWarning, x1 ) ((void)0)
 #define DBG_WARNING2( aWarning, x1, x2 ) ((void)0)
commit 51890613b7cdeddff9ad3360a91908ded28bc5f0
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu Mar 21 19:10:02 2013 +0100

vcl: use OSL_BIGENDIAN

Change-Id: Ifdf54d30cca94d0d65d78f94d5fac31edf8c6df2

diff --git a/vcl/source/glyphs/graphite_features.cxx 
b/vcl/source/glyphs/graphite_features.cxx
index ca10807..1bff1e4 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -24,6 +24,7 @@
 
 
 #include sal/types.h
+#include osl/endian.h
 
 #ifdef WNT
 #include windows.h
@@ -88,7 +89,7 @@ GrFeatureParser::GrFeatureParser(const gr_face * pFace, const 
::rtl::OString fea
 gr_uint32 nFaceLang = gr_face_lang_by_index(pFace, i);
 FeatId aSupportedLang;
 aSupportedLang.num = nFaceLang;
-#ifdef __BIG_ENDIAN__
+#ifdef OSL_BIGENDIAN
 // here we only expect full 3 letter codes
 if (aLang.label[0] == aSupportedLang.label[0] 
 aLang.label[1] == aSupportedLang.label[1] 
@@ -163,7 +164,7 @@ void GrFeatureParser::setLang(const gr_face * pFace, const 
rtl::OString  lang)
 FeatId aSupportedLang;
 aSupportedLang.num = nFaceLang;
 // here we only expect full 2  3 letter codes
-#ifdef __BIG_ENDIAN__
+#ifdef OSL_BIGENDIAN
 if (aLang.label[0] == aSupportedLang.label[0] 
 aLang.label[1] == aSupportedLang.label[1] 
 aLang.label[2] == aSupportedLang.label[2] 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Move setupwizard modify handler code.

2013-03-21 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2890

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8d910c15c5a1c1da5eb204b5922d074c454978b
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PATCH] basic: Remove non working AboutStarBasic

2013-03-21 Thread Thomas Arnhold (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2899

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/2899/1

basic: Remove non working AboutStarBasic

The content of this function was commented out since the first import. So as it 
does nothing remove it.

Change-Id: Ia46674f7bdc12e80d61a8142697e875f5c58f482
---
M basic/source/runtime/methods.cxx
M basic/source/runtime/rtlproto.hxx
M basic/source/runtime/stdobj.cxx
3 files changed, 0 insertions(+), 10 deletions(-)



diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 0318b82..64c0eb6 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4330,13 +4330,6 @@
 
 
//-
 
-RTLFUNC(AboutStarBasic)
-{
-(void)pBasic;
-(void)bWrite;
-(void)rPar;
-}
-
 RTLFUNC(MsgBox)
 {
 (void)pBasic;
diff --git a/basic/source/runtime/rtlproto.hxx 
b/basic/source/runtime/rtlproto.hxx
index b13d664..ccf0a3b 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -275,7 +275,6 @@
 
 extern RTLFUNC(Load);
 extern RTLFUNC(Unload);
-extern RTLFUNC(AboutStarBasic);
 extern RTLFUNC(LoadPicture);
 extern RTLFUNC(SavePicture);
 
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 2a69f44..1e882c2 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -80,8 +80,6 @@
 
 static Methods aMethods[] = {
 
-{ AboutStarBasic, SbxNULL,  1 | _FUNCTION, RTLNAME(AboutStarBasic),0  },
-  { Name, SbxSTRING, 0,NULL,0 },
 { Abs,SbxDOUBLE,1 | _FUNCTION, RTLNAME(Abs),0 },
   { number,   SbxDOUBLE, 0,NULL,0 },
 { Array,  SbxOBJECT,_FUNCTION, RTLNAME(Array),0   },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia46674f7bdc12e80d61a8142697e875f5c58f482
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold tho...@arnhold.org

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

[PATCH] clean up DBG_ERRORn

2013-03-21 Thread Thomas Arnhold (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2900

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/2900/1

clean up DBG_ERRORn

Those were DBG_ERRORn before and were falsely changed to OSL_TRACE by me.

See:
1707a350af8a0909ae88c2b11deb714f8b2a93ff
533f89e49395bbc31baaab9ade46db934b383e14

Change-Id: I4f4188ba25b988128a539542f49797ea6985702e
---
M oox/source/export/SchXMLSeriesHelper.cxx
M oox/source/export/chartexport.cxx
M sal/inc/sal/log-areas.dox
M tools/source/generic/config.cxx
M vcl/source/window/accel.cxx
M vcl/source/window/winproc.cxx
6 files changed, 8 insertions(+), 19 deletions(-)



diff --git a/oox/source/export/SchXMLSeriesHelper.cxx 
b/oox/source/export/SchXMLSeriesHelper.cxx
index 802fc01..a41 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/SchXMLSeriesHelper.cxx
@@ -26,8 +26,6 @@
 #include com/sun/star/lang/XMultiServiceFactory.hpp
 
 #include rtl/ustring.h
-// header for define DBG_ERROR1
-#include tools/debug.hxx
 
 #include typeinfo
 
@@ -201,8 +199,7 @@
 catch( const uno::Exception  rEx )
 {
 (void)rEx; // avoid warning for pro build
-OSL_TRACE( Exception caught 
SchXMLSeriesHelper::createOldAPISeriesPropertySet: %s,
-OUStringToOString( rEx.Message, 
RTL_TEXTENCODING_ASCII_US ).getStr() );
+SAL_WARN( oox, Exception caught 
SchXMLSeriesHelper::createOldAPISeriesPropertySet:   rEx.Message );
 }
 }
 
@@ -240,8 +237,7 @@
 {
 (void)rEx; // avoid warning for pro build
 
-OSL_TRACE( Exception caught 
SchXMLSeriesHelper::createOldAPIDataPointPropertySet: %s,
-OUStringToOString( rEx.Message, 
RTL_TEXTENCODING_ASCII_US ).getStr() );
+SAL_WARN( oox, Exception caught 
SchXMLSeriesHelper::createOldAPIDataPointPropertySet:   rEx.Message );
 }
 }
 
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 2d24717..5cab754 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2417,8 +2417,7 @@
 catch( const uno::Exception  rEx )
 {
 (void)rEx; // avoid warning for pro build
-OSL_TRACE( Exception caught during Export of data point: 
%s,
-OUStringToOString( rEx.Message, 
RTL_TEXTENCODING_ASCII_US ).getStr() );
+SAL_WARN( oox, Exception caught during Export of data 
point:   rEx.Message );
 }
 }
 else
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 3bb316f..07c7399 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -195,6 +195,7 @@
 
 @li @c tools.debug
 @li @c tools.datetime
+@li @c tools.generic
 @li @c tools.memtools
 @li @c tools.rc - resource manager
 @li @c tools.stream - SvStream class
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 9d2d284..dac13f0 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -537,15 +537,8 @@
 
 static void ImplWriteConfig( ImplConfigData* pData )
 {
-#ifdef DBG_UTIL
-if ( DbgIsAssert() )
-{
-if ( pData-mnTimeStamp != ImplSysGetConfigTimeStamp( 
pData-maFileName ) )
-{
-OSL_TRACE( Config overwrites modified configfile:\n %s, 
rtl::OUStringToOString(pData-maFileName, RTL_TEXTENCODING_UTF8).getStr() );
-}
-}
-#endif
+SAL_WARN_IF( pData-mnTimeStamp != ImplSysGetConfigTimeStamp( 
pData-maFileName ),
+tools.generic, Config overwrites modified configfile:   
pData-maFileName );
 
 // Read config list from buffer
 sal_uIntPtr nBufLen;
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 261c4d0..653dac9 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -264,7 +264,7 @@
 }
 else if ( !mpData-maKeyMap.insert( std::make_pair( nCode, pEntry ) 
).second )
 {
-OSL_TRACE( Accelerator::InsertItem(): KeyCode (Key: %lx) already 
exists, nCode );
+SAL_WARN( vcl.layout, Accelerator::InsertItem(): KeyCode (Key:   
nCode  ) already exists );
 delete pEntry;
 }
 else
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index b8f1cde..98c856b 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2661,7 +2661,7 @@
 break;
 #ifdef DBG_UTIL
 default:
-OSL_TRACE( ImplWindowFrameProc(): unknown event (%lu), 
(sal_uLong)nEvent );
+SAL_WARN( vcl.layout, ImplWindowFrameProc(): unknown event ( 
 nEvent  ) );
 break;
 #endif
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id:

[Libreoffice-commits] core.git: 2 commits - graphite/graphite2.patch python3/ExternalPackage_python3.mk python3/ExternalProject_python3.mk python3/python-3.3.0-msvc-x64.patch.1

2013-03-21 Thread Tor Lillqvist

 graphite/graphite2.patch  |   17 
 python3/ExternalPackage_python3.mk|   43 +-
 python3/ExternalProject_python3.mk|4 -
 python3/python-3.3.0-msvc-x64.patch.1 |  133 ++
 4 files changed, 175 insertions(+), 22 deletions(-)

New commits:
commit cd9c754828eb4f63373463399d7a41aa9ca43459
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Mar 21 20:20:28 2013 +0200

64-bit Windows size_t and ptrdiff_t fix

Change-Id: If52ea2777af1faca3ea20a7bd305307ab0c115ac

diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch
index 2b6f64b..c7739ad 100644
--- a/graphite/graphite2.patch
+++ b/graphite/graphite2.patch
@@ -10,3 +10,20 @@
#if defined GRAPHITE2_STATIC
  #define GR2_API
#elif defined GRAPHITE2_EXPORTING
+--- misc/graphite2-1.2.0/src/inc/json.h
 misc/build/graphite2-1.2.0/src/inc/json.h
+@@ -146,6 +146,14 @@
+ inline
+ json  operator  (json  j, unsigned int d) throw() { 
return j  json::integer(d); }
+ 
++#if defined(_WIN64)
++inline
++json  operator  (json  j, __int64 d) throw()  { return j  
json::integer((unsigned int)d); }
++
++inline
++json  operator  (json  j, size_t d) throw()   { return j  
json::integer((unsigned int)d); }
++
++#endif
+ inline
+ json  operator  (json  j, char c) throw ()
+ {
commit 8b79f292fb7f41f424c4f02900082a5c9a71c0f4
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Mar 21 18:20:01 2013 +0200

Fix x64 Windows build of python3 (no idea if it works)

Change-Id: If8075a459acf4901ef451b24e54d88a8b68393f9

diff --git a/python3/ExternalPackage_python3.mk 
b/python3/ExternalPackage_python3.mk
index 6c3c448..1e83e3f 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -12,27 +12,30 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,python3,python3))
 $(eval $(call gb_ExternalPackage_use_external_project,python3,python3))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call 
gb_ExternalPackage_add_file,python3,bin/python.exe,LO_lib/python.exe))
-$(eval $(call 
gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/python$(PYTHON_VERSION_MAJOR).dll))
-$(eval $(call 
gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).dll,LO_lib/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).dll))
-$(eval $(call 
gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR).lib,LO_lib/python$(PYTHON_VERSION_MAJOR).lib))
-$(eval $(call 
gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).lib,LO_lib/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).lib))
+ifeq ($(CPUNAME),X86_64)
+python_arch_subdir=amd64/
+endif
+$(eval $(call 
gb_ExternalPackage_add_file,python3,bin/python.exe,LO_lib/$(python_arch_subdir)python.exe))
+$(eval $(call 
gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll))
+$(eval $(call 
gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).dll))
+$(eval $(call 
gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).lib))
+$(eval $(call 
gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).lib))
 $(eval $(call gb_ExternalPackage_add_files,python3,lib/python,\
-   LO_lib/_ctypes.pyd \
-   LO_lib/_ctypes_test.pyd \
-   LO_lib/_decimal.pyd \
-   LO_lib/_elementtree.pyd \
-   LO_lib/_msi.pyd \
-   LO_lib/_multiprocessing.pyd \
-   LO_lib/_socket.pyd \
-   LO_lib/_ssl.pyd \
-   LO_lib/_testbuffer.pyd \
-   LO_lib/_testcapi.pyd \
-   LO_lib/pyexpat.pyd \
-   LO_lib/select.pyd \
-   LO_lib/unicodedata.pyd \
-   LO_lib/winsound.pyd \
-   LO_lib/xxlimited.pyd \
+   LO_lib/$(python_arch_subdir)_ctypes.pyd \
+   LO_lib/$(python_arch_subdir)_ctypes_test.pyd \
+   LO_lib/$(python_arch_subdir)_decimal.pyd \
+   LO_lib/$(python_arch_subdir)_elementtree.pyd \
+   LO_lib/$(python_arch_subdir)_msi.pyd \
+   LO_lib/$(python_arch_subdir)_multiprocessing.pyd \
+   LO_lib/$(python_arch_subdir)_socket.pyd \
+   LO_lib/$(python_arch_subdir)_ssl.pyd \
+   LO_lib/$(python_arch_subdir)_testbuffer.pyd \
+   LO_lib/$(python_arch_subdir)_testcapi.pyd \
+   LO_lib/$(python_arch_subdir)pyexpat.pyd \
+   LO_lib/$(python_arch_subdir)select.pyd \
+   LO_lib/$(python_arch_subdir)unicodedata.pyd \
+   LO_lib/$(python_arch_subdir)winsound.pyd \
+   LO_lib/$(python_arch_subdir)xxlimited.pyd \
 ))
 else ifeq ($(OS),WNT) # MinGW
 # TODO how are C modules called on this platform?
diff --git

[Libreoffice-commits] core.git: basic/source

2013-03-21 Thread Eike Rathke

 basic/source/comp/scanner.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit caecf6102f5042908c915afe89834ab7d3a4a4cb
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 21 19:30:36 2013 +0100

SbiScanner::NextSym: check status after rtl_math_uStringToDouble()

For example, 10e308 is overflow, not 0 ...

Change-Id: Ib7d622865bfb73581732bda45c76e078ee7d05d0

diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 5fbdcef..728187c 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -361,8 +361,11 @@ bool SbiScanner::NextSym()
 {   aError = OUString('.');
 GenError( SbERR_BAD_CHAR_IN_NUMBER );   }
 
-// #57844 use localized function
-nVal = rtl_math_uStringToDouble( buf, buf+(p-buf), '.', ',', NULL, 
NULL );
+rtl_math_ConversionStatus eStatus = rtl_math_ConversionStatus_Ok;
+const sal_Unicode* pParseEnd = buf;
+nVal = rtl_math_uStringToDouble( buf, buf+(p-buf), '.', ',', eStatus, 
pParseEnd );
+if (eStatus != rtl_math_ConversionStatus_Ok || pParseEnd != 
buf+(p-buf))
+GenError( SbERR_MATH_OVERFLOW );
 
 ndig = ndig - comma;
 if( !comma  !exp )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/qa

2013-03-21 Thread Eike Rathke

 basic/qa/cppunit/test_scanner.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit cafa2b948bd78905b5890f917403e6fabff3b6dd
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 21 19:43:53 2013 +0100

added unit test for 10e308 math overflow

Change-Id: I492d991545239539d21fb59de3eccdd1ab56a9af

diff --git a/basic/qa/cppunit/test_scanner.cxx 
b/basic/qa/cppunit/test_scanner.cxx
index 3396d0f..9c8d388 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -15,6 +15,7 @@
 
 #include osl/file.hxx
 #include osl/process.h
+#include rtl/math.hxx
 
 #include scanner.hxx
 
@@ -562,6 +563,7 @@ namespace
 const OUString source14(12e-3+);
 const OUString source15(1,2,3);
 const OUString 
source16(1.);
+const OUString source17(10e308);
 
 std::vectorSymbol symbols;
 sal_Int32 errors;
@@ -691,6 +693,15 @@ namespace
 // This error is from a buffer overflow which is stupid because
 // the buffer is artificially constrained by the scanner.
 CPPUNIT_ASSERT(errors == 1); // HACK
+
+double fInf = 0.0;
+rtl::math::setInf( fInf, false);
+symbols = getSymbols(source17, errors);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].number == fInf);
+CPPUNIT_ASSERT(symbols[0].type == SbxDOUBLE);
+CPPUNIT_ASSERT(symbols[1].text == cr);
+CPPUNIT_ASSERT(errors == 1);// math error, overflow
   }
 
   void ScannerTest::testDataType()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: need help debugging unopkg error on centos 6.3

2013-03-21 Thread Michael Stahl

On 21/03/13 17:40, Neeraj Rai wrote:
 Hi Michael,
 
 I ran it with strace but I'm not sure I can interpret the output . 
 I don't see any mention of  osl_executeProcess.

strace only traces system calls; presumably osl_executeProcess would
result in clone and some variant of exec on Linux.

 I suspected my env is bad, so I logged into the box from another machine
 and that works.
 
 I would like to learn how to interpret the strace output - there seems
 to be differences in the calls between the env  around the runtime
 exception. 


 lstat(/stora/work/loc1/prod/libreoffice-4.0/lib/libreoffice/ure/lib, 
 {st_mode=S_IFDIR|0775, st_size=4096, ...}) = 0
 lstat(/stora/work/loc1/prod/libreoffice-4.0/lib/libreoffice/ure/lib/libuno_cppu.so.3,
  {st_mode=S_IFREG|0755, st_size=900907, ...}) = 0
 write(2, \nERROR: unknown error!\n, 23
 ERROR: unknown error!
 ) = 23
 write(2, \nunopkg failed.\n, 16
 unopkg failed.
 )  = 16

nothing obviously going wrong there.

there's also no clone or exec* return value indicating failure.

hmm.. perhaps you should try gdb instead :)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [4.0] Calc+Base fail without registry/writer.xcd from Writer package

2013-03-21 Thread Andreas Radke

Am Thu, 21 Mar 2013 18:04:15 +0100
schrieb Stephan Bergmann sberg...@redhat.com:

 On 03/21/2013 05:39 PM, Andreas Radke wrote:
  Am Thu, 21 Mar 2013 14:55:37 +0100
  schrieb Stephan Bergmann sberg...@redhat.com:
  However, for the two archlinux issues mentioned above, I would
  assume that this things are packaged differently there, and
  share/registry/librelogo.xcd erroneously ends up in some core
  package? Which would make those issues downstream ones.
 
  Stephan
 
  We rely on the upstream file-lists/*_list.txt files to move all
  stuff into our packages.
 
  /usr/lib/libreoffice/share/registry/librelogo.xcd is part of
  libreoffice-common.
 
 Sorry, I have no idea about those file-lists/*_list.txt files.  Can
 you give a link to them in the LibreOffice git repo at 
 http://cgit.freedesktop.org/libreoffice?
 
 Stephan
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
 

http://cgit.freedesktop.org/libreoffice/core/tree/bin/distro-install-file-lists

I guess this is the base where they are created. Petr Mladek should
know best how this is done.

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

Re: [PATCH] remove/add blank lines in sw/source/core

2013-03-21 Thread Thomas Arnhold


On 21.03.2013 15:06, Michael Meeks wrote:


So I'd say that these huge spews of ascii-art don't serve a useful
purpose:

//-

and bulky content-free comments (which we still have plenty of) should
clearly take be a higher priority for being removing ;-) at least to me.


In this context: Here's the EasyHack for this:

https://bugs.freedesktop.org/show_bug.cgi?id=62475

If someone wants to do this :)

Thomas

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

[Libreoffice-commits] core.git: python3/ExternalProject_python3.mk

2013-03-21 Thread Michael Stahl

 python3/ExternalProject_python3.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c49d0ba320faff58c0c9baefe5c1a182593fe22b
Author: Michael Stahl mst...@redhat.com
Date:   Thu Mar 21 20:02:25 2013 +0100

python3: fix typo in 8b79f292fb7f41f424c4f02900082a5c9a71c0f4

Change-Id: I8bea810debfd4f53f4c53fe06fdf1f2b9256e795

diff --git a/python3/ExternalProject_python3.mk 
b/python3/ExternalProject_python3.mk
index cc417c3..506551b 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -35,7 +35,7 @@ ifeq ($(VCVER),110)
,PCBuild)
 else ifeq ($(VCVER),100)
$(call gb_ExternalProject_run,build,\
-   MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build 
/p:Configuration=Release /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64 
/ToolsVersion:4.0 \
+   MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build 
/p:Configuration=Release /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) 
/ToolsVersion:4.0 \
 cd $(EXTERNAL_WORKDIR) \
 ln -s PCbuild LO_lib \
,PCBuild)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

2013-03-21 Thread Kohei Yoshida

 sc/inc/column.hxx |3 ++
 sc/inc/document.hxx   |   12 +++
 sc/inc/table.hxx  |3 ++
 sc/source/core/data/column.cxx|   17 
 sc/source/core/data/column3.cxx   |   10 +
 sc/source/core/data/document.cxx  |   27 ++
 sc/source/core/data/table2.cxx|   26 +
 sc/source/filter/lotus/tool.cxx   |8 ---
 sc/source/filter/xml/xmlcelli.cxx |   27 ++
 sc/source/ui/docshell/tablink.cxx |5 +---
 sc/source/ui/view/spelleng.cxx|   39 --
 11 files changed, 129 insertions(+), 48 deletions(-)

New commits:
commit df7cbec4410e250dc45f9fd506dde42f709a591d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Mar 21 15:15:15 2013 -0400

More on PutCell() avoidance.

Change-Id: I9166a00f1aadd4bfcb9dc46ef794cd53c19f5692

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 83a5530..f25dc78 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -207,6 +207,7 @@ public:
 voidDeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag 
);
 void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn rColumn, bool 
bKeepScenarioFlags) const;
 void CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn rDestCol);
+void CopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn rDestCol 
);
 voidCopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
 sal_uInt16 nInsFlag, bool bAsLink, bool 
bSkipAttrForEmpty, ScColumn rColumn);
 voidStartListeningInArea( SCROW nRow1, SCROW nRow2 );
@@ -262,6 +263,7 @@ public:
 ScSetStringParam* pParam = NULL );
 
 void SetEditText( SCROW nRow, EditTextObject* pEditText );
+void SetEditText( SCROW nRow, const EditTextObject rEditText, const 
SfxItemPool* pEditPool );
 void SetFormula( SCROW nRow, const ScTokenArray rArray, 
formula::FormulaGrammar::Grammar eGram );
 void SetFormula( SCROW nRow, const OUString rFormula, 
formula::FormulaGrammar::Grammar eGram );
 void SetFormulaCell( SCROW nRow, ScFormulaCell* pCell );
@@ -276,6 +278,7 @@ public:
 voidGetFormula( SCROW nRow, rtl::OUString rFormula ) const;
 const ScTokenArray* GetFormulaTokens( SCROW nRow ) const;
 const ScFormulaCell* GetFormulaCell( SCROW nRow ) const;
+ScFormulaCell* GetFormulaCell( SCROW nRow );
 CellTypeGetCellType( SCROW nRow ) const;
 SCSIZE  GetCellCount() const;
 sal_uInt32 GetWeightedCount() const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c31c952..5f0a681 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -765,6 +765,8 @@ public:
  */
 SC_DLLPUBLIC void SetEditText( const ScAddress rPos, EditTextObject* 
pEditText );
 
+void SetEditText( const ScAddress rPos, const EditTextObject rEditText, 
const SfxItemPool* pEditPool );
+
 SC_DLLPUBLIC void SetEditText( const ScAddress rPos, const OUString rStr 
);
 
 /**
@@ -824,6 +826,7 @@ public:
 voidGetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String 
rFormula ) const;
 const ScTokenArray* GetFormulaTokens( const ScAddress rPos ) const;
 const ScFormulaCell* GetFormulaCell( const ScAddress rPos ) const;
+ScFormulaCell* GetFormulaCell( const ScAddress rPos );
 SC_DLLPUBLIC void   GetFormula( SCCOL nCol, SCROW nRow, SCTAB 
nTab, rtl::OUString rFormula ) const;
 SC_DLLPUBLIC void   GetCellType( SCCOL nCol, SCROW nRow, SCTAB 
nTab, CellType rCellType ) const;
 SC_DLLPUBLIC CellType   GetCellType( const ScAddress rPos ) const;
@@ -1088,6 +1091,15 @@ public:
  */
 void CopyStaticToDocument(const ScRange rSrcRange, SCTAB nDestTab, 
ScDocument* pDestDoc);
 
+/**
+ * Copy only cell, nothing but cell to another document.
+ *
+ * @param rSrcPos source cell position
+ * @param rDestPos destination cell position
+ * @param rDestDoc destination document
+ */
+void CopyCellToDocument( const ScAddress rSrcPos, const ScAddress 
rDestPos, ScDocument rDestDoc );
+
 voidCopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2,
 SCTAB nTab, ScDocument* pClipDoc = NULL);
 voidCopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index aebe9c0..461da522 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -304,6 +304,7 @@ public:
ScSetStringParam* pParam = NULL );
 
 void SetEditText( SCCOL nCol, SCROW nRow, EditTextObject* pEditText );
+void SetEditText( SCCOL nCol, SCROW nRow, const EditTextObject rEditText, 
const SfxItemPool* pEditPool );
 
 void SetEmptyCell( SCCOL nCol, SCROW nRow );
 void SetFormula(
@@ -329,6 +330,7 @@ public:
 void GetFormula( SCCOL nCol, SCROW nRow, rtl::OUString rFormula

[Libreoffice-commits] core.git: rsc/source

2013-03-21 Thread Michael Stahl

 rsc/source/rsc/rsc.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3b5497f258fce37eebfc33536bfabb9016575cb5
Author: Michael Stahl mst...@redhat.com
Date:   Thu Mar 21 20:35:45 2013 +0100

Revert RscCmdLine: don't use obsolete DirEntry

This reverts commit 3b00a7f87b8d428dc8c3d1d0ddb84b74bb2343d4.

Breaks the build on windows, requires adapting
RscCompiler::GetImageFilePath() to match.

diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 3d16351..7489218 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -167,10 +167,11 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError 
* pEH )
 ;
 if( *pEqual )
 {
-OString aSPath(pEqual + 1);
-if (aSPath.endsWith(OString(SAL_PATHDELIMITER)))
-aSPath = aSPath.copy(0, aSPath.getLength()-1);
-m_aReplacements.push_back( std::pair OString, OString ( 
OString( (*ppStr)+4, pEqual - *ppStr - 4 ), aSPath) );
+const rtl::OString aSPath( pEqual + 1 );
+DirEntryaSDir(rtl::OStringToOUString(aSPath, 
RTL_TEXTENCODING_ASCII_US));
+
+m_aReplacements.push_back( std::pair OString, OString ( 
OString( (*ppStr)+4, pEqual - *ppStr - 4 ),
+rtl::OUStringToOString(aSDir.GetFull(), 
RTL_TEXTENCODING_ASCII_US) ) );
 }
 }
 else if( !rsc_stricmp( (*ppStr) + 1, PreLoad ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2013-03-21 Thread Tor Lillqvist

 vcl/source/filter/jpeg/jpeg.cxx |2 +-
 vcl/source/filter/jpeg/jpeg.h   |2 +-
 vcl/source/filter/jpeg/jpegc.c  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3159f9cd6113c7f3fe8c210c56be886bb0b897e8
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Mar 21 22:01:05 2013 +0200

Avoid clash with the Win32 CreateBitmap()

On x64 Windows there is no name mangling for Win32 API calls, so a
plain extern C CreateBitmap() function clashes.

Change-Id: I39ca92c259f660f00952ec0a8065bae1e747cffb

diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index e32fe74..206c92d 100644
--- a/vcl/source/filter/jpeg/jpeg.cxx
+++ b/vcl/source/filter/jpeg/jpeg.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
 
 #define JPEGMINREAD 512
 
-extern C void* CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam 
)
+extern C void* CreateBitmapFromJPEGReader( void* pJPEGReader, void* 
pJPEGCreateBitmapParam )
 {
 return ( (JPEGReader*) pJPEGReader )-CreateBitmap( pJPEGCreateBitmapParam 
);
 }
diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index 9c7e4b7..a6b5f0f 100644
--- a/vcl/source/filter/jpeg/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
@@ -53,7 +53,7 @@ longWriteJPEG( void* pJPEGWriter, void* pOStm, long 
nWidth, long nHeight, lo
 void*   GetScanline( void* pJPEGWriter, long nY );
 
 voidReadJPEG( void* pJPEGReader, void* pIStm, long* pLines );
-void*   CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam );
+void*   CreateBitmapFromJPEGReader( void* pJPEGReader, void* 
pJPEGCreateBitmapParam );
 
 /* TODO: when incompatible changes are possible again
the preview size hint should be redone */
diff --git a/vcl/source/filter/jpeg/jpegc.c b/vcl/source/filter/jpeg/jpegc.c
index 7e2ae48..16711d9 100644
--- a/vcl/source/filter/jpeg/jpegc.c
+++ b/vcl/source/filter/jpeg/jpegc.c
@@ -146,7 +146,7 @@ void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines 
)
 aCreateBitmapParam.X_density = cinfo.X_density;
 aCreateBitmapParam.Y_density = cinfo.Y_density;
 aCreateBitmapParam.bGray = cinfo.output_components == 1;
-pDIB = CreateBitmap( pJPEGReader, aCreateBitmapParam );
+pDIB = CreateBitmapFromJPEGReader( pJPEGReader, aCreateBitmapParam );
 nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
 range_limit=cinfo.sample_range_limit;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [LibreOffice-QA] Conference Call - March 22nd, 2013 - UPDATED TIME (1300 UTC)

2013-03-21 Thread Bjoern Michaelsen

On Thu, Mar 21, 2013 at 07:15:39AM -0700, Joel Madero wrote:
 Hi All,
 
 I hope this isn't a problem for anyone. I forgot two weeks ago we
 had daylight savings time here in the States so 1400 UTC is 7am
 here, I wouldn't be able to make it as I have work. Unless there are
 complaints, *let's do 1300 UTC starting tomorrow.*
 
 Again the time has changed to 1300 UTC unless someone speaks up and
 says that this is a no go.
 
 I'll see you guys tomorrow at 1300.

I will try my best as I let you guys down too often already recently. I will be
travelling to the Impress Sprint in Dresden though, so no guarantees.

Best,

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

[Libreoffice-commits] core.git: Repository.mk

2013-03-21 Thread Thomas Arnhold

 Repository.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 211a9a9cdcc34316e40c893179d7d3d0c160cfe4
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu Mar 21 19:46:23 2013 +0100

rscdep is dead

18d37cf9fb21dd809ec79135ce93f9a55512c9b3

Change-Id: Iaa18cf4343f4818e72cda08ad580672e38f6446e

diff --git a/Repository.mk b/Repository.mk
index 1e5dde9..1da813e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 reg2unoidl \
 regsvrex \
 rsc \
-rscdep \
 saxparser \
 sp2bv \
 svg2odf \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [LibreOffice-QA] Conference Call - March 22nd, 2013 - UPDATED TIME (1300 UTC)

2013-03-21 Thread Joel Madero

On Thu, Mar 21, 2013 at 1:24 PM, Bjoern Michaelsen 
bjoern.michael...@canonical.com wrote:

 On Thu, Mar 21, 2013 at 07:15:39AM -0700, Joel Madero wrote:
  Hi All,
 
  I hope this isn't a problem for anyone. I forgot two weeks ago we
  had daylight savings time here in the States so 1400 UTC is 7am
  here, I wouldn't be able to make it as I have work. Unless there are
  complaints, *let's do 1300 UTC starting tomorrow.*
 
  Again the time has changed to 1300 UTC unless someone speaks up and
  says that this is a no go.
 
  I'll see you guys tomorrow at 1300.

 I will try my best as I let you guys down too often already recently. I
 will be
 travelling to the Impress Sprint in Dresden though, so no guarantees.


Would be great to hear your voice Bjoern, if not we understand though.

Best,
Joel

-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [LibreOffice-QA] Conference Call - March 22nd, 2013 - UPDATED TIME (1300 UTC)

2013-03-21 Thread Joel Madero

On Thu, Mar 21, 2013 at 8:23 AM, Florian Reisinger reisi...@gmail.comwrote:

 Well,

 I am at School -- 13:30 or 13:20 would be the earliest possible hour for
 me...


Sorry Florian for the inconvenience. I've been told that next weekend (9
days) is the time change for you guys and then the time will match again -
can we verify this? If not, of course the meeting could be held without me
if the majority thinks it's easier that way :) We usually start 5-10
minutes late so if you could hop in at 1320 maybe we'd just get through a
couple of the pending items. I expect it might be a short meeting, our
agenda is smaller than normal.

Best,
Joel

-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bridges/Module_bridges.mk solenv/gbuild

2013-03-21 Thread Bjoern Michaelsen

 bridges/Module_bridges.mk   |2 -
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |   43 
 2 files changed, 31 insertions(+), 14 deletions(-)

New commits:
commit c7f09e4fd4932f60c2e233d676537b6e786a7cfd
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Mar 15 11:20:41 2013 +0100

introduce gb_Module_SKIPTARGETS

- this speeds up the old SKIP_TESTS targets build-nocheck and
  dev-install-nocheck
- this allows e.g. tinderboxes, which know that they just completed a
  build, to only read the files for the tests (and exclude the build
  itself)
- since the dep file can be quite large this might help performance in
  such scenarios quite a bit
- also moving this to extensions as it is merely a performance
  optimization

Conflicts:
Makefile.in
solenv/gbuild/Module.mk

Change-Id: I1265dbacdd9f3731fe755a1b997c2fa5ac1f7421
Reviewed-on: https://gerrit.libreoffice.org/2742
Reviewed-by: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index f9d9c14..b71e142 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
) \
 ))
 
-ifeq (,$(gb_STRIPPED_BUILD))
+ifeq (,$(filter build,$(gb_Module_SKIPTARGETS)))
 ifeq ($(strip $(bridges_SELECTED_BRIDGE)),)
 $(call gb_Output_error,no bridge selected for build: bailing out)
 else ifneq ($(words $(bridges_SELECTED_BRIDGE)),1)
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 3db7218..1e07a5f 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -30,36 +30,53 @@ gb_Module_add_targets_for_build :=
 endif
 
 ifeq ($(gb_Side),build)
-gb_Module_add_check_target :=
-gb_Module_add_slowcheck_target :=
-gb_Module_add_subsequentcheck_target :=
+gb_Module_SKIPTARGETS := check slowcheck subsequentcheck
 endif
 
 ifneq ($(strip $(MAKECMDGOALS)),)
 # speed up depending on the target
-gb_SpeedUpTargets_LEVEL_3 := debugrun help translations
-gb_SpeedUpTargets_LEVEL_2 := showmodules $(gb_SpeedUpTargets_LEVEL_3)
+gb_SpeedUpTargets_LEVEL_4 := debugrun help translations
+gb_SpeedUpTargets_LEVEL_3 := showmodules $(gb_SpeedUpTargets_LEVEL_4)
+gb_SpeedUpTargets_LEVEL_2 := build $(gb_SpeedUpTargets_LEVEL_3)
 gb_SpeedUpTargets_LEVEL_1 := clean showdeliverables 
$(gb_SpeedUpTargets_LEVEL_2)
 
 ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_1),$(MAKECMDGOALS)),,T))
 gb_FULLDEPS :=
 
 ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_2),$(MAKECMDGOALS)),,T))
-gb_Module_add_target :=
-gb_Module_add_check_target :=
-gb_Module_add_slowcheck_target :=
-gb_Module_add_subsequentcheck_target :=
-
-# Turns of check in bridges/Module_bridges.mk:
-gb_STRIPPED_BUILD := $(true)
+gb_Module_SKIPTARGETS += check slowcheck subsequentcheck
 
 ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_3),$(MAKECMDGOALS)),,T))
-gb_Module_add_moduledir :=
+gb_Module_SKIPTARGETS += build
+
+ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_4),$(MAKECMDGOALS)),,T))
+gb_Module_SKIPTARGETS += module
 
 endif
 endif
 endif
+endif
 
 endif
 
+
+ifneq (,$(filter build,$(gb_Module_SKIPTARGETS)))
+gb_Module_add_target =
+endif
+
+ifneq (,$(filter check,$(gb_Module_SKIPTARGETS)))
+gb_Module_add_check_target =
+endif
+
+ifneq (,$(filter slowcheck,$(gb_Module_SKIPTARGETS)))
+gb_Module_add_slowcheck_target =
+endif
+
+ifneq (,$(filter subsequentcheck,$(gb_Module_SKIPTARGETS)))
+gb_Module_add_subsequentcheck_target =
+endif
+
+ifneq (,$(filter module,$(gb_Module_SKIPTARGETS)))
+gb_Module_add_moduledir =
+endif
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] introduce gb_Module_SKIPTARGETS

2013-03-21 Thread via Code Review

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2742

Approvals:
  Björn Michaelsen: Verified; Looks good to me, approved
  Matúš Kukan: Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1265dbacdd9f3731fe755a1b997c2fa5ac1f7421
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-03-21 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 55814, which changed state.

Bug 55814 Summary: Condition for hidden section replaced by 0
https://bugs.freedesktop.org/show_bug.cgi?id=55814

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
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: [PATCH libreoffice-4-0] fdo#55814 SwDoc::UpdateExpFlds: hiding the last section may ...

2013-03-21 Thread Miklos Vajna

Hi David,

On Wed, Mar 20, 2013 at 04:11:28PM +0100, d.ostrov...@idaia.de wrote:
 on 3.6 branch too. Could you please submit it?

Sure, I just did so.

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 3 commits - sc/source

2013-03-21 Thread Kohei Yoshida

 sc/source/ui/collab/sendfunc.cxx  |5 -
 sc/source/ui/collab/sendfunc.hxx  |3 
 sc/source/ui/docshell/docfunc.cxx |   35 -
 sc/source/ui/inc/docfunc.hxx  |3 
 sc/source/ui/inc/undocell.hxx |   41 ++-
 sc/source/ui/undo/undocell.cxx|  138 +++---
 sc/source/ui/unoobj/textuno.cxx   |2 
 sc/source/ui/view/viewfunc.cxx|   23 +-
 8 files changed, 121 insertions(+), 129 deletions(-)

New commits:
commit a2b9aec93e98cad0b36f62f7c0092a8f14b300c6
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Mar 21 16:36:57 2013 -0400

Modernize ScUndoEnterData a bit.

Change-Id: I2cf86a445b4820ec89fc610e8e4eec7862195d21

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 5bc31f5..c1caa2e 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -760,31 +760,29 @@ sal_Bool ScDocFunc::SetNormalString( bool o_rbNumFmtSet, 
const ScAddress rPos,
 return false;
 }
 
-SCTAB* pTabs = NULL;
-ScBaseCell** ppOldCells = NULL;
-sal_Bool* pHasFormat = NULL;
-sal_uLong* pOldFormats = NULL;
 ScBaseCell* pDocCell = pDoc-GetCell( rPos );
 sal_Bool bEditDeleted = (pDocCell  pDocCell-GetCellType() == 
CELLTYPE_EDIT);
+ScUndoEnterData::ValuesType aOldValues;
+
 if (bUndo)
 {
-pTabs = new SCTAB[1];
-pTabs[0] = rPos.Tab();
-ppOldCells  = new ScBaseCell*[1];
-ppOldCells[0] = pDocCell ? pDocCell-Clone( *pDoc ) : 0;
+ScUndoEnterData::Value aOldValue;
+
+aOldValue.mnTab = rPos.Tab();
+aOldValue.mpCell = pDocCell ? pDocCell-Clone( *pDoc ) : 0;
 
-pHasFormat = new sal_Bool[1];
-pOldFormats = new sal_uLong[1];
 const SfxPoolItem* pItem;
 const ScPatternAttr* pPattern = pDoc-GetPattern( 
rPos.Col(),rPos.Row(),rPos.Tab() );
 if ( SFX_ITEM_SET == pPattern-GetItemSet().GetItemState(
 ATTR_VALUE_FORMAT,false,pItem) )
 {
-pHasFormat[0] = sal_True;
-pOldFormats[0] = ((const SfxUInt32Item*)pItem)-GetValue();
+aOldValue.mbHasFormat = true;
+aOldValue.mnFormat = ((const SfxUInt32Item*)pItem)-GetValue();
 }
 else
-pHasFormat[0] = false;
+aOldValue.mbHasFormat = false;
+
+aOldValues.push_back(aOldValue);
 }
 
 o_rbNumFmtSet = pDoc-SetString( rPos.Col(), rPos.Row(), rPos.Tab(), rText 
);
@@ -792,8 +790,8 @@ sal_Bool ScDocFunc::SetNormalString( bool o_rbNumFmtSet, 
const ScAddress rPos,
 if (bUndo)
 {
 //  wegen ChangeTracking darf UndoAction erst nach SetString angelegt 
werden
-rDocShell.GetUndoManager()-AddUndoAction(new ScUndoEnterData( 
rDocShell, rPos, 1, pTabs,
- ppOldCells, pHasFormat, pOldFormats, 
rText, NULL ) );
+rDocShell.GetUndoManager()-AddUndoAction(
+new ScUndoEnterData(rDocShell, rPos, aOldValues, rText, NULL));
 }
 
 if ( bEditDeleted || pDoc-HasAttrib( ScRange(rPos), HASATTR_NEEDHEIGHT ) )
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index a41c558..76d9032 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -24,6 +24,7 @@
 #include postit.hxx
 
 #include boost/shared_ptr.hpp
+#include boost/scoped_ptr.hpp
 
 class ScDocShell;
 class ScBaseCell;
@@ -74,12 +75,24 @@ private:
 class ScUndoEnterData: public ScSimpleUndo
 {
 public:
+struct Value
+{
+SCTAB mnTab;
+bool mbHasFormat;
+sal_uInt32 mnFormat;
+ScBaseCell* mpCell;
+
+Value();
+};
+
+typedef std::vectorValue ValuesType;
+
 TYPEINFO();
-ScUndoEnterData( ScDocShell* pNewDocShell, const 
ScAddress rPos,
-SCTAB nNewCount, SCTAB* pNewTabs,
-ScBaseCell** ppOldData, sal_Bool* pHasForm, 
sal_uLong* pOldForm,
-const String rNewStr, EditTextObject* pObj = NULL 
);
-virtual ~ScUndoEnterData();
+ScUndoEnterData(
+ScDocShell* pNewDocShell, const ScAddress rPos,
+ValuesType rOldValues, const OUString rNewStr, EditTextObject* pObj 
= NULL );
+
+virtual ~ScUndoEnterData();
 
 virtual voidUndo();
 virtual voidRedo();
@@ -89,15 +102,12 @@ public:
 virtual rtl::OUString GetComment() const;
 
 private:
-String  aNewString;
-SCTAB*  pTabs;
-ScBaseCell**ppOldCells;
-sal_Bool*   pHasFormat;
-sal_uLong*  pOldFormats;
-EditTextObject* pNewEditData;
-sal_uLong   nEndChangeAction;
+ValuesType maOldValues;
+
+OUString maNewString;
+boost::scoped_ptrEditTextObject mpNewEditData;
+sal_uLong mnEndChangeAction;
 ScAddress maPos;
-SCTAB   nCount; //  Marked sheet
 
 void

1 2 3 4 >

1 - 100 of 302 matches

Mail list logo