[Libreoffice-bugs] [Bug 93394] Data lost in docx saved document after hibernation and using Crashplan
https://bugs.documentfoundation.org/show_bug.cgi?id=93394 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #6 from Alex Thurgood ipla...@yahoo.co.uk --- Please provide detailed steps as to how to reproduce the problem, otherwise we have no hope of confirming the bug with regard to hibernation / resume / suspend. Does the problem occur with native ODF documents, or only when working with OfficeOpenXML ? Setting to NEEDINFO -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93495] increase / decrease indent buttons with heading styles change style instead
https://bugs.documentfoundation.org/show_bug.cgi?id=93495 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- @Steve : could you provide us please with a minimal document with instructions how to reproduce this problem ? Also please state OSX version and whether you are using LibreOffice from AppStore or from the TDF download page, thanks. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/baside2b.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit ddb43837ca74295b848d3217064a2442b0a12b8c
Author: Laurent Godard lgodard.li...@laposte.net
Date: Tue Aug 18 09:24:26 2015 +0200
avoid basic ide crash in code autocompletion
due to code completion and user defined types
type MyType
a as string
b as string
end type
dim aa as MyType
typing
aa.b.
the last point led to crash
remaining problem
code autocorrection now shows wrong behaviour as
aa.b.
autocorrects (wrongly) to
.
Change-Id: I3e05680cd9d82f7dc124c5923f9858e22961896e
Reviewed-on: https://gerrit.libreoffice.org/17824
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index d1a29ae..d4961d5 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -860,8 +860,10 @@ void EditorWindow::HandleCodeCompletion()
if( aVect.empty() )//nothing to do
return;
+
OUString sBaseName = aVect[0];//variable name
OUString sVarType = aCodeCompleteCache.GetVarType( sBaseName );
+
if( !sVarType.isEmpty() CodeCompleteOptions::IsAutoCorrectOn() )
{//correct variable name, if autocorrection on
const OUString sStr = aCodeCompleteCache.GetCorrectCaseVarName(
sBaseName, GetActualSubName(nLine) );
@@ -3002,6 +3004,10 @@ std::vector OUString
UnoTypeCodeCompletetor::GetXIdlClassFields() const
bool UnoTypeCodeCompletetor::CheckField( const OUString sFieldName )
{// modifies xClass!!!
+
+if ( xClass == NULL )
+return false;
+
Reference reflection::XIdlField xField = xClass-getField( sFieldName );
if( xField != NULL )
{
@@ -3016,6 +3022,11 @@ bool UnoTypeCodeCompletetor::CheckField( const OUString
sFieldName )
bool UnoTypeCodeCompletetor::CheckMethod( const OUString sMethName )
{// modifies xClass!!!
+
+
+if ( xClass == NULL )
+return false;
+
Reference reflection::XIdlMethod xMethod = xClass-getMethod( sMethName
);
if( xMethod != NULL ) //method OK, check return type
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92749] VLOOKUP not calculated correctly in the large file from Calc 4.4 (hard recalc helps)
https://bugs.documentfoundation.org/show_bug.cgi?id=92749 Eike Rathke er...@redhat.com changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |er...@redhat.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
Re: [PATCH] resolved: crash while closing ImageMap Editor
Hi Szymon, On Sun, 2015-08-16 at 10:19 +, Szymon Kłos (via Code Review) wrote: Change subject: resolved: crash while closing ImageMap Editor Thanks so much for that =) I've pushed to 5-0 and gerrit for -5-0-1 - extra reviews appreciated: https://gerrit.libreoffice.org/17827 Wrt. a more general concern about Links - it is interesting; the ~Link destructor does not remove the link (and doesn't have the information to do so). So my hope is that this is a minor sequencing issue and not a widespread thing we need to tackle now. Having said that - having a variant of Link that keeps track of its target object and removes the link on dispose automatically sounds like rather a good idea to me (GObject has something like this). Thanks ! Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 93507] local area doesn't repainted
https://bugs.documentfoundation.org/show_bug.cgi?id=93507 Babushkin Mikhail muaddib1...@mail.ru changed: What|Removed |Added Summary|Don't repaint local area|local area doesn't ||repainted -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56173] FILESAVE impossible for password protected shared .ods
https://bugs.documentfoundation.org/show_bug.cgi?id=56173 --- Comment #16 from gallz gall.zoltan...@gmail.com --- I try version 5.0.0.5 (x64) on Hungarian Windows 7, but impossible save password protected shared .ods yet. This bug is resolved worksforme since 3 years. How can i help to test? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: basic/source sc/qa
basic/source/classes/image.cxx | 161
sc/qa/extras/macros-test.cxx| 33
sc/qa/extras/testdocuments/testTypePassword.ods |binary
3 files changed, 194 insertions(+)
New commits:
commit 0405975042e91e5cca56068ad0d16ad8ab910737
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Aug 17 13:28:16 2015 +0200
tdf#75973 : User Defined Types in password encrypted macros
save/load basic script so that when executing password protected
the user defined types can be rebuilt
supports array and nested types
a unit test in sc macros-test.cxx
Change-Id: Ie127ea7ad9aea3353741048c00f1b3910c5517a4
Reviewed-on: https://gerrit.libreoffice.org/17815
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 0fa3d13..fa4feac 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -240,6 +240,90 @@ bool SbiImage::Load( SvStream r, sal_uInt32 nVersion )
}
break;
}
+case B_SBXOBJECTS:
+
+// User defined types
+for (sal_uInt16 i = 0; i nCount; i++)
+{
+OUString aTypeName = r.ReadUniOrByteString(eCharSet);
+
+sal_Int16 nTypeMembers;
+r.ReadInt16(nTypeMembers);
+
+SbxObject *pType = new SbxObject(aTypeName);
+SbxArray *pTypeMembers = pType-GetProperties();
+
+for (sal_uInt16 j = 0; j nTypeMembers; j++)
+{
+OUString aMemberName = r.ReadUniOrByteString(eCharSet);
+
+sal_Int16 aIntMemberType;
+r.ReadInt16(aIntMemberType);
+SbxDataType aMemberType = static_cast SbxDataType (
aIntMemberType );
+
+SbxProperty *pTypeElem = new SbxProperty( aMemberName,
aMemberType );
+
+sal_uInt32 aIntFlag;
+r.ReadUInt32(aIntFlag);
+SbxFlagBits nElemFlags = static_cast SbxFlagBits (
aIntFlag );
+
+pTypeElem-SetFlags(nElemFlags);
+
+sal_Int16 hasObject;
+r.ReadInt16(hasObject);
+
+if (hasObject == 1)
+{
+if(aMemberType == SbxOBJECT)
+{
+// nested user defined types
+// declared before use, so it is ok to
reference it by name on load
+// nested types not structuraly compatible
with arrays at the moment
+OUString aNestedTypeName =
r.ReadUniOrByteString(eCharSet);
+SbxObject* pNestedTypeObj = static_cast
SbxObject* ( rTypes-Find( aNestedTypeName, SbxCLASS_OBJECT ) );
+if (pNestedTypeObj)
+{
+SbxObject* pCloneObj =
cloneTypeObjectImpl( *pNestedTypeObj );
+pTypeElem-PutObject( pCloneObj );
+}
+}
+else
+{
+// an array
+// not compatible with nested user defined
types at the moment
+SbxDimArray* pArray = new SbxDimArray();
+
+sal_Int16 isFixedSize;
+r.ReadInt16(isFixedSize);
+if (isFixedSize == 1)
+pArray-setHasFixedSize( true );
+
+sal_Int32 nDims;
+r.ReadInt32(nDims);
+for (sal_Int32 d = 0; d nDims; d++)
+{
+sal_Int32 lBound;
+sal_Int32 uBound;
+r.ReadInt32(lBound).ReadInt32(uBound);
+pArray-unoAddDim32(lBound, uBound);
+}
+
+pTypeElem-PutObject( pArray );
+}
+}
+
+pTypeMembers-Insert( pTypeElem, pTypeMembers-Count()
);
+
+}
+
+pType-Remove( OUString(Name), SbxCLASS_DONTCARE );
+pType-Remove( OUString(Parent), SbxCLASS_DONTCARE );
+
+AddType(pType);
+}
+
+break;
+
case B_MODEND:
goto done;
[Libreoffice-bugs] [Bug 88831] When OpenGL is enabled, drop-down arrows, check marks, scrollbars etc. are upside down
https://bugs.documentfoundation.org/show_bug.cgi?id=88831 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard| target:5.1.0 | target:5.1.0 |target:5.0.0.3 |target:5.0.0.3 target:4.4.6 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75973] password protected library does not honnor end user type definition
https://bugs.documentfoundation.org/show_bug.cgi?id=75973 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|| target:5.1.0 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82504] EDITING: Background color button should fill cell background and not paragraph color when in a cell
https://bugs.documentfoundation.org/show_bug.cgi?id=82504 Norbert X nrb...@gmail.com changed: What|Removed |Added CC||nrb...@gmail.com --- Comment #17 from Norbert X nrb...@gmail.com --- Created attachment 117994 -- https://bugs.documentfoundation.org/attachment.cgi?id=117994action=edit Screenshots to demonstrate cell background bug Dear all. I have the same problem. I was going to report new bug and went to this report. I reported a bug to Ubuntu Launchpad (https://bugs.launchpad.net/bugs/1485955) too. Here are my bug report and screenshots. Steps to reproduce: 1. Launch LibreOffice Writer 2. Insert table to the new document (Table - Insert - Table) 3. Write some multirow text in table cells 4. Try to change cell background: 4.1. place cursor on desired cell 4.2. select color from palette from Background Color drop-down (located on Table toolbar). 4.3. click Background Color button on Table toolbar. Expected results: background color of TABLE CELL (where cursor was) is changed to desired color. Actual results: background color of TEXT PARAGRAPH (where cursor was) is changed to desired color. Workaround: There is slow non-intuitive background - select whole cell, select color from palette from Background Color drop-down (located on Table toolbar), click Background Color button on Table toolbar. Affected versions: LibreOffice 3.5.7.2 Build ID: 350m1(Build:2) = pre-installed Ubuntu 12.04.5 LTS version; LibreOffice 4.2.7.2 Build ID: 420m0(Build:2) = pre-installed Ubuntu 14.04.2 LTS version; LibreOffice 4.4.2.2 Build ID: 40m0(Build:2) = pre-installed Ubuntu 15.04 version. Comment: I can't believe how this bug is possible. It is inherited from OO.org (I saw it on OO.org 3.2 in Ubuntu 10.04.4 LTS too). Microsoft Word 2003 and 2007 of course have normal behaviour with cell background. I attached pdf document with screenshots. Bug exists in LibO 5 too. So please confirm this bug. For me it seems that priority should be Normal. This is a very often used functionality. Thank you! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82504] EDITING: Background color button should fill cell background and not paragraph color when in a cell
https://bugs.documentfoundation.org/show_bug.cgi?id=82504 Norbert X nrb...@gmail.com changed: What|Removed |Added See Also||https://launchpad.net/bugs/ ||1485955 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 2 commits - desktop/source include/LibreOfficeKit smoketest/libtest.cxx
desktop/source/lib/init.cxx | 135 +---
include/LibreOfficeKit/LibreOfficeKitInit.h | 60 +++-
smoketest/libtest.cxx | 24
3 files changed, 162 insertions(+), 57 deletions(-)
New commits:
commit a320a722439c14b7e6de88fd029e5236032cbda6
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Aug 18 12:10:05 2015 +0100
Stub initial pre-init phase.
Change-Id: I92d172a166606189ce386826eee566623ec4a83c
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 88a2f06..a435b7ef 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -42,6 +42,8 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/ucb/XContentProvider.hpp
#include com/sun/star/ucb/XUniversalContentBroker.hpp
+#include com/sun/star/container/XContentEnumerationAccess.hpp
+#include com/sun/star/container/XHierarchicalNameAccess.hpp
#include vcl/svapp.hxx
#include vcl/svpforlokit.hxx
@@ -964,17 +966,69 @@ static void lo_status_indicator_callback(void *data,
comphelper::LibreOfficeKit:
}
}
+/// pre-load all C++ component factories and leak references to them.
+static void forceLoadAllNativeComponents()
+{
+// FIXME: we need to inject RTLD_NOW into here, either by a
+// putenv(LD_BIND_NOW=1) in parent process or ... (?).
+
+try {
+uno::Referencecontainer::XContentEnumerationAccess xEnumAcc(
+xContext-getServiceManager(), css::uno::UNO_QUERY_THROW);
+uno::Referencecontainer::XHierarchicalNameAccess xTypeMgr(
+xContext-getValueByName(
+
/singletons/com.sun.star.reflection.theTypeDescriptionManager),
+css::uno::UNO_QUERY_THROW);
+uno::SequenceOUString aServiceNames(
+xContext-getServiceManager()-getAvailableServiceNames());
+
+for (sal_Int32 i = 0; i != aServiceNames.getLength(); ++i)
+{
+css::uno::Referencecss::container::XEnumeration xServiceImpls(
+xEnumAcc-createContentEnumeration(aServiceNames[i]),
+css::uno::UNO_SET_THROW);
+SAL_INFO(lok, service aServiceNames[i]);
+// FIXME: need to actually load and link each native DSO.
+}
+} catch (const uno::Exception ) {
+}
+}
+
+/// pre-load and parse all filter XML
+static void forceLoadFilterXML()
+{
+}
+
static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const
char* pUserProfilePath)
{
+enum {
+PRE_INIT, // setup shared data in master process
+SECOND_INIT, // complete init. after fork
+FULL_INIT // do a standard complete init.
+} eStage;
+
+// Did we do a pre-initialize
+static bool bPreInited = false;
+
+// What stage are we at ?
+if (pThis == NULL)
+eStage = PRE_INIT;
+else if (bPreInited)
+eStage = SECOND_INIT;
+else
+eStage = FULL_INIT;
+
LibLibreOffice_Impl* pLib = static_castLibLibreOffice_Impl*(pThis);
if (bInitialized)
return 1;
-comphelper::LibreOfficeKit::setActive();
-
comphelper::LibreOfficeKit::setStatusIndicatorCallback(lo_status_indicator_callback,
pLib);
+if (eStage != SECOND_INIT)
+comphelper::LibreOfficeKit::setActive();
+if (eStage != PRE_INIT)
+
comphelper::LibreOfficeKit::setStatusIndicatorCallback(lo_status_indicator_callback,
pLib);
-if (pUserProfilePath)
+if (eStage != SECOND_INIT pUserProfilePath)
rtl::Bootstrap::set(OUString(UserInstallation),
OUString(pUserProfilePath, strlen(pUserProfilePath), RTL_TEXTENCODING_UTF8));
OUString aAppPath;
@@ -997,22 +1051,30 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
try
{
-SAL_INFO(lok, Attempting to initalize UNO);
-if (!initialize_uno(aAppURL))
+if (eStage != SECOND_INIT)
{
-return false;
-}
-force_c_locale();
+SAL_INFO(lok, Attempting to initalize UNO);
-// Force headless -- this is only for bitmap rendering.
-rtl::Bootstrap::set(SAL_USE_VCLPLUGIN, svp);
+if (!initialize_uno(aAppURL))
+return false;
+force_c_locale();
-// We specifically need to make sure we have the headless
-// command arg set (various code specifically checks via
-// CommandLineArgs):
-desktop::Desktop::GetCommandLineArgs().setHeadless();
+// Force headless -- this is only for bitmap rendering.
+rtl::Bootstrap::set(SAL_USE_VCLPLUGIN, svp);
-Application::EnableHeadlessMode(true);
+// We specifically need to make sure we have the headless
+// command arg set (various code specifically checks via
+// CommandLineArgs):
+desktop::Desktop::GetCommandLineArgs().setHeadless();
+
+
[Libreoffice-bugs] [Bug 93507] New: Don't repaint local area
https://bugs.documentfoundation.org/show_bug.cgi?id=93507 Bug ID: 93507 Summary: Don't repaint local area Product: LibreOffice Version: 5.0.0.5 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: muaddib1...@mail.ru Created attachment 117992 -- https://bugs.documentfoundation.org/attachment.cgi?id=117992action=edit screenshot During scrolling Writer document, some document's local areas don't repaint. To reproduce this bug, you may scroll down document, then scroll up. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBParser2k.cpp |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 1023378fcd0974c38d23fce906d8552406dbe599
Author: David Tardon dtar...@redhat.com
Date: Tue Aug 18 11:51:53 2015 +0200
fix brain fart
Change-Id: Ifa0015945255b2a6e2c9da25b89b0b4648465290
diff --git a/src/lib/MSPUBParser2k.cpp b/src/lib/MSPUBParser2k.cpp
index 7003b72..3f2aaf3 100644
--- a/src/lib/MSPUBParser2k.cpp
+++ b/src/lib/MSPUBParser2k.cpp
@@ -564,11 +564,13 @@ bool
MSPUBParser2k::parseGroup(librevenge::RVNGInputStream *input, unsigned seqN
bool retVal = true;
m_collector-beginGroup();
m_collector-setCurrentGroupSeqNum(seqNum);
- if (seqNum m_chunkChildIndicesById.size())
+ const std::mapunsigned, std::vectorunsigned ::const_iterator it =
m_chunkChildIndicesById.find(seqNum);
+ if (it != m_chunkChildIndicesById.end())
{
-for (unsigned i = 0; i m_chunkChildIndicesById[seqNum].size(); ++i)
+const std::vectorunsigned chunkChildIndices = it-second;
+for (unsigned i = 0; i chunkChildIndices.size(); ++i)
{
- const ContentChunkReference childChunk =
m_contentChunks.at(m_chunkChildIndicesById[seqNum][i]);
+ const ContentChunkReference childChunk =
m_contentChunks.at(chunkChildIndices[i]);
if (childChunk.type == SHAPE || childChunk.type == GROUP)
{
retVal = retVal parse2kShapeChunk(childChunk, input, page, false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 75973] password protected library does not honnor end user type definition
https://bugs.documentfoundation.org/show_bug.cgi?id=75973 --- Comment #4 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Laurent Godard committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0405975042e91e5cca56068ad0d16ad8ab910737 tdf#75973 : User Defined Types in password encrypted macros 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 88831] When OpenGL is enabled, drop-down arrows, check marks, scrollbars etc. are upside down
https://bugs.documentfoundation.org/show_bug.cgi?id=88831 --- Comment #21 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Tomaž Vajngerl committed a patch related to this issue. It has been pushed to libreoffice-4-4: http://cgit.freedesktop.org/libreoffice/core/commit/?id=dfac25d2300b56ee4594346a4b5ce8b083a5c782h=libreoffice-4-4 tdf#88831 fix inverted textures when OpenGL is enabled It will be available in 4.4.6. 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source
editeng/source/outliner/overflowingtxt.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 02739f1876f6d945823d5c4663e6b37f435f4a2f
Author: matteocam matteo.campane...@gmail.com
Date: Tue Aug 18 12:54:16 2015 +0200
Assign return value of InsertText to EditSelection
Change-Id: I6e00e408ed84c4310e276de8e0b37b230748cc13
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index 3a97c89..3454aee 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -184,25 +184,30 @@ OutlinerParaObject
*OverflowingText::JuxtaposeParaObject(Outliner *pOutl, Outlin
// XXX: this code should be moved in Outliner directly
// creating Outliner::InsertText(...transferable...)
EditSelection
aStartSel(pOutl-pEditEngine-CreateSelection(ESelection(0,0)));
-EditPaM aPaM = pOutl-pEditEngine-InsertText(mxOverflowingContent,
+EditSelection aNewSel =
pOutl-pEditEngine-InsertText(mxOverflowingContent,
OUString(),
aStartSel.Min(),
true);
// Separate Paragraphs
-pOutl-pEditEngine-InsertParaBreak(EditSelection(aPaM, aPaM));
+pOutl-pEditEngine-InsertParaBreak(aNewSel);
return pOutl-CreateParaObject();
}
-OutlinerParaObject *OverflowingText::impMakeOverflowingParaObject(Outliner
*pOutliner)
+// XXX: This method should probably be removed
+OutlinerParaObject *OverflowingText::impMakeOverflowingParaObject(Outliner *)
{
+/*
// Simply Juxtaposing; no within-para merging
OutlinerParaObject *pOverflowingPObj = new
OutlinerParaObject(*mpContentTextObj);
// the OutlinerParaObject constr. at the prev line gives no valid outliner
mode, so we set it
pOverflowingPObj-SetOutlinerMode(pOutliner-GetOutlinerMode());
return pOverflowingPObj;
+*/
+assert(0); // Should not be called
+return NULL;
}
@@ -218,7 +223,9 @@ OutlinerParaObject
*OverflowingText::DeeplyMergeParaObject(Outliner *pOutl, Outl
// XXX: this code should be moved in Outliner directly
// creating Outliner::InsertText(...transferable...)
EditSelection
aStartSel(pOutl-pEditEngine-CreateSelection(ESelection(0,0)));
-EditPaM aPaM = pOutl-pEditEngine-InsertText(mxOverflowingContent,
+// We don't need to mark the selection
+// EditSelection aNewSel =
+pOutl-pEditEngine-InsertText(mxOverflowingContent,
OUString(),
aStartSel.Min(),
true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93469] FILESAVE: ODS - User defined number formats with question marks not retained
https://bugs.documentfoundation.org/show_bug.cgi?id=93469 --- Comment #3 from Jacques Guilleron guillero...@aol.com --- Hi Miguel Ángel, Excel uses '?' also to align numbers on the decimal separator, by leaving a sspace instead of insignifiant zero. Calc actually replace space by a zero. https://support.office.com/en-au/article/Create-or-delete-a-custom-number-format-78f2a361-936b-4c03-8772-09fab54be7f4 Jacques -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93493] CRASH when File - Close after style update in Writer document
https://bugs.documentfoundation.org/show_bug.cgi?id=93493 --- Comment #3 from Alex Thurgood ipla...@yahoo.co.uk --- Also please indicate whether you are using LibreOffice from the AppStore, or from the TDF download page. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93102] Crash on enabling image contour
https://bugs.documentfoundation.org/show_bug.cgi?id=93102 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard| target:5.1.0 target:5.0.2 | target:5.1.0 target:5.0.2 ||target:5.0.1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93102] Crash on enabling image contour
https://bugs.documentfoundation.org/show_bug.cgi?id=93102 --- Comment #9 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Szymon Kłos committed a patch related to this issue. It has been pushed to libreoffice-5-0-1: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0464718dfe7401bc7e19e76226b9a1fe74c68a9eh=libreoffice-5-0-1 tdf#93102 : resolved crash on enabling image contour It will be available in 5.0.1. 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/data/document.cxx|8 ++
sc/source/core/data/formulacell.cxx | 133
2 files changed, 141 insertions(+)
New commits:
commit f7e493229bd949066b4d8984dce7678b8687d1ae
Author: Eike Rathke er...@redhat.com
Date: Tue Aug 18 11:33:44 2015 +0200
Resolves: tdf#92749 invalidate lookup caches after initial hard recalc
... because the caches are not setup as listeners during when the
document's hard recalc state is active.
Change-Id: Ie7ec84ee64d046e3e55ce26b92824e94a2f660e9
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 7943fa5..b0b3aa3 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3780,6 +3780,14 @@ void ScDocument::CalcAll()
if (*it)
(*it)-CalcAll();
ClearFormulaTree();
+
+// In hard recalc state caches were not added as listeners, invalidate them
+// so the next non-CalcAll() normal lookup will not be presented with
+// outdated data.
+/* TODO: come up with more detailed hard recalc states so we can
+ * differentiate between hard recalc after load and others. */
+if (GetHardRecalcState())
+ClearLookupCaches();
}
void ScDocument::CompileAll()
commit a962d699b044ee1688e914873c72337fa6217619
Author: Eike Rathke er...@redhat.com
Date: Tue Aug 18 11:32:05 2015 +0200
add a simple formula cell calculation chain dumper
Change-Id: Ie6409724dcf0baa2f1d7dd62ed8d995f0374dbf1
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index c90ab3e..bfda996 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -70,6 +70,121 @@ using namespace formula;
IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
#endif
+#define DEBUG_CALCULATION 0
+#if DEBUG_CALCULATION
+static ScAddress aDebugCalculationTriggerAddress(1,2,0);// Sheet1.B3,
whatever you like
+
+struct DebugCalculationEntry
+{
+ ScAddress maPos;
+ OUString maResult;
+const ScDocument* mpDoc;
+
+DebugCalculationEntry( const ScAddress rPos, const ScDocument* pDoc ) :
+maPos(rPos),
+mpDoc(pDoc)
+{
+}
+};
+
+/** Debug/dump formula cell calculation chain.
+Either, somewhere set aDC.mbActive=true, or
+aDC.maTrigger=ScAddress(col,row,tab) of interest from where to start.
+This does not work for deep recursion MAXRECURSION, the results are
+somewhat.. funny.. ;)
+ */
+static struct DebugCalculation
+{
+std::vector DebugCalculationEntry mvPos;
+std::vector DebugCalculationEntry mvResults;
+ScAddress maTrigger;
+boolmbActive;
+boolmbSwitchOff;
+boolmbPrint;
+boolmbPrintResults;
+
+DebugCalculation() : mbActive(false), mbSwitchOff(false), mbPrint(true),
mbPrintResults(false) {}
+
+/** Print chain in encountered dependency order. */
+void print() const
+{
+for (auto const it : mvPos)
+{
+OUString aStr( it.maPos.Format( SCA_VALID | SCA_TAB_3D, it.mpDoc));
+fprintf( stderr, %s - , aStr.toUtf8().getStr());
+}
+fprintf( stderr, %s, END\n);
+}
+
+/** Print chain results. */
+void printResults() const
+{
+for (auto const it : mvResults)
+{
+OUString aStr( it.maPos.Format( SCA_VALID | SCA_TAB_3D, it.mpDoc));
+aStr += ( + it.maResult + );
+fprintf( stderr, %s, , aStr.toUtf8().getStr());
+}
+fprintf( stderr, %s, END\n);
+}
+
+void storeResult( const svl::SharedString rStr )
+{
+if (mbActive !mvPos.empty())
+mvPos.back().maResult = rStr.getString();
+}
+
+void storeResult( const double fVal )
+{
+if (mbActive !mvPos.empty())
+storeResult( rtl::math::doubleToUString( fVal,
rtl_math_StringFormat_G, 2, '.', true));
+}
+
+} aDC;
+
+struct DebugCalculationStacker
+{
+DebugCalculationStacker( const ScAddress rPos, const ScDocument* pDoc )
+{
+if (!aDC.mbActive rPos == aDC.maTrigger)
+aDC.mbActive = aDC.mbSwitchOff = true;
+if (aDC.mbActive)
+{
+aDC.mvPos.push_back( DebugCalculationEntry( rPos, pDoc));
+aDC.mbPrint = true;
+}
+}
+
+~DebugCalculationStacker()
+{
+if (aDC.mbActive)
+{
+if (!aDC.mvPos.empty())
+{
+if (aDC.mbPrint)
+{
+aDC.print();
+aDC.mbPrint = false;
+}
+if (aDC.mbPrintResults)
+{
+// Store results until final result is available,
reversing order.
+aDC.mvResults.push_back(
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/source
vcl/source/opengl/OpenGLHelper.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit dfac25d2300b56ee4594346a4b5ce8b083a5c782 Author: Tomaž Vajngerl tomaz.vajng...@collabora.co.uk Date: Fri Jul 3 14:38:24 2015 +0900 tdf#88831 fix inverted textures when OpenGL is enabled GLX returns a wrong value if the y coords are inverted. Most other programs don't even ask for this (gnome-shell for example) and just assumes true (and this works because most relevant X servers work like this). We make this more robust and assume true only if the returned value is GLX_DONT_CARE (-1). (cherry picked from commit f7f0486376adbabf3ea66bfd8a7b692c335ec3c8) Change-Id: I4800b3364fd00f5f4a8f5a459472bfa8d97827ba Reviewed-on: https://gerrit.libreoffice.org/17707 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index c71380e..6387192 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -507,7 +507,11 @@ GLXFBConfig OpenGLHelper::GetPixmapFBConfig( Display* pDisplay, bool bInverted } glXGetFBConfigAttrib( pDisplay, aFbConfigs[i], GLX_Y_INVERTED_EXT, nValue ); -bInverted = (nValue == True) ? true : false; + +// Looks like that X sends GLX_DONT_CARE but this usually means true for most +// of the X implementations. Investigation on internet pointed that this could be +// safely true all the time (for example gnome-shell always assumes true). +bInverted = nValue == True || nValue == int(GLX_DONT_CARE); break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Haskell UNO Language Binding - Weekly Report 12
Hi, The past week I improved the code generation so that all the required code is generated and manual modifications are not needed to make the examples work. Moreover, the issue with UNO interfaces was also fixed, and I made conversion for more UNO types. 'Any' values are handled better (conversion from/to binary UNO to/from Haskell), but this work is not complete yet. Also, I updated the examples so that all code compiles and runs. Another thing that I tried to do was to extract the configuration code from the examples to 'hs-uno'. However, the examples would require the latest Cabal version, which isn't yet on Hackage. For this week, I'll write a bit of documentation (about the infrastructure of this project, and how to use it), I'll add more examples, and I'll keep improving the conversion of data between UNO and Haskell. Kind regards, Jorge ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 92347] unknown software exception 0xc0000005 at address 0x7d6110e8
https://bugs.documentfoundation.org/show_bug.cgi?id=92347 s...@abma.de changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID --- Comment #5 from s...@abma.de --- sorry, i don't think i'll find a way to reproduce exact this/these crashes. if i find one, i'll create a new report. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93504] GUI: CALC: missing toggle box for grouped columns/lines
https://bugs.documentfoundation.org/show_bug.cgi?id=93504 Reinhard Gimbel reinh...@dragonfly7.de changed: What|Removed |Added CC||reinh...@dragonfly7.de Hardware|Other |All -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93506] New: Crash when selecting chart containing a trend line
https://bugs.documentfoundation.org/show_bug.cgi?id=93506 Bug ID: 93506 Summary: Crash when selecting chart containing a trend line Product: LibreOffice Version: 5.1.0.0.alpha0+ Master Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Chart Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: jumbo4...@yahoo.fr Created attachment 117989 -- https://bugs.documentfoundation.org/attachment.cgi?id=117989action=edit Console output during crash Description: crash when you select a chart containing a trend line. The file must have been previously saved (just saved, or opened). Steps to reproduce: 1. Create a XY chart with a trend line 2. Save 3. Click on chart Actual behavior: Crash -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93506] Crash when selecting chart containing a trend line
https://bugs.documentfoundation.org/show_bug.cgi?id=93506 Laurent BP jumbo4...@yahoo.fr changed: What|Removed |Added Attachment #117990|text/plain |application/vnd.oasis.opend mime type||ocument.spreadsheet -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93506] Crash when selecting chart containing a trend line
https://bugs.documentfoundation.org/show_bug.cgi?id=93506 --- Comment #1 from Laurent BP jumbo4...@yahoo.fr --- Created attachment 117990 -- https://bugs.documentfoundation.org/attachment.cgi?id=117990action=edit Test file containing a chart with a trend line Other way to reproduce crash: 1. Open attached file 2. Select chart Note: no crash if chart does not contain trend line -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sw/source
sw/source/core/view/viewsh.cxx | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 222f10e773ba51a19880be1b798990260c198147
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Aug 18 09:59:46 2015 +0200
tdf#93096 sw: fix selection with keyboard outside current view
Regression from commit c9175a1bd3249ad573ae6827bf19963a3ebe2fbc
(SwViewShell::ImplEndAction: avoid direct PaintDesktop(), 2015-07-03),
the problem is that while going via InvalidateWindows() is fine for the
double-buffering case, it has side effects when painting directly, so
revert back to the old code in that case.
Change-Id: Ib1e3b143f5cfe2c6ab8b102a1a2064900282f136
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 80aa194..4f8edf7 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -405,7 +405,25 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
}
if ( bPaint )
{
-InvalidateWindows(aRect.SVRect());
+if (GetWin() GetWin()-SupportsDoubleBuffering())
+InvalidateWindows(aRect.SVRect());
+else
+{
+// #i75172# begin DrawingLayer paint
+// need to do begin/end DrawingLayer preparation
for each single rectangle of the
+// repaint region. I already tried to prepare only
once for the whole Region. This
+// seems to work (and does technically) but fails
with transparent objects. Since the
+// region given to BeginDarwLayers() defines the
clip region for DrawingLayer paint,
+// transparent objects in the single rectangles
will indeed be painted multiple times.
+DLPrePaint2(vcl::Region(aRect.SVRect()));
+
+if ( bPaintsFromSystem )
+PaintDesktop(*GetOut(), aRect);
+
pCurrentLayout-GetCurrShell()-InvalidateWindows(aRect.SVRect());
+
+// #i75172# end DrawingLayer paint
+DLPostPaint2(true);
+}
}
else
lcl_PaintTransparentFormControls(*this, aRect); //
i#107365
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa vcl/source
sw/qa/core/data/ooxml/pass/tdf93284.docx |binary
vcl/source/filter/wmf/winmtf.cxx |6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9dd9208d54d64eb53d95853af725712229d41fad
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Aug 17 09:13:12 2015 +0200
tdf#93284 vcl: fix VirtualDevice leaks in the WMF filter
We attempted to have 8884 VirtualDevices in parallel. This number is now
12 after fixing the leaks.
The original bugdoc has 135 images, 76 is enough to make Writer on
Windows crash. The minimized document has the same WMF data for all the
images, but still duplicated inside the ZIP container, so we trigger the
resource limit, but the document is still just 99K.
Change-Id: I4c6b3853eaf688302323daf67ff7b62dd64fc412
(cherry picked from commit 047ebb1dadcc0219a268455f74fc03a23aa3d86d)
Reviewed-on: https://gerrit.libreoffice.org/17825
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/core/data/ooxml/pass/tdf93284.docx
b/sw/qa/core/data/ooxml/pass/tdf93284.docx
new file mode 100755
index 000..aedc026
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/tdf93284.docx differ
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 20e2b5c..c5d1cf9 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -236,7 +236,7 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW rFont )
{
// #i117968# VirtualDevice is not thread safe, but filter is used in
multithreading
SolarMutexGuard aGuard;
-VclPtrInstance VirtualDevice pVDev;
+ScopedVclPtrInstance VirtualDevice pVDev;
// converting the cell height into a font height
aFont.SetSize( aFontSize );
pVDev-SetFont( aFont );
@@ -1451,7 +1451,7 @@ void WinMtfOutput::DrawText( Point rPosition, OUString
rText, long* pDXArry, b
{
// #i117968# VirtualDevice is not thread safe, but filter is used in
multithreading
SolarMutexGuard aGuard;
-VclPtrInstance VirtualDevice pVDev;
+ScopedVclPtrInstance VirtualDevice pVDev;
sal_Int32 nTextWidth;
pVDev-SetMapMode( MapMode( MAP_100TH_MM ) );
pVDev-SetFont( maFont );
@@ -1499,7 +1499,7 @@ void WinMtfOutput::DrawText( Point rPosition, OUString
rText, long* pDXArry, b
{
// #i117968# VirtualDevice is not thread safe, but filter is used
in multithreading
SolarMutexGuard aGuard;
-VclPtrInstance VirtualDevice pVDev;
+ScopedVclPtrInstance VirtualDevice pVDev;
pDX = new long[ rText.getLength() ];
pVDev-SetMapMode( MAP_100TH_MM );
pVDev-SetFont( maLatestFont );
___
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/source
sw/source/core/txtnode/thints.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3c6cdfe08420eefaa97d957c3908daf76b14e684
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Jul 29 09:08:00 2015 +0200
tdf#89954 sw: let annotation have CH_TXTATR_INWORD placeholder again
Regression from commit 0761f81643a6890457e9ef7d913ab5c88c2593a4 (123792:
complete annotations on text ranges feature, 2013-12-19), the problem
was that while sw wanted CH_TXTATR_INWORD as a placeholder character for
anchor positions that do not count as a word boundary, the commit
changed GetCharOfTextAttr() so that annotations have CH_TXTATR_BREAKWORD
as the placeholder.
Fix the problem by reverting the last hunk of
sw/source/core/txtnode/thints.cxx changes in that commit.
(cherry picked from commit 89d615360e80a13fff6bc69885e5780d8fedf149,
testcase not backported as libreoffice-4-4 does not have LOK editing API
yet)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
Change-Id: Ia8c97efda9c1e90ae3c27ddb8247e3f3203a63fb
Reviewed-on: https://gerrit.libreoffice.org/17826
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index a03b391a7..d05efb0 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -3443,6 +3443,7 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr rAttr )
{
case RES_TXTATR_REFMARK:
case RES_TXTATR_TOXMARK:
+case RES_TXTATR_ANNOTATION:
cRet = CH_TXTATR_INWORD;
break;
@@ -3451,7 +3452,6 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr rAttr )
case RES_TXTATR_FTN:
case RES_TXTATR_META:
case RES_TXTATR_METAFIELD:
-case RES_TXTATR_ANNOTATION:
{
cRet = CH_TXTATR_BREAKWORD;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - svx/source
svx/source/dialog/_contdlg.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 0464718dfe7401bc7e19e76226b9a1fe74c68a9e
Author: Szymon KÅos eszka...@gmail.com
Date: Fri Aug 14 12:42:58 2015 +0200
tdf#93102 : resolved crash on enabling image contour
Change-Id: I59a07a62573b8d472d15f8594473e8e8d1077589
Reviewed-on: https://gerrit.libreoffice.org/17758
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Michael Meeks michael.me...@collabora.com
Reviewed-on: https://gerrit.libreoffice.org/17827
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 3426ea3..47e783a 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -299,6 +299,8 @@ SvxSuperContourDlg::~SvxSuperContourDlg()
void SvxSuperContourDlg::dispose()
{
+m_pContourWnd-SetUpdateLink( Link() );
+
SvtMiscOptions aMiscOptions;
aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
m_pContourWnd.disposeAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93493] CRASH when File - Close after style update in Writer document
https://bugs.documentfoundation.org/show_bug.cgi?id=93493 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Summary|CRASH when File - Close|CRASH when File - Close ||after style update in ||Writer document --- Comment #2 from Alex Thurgood ipla...@yahoo.co.uk --- Please also tell us which version of OSX you are using -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93508] New: crash when sorting cells
https://bugs.documentfoundation.org/show_bug.cgi?id=93508 Bug ID: 93508 Summary: crash when sorting cells Product: LibreOffice Version: 4.4.5.2 release Hardware: Other OS: All Status: UNCONFIRMED Severity: major Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: s...@abma.de Created attachment 117993 -- https://bugs.documentfoundation.org/attachment.cgi?id=117993action=edit locrash.ods when sorting in the attached document by key b, libreoffice crashes. to reproduce: 1. open document 2. select column 3-201 3. click data - sort 4. select row b as sort key 5. ok - crash -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82504] EDITING: Background color button should fill cell background and not paragraph color when in a cell (proposed solution in comment #12)
https://bugs.documentfoundation.org/show_bug.cgi?id=82504 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Component|ux-advise |Writer Summary|EDITING: Background color |EDITING: Background color |button should fill cell |button should fill cell |background and not |background and not |paragraph color when in a |paragraph color when in a |cell|cell (proposed solution in ||comment #12) --- Comment #18 from Cor Nouws c...@nouenoff.nl --- Hi Norbert, Thanks for posting that information here and for reminding that.. (In reply to Norbert X from comment #17) So please confirm this bug. For me it seems that priority should be Normal. The bug is confirmed, proposed solution in comment #12. So I'll change settings accordingly. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 82504] EDITING: Background color button should fill cell background and not paragraph color when in a cell (proposed solution in comment #12)
https://bugs.documentfoundation.org/show_bug.cgi?id=82504 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Component|ux-advise |Writer Summary|EDITING: Background color |EDITING: Background color |button should fill cell |button should fill cell |background and not |background and not |paragraph color when in a |paragraph color when in a |cell|cell (proposed solution in ||comment #12) --- Comment #18 from Cor Nouws c...@nouenoff.nl --- Hi Norbert, Thanks for posting that information here and for reminding that.. (In reply to Norbert X from comment #17) So please confirm this bug. For me it seems that priority should be Normal. The bug is confirmed, proposed solution in comment #12. So I'll change settings accordingly. -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 56173] FILESAVE impossible for password protected shared .ods
https://bugs.documentfoundation.org/show_bug.cgi?id=56173 gallz gall.zoltan...@gmail.com changed: What|Removed |Added Keywords||security -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93102] Crash on enabling image contour
https://bugs.documentfoundation.org/show_bug.cgi?id=93102 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Blocks||91310 Resolution|--- |FIXED --- Comment #10 from Michael Meeks michael.me...@collabora.com --- Thanks Szymon ! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 91310] [META] Fallout from VclPtr merge
https://bugs.documentfoundation.org/show_bug.cgi?id=91310 Bug 91310 depends on bug 93102, which changed state. Bug 93102 Summary: Crash on enabling image contour https://bugs.documentfoundation.org/show_bug.cgi?id=93102 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 91310] [META] Fallout from VclPtr merge
https://bugs.documentfoundation.org/show_bug.cgi?id=91310 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on||93102 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - include/oox oox/source
include/oox/export/shapes.hxx |1 +
oox/source/export/shapes.cxx | 15 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit c32709bac2b729572a96242cb8aa9026598dc269
Author: Sushil Shinde sushil.shi...@synerzip.com
Date: Tue Mar 3 19:14:25 2015 +0530
tdf#89806 : Fixed background fill export for table cell.
1. Table cell properties were exproted empty if file
saved as .pptx file.
2. Now added code to export table cell fill properties
in 'tcPr'(Table cell properties xml tag)
Reviewed-on: https://gerrit.libreoffice.org/14734
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
(cherry picked from commit 63442ec636d637e05d7d585817df531dbbeb96d9)
Conflicts:
sd/qa/unit/export-tests.cxx
Change-Id: Ica6005a65c7eefb8629c808f2a54764f98badb11
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index bfc0cab..c94be84 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -158,6 +158,7 @@ public:
void WriteTable( ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape rXShape );
+void WriteTableCellProperties(::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape rShape );
sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape rShape, ::oox::core::XmlFilterBase* pFB );
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index a324d27..9d54b44 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -985,7 +985,9 @@ void ShapeExport::WriteTable( Reference XShape rXShape )
WriteTextBox( xCell, XML_a );
-mpFS-singleElementNS( XML_a, XML_tcPr, FSEND );
+Reference XPropertySet xCellPropSet(xCell,
UNO_QUERY_THROW);
+WriteTableCellProperties(xCellPropSet);
+
mpFS-endElementNS( XML_a, XML_tc );
}
}
@@ -1000,6 +1002,17 @@ void ShapeExport::WriteTable( Reference XShape
rXShape )
mpFS-endElementNS( XML_a, XML_graphic );
}
+void ShapeExport::WriteTableCellProperties(Reference XPropertySet
xCellPropSet)
+{
+mpFS-startElementNS( XML_a, XML_tcPr, FSEND );
+// Write background fill for table cell.
+DrawingML::WriteFill(xCellPropSet);
+// TODO
+// tcW : Table cell width
+// tcBorders : Table cell border values.
+mpFS-endElementNS( XML_a, XML_tcPr );
+}
+
ShapeExport ShapeExport::WriteTableShape( Reference XShape xShape )
{
FSHelperPtr pFS = GetFS();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - sw/source
sw/source/filter/ww8/ww8scan.cxx | 18 +-
sw/source/filter/ww8/ww8scan.hxx |4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 570ad4544297bc110245032eae972f0628abba26
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 13 10:58:06 2015 +0100
convert pStatus to vector and use at to check offsets
Change-Id: I5186f6a65bb9d5ed8a0d1ab1d71f7e2c13865411
(cherry picked from commit ea70088895ed45dc60abf18319acc1b4fa3018dd)
Reviewed-on: https://gerrit.libreoffice.org/17694
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index c97db22..5895568 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3988,7 +3988,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream rStrm, sal_uInt32
nStart, sal_Int32 nLen
}
WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTableSt, const WW8Fib rFib)
-: WW8PLCFx(rFib.GetFIBVersion(), false), pStatus(0), nIsEnd(0),
nBookmarkId(1)
+: WW8PLCFx(rFib.GetFIBVersion(), false), nIsEnd(0), nBookmarkId(1)
{
if( !rFib.fcPlcfbkf || !rFib.lcbPlcfbkf || !rFib.fcPlcfbkl ||
!rFib.lcbPlcfbkl || !rFib.fcSttbfbkmk || !rFib.lcbSttbfbkmk )
@@ -4013,14 +4013,12 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTableSt, const
WW8Fib rFib)
nIMax = pBook[0]-GetIMax();
if( pBook[1]-GetIMax() nIMax )
nIMax = pBook[1]-GetIMax();
-pStatus = new eBookStatus[ nIMax ];
-memset( pStatus, 0, nIMax * sizeof( eBookStatus ) );
+aStatus.resize(nIMax);
}
}
WW8PLCFx_Book::~WW8PLCFx_Book()
{
-delete[] pStatus;
delete pBook[1];
delete pBook[0];
}
@@ -4138,18 +4136,20 @@ long WW8PLCFx_Book::GetLen() const
return nNum;
}
-void WW8PLCFx_Book::SetStatus(sal_uInt16 nIndex, eBookStatus eStat )
+void WW8PLCFx_Book::SetStatus(sal_uInt16 nIndex, eBookStatus eStat)
{
-OSL_ENSURE(nIndex nIMax, set status of non existing bookmark!);
-pStatus[nIndex] = (eBookStatus)( pStatus[nIndex] | eStat );
+SAL_WARN_IF(nIndex = nIMax, sw.ww8,
+bookmark index nIndex invalid);
+eBookStatus eStatus = aStatus.at(nIndex);
+aStatus[nIndex] = static_casteBookStatus(eStatus | eStat);
}
eBookStatus WW8PLCFx_Book::GetStatus() const
{
-if( !pStatus )
+if (aStatus.empty())
return BOOK_NORMAL;
long nEndIdx = GetHandle();
-return ( nEndIdx nIMax ) ? pStatus[nEndIdx] : BOOK_NORMAL;
+return ( nEndIdx nIMax ) ? aStatus[nEndIdx] : BOOK_NORMAL;
}
long WW8PLCFx_Book::GetHandle() const
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 678482f..57ccae3 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -724,8 +724,8 @@ class WW8PLCFx_Book : public WW8PLCFx
{
private:
WW8PLCFspecial* pBook[2]; // Start and End Position
-::std::vectorOUString aBookNames; // Name
-eBookStatus* pStatus;
+std::vectorOUString aBookNames; // Name
+std::vectoreBookStatus aStatus;
long nIMax; // Number of Booknotes
sal_uInt16 nIsEnd;
sal_Int32 nBookmarkId; // counter incremented by GetUniqueBookmarkName.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBParser2k.cpp | 33 -
src/lib/MSPUBParser2k.h |2 ++
2 files changed, 34 insertions(+), 1 deletion(-)
New commits:
commit 98de8427131ba3203f38739a86c9af6e81367644
Author: David Tardon dtar...@redhat.com
Date: Tue Aug 18 12:13:54 2015 +0200
afl: avoid stack overflow
Change-Id: I920e3ef946e415aec3554fbb852d95f596e31405
diff --git a/src/lib/MSPUBParser2k.cpp b/src/lib/MSPUBParser2k.cpp
index 3f2aaf3..c0c7413 100644
--- a/src/lib/MSPUBParser2k.cpp
+++ b/src/lib/MSPUBParser2k.cpp
@@ -22,11 +22,35 @@
namespace libmspub
{
+namespace
+{
+
+class ChunkNestingGuard
+{
+public:
+ ChunkNestingGuard(std::dequeunsigned chunks, const unsigned seqNum)
+: m_chunks(chunks)
+ {
+m_chunks.push_front(seqNum);
+ }
+
+ ~ChunkNestingGuard()
+ {
+m_chunks.pop_front();
+ }
+
+private:
+ std::dequeunsigned m_chunks;
+};
+
+}
+
MSPUBParser2k::MSPUBParser2k(librevenge::RVNGInputStream *input,
MSPUBCollector *collector)
: MSPUBParser(input, collector),
m_imageDataChunkIndices(),
m_quillColorEntries(),
-m_chunkChildIndicesById()
+m_chunkChildIndicesById(),
+m_chunksBeingRead()
{
}
@@ -479,6 +503,13 @@ void
MSPUBParser2k::parseShapeRotation(librevenge::RVNGInputStream *input, bool
bool MSPUBParser2k::parse2kShapeChunk(const ContentChunkReference chunk,
librevenge::RVNGInputStream *input,
boost::optionalunsigned pageSeqNum,
bool topLevelCall)
{
+ if (find(m_chunksBeingRead.begin(), m_chunksBeingRead.end(), chunk.seqNum)
!= m_chunksBeingRead.end())
+ {
+MSPUB_DEBUG_MSG((chunk %u is nested in itself, chunk.seqNum));
+return false;
+ }
+ const ChunkNestingGuard guard(m_chunksBeingRead, chunk.seqNum);
+
unsigned page = pageSeqNum.get_value_or(chunk.parentSeqNum);
input-seek(chunk.offset, librevenge::RVNG_SEEK_SET);
if (topLevelCall)
diff --git a/src/lib/MSPUBParser2k.h b/src/lib/MSPUBParser2k.h
index f50e365..0d0ec57 100644
--- a/src/lib/MSPUBParser2k.h
+++ b/src/lib/MSPUBParser2k.h
@@ -10,6 +10,7 @@
#ifndef __MSPUBPARSER2K_H__
#define __MSPUBPARSER2K_H__
+#include deque
#include vector
#include map
@@ -25,6 +26,7 @@ class MSPUBParser2k : public MSPUBParser
std::vectorunsigned m_imageDataChunkIndices;
std::vectorunsigned m_quillColorEntries;
std::mapunsigned, std::vectorunsigned m_chunkChildIndicesById;
+ std::dequeunsigned m_chunksBeingRead;
protected:
// helper functions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-ux-advise] [Bug 82504] EDITING: Background color button should fill cell background and not paragraph color when in a cell
https://bugs.documentfoundation.org/show_bug.cgi?id=82504 Norbert X nrb...@gmail.com changed: What|Removed |Added CC||nrb...@gmail.com --- Comment #17 from Norbert X nrb...@gmail.com --- Created attachment 117994 -- https://bugs.documentfoundation.org/attachment.cgi?id=117994action=edit Screenshots to demonstrate cell background bug Dear all. I have the same problem. I was going to report new bug and went to this report. I reported a bug to Ubuntu Launchpad (https://bugs.launchpad.net/bugs/1485955) too. Here are my bug report and screenshots. Steps to reproduce: 1. Launch LibreOffice Writer 2. Insert table to the new document (Table - Insert - Table) 3. Write some multirow text in table cells 4. Try to change cell background: 4.1. place cursor on desired cell 4.2. select color from palette from Background Color drop-down (located on Table toolbar). 4.3. click Background Color button on Table toolbar. Expected results: background color of TABLE CELL (where cursor was) is changed to desired color. Actual results: background color of TEXT PARAGRAPH (where cursor was) is changed to desired color. Workaround: There is slow non-intuitive background - select whole cell, select color from palette from Background Color drop-down (located on Table toolbar), click Background Color button on Table toolbar. Affected versions: LibreOffice 3.5.7.2 Build ID: 350m1(Build:2) = pre-installed Ubuntu 12.04.5 LTS version; LibreOffice 4.2.7.2 Build ID: 420m0(Build:2) = pre-installed Ubuntu 14.04.2 LTS version; LibreOffice 4.4.2.2 Build ID: 40m0(Build:2) = pre-installed Ubuntu 15.04 version. Comment: I can't believe how this bug is possible. It is inherited from OO.org (I saw it on OO.org 3.2 in Ubuntu 10.04.4 LTS too). Microsoft Word 2003 and 2007 of course have normal behaviour with cell background. I attached pdf document with screenshots. Bug exists in LibO 5 too. So please confirm this bug. For me it seems that priority should be Normal. This is a very often used functionality. Thank you! -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-ux-advise] [Bug 82504] EDITING: Background color button should fill cell background and not paragraph color when in a cell
https://bugs.documentfoundation.org/show_bug.cgi?id=82504 Norbert X nrb...@gmail.com changed: What|Removed |Added See Also||https://launchpad.net/bugs/ ||1485955 -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/win
vcl/win/source/gdi/winlayout.cxx | 41 +--
1 file changed, 23 insertions(+), 18 deletions(-)
New commits:
commit 35f9d5f84c7d1a5058a7908bc68a6f127471e82d
Author: Tor Lillqvist t...@collabora.com
Date: Tue Aug 18 13:43:27 2015 +0300
More hacking on OpenGL glyph caching on Windows
Now text looks better, for instance the lower-case t glyphs on the
Start Centre aren't totally weird any more. But for instance the tip
of the hook of j leaks into the i texture. I guess I really would
need to render glyphs one by one.
Change-Id: I69ae2d2f7c559530bcfdfc1a4915503fcb3ab4af
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index e32b8b5..0ab9cd9 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -204,7 +204,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout rLayou
if (nGlyphIndex == DROPPED_OUTGLYPH)
return true;
-SAL_INFO(vcl.gdi.opengl, AddChunkOfGlyphs this
nGlyphIndex old: maOpenGLGlyphCache);
+SAL_INFO(vcl.gdi.opengl, this= this nGlyphIndex old:
maOpenGLGlyphCache);
auto n = maOpenGLGlyphCache.begin();
while (n != maOpenGLGlyphCache.end()
@@ -262,12 +262,32 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout rLayou
return false;
}
+std::vectorABC aABC(nCount);
+if (!GetCharABCWidthsI(hDC, 0, nCount, aGlyphIndices.data(), aABC.data()))
+{
+SAL_WARN(vcl.gdi, GetCharABCWidthsI failed:
WindowsErrorString(GetLastError()));
+return false;
+}
+
+for (int i = 0; i nCount; i++)
+std::cerr aABC[i].abcA : aABC[i].abcB :
aABC[i].abcC ;
+std::cerr std::endl;
+
+// Avoid kerning as we want to be able to use individual rectangles for
each glyph
+std::vectorint aDX(nCount);
+int totWidth = 0;
+for (int i = 0; i nCount; i++)
+{
+aDX[i] = std::abs(aABC[i].abcA) + aABC[i].abcB +
std::abs(aABC[i].abcC);
+totWidth += aDX[i];
+}
+
if (SelectObject(hDC, hOrigFont) == NULL)
SAL_WARN(vcl.gdi, SelectObject failed:
WindowsErrorString(GetLastError()));
if (!DeleteDC(hDC))
SAL_WARN(vcl.gdi, DeleteDC failed:
WindowsErrorString(GetLastError()));
-OpenGLCompatibleDC aDC(rGraphics, 0, 0, aSize.cx, aSize.cy);
+OpenGLCompatibleDC aDC(rGraphics, 0, 0, totWidth, aSize.cy);
hOrigFont = SelectFont(aDC.getCompatibleHDC(), rLayout.mhFont);
if (hOrigFont == NULL)
@@ -279,21 +299,6 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout rLayou
SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
-std::vectorABC aABC(nCount);
-if (!GetCharABCWidthsI(aDC.getCompatibleHDC(), 0, nCount,
aGlyphIndices.data(), aABC.data()))
-{
-SAL_WARN(vcl.gdi, GetCharABCWidthsI failed:
WindowsErrorString(GetLastError()));
-return false;
-}
-
-for (int i = 0; i nCount; i++)
-std::cerr aABC[i].abcA : aABC[i].abcB :
aABC[i].abcC ;
-std::cerr std::endl;
-
-// Avoid kerning as we want to be able to use individual rectangles for
each glyph
-std::vectorint aDX(nCount);
-for (int i = 0; i nCount; i++)
-aDX[i] = std::abs(aABC[i].abcA) + aABC[i].abcB +
std::abs(aABC[i].abcC);
if (!ExtTextOutW(aDC.getCompatibleHDC(), 0, 0, ETO_GLYPH_INDEX, NULL,
aGlyphIndices.data(), nCount, aDX.data()))
{
SAL_WARN(vcl.gdi, ExtTextOutW failed:
WindowsErrorString(GetLastError()));
@@ -317,7 +322,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex,
const WinLayout rLayou
SelectFont(aDC.getCompatibleHDC(), hOrigFont);
-SAL_INFO(vcl.gdi.opengl, AddChunkOfGlyphs this now:
maOpenGLGlyphCache DumpGlyphBitmap(aChunk, aDC.getCompatibleHDC()));
+SAL_INFO(vcl.gdi.opengl, this= this now:
maOpenGLGlyphCache DumpGlyphBitmap(aChunk, aDC.getCompatibleHDC()));
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/contnr/foldertree.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f54f99febd25b1c86e77747764375a2e53f572c5
Author: Caolán McNamara caol...@redhat.com
Date: Tue Aug 18 08:25:29 2015 +0100
coverity#1316521 Dereference null return value
Change-Id: I6ec19df7b84e3529ef00640560540fda445dc82e
diff --git a/svtools/source/contnr/foldertree.cxx
b/svtools/source/contnr/foldertree.cxx
index bc86533..acf54ac 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -92,12 +92,12 @@ void FolderTree::FillTreeEntry( const OUString rUrl,
const ::std::vector std:
if( pParent !IsExpanded( pParent ) )
{
-while( GetChildCount( pParent ) 0 )
+while (SvTreeListEntry* pChild = FirstChild(pParent))
{
-SvTreeListEntry* pChild = FirstChild( pParent );
-GetModel()-Remove( pChild );
+GetModel()-Remove(pChild);
}
+
for(::std::vector std::pair OUString, OUString ::const_iterator
it = rFolders.begin(); it != rFolders.end() ; ++it)
{
SvTreeListEntry* pNewEntry = InsertEntry( it-first, pParent, true
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source include/osl
avmedia/source/gstreamer/gstplayer.cxx |4 ++--
avmedia/source/vlc/vlcframegrabber.cxx |5 ++---
include/osl/conditn.hxx|4
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 26821b7e2eff4a7db22606f70daa3f3d442f7525
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 18 08:22:16 2015 +0200
tdf#84323: Make osl::Condition::wait more readable
Change-Id: Icd66ae1d390100549f903d45b2896cdcdca449be
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index eb64d1d..4282833 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -21,6 +21,7 @@
#include algorithm
#include cassert
+#include chrono
#include cstddef
#include cstring
#include map
@@ -854,11 +855,10 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
DBG( %p pre-Player::getPreferredPlayerWindowSize, member %d x %d, this,
mnWidth, mnHeight );
-TimeValue aTimeout = { 10, 0 };
#if OSL_DEBUG_LEVEL 2
osl::Condition::Result aResult =
#endif
- maSizeCondition.wait( aTimeout );
+ maSizeCondition.wait(
std::chrono::seconds(10) );
DBG( %p Player::getPreferredPlayerWindowSize after waitCondition %d,
member %d x %d, this, aResult, mnWidth, mnHeight );
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx
b/avmedia/source/vlc/vlcframegrabber.cxx
index 9783349..bb100c2 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -18,6 +18,7 @@
*/
#include boost/bind.hpp
+#include chrono
#include iostream
#include osl/conditn.hxx
#include vcl/graph.hxx
@@ -85,9 +86,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler eh,
const rtl::OUString
mPlayer.setTime( ( fMediaTime 0 ? fMediaTime : 0 ) * MSEC_IN_SEC );
mPlayer.pause();
-const TimeValue timeout = {2, 0};
-
-condition.wait(timeout);
+condition.wait(std::chrono::seconds(2));
if ( !mPlayer.hasVout() )
{
diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx
index 0859a14..8bb37e3 100644
--- a/include/osl/conditn.hxx
+++ b/include/osl/conditn.hxx
@@ -80,6 +80,10 @@ namespace osl
return (Result) osl_waitCondition(condition, pTimeout);
}
+#if defined LIBO_INTERNAL_ONLY
+Result wait(TimeValue const timeout) { return wait(timeout); }
+#endif
+
/** Checks if the condition is set without blocking.
*/
bool check()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 91946] Direct2D font rendering in Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=91946 --- Comment #1 from Adolfo Jayme f...@libreoffice.org --- Created attachment 117991 -- https://bugs.documentfoundation.org/attachment.cgi?id=117991action=edit Comparison between Direct2D (above) versus GDI+ (below): notice the smoother edges in D2D -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93503] New: LibraOffice 5
https://bugs.documentfoundation.org/show_bug.cgi?id=93503 Bug ID: 93503 Summary: LibraOffice 5 Product: LibreOffice Version: 5.0.0.5 release Hardware: x86 (IA32) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: sitaram.di...@gmail.com Libra Office 5 Writer keeps crashing. However the file is not lost but recovered on restarting. Windows XP SP3 Intel Pentium 4 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: i18npool/inc i18npool/qa i18npool/source
i18npool/inc/breakiteratorImpl.hxx |4 ++--
i18npool/inc/calendarImpl.hxx|4 ++--
i18npool/inc/cclass_unicode.hxx |4 ++--
i18npool/inc/characterclassificationImpl.hxx |4 ++--
i18npool/inc/collatorImpl.hxx|4 ++--
i18npool/inc/collator_unicode.hxx|4 ++--
i18npool/inc/defaultnumberingprovider.hxx|4 ++--
i18npool/inc/indexentrysupplier.hxx |4 ++--
i18npool/inc/indexentrysupplier_common.hxx |4 ++--
i18npool/inc/inputsequencechecker.hxx|4 ++--
i18npool/inc/localedata.hxx |4 ++--
i18npool/inc/nativenumbersupplier.hxx|4 ++--
i18npool/inc/numberformatcode.hxx|4 ++--
i18npool/inc/ordinalsuffix.hxx |4 ++--
i18npool/inc/textconversion.hxx |4 ++--
i18npool/inc/textconversionImpl.hxx |4 ++--
i18npool/inc/transliterationImpl.hxx |4 ++--
i18npool/inc/transliteration_commonclass.hxx |4 ++--
i18npool/inc/unoscripttypedetector.hxx |4 ++--
i18npool/qa/cppunit/test_breakiterator.cxx |1 -
i18npool/qa/cppunit/test_characterclassification.cxx |1 -
i18npool/qa/cppunit/test_textsearch.cxx |1 -
i18npool/source/localedata/LocaleNode.hxx|3 ---
i18npool/source/localedata/localedata.cxx|4 ++--
i18npool/source/localedata/saxparser.cxx |7 +++
i18npool/source/search/textsearch.hxx|4 ++--
26 files changed, 45 insertions(+), 52 deletions(-)
New commits:
commit 0a4c482a8aa2e421668a6607916c9656a3f18b19
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Aug 15 15:26:43 2015 +0900
i18npool: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: I0381de7fde198df74556355984bdaba2ecdedd4b
Reviewed-on: https://gerrit.libreoffice.org/17768
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/i18npool/inc/breakiteratorImpl.hxx
b/i18npool/inc/breakiteratorImpl.hxx
index f97133c..4dc6ee9 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -30,7 +30,7 @@
#include com/sun/star/i18n/CharacterIteratorMode.hpp
#include com/sun/star/i18n/CharType.hpp
#include com/sun/star/i18n/XLocaleData.hpp
-#include cppuhelper/implbase2.hxx
+#include cppuhelper/implbase.hxx
#include vector
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace
i18n {
// class BreakIterator
-class BreakIteratorImpl : public cppu::WeakImplHelper2
+class BreakIteratorImpl : public cppu::WeakImplHelper
XBreakIterator,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 0f67c1e..7d5964f 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -23,7 +23,7 @@
#include com/sun/star/i18n/CalendarDisplayCode.hpp
#include com/sun/star/i18n/CalendarFieldIndex.hpp
#include com/sun/star/i18n/CalendarDisplayIndex.hpp
-#include cppuhelper/implbase2.hxx
+#include cppuhelper/implbase.hxx
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/uno/XComponentContext.hpp
#include vector
@@ -34,7 +34,7 @@
namespace com { namespace sun { namespace star { namespace i18n {
-class CalendarImpl : public cppu::WeakImplHelper2
+class CalendarImpl : public cppu::WeakImplHelper
com::sun::star::i18n::XCalendar4,
com::sun::star::lang::XServiceInfo
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 3ff2aed..90f2c0e 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -22,7 +22,7 @@
#include com/sun/star/i18n/XNativeNumberSupplier.hpp
#include com/sun/star/i18n/XCharacterClassification.hpp
#include com/sun/star/i18n/XLocaleData4.hpp
-#include cppuhelper/implbase2.hxx
+#include cppuhelper/implbase.hxx
#include com/sun/star/lang/XServiceInfo.hpp
#include transliteration_body.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace
i18n {
typedef sal_uInt32 UPT_FLAG_TYPE;
-class cclass_Unicode : public cppu::WeakImplHelper2
XCharacterClassification, css::lang::XServiceInfo
+class cclass_Unicode : public cppu::WeakImplHelper XCharacterClassification,
css::lang::XServiceInfo
{
public:
cclass_Unicode(const com::sun::star::uno::Reference
com::sun::star::uno::XComponentContext rxContext );
diff --git a/i18npool/inc/characterclassificationImpl.hxx
b/i18npool/inc/characterclassificationImpl.hxx
index 59f84b7..091d7df 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -20,7 +20,7 @@
#define
[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 #28 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0a4c482a8aa2e421668a6607916c9656a3f18b19 i18npool: tdf#88206 replace cppu::WeakImplHelper* 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
[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 #27 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=370a26f7804d12da26abe007f1d80a00c4fdaeb4 hwpfilter: tdf#88206 replace cppu::WeakImplHelper* 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
[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/win
vcl/win/source/gdi/winlayout.cxx | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) New commits: commit 32b8b33273764c64515f7fdf97e369fed6406876 Author: Tor Lillqvist t...@collabora.com Date: Mon Aug 17 18:23:11 2015 +0300 Add FIXME comment and bin an #if 0 snippet Change-Id: I0bbea4ef62c8e94d8b8f1bfb440712da5839e532 diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 6f8b4ca..e32b8b5 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -1579,6 +1579,8 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics rGraphics) const pImpl-PreDraw(); +// FIXME: This code snippet is mostly copied from the one in +// UniscribeLayout::DrawTextImpl. Should be factored out. int nBaseClusterOffset = 0; int nBaseGlyphPos = -1; for( int nItem = 0; nItem mnItemCount; ++nItem ) @@ -1626,16 +1628,6 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics rGraphics) const pImpl-DrawMask(*rChunk.mpTexture, salColor, a2Rects); nAdvance += mpGlyphAdvances[i]; } -#if 0 -ScriptTextOut(hDC, rScriptCache, -aPos.X(), aPos.Y(), 0, NULL, -rVisualItem.mpScriptItem-a, NULL, 0, -mpOutGlyphs + nMinGlyphPos, -nEndGlyphPos - nMinGlyphPos, -mpGlyphAdvances + nMinGlyphPos, -mpJustifications ? mpJustifications + nMinGlyphPos : NULL, -mpGlyphOffsets + nMinGlyphPos); -#endif } pImpl-PostDraw(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93504] New: GUI: CALC: missing toggle box for grouped columns/lines
https://bugs.documentfoundation.org/show_bug.cgi?id=93504 Bug ID: 93504 Summary: GUI: CALC: missing toggle box for grouped columns/lines Product: LibreOffice Version: 5.0.0.5 release Hardware: Other OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: reinh...@dragonfly7.de Created attachment 117988 -- https://bugs.documentfoundation.org/attachment.cgi?id=117988action=edit screen shot showing the missing toggle boxes for grouped data I'm using LibO 5.0.0.5 under Ubuntu Linux 14.04.3 (unity) The toggle boxes (+/-) to expand/collapse grouped columns or lines are not shown. Workaround to collapse/hide: double-clicking the frame line Workaround to expand: marking area of interest including neighbourhood and context menu unhide Under Windows 10 this issue is not present (toggle box shown as usual) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93505] New: Crash when modifying trend line
https://bugs.documentfoundation.org/show_bug.cgi?id=93505 Bug ID: 93505 Summary: Crash when modifying trend line Product: LibreOffice Version: 5.1.0.0.alpha0+ Master Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Chart Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: jumbo4...@yahoo.fr Description: crash when modifying trend line Steps to reproduce: 1. Create a XY chart with one series 2. Right click on Data series point Insert Trend Line, OK 3. Select trend line, right click Format Trend Line 4. Modify something in dialog (type, checkbox, or Line property) 5. OK Actual behavior: crash -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: 3 commits - cppu/source filter/source io/source
cppu/source/threadpool/jobqueue.cxx | 22 ++---
cppu/source/threadpool/jobqueue.hxx |5 +---
cppu/source/threadpool/threadpool.cxx | 16 +++
cppu/source/threadpool/threadpool.hxx |7 --
filter/source/xsltfilter/XSLTFilter.cxx | 33 +++-
io/source/stm/opipe.cxx | 16 ++-
6 files changed, 41 insertions(+), 58 deletions(-)
New commits:
commit 6b7c23b3fb6175c04fcc3f1e12b34bedf5f4e5f8
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 18 08:15:56 2015 +0200
Some oslCondition - osl::Condition
Change-Id: Ib2c98db9ffd5871b6422c05f0230bbe27d1ba729
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 4315a99..5c8af3e 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -116,7 +116,7 @@ private:
bool m_bOutputStreamClosed;
bool m_bInputStreamClosed;
-oslCondition m_conditionBytesAvail;
+osl::Condition m_conditionBytesAvail;
Mutex m_mutexAccess;
I_FIFO *m_pFIFO;
};
@@ -131,12 +131,10 @@ OPipeImpl::OPipeImpl()
m_bInputStreamClosed= false;
m_pFIFO = new MemFIFO;
-m_conditionBytesAvail = osl_createCondition();
}
OPipeImpl::~OPipeImpl()
{
-osl_destroyCondition( m_conditionBytesAvail );
delete m_pFIFO;
}
@@ -164,7 +162,7 @@ sal_Int32 OPipeImpl::readBytes(Sequence sal_Int8 aData,
sal_Int32 nBytesToRe
if( nOccupiedBufferLen nBytesToRead )
{
// wait outside guarded section
-osl_resetCondition( m_conditionBytesAvail );
+m_conditionBytesAvail.reset();
}
else {
// necessary bytes are available
@@ -174,7 +172,7 @@ sal_Int32 OPipeImpl::readBytes(Sequence sal_Int8 aData,
sal_Int32 nBytesToRe
} // end guarded section
// wait for new data outside guarded section!
-osl_waitCondition( m_conditionBytesAvail , 0 );
+m_conditionBytesAvail.wait();
}
}
@@ -208,7 +206,7 @@ sal_Int32 OPipeImpl::readSomeBytes(Sequence sal_Int8
aData, sal_Int32 nMaxBy
}
}
-osl_waitCondition( m_conditionBytesAvail , 0 );
+m_conditionBytesAvail.wait();
}
}
@@ -268,7 +266,7 @@ void OPipeImpl::closeInput()
m_pFIFO = 0;
// readBytes may throw an exception
-osl_setCondition( m_conditionBytesAvail );
+m_conditionBytesAvail.set();
setSuccessor( Reference XConnectable () );
return;
@@ -334,7 +332,7 @@ void OPipeImpl::writeBytes(const Sequence sal_Int8
aData)
}
// readBytes may check again if enough bytes are available
-osl_setCondition( m_conditionBytesAvail );
+m_conditionBytesAvail.set();
}
@@ -355,7 +353,7 @@ void OPipeImpl::closeOutput()
MutexGuard guard( m_mutexAccess );
m_bOutputStreamClosed = true;
-osl_setCondition( m_conditionBytesAvail );
+m_conditionBytesAvail.set();
setPredecessor( Reference XConnectable () );
return;
}
commit 88f12d9c7e58a3465f4d9a50fafb9e47fe67c537
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 18 08:15:47 2015 +0200
Some oslCondition - osl::Condition
Change-Id: I57c10b14cd8a5ab821516575768891b66f834ca6
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx
b/filter/source/xsltfilter/XSLTFilter.cxx
index 95a514c..c9ba40a 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -24,7 +24,7 @@
#include sax/tools/documenthandleradapter.hxx
#include osl/time.h
-#include osl/conditn.h
+#include osl/conditn.hxx
#include rtl/strbuf.hxx
#include tools/urlobj.hxx
@@ -110,7 +110,7 @@ namespace XSLT
css::uno::Referencexslt::XXSLTTransformer m_tcontrol;
-oslCondition m_cTransformed;
+osl::Condition m_cTransformed;
bool m_bTerminated;
bool m_bError;
@@ -128,8 +128,6 @@ namespace XSLT
// ctor...
XSLTFilter(const css::uno::ReferenceXComponentContext r);
-virtual ~XSLTFilter();
-
// XStreamListener
virtual void SAL_CALL
error(const Any a) throw (RuntimeException, std::exception)
SAL_OVERRIDE;
@@ -162,14 +160,7 @@ namespace XSLT
XSLTFilter::XSLTFilter(const css::uno::ReferenceXComponentContext r):
m_xContext(r), m_bTerminated(false), m_bError(false)
-{
-m_cTransformed = osl_createCondition();
-}
-
-XSLTFilter::~XSLTFilter()
-{
-osl_destroyCondition(m_cTransformed);
-}
+{}
void
XSLTFilter::disposing(const EventObject) throw (RuntimeException,
std::exception)
@@ -233,7 +224,7 @@ namespace XSLT
void
XSLTFilter::started() throw (RuntimeException, std::exception)
{
-osl_resetCondition(m_cTransformed);
+m_cTransformed.reset();
}
void
XSLTFilter::error(const Any a) throw (RuntimeException, std::exception)
@@
[Libreoffice-bugs] [Bug 93064] START CENTER: Icon sizes in breeze cause help and extensions buttons not to be visible
https://bugs.documentfoundation.org/show_bug.cgi?id=93064 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Resolution|DUPLICATE |FIXED -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: cui/source
cui/source/inc/cuitabarea.hxx| 32 +-
cui/source/tabpages/tpshadow.cxx | 122 +++
2 files changed, 77 insertions(+), 77 deletions(-)
New commits:
commit d74271bec86e13beca09e5c5f2842efd45756d9c
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Aug 18 09:08:47 2015 +0200
cui: prefix members of SvxShadowTabPage
Change-Id: I68fa37f511c3eb7aec2bd2754afd1a47ac8d1e83
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index fe4fbbb..2216fb8 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -332,20 +332,20 @@ private:
VclPtrMetricFieldm_pMtrTransparent;
VclPtrSvxXShadowPreview m_pCtlXRectPreview;
-const SfxItemSet rOutAttrs;
-RECT_POINT eRP;
+const SfxItemSet m_rOutAttrs;
+RECT_POINT m_eRP;
-XColorListRef pColorList;
-ChangeType* pnColorListState;
-sal_uInt16 nPageType;
-sal_uInt16 nDlgType;
-bool* pbAreaTP;
+XColorListRef m_pColorList;
+ChangeType* m_pnColorListState;
+sal_uInt16 m_nPageType;
+sal_uInt16 m_nDlgType;
+bool* m_pbAreaTP;
-boolbDisable;
+boolm_bDisable;
-XFillAttrSetItemaXFillAttr;
-SfxItemSet rXFSet;
-SfxMapUnit ePoolUnit;
+XFillAttrSetItemm_aXFillAttr;
+SfxItemSet m_rXFSet;
+SfxMapUnit m_ePoolUnit;
DECL_LINK( ClickShadowHdl_Impl, void * );
DECL_LINK( ModifyShadowHdl_Impl, void * );
@@ -365,11 +365,11 @@ public:
virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP )
SAL_OVERRIDE;
-voidSetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
-voidSetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
-voidSetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
-voidSetAreaTP( bool* pIn ) { pbAreaTP = pIn; }
-voidSetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; }
+voidSetColorList( XColorListRef pColorList ) { m_pColorList =
pColorList; }
+voidSetPageType( sal_uInt16 nInType ) { m_nPageType = nInType; }
+voidSetDlgType( sal_uInt16 nInType ) { m_nDlgType = nInType; }
+voidSetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; }
+voidSetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
virtual void PageCreated(const SfxAllItemSet aSet) SAL_OVERRIDE;
};
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 2e49a73..327f33c 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -53,15 +53,15 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent,
const SfxItemSet rInA
ShadowTabPage,
cui/ui/shadowtabpage.ui,
rInAttrs ),
-rOutAttrs ( rInAttrs ),
-eRP ( RP_LT ),
-pnColorListState( 0 ),
-nPageType ( 0 ),
-nDlgType( 0 ),
-pbAreaTP( 0 ),
-bDisable( false ),
-aXFillAttr ( rInAttrs.GetPool() ),
-rXFSet ( aXFillAttr.GetItemSet() )
+m_rOutAttrs ( rInAttrs ),
+m_eRP ( RP_LT ),
+m_pnColorListState( 0 ),
+m_nPageType ( 0 ),
+m_nDlgType( 0 ),
+m_pbAreaTP( 0 ),
+m_bDisable( false ),
+m_aXFillAttr ( rInAttrs.GetPool() ),
+m_rXFSet ( m_aXFillAttr.GetItemSet() )
{
get(m_pTsbShowShadow,TSB_SHOW_SHADOW);
get(m_pGridShadow,gridSHADOW);
@@ -88,52 +88,52 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent,
const SfxItemSet rInA
SetFieldUnit( *m_pMtrDistance, eFUnit );
// determine PoolUnit
-SfxItemPool* pPool = rOutAttrs.GetPool();
+SfxItemPool* pPool = m_rOutAttrs.GetPool();
DBG_ASSERT( pPool, Wo ist der Pool? );
-ePoolUnit = pPool-GetMetric( SDRATTR_SHADOWXDIST );
+m_ePoolUnit = pPool-GetMetric( SDRATTR_SHADOWXDIST );
// setting the output device
drawing::FillStyle eXFS = drawing::FillStyle_SOLID;
-if( rOutAttrs.GetItemState( XATTR_FILLSTYLE ) != SfxItemState::DONTCARE )
+if( m_rOutAttrs.GetItemState( XATTR_FILLSTYLE ) != SfxItemState::DONTCARE )
{
-eXFS = (drawing::FillStyle) ( static_castconst XFillStyleItem(
rOutAttrs.
+eXFS = (drawing::FillStyle) ( static_castconst XFillStyleItem(
m_rOutAttrs.
Get( GetWhich( XATTR_FILLSTYLE ) )
).GetValue() );
switch( eXFS )
{
case drawing::FillStyle_SOLID:
-if( SfxItemState::DONTCARE != rOutAttrs.GetItemState(
XATTR_FILLCOLOR ) )
+if(
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - fpicker/source fpicker/uiconfig include/svtools svtools/source
fpicker/source/office/RemoteFilesDialog.cxx | 31 +---
fpicker/source/office/RemoteFilesDialog.hxx |3 +-
fpicker/uiconfig/ui/remotefilesdialog.ui| 17 +--
include/svtools/fileview.hxx|3 +-
svtools/source/contnr/fileview.cxx | 11 +++--
5 files changed, 46 insertions(+), 19 deletions(-)
New commits:
commit 910bdba989e09120faacafa050dfe187c68e4e2e
Author: Szymon KÅos eszka...@gmail.com
Date: Tue Aug 18 10:42:41 2015 +0200
RemoteFilesDialog: file name autocompletion
Change-Id: Iab051ccaf075cc91acce67e01863e8d7ecac820c
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index 402cd75..e8d25c6 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -183,7 +183,6 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent,
WinBits nBits )
get( m_pAddService_btn, add_service_btn );
get( m_pServices_lb, services_lb );
get( m_pFilter_lb, filter_lb );
-get( m_pName_ed, name_ed );
get( m_pNewFolder, new_folder );
m_eMode = ( nBits WB_SAVEAS ) ? REMOTEDLG_MODE_SAVE :
REMOTEDLG_MODE_OPEN;
@@ -194,6 +193,9 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent,
WinBits nBits )
m_bServiceChanged = false;
m_nCurrentFilter = LISTBOX_ENTRY_NOTFOUND;
+m_pName_ed = VclPtr AutocompleteEdit ::Create( get vcl::Window (
filename_container ) );
+m_pName_ed-Show();
+
m_pFilter_lb-Enable( false );
m_pName_ed-Enable( false );
@@ -1263,8 +1265,31 @@ void RemoteFilesDialog::UpdateControls( const OUString
rURL )
m_pTreeView-SetSelectHdl( Link() );
// read cached data for this url and fill the tree
-const ::std::vector std::pair OUString, OUString rFolders =
m_pFileView-GetSubFolders();
-m_pTreeView-FillTreeEntry( rURL, rFolders );
+const ::std::vector SvtContentEntry rFolders =
m_pFileView-GetContent();
+::std::vector std::pair OUString, OUString aFolders;
+
+m_pName_ed-ClearEntries();
+
+for( ::std::vector SvtContentEntry ::size_type i = 0; i
rFolders.size(); i++ )
+{
+int nTitleStart = rFolders[i].maURL.lastIndexOf( '/' );
+if( nTitleStart != -1 )
+{
+OUString sTitle( INetURLObject::decode(
+rFolders[i].maURL.copy( nTitleStart + 1 ),
+INetURLObject::DECODE_WITH_CHARSET ) );
+
+if( rFolders[i].mbIsFolder )
+{
+aFolders.push_back( std::pair OUString, OUString ( sTitle,
rFolders[i].maURL ) );
+}
+
+// add entries to the autocompletion mechanism
+m_pName_ed-AddEntry( sTitle );
+}
+}
+
+m_pTreeView-FillTreeEntry( rURL, aFolders );
m_pTreeView-SetSelectHdl( LINK( this, RemoteFilesDialog, TreeSelectHdl )
);
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx
b/fpicker/source/office/RemoteFilesDialog.hxx
index 4fe1188..bb0abaa 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -12,6 +12,7 @@
#include comphelper/docpasswordrequest.hxx
+#include svtools/autocmpledit.hxx
#include svtools/foldertree.hxx
#include svtools/place.hxx
#include svtools/PlaceEditDialog.hxx
@@ -156,7 +157,7 @@ private:
VclPtr SvtFileView m_pFileView;
VclPtr FileViewContainer m_pContainer;
VclPtr ListBox m_pFilter_lb;
-VclPtr Edit m_pName_ed;
+VclPtr AutocompleteEdit m_pName_ed;
PopupMenu* m_pAddMenu;
ImageList m_aImages;
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui
b/fpicker/uiconfig/ui/remotefilesdialog.ui
index e0699a5..7859348 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -234,26 +234,29 @@
/packing
/child
child
- object class=GtkEntry id=name_ed
+ object class=GtkComboBox id=filter_lb
+property name=width_request200/property
property name=visibleTrue/property
-property name=can_focusTrue/property
+property name=can_focusFalse/property
property name=hexpandTrue/property
/object
packing
property name=left_attach1/property
-property name=top_attach1/property
+property name=top_attach0/property
/packing
/child
child
- object class=GtkComboBox id=filter_lb
-property name=width_request200/property
+ object class=GtkBox id=filename_container
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=hexpandTrue/property
+property name=orientationvertical/property
+
[Libreoffice-bugs] [Bug 46817] Screen font anti-aliasing does not work (Windows)
https://bugs.documentfoundation.org/show_bug.cgi?id=46817 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Depends on||91946 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 91946] Direct2D font rendering in Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=91946 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Blocks||46817 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav/ContentProperties.cxx | 11 +--
ucb/source/ucp/webdav/ContentProperties.hxx |3 ---
ucb/source/ucp/webdav/webdavcontent.cxx |8
3 files changed, 5 insertions(+), 17 deletions(-)
New commits:
commit 482f0517083d13b3efb7d367b2f1f7a792fc6e47
Author: Giuseppe Castagno giuseppe.casta...@acca-esse.eu
Date: Mon Aug 17 16:39:46 2015 +0200
cppcheck:noExplicitConstructor in webdav, serf version
Explicitly add constructors that where previously hidden.
The right implementation of what I did
in aade7198d72bc4ddb18f10729b89f0435e6ca197.
The explict keyword was added in 6343754e310a589cb49e2a1da0cd68472571179d
Change-Id: I66f6ee51c8b51d93d6ac673e7e13024e4b48
Reviewed-on: https://gerrit.libreoffice.org/17823
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Stephan Bergmann sberg...@redhat.com
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx
b/ucb/source/ucp/webdav/ContentProperties.cxx
index 5069ef9..0d5e074 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -591,11 +591,6 @@ CachableContentProperties::CachableContentProperties(
addProperties( rProps );
}
-CachableContentProperties::CachableContentProperties(
- const DAVResource rResource )
-{
-addProperties( rResource );
-}
void CachableContentProperties::addProperties(
const ContentProperties rProps )
@@ -616,6 +611,7 @@ void CachableContentProperties::addProperties(
}
}
+
void CachableContentProperties::addProperties(
const std::vector DAVPropertyValue rProps )
{
@@ -631,9 +627,4 @@ void CachableContentProperties::addProperties(
}
}
-void CachableContentProperties::addProperties( const DAVResource rResource )
-{
-addProperties( rResource.properties );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx
b/ucb/source/ucp/webdav/ContentProperties.hxx
index 7929b39..daf3f47 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -173,15 +173,12 @@ private:
CachableContentProperties( const CachableContentProperties ); // n.i.
public:
-explicit CachableContentProperties( const DAVResource rResource );
explicit CachableContentProperties( const ContentProperties rProps );
void addProperties( const ContentProperties rProps );
void addProperties( const std::vector DAVPropertyValue rProps );
-void addProperties( const DAVResource rResource );
-
bool containsAllNames(
const com::sun::star::uno::Sequence
com::sun::star::beans::Property rProps,
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index 32ca2db..3173f26 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -2169,9 +2169,9 @@ uno::Any Content::open(
// cache headers.
if ( !m_xCachedProps.get())
m_xCachedProps.reset(
-new CachableContentProperties( aResource ) );
+new CachableContentProperties( ContentProperties(
aResource ) ) );
else
-m_xCachedProps-addProperties( aResource );
+m_xCachedProps-addProperties( ContentProperties(
aResource ) );
m_xResAccess.reset(
new DAVResourceAccess( *xResAccess.get() ) );
@@ -2215,7 +2215,7 @@ uno::Any Content::open(
// cache headers.
if ( !m_xCachedProps.get())
m_xCachedProps.reset(
-new CachableContentProperties( aResource ) );
+new CachableContentProperties(
ContentProperties( aResource ) ) );
else
m_xCachedProps-addProperties(
aResource.properties );
@@ -3362,7 +3362,7 @@ Content::ResourceType Content::getResourceType(
{
osl::MutexGuard g(m_aMutex);
m_xCachedProps.reset(
-new CachableContentProperties( resources[ 0 ] ) );
+new CachableContentProperties( ContentProperties( resources[ 0
] ) ) );
m_xCachedProps-containsAllNames(
aProperties, m_aFailedPropNames );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93096] Selecting text with keyboard (partially outside current view) results in wrong highlighting and mangled text
https://bugs.documentfoundation.org/show_bug.cgi?id=93096 Miklos Vajna vmik...@collabora.co.uk changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |vmik...@collabora.co.uk |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 79674] Opening ods file is slow (empty/blank or not), xlsx file is fast
https://bugs.documentfoundation.org/show_bug.cgi?id=79674 --- Comment #26 from nuageb...@gmail.com --- I had this bug for one year and one month on a regular Debian jessie. I thought I was helping by reporting issue to make LibreOffice better. But as I need my system to work I did reinstall it last week. As explained this was only affecting one system and not the other. I guess you can close the bug if nobody else can report it. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93233] clock face emoji autocorrect collisions in some languages
https://bugs.documentfoundation.org/show_bug.cgi?id=93233 --- Comment #15 from Adolfo Jayme f...@libreoffice.org --- Applied the same workaround to the Spanish translation =) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92242] UI - StartCenter and Application windows can not be resized diagonally with mouse after initial window size increase and covers OSX Dock
https://bugs.documentfoundation.org/show_bug.cgi?id=92242 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- andreask committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9eec11735cf929cbb5da72bc500e9ad1735c4bf3 Breeze: StartCenter icon size fixed to 32px tdf#93064 tdf#92242 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92242] UI - StartCenter and Application windows can not be resized diagonally with mouse after initial window size increase and covers OSX Dock
https://bugs.documentfoundation.org/show_bug.cgi?id=92242 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|notBibisectable |notBibisectable ||target:5.1.0 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/framework/res/extension.png|binary icon-themes/breeze/framework/res/folder_32.png|binary icon-themes/breeze/framework/res/info_26.png |binary icon-themes/breeze/framework/res/recent-documents.png |binary icon-themes/breeze/framework/res/remote-documents.png |binary icon-themes/breeze/framework/res/templates_32.png |binary icon-themes/breeze/res/odb_32_8.png |binary icon-themes/breeze/res/odf_32_8.png |binary icon-themes/breeze/res/odg_32_8.png |binary icon-themes/breeze/res/odp_32_8.png |binary icon-themes/breeze/res/ods_32_8.png |binary icon-themes/breeze/res/odt_32_8.png |binary 12 files changed New commits: commit 9eec11735cf929cbb5da72bc500e9ad1735c4bf3 Author: andreask kain...@gmail.com Date: Tue Aug 18 01:30:30 2015 +0200 Breeze: StartCenter icon size fixed to 32px tdf#93064 tdf#92242 Change-Id: I3501c917f5916b49b7cda35b89cafcc27987d828 Reviewed-on: https://gerrit.libreoffice.org/17820 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/icon-themes/breeze/framework/res/extension.png b/icon-themes/breeze/framework/res/extension.png index 0495357..75fb1f8 100644 Binary files a/icon-themes/breeze/framework/res/extension.png and b/icon-themes/breeze/framework/res/extension.png differ diff --git a/icon-themes/breeze/framework/res/folder_32.png b/icon-themes/breeze/framework/res/folder_32.png index 898f4f2..0cdb329 100644 Binary files a/icon-themes/breeze/framework/res/folder_32.png and b/icon-themes/breeze/framework/res/folder_32.png differ diff --git a/icon-themes/breeze/framework/res/info_26.png b/icon-themes/breeze/framework/res/info_26.png index 7534201..6da1e8e 100644 Binary files a/icon-themes/breeze/framework/res/info_26.png and b/icon-themes/breeze/framework/res/info_26.png differ diff --git a/icon-themes/breeze/framework/res/recent-documents.png b/icon-themes/breeze/framework/res/recent-documents.png index 9e02125..fde5062 100644 Binary files a/icon-themes/breeze/framework/res/recent-documents.png and b/icon-themes/breeze/framework/res/recent-documents.png differ diff --git a/icon-themes/breeze/framework/res/remote-documents.png b/icon-themes/breeze/framework/res/remote-documents.png new file mode 100644 index 000..6e4f853 Binary files /dev/null and b/icon-themes/breeze/framework/res/remote-documents.png differ diff --git a/icon-themes/breeze/framework/res/templates_32.png b/icon-themes/breeze/framework/res/templates_32.png index b5adc50..efeb344 100644 Binary files a/icon-themes/breeze/framework/res/templates_32.png and b/icon-themes/breeze/framework/res/templates_32.png differ diff --git a/icon-themes/breeze/res/odb_32_8.png b/icon-themes/breeze/res/odb_32_8.png index a8105ff..f719738 100644 Binary files a/icon-themes/breeze/res/odb_32_8.png and b/icon-themes/breeze/res/odb_32_8.png differ diff --git a/icon-themes/breeze/res/odf_32_8.png b/icon-themes/breeze/res/odf_32_8.png index f90dabd..837f12d 100644 Binary files a/icon-themes/breeze/res/odf_32_8.png and b/icon-themes/breeze/res/odf_32_8.png differ diff --git a/icon-themes/breeze/res/odg_32_8.png b/icon-themes/breeze/res/odg_32_8.png index 64f043c..93a3083 100644 Binary files a/icon-themes/breeze/res/odg_32_8.png and b/icon-themes/breeze/res/odg_32_8.png differ diff --git a/icon-themes/breeze/res/odp_32_8.png b/icon-themes/breeze/res/odp_32_8.png index afcef4b..2c5deac 100644 Binary files a/icon-themes/breeze/res/odp_32_8.png and b/icon-themes/breeze/res/odp_32_8.png differ diff --git a/icon-themes/breeze/res/ods_32_8.png b/icon-themes/breeze/res/ods_32_8.png index de5253c..df3783e 100644 Binary files a/icon-themes/breeze/res/ods_32_8.png and b/icon-themes/breeze/res/ods_32_8.png differ diff --git a/icon-themes/breeze/res/odt_32_8.png b/icon-themes/breeze/res/odt_32_8.png index 4defc32..c9e1a13 100644 Binary files a/icon-themes/breeze/res/odt_32_8.png and b/icon-themes/breeze/res/odt_32_8.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 93502] New: Error message during install (System.AppUserModel.ID can't be set)
https://bugs.documentfoundation.org/show_bug.cgi?id=93502 Bug ID: 93502 Summary: Error message during install (System.AppUserModel.ID can't be set) Product: LibreOffice Version: 5.0.0.5 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Installation Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: orfa...@freemail.hu During the installation current version (5.0.0.5 64 bit) I have got a message. I'm using Hungarian version, so the error message is in Hungarian: Figyelmeztetés: 1946. Nem lehetett beállítani a(z) System.AppUserModel.ID tulajdonságot a(z) LibreOffice Base.lnk parancsikonhoz. I'm using win7 64 bit (English) version. It was a simple, all default installation. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93064] START CENTER: Icon sizes in breeze cause help and extensions buttons not to be visible
https://bugs.documentfoundation.org/show_bug.cgi?id=93064 --- Comment #8 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- andreask committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9eec11735cf929cbb5da72bc500e9ad1735c4bf3 Breeze: StartCenter icon size fixed to 32px tdf#93064 tdf#92242 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93064] START CENTER: Icon sizes in breeze cause help and extensions buttons not to be visible
https://bugs.documentfoundation.org/show_bug.cgi?id=93064 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|| target:5.1.0 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [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 #27 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=370a26f7804d12da26abe007f1d80a00c4fdaeb4 hwpfilter: tdf#88206 replace cppu::WeakImplHelper* 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/attributes.cxx |2 +-
hwpfilter/source/attributes.hxx |4 ++--
hwpfilter/source/hwpreader.hxx |8 +++-
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 370a26f7804d12da26abe007f1d80a00c4fdaeb4
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Aug 15 15:09:19 2015 +0900
hwpfilter: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: Ibfe59dc7631cf499f42ff998066ed73d1eb257b3
Reviewed-on: https://gerrit.libreoffice.org/17767
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx
index a5749e8..14868ec 100644
--- a/hwpfilter/source/attributes.cxx
+++ b/hwpfilter/source/attributes.cxx
@@ -53,7 +53,7 @@ sal_Int16 SAL_CALL AttributeListImpl::getLength() throw
(RuntimeException, std::
AttributeListImpl::AttributeListImpl( const AttributeListImpl r ) :
-cppu::WeakImplHelper1com::sun::star::xml::sax::XAttributeList( r )
+cppu::WeakImplHelpercom::sun::star::xml::sax::XAttributeList( r )
{
m_pImpl = new AttributeListImpl_impl;
*m_pImpl = *(r.m_pImpl);
diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx
index de1bde8..e762579 100644
--- a/hwpfilter/source/attributes.hxx
+++ b/hwpfilter/source/attributes.hxx
@@ -22,7 +22,7 @@
#define INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX
#include com/sun/star/xml/sax/XAttributeList.hpp
-#include cppuhelper/implbase1.hxx
+#include cppuhelper/implbase.hxx
/*
*
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::uno;
struct AttributeListImpl_impl;
-class AttributeListImpl : public WeakImplHelper1 XAttributeList
+class AttributeListImpl : public WeakImplHelper XAttributeList
{
protected:
virtual ~AttributeListImpl();
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 15baadd..c94c078 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -37,9 +37,7 @@
#include com/sun/star/document/XExtendedFilterDetection.hpp
#include cppuhelper/factory.hxx
-#include cppuhelper/implbase1.hxx
-#include cppuhelper/implbase2.hxx
-#include cppuhelper/implbase4.hxx
+#include cppuhelper/implbase.hxx
#include cppuhelper/supportsservice.hxx
#include cppuhelper/weak.hxx
@@ -73,7 +71,7 @@ struct HwpReaderPrivate;
/**
* This class implements the external Parser interface
*/
-class HwpReader : public WeakImplHelper1XFilter
+class HwpReader : public WeakImplHelperXFilter
{
public:
@@ -151,7 +149,7 @@ private:
static char* getPStyleName(int, char *);
};
-class HwpImportFilter : public WeakImplHelper4 XFilter, XImporter,
XServiceInfo, XExtendedFilterDetection
+class HwpImportFilter : public WeakImplHelper XFilter, XImporter,
XServiceInfo, XExtendedFilterDetection
{
public:
HwpImportFilter(const Reference XMultiServiceFactory rFact);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [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 #28 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0a4c482a8aa2e421668a6607916c9656a3f18b19 i18npool: tdf#88206 replace cppu::WeakImplHelper* 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - include/svtools svtools/Library_svt.mk svtools/source
include/svtools/autocmpledit.hxx| 39 +++
svtools/Library_svt.mk |1
svtools/source/control/autocmpledit.cxx | 110
3 files changed, 150 insertions(+)
New commits:
commit 505e8f52469cb946b298b7d81bc02d0e1d8c2b5a
Author: Szymon KÅos eszka...@gmail.com
Date: Mon Aug 17 23:01:53 2015 +0200
Edit control with autocompletion
Change-Id: Id3aefbffa6b36b475ca78856c9e103cef433f88c
diff --git a/include/svtools/autocmpledit.hxx b/include/svtools/autocmpledit.hxx
new file mode 100644
index 000..49407d44
--- /dev/null
+++ b/include/svtools/autocmpledit.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX
+#define INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX
+
+#include svtools/svtdllapi.h
+
+#include vcl/edit.hxx
+
+#include vector
+
+class SVT_DLLPUBLIC AutocompleteEdit : public Edit
+{
+private:
+std::vector OUString m_aEntries;
+std::vector OUString m_aMatching;
+std::vector OUString ::size_type m_nCurrent;
+
+void AutoCompleteHandler( Edit* );
+bool Match( const OUString rText );
+bool PreNotify( NotifyEvent rNEvt );
+
+public:
+AutocompleteEdit( vcl::Window* pParent );
+
+void AddEntry( const OUString rEntry );
+void ClearEntries();
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index f6c834d..b877d46 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/contnr/viewdataentry \
svtools/source/control/accessibleruler \
svtools/source/control/asynclink \
+svtools/source/control/autocmpledit \
svtools/source/control/breadcrumb \
svtools/source/control/calendar \
svtools/source/control/collatorres \
diff --git a/svtools/source/control/autocmpledit.cxx
b/svtools/source/control/autocmpledit.cxx
new file mode 100644
index 000..14cf58b
--- /dev/null
+++ b/svtools/source/control/autocmpledit.cxx
@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include svtools/autocmpledit.hxx
+#include vcl/svapp.hxx
+
+AutocompleteEdit::AutocompleteEdit( vcl::Window* pParent )
+: Edit( pParent )
+, m_nCurrent( 0 )
+{
+SignalConnectAutocomplete( nullptr,
+[this] ( Edit *const pEdit ) { this-AutoCompleteHandler( pEdit );
} );
+}
+
+void AutocompleteEdit::AddEntry( const OUString rEntry )
+{
+m_aEntries.push_back( rEntry );
+}
+
+void AutocompleteEdit::ClearEntries()
+{
+m_aEntries.clear();
+m_aMatching.clear();
+}
+
+void AutocompleteEdit::AutoCompleteHandler( Edit* )
+{
+if( GetAutocompleteAction() != AUTOCOMPLETE_KEYINPUT )
+return;
+
+if( Application::AnyInput( VclInputFlags::KEYBOARD ) )
+return;
+
+OUString aCurText = GetText();
+Selection aSelection( GetSelection() );
+
+if( aSelection.Max() != aCurText.getLength() )
+return;
+
+sal_uInt16 nLen = ( sal_uInt16 )aSelection.Min();
+aCurText = aCurText.copy( 0, nLen );
+if( !aCurText.isEmpty() )
+{
+if( m_aEntries.size() )
+{
+if( Match( aCurText ) )
+{
+m_nCurrent = 0;
+SetText( m_aMatching[0] );
+sal_uInt16 nNewLen = m_aMatching[0].getLength();
+
+Selection aSel( nLen, nNewLen );
+SetSelection( aSel );
+}
+}
+}
+}
+
+bool AutocompleteEdit::Match( const OUString rText )
+{
+bool bRet = false;
+
+m_aMatching.clear();
+
+for( std::vector OUString ::size_type i = 0; i m_aEntries.size(); ++i )
+{
+if( m_aEntries[i].startsWith( rText ) )
+{
+m_aMatching.push_back( m_aEntries[i] );
+bRet = true;
+}
+}
+
+return bRet;
+}
+
+bool AutocompleteEdit::PreNotify( NotifyEvent rNEvt )
+{
+if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
+{
+const KeyEvent rEvent = *rNEvt.GetKeyEvent();
+const vcl::KeyCode rKey = rEvent.GetKeyCode();
+vcl::KeyCode aCode( rKey.GetCode() );
+
+if( ( aCode == KEY_UP || aCode == KEY_DOWN ) !rKey.IsMod2() )
+{
+Selection aSelection( GetSelection() );
+sal_uInt16 nLen = ( sal_uInt16
[Libreoffice-commits] core.git: config_host/config_python.h.in configure.ac pyuno/CustomTarget_python_shell.mk pyuno/CustomTarget_pyuno_pythonloader_ini.mk pyuno/Executable_python.mk pyuno/zipcore
config_host/config_python.h.in |8
configure.ac |4 +++-
pyuno/CustomTarget_python_shell.mk |3 ++-
pyuno/CustomTarget_pyuno_pythonloader_ini.mk |1 +
pyuno/Executable_python.mk |4
pyuno/zipcore/python.cxx | 12 +++-
6 files changed, 21 insertions(+), 11 deletions(-)
New commits:
commit aa93151b9a740582732a06578e04b558beb177c2
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 17 23:52:10 2015 +0200
configure, pyuno: stop claiming our python 3.3.5 is 3.3.3
... and adapt makefiles to automatically rebuild everything that depends
on PYTHON_VERSION.
Change-Id: If468183e59463503051c2a1526a905dbee9bf4cb
Reviewed-on: https://gerrit.libreoffice.org/17818
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/config_host/config_python.h.in b/config_host/config_python.h.in
new file mode 100644
index 000..3258205
--- /dev/null
+++ b/config_host/config_python.h.in
@@ -0,0 +1,8 @@
+/* python stuff */
+
+#ifndef CONFIG_PYTHON_H
+#define CONFIG_PYTHON_H
+
+#undef PYTHON_VERSION_STRING
+
+#endif // CONFIG_PYTHON_H
diff --git a/configure.ac b/configure.ac
index c2f7dc6..5944d23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8106,7 +8106,8 @@ internal)
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
+AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L${PYTHON_VERSION}])
BUILD_TYPE=$BUILD_TYPE PYTHON
# Embedded Python dies without Home set
if test $HOME = ; then
@@ -13168,6 +13169,7 @@ AC_CONFIG_HEADERS([config_host/config_vclplug.h])
AC_CONFIG_HEADERS([config_host/config_version.h])
AC_CONFIG_HEADERS([config_host/config_oauth2.h])
AC_CONFIG_HEADERS([config_host/config_poppler.h])
+AC_CONFIG_HEADERS([config_host/config_python.h])
AC_OUTPUT
if test $CROSS_COMPILING = TRUE; then
diff --git a/pyuno/CustomTarget_python_shell.mk
b/pyuno/CustomTarget_python_shell.mk
index bc6d355..203258b 100644
--- a/pyuno/CustomTarget_python_shell.mk
+++ b/pyuno/CustomTarget_python_shell.mk
@@ -27,7 +27,8 @@ $(call
gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh : \
cat $^ $@ chmod +x $@
$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \
- $(SRCDIR)/pyuno/zipcore/$(if $(filter
MACOSX,$(OS)),mac,nonmac).sh
+ $(SRCDIR)/pyuno/zipcore/$(if $(filter
MACOSX,$(OS)),mac,nonmac).sh \
+ $(BUILDDIR)/config_$(gb_Side)/config_python.h
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed -e s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g \
$ $@
diff --git a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
index 920a7a3..51cb35f 100644
--- a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
+++ b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_CustomTarget_register_targets,pyuno/pythonloader_ini, \
))
$(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)/$(call
gb_Helper_get_rcfile,pythonloader.uno): \
+ $(BUILDDIR)/config_$(gb_Side)/config_python.h \
$(SRCDIR)/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( printf '[Bootstrap]\n' \
diff --git a/pyuno/Executable_python.mk b/pyuno/Executable_python.mk
index 2f96404..05220bc2 100644
--- a/pyuno/Executable_python.mk
+++ b/pyuno/Executable_python.mk
@@ -9,10 +9,6 @@
$(eval $(call gb_Executable_Executable,python))
-$(eval $(call gb_Executable_add_defs,python,\
--DMY_PYVERSION=L\$(PYTHON_VERSION)\ \
-))
-
$(eval $(call gb_Executable_use_static_libraries,python,\
ooopathutils \
))
diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 6944d93..239f315 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_python.h
+
#include cstddef
#include stdlib.h
#include wchar.h
@@ -98,14 +100,14 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
wchar_t pythonpath2[MAX_PATH];
wchar_t * pythonpath2End = tools::buildPath(
pythonpath2, path, pathEnd,
-MY_STRING(L\\python-core- MY_PYVERSION L\\lib));
+MY_STRING(L\\python-core- PYTHON_VERSION_STRING L\\lib));
if (pythonpath2End == NULL) {
exit(EXIT_FAILURE);
}
wchar_t pythonpath3[MAX_PATH];
wchar_t * pythonpath3End = tools::buildPath(
pythonpath3, path, pathEnd,
-MY_STRING(L\\python-core- MY_PYVERSION L\\lib\\site-packages));
+MY_STRING(L\\python-core- PYTHON_VERSION_STRING
[Libreoffice-bugs] [Bug 93469] FILESAVE: ODS - User defined number formats with question marks not retained
https://bugs.documentfoundation.org/show_bug.cgi?id=93469 --- Comment #4 from Jacques Guilleron guillero...@aol.com --- Created attachment 117995 -- https://bugs.documentfoundation.org/attachment.cgi?id=117995action=edit Excel Displaying with # ###.?? user defined format -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source unotools/source
include/ucbhelper/fileidentifierconverter.hxx | 14 --
ucbhelper/source/client/fileidentifierconverter.cxx | 18 --
unotools/source/ucbhelper/localfilehelper.cxx |6 ++
3 files changed, 2 insertions(+), 36 deletions(-)
New commits:
commit 1242a3a55ffb8c5716d0a6f2e17dadc1f2c02818
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 18 14:19:30 2015 +0200
Remove obsolete getLocalFileURL
...vnd.sun.star.wfs is long gone
Change-Id: I64da15a6c16e429aeda57c435e353891fb28f04d
diff --git a/include/ucbhelper/fileidentifierconverter.hxx
b/include/ucbhelper/fileidentifierconverter.hxx
index d2ace14..27e7c8e 100644
--- a/include/ucbhelper/fileidentifierconverter.hxx
+++ b/include/ucbhelper/fileidentifierconverter.hxx
@@ -31,20 +31,6 @@ namespace com { namespace sun { namespace star { namespace
ucb {
namespace ucbhelper {
-
-/** Get a 'root' URL for the most 'local' file content provider.
-
-@descr
-The result can be used as the rBaseURL parameter of
-ucb::getFileURLFromSystemPath().
-
-@returns
-either a 'root' URL for the most 'local' file content provider, or an
-empty string, if no such URL can meaningfully be constructed.
- */
-UCBHELPER_DLLPUBLIC OUString getLocalFileURL();
-
-
/** Using a specific content provider manager, convert a file path in system
dependent notation to a (file) URL.
diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx
b/ucbhelper/source/client/fileidentifierconverter.cxx
index e3f3ec9..4916975 100644
--- a/ucbhelper/source/client/fileidentifierconverter.cxx
+++ b/ucbhelper/source/client/fileidentifierconverter.cxx
@@ -31,24 +31,6 @@ using namespace com::sun::star;
namespace ucbhelper {
-
-
-// getLocalFileURL
-
-
-
-OUString
-getLocalFileURL()
-{
-// If there were more file systems than just file:/// (e.g., the obsolete
-// vnd.sun.star.wfs:///), this code should query all relevant UCPs for
-// their com.sun.star.ucb.XFileIdentifierConverter.getFileProviderLocality
-// and return the most local one:
-return OUString(file:///);
-}
-
-
-
// getFileURLFromSystemPath
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx
b/unotools/source/ucbhelper/localfilehelper.cxx
index b459769..d5ff1e4 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -82,8 +82,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const
OUString rName, OUString
comphelper::getProcessComponentContext() ) );
try
{
-OUString aBase( ::ucbhelper::getLocalFileURL() );
-rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, aBase, rName
);
+rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, file:///,
rName );
}
catch (const ::com::sun::star::uno::RuntimeException)
{
@@ -101,8 +100,7 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const
OUString rName, OUString
try
{
INetURLObject aObj( rName );
-INetURLObject aLocal( ::ucbhelper::getLocalFileURL() );
-if ( aObj.GetProtocol() == aLocal.GetProtocol() )
+if ( aObj.GetProtocol() == INetProtocol::File )
rReturn = ::ucbhelper::getSystemPathFromFileURL( pBroker, rName );
}
catch (const ::com::sun::star::uno::RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92242] UI - StartCenter and Application windows can not be resized diagonally with mouse after initial window size increase and covers OSX Dock
https://bugs.documentfoundation.org/show_bug.cgi?id=92242 Dave Richards drich...@largo.com changed: What|Removed |Added CC||drich...@largo.com --- Comment #12 from Dave Richards drich...@largo.com --- Request please this patch also be applied to 5.0.x. As it stands right now, it's impossible to open LO in 1024x768 with the Breeze theme selected (which is our default theme). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93511] Target in Document Hyperlink doesn't work when the target header has combination of number and period
https://bugs.documentfoundation.org/show_bug.cgi?id=93511 --- Comment #1 from Freddy rdyf4e...@gmail.com --- The steps of creating the hyperlink: 1. Select text to be made as hyperlink. 2. Click menu Insert - Hyperlink 3. In Left panel of the pop-up dialog, click Document 4. At right panel, click the target icon button at right of Target textfield. 5. At Target in document pop-up, expand Headings and choose 1.1. Title 01. 6. Click Apply button and close it. 7. Back to main pop-up dialog, click Apply button and then click close button. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - include/oox oox/source
include/oox/export/shapes.hxx |1 +
oox/source/export/shapes.cxx | 15 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 21750ee2e7c8d29e48abe33eaa2f11ffb2f5976e
Author: Sushil Shinde sushil.shi...@synerzip.com
Date: Tue Mar 3 19:14:25 2015 +0530
tdf#89806 : Fixed background fill export for table cell.
1. Table cell properties were exproted empty if file
saved as .pptx file.
2. Now added code to export table cell fill properties
in 'tcPr'(Table cell properties xml tag)
Reviewed-on: https://gerrit.libreoffice.org/14734
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
(cherry picked from commit 63442ec636d637e05d7d585817df531dbbeb96d9)
Conflicts:
sd/qa/unit/export-tests.cxx
Change-Id: Ica6005a65c7eefb8629c808f2a54764f98badb11
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 6403aec..dd70c38 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -160,6 +160,7 @@ public:
void WriteTable( ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape rXShape );
+void WriteTableCellProperties(::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape rShape );
sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape rShape, ::oox::core::XmlFilterBase* pFB );
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 3526636..9a170f1 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -890,7 +890,9 @@ void ShapeExport::WriteTable( Reference XShape rXShape )
WriteTextBox( xCell, XML_a );
-mpFS-singleElementNS( XML_a, XML_tcPr, FSEND );
+Reference XPropertySet xCellPropSet(xCell,
UNO_QUERY_THROW);
+WriteTableCellProperties(xCellPropSet);
+
mpFS-endElementNS( XML_a, XML_tc );
}
}
@@ -905,6 +907,17 @@ void ShapeExport::WriteTable( Reference XShape rXShape
)
mpFS-endElementNS( XML_a, XML_graphic );
}
+void ShapeExport::WriteTableCellProperties(Reference XPropertySet
xCellPropSet)
+{
+mpFS-startElementNS( XML_a, XML_tcPr, FSEND );
+// Write background fill for table cell.
+DrawingML::WriteFill(xCellPropSet);
+// TODO
+// tcW : Table cell width
+// tcBorders : Table cell border values.
+mpFS-endElementNS( XML_a, XML_tcPr );
+}
+
ShapeExport ShapeExport::WriteTableShape( Reference XShape xShape )
{
FSHelperPtr pFS = GetFS();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/document.hxx | 15 ---
sc/source/core/data/bcaslot.cxx | 23 +++
sc/source/core/data/documen2.cxx|2 +-
sc/source/core/data/documen7.cxx|8
sc/source/core/data/document.cxx| 10 --
sc/source/core/data/formulacell.cxx |8
sc/source/core/inc/bcaslot.hxx |6 +++---
sc/source/ui/docshell/docsh.cxx | 12 +++-
sc/source/ui/docshell/docsh4.cxx|2 +-
9 files changed, 47 insertions(+), 39 deletions(-)
New commits:
commit 1bea8310747b65516f40f6457ab1d174ef7ddce4
Author: Eike Rathke er...@redhat.com
Date: Tue Aug 18 13:54:32 2015 +0200
introduce temporary hard-recalc state, tdf#92749 follow-up
This allows listeners to be setup and initial lookup caches to be kept,
which were thrown away after the initial calculation as an interim fix
for tdf#92749.
Change-Id: I34068b3f6b833a46f3c526579efbdc342a2e71df
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index aa1664a..a2b7800 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -275,6 +275,15 @@ friend class sc::EditTextIterator;
friend class sc::FormulaGroupAreaListener;
typedef ::std::vectorScTable* TableContainer;
+
+public:
+enum HardRecalcState
+{
+HARDRECALCSTATE_OFF = 0,/// normal calculation of dependencies
+HARDRECALCSTATE_TEMPORARY, /// CalcAll() without broadcast/notify but
setting up new listeners
+HARDRECALCSTATE_ETERNAL /// no new listeners are setup, no
broadcast/notify
+};
+
private:
rtl::ReferenceScPoolHelper xPoolHelper;
@@ -391,7 +400,7 @@ private:
sal_uInt16 nSrcVer;// file version
(load/save)
SCROW nSrcMaxRow; // number of lines to
load/save
sal_uInt16 nFormulaTrackCount;
-boolbHardRecalcState; // false: soft, true:
hard
+HardRecalcState eHardRecalcState; // off, temporary,
eternal
SCTAB nVisibleTab;// for OLE etc., don't
use inside ScDocument
ScLkUpdMode eLinkMode;
@@ -1949,8 +1958,8 @@ public:
voidTrackFormulas( sal_uLong nHintId = SC_HINT_DATACHANGED
);
boolIsInFormulaTree( ScFormulaCell* pCell ) const;
boolIsInFormulaTrack( ScFormulaCell* pCell ) const;
-boolGetHardRecalcState() { return bHardRecalcState; }
-voidSetHardRecalcState( bool bVal ) { bHardRecalcState =
bVal; }
+HardRecalcState GetHardRecalcState() { return eHardRecalcState; }
+voidSetHardRecalcState( HardRecalcState eVal ) {
eHardRecalcState = eVal; }
voidStartAllListeners();
voidStartNeededListeners();
voidStartAllListeners( const ScRange rRange );
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index f9d6a19..6ae65c7 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -166,14 +166,13 @@ ScBroadcastAreaSlot::~ScBroadcastAreaSlot()
}
}
-bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const
+ScDocument::HardRecalcState
ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const
{
-if ( pDoc-GetHardRecalcState() )
-return true;
-if (aBroadcastAreaTbl.size() = aBroadcastAreaTbl.max_size())
-{ // this is more hypothetical now, check existed for old SV_PTRARR_SORT
-if ( !pDoc-GetHardRecalcState() )
-{
+ScDocument::HardRecalcState eState = pDoc-GetHardRecalcState();
+if (eState == ScDocument::HARDRECALCSTATE_OFF)
+{
+if (aBroadcastAreaTbl.size() = aBroadcastAreaTbl.max_size())
+{ // this is more hypothetical now, check existed for old
SV_PTRARR_SORT
SfxObjectShell* pShell = pDoc-GetDocumentShell();
OSL_ENSURE( pShell, Missing DocShell :-/ );
@@ -181,11 +180,11 @@ bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition()
const
pShell-SetError( SCWARN_CORE_HARD_RECALC, OUString(
OSL_LOG_PREFIX ) );
pDoc-SetAutoCalc( false );
-pDoc-SetHardRecalcState( true );
+eState = ScDocument::HARDRECALCSTATE_ETERNAL;
+pDoc-SetHardRecalcState( eState );
}
-return true;
}
-return false;
+return eState;
}
bool ScBroadcastAreaSlot::StartListeningArea(
@@ -193,7 +192,7 @@ bool ScBroadcastAreaSlot::StartListeningArea(
{
bool bNewArea = false;
OSL_ENSURE(pListener, StartListeningArea: pListener Null);
-if (CheckHardRecalcStateCondition())
+if (CheckHardRecalcStateCondition() == ScDocument::HARDRECALCSTATE_ETERNAL)
return false;
if ( !rpArea )
{
@@ -234,7 +233,7 @@ bool ScBroadcastAreaSlot::StartListeningArea(
void
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 3 commits - svx/source
svx/source/svdraw/textchainflow.cxx | 42 +---
1 file changed, 30 insertions(+), 12 deletions(-)
New commits:
commit b876fcab266ab63105e29f2b526f6df5ef654944
Author: matteocam matteo.campane...@gmail.com
Date: Tue Aug 18 14:25:55 2015 +0200
Set UpdateMode=True before transfering text in OF/UF
Change-Id: Id01abf614bd4c842d86aa644b947f6295d6d7d6d
diff --git a/svx/source/svdraw/textchainflow.cxx
b/svx/source/svdraw/textchainflow.cxx
index 82bb4cd..06275e15 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -156,6 +156,12 @@ bool TextChainFlow::IsUnderflow() const
// XXX:Would it be possible to unify undeflow and its possibly following
overrflow?
void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
{
+bool bOldUpdateMode = pOutl-GetUpdateMode();
+
+// We need this since it's required by WriteRTF
+pOutl-SetUpdateMode(true);
+
+
//GetTextChain()-SetNilChainingEvent(mpTargetLink, true);
// making whole text
OutlinerParaObject *pNewText = impGetMergedUnderflowParaObject(pOutl);
@@ -173,6 +179,9 @@ void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
pOutl-SetMaxAutoPaperSize(aOldSize);
pOutl-SetText(*pNewText);
+// Reset update mode
+pOutl-SetUpdateMode(bOldUpdateMode);
+
//GetTextChain()-SetNilChainingEvent(mpTargetLink, false);
// Check for new overflow
@@ -181,6 +190,11 @@ void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
void TextChainFlow::ExecuteOverflow(SdrOutliner *pNonOverflOutl, SdrOutliner
*pOverflOutl)
{
+bool bOldUpdateMode = pNonOverflOutl-GetUpdateMode();
+
+// We need this since it's required by WriteRTF
+pNonOverflOutl-SetUpdateMode(true);
+
//GetTextChain()-SetNilChainingEvent(mpTargetLink, true);
// Leave only non overflowing text
impLeaveOnlyNonOverflowingText(pNonOverflOutl);
@@ -191,6 +205,9 @@ void TextChainFlow::ExecuteOverflow(SdrOutliner
*pNonOverflOutl, SdrOutliner *pO
impMoveChainedTextToNextLink(pOverflOutl);
}
+// Reset update mode
+pNonOverflOutl-SetUpdateMode(bOldUpdateMode);
+
//GetTextChain()-SetNilChainingEvent(mpTargetLink, false);
}
commit 3476f9dc1ceab8dedb0f93ee9d5cf87f2f30
Author: matteocam matteo.campane...@gmail.com
Date: Tue Aug 18 14:20:33 2015 +0200
Set UpdateMode=True even with editing outl
Change-Id: I18773c8ff7447741e87d25b849b6f6b2770531dc
diff --git a/svx/source/svdraw/textchainflow.cxx
b/svx/source/svdraw/textchainflow.cxx
index d74e441..82bb4cd 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -71,12 +71,12 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner
*pFlowOutl, SdrOutliner *p
{
bool bOldUpdateMode = pFlowOutl-GetUpdateMode();
-// XXX: This could be reorganized moving most of this stuff inside
EditingTextChainFlow (we need update=true anyway for TextChainFlow though)
+// We need this since it's required to check overflow
+pFlowOutl-SetUpdateMode(true);
+
+// XXX: This could be reorganized moving most of this stuff inside
EditingTextChainFlow
if (pParamOutl != NULL)
{
-// We need this since it's required to check overflow
-pFlowOutl-SetUpdateMode(true);
-
// XXX: does this work if you do it before setting the text? Seems so.
impSetFlowOutlinerParams(pFlowOutl, pParamOutl);
}
@@ -87,10 +87,9 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner
*pFlowOutl, SdrOutliner *p
bOverflow = bIsPageOverflow mpNextLink;
bUnderflow = !bIsPageOverflow mpNextLink mpNextLink-HasText();
-if (pParamOutl != NULL)
-{
-pFlowOutl-SetUpdateMode(bOldUpdateMode);
-}
+// Reset update mode
+pFlowOutl-SetUpdateMode(bOldUpdateMode);
+
// Get old state on whether to merge para-s or not
// NOTE: We handle UF/OF using the _old_ state. The new one is simply saved
commit 4ad93ff450e53263a32dff01239aacd876e81e28
Author: matteocam matteo.campane...@gmail.com
Date: Tue Aug 18 14:18:59 2015 +0200
Minor changes
Change-Id: Ife0861db9249dab3102399365ca965ca53b34e42
diff --git a/svx/source/svdraw/textchainflow.cxx
b/svx/source/svdraw/textchainflow.cxx
index 94fac05..d74e441 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -244,10 +244,12 @@ SdrTextObj *TextChainFlow::GetNextLink() const
return mpNextLink;
}
-OutlinerParaObject *TextChainFlow::impGetOverflowingParaObject(SdrOutliner
*pOutliner)
-{
-return mpOverflChText-CreateOverflowingParaObject(pOutliner,
-
mpNextLink-GetOutlinerParaObject());
+OutlinerParaObject *TextChainFlow::impGetOverflowingParaObject(SdrOutliner *)
+{ // XXX: Should never be called (to be deleted)
+assert(0);
+return NULL;
+//return mpOverflChText-CreateOverflowingParaObject(pOutliner,
+//
Re: Debug build breaks in unit test
On 10.08.2015 03:22, Norbert Thiebaud wrote: PS: PARALLELISM=1 should _not_ be needed... we are building literally thousands of build a month an all 3 platforms and none of these build is running PARALLELISM=1, thankfully as the build is long enough as it is... it is true that it should not be needed, but when your build breaks it will make it much more obvious *which* command failed. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Debug build breaks in unit test
Hey Regina, On Thu, Aug 13, 2015 at 5:05 PM, Regina Henschel rb.hensc...@t-online.de wrote: Hi all, Christian Lohmaier schrieb: Hi *, On Sun, Aug 9, 2015 at 4:33 PM, Oliver Brinzing oliver.brinz...@gmx.de wrote: Hi Regina, - https://wiki.documentfoundation.org/Development/BuildingOnWindows#System_PATH_causing_weird_build_breakage - BitDefender / other Anti-Virus / security tools breaking the build i told my anti virus not to scan c:\cygwin\* and c:\sources\* Note that you also need to include the temporary directory (or set TMPDIR to a path below the ones above, so that it is covered as well) I have disabled virus scan totally while building. pasebin.ca is down right now, so cannot have a look at Regina's log, but by defaullt, the build won't run those cve-document tests and should not trigger the problem. I have nailed it down. Exactly one test fails. It is CPPUNIT_TEST(testMediaEmbedding); from CPPUNIT_TEST_SUITE(SdExportTest); The log is not too long, so I paste it below. Kind regards Regina C:/cygwin/opt/lo/bin/make -j 4 -rs -f C:/LO_buildDebug/core/Makefile.gbuild CppunitTest_sd_export_tests [build PRL] CustomTarget/postprocess/images/sorted.lst [build PRL] CustomTarget/postprocess/images/commandimagelist.ilst [build PRL] CustomTarget/postprocess/images/images_breeze.zip [build PRL] CustomTarget/postprocess/images/images_galaxy.zip [build PRL] CustomTarget/postprocess/images/images_hicontrast.zip [build PRL] CustomTarget/postprocess/images/images_oxygen.zip [build PRL] CustomTarget/postprocess/images/images_sifr.zip [build PRL] CustomTarget/postprocess/images/images_tango.zip [build PRL] CustomTarget/postprocess/images/images_tango_testing.zip [build CXX] sd/qa/unit/export-tests.cxx [build DEP] LNK:CppunitTest/test_sd_export_tests.dll [build LNK] CppunitTest/test_sd_export_tests.dll Creating library C:/LO_buildDebug/core/workdir/LinkTarget/CppunitTest/itest_sd_export_tests.lib and object C:/LO_buildDebug/core/workdir/LinkTarget/CppunitTest/itest_sd_export_tests.exp [build CUT] sd_export_tests /usr/bin/sh: Zeile 1: 5968 Segmentation fault PATH=C:\LO_buildDebug\core\instdir\program;C:\LO_buildDebug\core\instdir\program;C:\LO_buildDebug\core\workdir\LinkTarget\Library;C:\LO_buildDebug\core\workdir\UnpackedTarball\cppunit\src\cppunit\DebugDll;$PATH $W/LinkTarget/Executable/cppunittester.exe $W/LinkTarget/CppunitTest/test_sd_export_tests.dll --headless -env:BRAND_BASE_DIR=file:///$S/instdir -env:BRAND_SHARE_SUBDIR=share -env:UserInstallation=file:///$W/CppunitTest/sd_export_tests.test.user -env:CONFIGURATION_LAYERS=xcsxcu:file:///$I/share/registry xcsxcu:file:///$W/unittest/registry -env:UNO_TYPES=file:///$I/program/types/offapi.rdb file:///$I/program/types.rdb -env:UNO_SERVICES=file:///$W/Rdb/ure/services.rdb file:///$W/Rdb/services.rdb -env:URE_INTERNAL_LIB_DIR=file:///$I/program -env:LO_LIB_DIR=file:///$I/program -env:LO_JAVA_DIR=file:///$I/program/classes --protector $W/LinkTarget/Library/unoexceptionprotector.dll unoexceptionprotector --protector $W/LinkTarget/Library/unobootstrapprotector.dll unobootstrapprotector --protector $W/LinkTarget/Library/vclbootstrapprotector.dll vclbootstrapprotector -env:SVG_DISABLE_FONT_EMBEDDING= $W/CppunitTest/sd_export_tests.test.log 21 warn:legacy.tools:1112:364:sfx2/source/appl/app.cxx:202: No DDE-Service possible. Error: 16399 warn:vcl.opengl.win:1112:364:vcl/opengl/win/WinDeviceInfo.cxx:914: error parsing blacklist warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.sob warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.soc warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.sod warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.sog warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.soh warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.soe warn:basic:1112:364:basic/source/uno/namecont.cxx:1013: Cannot access extensions! warn:basic:1112:364:basic/source/uno/namecont.cxx:1013: Cannot access extensions!
Re: Debug build breaks in unit test
On Tue, Aug 18, 2015 at 3:02 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey Regina, On Thu, Aug 13, 2015 at 5:05 PM, Regina Henschel rb.hensc...@t-online.de wrote: Hi all, Christian Lohmaier schrieb: Hi *, On Sun, Aug 9, 2015 at 4:33 PM, Oliver Brinzing oliver.brinz...@gmx.de wrote: Hi Regina, - https://wiki.documentfoundation.org/Development/BuildingOnWindows#System_PATH_causing_weird_build_breakage - BitDefender / other Anti-Virus / security tools breaking the build i told my anti virus not to scan c:\cygwin\* and c:\sources\* Note that you also need to include the temporary directory (or set TMPDIR to a path below the ones above, so that it is covered as well) I have disabled virus scan totally while building. pasebin.ca is down right now, so cannot have a look at Regina's log, but by defaullt, the build won't run those cve-document tests and should not trigger the problem. I have nailed it down. Exactly one test fails. It is CPPUNIT_TEST(testMediaEmbedding); from CPPUNIT_TEST_SUITE(SdExportTest); The log is not too long, so I paste it below. Kind regards Regina C:/cygwin/opt/lo/bin/make -j 4 -rs -f C:/LO_buildDebug/core/Makefile.gbuild CppunitTest_sd_export_tests [build PRL] CustomTarget/postprocess/images/sorted.lst [build PRL] CustomTarget/postprocess/images/commandimagelist.ilst [build PRL] CustomTarget/postprocess/images/images_breeze.zip [build PRL] CustomTarget/postprocess/images/images_galaxy.zip [build PRL] CustomTarget/postprocess/images/images_hicontrast.zip [build PRL] CustomTarget/postprocess/images/images_oxygen.zip [build PRL] CustomTarget/postprocess/images/images_sifr.zip [build PRL] CustomTarget/postprocess/images/images_tango.zip [build PRL] CustomTarget/postprocess/images/images_tango_testing.zip [build CXX] sd/qa/unit/export-tests.cxx [build DEP] LNK:CppunitTest/test_sd_export_tests.dll [build LNK] CppunitTest/test_sd_export_tests.dll Creating library C:/LO_buildDebug/core/workdir/LinkTarget/CppunitTest/itest_sd_export_tests.lib and object C:/LO_buildDebug/core/workdir/LinkTarget/CppunitTest/itest_sd_export_tests.exp [build CUT] sd_export_tests /usr/bin/sh: Zeile 1: 5968 Segmentation fault PATH=C:\LO_buildDebug\core\instdir\program;C:\LO_buildDebug\core\instdir\program;C:\LO_buildDebug\core\workdir\LinkTarget\Library;C:\LO_buildDebug\core\workdir\UnpackedTarball\cppunit\src\cppunit\DebugDll;$PATH $W/LinkTarget/Executable/cppunittester.exe $W/LinkTarget/CppunitTest/test_sd_export_tests.dll --headless -env:BRAND_BASE_DIR=file:///$S/instdir -env:BRAND_SHARE_SUBDIR=share -env:UserInstallation=file:///$W/CppunitTest/sd_export_tests.test.user -env:CONFIGURATION_LAYERS=xcsxcu:file:///$I/share/registry xcsxcu:file:///$W/unittest/registry -env:UNO_TYPES=file:///$I/program/types/offapi.rdb file:///$I/program/types.rdb -env:UNO_SERVICES=file:///$W/Rdb/ure/services.rdb file:///$W/Rdb/services.rdb -env:URE_INTERNAL_LIB_DIR=file:///$I/program -env:LO_LIB_DIR=file:///$I/program -env:LO_JAVA_DIR=file:///$I/program/classes --protector $W/LinkTarget/Library/unoexceptionprotector.dll unoexceptionprotector --protector $W/LinkTarget/Library/unobootstrapprotector.dll unobootstrapprotector --protector $W/LinkTarget/Library/vclbootstrapprotector.dll vclbootstrapprotector -env:SVG_DISABLE_FONT_EMBEDDING= $W/CppunitTest/sd_export_tests.test.log 21 warn:legacy.tools:1112:364:sfx2/source/appl/app.cxx:202: No DDE-Service possible. Error: 16399 warn:vcl.opengl.win:1112:364:vcl/opengl/win/WinDeviceInfo.cxx:914: error parsing blacklist warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.sob warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.soc warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.sod warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.sog warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.soh warn:unotools.misc:1112:364:unotools/source/misc/mediadescriptor.cxx:757: caught Exception an error occurred during file opening while opening file:///C:/LO_buildDebug/core/workdir/unittest/user/config/standard.soe warn:basic:1112:364:basic/source/uno/namecont.cxx:1013: Cannot access
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/filter/RtfFilter.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cfa853c07fd4632fa40e62a5b4474c55d4588416
Author: Caolán McNamara caol...@redhat.com
Date: Tue Aug 18 14:04:58 2015 +0100
this debugging code can definitely use osl
Change-Id: I420e7f242868a25a2f9a473c23c67dfd9a285b7c
diff --git a/writerfilter/source/filter/RtfFilter.cxx
b/writerfilter/source/filter/RtfFilter.cxx
index 7bf88b2..752330c 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -29,7 +29,7 @@
#include cppuhelper/implbase.hxx
#include cppuhelper/implementationentry.hxx
#include cppuhelper/supportsservice.hxx
-#include unotools/localfilehelper.hxx
+#include osl/file.hxx
#include unotools/mediadescriptor.hxx
#include unotools/streamwrap.hxx
#include unotools/ucbstreamhelper.hxx
@@ -119,7 +119,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence
beans::PropertyValue aDescrip
// If this is set, write to this file, instead of the real document
during paste.
char* pEnv = getenv(SW_DEBUG_RTF_PASTE_TO);
OUString aOutStr;
-if (!bIsNewDoc pEnv
utl::LocalFileHelper::ConvertPhysicalNameToURL(OUString::fromUtf8(pEnv),
aOutStr))
+if (!bIsNewDoc pEnv
osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(pEnv), aOutStr) ==
osl::FileBase::E_None)
{
std::unique_ptrSvStream
pOut(utl::UcbStreamHelper::CreateStream(aOutStr, StreamMode::WRITE));
std::unique_ptrSvStream
pIn(utl::UcbStreamHelper::CreateStream(xInputStream));
@@ -132,7 +132,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence
beans::PropertyValue aDescrip
if (!bIsNewDoc pEnv)
{
OUString aInStr;
-
utl::LocalFileHelper::ConvertPhysicalNameToURL(OUString::fromUtf8(pEnv),
aInStr);
+osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(pEnv),
aInStr);
SvStream* pStream = utl::UcbStreamHelper::CreateStream(aInStr,
StreamMode::READ);
uno::Referenceio::XStream xStream(new
utl::OStreamWrapper(*pStream));
xInputStream.set(xStream, uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build WebDAV neon/serf: differences among the two
On 13.08.2015 17:32, Giuseppe Castagno wrote: Other observations. Serf vers. 1.2.1 currently in LO lack NTLM (Windows) authorization. ... which neon claims to support. Vers. 1.3.8, last available, has it. Serf uses OpenSSL, Zip, apr and apr-util libraries. ... and its long list of dependencies that we need to bundle is the one thing i don't like about it :) Starting from V. 1.3.0 serf uses scons build system, not configure/make. oh well there had to be a catch... i believe we don't have anything with scons currently, so it remains to be seen if and how that will support finding our bundled libraries instead of system libraries, building on Windows with MSVC (and using debug runtimes with --enable-dbgutil), cross-compiling for Android/iOS, etc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/vba-export' - oox/qa
oox/qa/unit/data/vba/reference/spec321.bin |binary
oox/qa/unit/data/vba/spec321.bin |1 +
oox/qa/unit/vba_compression.cxx| 27 ++-
3 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 40b8f4d7b23e3ab297cd6d006bba1ad6a081b2fa
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Aug 18 13:17:02 2015 +0200
add remaining test from spec for vba compression
That test is testing the case that a sequence can not be compressed at
all.
Change-Id: I98d1065919acc9688d713ea09bf578c325b1f821
diff --git a/oox/qa/unit/data/vba/reference/spec321.bin
b/oox/qa/unit/data/vba/reference/spec321.bin
new file mode 100644
index 000..3120c7f
Binary files /dev/null and b/oox/qa/unit/data/vba/reference/spec321.bin differ
diff --git a/oox/qa/unit/data/vba/spec321.bin b/oox/qa/unit/data/vba/spec321.bin
new file mode 100644
index 000..c5d48c9
--- /dev/null
+++ b/oox/qa/unit/data/vba/spec321.bin
@@ -0,0 +1 @@
+abcdefghijklmnopqrstuv.
\ No newline at end of file
diff --git a/oox/qa/unit/vba_compression.cxx b/oox/qa/unit/vba_compression.cxx
index abf2b29..0247fb9 100644
--- a/oox/qa/unit/vba_compression.cxx
+++ b/oox/qa/unit/vba_compression.cxx
@@ -33,6 +33,8 @@ public:
// tests taken from the VBA specification
// section 3.2
+// section 3.2.1
+void testSpec321();
// section 3.2.2
void testSpec322();
// section 3.2.3
@@ -47,6 +49,7 @@ public:
CPPUNIT_TEST(testSimple2);
CPPUNIT_TEST(testSimple3);
CPPUNIT_TEST(testComplex1);
+CPPUNIT_TEST(testSpec321);
CPPUNIT_TEST(testSpec322);
CPPUNIT_TEST(testSpec323);
CPPUNIT_TEST_SUITE_END();
@@ -166,6 +169,28 @@ void TestVbaCompression::testComplex1()
}
}
+void TestVbaCompression::testSpec321()
+{
+OUString aTestFile = getPathFromSrc(/oox/qa/unit/data/vba/spec321.bin);
+OUString aReference =
getPathFromSrc(/oox/qa/unit/data/vba/reference/spec321.bin);
+
+SvMemoryStream aOutputMemoryStream(4096, 4096);
+SvMemoryStream aReferenceMemoryStream(4096, 4096);
+ReadFiles(aTestFile, aReference, aOutputMemoryStream,
aReferenceMemoryStream, /tmp/vba_debug_spec321.bin);
+
+CPPUNIT_ASSERT_EQUAL(aReferenceMemoryStream.GetSize(),
aOutputMemoryStream.GetSize());
+
+const sal_uInt8* pReferenceData = (const sal_uInt8*)
aReferenceMemoryStream.GetData();
+const sal_uInt8* pData = (const sal_uInt8*)aOutputMemoryStream.GetData();
+
+size_t nSize = std::min(aReferenceMemoryStream.GetSize(),
+aOutputMemoryStream.GetSize());
+for (size_t i = 0; i nSize; ++i)
+{
+CPPUNIT_ASSERT_EQUAL((int)pReferenceData[i], (int)pData[i]);
+}
+}
+
void TestVbaCompression::testSpec322()
{
OUString aTestFile = getPathFromSrc(/oox/qa/unit/data/vba/spec322.bin);
@@ -195,7 +220,7 @@ void TestVbaCompression::testSpec323()
SvMemoryStream aOutputMemoryStream(4096, 4096);
SvMemoryStream aReferenceMemoryStream(4096, 4096);
-ReadFiles(aTestFile, aReference, aOutputMemoryStream,
aReferenceMemoryStream, /tmp/vba_debug_spec321.bin);
+ReadFiles(aTestFile, aReference, aOutputMemoryStream,
aReferenceMemoryStream, /tmp/vba_debug_spec323.bin);
CPPUNIT_ASSERT_EQUAL(aReferenceMemoryStream.GetSize(),
aOutputMemoryStream.GetSize());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Have serf layer in webdav built again: cannot link libucpdav1.so
On 03.08.2015 09:51, Giuseppe Castagno wrote: Building serf webdav I hit the following problem: I have problem linking libucpdav1.so: /srv5/git/LibO/lo-serf-study/workdir/UnpackedTarball/apr/.libs/libapr-1.a(rand.o): In function `apr_os_uuid_get': /srv5/git/LibO/lo-serf-study/workdir/UnpackedTarball/apr/misc/unix/rand.c:75: undefined reference to `uuid_generate' this should mean -luuid (hence libuuid from host OS) is missing, but I could not figure out a way to edit the file ucb/Library_ucpdav1.mk in order to link successfully i believe this problem was resolved by Stephan with commit aeafca133405e4a5fdbe253f8dcd2019d6b6b2a4 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/apr
external/apr/UnpackedTarball_apr.mk |6
external/apr/uuid.patch | 241
2 files changed, 247 insertions(+)
New commits:
commit 78a7dfe3aeb8cb42fcc2a370b8ee4979a5560029
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 17 12:01:18 2015 +0200
external/apr: Avoid dependency on system uuid lib
...which isn't even needed, as apr only uses APR_HAS_OS_UUID for
apr_os_uuid_get
(apr_portable.h), which is neither used internally in apr nor by either of
the
two clients of apr in LO, external/serf and ucb/source/ucp/webdav
Change-Id: I2e9d1f2640df0a8125ae2840f54488e77656c3ec
(cherry picked from commit aeafca133405e4a5fdbe253f8dcd2019d6b6b2a4)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/external/apr/UnpackedTarball_apr.mk
b/external/apr/UnpackedTarball_apr.mk
index 5fa9d05..5f82b84 100644
--- a/external/apr/UnpackedTarball_apr.mk
+++ b/external/apr/UnpackedTarball_apr.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apr))
$(eval $(call gb_UnpackedTarball_set_tarball,apr,$(APR_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,apr,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,apr, \
+external/apr/uuid.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/apr/uuid.patch b/external/apr/uuid.patch
new file mode 100644
index 000..53c75f1
--- /dev/null
+++ b/external/apr/uuid.patch
@@ -0,0 +1,241 @@
+--- configure
configure
+@@ -26343,235 +26343,9 @@
+
+ echo ${nl}Checking for OS UUID Support...
+
+-for ac_header in uuid.h uuid/uuid.h sys/uuid.h
+-do :
+- as_ac_Header=`$as_echo ac_cv_header_$ac_header | $as_tr_sh`
+-ac_fn_c_check_header_mongrel $LINENO $ac_header $as_ac_Header
$ac_includes_default
+-if eval test \x\$$as_ac_Header\ = xyes; then :
+- cat confdefs.h _ACEOF
+-#define `$as_echo HAVE_$ac_header | $as_tr_cpp` 1
+-_ACEOF
+- break
+-fi
+-
+-done
+-
+-
+-apr_revert_save_LIBS=$LIBS
+-
+-# Prefer the flavor(s) that live in libc;
+-{ $as_echo $as_me:${as_lineno-$LINENO}: checking for library containing
uuid_create 5
+-$as_echo_n checking for library containing uuid_create... 6; }
+-if ${ac_cv_search_uuid_create+:} false; then :
+- $as_echo_n (cached) 6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - _ACEOF conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern C
+-#endif
+-char uuid_create ();
+-int
+-main ()
+-{
+-return uuid_create ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-for ac_lib in '' uuid; do
+- if test -z $ac_lib; then
+-ac_res=none required
+- else
+-ac_res=-l$ac_lib
+-LIBS=-l$ac_lib $ac_func_search_save_LIBS
+- fi
+- if ac_fn_c_try_link $LINENO; then :
+- ac_cv_search_uuid_create=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-conftest$ac_exeext
+- if ${ac_cv_search_uuid_create+:} false; then :
+- break
+-fi
+-done
+-if ${ac_cv_search_uuid_create+:} false; then :
+-
+-else
+- ac_cv_search_uuid_create=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo $as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_create
5
+-$as_echo $ac_cv_search_uuid_create 6; }
+-ac_res=$ac_cv_search_uuid_create
+-if test $ac_res != no; then :
+- test $ac_res = none required || LIBS=$ac_res $LIBS
+-
+-fi
+-
+-{ $as_echo $as_me:${as_lineno-$LINENO}: checking for library containing
uuid_generate 5
+-$as_echo_n checking for library containing uuid_generate... 6; }
+-if ${ac_cv_search_uuid_generate+:} false; then :
+- $as_echo_n (cached) 6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - _ACEOF conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern C
+-#endif
+-char uuid_generate ();
+-int
+-main ()
+-{
+-return uuid_generate ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-for ac_lib in '' uuid; do
+- if test -z $ac_lib; then
+-ac_res=none required
+- else
+-ac_res=-l$ac_lib
+-LIBS=-l$ac_lib $ac_func_search_save_LIBS
+- fi
+- if ac_fn_c_try_link $LINENO; then :
+- ac_cv_search_uuid_generate=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-conftest$ac_exeext
+- if ${ac_cv_search_uuid_generate+:} false; then :
+- break
+-fi
+-done
+-if ${ac_cv_search_uuid_generate+:} false; then :
+-
+-else
+- ac_cv_search_uuid_generate=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo $as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate
5
+-$as_echo $ac_cv_search_uuid_generate 6; }
+-ac_res=$ac_cv_search_uuid_generate
+-if test $ac_res != no; then :
+- test $ac_res = none
[Libreoffice-bugs] [Bug 93510] New: Regular expressions do not works when enabled automatically find columns and rows labels
https://bugs.documentfoundation.org/show_bug.cgi?id=93510 Bug ID: 93510 Summary: Regular expressions do not works when enabled automatically find columns and rows labels Product: LibreOffice Version: unspecified Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: lera.goncha...@gmail.com Created attachment 117996 -- https://bugs.documentfoundation.org/attachment.cgi?id=117996action=edit for example OS: Kubuntu 14.04 (64 bit) LO: 5.0.0.5 If a table have column of words, and I use the function SUMIFS with regular expressions in the function parameter Criteria, the function return 0 independently from values in the sum range. If range contains merged cells in the label or a empty cell right after the label, this bug do not appear. I think that Calc cannot solve precedence of labels. I attached the file with example. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: 2 commits - svl/source
svl/source/numbers/zforlist.cxx | 253
1 file changed, 128 insertions(+), 125 deletions(-)
New commits:
commit c77e74747b289990d45fb9378323daf63c9f7a2f
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 18 13:16:23 2015 +0200
Content of theIndexTable is known statically
...and initializing it on-demand in SvNumberFormatter::ImpGenerateFormats
wasn't
even thread safe (despite theIndexTable.maMtx): While one thread was
cleaning
and then filling it in ImpGenerateFormats, another thread could also enter
ImpGenerateFormats and clean it again (and only later fill it), and the
first
thread might use the half-filled table after it left ImpGenerateFormats but
before the second thread re-filled it.
Change-Id: Iba4e9d57519d2b288718b9cb2e6f7546ba2bd5df
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8f540bd..8b00985 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -90,19 +90,61 @@ using namespace ::std;
* (old currency) is recognized as a date (#53155#). */
#define UNKNOWN_SUBSTITUTE LANGUAGE_ENGLISH_US
-struct IndexTable
-{
-bool mbInitialized;
-sal_uInt32 maData[NF_INDEX_TABLE_ENTRIES];
-osl::Mutex maMtx;
-
-IndexTable() : mbInitialized(false) {}
+static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = {
+ZF_STANDARD, // NF_NUMBER_STANDARD
+ZF_STANDARD + 1, // NF_NUMBER_INT
+ZF_STANDARD + 2, // NF_NUMBER_DEC2
+ZF_STANDARD + 3, // NF_NUMBER_1000INT
+ZF_STANDARD + 4, // NF_NUMBER_1000DEC2
+ZF_STANDARD + 5, // NF_NUMBER_SYSTEM
+ZF_STANDARD_SCIENTIFIC, // NF_SCIENTIFIC_000E000
+ZF_STANDARD_SCIENTIFIC + 1, // NF_SCIENTIFIC_000E00
+ZF_STANDARD_PERCENT, // NF_PERCENT_INT
+ZF_STANDARD_PERCENT + 1, // NF_PERCENT_DEC2
+ZF_STANDARD_FRACTION, // NF_FRACTION_1
+ZF_STANDARD_FRACTION + 1, // NF_FRACTION_2
+ZF_STANDARD_CURRENCY, // NF_CURRENCY_1000INT
+ZF_STANDARD_CURRENCY + 1, // NF_CURRENCY_1000DEC2
+ZF_STANDARD_CURRENCY + 2, // NF_CURRENCY_1000INT_RED
+ZF_STANDARD_CURRENCY + 3, // NF_CURRENCY_1000DEC2_RED
+ZF_STANDARD_CURRENCY + 4, // NF_CURRENCY_1000DEC2_CCC
+ZF_STANDARD_CURRENCY + 5, // NF_CURRENCY_1000DEC2_DASHED
+ZF_STANDARD_DATE, // NF_DATE_SYSTEM_SHORT
+ZF_STANDARD_DATE + 8, // NF_DATE_SYSTEM_LONG
+ZF_STANDARD_DATE + 7, // NF_DATE_SYS_DDMMYY
+ZF_STANDARD_DATE + 6, // NF_DATE_SYS_DDMM
+ZF_STANDARD_DATE + 9, // NF_DATE_SYS_DMMMYY
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_DMMM, // NF_DATE_SYS_DMMM
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_DMMM, // NF_DATE_DIN_DMMM
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_D, // NF_DATE_SYS_D
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_D, // NF_DATE_DIN_D
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNDMMMYY, // NF_DATE_SYS_NNDMMMYY
+ZF_STANDARD_DATE + 1, // NF_DATE_DEF_NNDDMMMYY
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_NND, // NF_DATE_SYS_NND
+ZF_STANDARD_NEWEXTENDED_DATE_SYS_D, //
NF_DATE_SYS_D
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_MMDD, // NF_DATE_DIN_MMDD
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYMMDD, // NF_DATE_DIN_YYMMDD
+ZF_STANDARD_NEWEXTENDED_DATE_DIN_MMDD, // NF_DATE_DIN_MMDD
+ZF_STANDARD_DATE + 2, // NF_DATE_SYS_MMYY
+ZF_STANDARD_DATE + 3, // NF_DATE_SYS_DDMMM
+ZF_STANDARD_DATE + 4, // NF_DATE_
+ZF_STANDARD_DATE + 5, // NF_DATE_QQJJ
+ZF_STANDARD_NEWEXTENDED_DATE_WW, // NF_DATE_WW
+ZF_STANDARD_TIME, // NF_TIME_HHMM
+ZF_STANDARD_TIME + 1, // NF_TIME_HHMMSS
+ZF_STANDARD_TIME + 2, // NF_TIME_HHMMAMPM
+ZF_STANDARD_TIME + 3, // NF_TIME_HHMMSSAMPM
+ZF_STANDARD_TIME + 4, // NF_TIME_HH_MMSS
+ZF_STANDARD_TIME + 5, // NF_TIME_MMSS00
+ZF_STANDARD_TIME + 6, // NF_TIME_HH_MMSS00
+ZF_STANDARD_DATETIME, // NF_DATETIME_SYSTEM_SHORT_HHMM
+ZF_STANDARD_DATETIME + 1, // NF_DATETIME_SYS_DDMM_HHMMSS
+ZF_STANDARD_LOGICAL, // NF_BOOLEAN
+ZF_STANDARD_TEXT, // NF_TEXT
+ZF_STANDARD_FRACTION + 2, // NF_FRACTION_3
+ZF_STANDARD_FRACTION + 3 // NF_FRACTION_4
};
-static IndexTable theIndexTable;
-
-
-
/**
instead of every number formatter being a listener we have a registry which
also handles one instance of the SysLocale options
@@ -1918,21 +1960,6 @@ sal_uInt32 SvNumberFormatter::GetFormatSpecialInfo(
const OUString rFormatStrin
return nCheckPos;
}
-
-inline sal_uInt32 SetIndexTable( NfIndexTableOffset nTabOff, sal_uInt32
nIndOff )
-{
-osl::MutexGuard aGuard(theIndexTable.maMtx);
-
-if (!theIndexTable.mbInitialized)
-{
-DBG_ASSERT(theIndexTable.maData[nTabOff] ==
NUMBERFORMAT_ENTRY_NOT_FOUND,
-SetIndexTable: theIndexTable[nTabOff] already occupied );
-theIndexTable.maData[nTabOff] = nIndOff;
-}
-return nIndOff;
-}
-
-
sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex(
[Libreoffice-bugs] [Bug 93495] increase / decrease indent buttons with heading styles change style instead
https://bugs.documentfoundation.org/show_bug.cgi?id=93495 --- Comment #3 from Steve Beisner beis...@alum.mit.edu --- OSX 10.10.5 Libre Office from download page. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93495] increase / decrease indent buttons with heading styles change style instead
https://bugs.documentfoundation.org/show_bug.cgi?id=93495 --- Comment #2 from Steve Beisner beis...@alum.mit.edu --- 1) open new document. 2) insert several lines/paragraphs. 3) format one of them as a heading/outline style. 4) try to use increase/decrease indent buttons. Instead of changing the indent, the style is changed to a different heading style. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 91129] comment seems empty when opening, editing not possible
https://bugs.documentfoundation.org/show_bug.cgi?id=91129 --- Comment #9 from jipeel4...@hotmail.com --- In my case (bug 93484) i can see that the background color of the empty comments is automatically changed and the good ones no. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92995] EDITING: copy-paste causes crash
https://bugs.documentfoundation.org/show_bug.cgi?id=92995 --- Comment #9 from Eike Rathke er...@redhat.com --- @Timur: Can you attach a backtrace with symbols, preferably produced on Linux? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
