[Libreoffice-commits] core.git: reportbuilder/java

[Stephan Bergmann (via logerrit)]

 reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java |
2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a5e002442cba22f6d0806197e5a155353593bcd0
Author: Stephan Bergmann 
AuthorDate: Thu Apr 20 14:59:16 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 21 08:05:46 2023 +0200

Fix some getImplementationName

...to match the corresponding .component entry

Change-Id: I718cf71482923eec25f8c965e1a246fc2194a991
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150696
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index 322c2ac1ccfa..a83631261891 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -161,7 +161,7 @@ public class SOReportJobFactory
  */
 public String getImplementationName()
 {
-return SOReportJobFactory.class.getName();
+return _SOReportJobFactory.class.getName();
 }
 
 private String getLocaleFromRegistry(final XSimpleRegistry simpleReg, 
final String path, final String value)

[Libreoffice-commits] core.git: reportbuilder/java vcl/inc

[Andrea Gelmini (via logerrit)]

 reportbuilder/java/org/libreoffice/report/InputRepository.java 
|2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
|2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
  |2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
 |2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
   |2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
   |2 +-
 reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java   
|4 ++--
 
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
 |4 ++--
 
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java
 |2 +-
 vcl/inc/osx/salframeview.h 
|2 +-
 vcl/inc/outdev.h   
|2 +-
 vcl/inc/quartz/salgdicommon.hxx
|2 +-
 vcl/inc/toolbox.h  
|2 +-
 vcl/inc/unx/screensaverinhibitor.hxx   
|2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit caa626809433b06b2a6f5eff80c6d0d2f4d71b7e
Author: Andrea Gelmini 
AuthorDate: Wed Jul 31 09:39:21 2019 +0200
Commit: Julien Nabet 
CommitDate: Wed Jul 31 15:10:24 2019 +0200

Fix typos

Change-Id: I2b9361433df39f66ec8328262a3128cf7294b6e1
Reviewed-on: https://gerrit.libreoffice.org/76720
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/reportbuilder/java/org/libreoffice/report/InputRepository.java 
b/reportbuilder/java/org/libreoffice/report/InputRepository.java
index 0d89b2d7d8f5..1e26bfea7c56 100644
--- a/reportbuilder/java/org/libreoffice/report/InputRepository.java
+++ b/reportbuilder/java/org/libreoffice/report/InputRepository.java
@@ -54,7 +54,7 @@ public interface InputRepository
 InputRepository openInputRepository(final String name) throws IOException;
 
 /**
- * This returns an version number for the given resource. Return zero, if
+ * This returns a version number for the given resource. Return zero, if
  * the resource is not versionable, else return a unique number for each 
version.
  * As rule of thumb: Increase the version number by at least one for each 
change
  * made to the resource.
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
index 52ce34274de4..0bf40b9dcd28 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
@@ -157,7 +157,7 @@ public class ImageElementLayoutController
 final Section columns = (Section) 
table.findFirstChild(OfficeNamespaces.TABLE_NS, OfficeToken.TABLE_COLUMNS);
 if (columns.getNodeCount() <= columnPos + colSpan)
 {
-// the colspan is to large. The table definition is therefore 
invalid. We do not try to fix this.
+// the colspan is too large. The table definition is therefore 
invalid. We do not try to fix this.
 LOGGER.warn(
 "The Table's defined columns do not match the col-span 
or col-position. Unable to calculate the image-size.");
 return null;
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
index 38cd53f13425..11a3693463a0 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
@@ -34,7 +34,7 @@ import org.jfree.report.structure.Element;
 
 /**
  * This layoutcontroller simply checks, whether the parent layout controller
- * is a OfficeGroupLayoutController and whether this layout controller is
+ * is an OfficeGroupLayoutController and whether this layout controller is
  * processing the normal flow or an repeating section. If a repeating section
  * is being 

[Libreoffice-commits] core.git: reportbuilder/java

[Libreoffice Gerrit user]

 reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java |   
27 ++
 1 file changed, 27 insertions(+)

New commits:
commit 57bfb56972dc101200466054f0f9446301c214cb
Author: Caolán McNamara 
AuthorDate: Tue Nov 27 17:42:16 2018 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 28 13:11:20 2018 +0100

Resolves: tdf#94446 if this is a SQLException in disguise, throw that 
instead

instead of the wrapper exception, so that dbaccess can apply its special
handling for SQLException::ErrorCode of 
dbtools::ParameterInteractionCancelled
in OLinkedDocumentsAccess::open if ParameterInteractionCancelled was the 
root
cause

Change-Id: I777893cf7355d8c4a9c48237284903176d81402d
Reviewed-on: https://gerrit.libreoffice.org/64123
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index 6c70a3425d90..4c799cd27326 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -38,6 +38,9 @@ import com.sun.star.registry.InvalidRegistryException;
 import com.sun.star.registry.InvalidValueException;
 import com.sun.star.registry.XRegistryKey;
 import com.sun.star.registry.XSimpleRegistry;
+import com.sun.star.sdbc.SQLException;
+import org.jfree.report.ReportDataFactoryException;
+import org.libreoffice.report.DataSourceException;
 import org.libreoffice.report.DataSourceFactory;
 import org.libreoffice.report.JobProperties;
 import org.libreoffice.report.ReportEngineParameterNames;
@@ -194,6 +197,26 @@ public class SOReportJobFactory
 return currentLocale;
 }
 
+// tdf#94446 if this is a SQLException in disguise, throw that
+// original exception instead of the wrapper exception, so that
+// dbaccess can apply its special handling for
+// SQLException::ErrorCode of dbtools::ParameterInteractionCancelled
+// in OLinkedDocumentsAccess::open if ParameterInteractionCancelled
+// was the root cause
+public void rethrow_sql_exception(Throwable exception)
+throws com.sun.star.sdbc.SQLException
+{
+if (exception instanceof ReportDataFactoryException == false)
+return;
+exception = ((ReportDataFactoryException)exception).getParent();
+if (exception instanceof DataSourceException == false)
+return;
+exception = ((DataSourceException)exception).getCause();
+if (exception instanceof SQLException == false)
+return;
+throw (SQLException)exception;
+}
+
 public Object execute(final NamedValue[] namedValue)
 throws com.sun.star.lang.IllegalArgumentException, 
com.sun.star.uno.Exception
 {
@@ -223,6 +246,10 @@ public class SOReportJobFactory
 Writer result = new StringWriter();
 PrintWriter printWriter = new PrintWriter(result);
 e.printStackTrace(printWriter);
+
+// if this is a wrapped SQLException, rethrow that instead
+rethrow_sql_exception(e.getCause());
+
 throw new com.sun.star.lang.WrappedTargetException(e, 
e.toString() + '\n' + result.toString(), this, null);
 }
 catch (java.lang.IncompatibleClassChangeError e)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[Libreoffice Gerrit user]

 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java |   30 
+-
 1 file changed, 29 insertions(+), 1 deletion(-)

New commits:
commit 92c34111dd8095b97a3761ab10c3ac4a3c191310
Author: Caolán McNamara 
AuthorDate: Tue Nov 27 15:13:33 2018 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 27 21:09:13 2018 +0100

Related: tdf#94446 set parent for dialog

Change-Id: I174ec605f40e7cafbcb44e492941dfc36a4df3f2
Reviewed-on: https://gerrit.libreoffice.org/64120
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java 
b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index 26eb4950e248..463addc63e71 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -17,17 +17,24 @@
  */
 package org.libreoffice.report;
 
+import com.sun.star.awt.XWindow;
+import com.sun.star.beans.NamedValue;
 import com.sun.star.beans.PropertyVetoException;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.NoSuchElementException;
+import com.sun.star.container.XChild;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
+import com.sun.star.frame.XController;
+import com.sun.star.frame.XFrame;
+import com.sun.star.frame.XModel;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.IndexOutOfBoundsException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.sdb.CommandType;
 import com.sun.star.sdb.XCompletedExecution;
+import com.sun.star.sdb.XDocumentDataSource;
 import com.sun.star.sdb.XParametersSupplier;
 import com.sun.star.sdb.XQueriesSupplier;
 import com.sun.star.sdb.XSingleSelectQueryComposer;
@@ -159,6 +166,26 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 m_cmpCtx = cmpCtx;
 }
 
+public XWindow getParentWindow()
+{
+final XChild child = UnoRuntime.queryInterface(XChild.class, 
connection);
+if (child == null)
+return null;
+final XDocumentDataSource docSource = 
UnoRuntime.queryInterface(XDocumentDataSource.class, child.getParent());
+if (docSource == null)
+return null;
+final XModel model = UnoRuntime.queryInterface(XModel.class, 
docSource.getDatabaseDocument());
+if (model == null)
+return null;
+final XController controller = model.getCurrentController();
+if (controller == null)
+return null;
+final XFrame frame = controller.getFrame();
+if (frame == null)
+return null;
+return frame.getContainerWindow();
+}
+
 public DataSource queryData(final String command, final Map 
parameters) throws DataSourceException
 {
 try
@@ -201,7 +228,8 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 final XCompletedExecution execute = 
UnoRuntime.queryInterface(XCompletedExecution.class, rowSet);
 if (rowSetCreated && execute != null && 
paramDef.parameterCount > 0)
 {
-final XInteractionHandler handler = 
UnoRuntime.queryInterface(XInteractionHandler.class, 
m_cmpCtx.getServiceManager().createInstanceWithContext("com.sun.star.sdb.InteractionHandler",
 m_cmpCtx));
+final XWindow window = getParentWindow();
+final XInteractionHandler handler = 
UnoRuntime.queryInterface(XInteractionHandler.class, 
m_cmpCtx.getServiceManager().createInstanceWithArgumentsAndContext("com.sun.star.sdb.InteractionHandler",
 new Object[] { new NamedValue("Parent", window) }, m_cmpCtx));
 execute.executeWithCompletion(handler);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java reportdesign/qa reportdesign/source sal/osl sal/qa sc/qa sc/source

[Libreoffice Gerrit user]

 
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
 |2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
   |2 +-
 reportdesign/qa/complex/reportdesign/ReportDesignerTest.java   
  |2 +-
 reportdesign/source/ui/report/dlgedfunc.cxx
  |2 +-
 sal/osl/unx/process.cxx
  |2 +-
 sal/qa/rtl/ostring/rtl_str.cxx 
  |2 +-
 sal/qa/rtl/oustring/rtl_ustr.cxx   
  |2 +-
 sal/qa/rtl/random/rtl_random.cxx   
  |4 ++--
 sc/qa/unit/ucalc.cxx   
  |2 +-
 sc/source/filter/oox/pivottablebuffer.cxx  
  |2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 76532719505a3d9b495911ce7f86b8cda8412a00
Author: Andrea Gelmini 
AuthorDate: Wed Aug 15 14:19:08 2018 +0200
Commit: Jens Carl 
CommitDate: Wed Aug 15 19:04:41 2018 +0200

Fix typo: s/an other/another/g

Change-Id: Iab3302d20fb9b0be4b97331709f83f818a46b2da
Reviewed-on: https://gerrit.libreoffice.org/59100
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 3f23ab3b4f63..0a3f23c6986e 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -614,7 +614,7 @@ public abstract class OfficeDocumentReportTarget extends 
AbstractReportTarget
 }
 case OfficeDocumentReportTarget.STATE_IN_GROUP_BODY:
 {
-// We now expect either an other group or a detail band.
+// We now expect either another group or a detail band.
 
 if 
(ReportTargetUtil.isElementOfType(OfficeNamespaces.OOREPORT_NS, "group", attrs))
 {
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
index 469e5ef48268..96add59a59b6 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
@@ -99,7 +99,7 @@ public class TextRawReportTarget extends 
OfficeDocumentReportTarget
 private static final int DETAIL_SECTION_FIRST_STARTED = 1;
 // The first detail section has been printed.
 private static final int DETAIL_SECTION_FIRST_PRINTED = 2;
-// An other detail section has started
+// Another detail section has started
 private static final int DETAIL_SECTION_OTHER_STARTED = 3;
 // The other detail section has been printed.
 private static final int DETAIL_SECTION_OTHER_PRINTED = 4;
diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java 
b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
index 7b86d15cc1f4..fef462031b69 100644
--- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
@@ -382,7 +382,7 @@ public class ReportDesignerTest
 aOverwrite.Value = Boolean.TRUE;
 aPropertyList.add(aOverwrite);
 
-// store the document in an other directory
+// store the document in another directory
 XStorable aStorable = UnoRuntime.queryInterface(XStorable.class, 
_xComponent);
 if (aStorable != null)
 {
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx 
b/reportdesign/source/ui/report/dlgedfunc.cxx
index 2d07356bb356..8226116cb32c 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -499,7 +499,7 @@ void DlgEdFunc::checkMovementAllowed(const MouseEvent& 
rMEvt)
 {
 if ( isRectangleHit(rMEvt) )
 {
-// there is an other component under use, break action
+// there is another component under use, break action
 m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
 }
 // object was dragged
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index d3c1e096d8a8..d52452cd5e38 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -303,7 +303,7 @@ static void ChildStatusProc(void *pData)
 SAL_WARN("sal.osl", "Failed to wait for child process, errno=" 
<< 

[Libreoffice-commits] core.git: reportbuilder/java

[Fridrich Štrba]

 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 398eccd6e833875b08f3414cfcf6820cdf07dcbf
Author: Fridrich Å trba 
Date:   Tue Sep 12 13:35:44 2017 +0200

This really does not need to be utf-8 character

Change-Id: I75e3973ed3fe2489233cdce127a29ff19f604903

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index d20927f8eb27..6a1bd00736ee 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -263,7 +263,7 @@ public class FormatValueUtility
 final SectionLayoutController slc = findGroupOrDetail(ref);
 if (slc == null)
 {
-// {Page, Report} × {Header, Footer} have no usable iteration 
count
+// {Page, Report} x {Header, Footer} have no usable iteration count
 // err on the side of showing them rather than not showing them
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java reportdesign/source rsc/source sal/osl sal/qa sal/textenc sax/qa sax/source sax/test

[Andrea Gelmini]

 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
 |2 +-
 reportdesign/source/core/api/ReportDefinition.cxx  
  |2 +-
 reportdesign/source/ui/inc/GeometryHandler.hxx 
  |2 +-
 rsc/source/rscpp/cpp3.c
  |2 +-
 sal/osl/unx/security.cxx   
  |2 +-
 sal/osl/w32/profile.cxx
  |2 +-
 sal/qa/osl/process/osl_Thread.cxx  
  |6 +++---
 sal/qa/rtl/ostring/rtl_OString2.cxx
  |2 +-
 sal/textenc/convertsimple.cxx  
  |2 +-
 sal/textenc/tcvtutf7.cxx   
  |2 +-
 sax/qa/cppunit/attributes.cxx  
  |2 +-
 sax/qa/data/defaultns.xml  
  |4 ++--
 sax/source/fastparser/fastparser.cxx   
  |4 ++--
 sax/source/tools/fastattribs.cxx   
  |2 +-
 sax/test/sax/testwriter.cxx
  |2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 2e9fe260149911a8a906e059a6025892af8e9a64
Author: Andrea Gelmini 
Date:   Fri Mar 24 11:48:58 2017 +0100

Fix typos

Change-Id: I5fc62060e7d01c6b492a0e91323f753cc676bf71
Reviewed-on: https://gerrit.libreoffice.org/35639
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
index bcc725783ba7..3f9631792c05 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
@@ -33,7 +33,7 @@ import 
org.jfree.report.flow.layoutprocessor.LayoutControllerFactory;
 import org.jfree.report.structure.Section;
 
 /**
- * Processes a fixed-text element of the OpenOffice reporting specificiation.
+ * Processes a fixed-text element of the OpenOffice reporting specification.
  * The element itself contains a single paragraph which contains the content.
  * After checking, whether this element should be printed, this layout
  * controller simply delegates the dirty work to a suitable handler.
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 95b6ad2dde64..f536a1268a40 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1497,7 +1497,7 @@ bool OReportDefinition::WriteThroughComponent(
 return false;
 
 uno::Reference 
xStreamProp(xOutputStream,uno::UNO_QUERY);
-OSL_ENSURE(xStreamProp.is(),"No valid preoperty set for the output 
stream!");
+OSL_ENSURE(xStreamProp.is(),"No valid property set for the output 
stream!");
 
 uno::Reference xSeek(xStreamProp,uno::UNO_QUERY);
 if ( xSeek.is() )
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx 
b/reportdesign/source/ui/inc/GeometryHandler.hxx
index d277cc402c24..3bf7d026f2e9 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -210,7 +210,7 @@ namespace rptui
 */
 void loadDefaultFunctions();
 
-/** creates a default functionof the _sFunction for the data field 
_sDataField
+/** creates a default function of the _sFunction for the data field 
_sDataField
 *   The new function will only be created if it didn't exist.
 *
 * \param _aGuardWill be cleared, when a new function was 
created.
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index 078be477d815..6e6f87aa59a8 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -209,7 +209,7 @@ int dooptions(int argc, char** argv)
 AddInclude( ap );   /* BP, 11.09.91 */
 break;
 
-case 'N':   /* No predefineds   */
+case 'N':   /* No predefined*/
 nflag++;/* Repeat to undefine   */
 break;

[Libreoffice-commits] core.git: reportbuilder/java

[Caolán McNamara]

 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java |
3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e75701ce9efba6320ed286ffbe8dd6f87d15b902
Author: Caolán McNamara 
Date:   Wed Oct 14 11:40:23 2015 +0100

coverity#1327210 UwF: Unwritten field

Change-Id: I1021bd43a93b9b7f1b4e0f73f75e7a7f7c52b857

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java
index a20786b..410515d 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java
@@ -35,7 +35,6 @@ public class OfficeReport extends Element
 private Node pageHeader;
 private Node pageFooter;
 private Node columnHeader;
-private Node columnFooter;
 private Node reportHeader;
 private Node reportFooter;
 private Node bodySection;
@@ -89,7 +88,7 @@ public class OfficeReport extends Element
 
 public Node getColumnFooter()
 {
-return columnFooter;
+return null;
 }
 
 public Node getReportHeader()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java reportdesign/source rsc/inc rsc/source

[Andrea Gelmini]

 
reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
  |2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
|2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
   |2 +-
 reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java   
|2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
 |6 +++---
 
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
 |2 +-
 reportdesign/source/ui/inc/GroupsSorting.hxx   
|2 +-
 reportdesign/source/ui/inc/ReportController.hxx
|2 +-
 rsc/inc/rscarray.hxx   
|2 +-
 rsc/inc/rscrange.hxx   
|2 +-
 rsc/inc/rsctop.hxx 
|4 ++--
 rsc/source/res/rscclass.cxx
|2 +-
 rsc/source/rscpp/cpp.h 
|2 +-
 rsc/source/rscpp/cpp1.c
|4 ++--
 rsc/source/rscpp/cpp2.c
|2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit d721cc515b1056226c562b2d85870da6f69180a4
Author: Andrea Gelmini 
Date:   Tue Sep 29 17:56:36 2015 +0200

Fix typos

Change-Id: I8f4500fc7a901c5cc73634ba6da6b9541452e5ae
Reviewed-on: https://gerrit.libreoffice.org/18966
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
index e3dde73..dd2b480 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
@@ -47,7 +47,7 @@ public class InputRepositoryResourceData extends 
AbstractResourceData
 
 public Object getAttribute(final String key)
 {
-// we dont support attributes here ..
+// we don't support attributes here ..
 return null;
 }
 
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
index 71562ca..90647e4 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
@@ -80,7 +80,7 @@ public class OfficeStylesCollection extends Element
 }
 
 // And later: Autogenerate one of the default styles.
-// However, at this moment, we dont have a clue about the default 
styles
+// However, at this moment, we don't have a clue about the default 
styles
 // at all. Maybe we should add them to make this implementation more 
robust
 // against invalid documents.
 return null;
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index eef2178..2889a8f 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -1401,7 +1401,7 @@ public abstract class OfficeDocumentReportTarget extends 
AbstractReportTarget
 imageAreaHeightVal = 
CSSNumericValue.createValue(imageAreaHeightVal.getType(), ret[1]);
 }
 }
-// If we do scale, then we simply use the given 
image-area-size as valid image size and dont
+// If we do scale, then we simply use the given 
image-area-size as valid image size and don't
 // care about the image itself ..
 }
 else
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
index 8ba9231..db8fe0f 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
@@ -174,7 +174,7 @@ public class StyleUtilities
 

[Libreoffice-commits] core.git: reportbuilder/java reportdesign/inc reportdesign/source sal/android sal/osl scaddins/source sc/inc sc/qa sc/source sdext/source sd/inc sd/source

[Andrea Gelmini]

 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
 |2 -
 reportdesign/inc/RptDef.hxx
   |2 -
 reportdesign/source/core/inc/Tools.hxx 
   |2 -
 reportdesign/source/ui/inc/DateTime.hxx
   |2 -
 reportdesign/source/ui/inc/GroupsSorting.hxx   
   |2 -
 reportdesign/source/ui/inc/dlgedclip.hxx   
   |2 -
 sal/android/uthash.h   
   |2 -
 sal/osl/w32/file_url.cxx   
   |2 -
 sc/inc/externalrefmgr.hxx  
   |2 -
 sc/qa/unit/ucalc_sharedformula.cxx 
   |4 +-
 sc/source/core/data/column2.cxx
   |2 -
 sc/source/core/data/drwlayer.cxx   
   |   16 +-
 sc/source/core/data/table5.cxx 
   |2 -
 sc/source/core/opencl/formulagroupcl.cxx   
   |2 -
 sc/source/core/tool/chartlis.cxx   
   |2 -
 sc/source/core/tool/interpr7.cxx   
   |2 -
 sc/source/filter/excel/xiescher.cxx
   |2 -
 sc/source/filter/inc/stylesbuffer.hxx  
   |2 -
 sc/source/filter/inc/xlchart.hxx   
   |2 -
 sc/source/filter/inc/xlpivot.hxx   
   |2 -
 sc/source/filter/oox/worksheethelper.cxx   
   |2 -
 sc/source/ui/docshell/docsh.cxx
   |2 -
 sc/source/ui/drawfunc/fuconstr.cxx 
   |4 +-
 sc/source/ui/vba/excelvbahelper.cxx
   |2 -
 sc/source/ui/vba/vbaapplication.cxx
   |2 -
 sc/source/ui/vba/vbarange.cxx  
   |2 -
 sc/source/ui/view/gridwin.cxx  
   |2 -
 sc/source/ui/view/printfun.cxx 
   |4 +-
 sc/source/ui/view/viewdata.cxx 
   |2 -
 scaddins/source/datefunc/datefunc.cxx  
   |2 -
 sd/inc/sdmod.hxx   
   |2 -
 sd/source/filter/ppt/pptin.cxx 
   |2 -
 sd/source/ui/inc/framework/ResourceId.hxx  
   |2 -
 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
   |2 -
 sd/source/ui/sidebar/MasterPageContainer.hxx   
   |2 -
 sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx   
   |2 -
 sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx  
   |2 -
 sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
   |2 -
 sd/source/ui/slidesorter/view/SlsLayouter.cxx  
   |2 -
 sd/source/ui/unoidl/DrawController.cxx 
  

[Libreoffice-commits] core.git: reportbuilder/java

[Stephan Bergmann]

 reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java |
4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 01fb1701c8a59dd023604492a117ea1a6cffcee9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jan 21 17:22:57 2015 +0100

Related fdo#85190: Don't dress arbitrary Java Throwables as UNO Any values

Regression introduced with 9341bf3dc38b2cc117ffbe12ff057511ed6e046d java: 
when
rethrowing, store the original exception, but these two appear to be the 
only
two cases related to com.sun.star.lang.WrappedTarget[Runtime]Exception in 
that
patch that would now create bad UNO Any values.  Happily reverted to the
original but oddly inconsistent setting of the WrappedTargetException's
TargetException member...

Change-Id: I9421da721d5a111d0d89ee0601238a2c01cfc12c

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index f6d7147..68b1b17 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -216,12 +216,12 @@ public class SOReportJobFactory
 catch (java.lang.Exception e)
 {
 LOGGER.error(ReportProcessing failed, e);
-throw new 
com.sun.star.lang.WrappedTargetException(e.getMessage(), this, e);
+throw new com.sun.star.lang.WrappedTargetException(e, 
e.getMessage(), this, null);
 }
 catch (java.lang.IncompatibleClassChangeError e2)
 {
 LOGGER.error(Detected an IncompatibleClassChangeError);
-throw new com.sun.star.lang.WrappedTargetException(caught a  
+ e2.getClass().getName(), this, e2);
+throw new com.sun.star.lang.WrappedTargetException(e2, caught 
a  + e2.getClass().getName(), this, new 
com.sun.star.uno.Exception(e2.getLocalizedMessage()));
 }
 Thread.currentThread().setContextClassLoader(cl);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[Lionel Elie Mamane]

 reportbuilder/java/org/libreoffice/report/SOImageService.java |
4 +-
 reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java |   
16 --
 2 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit f4a2cff16ea546e7d0a135d4b061a65e783ab422
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jan 21 15:41:55 2015 +0100

Don't try to pass an arbitrary Java exception through UNO

also make other exceptions more verbose

Change-Id: Id6bf88b1ec228b20b19c89ccf6ee14d0c1ffb44d

diff --git a/reportbuilder/java/org/libreoffice/report/SOImageService.java 
b/reportbuilder/java/org/libreoffice/report/SOImageService.java
index 3cfdf35..f472d28 100644
--- a/reportbuilder/java/org/libreoffice/report/SOImageService.java
+++ b/reportbuilder/java/org/libreoffice/report/SOImageService.java
@@ -45,7 +45,7 @@ public class SOImageService implements ImageService
 {
 if (xCompContext == null)
 {
-throw new ReportExecutionException();
+throw new ReportExecutionException(SOImageService constructed 
with null Component Context);
 }
 
 
@@ -55,7 +55,7 @@ public class SOImageService implements ImageService
 
 if (m_xGraphicProvider == null)
 {
-throw new ReportExecutionException(There is no graphic-provider 
available.);
+throw new ReportExecutionException(There is no graphic-provider 
available for SOImageService.);
 }
 }
 
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index 68b1b17..1b53cc0 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -61,6 +61,10 @@ import com.sun.star.uno.XComponentContext;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import java.io.Writer;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -216,12 +220,18 @@ public class SOReportJobFactory
 catch (java.lang.Exception e)
 {
 LOGGER.error(ReportProcessing failed, e);
-throw new com.sun.star.lang.WrappedTargetException(e, 
e.getMessage(), this, null);
+Writer result = new StringWriter();
+PrintWriter printWriter = new PrintWriter(result);
+e.printStackTrace(printWriter);
+throw new 
com.sun.star.lang.WrappedTargetException(e.toString() + '\n' + 
result.toString(), this, null);
 }
-catch (java.lang.IncompatibleClassChangeError e2)
+catch (java.lang.IncompatibleClassChangeError e)
 {
 LOGGER.error(Detected an IncompatibleClassChangeError);
-throw new com.sun.star.lang.WrappedTargetException(e2, caught 
a  + e2.getClass().getName(), this, new 
com.sun.star.uno.Exception(e2.getLocalizedMessage()));
+Writer result = new StringWriter();
+PrintWriter printWriter = new PrintWriter(result);
+e.printStackTrace(printWriter);
+throw new 
com.sun.star.lang.WrappedTargetException(e.toString() + '\n' + 
result.toString(), this, null);
 }
 Thread.currentThread().setContextClassLoader(cl);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[Noel Grandin]

 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java |   29 
--
 1 file changed, 1 insertion(+), 28 deletions(-)

New commits:
commit 6636b2bacad2026bbc3bc84894d296f98eaaa3cc
Author: Noel Grandin n...@peralex.com
Date:   Fri Dec 5 11:18:33 2014 +0200

no need to call getComposer by reflection

Change-Id: Icf2cdeaab013814b669ce6d6cd243ce43856e940

diff --git 
a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java 
b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index befae9f..3596413 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -41,8 +41,6 @@ import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 
-import java.lang.reflect.Method;
-
 import java.math.BigDecimal;
 
 import java.util.ArrayList;
@@ -280,32 +278,7 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 final String command,
 final int commandType)
 {
-final Class[] parameter = new Class[2];
-parameter[0] = int.class;
-parameter[1] = String.class;
-try
-{
-final Object[] param = new Object[2];
-param[0] = commandType;
-param[1] = command;
-final Method call = tools.getClass().getMethod(getComposer, 
parameter);
-return (XSingleSelectQueryComposer) call.invoke(tools, param);
-}
-catch (NoSuchMethodException ex)
-{
-}
-catch (IllegalAccessException ex)
-{
-// should not happen
-// assert False
-}
-catch (java.lang.reflect.InvocationTargetException ex)
-{
-// should not happen
-// assert False
-}
-
-return null;
+return tools.getComposer(commandType, command);
 }
 
 private void fillParameter(final Map parameters,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java toolkit/test wizards/com

[Robert Antoni Buj i Gelonch]

 
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
 |5 
 toolkit/test/accessibility/EventListener.java  
  |6 -
 wizards/com/sun/star/wizards/common/NumericalHelper.java   
  |   16 --
 wizards/com/sun/star/wizards/db/FieldColumn.java   
  |   35 --
 wizards/com/sun/star/wizards/db/RecordParser.java  
  |   55 +-
 wizards/com/sun/star/wizards/ui/FieldSelection.java
  |   15 --
 wizards/com/sun/star/wizards/ui/FilterComponent.java   
  |   11 --
 7 files changed, 15 insertions(+), 128 deletions(-)

New commits:
commit 5d8ecad569fd7a254902da154ed8057ec61f3a83
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Wed Oct 29 17:34:18 2014 +0100

java: Method uses the same code for two switch clauses

Change-Id: Ied82b0a39ff9dc9c7cc9539dec2b963059f3d4a5
Reviewed-on: https://gerrit.libreoffice.org/12139
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index e0e4d2d..08285f6 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -703,11 +703,6 @@ public abstract class OfficeDocumentReportTarget extends 
AbstractReportTarget
 break;
 }
 case OfficeDocumentReportTarget.STATE_IN_SECTION:
-{
-
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_OTHER));
-startOther(attrs);
-break;
-}
 case OfficeDocumentReportTarget.STATE_IN_OTHER:
 {
 
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_OTHER));
diff --git a/toolkit/test/accessibility/EventListener.java 
b/toolkit/test/accessibility/EventListener.java
index 8d7efd5..d4d1227 100644
--- a/toolkit/test/accessibility/EventListener.java
+++ b/toolkit/test/accessibility/EventListener.java
@@ -80,13 +80,7 @@ public class EventListener
 break;
 
 case AccessibleEventId.ACTION_CHANGED:
-aHandler = new EventHandler (aEvent, maTreeModel);
-break;
-
 case AccessibleEventId.HYPERTEXT_CHANGED:
-aHandler = new EventHandler (aEvent, maTreeModel);
-break;
-
 case AccessibleEventId.ACTIVE_DESCENDANT_CHANGED:
 case AccessibleEventId.CARET_CHANGED:
 case AccessibleEventId.TEXT_CHANGED:
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java 
b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index 1d5e483..2c93b0c 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -608,32 +608,18 @@ public class NumericalHelper
 switch (aTypeObject.iType)
 {
 case BYTE_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
 case CHAR_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
 case SHORT_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
 case INT_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
 case LONG_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
 case FLOAT_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
 case DOUBLE_TYPE:
+case BOOLEAN_TYPE:
 retValue = aTypeObject.aValue.toString();
 break;
 case STRING_TYPE:
 retValue = (String) aTypeObject.aValue;
 break;
-case BOOLEAN_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
 case SEQUENCE_TYPE:
 retValue = new String(toByteArray((aValue)));
 break;
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java 
b/wizards/com/sun/star/wizards/db/FieldColumn.java
index 409af6e..c792514 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -256,11 +256,6 @@ public class FieldColumn
 break;
 
 case DataType.TINYINT: // ==  -6;
-StandardFormatKey = iNumberFormatKey;

[Libreoffice-commits] core.git: reportbuilder/java

[Robert Antoni Buj i Gelonch]

 reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java |2 
--
 1 file changed, 2 deletions(-)

New commits:
commit a667840368d0299c695c3565da06d31f6fde4c02
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Mon Oct 13 16:52:02 2014 +0200

reportbuilder: import from java.lang package

Change-Id: I039f7cf28dddede48627c3c624c87741ee9de0ed
Reviewed-on: https://gerrit.libreoffice.org/11956
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
index 0a8586b..a054794 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
@@ -40,8 +40,6 @@ import 
org.libreoffice.report.pentaho.output.text.TextRawReportProcessor;
 
 import java.io.IOException;
 
-import java.lang.Integer;
-
 import java.util.ArrayList;
 import java.util.List;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[rbuj]

 reportbuilder/java/org/libreoffice/report/DataSourceException.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da3b039d41298b2c85ccf632577eb0e5699c76b8
Author: rbuj robert@gmail.com
Date:   Sat Sep 6 16:04:59 2014 +0200

reportbuilder: fix javadoc error: reference not found

Change-Id: Ic548a23a9d1e1acc90386da76416c76990f3a5b3
Reviewed-on: https://gerrit.libreoffice.org/11309
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/reportbuilder/java/org/libreoffice/report/DataSourceException.java 
b/reportbuilder/java/org/libreoffice/report/DataSourceException.java
index abcef53..06c1ef9 100644
--- a/reportbuilder/java/org/libreoffice/report/DataSourceException.java
+++ b/reportbuilder/java/org/libreoffice/report/DataSourceException.java
@@ -70,7 +70,7 @@ public class DataSourceException extends Exception
  * tt(cause==null ? null : cause.toString())/tt (which typically 
contains
  * the class and detail message of ttcause/tt). This constructor is 
useful
  * for exceptions that are little more than wrappers for other throwables 
(for
- * example, {@link PrivilegedActionException}).
+ * example, {@link java.security.PrivilegedActionException}).
  *
  * @param cause the cause (which is saved for later retrieval by the {@link
  *  #getCause()} method).  (A ttnull/tt value is permitted,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[rbuj]

 reportbuilder/java/org/libreoffice/report/ReportJob.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4db06c5a69e134237ee3820739d0ed3018453a68
Author: rbuj robert@gmail.com
Date:   Mon Sep 1 19:07:01 2014 +0200

reportbuilder: fix javadoc error: no summary or caption for table

Change-Id: I5697ebe0481491d70ee728cac5343aaf892ad29f
Reviewed-on: https://gerrit.libreoffice.org/11242
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/reportbuilder/java/org/libreoffice/report/ReportJob.java 
b/reportbuilder/java/org/libreoffice/report/ReportJob.java
index 4508451..3866bc6 100644
--- a/reportbuilder/java/org/libreoffice/report/ReportJob.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportJob.java
@@ -24,7 +24,7 @@ import java.io.IOException;
  * not yet been started, canceled), and the job status can be queried 
(scheduled,
  * running, finished).
  *
- * table border=1
+ * table summary=Job status values border=1
  * tr
  * thJobStatus/ththrunning/ththfinished/th
  * /tr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[rbuj]

 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
 |2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
 |2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
 |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 653025e6f10d07d0a95f7b75d56ff457f1902e82
Author: rbuj robert@gmail.com
Date:   Mon Sep 1 19:18:38 2014 +0200

reportbuilder: fix unknown tag: noinspection (IntelliJ)

Change-Id: I97c464547068d0d17a0d4423e8462097c73624aa
Reviewed-on: https://gerrit.libreoffice.org/11243
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
index f15f381..aaad818 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
@@ -32,8 +32,8 @@ import org.jfree.report.flow.layoutprocessor.LayoutController;
  * Todo: Document me!
  *
  * @since 05.03.2007
- * @noinspection CloneableClassWithoutClone
  */
+@SuppressWarnings({CloneableClassWithoutClone})
 public abstract class AbstractReportElementLayoutController
 extends AbstractLayoutController
 {
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
index edc19e6..bcc7257 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
@@ -38,9 +38,9 @@ import org.jfree.report.structure.Section;
  * After checking, whether this element should be printed, this layout
  * controller simply delegates the dirty work to a suitable handler.
  *
- * @noinspection CloneableClassWithoutClone
  * @since 05.03.2007
  */
+@SuppressWarnings({CloneableClassWithoutClone})
 public class FixedTextLayoutController
 extends AbstractReportElementLayoutController
 {
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 937dec8..cc54319 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -46,9 +46,9 @@ import 
org.pentaho.reporting.libraries.base.util.ObjectUtilities;
  * has a one ore more paragraphs inside. The paragraph contains a single 
report element, but may contain additional
  * other content.
  *
- * @noinspection CloneableClassWithoutClone
  * @since 05.03.2007
  */
+@SuppressWarnings({CloneableClassWithoutClone})
 public class TableCellLayoutController extends SectionLayoutController
 {
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[rbuj]

 reportbuilder/java/org/libreoffice/report/ImageService.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbe818643490ff5f69ba52a901a9e3e927ada3e7
Author: rbuj robert@gmail.com
Date:   Mon Sep 1 18:41:40 2014 +0200

reportbuilder: fix javadoc error: unknown tag: returns

Change-Id: I3cc2afca6e59a8bc9e3374e5cebf9b2e903da78b
Reviewed-on: https://gerrit.libreoffice.org/11241
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/reportbuilder/java/org/libreoffice/report/ImageService.java 
b/reportbuilder/java/org/libreoffice/report/ImageService.java
index aa15e42..fbcfab4 100644
--- a/reportbuilder/java/org/libreoffice/report/ImageService.java
+++ b/reportbuilder/java/org/libreoffice/report/ImageService.java
@@ -34,7 +34,7 @@ public interface ImageService
 
 /**
  * @param image
- * @returns the dimension in 100th mm.
+ * @return  the dimension in 100th mm.
  *
  * @throws ReportExecutionException
  **/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[rbuj]

 reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java  
|3 -
 reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java   
|4 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
|6 +--
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
 |6 +--
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
|6 +--
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
 |4 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
|   18 -
 reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java   
|   20 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java
|6 +--
 reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper.java  
|6 +--
 10 files changed, 39 insertions(+), 40 deletions(-)

New commits:
commit 18d72e76f1d20d613ab05a4f40e4505279a989ca
Author: rbuj robert@gmail.com
Date:   Mon Sep 1 18:35:40 2014 +0200

reportbuilder: fix javadoc error: self-closing element not allowed

Change-Id: Iabfa4dd2c1018b982b50798bf09347e0b11901a4
Reviewed-on: https://gerrit.libreoffice.org/11240
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index b9a0c2d..4a66046 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -384,8 +384,7 @@ public class SOReportJobFactory
 }
 
 /**
- * Gives a factory for creating the service. This method is called by the 
codeJavaLoader/code
- * p/
+ * Gives a factory for creating the service. This method is called by the 
codeJavaLoader/code.
  *
  * @param sImplName the name of the implementation for which a service is 
desired
  * @return returns a codeXSingleComponentFactory/code for creating the 
component
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
index 4b9d7f9..0c78d4a 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
@@ -41,8 +41,8 @@ public class StarReportDataFactory implements 
ReportDataFactory, Cloneable
 /**
  * Queries a datasource. The string 'query' defines the name of the query. 
The
  * Parameterset given here may contain more data than actually needed.
- * p/
- * The dataset may change between two calls, do not assume anything!
+ *
+ * pThe dataset may change between two calls, do not assume anything!/p
  */
 public ReportData queryData(final String query, final DataSet parameters)
 throws ReportDataFactoryException
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
index 659417c..37a514c 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
@@ -47,9 +47,9 @@ public class OfficeDetailLayoutController extends 
SectionLayoutController
 /**
  * Initializes the layout controller. This method is called exactly once. 
It
  * is the creators responsibility to call this method.
- * p/
- * Calling initialize after the first advance must result in a
- * IllegalStateException.
+ *
+ * pCalling initialize after the first advance must result in a
+ * IllegalStateException./p
  *
  * @param node   the currently processed object or layout node.
  * @param flowController the current flow controller.
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index 17b488e..8933adf 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -54,9 +54,9 @@ 

[Libreoffice-commits] core.git: reportbuilder/java wizards/com

[Noel Grandin]

 reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java|
2 
 reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java |   
37 +-
 wizards/com/sun/star/wizards/form/CallFormWizard.java |
2 
 wizards/com/sun/star/wizards/query/CallQueryWizard.java   |
2 
 4 files changed, 39 insertions(+), 4 deletions(-)

New commits:
commit 610cfb377161a84f24c9022fc04cf7cb55d74ea9
Author: Noel Grandin n...@peralex.com
Date:   Fri Aug 29 13:13:26 2014 +0200

java: fix reportbuilder and wizard

which I broke in commits
70f56bc22fe95 java: reduce scope, make member classes private
and
34bcf9b498b java: remove dead methods

Change-Id: Id21482782bbc102e60f346a2bf51096af2fcbe22

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
index d6cde5d..7918826 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
@@ -329,7 +329,7 @@ public final class SOFormulaParser extends ComponentBase
  * This method is a simple helper function to used in the static component 
initialisation functions as well as
  * in getSupportedServiceNames.
  */
-private static String[] getServiceNames()
+public static String[] getServiceNames()
 {
 return new String[]
 {
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index 6ed6ec7..b9a0c2d 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -30,6 +30,8 @@ import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XInitialization;
 import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lib.uno.helper.Factory;
 import com.sun.star.lib.uno.helper.PropertySetMixin;
 import com.sun.star.lib.uno.helper.WeakBase;
 import com.sun.star.registry.InvalidRegistryException;
@@ -74,7 +76,7 @@ public class SOReportJobFactory
 {
 }
 
-private static class _SOReportJobFactory extends WeakBase implements 
XInitialization, XServiceInfo, XJob, XPropertySet, ReportJobFactory
+public static class _SOReportJobFactory extends WeakBase implements 
XInitialization, XServiceInfo, XJob, XPropertySet, ReportJobFactory
 {
 
 private static final Log LOGGER = 
LogFactory.getLog(_SOReportJobFactory.class);
@@ -381,5 +383,38 @@ public class SOReportJobFactory
 }
 }
 
+/**
+ * Gives a factory for creating the service. This method is called by the 
codeJavaLoader/code
+ * p/
+ *
+ * @param sImplName the name of the implementation for which a service is 
desired
+ * @return returns a codeXSingleComponentFactory/code for creating the 
component
+ * @see com.sun.star.comp.loader.JavaLoader
+ */
+public static XSingleComponentFactory __getComponentFactory(final String 
sImplName)
+{
+XSingleComponentFactory xFactory = null;
+
+try
+{
+if (sImplName.equals(_SOReportJobFactory.class.getName()))
+{
+xFactory = 
Factory.createComponentFactory(_SOReportJobFactory.class, 
_SOReportJobFactory.getServiceNames());
+}
+else if (sImplName.equals(SOFunctionManager.class.getName()))
+{
+xFactory = 
Factory.createComponentFactory(SOFunctionManager.class, 
SOFunctionManager.getServiceNames());
+}
+else if (sImplName.equals(SOFormulaParser.class.getName()))
+{
+xFactory = 
Factory.createComponentFactory(SOFormulaParser.class, 
SOFormulaParser.getServiceNames());
+}
+}
+catch (java.lang.IncompatibleClassChangeError e2)
+{
+}
+
+return xFactory;
+}
 
 }
diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java 
b/wizards/com/sun/star/wizards/form/CallFormWizard.java
index 1d72909..a73391a 100644
--- a/wizards/com/sun/star/wizards/form/CallFormWizard.java
+++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java
@@ -51,7 +51,7 @@ public class CallFormWizard
 /** This class implements the component. At least the interfaces 
XServiceInfo,
  * XTypeProvider, and XInitialization should be provided by the service.
  */
-private static class FormWizardImplementation extends 
com.sun.star.lib.uno.helper.PropertySet implements 
com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, 
com.sun.star.task.XJobExecutor
+public static class FormWizardImplementation extends 

[Libreoffice-commits] core.git: reportbuilder/java

[Alexander Wilms]

 
reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
 |4 +--
 
reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
 |   10 -
 
reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
   |   11 --
 3 files changed, 7 insertions(+), 18 deletions(-)

New commits:
commit bc1b0fca47dff0b6301988b831147ac89a0de375
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date:   Tue Feb 25 19:48:56 2014 +0100

Remove visual noise from reportbuilder

Change-Id: I4063ea1ea95ddd1a3c220ca0da89cdcd78f62410
Reviewed-on: https://gerrit.libreoffice.org/8294
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
index 7b0a281..f8ad55f 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -219,7 +219,7 @@ public class ChartRawReportTarget extends 
OfficeDocumentReportTarget
 }
 
 // All styles have to be processed or you will loose the 
paragraph-styles and inline text-styles.
-// ..
+
 performStyleProcessing(attrs);
 
 final AttributeList attrList = buildAttributeList(attrs);
@@ -227,7 +227,7 @@ public class ChartRawReportTarget extends 
OfficeDocumentReportTarget
 xmlWriter.writeTag(namespace, elementType, attrList, XmlWriter.OPEN);
 ++closeTags;
 }
-// 
/
+
 
 public void processText(final String text) throws DataSourceException, 
ReportProcessingException
 {
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
index d8f7cd8..a6bf1e8 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -455,7 +455,7 @@ public class SpreadsheetRawReportTarget extends 
OfficeDocumentReportTarget
 // // System.out.print(cbs[i].getBoundary() +  );
 // // }
 // // System.out.println();
-//
+
 // LOGGER.error(A cell cannot span less than the declared 
columns: Declared= + initialColumnSpan +  Computed=
 // + span);
 // }
@@ -471,7 +471,7 @@ public class SpreadsheetRawReportTarget extends 
OfficeDocumentReportTarget
 }
 
 // All styles have to be processed or you will loose the 
paragraph-styles and inline text-styles.
-// ..
+
 performStyleProcessing(attrs);
 
 final AttributeList attrList = buildAttributeList(attrs);
@@ -557,7 +557,7 @@ public class SpreadsheetRawReportTarget extends 
OfficeDocumentReportTarget
 // at this point we need to generate the table-columns section 
based on our boundary table
 // table:shapes
 // draw:frame /
-// ..
+
 // /table:shapes
 xmlWriter.writeTag(OfficeNamespaces.TABLE_NS, 
OfficeToken.SHAPES, null, XmlWriterSupport.OPEN);
 
@@ -589,7 +589,7 @@ public class SpreadsheetRawReportTarget extends 
OfficeDocumentReportTarget
 // at this point we need to generate the table-columns section 
based on our boundary table
 // table-columns
 // table-column style-name=coX/
-// ..
+
 // /table-columns
 // the first boundary is '0' which is a placeholder so we will 
ignore it
 xmlWriter.writeTag(OfficeNamespaces.TABLE_NS, 
OfficeToken.TABLE_COLUMNS, null, XmlWriterSupport.OPEN);
@@ -710,7 +710,7 @@ public class SpreadsheetRawReportTarget extends 
OfficeDocumentReportTarget
 return raw/ + PentahoReportEngineMetaData.OPENDOCUMENT_SPREADSHEET;
 }
 
-// 
/
+
 public void processText(final String text) throws DataSourceException, 
ReportProcessingException
 {
 if (!(isRepeatingSection() || isElementBoundaryCollectionPass()))
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
index f34b54e..b24b2cf 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
+++ 

[Libreoffice-commits] core.git: reportbuilder/java

[Lionel Elie Mamane]

 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
 |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0089d3ae9442f26695ae742f5fbdeeaf698861f2
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Oct 8 16:37:32 2013 +0200

fdo#62994 reportbuilder survive empty formula

Change-Id: I1da053871d107730ad9a135deb48313d8a877d89

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index 5bda08b..1841122 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -84,6 +84,8 @@ public class FormattedTextLayoutController
 {
 final FormattedTextElement element = (FormattedTextElement) 
getNode();
 final FormulaExpression formulaExpression = 
element.getValueExpression();
+if (formulaExpression.getFormulaExpression() == null)
+return false;
 final Formula formula = formulaExpression.getCompiledFormula();
 final LValue lValue = formula.getRootReference();
 return FormatValueUtility.isReferenceChanged(this, lValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[Lionel Elie Mamane]

 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
 |   57 +-
 1 file changed, 33 insertions(+), 24 deletions(-)

New commits:
commit fc92c1abebcfe9b18649d35b76bf22e001e332da
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Aug 12 18:41:44 2013 +0200

fdo#67930 don't use variables for formattedtext in header/footer

I don't know why it was going through variables.
Instead, put the value where it is supposed to,
like for formattedtext in detail section.
Try it, and if something breaks, we can revert.

This also works around fdo#67930

Change-Id: Ia7f08afd8a037d3ac75676c5221ddb36aa791354

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index dcc153c..5bda08b 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -100,30 +100,39 @@ public class FormattedTextLayoutController
 DataSourceException
 {
 final FormattedTextElement element = (FormattedTextElement) getNode();
-final VariablesCollection vc = getVariablesCollection();
-if (vc != null)
-{
-final String name = vc.addVariable(element);
-final AttributeMap variablesGet = new AttributeMap();
-variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE,
-Element.TYPE_ATTRIBUTE, variable-get);
-variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE,
-Element.NAMESPACE_ATTRIBUTE, OfficeNamespaces.TEXT_NS);
-variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, name, name);
-
-final String dataStyleName = computeValueStyle();
-if (dataStyleName != null)
-{
-variablesGet.setAttribute(OfficeNamespaces.STYLE_NS, 
data-style-name, dataStyleName);
-}
-
-final String valueType = computeValueType();
-variablesGet.setAttribute(OfficeNamespaces.OFFICE_NS, 
FormatValueUtility.VALUE_TYPE, valueType);
-target.startElement(variablesGet);
-
-target.endElement(variablesGet);
-}
-else
+// LEM 20130812 I have absolutely no clue why it wants to go via
+// a variable like that. It complicates things, is fragile
+// (because the variable-set is done in *every* detail section
+//  again and again. This in itself is not that bad, but when
+//  the detail section is of height zero, the set us never done...
+//  and this whole schema fails). For now, keep the code in case
+//  something break. If we survive the 4.2 cycle (in its entirety)
+//  without regression traced to this, then remove it (for 4.4 or
+//  something like that).
+// final VariablesCollection vc = getVariablesCollection();
+// if (vc != null)
+// {
+// final String name = vc.addVariable(element);
+// final AttributeMap variablesGet = new AttributeMap();
+// variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE,
+// Element.TYPE_ATTRIBUTE, variable-get);
+// variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE,
+// Element.NAMESPACE_ATTRIBUTE, OfficeNamespaces.TEXT_NS);
+// variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, name, 
name);
+
+// final String dataStyleName = computeValueStyle();
+// if (dataStyleName != null)
+// {
+// variablesGet.setAttribute(OfficeNamespaces.STYLE_NS, 
data-style-name, dataStyleName);
+// }
+
+// final String valueType = computeValueType();
+// variablesGet.setAttribute(OfficeNamespaces.OFFICE_NS, 
FormatValueUtility.VALUE_TYPE, valueType);
+// target.startElement(variablesGet);
+
+// target.endElement(variablesGet);
+// }
+// else
 {
 final DataFlags df = FormatValueUtility.computeDataFlag(element, 
getFlowController());
 if (df != null)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[Lionel Elie Mamane]

 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
 |   11 +++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit b8537fba16417aa5a2e940191f094b8671256ee5
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Apr 12 19:03:07 2013 +0200

fdo#36858

1) No valueType (Format/Number/General) is like float valueType 
(Format/Number/any other)
2) We use 1/1/1900 as startdate for number-from-date, stick to it more 
consistently

Change-Id: Ib1008d1c30be602d8173457738c915087ed17391

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index f5f65db..4c1b8dd 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -126,9 +126,10 @@ public class FormatValueUtility
 }
 else if (value instanceof java.sql.Date)
 {
-if (float.equals(valueType))//@see 
http://qa.openoffice.org/issues/show_bug.cgi?id=108954
+if (float.equals(valueType) || valueType == null)
 {
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, 
VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 2).toString());
+// This is to work around fdo#63478
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, 
VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 0).toString());
 }
 else
 {
@@ -137,8 +138,12 @@ public class FormatValueUtility
 }
 else if (value instanceof Date)
 {
+// This is what we *should* do, but see fdo#63478
+// variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, 
VALUE_TYPE, date);
+// variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, 
date-value, formatDate((Date) value));
+// so we do that instead to work around:
 variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, 
VALUE_TYPE, float);
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, 
HSSFDateUtil.getExcelDate((Date) value, false, 2).toString());
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, 
HSSFDateUtil.getExcelDate((Date) value, false, 0).toString());
 }
 else if (value instanceof BigDecimal)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportbuilder/java

[Lionel Elie Mamane]

 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java |   10 
+-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit eb39389da846a5d31acbfeab029ca0dacbc5f02c
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Apr 10 18:03:58 2013 +0200

reportbuilder: do not use empty tablename

Change-Id: I03ed5e810468ee206820a250c740b80c0ceda432

diff --git 
a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java 
b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index 24e1fe1..4d0a797 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -254,7 +254,15 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 try
 {
 column = 
UnoRuntime.queryInterface(XPropertySet.class, columns.getByName(expression));
-expression = quote + 
column.getPropertyValue(TableName) + quote + . + quote + expression + quote;
+String prefix;
+prefix = 
(String)column.getPropertyValue(TableName);
+if (prefix == null)
+prefix = ;
+if (!prefix.isEmpty())
+{
+prefix = quote + prefix + quote + .;
+}
+expression = prefix + quote + expression + 
quote;
 }
 catch (Exception ex)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits