LibreOffice Gerrit News for core on 2014-10-30
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + sd: move code setting edit mode to a new method in https://gerrit.libreoffice.org/12148 from Boris Egorov about module sd + TANGO: Updated formatting icons and moved old tango sources to human in https://gerrit.libreoffice.org/12147 from Yousuf Philips about module icon-themes, officecfg + Improve SvSimpleTable class in https://gerrit.libreoffice.org/12070 from Mihály Palenik about module cui, include, svtools + accessibility: shift by zero in https://gerrit.libreoffice.org/12146 from Robert Antoni Buj i Gelonch about module toolkit + fdo#85046 - Calc name changes didnt show up with entries having ContextLa in https://gerrit.libreoffice.org/12145 from Yousuf Philips about module officecfg + java: Method uses the same code for two switch clauses in https://gerrit.libreoffice.org/12139 from Robert Antoni Buj i Gelonch about module reportbuilder, toolkit, wizards + java: Questionable use of non-short-circuit logic in https://gerrit.libreoffice.org/12137 from Robert Antoni Buj i Gelonch about module qadevOOo, wizards + fdo#75757: Remove inheritance from std::vector in https://gerrit.libreoffice.org/12136 from Matthew Pottage about module comphelper, configmgr, cui, editeng, extensions, filter, fpicker, framework, include, oox, package, sax, sfx2, svx, sw, unotools, unoxml, writerfilter, xmloff + runner: Dereference of the result of readLine() without nullcheck in https://gerrit.libreoffice.org/12135 from Robert Antoni Buj i Gelonch about module qadevOOo + fdo#81356: use boost::rational internally in Fraction in https://gerrit.libreoffice.org/12134 from Juan Picca about module include, tools + fdo#83308 Show thousand separators in document word/character counts in https://gerrit.libreoffice.org/12130 from Matthew Francis about module sw End of freshness + vcl: Allow SalGraphics to draw gradients natively in https://gerrit.libreoffice.org/12119 from Chris Sherlock about module include, vcl + Change the “X” icons for removing documents in Start Center in https://gerrit.libreoffice.org/12144 from Adolfo Jayme Barrientos about module icon-themes + HIG fixes for smath dialogs in https://gerrit.libreoffice.org/12105 from Adolfo Jayme Barrientos about module starmath + Better label for OK button in Special Characters dialog in https://gerrit.libreoffice.org/12143 from Adolfo Jayme Barrientos about module cui + Perftest for loading autocorrect dictionaries, related fdo#79761 in https://gerrit.libreoffice.org/11296 from Matúš Kukan about module editeng + android: Show document browser back in the menu in https://gerrit.libreoffice.org/12108 from Jacobo Aragunde Pérez about module android * Merged changes on master for project core changed in the last 25 hours: + remove unnecessary 'using namespace rtl' declarations in https://gerrit.libreoffice.org/12133 from Noel Grandin + fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT in https://gerrit.libreoffice.org/12103 from Naruhiko Ogasawara + perfcheck : parse callgrind.out results to build csv file in https://gerrit.libreoffice.org/11962 from Laurent Godard + ref-counting vcl::Window subclasses in https://gerrit.libreoffice.org/11972 from Noel Grandin + OXYGEN: Refreshing icons from main source and added a few new ones in https://gerrit.libreoffice.org/12129 from Yousuf Philips * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot + WIP: fdo#43090: Add an option to disable autoclose brackets in https://gerrit.libreoffice.org/12024 from Marcos Paulo de Souza + convert ScHint ID's to an enum in https://gerrit.libreoffice.org/11986 from Noel Grandin + fdo#39625 Make existing CppUnittests work in https://gerrit.libreoffice.org/11605 from Tobias Madl + fdo#58194 - export DOCX Automatic indent as firstLine indent in https://gerrit.libreoffice.org/10425 from Joren De Cuyper + WIP (do not merge): remove custom impl of bidirectional list in https://gerrit.libreoffice.org/11001 from Chris Laplante + fdo#83003 Startcenter: No method for returnin Recent Docs in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri
LibreOffice Gerrit News for submodules on 2014-10-30
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: + update label Minimum space between numbering and text in https://gerrit.libreoffice.org/12141 from Stanislav Horáček + rename Fields - Other to Fields - More Fields in https://gerrit.libreoffice.org/12140 from Stanislav Horáček + update description of the Special Characters dialog in https://gerrit.libreoffice.org/12138 from Stanislav Horáček * Merged changes on master for project help changed in the last 25 hours: None * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes for call about new testing hardware
On Wed, Oct 29, 2014 at 11:05 PM, Thorsten Behrens t...@documentfoundation.org wrote: Norbert Thiebaud wrote: With VAT you are at 7995e, without storage or bandwidth. that leave you with 1344euro net-VAT for storage and bandwidth. even with a cap of 1GB per month of bandwidth that leave us with 1.4TB of storage and you get a tie... Still, interesting to see that -- give or take a few dollars or SPECints or GBs -- AWS is competitive even to generous hosted offers. The hosted price is based on general public price. It is not taking into account any special deal that the said generous hoster may or may not extend to us. So yeah AWS can be competitive with hosted solution, it can even be way more interesting for _some_ usage pattern, like if you have a process that can fit the spot-instance restrictions, which we indeed considered and _is_ part of the mix. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - framework/source svx/source sw/source vcl/source
framework/source/accelerators/acceleratorconfiguration.cxx | 15 +-
framework/source/accelerators/documentacceleratorconfiguration.cxx |4
framework/source/accelerators/presethandler.cxx| 30 -
framework/source/inc/accelerators/presethandler.hxx| 13 --
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 10 +
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx|7 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx|4
svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 35 +
svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx | 10 -
sw/source/uibase/inc/workctrl.hxx |1
sw/source/uibase/ribbar/workctrl.cxx | 59
--
vcl/source/window/builder.cxx | 23 ++-
12 files changed, 72 insertions(+), 139 deletions(-)
New commits:
commit 56019dcb79475606952a954fe732a3109441ffec
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Oct 30 08:11:04 2014 +0100
cleanup: We re-init this member all the time anyway.
Also kill some unused measuring.
Change-Id: I69521d36e4da4b50cd58f346f0adb0e5563c8bec
diff --git a/sw/source/uibase/inc/workctrl.hxx
b/sw/source/uibase/inc/workctrl.hxx
index 567a0d0..493b164 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -76,7 +76,6 @@ public:
class SwTbxAutoTextCtrl : public SfxToolBoxControl
{
PopupMenu* pPopup;
-SwView* pView;
voidDelPopup();
public:
diff --git a/sw/source/uibase/ribbar/workctrl.cxx
b/sw/source/uibase/ribbar/workctrl.cxx
index ef1e5b7..d191cfd 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -49,8 +49,6 @@
#include vcl/svapp.hxx
-
-
// Size check
#define NAVI_ENTRIES 20
#if NAVI_ENTRIES != NID_COUNT
@@ -164,8 +162,7 @@ SwTbxAutoTextCtrl::SwTbxAutoTextCtrl(
sal_uInt16 nId,
ToolBox rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
-pPopup(0),
-pView(0)
+pPopup(0)
{
rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWN | rTbx.GetItemBits( nId )
);
}
@@ -177,46 +174,38 @@ SwTbxAutoTextCtrl::~SwTbxAutoTextCtrl()
SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
{
-pView = ::GetActiveView();
+SwView* pView = ::GetActiveView();
if(pView !pView-GetDocShell()-IsReadOnly()
!pView-GetWrtShell().HasReadonlySel() )
{
-ToolBox rBox = GetToolBox();
+Link aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
-Rectangle aItemRect( rBox.GetItemRect( GetId() ) );
-Point aPt(rBox.OutputToScreenPixel(aItemRect.TopLeft()));
-aPt.X() += aItemRect.GetWidth()/2;
-aPt.Y() += aItemRect.GetHeight()/2;
-if(pView)
+pPopup = new PopupMenu;
+SwGlossaryList* pGlossaryList = ::GetGlossaryList();
+const size_t nGroupCount = pGlossaryList-GetGroupCount();
+for(size_t i = 1; i = nGroupCount; ++i)
{
-Link aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
-
-pPopup = new PopupMenu;
-SwGlossaryList* pGlossaryList = ::GetGlossaryList();
-const size_t nGroupCount = pGlossaryList-GetGroupCount();
-for(size_t i = 1; i = nGroupCount; ++i)
+OUString sTitle = pGlossaryList-GetGroupTitle(i - 1);
+const sal_uInt16 nBlockCount = pGlossaryList-GetBlockCount(i -1);
+if(nBlockCount)
{
-OUString sTitle = pGlossaryList-GetGroupTitle(i - 1);
-const sal_uInt16 nBlockCount = pGlossaryList-GetBlockCount(i
-1);
-if(nBlockCount)
+sal_uInt16 nIndex = static_castsal_uInt16(100*i);
+// but insert without extension
+pPopup-InsertItem( i, sTitle);
+PopupMenu* pSub = new PopupMenu;
+pSub-SetSelectHdl(aLnk);
+pPopup-SetPopupMenu(i, pSub);
+for(sal_uInt16 j = 0; j nBlockCount; j++)
{
-sal_uInt16 nIndex = static_castsal_uInt16(100*i);
-// but insert without extension
-pPopup-InsertItem( i, sTitle);
-PopupMenu* pSub = new PopupMenu;
-pSub-SetSelectHdl(aLnk);
-pPopup-SetPopupMenu(i, pSub);
-for(sal_uInt16 j = 0; j nBlockCount; j++)
-{
-OUString sLongName(pGlossaryList-GetBlockLongName(i -
1, j));
-OUString sShortName(pGlossaryList-GetBlockShortName(i
- 1, j));
-
-OUString sEntry = sShortName + - + sLongName;
-pSub-InsertItem(++nIndex, sEntry);
-}
+
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 46635, which changed state. Bug 46635 Summary: FILESAVE Endless loop during autorecovery if format not writable https://bugs.freedesktop.org/show_bug.cgi?id=46635 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 40 ---
sw/source/filter/ww8/docxattributeoutput.hxx |2 -
2 files changed, 42 deletions(-)
New commits:
commit 51d694ee802a13f773421ac78cfabdf7acab023b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Oct 30 09:00:10 2014 +0100
Unused DocxAttributeOutput::switchHeaderFooter()
Change-Id: If50922e238bebd9a02e9950ca27d99c2df9ab7d8
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 85b38bb..b3c3687 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2950,45 +2950,6 @@ void DocxAttributeOutput::InitTableHelper(
ww8::WW8TableNodeInfoInner::Pointer_t
(sal_uInt16)nTblSz, false);
}
-/**
- * As we are exporting Header and footer in between when we are exporting
document.xml.
- * In this case we are facing issue in table export for header and footer.
Because
- * flags for table is getting shared in both export.
- * So we are switching between flags in between exporting document.xml and
Header footer
- * export.
- */
-void DocxAttributeOutput::switchHeaderFooter(bool isHeaderFooter, sal_Int32
index)
-{
-if( isHeaderFooter index == 1)
-{
-m_oldTableReference-m_bTableCellOpen =
m_tableReference-m_bTableCellOpen;
-m_oldTableReference-m_nTableDepth = m_tableReference-m_nTableDepth;
-m_oldTableReference-m_pOldTablepInner =
m_tableReference-m_pOldTablepInner;
-m_tableReference-m_bTableCellOpen = false;
-m_tableReference-m_nTableDepth = 0;
-m_pSectionInfo.reset();
-}
-else if( index == -1)
-{
- if (m_oldTableReference-m_pOldTablepInner)
- {
- m_tableReference-m_bTableCellOpen =
m_oldTableReference-m_bTableCellOpen;
- m_tableReference-m_nTableDepth =
m_oldTableReference-m_nTableDepth;
-
-//Reset the oldReference, after copying it back to the original.
-m_oldTableReference-m_bTableCellOpen = false ;
-m_oldTableReference-m_nTableDepth = 0;
-m_oldTableReference-m_pOldTablepInner.reset();
- }
-
-}
-else
-{
-m_tableReference-m_bTableCellOpen = false;
-m_tableReference-m_nTableDepth = 0;
-}
-}
-
void DocxAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner )
{
// In case any paragraph SDT's are open, close them here.
@@ -8350,7 +8311,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport
rExport, FSHelperPtr pSeri
m_anchorId( 1 ),
m_nextFontId( 1 ),
m_tableReference(new TableReference()),
- m_oldTableReference(new TableReference()),
m_bIgnoreNextFill(false),
m_bBtLr(false),
m_pTableStyleExport(new DocxTableStyleExport(rExport.pDoc, pSerializer)),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 765d64d..e787e5a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -878,7 +878,6 @@ private:
};
boost::scoped_ptrTableReference m_tableReference;
-boost::scoped_ptrTableReference m_oldTableReference;
std::map OUString, EmbeddedFontRef fontFilesMap; // font file url to
data
@@ -962,7 +961,6 @@ public:
/// DMLTextExport
virtual void WriteTextBox(css::uno::Referencecss::drawing::XShape
xShape) SAL_OVERRIDE;
virtual oox::drawingml::DrawingML GetDrawingML() SAL_OVERRIDE;
-virtual void switchHeaderFooter(bool isHeaderFooter, sal_Int32 index);
void BulletDefinition(int nId, const Graphic rGraphic, Size aSize)
SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno.cxx |4 1 file changed, 4 insertions(+) New commits: commit 4d7c414a8dd60f49073d3b34e1c37ad5e427a377 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 30 09:33:01 2014 +0100 Add include Change-Id: I0598e9d0c9c33c538aa02eabc2c09d96ec3c9b4d diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index 065513a..a4f0d1e 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include sal/config.h + +#include cassert + #include pyuno_impl.hxx #include rtl/strbuf.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/helper/APIDescGetter.java | 22 +-
1 file changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 1e7382cb45759908cd3d639c839dcd5633dbadd1
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Wed Oct 29 16:48:00 2014 +0100
runner: Dereference of the result of readLine() without nullcheck
Change-Id: I3d02436446a79137ce42b1a190c9e3985fbb9246
Reviewed-on: https://gerrit.libreoffice.org/12135
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/qadevOOo/runner/helper/APIDescGetter.java
b/qadevOOo/runner/helper/APIDescGetter.java
index 4171dc2..71c8981 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -595,16 +595,20 @@ public class APIDescGetter extends DescGetter
{
String entry = buf.readLine();
-if (entry.endsWith(sEndsWithCSVName))
+if (entry != null)
{
-System.out.println(FOUND );
-InputStream input =
this.getClass().getResourceAsStream(/objdsc/ +
-module +
-/ +
-entry);
-csvFile = new BufferedReader(
-new InputStreamReader(input));
-found = true;
+if (entry.endsWith(sEndsWithCSVName))
+{
+System.out.println(FOUND );
+InputStream input =
+this.getClass().getResourceAsStream(/objdsc/
+
+module +
+/ +
+entry);
+csvFile =
+new BufferedReader(new
InputStreamReader(input));
+found = true;
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Andrea Gelmini license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: qadevOOo/runner wizards/com
qadevOOo/runner/util/XMLTools.java |
3 ++-
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java |
2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 9eabc1fc3b2efa3303860d33013f39582861
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Wed Oct 29 17:11:50 2014 +0100
java: Questionable use of non-short-circuit logic
Change-Id: Ied831cb5d6645e2696ff2d3d57843fc7a1f82f7e
Reviewed-on: https://gerrit.libreoffice.org/12137
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/qadevOOo/runner/util/XMLTools.java
b/qadevOOo/runner/util/XMLTools.java
index 7dea190..64330a1 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -424,7 +424,8 @@ public class XMLTools {
* all necessary tags and character data was found.
*/
public boolean checkTags() {
-allOK = isWellFormed() ;
+if (!isWellFormed())
+allOK = false ;
IteratorString badTags = tags.keySet().iterator() ;
IteratorString badChars = chars.keySet().iterator() ;
diff --git
a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
index 00319ce..fb1687a 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
@@ -118,7 +118,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns
aRectFields = insertFormattedField(xSection, sFieldName,
aRectFields, nFieldWidth, aSOTextField);
nLastHeight = Math.max(nLastHeight, aRectFields.Height);
int nNextX = aRectFields.X + nFieldWidth;
-if (nNextX (getPageWidth() - getRightPageIndent()) nCount 1)
+if ((nNextX (getPageWidth() - getRightPageIndent())) nCount
1)
{
int nHeight = (aSOLabel.getHeight(LayoutConstants.LabelHeight)
+ Math.max(aSOTextField.getHeight(LayoutConstants.FormattedFieldHeight),
nLastHeight));
nLastHeight = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportbuilder/java toolkit/test wizards/com
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
|5
toolkit/test/accessibility/EventListener.java
|6 -
wizards/com/sun/star/wizards/common/NumericalHelper.java
| 16 --
wizards/com/sun/star/wizards/db/FieldColumn.java
| 35 --
wizards/com/sun/star/wizards/db/RecordParser.java
| 55 +-
wizards/com/sun/star/wizards/ui/FieldSelection.java
| 15 --
wizards/com/sun/star/wizards/ui/FilterComponent.java
| 11 --
7 files changed, 15 insertions(+), 128 deletions(-)
New commits:
commit 5d8ecad569fd7a254902da154ed8057ec61f3a83
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Wed Oct 29 17:34:18 2014 +0100
java: Method uses the same code for two switch clauses
Change-Id: Ied82b0a39ff9dc9c7cc9539dec2b963059f3d4a5
Reviewed-on: https://gerrit.libreoffice.org/12139
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index e0e4d2d..08285f6 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -703,11 +703,6 @@ public abstract class OfficeDocumentReportTarget extends
AbstractReportTarget
break;
}
case OfficeDocumentReportTarget.STATE_IN_SECTION:
-{
-
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_OTHER));
-startOther(attrs);
-break;
-}
case OfficeDocumentReportTarget.STATE_IN_OTHER:
{
states.push(IntegerCache.getInteger(OfficeDocumentReportTarget.STATE_IN_OTHER));
diff --git a/toolkit/test/accessibility/EventListener.java
b/toolkit/test/accessibility/EventListener.java
index 8d7efd5..d4d1227 100644
--- a/toolkit/test/accessibility/EventListener.java
+++ b/toolkit/test/accessibility/EventListener.java
@@ -80,13 +80,7 @@ public class EventListener
break;
case AccessibleEventId.ACTION_CHANGED:
-aHandler = new EventHandler (aEvent, maTreeModel);
-break;
-
case AccessibleEventId.HYPERTEXT_CHANGED:
-aHandler = new EventHandler (aEvent, maTreeModel);
-break;
-
case AccessibleEventId.ACTIVE_DESCENDANT_CHANGED:
case AccessibleEventId.CARET_CHANGED:
case AccessibleEventId.TEXT_CHANGED:
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java
b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index 1d5e483..2c93b0c 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -608,32 +608,18 @@ public class NumericalHelper
switch (aTypeObject.iType)
{
case BYTE_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
case CHAR_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
case SHORT_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
case INT_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
case LONG_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
case FLOAT_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
case DOUBLE_TYPE:
+case BOOLEAN_TYPE:
retValue = aTypeObject.aValue.toString();
break;
case STRING_TYPE:
retValue = (String) aTypeObject.aValue;
break;
-case BOOLEAN_TYPE:
-retValue = aTypeObject.aValue.toString();
-break;
case SEQUENCE_TYPE:
retValue = new String(toByteArray((aValue)));
break;
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java
b/wizards/com/sun/star/wizards/db/FieldColumn.java
index 409af6e..c792514 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -256,11 +256,6 @@ public class FieldColumn
break;
case DataType.TINYINT: // == -6;
-StandardFormatKey = iNumberFormatKey;
[Libreoffice-commits] core.git: cppu/source
cppu/source/uno/data.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit e4573efdff3bd5060ced95ee2380c9d4252011eb Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 30 09:04:44 2014 + restore using rtl for OSL_DEBUG_LEVEL 1 Change-Id: I6497303e1b2d8d5ffd962489657582387ab974b1 diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 7b0ee22..e2d8b6f 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -36,6 +36,9 @@ using namespace ::cppu; using namespace ::osl; +#if OSL_DEBUG_LEVEL 1 +using namespace ::rtl; +#endif namespace cppu ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - canvas/source
canvas/source/opengl/ogl_canvascustomsprite.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 37c274ed4c39aefc0e8d3e02d48032e312f6a3a9
Author: Michael Jaumann meta_...@yahoo.com
Date: Thu Oct 30 08:31:01 2014 +
apply transformation matrice before rendering
Change-Id: I3eef5aa445dc2476266da55d9ea7012e62711ca0
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx
b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index f6126f5..f64e25c 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -151,10 +151,17 @@ namespace oglcanvas
if( !maCanvasHelper.renderRecordedActions() )
return false;
+const glm::mat4 translate =
glm::translate(glm::vec3(maPosition.getX(), maPosition.getY(), 0));
if( pBufferContext )
{
-//no transformation
-mRenderHelper.SetModelAndMVP(glm::mat4());
+const glm::mat4 aGLTransform = glm::mat4(
+maTransformation.m00, maTransformation.m10, 0, 0,
+maTransformation.m01, maTransformation.m11, 0, 0,
+0,0,1, 0,
+maTransformation.m02, maTransformation.m12, 0, 1
+);
+
+mRenderHelper.SetModelAndMVP(translate * aGLTransform);
// content ended up in background buffer - compose to
// screen now. Calls below switches us back to window
// context, and binds to generated, dynamic texture
@@ -178,7 +185,7 @@ namespace oglcanvas
if( mxClip.is() )
{
const double fWidth=maSize.Width;
-const double fHeight=maSize.Height;
+const double fHeight=maSize.Height;
// TODO(P3): buffer triangulation
const ::basegfx::B2DPolygon rTriangulatedPolygon(
@@ -222,7 +229,7 @@ namespace oglcanvas
glBindTexture(GL_TEXTURE_2D, 0);
}
// translate sprite to output position
-
mRenderHelper.SetModelAndMVP(glm::translate(glm::vec3(maPosition.getX(),
maPosition.getY(), 0)));
+mRenderHelper.SetModelAndMVP(translate);
GLfloat vertices[] = {-2, -2,
-2, (float) maSize.Height+4,
(float) maSize.Width+4, (float) maSize.Height+4,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 12 commits - basic/source connectivity/source cppu/source extensions/source javaunohelper/source package/source sc/source svtools/source svx/source unotest/source vcl/g
basic/source/classes/sbunoobj.cxx |2
basic/source/runtime/methods.cxx|1
basic/source/runtime/methods1.cxx |4 +
basic/source/runtime/runtime.cxx|1
connectivity/source/drivers/mork/MorkParser.cxx |5 +
cppu/source/typelib/static_types.cxx|3 -
cppu/source/typelib/typelib.cxx |1
extensions/source/scanner/grid.cxx |8 ++-
javaunohelper/source/javaunohelper.cxx | 24 +
package/source/xstor/owriteablestream.cxx | 23 +++-
package/source/xstor/xstorage.cxx |2
package/source/zippackage/ZipPackage.cxx| 41 +---
sc/source/filter/excel/xichart.cxx | 12 +++-
svtools/source/svhtml/htmlout.cxx |1
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 36 --
unotest/source/cpp/officeconnection.cxx |1
vcl/generic/print/genpspgraphics.cxx|1
vcl/generic/print/text_gfx.cxx |2
18 files changed, 122 insertions(+), 46 deletions(-)
New commits:
commit 3707022b9b72f317c50a353c64ff21bdd0ffdb69
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 30 10:17:28 2014 +
coverity#735298 Unchecked return value
Change-Id: I66499283f4218662146c380f605bb20b8a2ff49a
diff --git a/connectivity/source/drivers/mork/MorkParser.cxx
b/connectivity/source/drivers/mork/MorkParser.cxx
index 8057b09..2cfde00 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -296,7 +296,10 @@ bool MorkParser::parseCell()
{
Text += NextChar;
}
-else nextChar();
+else
+{
+(void)nextChar();
+}
}
break;
case '$':
commit cb0e009a9e6903fc7b814c38b60f3f895a878028
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 30 10:10:09 2014 +
document array_vs_singleton dismissals
Change-Id: I8d7eb4c01197e885abca717c7814c61a7641ac9d
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 3106708..0ff6393 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -905,6 +905,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal )
sal_Int32 nIdx = nLower;
for( sal_Int32 i = 0 ; i nSize ; i++,nIdx++ )
{
+// coverity[array_vs_singleton]
SbxVariableRef xVar = pArray-Get32( nIdx );
Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar
);
if( bNeedsInit )
@@ -1350,6 +1351,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type
rType, Property* pUnoProper
sal_Int32 nIdx = nLower;
for( sal_Int32 i = 0 ; i nSeqSize ; i++,nIdx++ )
{
+// coverity[array_vs_singleton]
SbxVariableRef xVar = pArray-Get32( nIdx );
// Convert the value of Sbx to Uno
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 194b06b..4ab4fff 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4372,6 +4372,7 @@ RTLFUNC(StrConv)
{
++index;
}
+// coverity[array_vs_singleton]
pArray-Put( pNew, index );
}
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 2e82486..3c81652 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -839,6 +839,7 @@ RTLFUNC(Array)
{
++index;
}
+// coverity[array_vs_singleton]
pArray-Put( pNew, index );
}
@@ -1731,8 +1732,9 @@ RTLFUNC(Join)
OUString aRetStr;
short nLower, nUpper;
pArr-GetDim( 1, nLower, nUpper );
-for( short i = nLower ; i = nUpper ; ++i )
+for (short i = nLower; i = nUpper; ++i)
{
+// coverity[array_vs_singleton]
OUString aStr = pArr-Get( i )-GetOUString();
aRetStr += aStr;
if( i != nUpper )
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 8cae088..455611f 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -669,6 +669,7 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
{
SbxVariable* v = pParams-Get( j );
short nDimIndex = j - i;
+// coverity[array_vs_singleton]
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/index.hxx | 14 +++
sw/source/core/bastyp/index.cxx|8 ++
sw/source/core/crsr/bookmrk.cxx|3
sw/source/core/unocore/unoportenum.cxx | 131 -
4 files changed, 106 insertions(+), 50 deletions(-)
New commits:
commit cb46aaf2d7240dfe3ac080fe086a9f70c4c91ab5
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Oct 30 11:59:17 2014 +0100
sw: use new bookmark API in lcl_FillBookmarkArray() for text nodes
For a document of 1000 pages and having 13000 bookmarks, this helps a
lot on ODF export: 2m51.565s - 2m23.412s on my machine.
Change-Id: I8c8a7cd2b83a94ab7f2de17e0b4cb449fc4c0e1a
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index 7f70bc5..e079b9c 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -131,67 +131,98 @@ namespace
};
typedef std::multiset SwXBookmarkPortion_ImplSharedPtr,
BookmarkCompareStruct SwXBookmarkPortion_ImplList;
-static void lcl_FillBookmarkArray(SwDoc rDoc, SwUnoCrsr rUnoCrsr,
SwXBookmarkPortion_ImplList rBkmArr)
+/// Inserts pBkmk to rBkmArr in case it starts or ends at nOwnNode
+static void lcl_FillBookmark(sw::mark::IMark* const pBkmk, const
SwNodeIndex nOwnNode, SwDoc rDoc, SwXBookmarkPortion_ImplList rBkmArr)
{
-IDocumentMarkAccess* const pMarkAccess = rDoc.getIDocumentMarkAccess();
-if(!pMarkAccess-getBookmarksCount())
-return;
-
-// no need to consider marks starting after aEndOfPara
-SwPosition aEndOfPara(*rUnoCrsr.GetPoint());
-aEndOfPara.nContent = aEndOfPara.nNode.GetNode().GetTxtNode()-Len();
-const IDocumentMarkAccess::const_iterator_t pCandidatesEnd =
upper_bound(
-pMarkAccess-getBookmarksBegin(),
-pMarkAccess-getBookmarksEnd(),
-aEndOfPara,
-sw::mark::CompareIMarkStartsAfter()); // finds the first that
starts after
+bool const hasOther = pBkmk-IsExpanded();
-// search for all bookmarks that start or end in this paragraph
-const SwNodeIndex nOwnNode = rUnoCrsr.GetPoint()-nNode;
-for(IDocumentMarkAccess::const_iterator_t ppMark =
pMarkAccess-getBookmarksBegin();
-ppMark != pCandidatesEnd;
-++ppMark)
+const SwPosition rStartPos = pBkmk-GetMarkStart();
+if(rStartPos.nNode == nOwnNode)
{
-::sw::mark::IMark* const pBkmk = ppMark-get();
-bool const hasOther = pBkmk-IsExpanded();
+// #i109272#: cross reference marks: need special handling!
+::sw::mark::CrossRefBookmark *const pCrossRefMark(dynamic_cast
::sw::mark::CrossRefBookmark*(pBkmk));
+sal_uInt8 const nType = (hasOther || pCrossRefMark)
+? BKM_TYPE_START : BKM_TYPE_START_END;
+rBkmArr.insert(SwXBookmarkPortion_ImplSharedPtr(
+new SwXBookmarkPortion_Impl(
+SwXBookmark::CreateXBookmark(rDoc, pBkmk),
+nType, rStartPos)));
+}
-const SwPosition rStartPos = pBkmk-GetMarkStart();
-if(rStartPos.nNode == nOwnNode)
+const SwPosition rEndPos = pBkmk-GetMarkEnd();
+if(rEndPos.nNode == nOwnNode)
+{
+unique_ptrSwPosition pCrossRefEndPos;
+const SwPosition* pEndPos = NULL;
+::sw::mark::CrossRefBookmark *const pCrossRefMark(dynamic_cast
::sw::mark::CrossRefBookmark*(pBkmk));
+if(hasOther)
+{
+pEndPos = rEndPos;
+}
+else if (pCrossRefMark)
+{
+// Crossrefbookmarks only remember the start position but have
to span the whole paragraph
+pCrossRefEndPos = unique_ptrSwPosition(new
SwPosition(rEndPos));
+pCrossRefEndPos-nContent =
pCrossRefEndPos-nNode.GetNode().GetTxtNode()-Len();
+pEndPos = pCrossRefEndPos.get();
+}
+if(pEndPos)
{
-// #i109272#: cross reference marks: need special handling!
-::sw::mark::CrossRefBookmark *const
pCrossRefMark(dynamic_cast ::sw::mark::CrossRefBookmark*(pBkmk));
-sal_uInt8 const nType = (hasOther || pCrossRefMark)
-? BKM_TYPE_START : BKM_TYPE_START_END;
rBkmArr.insert(SwXBookmarkPortion_ImplSharedPtr(
new SwXBookmarkPortion_Impl(
SwXBookmark::CreateXBookmark(rDoc, pBkmk),
-nType, rStartPos)));
+BKM_TYPE_END, *pEndPos)));
}
+}
+}
-const SwPosition rEndPos = pBkmk-GetMarkEnd();
-if(rEndPos.nNode == nOwnNode)
+static void lcl_FillBookmarkArray(SwDoc rDoc, SwUnoCrsr rUnoCrsr,
SwXBookmarkPortion_ImplList rBkmArr)
+{
libvisio: arrow head shapes not imported properly
Hi there VSDContentCollector::_lineProperties I am embedded SAL_INFO here, but it did not work. git/libo/workdir/UnpackedTarball/libvisio/src/lib/VSDContentCollector.cpp Please tell me how to do this compilation. I am investigating the following problem. Bug 44551 - libvisio: arrow head shapes not imported properly https://bugs.freedesktop.org/show_bug.cgi?id=44551 Best regards TANAKA Hidemune ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/jmux/libreoffice-4-1-6+backports' - 15 commits - bridges/source config_host/config_gcc.h.in configure.ac filter/source offapi/com sw/CppunitTest_sw_mail
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx |9
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 51 +
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |7
config_host/config_gcc.h.in | 19
configure.ac | 34 +
filter/source/graphicfilter/ipbm/ipbm.cxx|6
filter/source/graphicfilter/ipcd/ipcd.cxx|2
filter/source/graphicfilter/ipcx/ipcx.cxx|2
filter/source/graphicfilter/iras/iras.cxx|2
filter/source/graphicfilter/itga/itga.cxx|2
offapi/com/sun/star/text/MailMergeType.idl |9
sw/CppunitTest_sw_mailmerge.mk | 94 +++
sw/CppunitTest_sw_ooxmlexport.mk |6
sw/CppunitTest_sw_ooxmlimport.mk |5
sw/CppunitTest_sw_ww8import.mk |5
sw/Module_sw.mk |1
sw/inc/dbmgr.hxx | 49 +
sw/inc/doc.hxx |2
sw/inc/swabstdlg.hxx |2
sw/inc/unotbl.hxx|2
sw/inc/viewsh.hxx|2
sw/qa/extras/inc/swmodeltestbase.hxx | 184 ++
sw/qa/extras/mailmerge/data/4_v01.ods|binary
sw/qa/extras/mailmerge/data/missing-default-line-color.ott |binary
sw/qa/extras/mailmerge/data/multiple-page-anchored-draws.odt |binary
sw/qa/extras/mailmerge/data/one-empty-address.ods|binary
sw/qa/extras/mailmerge/mailmerge.cxx | 100 +++
sw/source/core/doc/docnew.cxx| 25
sw/source/core/inc/frame.hxx |2
sw/source/core/inc/frmtool.hxx |2
sw/source/core/unocore/unotbl.cxx|2
sw/source/core/view/vprint.cxx |2
sw/source/ui/dbui/dbmgr.cxx | 322 +--
sw/source/ui/dbui/mailmergewizard.cxx|2
sw/source/ui/dialog/swdlgfact.cxx|4
sw/source/ui/dialog/swdlgfact.hxx|4
sw/source/ui/envelp/mailmrge.cxx |8
sw/source/ui/inc/mailmrge.hxx|2
sw/source/ui/uno/unomailmerge.cxx| 176 +++---
vcl/headless/svptext.cxx |2
40 files changed, 828 insertions(+), 320 deletions(-)
New commits:
commit 00434310dd3b3bd1b9b365a1a51c3bb5f69f2c91
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Fri Oct 3 18:21:08 2014 +0200
copy default drawinglayer attributes when doing mailmerge
(cherry picked from commit f4825097a98c681cc187d88cfc1f8fd82362e1e0)
Conflicts:
sw/qa/extras/mailmerge/mailmerge.cxx
Change-Id: I4c6fc31ae72d179975c65aec0b560741474d433e
diff --git a/sw/qa/extras/mailmerge/data/missing-default-line-color.ott
b/sw/qa/extras/mailmerge/data/missing-default-line-color.ott
new file mode 100644
index 000..dad5a7b
Binary files /dev/null and
b/sw/qa/extras/mailmerge/data/missing-default-line-color.ott differ
diff --git a/sw/qa/extras/mailmerge/data/one-empty-address.ods
b/sw/qa/extras/mailmerge/data/one-empty-address.ods
new file mode 100644
index 000..abffed9
Binary files /dev/null and b/sw/qa/extras/mailmerge/data/one-empty-address.ods
differ
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 7284058..ca59513 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -71,6 +71,29 @@ DECLARE_DFLT_MAILMERGE_TEST(testMultiPageAnchoredDraws,
multiple-page-anchored-
}
}
+DECLARE_DFLT_MAILMERGE_TEST(testMissingDefaultLineColor,
missing-default-line-color.ott, one-empty-address.ods, one-empty-address)
+{
+executeMailMerge();
+// The document was created by LO version which didn't write out the
default value for line color
+// (see XMLGraphicsDefaultStyle::SetDefaults()).
+uno::Referencedrawing::XDrawPageSupplier
xDrawPageSupplier(mxMMComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xPropertySet(xDraws-getByIndex(0),
uno::UNO_QUERY);
+// Lines do not have a line color.
+CPPUNIT_ASSERT( !xPropertySet-getPropertySetInfo()-hasPropertyByName(
LineColor ));
+SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument
*(mxMMComponent.get());
+CPPUNIT_ASSERT(pTxtDoc);
+
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - svx/source
svx/source/sdr/contact/objectcontactofpageview.cxx | 43 -
1 file changed, 43 deletions(-)
New commits:
commit 3b7b6c289f7cd7b5e65cd44de6e131b24bd95b18
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 30 08:20:14 2014 -0400
Remove debug code. This wasn't meant to be checked in.
Change-Id: I3bd8ab784d9af295b61555a3ed775097270b90bf
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx
b/svx/source/sdr/contact/objectcontactofpageview.cxx
index c6b9f8e..f778df1 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -41,48 +41,6 @@
using namespace com::sun::star;
-#include stdio.h
-#include string
-#include sys/time.h
-
-namespace {
-
-class stack_printer
-{
-public:
-explicit stack_printer( const char* msg ) :
-msMsg(msg)
-{
-fprintf(stdout, %s: --begin\n, msMsg.c_str());
-mfStartTime = getTime();
-}
-
-~stack_printer()
-{
-double fEndTime = getTime();
-fprintf(stdout, %s: --end (duration: %g sec)\n, msMsg.c_str(),
(fEndTime - mfStartTime));
-}
-
-void printTime( int line ) const
-{
-double fEndTime = getTime();
-fprintf(stdout, %s: --(%d) (duration: %g sec)\n, msMsg.c_str(),
line, (fEndTime - mfStartTime));
-}
-
-private:
-double getTime() const
-{
-timeval tv;
-gettimeofday(tv, NULL);
-return tv.tv_sec + tv.tv_usec / 100.0;
-}
-
-::std::string msMsg;
-double mfStartTime;
-};
-
-}
-
namespace sdr
{
namespace contact
@@ -137,7 +95,6 @@ namespace sdr
// From baseclass Timer, the timeout call triggered by the
LazyInvalidate mechanism
void ObjectContactOfPageView::Timeout()
{
-stack_printer __stack_printer__(
sdr/contact/ObjectContactOfPageView::Timeout );
// stop the timer
Stop();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 18 ++ 1 file changed, 12 insertions(+), 6 deletions(-) New commits: commit 6d5fc817b5e84cf0669725cf0ef3a94f93158f50 Author: Yousuf Philips philip...@hotmail.com Date: Thu Oct 30 01:19:56 2014 +0400 fdo#85046 - Calc name changes didnt show up with entries having ContextLabel Change-Id: Ia60bb283df61ebdf39553ff9fb5fac0e2b9d9989 Reviewed-on: https://gerrit.libreoffice.org/12145 Reviewed-by: Matthew Francis mjay.fran...@gmail.com Tested-by: Matthew Francis mjay.fran...@gmail.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 5919776..64eb9ad 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -134,6 +134,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-US~Protect Records.../value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:InsertExternalDataSource oor:op=replace prop oor:name=Label oor:type=xs:string @@ -790,8 +793,8 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-US~Record Changes/value /prop -prop oor:name=ContextLabel oor:type=xs:string - value xml:lang=en-US~Record/value +prop oor:name=Properties oor:type=xs:int + value1/value /prop /node node oor:name=.uno:InsObjCtrl oor:op=replace @@ -806,8 +809,8 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-USSho~w Changes.../value /prop -prop oor:name=ContextLabel oor:type=xs:string - value xml:lang=en-USSho~w.../value +prop oor:name=Properties oor:type=xs:int + value1/value /prop /node node oor:name=.uno:DefineLabelRange oor:op=replace @@ -913,8 +916,8 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-US~List of Changes.../value /prop -prop oor:name=ContextLabel oor:type=xs:string - value xml:lang=en-US~Accept or Reject.../value +prop oor:name=Properties oor:type=xs:int + value1/value /prop /node node oor:name=.uno:UnderlineDouble oor:op=replace @@ -929,6 +932,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-US~Comment on Change.../value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:UnderlineDotted oor:op=replace prop oor:name=Label oor:type=xs:string ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #229 from tommy27 ba...@quipo.it --- LibO 4.2.7 has been finally released today. as said before the END OF LIFE of the 4.2.x branch is set on november 19th. please do not start any mab4.2 to mab4.3 migration until then. anyway feel free to retest the current mab4.2 which are still open [1] against the 4.3.x branch (4.3.3 released today) or against 4.4.x master, and post a new comment in the report page of that specific bug telling your findings (still reproducible, not reproducible, changed, etc. etc.) I'll personally move all residual 4.2mabs into the 4.3mab list after november 19th, so again do not start any migration until then. [1] https://bugs.freedesktop.org/showdependencytree.cgi?id=65675hide_resolved=1 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/helper/APIDescGetter.java | 29 -
1 file changed, 12 insertions(+), 17 deletions(-)
New commits:
commit 226285b7ccc0c6880ae1005c9f0d9f47aa41fc29
Author: Noel Grandin n...@peralex.com
Date: Thu Oct 30 10:47:32 2014 +0200
java: calling ready() on a BufferedReader is a dodgy way..
..to detect end-of-file
Change-Id: I3b1d5eca3a7424d72b5e3ab741f7407ad7e65193
diff --git a/qadevOOo/runner/helper/APIDescGetter.java
b/qadevOOo/runner/helper/APIDescGetter.java
index 71c8981..2df8cea 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -589,26 +589,21 @@ public class APIDescGetter extends DescGetter
{
InputStream in = con.getInputStream();
java.io.BufferedReader buf = new java.io.BufferedReader(new
InputStreamReader(in));
-boolean found = false;
-
-while (buf.ready() !found)
+while (true)
{
String entry = buf.readLine();
-
-if (entry != null)
+if (entry == null)
+break;
+if (entry.endsWith(sEndsWithCSVName))
{
-if (entry.endsWith(sEndsWithCSVName))
-{
-System.out.println(FOUND );
-InputStream input =
-this.getClass().getResourceAsStream(/objdsc/
+
-module +
-/ +
-entry);
-csvFile =
-new BufferedReader(new
InputStreamReader(input));
-found = true;
-}
+System.out.println(FOUND );
+InputStream input =
+this.getClass().getResourceAsStream(/objdsc/ +
+module +
+/ +
+entry);
+csvFile = new BufferedReader(new
InputStreamReader(input));
+break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source include/svtools svtools/source
cui/source/options/optaboutconfig.cxx | 14 +++--
cui/source/options/optjava.cxx|1
include/svtools/simptabl.hxx |3 ++
include/svtools/treelist.hxx |6 -
svtools/source/contnr/simptabl.cxx| 35 ++
svtools/source/contnr/treelist.cxx| 32 +++
6 files changed, 64 insertions(+), 27 deletions(-)
New commits:
commit f92ab4da51647a4353038b1c56b70db3672c49cf
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Wed Oct 22 19:01:05 2014 +0200
Improve SvSimpleTable class
It is possible to order columns. This is set in Expert Configuration
dialog. The header's itembits weren't set correctly therefore mouse
click handler didn't do anything. The comparsion was slow on big
table.
Conflicts:
include/svtools/treelist.hxx
svtools/source/contnr/simptabl.cxx
Change-Id: I7e1301d40433ef45b3d0a3fb300909345ede9d4d
Reviewed-on: https://gerrit.libreoffice.org/12070
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index d66a369..8732145 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -38,11 +38,6 @@ using namespace com::sun::star::container;
#define LONG_LEN_LIMIT 11
#define HYPER_LEN_LIMIT 20
-#define ITEMID_PREFNAME 1
-#define ITEMID_PROPERTY 2
-#define ITEMID_TYPE 3
-#define ITEMID_VALUE4
-
struct Prop_Impl
{
OUStringName;
@@ -141,11 +136,10 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage(
vcl::Window* pParent/*, const SfxI
m_pResetBtn-SetClickHdl( LINK( this, CuiAboutConfigTabPage,
ResetBtnHdl_Impl ) );
m_pPrefBox-SetDoubleClickHdl( LINK(this, CuiAboutConfigTabPage,
StandardHdl_Impl) );
-HeaderBar rBar = m_pPrefBox-GetTheHeaderBar();
-rBar.InsertItem( ITEMID_PREFNAME, getFixedText(preference)-GetText(),
0, HIB_LEFT | HIB_VCENTER );
-rBar.InsertItem( ITEMID_PROPERTY, getFixedText(property)-GetText(),
0, HIB_LEFT | HIB_VCENTER );
-rBar.InsertItem( ITEMID_TYPE, getFixedText(type)-GetText(), 0,
HIB_LEFT | HIB_VCENTER );
-rBar.InsertItem( ITEMID_VALUE, getFixedText(value)-GetText(), 0,
HIB_LEFT | HIB_VCENTER );
+m_pPrefBox-InsertHeaderEntry(getFixedText(preference)-GetText());
+m_pPrefBox-InsertHeaderEntry(getFixedText(property)-GetText());
+m_pPrefBox-InsertHeaderEntry(getFixedText(type)-GetText());
+m_pPrefBox-InsertHeaderEntry(getFixedText(value)-GetText());
long aTabs[] = {4,0,0,0,0};
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index cf3b2b5..10ee781 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -430,6 +430,7 @@ IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl )
m_pExpertConfigDlg-FillItemSet();//save changes if there are any
}
+delete m_pExpertConfigDlg;
return 0;
}
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 5ade4fb..821a1d7 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -23,6 +23,7 @@
#include svtools/svtdllapi.h
#include svtools/headbar.hxx
#include svtools/svtabbx.hxx
+#include unotools/intlwrapper.hxx
class SvSimpleTable;
class SVT_DLLPUBLIC SvSimpleTableContainer : public Control
@@ -59,6 +60,8 @@ private:
boolbSortDirection;
sal_uInt16 nSortCol;
+const CollatorWrapper aCollator;
+
DECL_LINK( StartDragHdl, HeaderBar* );
DECL_LINK( DragHdl, HeaderBar* );
DECL_LINK( EndDragHdl, HeaderBar* );
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index cf20872..ae01595 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -44,7 +44,9 @@ enum class SvListAction
INVALIDATE_ENTRY = 8,
RESORTING= 9,
RESORTED = 10,
-CLEARED = 11
+CLEARED = 11,
+REVERSING= 12,
+REVERSED = 13
};
class SvTreeListEntry;
@@ -124,6 +126,7 @@ class SVT_DLLPUBLIC SvTreeList
);
SVT_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
+SVT_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent );
SvTreeList(const SvTreeList); // disabled
SvTreeList operator= (const SvTreeList); // disabled
@@ -233,6 +236,7 @@ public:
voidSetCompareHdl( const Link rLink ) { aCompareLink =
rLink; }
const Link GetCompareHdl() const { return aCompareLink; }
voidResort();
+voidReverse();
};
class SVT_DLLPUBLIC SvListView
diff --git a/svtools/source/contnr/simptabl.cxx
b/svtools/source/contnr/simptabl.cxx
index f5755bd..2422bba 100644
--- a/svtools/source/contnr/simptabl.cxx
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/data/formulacell.cxx |2 +-
sc/source/core/opencl/openclwrapper.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit ae98892269205632f52d220749e154ca3a87f18c
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 30 14:47:51 2014 +0200
Log the state as an integer, not as a byte with value 0, 1 or 2
It is rather hard to see in a terminal window whether a char with value 0, 1
or 2 has been printed;)
The elegant thing to do would of course be to make the enum in question into
an enum class, and define an operator for it, to output it symbolically.
But
I can not be distracted into that now.
Change-Id: Ibfa4f4d5925d1db3cbbf35f84df70640f47a8d56
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 3ba6bf3..96b4339 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3687,7 +3687,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
mxGroup-meCalcState = sc::GroupCalcRunning;
if (!sc::FormulaGroupInterpreter::getStatic()-interpret(*pDocument,
mxGroup-mpTopCell-aPos, mxGroup, aCode))
{
-SAL_INFO(sc.opencl, interpreting group mxGroup (state
mxGroup-meCalcState ) failed, disabling);
+SAL_INFO(sc.opencl, interpreting group mxGroup (state
(int) mxGroup-meCalcState ) failed, disabling);
mxGroup-meCalcState = sc::GroupCalcDisabled;
return false;
}
commit 288550ee6db7e3b3f81a027145d006f422d67876
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 30 14:28:48 2014 +0200
Use more specific log area for the binary file messages
So that they can easily be avoided as they are rather uninteresting, in my
humble opinion. Did not want to drop these SAL_INFOs altogether as this
after
all is not my code.
Change-Id: Icb92f4ca2715c3dfef522319fdb1f81b782ec6cc
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 464d70b..23db69e 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -158,11 +158,11 @@ std::vectorboost::shared_ptrosl::File
OpenCLDevice::binaryGenerated( const
if(pNewFile-open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
{
aGeneratedFiles.push_back(boost::shared_ptrosl::File(pNewFile));
-SAL_INFO(sc.opencl, Opening binary file ' fileName
' for reading: success);
+SAL_INFO(sc.opencl.file, Opening binary file ' fileName
' for reading: success);
}
else
{
-SAL_INFO(sc.opencl, Opening binary file ' fileName
' for reading: FAIL);
+SAL_INFO(sc.opencl.file, Opening binary file ' fileName
' for reading: FAIL);
delete pNewFile;
break;
}
@@ -238,9 +238,9 @@ bool OpenCLDevice::generatBinFromKernelSource( cl_program
program, const char *
OString fileName = createFileName(mpArryDevsID[i], clFileName);
if ( !writeBinaryToFile( fileName,
binaries[i], binarySizes[i] ) )
-SAL_INFO(sc.opencl, Writing binary file ' fileName
': FAIL);
+SAL_INFO(sc.opencl.file, Writing binary file ' fileName
': FAIL);
else
-SAL_INFO(sc.opencl, Writing binary file ' fileName
': success);
+SAL_INFO(sc.opencl.file, Writing binary file ' fileName
': success);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/uibase/docvw/edtwin.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 353dff99da15e1dfac96781b4fd472e4ba523bb8
Author: Andras Timar andras.ti...@collabora.com
Date: Tue Oct 28 12:13:55 2014 +0100
fdo#37960 fix shift+click to select multiple drawings
I simply didn't get the logic behind calling GotoNextFly(). It caused
not only this bug. For example Ctrl+click on a background text frame
did not select the text frame, but an image on the previous page.
Change-Id: I85ccbbda2f324de55417d6199b4abe79e59bf295
Reviewed-on: https://gerrit.libreoffice.org/12132
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx
b/sw/source/core/uibase/docvw/edtwin.cxx
index e35b688..f78b2fe 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -3664,8 +3664,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
rSh.IsObjSelectable( aDocPos ) )
!lcl_urlOverBackground( rSh, aDocPos ) )
{
SwMvContext aMvContext( rSh );
-if( !rSh.IsFrmSelected() )
-rSh.GotoNextFly();
rSh.EnterSelFrmMode();
bCallBase = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - include/vcl vcl/source
include/vcl/timer.hxx|2 +-
vcl/source/app/timer.cxx | 32 ++--
2 files changed, 23 insertions(+), 11 deletions(-)
New commits:
commit b5d780f20aaa9f70bf53adde32bcb10ec57e171c
Author: Jennifer Liebel jliebe...@gmail.com
Date: Thu Oct 30 13:46:44 2014 +
commented and formated
Change-Id: I6d2c51ceaca8662e3b6d47ceeecbc45d0109d0df
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 1fec77d..f7ab003 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -43,9 +43,9 @@ class VCL_DLLPUBLIC Timer
{
protected:
ImplTimerData* mpTimerData;
+sal_uLong mnTimeout;
sal_Int32 mnDefaultPriority;
sal_Int32 mnPriority;
-sal_uLong mnTimeout;
boolmbActive;
boolmbAuto;
LinkmaTimeoutHdl;
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index bad6c1b..c4f0b45 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -97,7 +97,6 @@ void Timer::ImplTimerCallbackProc()
sal_uLong nMinPeriod = MAX_TIMER_PERIOD;
sal_uLong nDeltaTime;
sal_uLong nTime = tools::Time::GetSystemTicks();
-boolbAllTimerCalled = true;
if ( pSVData-mbNoCallTimer )
return;
@@ -107,6 +106,7 @@ void Timer::ImplTimerCallbackProc()
pTimerData = pSVData-mpFirstTimerData;
pPrioFirstTimerData = NULL;
+//running through the new incoming timers
while ( pTimerData )
{
// If the timer is not new, was not deleted, and if it is not in the
timeout handler, then
@@ -115,20 +115,26 @@ void Timer::ImplTimerCallbackProc()
!pTimerData-mbDelete !pTimerData-mbInTimeout )
{
// time has expired
-if ( (pTimerData-mnUpdateTime+pTimerData-mpTimer-mnTimeout) =
nTime || pTimerData-mpTimer-GetPriority()
pTimerData-mpTimer-GetDefaultPriority() )
+if ( (pTimerData-mnUpdateTime+pTimerData-mpTimer-mnTimeout) =
nTime ||
+pTimerData-mpTimer-GetPriority()
pTimerData-mpTimer-GetDefaultPriority() )
{
+// increase priority to avoid starvation (higher priority
means lower number)
pTimerData-mpTimer-SetPriority(pTimerData-mpTimer-GetPriority() - 1);
ImplTimerData* pCurrentTimer = pPrioFirstTimerData;
pPrevTimerData = NULL;
-if(pCurrentTimer != pTimerData){
+if(pCurrentTimer != pTimerData)
+{
//while the priority (number) of the new timer is greater
than the priority
//of the current timer go to forward
-while(pCurrentTimer pCurrentTimer-mpTimer
pCurrentTimer-mpTimer-GetPriority() = pTimerData-mpTimer-GetPriority()){
+while(pCurrentTimer pCurrentTimer-mpTimer
+pCurrentTimer-mpTimer-GetPriority() =
pTimerData-mpTimer-GetPriority())
+{
pPrevTimerData = pCurrentTimer;
pCurrentTimer = pCurrentTimer-mpPrioNext;
}
//if there is no previous timer: the new timer is the
first timer in the list
-if(!pPrevTimerData){
+if(!pPrevTimerData)
+{
if(pCurrentTimer pCurrentTimer-mpTimer)
pTimerData-mpPrioNext = pCurrentTimer;
else
@@ -136,7 +142,8 @@ void Timer::ImplTimerCallbackProc()
pCurrentTimer = pTimerData;
}
//else the new timer is inserted in the middle or in the
end of the list
-else{
+else
+{
pPrevTimerData-mpPrioNext = pTimerData;
if(pCurrentTimer pCurrentTimer-mpTimer)
pTimerData-mpPrioNext = pCurrentTimer;
@@ -154,7 +161,9 @@ void Timer::ImplTimerCallbackProc()
if(pPrioFirstTimerData pPrioFirstTimerData-mpTimer)
nPrevPrio = pPrioFirstTimerData-mpTimer-GetPriority();
-while(pPrioFirstTimerData pPrioFirstTimerData-mpTimer
pPrioFirstTimerData-mpTimer-GetPriority() == nPrevPrio){
+// running through the sorted list and call the timers with the highest
priorities
+while(pPrioFirstTimerData pPrioFirstTimerData-mpTimer
pPrioFirstTimerData-mpTimer-GetPriority() == nPrevPrio)
+{
// set new update time
pPrioFirstTimerData-mnUpdateTime = nTime;
nPrevPrio = pPrioFirstTimerData-mpTimer-GetPriority();
@@ -168,6 +177,8 @@ void Timer::ImplTimerCallbackProc()
// call Timeout
pPrioFirstTimerData-mbInTimeout = true;
pPrioFirstTimerData-mpTimer-Timeout();
+
+//reset priority if the timer was called
if(pPrioFirstTimerData-mpTimer)
[Libreoffice-commits] core.git: 2 commits - svgio/source
svgio/source/svgreader/svgclippathnode.cxx |2 +-
svgio/source/svgreader/svgnode.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 82dd3e5d53a7521a1190a4068391e7e3eb1e9a79
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Tue Oct 28 22:03:03 2014 +0100
fixed typo
Change-Id: I2be2caae32a4b33facbf9e933f4537e12e576023
diff --git a/svgio/source/svgreader/svgclippathnode.cxx
b/svgio/source/svgreader/svgclippathnode.cxx
index 5e3bab1..7d4ac89 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -140,7 +140,7 @@ namespace svgio
if(aClipTarget.hasElements())
{
-// extract filled plygons as base for a mask PolyPolygon
+// extract filled polygons as base for a mask PolyPolygon
drawinglayer::processor2d::ContourExtractor2D
aExtractor(aViewInformation2D, true);
aExtractor.process(aClipTarget);
commit 78a6fc8eda40c08eb3856c815fc402fa5ebbd995
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Tue Oct 28 22:01:19 2014 +0100
use isEmpty() instead of getLength() where appropriate
Change-Id: I2ac660a6035791e68af9bde9470bbf8c1d008dee
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index edd287b..723ddbf 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -359,7 +359,7 @@ namespace svgio
Display getDisplayFromContent(const OUString aContent)
{
-if(aContent.getLength())
+if(!aContent.isEmpty())
{
if(aContent.startsWith(inline))
{
@@ -476,7 +476,7 @@ namespace svgio
}
case SVGTokenDisplay:
{
-if(aContent.getLength())
+if(!aContent.isEmpty())
{
setDisplay(getDisplayFromContent(aContent));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/specialcharacters.ui | 41 --- 1 file changed, 15 insertions(+), 26 deletions(-) New commits: commit 54b7489f2cb5e84613c2e382a0efebff15009339 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Wed Oct 29 12:47:52 2014 -0600 Better label for OK button in Special Characters dialog Also, added missing colons and changed Help buttonâs position, according to the HIG. Didnât disable resizing here because itâs actually useful. Change-Id: I33306eb558f51d3c9889337f4c39465d6c201ff2 Reviewed-on: https://gerrit.libreoffice.org/12143 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index edfbc30..3e2046c 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -1,6 +1,8 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ + requires lib=LibreOffice version=1.0/ object class=GtkDialog id=SpecialCharactersDialog property name=can_focusFalse/property property name=border_width6/property @@ -17,12 +19,12 @@ property name=layout_styleend/property child object class=GtkButton id=ok -property name=labelgtk-ok/property +property name=label_Insert/property property name=visibleTrue/property property name=can_focusTrue/property property name=has_defaultTrue/property property name=receives_defaultTrue/property -property name=use_stockTrue/property +property name=use_underlineTrue/property /object packing property name=expandFalse/property @@ -57,6 +59,7 @@ property name=expandFalse/property property name=fillTrue/property property name=position2/property +property name=secondaryTrue/property /packing /child /object @@ -85,30 +88,26 @@ object class=GtkLabel id=fontft property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesFont/property +property name=label translatable=yesFont:/property property name=use_underlineTrue/property property name=mnemonic_widgetfontlb/property /object packing property name=left_attach0/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child object class=GtkLabel id=subsetft property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesSubset/property +property name=label translatable=yesSubset:/property property name=use_underlineTrue/property property name=mnemonic_widgetsubsetlb/property /object packing property name=left_attach2/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -120,8 +119,6 @@ packing property name=left_attach1/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -133,16 +130,12 @@ packing property name=left_attach3/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child /object packing property name=left_attach0/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -161,8 +154,6 @@ packing property name=left_attach0/property property name=top_attach1/property -property
[Libreoffice-commits] help.git: 2 commits - source/text
source/text/shared/00/0404.xhp |2 +- source/text/shared/00/00040503.xhp |2 +- source/text/shared/01/0410.xhp |5 + source/text/shared/explorer/database/dabawiz02.xhp |2 +- source/text/swriter/00/0404.xhp| 16 source/text/swriter/01/0115.xhp|2 +- source/text/swriter/01/04090200.xhp|6 +++--- source/text/swriter/02/18030100.xhp|2 +- source/text/swriter/02/18030200.xhp|2 +- source/text/swriter/02/18030300.xhp|2 +- source/text/swriter/02/18030400.xhp|2 +- source/text/swriter/02/18030500.xhp|2 +- source/text/swriter/02/18030600.xhp|2 +- source/text/swriter/guide/conditional_text.xhp |4 ++-- source/text/swriter/guide/conditional_text2.xhp|2 +- source/text/swriter/guide/fields_date.xhp |2 +- source/text/swriter/guide/fields_enter.xhp |2 +- source/text/swriter/guide/footer_nextpage.xhp |2 +- source/text/swriter/guide/header_with_chapter.xhp |2 +- source/text/swriter/guide/hidden_text.xhp |8 source/text/swriter/guide/number_sequence.xhp |2 +- 21 files changed, 34 insertions(+), 37 deletions(-) New commits: commit 499339d7bca9cfa3d71bdda72224c8b590192475 Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Wed Oct 29 17:42:23 2014 +0100 rename Fields - Other to Fields - More Fields Change-Id: I7460acb296b32c99c37a77bbce05d44aa3f36bd7 Reviewed-on: https://gerrit.libreoffice.org/12140 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index c70cd5f..eed1265 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -51,7 +51,7 @@ /caseinline/switchinline/paragraph paragraph role=paragraph id=par_id3161459 xml-lang=en-US l10n=U oldref=14Open context menu for a column header in an open database table - choose emphColumn Format - Format/emph tab/paragraph paragraph role=paragraph id=par_id3147531 xml-lang=en-US l10n=U oldref=15Choose emphFormat - Axis - Y Axis - Numbers/emph tab (Chart Documents)/paragraph -paragraph role=paragraph id=par_id3150823 xml-lang=en-US l10n=U oldref=32Also as emphNumber Format/emph dialog for tables and fields in text documents: Choose emphFormat - Number Format/emph, or choose emphInsert - Fields - Other - Variables/emph tab and select Additional formats in the emphFormat/emph list./paragraph +paragraph role=paragraph id=par_id3150823 xml-lang=en-US l10n=U oldref=32Also as emphNumber Format/emph dialog for tables and fields in text documents: Choose emphFormat - Number Format/emph, or choose emphInsert - Fields - More Fields - Variables/emph tab and select Additional formats in the emphFormat/emph list./paragraph /section section id=fozelaus paragraph role=paragraph id=par_id3154923 xml-lang=en-US l10n=U oldref=6switchinline select=applcaseinline select=CHARTChoose emphFormat - Title - Main Title - Alignment/emph tab diff --git a/source/text/shared/explorer/database/dabawiz02.xhp b/source/text/shared/explorer/database/dabawiz02.xhp index b70b771..9b21662 100644 --- a/source/text/shared/explorer/database/dabawiz02.xhp +++ b/source/text/shared/explorer/database/dabawiz02.xhp @@ -35,7 +35,7 @@ paragraph role=paragraph id=par_idN10554 xml-lang=en-US l10n=NEWahelp hid=.Specifies whether you want to register the database, open the database for editing, or insert a new table./ahelp/paragraph /section bookmark xml-lang=en-US branch=hid/dbaccess/ui/finalpagewizard/yesregister id=bm_id9310281 localize=false/paragraph role=heading id=par_idN10557 xml-lang=en-US level=2 l10n=NEWYes, register the Database for me/paragraph -paragraph role=paragraph id=par_idN105B4 xml-lang=en-US l10n=CHGahelp hid=.Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the emphView - Data Sources/emph window. You must register a database to be able to insert the database fields in a document (Insert - Fields - Other) or in a mail merge./ahelp/paragraph +paragraph role=paragraph id=par_idN105B4 xml-lang=en-US l10n=CHGahelp hid=.Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the emphView - Data Sources/emph window. You must register a database to be able to insert the database fields in a document (Insert - Fields - More Fields) or in a mail merge./ahelp/paragraph bookmark xml-lang=en-US branch=hid/dbaccess/ui/finalpagewizard/noregister id=bm_id8243354 localize=false/paragraph role=heading id=par_idN105B7 xml-lang=en-US level=2 l10n=NEWNo, do not register the
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 456d1ba79d7f40e4485b012b8a5c31ec8eed74e2 Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Wed Oct 29 17:42:23 2014 +0100 Updated core Project: help 499339d7bca9cfa3d71bdda72224c8b590192475 rename Fields - Other to Fields - More Fields Change-Id: I7460acb296b32c99c37a77bbce05d44aa3f36bd7 Reviewed-on: https://gerrit.libreoffice.org/12140 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 056e5b7..499339d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 056e5b774b1c6b9372683684dd0af9900eb16a17 +Subproject commit 499339d7bca9cfa3d71bdda72224c8b590192475 commit 9c9a7332f6bfaa71115d2c62dfa237f2416af078 Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Wed Oct 29 17:19:26 2014 +0100 Updated core Project: help 056e5b774b1c6b9372683684dd0af9900eb16a17 update description of the Special Characters dialog Change-Id: I76c2839804ebbf4d1be825a31d09c2566f0e714c Reviewed-on: https://gerrit.libreoffice.org/12138 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 301caf5..056e5b7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 301caf5470aec71aeac5327f452c15a28caa2f10 +Subproject commit 056e5b774b1c6b9372683684dd0af9900eb16a17 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/06050600.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 3019c4ebd3984158f2b0b0b7f9f184c48044add8 Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Wed Oct 29 17:51:05 2014 +0100 update label Minimum space between numbering and text Change-Id: I7e51c47848a3454dace8f6f86a5d434a8ff37b6d Reviewed-on: https://gerrit.libreoffice.org/12141 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/shared/01/06050600.xhp b/source/text/shared/01/06050600.xhp index 1858ea1..23102f2 100644 --- a/source/text/shared/01/06050600.xhp +++ b/source/text/shared/01/06050600.xhp @@ -36,7 +36,7 @@ section id=howtoget embed href=text/shared/00/00040500.xhp#numposition/ /section -paragraph role=note id=par_id5004119 xml-lang=en-US l10n=NEWThe Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0 (and used in all versions of LibreOffice), or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls Numbering followed by, Numbering alignment, Aligned at, and Indent at. The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls Indent, Width of numbering, Minimum space numbering lt;-gt; text, and Numbering alignment.commentsee http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt/comment/paragraph +paragraph role=note id=par_id5004119 xml-lang=en-US l10n=NEWThe Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0 (and used in all versions of LibreOffice), or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls Numbering followed by, Numbering alignment, Aligned at, and Indent at. The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls Indent, Width of numbering, Minimum space between numbering and text, and Numbering alignment.commentsee http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt/comment/paragraph bookmark xml-lang=en-US branch=hid/cui/ui/numberingpositionpage/levellb id=bm_id3149119 localize=false/ bookmark xml-lang=en-US branch=hid/modules/swriter/ui/outlinepositionpage/levellb id=bm_id3153323 localize=false/ paragraph role=heading id=hd_id3149031 xml-lang=en-US level=2 l10n=U oldref=3Level/paragraph @@ -74,7 +74,7 @@ paragraph role=paragraph id=par_id3150129 xml-lang=en-US l10n=CHG oldref=29ahelp hid=modules/swriter/ui/outlinepositionpage/indentatmfEnter the amount of space to leave between the left edge of the numbering symbol and the left edge of the text./ahelpcommentUFI: fixed #i31282#/comment/paragraph bookmark xml-lang=en-US branch=hid/cui/ui/numberingpositionpage/numdistmf id=bm_id3149237 localize=false/ bookmark xml-lang=en-US branch=hid/modules/swriter/ui/outlinepositionpage/numdistmf id=bm_id3149235 localize=false/ -paragraph role=heading id=hd_id3156194 xml-lang=en-US level=2 l10n=U oldref=8switchinline select=applcaseinline select=WRITERMinimum space numbering lt;-gt; text +paragraph role=heading id=hd_id3156194 xml-lang=en-US level=2 l10n=U oldref=8switchinline select=applcaseinline select=WRITERMinimum space between numbering and text /caseinline/switchinline/paragraph paragraph role=paragraph id=par_id3147574 xml-lang=en-US l10n=CHG oldref=18switchinline select=applcaseinline select=WRITERahelp hid=modules/swriter/ui/outlinepositionpage/numdistmfEnter the minimum amount of space to leave between the right edge of the numbering symbol and the left edge of the text./ahelp /caseinline/switchinline/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c572b59c33ac0e529c64c4c93d7a125cf618138d Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Wed Oct 29 17:51:05 2014 +0100 Updated core Project: help 3019c4ebd3984158f2b0b0b7f9f184c48044add8 update label Minimum space between numbering and text Change-Id: I7e51c47848a3454dace8f6f86a5d434a8ff37b6d Reviewed-on: https://gerrit.libreoffice.org/12141 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 499339d..3019c4e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 499339d7bca9cfa3d71bdda72224c8b590192475 +Subproject commit 3019c4ebd3984158f2b0b0b7f9f184c48044add8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/qa sc/source
sc/qa/unit/data/xls/external-ref.xls |binary
sc/qa/unit/subsequent_export-test.cxx | 22 ++
sc/source/filter/excel/xehelper.cxx | 10 ++
3 files changed, 32 insertions(+)
New commits:
commit 42bf43f0b65f97f2739b2993e5a299dab69616ac
Author: Andras Timar andras.ti...@collabora.com
Date: Sat Oct 25 21:47:55 2014 +0200
bnc#893791 XLS export: external sheet references on Linux/OSX
The commit solves two problems.
1. Make sure we save absolute paths on Linux/OSX
2. Make sure we don't save invalid XLS (VirtualPath longer than 255 chars)
The first problem has always been there, so after a few load/save cycles
an XLS with reference to other XLS on a Unix-like file system became
invalid, and only LibreOffice could open it, Excel could not. These
broken XLS files can be repaired by saving after this patch, however,
the original reference will remain broken.
(cherry picked from commit 3f5251675ae56ea282fdeb09dbc53ce4aae6)
Conflicts:
sc/qa/unit/subsequent_export-test.cxx
Change-Id: I8f575acb1d560d539c1da61a1afdaac3f0c13977
Reviewed-on: https://gerrit.libreoffice.org/12099
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/qa/unit/data/xls/external-ref.xls
b/sc/qa/unit/data/xls/external-ref.xls
new file mode 100644
index 000..21f3338
Binary files /dev/null and b/sc/qa/unit/data/xls/external-ref.xls differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 2e36357..248bf03 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -106,6 +106,8 @@ public:
void testFunctionsExcel2010ODS();
#endif
+void testSupBookVirtualPath();
+
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
#if !defined(MACOSX) !defined(DRAGONFLY)
@@ -145,6 +147,9 @@ public:
#if 0
CPPUNIT_TEST(testFunctionsExcel2010ODS);
#endif
+#if !defined(WNT)
+CPPUNIT_TEST(testSupBookVirtualPath);
+#endif
CPPUNIT_TEST_SUITE_END();
@@ -1660,6 +1665,23 @@ void ScExportTest::tearDown()
test::BootstrapFixture::tearDown();
}
+void ScExportTest::testSupBookVirtualPath()
+{
+ScDocShellRef xShell = loadDoc(external-ref., XLS);
+CPPUNIT_ASSERT(xShell.Is());
+
+ScDocShellRef xDocSh = saveAndReload(xShell, XLS);
+xShell-DoClose();
+CPPUNIT_ASSERT(xDocSh.Is());
+
+ScDocument* pDoc = xDocSh-GetDocument();
+
+if (!checkFormula(*pDoc, ScAddress(0,0,0),
'file:///home/timar/Documents/external.xls'#$Sheet1.A1))
+CPPUNIT_FAIL(Wrong SupBook VirtualPath URL);
+
+xDocSh-DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xehelper.cxx
b/sc/source/filter/excel/xehelper.cxx
index add62f7..9044c04 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -908,6 +908,11 @@ OUString lclEncodeDosUrl(
aBuf.append(EXC_URL_DOSDRIVE).append(cDrive);
aOldUrl = aOldUrl.copy(3);
}
+else
+{
+// URL probably points to a document on a Unix-like file system
+aBuf.append(EXC_URL_DRIVEROOT);
+}
// directories
sal_Int32 nPos = -1;
@@ -949,6 +954,11 @@ OUString lclEncodeDosUrl(
if (pTableName)
aBuf.append(*pTableName);
+// VirtualPath must be shorter than 255 chars ([MS-XLS].pdf 2.5.277)
+// It's better to truncate, than generate invalid file that Excel cannot
open.
+if (aBuf.getLength() 255)
+aBuf.setLength(255);
+
return aBuf.makeStringAndClear();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - configure.ac helpcontent2
configure.ac |3 ++- helpcontent2 |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 86255b6fa31fb65e31a8a3f702a58a27e76c36d2 Author: Matthew J. Francis mjay.fran...@gmail.com Date: Tue Oct 28 16:10:44 2014 +0800 Document that gtk3 support is experimental Change-Id: I87df8cb6a4e4e374c5c9782e695fcdf020d5707f Reviewed-on: https://gerrit.libreoffice.org/12121 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/configure.ac b/configure.ac index 964fc5b..2796015 100644 --- a/configure.ac +++ b/configure.ac @@ -1077,7 +1077,8 @@ AC_ARG_ENABLE(gtk, AC_ARG_ENABLE(gtk3, AS_HELP_STRING([--enable-gtk3], -[Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]), +[Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available. + This is experimental and may not work.]), ,enable_gtk3=no) AC_ARG_ENABLE(systray, commit 0cba83792d6b2d42a73abcf9a43a8608e175fa6b Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Tue Oct 28 17:07:23 2014 +0100 Updated core Project: help e5af8139b8a16b80a1b2398ffbeb629600484823 rename Format Paintbrush to Clone Formatting Change-Id: I8d6d7094d32eb84d619a4164328401fd8584dd99 Reviewed-on: https://gerrit.libreoffice.org/12126 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 36a1eb4..e5af813 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 36a1eb4dcee3c27e1ed72f2af63c8ea882a38863 +Subproject commit e5af8139b8a16b80a1b2398ffbeb629600484823 commit f2b355ef62c0a06a356a43bb84e584968666c77b Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Tue Oct 28 22:20:14 2014 +0100 Updated core Project: help 36a1eb4dcee3c27e1ed72f2af63c8ea882a38863 related fdo#70998 rename Picture to Image Change-Id: Ie196de29cc8b2fa2d569019d18ddbd117cb33b5a Reviewed-on: https://gerrit.libreoffice.org/12128 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 3019c4e..36a1eb4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3019c4ebd3984158f2b0b0b7f9f184c48044add8 +Subproject commit 36a1eb4dcee3c27e1ed72f2af63c8ea882a38863 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - include/vcl vcl/source
include/vcl/layout.hxx |1 +
vcl/source/window/layout.cxx | 13 -
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit d7d4a6bf1e96be723a09add106ce6d261509b1c8
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 29 17:12:40 2014 +
Resolves: rhbz#1146169 a11y frames label dies before frame
Change-Id: I2bc45dcb92b8e68bf4ae4df72c0fbd4e3b535604
Reviewed-on: https://gerrit.libreoffice.org/12142
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index c69b44b..0ed3e6c 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -459,6 +459,7 @@ private:
private:
friend class VclBuilder;
void designate_label(Window *pWindow);
+DECL_LINK(WindowEventListener, VclSimpleEvent*);
public:
VclFrame(Window *pParent)
: VclBin(pParent)
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 975df2f..9f560d5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1340,10 +1340,21 @@ void VclFrame::setAllocation(const Size rAllocation)
setLayoutAllocation(*pChild, aChildPos, aAllocation);
}
+IMPL_LINK(VclFrame, WindowEventListener, VclSimpleEvent*, pEvent)
+{
+if (pEvent pEvent-GetId() == VCLEVENT_OBJECT_DYING)
+designate_label(NULL);
+return 0;
+}
+
void VclFrame::designate_label(Window *pWindow)
{
-assert(pWindow-GetParent() == this);
+assert(!pWindow || pWindow-GetParent() == this);
+if (m_pLabel)
+m_pLabel-RemoveEventListener(LINK(this, VclFrame,
WindowEventListener));
m_pLabel = pWindow;
+if (m_pLabel)
+m_pLabel-AddEventListener(LINK(this, VclFrame, WindowEventListener));
}
const Window *VclFrame::get_label_widget() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - source/auxiliary source/text
source/auxiliary/scalc.tree|2 +- source/auxiliary/simpress.tree |2 +- source/auxiliary/swriter.tree |2 +- source/text/scalc/main0214.xhp |6 +++--- source/text/sdraw/guide/graphic_insert.xhp |8 source/text/shared/00/00040500.xhp |2 +- source/text/shared/00/00040503.xhp |6 +++--- source/text/shared/01/05260300.xhp |2 +- source/text/shared/02/2401.xhp |2 +- source/text/shared/02/2410.xhp |2 +- source/text/shared/02/colortoolbar.xhp |4 ++-- source/text/shared/02/paintbrush.xhp |8 source/text/shared/guide/imagemap.xhp |4 ++-- source/text/shared/guide/insert_bitmap.xhp | 20 ++-- source/text/shared/guide/paintbrush.xhp| 15 --- source/text/simpress/main0214.xhp |6 +++--- source/text/swriter/00/0405.xhp|4 ++-- source/text/swriter/01/0506.xhp| 10 +- source/text/swriter/01/05060100.xhp|2 +- source/text/swriter/01/05060300.xhp| 18 +- source/text/swriter/main0203.xhp |6 +++--- 21 files changed, 66 insertions(+), 65 deletions(-) New commits: commit e5af8139b8a16b80a1b2398ffbeb629600484823 Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Tue Oct 28 17:07:23 2014 +0100 rename Format Paintbrush to Clone Formatting Change-Id: I8d6d7094d32eb84d619a4164328401fd8584dd99 Reviewed-on: https://gerrit.libreoffice.org/12126 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/shared/02/paintbrush.xhp b/source/text/shared/02/paintbrush.xhp index bab887e..67e03ed 100644 --- a/source/text/shared/02/paintbrush.xhp +++ b/source/text/shared/02/paintbrush.xhp @@ -22,7 +22,7 @@ meta topic id=textshared02paintbrushxml indexer=include -title id=tit xml-lang=en-USFormat Paintbrush/title +title id=tit xml-lang=en-USClone Formatting/title filename/text/shared/02/paintbrush.xhp/filename /topic /meta @@ -30,10 +30,10 @@ section id=paintbrush bookmark xml-lang=en-US branch=hid/.uno:FormatPaintbrush id=bm_id1629078 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:FormatPaintbrush id=bm_id3944822 localize=false/ -paragraph role=heading id=par_idN1056A xml-lang=en-US level=1 l10n=NEWlink href=text/shared/02/paintbrush.xhpFormat Paintbrush/link/paragraph +paragraph role=heading id=par_idN1056A xml-lang=en-US level=1 l10n=NEWlink href=text/shared/02/paintbrush.xhpClone Formatting/link/paragraph paragraph role=paragraph id=par_idN1057A xml-lang=en-US l10n=CHGahelp hid=.First select some text or an object, then click this icon. Then click on or drag across other text or click an object to apply the same formatting./ahelpcommenti93691/comment/paragraph section id=howtoget -paragraph role=paragraph id=par_idN10617 xml-lang=en-US l10n=NEWClick the emphFormat Paintbrush/emph icon +paragraph role=paragraph id=par_idN10617 xml-lang=en-US l10n=NEWClick the emphClone Formatting/emph icon image id=img_id3610034 src=cmd/sc_formatpaintbrush.png width=0.423cm height=0.423cmalt id=alt_id3610034 xml-lang=en-USIcon/alt /image on the emphStandard/emph toolbar. /paragraph /section @@ -46,7 +46,7 @@ /image/paragraph /tablecell tablecell -paragraph role=tablecontent id=par_idN10657 xml-lang=en-US l10n=NEWFormat Paintbrush/paragraph +paragraph role=tablecontent id=par_idN10657 xml-lang=en-US l10n=NEWClone Formatting/paragraph /tablecell /tablerow /table diff --git a/source/text/shared/guide/paintbrush.xhp b/source/text/shared/guide/paintbrush.xhp index 92fc110..c8eeacf 100644 --- a/source/text/shared/guide/paintbrush.xhp +++ b/source/text/shared/guide/paintbrush.xhp @@ -22,22 +22,23 @@ meta topic id=textsharedguidepaintbrushxml indexer=include - title xml-lang=en-US id=titCopying Attributes With the Format Paintbrush/title + title xml-lang=en-US id=titCopying Attributes With the Clone Formatting Tool/title filename/text/shared/guide/paintbrush.xhp/filename /topic /meta body section id=paintbrush bookmark xml-lang=en-US branch=index id=bm_id380260bookmark_valueFormat Paintbrush/bookmark_value + bookmark_valueclone formatting/bookmark_value bookmark_valueformatting;copying/bookmark_value bookmark_valuecopying;formatting/bookmark_value bookmark_valuePaintbrush/bookmark_value /bookmarkcommentMW added Paintbrush/comment -paragraph xml-lang=en-US id=par_idN1053A role=heading level=1 l10n=NEWvariable id=formatpaintbrushlink href=text/shared/guide/paintbrush.xhpCopying Formatting With the Format Paintbrush/link +paragraph xml-lang=en-US id=par_idN1053A role=heading level=1 l10n=NEWvariable id=formatpaintbrushlink href=text/shared/guide/paintbrush.xhpCopying
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 06a55072518d6fae6e286e5649e2a8925dd2b5b3 Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Tue Oct 28 17:52:24 2014 +0100 Updated core Project: help 42c2490f90d1a0dbc2b00bfc446caded8ca682b1 rename terms Movie/Sound to Audio/Video Change-Id: I3afc007cd4a9b5dca83145f9b03b1393b546358d Reviewed-on: https://gerrit.libreoffice.org/12127 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index e5af813..42c2490 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e5af8139b8a16b80a1b2398ffbeb629600484823 +Subproject commit 42c2490f90d1a0dbc2b00bfc446caded8ca682b1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/core/data/rtf/pass/fdo82859.rtf | 25 +
writerfilter/source/rtftok/rtfsdrimport.cxx |2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 22f307bc19d5acd0c4cb71e8e122e57bd6afc568
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Oct 24 16:21:51 2014 +0200
fdo#82859 RTF import: don't try to set CustomShapeGeometry on a TextFrame
(cherry picked from commit 6b7239855d8babdc1bcc7742f79ce2df64d1e476)
Conflicts:
writerfilter/source/rtftok/rtfsdrimport.cxx
Change-Id: I687fa609559f0484fe6bb804265243de154c3760
Reviewed-on: https://gerrit.libreoffice.org/12122
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/core/data/rtf/pass/fdo82859.rtf
b/sw/qa/core/data/rtf/pass/fdo82859.rtf
new file mode 100644
index 000..72b1576
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo82859.rtf
@@ -0,0 +1,25 @@
+{\rtf1
+{\field
+{\*\fldinst SHAPE }
+{\fldrslt
+{\shp
+{\*\shpinst\shpleft-90\shptop720\shpright9404\shpbottom2939\shpwr2\shpbxignore\shpbyignore
+{\sp
+{\sn shapeType}
+{\sv 1}
+}
+{\sp
+{\sn pVerticies}
+{\sv 8;4;(0,0);(-2147483645,0);(-2147483645,-2147483646);(0,-2147483646)}
+}
+{\sp
+{\sn pSegmentInfo}
+{\sv 2;4;16384;3;24577;32768}
+}
+{\shptxt hello}
+}
+}
+}
+}
+\par
+}
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 3d62a447..7afcfb0 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -793,7 +793,7 @@ void RTFSdrImport::resolve(RTFShape rShape, bool bClose,
ShapeOrPict const shap
beans::PropertyValue* pGeomValues = aGeomPropSeq.getArray();
for (std::vectorbeans::PropertyValue::iterator i = aGeomPropVec.begin();
i != aGeomPropVec.end(); ++i)
*pGeomValues++ = *i;
-if (aGeomPropSeq.getLength() xPropertySet.is())
+if (aGeomPropSeq.getLength() xPropertySet.is() !m_bTextFrame)
xPropertySet-setPropertyValue(CustomShapeGeometry,
uno::Any(aGeomPropSeq));
// Set position and size
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0404.xhp |6 +++--- source/text/shared/01/0415.xhp |4 ++-- source/text/shared/01/04150400.xhp |6 +++--- source/text/shared/01/moviesound.xhp |8 source/text/simpress/01/0607.xhp | 18 +- source/text/simpress/02/1011.xhp |2 +- 6 files changed, 22 insertions(+), 22 deletions(-) New commits: commit 42c2490f90d1a0dbc2b00bfc446caded8ca682b1 Author: Stanislav Horacek stanislav.hora...@gmail.com Date: Tue Oct 28 17:52:24 2014 +0100 rename terms Movie/Sound to Audio/Video Change-Id: I3afc007cd4a9b5dca83145f9b03b1393b546358d Reviewed-on: https://gerrit.libreoffice.org/12127 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/source/text/shared/00/0404.xhp b/source/text/shared/00/0404.xhp index 0f5d045..bbfe599 100644 --- a/source/text/shared/00/0404.xhp +++ b/source/text/shared/00/0404.xhp @@ -68,14 +68,14 @@ /section /section section id=mov_sound -paragraph role=paragraph id=par_idN107CD xml-lang=en-US l10n=NEWvariable id=moviesoundChoose emphInsert - Movie and Sound/emph +paragraph role=paragraph id=par_idN107CD xml-lang=en-US l10n=NEWvariable id=moviesoundChoose emphInsert - Media - Audio or Video/emph /variable/paragraph section id=symoviesound table id= tablerow tablecell colspan= rowspan=/ tablecell colspan= rowspan= -paragraph role=paragraph id=par_idN1085D xml-lang=en-US l10n=NEWMovie and Sound/paragraph +paragraph role=paragraph id=par_idN1085D xml-lang=en-US l10n=NEWAudio or Video/paragraph /tablecell /tablerow /table @@ -124,7 +124,7 @@ /switch/section /section section id=objektklang -paragraph role=paragraph id=par_id3153880 xml-lang=en-US l10n=U oldref=53Choose emphInsert - Object - Sound/emph +paragraph role=paragraph id=par_id3153880 xml-lang=en-US l10n=U oldref=53Choose emphInsert - Object - Audio/emph /paragraph /section section id=objektvideo diff --git a/source/text/shared/01/0415.xhp b/source/text/shared/01/0415.xhp index 3683e03..81ca691 100644 --- a/source/text/shared/01/0415.xhp +++ b/source/text/shared/01/0415.xhp @@ -31,14 +31,14 @@ bookmark xml-lang=en-US branch=hid/.uno:ObjectMenu id=bm_id2569353 localize=false/ paragraph xml-lang=en-US id=hd_id3146873 role=heading level=1 l10n=CHG oldref=1link href=text/shared/01/0415.xhp name=Drawing ObjectDrawing Object/link/paragraph - paragraph xml-lang=en-US id=par_id3159079 role=paragraph l10n=CHG oldref=2ahelp hid=.Inserts an object into your document. For movies and sounds, use emphInsert - Movie and Sound/emph instead./ahelp/paragraph + paragraph xml-lang=en-US id=par_id3159079 role=paragraph l10n=CHG oldref=2ahelp hid=.Inserts an object into your document. For movies and sounds, use emphInsert - Media - Audio or Video/emph instead./ahelp/paragraph /section section id=howtoget embed href=text/shared/00/0404.xhp#objekteinf/ /section paragraph xml-lang=en-US id=hd_id3154894 role=heading level=2 l10n=U oldref=8link href=text/shared/01/04150100.xhp name=OLE ObjectOLE Object/link/paragraph embed href=text/shared/01/04150100.xhp#ole/ - paragraph xml-lang=en-US id=hd_id3159201 role=heading level=2 l10n=U oldref=6link href=text/shared/01/04150400.xhp name=SoundSound/link/paragraph + paragraph xml-lang=en-US id=hd_id3159201 role=heading level=2 l10n=U oldref=6link href=text/shared/01/04150400.xhp name=AudioAudio/link/paragraph embed href=text/shared/01/04150400.xhp#klang/ paragraph xml-lang=en-US id=hd_id3157896 role=heading level=2 l10n=U oldref=7link href=text/shared/01/04150500.xhp name=VideoVideo/link/paragraph embed href=text/shared/01/04150500.xhp#video/commentremoved Insert Applet link/comment diff --git a/source/text/shared/01/04150400.xhp b/source/text/shared/01/04150400.xhp index ada5f67..91ae059 100644 --- a/source/text/shared/01/04150400.xhp +++ b/source/text/shared/01/04150400.xhp @@ -23,7 +23,7 @@ helpdocument version=1.0 meta topic id=textshared0104150400xml indexer=include status=PUBLISH -title id=tit xml-lang=en-USInsert sound/title +title id=tit xml-lang=en-USInsert Audio/title filename/text/shared/01/04150400.xhp/filename /topic history @@ -34,8 +34,8 @@ bodycommentmw deleted 4 index entries/comment bookmark xml-lang=en-US branch=hid/.uno:InsertSound id=bm_id8635877 localize=false/ bookmark xml-lang=en-US branch=hid/.uno:InsertSound id=bm_id3154350 localize=false/ -paragraph role=heading id=hd_id3152414 xml-lang=en-US level=1 l10n=U oldref=1Insert sound/paragraph -paragraph role=paragraph id=par_id3154840 xml-lang=en-US l10n=CHG oldref=2variable id=klangahelp hid=.uno:InsertSoundInserts a sound file into the current document./ahelp +paragraph role=heading id=hd_id3152414 xml-lang=en-US level=1 l10n=U oldref=1Insert Audio/paragraph +paragraph
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/custominfopage.ui |4 +- sfx2/uiconfig/ui/descriptioninfopage.ui | 30 +++--- sfx2/uiconfig/ui/documentfontspage.ui| 45 +-- sfx2/uiconfig/ui/documentpropertiesdialog.ui |5 ++- 4 files changed, 47 insertions(+), 37 deletions(-) New commits: commit fc293cecec7732a365d791089a2c92bf2f85fea9 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sat Oct 25 11:58:11 2014 -0500 HIG fixes for Document Properties dialog * Add missing colons to labels that precede controls * Standardize Help buttonâs position * Better label for Add Property button * Add a frame for the lonely Embed Fonts option Change-Id: If12708161f2345e66ab3f49fd744bcad00d4ecc6 Reviewed-on: https://gerrit.libreoffice.org/12096 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sfx2/uiconfig/ui/custominfopage.ui b/sfx2/uiconfig/ui/custominfopage.ui index efead1e..89455a5 100644 --- a/sfx2/uiconfig/ui/custominfopage.ui +++ b/sfx2/uiconfig/ui/custominfopage.ui @@ -11,12 +11,12 @@ property name=row_spacing6/property child object class=GtkButton id=add -property name=labelgtk-add/property +property name=label translatable=yesAdd _Property/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property property name=halignend/property -property name=use_stockTrue/property +property name=use_underlineTrue/property /object packing property name=left_attach0/property diff --git a/sfx2/uiconfig/ui/descriptioninfopage.ui b/sfx2/uiconfig/ui/descriptioninfopage.ui index 113e60c..60b56a3 100644 --- a/sfx2/uiconfig/ui/descriptioninfopage.ui +++ b/sfx2/uiconfig/ui/descriptioninfopage.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkGrid id=DescriptionInfoPage property name=visibleTrue/property property name=can_focusFalse/property @@ -14,15 +15,13 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yes_Title/property +property name=label translatable=yes_Title:/property property name=use_underlineTrue/property property name=mnemonic_widgettitle/property /object packing property name=left_attach0/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -30,15 +29,13 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yes_Subject/property +property name=label translatable=yes_Subject:/property property name=use_underlineTrue/property property name=mnemonic_widgetsubject/property /object packing property name=left_attach0/property property name=top_attach1/property -property name=width1/property -property name=height1/property /packing /child child @@ -46,15 +43,13 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yes_Keywords/property +property name=label translatable=yes_Keywords:/property property name=use_underlineTrue/property property name=mnemonic_widgetkeywords/property /object packing property name=left_attach0/property property name=top_attach2/property -property name=width1/property -property name=height1/property /packing /child child @@ -63,15 +58,13 @@ property name=can_focusFalse/property property name=valignstart/property property name=xalign0/property -property name=label translatable=yes_Comments/property +property name=label translatable=yes_Comments:/property property name=use_underlineTrue/property property name=mnemonic_widgetcomments/property /object packing property name=left_attach0/property property name=top_attach3/property -property name=width1/property -property name=height1/property /packing /child child @@ -80,13 +73,10 @@ property name=can_focusTrue/property property name=hexpandTrue/property property name=invisible_charâ¢/property -property name=invisible_char_setTrue/property /object packing property name=left_attach1/property
[Libreoffice-commits] core.git: starmath/uiconfig
starmath/uiconfig/smath/ui/alignmentdialog.ui|5 starmath/uiconfig/smath/ui/catalogdialog.ui | 24 - starmath/uiconfig/smath/ui/fontdialog.ui | 11 starmath/uiconfig/smath/ui/fontsizedialog.ui | 38 -- starmath/uiconfig/smath/ui/fonttypedialog.ui | 81 + starmath/uiconfig/smath/ui/printeroptions.ui | 17 - starmath/uiconfig/smath/ui/savedefaultsdialog.ui |3 starmath/uiconfig/smath/ui/smathsettings.ui |5 starmath/uiconfig/smath/ui/spacingdialog.ui | 323 +++ starmath/uiconfig/smath/ui/symdefinedialog.ui| 137 +++-- 10 files changed, 217 insertions(+), 427 deletions(-) New commits: commit 377ffa4d8f6132b5b20a1428af4af2ac02b094f0 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Sun Oct 26 11:13:37 2014 -0600 HIG fixes for smath dialogs Disabling manual resizing, setting modal flags, fixing spacing and adding missing colons to labels that precede controls. Change-Id: Id0f180355d302206a632af97dafb6a391c8b4472 Reviewed-on: https://gerrit.libreoffice.org/12105 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/starmath/uiconfig/smath/ui/alignmentdialog.ui b/starmath/uiconfig/smath/ui/alignmentdialog.ui index e0b4fed..3e727f4 100644 --- a/starmath/uiconfig/smath/ui/alignmentdialog.ui +++ b/starmath/uiconfig/smath/ui/alignmentdialog.ui @@ -1,10 +1,13 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkDialog id=AlignmentDialog property name=can_focusFalse/property property name=border_width6/property property name=title translatable=yesAlignment/property +property name=resizableFalse/property +property name=modalTrue/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox3 diff --git a/starmath/uiconfig/smath/ui/catalogdialog.ui b/starmath/uiconfig/smath/ui/catalogdialog.ui index 8c34bad..5d6e9eeb 100644 --- a/starmath/uiconfig/smath/ui/catalogdialog.ui +++ b/starmath/uiconfig/smath/ui/catalogdialog.ui @@ -1,10 +1,14 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ + requires lib=LibreOffice version=1.0/ object class=GtkDialog id=CatalogDialog property name=can_focusFalse/property property name=border_width6/property property name=title translatable=yesSymbols/property +property name=resizableFalse/property +property name=modalTrue/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox5 @@ -89,20 +93,18 @@ property name=hexpandTrue/property property name=vexpandTrue/property property name=row_spacing6/property -property name=column_spacing18/property +property name=column_spacing12/property child object class=GtkLabel id=label1 property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yes_Symbol set/property +property name=label translatable=yes_Symbol set:/property property name=use_underlineTrue/property /object packing property name=left_attach0/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -110,14 +112,10 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=margin_bottom6/property -property name=entry_text_column0/property -property name=id_column1/property /object packing property name=left_attach0/property property name=top_attach1/property -property name=width1/property -property name=height1/property /packing /child child @@ -132,8 +130,6 @@ packing property name=left_attach0/property property name=top_attach2/property -property name=width1/property -property name=height1/property /packing /child child @@ -147,8 +143,6 @@ packing property name=left_attach1/property property name=top_attach2/property -property name=width1/property -property
[Libreoffice-commits] core.git: icon-themes/galaxy
icon-themes/galaxy/res/recentdoc_remove.png |binary icon-themes/galaxy/res/recentdoc_remove_highlighted.png |binary 2 files changed New commits: commit 08ac08592da55a97e32cf16a00e1e34d65149a53 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Wed Oct 29 13:43:31 2014 -0600 Change the âXâ icons for removing documents in Start Center Change-Id: Icb118ef49d46b983ff535c29e5b82a2da61700e1 Reviewed-on: https://gerrit.libreoffice.org/12144 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/galaxy/res/recentdoc_remove.png b/icon-themes/galaxy/res/recentdoc_remove.png index 88e3f0c..a758b75 100644 Binary files a/icon-themes/galaxy/res/recentdoc_remove.png and b/icon-themes/galaxy/res/recentdoc_remove.png differ diff --git a/icon-themes/galaxy/res/recentdoc_remove_highlighted.png b/icon-themes/galaxy/res/recentdoc_remove_highlighted.png index 5492295..3fa1707 100644 Binary files a/icon-themes/galaxy/res/recentdoc_remove_highlighted.png and b/icon-themes/galaxy/res/recentdoc_remove_highlighted.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/paragrph.cxx | 24 +---
1 file changed, 5 insertions(+), 19 deletions(-)
New commits:
commit 0466ab0c66c514dd53676483cab2fb2c60e60667
Author: Harri Pitkänen hatap...@iki.fi
Date: Sat Oct 25 11:20:08 2014 +0300
Remove checks for HTMLMODE_SOME_STYLES
HTMLMODE_SOME_STYLES is enabled for all supported HTML export
modes so there is never need to disable these elements in
the paragraph dialog.
Change-Id: I43df54a6ce900c8a9f957522eb85ca67b6cd756f
Reviewed-on: https://gerrit.libreoffice.org/12091
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index ad93257..f5b2148 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -576,16 +576,6 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet
)
m_pRegisterFL-Hide();
m_pRegisterCB-Hide();
m_pAutoCB-Hide();
-
-if(!(nHtmlMode HTMLMODE_SOME_STYLES)) // IE or SW
-{
-m_pRightLabel-Disable();
-m_pRightIndent-Disable();
-m_pTopDist-Disable(); //HTML3.2 and NS 3.0
-m_pBottomDist-Disable();
-m_pFLineIndent-Disable();
-m_pFLineLabel-Disable();
-}
}
// this sets the min/max limits; do this _after_ setting the values,
@@ -1019,17 +1009,13 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window*
pParent, const SfxItemSet
m_pLastLineLB-SetSelectHdl( LINK( this, SvxParaAlignTabPage,
LastLineHdl_Impl ) );
m_pTextDirectionLB-SetSelectHdl( LINK( this, SvxParaAlignTabPage,
TextDirectionHdl_Impl ) );
-sal_uInt16 nHtmlMode = GetHtmlMode_Impl(rSet);
-if(!(nHtmlMode HTMLMODE_ON) || (0 != (nHtmlMode HTMLMODE_SOME_STYLES))
)
+if( aLangOptions.IsCTLFontEnabled() )
{
-if( aLangOptions.IsCTLFontEnabled() )
-{
-m_pTextDirectionLB-InsertEntryValue( CUI_RESSTR(
RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
-m_pTextDirectionLB-InsertEntryValue( CUI_RESSTR(
RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
-m_pTextDirectionLB-InsertEntryValue( CUI_RESSTR(
RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
+m_pTextDirectionLB-InsertEntryValue( CUI_RESSTR(
RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
+m_pTextDirectionLB-InsertEntryValue( CUI_RESSTR(
RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
+m_pTextDirectionLB-InsertEntryValue( CUI_RESSTR(
RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
-m_pPropertiesFL-Show();
-}
+m_pPropertiesFL-Show();
}
setPreviewsToSamePlace(pParent, this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo82859.rtf| 25 +
sw/qa/extras/rtfimport/rtfimport.cxx|6 ++
writerfilter/source/rtftok/rtfsdrimport.cxx |2 +-
3 files changed, 32 insertions(+), 1 deletion(-)
New commits:
commit 9f89fbf3be626b13799b1b9c0fb8ca246148bcfb
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sat Oct 25 10:36:10 2014 +0200
fdo#82859 RTF import: fillColor is unsigned
Otherwise ARGB 0x would turn into black.
(cherry picked from commit 04ea7b24ec1b5a027efa0b850f2bc3ac7116c52e)
Change-Id: I690f34d888ca9a013e8ce1af2c7ef8ed88ee28b0
Reviewed-on: https://gerrit.libreoffice.org/12153
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/rtfimport/data/fdo82859.rtf
b/sw/qa/extras/rtfimport/data/fdo82859.rtf
new file mode 100644
index 000..eac5e6f
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo82859.rtf
@@ -0,0 +1,25 @@
+{\rtf1
+{\shp
+{\*\shpinst\shpbypara\shpbyignore\shptop4154\shpbottom11234\shpbxcolumn\shpbxignore\shpleft-90\shpright9270
+{\sp
+{\sn fillColor}
+{\sv 4294967295}
+}
+{\sp
+{\sn shapeType}
+{\sv 202}
+}
+{\sp
+{\sn posrelv}
+{\sv 2}
+}
+{\sp
+{\sn posrelh}
+{\sv 2}
+}
+{\shptxt
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index d4cb897..520beee 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1914,6 +1914,12 @@ DECLARE_RTFIMPORT_TEST(testFdo85179, fdo85179.rtf)
CPPUNIT_ASSERT_EQUAL(sal_uInt32(50800/360),
getPropertytable::BorderLine2(getShape(1), TopBorder).LineWidth);
}
+DECLARE_RTFIMPORT_TEST(testFdo82859, fdo82859.rtf)
+{
+// This was 0: 0xff was converted to 0, i.e. the background was
black instead of the default.
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(-1),
getPropertysal_Int32(getShape(1), BackColor));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 7afcfb0..acbe6a2 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -358,7 +358,7 @@ void RTFSdrImport::resolve(RTFShape rShape, bool bClose,
ShapeOrPict const shap
}
else if (i-first == fillColor xPropertySet.is())
{
-aAny = msfilter::util::BGRToRGB(i-second.toInt32());
+aAny = msfilter::util::BGRToRGB(i-second.toUInt32());
if (m_bTextFrame)
xPropertySet-setPropertyValue(BackColor, aAny);
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/file_volume.cxx | 11 --- 1 file changed, 11 deletions(-) New commits: commit 9eed0d4854623d28caf2c4d3bcdd6803db488475 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Thu Oct 30 12:20:15 2014 +0100 osl/unx: Remove ifdefery for ancient NetBSD 3.0 Change-Id: I808da98a3b825eb2213dbcb6d435baa58bf54a9d Reviewed-on: https://gerrit.libreoffice.org/12151 Reviewed-by: Bryan Quigley gqu...@gmail.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx index ce036fc..c200217 100644 --- a/sal/osl/unx/file_volume.cxx +++ b/sal/osl/unx/file_volume.cxx @@ -156,21 +156,10 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI #include sys/param.h -/* statvfs() replaced statfs() in 2.99.9 */ -# if __NetBSD_Version__ = 299000900 - /* 2.0D or later */ # define __OSL_STATFS_STRUCT struct statvfs # define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs)) # define __OSL_STATFS_ISREMOTE(a) (((a).f_flag ST_LOCAL) == 0) -# else - /* version before 2.0D */ -# define __OSL_STATFS_STRUCT struct statfs -# define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) -# define __OSL_STATFS_ISREMOTE(a) (((a).f_type MNT_LOCAL) == 0) - -# endif /* 2.0D */ - # define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) # define __OSL_STATFS_TYPENAME(a) ((a).f_fstypename) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx | 24 ++--
1 file changed, 6 insertions(+), 18 deletions(-)
New commits:
commit 0641dd420956d4c3777c17dd0c0a563fb222e265
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 30 15:39:10 2014 +0200
Use SAL_WARN instead of writing to std::cerr
Change-Id: I28cc30bc4cd0053ced8de0b51e7cdc3ee0a237a5
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 645d889..b03c087 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -77,10 +77,6 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int,
cl_program )
static_castconst formula::SingleVectorRefToken*(ref);
pHostBuffer = const_castdouble*(pSVR-GetArray().mpNumericArray);
szHostBuffer = pSVR-GetArrayLength() * sizeof(double);
-#if 0
-std::cerr Marshal a Single vector of size
pSVR-GetArrayLength();
-std::cerr at argument argno \n;
-#endif
}
else if (ref-GetType() == formula::svDoubleVectorRef)
{
@@ -3572,9 +3568,7 @@ DynamicKernel* DynamicKernel::create( ScDocument /* rDoc
*/,
}
catch (const UnhandledToken ut)
{
-std::cerr \nDynamic formula compiler: unhandled token: ;
-std::cerr ut.mMessage at ;
-std::cerr ut.mFile : ut.mLineNumber \n;
+SAL_WARN(sc.opencl, Dynamic formula compiler: unhandled token:
ut.mMessage at ut.mFile : ut.mLineNumber);
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
#else
@@ -3584,7 +3578,7 @@ DynamicKernel* DynamicKernel::create( ScDocument /* rDoc
*/,
}
catch (...)
{
-std::cerr Dynamic formula compiler: unhandled compiler error\n;
+SAL_WARN(sc.opencl, Dynamic formula compiler: unhandled compiler
error);
return NULL;
}
return pDynamicKernel;
@@ -3662,8 +3656,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
}
catch (const UnhandledToken ut)
{
-std::cerr \nDynamic formula compiler: unhandled token: ;
-std::cerr ut.mMessage \n;
+SAL_WARN(sc.opencl, Dynamic formula compiler: unhandled token:
ut.mMessage at ut.mFile : ut.mLineNumber);
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
return true;
@@ -3673,10 +3666,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
}
catch (const OpenCLError oce)
{
-std::cerr Dynamic formula compiler: OpenCL error: ;
-std::cerr oce.mError;
-std::cerr at ;
-std::cerr oce.mFile : oce.mLineNumber \n;
+SAL_WARN(sc.opencl, Dynamic formula compiler: OpenCL error:
oce.mError at oce.mFile : oce.mLineNumber);
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
return true;
@@ -3686,9 +3676,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
}
catch (const Unhandled uh)
{
-std::cerr Dynamic formula compiler: unhandled case:;
-std::cerr at ;
-std::cerr uh.mFile : uh.mLineNumber \n;
+SAL_WARN(sc.opencl, Dynamic formula compiler: unhandled case at
uh.mFile : uh.mLineNumber);
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
return true;
@@ -3698,7 +3686,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
}
catch (...)
{
-std::cerr Dynamic formula compiler: unhandled compiler error\n;
+SAL_WARN(sc.opencl, Dynamic formula compiler: unhandled compiler
error);
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/qa
forms/qa/integration/forms/BooleanValidator.java |4 ---
forms/qa/integration/forms/DateValidator.java |4 ---
forms/qa/integration/forms/FormComponent.java | 20 -
forms/qa/integration/forms/ListSelectionValidator.java |4 ---
forms/qa/integration/forms/NumericValidator.java |4 ---
forms/qa/integration/forms/TextValidator.java | 11 ++---
forms/qa/integration/forms/TimeValidator.java |4 ---
7 files changed, 13 insertions(+), 38 deletions(-)
New commits:
commit 1e48bfafdd25d595a2265a5bc66230f3681e96b5
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Tue Sep 30 13:05:54 2014 +0200
forms: The if statement is redundant
Change-Id: I1d339ea6052e648acf4405d2d40795c82ee043ca
Reviewed-on: https://gerrit.libreoffice.org/11713
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/forms/qa/integration/forms/BooleanValidator.java
b/forms/qa/integration/forms/BooleanValidator.java
index 730c45f..8201fe9 100644
--- a/forms/qa/integration/forms/BooleanValidator.java
+++ b/forms/qa/integration/forms/BooleanValidator.java
@@ -61,9 +61,7 @@ public class BooleanValidator extends
integration.forms.ControlValidator
return false;
boolean value = ((Boolean)Value).booleanValue();
-if ( m_preventChecked ( value ) )
-return false;
-return true;
+return !(m_preventChecked ( value ));
}
catch( java.lang.Exception e )
{
diff --git a/forms/qa/integration/forms/DateValidator.java
b/forms/qa/integration/forms/DateValidator.java
index 055e779..255ec6f 100644
--- a/forms/qa/integration/forms/DateValidator.java
+++ b/forms/qa/integration/forms/DateValidator.java
@@ -54,9 +54,7 @@ public class DateValidator extends
integration.forms.ControlValidator
if ( isDedicatedInvalidDate( dateValue ) )
return false;
-if ( !isNextMonthsDate( dateValue ) )
-return false;
-return true;
+return isNextMonthsDate( dateValue );
}
catch( java.lang.Exception e )
{
diff --git a/forms/qa/integration/forms/FormComponent.java
b/forms/qa/integration/forms/FormComponent.java
index 89b8f91..eb7467a 100644
--- a/forms/qa/integration/forms/FormComponent.java
+++ b/forms/qa/integration/forms/FormComponent.java
@@ -103,9 +103,7 @@ public class FormComponent
/* -- */
public String[] getElementNames()
{
-if ( m_nameAccess != null )
-return m_nameAccess.getElementNames();
-return new String[]{};
+return ( m_nameAccess != null ) ? m_nameAccess.getElementNames() : new
String[]{};
}
@@ -113,9 +111,7 @@ public class FormComponent
/* -- */
public int getCount()
{
-if ( m_indexAccess != null )
-return m_indexAccess.getCount();
-return 0;
+return ( m_indexAccess != null ) ? m_indexAccess.getCount() : 0;
}
/* -- */
@@ -149,17 +145,13 @@ public class FormComponent
/* -- */
public FormComponent getParent()
{
-if ( m_child != null )
-return new FormComponent( m_child.getParent() );
-return new FormComponent();
+return ( m_child != null ) ? new FormComponent( m_child.getParent() )
: new FormComponent();
}
/* -- */
public String getName()
{
-if ( m_named != null )
-return m_named.getName();
-return ;
+return ( m_named != null ) ? m_named.getName() : ;
}
/* -- */
@@ -167,8 +159,6 @@ public class FormComponent
{
XServiceInfo si = UnoRuntime.queryInterface(
XServiceInfo.class, m_component );
-if ( si != null )
-return si.getImplementationName();
-return ;
+return ( si != null ) ? si.getImplementationName() : ;
}
}
diff --git a/forms/qa/integration/forms/ListSelectionValidator.java
b/forms/qa/integration/forms/ListSelectionValidator.java
index ce94a1e..164110d 100644
--- a/forms/qa/integration/forms/ListSelectionValidator.java
+++ b/forms/qa/integration/forms/ListSelectionValidator.java
@@ -40,9 +40,7 @@ public class ListSelectionValidator extends
integration.forms.ControlValidator
try
{
short[] selectionIndexes = (short[])Value;
-if ( selectionIndexes.length 2 )
-return false;
-return true;
+return
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/download.pm | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 3bfd60a1dc138f1910529bd15043ec731525d572
Author: YiiChang Yen sadwind@gmail.com
Date: Thu Oct 23 14:59:06 2014 +0800
Setting download name: To let other product name can pass to $start
Because the product name may be others.
Change-Id: I2cd60fd029c7a75b8018b681303aa2883cd3dc97
Reviewed-on: https://gerrit.libreoffice.org/12074
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index d9b3d46..017d048 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -299,13 +299,17 @@ sub get_downloadname_productname
{
my ($allvariables) = @_;
-my $start = LibreOffice;
+my $start = ;
if ( $allvariables-{'PRODUCTNAME'} eq LibreOffice ) { $start =
LibreOffice; }
-if ( $allvariables-{'PRODUCTNAME'} eq LibreOfficeDev ) { $start =
LibreOfficeDev; }
+elsif ( $allvariables-{'PRODUCTNAME'} eq LibreOfficeDev ) { $start =
LibreOfficeDev; }
-if ( $allvariables-{'PRODUCTNAME'} eq OxygenOffice ) { $start = OOOP;
}
+elsif ( $allvariables-{'PRODUCTNAME'} eq OxygenOffice ) { $start =
OOOP; }
+
+elsif ( $allvariables-{'PRODUCTNAME'} eq ) { $start = LibreOffice; }
+
+else ( $start = $allvariables-{'PRODUCTNAME'}; }
return $start;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - bridges/source filter/source idlc/source jvmfwk/plugins reportdesign/source sc/source svl/source sw/source vcl/source
bridges/source/jni_uno/jni_info.cxx |1
filter/source/graphicfilter/ipict/ipict.cxx | 25 +--
idlc/source/parser.y |1
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 11 +++-
reportdesign/source/ui/report/dlgedfunc.cxx | 29 ++-
sc/source/core/opencl/op_statistical.cxx |9 ---
svl/source/items/rngitem.cxx | 12 +
sw/source/filter/basflt/iodetect.cxx |4 +--
vcl/source/gdi/pdfwriter_impl.cxx|7 -
9 files changed, 53 insertions(+), 46 deletions(-)
New commits:
commit 9d522e214c074b94cf8cbb6a82f80286838a3c54
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 30 14:21:13 2014 +
coverity#982268 silence Copy-paste error
Change-Id: I10e5dd8ea4097892d2571304d982ab20ee230988
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index c239fba..afa3801 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -2154,6 +2154,7 @@ at_least_one_scoped_name :
} else
{
StringList* pScopedNames = new StringList();
+//coverity [copy_paste_error]
pScopedNames-push_back(*$1);
$$ = pScopedNames;
}
commit 37b53e179d7727c817d175d8102e87f7f23e9bb8
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 30 14:10:52 2014 +
there are two of these GetUserData()[0] tests, use startsWith for both
Change-Id: Iacb40220a87563a53a521b35efe208bb3b90e653
diff --git a/sw/source/filter/basflt/iodetect.cxx
b/sw/source/filter/basflt/iodetect.cxx
index 64da606..5c5f6a5 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -171,7 +171,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString
rFileName)
{
while ( pFilter )
{
-if( !pFilter-GetUserData().isEmpty() 'C' ==
pFilter-GetUserData()[0] IsValidStgFilter( xStor, *pFilter ) )
+if (pFilter-GetUserData().startsWith(C)
IsValidStgFilter(xStor, *pFilter ))
{
if (pFilter-IsOwnTemplateFormat())
{
@@ -206,7 +206,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString
rFileName)
{
while ( pFilter )
{
-if( 'C' == pFilter-GetUserData()[0] IsValidStgFilter(
*xStg, *pFilter ) )
+if (pFilter-GetUserData().startsWith(C)
IsValidStgFilter(*xStg, *pFilter))
{
if (pFilter-IsOwnTemplateFormat())
{
commit 1c4fc13600e0466dc6d1816d3a0306db6566141a
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 30 13:19:04 2014 +
coverity#704245 Logically dead code
since
commit 7599f68cee9141cd16ca7697872b5f83c6ae9ad9
Author: Ivo Hinkelmann i...@openoffice.org
Date: Wed Apr 22 11:01:27 2009 +
CWS-TOOLING: integrate CWS dba32a
Change-Id: I85c45344ca31d50bd99c12b8c9dc29478aadb067
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx
b/reportdesign/source/ui/report/dlgedfunc.cxx
index 0706761..db21172 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -672,34 +672,21 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent
rMEvt )
const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN,
aVEvt);
-if (eHit == SDRHIT_UNMARKEDOBJECT
-nId != OBJ_CUSTOMSHAPE)
+if (eHit == SDRHIT_UNMARKEDOBJECT nId != OBJ_CUSTOMSHAPE)
{
// there is an object under the mouse cursor, but not a customshape
m_pParent-getSectionWindow()-getViewsWindow()-BrkAction();
return false;
}
-if( eHit != SDRHIT_UNMARKEDOBJECT || nId == OBJ_CUSTOMSHAPE)
+// if no action, create object
+if (!m_pParent-getSectionWindow()-getViewsWindow()-IsAction())
{
-// if no action, create object
-if ( !m_pParent-getSectionWindow()-getViewsWindow()-IsAction() )
-{
-deactivateOle(true);
-if (
m_pParent-getSectionWindow()-getViewsWindow()-HasSelection() )
-
m_pParent-getSectionWindow()-getViewsWindow()-unmarkAllObjects(m_rView);
-m_rView.BegCreateObj(m_aMDPos);
-m_pParent-getSectionWindow()-getViewsWindow()-createDefault();
-}
-}
-else
-{
-if( !rMEvt.IsShift() )
-{
-// shift key pressed?
-
m_pParent-getSectionWindow()-getViewsWindow()-unmarkAllObjects(NULL);
-}
-m_pParent-getSectionWindow()-getViewsWindow()-BegMarkObj(
m_aMDPos,m_rView );
+deactivateOle(true);
+if ( m_pParent-getSectionWindow()-getViewsWindow()-HasSelection() )
+
Re: enhancing perfcheck - Proof of concept proposals
Hi, On Tue, 2014-10-28 at 07:51 +0100, Laurent Godard wrote: Hi Matus, Thanks a lot for your detailled response I'm actually in holidays with family and will be back next week; I hope then to be able to continue this work (but feel free to start it !) enjoy :-) Regarding output results, the approach i took was to first gather all the results in the csv file Then post-processing it in a spreadsheet (say, randomly, calc) and use standard filters to isolate the tests Ah, I see. Nice, I would not be able to come up with something like that :-) - set IS_PERFCHECK this would be set all the time (not needed) make perfcheck would just run tests under callgrind, where it makes sense ok but i still do not catch how the beast would know if callgrind is running or not. how would startImplemntation and endImplementation behave if callgrind is not running (case of normal tests) callgrind runs if you use 'make perfcheck' or set gb_CppunitTest_VALGRINDTOOL explicitely. If callgrind does not run, startImplementation should do nothing. So, I've done http://cgit.freedesktop.org/libreoffice/core/commit/?id=e4e7f9d88e05fa610a72245c40f4e47f85db61ff Hopefully it will help us. Example test: https://gerrit.libreoffice.org/#/c/11296/ Would be nice to rebase your patches and merge them. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/image_rework' - 13 commits - include/svtools include/svx svtools/source svx/source sw/inc sw/source
include/svtools/grfmgr.hxx |9 --
include/svx/svdpage.hxx | 17
include/svx/svdundo.hxx |3
svtools/source/graphic/grfmgr.cxx | 109 +++-
svx/source/svdraw/svdpage.cxx | 34
svx/source/svdraw/svdundo.cxx | 28 ---
svx/source/unodraw/unoshap2.cxx | 10 --
sw/inc/editsh.hxx |2
sw/inc/ndgrf.hxx|4 -
sw/source/core/doc/notxtfrm.cxx | 28 ++-
sw/source/core/docnode/ndnotxt.cxx |3
sw/source/core/edit/editsh.cxx | 35
sw/source/core/frmedt/fefly1.cxx|3
sw/source/core/graphic/ndgrf.cxx| 12 ++-
sw/source/core/layout/paintfrm.cxx | 21 +
sw/source/core/undo/unins.cxx |3
sw/source/core/unocore/unoframe.cxx | 17
sw/source/filter/inc/msfilter.hxx | 21 -
sw/source/filter/ww8/rtfattributeoutput.cxx |4 -
sw/source/filter/ww8/writerhelper.cxx | 22 -
sw/source/ui/frmdlg/wrap.cxx|2
sw/source/uibase/shells/basesh.cxx |4 -
22 files changed, 52 insertions(+), 339 deletions(-)
New commits:
commit 839ad234daa0edba899c2823c17d0ab3eb2f87ab
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Oct 30 15:38:07 2014 +0100
SwapIn by SwGrfNode::GetGrf(bool)/GetGrfObj() methods and not manually
Change-Id: Ie56584c03af8a6d3ea8f8d4294f5492a841933b7
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 8117d4d..b869896 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -619,7 +619,7 @@ public:
// #i73788#
/// Remove default parameter, because method always called this default
value.
-Graphic GetIMapGraphic(bool bSwapIn = true) const; /// @return a graphic
for all Flys!
+Graphic GetIMapGraphic() const; /// @return a graphic for all Flys!
const SwFlyFrmFmt* FindFlyByName( const OUString rName, sal_uInt8 nNdTyp
= 0 ) const;
/** @return a ClientObject, if CurCrsr-Point() points to a SwOLENode
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 2b50fce..5a2dcbd 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -123,8 +123,8 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
public:
virtual ~SwGrfNode();
-const Graphic GetGrf() const;
-const GraphicObjectGetGrfObj() const;
+const Graphic GetGrf(bool bWait = false) const;
+const GraphicObjectGetGrfObj(bool bWait = false) const;
const GraphicObject* GetReplacementGrfObj() const;
virtual SwCntntNode *SplitCntntNode( const SwPosition ) SAL_OVERRIDE;
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 563144a..612b785 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -879,7 +879,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect rGrfArea ) cons
}
bool bContinue = true;
-const GraphicObject rGrfObj = pGrfNd-GetGrfObj();
+const GraphicObject rGrfObj = pGrfNd-GetGrfObj(bPrn);
GraphicAttr aGrfAttr;
pGrfNd-GetGraphicAttr( aGrfAttr, this );
@@ -917,8 +917,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect rGrfArea ) cons
if( bContinue )
{
-const bool bSwappedIn = pGrfNd-SwapIn( bPrn );
-if( bSwappedIn rGrfObj.GetGraphic().IsSupportedGraphic())
+if( rGrfObj.GetGraphic().IsSupportedGraphic())
{
const bool bAnimate = rGrfObj.IsAnimated()
!pShell-IsPreview()
@@ -955,13 +954,12 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect rGrfArea ) cons
else
{
sal_uInt16 nResId = 0;
-if( bSwappedIn )
-{
-if( GRAPHIC_NONE == rGrfObj.GetType() )
-nResId = STR_COMCORE_READERROR;
-else if ( !rGrfObj.GetGraphic().IsSupportedGraphic() )
-nResId = STR_COMCORE_CANT_SHOW;
-}
+
+if( GRAPHIC_NONE == rGrfObj.GetType() )
+nResId = STR_COMCORE_READERROR;
+else if ( !rGrfObj.GetGraphic().IsSupportedGraphic() )
+nResId = STR_COMCORE_CANT_SHOW;
+
((SwNoTxtFrm*)this)-nWeight = -1;
OUString aText;
if ( !nResId
diff --git a/sw/source/core/docnode/ndnotxt.cxx
b/sw/source/core/docnode/ndnotxt.cxx
index 7a325c9..dfb38b1 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -251,8 +251,7 @@ Graphic SwNoTxtNode::GetGraphic() const
Graphic aRet;
if ( GetGrfNode() )
{
-((SwGrfNode*)this)-SwapIn( true );
-
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |3 ++-
sw/source/core/doc/DocumentSettingManager.cxx |6 ++
sw/source/core/inc/DocumentSettingManager.hxx |1 +
sw/source/core/text/itrform2.cxx | 19 ++-
sw/source/filter/ww8/ww8par.cxx |1 +
sw/source/filter/xml/xmlimp.cxx | 10 ++
sw/source/uibase/uno/SwXDocumentSettings.cxx | 21 -
writerfilter/source/filter/ImportFilter.cxx |1 +
8 files changed, 55 insertions(+), 7 deletions(-)
New commits:
commit 9605763e3dc8c85137787c77c31e8639553a35ed
Author: Michael Stahl mst...@redhat.com
Date: Thu Oct 30 15:12:33 2014 +0100
fdo#79602: sw: add new compatibiltiy flag PropLineSpacingShrinksFirstLine
This is enabled by default, to get the new formatting where the first
line of a paragraph is shrunk if a proportional line spacing 100% is
applied; existing OOo documents get the previous (before LO 3.3)
formatting. Since the formatting in LO releases is broken anyway, it
does not matter much which way documents written by old LO get
formatted.
Change-Id: I0952f568a933c137bd03070759989cac3517d8b9
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index a544549..f0e941e 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -79,6 +79,7 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
TAB_OVER_MARGIN,
// MS Word still wraps text around objects with less space than LO
would.
SURROUND_TEXT_WRAP_SMALL,
+ PROP_LINE_SPACING_SHRINKS_FIRST_LINE,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
@@ -93,7 +94,7 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
FLOATTABLE_NOMARGINS,
EMBED_FONTS,
EMBED_SYSTEM_FONTS,
- APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING
+ APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING,
};
public:
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx
b/sw/source/core/doc/DocumentSettingManager.cxx
index f192f72..95dca59 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -80,6 +80,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc
rDoc)
mbBackgroundParaOverDrawings(false),
mbTabOverMargin(false),
mbSurroundTextWrapSmall(false),
+mbPropLineSpacingShrinksFirstLine(true),
mApplyParagraphMarkFormatToNumbering(false),
mbLastBrowseMode( false )
@@ -154,6 +155,7 @@ bool sw::DocumentSettingManager::get(/*[in]*/
DocumentSettingId id) const
case BACKGROUND_PARA_OVER_DRAWINGS: return
mbBackgroundParaOverDrawings;
case TAB_OVER_MARGIN: return mbTabOverMargin;
case SURROUND_TEXT_WRAP_SMALL: return mbSurroundTextWrapSmall;
+case PROP_LINE_SPACING_SHRINKS_FIRST_LINE: return
mbPropLineSpacingShrinksFirstLine;
case BROWSE_MODE: return mbLastBrowseMode; // Attention: normally the
SwViewShell has to be asked!
case HTML_MODE: return mbHTMLMode;
@@ -316,6 +318,10 @@ void sw::DocumentSettingManager::set(/*[in]*/
DocumentSettingId id, /*[in]*/ boo
mbSurroundTextWrapSmall = value;
break;
+case PROP_LINE_SPACING_SHRINKS_FIRST_LINE:
+mbPropLineSpacingShrinksFirstLine = value;
+break;
+
// COMPATIBILITY FLAGS END
case BROWSE_MODE: //can be used temporary (load/save) when no
SwViewShell is available
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx
b/sw/source/core/inc/DocumentSettingManager.hxx
index 66cc76c..6dc27ca 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -147,6 +147,7 @@ class DocumentSettingManager :
bool mbBackgroundParaOverDrawings;
bool mbTabOverMargin;
bool mbSurroundTextWrapSmall;
+bool mbPropLineSpacingShrinksFirstLine; // fdo#79602
bool mApplyParagraphMarkFormatToNumbering;
bool mbLastBrowseMode : 1;
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 233aaab..c650214 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1744,7 +1744,8 @@ void SwTxtFormatter::CalcRealHeight( bool bNewLine )
case SVX_LINE_SPACE_AUTO:
// shrink first line of paragraph too on spacing 100%
if (IsParaLine()
-pSpace-GetInterLineSpaceRule() ==
SVX_INTER_LINE_SPACE_PROP)
+pSpace-GetInterLineSpaceRule() ==
SVX_INTER_LINE_SPACE_PROP
+
GetTxtFrm()-GetTxtNode()-getIDocumentSettingAccess()-get(IDocumentSettingAccess::PROP_LINE_SPACING_SHRINKS_FIRST_LINE))
{
long nTmp =
[Libreoffice-commits] core.git: 2 commits - svx/source svx/uiconfig sw/source
svx/source/dialog/docrecovery.src |2 +-
svx/source/inc/docrecovery.hxx |2 +-
svx/uiconfig/ui/docrecoveryrecoverdialog.ui |5 +++--
sw/source/uibase/shells/basesh.cxx |6 +++---
4 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 6ac621f1e07c2717d69880866522056996fe9546
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 30 14:56:31 2014 +
Resolves: fdo#80815 rename Cancel and explain what it will do
Change-Id: Ifdd68f7e415176062b9eee6825b3c0bb09cb05db
diff --git a/svx/source/dialog/docrecovery.src
b/svx/source/dialog/docrecovery.src
index eb55d1f..8f8cd98 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -24,7 +24,7 @@
String RID_SVXSTR_QUERY_EXIT_RECOVERY
{
-Text [ en-US ] = Are you sure you want to cancel the %PRODUCTNAME
document recovery?;
+Text [ en-US ] = Are you sure you want to discard the %PRODUCTNAME
document recovery data?;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 74946f1..c29d139 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -502,7 +502,7 @@ class RecoveryDialog : public Dialog
vcl::Window* m_pProgrParent;
RecovDocList* m_pFileListLB;
PushButton* m_pNextBtn;
-CancelButton* m_pCancelBtn;
+PushButton* m_pCancelBtn;
OUStringm_aTitleRecoveryInProgress;
OUStringm_aRecoveryOnlyFinish;
OUStringm_aRecoveryOnlyFinishDescr;
diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
index 034380e..fe77eb8 100644
--- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
@@ -35,12 +35,11 @@
/child
child
object class=GtkButton id=cancel
-property name=labelgtk-cancel/property
+property name=labelDiscard Recovery Data/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=can_defaultTrue/property
property name=receives_defaultTrue/property
-property name=use_stockTrue/property
/object
packing
property name=expandFalse/property
@@ -77,6 +76,8 @@
property name=xalign0/property
property name=label translatable=yesPress 'Start
Recovery' to start the recovery process of the documents listed below.
+Press 'Discard Recovery Data' to abandon attempting recovery of these document.
+
The 'Status' column shows whether the document can be recovered./property
property name=wrapTrue/property
property name=max_width_chars87/property
commit f6011536a888be3a4e1cda2de9532b6ba3f4a275
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 30 14:35:17 2014 +
coverity#704378 gold, Logically dead code
Change-Id: I53bd1e36b2c4e9e7f5e8ec95fa79348fc9cac98b
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index 96f5218..9c8b35d 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1041,7 +1041,7 @@ void SwBaseShell::Execute(SfxRequest rReq)
if( eVOrient != text::VertOrientation::TOP eVOrient !=
text::VertOrientation::NONE)
aSet.Put(SwFmtVertOrient(0,
text::VertOrientation::TOP));
-if(eHOrient != text::HoriOrientation::NONE || eHOrient !=
text::HoriOrientation::LEFT)
+if (eHOrient != text::HoriOrientation::NONE eHOrient !=
text::HoriOrientation::LEFT)
aSet.Put(SwFmtHoriOrient(0,
text::HoriOrientation::LEFT));
break;
@@ -1053,7 +1053,7 @@ void SwBaseShell::Execute(SfxRequest rReq)
if( eVOrient != text::VertOrientation::TOP)
aSet.Put(SwFmtVertOrient(0,
text::VertOrientation::TOP));
-if(eHOrient != text::HoriOrientation::NONE || eHOrient !=
text::HoriOrientation::LEFT || eHOrient != text::HoriOrientation::RIGHT)
+if (eHOrient != text::HoriOrientation::NONE eHOrient !=
text::HoriOrientation::LEFT eHOrient != text::HoriOrientation::RIGHT)
aSet.Put(SwFmtHoriOrient(0,
text::HoriOrientation::LEFT));
break;
@@ -1065,7 +1065,7 @@ void SwBaseShell::Execute(SfxRequest rReq)
if( eVOrient != text::VertOrientation::TOP)
aSet.Put(SwFmtVertOrient(0,
text::VertOrientation::TOP));
-if(eHOrient != text::HoriOrientation::NONE || eHOrient !=
text::HoriOrientation::LEFT || eHOrient !=
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 5 commits - include/vcl vcl/inc vcl/win
include/vcl/opengl/OpenGLContext.hxx |5 ++-
vcl/inc/win/svsys.h |3 ++
vcl/win/source/gdi/gdiimpl.hxx |3 +-
vcl/win/source/gdi/salgdi.cxx| 46 +++
4 files changed, 33 insertions(+), 24 deletions(-)
New commits:
commit d06876c3a657ca4e08e29b476fbe16c4b970d0fe
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Oct 30 16:29:54 2014 +0100
no check before delete and move to intializer list
Change-Id: Ib6e50f863db1a64dc42ed4313a009abe4932ce3f
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index b8d465a..8ccc7d0 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -555,7 +555,23 @@ void ImplClearHDCCache( SalData* pData )
}
WinSalGraphics::WinSalGraphics():
-mpImpl(new WinSalGraphicsImpl(*this))
+mpImpl(new WinSalGraphicsImpl(*this)),
+mhLocalDC(0),
+mfCurrentFontScale(1.0),
+mhRegion(0),
+mhDefPen(0),
+mhDefBrush(0),
+mhDefFont(0),
+mhDefPal(0),
+mpStdClipRgnData(NULL),
+mpLogFont(NULL),
+mpFontCharSets(NULL),
+mpFontAttrCache(NULL),
+mnFontCharSetCount(0),
+mpFontKernPairs(NULL),
+mnFontKernPairCount(0),
+mbFontKernInit(false),
+mnPenWidth(GSL_PEN_WIDTH)
{
for( int i = 0; i MAX_FALLBACK; ++i )
{
@@ -565,23 +581,6 @@ WinSalGraphics::WinSalGraphics():
mfFontScale[ i ] = 1.0;
}
-mfCurrentFontScale = 1.0;
-
-mhLocalDC = 0;
-mhRegion= 0;
-mhDefPen= 0;
-mhDefBrush = 0;
-mhDefFont = 0;
-mhDefPal= 0;
-mpStdClipRgnData= NULL;
-mpLogFont = NULL;
-mpFontCharSets = NULL;
-mpFontAttrCache = NULL;
-mnFontCharSetCount = 0;
-mpFontKernPairs = NULL;
-mnFontKernPairCount = 0;
-mbFontKernInit = FALSE;
-mnPenWidth = GSL_PEN_WIDTH;
static const char* pEnv = getenv(USE_OPENGL);
if (pEnv)
{
@@ -601,8 +600,7 @@ WinSalGraphics::~WinSalGraphics()
}
// delete cache data
-if ( mpStdClipRgnData )
-delete [] mpStdClipRgnData;
+delete [] mpStdClipRgnData;
delete mpLogFont;
commit 5ba57c87cfeca41e323a2e0936f4d3b829d38826
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Oct 30 16:06:01 2014 +0100
make it possible to select the OpenGL rendering on windows
Change-Id: Id60b8121a890e6d1f46bd671549ac681f42b7660
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index bb7aa3b..91b54e4 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -22,9 +22,12 @@
# include GL/glxew.h
# include postx.h
#elif defined( _WIN32 )
+#ifndef INCLUDED_PRE_POST_WIN_H
+#define INCLUDED_PRE_POST_WIN_H
# include prewin.h
# include postwin.h
#endif
+#endif
#if defined( _WIN32 )
#include GL/glext.h
diff --git a/vcl/inc/win/svsys.h b/vcl/inc/win/svsys.h
index 5554da9..9753a87 100644
--- a/vcl/inc/win/svsys.h
+++ b/vcl/inc/win/svsys.h
@@ -21,9 +21,12 @@
#define INCLUDED_VCL_INC_WIN_SVSYS_H
#ifdef WNT
+#ifndef INCLUDED_PRE_POST_WIN_H
+#define INCLUDED_PRE_POST_WIN_H
#include prewin.h
#include postwin.h
#endif
+#endif
#endif // INCLUDED_VCL_INC_WIN_SVSYS_H
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index d7a0716..b8d465a 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -34,6 +34,7 @@
#include salgdiimpl.hxx
#include gdiimpl.hxx
+#include openglgdiimpl.hxx
#define DITHER_PAL_DELTA51
#define DITHER_PAL_STEPS6
@@ -581,6 +582,11 @@ WinSalGraphics::WinSalGraphics():
mnFontKernPairCount = 0;
mbFontKernInit = FALSE;
mnPenWidth = GSL_PEN_WIDTH;
+static const char* pEnv = getenv(USE_OPENGL);
+if (pEnv)
+{
+mpImpl.reset(new OpenGLSalGraphicsImpl());
+}
}
WinSalGraphics::~WinSalGraphics()
commit e95f8017fa91088e47fabde067b18d6340e5d5de
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Oct 30 02:55:57 2014 +0100
don't include the win version of svsys directly
Change-Id: I21f9443ad847ab07c3e25e6004d2133148db7f03
diff --git a/vcl/win/source/gdi/gdiimpl.hxx b/vcl/win/source/gdi/gdiimpl.hxx
index 42765aa..c10a143 100644
--- a/vcl/win/source/gdi/gdiimpl.hxx
+++ b/vcl/win/source/gdi/gdiimpl.hxx
@@ -19,9 +19,10 @@
#include salgdiimpl.hxx
-#include win/svsys.h
#include vcl/gradient.hxx
+#include svsys.h
+
class WinSalGraphics;
class WinSalGraphicsImpl : public SalGraphicsImpl
commit 22ec06afbf141f7d2a91a9fffdd16535e6e895b5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Oct 30 02:55:28 2014 +0100
fix indentation
Change-Id: Ia61988f94a2cce9aefe1b48159a1bf1884be70f2
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
coverity warnings update, 200
So, we now have 200 non-(intentional/false positive) warnings remaining in coverity from an original count of approx 11 thousand or thereabouts. the biggest remaining categories are... 50 Tainted scalars 23 Uncaught exceptions 19 Unchecked returns 19 divide by zeros 14 Swapped arguments and a handful in a bunch of various other categories. I reckon practically all the swapped arguments are ok except maybe for 1242508. (caolanm-quikee: in 1b23e46051d8cc7c01fd8b4d0ea51bfec145db8e there is.. - pWriteAcc-SetPixel( i, x, aResultColor ); + pWriteAcc-SetPixel( x, y, aResultColor ); and SetPixel takes args named x, y. so are those arguments definitely not the wrong way around or is it actually a real detected problem?) Nearly all the other swapped arguments are around column/rows possibly being swapped, especially in calc, e.g. a lot of them are like 1242513 bChartRowAsHdr passed to bCol on line 3176 ScCellRangesBase::setRowDescriptions. I assume those are ok ? There are also 4 remaining (from originally 1842) uninitialized members in ctors, all from calc, where there are quite a few members and only some of them get initialized directly in the ctor. It'd be good to get someone from calc to have a once-over on those and see if they are intentionally uninitialized for e.g. performance reasons. So in general, we have only a very small count of remaining warnings to be decided about one way or the other, logging into coverity and choosing outstanding defects and sorting by file and having a quick scan through whatever modules you consider yours especially for swapped arguments and unchecked returns to see if any of them need fixing or can be dismissed as intentional. FWIW coverity Unchecked returns can be silenced in code with foo() - (void)foo() as is typical for some compilers' similar compile-time warnings. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/uiconfig
sc/uiconfig/scalc/ui/formulacalculationoptions.ui | 78 +++ sc/uiconfig/scalc/ui/optformula.ui| 449 +++--- 2 files changed, 315 insertions(+), 212 deletions(-) New commits: commit da4395d818a0826e92976a066e86c8be8320ec2d Author: Jan Holesovsky ke...@collabora.com Date: Thu Oct 30 17:00:07 2014 +0100 Make the Value: combobox visible when you open the dialog. Change-Id: I8cb9ecb3a38468c4b00b5c043f63165631f55513 diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui index 293d993..08f2379 100644 --- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui +++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui @@ -1,8 +1,7 @@ ?xml version=1.0 encoding=UTF-8? -!-- Generated with glade 3.18.3 -- interface - requires lib=gtk+ version=3.6/ - requires lib=LibreOffice version=1.0/ + !-- interface-requires gtk+ 3.6 -- + !-- interface-requires LibreOffice 1.0 -- object class=GtkDialog id=FormulaCalculationOptions property name=can_focusFalse/property property name=vexpandTrue/property @@ -77,6 +76,8 @@ packing property name=left_attach0/property property name=top_attach0/property +property name=width1/property +property name=height1/property /packing /child child @@ -94,12 +95,15 @@ packing property name=left_attach0/property property name=top_attach0/property +property name=width1/property +property name=height1/property /packing /child child object class=GtkGrid id=grid4 property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property property name=column_homogeneousTrue/property child object class=GtkRadioButton id=true @@ -116,6 +120,8 @@ packing property name=left_attach0/property property name=top_attach0/property +property name=width1/property +property name=height1/property /packing /child child @@ -132,29 +138,37 @@ packing property name=left_attach1/property property name=top_attach0/property +property name=width1/property +property name=height1/property /packing /child child object class=GtkComboBoxText id=edit property name=visibleTrue/property property name=can_focusFalse/property -property name=halignstart/property +property name=hexpandTrue/property /object packing property name=left_attach2/property property name=top_attach0/property +property name=width1/property +property name=height1/property /packing /child /object packing property name=left_attach1/property property name=top_attach0/property +property name=width1/property +property name=height1/property /packing /child /object packing property name=left_attach0/property property name=top_attach1/property +property name=width1/property +property name=height1/property /packing /child child @@ -169,6 +183,8 @@ packing property name=left_attach0/property property name=top_attach2/property +property name=width1/property +property name=height1/property /packing /child child @@ -180,6 +196,8 @@ packing property name=left_attach0/property property name=top_attach4/property +property name=width1/property +property name=height1/property /packing /child child @@ -193,6 +211,8 @@ packing property name=left_attach0/property property name=top_attach5/property +property name=width1/property +property
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unoportenum.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8e79e7788d109403b7a5eb694f73e030a50be2c9 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 30 16:13:13 2014 + WaE: [loplugin:staticcall] Change-Id: I2e3ad291d34b412b27b52cf54266ede6b31028a2 diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index e079b9c..35e074a 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -214,7 +214,7 @@ namespace sw::mark::IMark* pBkmk = const_castsw::mark::IMark*(pIndex-GetMark()); if (!pBkmk) continue; -IDocumentMarkAccess::MarkType eType = pMarkAccess-GetType(*pBkmk); +IDocumentMarkAccess::MarkType eType = IDocumentMarkAccess::GetType(*pBkmk); // These are the types stored in the container otherwise accessible via getBookmarks*() if (eType != IDocumentMarkAccess::BOOKMARK eType != IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK eType != IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK) continue; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/download.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 24f6035e79f474c6878a775b2be62691ac950d36
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 30 16:18:31 2014 +
fix bracket
Change-Id: Id4fc5dda86845d23fe35122f7ade3ae99b2d123c
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 017d048..37a9123 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -309,7 +309,7 @@ sub get_downloadname_productname
elsif ( $allvariables-{'PRODUCTNAME'} eq ) { $start = LibreOffice; }
-else ( $start = $allvariables-{'PRODUCTNAME'}; }
+else { $start = $allvariables-{'PRODUCTNAME'}; }
return $start;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 81 commits - apple_remote/source avmedia/Module_avmedia.mk basic/source bridges/Library_cpp_uno.mk bridges/source configure.ac connec
Rebased ref, commits from common ancestor:
commit e256ee7811a691587f3c4149611d32e9e6db20b1
Author: Douglas Mencken dougmenc...@gmail.com
Date: Thu Oct 30 12:19:27 2014 -0400
OpenGL is not well supported on OSX 10.666
'NSOpenGLPFAOpenGLProfile' was not declared in this scope
'NSOpenGLProfileVersion3_2Core' was not declared in this scope
Change-Id: I90584aa3fbffa8c67f67336f0036324dcac28830
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 58e2c64..d1f4df7 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -52,8 +52,10 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame,
SystemWindowData* pWindowDat
maSysData.mbOpenGL = true;
NSOpenGLPixelFormat* pixFormat = NULL;
+#if MACOSX_SDK_VERSION = 1070
if (pWindowData-bLegacy)
{
+#endif
NSOpenGLPixelFormatAttribute aAttributes[] =
{
NSOpenGLPFADoubleBuffer,
@@ -65,6 +67,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame,
SystemWindowData* pWindowDat
0
};
pixFormat = [[NSOpenGLPixelFormat alloc]
initWithAttributes:aAttributes];
+#if MACOSX_SDK_VERSION = 1070
}
else
{
@@ -81,6 +84,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame,
SystemWindowData* pWindowDat
};
pixFormat = [[NSOpenGLPixelFormat alloc]
initWithAttributes:aAttributes];
}
+#endif
maSysData.mpNSView = [[NSOpenGLView alloc] initWithFrame: aInitFrame
pixelFormat:pixFormat];
}
commit f5375c05a5eec782eaa486f51a468fee680cc02f
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sat Oct 25 11:03:56 2014 -0400
workarounds for `objc_msgSend' on 10.5
(vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)
plus, move conditional includes in salframe.cxx down a bit
Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index ce3e371..dacf9fe 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
#include osx/a11yfactory.h
#include quartz/utils.h
-#if MACOSX_SDK_VERSION 1060
-#include vcl/timer.hxx
-#include osx/saltimer.h
-#endif
-
#include salwtype.hxx
#include premac.h
@@ -54,6 +49,11 @@
#include Carbon/Carbon.h
#include postmac.h
+#if MACOSX_SDK_VERSION 1060
+#include vcl/timer.hxx
+#include osx/saltimer.h
+#endif
+
using namespace std;
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setAcceptsMouseMovedEvents: YES];
[mpNSWindow setHasShadow: YES];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION = 1070
+/* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
[mpNSWindow setDelegate: static_castidNSWindowDelegate (mpNSWindow)];
-#endif
if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
{
objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
}
+#endif
+
const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth,
maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView
userData: nil assumeInside: NO];
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 32ce46b..1c876ea 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
if( ! mbMenuBar )
{
mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */
[mpMenu setDelegate: (idNSMenuDelegate)mpMenu];
#endif
}
commit 6d52e0224c88bfce28d6458a1f6e6b2d943955ea
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sun Oct 26 06:38:10 2014 -0400
vcl: fix some cannot convert 'objc_object*' to... issues
Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 4e19e1d..f821da7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// (getter with parameter)attributeNameHereAttributeForParameter:
// (setter) setAttributeNameHereAttributeForElement:to:
-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = nil;
+SEL selector = (SEL)nil;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
@try {
// step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// step 2: create selector
selector =
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 16 commits - apple_remote/source avmedia/Module_avmedia.mk bridges/Library_cpp_uno.mk bridges/source configure.ac external/curl exter
Rebased ref, commits from common ancestor:
commit d2a84078d030cd9e1d06c429de798d564c5767e2
Author: Douglas Mencken dougmenc...@gmail.com
Date: Thu Oct 30 12:19:27 2014 -0400
OpenGL is not well supported on OSX 10.666
'NSOpenGLPFAOpenGLProfile' was not declared in this scope
'NSOpenGLProfileVersion3_2Core' was not declared in this scope
Change-Id: I90584aa3fbffa8c67f67336f0036324dcac28830
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 58e2c64..d1f4df7 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -52,8 +52,10 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame,
SystemWindowData* pWindowDat
maSysData.mbOpenGL = true;
NSOpenGLPixelFormat* pixFormat = NULL;
+#if MACOSX_SDK_VERSION = 1070
if (pWindowData-bLegacy)
{
+#endif
NSOpenGLPixelFormatAttribute aAttributes[] =
{
NSOpenGLPFADoubleBuffer,
@@ -65,6 +67,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame,
SystemWindowData* pWindowDat
0
};
pixFormat = [[NSOpenGLPixelFormat alloc]
initWithAttributes:aAttributes];
+#if MACOSX_SDK_VERSION = 1070
}
else
{
@@ -81,6 +84,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame,
SystemWindowData* pWindowDat
};
pixFormat = [[NSOpenGLPixelFormat alloc]
initWithAttributes:aAttributes];
}
+#endif
maSysData.mpNSView = [[NSOpenGLView alloc] initWithFrame: aInitFrame
pixelFormat:pixFormat];
}
commit d2fd78ce587106652bd6f20d2874948683fa8b05
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sat Oct 25 11:03:56 2014 -0400
workarounds for `objc_msgSend' on 10.5
(vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)
plus, move conditional includes in salframe.cxx down a bit
Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index ce3e371..dacf9fe 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
#include osx/a11yfactory.h
#include quartz/utils.h
-#if MACOSX_SDK_VERSION 1060
-#include vcl/timer.hxx
-#include osx/saltimer.h
-#endif
-
#include salwtype.hxx
#include premac.h
@@ -54,6 +49,11 @@
#include Carbon/Carbon.h
#include postmac.h
+#if MACOSX_SDK_VERSION 1060
+#include vcl/timer.hxx
+#include osx/saltimer.h
+#endif
+
using namespace std;
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setAcceptsMouseMovedEvents: YES];
[mpNSWindow setHasShadow: YES];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION = 1070
+/* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
[mpNSWindow setDelegate: static_castidNSWindowDelegate (mpNSWindow)];
-#endif
if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
{
objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
}
+#endif
+
const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth,
maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView
userData: nil assumeInside: NO];
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 32ce46b..1c876ea 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
if( ! mbMenuBar )
{
mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */
[mpMenu setDelegate: (idNSMenuDelegate)mpMenu];
#endif
}
commit cc37d0bd9605646baac3b61f3629edb636e08070
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sun Oct 26 06:38:10 2014 -0400
vcl: fix some cannot convert 'objc_object*' to... issues
Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 4e19e1d..f821da7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// (getter with parameter)attributeNameHereAttributeForParameter:
// (setter) setAttributeNameHereAttributeForElement:to:
-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = nil;
+SEL selector = (SEL)nil;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
@try {
// step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// step 2: create selector
selector =
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr4.cxx | 55 ++-
1 file changed, 26 insertions(+), 29 deletions(-)
New commits:
commit bff6b297fcb2ee88f663d20c9f03c6b998602256
Author: Michael Jaumann meta_...@yahoo.com
Date: Thu Oct 30 14:32:05 2014 +
fdo#39468 translate german comments
Change-Id: Ife2b6e9729ae7335a87f077368a984c417ab5e66
Reviewed-on: https://gerrit.libreoffice.org/12154
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index e6bff29..276713b 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -84,7 +84,7 @@ using ::std::unique_ptr;
//-static data -
-// Funktionen fuer den Zugriff auf das Document
+// document access functions
void ScInterpreter::ReplaceCell( ScAddress rPos )
{
@@ -2598,11 +2598,10 @@ void ScInterpreter::ScExternal()
}
else
{
-// nach dem Laden Asyncs wieder anwerfen
+// enable asyncs after loading
if ( rArr.IsRecalcModeNormal() )
rArr.SetExclusiveRecalcModeOnLoad();
-// garantiert identischer Handle bei identischem Aufruf?!?
-// sonst schei*e ...
+// assure identical handler with identical call?
double nErg = 0.0;
ppParam[0] = nErg;
pFuncData-Call(ppParam);
@@ -2617,9 +2616,7 @@ void ScInterpreter::ScExternal()
}
else
{
-// falls per cut/copy/paste
pMyFormulaCell-StartListening( *pAs );
-// in anderes Dokument?
if ( !pAs-HasDocument( pDok ) )
pAs-AddDocument( pDok );
}
@@ -3097,7 +3094,7 @@ void ScInterpreter::ScMacro()
{
#if !HAVE_FEATURE_SCRIPTING
-PushNoValue(); // ohne DocShell kein CallBasic
+PushNoValue(); // without DocShell no CallBasic
return;
#else
SbxBase::ResetError();
@@ -3108,18 +3105,18 @@ void ScInterpreter::ScMacro()
SfxObjectShell* pDocSh = pDok-GetDocumentShell();
if ( !pDocSh || !pDok-CheckMacroWarn() )
{
-PushNoValue(); // ohne DocShell kein CallBasic
+PushNoValue(); // without DocShell no CallBasic
return;
}
-// keine Sicherheitsabfrage mehr vorneweg (nur CheckMacroWarn), das
passiert im CallBasic
+// no security queue beforehand (just CheckMacroWarn), moved to CallBasic
-// Wenn das Dok waehrend eines Basic-Calls geladen wurde,
-// ist das Sbx-Objekt evtl. nicht angelegt (?)
+// If the Dok was loaded during a Basic-Calls,
+// is the Sbx-Objekt created(?)
// pDocSh-GetSbxObject();
-// Funktion ueber den einfachen Namen suchen,
-// dann aBasicStr, aMacroStr fuer SfxObjectShell::CallBasic zusammenbauen
+// search function with the name,
+// then assemble SfxObjectShell::CallBasic from aBasicStr, aMacroStr
StarBASIC* pRoot;
@@ -3330,7 +3327,7 @@ void ScInterpreter::ScMacro()
SCCOL nColIdx;
SCROW nRowIdx;
if ( nDim == 1 )
-{ // array( cols ) eine Zeile, mehrere Spalten
+{ // array( cols ) one line, several columns
pDimArray-GetDim32( 1, nCs, nCe );
nC = static_castSCSIZE(nCe - nCs + 1);
nRs = nRe = 0;
@@ -3355,8 +3352,8 @@ void ScInterpreter::ScMacro()
for ( SCSIZE j=0; j nR; j++ )
{
sal_Int32 nIdx[ 2 ];
-// bei eindimensionalem array( cols ) wird nIdx[1]
-// von SbxDimArray::Get ignoriert
+// in one-dimensional array( cols ) nIdx[1]
+// from SbxDimArray::Get is ignored
nIdx[ nRowIdx ] = nRs + static_castsal_Int32(j);
for ( SCSIZE i=0; i nC; i++ )
{
@@ -3588,7 +3585,7 @@ void ScInterpreter::ScColRowNameAuto()
SCsCOL nStartCol;
SCsROW nStartRow;
-// evtl. Begrenzung durch definierte ColRowNameRanges merken
+// maybe remember limit by using defined ColRowNameRange
SCsCOL nCol2 = aAbs.aEnd.Col();
SCsROW nRow2 = aAbs.aEnd.Row();
// DataArea of the first cell
@@ -3605,26 +3602,26 @@ void ScInterpreter::ScColRowNameAuto()
aAbs.aEnd.SetRow(nDARow2);
}
-//! korrespondiert mit ScCompiler::GetToken
+//! corresponds with ScCompiler::GetToken
if ( aRefData.Ref1.IsColRel() )
{ // ColName
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp target:3.7.0 |SkillCpp target:3.7.0 |target:4.1.0 target:4.2.0 |target:4.1.0 target:4.2.0 |target:4.3.0 target:4.4.0 |target:4.3.0 target:4.4.0 ||target:4.4.0 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #141 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Jaumann committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=bff6b297fcb2ee88f663d20c9f03c6b998602256 fdo#39468 translate german comments It will be available in 4.4.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
minutes of ESC call ...
* Present + David, Bjoern, Michael M, Andras, Norbert, Kendy, Markus, Miklos, Robinson, Stephan, Jan-Marek , Lionel, Cloph, Caolan, Jacobo, Eike, Michael S, Muthu * Completed Action Items: + setup call to co-ordinate new load/save/validate hardware (Markus) + stick with the GetSolarVersion plan put it into the release notes (Marcos) + revert boost::rational changes for now (Kendy) + poke Taras wrt. UI / telemetry code re-use here (Michael) * Pending Action Items: + get a clear use-case description of what doesn't work vs. master wrt. Calc sorting (JBF) [ Work in progress. At the moment I have at least 3 different use-cases: # bank account: the sorted range contains a column where each cell contains the same formula (fdo#81633 and fdo#85215) # sorting students by their scores: the cells in the sorted column contains formula with functions like AVERAGE() or SUM() (fdo#79441) # computing an indicator from data: the cell containing the formula with references is outside the range of cells that is sorted (fdo#45146) # I am pretty sure I will find other use-cases ] AI:[ poke JBF - what is the status here ? and what to do next ? ] + look at regressions associated with a SUSE bugzilla bugfix (Timar) * Release Engineering update (Cloph) + 4.2.7 4.3.3 released as final today AI: + mention calc sorting issue in the 4.2.7 release notes. + unclear what went wrong wrt. bug reporting / fixing / on that issue and/or how to fix it. + Questionable new feature breaks existing workflow / new behavior set as default / new feature backported to stable + 4.4 Alpha 1 status + horrible problem with calc - not refreshing the background + zoom issues etc. a display problem. + fixed via a revert. + problem building all languages on Windows + prolly the PATH limit too: for now building in c:\lo\ + working on a fix to make it less reliant on v. short paths + how did the VS 2013 build go + no problems related to this identified yet; + do we get issues with earlier CPUs with no SSE2 ? + good that we discovered these breakages early (Bjoern) AI: + poke at fdo#84854 (Michael) + no harm in reverting for now, can always replace. + 4.4 Alpha 2 + planning to do a new tag later this week for testing. + 4.4.0 Beta 1 / Feature Freeze + due November 17th. + 4.3.4 RC1 - Nov 24th + Android Remote * Crashtest futures / automated test scripts (Markus) + call on Tuesday; new testing hardware. + result - get a Manitu server leave room in the budget for ondemand Amazon instances (with spot pricing) if there is special need at some point. + will migrate when we have the perf. crash. testing fuzzing, and should bring down all the times. + perf testing: in 2-3 hours (same day) + crash testing: to ~1 day. + talked with Matus: a way to notify developers similar to tinderbox. + could have bibsect repositories there too (Norbert) + and at least 1 VM to try crazy new testing ideas. + budget specifically for load/save/validate testing (Michael) + any concerns / Bjoern ? + lets not let that creep in wildly; test new things, but not burn lots of CPU. + what was missing - a real comparison of prices ? (Bjoern) + comparison happened on the mailing list by now. + decision to buy the base-load and dynamically rent the discretionary work. + when does it arrive ? (Michael) + Florian pinging Manitu wrt. conditions etc. + will take 2-4 weeks to get it setup. + right after Beta 1-2 will that be a good time ? (Bjoern) + mostly just migrating the VM(s) across (Cloph) + ~trivial to migrate the workload (Markus) * Crashtest update (Markus) + http://dev-builds.libreoffice.org/crashtest/013ec10d4e89e86cbd53a88058defb7e97ebaa49/ (25-Oct-2014) + still a big spike in DOCX export crashers + if no-one beats him: will look into it next week (Miklos) + otherwise similar to last week + most of the PDF import crashers fixed since last week + RTF import export are now set to zero (Miklos) * Seattle Hackfest (Robinson/Norbert) + around 32 people showed up + lots of Linux Mac users showed up, few Windows users + lots of interest in getting involved. + several people eager to come but couldn't make it - eager to come next time. + lots of build work (Norbert) + lots of setup / long heavy etc. + got 5-6 new people with builds + how did pre-built VM's fare (Michael) + a couple of guys used that (Norbert) + 1x person on IRC, asked for help with x2go connection (Cloph) + saw 1x building 1x using only. + better documentation -
[Libreoffice-commits] core.git: sd/source
sd/source/ui/docshell/docshel4.cxx | 57 -
sd/source/ui/inc/DrawDocShell.hxx |3 +
2 files changed, 23 insertions(+), 37 deletions(-)
New commits:
commit 10db2f72465e002c882afd97edd76bd0cfc8322e
Author: Boris Egorov ego...@linux.com
Date: Fri Oct 17 23:45:59 2014 +0700
Related: fdo#84846 move code setting edit mode to a new method
First change in series to fix fdo#84846.
Change-Id: I52dc333c2caa30ee3c75d9cc80862cf24a204f93
Reviewed-on: https://gerrit.libreoffice.org/12148
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index 628b66f..57be822 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -790,19 +790,7 @@ bool DrawDocShell::GotoBookmark(const OUString rBookmark)
if (pDrawViewShell != NULL)
{
-// Set the edit mode to either the normal edit mode or the
-// master page mode.
-EditMode eNewEditMode = EM_PAGE;
-if (bIsMasterPage)
-{
-eNewEditMode = EM_MASTERPAGE;
-}
-
-if (eNewEditMode != pDrawViewShell-GetEditMode())
-{
-// EditMode setzen
-pDrawViewShell-ChangeEditMode(eNewEditMode, false);
-}
+setEditMode(pDrawViewShell, bIsMasterPage);
// Make the bookmarked page the current page. This is done
// by using the API because this takes care of all the
@@ -916,18 +904,7 @@ bool DrawDocShell::GetObjectIsmarked(const OUString
rBookmark)
pDrViewSh = (DrawViewShell*) mpViewShell;
}
-EditMode eNewEditMode = EM_PAGE;
-
-if( bIsMasterPage )
-{
-eNewEditMode = EM_MASTERPAGE;
-}
-
-if (eNewEditMode != pDrViewSh-GetEditMode())
-{
-// set EditMode
-pDrViewSh-ChangeEditMode(eNewEditMode, false);
-}
+setEditMode(pDrViewSh, bIsMasterPage);
// Jump to the page. This is done by using the API because this
// takes care of all the little things to be done. Especially
@@ -1020,18 +997,7 @@ bool DrawDocShell::GotoTreeBookmark(const OUString
rBookmark)
pDrViewSh = (DrawViewShell*) mpViewShell;
}
-EditMode eNewEditMode = EM_PAGE;
-
-if( bIsMasterPage )
-{
-eNewEditMode = EM_MASTERPAGE;
-}
-
-if (eNewEditMode != pDrViewSh-GetEditMode())
-{
-// set EditMode
-pDrViewSh-ChangeEditMode(eNewEditMode, false);
-}
+setEditMode(pDrViewSh, bIsMasterPage);
// Jump to the page. This is done by using the API because this
// takes care of all the little things to be done. Especially
@@ -1237,6 +1203,23 @@ bool DrawDocShell::getDocReadOnly() const
return false;
}
+
+void DrawDocShell::setEditMode(DrawViewShell* pDrawViewShell, bool
isMasterPage)
+{
+// Set the edit mode to either the normal edit mode or the
+// master page mode.
+EditMode eNewEditMode = EM_PAGE;
+if (isMasterPage)
+{
+eNewEditMode = EM_MASTERPAGE;
+}
+
+if (eNewEditMode != pDrawViewShell-GetEditMode())
+{
+// Set EditMode
+pDrawViewShell-ChangeEditMode(eNewEditMode, false);
+}
+}
} // end of namespace sd
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/DrawDocShell.hxx
b/sd/source/ui/inc/DrawDocShell.hxx
index 5cfbda9..47f6d16 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -43,6 +43,7 @@ namespace sd {
class FrameView;
class ViewShell;
+class DrawViewShell;
// DrawDocShell
class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell
@@ -230,6 +231,8 @@ public:
virtual const OUString getDocAccTitle() const;
virtual void setDocReadOnly( bool bReadOnly);
virtual bool getDocReadOnly() const;
+private:
+void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage);
};
#ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - officecfg/registry sc/inc sc/qa sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 10 +
sc/inc/document.hxx |5
sc/inc/inputopt.hxx |3
sc/inc/sc.hrc|1
sc/inc/sortparam.hxx |1
sc/inc/table.hxx |8 -
sc/qa/unit/ucalc.cxx | 10 -
sc/source/core/data/documen3.cxx |5
sc/source/core/data/table3.cxx | 115 ---
sc/source/core/tool/inputopt.cxx | 34 ++--
sc/source/ui/app/scmod.cxx |9 +
sc/source/ui/docshell/dbdocfun.cxx |5
sc/source/ui/undo/undosort.cxx |2
13 files changed, 135 insertions(+), 73 deletions(-)
New commits:
commit 67f3ce3a9df2bc62db5602dd84975047c1137b92
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Oct 9 16:21:59 2014 +0100
fdo#81633: Add a hidden configuration option to toggle ref update on sort.
This option is defaulted to off for 4.3 for back-compatibility.
Reviewed-on: https://gerrit.libreoffice.org/11902
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
sc/inc/inputopt.hxx
sc/qa/unit/ucalc.cxx
sc/source/core/tool/inputopt.cxx
Change-Id: I5ac686e96742df40f7d8ba5ffec23806db2988a6
(cherry picked from commit c357fb2dbdc54d9ee8471ce4e9f9381e74a6deed)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 0cdb9d5..54e15fc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -678,6 +678,16 @@
/info
valuefalse/value
/prop
+ prop oor:name=UpdateReferenceOnSort oor:type=xs:boolean
oor:nillable=false
+!-- OldPath: Calc/Input --
+!-- OldLocation: Soffice.cfg --
+!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input
--
+info
+ descSpecifies whether references get updated when performing sort
on a range of cells./desc
+ labelUpdate references when sorting range of cells/label
+/info
+valuefalse/value
+ /prop
prop oor:name=HighlightSelection oor:type=xs:boolean
oor:nillable=false
!-- OldPath: Calc/Input --
!-- OldLocation: Soffice.cfg --
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 9d365cc..44107b4 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1664,7 +1664,10 @@ public:
SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const;
-void Sort( SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery,
ScProgress* pProgress, sc::ReorderParam* pUndo );
+void Sort(
+SCTAB nTab, const ScSortParam rSortParam, bool bKeepQuery, bool
bUpdateRefs,
+ScProgress* pProgress, sc::ReorderParam* pUndo );
+
void Reorder( const sc::ReorderParam rParam, ScProgress* pProgress );
SCSIZE Query( SCTAB nTab, const ScQueryParam rQueryParam, bool
bKeepSub );
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 3a46bf6..3c33154 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -32,6 +32,7 @@ private:
sal_BoolbExtendFormat;
sal_BoolbRangeFinder;
sal_BoolbExpandRefs;
+sal_BoolmbSortRefUpdate;
sal_BoolbMarkHeader;
sal_BoolbUseTabCol;
sal_BoolbTextWysiwyg;
@@ -57,6 +58,8 @@ public:
sal_BoolGetRangeFinder() const { return bRangeFinder; }
voidSetExpandRefs(sal_Bool bSet){ bExpandRefs = bSet;}
sal_BoolGetExpandRefs() const { return bExpandRefs;}
+voidSetSortRefUpdate(sal_Bool bSet) { mbSortRefUpdate = bSet; }
+sal_BoolGetSortRefUpdate() const{ return mbSortRefUpdate; }
voidSetMarkHeader(sal_Bool bSet){ bMarkHeader = bSet;}
sal_BoolGetMarkHeader() const { return bMarkHeader;}
voidSetUseTabCol(sal_Bool bSet) { bUseTabCol = bSet; }
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 8e517ae..63ff3ba 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -86,6 +86,7 @@
// TabPage entry - Legacy selection
#define SID_SC_INPUT_LEGACY_CELL_SELECTION (SC_VIEW_START + 15)
+#define SID_SC_OPT_SORT_REF_UPDATE (SC_VIEW_START + 16)
// Format options
#define SID_SCFORMULAOPTIONS
Re: minutes of ESC call ...
Hi, Le 30/10/2014 17:39, Michael Meeks a écrit : [...] * Pending Action Items: + get a clear use-case description of what doesn't work vs. master wrt. Calc sorting (JBF) [ Work in progress. At the moment I have at least 3 different use-cases: # bank account: the sorted range contains a column where each cell contains the same formula (fdo#81633 and fdo#85215) # sorting students by their scores: the cells in the sorted column contains formula with functions like AVERAGE() or SUM() (fdo#79441) # computing an indicator from data: the cell containing the formula with references is outside the range of cells that is sorted (fdo#45146) # I am pretty sure I will find other use-cases ] AI:[ poke JBF - what is the status here ? and what to do next ? ] Damned, I updated the pad yesterday evening, now my changes are lost :-( The timeline seems not be able to show versions before today. Is there a solution or must I redo what I wrote ? 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] core.git: sc/source
sc/source/filter/lotus/lotread.cxx | 26 +++
sc/source/filter/starcalc/scflt.cxx | 59 +--
sc/source/filter/starcalc/scfobj.cxx | 10 ++---
sc/source/filter/xml/xmlcelli.cxx|9 ++---
4 files changed, 51 insertions(+), 53 deletions(-)
New commits:
commit d665d253eea7b6f311167079893cbfaac566ca8b
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sun Oct 19 07:54:05 2014 -0400
fdo#39468 Translate German Comments - sc/source/filter/{lotus,starcalc,xml}
V2 with changes suggested by Samuel and Eike
Change-Id: I3bc7e5c5173fe06d29f32bab1973828fdfb33d53
Reviewed-on: https://gerrit.libreoffice.org/12036
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/filter/lotus/lotread.cxx
b/sc/source/filter/lotus/lotread.cxx
index c739ab2..a75dc99 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -54,7 +54,7 @@ FltError ImportLotus::Read()
pIn-Seek( nNextRec );
-// Progressbar starten
+// start progressbar
ScfStreamProgressBar aPrgrsBar( *pIn, pD-GetDocumentShell() );
LotusContext rContext = aConv.getContext();
while( eAkt != S_END )
@@ -93,17 +93,17 @@ FltError ImportLotus::Read()
}
else
{
-eAkt = S_END; // hier kommt wat fuer = WK1 hinne!
+eAkt = S_END; // TODO: add here
something for = WK1!
eRet = 0x;
}
}
break;
-case S_WK1: // S_WK1
+case S_WK1: // S_WK1
break;
-case S_WK3: // S_WK3
-case S_WK4: // S_WK4
+case S_WK3: // S_WK3
+case S_WK4: // S_WK4
switch( nOp )
{
case 0x0001:// EOF
@@ -180,21 +180,21 @@ FltError ImportLotus::Read()
break;
-case S_FM3: // S_FM3
+case S_FM3: // S_FM3
break;
-case S_END: // S_END
+case S_END: // S_END
break;
}
OSL_ENSURE( nNextRec = pIn-Tell(),
-*ImportLotus::Read(): Etwas zu gierig... );
+*ImportLotus::Read(): Read too much... );
pIn-Seek( nNextRec );
aPrgrsBar.Progress();
}
-// duemmliche Namen eliminieren
+// TODO: eliminate stupid names
SCTAB nTabs = pD-GetTableCount();
SCTAB nCnt;
OUString aTabName;
@@ -210,7 +210,7 @@ FltError ImportLotus::Read()
for( nCnt = 1 ; nCnt nTabs ; nCnt++ )
{
OSL_ENSURE( pD-HasTable( nCnt ),
--ImportLotus::Read(): Wo ist meine Tabelle?! );
+-ImportLotus::Read(): Where is my table?! );
pD-GetName( nCnt, aTabName );
if( aTabName.equals(aRef) )
{
@@ -241,7 +241,7 @@ FltError ImportLotus::Read(SvStream rIn)
pIn-Seek( nNextRec );
-// Progressbar starten
+// start progressbar
ScfStreamProgressBar aPrgrsBar( *pIn, pD-GetDocumentShell() );
LotusContext rContext = aConv.getContext();
while( bRead )
@@ -267,7 +267,7 @@ FltError ImportLotus::Read(SvStream rIn)
case 0x0001:// EOF
bRead = false;
OSL_ENSURE( nTab == 0,
--ImportLotus::Read( SvStream ): Zweimal EOF nicht
erlaubt );
+-ImportLotus::Read( SvStream ): EOF twice! );
nTab++;
break;
@@ -294,7 +294,7 @@ FltError ImportLotus::Read(SvStream rIn)
}
OSL_ENSURE( nNextRec = pIn-Tell(),
-*ImportLotus::Read(): Etwas zu gierig... );
+*ImportLotus::Read(): Read too much... );
pIn-Seek( nNextRec );
aPrgrsBar.Progress();
}
diff --git a/sc/source/filter/starcalc/scflt.cxx
b/sc/source/filter/starcalc/scflt.cxx
index bdade94..f133163 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -424,7 +424,7 @@ Sc10FontCollection::Sc10FontCollection(SvStream rStream)
}
}
-// Benannte-Bereiche
+// named regions
Sc10NameData::Sc10NameData(SvStream rStream)
{
@@ -465,7 +465,7 @@ Sc10NameCollection::Sc10NameCollection(SvStream rStream) :
}
}
-// Vorlagen
+// templates
Sc10PatternData::Sc10PatternData(SvStream rStream)
:
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468
--- Comment #142 from Commit Notification
libreoffice-comm...@lists.freedesktop.org ---
Christian M. Heller committed a patch related to this issue.
It has been pushed to master:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=d665d253eea7b6f311167079893cbfaac566ca8b
fdo#39468 Translate German Comments - sc/source/filter/{lotus,starcalc,xml}
It will be available in 4.4.0.
The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.
--
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - toolkit/source
toolkit/source/awt/vclxwindow1.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 9bc943ae7adaf6e8798fe0608b79fb8e58953266 Author: Douglas Mencken dougmenc...@gmail.com Date: Thu Oct 30 12:55:14 2014 -0400 toolkit: include objc/objc-api.h when OBJC_EXPORT is not defined Change-Id: I5b1abae5bace4f831baa2e69d46e75c7cb638095 diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 46b2e72..f2cc331 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -28,6 +28,9 @@ #include postwin.h #elif defined ( MACOSX ) #include premac.h +#ifndef OBJC_EXPORT +#include objc/objc-api.h +#endif #include Cocoa/Cocoa.h #include postmac.h #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/test configure.ac connectivity/source cui/source dbaccess/source desktop/win32 drawinglayer/source extensions/workben filter/source framework/inc include/basebm
bridges/test/java_uno/nativethreadpool/readme |2 +- configure.ac |6 +++--- connectivity/source/drivers/odbc/ORealDriver.cxx |2 +- cui/source/options/fontsubs.cxx |2 +- dbaccess/source/ui/app/AppControllerDnD.cxx |2 +- dbaccess/source/ui/dlg/tablespage.cxx |4 ++-- dbaccess/source/ui/misc/UITools.cxx |2 +- dbaccess/source/ui/querydesign/QueryTableView.cxx |2 +- desktop/win32/source/guistdio/guistdio.inc|2 +- drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx |2 +- extensions/workben/testcomponent.cxx |2 +- filter/source/graphicfilter/ios2met/ios2met.cxx |2 +- filter/source/msfilter/msdffimp.cxx |2 +- framework/inc/classes/filtercachedata.hxx |2 +- include/basebmp/bitmapdevice.hxx |2 +- include/comphelper/propagg.hxx|2 +- include/comphelper/serviceinfohelper.hxx |2 +- include/tools/resid.hxx |4 ++-- include/ucbhelper/resultset.hxx |2 +- include/xmloff/xmlimp.hxx |2 +- jurt/com/sun/star/comp/loader/JavaLoader.java |2 +- jurt/com/sun/star/comp/servicemanager/ServiceManager.java |4 ++-- jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java |2 +- jurt/com/sun/star/lib/util/UrlToFileMapper.java |2 +- jvmfwk/plugins/sunmajor/pluginlib/util.cxx|2 +- odk/examples/java/ToDo/ToDo.java |2 +- offapi/com/sun/star/frame/XPopupMenuController.idl|2 +- offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl |2 +- offapi/com/sun/star/table/AccessibleTableView.idl |2 +- sal/osl/w32/profile.cxx |2 +- sax/source/expatwrap/sax_expat.cxx|2 +- sax/test/saxdemo.cxx |2 +- sax/test/testcomponent.cxx|2 +- sc/inc/compiler.hxx |2 +- sc/inc/formulacell.hxx|2 +- sc/source/core/tool/interpr1.cxx |2 +- sc/source/ui/vba/vbarange.cxx |2 +- sd/source/filter/eppt/epptso.cxx |2 +- sd/source/ui/framework/configuration/ConfigurationClassifier.hxx |2 +- sfx2/source/control/objface.cxx |2 +- slideshow/source/engine/slide/userpaintoverlay.cxx|2 +- smoketest/data/Basic/Standard/Test_Ext.xml|2 +- solenv/doc/gbuild/doxygen.cfg |2 +- solenv/gcc-wrappers/wrapper.cxx |2 +- solenv/inc/doxygen.cfg|2 +- svx/source/sdr/contact/viewobjectcontact.cxx |4 ++-- sw/inc/redline.hxx|6 +++--- sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |4 ++-- sw/source/core/access/acccontext.cxx |4 ++-- sw/source/core/inc/ptqueue.hxx|2 +- sw/source/core/inc/rootfrm.hxx|2 +- sw/source/core/layout/softpagebreak.cxx |2 +- sw/source/core/tox/txmsrt.cxx |2 +- sw/source/filter/ascii/parasc.cxx |2 +- sw/source/filter/ww8/ww8par5.cxx |2 +- sw/source/filter/ww8/ww8par6.cxx |4 ++-- sw/source/uibase/uiview/viewdlg2.cxx |2 +- udkapi/com/sun/star/io/XPersistObject.idl |2 +- unotools/source/i18n/localedatawrapper.cxx|2 +- vcl/osx/DragSource.cxx|2 +- vcl/source/app/dbggui.cxx |2 +- vcl/unx/kde/kdedata.cxx
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - svx/source
svx/source/unodraw/unoshap2.cxx | 10 --
1 file changed, 10 deletions(-)
New commits:
commit 3339f12d2a155ef59d5d6221f740be3f13ace942
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Oct 30 11:55:52 2014 +0100
SvxGraphicObject: remove more manual swap out calls
Tested with importing large *.rtf and *.docx test documents
with lots of images - auto swapp out works.
Change-Id: Ib040edaa89c9bcb966c58b75f0392e6d9f7a165e
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index a3b791e..818e8ab 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1540,7 +1540,6 @@ bool SvxGraphicObject::setPropertyValueImpl( const
OUString rName, const SfxIte
if( mpObj.is() )
{
static_castSdrGrafObj*(mpObj.get())-SetGrafStreamURL(
aStreamURL );
-static_castSdrGrafObj*(mpObj.get())-ForceSwapOut();
}
bOk = true;
}
@@ -1578,7 +1577,6 @@ bool SvxGraphicObject::getPropertyValueImpl( const
OUString rName, const SfxIte
{
case OWN_ATTR_VALUE_FILLBITMAP:
{
-bool bSwapped = static_cast SdrGrafObj* ( mpObj.get()
)-IsSwappedOut();
const Graphic rGraphic = static_cast SdrGrafObj*( mpObj.get()
)-GetGraphic();
if(rGraphic.GetType() != GRAPHIC_GDIMETAFILE)
@@ -1597,8 +1595,6 @@ bool SvxGraphicObject::getPropertyValueImpl( const
OUString rName, const SfxIte
aDestStrm.GetEndOfData());
rValue = aSeq;
}
-if ( bSwapped )
-static_cast SdrGrafObj* ( mpObj.get() )-ForceSwapOut();
break;
}
@@ -1610,13 +1606,10 @@ bool SvxGraphicObject::getPropertyValueImpl( const
OUString rName, const SfxIte
}
else
{
-bool bSwapped = static_cast SdrGrafObj* ( mpObj.get()
)-IsSwappedOut();
const GraphicObject rGrafObj = static_cast SdrGrafObj*(
mpObj.get() )-GetGraphicObject(true);
OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX);
aURL += OStringToOUString(rGrafObj.GetUniqueID(),
RTL_TEXTENCODING_ASCII_US);
rValue = aURL;
-if ( bSwapped )
-static_cast SdrGrafObj* ( mpObj.get() )-ForceSwapOut();
}
break;
}
@@ -1645,11 +1638,8 @@ bool SvxGraphicObject::getPropertyValueImpl( const
OUString rName, const SfxIte
case OWN_ATTR_VALUE_GRAPHIC:
{
-bool bSwapped = static_cast SdrGrafObj* ( mpObj.get()
)-IsSwappedOut();
Reference graphic::XGraphic xGraphic( static_cast SdrGrafObj* (
mpObj.get() )-GetGraphic().GetXGraphic() );
rValue = xGraphic;
-if ( bSwapped )
-static_cast SdrGrafObj* ( mpObj.get() )-ForceSwapOut();
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source svl/source
sc/source/core/data/table6.cxx |3 +++
svl/source/numbers/zforlist.cxx |4 +---
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 5ecd416c011557ce663edd52a5bc95e991fb3b84
Author: Eike Rathke er...@redhat.com
Date: Thu Oct 30 17:51:28 2014 +0100
CID#736090 Improper use of negative value
Change-Id: Ice6d473d56b16ca53a046888f38d0c570d4b3828
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 8102c78..d9140ed 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -52,6 +52,9 @@ bool lcl_GetTextWithBreaks( const EditTextObject rData,
ScDocument* pDoc, OUStr
bool ScTable::SearchCell(const SvxSearchItem rSearchItem, SCCOL nCol, SCROW
nRow,
const ScMarkData rMark, OUString rUndoStr,
ScDocument* pUndoDoc)
{
+if (!ValidColRow( nCol, nRow))
+return false;
+
boolbFound = false;
boolbDoSearch = true;
boolbDoBack = rSearchItem.GetBackward();
commit 34c725d3fdf95841df43910715f61db980783bca
Author: Eike Rathke er...@redhat.com
Date: Fri Oct 24 23:42:08 2014 +0200
eliminate now unnecessary temporary OUString
Change-Id: I8461cb3f9a3c1cd662b1bcbfc53ee56a498a7b35
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index d28d5f6..fba025a 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1801,13 +1801,11 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat(
const ::com::sun::star::i18n
}
}
sal_Int32 nCheckPos = 0;
-OUString sTempIn(aCodeStr);
-SvNumberformat* pFormat = new SvNumberformat(sTempIn,
+SvNumberformat* pFormat = new SvNumberformat(aCodeStr,
pFormatScanner,
pStringScanner,
nCheckPos,
ActLnge);
-aCodeStr = sTempIn;
if ( !pFormat || !(nCheckPos == 0) )
{
if (LocaleDataWrapper::areChecksEnabled())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/qa vcl/quartz
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +
vcl/quartz/CTRunData.cxx |6 +++
vcl/quartz/ctlayout.cxx | 52 ++-
3 files changed, 26 insertions(+), 34 deletions(-)
New commits:
commit f5296655650e75fee259acf1959c15eb2cea3a1e
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Oct 30 13:10:46 2014 -0500
disable specific oox_export unit for macosx
the magic number in this test does not seems to agree with Mac Retina
Display (Assumed because the non Retina tinderbox do not complain)
Change-Id: I247215b59995e4ffc01720da4988e7eaa8ac78ca
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 3d76287..1ca3bce 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -445,7 +445,9 @@ DECLARE_OOXMLEXPORT_TEST(testCropPixel, crop-pixel.docx)
{
// This is 17667 in the original document, was 504666 (so the image
// become invisible), now is around 19072.
+#ifndef MACOSX
CPPUNIT_ASSERT(getXPath(pXmlDoc, //a:srcRect, l).toInt32()
2);
+#endif
}
}
commit 1ea6dd2111a0ecf7aface1af0ffb0c17bd6d79fe
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Oct 30 13:08:46 2014 -0500
address LTR issue with coretext rendering
There was a snaffu with the handling of DXArray
concerning the special case of the 'first' character
and how that translate when the glyph order is not
the same than the character order
Change-Id: Ie9273ff22fa2d22ca0df2b583768ffb2b2a59930
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index a0bcd24..3a42ebc 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -141,7 +141,7 @@ bool CTLayout::LayoutText( ImplLayoutArgs rArgs )
// CFAttributedStringCreate copies the attribues parameter
mpAttrString = CFAttributedStringCreate( NULL, aCFText,
mpTextStyle-GetStyleDict() );
mpCTLine = CTLineCreateWithAttributedString( mpAttrString );
-SAL_INFO( vcl.ct, CTLineCreateWithAttributedString(\
GetOUString(aCFText) \) = mpCTLine );
+SAL_INFO( vcl.ct, CTLineCreateWithAttributedString(\
GetOUString(aCFText) \) =p mpCTLine );
CFRelease( aCFText);
mnTrailingSpaceCount = 0;
@@ -176,48 +176,32 @@ void CTLayout::ApplyDXArray(ImplLayoutArgs rArgs)
delete[] iter-m_pAdjPositions;
iter-m_pAdjPositions = new CGPoint[iter-m_nGlyphs];
+SAL_INFO( vcl.ct, Apply DXArray Run status:
(void*)(uintptr_t)status);
+
if(!(status kCTRunStatusNonMonotonic))
{
-if(mnLayoutFlags SAL_LAYOUT_VERTICAL)
+/* simple 1 to 1 */
+SAL_INFO( vcl.ct, nb glyph in vrun: iter-m_nGlyphs);
+for(int i = 0 ; i iter-m_nGlyphs; i++)
{
-/* simple 1 to 1 */
-for(int i = 0 ; i iter-m_nGlyphs; i++)
+SAL_INFO( vcl.ct, StringIndices[ i ] =
iter-m_pStringIndices[i]);
+int j = iter-m_pStringIndices[i];
+if(j == 0)
{
-if(iter-m_pStringIndices[i] == 0)
-{
-iter-m_pAdjPositions[i].x = 0;
-SAL_INFO( vcl.ct, Apply DXArray[ i ]: 0.0
pos: iter-m_pPositions[i].x);
-}
-else
-{
-iter-m_pAdjPositions[i].x =
rArgs.mpDXArray[iter-m_pStringIndices[i-1]];
-SAL_INFO( vcl.ct, Apply to i DXArray[
iter-m_pStringIndices[i-1] ]:
- rArgs.mpDXArray[iter-m_pStringIndices[i-1]]
pos:( iter-m_pPositions[i].x , iter-m_pPositions[i].y);
-}
-iter-m_pAdjPositions[i].y = iter-m_pPositions[i].y;
+iter-m_pAdjPositions[i].x = 0;
+SAL_INFO( vcl.ct, m_pAdjPostion[ i ] = 0.0);
}
-}
-else
-{
-/* simple 1 to 1 */
-for(int i = 0 ; i iter-m_nGlyphs; i++)
+else
{
-if(iter-m_pStringIndices[i] == 0)
-{
-iter-m_pAdjPositions[i].x = 0;
-SAL_INFO( vcl.ct, Apply DXArray[ i ]: 0.0
pos: iter-m_pPositions[i].x);
-}
-else
-{
-iter-m_pAdjPositions[i].x =
rArgs.mpDXArray[iter-m_pStringIndices[i-1]];
-SAL_INFO( vcl.ct, Apply to i DXArray[
iter-m_pStringIndices[i-1] ]:
rArgs.mpDXArray[iter-m_pStringIndices[i-1]] pos:
iter-m_pPositions[i].x);
-}
-iter-m_pAdjPositions[i].y = iter-m_pPositions[i].y;
+iter-m_pAdjPositions[i].x = rArgs.mpDXArray[j - 1];
+
Re: minutes of ESC call ...
Hi *, Am 30.10.2014 17:54 schrieb Jean-Baptiste Faure jbfa...@libreoffice.org: The timeline seems not be able to show versions before today. Is there a solution or must I redo what I wrote ? Use the controls for the previous version before attempting to use the slider, that way using the timeline should work. Ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: 3 commits - ciabot/libreoffice-bugzilla2.py -q
-q | 204
ciabot/libreoffice-bugzilla2.py |9 -
2 files changed, 208 insertions(+), 5 deletions(-)
New commits:
commit 9429f595724ab30959ec5995eb72c97162822142
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Oct 30 19:52:28 2014 +0100
remove print statement that breaks with unicode chars
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 39c93db..31f9426 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -55,8 +55,8 @@ class FreedesktopBZ:
print(bug)
old_whiteboard = bug.getwhiteboard()
-m = re.search(new_version, old_whiteboard)
-if m is not None and len(m.groups()) 0:
+m = re.findall(new_version, old_whiteboard)
+if m is None or len(m) == 0:
new_whiteboard = old_whiteboard + target: + new_version
bug.setwhiteboard(new_whiteboard)
@@ -80,7 +80,6 @@ http://dev-builds.libreoffice.org/daily/ in the next 24-48
hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.
%(commit.author, branch, cgiturl, commit.summary, new_version)
-print(comment_msg)
bug.addcomment(comment_msg)
commit ade270cd79a7fd4d86cc28158d1a897fce3003d9
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Oct 30 19:51:33 2014 +0100
update only if no target:x.y.z matching is already there
diff --git a/-q b/-q
new file mode 100644
index 000..42cf0d1
--- /dev/null
+++ b/-q
@@ -0,0 +1,204 @@
+# libreoffice git bugzilla integration
+# Copyright (C) 2014 Markus Mohrhard
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+from __future__ import print_function
+
+import datetime
+import os
+import re
+import sys, getopt
+import git
+import ConfigParser
+
+if hasattr(sys.version_info, major) and sys.version_info.major = 3:
+# pylint: disable=F0401,E0611
+from urllib.parse import urlparse
+else:
+from urlparse import urlparse
+
+import bugzilla
+from bugzilla import Bugzilla
+from bugzilla.base import _BugzillaToken
+
+master_target = 4.4.0
+bug_regex = fdo#(\d+)
+
+class FreedesktopBZ:
+bzclass = bugzilla.Bugzilla44
+
+bz = None
+
+def connect(self):
+config = ConfigParser.ConfigParser()
+config.read('config.cfg')
+url = config.get('bugzilla', 'url')
+user = config.get('bugzilla', 'user')
+password = config.get('bugzilla', 'password')
+self.bz = self.bzclass(url=url, cookiefile = /tmp/cookie, tokenfile
= /tmp/token)
+self.bz.login(user=user, password=password)
+
+def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
+bug = self.bz.getbug(bugnr)
+print(bug)
+old_whiteboard = bug.getwhiteboard()
+
+m = re.findall(new_version, old_whiteboard)
+if m is None or len(m) == 0:
+new_whiteboard = old_whiteboard + target: + new_version
+bug.setwhiteboard(new_whiteboard)
+
+cgiturl = http://cgit.freedesktop.org/libreoffice/%s/commit/?id=%s;
%(repo_name, commit.hexsha)
+if branch is not None and branch != master:
+cgiturl = cgiturl + h= + branch
+else:
+branch = master
+
+comment_msg = %s committed a patch related to this issue.
+It has been pushed to %s:
+
+%s
+
+%s
+
+It will be available in %s.
+
+The patch should be included in the daily builds available at
+http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
+information about daily builds can be found at:
+http://wiki.documentfoundation.org/Testing_Daily_Builds
+Affected users are encouraged to test the fix and report feedback.
%(commit.author, branch, cgiturl, commit.summary, new_version)
+print(comment_msg)
+bug.addcomment(comment_msg)
+
+
+
+
+def find_target_version(repo, branch):
+if branch is None or branch == master:
+return master_target
+
+# check if committed to a release branch
+# form libreoffice-x-y-z = will be available in x.y.z
+match = re.search(libreoffice-(\d+)-(\d+)-(\d+), branch)
+if match is not None:
+return ..join(map(str, match.groups()))
+
+# form libreoffice-x-y
+#
Re: minutes of ESC call ...
Hi, Le 30/10/2014 19:43, Christian Lohmaier a écrit : Hi *, Am 30.10.2014 17:54 schrieb Jean-Baptiste Faure jbfa...@libreoffice.org mailto:jbfa...@libreoffice.org: The timeline seems not be able to show versions before today. Is there a solution or must I redo what I wrote ? Use the controls for the previous version before attempting to use the slider, that way using the timeline should work. Ah, yes, thank you, I found what I wrote yesterday http://pad.documentfoundation.org/p/esc/timeslider#97066 : [Use-cases summarized in metabug https://bugs.freedesktop.org/show_bug.cgi?id=85490 see attachment https://bugs.freedesktop.org/attachment.cgi?id=108546 My suggestions : + fix bug fdo#85215 : done + change the default value of option UpdateReferenceOnSort from true to false for backward compatibility + I think that the best would be to have this option locale to the sorting dialog instead of global for Calc Is it something possible? That said we have a problem with version 4.2.7 in which it is not possible to configure how sorting should work] Main bug reports related to this problem: fdo#85490 (metabug) fdo#85614 fdo#81309 fdo#81633, fdo#85215 and their duplicates 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
Re: minutes of ESC call ...
On Thu, 2014-10-30 at 20:00 +0100, Jean-Baptiste Faure wrote: + I think that the best would be to have this option locale to the sorting dialog instead of global for Calc Is it something possible? Not unless someone volunteers. FYI it would require a fair amount of code change and a change in ODF file format. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Le 30/10/2014 20:05, Kohei Yoshida a écrit : On Thu, 2014-10-30 at 20:00 +0100, Jean-Baptiste Faure wrote: + I think that the best would be to have this option locale to the sorting dialog instead of global for Calc Is it something possible? Not unless someone volunteers. FYI it would require a fair amount of code change and a change in ODF file format. Is it not possible to have a checkbox in the sorting dialog without saving its state to the file or not in the file but in the registry ? 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
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 80939, which changed state. Bug 80939 Summary: Mac OS X: LibreOffice windows are pixelated on Retina displays https://bugs.freedesktop.org/show_bug.cgi?id=80939 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED -- 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
Re: minutes of ESC call ...
On Thu, 2014-10-30 at 20:13 +0100, Jean-Baptiste Faure wrote: Le 30/10/2014 20:05, Kohei Yoshida a écrit : On Thu, 2014-10-30 at 20:00 +0100, Jean-Baptiste Faure wrote: + I think that the best would be to have this option locale to the sorting dialog instead of global for Calc Is it something possible? Not unless someone volunteers. FYI it would require a fair amount of code change and a change in ODF file format. Is it not possible to have a checkbox in the sorting dialog without saving its state to the file or not in the file but in the registry ? Anything UI related, I'll defer to UX people. So, no further comment from me other than what I've already said. You are welcome to investigate and prove me wrong, of course. You are actually encouraged to. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extensions/source
extensions/source/scanner/grid.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 70485c1137e04a4b86eb25bb3d9a619ced52b3ea
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 30 19:15:04 2014 +
nothing to see here, move along
brown bag fix for
commit cdbfbd0f7c3ed3bd3235f97197d279c41913245b
Date: Thu Oct 30 09:21:40 2014 +
coverity#735608 Division or modulo by float zero
and
coverity#735607 Division or modulo by float zero
Change-Id: I8e04765cf5354d57a54b166a5e2af71b40b670bb
diff --git a/extensions/source/scanner/grid.cxx
b/extensions/source/scanner/grid.cxx
index 44143f5..96fb625 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -308,7 +308,7 @@ void GridWindow::transform( const Point rOriginal, double
x, double y )
{
const long nWidth = m_aGridArea.GetWidth();
const long nHeight = m_aGridArea.GetHeight();
-if (!nWidth || nHeight)
+if (!nWidth || !nHeight)
return;
x = ( rOriginal.X() - m_aGridArea.Left() ) * (m_fMaxX - m_fMinX) /
(double)nWidth + m_fMinX;
y = ( m_aGridArea.Bottom() - rOriginal.Y() ) * (m_fMaxY - m_fMinY) /
(double)nHeight + m_fMinY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: -q
-q | 204 -
1 file changed, 204 deletions(-)
New commits:
commit 7c46bc794a417b5e5280183dcabeefb9e6df4377
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Oct 30 20:26:10 2014 +0100
remove accidently committed file
diff --git a/-q b/-q
deleted file mode 100644
index 42cf0d1..000
--- a/-q
+++ /dev/null
@@ -1,204 +0,0 @@
-# libreoffice git bugzilla integration
-# Copyright (C) 2014 Markus Mohrhard
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
-
-from __future__ import print_function
-
-import datetime
-import os
-import re
-import sys, getopt
-import git
-import ConfigParser
-
-if hasattr(sys.version_info, major) and sys.version_info.major = 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
-
-import bugzilla
-from bugzilla import Bugzilla
-from bugzilla.base import _BugzillaToken
-
-master_target = 4.4.0
-bug_regex = fdo#(\d+)
-
-class FreedesktopBZ:
-bzclass = bugzilla.Bugzilla44
-
-bz = None
-
-def connect(self):
-config = ConfigParser.ConfigParser()
-config.read('config.cfg')
-url = config.get('bugzilla', 'url')
-user = config.get('bugzilla', 'user')
-password = config.get('bugzilla', 'password')
-self.bz = self.bzclass(url=url, cookiefile = /tmp/cookie, tokenfile
= /tmp/token)
-self.bz.login(user=user, password=password)
-
-def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
-bug = self.bz.getbug(bugnr)
-print(bug)
-old_whiteboard = bug.getwhiteboard()
-
-m = re.findall(new_version, old_whiteboard)
-if m is None or len(m) == 0:
-new_whiteboard = old_whiteboard + target: + new_version
-bug.setwhiteboard(new_whiteboard)
-
-cgiturl = http://cgit.freedesktop.org/libreoffice/%s/commit/?id=%s;
%(repo_name, commit.hexsha)
-if branch is not None and branch != master:
-cgiturl = cgiturl + h= + branch
-else:
-branch = master
-
-comment_msg = %s committed a patch related to this issue.
-It has been pushed to %s:
-
-%s
-
-%s
-
-It will be available in %s.
-
-The patch should be included in the daily builds available at
-http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
-information about daily builds can be found at:
-http://wiki.documentfoundation.org/Testing_Daily_Builds
-Affected users are encouraged to test the fix and report feedback.
%(commit.author, branch, cgiturl, commit.summary, new_version)
-print(comment_msg)
-bug.addcomment(comment_msg)
-
-
-
-
-def find_target_version(repo, branch):
-if branch is None or branch == master:
-return master_target
-
-# check if committed to a release branch
-# form libreoffice-x-y-z = will be available in x.y.z
-match = re.search(libreoffice-(\d+)-(\d+)-(\d+), branch)
-if match is not None:
-return ..join(map(str, match.groups()))
-
-# form libreoffice-x-y
-# branch of libreoffice-x-y-z exists = will be available in x.y.z+1
-# else
-# tag libreoffice-x.y.0.z exists = will be available in x.y.0.z+1 (RC)
-# else
-# beta
-match = re.search(libreoffice-(\d+)-(\d+), branch)
-if match is not None:
-base = ..join(map(str, match.groups()))
-branches = repo.remote().refs
-branch_names = [str(branch) for branch in branches]
-print(branch_names)
-search_string = libreoffice-+-.join(map(str, match.groups())) +
-(\d+)
-print(search_string)
-micro_list = [m.group(1) for m in [re.search(search_string, branch)
for branch in branch_names] if m is not None]
-if micro_list.count() == 0:
-# first search if we are at an RC already
-search_string = libreoffice- + base + .0. + (\d+)
-rc_list = [m.group(1) for m in [re.search(search_string, str(tag))
for tag in tags] if m is not None]
-print(rc_list)
-if len(rc_list) 0:
-return base + .0. + str(max(rc_list) + 1)
-
-# we have not yet tagged an RC, check which betas have been tagged
-search_string = libreoffice- + base + .0.0.beta(\d+)
-beta_list = [m.group(1) for m in
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 8abb980a3fa32d3755b67ba4972eb56edaf36aa1
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 30 21:12:51 2014 +0200
WaE: unused variable 'pXmlDoc'
Change-Id: Ie232566340e3d7c77cabbfcea641f3d1b40de0bd
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1ca3bce..11ba954 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -445,6 +445,7 @@ DECLARE_OOXMLEXPORT_TEST(testCropPixel, crop-pixel.docx)
{
// This is 17667 in the original document, was 504666 (so the image
// become invisible), now is around 19072.
+(void) pXmlDoc;
#ifndef MACOSX
CPPUNIT_ASSERT(getXPath(pXmlDoc, //a:srcRect, l).toInt32()
2);
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - officecfg/registry shell/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |8 - officecfg/registry/data/org/openoffice/Setup.xcu |2 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 67 - shell/source/backends/gconfbe/gconfaccess.cxx | 16 --- shell/source/backends/gconfbe/gconfaccess.hxx |2 5 files changed, 95 deletions(-) New commits: commit 2b905ac7c000ac4df919a1ce1a92117e36aad7a7 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu Oct 30 01:47:12 2014 +0100 this configuration option is totally unused Change-Id: I6057dfff10d8c776080df2de0b259bd401cd7fb7 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 166a106..4e0f2a3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2067,16 +2067,6 @@ descContains settings which are used during the Office startup to check for unfinished work./desc /info - prop oor:name=DevelopmentChart oor:type=xs:boolean oor:nillable=false -info - descSpecifies that If this option is set to true, the new - development chart library is used instead of the standard one. Do not - set this option to true unless you know exactly what to do. This new - library will be unstable and incomplete most of the time. This flag - will be removed when the new library is in a stable state./desc -/info -valuefalse/value - /prop set oor:name=RecoveryList oor:node-type=RecoveryEntry info descContains the documents that were opened when the office commit 8a8200e338fb2e3ebdd0944d1d3eed31b84c84c2 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu Oct 30 01:40:53 2014 +0100 that stuff seems to be totally unused Change-Id: Ice7bc99fc5f3d26ced1b7cd5a1dbf29b0e635471 diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index dcb3f70..f29eb6c 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -695,12 +695,4 @@ value oor:external=com.sun.star.configuration.backend.GconfBackend UndoSteps/ /prop /node - node oor:name=_3D_Engine install:module=gconflockdown -prop oor:name=OpenGL - value oor:external=com.sun.star.configuration.backend.GconfBackend OpenGL/ -/prop -prop oor:name=OpenGL_Faster - value oor:external=com.sun.star.configuration.backend.GconfBackend OpenGL_Faster/ -/prop - /node /oor:component-data diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 51ff7c0..9b17125 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -912,12 +912,10 @@ it/org.openoffice.Office.Common/View/FontAntiAliasing/it it/org.openoffice.Office.Common/View/Localization/it it/org.openoffice.Office.Common/View/Menu/it -it/org.openoffice.Office.Common/_3D_Engine/it /value /prop prop oor:name=ExcludedNodes value -it/org.openoffice.Office.Common/_3D_Engine/OpenGL/it it/org.openoffice.Office.Common/Help/Registration/it /value /prop diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 9e72795..166a106 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -897,63 +897,6 @@ /info /prop /group -group oor:name=_3D_Engine - info -descSpecifies settings for the 3D engine./desc - /info - prop oor:name=Dithering oor:type=xs:boolean oor:nillable=false -!-- OldPath: 3D-Engine/Dithering -- -!-- OldLocation: soffice.ini -- -!-- UIHints: Tools - Options - General - Other - [Section] 3D-View -- -info - descSpecifies if dithering is used to display more colors with few - colors available./desc - labelUse Dithering/label -/info -valuetrue/value - /prop - prop oor:name=OpenGL oor:type=xs:boolean oor:nillable=false -!-- OldPath: 3D-Engine/OpenGL -- -!-- OldLocation: soffice.ini -- -!-- UIHints: Tools - Options - General - Other - [Section] 3D-View -- -info - descSpecifies if 3D graphics from Draw and Impress will be displayed - on the user's system using an OpenGL capable hardware. If the system - does not have an OpenGL capable hardware, this
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - starmath/inc starmath/source
starmath/inc/parse.hxx |4 ++-
starmath/source/mathmlexport.cxx | 30
starmath/source/mathmlimport.cxx | 20 +---
starmath/source/mathmlimport.hxx |3 +-
starmath/source/node.cxx | 48 +++
starmath/source/parse.cxx| 10
6 files changed, 106 insertions(+), 9 deletions(-)
New commits:
commit 529e59d90037748d0030191b93252e597935243e
Author: Regina Henschel reg...@apache.org
Date: Thu Oct 30 18:41:23 2014 +
#i118191# Red is not red enough
Enable Math to use 16 basic HTML colors
Patch by: Regina Henschel rb.hensc...@t-online.de
Found by: lapsap7+...@gmail.com
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 578196c..01d8b96 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -95,7 +95,9 @@ enum SmTokenType
TSINH, TCOSH, TTANH, TCOTH, TASIN,
TACOS, TATAN, TLN,TLOG, TUOPER,
TBOPER, TBLACK, TWHITE, TRED, TGREEN,
-TBLUE, TCYAN, TMAGENTA, TYELLOW,TFIXED,
+TBLUE, TCYAN, TMAGENTA, TYELLOW,TSILVER,
+TGRAY, TMAROON,TPURPLE,TLIME, TOLIVE,
+TNAVY, TTEAL, TAQUA, TFUCHSIA, TFIXED,
TSANS, TSERIF, TPOINT, TASINH, TACOSH,
TATANH, TACOTH, TACOT, TEXP, TCDOT,
TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET,
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 8f0026d..050242a 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1281,6 +1281,36 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int
nLevel)
case TYELLOW:
AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_YELLOW);
break;
+case TSILVER:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_SILVER);
+break;
+case TGRAY:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_GRAY);
+break;
+case TMAROON:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_MAROON);
+break;
+case TOLIVE:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_OLIVE);
+break;
+case TLIME:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_LIME);
+break;
+case TAQUA:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_AQUA);
+break;
+case TTEAL:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_TEAL);
+break;
+case TNAVY:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_NAVY);
+break;
+case TFUCHSIA:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_FUCHSIA);
+break;
+case TPURPLE:
+AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_PURPLE);
+break;
case TSIZE:
{
const SmFontNode *pFontNode = static_castconst SmFontNode
*(pNode);
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index fd2354b..5f927be4 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -724,6 +724,9 @@ void SmXMLContext_Helper::RetrieveAttrs(const
uno::Reference
case XML_TOK_COLOR:
sColor = sValue;
break;
+case XML_TOK_MATHCOLOR:
+sColor = sValue;
+break;
default:
break;
}
@@ -966,6 +969,9 @@ void SmXMLStyleContext_Impl::StartElement(const
uno::Reference
case XML_TOK_COLOR:
sColor = sValue;
break;
+case XML_TOK_MATHCOLOR:
+sColor = sValue;
+break;
default:
break;
}
@@ -2093,6 +2099,7 @@ static __FAR_DATA SvXMLTokenMapEntry
aPresLayoutAttrTokenMap[] =
{ XML_NAMESPACE_MATH, XML_FONTSIZE,XML_TOK_FONTSIZE },
{ XML_NAMESPACE_MATH, XML_FONTFAMILY, XML_TOK_FONTFAMILY},
{ XML_NAMESPACE_MATH, XML_COLOR, XML_TOK_COLOR },
+{ XML_NAMESPACE_MATH, XML_MATHCOLOR, XML_TOK_MATHCOLOR },
XML_TOKEN_MAP_END
};
@@ -2150,13 +2157,20 @@ static __FAR_DATA SvXMLTokenMapEntry aColorTokenMap[] =
{ XML_NAMESPACE_MATH, XML_RED, TRED},
{ XML_NAMESPACE_MATH, XML_GREEN,TGREEN},
{ XML_NAMESPACE_MATH, XML_BLUE, TBLUE},
-{ XML_NAMESPACE_MATH, XML_AQUA, TCYAN},
-{ XML_NAMESPACE_MATH, XML_FUCHSIA, TMAGENTA},
+{ XML_NAMESPACE_MATH, XML_AQUA, TAQUA},
+{ XML_NAMESPACE_MATH, XML_FUCHSIA,
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/docrecoveryrecoverdialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 249d1b57faa046642298940be9a1c26ca08072a3 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 30 20:20:54 2014 + pluralize Change-Id: I0ffb952b1a12889462c209d0c2d43ab75296c3d0 diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui index fe77eb8..0f4a1a8 100644 --- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui +++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui @@ -76,7 +76,7 @@ property name=xalign0/property property name=label translatable=yesPress 'Start Recovery' to start the recovery process of the documents listed below. -Press 'Discard Recovery Data' to abandon attempting recovery of these document. +Press 'Discard Recovery Data' to abandon attempting recovery of these documents. The 'Status' column shows whether the document can be recovered./property property name=wrapTrue/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On Thu, 2014-10-30 at 20:00 +0100, Jean-Baptiste Faure wrote: My suggestions : + fix bug fdo#85215 : done + change the default value of option UpdateReferenceOnSort from true to false for backward compatibility So - we punted this default decision to the UX team. Main bug reports related to this problem: My concern is that I don't have time to waste with interminable ranting bug comments by all sundry ;-) or lists of duplicates, or change default to this / that - all of that is in-hand, and it is a ~one-liner to change the default now [ and perhaps a single unit test change ]. The only open question is: given what is in master today - are there -well-defined- clearly specified cases that continue not to work [ with the default set to the user's preferred state ]. Are there clear comparisons vs. what competing products do in exactly those corner cases too ? Can we get a tracker for exactly these outstanding issues and no others ? can each of those issues be a succinct, crisp, clear statement of a real issue with the current state of master; and nothing else =) or (more ideally) we can confirm that there are no outstanding issues [ modulo the non-interesting ones I outline above ]. Thanks ! Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/formulagroup.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c554343856a4efdc3388498656ad518b0f03b41c
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 30 16:31:04 2014 +0200
Use SAL_INFO instead of fprintf(stderr)
Change-Id: I49bc06865c599e0a4417e24c70845a2bc25b7ff8
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 32e83c6..b4a8827 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -478,7 +478,7 @@ public:
{
const char *pValue = getenv(FORMULA_GROUP_DUMMY);
meMode = static_castMode(OString(pValue, strlen(pValue)).toInt32());
-fprintf(stderr, Using Dummy Formula Group interpreter mode %d\n,
(int)meMode);
+SAL_INFO(sc.formulagroup, Using Dummy Formula Group interpreter
mode (int)meMode);
}
virtual ScMatrixRef inverseMatrix(const ScMatrix /*rMat*/)
@@ -527,7 +527,7 @@ FormulaGroupInterpreter
*FormulaGroupInterpreter::getStatic()
if ( !msInstance ) // software fallback
{
-fprintf(stderr, Create S/W interp\n);
+SAL_INFO(sc.formulagroup, Create S/W interpreter);
msInstance = new sc::FormulaGroupInterpreterSoftware();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/opencl_device.cxx | 41 +++-
1 file changed, 20 insertions(+), 21 deletions(-)
New commits:
commit 07accd020ba1e5dc8bba2909e9e6518140acb477
Author: Tor Lillqvist t...@collabora.com
Date: Thu Oct 30 20:02:58 2014 +0200
Use our standard SAL_INFO instead of homegrown LOG_PRINTF thingie
Change-Id: I3bca38b16613d59c4620de33eaf61bebb269e1a8
diff --git a/sc/source/core/opencl/opencl_device.cxx
b/sc/source/core/opencl/opencl_device.cxx
index bcb3c3f..90b4f3d 100644
--- a/sc/source/core/opencl/opencl_device.cxx
+++ b/sc/source/core/opencl/opencl_device.cxx
@@ -21,6 +21,7 @@
#include iostream
#include sstream
#include vector
+#include sal/log.hxx
#include comphelper/random.hxx
#include boost/scoped_ptr.hpp
@@ -30,13 +31,11 @@
#define OUTPUTSIZE 15360
#define STRINGIFY(...) #__VA_ARGS__\n
-//#define LOG_PRINTF(x) (std::cout x std::endl)
-#define LOG_PRINTF(x)
#define DS_CHECK_STATUS(status, name) \
if (CL_SUCCESS != status) \
{ \
-LOG_PRINTF([OCL] Error code is status at name); \
+SAL_INFO(sc.opencl.device, Error code is status at name); \
}
namespace sc { namespace OpenCLDevice {
@@ -226,7 +225,7 @@ ds_status evaluateScoreForDevice(ds_device* device, void*
evalData)
if (DS_DEVICE_OPENCL_DEVICE == device-type)
{
/* Evaluating an OpenCL device */
-LOG_PRINTF([DS] Device: \ device-oclDeviceName \ (OpenCL)
evaluation...);
+SAL_INFO(sc.opencl.device, Device: \ device-oclDeviceName
\ (OpenCL) evaluation...);
cl_int clStatus;
/* Check for 64-bit float extensions */
size_t aDevExtInfoSize = 0;
@@ -290,7 +289,7 @@ ds_status evaluateScoreForDevice(ds_device* device, void*
evalData)
clStatus = clGetProgramBuildInfo(clProgram,
device-oclDeviceID, CL_PROGRAM_BUILD_LOG, 0, NULL, length);
buildLog = (char*)malloc(length);
clGetProgramBuildInfo(clProgram, device-oclDeviceID,
CL_PROGRAM_BUILD_LOG, length, buildLog, length);
-LOG_PRINTF([OCL] Build Errors std::endl buildLog);
+SAL_INFO(sc.opencl.device, Build Errors:\n buildLog);
free(buildLog);
device-score = (void*)new LibreOfficeDeviceScore;
@@ -352,7 +351,7 @@ ds_status evaluateScoreForDevice(ds_device* device, void*
evalData)
else
{
/* Evaluating an Native CPU device */
-LOG_PRINTF([DS] Device: \CPU\ (Native) evaluation...);
+SAL_INFO(sc.opencl.device, Device: \CPU\ (Native) evaluation...);
timer kernelTime;
timerStart(kernelTime);
@@ -405,16 +404,16 @@ ds_status pickBestDevice(ds_profile* profile, int*
bestDeviceIdx)
}
else
{
-LOG_PRINTF(Unusual null score);
+SAL_INFO(sc.opencl.device, Unusual null score);
}
if (DS_DEVICE_OPENCL_DEVICE == device.type)
{
-LOG_PRINTF([DS] Device[ d ] device.oclDeviceName
(OpenCL) score is fScore);
+SAL_INFO(sc.opencl.device, Device[ d ]
device.oclDeviceName (OpenCL) score is fScore);
}
else
{
-LOG_PRINTF([DS] Device[ d ] CPU (Native) score is
fScore);
+SAL_INFO(sc.opencl.device, Device[ d ] CPU (Native)
score is fScore);
}
if (fScore bestScore)
{
@@ -424,11 +423,11 @@ ds_status pickBestDevice(ds_profile* profile, int*
bestDeviceIdx)
}
if (DS_DEVICE_OPENCL_DEVICE == profile-devices[*bestDeviceIdx].type)
{
-LOG_PRINTF([DS] Selected Device[ *bestDeviceIdx ]:
profile-devices[*bestDeviceIdx].oclDeviceName (OpenCL).);
+SAL_INFO(sc.opencl.device, Selected Device[ *bestDeviceIdx
]: profile-devices[*bestDeviceIdx].oclDeviceName (OpenCL).);
}
else
{
-LOG_PRINTF([DS] Selected Device[ *bestDeviceIdx ]: CPU
(Native).);
+SAL_INFO(sc.opencl.device, Selected Device[ *bestDeviceIdx
]: CPU (Native).);
}
return DS_SUCCESS;
@@ -476,13 +475,13 @@ ds_device getDeviceSelection(const char* sProfilePath,
bool bForceSelection)
else
{
status = DS_INVALID_PROFILE;
-LOG_PRINTF([DS] Performing forced profiling.);
+SAL_INFO(sc.opencl.device, Performing forced profiling.);
}
if (DS_SUCCESS != status)
{
if (!bForceSelection)
{
-LOG_PRINTF([DS] Profile file not available ( fileName
); performing profiling.);
+SAL_INFO(sc.opencl.device, Profile file not available (
fileName ); performing profiling.);
}
/* Populate input data for micro-benchmark */
@@ -506,21 +505,21 @@ ds_device getDeviceSelection(const char* sProfilePath,
bool bForceSelection)
status = writeProfileToFile(profile, serializeScore, fileName);
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/opencl_device_selection.h | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit 03d90274bcb6fb617034161c6d4676050d7e9edb Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 30 22:47:26 2014 +0200 Make sure the cached OpenCL profile file actually matches the devices present Re-evaluate scores if the profile file did not match. It used to work so that if the OpenCL devices available had changed (if just the OpenCL driver version had changed), we did not re-evaluate scores but instead selected the dummy software device. Which hardly was as intended. Change-Id: Ifd79c0226504323f275d2e1d02876a0fecc449e0 diff --git a/sc/source/core/opencl/opencl_device_selection.h b/sc/source/core/opencl/opencl_device_selection.h index 1d5086d..fcfa41a 100644 --- a/sc/source/core/opencl/opencl_device_selection.h +++ b/sc/source/core/opencl/opencl_device_selection.h @@ -602,7 +602,17 @@ inline ds_status readProfileFromFile(ds_profile* profile, ds_score_deserializer } cleanup: if (contentStart != NULL) free(contentStart); -return status; +if (status != DS_SUCCESS) +return status; + +// Check that all the devices present had valid cached scores. If +// not, return DS_INVALID_PROFILE and let the caller re-evaluate +// scores for present devices, and write a new profile file. +for (unsigned int i = 0; i profile-numDevices; i++) +if (profile-devices[i].score == NULL) +return DS_INVALID_PROFILE; + +return DS_SUCCESS; } inline ds_status getNumDeviceWithEmptyScore(ds_profile* profile, unsigned int* num) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Michael Meeks-5 wrote + badly need ways to stop 'building' consuming the hack-fest (Michael) [...] + icecream can work in the cloud ? (Norbert) + not ideal in a hackfest - transferring Gb's (Moggi) Hi! Maybe scache could be investigated and help somehow? https://github.com/glandium/sccache Some Mozilla findings: http://glandium.org/blog/?p=3235 http://glandium.org/blog/?p=3201 http://glandium.org/blog/?p=3188 http://glandium.org/blog/?p=3079 http://glandium.org/blog/?p=3054 Michael Meeks-5 wrote + poke Taras wrt. UI / telemetry code re-use here (Michael) Maybe this article can help to find good server side code for re-use solution: http://taras.glek.net/blog/2013/08/28/telemetry-reboot/ https://github.com/mozilla/telemetry-server/ http://mreid-moz.github.io/ is a good read in general. Michael Meeks-5 wrote + call on Tuesday; new testing hardware. + result - get a Manitu server leave room in the budget for ondemand Amazon instances (with spot pricing) if there is special need at some point. Good read about Mozilla AWS costs (they use it a lot): http://taras.glek.net/blog/2014/05/09/how-amazon-ec2-got-15x-cheaper-in-6-months/ Old stuff sometimes but I hope it helps and you all didn't read that already... Best regards. -- View this message in context: http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4127342p4127394.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Hi bfoman, Thanks for the links; On Thu, 2014-10-30 at 14:27 -0700, bfoman wrote: + poke Taras wrt. UI / telemetry code re-use here (Michael) ... Maybe this article can help to find good server side code for re-use solution: http://taras.glek.net/blog/2013/08/28/telemetry-reboot/ The 'Taras' I mention is the same guy in the URL you quote here and below ;-) an old friend, and sharp cookie - now no longer at mozilla. All the best, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Hi, On Thu, Oct 30, 2014 at 02:27:27PM -0700, bfoman wrote: Maybe scache could be investigated and help somehow? https://github.com/glandium/sccache Some Mozilla findings: http://glandium.org/blog/?p=3054 Oh, thats indeed interesting -- esp. since I had the same concept in mind too, but didnt get around to experiment with that at all. We do not have a coordinated build nodes setup as required for that ... yet. Current dynamics in the market will move the world in that direction rather sooner than later though. Certainly something to keep a close eye on. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/priorities' - comphelper/Library_comphelper.mk comphelper/source include/comphelper sc/Library_scfilt.mk sc/source
comphelper/Library_comphelper.mk |1
comphelper/source/misc/threadpool.cxx | 185 ++
include/comphelper/threadpool.hxx | 64 ++
sc/Library_scfilt.mk |1
sc/source/filter/oox/threadpool.cxx | 164 --
sc/source/filter/oox/threadpool.hxx | 53
sc/source/filter/oox/workbookfragment.cxx |6
7 files changed, 253 insertions(+), 221 deletions(-)
New commits:
commit 7e72f8c4cedf14fe957ea3fed79d416f7926293f
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Oct 30 18:37:42 2014 +
Move thread-pool down into comphelper for re-use elsewhere.
Change-Id: Ib27b8b1ccc07ff194035d6c2ef3d45c429e3cea1
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index cfe48f6..84bf698 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/string \
comphelper/source/misc/synchronousdispatch \
comphelper/source/misc/syntaxhighlight \
+comphelper/source/misc/threadpool \
comphelper/source/misc/types \
comphelper/source/misc/weak \
comphelper/source/misc/weakeventlistener \
diff --git a/sc/source/filter/oox/threadpool.cxx
b/comphelper/source/misc/threadpool.cxx
similarity index 84%
rename from sc/source/filter/oox/threadpool.cxx
rename to comphelper/source/misc/threadpool.cxx
index 3fcfa75..d2101ad 100644
--- a/sc/source/filter/oox/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -7,17 +7,22 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include threadpool.hxx
+#include comphelper/threadpool.hxx
+#include rtl/instance.hxx
+#include boost/shared_ptr.hpp
+#include thread
#include algorithm
+namespace comphelper {
+
class ThreadPool::ThreadWorker : public salhelper::Thread
{
ThreadPool*mpPool;
osl::Condition maNewWork;
public:
ThreadWorker( ThreadPool *pPool ) :
-salhelper::Thread(sheet-import-thread-pool),
+salhelper::Thread(thread-pool),
mpPool( pPool ) {}
virtual void execute() SAL_OVERRIDE
@@ -90,6 +95,20 @@ ThreadPool::~ThreadPool()
waitUntilWorkersDone();
}
+struct ThreadPoolStatic : public rtl::StaticWithInit boost::shared_ptr
ThreadPool ,
+ ThreadPoolStatic
+{
+boost::shared_ptr ThreadPool operator () () {
+sal_Int32 nThreads = std::max( std::thread::hardware_concurrency(), 1U
);
+return boost::shared_ptr ThreadPool ( new ThreadPool( nThreads ) );
+};
+};
+
+ThreadPool ThreadPool::getSharedOptimalPool()
+{
+return *ThreadPoolStatic::get().get();
+}
+
/// wait until all the workers have completed and
/// terminate all threads
void ThreadPool::waitUntilWorkersDone()
@@ -161,4 +180,6 @@ void ThreadPool::waitUntilEmpty()
assert( maTasks.empty() );
}
+} // namespace comphelper
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/threadpool.hxx
b/include/comphelper/threadpool.hxx
similarity index 73%
rename from sc/source/filter/oox/threadpool.hxx
rename to include/comphelper/threadpool.hxx
index 19b524c..ae103f1 100644
--- a/sc/source/filter/oox/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SC_SOURCE_FILTER_OOX_THREADPOOL_HXX
-#define INCLUDED_SC_SOURCE_FILTER_OOX_THREADPOOL_HXX
+#ifndef INCLUDED_COMPHELPER_THREADPOOL_HXX
+#define INCLUDED_COMPHELPER_THREADPOOL_HXX
#include sal/config.h
#include salhelper/thread.hxx
@@ -16,8 +16,12 @@
#include osl/conditn.hxx
#include rtl/ref.hxx
#include vector
+#include comphelper/comphelperdllapi.h
-class ThreadTask
+namespace comphelper
+{
+
+class COMPHELPER_DLLPUBLIC ThreadTask
{
public:
virtual ~ThreadTask() {}
@@ -25,11 +29,16 @@ public:
};
/// A very basic thread pool implementation
-class ThreadPool
+class COMPHELPER_DLLPUBLIC ThreadPool
{
public:
+/// returns a pointer to a shared pool with optimal thread
+/// count for the CPU
+static ThreadPool getSharedOptimalPool();
+
ThreadPool( sal_Int32 nWorkers );
virtual~ThreadPool();
+
voidpushTask( ThreadTask *pTask /* takes ownership */ );
voidwaitUntilEmpty();
voidwaitUntilWorkersDone();
@@ -48,6 +57,8 @@ private:
std::vector ThreadTask *maTasks;
};
-#endif // INCLUDED_SC_SOURCE_FILTER_OOX_THREADPOOL_HXX
+} // namespace comphelper
+
+#endif // INCLUDED_COMPHELPER_THREADPOOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 00d32da..77c8486 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -214,7 +214,6 @@ $(eval $(call
[Libreoffice-commits] core.git: Branch 'feature/priorities' - comphelper/source include/comphelper sc/source
comphelper/source/misc/threadpool.cxx |7 ++-
include/comphelper/threadpool.hxx |7 ++-
sc/source/filter/oox/workbookfragment.cxx |5 +++--
3 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit d927998c80cb1933cb71ff33be5a7ba1dca2d411
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Oct 30 21:58:36 2014 +
thread-pool: re-work termination semantics to avoid problems.
We want a pre-spun-up, shared thread-pool that doesn't get its
workers created joined frequently.
Change-Id: I29081e3a3e3849ca30e63fd080ee3315d99cbe8d
diff --git a/comphelper/source/misc/threadpool.cxx
b/comphelper/source/misc/threadpool.cxx
index d2101ad..236a314 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -92,7 +92,7 @@ ThreadPool::ThreadPool( sal_Int32 nWorkers ) :
ThreadPool::~ThreadPool()
{
-waitUntilWorkersDone();
+waitAndCleanupWorkers();
}
struct ThreadPoolStatic : public rtl::StaticWithInit boost::shared_ptr
ThreadPool ,
@@ -109,9 +109,7 @@ ThreadPool ThreadPool::getSharedOptimalPool()
return *ThreadPoolStatic::get().get();
}
-/// wait until all the workers have completed and
-/// terminate all threads
-void ThreadPool::waitUntilWorkersDone()
+void ThreadPool::waitAndCleanupWorkers()
{
waitUntilEmpty();
@@ -169,7 +167,6 @@ void ThreadPool::waitUntilEmpty()
pTask-doWork();
delete pTask;
}
-mbTerminate = true;
}
else
{
diff --git a/include/comphelper/threadpool.hxx
b/include/comphelper/threadpool.hxx
index ae103f1..2e51719 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -39,14 +39,19 @@ public:
ThreadPool( sal_Int32 nWorkers );
virtual~ThreadPool();
+/// push a new task onto the work queue
voidpushTask( ThreadTask *pTask /* takes ownership */ );
+
+/// wait until all queued tasks are completed
voidwaitUntilEmpty();
-voidwaitUntilWorkersDone();
private:
class ThreadWorker;
friend class ThreadWorker;
+/// wait until all work is completed, then join all threads
+voidwaitAndCleanupWorkers();
+
ThreadTask *waitForWork( osl::Condition rNewWork );
ThreadTask *popWork();
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index 891c5aa..fbdd902 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -335,8 +335,9 @@ void importSheetFragments( WorkbookFragment
rWorkbookHandler, SheetFragmentVect
// bar updating.
Application::Yield();
}
-// join all the threads:
-aPool.waitUntilWorkersDone();
+aPool.waitUntilEmpty();
+
+// threads joined in ThreadPool destructor
}
else // single threaded iteration
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/opencl_device.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2f55701c550950ab4530df3c9ca305a819e3cabb
Author: Tor Lillqvist t...@collabora.com
Date: Fri Oct 31 00:02:05 2014 +0200
Add a few informative SAL_INFOs
Change-Id: I1ac6366714acd7ec3e74b7afb4670c73825d1032
diff --git a/sc/source/core/opencl/opencl_device.cxx
b/sc/source/core/opencl/opencl_device.cxx
index 90b4f3d..2703040 100644
--- a/sc/source/core/opencl/opencl_device.cxx
+++ b/sc/source/core/opencl/opencl_device.cxx
@@ -249,6 +249,7 @@ ds_status evaluateScoreForDevice(ds_device* device, void*
evalData)
//buildOption = -D KHR_DP_EXTENSION -Dfp_t=double -Dfp_t4=double4
-Dfp_t16=double16;
tmpStr.append( -DKHR_DP_EXTENSION);
buildOption = tmpStr.c_str();
+SAL_INFO(sc.opencl.device, ... has cl_khr_fp64);
}
else if ((std::string(aExtInfo)).find(cl_amd_fp64) !=
std::string::npos)
{
@@ -256,6 +257,7 @@ ds_status evaluateScoreForDevice(ds_device* device, void*
evalData)
//buildOption = -D AMD_DP_EXTENSION -Dfp_t=double -Dfp_t4=double4
-Dfp_t16=double16;
tmpStr.append( -DAMD_DP_EXTENSION);
buildOption = tmpStr.c_str();
+SAL_INFO(sc.opencl.device, ... has cl_amd_fp64);
}
delete[] aExtInfo;
@@ -265,6 +267,7 @@ ds_status evaluateScoreForDevice(ds_device* device, void*
evalData)
device-score = (void*)new LibreOfficeDeviceScore;
((LibreOfficeDeviceScore*)device-score)-fTime = DBL_MAX;
((LibreOfficeDeviceScore*)device-score)-bNoCLErrors = true;
+SAL_INFO(sc.opencl.device, ... no fp64 support);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - comphelper/Library_comphelper.mk comphelper/source include/comphelper sc/Library_scfilt.mk sc/source
comphelper/Library_comphelper.mk |1
comphelper/source/misc/threadpool.cxx | 182 ++
include/comphelper/threadpool.hxx | 69 +++
sc/Library_scfilt.mk |1
sc/source/filter/oox/threadpool.cxx | 164 ---
sc/source/filter/oox/threadpool.hxx | 53
sc/source/filter/oox/workbookfragment.cxx | 11 -
7 files changed, 258 insertions(+), 223 deletions(-)
New commits:
commit 593a44a12dbdc00a9f116efc754e3e17dff5dec6
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Oct 30 21:58:36 2014 +
thread-pool: re-work termination semantics to avoid problems.
We want a pre-spun-up, shared thread-pool that doesn't get its
workers created joined frequently.
Change-Id: I29081e3a3e3849ca30e63fd080ee3315d99cbe8d
diff --git a/comphelper/source/misc/threadpool.cxx
b/comphelper/source/misc/threadpool.cxx
index d2101ad..236a314 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -92,7 +92,7 @@ ThreadPool::ThreadPool( sal_Int32 nWorkers ) :
ThreadPool::~ThreadPool()
{
-waitUntilWorkersDone();
+waitAndCleanupWorkers();
}
struct ThreadPoolStatic : public rtl::StaticWithInit boost::shared_ptr
ThreadPool ,
@@ -109,9 +109,7 @@ ThreadPool ThreadPool::getSharedOptimalPool()
return *ThreadPoolStatic::get().get();
}
-/// wait until all the workers have completed and
-/// terminate all threads
-void ThreadPool::waitUntilWorkersDone()
+void ThreadPool::waitAndCleanupWorkers()
{
waitUntilEmpty();
@@ -169,7 +167,6 @@ void ThreadPool::waitUntilEmpty()
pTask-doWork();
delete pTask;
}
-mbTerminate = true;
}
else
{
diff --git a/include/comphelper/threadpool.hxx
b/include/comphelper/threadpool.hxx
index ae103f1..2e51719 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -39,14 +39,19 @@ public:
ThreadPool( sal_Int32 nWorkers );
virtual~ThreadPool();
+/// push a new task onto the work queue
voidpushTask( ThreadTask *pTask /* takes ownership */ );
+
+/// wait until all queued tasks are completed
voidwaitUntilEmpty();
-voidwaitUntilWorkersDone();
private:
class ThreadWorker;
friend class ThreadWorker;
+/// wait until all work is completed, then join all threads
+voidwaitAndCleanupWorkers();
+
ThreadTask *waitForWork( osl::Condition rNewWork );
ThreadTask *popWork();
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index 62ea5bb..8488b46 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -336,8 +336,9 @@ void importSheetFragments( WorkbookFragment
rWorkbookHandler, SheetFragmentVect
// bar updating.
Application::Yield();
}
-// join all the threads:
-aPool.waitUntilWorkersDone();
+aPool.waitUntilEmpty();
+
+// threads joined in ThreadPool destructor
}
else // single threaded iteration
{
commit 62090f65b804a08a66ca26675ae610ed07c7c341
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Oct 30 18:37:42 2014 +
Move thread-pool down into comphelper for re-use elsewhere.
Change-Id: Ib27b8b1ccc07ff194035d6c2ef3d45c429e3cea1
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index cfe48f6..84bf698 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/string \
comphelper/source/misc/synchronousdispatch \
comphelper/source/misc/syntaxhighlight \
+comphelper/source/misc/threadpool \
comphelper/source/misc/types \
comphelper/source/misc/weak \
comphelper/source/misc/weakeventlistener \
diff --git a/sc/source/filter/oox/threadpool.cxx
b/comphelper/source/misc/threadpool.cxx
similarity index 84%
rename from sc/source/filter/oox/threadpool.cxx
rename to comphelper/source/misc/threadpool.cxx
index 3fcfa75..d2101ad 100644
--- a/sc/source/filter/oox/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -7,17 +7,22 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include threadpool.hxx
+#include comphelper/threadpool.hxx
+#include rtl/instance.hxx
+#include boost/shared_ptr.hpp
+#include thread
#include algorithm
+namespace comphelper {
+
class ThreadPool::ThreadWorker : public salhelper::Thread
{
ThreadPool*mpPool;
osl::Condition maNewWork;
public:
ThreadWorker( ThreadPool *pPool ) :
-salhelper::Thread(sheet-import-thread-pool),
+salhelper::Thread(thread-pool),
mpPool( pPool ) {}
virtual void execute()
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - 3 commits - comphelper/Library_comphelper.mk comphelper/source include/comphelper sc/Library_scfilt.mk sc/source vcl/source
comphelper/Library_comphelper.mk |1
comphelper/source/misc/threadpool.cxx | 182 ++
include/comphelper/threadpool.hxx | 72 +++
sc/Library_scfilt.mk |1
sc/source/filter/oox/threadpool.cxx | 164 ---
sc/source/filter/oox/threadpool.hxx | 53
sc/source/filter/oox/workbookfragment.cxx | 11 -
vcl/source/bitmap/bitmapscalesuper.cxx| 32 +
8 files changed, 273 insertions(+), 243 deletions(-)
New commits:
commit bc483c75571d7a46ab003857200cea8af91bedc7
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Oct 30 22:17:04 2014 +
Switch image scaling to use the shared thread pool.
Change-Id: I7450e10b329247d972ef048f61b8ce1ca943aca8
diff --git a/include/comphelper/threadpool.hxx
b/include/comphelper/threadpool.hxx
index 2e51719..1b49f87 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -45,6 +45,9 @@ public:
/// wait until all queued tasks are completed
voidwaitUntilEmpty();
+/// return the number of live worker threads
+sal_Int32 getWorkerCount() { return maWorkers.size(); }
+
private:
class ThreadWorker;
friend class ThreadWorker;
diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx
b/vcl/source/bitmap/bitmapscalesuper.cxx
index 4e734c4..2c01709 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -21,9 +21,8 @@
#include vcl/bitmapscalesuper.hxx
#include algorithm
-#include thread
-#include osl/thread.hxx
#include boost/scoped_array.hpp
+#include comphelper/threadpool.hxx
namespace {
@@ -85,15 +84,14 @@ struct ScaleRangeContext {
typedef void (*ScaleRangeFn)(ScaleContext rCtx, long nStartY, long nEndY);
-// FIXME: should really be pooled managed intelligently etc.
-class ScaleThread : public osl::Thread
+class ScaleTask : public comphelper::ThreadTask
{
ScaleRangeFn mpFn;
std::vector ScaleRangeContext maStrips;
public:
-ScaleThread( ScaleRangeFn pFn ) : mpFn( pFn ) {}
+ScaleTask( ScaleRangeFn pFn ) : mpFn( pFn ) {}
void push( ScaleRangeContext aRC ) { maStrips.push_back( aRC ); }
-virtual void SAL_CALL run() SAL_OVERRIDE
+virtual void doWork() SAL_OVERRIDE
{
std::vector ScaleRangeContext ::iterator it;
for (it = maStrips.begin(); it != maStrips.end(); ++it)
@@ -1001,35 +999,29 @@ bool BitmapScaleSuper::filter(Bitmap rBitmap)
else
{
// partition and queue work
-sal_uInt32 nThreads =
std::max(std::thread::hardware_concurrency(), 1U);
+comphelper::ThreadPool rShared =
comphelper::ThreadPool::getSharedOptimalPool();
+sal_uInt32 nThreads = rShared.getWorkerCount();
+assert( nThreads 0 );
sal_uInt32 nStrips = ((nEndY - nStartY) + SCALE_THREAD_STRIP - 1)
/ SCALE_THREAD_STRIP;
sal_uInt32 nStripsPerThread = nStrips / nThreads;
SAL_INFO(vcl.gdi, Scale in nStrips strips
nStripsPerThread per thread we have nThreads CPU threads
);
long nStripY = nStartY;
-std::vectorScaleThread * aThreads;
for ( sal_uInt32 t = 0; t nThreads - 1; t++ )
{
-ScaleThread *pThread = new ScaleThread( pScaleRangeFn );
+ScaleTask *pTask = new ScaleTask( pScaleRangeFn );
for ( sal_uInt32 j = 0; j nStripsPerThread; j++ )
{
ScaleRangeContext aRC( aContext, nStripY );
-pThread-push( aRC );
+pTask-push( aRC );
nStripY += SCALE_THREAD_STRIP;
}
-pThread-create(); // set it running
-aThreads.push_back( pThread );
+rShared.pushTask( pTask );
}
// finish any remaining bits here
pScaleRangeFn( aContext, nStripY, nEndY );
-// join threads...
-for ( std::vectorScaleThread *::iterator it = aThreads.begin();
- it != aThreads.end(); ++it )
-{
-(*it)-join();
-delete *it;
-}
-SAL_INFO(vcl.gdi, Joined all scaling threads);
+rShared.waitUntilEmpty();
+SAL_INFO(vcl.gdi, All threaded scaling tasks complete);
}
bRet = true;
commit a885c10d845101cb7459a582538d4f1b2557495e
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Oct 30 21:58:36 2014 +
thread-pool: re-work termination semantics to avoid problems.
We want a pre-spun-up, shared thread-pool that doesn't get its
workers created joined frequently.
Change-Id: I29081e3a3e3849ca30e63fd080ee3315d99cbe8d
diff --git a/comphelper/source/misc/threadpool.cxx
b/comphelper/source/misc/threadpool.cxx
index d2101ad..236a314
Re: minutes of ESC call ...
Michael Meeks-5 wrote The 'Taras' I mention is the same guy in the URL you quote here and below ;-) an old friend, and sharp cookie - now no longer at mozilla. Hi! I noticed that it could be the same guy. Anyway it is great that this project will cooperate with Mozilla folks in a way, ex-Mozilla even. Sometimes when I read those minutes I have a feeling that you rediscover a wheel again in some fields... Hope Taras can help to get LibreOffice telemetry going live in not so distant future. Best regards. -- View this message in context: http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4127342p4127402.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: touch/Library_libotouch.mk touch/source
touch/Library_libotouch.mk |8 touch/source/ios/ios.cxx | 10 -- 2 files changed, 18 deletions(-) New commits: commit 6b7e9bb9a9d92b925adfd185abc048d62a4260ad Author: Tor Lillqvist t...@collabora.com Date: Fri Oct 31 00:28:01 2014 +0200 Bin dummy source Change-Id: I41067a6a81e58793ba8b0491b4044de6e7f68e2b diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk index 856a2c6..1d6b289 100644 --- a/touch/Library_libotouch.mk +++ b/touch/Library_libotouch.mk @@ -25,12 +25,4 @@ $(eval $(call gb_Library_add_exception_objects,libotouch,\ endif -ifeq ($(OS),IOS) - -$(eval $(call gb_Library_add_objcxx_objects,libotouch,\ - touch/source/ios/ios \ -)) - -endif - # vim: set noet sw=4 ts=4: diff --git a/touch/source/ios/ios.cxx b/touch/source/ios/ios.cxx deleted file mode 100644 index 2b7f953..000 --- a/touch/source/ios/ios.cxx +++ /dev/null @@ -1,10 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
