[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/com

[Matthias Seidel (via logerrit)]

 wizards/com/sun/star/wizards/ui/DocumentPreview.java |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ed76f39cedcebf942ff926052c5730f124955d0a
Author: Matthias Seidel 
AuthorDate: Wed May 29 19:29:04 2019 +
Commit: Matthias Seidel 
CommitDate: Wed May 29 19:29:04 2019 +

Cleaned up whitespace, fixed typos

diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java 
b/wizards/com/sun/star/wizards/ui/DocumentPreview.java
index d25d469cb51f..a4a678c2a12e 100644
--- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java
+++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java
@@ -45,7 +45,7 @@ public class DocumentPreview
 {
 
 /**
- * The window in which the preview is showed.
+ * The window in which the preview is shown.
  */
 private XWindow xWindow;
 /**
@@ -67,7 +67,7 @@ public class DocumentPreview
 
 - create new frame with window inside
 - load a component as preview into this frame
- */
+*/
 public DocumentPreview(XMultiServiceFactory xmsf, Object control) throws 
Exception
 {
 
@@ -137,9 +137,9 @@ public class DocumentPreview
 which isn't part of the global frame tree.
 
 Attention:
-a) This frame wont be destroyed by the office. It must be closed by you!
+a) This frame won't be destroyed by the office. It must be closed by you!
 Do so - please call XCloseable::close().
-b) The container window is part of the frame. Dont hold it alive - nor try 
to kill it.
+b) The container window is part of the frame. Don't hold it alive - nor 
try to kill it.
 It will be destroyed inside close().
  */
 public void createPreviewFrame(XMultiServiceFactory xmsf, XControl 
xControl) throws com.sun.star.uno.Exception, 
com.sun.star.lang.IllegalArgumentException
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/com

[Damjan Jovanovic]

 wizards/com/sun/star/wizards/db/FieldColumn.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d46d79f2261eb6be2fb74254f09520f5ef2baa88
Author: Damjan Jovanovic 
Date:   Tue Dec 1 03:42:43 2015 +

Calculate substring indexes properly, avoiding an unnecessary 
IndexOutOfBoundsException.

Patch by: me

diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java 
b/wizards/com/sun/star/wizards/db/FieldColumn.java
index 7a44f86..a33af66 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -138,7 +138,7 @@ public class FieldColumn
  */
 private String getOnlyFieldName(String _DisplayFieldName, String 
_CommandName)
 {
-return _DisplayFieldName.substring(_CommandName.length() + 1, 
_DisplayFieldName.length());
+return _DisplayFieldName.substring(_CommandName.length() + 1);
 }
 
 public static String composeDisplayFieldName(String _sCommandName, String 
_sFieldName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/com

[Damjan Jovanovic]

 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |4 
 1 file changed, 4 insertions(+)

New commits:
commit 046771cac8605e5826a150e4454eff332b65d517
Author: Damjan Jovanovic 
Date:   Sat Nov 7 18:26:04 2015 +

#i126029# Base query wizard error due to missing quoting of table and 
column names

During the Base query design wizard,
com.sun.star.wizards.ui.FilterComponent.getFilterConditions()
calls
com.sun.star.wizards.db.SQLQueryComposer.getSelectClause()
before its
getFromClause(). However the getSelectClause() needs composedCommandNames
which is populated only by getFromClause() in order to quote table and 
column names.
Without this, table and column names that need quoting (spaces, special 
characters,
reserved words) produce errors.

diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java 
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index f8ea6aa..37e7c9b 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -83,6 +83,10 @@ public class SQLQueryComposer
 
 public String getSelectClause(boolean _baddAliasFieldNames) throws 
SQLException
 {
+// getFromClause() must be called first to populate 
composedCommandNames,
+// but it's idempotent, so let's call it now in case the caller didn't 
already:
+getFromClause();
+
 String sSelectBaseClause = "SELECT ";
 String sSelectClause = sSelectBaseClause;
 for (int i = 0; i < CurDBMetaData.FieldColumns.length; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - wizards/com

[Tsutomu Uchino]

 wizards/com/sun/star/wizards/letter/LocaleCodes.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e878f6ea157ec0aaa47c1f4dbaf039b9de1a103
Author: Tsutomu Uchino ha...@apache.org
Date:   Sat Jan 18 02:36:25 2014 +

#i124045# fix resource id for STR_ARR_SVT_LANGUAGE_TABLE used in Letter 
wizard to match with svtools.hrc

diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.java 
b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
index 2078d68..4904364 100644
--- a/wizards/com/sun/star/wizards/letter/LocaleCodes.java
+++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
@@ -36,7 +36,7 @@ public class LocaleCodes extends Resource
 public LocaleCodes(XMultiServiceFactory xmsf)
 {
 super(xmsf, UNIT_NAME, MODULE_NAME);
-allLanguageStrings = getStringList(16635);  // 
STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
+allLanguageStrings = getStringList(16638);  // 
STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
 }
 
 public String getLanguageString(String MSID)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits