[Libreoffice-commits] core.git: basic/source
basic/source/comp/exprgen.cxx | 14 +++---
basic/source/comp/exprtree.cxx | 10 --
basic/source/inc/expr.hxx |6 ++
3 files changed, 13 insertions(+), 17 deletions(-)
New commits:
commit 49b5eed56c470975927bb7b0328337ab8a76a910
Author: Arnaud Versini
Date: Sun Jan 17 14:28:13 2016 +0100
BASIC : Remove SbiExprList::pParser
Change-Id: Ib9386d97ddb12f148cf76dc71aa8c41003286f50
Reviewed-on: https://gerrit.libreoffice.org/21534
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index ce6ff93..96efddb 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -184,7 +184,7 @@ void SbiExprNode::GenElement( SbiCodeGen& rGen, SbiOpcode
eOp )
if( aVar.pPar && aVar.pPar->GetSize() )
{
nId |= 0x8000;
-aVar.pPar->Gen();
+aVar.pPar->Gen(rGen);
}
rGen.Gen( eOp, nId, sal::static_int_cast< sal_uInt16 >( GetType() ) );
@@ -193,7 +193,7 @@ void SbiExprNode::GenElement( SbiCodeGen& rGen, SbiOpcode
eOp )
{
for( auto& pExprList: *aVar.pvMorePar )
{
-pExprList->Gen();
+pExprList->Gen(rGen);
rGen.Gen( _ARRAYACCESS );
}
}
@@ -203,11 +203,11 @@ void SbiExprNode::GenElement( SbiCodeGen& rGen, SbiOpcode
eOp )
// The first element remain available for return value etc.
// See as well SbiProcDef::SbiProcDef() in symtbl.cxx
-void SbiExprList::Gen()
+void SbiExprList::Gen(SbiCodeGen& rGen)
{
if( pFirst )
{
-pParser->aGen.Gen( _ARGC );
+rGen.Gen( _ARGC );
// Type adjustment at DECLARE
sal_uInt16 nCount = 1;
@@ -217,8 +217,8 @@ void SbiExprList::Gen()
if( !pExpr->GetName().isEmpty() )
{
// named arg
-sal_uInt16 nSid = pParser->aGblStrings.Add( pExpr->GetName() );
-pParser->aGen.Gen( _ARGN, nSid );
+sal_uInt16 nSid = rGen.GetParser()->aGblStrings.Add(
pExpr->GetName() );
+rGen.Gen( _ARGN, nSid );
/* TODO: Check after Declare concept change
// From 1996-01-10: Type adjustment at named -> search
suitable parameter
@@ -247,7 +247,7 @@ void SbiExprList::Gen()
}
else
{
-pParser->aGen.Gen( _ARGV );
+rGen.Gen( _ARGV );
}
}
}
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index b6ed8da..ba99c00 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -920,9 +920,8 @@ short SbiConstExpression::GetShortValue()
|*
***/
-SbiExprList::SbiExprList( SbiParser* p )
+SbiExprList::SbiExprList( )
{
-pParser = p;
pFirst = nullptr;
nExpr =
nDim = 0;
@@ -984,8 +983,7 @@ void SbiExprList::addExpression( SbiExpression* pExpr )
// #i79918/#i80532: bConst has never been set to true
// -> reused as bStandaloneExpression
//SbiParameters::SbiParameters( SbiParser* p, sal_Bool bConst, sal_Bool bPar) :
-SbiParameters::SbiParameters( SbiParser* p, bool bStandaloneExpression, bool
bPar) :
-SbiExprList( p )
+SbiParameters::SbiParameters( SbiParser* pParser, bool bStandaloneExpression,
bool bPar)
{
if( !bPar )
{
@@ -1150,9 +1148,9 @@ SbiParameters::SbiParameters( SbiParser* p, bool
bStandaloneExpression, bool bPa
// A list of array dimensions is parsed. The expressions are tested for being
// numeric. The bCONST-Bit is reset when all expressions are Integer constants.
-SbiDimList::SbiDimList( SbiParser* p ) : SbiExprList( p )
+SbiDimList::SbiDimList( SbiParser* pParser )
{
-bConst = true;
+bool bConst = true;// true: everything integer constants
if( pParser->Next() != LPAREN )
{
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 6efa150..7bcea84 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -223,21 +223,20 @@ public: // numeric constant
class SbiExprList { // base class for parameters and dims
protected:
-SbiParser* pParser;
SbiExpression* pFirst;
short nExpr;
short nDim;
bool bError;
bool bBracket;
public:
-SbiExprList( SbiParser* );
+SbiExprList();
virtual ~SbiExprList();
bool IsBracket() { return bBracket;}
bool IsValid() { return !bError; }
short GetSize() { return nExpr; }
short GetDims() { return nDim;}
SbiExpression* Get( short );
-void Gen();// code generation
+void Gen( SbiCodeGen& rGen);// code generation
void addExpression( SbiExpression* pExpr );
};
@@ -247,7 +246,6 @@ public:
};
[Bug 42788] FORMATTING - Numbering/ordered list results in misaligned text after a certain level: default indent does not match with the width of numbers/bullets
https://bugs.documentfoundation.org/show_bug.cgi?id=42788 Christopher M. Penalver changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED QA Contact||christopher.m.penalver@gmai ||l.com --- Comment #24 from Christopher M. Penalver --- Fixed in: Version: 5.2.0.0.alpha0+ Build ID: 3fc292f7b32f30b98dad208eb03e086b927d38a2 CPU Threads: 2; OS Version: Windows 6.19; UI Render: default; TinderBox: Win-x86@39, Branch:master, Time: 2016-01-22_23:56:18 Locale: en-US (en_US) -- 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
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2016-24-01_02:11:42 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Heads up - potential new devs coming our way
Hi guys, Heads up (especially Jan!) I wrote a blog post the other day and my friend David Gerard posted it to Hacker News, where it hit the front page. I saw a golden opportunity to attract some new talent so I posted a comment referring folks to the #libreoffice-dev channel on Freenode. The *might* be an influx of newbies - just to give you a heads up! Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Akshay Deep license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/tango postprocess/packimages
icon-themes/elementary/links.txt |1 - icon-themes/tango/links.txt |1 - postprocess/packimages/image-sort.lst |2 -- 3 files changed, 4 deletions(-) New commits: commit 31504c85f13861c40bdab6db0b6276f16662a166 Author: irem Date: Sat Jan 23 17:36:17 2016 +0200 tdf# 95360 Fix use of icons used only from help, but not in the code Change-Id: I87c7c32dcc61522c214b8a30a88c6856b4857c1d Reviewed-on: https://gerrit.libreoffice.org/21733 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index 035a2a0..f5985b5 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -455,7 +455,6 @@ res/sx03247.png res/odf_16_8.png res/sx03248.png res/odm_16_8.png res/sx03249.png res/odp_16_8.png res/sx03250.png res/ods_16_8.png -res/sx03251.png res/odt_16_8.png res/sx03256.png cmd/sc_addons.png sc/imglst/lc26047.png cmd/lc_insertformula.png sc/imglst/lc26048.png cmd/lc_autosum.png diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 63f253b..63cf1fd 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -66,7 +66,6 @@ res/extension_plus_32.png desktop/res/extension_32.png svtools/res/fp011.png fpicker/res/fp015.png res/sx03250.png res/ods_16_8.png res/sx03132.png res/sx03127.png -res/sx03251.png res/odt_16_8.png res/sc10854.png res/target.png res/im30821.png res/im30820.png res/sx03145.png res/sx03144.png diff --git a/postprocess/packimages/image-sort.lst b/postprocess/packimages/image-sort.lst index 2cb3eec..ac4842b 100644 --- a/postprocess/packimages/image-sort.lst +++ b/postprocess/packimages/image-sort.lst @@ -13,8 +13,6 @@ res/mainapp_16.png res/mainapp_32.png sw/res/punkt.png sw/res/punkt_h.png -res/sx03251.png -res/lx03251.png -- literal ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/activex/module_activex.ulf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09ffa9515ed7baa7e91d591fa24bf112c7c74b1c Author: Bryan Quigley Date: Mon Jan 18 00:14:13 2016 -0500 Show that ActiveX support is deprecated This just adds deprecated before activex support and mentions to the user to check the release notes for more details. Change-Id: I4bb7d577fb8f9e2618691e5418b1ddc4a4330ae2 Reviewed-on: https://gerrit.libreoffice.org/21563 Tested-by: Jenkins Tested-by: jan iversen Reviewed-by: jan iversen diff --git a/scp2/source/activex/module_activex.ulf b/scp2/source/activex/module_activex.ulf index 9bc08c6..eb8a045 100644 --- a/scp2/source/activex/module_activex.ulf +++ b/scp2/source/activex/module_activex.ulf @@ -20,7 +20,7 @@ en-US = "ActiveX Control" [STR_DESC_MODULE_OPTIONAL_ACTIVEXCONTROL] -en-US = "Component to enable Microsoft Internet Explorer to display %PRODUCTNAME documents." +en-US = "Deprecated Component (see release notes) to enable Microsoft Internet Explorer to display %PRODUCTNAME documents." ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/conditio.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a0a4ea3c636fc18cca6a3b2f9391996fb909e81f
Author: Julien Nabet
Date: Fri Jan 22 20:18:33 2016 +0100
tdf#97308: fix logic with conditional "ends with"
Change-Id: Ib9f9ed627dc37b11d8c3911aa4fe62141ff471c2
Reviewed-on: https://gerrit.libreoffice.org/21723
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index d2402a3..8b8b4bc 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1112,12 +1112,12 @@ bool ScConditionEntry::IsValid( double nArg, const
ScAddress& rPos ) const
{
OUString aStr = OUString::number(nVal1);
OUString aStr2 = OUString::number(nArg);
-bValid = !aStr2.endsWith(aStr);
+bValid = aStr2.endsWith(aStr);
}
else
{
OUString aStr2 = OUString::number(nArg);
-bValid = !aStr2.endsWith(aStrVal1);
+bValid = aStr2.endsWith(aStrVal1);
}
break;
case SC_COND_CONTAINS_TEXT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - scp2/source
scp2/source/writer/registryitem_writer.scp |9 + 1 file changed, 9 insertions(+) New commits: commit 91c708955435503b1ec95b68a4fa234b949b335f Author: Sean Young Date: Fri Dec 11 12:41:24 2015 + Register LibreOffice as able to open MS Write files Change-Id: I9d2962214e048e489c063b9a364dbfa207740949 Reviewed-on: https://gerrit.libreoffice.org/20643 Reviewed-by: jan iversen Tested-by: jan iversen Signed-off-by: Adolfo Jayme Barrientos diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index 80cbbdd..a1db1ef 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -1577,6 +1577,15 @@ RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer Value = " "; End +// .WRI +RegistryItem gid_Regitem_OpenOffice_WRI_OpenWith_Writer +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; +Subkey = ".wri\OpenWithProgIDs"; +ModuleID = gid_Module_Prg_Wrt_Bin; +Name = "LibreOffice.WriterDocument.1"; +Value = " "; +End + // .HWP RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - filter/source sysui/desktop
filter/source/config/fragments/types/writer_MS_Write.xcu |2 -
sysui/desktop/debian/postinst|1
sysui/desktop/macosx/Info.plist.in | 24 +++
sysui/desktop/menus/writer.desktop |2 -
4 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit f63fc6a723e0325cd9e78432d02e91bbb9de80b8
Author: Sean Young
Date: Thu Jan 14 20:13:45 2016 +
Set file association for MS Write files on linux and Mac
Other mime types used for MS Write are application/x-wri,
application/mswrite and application/wri. I think these were
pretty rare though.
Change-Id: I2bf48ab7a2fb1d979db38774ae0547c5ab6040d4
Reviewed-on: https://gerrit.libreoffice.org/21552
Tested-by: Jenkins
Reviewed-by: jan iversen
Signed-off-by: Adolfo Jayme Barrientos
diff --git a/filter/source/config/fragments/types/writer_MS_Write.xcu
b/filter/source/config/fragments/types/writer_MS_Write.xcu
index f42dca6..48ae04b 100644
--- a/filter/source/config/fragments/types/writer_MS_Write.xcu
+++ b/filter/source/config/fragments/types/writer_MS_Write.xcu
@@ -19,7 +19,7 @@
com.sun.star.comp.Writer.MSWorksImportFilter
wri
-
+application/x-mswrite
true
MS_Write
diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst
index b9b6f24..715403f 100755
--- a/sysui/desktop/debian/postinst
+++ b/sysui/desktop/debian/postinst
@@ -176,6 +176,7 @@ application/x-wordperfect; %PREFIX -view %s
application/wordperfect; %PREFIX -view %s
application/vnd.lotus-wordpro; %PREFIX -view %s
application/wpwin; %PREFIX -view %s
+application/x-mswrite; %PREFIX -view %s
application/vnd.openofficeorg.extension; %PREFIX %s
END
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 604a356..bd10c26 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1142,6 +1142,29 @@
public.content
UTTypeDescription
+Microsoft Write
+UTTypeIdentifier
+org.libreoffice.wri-document
+UTTypeTagSpecification
+
+public.filename-extension
+
+wri
+
+public.mime-type
+
+application/x-mswrite
+
+
+
+
+
+UTTypeConformsTo
+
+public.data
+public.content
+
+UTTypeDescription
Data Interchange Format
UTTypeIdentifier
org.libreoffice.dif-document
@@ -1782,6 +1805,7 @@
org.libreoffice.wpd-document
org.libreoffice.hwp-document
org.libreoffice.wks-document
+org.libreoffice.wri-document
org.libreoffice.dif-document
org.libreoffice.slk-document
org.libreoffice.csv-document
diff --git a/sysui/desktop/menus/writer.desktop
b/sysui/desktop/menus/writer.desktop
index 1df1b49..68ec858 100644
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -22,7 +22,7 @@ Icon=writer
Type=Application
Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;applicatio
n/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;application/x-iwork-pages-sffpages;
+MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writ
[Bug 96434] Activate usage data collection from commandline
https://bugs.documentfoundation.org/show_bug.cgi?id=96434 --- Comment #5 from Commit Notification --- aybuke committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=beea0484de87709da0814b4acd19527c8824f9b3 tdf#96434 Activate usage data collection from commandline. It will be available in 5.2.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 96434] Activate usage data collection from commandline
https://bugs.documentfoundation.org/show_bug.cgi?id=96434 Commit Notification changed: What|Removed |Added Whiteboard|| target:5.2.0 -- 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
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/unoctitm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit beea0484de87709da0814b4acd19527c8824f9b3
Author: aybuke
Date: Tue Jan 19 01:34:09 2016 +0200
tdf#96434 Activate usage data collection from commandline.
Possible env variable: $ export LO_COLLECT_USAGE=1
Change-Id: Ic253850ca73551bad8b44072164881c5039615c9
Reviewed-on: https://gerrit.libreoffice.org/21596
Tested-by: jan iversen
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 7a2616c..6e63bc7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -674,7 +674,7 @@ class theUsageInfo : public rtl::Static {};
/// Extracts information about the command + args, and stores that.
void collectUsageInformation(const util::URL& rURL, const
uno::Sequence& rArgs)
{
-bool bCollecting =
officecfg::Office::Common::Misc::CollectUsageInformation::get();
+bool bCollecting = getenv("LO_COLLECT_USAGE") ||
officecfg::Office::Common::Misc::CollectUsageInformation::get();
theUsageInfo::get().setCollecting(bCollecting);
if (!bCollecting)
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner qadevOOo/tests swext/mediawiki
qadevOOo/runner/util/utils.java |3
qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java| 14 +-
qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java |3
swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java | 54
+-
4 files changed, 41 insertions(+), 33 deletions(-)
New commits:
commit 77031644f16b63c794c1eef0ec4456d37e34fe23
Author: jan iversen
Date: Fri Jan 22 15:04:25 2016 +0100
cid#1326434, 1326446, 1326248, 1326254
null pointer dereferencing, added null check
Change-Id: I78f3ee1eb5d5bd4ebe7b3a6775db4884859dbcf6
Reviewed-on: https://gerrit.libreoffice.org/21712
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index c3f3458..8582f5f 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -587,7 +587,8 @@ public class utils {
} catch (com.sun.star.uno.Exception e) {
}
-xTrans.parseStrict(rUrl);
+if (xTrans != null)
+xTrans.parseStrict(rUrl);
return rUrl[0];
}
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
index 971dab8..d766c96 100644
--- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
+++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
@@ -137,12 +137,18 @@ public class _XTreeNode extends MultiMethodTest {
}
log.println("try to get parrent of children");
-XTreeNode xParrent = xNode.getParent();
+if (xNode == null) {
+log.println("missing xNode");
+tRes.tested("getParent()", false);
+}
+else {
+XTreeNode xParrent = xNode.getParent();
-bOK = oObj.equals(xParrent);
-log.println("original object and parrent should be the same: " + bOK);
-tRes.tested("getParent()", bOK);
+bOK = oObj.equals(xParrent);
+log.println("original object and parrent should be the same: " +
bOK);
+tRes.tested("getParent()", bOK);
+}
}
diff --git a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
index 082babb..597e44c 100644
--- a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
+++ b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
@@ -164,7 +164,8 @@ public class _DrawingDocumentDrawView extends
MultiPropertyTest {
}
log.println("oldZoomValue: "+oldValue);
log.println("newZoomValue: "+newValue);
-tRes.tested("ZoomType",(!oldValue.equals(newValue)));
+if (oldValue != null)
+tRes.tested("ZoomType",(!oldValue.equals(newValue)));
}
}
diff --git
a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
index 784bc77..a6ee07f 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
@@ -60,40 +60,40 @@ public class MainThreadDialogExecutor implements XCallback
private static boolean GetCallback( XComponentContext xContext,
MainThreadDialogExecutor aExecutor )
{
+if (aExecutor == null)
+ return false;
+
try
{
-if ( aExecutor != null )
-{
-String aThreadName = null;
-Thread aCurThread = Thread.currentThread();
-if ( aCurThread != null )
-aThreadName = aCurThread.getName();
+String aThreadName = null;
+Thread aCurThread = Thread.currentThread();
+if ( aCurThread != null )
+aThreadName = aCurThread.getName();
-if ( aThreadName != null && aThreadName.equals(
"com.sun.star.thread.WikiEditorSendingThread" ) )
+if ( aThreadName != null && aThreadName.equals(
"com.sun.star.thread.WikiEditorSendingThread" ) )
+{
+// the main thread should be accessed asynchronously
+XMultiComponentFactory xFactory = xContext.getServiceManager();
+if ( xFactory == null )
+throw new com.sun.star.uno.RuntimeException();
+
+XRequestCallback xRequest = UnoRuntime.queryInterface(
+XRequestCallback.class,
+xFactory.createInstanceWithContext(
"com.sun.star.awt.AsyncCallback", xContext ) );
+if ( xRequest != null )
{
-// the main thread should be accessed asynchronously
-XMultiComponentFactory xFactory =
xContext.getServiceManager();
-if ( xFactory == null )
-throw new com.sun.star.uno.RuntimeException();
-
-
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/document/Control.java | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit b996107585efb7bed88351d2cea2e56d8500c2fb
Author: jan iversen
Date: Thu Jan 21 19:35:26 2016 +0100
cid#1326113, 1326410, 1326411
Removed reference to elements in a null pointer.
Change-Id: Ife6fc68128284e291130a9a81bb7557ce03197ed
Reviewed-on: https://gerrit.libreoffice.org/21690
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/wizards/com/sun/star/wizards/document/Control.java
b/wizards/com/sun/star/wizards/document/Control.java
index 17d12f0..9ff4691 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -75,7 +75,7 @@ public class Control extends Shape
try
{
icontroltype = _icontroltype;
-String sServiceName =
oFormHandler.sModelServices[getControlType()];
+String sServiceName = oFormHandler.sModelServices[icontroltype];
Object oControlModel =
oFormHandler.xMSFDoc.createInstance(sServiceName);
xControlModel = UnoRuntime.queryInterface( XControlModel.class,
oControlModel );
xPropertySet = UnoRuntime.queryInterface( XPropertySet.class,
oControlModel );
@@ -185,15 +185,21 @@ public class Control extends Shape
else
{
Size aPeerSize = getPeerSize();
+int aWidth;
+if (aPeerSize == null)
+aWidth = 0;
+else
+aWidth = aPeerSize.Width;
+
// We increase the preferred Width a bit so that the control does
not become too small
// when we change the border from "3D" to "Flat"
if (getControlType() == FormHandler.SOCHECKBOX)
{
-return aPeerSize.Width * oFormHandler.getXPixelFactor();
+return aWidth * oFormHandler.getXPixelFactor();
}
else
{
-return (aPeerSize.Width * oFormHandler.getXPixelFactor()) +
200;
+return (aWidth * oFormHandler.getXPixelFactor()) + 200;
}
}
}
@@ -208,6 +214,11 @@ public class Control extends Shape
{
Size aPeerSize = getPeerSize();
int nHeight = aPeerSize.Height;
+if (aPeerSize == null)
+ nHeight = 0;
+else
+ nHeight = aPeerSize.Height;
+
// We increase the preferred Height a bit so that the control does
not become too small
// when we change the border from "3D" to "Flat"
return ((nHeight + 1) * oFormHandler.getYPixelFactor());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
