Remotely management advertising player / Attn: Technical Manager与您共享了相册。
Dear Sirs, After visiting your web-site I decided to contact your esteemed company as one of the leaders of digital signage field . CMP-web1 is a low cost digital signage solution, consist of digital signage player and content management software. The solution offer local and central scheduling via internet or TF card. Zone type displays and full screen digital posters are available also. I would appreciate if you forward this letter to Technical Manager or to other expert responsible for technical integration of new products in your company, or provide me with his contact for we could discuss all the details of our future cooperation. Your early reply is highly appreciated . Anna https://picasaweb.google.com/lh/sredir?uname=101488099794642952864&target=ALBUM&id=6166792858629771729&authkey=Gv1sRgCIjFz8yIgsv8wwE&invite=CLW52q8G&feat=email ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
- Extended tips in Helpcontent & VCL + Glade
Hi all Just playing with a new linux master build today and I found that the bla bla bla of a widget in a UI dialog, edited by Glade, indeed acts like an extended tip () for help content for the widget, provided the "extented tips" in Tools - Options - General - Extended tips" is unmarked. In other words, it is possible to have extended tips moved into these dialogs. The benefits I see are * Have the text of the e.t. in the UI and facilitate translation job (context) * fix the e.t. of the wikihelp. The issues I see are * a quite large work of moving e.t. from helpcontent to UI. * An impact in the translations of the UI (not sure it can be automated). * when unmarking Extended tips in the Options, we loose e.t. of toolbars and other non-Glade UI objects. * by filling the tooltip_markup property, e.t. are always enabled in a dialog. The last two may require an Option of e.t for toolbars and another Option or dialogs. bin/lint-ui.py can be adapted to check if the widget have a e.t. Regards -- Olivier Hallot Comunidade LibreOffice http://ask.libreoffice.org/pt-br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 67544] FILESAVE: Slide transistion sound(other sound) is not included in presentation file
https://bugs.documentfoundation.org/show_bug.cgi?id=67544 --- Comment #10 from Zeki Bildirici --- (In reply to Vishv from comment #9) > (In reply to comment #8) > > (In reply to comment #7) > > > The above code don't give me any compilation error. But, when I open an > > > instance of Impress from my terminal, I could see this messages > > > http://pastebin.ca/2679016. And this seems to be the reason behind the > > > EmbedMedia() not able to create & store the .mp3 file in "Media/" (which > > > is > > > vnd.sun.star.Package:Media). > > > > > That paste is not really helpful, since you can't tell which part of your > > code is triggering it. Have you debugged this (both a working call to > > EmbedMedia, and your snippets)? > > Yes, I had debugged the working call to "EmbedMedia()", when called by (1) > "Insert->Media and Sound" and (2) and for this case (slide transitions). It > seems to work similarly in both cases. But, still for the second case it > does not embed the music file. Ping :) -- 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: 2 commits - basic/source vcl/workben
basic/source/classes/image.cxx | 14 -
vcl/workben/fftester.cxx | 526 -
2 files changed, 280 insertions(+), 260 deletions(-)
New commits:
commit de26ef857bf3b39a02192289a374605ca9491721
Author: Caolán McNamara
Date: Sun Aug 23 12:52:52 2015 +0100
coverity#1242865 Untrusted loop bound
Change-Id: I9c6f821f7bd1e9bd3eb8f47e269e62a792523f1a
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index ef468dc..703dbd4 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -241,6 +241,17 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
break;
}
case B_SBXOBJECTS:
+{
+//assuming an empty string with just the lead 32bit/16bit len
indicator
+const size_t nMinStringSize = (eCharSet ==
RTL_TEXTENCODING_UNICODE) ? 4 : 2;
+const size_t nMinRecordSize = nMinStringSize +
sizeof(sal_Int16);
+const size_t nMaxRecords = r.remainingSize() / nMinRecordSize;
+if (nCount > nMinRecordSize)
+{
+SAL_WARN("basic", "Parsing error: " << nMaxRecords <<
+ " max possible entries, but " << nCount << "
claimed, truncating");
+nCount = nMaxRecords;
+}
// User defined types
for (sal_uInt16 i = 0; i < nCount; i++)
@@ -319,9 +330,8 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
AddType(pType);
}
-
break;
-
+}
case B_MODEND:
goto done;
default:
commit ca09871bc0c2672370d23c66148afe25006962f8
Author: Caolán McNamara
Date: Sun Aug 23 10:31:15 2015 +0100
coverity#1317301 Uncaught exception
Change-Id: I580c1c873b440d5230a0c9e6a2a2af5d5d8c0e0e
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index cb41af9..b50df80 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -76,305 +76,315 @@ unsigned int persist_cnt;
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{
int ret = -1;
-
-if (argc < 3)
+try
{
-fprintf(stderr, "Usage: fftester \n");
-return -1;
-}
+if (argc < 3)
+{
+fprintf(stderr, "Usage: fftester \n");
+return -1;
+}
-OUString in(argv[1], strlen(argv[1]), RTL_TEXTENCODING_UTF8);
-OUString out;
-osl::File::getFileURLFromSystemPath(in, out);
+OUString in(argv[1], strlen(argv[1]), RTL_TEXTENCODING_UTF8);
+OUString out;
+osl::File::getFileURLFromSystemPath(in, out);
-tools::extendApplicationEnvironment();
+tools::extendApplicationEnvironment();
-Reference< XComponentContext > xContext =
defaultBootstrap_InitialComponentContext();
-Reference< XMultiServiceFactory > xServiceManager(
xContext->getServiceManager(), UNO_QUERY );
-if( !xServiceManager.is() )
-Application::Abort( "Failed to bootstrap" );
-comphelper::setProcessServiceFactory( xServiceManager );
-utl::ConfigManager::EnableAvoidConfig();
-InitVCL();
+Reference< XComponentContext > xContext =
defaultBootstrap_InitialComponentContext();
+Reference< XMultiServiceFactory > xServiceManager(
xContext->getServiceManager(), UNO_QUERY );
+if( !xServiceManager.is() )
+Application::Abort( "Failed to bootstrap" );
+comphelper::setProcessServiceFactory( xServiceManager );
+utl::ConfigManager::EnableAvoidConfig();
+InitVCL();
try_again:
-{
-if (strcmp(argv[2], "wmf") == 0 || strcmp(argv[2], "emf") == 0)
-{
-GDIMetaFile aGDIMetaFile;
-SvFileStream aFileStream(out, StreamMode::READ);
-ret = (int) ReadWindowMetafile(aFileStream, aGDIMetaFile);
-}
-else if (strcmp(argv[2], "jpg") == 0)
-{
-Graphic aGraphic;
-SvFileStream aFileStream(out, StreamMode::READ);
-ret = (int) ImportJPEG(aFileStream, aGraphic, NULL,
GraphicFilterImportFlags::NONE);
-}
-else if (strcmp(argv[2], "gif") == 0)
-{
-SvFileStream aFileStream(out, StreamMode::READ);
-Graphic aGraphic;
-ret = (int) ImportGIF(aFileStream, aGraphic);
-}
-else if (strcmp(argv[2], "xbm") == 0)
-{
-Graphic aGraphic;
-SvFileStream aFileStream(out, StreamMode::READ);
-ret = (int) ImportXBM(aFileStream, aGraphic);
-}
-else if (strcmp(argv[2], "xpm") == 0)
-{
-Graphic aGraphic;
-SvFileStream aFileStream(out, StreamMode::READ);
-ret = (int) ImportXPM(aFileStream, aGraphic);
-}
-else if (strcmp(argv[2], "png") == 0)
-{
-SvFileStream
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/data/ww6/pass/crash-7.doc |binary
sw/source/filter/basflt/fltshell.cxx | 26 ++
2 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit b164d08f0c12a3434fad1b40900ddc8cb510370c
Author: Caolán McNamara
Date: Sun Aug 23 17:13:23 2015 +0100
check for bad locations
Change-Id: I635585f664e700047d92821fb965d42b803a8a15
diff --git a/sw/qa/core/data/ww6/pass/crash-7.doc
b/sw/qa/core/data/ww6/pass/crash-7.doc
new file mode 100644
index 000..5a9dab3
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-7.doc differ
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index 6c722d3..6ef14e5 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -419,25 +419,33 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const
SwPosition& rPos,
return pRet;
}
-static void MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
+static bool MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
SwPaM& rRegion)
{
// the anchor is the Pam's Point. It's modified when inserting
// text, etc.; therefore it is kept on the stack. Only the
// attribute's format needs to be set.
rRegion.DeleteMark();
-rRegion.GetPoint()->nNode = rEntry.m_aMkPos.m_nNode.GetIndex() + 1;
+
+sal_uLong nMk = rEntry.m_aMkPos.m_nNode.GetIndex() + 1;
+const SwNodes& rMkNodes = rEntry.m_aMkPos.m_nNode.GetNodes();
+if (nMk >= rMkNodes.Count())
+return false;
+
+rRegion.GetPoint()->nNode = nMk;
SwContentNode* pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode,
true);
rRegion.GetPoint()->nContent.Assign(pCNd, rEntry.m_aMkPos.m_nContent);
+return true;
}
// MakeBookRegionOrPoint() behaves like MakeRegionOrPoint, except that
// it adheres to certain restrictions on bookmarks in tables (cannot
// span more than one cell)
-static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
+static bool MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
SwPaM& rRegion, bool bCheck )
{
-if (rEntry.MakeRegion(pDoc, rRegion, bCheck )){
+if (rEntry.MakeRegion(pDoc, rRegion, bCheck ))
+{
// sal_Bool b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
if (rRegion.GetPoint()->nNode.GetNode().FindTableBoxStartNode()
!= rRegion.GetMark()->nNode.GetNode().FindTableBoxStartNode())
@@ -445,9 +453,9 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry&
rEntry, SwDoc* pDoc,
rRegion.Exchange(); // invalid range
rRegion.DeleteMark(); // -> both to mark
}
-}else{
-MakePoint(rEntry, pDoc, rRegion);
+return true;
}
+return MakePoint(rEntry, pDoc, rRegion);
}
// IterateNumrulePiece() looks for the first range valid for Numrules
@@ -596,8 +604,10 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
break;
case RES_FLTR_ANNOTATIONMARK:
{
-MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true);
-pDoc->getIDocumentMarkAccess()->makeAnnotationMark(aRegion,
OUString());
+if (MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true))
+pDoc->getIDocumentMarkAccess()->makeAnnotationMark(aRegion,
OUString());
+else
+SAL_WARN("sw", "failed to make book region or point");
}
break;
case RES_FLTR_TOX:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Shreyansh Gandhi License Statement
Hi, All of my past & future contributions to Libreoffice may be licensed under the MLPv2/LGPLv3 license. Regards,Shreyansh Gandhi___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trouble pulling from git
Hey, Will the http link work for git push too? Regards, Shreyansh On Fri, Aug 21, 2015 at 9:54 PM Eike Rathke wrote: > Hi Shreyansh, > > On Friday, 2015-08-21 11:35:02 -0400, Ashod Nakashian wrote: > > > On Fri, Aug 21, 2015 at 10:44 AM, Shreyansh Gandhi < > gandhish...@gmail.com> > > > I have been facing trouble while running git pull. The connection > always > > > times out. > > > url = git://gerrit.libreoffice.org/core > > url = git://anongit.freedesktop.org/libreoffice/core > > Both should work, unless your firewall or proxy blocks the git protocol > or one of the servers is temporarily unavailable.. which may have been > the case with gerrit yesterday during some time frame. > > http://anongit.freedesktop.org/git/libreoffice/core.git > would also be possible if the git protocol doesn't work for some reason, > the http protocol is just less effective than the git protocol. > > Eike > > -- > LibreOffice Calc developer. Number formatter stricken i18n > transpositionizer. > GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 > 2D3A > Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ > Care about Free Software, support the FSFE https://fsfe.org/support/?erack > -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Alternate link for pushing commits
Hi, Apparently the git:// protocol doesn't work on my network. Is there an alternate link such as the http lik for pulling? -Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Alternate link for pushing commits
Hey, On Sun, Aug 23, 2015 at 6:45 PM, Shreyansh Gandhi wrote: > Hi, > > Apparently the git:// protocol doesn't work on my network. Is there an > alternate link such as the http lik for pulling? > > Pushing happens through the ssh protocol. Please have a look at https://wiki.documentfoundation.org/Development/gerrit. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa sw/source
sw/qa/core/data/ww6/pass/crash-6.doc |binary
sw/source/filter/basflt/fltshell.cxx | 13 ++---
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 4d1b6057627c1fbee8cceefe77f9fb1c0af836d5
Author: Caolán McNamara
Date: Sat Aug 22 10:31:35 2015 +0100
check that src index is in doc range
Change-Id: Ic81e7a14701ff30aa46a9293dd6db351bd350ba5
(cherry picked from commit 3230c8cf1cf2dc486f038d369e7f4f44ffd6b0a7)
check that dest index is in doc range
Change-Id: I3006cf03cf97399a6c418162178acdb1d41c3b23
(cherry picked from commit cd6c9aef7468120dd5ea5c747f35c98baf214613)
Reviewed-on: https://gerrit.libreoffice.org/17925
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/sw/qa/core/data/ww6/pass/crash-6.doc
b/sw/qa/core/data/ww6/pass/crash-6.doc
new file mode 100644
index 000..08c8791
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-6.doc differ
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index be5d9eb..2427161 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -120,8 +120,11 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM&
rRegion, bool bCheck,
// The only position of 0x0D will not be able to make region in the old
logic
// because it is beyond the length of para...need special consideration
here.
-SwContentNode *const pContentNode(
-SwNodeIndex(rMkPos.m_nNode, +1).GetNode().GetContentNode());
+sal_uLong nMk = rMkPos.m_nNode.GetIndex() + 1;
+const SwNodes& rMkNodes = rMkPos.m_nNode.GetNodes();
+if (nMk >= rMkNodes.Count())
+return false;
+SwContentNode *const pContentNode(rMkNodes[nMk]->GetContentNode());
if (rMkPos == rPtPos &&
((0 != rPtPos.m_nContent) || (pContentNode && (0 !=
pContentNode->Len(
&& ( RES_TXTATR_FIELD != nWhich
@@ -138,7 +141,11 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM&
rRegion, bool bCheck,
rRegion.SetMark();
if (rMkPos.m_nNode != rPtPos.m_nNode)
{
-rRegion.GetPoint()->nNode = rPtPos.m_nNode.GetIndex() + 1;
+sal_uLong n = rPtPos.m_nNode.GetIndex() + 1;
+SwNodes& rNodes = rRegion.GetPoint()->nNode.GetNodes();
+if (n >= rNodes.Count())
+return false;
+rRegion.GetPoint()->nNode = n;
pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode, false);
}
rRegion.GetPoint()->nContent.Assign(pCNd, rPtPos.m_nContent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - filter/CppunitTest_filter_msfilter.mk filter/CppunitTest_filter_utils.mk filter/Module_filter.mk filter/qa filter/source sw/source
filter/CppunitTest_filter_msfilter.mk | 46
filter/CppunitTest_filter_utils.mk| 46
filter/Module_filter.mk |2
filter/qa/cppunit/msfilter-test.cxx | 77 ++
filter/qa/cppunit/utils-test.cxx | 77 --
filter/source/msfilter/util.cxx | 12 ++---
sw/source/core/layout/paintfrm.cxx|4 -
7 files changed, 132 insertions(+), 132 deletions(-)
New commits:
commit 8d933132ab01f0070225fae6cf704c9a1982e8f8
Author: Zolnai Tamás
Date: Sun Aug 23 19:15:14 2015 +0200
tdf#91969: Parts of paragraph border is missing
...when border is around more than one paragraph
Regression from:
16f637dab3c1b5f7ac9eacf2c57347800d3fdf09
Change-Id: Iea9455dd7cc3c301c3e2d5d7903c98d98e515595
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index b3e1f77..db70553 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -487,13 +487,13 @@ static sal_uInt8 lcl_TryMergeLines(
{
double const fMergeGap(properties.nSPixelSzW + properties.nSHalfPixelSzW);
// NOT static!
// A is above/before B
-if( mergeA.second <= mergeB.second &&
+if( mergeA.second <= mergeB.first &&
mergeA.second + fMergeGap >= mergeB.first )
{
return 1;
}
// B is above/before A
-else if( mergeB.second <= mergeA.second &&
+else if( mergeB.second <= mergeA.first &&
mergeB.second + fMergeGap >= mergeA.first )
{
return 2;
commit 9a23428ff030106c4d91ba8b6f3a68ce56b7c428
Author: Zolnai Tamás
Date: Fri Jul 24 04:23:30 2015 +0200
Use less operator here to be consistent with the original idea (see comment)
This doesn't change the result of the BestIndex method
Change-Id: If1efc04feac3d4966c126b1fa93d017a4beafbe1
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index f7e44c0..ce51d20 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1361,17 +1361,17 @@ namespace
static void CalculateScheme(const BitmapColor& rBitmapColor, std::vector
&vScheme, sal_uInt16 nVariance)
{
vScheme.resize(3,1);
-if( rBitmapColor.GetRed() > rBitmapColor.GetGreen() + nVariance )
+if( rBitmapColor.GetRed() < rBitmapColor.GetGreen() + nVariance )
++vScheme[0];
-if( rBitmapColor.GetRed() > rBitmapColor.GetBlue() + nVariance )
+if( rBitmapColor.GetRed() < rBitmapColor.GetBlue() + nVariance )
++vScheme[0];
-if( rBitmapColor.GetGreen() > rBitmapColor.GetRed() + nVariance )
+if( rBitmapColor.GetGreen() < rBitmapColor.GetRed() + nVariance )
++vScheme[1];
-if( rBitmapColor.GetGreen() > rBitmapColor.GetBlue() + nVariance )
+if( rBitmapColor.GetGreen() < rBitmapColor.GetBlue() + nVariance )
++vScheme[1];
-if( rBitmapColor.GetBlue() > rBitmapColor.GetRed() + nVariance )
+if( rBitmapColor.GetBlue() < rBitmapColor.GetRed() + nVariance )
++vScheme[2];
-if( rBitmapColor.GetBlue() > rBitmapColor.GetGreen() + nVariance )
+if( rBitmapColor.GetBlue() < rBitmapColor.GetGreen() + nVariance )
++vScheme[2];
}
commit 3f339c5e77881a0680552c05997db03a7587bf4b
Author: Zolnai Tamás
Date: Thu Jul 16 21:49:55 2015 +0200
Better to call this msfilter test
Change-Id: I2abd6aedb16303d8988c17e7204c9607bf8336a3
diff --git a/filter/CppunitTest_filter_utils.mk
b/filter/CppunitTest_filter_msfilter.mk
similarity index 56%
rename from filter/CppunitTest_filter_utils.mk
rename to filter/CppunitTest_filter_msfilter.mk
index 1d042a9..aa567cd 100644
--- a/filter/CppunitTest_filter_utils.mk
+++ b/filter/CppunitTest_filter_msfilter.mk
@@ -7,18 +7,18 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_CppunitTest_CppunitTest,filter_utils))
+$(eval $(call gb_CppunitTest_CppunitTest,filter_msfilter))
-$(eval $(call gb_CppunitTest_use_sdk_api,filter_utils))
-$(eval $(call gb_CppunitTest_use_ure,filter_utils))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_msfilter))
+$(eval $(call gb_CppunitTest_use_ure,filter_msfilter))
-$(eval $(call gb_CppunitTest_use_configuration,filter_utils))
+$(eval $(call gb_CppunitTest_use_configuration,filter_msfilter))
-$(eval $(call gb_CppunitTest_use_externals,filter_utils, \
+$(eval $(call gb_CppunitTest_use_externals,filter_msfilter, \
boost_headers \
))
-$(eval $(call gb_CppunitTest_use_libraries,filter_utils, \
+$(eval $(call gb_CppunitTest_use_libraries,filter_msfilter, \
tl \
comphelper \
unotest \
@@ -29,7 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_utils, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_components,filter_utils,\
+$(eval $(call gb_CppunitTest_use_components,filter_msfilter,\
configmgr/source/configmgr \
filter/sou
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - javaunohelper/com ridljar/com xmerge/source
javaunohelper/com/sun/star/comp/helper/Bootstrap.java
| 12 ++
ridljar/com/sun/star/uno/IMethodDescription.java
|4 +--
ridljar/com/sun/star/uno/Type.java
|4 +--
ridljar/com/sun/star/uno/Union.java
|2 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
|6 ++---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
| 10
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
|4 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
|2 -
12 files changed, 28 insertions(+), 24 deletions(-)
New commits:
commit 01aadc965ca97f28505418c6fb95a0c4c1f0d160
Author: Damjan Jovanovic
Date: Sun Aug 23 17:26:31 2015 +
Fix some of the many javadoc 8 errors.
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index eb9bf0c..66ae01f 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -97,6 +97,7 @@ public class Bootstrap {
@param context_entries the hash table contains mappings of entry names
(type string) to
context entries (type class ComponentContextEntry).
@return a new context.
+@throws java.lang.Exception
*/
static public XComponentContext createInitialComponentContext( Hashtable
context_entries )
throws Exception
@@ -149,6 +150,7 @@ public class Bootstrap {
*
* @return a freshly boostrapped service manager
* @seecom.sun.star.lang.ServiceManager
+ * @throws java.lang.Exception
*/
static public XMultiServiceFactory createSimpleServiceManager() throws
Exception
{
@@ -157,10 +159,12 @@ public class Bootstrap {
}
-/** Bootstraps the initial component context from a native UNO
installation.
-
-@see cppuhelper/defaultBootstrap_InitialComponentContext()
-*/
+/**
+ * Bootstraps the initial component context from a native UNO installation.
+ *
+ * @return
+ * @see cppuhelper/defaultBootstrap_InitialComponentContext()
+ */
static public final XComponentContext
defaultBootstrap_InitialComponentContext()
throws Exception
{
diff --git a/ridljar/com/sun/star/uno/IMethodDescription.java
b/ridljar/com/sun/star/uno/IMethodDescription.java
index f712556..0c1aad5 100644
--- a/ridljar/com/sun/star/uno/IMethodDescription.java
+++ b/ridljar/com/sun/star/uno/IMethodDescription.java
@@ -52,7 +52,7 @@ public interface IMethodDescription extends
IMemberDescription {
boolean isConst();
/**
- * Gives any array of ITypeDescription> of
+ * Gives any array of ITypeDescription of
* the [in] parameters.
*
* @return the in parameters
@@ -60,7 +60,7 @@ public interface IMethodDescription extends
IMemberDescription {
ITypeDescription[] getInSignature();
/**
- * Gives any array of ITypeDescription> of
+ * Gives any array of ITypeDescription of
* the [out] parameters.
*
* @return the out parameters
diff --git a/ridljar/com/sun/star/uno/Type.java
b/ridljar/com/sun/star/uno/Type.java
index f3a55f4..411db96 100644
--- a/ridljar/com/sun/star/uno/Type.java
+++ b/ridljar/com/sun/star/uno/Type.java
@@ -33,7 +33,7 @@ import java.util.HashMap;
* SHORT) do not have a matching Java class. For another, it can be
* necessary to describe a type which is unknown to the Java runtime system
* (for example, for delaying the need of a class, so that it is possible to
- * generate it on the fly.)
+ * generate it on the fly.)
*
* A Type is uniquely determined by its type class (a
* TypeClass) and its type name (a String); these two
@@ -204,7 +204,7 @@ public class Type {
*
* In certain cases, one Java class corresponds to two UNO types (e.g.,
* the Java class short[].class corresponds to both a sequence
- * of SHORT and a sequence of UNSIGNED SHORT in
+ * of SHORT and a sequence of UNSIGNED SHORT in
* UNO). In such ambiguous cases, the parameter alternative
* controls which UNO type is
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa sw/source
sw/qa/core/data/ww6/pass/crash-7.doc |binary
sw/source/filter/basflt/fltshell.cxx | 26 ++
2 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit 4ff8b3a353b1d042e9c47c4f82a3a1f74bcea6e8
Author: Caolán McNamara
Date: Sun Aug 23 17:13:23 2015 +0100
check for bad locations
Change-Id: I635585f664e700047d92821fb965d42b803a8a15
(cherry picked from commit b164d08f0c12a3434fad1b40900ddc8cb510370c)
Reviewed-on: https://gerrit.libreoffice.org/17938
Tested-by: Jenkins
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/sw/qa/core/data/ww6/pass/crash-7.doc
b/sw/qa/core/data/ww6/pass/crash-7.doc
new file mode 100644
index 000..5a9dab3
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-7.doc differ
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index 2427161..eb1e45f 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -419,25 +419,33 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const
SwPosition& rPos,
return pRet;
}
-static void MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
+static bool MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
SwPaM& rRegion)
{
// the anchor is the Pam's Point. It's modified when inserting
// text, etc.; therefore it is kept on the stack. Only the
// attribute's format needs to be set.
rRegion.DeleteMark();
-rRegion.GetPoint()->nNode = rEntry.m_aMkPos.m_nNode.GetIndex() + 1;
+
+sal_uLong nMk = rEntry.m_aMkPos.m_nNode.GetIndex() + 1;
+const SwNodes& rMkNodes = rEntry.m_aMkPos.m_nNode.GetNodes();
+if (nMk >= rMkNodes.Count())
+return false;
+
+rRegion.GetPoint()->nNode = nMk;
SwContentNode* pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode,
true);
rRegion.GetPoint()->nContent.Assign(pCNd, rEntry.m_aMkPos.m_nContent);
+return true;
}
// MakeBookRegionOrPoint() behaves like MakeRegionOrPoint, except that
// it adheres to certain restrictions on bookmarks in tables (cannot
// span more than one cell)
-static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
+static bool MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
SwPaM& rRegion, bool bCheck )
{
-if (rEntry.MakeRegion(pDoc, rRegion, bCheck )){
+if (rEntry.MakeRegion(pDoc, rRegion, bCheck ))
+{
// sal_Bool b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
if (rRegion.GetPoint()->nNode.GetNode().FindTableBoxStartNode()
!= rRegion.GetMark()->nNode.GetNode().FindTableBoxStartNode())
@@ -445,9 +453,9 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry&
rEntry, SwDoc* pDoc,
rRegion.Exchange(); // invalid range
rRegion.DeleteMark(); // -> both to mark
}
-}else{
-MakePoint(rEntry, pDoc, rRegion);
+return true;
}
+return MakePoint(rEntry, pDoc, rRegion);
}
// IterateNumrulePiece() looks for the first range valid for Numrules
@@ -596,8 +604,10 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
break;
case RES_FLTR_ANNOTATIONMARK:
{
-MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true);
-pDoc->getIDocumentMarkAccess()->makeAnnotationMark(aRegion,
OUString());
+if (MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true))
+pDoc->getIDocumentMarkAccess()->makeAnnotationMark(aRegion,
OUString());
+else
+SAL_WARN("sw", "failed to make book region or point");
}
break;
case RES_FLTR_TOX:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source
sw/qa/core/data/ww6/pass/hang-1.doc |binary
sw/source/filter/ww8/ww8par.cxx |2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 44c27bfb62ee9e820b659132ad9f8799b67064cc
Author: Caolán McNamara
Date: Fri Aug 21 14:01:03 2015 +0100
avoid hang in certain ww6 docs
(cherry picked from commit d0813b432f94d214a6961cb6a1eb11f65399e59b)
Change-Id: Ife15f6a6e4b31c6e226a154dd708290266e86a2e
Reviewed-on: https://gerrit.libreoffice.org/17927
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/sw/qa/core/data/ww6/pass/hang-1.doc
b/sw/qa/core/data/ww6/pass/hang-1.doc
new file mode 100644
index 000..825283d
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/hang-1.doc differ
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8f8c00b..e922037 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3880,7 +3880,7 @@ void SwWW8ImplReader::ReadAttrs(WW8_CP& rTxtPos, WW8_CP&
rNext, long nTextEnd, b
{
maCurrAttrCP = rTxtPos;
rNext = ReadTextAttr(rTxtPos, nTextEnd, rbStartLine);
-if (rTxtPos == rNext && rTxtPos == WW8_CP_MAX)
+if (rTxtPos == rNext && rTxtPos >= nTextEnd)
break;
}
while( rTxtPos >= rNext );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source
sw/qa/core/data/ww6/pass/crash-6.doc |binary
sw/source/filter/basflt/fltshell.cxx | 13 ++---
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 4efb0056f24698516aa5550ec926255da45a2381
Author: Caolán McNamara
Date: Sat Aug 22 10:31:35 2015 +0100
check that src index is in doc range
(cherry picked from commit 3230c8cf1cf2dc486f038d369e7f4f44ffd6b0a7)
check that dest index is in doc range
(cherry picked from commit cd6c9aef7468120dd5ea5c747f35c98baf214613)
Change-Id: Ic81e7a14701ff30aa46a9293dd6db351bd350ba5
3006cf03cf97399a6c418162178acdb1d41c3b23
Reviewed-on: https://gerrit.libreoffice.org/17928
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/sw/qa/core/data/ww6/pass/crash-6.doc
b/sw/qa/core/data/ww6/pass/crash-6.doc
new file mode 100644
index 000..08c8791
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-6.doc differ
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index 53a9b66..549731a 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -120,8 +120,11 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM&
rRegion, bool bCheck,
// The only position of 0x0D will not be able to make region in the old
logic
// because it is beyond the length of para...need special consideration
here.
-SwCntntNode *const pCntntNode(
-SwNodeIndex(rMkPos.m_nNode, +1).GetNode().GetCntntNode());
+sal_uLong nMk = rMkPos.m_nNode.GetIndex() + 1;
+const SwNodes& rMkNodes = rMkPos.m_nNode.GetNodes();
+if (nMk >= rMkNodes.Count())
+return false;
+SwCntntNode *const pCntntNode(rMkNodes[nMk]->GetCntntNode());
if (rMkPos == rPtPos &&
((0 != rPtPos.m_nCntnt) || (pCntntNode && (0 != pCntntNode->Len(
&& ( RES_TXTATR_FIELD != nWhich
@@ -138,7 +141,11 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM&
rRegion, bool bCheck,
rRegion.SetMark();
if (rMkPos.m_nNode != rPtPos.m_nNode)
{
-rRegion.GetPoint()->nNode = rPtPos.m_nNode.GetIndex() + 1;
+sal_uLong n = rPtPos.m_nNode.GetIndex() + 1;
+SwNodes& rNodes = rRegion.GetPoint()->nNode.GetNodes();
+if (n >= rNodes.Count())
+return false;
+rRegion.GetPoint()->nNode = n;
pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, false);
}
rRegion.GetPoint()->nContent.Assign(pCNd, rPtPos.m_nCntnt);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source
sw/qa/core/data/ww6/pass/crash-7.doc |binary
sw/source/filter/basflt/fltshell.cxx | 26 ++
2 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit e1276f7bd5a396f23856d039f3e79e20aa8232fc
Author: Caolán McNamara
Date: Sun Aug 23 17:13:23 2015 +0100
check for bad locations
(cherry picked from commit b164d08f0c12a3434fad1b40900ddc8cb510370c)
Change-Id: I635585f664e700047d92821fb965d42b803a8a15
Reviewed-on: https://gerrit.libreoffice.org/17939
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/sw/qa/core/data/ww6/pass/crash-7.doc
b/sw/qa/core/data/ww6/pass/crash-7.doc
new file mode 100644
index 000..5a9dab3
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-7.doc differ
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index 549731a..ef46c21 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -419,25 +419,33 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const
SwPosition& rPos,
return pRet;
}
-static void MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
+static bool MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
SwPaM& rRegion)
{
// the anchor is the Pam's Point. It's modified when inserting
// text, etc.; therefore it is kept on the stack. Only the
// attribute's format needs to be set.
rRegion.DeleteMark();
-rRegion.GetPoint()->nNode = rEntry.m_aMkPos.m_nNode.GetIndex() + 1;
+
+sal_uLong nMk = rEntry.m_aMkPos.m_nNode.GetIndex() + 1;
+const SwNodes& rMkNodes = rEntry.m_aMkPos.m_nNode.GetNodes();
+if (nMk >= rMkNodes.Count())
+return false;
+
+rRegion.GetPoint()->nNode = nMk;
SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, true);
rRegion.GetPoint()->nContent.Assign(pCNd, rEntry.m_aMkPos.m_nCntnt);
+return true;
}
// MakeBookRegionOrPoint() behaves like MakeRegionOrPoint, except that
// it adheres to certain restrictions on bookmarks in tables (cannot
// span more than one cell)
-static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
+static bool MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
SwPaM& rRegion, bool bCheck )
{
-if (rEntry.MakeRegion(pDoc, rRegion, bCheck )){
+if (rEntry.MakeRegion(pDoc, rRegion, bCheck ))
+{
// sal_Bool b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
if (rRegion.GetPoint()->nNode.GetNode().FindTableBoxStartNode()
!= rRegion.GetMark()->nNode.GetNode().FindTableBoxStartNode())
@@ -445,9 +453,9 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry&
rEntry, SwDoc* pDoc,
rRegion.Exchange(); // invalid range
rRegion.DeleteMark(); // -> both to mark
}
-}else{
-MakePoint(rEntry, pDoc, rRegion);
+return true;
}
+return MakePoint(rEntry, pDoc, rRegion);
}
// IterateNumrulePiece() looks for the first range valid for Numrules
@@ -596,8 +604,10 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
break;
case RES_FLTR_ANNOTATIONMARK:
{
-MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true);
-pDoc->getIDocumentMarkAccess()->makeAnnotationMark(aRegion,
OUString());
+if (MakeBookRegionOrPoint(rEntry, pDoc, aRegion, true))
+pDoc->getIDocumentMarkAccess()->makeAnnotationMark(aRegion,
OUString());
+else
+SAL_WARN("sw", "failed to make book region or point");
}
break;
case RES_FLTR_TOX:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/workben xmlsecurity/source
vcl/workben/fftester.cxx |8 ++--
xmlsecurity/source/helper/xsecsign.cxx |6 +++---
2 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 63cbf8fb02c3c53acc31c56a79c3f39e02c92f7b
Author: Caolán McNamara
Date: Sun Aug 23 19:58:58 2015 +0100
fail on exception
Change-Id: Ib48c6b05b7002db19e47d07fcfc0241468452190
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index b50df80..adf03b9 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -377,13 +377,9 @@ try_again:
/* If AFL_PERSISTENT not set or PERSIST_MAX exceeded, exit normally. */
}
-catch (const Exception& e)
+catch (...)
{
-SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
-}
-catch (const std::exception &e)
-{
-SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+abort();
}
_exit(ret);
commit e903601e636bcec8bdb7d1a4acb4bab27bf87533
Author: Caolán McNamara
Date: Sun Aug 23 17:21:16 2015 +0100
can replace sequence with simple array here
Change-Id: I1b5125f5354dc2a1f4b4312dbe2b921d5cf13b49
diff --git a/xmlsecurity/source/helper/xsecsign.cxx
b/xmlsecurity/source/helper/xsecsign.cxx
index cfa312e..70149ce 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -43,14 +43,14 @@ namespace cssxs = com::sun::star::xml::sax;
/* protected: for signature generation */
OUString XSecController::createId()
{
-cssu::Sequence< sal_Int8 > aSeq( 16 );
-rtl_createUuid (reinterpret_cast(aSeq.getArray()), 0,
sal_True);
+sal_uInt8 aSeq[16];
+rtl_createUuid( aSeq, 0, true );
char str[68]="ID_";
int length = 3;
for (int i=0; i<16; ++i)
{
-length += sprintf(str+length, "%04x", (unsigned char)aSeq[i]);
+length += sprintf(str+length, "%04x", aSeq[i]);
}
return OUString::createFromAscii(str);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 01/aadc965ca97f28505418c6fb95a0c4c1f0d160
01/aadc965ca97f28505418c6fb95a0c4c1f0d160 |1 + 1 file changed, 1 insertion(+) New commits: commit 6e1031cb6a8a3a04bfb65b0c806b3e1a706a1198 Author: Caolán McNamara Date: Sun Aug 23 20:03:58 2015 +0100 Notes added by 'git notes add' diff --git a/01/aadc965ca97f28505418c6fb95a0c4c1f0d160 b/01/aadc965ca97f28505418c6fb95a0c4c1f0d160 new file mode 100644 index 000..363c920 --- /dev/null +++ b/01/aadc965ca97f28505418c6fb95a0c4c1f0d160 @@ -0,0 +1 @@ +prefer: 3a05aabe4190fc948ebdc94a14a15872f977ba0c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c571bcd775ebcb3ad69099bdc0c326d28c00c78c
Author: Stephan Bergmann
Date: Sun Aug 23 21:55:05 2015 +0200
loplugin:defaultparams
Change-Id: I797b986b227381bc066ea3aa305c0abf78cd156a
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 634f65b..90bcd37 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -669,7 +669,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
#if defined(WNT)
do_msvcr_magic(sRuntimeLib.pData);
#endif
-if (!moduleRt.load(sRuntimeLib, SAL_LOADMODULE_DEFAULT))
+if (!moduleRt.load(sRuntimeLib))
#endif
{
JFW_ENSURE(false,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/source vcl/unx
vcl/source/gdi/salgdilayout.cxx |4 ++-
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 29 +++---
2 files changed, 25 insertions(+), 8 deletions(-)
New commits:
commit e2582341af9f6b756e5d95c8ddd99652b62d1a41
Author: Khaled Hosny
Date: Mon Aug 17 04:00:49 2015 +0200
Fix GTK3 right-to-left rendering of spin buttons
The button were not drawn at all
Change-Id: I51dfa30a6daa1034b5e978b09bcdfcc83e859f3d
Reviewed-on: https://gerrit.libreoffice.org/17790
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 8ee0d0a..7344423 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -139,25 +139,40 @@ Rectangle GtkSalGraphics::NWGetSpinButtonRect(
ControlPart nPart, Rectangle aAre
buttonRect.SetSize(Size(buttonWidth, buttonHeight));
buttonRect.setY(aAreaRect.Top());
buttonRect.Bottom() = buttonRect.Top() + aAreaRect.GetHeight();
+Rectangle partRect(buttonRect);
if ( nPart == PART_BUTTON_UP )
{
-buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() -
buttonRect.GetWidth()));
+if (AllSettings::GetLayoutRTL())
+partRect.setX(aAreaRect.Left());
+else
+partRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() -
buttonRect.GetWidth()));
}
else if( nPart == PART_BUTTON_DOWN )
{
-buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() -
2*buttonRect.GetWidth()));
+if (AllSettings::GetLayoutRTL())
+partRect.setX(aAreaRect.Left() + buttonRect.GetWidth());
+else
+partRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 2 *
buttonRect.GetWidth()));
}
else
{
-buttonRect.Right() = (aAreaRect.Left() + (aAreaRect.GetWidth() -
2*buttonRect.GetWidth()))-1;
-buttonRect.Left() = aAreaRect.Left();
-buttonRect.Top()= aAreaRect.Top();
-buttonRect.Bottom() = aAreaRect.Bottom();
+if (AllSettings::GetLayoutRTL())
+{
+partRect.Right() = aAreaRect.Left() + aAreaRect.GetWidth();
+partRect.Left() = aAreaRect.Left() + (2 * buttonRect.GetWidth())
- 1;
+}
+else
+{
+partRect.Right() = (aAreaRect.Left() + (aAreaRect.GetWidth() - 2 *
buttonRect.GetWidth())) - 1;
+partRect.Left() = aAreaRect.Left();
+}
+partRect.Top()= aAreaRect.Top();
+partRect.Bottom() = aAreaRect.Bottom();
}
gtk_style_context_restore(mpSpinStyle);
-return buttonRect;
+return partRect;
}
Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle
aAreaRect )
commit fff3c9d6e56ae380437333f9c15ff63742904f25
Author: Caolán McNamara
Date: Sun Aug 23 20:46:53 2015 +0100
don't mirror 0, RECT_EMPTY, 0, RECT_EMPTY rectangle
leave it untouched to make gtk3 rtl spin buttons possible
where the additional mirrorValue contains the region
of the spinbuttons to render within this rectangle
Change-Id: I2648d98ed36373c95947cc4d78e2e54797f01155
Reviewed-on: https://gerrit.libreoffice.org/17940
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 2771c9d6..df124a9 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -703,7 +703,9 @@ bool SalGraphics::DrawNativeControl( ControlType nType,
ControlPart nPart, const
if( (m_nLayout & SalLayoutFlags::BiDiRtl) || (pOutDev &&
pOutDev->IsRTLEnabled()) )
{
Rectangle rgn( rControlRegion );
-mirror( rgn, pOutDev );
+Rectangle aNull;
+if (rgn != aNull)
+mirror(rgn, pOutDev);
std::unique_ptr< ImplControlValue > mirrorValue( aValue.clone());
mirror( *mirrorValue, pOutDev );
bool bRet = drawNativeControl( nType, nPart, rgn, nState,
*mirrorValue, aCaption );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - javaunohelper/com xmerge/source
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java |2 + javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 17 -- javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java |2 - xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java |2 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java | 11 -- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java |5 +- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java |6 +-- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java |6 +-- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java |6 +-- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java |6 +-- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java | 14 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java |6 --- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java |9 + xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java |2 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java |2 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java |9 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java |7 +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java |4 +- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java |2 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java |2 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java |6 +-- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java |2 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java |2 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java |8 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java | 15 ++-- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java |2 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java | 12 +++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java |2 - xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java |4 +- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java |2 - xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java |2 - xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java |4 +- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java |4 +- xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java |2 - xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java |4 +- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java |2 - xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java |2 - xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java |4 +- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java |2 - xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java |6 +-- xmerge/source/
[Bug 67544] FILESAVE: Slide transistion sound(other sound) is not included in presentation file
https://bugs.documentfoundation.org/show_bug.cgi?id=67544 Vishv changed: What|Removed |Added Assignee|vishvbrahmbhat...@gmail.com |libreoffice-b...@lists.free ||desktop.org -- 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: vcl/osx
vcl/osx/printaccessoryview.mm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a401cf33b2e05d1778faef8e4fdd1043d3eb9b2e
Author: Stephan Bergmann
Date: Sun Aug 23 22:17:18 2015 +0200
loplugin:defaultparams
Change-Id: I0db404b84f62db9636fa30f9af1b9cc0d70a2624
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 3958bb1..7f7c826 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -298,14 +298,14 @@ class ControllerProperties
if( i_nPage >= 0 && nPages > i_nPage )
{
GDIMetaFile aMtf;
-PrinterController::PageSize aPageSize(
mpController->getFilteredPageFile( i_nPage, aMtf, false ) );
+PrinterController::PageSize aPageSize(
mpController->getFilteredPageFile( i_nPage, aMtf ) );
auto aDev(VclPtr::Create());
if(
mpController->getPrinter()->GetPrinterOptions().IsConvertToGreyscales() )
aDev->SetDrawMode( aDev->GetDrawMode() | (
DrawModeFlags::GrayLine | DrawModeFlags::GrayFill | DrawModeFlags::GrayText |
DrawModeFlags::GrayBitmap | DrawModeFlags::GrayGradient ) );
// see salprn.cxx, currently we pretend to be a 720dpi device on
printers
aDev->SetReferenceDevice( 720, 720 );
-aDev->EnableOutput( TRUE );
+aDev->EnableOutput();
Size aLogicSize( aDev->PixelToLogic( aPixelSize, MapMode(
MAP_100TH_MM ) ) );
double fScaleX =
double(aLogicSize.Width())/double(aPageSize.aSize.Width());
double fScaleY =
double(aLogicSize.Height())/double(aPageSize.aSize.Height());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Module_vcl.mk vcl/qa
vcl/Module_vcl.mk|7 +++
vcl/qa/cppunit/timer.cxx | 109 +--
2 files changed, 112 insertions(+), 4 deletions(-)
New commits:
commit b103e7d786f5b7ec6cfe4f53f2ca317f06ceabc5
Author: Ashod Nakashian
Date: Thu Aug 20 21:06:06 2015 -0400
vcl: unittests for Timer and AutoTimer.
Enabled VCL Timer unittests on Windows builds and added two unittests to
detect misfiring of timer events.
Due to the nature of timer events having virtually no guarantees on
non-realtime operating systems, the tests may fail randomly under
different system loads. The tests repeat a few times in such cases, but
still there are no guarantees.
These tests are added to detect gross breaks in the timer algorithms and
to improve certain corner cases. They are designed to minimize any
random failures.
Posterity might hate me for committing such unittests, so I added
TEST_TIMERPRECISION directive to include/exclude the tests at compile
time. It should be enabled if it causes more harm than good.
Change-Id: If2856f194cb4732c84900113bdb969f397f67d5a
Reviewed-on: https://gerrit.libreoffice.org/17906
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index c3e84e6..c949f42 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -123,4 +123,11 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_timer \
))
endif
+
+# Is any configuration missing?
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_check_targets,vcl,\
+ CppunitTest_vcl_timer \
+))
+endif
# vim: set noet sw=4 ts=4:
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 88807fc..85dc9ac 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -22,6 +22,8 @@
#include "salinst.hxx"
// #define TEST_WATCHDOG
+// Comment if UT fails randomly.
+#define TEST_TIMERPRECISION
/// Avoid our timer tests just wedging the build if they fail.
class WatchDog : public osl::Thread
@@ -44,7 +46,7 @@ public:
}
};
-static WatchDog aWatchDog( 10 /* 10 secs should be enough */);
+static WatchDog aWatchDog( 12 /* 12 secs should be enough */);
class TimerTest : public test::BootstrapFixture
{
@@ -58,6 +60,7 @@ public:
#endif
void testDurations();
void testAutoTimer();
+void testMultiAutoTimers();
void testRecursiveTimer();
void testSlowTimerCallback();
@@ -69,6 +72,7 @@ public:
#endif
CPPUNIT_TEST(testDurations);
CPPUNIT_TEST(testAutoTimer);
+CPPUNIT_TEST(testMultiAutoTimers);
CPPUNIT_TEST(testRecursiveTimer);
CPPUNIT_TEST(testSlowTimerCallback);
@@ -117,6 +121,7 @@ void TimerTest::testIdle()
// tdf#91727
void TimerTest::testIdleMainloop()
{
+#ifndef WNT
bool bTriggered = false;
IdleBool aTest( bTriggered );
// coverity[loop_top] - Application::Yield allows the timer to fire and
toggle bDone
@@ -131,6 +136,7 @@ void TimerTest::testIdleMainloop()
pSVData->maAppData.mnDispatchLevel--;
}
CPPUNIT_ASSERT_MESSAGE("mainloop idle triggered", bTriggered);
+#endif
}
//
@@ -189,11 +195,106 @@ public:
void TimerTest::testAutoTimer()
{
+const sal_Int32 nDurationMs = 30;
+const sal_Int32 nEventsCount = 5;
+const double exp = (nDurationMs * nEventsCount);
+
sal_Int32 nCount = 0;
-AutoTimerCount aCount(1, nCount);
-while (nCount < 100) {
-Application::Yield();
+double dur = 0;
+std::ostringstream msg;
+
+// Repeat when we have random latencies.
+// This is expected on non-realtime OSes.
+for (int i = 0; i < 10; ++i)
+{
+const auto start = std::chrono::high_resolution_clock::now();
+nCount = 0;
+AutoTimerCount aCount(nDurationMs, nCount);
+while (nCount < nEventsCount) {
+Application::Yield();
+}
+
+const auto end = std::chrono::high_resolution_clock::now();
+dur = std::chrono::duration(end - start).count();
+
+msg << std::setprecision(2) << std::fixed
+<< "periodic multi-timer - dur: "
+<< dur << " (" << exp << ") ms." << std::endl;
+
+// +/- 20% should be reasonable enough a margin.
+if (dur >= (exp * 0.8) && dur <= (exp * 1.2))
+{
+// Success.
+return;
+}
+}
+
+#ifdef TEST_TIMERPRECISION
+CPPUNIT_FAIL(msg.str().c_str());
+#endif
+}
+
+void TimerTest::testMultiAutoTimers()
+{
+// The behavior of the timers change drastically
+// when multiple timers are present.
+// The worst, in my tests, is when two
+// timers with 1ms period exist with a
+// third of much longer period.
+
+const sal_Int32 nDurationMsX = 5;
+const sal_Int32 nDurationMsY = 10;
+const sal_Int32 nDurationMs = 40;
+const sal_Int32 nEventsCount = 5;
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmerge/source
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
|2 +-
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
|6 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
| 10 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
|3 +--
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
|6 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
|2 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
|5 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
|2 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
|4 ++--
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
|3 ---
10 files changed, 11 insertions(+), 32 deletions(-)
New commits:
commit b5b4892e2bb80e5c308cf63a3e4c1c4f639d88d0
Author: Damjan Jovanovic
Date: Sun Aug 23 20:37:20 2015 +
Fix bad @return javadocs in main/xmerge.
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
index 6e85b9f..8886823 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
@@ -126,7 +126,7 @@ public class LabelCell extends CellValue {
/**
* Sets the String representing the cells contents
*
- * @return the String representing the cells contents
+ * @param cellContents the String representing the cells
contents
*/
private void setLabel(String cellContents) throws IOException {
rgch = cellContents.getBytes("UTF-16LE");
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
index ff718c7..f355538 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
@@ -120,9 +120,11 @@ public class Pane implements BIFFRecord {
}
/**
- * Get the hex code for this particular BIFFRecord
+ * Set the pane number of the active pane
+ * 0 - bottom right, 1 - top right
+ * 2 - bottom left, 3 - top left
*
- * @return the hex code for Pane
+ * @param paneNumber the pane number of the active pane
*/
public void setPaneNumber(int paneNumber) {
pnnAcct = (byte) paneNumber;
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
index 3db5794..70fea79f 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
@@ -76,21 +76,11 @@ public class Selection implements BIFFRecord {
return PocketExcelConstants.CURRENT_SELECTION;
}
-/**
- * Get the hex code for this particular BIFFRecord
- *
- * @return the hex code for Selection
- */
public Point getActiveCell() {
Point p = new Point(colActive, EndianConverter.readShort(rwActive));
return p;
}
-/**
- * Get the hex code for this particular BIFFRecord
- *
- * @return the hex code for Selection
- */
public void setActiveCell(Point p) {
colActive = (byte) p.getX();
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
index 8f98297..8e4aac3 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
@@ -358,7 +358,7 @@ OfficeConstants {
/**
* Adds a Worksheet to the workbook.
*
- * @return name the name of the Worksheet to be added
+ * @param name the name of the Worksheet to be added
*/
public void addWorksheet(String name) throws IOException {
@@ -372,7 +372,6 @@ OfficeConstants {
/**
* Adds a cell to the current worksheet.
*
- * @return the name of the Wor
Re: Trouble pulling from git
On Sun, Aug 23, 2015 at 12:30 PM, Shreyansh Gandhi wrote: > Hey, > > Will the http link work for git push too? > You need to push to gerrit: ssh://logerrit/core It might have https support, not sure. Check the docs please. > Regards, > Shreyansh > > On Fri, Aug 21, 2015 at 9:54 PM Eike Rathke wrote: > >> Hi Shreyansh, >> >> On Friday, 2015-08-21 11:35:02 -0400, Ashod Nakashian wrote: >> >> > On Fri, Aug 21, 2015 at 10:44 AM, Shreyansh Gandhi < >> gandhish...@gmail.com> >> > > I have been facing trouble while running git pull. The connection >> always >> > > times out. >> > > url = git://gerrit.libreoffice.org/core >> > url = git://anongit.freedesktop.org/libreoffice/core >> >> Both should work, unless your firewall or proxy blocks the git protocol >> or one of the servers is temporarily unavailable.. which may have been >> the case with gerrit yesterday during some time frame. >> >> http://anongit.freedesktop.org/git/libreoffice/core.git >> would also be possible if the git protocol doesn't work for some reason, >> the http protocol is just less effective than the git protocol. >> >> Eike >> >> -- >> LibreOffice Calc developer. Number formatter stricken i18n >> transpositionizer. >> GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 >> 2D3A >> Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ >> Care about Free Software, support the FSFE >> https://fsfe.org/support/?erack >> > -- > Regards, > Shreyansh Gandhi > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmerge/source
xmerge/source/bridge/java/XMergeBridge.java
|1
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
|2
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
|2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
| 29 --
4 files changed, 14 insertions(+), 20 deletions(-)
New commits:
commit af75d8d3f6defc9ae79e09fde3cee3a3c60e32df
Author: Damjan Jovanovic
Date: Mon Aug 24 03:07:26 2015 +
Fix all xmerge javadoc errors.
diff --git a/xmerge/source/bridge/java/XMergeBridge.java
b/xmerge/source/bridge/java/XMergeBridge.java
index 5317a24..4442301 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -92,7 +92,6 @@ public class XMergeBridge {
/** This inner class provides the component as a concrete implementation
* of the service description. It implements the needed interfaces.
- * @implements XTypeProvider
*/
static public class _XMergeBridge implements
XImportFilter,
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
index 2e10fbb..6981a22 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
@@ -33,7 +33,7 @@ import
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
/**
* This Helper class provides a simplified interface to conversion between
PocketXL formula representation
* and Calc formula representation.
- * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula}
+ * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula}
*/
public class FormulaHelper {
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
index 6aac8e6..cb7d42a 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
/**
* This class defines the precedence applied to each operator when performing
a conversion
- * {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.formula.FormulaCompiler.infix2
from infix to RPN.}.
+ * {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaCompiler#infix2RPN
from infix to RPN.}.
*/
public class PrecedenceTable {
public static final int DEFAULT_PRECEDENCE = 0;
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 18c9ff1..4b03bbf 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -123,26 +123,21 @@ class alignment extends conversionAlgorithm {
/**
* This class represents a paragraph Style.
*
- *
- * AttributeValue
- *
- * MARGIN_LEFT mm * 100
- *
- * MARGIN_RIGHT mm * 100
- *
- * MARGIN_TOP mm * 100 (space on top of paragraph)
- *
- * MARGIN_BOTTOMmm * 100
- *
- * TEXT_INDENT mm * 100 (first line indent)
- *
- * LINE_HEIGHT mm * 100, unless or'ed with LH_PCT, in which
+ *
+ * Properties
+ * AttributeValue
+ * MARGIN_LEFT mm * 100
+ * MARGIN_RIGHT mm * 100
+ * MARGIN_TOP mm * 100 (space on top of
paragraph)
+ * MARGIN_BOTTOMmm * 100
+ * TEXT_INDENT mm * 100 (first line indent)
+ * LINE_HEIGHT mm * 100, unless or'ed with LH_PCT, in
which
* case it is a percentage (e.g. 200% for double spacing)
* Can also be or'ed with LH_ATLEAST. Value is stored
* in bits indicated by LH_VALUEMASK.
- *
- * TEXT_ALIGN ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT
- *
+ *
+ * TEXT_ALIGN ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST,
ALIGN_LEFT
+ *
*
* @author David Proulx
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - javaunohelper/com ridljar/com
javaunohelper/com/sun/star/comp/helper/Bootstrap.java |6 +-
javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java |2
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java | 28
+-
javaunohelper/com/sun/star/lib/uno/helper/Factory.java|3 -
ridljar/com/sun/star/uno/IEnvironment.java|2
ridljar/com/sun/star/uno/ITypeDescription.java| 18 +++---
6 files changed, 30 insertions(+), 29 deletions(-)
New commits:
commit df3a689140ef47a8b7e960769a0fa7f2e479e601
Author: Damjan Jovanovic
Date: Mon Aug 24 04:22:52 2015 +
Fix all remaining javadoc errors that break the build with Java 8.
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 66ae01f..638bded 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -149,7 +149,7 @@ public class Bootstrap {
* Bootstraps a servicemanager with the jurt base components registered.
*
* @return a freshly boostrapped service manager
- * @seecom.sun.star.lang.ServiceManager
+ * @see"com.sun.star.lang.ServiceManager"
* @throws java.lang.Exception
*/
static public XMultiServiceFactory createSimpleServiceManager() throws
Exception
@@ -163,7 +163,7 @@ public class Bootstrap {
* Bootstraps the initial component context from a native UNO installation.
*
* @return
- * @see cppuhelper/defaultBootstrap_InitialComponentContext()
+ * @see defaultBootstrap_InitialComponentContext()
*/
static public final XComponentContext
defaultBootstrap_InitialComponentContext()
throws Exception
@@ -177,7 +177,7 @@ public class Bootstrap {
@param bootstrap_parameters
bootstrap parameters (maybe null)
-@see cppuhelper/defaultBootstrap_InitialComponentContext()
+@see defaultBootstrap_InitialComponentContext()
*/
static public final XComponentContext
defaultBootstrap_InitialComponentContext(
String ini_file, Hashtable bootstrap_parameters )
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
index 623402d..4d4cd2f 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
@@ -29,7 +29,7 @@ package com.sun.star.comp.helper;
The first one is commonly used for singleton objects of the component
context, that are raised on first-time retrieval of the key.
You have to pass a com.sun.star.lang.XSingleComponentFactory
-or string (=> service name) object for this.
+or string (=> service name) object for this.
*/
public class ComponentContextEntry
diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
index 9015724..8b107b9 100644
--- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKey;
* The SharedLibraryLoader class provides the functionality of
the com.sun.star.loader.SharedLibrary
* service.
*
- * @see com.sun.star.loader.SharedLibrary
+ * @see "com.sun.star.loader.SharedLibrary"
* @see com.sun.star.comp.servicemanager.ServiceManager
- * @see com.sun.star.lang.ServiceManager
+ * @see "com.sun.star.lang.ServiceManager"
*/
public class SharedLibraryLoader {
/**
@@ -70,9 +70,9 @@ public class SharedLibraryLoader {
* @return the factory for the
"com.sun.star.comp.stoc.DLLComponentLoader" component.
* @param smgrthe ServiceManager
* @param regKey the root registry key
- * @see com.sun.star.loader.SharedLibrary
- * @see com.sun.star.lang.ServiceManager
- * @see com.sun.star.registry.RegistryKey
+ * @see "com.sun.star.loader.SharedLibrary"
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static XSingleServiceFactory getServiceFactory(
XMultiServiceFactory smgr,
@@ -93,9 +93,9 @@ public class SharedLibraryLoader {
* @param impName the implementation name of the component
* @param smgrthe ServiceManager
* @param regKey the root registry key
- * @see com.sun.star.loader.SharedLibrary
- * @see com.sun.star.lang.ServiceManager
- * @see com.sun.star.registry.RegistryKey
+ * @see "com.sun.star.loader.SharedLibrary"
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static XSingleS
[Libreoffice-commits] core.git: mysqlc/source
mysqlc/source/mysqlc_connection.hxx|4 ++--
mysqlc/source/mysqlc_databasemetadata.hxx |4 ++--
mysqlc/source/mysqlc_driver.hxx|4 ++--
mysqlc/source/mysqlc_resultset.hxx |4 ++--
mysqlc/source/mysqlc_resultsetmetadata.hxx |4 ++--
mysqlc/source/mysqlc_statement.hxx |4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 112286d2ef68ffb697ca3ce48fc66197ce90c2f0
Author: Stephan Bergmann
Date: Mon Aug 24 08:28:57 2015 +0200
Revert "mysqlc: tdf#88206 replace cppu::WeakImplHelper* etc."
This reverts commit 7fa5f876fddfd4baeff01d74d26cbf1dc4607d18,
which uses LIBO_INTERNAL_ONLY features in external code.
diff --git a/mysqlc/source/mysqlc_connection.hxx
b/mysqlc/source/mysqlc_connection.hxx
index 2700c67..aeb9686 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -38,7 +38,7 @@
#include
-#include
+#include
#include
#include
@@ -65,7 +65,7 @@ namespace connectivity
typedef ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess > my_XNameAccessRef;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef;
-typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::sdbc::XConnection,
+typedef ::cppu::WeakComponentImplHelper3<
::com::sun::star::sdbc::XConnection,
::com::sun::star::sdbc::XWarningsSupplier,
::com::sun::star::lang::XServiceInfo
> OMetaConnection_BASE;
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx
b/mysqlc/source/mysqlc_databasemetadata.hxx
index e29e356..3dd311f 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -23,7 +23,7 @@
#include "mysqlc_connection.hxx"
#include
-#include
+#include
#include
@@ -40,7 +40,7 @@ namespace connectivity
// Class: ODatabaseMetaData
-typedef ::cppu::WeakImplHelper<
::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE;
+typedef ::cppu::WeakImplHelper1<
::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE;
class ODatabaseMetaData : public ODatabaseMetaData_BASE
{
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index 9f87386..f95e914 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -35,7 +35,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -50,7 +50,7 @@ namespace connectivity
using ::com::sun::star::uno::Sequence;
Reference< ::com::sun::star::uno::XInterface > SAL_CALL
MysqlCDriver_CreateInstance(const Reference<
::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw(Exception);
-typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::sdbc::XDriver,
+typedef ::cppu::WeakComponentImplHelper2<
::com::sun::star::sdbc::XDriver,
::com::sun::star::lang::XServiceInfo > ODriver_BASE;
typedef void* (SAL_CALL *
OMysqlCConnection_CreateInstanceFunction)(void* _pDriver);
diff --git a/mysqlc/source/mysqlc_resultset.hxx
b/mysqlc/source/mysqlc_resultset.hxx
index 567c721..003ca03 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -36,7 +36,7 @@
#include
#include
-#include
+#include
namespace connectivity
@@ -52,7 +52,7 @@ namespace connectivity
/*
** OResultSet
*/
-typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::sdbc::XResultSet,
+typedef ::cppu::WeakComponentImplHelper12<
::com::sun::star::sdbc::XResultSet,
::com::sun::star::sdbc::XRow,
::com::sun::star::sdbc::XResultSetMetaDataSupplier,
::com::sun::star::util::XCancellable,
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx
b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 8528056..ef4c53e 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -24,7 +24,7 @@
#include
-#include
+#include
#include
namespace connectivity
@@ -36,7 +36,7 @@ namespace connectivity
// Class: ResultSetMetaData
-typedef ::cppu::WeakImplHelper<
::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
+typedef ::cppu::WeakImplHelper1<
::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE;
class OResultSetMetaData : public OResultSetMetaData_BASE
{
diff --git a/mysqlc/source/mysqlc_statement.hxx
b/mysqlc/source/mysqlc_sta
[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead
https://bugs.documentfoundation.org/show_bug.cgi?id=88206 --- Comment #34 from Commit Notification --- Stephan Bergmann committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=112286d2ef68ffb697ca3ce48fc66197ce90c2f0 Revert "mysqlc: tdf#88206 replace cppu::WeakImplHelper* etc." It will be available in 5.1.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
