[Libreoffice-commits] .: Branch 'feature/masterpages' - 2 commits - extras/source
dev/null |binary extras/source/templates/layout/Metropolis.otp |binary extras/source/templates/layout/Sunset.otp |binary 3 files changed New commits: commit dca9b3b9790fd4c29d17f0ab634f3ef001d7458c Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 08:19:52 2012 +0200 Modify Metropolis template * use SVG background image (saves lots of space) * remove stains etc to produce a cleaner look * strip language tags * set zoom to 75% Metropolis was created by Alexander Wilms and is licensed under CC0. Change-Id: I269e9121a5e9dff0fbafa94c9da0f2cec1c59108 diff --git a/extras/source/templates/layout/Metropolis.otp b/extras/source/templates/layout/Metropolis.otp index ade2c81..066adb0 100644 Binary files a/extras/source/templates/layout/Metropolis.otp and b/extras/source/templates/layout/Metropolis.otp differ commit 84778e14a5eb294eec001f5a9eed8257604957c4 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 07:44:27 2012 +0200 Replace Cuba Libre template with Sunset * don't mention Cuba * don't put text frames at an angle (ugly rendering) * strip language tags * set zoom to 75% Sunset was done by Alexander Wilms and is licensed under CC0. Change-Id: I035903ba052c89ddbfb1738d80302114b02b2cc1 diff --git a/extras/source/templates/layout/CubaLibre.otp b/extras/source/templates/layout/CubaLibre.otp deleted file mode 100644 index 8100a04..000 Binary files a/extras/source/templates/layout/CubaLibre.otp and /dev/null differ diff --git a/extras/source/templates/layout/Sunset.otp b/extras/source/templates/layout/Sunset.otp new file mode 100644 index 000..f4c03b9 Binary files /dev/null and b/extras/source/templates/layout/Sunset.otp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - connectivity/source
connectivity/source/commontools/dbtools.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0a3744b78b52c403630eff81c756ba1543e9c84b
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Jul 2 14:52:58 2012 +0200
fdo#51619 do not ask for parameters if all have already been given
Change-Id: I1c1b1e46e7269bbfa24fbc0c0ebf5ba0f5aad7b9
(cherry picked from commit c34ef6b710bd9f3a5beac3be856c970c70e68610)
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Fridrich Strba fridrich.st...@graduateinstitute.ch
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 35482a2..5113e4f 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1820,7 +1820,7 @@ void askForParameters(const Reference
XSingleSelectQueryComposer _xComposer,
ReferenceXNameAccess xParamsAsNames(xParamsAsIndicies, UNO_QUERY);
sal_Int32 nParamCount = xParamsAsIndicies.is() ?
xParamsAsIndicies-getCount() : 0;
::std::vectorbool, std::allocatorbool aNewParameterSet(
_aParametersSet );
-if ( nParamCount ||
::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) !=
nParamCount )
+if ( nParamCount
::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) !=
nParamCount )
{
static const ::rtl::OUString
PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME));
aNewParameterSet.resize(nParamCount ,false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 51619, which changed state. Bug 51619 Summary: [CRASH] legacy reports: asks for parameters, then for empty parameters list then CRASH https://bugs.freedesktop.org/show_bug.cgi?id=51619 What|Old Value |New Value Resolution||FIXED Status|ASSIGNED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: Branch 'libreoffice-3-5-5' - filter/source
filter/source/msfilter/msdffimp.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 78eec35a8d07a5e94968c525bb5aa2f22d43b606 Author: Caolán McNamara caol...@redhat.com Date: Mon May 28 16:13:09 2012 +0100 clip max entries Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Fridrich Strba fridrich.st...@graduateinstitute.ch Signed-off-by: Miklos Vajna vmik...@suse.cz diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 3107635..56234e2 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6049,6 +6049,9 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL ) escher, FIDCL list longer than remaining bytes, ppt or parser is wrong); mnIdClusters = std::min(nMaxEntriesPossible, static_castsal_Size(mnIdClusters)); +sal_Size nMaxEntriesAllocatable = SAL_MAX_INT32 / sizeof(FIDCL); +mnIdClusters = std::min(nMaxEntriesAllocatable, static_castsal_Size(mnIdClusters)); + mpFidcls = new FIDCL[ mnIdClusters ]; memset(mpFidcls, 0, mnIdClusters * sizeof(FIDCL)); for (sal_uInt32 i = 0; i mnIdClusters; ++i) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - 2 commits - sc/inc sc/qa sc/source
sc/inc/document.hxx|3 +
sc/qa/unit/subsequent_filters-test.cxx | 61 +
sc/source/core/data/cell.cxx |3 +
sc/source/core/data/documen2.cxx |1
sc/source/filter/xml/xmlcelli.cxx | 17 +++--
sc/source/filter/xml/xmlimprt.cxx | 12 --
sc/source/ui/docshell/docsh.cxx|2 -
7 files changed, 54 insertions(+), 45 deletions(-)
New commits:
commit 7a0fba0b0225f59f8c38b245cb21b81750271e26
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date: Tue Jul 3 03:06:29 2012 -0500
Use imported formula results if ODS doc was generated by LibreOffice
During ODS import, use imported formula results instead of recalculating if
the document was generated by LibreOffice.
Still need to implement recalculating special cases such as NOW().
Change-Id: Ia54690224dc0d8f74b93cafd8d01b072e85c7416
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index b4df35b..7559a4e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -371,6 +371,7 @@ private:
boolbInsertingFromOtherDoc;
boolbLoadingMedium;
boolbImportingXML; // special handling of formula text
+boolbImportingLiboGenDoc; //to avoid recalculating formula
results of libo generated docs
boolbXMLFromWrapper;// distinguish ScXMLImportWrapper
from external component
boolbCalcingAfterLoad; // in CalcAfterLoad
TRUE
// don't construct/destruct listeners temporarily
@@ -1563,6 +1564,8 @@ public:
voidSetLoadingMedium( bool bVal );
voidSetImportingXML( bool bVal );
boolIsImportingXML() const { return bImportingXML; }
+voidSetImportingLiboGenDoc( bool bVal ) { bImportingLiboGenDoc
= bVal; };
+boolIsImportingLiboGenDoc() const { return
bImportingLiboGenDoc; }
voidSetXMLFromWrapper( bool bVal );
boolIsXMLFromWrapper() const { return bXMLFromWrapper; }
voidSetCalcingAfterLoad( bool bVal ) { bCalcingAfterLoad =
bVal; }
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 338b0ab..4d12292 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -1830,7 +1830,8 @@ void ScFormulaCell::SetDirty()
void ScFormulaCell::SetDirtyVar()
{
-bDirty = true;
+if(!pDocument-IsImportingLiboGenDoc())
+bDirty = true;
// mark the sheet of this cell to be calculated
//#FIXME do we need to revert this remnant of old fake vba events?
pDocument-AddCalculateTable( aPos.Tab() );
}
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 2419859..0921f20 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -188,6 +188,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
bInsertingFromOtherDoc( false ),
bLoadingMedium( false ),
bImportingXML( false ),
+bImportingLiboGenDoc( false ),
bXMLFromWrapper( false ),
bCalcingAfterLoad( false ),
bNoListening( false ),
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 1457033..fac8481 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -757,6 +757,8 @@ void ScXMLTableRowCellContext::AddTextCellToDoc( const
ScAddress rCurrentPos,
pFCell-SetHybridString( *pOUText );
else
bDoIncrement = false;
+if(rXMLImport.GetDocument()-IsImportingLiboGenDoc())
+pFCell-ResetDirty();
}
}
else
@@ -788,7 +790,12 @@ void ScXMLTableRowCellContext::AddNumberCellToDoc( const
ScAddress rCurrentPos
{
ScBaseCell* pCell = rXMLImport.GetDocument()-GetCell( rCurrentPos );
if ( pCell pCell-GetCellType() == CELLTYPE_FORMULA )
-static_castScFormulaCell*(pCell)-SetHybridDouble( fValue );
+{
+ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
+pFCell-SetHybridDouble( fValue );
+if(rXMLImport.GetDocument()-IsImportingLiboGenDoc())
+pFCell-ResetDirty();
+}
}
else
{
@@ -1013,10 +1020,13 @@ void ScXMLTableRowCellContext::AddNonMatrixFormulaCell(
const ScAddress rCellPo
pNewCell = new ScFormulaCell( pDoc, rCellPos, pCode, eGrammar,
MM_NONE );
delete pCode;
+ScFormulaCell* pFCell = static_castScFormulaCell*(pNewCell);
if( bFormulaTextResult pOUTextValue !pOUTextValue-isEmpty()
)
-static_castScFormulaCell*(pNewCell)-SetHybridString(
*pOUTextValue );
+pFCell-SetHybridString( *pOUTextValue );
else
-static_castScFormulaCell*(pNewCell)-SetHybridDouble( fValue
);
+
Metropolis does not load anymore in feature/masterpages
Hi Astron, all, I jsut removed BrightBlue and Progress in feature/masterpages and rechecked the result with a clean build and found that Metropolis does not load anymore as a masterpage, although it worked before. I suspect: commit dca9b3b9790fd4c29d17f0ab634f3ef001d7458c Author: Stefan Knorr (astron) heinzless...@gmail.com Modify Metropolis template to have to do with it. @Astron: Could you redo the steps you did there in an installation and see which one broke the loading as a masterpage? In the end, if we find out what the trouble with BrightBlue is this might actually be good. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/masterpages' - 9 commits - extras/source
dev/null |binary extras/source/templates/layout/AbstractGreen.otp |binary extras/source/templates/layout/AbstractRed.otp|binary extras/source/templates/layout/AbstractYellow.otp |binary extras/source/templates/layout/BrightBlue.otp |binary extras/source/templates/layout/DNA.otp|binary extras/source/templates/layout/Inspiration.otp|binary extras/source/templates/layout/LushGreen.otp |binary extras/source/templates/layout/Vintage.otp|binary 9 files changed New commits: commit a1586f2a4ace4b26db553673064650b82c0c1e68 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 10:44:02 2012 +0200 Modify Bright Blue template * set zoom to 50% * strip lang attribs * Alex Wilms removed the puzzle pieces â saves some space clutter Change-Id: I3561b0951ec7c08b7edd626e3503135b4913b6e7 diff --git a/extras/source/templates/layout/BrightBlue.otp b/extras/source/templates/layout/BrightBlue.otp index 5eaf509..166a7aa 100644 Binary files a/extras/source/templates/layout/BrightBlue.otp and b/extras/source/templates/layout/BrightBlue.otp differ commit ec24c8802018e0385c9ac5e7495fb2cc78e48c58 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 10:32:04 2012 +0200 Modify DNA template * run background through optipng (very moderate savings) * replace fonts with Liberation Sans/Serif * set zoom to 50% * strip lang attribs Change-Id: I361e3af47a09e356c6603e37f56f82c11db7808a diff --git a/extras/source/templates/layout/DNA.otp b/extras/source/templates/layout/DNA.otp index c278f84..dfc8bdf 100644 Binary files a/extras/source/templates/layout/DNA.otp and b/extras/source/templates/layout/DNA.otp differ commit 0e7e5b69987fc82476145e5d3f078a33d96a7870 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 10:16:00 2012 +0200 Add Abstract Yellow template Abstract Yellow was created by Alexander Wilms and further modifed by myself. It is released under the CC0 license. Change-Id: I52f85957eb0a3998cd911556a9e86e6205ae891b diff --git a/extras/source/templates/layout/AbstractYellow.otp b/extras/source/templates/layout/AbstractYellow.otp new file mode 100644 index 000..f38ec22 Binary files /dev/null and b/extras/source/templates/layout/AbstractYellow.otp differ commit 11f1e073e2c24b70a80470053b8641530cd98c47 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 10:00:26 2012 +0200 Rename Green Typography template to Abstract Green * there's no typography that's worth speaking of â so rename * set zoom to 50% * strip lang tags * use SVG background image Change-Id: I6e9f69c681c2c0844753e80b6965e6c7107f4b0f diff --git a/extras/source/templates/layout/AbstractGreen.otp b/extras/source/templates/layout/AbstractGreen.otp new file mode 100644 index 000..9f14073 Binary files /dev/null and b/extras/source/templates/layout/AbstractGreen.otp differ diff --git a/extras/source/templates/layout/GreenTypography.otp b/extras/source/templates/layout/GreenTypography.otp deleted file mode 100644 index 3328a0b..000 Binary files a/extras/source/templates/layout/GreenTypography.otp and /dev/null differ commit 4319a85b3ce66947d08c69507b2c1d616bc4b769 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 09:54:14 2012 +0200 Rename Red Typography to Abstract Red * there's no typography to speak of â so change that name * set zoom to 50% * use SVG background * strip lang tags Change-Id: I4878ec6cc6f8fbb0902fc49f8005a5f7dad1b2d0 diff --git a/extras/source/templates/layout/AbstractRed.otp b/extras/source/templates/layout/AbstractRed.otp new file mode 100644 index 000..d228b6f Binary files /dev/null and b/extras/source/templates/layout/AbstractRed.otp differ diff --git a/extras/source/templates/layout/RedTypography.otp b/extras/source/templates/layout/RedTypography.otp deleted file mode 100644 index e0a1ea0..000 Binary files a/extras/source/templates/layout/RedTypography.otp and /dev/null differ commit ab5190e34258f9b7edb20a238caaab565147a32c Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 09:44:17 2012 +0200 Modify Lush Green template * use SVG background image to save space * set zoom level to 75% * strip lang tags Change-Id: Ifbefcb81caa43aa9e07386616afc9f9a4bb00275 diff --git a/extras/source/templates/layout/LushGreen.otp b/extras/source/templates/layout/LushGreen.otp index 2a83c03..df166cc 100644 Binary files a/extras/source/templates/layout/LushGreen.otp and b/extras/source/templates/layout/LushGreen.otp differ commit 951972b8bd5927a37ec6bb4583ed12ffa9a37da5 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 09:31:05 2012 +0200 Modify Vintage template * use part-SVG-part-PNG background to save space
[REVIEW-3-6] feature/masterpages
Hello Björn, Petr, can you please have a look at the stuff I've done in feature/masterpages. To be quite honest, I haven't tried building with it yet, so I don't know if Bright Blue works now from the template dialogue or not. Otherwise, though I tried to do everything Petr asked us to. Also, I've removed a number of master pages, usually for size or license reasons (Ron Faile hasn't given us a license statement, Mateus only gave us one for a single template). Regards, Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6] feature/masterpages
Ugh... sorry, really should have tried building with the new master pages, as Björn's message indicates. Also note that I could not use Caolan's script for some reason, so I unzipped them manually and then used sed on styles.xml... Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GERRIT - MAINTANANCE] Update of Gerrit on Weekend 06.07. to 08.07.
Hi List, we will do an Update of Gerrit on upcoming Weekend. Therefore Gerrit has a short Downtime of about 1 Hour. I Will notify you shourtly before we begin working. Thanks a lot Robert -- The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint Robert Einsle r.ein...@documentfoundation.org Admin Team / Infrastructure ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
missing configure option: --without-cppunit -- was [BUILD] consistent test failures under windows
Hi, Zitat von Mat M m...@gmx.fr: Hello Le Sun, 10 Jun 2012 12:44:42 +0200, Korrawit Pruegsanusak detective.conan.1...@gmail.com a écrit: I think you should disable your antivirus during the build. It captures CVE files as a threat, and delete / quarantine them. I eventually found that files are copied into the tmp folder of cygwin before being used by tests, so c:\cygwin\tmp is the path to exclude, not the libo sources one. it only works if you do have admin rights. Think about enterprise where you do not have it. In that case you will end up manually commented all CVE cpp units calls in the tree (and there are a lot). Actually I'm missing the build option: --without-ccpunit (or at least --without-cve-unit) Unit tests are really important and we need more of them. In some circumstances however (tracking down critical problems on some strange platform) all you want is to get debug build done and not to mess around with ... antivirus settings! Unfortunatelly current integration of cpp units in LO build infrastructure is broken. To see why try to activate the production option --without-xmlsec on linux ... and you will not be able to build at all. And yes I provided a patch for that (you can find it on ML) and it was rejected with (a bad) joke justification: you *should* not use *this* option on linux. Another option would be to introduce some means to activate only specific cpp units: --enable-cppunit=sw like lately introduced per lib activation of debug symbols. I am going to provide a patch for this option: --without-cppunit (note we have already --without-junit). It more or less one line change ... so next time you would have a choice ;-) Regards David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: port spreadsheet engine to iOS
Thanks very much for the reply, tml! It makes a lot of sense. Basically, from your experience, how many times does it cost to build a lib which has the functionality I list in my question? or you guys have already done this part? BTW, what is the current status of porting the whole LO to iOS? Thanks, Wade On Mon, Jul 2, 2012 at 1:27 AM, Tor Lillqvist t...@iki.fi wrote: I'm going to port the spreadsheet engine to iOS platform. I was just wondering is there anyone here who once did the same work before? Or could someone give me some directions/suggestions to do so? Well, yes, most of the LIbreOffice platform-independent code compiles just fine for iOS. What remains to be done is to fill in more of the the details so that necessary UNO components that aren't dynamically loaded on iOS but statically linked, get statically linked. Of course, which UNO components will be needed at run-time depends on the app the code is used in. And other bits and pieces. Of course if one wants to build an actual app that uses LO code to handle text, spreadsheet and/or presentation documents, all UI code is missing. Assuming the plan we have been following so far (for Android) is the right one, i.e. that UI code needs to be platform-specific, and that re-use of desktop UI components in LO for touch platforms is wrong. Just have a look in README.cross and learn to build the stuff yourself. And then you need to understand a bit about how LibreOffice works, UNO etc, before you can work on getting more of that to hang properly together. There is a unit test program in ios/qa that builds using Xcode into an iOS .app that corresponds to the sc_filters_test unt test. That is the test program I have been tinkering with now and then. All the relevant other bits of LO has to be built first, using LO's normal build mechanism, before you can build the Xcode project there. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Mon, 2012-07-02 at 18:35 +0200, Lionel Elie Mamane wrote: On Fri, Jun 29, 2012 at 09:56:32AM +0100, Michael Meeks wrote: * CXX0X-ABI incompatibility can of worms (Bjoern) + gcc 4.7 - cxx0x extension is binary incompatible + incompatible stdlib symbols that bust + http://gcc.gnu.org/ml/gcc/2012-06/msg00201.html + luck that it worked until now: it was compatible. AA: + should disable in our builds by default (Bjoern) The linked thread suggests that this is a bug / not intended to have gone in GCC 4.7, and that the right thing that will be done is bump the soname? Well yes, the thread on the gcc list, after initially running into the ground, seems to continue in a more encouraging direction yesterday / today - focused on reverting the ABI breakage - I believe Ubuntu did this already in their gcc ;-) That's my preferred solution too I think :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-5-6] resolved fdo#51601 do not attempt to compile running formula cell
Hi, Please review attached patch for 3-5-6 It is a quick fix for https://bugs.freedesktop.org/show_bug.cgi?id=51601 Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD resolved fdo#51601 do not attempt to compile running formula cell From: Eike Rathke er...@redhat.com 2fb377c19f8ae38e7ec649af1343bbd64b70a16b introduced compilation of a formula cell while it is interpreted, ignoring the comment just above why that does NOT work ... This removes the portion that is responsible for the crash as a quick fix, a more sophisticated solution might be needed to make the original intention work. --- sc/source/core/data/cell.cxx | 11 --- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 4ed94b9..29ecd68 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -1527,7 +1527,9 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) // #i11719# no UPN and no error and no token code but result string present // = interpretation of this cell during name-compilation and unknown names // = can't exchange underlying code array in CompileTokenArray() / -// Compile() because interpreter's token iterator would crash. +// Compile() because interpreter's token iterator would crash or pCode +// would be deleted twice if this cell was interpreted during +// compilation. // This should only be a temporary condition and, since we set an // error, if ran into it again we'd bump into the dirty-clearing // condition further down. @@ -1536,12 +1538,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) pCode-SetCodeError( errNoCode ); // This is worth an assertion; if encountered in daily work // documents we might need another solution. Or just confirm correctness. -OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but string - Try compiling it. ); -// Force Compilation -String aFormula = aResult.GetHybridFormula(); -aResult.SetHybridFormula( String() ); -Compile( aFormula ); -InterpretTail( eTailParam ); +OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but hybrid formula string ); return; } CompileTokenArray(); pgp2JF2j3VHWu.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - offapi/com
offapi/com/sun/star/table/BorderLine2.idl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ae14f3587e091cfdb3ceca0e744e715ac13d7fac
Author: Andras Timar ati...@suse.com
Date: Tue Jul 3 11:27:20 2012 +0200
move comment to correct place in BorderLine2.idl
Change-Id: I4618f91b0a000c6bece39936a97a5e3ce13b0925
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/offapi/com/sun/star/table/BorderLine2.idl
b/offapi/com/sun/star/table/BorderLine2.idl
index 1f00e18..3fc3887 100644
--- a/offapi/com/sun/star/table/BorderLine2.idl
+++ b/offapi/com/sun/star/table/BorderLine2.idl
@@ -38,11 +38,11 @@ module com { module sun { module star { module table {
//=
-struct BorderLine2 : BorderLine
/** A border line, extended with line style.
@since LibreOffice 3.4
*/
+struct BorderLine2 : BorderLine
{
/** Style of the border. @see BorderLineStyle
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: API Documentation - cronjob for website update
2012/7/2 Lionel Elie Mamane lio...@mamane.lu: On Mon, Jul 02, 2012 at 11:33:21AM +0200, Michael Stahl wrote: On 30/06/12 21:32, Miklos Vajna wrote: Hm, sounds like api.libreoffice.org is not updated regularly (...) Andras, do you know if we have a cronjob for doing that, please? i'm not sure if a cronjob is necessary -- the API documentation on the website should be generated from the latest stable release, and that doesn't change so often; it would need a manual switch to the next release branch in any case. That's assuming it is part of our release process to update api.libreoffice.org. I mean: it is someone's task, so that it does not fall in the cracks. I updated the website now, see http://api.libreoffice.org/common/ref/com/sun/star/table/BorderLine2.html We don't have a cronjob for this, API does not change much after branching off the stable version. So far I updated the site manually. Just ping me, if I forget to push a change. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - dbaccess/source filter/source sd/source sd/util svx/source svx/util sw/source sw/util vcl/source
dbaccess/source/ui/dlg/AutoControlsDef.hrc | 86 --- dbaccess/source/ui/misc/dbumiscres.hrc | 53 filter/source/graphicfilter/icgm/cgmres.hrc | 18 sd/source/ui/app/_app.hrc | 32 --- sd/source/ui/dlg/celltempl.cxx | 121 sd/source/ui/dlg/celltempl.src | 73 sd/source/ui/inc/celltempl.hrc | 19 sd/source/ui/inc/packgdlg.hrc | 22 - sd/source/ui/inc/preview.hrc| 18 sd/util/hidother.hrc| 33 --- svx/source/src/hidgen.hrc | 24 - svx/util/hidother.hrc | 18 sw/source/ui/frmdlg/pattern.hrc | 21 sw/util/hidother.hrc| 22 - vcl/source/src/throbber.src | 106 15 files changed, 666 deletions(-) New commits: commit d8c91a5276bca967ab7ea81b0bddd2503a32e50b Author: Thomas Arnhold tho...@arnhold.org Date: Tue Jul 3 11:48:49 2012 +0200 hrc cleanup: Remove unused hrc files Change-Id: I16d83ca3ea0e01f2c0f4115db18b97958e51afde diff --git a/dbaccess/source/ui/dlg/AutoControlsDef.hrc b/dbaccess/source/ui/dlg/AutoControlsDef.hrc deleted file mode 100644 index 2f3cd3b..000 --- a/dbaccess/source/ui/dlg/AutoControlsDef.hrc +++ /dev/null @@ -1,86 +0,0 @@ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / - - -#ifndef _DBAUI_AUTOCONTROLSDEF_HRC_ -#define _DBAUI_AUTOCONTROLSDEF_HRC_ - -#define FT_AUTOJDBCDRIVERCLASS 80 -#define FT_AUTOFIELDSEPARATOR 81 -#define FT_AUTOTEXTSEPARATOR82 -#define FT_AUTODECIMALSEPARATOR 83 -#define FT_AUTOTHOUSANDSSEPARATOR 84 -#define FT_AUTOPORTNUMBER 85 -#define FT_AUTOPORTNUMBERDEFAULT86 -#define FT_AUTOBASEDN 87 -#define FT_AUTOHOSTNAME 88 -#define FT_AUTOBROWSEURL89 -#define FT_AUTODATABASENAME 90 -#define FT_AUTOWIZARDHELPTEXT 91 -#define FT_AUTOWIZARDHEADER 92 -#define FT_AUTOEXTENSIONHEADER 93 -#define FT_AUTOOWNEXTENSIONAPPENDIX 94 -#define FT_CHARSET 95 -#define FT_SOCKET 96 - -#define FL_AUTOSEPARATOR2 80 -#define FL_DATACONVERT 81 -#define FL_SEPARATOR1 82 - -#define CB_AUTOHEADER 80 - -#define PB_AUTOTESTDRIVERCLASS 80 -#define PB_AUTOBROWSEURL81 - -#define CM_AUTOFIELDSEPARATOR 80 -#define CM_AUTOTEXTSEPARATOR81 -#define CM_AUTODECIMALSEPARATOR 82 -#define CM_AUTOTHOUSANDSSEPARATOR 83 - -#define NF_AUTOPORTNUMBER 80 - -#define ET_AUTOBASEDN 80 -#define ET_AUTOHOSTNAME 81 -#define ET_AUTODATABASENAME 82 -#define ET_AUTOBROWSEURL83 -#define ET_AUTOJDBCDRIVERCLASS 84 -#define ET_AUTOOWNEXTENSION 85 -#define ET_SOCKET 86 - -#define RB_AUTOACCESSCTEXTFILES 80 -#define RB_AUTOACCESSCCSVFILES 81 -#define RB_AUTOACCESSOTHERS 82 - -#define LB_CHARSET 80 - -#define STR_AUTOFIELDSEPARATORLIST 100 -#define STR_AUTOTEXTSEPARATORLIST 101 -#define STR_AUTOTEXT_FIELD_SEP_NONE 102 -#define STR_AUTODELIMITER_MISSING 103 -#define STR_AUTODELIMITER_MUST_DIFFER 104 -#define STR_AUTONO_WILDCARDS105 -#endif // _DBAUI_AUTOCONTROLSDEF_HRC_ diff --git a/dbaccess/source/ui/misc/dbumiscres.hrc b/dbaccess/source/ui/misc/dbumiscres.hrc deleted file mode 100644 index b27d086..000 --- a/dbaccess/source/ui/misc/dbumiscres.hrc +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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
Re: [REVIEW 3-5-6] resolved fdo#51601 do not attempt to compile running formula cell
On 03/07/12 10:22, Eike Rathke wrote: Hi, Please review attached patch for 3-5-6 It is a quick fix for https://bugs.freedesktop.org/show_bug.cgi?id=51601 for what it's worth preventing a crash seems sensible to me +1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-5-6] resolved fdo#51601 do not attempt to compile running formula cell
Eike Rathke píše v Út 03. 07. 2012 v 11:22 +0200: Hi, Please review attached patch for 3-5-6 It is a quick fix for https://bugs.freedesktop.org/show_bug.cgi?id=51601 It solves the crash here. The comment warns about the crash, so the operation was indeed dangerous. It did not crash that often, so this code is probably used only rarely = probably small loss in the import quality. I prefer to have it more stable = I am for this fix. We need two more approvals for 3-5-5 branch. I would like to hear from Markus or Muthu. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Metropolis does not load anymore in feature/masterpages
Hi Björn, @Astron: Could you redo the steps you did there in an installation and see which one broke the loading as a masterpage? In the end, if we find out what the trouble with BrightBlue is this might actually be good. I would try to – but I can't seem to reproduce the breakage: * Preview works for me, * Opening the template works too. The only thing that's weird is the zoom level – which doesn't adhere to the settings I thought I'd saved. Since building would have taken a bit long now, I've taken the shortcut of installing the 3.6-64-bit .debs version of 3.6 beta 2 and then copying the templates into /opt/lodev3.6/share/templates/common/layout . I've also tried with the official Ubuntu version LibO 3.5.4.2, it also works. Maybe the templates break due to something being run over them during the build? Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-5-6] resolved fdo#51601 do not attempt to compile running formula cell
+1. Looks fine to me. The patch path (2fb377c19f8ae38e7ec649af1343bbd64b70a16b) has long been disabled (because of related issues like these). The idea was to import quick and compile the formula only when necessary, but there's quite some pending work there... On 07/03/2012 02:52 PM, Eike Rathke wrote: Hi, Please review attached patch for 3-5-6 It is a quick fix for https://bugs.freedesktop.org/show_bug.cgi?id=51601 Thanks Eike ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/tubes' - sc/CustomTarget_uiconfig.mk sc/Module_sc.mk sc/Package_uiconfig.mk sc/uiconfig solenv/gbuild
sc/CustomTarget_uiconfig.mk | 22 ++ sc/Module_sc.mk |1 + sc/Package_uiconfig.mk|2 ++ sc/uiconfig/scalc/menubar/menubar.xml |3 +-- solenv/gbuild/CustomTarget.mk |1 + 5 files changed, 27 insertions(+), 2 deletions(-) New commits: commit a6cd97c29c1cfdb0679d693b7b350f34427a9da6 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Jul 3 12:40:14 2012 +0200 tubes: add Collaborate menu item only in telepathy enabled build Change-Id: Ibfd90941a64540d0e59f1e884a0992758cbc3bb8 diff --git a/sc/CustomTarget_uiconfig.mk b/sc/CustomTarget_uiconfig.mk new file mode 100644 index 000..8e4e1ae --- /dev/null +++ b/sc/CustomTarget_uiconfig.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,sc/uiconfig)) + +ifeq ($(ENABLE_TELEPATHY),TRUE) +$(call gb_CustomTarget_get_target,sc/uiconfig) : \ + $(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml + +$(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml : $(SRCDIR)/sc/uiconfig/scalc/menubar/menubar.xml \ + | $(OUTDIR)/xml/uiconfig/modules/scalc/menubar/.dir + sed 's/.*.uno:Collaborate.*/menu:menuseparator\/\n menu:menuitem menu:id=.uno:Collaborate\//' $ $@ + +endif + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 3afcaf2..6f5b034 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Module_Module,sc)) $(eval $(call gb_Module_add_targets,sc,\ AllLangResTarget_sc \ + CustomTarget_uiconfig \ Library_sc \ Library_scd \ Library_scfilt \ diff --git a/sc/Package_uiconfig.mk b/sc/Package_uiconfig.mk index bc3ec4d..f85a789 100644 --- a/sc/Package_uiconfig.mk +++ b/sc/Package_uiconfig.mk @@ -21,7 +21,9 @@ # instead of those above. $(eval $(call gb_Package_Package,sc_uiconfig,$(SRCDIR)/sc/uiconfig)) +ifneq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/menubar/menubar.xml,scalc/menubar/menubar.xml)) +endif $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/statusbar/statusbar.xml,scalc/statusbar/statusbar.xml)) $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/alignmentbar.xml,scalc/toolbar/alignmentbar.xml)) $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/arrowshapes.xml,scalc/toolbar/arrowshapes.xml)) diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 6104095..71ad4f8 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -15,8 +15,7 @@ menu:menuseparator/ menu:menuitem menu:id=.uno:Reload/ menu:menuitem menu:id=.uno:VersionDialog/ -menu:menuseparator/ -menu:menuitem menu:id=.uno:Collaborate/ +!-- .uno:Collaborate menuitem, see CustomTarget_uiconfig.mk -- menu:menuseparator/ menu:menuitem menu:id=.uno:ExportTo/ menu:menuitem menu:id=.uno:ExportToPDF/ diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 31c5e9c..d8b59d2 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -43,6 +43,7 @@ $(call gb_CustomTarget_get_clean_target,%) : define gb_CustomTarget_CustomTarget $(eval $(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1 +$(call gb_CustomTarget_get_target,$(1)) :| $(dir $(call gb_CustomTarget_get_target,$(1))).dir endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Document conversion engine
Hello, my name is Flávio Moringa, I'm from Portugal and I'm starting my Masters Dissertation next September (Master in Open Source software - http://moss.dcti.iscte.pt ). I'm the Caixa Mágica project leader, the main Linux distribution in Portugal (http://www.caixamagica.pt), with deploys reaching almost a million machines with our Linux distribution, mainly in Education. I chose as my masters dissertation investigation topic trying to improve the document conversion engine in LibreOffice (ex: converting docx to odt), and as such I would like to know who is working on the conversion engines and how can I help. I'm not a programmer, so what I'm interested in doing is something in the lines of investigating the main conversion problems, identifying the possible conversion flows, analysing the way the conversion flow is implemented in LibreOffice, and eventually trying to improve this flow somehow. For now I'd like just to get to know the people involved, development plans, and all informatioin you find relevant. Hope to ear from you. You can contact-me directly if you which at: flavio.moringaATcaixamagica.pt Your's trully -- *Flávio Moringa* Project Leader Caixa Mágica Software Energia Open Source Rua Soeiro Pereira Gomes, Lote 1 - 4.º B, Edifício Espanha, 1600-196 Lisboa - Portugal Tel.: +351 217 921 260 Fax: +351 217 921 261 http://www.caixamagica.pt https://twitter.com/flaviomoringa https://www.facebook.com/flaviomoringahttps://www.facebook.com/flavio.moringa http://pt.linkedin.com/in/flaviomoringa http://people.caixamagica.pt/flaviomoringa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - sc/source
sc/source/core/data/cell.cxx | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) New commits: commit be67632e9eb298af8a5582c0e06cad9218fa5b71 Author: Eike Rathke er...@redhat.com Date: Tue Jul 3 12:51:53 2012 +0200 resolved fdo#51601 do not attempt to compile running formula cell 2fb377c19f8ae38e7ec649af1343bbd64b70a16b introduced compilation of a formula cell while it is interpreted, ignoring the comment just above why that does NOT work ... This removes the portion that is responsible for the crash as a quick fix, a more sophisticated solution might be needed to make the original intention work. Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Noel Power nopo...@suse.com Signed-off-by: Muthu Subramanian K sumu...@suse.com diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 4ed94b9..29ecd68 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -1527,7 +1527,9 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) // #i11719# no UPN and no error and no token code but result string present // = interpretation of this cell during name-compilation and unknown names // = can't exchange underlying code array in CompileTokenArray() / -// Compile() because interpreter's token iterator would crash. +// Compile() because interpreter's token iterator would crash or pCode +// would be deleted twice if this cell was interpreted during +// compilation. // This should only be a temporary condition and, since we set an // error, if ran into it again we'd bump into the dirty-clearing // condition further down. @@ -1536,12 +1538,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) pCode-SetCodeError( errNoCode ); // This is worth an assertion; if encountered in daily work // documents we might need another solution. Or just confirm correctness. -OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but string - Try compiling it. ); -// Force Compilation -String aFormula = aResult.GetHybridFormula(); -aResult.SetHybridFormula( String() ); -Compile( aFormula ); -InterpretTail( eTailParam ); +OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but hybrid formula string ); return; } CompileTokenArray(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Metropolis does not load anymore in feature/masterpages
Hi Stefan, On Tue, Jul 03, 2012 at 12:27:30PM +0200, Stefan Knorr wrote: Maybe the templates break due to something being run over them during the build? Ha! You get a cookie! No, you get a cake! Something does evil there. The installed file and the file in the source tree differ. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.5.3'
Tag 'libreoffice-3.5.5.3' created by Petr Mladek pmla...@suse.cz at 2012-07-03 12:01 -0700 Tag libreoffice-3.5.5.3 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJP8tEYAAoJEPQ0oe+v7q6jApAQAIyjp7DFydGSwY6e8omoC0eX ww2h58PaCqhoFKO5xsebQ63ItaUoDZYMJqWv8JpLP5EBD8eexDIdTnaj0qUvqNrB Wau8sQ/c75LFK/EWMb8OGr91jF1bPvb4XhD/wOROuKQfe2XtsmLJSxxBxVPce07h Hu3VDmZ04FChMDPGwoVZj2sY3XoyGoo33jVA2N38nvN/+bnHC6PaWT+LHJfheNZx gMkYP4DcfcpVTxPlSNr8BNzXnljPe5+S8l5BpN69zral5tfT067JvHhFkV7lRk2N dVaSqaG5SLemajZYQAoSs40yPyFqSoneFu4eBSayVe7iPqLYDOeI3nj6BBWz8nmT 0yYI5pQDG9Kqh6u4iq05eriYE+pVLXLeT5vcfLai0eeEnR6hCXCwFQ50CRu9ogcy ZgradDTWmk/wzPbso16Vqf50Hp9WxamvgbiGey/hA618/75l8OQTZfU6a7Dilgcl uIUULTx1Yp471GIK3H5PIs3jVi92enTUGgkCbEEokmMEdJRBPVM3NJosoiiVuPOc FbvSACB3jnLohzSeVzGAD7UV2rUq9Vu8IcAW9TZAhYBHdZCYEBQ/EBTIdj9vOzKN XPYnA3A9MTIh54dsYlPGYxPy5nuMxy5Q3iRDW0nvulhR798hGZfiadLNUvObdoEB tfwu8wSxPAWdDUvabv/P =291Y -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-1367: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.5.3'
Tag 'libreoffice-3.5.5.3' created by Petr Mladek pmla...@suse.cz at 2012-07-03 12:01 -0700 Tag libreoffice-3.5.5.3 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJP8tEYAAoJEPQ0oe+v7q6jW+gP/2ISSSvPUqThAItRx8nKs3ky ZjFdJa/3xHmYq09fBauiergnkyoBOXYxdBltF2VqSZWJ5kr6u0nazlRHifEZcwO4 hBQU8ELtX268cmU4y0bhRkYxJH4YjjhU0yiyqZ15lYNL/lODeGg2pk7f2cDz5cny /bI0izo3Tg32nrhxjBtPLFpubOtJ/BAH+yvCwc85VqEQ2ADOQ5nGUt/Xf4yjQYXr DxWMROJHWYiTZFRU2m0I/fk32i4hHH5vGfA/px3GvXh4jn1BuJXbY1y5hzfoKXI7 V9a+rVETFEd4e9S7inUaM4qwTWeJFNFCuRhWs9tL0qOHpMKBk/tniKW1526YtiCI t6C47i7iObo6WCBxLwIoRvwtSYLAkCxADi/+uas60M2Hs9pcVh+FzMncaWiDeaG4 rJvK5uU7r2ISLVN1XfBS/dnrjb+zJk1X2Acz0PellfrttTGA9iTmChrTKPs9bt4O vWGCey0EuWmN0WO8FNE2FJqXfeWyqOWaWzi2fcwYM8op4wCpDVMMTSvTkR1nNiQa JykWeylAj3VIIMOCF+r57AGI1HWxWLBv6rTEhzWl8z9Q8f3mUqWUugtCy+s+kjf/ MInk+V52D7CAEfWBO3pnEqHUT0KLvnkz6rU/5nH56NJh99h8nocOSL2fj+sDb9u6 AW0db40K9j7TeSWVviMR =FOxj -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.5.3'
Tag 'libreoffice-3.5.5.3' created by Petr Mladek pmla...@suse.cz at 2012-07-03 12:01 -0700 Tag libreoffice-3.5.5.3 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJP8tEZAAoJEPQ0oe+v7q6jW6QP/3Zi/oAP7nnyuNfhUEwAReiB ogWQkkSjH+5LjjLUfEAjREvAqkJepptsJ24nUWhpNEFUgWIuzRGLZLVPv4+ojSDC 53JuLYBqjgvWZZxH3yIaSpO2WbalqsJHbfEDRrTx1CTXxQd0DssXTPTLICzPniOh FMbpJBQfxFTEL4+mZQ83/mtvJrXnYxxV3UfXO3SoIMyZxrxF5sTUl68lghv+V1Sa xU4WrRyu11frqi5XZvEn3G+8krvHyfSoywZmaC2vPlN2hW4dPajmYbfaOXee6JLu n5laDBWUYQsz8vHr12DVtXwc/qvABebwfAntVdt6+mQq5J3eFIbjQUzuILekjRq9 RY6jODoUHFkEYgR0hl+JEstGgbm6uSD6BQO3w5dSihfVWzuL502DVF6No0iSyvfk 7+cK0oWmQnweINsPy1JUIIVmcFD90J7GEU9kzQMhy7XSOgvrj1ARpv2OMtdtyJcb PkyMnoDKM4xjw9doFWXIdY6qyalN4SbER1bXhxCM/TJJNj4S100eIK5vJ0wdq/kI V16sful7yaATO2LkIirhRbVIwTBNJwVsKnfVJZCL7Nheze3Pqg61wo+uWZPFTCzp G6ixksbMOo5ALxkYMOlerFLZEfyxMId3Vm2vVFAyWbEAk0mr60V8DF1Evw9M6rYf y53iWPGUjHPfoY/1kbk6 =fnMk -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-37: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On Fri, 2012-06-29 at 09:56 +0100, Michael Meeks wrote: * GSOC update (Cedric) + face-to-face mentor meeting in Berlin + submit a private GSOC mentors' BoF @ conference Done: filed a workshop on the conference tool for that. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-5 3-5-5?] fix for fdo#51677, check for valid tab number before using it
Hey, attached a quite simple patch that fixes the crash from fdo#51677. The documents is till not imported correctly but at least it does not crash and the fix is trivial. Regards, Markus 0001-check-for-invalid-tab-number-fdo-51667.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||51685 --- Comment #37 from Michael Meeks michael.me...@novell.com 2012-07-03 04:20:28 PDT --- add bug#51685 - startup component registration / profile compatibility issue. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/cell.cxx | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) New commits: commit e031258c7689219c64c030490c123c0e2544b91a Author: Eike Rathke er...@redhat.com Date: Tue Jul 3 12:51:53 2012 +0200 resolved fdo#51601 do not attempt to compile running formula cell 2fb377c19f8ae38e7ec649af1343bbd64b70a16b introduced compilation of a formula cell while it is interpreted, ignoring the comment just above why that does NOT work ... This removes the portion that is responsible for the crash as a quick fix, a more sophisticated solution might be needed to make the original intention work. Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Noel Power nopo...@suse.com Signed-off-by: Muthu Subramanian K sumu...@suse.com (cherry picked from commit be67632e9eb298af8a5582c0e06cad9218fa5b71) diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 4ed94b9..29ecd68 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -1527,7 +1527,9 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) // #i11719# no UPN and no error and no token code but result string present // = interpretation of this cell during name-compilation and unknown names // = can't exchange underlying code array in CompileTokenArray() / -// Compile() because interpreter's token iterator would crash. +// Compile() because interpreter's token iterator would crash or pCode +// would be deleted twice if this cell was interpreted during +// compilation. // This should only be a temporary condition and, since we set an // error, if ran into it again we'd bump into the dirty-clearing // condition further down. @@ -1536,12 +1538,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) pCode-SetCodeError( errNoCode ); // This is worth an assertion; if encountered in daily work // documents we might need another solution. Or just confirm correctness. -OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but string - Try compiling it. ); -// Force Compilation -String aFormula = aResult.GetHybridFormula(); -aResult.SetHybridFormula( String() ); -Compile( aFormula ); -InterpretTail( eTailParam ); +OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but hybrid formula string ); return; } CompileTokenArray(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/inc sw/source
sw/inc/pagedesc.hxx | 15 +--
sw/source/core/doc/doclay.cxx |2 +-
sw/source/core/text/xmldump.cxx |6 +++---
3 files changed, 17 insertions(+), 6 deletions(-)
New commits:
commit 9cfa2b97cc286a06fe14223abb41ead772b17ad5
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jul 3 14:11:32 2012 +0200
sw: include footer type in layout dump, now really
Change-Id: Ie4b5d04824316c03e7a0b5bdb9d04bd42fad5f88
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 5dbff90..2273fd7 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -149,7 +149,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const
SfxItemSet* pSet )
case RND_STD_FOOTERR:
{
pFmt = new SwFrmFmt( GetAttrPool(),
- (bHeader ? Header : Footer),
+ (bHeader ? Right header : Right footer),
GetDfltFrmFmt() );
SwNodeIndex aTmpIdx( GetNodes().GetEndOfAutotext() );
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 5818f20..6bcf270 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -368,10 +368,10 @@ void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
SwTxtNode *pTxtNode = pTxtFrm-GetTxtNode();
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( txtNodeIndex ),
%lu, pTxtNode-GetIndex() );
}
-if (IsHeaderFrm())
+if (IsHeaderFrm() || IsFooterFrm())
{
-SwHeaderFrm *pHeaderFrm = (SwHeaderFrm*)this;
-rtl::OUString aFmtName = pHeaderFrm-GetFmt()-GetName();
+SwHeadFootFrm *pHeadFootFrm = (SwHeadFootFrm*)this;
+rtl::OUString aFmtName = pHeadFootFrm-GetFmt()-GetName();
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( fmtName ),
%s, BAD_CAST(rtl::OUStringToOString(aFmtName,
RTL_TEXTENCODING_UTF8).getStr()));
}
}
commit fa0f42bafbf24e9141ddee728b160b5ab47077f2
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jul 3 11:41:13 2012 +0200
SwPageDesc: add GetFirstFmt methods
Change-Id: Id0e1185950446d0c9b7159a406315540956baed1
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 08e55c0..be9073c 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -127,8 +127,9 @@ namespace nsUseOnPage
const UseOnPage PD_NONE = 0x; // For internal use only.
const UseOnPage PD_LEFT = 0x0001;
const UseOnPage PD_RIGHT = 0x0002;
-const UseOnPage PD_ALL= 0x0003;
-const UseOnPage PD_MIRROR = 0x0007;
+const UseOnPage PD_FIRST = 0x0004;
+const UseOnPage PD_ALL= 0x0007;
+const UseOnPage PD_MIRROR = 0x000F;
const UseOnPage PD_HEADERSHARE= 0x0040;
const UseOnPage PD_FOOTERSHARE= 0x0080;
const UseOnPage PD_NOHEADERSHARE = 0x00BF; // For internal use only.
@@ -217,6 +218,8 @@ public:
inline const SwFrmFmt *GetRightFmt() const;
inline SwFrmFmt *GetLeftFmt();
inline const SwFrmFmt *GetLeftFmt() const;
+inline SwFrmFmt *GetFirstFmt();
+inline const SwFrmFmt *GetFirstFmt() const;
sal_uInt16 GetRegHeight() const { return nRegHeight; }
sal_uInt16 GetRegAscent() const { return nRegAscent; }
@@ -326,6 +329,14 @@ inline const SwFrmFmt *SwPageDesc::GetLeftFmt() const
{
return nsUseOnPage::PD_LEFT eUse ? aLeft : 0;
}
+inline SwFrmFmt *SwPageDesc::GetFirstFmt()
+{
+return nsUseOnPage::PD_FIRST eUse ? aFirst : 0;
+}
+inline const SwFrmFmt *SwPageDesc::GetFirstFmt() const
+{
+return nsUseOnPage::PD_FIRST eUse ? aFirst : 0;
+}
class SwPageDescExt
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-5 3-5-5] resolved fdo#51601 do not attempt to compile running formula cell
Hi, 3-5-6 should of course had been 3-5-5 ... Pushed http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=e031258c7689219c64c030490c123c0e2544b91a http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-5id=be67632e9eb298af8a5582c0e06cad9218fa5b71 Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpvShy2PwQek.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/documen7.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7f2bea49b3871443608ca7639f9b601fbb9d37b6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jul 3 02:52:55 2012 +0200
check for invalid tab number, fdo#51667
Change-Id: I9aebfafb68850130088658535f289f66d49f1741
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 0826ea6..5f6a186 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -191,7 +191,7 @@ void ScDocument::StartListeningCell( const ScAddress
rAddress,
{
OSL_ENSURE(pListener, StartListeningCell: pListener Null);
SCTAB nTab = rAddress.Tab();
-if (nTab static_castSCTAB(maTabs.size()) maTabs[nTab])
+if (VALIDTAB(nTab) nTab static_castSCTAB(maTabs.size())
maTabs[nTab])
maTabs[nTab]-StartListening( rAddress, pListener );
}
@@ -200,7 +200,7 @@ void ScDocument::EndListeningCell( const ScAddress
rAddress,
{
OSL_ENSURE(pListener, EndListeningCell: pListener Null);
SCTAB nTab = rAddress.Tab();
-if (nTab static_castSCTAB(maTabs.size()) maTabs[nTab])
+if (VALIDTAB(nTab) nTab static_castSCTAB(maTabs.size())
maTabs[nTab])
maTabs[nTab]-EndListening( rAddress, pListener );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-5][REVIEW 3-5-5?] fix for fdo#51677, check for valid tab number before using it
Hi Markus, On Tuesday, 2012-07-03 13:20:14 +0200, Markus Mohrhard wrote: attached a quite simple patch that fixes the crash from fdo#51677. The documents is till not imported correctly but at least it does not crash and the fix is trivial. Pushed to 3-5 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=7f2bea49b3871443608ca7639f9b601fbb9d37b6 2 more reviews for 3-5-5 needed. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpD8GUenfCMj.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - basctl/source
basctl/source/basicide/basides1.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 37c1c9c446264ba0f5a56ed11d24b9e0fabb
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jul 3 13:09:28 2012 +0100
fdo#51577 - fix incremental search / buffer switching hang/crash
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index cb18b10..24c7884 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -231,9 +231,12 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
}
if ( pWin ( pWin != pCurWin ) )
{
-++it;
+if ( it != aIDEWindowTable.end() )
+++it;
if ( it != aIDEWindowTable.end() )
pWin = it-second;
+else
+pWin = 0;
}
else
pWin = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Review-3-6?] New artwork for 3.6
Hi again, the license restriction doesn't apply any more, as luckily Andrea Soragna (sorry misspelled him in the commit messages) has sent us a license statement [1]. Thanks to him! Thus, I've just pushed all the patches related to the branding into master. Can I just cherry-pick or do I need to ask for review? These are the commits: http://cgit.freedesktop.org/libreoffice/core/commit/?id=64011a43020b108febf94cbd89fb352dc61c75df http://cgit.freedesktop.org/libreoffice/core/commit/?id=7804c249753ce88491979a7058b6cca05421cefa http://cgit.freedesktop.org/libreoffice/core/commit/?id=6b49f186bc79e30d459352d6a4d4c5a6baec384e http://cgit.freedesktop.org/libreoffice/core/commit/?id=e4691755ac871b41083cc4bee7dd060cdb00f078 (The only change that actually concerns code is the second in the list.) Additionally, there's this one: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0617454d3b9cfa68df9917d47cf35be539506ec1 Which Michael approved on gerrit ... and I just pushed, because, the About screen patch probably wouldn't have made much sense without it.) Also, feel free to fetch the tar.bz2 archives from the previous mail, they're now good to go. Stefan. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/template-dialog' - sfx2/sdi sfx2/source
sfx2/sdi/appslots.sdi|1 +
sfx2/source/appl/appserv.cxx | 12
2 files changed, 13 insertions(+)
New commits:
commit 9c47fae01bac6374c24cb8e3653becbfc773e0e7
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Tue Jul 3 14:54:18 2012 +0200
Template dialog: show the menu entry when enabling experimental features
Change-Id: Idfd57169d40e9bb60d72559f3ca09f7d34cf60df
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 11d7e3a..0d7c7a0 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -130,6 +130,7 @@ interface Application
SID_TEMPLATE_MANAGER // ole(no) api(final/play/rec)
[
ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
]
SID_ORGANIZER // ole(no) api(final/play/rec)
[
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index ad6012f..5e83a9f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -53,6 +53,7 @@
#include comphelper/configurationhelper.hxx
#include svtools/addresstemplate.hxx
+#include svtools/miscopt.hxx
#include svl/visitem.hxx
#include unotools/intlwrapper.hxx
@@ -778,6 +779,17 @@ void SfxApplication::MiscState_Impl(SfxItemSet rSet)
rSet.DisableItem(SID_SHOW_IME_STATUS_WINDOW);
break;
+case SID_TEMPLATE_MANAGER:
+{
+SvtMiscOptions aMiscOptions;
+if ( !aMiscOptions.IsExperimentalMode() )
+{
+ rSet.DisableItem( nWhich );
+ rSet.Put( SfxVisibilityItem( nWhich, sal_False ) );
+}
+}
+break;
+
default:
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: convwatch.py
Peter Jentsch wrote: I've noticed your recent revival of convwatch.py for layout regression tests. We've been developing a tool (written in Java) that might make convwatch.py more portable, by allowing to ignore certain graphical differences (caused by the possibly different implementations of antialiasing on windows and linux for example). We'd like to integrate that with convwatch.py to make it part of the LibO regression tests *but* I'm quite unsure about how you're using convwatch.py currently. Could you help us out with a hint here? Hi Peter, all image comparison scripts we have ultimately call imagemagick's composite, followed by pixel counting via identify - so having a stand-alone command line version of your smart comparison would be perfect I guess. :) Cheers, -- Thorsten pgpACsiCp4Pvd.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] testing - Weekly Report no. 6
Hi Cedric, 2012/7/3 Cedric Bosdonnat cbosdon...@suse.com: It seems you are wrong, mid terms evaluation will take place next week! Make sure you file your evaluation or you won't get any money. -- Cedric Yes, I know when they are ;-) it was written from the position of the past week. I'm writing weekly reports *after* the week, so now we have week 7, mid-term evaluations are on the week 8, and the report was from the week 6 :) Anyway, thank you for your concern! That's very kind of you. Best regards, Artur ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] libreoffice-3.5.5.3 tag created (3.5.5-rc3)
Hi, regression crasher in Base[1] has been considered as a blocker. We added two more useful fixes and created the libreoffice-3.5.5.3 tag for 3.5.5-rc3 release. The corresponding official builds will be available within next few days. It will be used as final if no blocker is found. See the attached list of changes against 3.5.5-rc2. Now, you might switch your current 3-5 source tree to it using: ./g fetch --tags ./g checkout -b tag-libreoffice-3.5.5.3 libreoffice-3.5.5.3 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will be available from the official page together with the builds. See also the schedule at http://wiki.documentfoundation.org/ReleasePlan#3.5_release and release criteria at http://wiki.documentfoundation.org/Release_Criteria Reference: [1] https://bugs.freedesktop.org/show_bug.cgi?id=51619 Best Regards, Petr fdo#51601 Cannot open xlsx file [Eike Rathke] fdo#51619 legacy reports: asks for parameters, then for empty parameters list then CRASH [Lionel Elie Mamane] + common + version 3.5.5.3, tag libreoffice-3.5.5.3 (3.5.5-rc3) [Petr Mladek] + core + clip max entries [Caolán McNamara] + do not ask for parameters if all have already been given (fdo#51619) [Lionel Elie Mamane] + do not attempt to compile running formula cell (fdo#51601) [Eike Rathke] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 4 commits - configure.in cui/source icon-themes/galaxy instsetoo_native/res
configure.in |8 cui/source/dialogs/about.cxx | 80 --- icon-themes/galaxy/brand/flat_logo.svg | 396 +++ icon-themes/galaxy/brand/intro.png |binary icon-themes/galaxy/brand/shell/backing_left.png |binary icon-themes/galaxy/brand/shell/backing_right.png |binary icon-themes/galaxy/brand/shell/backing_rtl_left.png |binary icon-themes/galaxy/brand/shell/backing_rtl_right.png |binary icon-themes/galaxy/brand/shell/backing_space.png |binary icon-themes/galaxy/brand_dev/intro.png |binary instsetoo_native/res/nologobanner.bmp|binary instsetoo_native/res/nologoinstall.bmp |binary 12 files changed, 173 insertions(+), 311 deletions(-) New commits: commit 08b4d85e6e04b1ca4ec7f9ea623d795af4a044d4 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Mon Jul 2 07:29:32 2012 +0200 Add new splash screen by Andrea Sorogna With some modifications to fit the brand colors etc. by myself. * The visible progress bar frame is now in the image itself which has two advantages - it is always there (otherwise the splash could come up without any progress bar frame at all, and then would appear a second later) - you can have arbitrary distances between the bar frame and the bar The frame defined in configure.in is now in a barely visible colour. Change-Id: Ief361b68d6a8665afa8da42325ac39fa750654ef Signed-off-by: Thorsten Behrens tbehr...@suse.com diff --git a/configure.in b/configure.in index feca9cd..2c9ea07 100644 --- a/configure.in +++ b/configure.in @@ -11268,7 +11268,7 @@ AC_SUBST(GIT_LINK_SRC) AC_MSG_CHECKING([for custom 'intro' progress bar color]) PROGRESSBARCOLOR= if test -z $with_intro_progressbar_color; then - PROGRESSBARCOLOR=126,170,23 + PROGRESSBARCOLOR=255,255,255 AC_MSG_RESULT([none]) else PROGRESSBARCOLOR=$with_intro_progressbar_color @@ -11279,7 +11279,7 @@ AC_SUBST(PROGRESSBARCOLOR) AC_MSG_CHECKING([for custom 'intro' progress bar size]) PROGRESSSIZE= if test -z $with_intro_progressbar_size; then - PROGRESSSIZE=319,10 + PROGRESSSIZE=407,6 AC_MSG_RESULT([none]) else PROGRESSSIZE=$with_intro_progressbar_size @@ -11290,7 +11290,7 @@ AC_SUBST(PROGRESSSIZE) AC_MSG_CHECKING([for custom 'intro' progress bar position]) PROGRESSPOSITION= if test -z $with_intro_progressbar_position; then - PROGRESSPOSITION=164,225 + PROGRESSPOSITION=61,317 AC_MSG_RESULT([none]) else PROGRESSPOSITION=$with_intro_progressbar_position @@ -11301,7 +11301,7 @@ AC_SUBST(PROGRESSPOSITION) AC_MSG_CHECKING([for custom 'intro' progress bar frame color]) PROGRESSFRAMECOLOR= if test -z $with_intro_progressbar_frame_color; then - PROGRESSFRAMECOLOR=207,208,211 + PROGRESSFRAMECOLOR=20,136,3 AC_MSG_RESULT([none]) else PROGRESSFRAMECOLOR=$with_intro_progressbar_frame_color diff --git a/icon-themes/galaxy/brand/intro.png b/icon-themes/galaxy/brand/intro.png index f1bc4d2..23f45af 100644 Binary files a/icon-themes/galaxy/brand/intro.png and b/icon-themes/galaxy/brand/intro.png differ diff --git a/icon-themes/galaxy/brand_dev/intro.png b/icon-themes/galaxy/brand_dev/intro.png index ec74b1e..30eb1e2 100644 Binary files a/icon-themes/galaxy/brand_dev/intro.png and b/icon-themes/galaxy/brand_dev/intro.png differ commit 91e088ed4a84330d0f31b11665c21a073004ae5e Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Mon Jul 2 07:36:46 2012 +0200 Replace Start Center images Based upon the splash screen design by Andrea Soragna, made by myself. Change-Id: I3bec1d06af7bfd147da27d17f0ced558ccae2e87 Signed-off-by: Thorsten Behrens tbehr...@suse.com diff --git a/icon-themes/galaxy/brand/shell/backing_left.png b/icon-themes/galaxy/brand/shell/backing_left.png index 8819380..8a19196 100644 Binary files a/icon-themes/galaxy/brand/shell/backing_left.png and b/icon-themes/galaxy/brand/shell/backing_left.png differ diff --git a/icon-themes/galaxy/brand/shell/backing_right.png b/icon-themes/galaxy/brand/shell/backing_right.png index 343daa3..3328c3e 100644 Binary files a/icon-themes/galaxy/brand/shell/backing_right.png and b/icon-themes/galaxy/brand/shell/backing_right.png differ diff --git a/icon-themes/galaxy/brand/shell/backing_rtl_left.png b/icon-themes/galaxy/brand/shell/backing_rtl_left.png index 8819380..8a19196 100644 Binary files a/icon-themes/galaxy/brand/shell/backing_rtl_left.png and b/icon-themes/galaxy/brand/shell/backing_rtl_left.png differ diff --git a/icon-themes/galaxy/brand/shell/backing_rtl_right.png b/icon-themes/galaxy/brand/shell/backing_rtl_right.png index 343daa3..3328c3e 100644 Binary files a/icon-themes/galaxy/brand/shell/backing_rtl_right.png and b/icon-themes/galaxy/brand/shell/backing_rtl_right.png differ diff --git a/icon-themes/galaxy/brand/shell/backing_space.png
Re: [PUSHED 3-6][Review-3-6?] New artwork for 3.6
Stefan Knorr wrote: the license restriction doesn't apply any more, as luckily Andrea Soragna (sorry misspelled him in the commit messages) has sent us a license statement [1]. Thanks to him! Great, thanks! Cherry-picked to -3-6 - http://cgit.freedesktop.org/libreoffice/core/commit/?id=7804c249753ce88491979a7058b6cca05421cefa Slight tweaks there because of the license button - you may want to check if http://cgit.freedesktop.org/libreoffice/core/commit/?id=17e1bd6d32f151a7dce3bf7b749d63da895e0e9d captures your intend. ;) Cheers, -- Thorsten pgpdzkFTIiBDj.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Including a patch from AOO...
On Mon, 2012-07-02 at 20:04 +0200, Lionel Elie Mamane wrote: What you'd have to do is a clean-room implementation AFAIR we have such a re-implementation committed already. For legal advice, it's best to consult a lawyer - in general, I'd prefer to keep random legal tips off the development list :-) Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/masterpages' - extras/source
extras/source/templates/layout/AbstractGreen.otp |binary extras/source/templates/layout/AbstractRed.otp|binary extras/source/templates/layout/AbstractYellow.otp |binary extras/source/templates/layout/BrightBlue.otp |binary extras/source/templates/layout/DNA.otp|binary extras/source/templates/layout/Inspiration.otp|binary extras/source/templates/layout/LushGreen.otp |binary extras/source/templates/layout/Metropolis.otp |binary extras/source/templates/layout/Sunset.otp |binary extras/source/templates/layout/Vintage.otp|binary 10 files changed New commits: commit a39994358b80c88e9304ad3c6fe3ce81c232bca6 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Tue Jul 3 15:32:24 2012 +0200 Set zoom level to optimal on the new templates Also fix some meta data and hide the grid in Bright Blue Change-Id: I697e03cdd19df8d55762d201d19b6c248dce08a7 diff --git a/extras/source/templates/layout/AbstractGreen.otp b/extras/source/templates/layout/AbstractGreen.otp index 9f14073..28ff10e 100644 Binary files a/extras/source/templates/layout/AbstractGreen.otp and b/extras/source/templates/layout/AbstractGreen.otp differ diff --git a/extras/source/templates/layout/AbstractRed.otp b/extras/source/templates/layout/AbstractRed.otp index d228b6f..3eafab4 100644 Binary files a/extras/source/templates/layout/AbstractRed.otp and b/extras/source/templates/layout/AbstractRed.otp differ diff --git a/extras/source/templates/layout/AbstractYellow.otp b/extras/source/templates/layout/AbstractYellow.otp index f38ec22..e3294ce 100644 Binary files a/extras/source/templates/layout/AbstractYellow.otp and b/extras/source/templates/layout/AbstractYellow.otp differ diff --git a/extras/source/templates/layout/BrightBlue.otp b/extras/source/templates/layout/BrightBlue.otp index 166a7aa..3cb8c16 100644 Binary files a/extras/source/templates/layout/BrightBlue.otp and b/extras/source/templates/layout/BrightBlue.otp differ diff --git a/extras/source/templates/layout/DNA.otp b/extras/source/templates/layout/DNA.otp index dfc8bdf..ec246d5 100644 Binary files a/extras/source/templates/layout/DNA.otp and b/extras/source/templates/layout/DNA.otp differ diff --git a/extras/source/templates/layout/Inspiration.otp b/extras/source/templates/layout/Inspiration.otp index 89bf1f4..d0a4ecf 100644 Binary files a/extras/source/templates/layout/Inspiration.otp and b/extras/source/templates/layout/Inspiration.otp differ diff --git a/extras/source/templates/layout/LushGreen.otp b/extras/source/templates/layout/LushGreen.otp index df166cc..83d977a 100644 Binary files a/extras/source/templates/layout/LushGreen.otp and b/extras/source/templates/layout/LushGreen.otp differ diff --git a/extras/source/templates/layout/Metropolis.otp b/extras/source/templates/layout/Metropolis.otp index 066adb0..ba7ccc5 100644 Binary files a/extras/source/templates/layout/Metropolis.otp and b/extras/source/templates/layout/Metropolis.otp differ diff --git a/extras/source/templates/layout/Sunset.otp b/extras/source/templates/layout/Sunset.otp index f4c03b9..0e64281 100644 Binary files a/extras/source/templates/layout/Sunset.otp and b/extras/source/templates/layout/Sunset.otp differ diff --git a/extras/source/templates/layout/Vintage.otp b/extras/source/templates/layout/Vintage.otp index 7825d3e..90d3ca5 100644 Binary files a/extras/source/templates/layout/Vintage.otp and b/extras/source/templates/layout/Vintage.otp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Removal of throbber.src
Hi, I recently removed the unused throbber.src. See: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0d53a8336bd6b55fb89873ce7e2cd623468f282e For me it doesn't make a difference between images*.zip. If I unzip it and search for spinner-* it's always the same result: ./toolkit/tk/spinner03-grey_07.png ./toolkit/tk/spinner03-grey_04.png ./toolkit/tk/spinner03-grey_06.png ./toolkit/tk/spinner03-grey_08.png ./toolkit/tk/spinner03-grey_01.png ./toolkit/tk/spinner03-grey_02.png ./toolkit/tk/spinner03-grey_05.png ./toolkit/tk/spinner03-grey_11.png ./toolkit/tk/spinner03-grey_10.png ./toolkit/tk/spinner03-grey_03.png ./toolkit/tk/spinner03-grey_12.png ./toolkit/tk/spinner03-grey_09.png This is it on master with and without patch and on Ubuntu with libo 3.5.3.2. So I assume the other spinner images are unused?! Or is there some missing link I don't get? Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-5][REVIEW 3-5-5?] fix for fdo#51677, check for valid tab number before using it
On Tue, Jul 03, 2012 at 03:55:35PM +0200, Lionel Elie Mamane wrote: On Tue, Jul 03, 2012 at 02:17:53PM +0200, Eike Rathke wrote: On Tuesday, 2012-07-03 13:20:14 +0200, Markus Mohrhard wrote: attached a quite simple patch that fixes the crash from fdo#51677. The documents is till not imported correctly but at least it does not crash and the fix is trivial. Pushed to 3-5 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=7f2bea49b3871443608ca7639f9b601fbb9d37b6 2 more reviews for 3-5-5 needed. Looks sensible to me; 1 more review for 3-5-5. Ah no, we have already tagged 3.5.5rc3... Too late. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-5][REVIEW 3-5-5?] fix for fdo#51677, check for valid tab number before using it
Eike Rathke píše v Út 03. 07. 2012 v 14:17 +0200: Hi Markus, On Tuesday, 2012-07-03 13:20:14 +0200, Markus Mohrhard wrote: attached a quite simple patch that fixes the crash from fdo#51677. The documents is till not imported correctly but at least it does not crash and the fix is trivial. Pushed to 3-5 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=7f2bea49b3871443608ca7639f9b601fbb9d37b6 2 more reviews for 3-5-5 needed. Ah, I have already created the tag for 3.5.5-rc3. I hope that rc4 will not be needed. It need to wait for LO-3.5.6 that will be done in August. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #6
Marco Cecchetti wrote: I fixed a bug that prevented the C++ skip effect feature to work properly with repeated animations. I merged the feature/svg-export branch to the master branch, so support for repeated animations is on the master branch now. Hi Marco, excellent work again - thanks for digging through that code fixing things up in parallel to the javascript version! I have to say that I performed a lot of test on several sample presentations, so if you are wondering how reliable the current features are, the answer is: enough, but it could still be some corner case I missed to test. Fair enough - and easily better than before I would dare say. :) Looking at your proposed schedule, there's this week left as a buffer before midterm - I assume you want to finish off the rewind effect problem? Let's please meet on IRC Thursday/Friday for planning/brainstorming - I'd like to run a few ideas wrt. unit testing past you interactively. ;) Cheers, -- Thorsten pgpdbbtDCmvD2.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/doc/docdesc.cxx | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 3a60e6ddd9546db53796fa0a32801d9b6a16c293
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jul 3 16:11:08 2012 +0200
sw: missing RES_FRAMEDIR in SwPageDesc::aFirst's itemset
Change-Id: I695dae12060de2d7ec20ca222b8eadf93a6e9d79
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index ed700a5..0ae1093 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -419,6 +419,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
rChged )
// Take over the page attributes.
::lcl_DescSetAttr( rChged.GetMaster(), pDesc-GetMaster() );
::lcl_DescSetAttr( rChged.GetLeft(), pDesc-GetLeft() );
+::lcl_DescSetAttr( rChged.GetFirst(), pDesc-GetFirst() );
// If the FootnoteInfo changes, the pages are triggered.
if( !(pDesc-GetFtnInfo() == rChged.GetFtnInfo()) )
@@ -431,6 +432,9 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
rChged )
{
pDesc-GetLeft().ModifyBroadcast( aInfo, 0, TYPE(SwFrm) );
}
+{
+pDesc-GetFirst().ModifyBroadcast( aInfo, 0, TYPE(SwFrm) );
+}
}
SetModified();
@@ -573,6 +577,7 @@ sal_uInt16 SwDoc::MakePageDesc( const String rName, const
SwPageDesc *pCpy,
pNew-GetMaster().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection,
RES_FRAMEDIR) );
pNew-GetLeft().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection,
RES_FRAMEDIR) );
+pNew-GetFirst().SetFmtAttr( SvxFrameDirectionItem(aFrameDirection,
RES_FRAMEDIR) );
}
aPageDescs.push_back( pNew );
commit 84a9c3ff504218683d0391d3dfe7491eb043a2b5
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jul 3 14:37:21 2012 +0200
SwDoc: initialize first page format as well
Change-Id: I788584d4e32731b7bc76086df88640b59f27dfc1
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 0d3073f..ed700a5 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -78,7 +78,8 @@ using namespace com::sun::star;
static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
SwFrmFmt rFmt1,
-SwFrmFmt rFmt2 )
+SwFrmFmt rFmt2,
+SwFrmFmt rFmt3 )
{
// -- #i41075# Printer on demand
// This function does not require a printer anymore.
@@ -130,6 +131,10 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
rFmt2.SetFmtAttr( aFrmSize );
rFmt2.SetFmtAttr( aLR );
rFmt2.SetFmtAttr( aUL );
+
+rFmt3.SetFmtAttr( aFrmSize );
+rFmt3.SetFmtAttr( aLR );
+rFmt3.SetFmtAttr( aUL );
}
/*
@@ -560,7 +565,7 @@ sal_uInt16 SwDoc::MakePageDesc( const String rName, const
SwPageDesc *pCpy,
{
pNew = new SwPageDesc( rName, GetDfltFrmFmt(), this );
// Set the default page format.
-lcl_DefaultPageFmt( USHRT_MAX, pNew-GetMaster(), pNew-GetLeft() );
+lcl_DefaultPageFmt( USHRT_MAX, pNew-GetMaster(), pNew-GetLeft(),
pNew-GetFirst() );
SvxFrameDirection aFrameDirection = bRegardLanguage ?
GetDefaultFrameDirection(GetAppLanguage())
@@ -868,7 +873,7 @@ void SwDoc::CheckDefaultPageFmt()
LONG_MAX == rLeftSize.GetHeight();
if ( bSetSize )
-lcl_DefaultPageFmt( rDesc.GetPoolFmtId(), rDesc.GetMaster(),
rDesc.GetLeft() );
+lcl_DefaultPageFmt( rDesc.GetPoolFmtId(), rDesc.GetMaster(),
rDesc.GetLeft(), rDesc.GetFirst() );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[HELP] fdo#51278 cannot open or create report builder reports
I'd appreciate some help on fdo#51278; IMHO it has to be fixed for 3.6.0, but it is not directly in my area of expertise, but is very crippling for Base / Report Builder users: opening or creating *any* report fails. I did some analysis (see the bug log) but I don't know where to go from there. I suspect a change introduced during gbuildification or a change in the way (handlers for?) ClassIDs are registered / matched / ... Thanks in advance. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/workbookhelper.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 1466a8c264d22855238961fa1cb0556dcf1af2ae Author: Noel Power noel.po...@novell.com Date: Fri Jun 29 17:34:18 2012 +0100 remove a forgotten about (harmless) hack for the formulabuffer change Change-Id: If106b1d322eda141836f69e0daa3cda70395c1e2 diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index e8df821..db6342d 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -591,8 +591,6 @@ void WorkbookGlobals::finalize() // #i79826# enable updating automatic row height after loading the document aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); getFormulaBuffer().finalizeImport(); -// hack, setting it true the second time will delete the cache -aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); // #i76026# enable Undo after loading the document aPropSet.setProperty( PROP_IsUndoEnabled, true ); // disable editing read-only documents (e.g. from read-only files) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - icon-themes/galaxy setup_native/source
dev/null|binary
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 104
--
2 files changed, 104 deletions(-)
New commits:
commit ca5b90292df238ab44f740080356dff01bd73176
Author: Andras Timar ati...@suse.com
Date: Tue Jul 3 16:03:24 2012 +0200
remove unsued code and ornamentic comment blocks
Change-Id: I2067ceb1086edfebc51a7532a0539d4368175fe7
diff --git
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 755a581..3ac1343 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -40,7 +40,6 @@
#include string
#include strsafe.h
-//--
static const CHAR* g_Extensions[] =
{
.doc, // Microsoft Word Text [0]
@@ -81,7 +80,6 @@ static const int VISIO_END = 25;
//.ppam,// Office PowerPoint 2007 macro-enabled XML add-in
//.ppsm,// Office PowerPoint 2007 macro-enabled XML show
-//--
#ifdef DEBUG
inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
{
@@ -98,7 +96,6 @@ static inline void OutputDebugStringFormat( LPCSTR, ... )
}
#endif
-//--
static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
{
BOOLbRet = false;
@@ -169,7 +166,6 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
return bRet;
}
-//--
static LONG DeleteSubKeyTree( HKEY RootKey, LPCSTR lpKey )
{
HKEY hKey;
@@ -216,62 +212,6 @@ static LONG DeleteSubKeyTree( HKEY RootKey, LPCSTR lpKey )
return rc;
}
-// Unused
-#if 0
-
-//--
-static BOOL RemoveExtensionInRegistry( LPCSTR lpSubKey )
-{
-CHARszBuffer[4096];
-DWORD nSize = sizeof( szBuffer );
-HKEYhKey = NULL;
-HKEYhSubKey = NULL;
-LONGlResult = RegOpenKeyExA( HKEY_LOCAL_MACHINE, SOFTWARE\\Classes,
0, KEY_QUERY_VALUE, hKey );
-
-if ( ERROR_SUCCESS == lResult )
-{
-lResult = RegOpenKeyExA( hKey, lpSubKey, 0, KEY_QUERY_VALUE, hSubKey
);
-
-if ( ERROR_SUCCESS == lResult )
-{
-DWORD nSubKeys = 1;
-szBuffer[0] = '\0';
-
-// we get the value of the default key fist and while we are on
querying,
-// we ask for the subkey count, too
-lResult = RegQueryValueExA( hSubKey, , NULL, NULL,
(LPBYTE)szBuffer, nSize );
-if ( ERROR_SUCCESS == lResult )
-RegQueryInfoKeyA( hSubKey, 0, 0, 0, nSubKeys, 0, 0, 0, 0, 0,
0, 0 );
-RegCloseKey( hSubKey );
-
-// we will remove all key with an default value starting with
ooostub but
-// we have to be careful about MSO keys
-if ( strncmp( szBuffer, opendocument., 13 ) == 0 )
-{
-if ( nSubKeys == 0 )
-{
-DeleteSubKeyTree( hKey, lpSubKey );
-}
-else
-{
-lResult = RegOpenKeyExA( hKey, lpSubKey, 0, KEY_SET_VALUE,
hSubKey );
-if ( ERROR_SUCCESS == lResult )
-RegDeleteValueA( hSubKey, );
-else
-OutputDebugStringFormat( Could not open key %s for
deleting: RegOpenKeyEx returned %ld.\n, lpSubKey, lResult );
-}
-}
-}
-
-RegCloseKey( hKey );
-}
-
-return ( ERROR_SUCCESS == lResult );
-}
-
-#endif
-
-//--
bool GetMsiProp( MSIHANDLE handle, LPCSTR name, /*out*/std::string value )
{
DWORD sz = 0;
@@ -289,7 +229,6 @@ bool GetMsiProp( MSIHANDLE handle, LPCSTR name,
/*out*/std::string value )
return false;
}
-//--
bool IsSetMsiProp( MSIHANDLE handle, LPCSTR name )
{
std::string val;
@@ -297,7 +236,6 @@ bool IsSetMsiProp( MSIHANDLE handle, LPCSTR name )
return (val == 1);
}
-//--
static void registerForExtension( MSIHANDLE handle, const int nIndex, bool
bRegister )
{
CHAR sPropName[256];
@@ -314,7 +252,6 @@ static void registerForExtension( MSIHANDLE handle, const
int nIndex, bool bRegi
}
}
-//--
static void saveOldRegistration( LPCSTR lpSubKey )
{
BOOLbRet = false;
@@ -360,7 +297,6 @@ static void saveOldRegistration( LPCSTR lpSubKey )
}
}
-//--
static void registerForExtensions( MSIHANDLE handle, BOOL bRegisterAll )
{ //
[Libreoffice-commits] .: 2 commits - libcmis/libcmis-0.2.3-allowable-actions.patch libcmis/makefile.mk ucb/source
libcmis/libcmis-0.2.3-allowable-actions.patch | 284 ++
libcmis/makefile.mk |2
ucb/source/ucp/cmis/cmis_content.cxx |9
ucb/source/ucp/cmis/cmis_content.hxx |1
ucb/source/ucp/cmis/cmis_datasupplier.cxx |8
ucb/source/ucp/cmis/cmis_url.cxx | 23 +-
ucb/source/ucp/cmis/cmis_url.hxx |2
7 files changed, 325 insertions(+), 4 deletions(-)
New commits:
commit 478c65b490912b2d334fab79f80d3eecbdbe0dac
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Jul 3 17:06:49 2012 +0200
libcmis: added a patch to workaround an alfresco bug and avoid HTTP requests
Change-Id: Ifbdaa6fce3812ff7d5c884527924b0b321133856
diff --git a/libcmis/libcmis-0.2.3-allowable-actions.patch
b/libcmis/libcmis-0.2.3-allowable-actions.patch
new file mode 100644
index 000..8cd84ab
--- /dev/null
+++ b/libcmis/libcmis-0.2.3-allowable-actions.patch
@@ -0,0 +1,284 @@
+diff -ur libcmis-0.2.3/src/libcmis/allowable-actions.cxx
misc/build/libcmis-0.2.3/src/libcmis/allowable-actions.cxx
+--- libcmis-0.2.3/src/libcmis/allowable-actions.cxx2012-07-03
16:47:28.063183460 +0200
misc/build/libcmis-0.2.3/src/libcmis/allowable-actions.cxx 2012-07-03
16:48:24.178187938 +0200
+@@ -28,14 +28,122 @@
+
+ #include allowable-actions.hxx
+ #include object.hxx
++#include xml-utils.hxx
+
+ using namespace std;
+
+ namespace libcmis
+ {
+-AllowableActions::AllowableActions( ) :
++ObjectAction::ObjectAction( xmlNodePtr node ) :
++m_type( ObjectAction::DeleteObject ),
++m_enabled( false ),
++m_valid( false )
++{
++try
++{
++m_type = parseType( string( ( char* ) node-name ) );
++m_valid = true;
++}
++catch ( const Exception e )
++{
++m_valid = false;
++}
++
++// Invalid xsd:bool will be mean false... not sure what the spec says
++try
++{
++xmlChar* content = xmlNodeGetContent( node );
++m_enabled = parseBool( string( ( char* )content ) );
++xmlFree( content );
++}
++catch ( const Exception e )
++{
++m_enabled = false;
++}
++}
++
++ObjectAction::Type ObjectAction::parseType( string type ) throw (
Exception )
++{
++Type value = DeleteObject;
++if ( type == canDeleteObject )
++value = DeleteObject;
++else if ( type == canUpdateProperties )
++value = UpdateProperties;
++else if ( type == canGetFolderTree )
++value = GetFolderTree;
++else if ( type == canGetProperties )
++value = GetProperties;
++else if ( type == canGetObjectRelationships )
++value = GetObjectRelationships;
++else if ( type == canGetObjectParents )
++value = GetObjectParents;
++else if ( type == canGetFolderParent )
++value = GetFolderParent;
++else if ( type == canGetDescendants )
++value = GetDescendants;
++else if ( type == canMoveObject )
++value = MoveObject;
++else if ( type == canDeleteContentStream )
++value = DeleteContentStream;
++else if ( type == canCheckOut )
++value = CheckOut;
++else if ( type == canCancelCheckOut )
++value = CancelCheckOut;
++else if ( type == canCheckIn )
++value = CheckIn;
++else if ( type == canSetContentStream )
++value = SetContentStream;
++else if ( type == canGetAllVersions )
++value = GetAllVersions;
++else if ( type == canAddObjectToFolder )
++value = AddObjectToFolder;
++else if ( type == canRemoveObjectFromFolder )
++value = RemoveObjectFromFolder;
++else if ( type == canGetContentStream )
++value = GetContentStream;
++else if ( type == canApplyPolicy )
++value = ApplyPolicy;
++else if ( type == canGetAppliedPolicies )
++value = GetAppliedPolicies;
++else if ( type == canRemovePolicy )
++value = RemovePolicy;
++else if ( type == canGetChildren )
++value = GetChildren;
++else if ( type == canCreateDocument )
++value = CreateDocument;
++else if ( type == canCreateFolder )
++value = CreateFolder;
++else if ( type == canCreateRelationship )
++value = CreateRelationship;
++else if ( type == canDeleteTree )
++value = DeleteTree;
++else if ( type == canGetRenditions )
++value = GetRenditions;
++else if ( type == canGetACL )
++value = GetACL;
++else if ( type == canApplyACL )
++value = ApplyACL;
++else
++throw Exception( Invalid AllowableAction type: + type );
++
++
[Libreoffice-commits] .: 11 commits - basegfx/inc basegfx/source desktop/unx drawinglayer/inc drawinglayer/source extensions/source hwpfilter/source Module_tail_build.mk postprocess/prj sal/osl slides
Module_tail_build.mk | 5 - basegfx/inc/basegfx/color/bcolor.hxx | 2 +- basegfx/inc/basegfx/curve/b2dbeziertools.hxx | 2 +- basegfx/inc/basegfx/point/b2dpoint.hxx | 2 +- basegfx/inc/basegfx/range/basicbox.hxx | 2 +- basegfx/inc/basegfx/range/basicrange.hxx | 2 +- basegfx/inc/basegfx/vector/b2dvector.hxx | 2 +- basegfx/source/inc/hommatrixtemplate.hxx | 2 +- basegfx/source/polygon/b2dpolygontriangulator.cxx| 2 +- basegfx/source/polygon/b2dpolypolygon.cxx| 2 +- basegfx/source/polygon/b2dpolypolygoncutter.cxx | 4 ++-- basegfx/source/polygon/b2dtrapezoid.cxx | 2 +- basegfx/source/polygon/b3dpolypolygon.cxx| 2 +- basegfx/source/range/b2drange.cxx| 4 ++-- desktop/unx/source/start.c | 2 +- drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx| 2 +- drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx | 2 +- drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx | 2 +- drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx | 2 +- drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx | 2 +- drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx | 2 +- drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx | 2 +- drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx | 2 +- drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx | 2 +- drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx | 2 +- drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx | 10 +- drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx | 2 +- drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx | 2 +- drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx | 2 +- drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx| 2 +- drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx | 2 +- drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx | 2 +- drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx| 2 +- drawinglayer/source/attribute/sdrlineattribute.cxx | 2 +- drawinglayer/source/geometry/viewinformation2d.cxx | 2 +- drawinglayer/source/geometry/viewinformation3d.cxx | 2 +- drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 2 +- drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2 +- drawinglayer/source/primitive3d/baseprimitive3d.cxx | 2 +- extensions/source/nsplugin/source/so_env.cxx | 5 +++-- hwpfilter/source/hcode.cxx | 2 +- postprocess/prj/build.lst| 2 +- sal/osl/unx/pipe.c | 6 +++--- sal/osl/unx/util.c | 3 +++ slideshow/source/engine/slide/slideimpl.cxx | 6 +++--- slideshow/source/engine/slideshowimpl.cxx| 4 ++-- slideshow/source/engine/transitions/slidechangebase.cxx | 10 +- slideshow/source/engine/transitions/slidetransitionfactory.cxx | 6 +++--- 48 files changed, 72 insertions(+), 65 deletions(-) New commits: commit 3425a9777f6d06d4ef1c6d1f0883dc2254dff295 Author: David Tardon dtar...@redhat.com Date: Tue Jul 3 12:21:33 2012 +0200 move testtools to tail_build Change-Id: I7dfd5b1f059f7f254a28d2d627365a0b650e33d1 diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 61d0f89..533dd24 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -111,6 +111,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ sw \ swext \ test \ +testtools \ toolkit \ tools \ touch \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 36a375a..8038e87 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras
[Libreoffice-commits] .: setup_native/source
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a54230f3211f19290c4d2ac26b3084fc0a0eeab5
Author: Andras Timar ati...@suse.com
Date: Tue Jul 3 18:24:01 2012 +0200
typo
Change-Id: I12d875faa6f8206a5b0a37067ca21df124f71e22
diff --git
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 3ac1343..f0f89fc 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -121,7 +121,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
{ // We will replace registration for our own types, too
bRet = true;
}
-else if ( strncmp( szBuffer, lostub., 8 ) == 0 )
+else if ( strncmp( szBuffer, lostub., 7 ) == 0 )
{ // We will replace registration for ooostub, too
bRet = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - setup_native/source
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 14d7acf2d18f43b29a4a41adac25f0c584a0f6dd
Author: Andras Timar ati...@suse.com
Date: Tue Jul 3 18:24:01 2012 +0200
typo
Change-Id: I12d875faa6f8206a5b0a37067ca21df124f71e22
diff --git
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 755a581..4b9bdab 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -124,7 +124,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
{ // We will replace registration for our own types, too
bRet = true;
}
-else if ( strncmp( szBuffer, lostub., 8 ) == 0 )
+else if ( strncmp( szBuffer, lostub., 7 ) == 0 )
{ // We will replace registration for ooostub, too
bRet = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-ux-advise] Enable CTL for Default?
Just to add to the ongoing disappointment with CTL, came across FDO 42123 which is another user stating that CTL is outdated, confusing, etc Ultimately it seems like people want to purge CTL completely but that seems unlikely. I'm still wondering if we're nearing consensus on if we can enable by default or leave as is and just explain why to our user base. Joel On Thu, Jun 28, 2012 at 7:18 AM, Khaled Hosny khaledho...@eglug.org wrote: On Thu, Jun 28, 2012 at 10:21:57AM +0200, Stefan Knorr (Astron) wrote: * I am not sure about Cursor Movement, but I've tried the options and visual seems to behave rather buggy – if it weren't it would likely be the best option I always set it to visual, logical seems very unprediuctable to me (i.e. I can't usually tell if the right arrow will move the cursor left or right at ant given position). * the Digits option: it could find a new home in the Languages tab or it could be removed completely, with it being set to Context always This have to be kept, in Arabic countries to the west of Egypt the European (AKA Arabic) digits are always used. Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Removal of throbber.src
Hi Thomas, On Tue, 2012-07-03 at 13:13 +0200, Thomas Arnhold wrote: I recently removed the unused throbber.src. Sounds reasonable :-) See: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0d53a8336bd6b55fb89873ce7e2cd623468f282e ... For me it doesn't make a difference between images*.zip. If I unzip it and search for spinner-* it's always the same result: And you re-built images.zip from clean ? [ bearing in mind that images.zip is itself built using the output from the compiled .src files so to be entirely sure you'd want to build completely from clean. At least, unless something new happened: -// TODO: we need a mechanism to add images to images.zip, *without* -// referring them in resource files. The below resources are never loaded -// at runtime, instead, the images in images.zip are accessed via -// private:graphicrepository/* URLs. It's possible that some images can be included in some new way I suppose, but unless you built from clean, I'd be nervous that this just came from a stale .ilst files that are built from the .src files. cf. ./solver/unxlngi6.pro/res/img/ So I assume the other spinner images are unused?! Or is there some missing link I don't get? It's quite possibly / probable of course :-) but ... given the comment in that removed .src file - I'd be extra careful - and chase all callers of the method that builds those string file names etc. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Removal of throbber.src
Hello Thomas, Michael, AFAIK, LibO uses a throbber in its extension manager, e.g. when looking for extension updates. I believe the application update checker also uses a throbber. I can't really say if that's the one you are trying to remove (I think there were multiple throbber directories)... but, as Michael says, images.zip tends to become stale on subsequent builds. Stefan. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Review-3-6?] New artwork for 3.6
Le 03/07/2012 14:42, Stefan Knorr a écrit : Hi again, the license restriction doesn't apply any more, as luckily Andrea Soragna (sorry misspelled him in the commit messages) has sent us a license statement [1]. Thanks to him! Hi, There is no Close button on the new About dialog. Is it intended ? I remember that for the previous change in this dialog, we had have the same problem. It was fixed later. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'features/base-preview' - hsqldb/makefile.mk hsqldb/patches
hsqldb/makefile.mk|3 ++- hsqldb/patches/fdo36824.patch | 11 +++ 2 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 1eb6e40fbb53e03fda484b7b3491308e2ffb192e Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 3 20:00:06 2012 +0200 fdo#36824 hsqldb properly escape automatically built names Change-Id: Id2c36fb24d1f7c8f8e9800c10226323594bb766e diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index e500462..3692403 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -58,7 +58,8 @@ CONVERTFILES=build$/build.xml \ PATCH_FILES=patches$/i96823.patch \ patches$/i97032.patch \ patches$/i103528.patch \ -patches$/i104901.patch +patches$/i104901.patch \ +patches$/fdo36824.patch .IF $(JAVANUMVER:s/.//) = 00010006 PATCH_FILES+= \ diff --git a/hsqldb/patches/fdo36824.patch b/hsqldb/patches/fdo36824.patch new file mode 100644 index 000..a4b49a7 --- /dev/null +++ b/hsqldb/patches/fdo36824.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:49:00.0 +0200 misc/build/hsqldb//src/org/hsqldb/Expression.java 2012-07-03 19:39:00.0 +0200 +@@ -1552,7 +1552,7 @@ + return columnQuoted; + } + +-return false; ++return true; + } + + /** ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/dpitemdata.hxx |1 +
sc/source/core/data/dpcache.cxx|2 ++
sc/source/core/data/dpitemdata.cxx |6 ++
3 files changed, 9 insertions(+)
New commits:
commit f2ac4ff6600a7d20a519e9ef9e6bcd8157288f63
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jul 3 14:08:14 2012 -0400
fdo#51266: Properly set pivot item 'empty' on empty cells.
Or else it would re-use the last non-empty cell value which is wrong.
Change-Id: I3feab09a54e93150a7b6a9e9b4b540327f2ab5c5
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 67f4af2..e294de8 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -89,6 +89,7 @@ public:
~ScDPItemData();
Type GetType() const;
+void SetEmpty();
void SetString(const rtl::OUString rS);
void SetString(const rtl::OUString* pS);
void SetValue(double fVal);
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 742b6eb..9163dde 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -161,6 +161,8 @@ void initFromCell(
{
rData.SetString(rCache.InternString(aDocStr));
}
+else
+rData.SetEmpty();
}
void getItemValue(
diff --git a/sc/source/core/data/dpitemdata.cxx
b/sc/source/core/data/dpitemdata.cxx
index 1bcc3a6..1641572 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -138,6 +138,12 @@ ScDPItemData::Type ScDPItemData::GetType() const
return static_castType(meType);
}
+void ScDPItemData::SetEmpty()
+{
+DisposeString();
+meType = Empty;
+}
+
void ScDPItemData::SetString(const rtl::OUString rS)
{
DisposeString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/inc sc/source
sc/inc/dpitemdata.hxx |1 +
sc/source/core/data/dpcache.cxx|2 ++
sc/source/core/data/dpitemdata.cxx |6 ++
3 files changed, 9 insertions(+)
New commits:
commit 6d91eaaf8695da3f0da767f2669fcc650e9a76a5
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jul 3 14:08:14 2012 -0400
fdo#51266: Properly set pivot item 'empty' on empty cells.
Or else it would re-use the last non-empty cell value which is wrong.
Change-Id: I3feab09a54e93150a7b6a9e9b4b540327f2ab5c5
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 46642a9..c585846 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -91,6 +91,7 @@ public:
~ScDPItemData();
Type GetType() const;
+void SetEmpty();
void SetString(const rtl::OUString rS);
void SetString(const rtl::OUString* pS);
void SetValue(double fVal);
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 6908163..2d2a0a3 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -161,6 +161,8 @@ void initFromCell(
{
rData.SetString(rCache.InternString(aDocStr));
}
+else
+rData.SetEmpty();
}
void getItemValue(
diff --git a/sc/source/core/data/dpitemdata.cxx
b/sc/source/core/data/dpitemdata.cxx
index 1bcc3a6..1641572 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -138,6 +138,12 @@ ScDPItemData::Type ScDPItemData::GetType() const
return static_castType(meType);
}
+void ScDPItemData::SetEmpty()
+{
+DisposeString();
+meType = Empty;
+}
+
void ScDPItemData::SetString(const rtl::OUString rS)
{
DisposeString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'features/base-preview' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'features/base-preview'
New branch 'features/base-preview' available with the following commits: commit 0aff429e7606eac6018d1163b2f94b6ef6ad5739 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 3 20:17:01 2012 +0200 embedded HSQLDB: reclaim space occupied by deleted rows Disadvantage is that saving/closing the file may take a significantly longer time Change-Id: I1cc35c34b49e60d73e8d341549c5a3c5ef314b6d commit f711f9561719a1c450ff10bf75a682dfe67f7810 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 3 20:00:06 2012 +0200 fdo#36824 hsqldb properly escape automatically built names Change-Id: Id2c36fb24d1f7c8f8e9800c10226323594bb766e commit 637018271e6bde5af180bfde124173af2c8f2b71 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Jul 2 19:33:38 2012 +0200 LEM notes Change-Id: I16939e5d6e1f7c0a83f7f2b2dbc9a5b397b45c36 commit 847a70c418c8da0b773027ad3b8280c9716efb77 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Jul 2 14:48:03 2012 +0200 janitorial: remove unused xParamsAsNames variable Change-Id: Ic4fe24faf75d38a8123a8f0e8304c054760bad85 commit 9a2c760bc2b54e3e5af8f797dd99c23b502494ca Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:28:50 2012 +0200 legacy reports: unify treatment of query and table In *both* cases, the value of hidden control Sorting (if non-empty) decides the columns being sorted on. Change-Id: I7f4b50c3af8c12e48e5dedd36b5877ad7a9e1b66 commit 6f29429a844f18fbe490281c23e3a25e20e9cfea Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:26:58 2012 +0200 legacy report wizard: when source is table, save name in QueryName Change-Id: Ie0bdbed9578b95f7fccc3d9ff6d9c8b5b91ac0ab commit 0355a0baf5a64c96a84ba6b6bee372f7a2d27354 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:25:51 2012 +0200 SQLQueryComposer allow setQueryCommand with prependSorting instead of append Change-Id: Ia06794537ea4d0f6f069c83709792ebbcc084804 commit 03a21c22b46146c3394ceeed57e603ec52f2ba16 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:24:54 2012 +0200 db.SQLQueryComposer allow prependSortingCriteria call with addAliasFieldNames Change-Id: I05889ccac213743a55c302bd7249b30f817c0428 commit 71c083a7d806b8e46b4b88005dba1b1e2c8c4e37 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:23:50 2012 +0200 cleanup Change-Id: I1ce4279d434ffa58328e17863b2e68af1e813a99 commit fbfa20ca3a063efd403895feca256795353ff3ab Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Jun 6 14:23:30 2012 +0200 untabify Change-Id: I984c84534cb4c6cda8bd73a43d79ec8e49afcdeb commit 408e8222e2764c3658e8da06487fa8437c55f948 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Jun 4 17:54:30 2012 +0200 i#102625 avoid fetching same row twice in different queries We do a SELECT * FROM table just to fetch the primary key columns; so reuse the same XResultSet to fetch all columns. Else, we immediately issue a SELECT * FROM table WHERE primary_key=current_value to read the other columns, which is wasteful and particularly silly. Commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b already tried to do that, but was essentially reverted piecewise because it caused fdo#47520, fdo#48345, fdo#50372. Commit c08067d6da94743d53217cbc26cffae00a22dc3a thought it did that, but actually reverted commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b. This implementation fetches the whole current row and caches it in memory; only one row is cached: when the current row changes, the cache contains the new current row. This could be problematic (wrt to memory consumption) if the current row is big (e.g. with BLOBs) and nobody is interested in the data anyway (as would often be the case with BLOBs). Note that because of our SELECT *, the driver most probably has it in memory already anyway, so we don't make the situation that much worse. This could be incrementally improved with a heuristic of not preemptively caching binary data (and also not LONGVARCHAR / TEXT / MEMO / ...); a getFOO on these columns would issue a specific SELECT column FROM table WHERE primary_key=current_value each time. The *real* complete fix to all these issues would be to not do SELECT * at all. Use SELECT pkey_col1, pkey_col2, ... when we are only interested in the key columns. As to data, somehow figure out which columns were ar interested in and SELECT only these (and maybe only those with small datatype?). Interesting columns could be determined by our caller (creator) as an argument to our constructor, or some heuristic (no binary data, no big unbound data). Also be extra smart and use *(m_aKeyIter) when getFOO is called on a column included in it (and don't include it in any subsequent
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - hsqldb/makefile.mk hsqldb/patches
hsqldb/makefile.mk|3 ++- hsqldb/patches/fdo36824.patch | 11 +++ 2 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 3286e849e5b5f8809e92219bdf07e737c81cf42c Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 3 20:00:06 2012 +0200 fdo#36824 hsqldb properly escape automatically built names Change-Id: Id2c36fb24d1f7c8f8e9800c10226323594bb766e diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index e500462..3692403 100644 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -58,7 +58,8 @@ CONVERTFILES=build$/build.xml \ PATCH_FILES=patches$/i96823.patch \ patches$/i97032.patch \ patches$/i103528.patch \ -patches$/i104901.patch +patches$/i104901.patch \ +patches$/fdo36824.patch .IF $(JAVANUMVER:s/.//) = 00010006 PATCH_FILES+= \ diff --git a/hsqldb/patches/fdo36824.patch b/hsqldb/patches/fdo36824.patch new file mode 100644 index 000..ad753e3 --- /dev/null +++ b/hsqldb/patches/fdo36824.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:49:00.0 +0200 misc/build/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:39:00.0 +0200 +@@ -1552,7 +1552,7 @@ + return columnQuoted; + } + +-return false; ++return true; + } + + /** ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source hsqldb/makefile.mk hsqldb/patches
connectivity/source/drivers/hsqldb/HConnection.cxx |2 +-
hsqldb/makefile.mk |3 ++-
hsqldb/patches/fdo36824.patch | 11 +++
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 2c46368432bd4f1bd86c7f3fb6c25ec5ad05dee7
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jul 3 20:17:01 2012 +0200
embedded HSQLDB: reclaim space occupied by deleted rows
Disadvantage is that saving/closing the file may take a significantly
longer time
Change-Id: I1cc35c34b49e60d73e8d341549c5a3c5ef314b6d
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx
b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 1c85dde..ee7c5b2 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -180,7 +180,7 @@ namespace connectivity { namespace hsqldb
if ( !m_bReadOnly )
{
Reference XStatement xStmt(
m_xConnection-createStatement(), UNO_QUERY_THROW );
-xStmt-execute( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( CHECKPOINT ) ) );
+xStmt-execute( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( CHECKPOINT DEFRAG ) ) );
}
}
commit bed3049c4c04a202ff288189d225ca6e5941d69b
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jul 3 20:00:06 2012 +0200
fdo#36824 hsqldb properly escape automatically built names
Change-Id: Id2c36fb24d1f7c8f8e9800c10226323594bb766e
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index e500462..3692403 100644
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -58,7 +58,8 @@ CONVERTFILES=build$/build.xml \
PATCH_FILES=patches$/i96823.patch \
patches$/i97032.patch \
patches$/i103528.patch \
-patches$/i104901.patch
+patches$/i104901.patch \
+patches$/fdo36824.patch
.IF $(JAVANUMVER:s/.//) = 00010006
PATCH_FILES+= \
diff --git a/hsqldb/patches/fdo36824.patch b/hsqldb/patches/fdo36824.patch
new file mode 100644
index 000..ad753e3
--- /dev/null
+++ b/hsqldb/patches/fdo36824.patch
@@ -0,0 +1,11 @@
+--- misc/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:49:00.0
+0200
misc/build/hsqldb/src/org/hsqldb/Expression.java 2012-07-03
19:39:00.0 +0200
+@@ -1552,7 +1552,7 @@
+ return columnQuoted;
+ }
+
+-return false;
++return true;
+ }
+
+ /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/template-dialog' - sfx2/source
sfx2/source/doc/templatedlg.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 71d8a8de222b160cc0a3a1a3eaa2a8c4da34e5b6
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Tue Jul 3 20:24:18 2012 +0200
templates dlg: close window and use _default target for template creation
Change-Id: Icc9d7acca1669620b53bdc634a3d188323ee9440
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 60e68a6..4488bc9 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -419,15 +419,19 @@ IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, Menu*,
pMenu)
{
case MNI_CREATE_TEXT:
lcl_createTemplate(mxDesktop,FILTER_APP_WRITER);
+Close( );
break;
case MNI_CREATE_SHEET:
lcl_createTemplate(mxDesktop,FILTER_APP_CALC);
+Close( );
break;
case MNI_CREATE_PRESENT:
lcl_createTemplate(mxDesktop,FILTER_APP_IMPRESS);
+Close( );
break;
case MNI_CREATE_DRAW:
lcl_createTemplate(mxDesktop,FILTER_APP_DRAW);
+Close( );
break;
case MNI_ACTION_SORT_NAME:
if (maView-isOverlayVisible())
@@ -662,7 +666,7 @@ void lcl_createTemplate(uno::Reference
com::sun::star::frame::XComponentLoader
if (!aURL.isEmpty())
{
uno::SequencePropertyValue aArgs;
-xDesktop-loadComponentFromURL(aURL,rtl::OUString(_blank), 0, aArgs
);
+xDesktop-loadComponentFromURL(aURL,rtl::OUString(_default), 0,
aArgs );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] [REVIEW:3-5,3-6] size optimisation
I'm unsure whether I should apply this to libreoffice-3-6 or maybe
even libreoffice-3-5; I'd be glad of your opinions.
The issue is that embedded HSQLDB does not reclaim space occupied by
deleted rows; it only overwrites them with new rows. So basically this
means that the data portion of an .odb file NEVER shrinks and only
grows or stagnates.
In particular, people that try to make a minimal reproduction case for
bug reports by deleting a lot of rows still have big files that don't
fit in our bugzilla's size limit (that's how I noticed this issue).
This patch tells HSQLDB, on each flush, to defrag the database. This
can take time for big databases :-| and will happen at least for each
file save operation.
The alternative would be to introduce an UI element
compress/cleanup/defrag database, but:
1) It would necessarily be specific to sdbc(x) direct drivers as AFAIK
odbc / jdbc / ... don't have a standard way to do such an
operation.
2) It is not do the right thing by default
3) People using big databases should switch to a real database
system anyway (and use LibreOffice base as a graphical front-end to
it).
4) More work, and touching the UI, so I won't do it by myself. If we
decide it is the better idea and someone wants to collaborate on
that...
--
Lionel
From 2c46368432bd4f1bd86c7f3fb6c25ec5ad05dee7 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane lio...@mamane.lu
Date: Tue, 3 Jul 2012 20:17:01 +0200
Subject: [PATCH] embedded HSQLDB: reclaim space occupied by deleted rows
Disadvantage is that saving/closing the file may take a significantly longer time
Change-Id: I1cc35c34b49e60d73e8d341549c5a3c5ef314b6d
---
connectivity/source/drivers/hsqldb/HConnection.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 1c85dde..ee7c5b2 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -180,7 +180,7 @@ namespace connectivity { namespace hsqldb
if ( !m_bReadOnly )
{
Reference XStatement xStmt( m_xConnection-createStatement(), UNO_QUERY_THROW );
-xStmt-execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CHECKPOINT ) ) );
+xStmt-execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CHECKPOINT DEFRAG ) ) );
}
}
--
1.7.10
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] [REVIEW:3-5] fdo#36824 embedded hsqldb; in view computed row without alias makes whole file unusable
hsqldb fails to properly escape column names it generates automatically from an expression in the script file it uses to recreate the database (in memory) on load/connect. The net effect is that any .odb file where such a view has been defined cannot be reopened, unless one manually fiddles with the database/script file in the .odb file seen as a zip file. This patch fixes that, by saying that *any* expression that is not already a column name *should* be escaped (instead of *not* escaped) when seen as a column name/alias. I hope no bad side-effects, but I'm not intimate with HSQLDB internals, so never can be really sure. Please apply to libreoffice-3-5. -- Lionel From bed3049c4c04a202ff288189d225ca6e5941d69b Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane lio...@mamane.lu Date: Tue, 3 Jul 2012 20:00:06 +0200 Subject: [PATCH 1/2] fdo#36824 hsqldb properly escape automatically built names Change-Id: Id2c36fb24d1f7c8f8e9800c10226323594bb766e --- hsqldb/makefile.mk|3 ++- hsqldb/patches/fdo36824.patch | 11 +++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 hsqldb/patches/fdo36824.patch diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index e500462..3692403 100644 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -58,7 +58,8 @@ CONVERTFILES=build$/build.xml \ PATCH_FILES=patches$/i96823.patch \ patches$/i97032.patch \ patches$/i103528.patch \ -patches$/i104901.patch +patches$/i104901.patch \ +patches$/fdo36824.patch .IF $(JAVANUMVER:s/.//) = 00010006 PATCH_FILES+= \ diff --git a/hsqldb/patches/fdo36824.patch b/hsqldb/patches/fdo36824.patch new file mode 100644 index 000..ad753e3 --- /dev/null +++ b/hsqldb/patches/fdo36824.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:49:00.0 +0200 misc/build/hsqldb/src/org/hsqldb/Expression.java 2012-07-03 19:39:00.0 +0200 +@@ -1552,7 +1552,7 @@ + return columnQuoted; + } + +-return false; ++return true; + } + + /** -- 1.7.10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC] testing - Weekly Report no. 6
On Tue, 2012-07-03 at 15:11 +0200, Artur Dorda wrote: Yes, I know when they are ;-) it was written from the position of the past week. I'm writing weekly reports *after* the week, so now we have week 7, mid-term evaluations are on the week 8, and the report was from the week 6 :) Sorry, I didn't pay attention to the time you were writing... rather to the time I was receiving the email ;) -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6] feature/masterpages
On Tue, Jul 03, 2012 at 08:39:15PM +0200, Bjoern Michaelsen wrote: On Tue, Jul 03, 2012 at 10:59:58AM +0200, Stefan Knorr wrote: Ugh... sorry, really should have tried building with the new master pages, as Björn's message indicates. Also note that I could not use Caolan's script for some reason, so I unzipped them manually and then used sed on styles.xml... Finally found out what is wrong there: I had no rsvg in my dev-install configure. Rebuilding now with rsvg support. Since we are using rsvg now in the core product, I guees we need to make rsvg (internal or external) a hard dependency -- any objections to that? Yes, that was it. with --enable-rsvg=system it works like a charm. Without it, the template loading fails for all vector templates. Loading the template directly even crashes LibreOffice: https://bugs.freedesktop.org/show_bug.cgi?id=51694 so some exception catching on a normal load would be appropriate (as it seems is done for the masterpages). Looking at ./configure.in at least on iOS and Android by default use no rsvg at all. @Tor: Is rsvg available at all on these platforms? Can we make it a hard dep? If not, is that limited masterpages functionality ok for these experimental platformsi for now? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Review-3-6?] New artwork for 3.6
Le 03/07/2012 19:47, Jean-Baptiste Faure a écrit :
Le 03/07/2012 14:42, Stefan Knorr a écrit :
Hi again,
the license restriction doesn't apply any more, as luckily Andrea
Soragna (sorry misspelled him in the commit messages) has sent us a
license statement [1]. Thanks to him!
Hi,
There is no Close button on the new About dialog. Is it intended ?
I remember that for the previous change in this dialog, we had have the
same problem. It was fixed later.
Best regards.
JBF
Hi,
Here is a one line patch which restore a line in about.cxx modified in a
previous patch. With these patch I get the Close button.
Best regards.
JBF
--
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
From fa0c1095b5caabd68036f2110f0ef1197720d2c5 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste FAURE jbf.fa...@orange.fr
Date: Tue, 3 Jul 2012 21:01:47 +0200
Subject: [PATCH] restore close button in About dialog
Change-Id: I32d528cf047e890815bfeaf9b5dc0516ef8ffccf
---
cui/source/dialogs/about.cxx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index db5057f..e18a22c 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -291,7 +291,7 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
aWebsiteButton.SetSizePixel( aButtonSize );
aCancelButton.SetSizePixel( aButtonSize );
-sal_Int32 aButtonSpacing = aDialogWidth - ( aDialogBorder * 2 ) - ( aButtonSize.Width() * 3 ) - aAdjacentButtonSpacing ;
+sal_Int32 aButtonSpacing = aDialogWidth - ( aDialogBorder * 2 ) - ( aButtonSize.Width() * 4 ) - ( aAdjacentButtonSpacing * 2 );
if (aButtonSpacing aAdjacentButtonSpacing)
{
aButtonsWidth = aAdjacentButtonSpacing - aButtonSpacing;
--
1.7.5.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] File Format Defaults Multiple FDO's
Hi Joel, 2012/7/3 Joel Madero jmadero@gmail.com: Hi All, This seems to be one of the most consistent complaints from users as I'm going through the bug list. The issue is three fold (or more). 1. Defaults hijack everything -- vs. defaulting to allow users to select 2. No check to see if Microsoft Office is installed and thus some prompt to see if we want to replace it 3. Changing defaults once installed very difficult (or not possible?). 4. Other file associations outside of Microsoft are also hijacked -- see bug on txt files Here are just a few of the FDO's that I came across: https://bugs.freedesktop.org/show_bug.cgi?id=39791 https://bugs.freedesktop.org/show_bug.cgi?id=44462 https://bugs.freedesktop.org/show_bug.cgi?id=43519 https://bugs.freedesktop.org/show_bug.cgi?id=38310 https://bugs.freedesktop.org/show_bug.cgi?id=47483 Each one deals with the same issue in a different manner -- ie. file associations and defaults. I personally like the mock up done in https://bugs.freedesktop.org/show_bug.cgi?id=44462 I have a few questions, I know that one of these bugs is assigned but not sure about current status. I have a couple suggestions and wanted feedback: 1. Most annoying bug? I think it qualifies with at least 5 different people complaining about it with multiple comments on many of them 2. Can I make a bug that takes every complaint into account and then mark these all as dupes of the one I make? Thanks for your bug triage work. File association is a difficult topic and after fixing obvious bugs, I need ux input about how to do things the best. I'm currently debugging the hijack issue. It happens in http://opengrok.libreoffice.org/xref/core/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx. These functions were designed so that they detect Microsoft Office and do not take over their files, the only problem is that these functions do not work correctly under certain circumstances. After install user have several possibilities to change file associations, e.g. repair MS Office install, right click on file and change associations, regedit, etc. I know that none of these are easy for an ordinary user. As for other file types than MS Office, it is hard to define a good default, many file types that LibreOffice can open are not associated. We need to collect them all, this is the pre-requisite of the planned file association application. I have some problems with the mockup in fdo#44462. First is that it lists only a few file types. There are many more. Maybe we need a separate panel for it. Or instead of file extensions, we could use bigger categories (e.g. ODF, MS Office Binary, MS Office OpenXML, etc.) Please note that within LibreOffice we can handle only per user settings, because we cannot elevate the rights of soffice.bin process. Even if it is running from an administrator account, it runs with normal user privileges (at least on Vista and higher). But maybe it is even better. It is possible that one user prefers LibreOffice, other prefers something else on the same computer. Alternatively a standalone application can be developed, that can set file associations for all users. I don't think it makes sense to open a super-bug for file associations. I'm currently working on it, and I regularly monitor Windows Installer bugs. As long as a bug classified as a Windows Installer bug, I'll see it, and fix it some day. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] File Format Defaults Multiple FDO's
I agree that it was limited for types and your ideas both sound promising. I've included UX mailing list for input because I think ultimately it would be really nice to be able to easily and quickly change file associations for LO. I lean more towards a separate set of options that lists every file type we support with a check box next to it. The only issue I see is that if you uncheck the file type, what software takes over as primary software? Would it default automatically back to MS or just be unassociated? As for super bug, fair enough, I'm going to put a comment in each of the bugs saying that it's an ongonig process to fix this and say these bugs are similar and may be of interest to you and list the other FDO bugs so that those users can keep up with the comments. Hopefully some UX people will get involved soon and put in some input. Thanks, Joel PS. To Gerald, this is even trickier as it's actually MS's bug, not LibreOffice, if in fact it is a bug. From my remembering my last MS Office install (which was quite some time ago), on install it asked if I wanted OpenOffice files to be opened by MS Office, if you have these selected, then it's kind of user error if something goes wrong. Maybe someone with MS Office can do a test install and verify this or verify that it's a bug on their side and we can discuss if there's anything we can do about it -- we all know how receptive MS is to suggestions ;) On Tue, Jul 3, 2012 at 12:12 PM, Andras Timar tima...@gmail.com wrote: Hi Joel, 2012/7/3 Joel Madero jmadero@gmail.com: Hi All, This seems to be one of the most consistent complaints from users as I'm going through the bug list. The issue is three fold (or more). 1. Defaults hijack everything -- vs. defaulting to allow users to select 2. No check to see if Microsoft Office is installed and thus some prompt to see if we want to replace it 3. Changing defaults once installed very difficult (or not possible?). 4. Other file associations outside of Microsoft are also hijacked -- see bug on txt files Here are just a few of the FDO's that I came across: https://bugs.freedesktop.org/show_bug.cgi?id=39791 https://bugs.freedesktop.org/show_bug.cgi?id=44462 https://bugs.freedesktop.org/show_bug.cgi?id=43519 https://bugs.freedesktop.org/show_bug.cgi?id=38310 https://bugs.freedesktop.org/show_bug.cgi?id=47483 Each one deals with the same issue in a different manner -- ie. file associations and defaults. I personally like the mock up done in https://bugs.freedesktop.org/show_bug.cgi?id=44462 I have a few questions, I know that one of these bugs is assigned but not sure about current status. I have a couple suggestions and wanted feedback: 1. Most annoying bug? I think it qualifies with at least 5 different people complaining about it with multiple comments on many of them 2. Can I make a bug that takes every complaint into account and then mark these all as dupes of the one I make? Thanks for your bug triage work. File association is a difficult topic and after fixing obvious bugs, I need ux input about how to do things the best. I'm currently debugging the hijack issue. It happens in http://opengrok.libreoffice.org/xref/core/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx . These functions were designed so that they detect Microsoft Office and do not take over their files, the only problem is that these functions do not work correctly under certain circumstances. After install user have several possibilities to change file associations, e.g. repair MS Office install, right click on file and change associations, regedit, etc. I know that none of these are easy for an ordinary user. As for other file types than MS Office, it is hard to define a good default, many file types that LibreOffice can open are not associated. We need to collect them all, this is the pre-requisite of the planned file association application. I have some problems with the mockup in fdo#44462. First is that it lists only a few file types. There are many more. Maybe we need a separate panel for it. Or instead of file extensions, we could use bigger categories (e.g. ODF, MS Office Binary, MS Office OpenXML, etc.) Please note that within LibreOffice we can handle only per user settings, because we cannot elevate the rights of soffice.bin process. Even if it is running from an administrator account, it runs with normal user privileges (at least on Vista and higher). But maybe it is even better. It is possible that one user prefers LibreOffice, other prefers something else on the same computer. Alternatively a standalone application can be developed, that can set file associations for all users. I don't think it makes sense to open a super-bug for file associations. I'm currently working on it, and I regularly monitor Windows Installer bugs. As long as a bug classified as a Windows
[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements2' - 13 commits - drawinglayer/inc drawinglayer/source
drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx | 30 +
drawinglayer/source/dumper/EnhancedShapeDumper.cxx| 325 ++
2 files changed, 355 insertions(+)
New commits:
commit 4a42710b8da84c77e75c091bd27d3dc91b52e987
Author: Artur Dorda artur.dorda+l...@gmail.com
Date: Tue Jul 3 21:26:01 2012 +0200
Added dumping ExtrusionColor property
Change-Id: I5df2f997494c399921a6657aecbb0d9a40977e93
diff --git a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
b/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
index ed35546..eaf7e9e 100644
--- a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
@@ -76,6 +76,7 @@ public:
void dumpProjectionModeAsAttribute(com::sun::star::drawing::ProjectionMode
eProjectionMode);
void dumpViewPointAsElement(com::sun::star::drawing::Position3D
aViewPoint);
void
dumpOriginAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair
aOrigin);
+void dumpExtrusionColorAsAttribute(sal_Bool bExtrusionColor);
private:
xmlTextWriterPtr xmlWriter;
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index 152e1fa..51caccc 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -170,6 +170,12 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference
if(anotherAny = aOrigin)
dumpOriginAsElement(aOrigin);
}
+{
+uno::Any anotherAny = xPropSet-getPropertyValue(ExtrusionColor);
+sal_Bool bExtrusionColor;
+if(anotherAny = bExtrusionColor)
+dumpExtrusionColorAsAttribute(bExtrusionColor);
+}
}
void EnhancedShapeDumper::dumpExtrusionAsAttribute(sal_Bool bExtrusion)
{
@@ -375,4 +381,11 @@ void
EnhancedShapeDumper::dumpOriginAsElement(drawing::EnhancedCustomShapeParame
xmlTextWriterEndElement( xmlWriter );
}
+void EnhancedShapeDumper::dumpExtrusionColorAsAttribute(sal_Bool
bExtrusionColor)
+{
+if(bExtrusionColor)
+xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST(extrusionColor), %s, true);
+else
+xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST(extrusionColor), %s, false);
+}
commit 778a433b1942320c557b40378f77cbf7f06cb75f
Author: Artur Dorda artur.dorda+l...@gmail.com
Date: Tue Jul 3 21:23:31 2012 +0200
Added properties ViewPoint Origin
Change-Id: I87deba7504eff3feb6671835b33768045f502ba5
diff --git a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
b/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
index 5a5fbf8..ed35546 100644
--- a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
@@ -33,6 +33,7 @@
#include com/sun/star/drawing/Direction3D.hpp
#include com/sun/star/drawing/ShadeMode.hpp
#include com/sun/star/drawing/ProjectionMode.hpp
+#include com/sun/star/drawing/Position3D.hpp
#ifndef EnhancedShapeDumper_hxx
#define EnhancedShapeDumper_hxx
@@ -73,6 +74,8 @@ public:
void
dumpSkewAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair
aSkew);
void dumpSpecularityAsAttribute(double aSpecularity);
void dumpProjectionModeAsAttribute(com::sun::star::drawing::ProjectionMode
eProjectionMode);
+void dumpViewPointAsElement(com::sun::star::drawing::Position3D
aViewPoint);
+void
dumpOriginAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair
aOrigin);
private:
xmlTextWriterPtr xmlWriter;
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index 5b9b5ac..152e1fa 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -158,6 +158,18 @@ void
EnhancedShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference
if(anotherAny = eProjectionMode)
dumpProjectionModeAsAttribute(eProjectionMode);
}
+{
+uno::Any anotherAny = xPropSet-getPropertyValue(ViewPoint);
+drawing::Position3D aViewPoint;
+if(anotherAny = aViewPoint)
+dumpViewPointAsElement(aViewPoint);
+}
+{
+uno::Any anotherAny = xPropSet-getPropertyValue(Origin);
+drawing::EnhancedCustomShapeParameterPair aOrigin;
+if(anotherAny = aOrigin)
+dumpOriginAsElement(aOrigin);
+}
}
void EnhancedShapeDumper::dumpExtrusionAsAttribute(sal_Bool bExtrusion)
{
@@ -347,4 +359,20 @@ void
EnhancedShapeDumper::dumpProjectionModeAsAttribute(drawing::ProjectionMode
}
}
+void EnhancedShapeDumper::dumpViewPointAsElement(drawing::Position3D
aViewPoint)
+{
+xmlTextWriterStartElement(xmlWriter, BAD_CAST( ViewPoint ));
+xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST(positionX), %f,
aViewPoint.PositionX);
+
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/core/data/cell.cxx | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) New commits: commit b6dcf00472b8f9573ff23ae8cadadeaad58ea4bb Author: Eike Rathke er...@redhat.com Date: Tue Jul 3 21:28:46 2012 +0200 do not attempt to compile running formula cell (fdo#51601 related) 2fb377c19f8ae38e7ec649af1343bbd64b70a16b introduced compilation of a formula cell while it is interpreted, ignoring the comment just above why that does NOT work ... This removes the portion that was responsible for the crash. Though import changed and 3-6 did not crash on opening the testcase documents anymore, the questionable code is still wrong and therefor removed. diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 5fbcbb9..2a3d807 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -1444,7 +1444,9 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) // #i11719# no UPN and no error and no token code but result string present // = interpretation of this cell during name-compilation and unknown names // = can't exchange underlying code array in CompileTokenArray() / -// Compile() because interpreter's token iterator would crash. +// Compile() because interpreter's token iterator would crash or pCode +// would be deleted twice if this cell was interpreted during +// compilation. // This should only be a temporary condition and, since we set an // error, if ran into it again we'd bump into the dirty-clearing // condition further down. @@ -1453,12 +1455,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) pCode-SetCodeError( errNoCode ); // This is worth an assertion; if encountered in daily work // documents we might need another solution. Or just confirm correctness. -OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but string - Try compiling it. ); -// Force Compilation -rtl::OUString aFormula = aResult.GetHybridFormula(); -aResult.SetHybridFormula( rtl::OUString() ); -Compile( aFormula ); -InterpretTail( eTailParam ); +OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but hybrid formula string ); return; } CompileTokenArray(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Re: [Review-3-6?] New artwork for 3.6
Hi Jean-Baptiste, Thorsten,
Hi,
There is no Close button on the new About dialog. Is it intended ?
I remember that for the previous change in this dialog, we had have the
same problem. It was fixed later.
Hm, no, that seems like a mishap that happened because my earlier change
to the About dialogue and the menu is not in 3.6. The attached one-line
change should help, although I'd somewhat prefer if we could have the
duplication-removal patch in 3.6, too.
Otherwise, we have both menu items and About dialogue buttons for
License and Credits – while the former each lead to a local document,
the latter lead to an internet resource.
Astron.
From 9673e9cc0530196e3a66297b1237480c01a191ee Mon Sep 17 00:00:00 2001
From: Stefan Knorr (astron) heinzless...@gmail.com
Date: Tue, 3 Jul 2012 21:19:54 +0200
Subject: [PATCH] Make sure About can accommodate 4 buttons, not just 3
Change-Id: Id5fc92f1ef2e8810ec6603bbcebf454b9dbdedbb
---
cui/source/dialogs/about.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index db5057f..681e792 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -291,7 +291,7 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
aWebsiteButton.SetSizePixel( aButtonSize );
aCancelButton.SetSizePixel( aButtonSize );
-sal_Int32 aButtonSpacing = aDialogWidth - ( aDialogBorder * 2 ) - ( aButtonSize.Width() * 3 ) - aAdjacentButtonSpacing ;
+sal_Int32 aButtonSpacing = aDialogWidth - ( aDialogBorder * 2 ) - ( aButtonSize.Width() * 4 ) - ( aAdjacentButtonSpacing * 2 ) ;
if (aButtonSpacing aAdjacentButtonSpacing)
{
aButtonsWidth = aAdjacentButtonSpacing - aButtonSpacing;
--
1.7.9.5
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] File Format Defaults Multiple FDO's
Hi, On Tue, Jul 3, 2012 at 9:12 PM, Andras Timar tima...@gmail.com wrote: Hi Joel, 2012/7/3 Joel Madero jmadero@gmail.com: Hi All, This seems to be one of the most consistent complaints from users as I'm going through the bug list. The issue is three fold (or more). 1. Defaults hijack everything -- vs. defaulting to allow users to select 2. No check to see if Microsoft Office is installed and thus some prompt to see if we want to replace it 3. Changing defaults once installed very difficult (or not possible?). 4. Other file associations outside of Microsoft are also hijacked -- see bug on txt files Here are just a few of the FDO's that I came across: https://bugs.freedesktop.org/show_bug.cgi?id=39791 https://bugs.freedesktop.org/show_bug.cgi?id=44462 https://bugs.freedesktop.org/show_bug.cgi?id=43519 https://bugs.freedesktop.org/show_bug.cgi?id=38310 https://bugs.freedesktop.org/show_bug.cgi?id=47483 Each one deals with the same issue in a different manner -- ie. file associations and defaults. I personally like the mock up done in https://bugs.freedesktop.org/show_bug.cgi?id=44462 I have a few questions, I know that one of these bugs is assigned but not sure about current status. I have a couple suggestions and wanted feedback: 1. Most annoying bug? I think it qualifies with at least 5 different people complaining about it with multiple comments on many of them 2. Can I make a bug that takes every complaint into account and then mark these all as dupes of the one I make? Thanks for your bug triage work. File association is a difficult topic and after fixing obvious bugs, I need ux input about how to do things the best. I'm currently debugging the hijack issue. It happens in http://opengrok.libreoffice.org/xref/core/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx. These functions were designed so that they detect Microsoft Office and do not take over their files, the only problem is that these functions do not work correctly under certain circumstances. After install user have several possibilities to change file associations, e.g. repair MS Office install, right click on file and change associations, regedit, etc. I know that none of these are easy for an ordinary user. As for other file types than MS Office, it is hard to define a good default, many file types that LibreOffice can open are not associated. We need to collect them all, this is the pre-requisite of the planned file association application. I have some problems with the mockup in fdo#44462. First is that it lists only a few file types. There are many more. Maybe we need a separate panel for it. Or instead of file extensions, we could use bigger categories (e.g. ODF, MS Office Binary, MS Office OpenXML, etc.) Please note that within LibreOffice we can handle only per user settings, because we cannot elevate the rights of soffice.bin process. Even if it is running from an administrator account, it runs with normal user privileges (at least on Vista and higher). But maybe it is even better. It is possible that one user prefers LibreOffice, other prefers something else on the same computer. Alternatively a standalone application can be developed, that can set file associations for all users. I don't think it makes sense to open a super-bug for file associations. I'm currently working on it, and I regularly monitor Windows Installer bugs. As long as a bug classified as a Windows Installer bug, I'll see it, and fix it some day. In this particular case, recent versions of Windows behave much better than the old ones. Windows Vista and 7 are much more respectful with file associations owned by different programs than for example Windows XP. I did quite a few changes in the registry for LibreOffice 3.6 and some of those changes should improve the situation. Could be interesting to retest those scenarios with LibO 3.6 to check if the situation has really improved (but don't expect major improvements in XP). Thanks for you work :) -- Jesús Corrius je...@softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Problem with 'ant' detecting running ./autogen.sh
Hi, I seem to be running into some trouble when running ./autogen.sh, in particular with the ant detection part. when i run something like 'ant -buildfile conftest.xml' on the commandline, ant works as expected. 'ant -version' gives me 'version 1.8.3' but when i run autogen/configure, I get this message : checking for ant... /bin/ant checking if /bin/ant works... configure: WARNING: Ant does not work - Some Java projects will not build! checking whether Ant is = 1.6.0... Error: Could not find or load main class org.apache.tools.ant.launch.Launcher ./configure: line 34315: test: : integer expression expected ./configure: line 34318: test: : integer expression expected configure: error: no, you need at least Ant = 1.6.0 Error running configure at ./autogen.sh line 187. i cant figure out whats going wrong here ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/core/data/cell.cxx | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) New commits: commit 2bf5edb1893df2d253ea0b7cf20f3bb7c62ae7f1 Author: Eike Rathke er...@redhat.com Date: Tue Jul 3 21:40:42 2012 +0200 do not attempt to compile running formula cell (fdo#51601 related) 2fb377c19f8ae38e7ec649af1343bbd64b70a16b introduced compilation of a formula cell while it is interpreted, ignoring the comment just above why that does NOT work ... This removes the portion that was responsible for the crash. Though import changed and this did not crash anymore on opening the testcase documents, the questionable code is still wrong and therefor removed. diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 338b0ab..c4846c0 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -1435,7 +1435,9 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) // #i11719# no UPN and no error and no token code but result string present // = interpretation of this cell during name-compilation and unknown names // = can't exchange underlying code array in CompileTokenArray() / -// Compile() because interpreter's token iterator would crash. +// Compile() because interpreter's token iterator would crash or pCode +// would be deleted twice if this cell was interpreted during +// compilation. // This should only be a temporary condition and, since we set an // error, if ran into it again we'd bump into the dirty-clearing // condition further down. @@ -1444,12 +1446,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) pCode-SetCodeError( errNoCode ); // This is worth an assertion; if encountered in daily work // documents we might need another solution. Or just confirm correctness. -OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but string - Try compiling it. ); -// Force Compilation -rtl::OUString aFormula = aResult.GetHybridFormula(); -aResult.SetHybridFormula( rtl::OUString() ); -Compile( aFormula ); -InterpretTail( eTailParam ); +OSL_FAIL( ScFormulaCell::Interpret: no UPN, no error, no token, but hybrid formula string ); return; } CompileTokenArray(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/config/svt_lingucfg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c71ded60095a0fe3d1e639d77c9529c6f44cc2d8
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 2 16:02:44 2012 +0100
ditch String::CreateFromAscii
Change-Id: Ifb41b0ab2c251e32fc8ba0124c7a8e4c077908d2
diff --git a/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
b/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
index ba7bf69..64ab9c8 100644
--- a/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
+++ b/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
@@ -163,7 +163,7 @@ public:
SvtLinguConfigItem::SvtLinguConfigItem() :
-utl::ConfigItem( String::CreateFromAscii( Office.Linguistic ) )
+utl::ConfigItem( rtl::OUString( Office.Linguistic ) )
{
LoadOptions( GetPropertyNames() );
ClearModified();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: convwatch.py
Am 03.07.12 14:51, schrieb Thorsten Behrens: Peter Jentsch wrote: I've noticed your recent revival of convwatch.py for layout regression tests. We've been developing a tool (written in Java) that might make convwatch.py more portable, by allowing to ignore certain graphical differences (caused by the possibly different implementations of antialiasing on windows and linux for example). We'd like to integrate that with convwatch.py to make it part of the LibO regression tests *but* I'm quite unsure about how you're using convwatch.py currently. Could you help us out with a hint here? Hi Peter, all image comparison scripts we have ultimately call imagemagick's composite, followed by pixel counting via identify - so having a stand-alone command line version of your smart comparison would be perfect I guess. :) Cheers, -- Thorsten Hi Thorsten, thanks for your quick reply. We'll just try our tool combined with convwatch on some of the testdocuments in the LibO source tree and see what happends. Cheers, Peter ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC] Using cached formula results during ODS import
Hi, Kohei and Markus, I have commited my initial implementation of using imported formula results during ODS import if the document was generated by LibreOffice. It's not as clean and symmetric as I would have liked, but it's the best I have right now. I hope it's not too hackish, ;-) and I await your valuable comments and criticisms. If an ScFormulaCell is set to dirty, it will be re-Interpreted (recalculated). The goal is to avoid this during ODS import of a LibreOffice generated document and instead use cached formula results imported from the document itself to achieve better performance. I added a new flag in ScDocument (kind of like IsImportingXML) that is set if the document is currently importing a LibreOffice ODS generated document. In this email, I'll call it the ScDocument libreoffice-generated-doc flag. The flag is set in ScXMLImport::setTargetDocument() because I needed a valid ScDocument to have already been created and I needed access to the XML meta generator. The flag is always reset in ScDocShell::LoadXML() because ScDocShell::AfterXMLLoading() will try to set ScFormulaCells to dirty. If the ScDocument libreoffice-generated-doc flag is set, ScXMLTableRowCellContext::EndElement()'s callees will set each newly created ScFormulaCell to not dirty (a newly created ScFormulaCell is set to dirty by default). There are multiple times during the import process that all ScFormulaCells are attempted to be set to dirty. To prevent this, ScFormulaCell::SetDirtyVar() will not set a ScFormulaCell to dirty if the ScDocument libreoffice-generated-doc flag is set. I still need to implement checking for special cases of functions, such as NOW(), where we always want to recalculate the formula result. Here are import times before and after my commit 7a0fba0b0225f59f8c38b245cb21b81750271e26, using Markus's large matrix test file with complicated functions (single sheet with approx 300cols x 5200rows), on an –enable-symbols libo build on a machine with AMD Athlon 64 X2 Dual Core 6400 @ 3.2GHz with 8GB Ram running 64 bit GNU/Linux: Before commit: 22 seconds After commit: 21 seconds Really it's probably a less than a second improvement which is not so great. Two areas that I think MAY help improve performance a little: 1) Since the goal was to just stop Interpret() from being called, my current implementation allows the whole SetDirty() call chain to call all the way down to the lowest level, which is ScFormulaCell::SetDirtyVar(), before preventing the ScFormulaCell object's dirty flag from being set. Performance may improve a bit, if I stop this call chain at a higher level, preventing the overhead of the calls and peripheral logic taking place in the call chain. I just have to make sure that this peripheral logic isn't required. 2) ScXMLImport::setTargetDocument() is called for each tab in the document which means the meta generator is checked and the ScDocument libreoffice-generated-doc flag is set for each tab. Maybe I can find a way to do this once while still having access to the XML and a valid ScDocument. However, this probably won't affect performance much at all especially in the test document I was using. I'll try to see if callgrind will tell me anything with this test document. Respectfully, Daniel Bankston ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC] Using cached formula results during ODS import
On 07/03/2012 04:46 PM, Daniel Bankston wrote: If an ScFormulaCell is set to dirty, it will be re-Interpreted (recalculated). The goal is to avoid this during ODS import of a LibreOffice generated document and instead use cached formula results imported from the document itself to achieve better performance. Before commit: 22 seconds After commit: 21 seconds Really it's probably a less than a second improvement which is not so great. I'll try to see if callgrind will tell me anything with this test document. According to callgrind the ScInterpreter::Interpret() chain is still being called on this test file so I need to investigate what is going on. Sorry, I'll let you know what I find out. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: missing configure option: --without-cppunit -- was [BUILD] consistent test failures under windows
Hello Le Tue, 03 Jul 2012 09:42:46 +0200, David Ostrovsky d.ostrov...@gmx.de a écrit: Hi, Zitat von Mat M m...@gmx.fr: Hello Le Sun, 10 Jun 2012 12:44:42 +0200, Korrawit Pruegsanusak detective.conan.1...@gmail.com a écrit: I think you should disable your antivirus during the build. It captures CVE files as a threat, and delete / quarantine them. I eventually found that files are copied into the tmp folder of cygwin before being used by tests, so c:\cygwin\tmp is the path to exclude, not the libo sources one. it only works if you do have admin rights. Think about enterprise where you do not have it. I'm at home, so no issue with that, right. In that case you will end up manually commented all CVE cpp units calls in the tree (and there are a lot). Actually I'm missing the build option: --without-ccpunit (or at least --without-cve-unit) Unit tests are really important and we need more of them. In some circumstances however (tracking down critical problems on some strange platform) all you want is to get debug build done and not to mess around with ... antivirus settings! About AV, --without-cve-unit is enough, but having a way to bypass unit testing could be practical for some specific cases. regards -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svl/inc svl/qa svl/source
svl/inc/svl/style.hxx |2
svl/qa/unit/svl.cxx |6 -
svl/qa/unit/test_URIHelper.cxx| 16 +--
svl/qa/unit/test_lngmisc.cxx | 36
svl/source/config/asiancfg.cxx| 26 +
svl/source/config/cjkoptions.cxx | 21 ++--
svl/source/config/ctloptions.cxx | 15 +--
svl/source/config/languageoptions.cxx |4
svl/source/items/macitem.cxx |6 -
svl/source/misc/inettype.cxx |4
svl/source/misc/lockfilecommon.cxx|4
svl/source/misc/urihelper.cxx | 26 +
svl/source/numbers/zforfind.cxx |8 -
svl/source/numbers/zforlist.cxx | 148 +-
svl/source/numbers/zformat.cxx| 16 +--
15 files changed, 136 insertions(+), 202 deletions(-)
New commits:
commit c6c99966cd4515b574e9cd21e89954dabf56009a
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Tue Jul 3 21:18:15 2012 -0300
Get rid of RTL_CONSTASCII_USTRINGPARAM in svl/
Change-Id: I64f3f966011bf07a2ee0c7327feb4a46df595210
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 0fb3e8e..34edeb5 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -276,7 +276,7 @@ public:
protected:
SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy
ImplInheritanceHelper2
-:
SfxStyleSheetBase(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(dummy)),
+: SfxStyleSheetBase(rtl::OUString(dummy),
NULL, SFX_STYLE_FAMILY_ALL, 0)
{
assert(false);
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index b051d1f..d0cab79 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -267,21 +267,21 @@ void Test::testNumberFormat()
sal_uInt32 nKey;
OUString aCode;
// Thai date format (implicit locale).
-aCode = OUString(RTL_CONSTASCII_USTRINGPARAM([$-107]d/mm/;@));
+aCode = [$-107]d/mm/;@;
if (!aFormatter.PutEntry(aCode, nPos, nType, nKey))
{
CPPUNIT_ASSERT_MESSAGE(failed to insert format code
'[$-107]d/mm/;@', false);
}
// Thai date format (explicit locale)
-aCode = OUString(RTL_CONSTASCII_USTRINGPARAM([$-107041E]d/mm/;@));
+aCode = [$-107041E]d/mm/;@;
if (!aFormatter.PutEntry(aCode, nPos, nType, nKey))
{
CPPUNIT_ASSERT_MESSAGE(failed to insert format code
'[$-107041E]d/mm/;@', false);
}
// Thai date format (using buddhist calendar type).
-aCode = OUString(RTL_CONSTASCII_USTRINGPARAM([~buddhist]D ));
+aCode = [~buddhist]D ;
if (!aFormatter.PutEntry(aCode, nPos, nType, nKey))
{
CPPUNIT_ASSERT_MESSAGE(failed to insert format code '[~buddhist]D
', false);
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index e91cb20..9cb810b 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -163,7 +163,7 @@ css::uno::Any Content::execute(
}
switch (c) {
case '1':
-uri += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/));
+uri += /;
break;
case '2':
if (uri.getLength() 0 uri[uri.getLength() - 1] == '/') {
@@ -231,18 +231,16 @@ void Test::finish() {
void Test::testNormalizedMakeRelative() {
css::uno::Sequence css::uno::Any args(2);
-args[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Local));
-args[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Office));
+args[0] = rtl::OUString(Local);
+args[1] = rtl::OUString(Office);
css::uno::Reference css::ucb::XContentProviderManager (
(css::uno::Reference css::lang::XMultiComponentFactory (
m_context-getServiceManager(), css::uno::UNO_QUERY_THROW)-
createInstanceWithArgumentsAndContext(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- com.sun.star.ucb.UniversalContentBroker)),
+ rtl::OUString(com.sun.star.ucb.UniversalContentBroker),
args, m_context)),
css::uno::UNO_QUERY_THROW)-registerContentProvider(
-new Provider, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(test)),
+new Provider, rtl::OUString(test),
true);
struct Data {
char const * base;
@@ -402,9 +400,7 @@ void Test::testFindFirstURLInText() {
CharClass charClass(
css::uno::Reference css::lang::XMultiServiceFactory (
m_context-getServiceManager(), css::uno::UNO_QUERY_THROW),
-com::sun::star::lang::Locale(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(en)),
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(US)),
rtl::OUString()));
+com::sun::star::lang::Locale(en, US, ));
for (std::size_t i = 0; i SAL_N_ELEMENTS(tests); ++i) {
rtl::OUString input(rtl::OUString::createFromAscii(tests[i].input));
xub_StrLen begin = 0;
diff --git
Re: missing configure option: --without-cppunit -- was [BUILD] consistent test failures under windows
Hello David, Mat, it only works if you do have admin rights. Think about enterprise where you do not have it. In that case you will end up manually commented all CVE cpp units calls in the tree (and there are a lot). I doubt that you're allowed to build LibO in such an environment. Actually I'm missing the build option: --without-ccpunit (or at least --without-cve-unit) Unit tests are really important and we need more of them. In some circumstances however (tracking down critical problems on some strange platform) all you want is to get debug build done and not to mess around with ... antivirus settings! Unfortunatelly current integration of cpp units in LO build infrastructure is broken. To see why try to activate the production option --without-xmlsec on linux ... and you will not be able to build at all. --without-xmlsec is not an option for Linux builds. You may call it a bad joke but it was never intended for this purpose. This is not broken, this has been added by design to make sure that we will never again get into the siutation where we can't open any of our password protected files. And yes I provided a patch for that (you can find it on ML) and it was rejected with (a bad) joke justification: you *should* not use *this* option on linux. Another option would be to introduce some means to activate only specific cpp units: --enable-cppunit=sw like lately introduced per lib activation of debug symbols. I'm strongly against this idea. Everyone should ALWAYS execute all tests and not only the tests someone thinks are useful. You can see at the subsequenttests what happens to tests that are optional. I am going to provide a patch for this option: --without-cppunit (note we have already --without-junit). It more or less one line change ... so next time you would have a choice ;-) Please save your time and work on something more useful. There are ways to prevent the execution of the unit tests during the build but they are not widespread for good reasons. We learned in the past that we need to make it as difficult as possible to build without executing the unit tests. All our tests should normally execute fine on all major platforms and if not that is a serious bug and we need to fix it as fast as possible. IMHO adding a simple documented way to disable the unit test will make many more developers disable them and in the end result in more broken tests and undiscovered bugs. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 6 commits - officecfg/registry sc/AllLangResTarget_sc.mk sc/inc sc/Library_scui.mk sc/sdi sc/source sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5
sc/AllLangResTarget_sc.mk |1
sc/Library_scui.mk|2
sc/inc/conditio.hxx |2
sc/inc/globstr.hrc| 14
sc/inc/sc.hrc |3
sc/inc/scabstdlg.hxx | 10
sc/sdi/cellsh.sdi |1
sc/sdi/scalc.sdi | 25 +
sc/source/core/data/documen7.cxx |4
sc/source/ui/attrdlg/scdlgfact.cxx| 25 +
sc/source/ui/attrdlg/scdlgfact.hxx| 11
sc/source/ui/condformat/condformatdlg.cxx | 82 +--
sc/source/ui/condformat/condformathelper.cxx | 121 +
sc/source/ui/condformat/condformatmgr.cxx | 227
++
sc/source/ui/inc/condformatdlg.hrc|1
sc/source/ui/inc/condformatdlg.hxx| 13
sc/source/ui/inc/condformathelper.hxx | 30 +
sc/source/ui/inc/condformatmgr.hrc| 18
sc/source/ui/inc/condformatmgr.hxx| 110
sc/source/ui/src/condformatdlg.src| 77 +--
sc/source/ui/src/condformatmgr.src| 66 ++
sc/source/ui/src/globstr.src | 32 +
sc/source/ui/view/cellsh1.cxx | 29 +
sc/uiconfig/scalc/menubar/menubar.xml | 10
25 files changed, 796 insertions(+), 123 deletions(-)
New commits:
commit e93b5fff2775cd1d8793eb14e7ffcf059ebc2752
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Jul 4 02:16:17 2012 +0200
impreove the cond format dialog a little bit
Change-Id: I4c7fdb15440ef0fca5b262a37549e96c85d8ab1f
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index d20d320..79a111d 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -320,7 +320,7 @@ void ScCondFrmtEntry::Init()
Point aPointCol = maLbColMiddle.GetPosPixel();
Point aPointEdDataBar = maEdDataBarMin.GetPosPixel();
Point aPointLbDataBar = maLbDataBarMaxType.GetPosPixel();
-const long nMovePos = 150;
+const long nMovePos = 250;
aPointLb.X() += nMovePos;
aPointEd.X() += nMovePos;
aPointCol.X() += nMovePos;
@@ -453,6 +453,7 @@ void ScCondFrmtEntry::SetCondType()
HideColorScaleElements();
HideDataBarElements();
SwitchToType(CONDITION);
+ConditionTypeSelectHdl(NULL);
}
void ScCondFrmtEntry::HideColorScaleElements()
@@ -565,7 +566,11 @@ void ScCondFrmtEntry::SetFormulaType()
maEdVal2.Hide();
maLbCondType.Hide();
maLbStyle.Show();
+maFtCondition.Show();
maWdPreview.Show();
+maFtStyle.Show();
+Size aSize(440, 30);
+maEdVal1.SetSizePixel(aSize);
}
void ScCondFrmtEntry::Select()
@@ -895,7 +900,7 @@ IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl )
else
{
maEdVal2.Hide();
-Size aSize(193, 30);
+Size aSize(440, 30);
maEdVal1.SetSizePixel(aSize);
}
return 0;
diff --git a/sc/source/ui/src/condformatdlg.src
b/sc/source/ui/src/condformatdlg.src
index 68fd52a..ebf84f3 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -134,13 +134,13 @@ Control RID_COND_ENTRY
Edit ED_VAL1
{
Pos = MAP_APPFONT( 125, 15 );
-Size = MAP_APPFONT( 170, 12 );
+Size = MAP_APPFONT( 160, 12 );
Border = TRUE;
};
Edit ED_VAL2
{
-Pos = MAP_APPFONT( 215, 15 );
-Size = MAP_APPFONT( 80, 12 );
+Pos = MAP_APPFONT( 210, 15 );
+Size = MAP_APPFONT( 75, 12 );
Border = TRUE;
};
ListBox LB_STYLE
@@ -156,7 +156,7 @@ Control RID_COND_ENTRY
};
ListBox LB_COLOR_FORMAT
{
-Pos = MAP_APPFONT( 50, 15 );
+Pos = MAP_APPFONT( 70, 15 );
Size = MAP_APPFONT( 60, 60);
Border = TRUE;
DropDown = TRUE;
@@ -170,7 +170,7 @@ Control RID_COND_ENTRY
ListBox LB_TYPE_COL_SCALE
{
Pos = MAP_APPFONT( 5, 32 );
-Size = MAP_APPFONT( 50, 60 );
+Size = MAP_APPFONT( 60, 60 );
Border = TRUE;
DropDown = TRUE;
StringList [ en-US ] =
@@ -186,7 +186,7 @@ Control RID_COND_ENTRY
Edit ED_COL_SCALE
{
Pos = MAP_APPFONT( 5, 48 );
-Size = MAP_APPFONT( 50, 12 );
+Size = MAP_APPFONT( 60, 12 );
[Libreoffice-commits] .: svl/source
svl/source/numbers/zforlist.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7f5f50052df9222dd3bb0908cff7d864859ae213
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Tue Jul 3 23:22:25 2012 -0300
Make windows tinderbox happy
fix some cast for OUString
Change-Id: I20563d404169b9e1f29699d52567760509fabb13
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 934a043..368a022 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -949,7 +949,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType
eLnge, bool bNoAdditio
if ( !aDupes.isEmpty() )
{
rtl::OUString aMsg(XML locale data FormatElement
formatindex dupe: );
-aMsg += rtl::OUString::valueOf( nIdx );
+aMsg += rtl::OUString::valueOf( sal_Int32(nIdx) );
aMsg += \nFormatElements: ;
aMsg += rtl::OUString::valueOf( j );
aMsg += (;
@@ -1740,7 +1740,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat(
rCode.Index != NF_CURRENCY_1000DEC2_CCC )
{
rtl::OUString aMsg(SvNumberFormatter::ImpInsertFormat: no
[$...] on currency format code, index );
-aMsg += rtl::OUString::valueOf( rCode.Index );
+aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index) );
aMsg += :\n;
aMsg += rCode.Code;
LocaleDataWrapper::outputCheckMessage(
xLocaleData-appendLocaleInfo( aMsg));
@@ -1758,7 +1758,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat(
if (LocaleDataWrapper::areChecksEnabled())
{
rtl::OUString aMsg( SvNumberFormatter::ImpInsertFormat: bad
format code, index );
-aMsg += rtl::OUString::valueOf( rCode.Index );
+aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index) );
aMsg += \n;
aMsg += rCode.Code;
LocaleDataWrapper::outputCheckMessage(
xLocaleData-appendLocaleInfo( aMsg));
@@ -1788,7 +1788,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat(
default:
{
rtl::OUString
aMsg(SvNumberFormatter::ImpInsertFormat: dup format code, index );
-aMsg += rtl::OUString::valueOf( rCode.Index );
+aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index)
);
aMsg += \n;
aMsg += rCode.Code;
LocaleDataWrapper::outputCheckMessage(
xLocaleData-appendLocaleInfo( aMsg));
@@ -1803,7 +1803,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat(
if (LocaleDataWrapper::areChecksEnabled())
{
rtl::OUString aMsg( SvNumberFormatter::ImpInsertFormat: too
many format codes, index );
-aMsg += rtl::OUString::valueOf( rCode.Index );
+aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index) );
aMsg += \n;
aMsg += rCode.Code;
LocaleDataWrapper::outputCheckMessage(
xLocaleData-appendLocaleInfo( aMsg));
@@ -1819,7 +1819,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat(
rtl::OUString aMsg( ImpInsertFormat: can't insert number format
key pos: );
aMsg += rtl::OUString::valueOf( sal_Int32( nPos ) );
aMsg += , code index ;
-aMsg += rtl::OUString::valueOf( rCode.Index );
+aMsg += rtl::OUString::valueOf( sal_Int32(rCode.Index) );
aMsg += \n;
aMsg += rCode.Code;
LocaleDataWrapper::outputCheckMessage(
xLocaleData-appendLocaleInfo( aMsg));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: testtools/CustomTarget_uno_test.mk
testtools/CustomTarget_uno_test.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 40605c33bc58c668419d07ec5037674bee37911a Author: David Tardon dtar...@redhat.com Date: Wed Jul 4 07:02:39 2012 +0200 add missing dependency Change-Id: Ib8eaa63c6a704902d3ee3e142050f2388545ea64 diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk index 3cbea08..7c8d016 100644 --- a/testtools/CustomTarget_uno_test.mk +++ b/testtools/CustomTarget_uno_test.mk @@ -30,7 +30,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test)) .PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test) $(call gb_CustomTarget_get_target,testtools/uno_test) : \ - $(call gb_Rdb_get_target,uno_services) \ + $(call gb_Rdb_get_outdir_target,uno_services) \ $(call gb_Executable_get_target_for_build,uno) \ $(call gb_InternalUnoApi_get_target,bridgetest) $(call gb_Helper_abbreviate_dirs,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] FR QA team
Hi all, Just to let you know that I'm organizing a bug hunting session in French, aiming the 6th and 7th, but I think it will be too short in time (joining irc, installing the version in parallel, etc... need time). However, it's a work in progress and we should have a team of 10 people testing the 3.6. My goal is to transform it in a regular testing team (and to enlarge it of course ;). I'll report our progress here. Kind regards Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ...
On Mon, 2012-07-02 at 18:35 +0200, Lionel Elie Mamane wrote: On Fri, Jun 29, 2012 at 09:56:32AM +0100, Michael Meeks wrote: * CXX0X-ABI incompatibility can of worms (Bjoern) + gcc 4.7 - cxx0x extension is binary incompatible + incompatible stdlib symbols that bust + http://gcc.gnu.org/ml/gcc/2012-06/msg00201.html + luck that it worked until now: it was compatible. AA: + should disable in our builds by default (Bjoern) The linked thread suggests that this is a bug / not intended to have gone in GCC 4.7, and that the right thing that will be done is bump the soname? Well yes, the thread on the gcc list, after initially running into the ground, seems to continue in a more encouraging direction yesterday / today - focused on reverting the ABI breakage - I believe Ubuntu did this already in their gcc ;-) That's my preferred solution too I think :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 47904] FILEOPEN MS2007 .xlsx shows comments what should be hidden
https://bugs.freedesktop.org/show_bug.cgi?id=47904 Qubit bishop.robin...@gmail.com changed: What|Removed |Added Status Whiteboard||bibisected35 ||bibisected35older CC||bishop.robin...@gmail.com --- Comment #10 from Qubit bishop.robin...@gmail.com 2012-07-03 22:09:54 UTC --- Regression does appear in oldest version of bibisect-3.5.tar.lzma and must be older. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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 50948] : Hyperlink-edit disabled
https://bugs.freedesktop.org/show_bug.cgi?id=50948 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution||INVALID CC||LibreOffice@bielefeldundbus ||s.de --- Comment #3 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-07-03 22:10:57 UTC --- I have lots of Spreadsheet documents with linked contents, no problem at all with LibreOffice 3.5.5.2. German UI/Locale [Build-ID: 24b32b4-b87ec2e-85c8e98-87a4e20-9a1b8c1] on German WIN7 Home Premium (64bit) and any other Version. Closing Bug due to reporter's inactivity as INVALID. @reporter: Please feel free to reopen this bug if you find out that the problem still exists with the current stable LibreOffice version and if you can contribute requested additional information due to http://wiki.documentfoundation.org/BugReport (especially BugReport Details)! -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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 41543] Mentioned Menu item 'Edit - Hyperlink' does not exist
https://bugs.freedesktop.org/show_bug.cgi?id=41543 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Status|NEEDINFO|NEW CC||cedric.bosdonnat.ooo@free.f ||r, kohei.yosh...@gmail.com, ||r...@novell.com Component|Documentation |UI --- Comment #3 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-07-03 22:33:50 UTC --- But the question is: why do we have menu 'Edit - Hyperlink' in Writer and Draw, but not in Calc? 'Edit - Hyperlink' brings up the same dialog as 'Insert - Hyperlink' for a selected text with hyperlink I believe in a first step we should think about unifying UI, then about Documentation + Help. @Cédric, Kohei, Radek Can you please decide whether we need menu 'Edit - Hyperlink' in all applications or no one (or why not in Calc)? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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 51707] New: Right aligned single line textfield Currency Symbol Problem
https://bugs.freedesktop.org/show_bug.cgi?id=51707 Bug #: 51707 Summary: Right aligned single line textfield Currency Symbol Problem Classification: Unclassified Product: LibreOffice Version: 3.5.4 release Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: major Priority: medium Component: Writer AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: kontakt+libreoff...@patrick-brueckner.de Created attachment 63796 -- https://bugs.freedesktop.org/attachment.cgi?id=63796 affected document In the attached document, see the three text input fields. Their values are 0€, 0$, and 0£. Formatting the text fields to be single lined and aligned right, will hide the currency symbol (altough it stays in the input field), just to far on the right. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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 51707] Right aligned single line textfield Currency Symbol Problem
https://bugs.freedesktop.org/show_bug.cgi?id=51707 --- Comment #1 from madmuffin kontakt+libreoff...@patrick-brueckner.de 2012-07-03 22:34:34 PDT --- Created attachment 63797 -- https://bugs.freedesktop.org/attachment.cgi?id=63797 screenshot -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
