Incorrect glyph orientation on vertical layout mode under Mac
Hi I reported a vertical layout issues under Mac at here https://www.libreoffice.org/bugzilla/show_bug.cgi?id=86768 also reported it at OpenOffice's bugzilla https://issues.apache.org/ooo/show_bug.cgi?id=125908 Like shown in the illustration below, both Mongolian and English text is not handled correctly on vertical layout mode under Mac(and Ubuntu too although there is no Ubuntu's screen shot at here). -- Aron ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - wizards/com
wizards/com/sun/star/wizards/common/PlaceholderTextElement.java |
1
wizards/com/sun/star/wizards/common/PropertyNames.java |
1
wizards/com/sun/star/wizards/db/DBMetaData.java |
1
wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java |
15 +-
wizards/com/sun/star/wizards/db/QueryMetaData.java |
1
wizards/com/sun/star/wizards/db/RecordParser.java |
1
wizards/com/sun/star/wizards/db/SQLQueryComposer.java |
1
wizards/com/sun/star/wizards/db/TableDescriptor.java|
1
wizards/com/sun/star/wizards/document/Control.java |
3
wizards/com/sun/star/wizards/document/TimeStampControl.java |
1
wizards/com/sun/star/wizards/form/Finalizer.java|
1
wizards/com/sun/star/wizards/form/FormWizard.java |
7 +
wizards/com/sun/star/wizards/query/CallQueryWizard.java |
1
wizards/com/sun/star/wizards/query/QueryWizard.java |
7 +
wizards/com/sun/star/wizards/report/DBColumn.java |
4
wizards/com/sun/star/wizards/report/Dataimport.java |
2
wizards/com/sun/star/wizards/report/RecordTable.java|
2
wizards/com/sun/star/wizards/report/ReportFinalizer.java|
4
wizards/com/sun/star/wizards/report/ReportTextImplementation.java |
2
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java |
59 ++
wizards/com/sun/star/wizards/table/CGCategory.java |
2
wizards/com/sun/star/wizards/table/CGTable.java |
2
wizards/com/sun/star/wizards/table/CallTableWizard.java |
1
wizards/com/sun/star/wizards/table/FieldFormatter.java |
1
wizards/com/sun/star/wizards/table/TableWizard.java |
1
wizards/com/sun/star/wizards/text/TextDocument.java |
3
wizards/com/sun/star/wizards/ui/AggregateComponent.java |
10 -
wizards/com/sun/star/wizards/ui/ButtonList.java |
1
wizards/com/sun/star/wizards/ui/ControlScroller.java|
2
wizards/com/sun/star/wizards/ui/FilterComponent.java|
6 -
wizards/com/sun/star/wizards/ui/SortingComponent.java |
2
wizards/com/sun/star/wizards/ui/TitlesComponent.java|
2
wizards/com/sun/star/wizards/ui/UIConsts.java |
12 --
wizards/com/sun/star/wizards/ui/WizardDialog.java |
2
34 files changed, 34 insertions(+), 128 deletions(-)
New commits:
commit 898186c40ff730d153b43547c65e53f7ca8be516
Author: Noel Grandin
Date: Wed Nov 26 11:20:00 2014 +0200
java,wizards: remove completely unreferenced fields
found by UCDetector
Change-Id: I00a35337478111991dec7fa6310e57d3b5a146fa
diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
index 8299d48..b1b9cb6 100644
--- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
+++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
@@ -30,7 +30,6 @@ public class PlaceholderTextElement extends TextElement
String hint;
String placeHolderText;
XMultiServiceFactory xmsf;
-TextDocument templateDocument;
public PlaceholderTextElement(XTextRange textRange, String
placeHolderText_, String hint_, XMultiServiceFactory xmsf_)
{
diff --git a/wizards/com/sun/star/wizards/common/PropertyNames.java
b/wizards/com/sun/star/wizards/common/PropertyNames.java
index c851b743..2d7cdd8 100644
--- a/wizards/com/sun/star/wizards/common/PropertyNames.java
+++ b/wizards/com/sun/star/wizards/common/PropertyNames.java
@@ -36,7 +36,6 @@ public class PropertyNames
public static String PROPERTY_TITLE = "Title";
public static String PROPERTY_BORDER = "Border";
public static String PROPERTY_MOVEABLE = "Moveable";
-public static String PROPERTY_CLOSEABLE = "Closeable";
public static String PROPERTY_ALIGN = "Align";
public static String COMMAND = "Command";
public static String COMMAND_TYPE = "CommandType";
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java
b/wizards/com/sun/star/wizards/db/DBMetaData.java
index dc6b0fb..2a8ee9c 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -86,7 +86,6 @@ public class DBMetaData
private XOfficeDatabaseDocument xModel;
private XPropertySet xDataSourcePropertySet;
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/segmenttree.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 2ea1f35b195e51d5325d1a36096e754d692aaaf3 Author: Stephan Bergmann Date: Thu Nov 27 08:22:28 2014 +0100 Missing include Change-Id: I65c2f9d6f3d0974d94c1f7b6bcde28db53d85516 diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index 14b0518..1ed1680 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -21,6 +21,7 @@ #include +#include #include using ::std::numeric_limits; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source include/editeng sw/source
editeng/source/outliner/outlobj.cxx |9 +
include/editeng/outlobj.hxx |2 ++
sw/source/core/docnode/nodedump.cxx |8 ++--
3 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 855c94a46a8810780dacce178b533ab6ceb4d19b
Author: Miklos Vajna
Date: Thu Nov 27 08:04:28 2014 +0100
Factor out OutlinerParaObject::dumpAsXml() from SwDoc::dumpAsXml()
Change-Id: I5e805aa98f643b5a034cdeadb4718af528af022c
diff --git a/editeng/source/outliner/outlobj.cxx
b/editeng/source/outliner/outlobj.cxx
index a4dcc67..02094ae 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -33,6 +33,7 @@
#include
#include
+#include
/**
* This is the guts of OutlinerParaObject, refcounted and shared among
@@ -278,4 +279,12 @@ void OutlinerParaObject::SetStyleSheets(sal_uInt16 nLevel,
const OUString& rNewN
}
}
+void OutlinerParaObject::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("outlinerParaObject"));
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
+GetTextObject().dumpAsXml(pWriter);
+xmlTextWriterEndElement(pWriter);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index c57397e..39c2b3e 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -76,6 +76,8 @@ public:
const OUString& rNewName);
void SetStyleSheets(sal_uInt16 nLevel, const OUString& rNewName,
const SfxStyleFamily& rNewFamily);
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
#endif
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 9268d7f..87a2ae4 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -158,12 +158,8 @@ void lcl_dumpSdrModel(WriterHelper& writer, const
SdrModel* pModel)
writer.writeFormatAttribute("description", "%s",
BAD_CAST(OUStringToOString(pObject->GetDescription(),
RTL_TEXTENCODING_UTF8).getStr()));
writer.writeFormatAttribute("nOrdNum", TMP_FORMAT,
pObject->GetOrdNumDirect());
-const OutlinerParaObject* pOutliner =
pObject->GetOutlinerParaObject();
-writer.startElement("outliner");
-writer.writeFormatAttribute("ptr", "%p", pOutliner);
-if (pOutliner)
-pOutliner->GetTextObject().dumpAsXml(writer);
-writer.endElement();
+if (const OutlinerParaObject* pOutliner =
pObject->GetOutlinerParaObject())
+pOutliner->dumpAsXml(writer);
}
writer.endElement();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-11-27
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#86697 Avoid deadlock updating progress bar in https://gerrit.libreoffice.org/13147 from Matthew Francis about module sc + TANGO: Copied crop icon from human in https://gerrit.libreoffice.org/13145 from Yousuf Philips about module icon-themes + fdo#81475 rearrange, add and remove entries from toolbars in https://gerrit.libreoffice.org/13143 from Yousuf Philips about module sw + fdo#86472 added white backgrounds to images so they appear fine in dark t in https://gerrit.libreoffice.org/13140 from Yousuf Philips about module icon-themes + fdo#51741 Mark document as modified on bookmark rename / delete in https://gerrit.libreoffice.org/12436 from Renato Ferreira about module sw + fdo#84938: replace EVENT_ constants with enum in https://gerrit.libreoffice.org/13134 from Tobias Madl about module include, vcl + Second preparation of the LibreOfficeKit for Windows in https://gerrit.libreoffice.org/13017 from juegen funk about module include, smoketest + Unittest for autocorrect in writer in https://gerrit.libreoffice.org/13131 from Daniel Sikeler about module sw, test End of freshness + move the iOS SalGraphics code back into the OSX one in https://gerrit.libreoffice.org/12186 from Markus Mohrhard about module vcl + fdo#75256 Improve sifr icontheme in https://gerrit.libreoffice.org/13031 from Matthias Freund about module icon-themes + Replace image-sort.pl with image-sort.py in https://gerrit.libreoffice.org/13124 from Marcos Paulo de Souza about module postprocess, solenv + Rendering support for multiStop GradientFill (OOXML RADIAL) in https://gerrit.libreoffice.org/13130 from Vinaya Mandke about module drawinglayer, include, oox + Rendering support for multiStop GradientFill (OOXML LINEAR) in https://gerrit.libreoffice.org/12056 from Vinaya Mandke about module UnoControls, chart2, drawinglayer, filter, include, offapi, oox, sc, sd, sfx2, svx, sw, toolkit, vbahelper, vcl, xmloff * Merged changes on master for project core changed in the last 25 hours: + Add missing space in translatable string in https://gerrit.libreoffice.org/13127 from Adolfo Jayme Barrientos + ICONS: fix icons in galaxy and tango and added new icons to sifr and tang in https://gerrit.libreoffice.org/13128 from Yousuf Philips + Correct and reenable SmNodeToTextVisitor's test for RSUP in https://gerrit.libreoffice.org/13037 from Takeshi Abe + fdo#70185: Correct and reenable SmNodeToTextVisitor's test case in https://gerrit.libreoffice.org/13086 from Takeshi Abe + fdo#83308 Show thousand separators in document word/character counts in https://gerrit.libreoffice.org/12130 from Matthew Francis * Abandoned changes on master for project core changed in the last 25 hours: + fdo#81475 moved draw button to end of toolbar in https://gerrit.libreoffice.org/13055 from Yousuf Philips + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji * Open changes needing tweaks, but being untouched for more than a week: + Removed useless includes in accessibility/ tree in https://gerrit.libreoffice.org/12948 from Andrea Gelmini + Don’t Save --> Don't Save. in https://gerrit.libreoffice.org/12399 from Kevin Suo + fdo#77569 - Add Choose Theme to Format Menu in https://gerrit.libreoffice.org/12275 from Joel Madero + Perftest for loading autocorrect dictionaries, related fdo#79761 in https://gerrit.libreoffice.org/11296 from Matúš Kukan + android: Show document browser back in the menu in https://gerrit.libreoffice.org/12108 from Jacobo Aragunde Pérez + coverity#1242459 Identical code for different branches in https://gerrit.libreoffice.org/11772 from Caolán McNamara + jvmfwk: Apple & Oracle's JRE detection for OS X 10.8+ in https://gerrit.libreoffice.org/12057 from Robert Antoni Buj i Gelonch + 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 + 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#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji 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
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/uiconfig
sw/uiconfig/sglobal/toolbar/previewobjectbar.xml |6 ++ sw/uiconfig/sweb/toolbar/previewobjectbar.xml |6 ++ sw/uiconfig/swform/toolbar/previewobjectbar.xml |6 ++ sw/uiconfig/swreport/toolbar/previewobjectbar.xml |6 ++ sw/uiconfig/swriter/toolbar/previewobjectbar.xml |4 ++-- sw/uiconfig/swxform/toolbar/previewobjectbar.xml |6 ++ 6 files changed, 12 insertions(+), 22 deletions(-) New commits: commit 0bd7e1cfed956b0cb2dcdfac9d382e00d119 Author: Jan Holesovsky Date: Thu Nov 27 06:27:29 2014 +0100 sw: Swap Zoom In and Zoom out in the preview toolbars. Zoom Out is expected to be on the left, as in the status bar. Change-Id: Ie2a678af407ead0ae40ab7d89f435c8bfb7d8b8e diff --git a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml index 9a1e05f..94884da 100644 --- a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + diff --git a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml index f0f67aa..9509e1d 100644 --- a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + diff --git a/sw/uiconfig/swform/toolbar/previewobjectbar.xml b/sw/uiconfig/swform/toolbar/previewobjectbar.xml index 9a1e05f..94884da 100644 --- a/sw/uiconfig/swform/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + diff --git a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml index 9a1e05f..94884da 100644 --- a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml index 47479e5..2512308 100644 --- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml @@ -29,9 +29,9 @@ - - + + diff --git a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml index 9a1e05f..94884da 100644 --- a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/sglobal/toolbar/previewobjectbar.xml |6 ++ sw/uiconfig/sweb/toolbar/previewobjectbar.xml |6 ++ sw/uiconfig/swform/toolbar/previewobjectbar.xml |6 ++ sw/uiconfig/swreport/toolbar/previewobjectbar.xml |6 ++ sw/uiconfig/swriter/toolbar/previewobjectbar.xml |4 ++-- sw/uiconfig/swxform/toolbar/previewobjectbar.xml |6 ++ 6 files changed, 12 insertions(+), 22 deletions(-) New commits: commit 90fe751ab381cf59e87b79d921b3773567774af2 Author: Jan Holesovsky Date: Thu Nov 27 06:27:29 2014 +0100 sw: Swap Zoom In and Zoom out in the preview toolbars. Zoom Out is expected to be on the left, as in the status bar. Change-Id: Ie2a678af407ead0ae40ab7d89f435c8bfb7d8b8e diff --git a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml index 9a1e05f..94884da 100644 --- a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + diff --git a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml index f0f67aa..9509e1d 100644 --- a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + diff --git a/sw/uiconfig/swform/toolbar/previewobjectbar.xml b/sw/uiconfig/swform/toolbar/previewobjectbar.xml index 9a1e05f..94884da 100644 --- a/sw/uiconfig/swform/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + diff --git a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml index 9a1e05f..94884da 100644 --- a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml index 47479e5..2512308 100644 --- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml @@ -29,9 +29,9 @@ - - + + diff --git a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml index 9a1e05f..94884da 100644 --- a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml @@ -29,11 +29,9 @@ - - - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
www.lists.freedesktop.org
Hi, I came across-your contact over the-web and wanted to-share a brief note. I think a few-changes, aesthetically and/or SEO-wise, can make your site-convert more-visitors into leads-and also get it placed-higher in the organic search-results, for a few of the select terms.(Search-Engine-Optimization is the-process of affecting the visibility of a-website or a web-page in a search-engine's "natural" or un-paid "organic" search-results) This is NOT like one-of those foreign-emails you probably get in your-inbox every day. Just to be-upfront, I have 3 agents that-work with me for Web-Development-&-SEO. I would just-need to know-which (if not both) services-you're open to checking out-information about, either web-design or-SEO. Would you be-open to seeing more-brief info / quote for what-I would like to accomplish? Best regards, Oscar | Director MKT KiwiTech Proudly NZ Headquarters: Napier 4112, Hawke's Bay, New Zealand Other Offices: Northland, Auckland, Waikato, Bay of Plenty, Gisborne, Hawke's Bay, Taranaki, Manawatu-Whanganui, Wellington, Tasman, Nelson, Marlborough, West Coast, Canterbury, Otago, Southland ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
www.lists.freedesktop.org
Hi, I came across-your contact over the-web and wanted to-share a brief note. I think a few-changes, aesthetically and/or SEO-wise, can make your site-convert more-visitors into leads-and also get it placed-higher in the organic search-results, for a few of the select terms.(Search-Engine-Optimization is the-process of affecting the visibility of a-website or a web-page in a search-engine's "natural" or un-paid "organic" search-results) This is NOT like one-of those foreign-emails you probably get in your-inbox every day. Just to be-upfront, I have 3 agents that-work with me for Web-Development-&-SEO. I would just-need to know-which (if not both) services-you're open to checking out-information about, either web-design or-SEO. Would you be-open to seeing more-brief info / quote for what-I would like to accomplish? Best regards, Sharon | Director MKT KiwiTech Proudly NZ Headquarters: Napier 4112, Hawke's Bay, New Zealand Other Offices: Northland, Auckland, Waikato, Bay of Plenty, Gisborne, Hawke's Bay, Taranaki, Manawatu-Whanganui, Wellington, Tasman, Nelson, Marlborough, West Coast, Canterbury, Otago, Southland ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: Who knows of a free UML tool to work with libreoffice?
>> UML Modeller, from the KDE stable, says that's what it does. [nicholas ferguson] I tried doxygen. Along with dot. And selected a subset of directories from LibreOffice. I got 64GB of files. It took nearly 1.5 days. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: guidance to write a unit test for SetMacroSecurityLevel()
>> I can do >> Line 544 >> SfxItemSet* pSet = pSrcMed->GetItemSet(); >> pSet->Put(SfxUInt16Item(SID_MACROEXECMODE,::com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN)); >> and add include >> #include [nicholas ferguson] This does work. But someone needs to write a CPP Unit test of opening up a s/h, then dynamically changing MacroExecMode's and checking that they are ok. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Formatting of README files
On 26/11/2014 23:16, Tor Lillqvist wrote: I wonder if it is politically controversial to be seen as "supporting" a markup language, though, the antithesis to WYSIWYG... Even if it is a quite new and minimal markup language, that doesn't pretend to be even close to full-featured (like troff or TeX). I can imagine the reaction among the trolling population, "oh, so LibreOffice developers don't like their own software, but prefer to write their documentation in this sixties-style markup language, ha ha ha". Actually, the KILLER feature of WordPerfect was always its markup mode. And the sooner we can get that (reveal codes) working in Writer, the better!!! Okay, I might be an old-school typist, but imho pure wysiwyg is an AWFUL idea. Dragging stuff around with a mouse is an awful way of getting stuff in the right place! I've spent my own money on WordPerfect in the past, and would do so again if I had the money to spare - that feature is THAT important to me. Unfortunately, because MS view WP as dangerous competition, my old copies don't work (very well) any more. Seriously, markup-mode IS a killer feature. (Unfortunately, today's vulgate have never known anything other than wysiwyg and don't know what they're missing :-( Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py
ciabot/libreoffice-bugzilla2.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2f103071bccddd87fd11668d56567d62fe67704a Author: Markus Mohrhard Date: Wed Nov 26 23:49:39 2014 + fix script for commits to stable branches diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py index 448b8b2..480182f 100644 --- a/ciabot/libreoffice-bugzilla2.py +++ b/ciabot/libreoffice-bugzilla2.py @@ -138,7 +138,7 @@ def find_target_version(repo, branch): return base + ".0.0.beta" + str(int(max(beta_list)) + 1) print(micro_list) # the next release from libreoffice-x-y is max existing z-branch + 1 -return base + "." + str(max(micro_list) + 1) +return base + "." + str(int(max(micro_list)) + 1) return None ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Formatting of README files
Hi, On Thu, Nov 27, 2014 at 01:16:14AM +0200, Tor Lillqvist wrote: > I wonder if it is politically controversial to be seen as "supporting" a > markup language, though, the antithesis to WYSIWYG... Even if it is a quite > new and minimal markup language, that doesn't pretend to be even close to > full-featured (like troff or TeX). If one of our wonderful Document Liberation guys would volunteer to mentor that, we could have an Easy Hack making LibreOffice exporting/importing MarkDown would be awesome ... > I can imagine the reaction among the trolling population, "oh, so > LibreOffice developers don't like their own software, but prefer to write > their documentation in this sixties-style markup language, ha ha ha". > > But yeah, one should ignore trolls. I actually like the idea quite much. ... and allows us to then direct those trolls towards that Easy Hack with a calm and dry show-me-the-code/put-up-or-shut-up combo. Personally MarkDown seems fine to me and we are actually already using it elsewhere in the project (e.g. Infra docs, Redmine) IIRC. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Formatting of README files
I wonder if it is politically controversial to be seen as "supporting" a markup language, though, the antithesis to WYSIWYG... Even if it is a quite new and minimal markup language, that doesn't pretend to be even close to full-featured (like troff or TeX). I can imagine the reaction among the trolling population, "oh, so LibreOffice developers don't like their own software, but prefer to write their documentation in this sixties-style markup language, ha ha ha". But yeah, one should ignore trolls. I actually like the idea quite much. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/lfrb-vcl-opengl' - include/vcl vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/opengl vcl/source vcl/unx
Rebased ref, commits from common ancestor:
commit 7ac688fa6d7756ce25a3cfe8b4e3d06379a8dd08
Author: Louis-Francis Ratté-Boulianne
Date: Wed Nov 26 09:22:25 2014 -0500
vcl: Use the current OpenGL context for VirtualDevice and Bitmap if possible
Change-Id: I17f6ce66fb8b5bc027d35b4016ae56c24ee0a738
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 9be9c59..1b21851 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -55,6 +55,9 @@ class NSOpenGLView;
#include
#include
+class OpenGLFramebuffer;
+class OpenGLTexture;
+
/// Holds the information of our new child window
struct GLWindow
{
@@ -177,6 +180,13 @@ public:
void AddRef();
void DeRef();
+// use these methods right after setting a context to make sure drawing
happens
+// in the right FBO (default one is for onscreen painting)
+bool AcquireDefaultFramebuffer();
+bool AcquireFramebuffer( OpenGLFramebuffer* pFramebuffer );
+OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture& rTexture );
+void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer );
+
void makeCurrent();
void resetCurrent();
void swapBuffers();
@@ -229,6 +239,11 @@ private:
bool mbPixmap; // is a pixmap instead of a window
#endif
+int mnFramebufferCount;
+OpenGLFramebuffer* mpCurrentFramebuffer;
+OpenGLFramebuffer* mpFirstFramebuffer;
+OpenGLFramebuffer* mpLastFramebuffer;
+
public:
vcl::Region maClipRegion;
int mnPainting;
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 81f774a..a231dae 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/gdiimpl \
vcl/opengl/salbmp \
vcl/opengl/scale \
+ vcl/opengl/framebuffer \
vcl/opengl/texture \
vcl/source/opengl/OpenGLContext \
vcl/source/opengl/OpenGLHelper \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 76be2c1..29695e9 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/x11/x11sys \
vcl/unx/x11/xlimits \
vcl/opengl/x11/gdiimpl \
+ vcl/opengl/x11/salvd \
))
# ultimately we want to split the x11 dependencies out
diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
new file mode 100644
index 000..4ccc1c5
--- /dev/null
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+#define INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+#include
+#include
+
+#include
+
+class VCL_PLUGIN_PUBLIC OpenGLFramebuffer
+{
+private:
+GLuintmnId;
+OpenGLTexture maAttachedTexture;
+
+public:
+OpenGLFramebuffer();
+virtual ~OpenGLFramebuffer();
+
+GLuint Id() const { return mnId; };
+
+voidBind();
+voidUnbind();
+
+boolIsFree() const;
+boolIsAttached( const OpenGLTexture& rTexture ) const;
+voidAttachTexture( const OpenGLTexture& rTexture );
+voidDetachTexture();
+
+public:
+OpenGLFramebuffer* mpPrevFramebuffer;
+OpenGLFramebuffer* mpNextFramebuffer;
+};
+
+#endif // INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 449c1b6..6a812d0 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -39,6 +39,7 @@ class BitmapPalette;
class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap
{
private:
+OpenGLContext* mpContext;
OpenGLTexture maTexture;
boolmbDirtyTexture;
BitmapPalette maPalette;
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index eb003cf..ad4738a 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -22,6 +22,9 @@
#include
#include
+#include
+
+#include
class ImplOpenGLTexture
{
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index f5e5bfb..53ebe5b 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -31,8 +31,8 @@ protected:
boolIsOffscreen() const SAL_OVERRIDE;
virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE;
-virtual bool CompareWinContext( OpenGLContext* pContext ) SAL_OVERRIDE;
virtual OpenGLContext* CreatePixmapCo
Re: Formatting of README files
On Tue, 2014-11-25 at 13:17 +1100, Chris Sherlock wrote: > > Also, what would the feasibility of using Markdown syntax, ala > github.io? Actually this may be an interesting choice for us in the long run. Markdown[1] seems to be popular syntax of choice for README files in many open source projects. Rather than inventing our own syntax, sticking with an already existing standard is probably a good idea IMO. Kohei [1] http://en.wikipedia.org/wiki/Markdown ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |3 +++ 1 file changed, 3 insertions(+) New commits: commit 5991659401a16f1ab2b4a17afde597f786d4695e Author: Maxim Monastirsky Date: Wed Nov 26 19:50:04 2014 +0200 Fix .uno:NumberFormatTime tooltip Change-Id: I4fb9842002f5dcc56c962a9a3437837110c7625d (cherry picked from commit ad19a7057efff98dd8656405d045c7df11a785b1) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 120d1f6..9e6c7de 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1692,6 +1692,9 @@ + Format as Time + + Time ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/lfrb-vcl-opengl' - include/vcl vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/opengl vcl/source vcl/unx
Rebased ref, commits from common ancestor:
commit 7bfea5be70be9d1249b3a2f4c4339e6205e733d2
Author: Louis-Francis Ratté-Boulianne
Date: Wed Nov 26 09:22:25 2014 -0500
vcl: Use the current OpenGL context for VirtualDevice and Bitmap if possible
Change-Id: I17f6ce66fb8b5bc027d35b4016ae56c24ee0a738
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 9be9c59..1b21851 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -55,6 +55,9 @@ class NSOpenGLView;
#include
#include
+class OpenGLFramebuffer;
+class OpenGLTexture;
+
/// Holds the information of our new child window
struct GLWindow
{
@@ -177,6 +180,13 @@ public:
void AddRef();
void DeRef();
+// use these methods right after setting a context to make sure drawing
happens
+// in the right FBO (default one is for onscreen painting)
+bool AcquireDefaultFramebuffer();
+bool AcquireFramebuffer( OpenGLFramebuffer* pFramebuffer );
+OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture& rTexture );
+void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer );
+
void makeCurrent();
void resetCurrent();
void swapBuffers();
@@ -229,6 +239,11 @@ private:
bool mbPixmap; // is a pixmap instead of a window
#endif
+int mnFramebufferCount;
+OpenGLFramebuffer* mpCurrentFramebuffer;
+OpenGLFramebuffer* mpFirstFramebuffer;
+OpenGLFramebuffer* mpLastFramebuffer;
+
public:
vcl::Region maClipRegion;
int mnPainting;
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 81f774a..a231dae 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/gdiimpl \
vcl/opengl/salbmp \
vcl/opengl/scale \
+ vcl/opengl/framebuffer \
vcl/opengl/texture \
vcl/source/opengl/OpenGLContext \
vcl/source/opengl/OpenGLHelper \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 76be2c1..29695e9 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/x11/x11sys \
vcl/unx/x11/xlimits \
vcl/opengl/x11/gdiimpl \
+ vcl/opengl/x11/salvd \
))
# ultimately we want to split the x11 dependencies out
diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
new file mode 100644
index 000..4ccc1c5
--- /dev/null
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+#define INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+#include
+#include
+
+#include
+
+class VCL_PLUGIN_PUBLIC OpenGLFramebuffer
+{
+private:
+GLuintmnId;
+OpenGLTexture maAttachedTexture;
+
+public:
+OpenGLFramebuffer();
+virtual ~OpenGLFramebuffer();
+
+GLuint Id() const { return mnId; };
+
+voidBind();
+voidUnbind();
+
+boolIsFree() const;
+boolIsAttached( const OpenGLTexture& rTexture ) const;
+voidAttachTexture( const OpenGLTexture& rTexture );
+voidDetachTexture();
+
+public:
+OpenGLFramebuffer* mpPrevFramebuffer;
+OpenGLFramebuffer* mpNextFramebuffer;
+};
+
+#endif // INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 449c1b6..6a812d0 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -39,6 +39,7 @@ class BitmapPalette;
class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap
{
private:
+OpenGLContext* mpContext;
OpenGLTexture maTexture;
boolmbDirtyTexture;
BitmapPalette maPalette;
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index eb003cf..ad4738a 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -22,6 +22,9 @@
#include
#include
+#include
+
+#include
class ImplOpenGLTexture
{
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index f5e5bfb..53ebe5b 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -31,8 +31,8 @@ protected:
boolIsOffscreen() const SAL_OVERRIDE;
virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE;
-virtual bool CompareWinContext( OpenGLContext* pContext ) SAL_OVERRIDE;
virtual OpenGLContext* CreatePixmapCo
[Libreoffice-commits] core.git: Branch 'feature/lfrb-vcl-opengl' - 7 commits - include/vcl vcl/headless vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/opengl vcl/quartz vcl/source vcl/unx v
Rebased ref, commits from common ancestor:
commit ddfdf013f00309cfcab1aa9a56a9b1d01cfb5d41
Author: Louis-Francis Ratté-Boulianne
Date: Wed Nov 26 09:22:25 2014 -0500
vcl: Use the current OpenGL context for VirtualDevice and Bitmap if possible
Change-Id: I17f6ce66fb8b5bc027d35b4016ae56c24ee0a738
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 9be9c59..1b21851 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -55,6 +55,9 @@ class NSOpenGLView;
#include
#include
+class OpenGLFramebuffer;
+class OpenGLTexture;
+
/// Holds the information of our new child window
struct GLWindow
{
@@ -177,6 +180,13 @@ public:
void AddRef();
void DeRef();
+// use these methods right after setting a context to make sure drawing
happens
+// in the right FBO (default one is for onscreen painting)
+bool AcquireDefaultFramebuffer();
+bool AcquireFramebuffer( OpenGLFramebuffer* pFramebuffer );
+OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture& rTexture );
+void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer );
+
void makeCurrent();
void resetCurrent();
void swapBuffers();
@@ -229,6 +239,11 @@ private:
bool mbPixmap; // is a pixmap instead of a window
#endif
+int mnFramebufferCount;
+OpenGLFramebuffer* mpCurrentFramebuffer;
+OpenGLFramebuffer* mpFirstFramebuffer;
+OpenGLFramebuffer* mpLastFramebuffer;
+
public:
vcl::Region maClipRegion;
int mnPainting;
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 81f774a..a231dae 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/gdiimpl \
vcl/opengl/salbmp \
vcl/opengl/scale \
+ vcl/opengl/framebuffer \
vcl/opengl/texture \
vcl/source/opengl/OpenGLContext \
vcl/source/opengl/OpenGLHelper \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 76be2c1..29695e9 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/x11/x11sys \
vcl/unx/x11/xlimits \
vcl/opengl/x11/gdiimpl \
+ vcl/opengl/x11/salvd \
))
# ultimately we want to split the x11 dependencies out
diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
new file mode 100644
index 000..4ccc1c5
--- /dev/null
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+#define INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+#include
+#include
+
+#include
+
+class VCL_PLUGIN_PUBLIC OpenGLFramebuffer
+{
+private:
+GLuintmnId;
+OpenGLTexture maAttachedTexture;
+
+public:
+OpenGLFramebuffer();
+virtual ~OpenGLFramebuffer();
+
+GLuint Id() const { return mnId; };
+
+voidBind();
+voidUnbind();
+
+boolIsFree() const;
+boolIsAttached( const OpenGLTexture& rTexture ) const;
+voidAttachTexture( const OpenGLTexture& rTexture );
+voidDetachTexture();
+
+public:
+OpenGLFramebuffer* mpPrevFramebuffer;
+OpenGLFramebuffer* mpNextFramebuffer;
+};
+
+#endif // INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 449c1b6..6a812d0 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -39,6 +39,7 @@ class BitmapPalette;
class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap
{
private:
+OpenGLContext* mpContext;
OpenGLTexture maTexture;
boolmbDirtyTexture;
BitmapPalette maPalette;
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index eb003cf..ad4738a 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -22,6 +22,9 @@
#include
#include
+#include
+
+#include
class ImplOpenGLTexture
{
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index f5e5bfb..53ebe5b 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -31,8 +31,8 @@ protected:
boolIsOffscreen() const SAL_OVERRIDE;
virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE;
-virtual bool CompareWinContext( OpenGLContext* pContext ) SAL_OVERRIDE;
virtual OpenGLContext* CreatePixmapCo
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/shapeexport.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit e97edb6e85a8e272b003e2b07a68d49abf7dd750
Author: Stephan Bergmann
Date: Wed Nov 26 22:21:22 2014 +0100
simplify
Change-Id: I6cb7c66a8dbac1a887d4f218f5de9d73310c809b
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index f0a8db4..6ad5b61 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2448,13 +2448,12 @@ void XMLShapeExport::ImpExportConnectorShape(
nDelta1);
if( nDelta2 != 0 || nDelta3 != 0 )
{
-const char aSpace = ' ';
-sStringBuffer.appendAscii( &aSpace, 1 );
+sStringBuffer.append( ' ' );
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
nDelta2);
if( nDelta3 != 0 )
{
-sStringBuffer.appendAscii( &aSpace, 1 );
+sStringBuffer.append( ' ' );
mrExport.GetMM100UnitConverter().convertMeasureToXML(
sStringBuffer, nDelta3);
}
___
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 Bug 65675 depends on bug 68806, which changed state. Bug 68806 Summary: SIDEBAR: Wrong Paragraph spacing values after activating the Properties pane https://bugs.freedesktop.org/show_bug.cgi?id=68806 What|Removed |Added Status|NEW |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: external/collada2gltf
external/collada2gltf/UnpackedTarball_collada2gltf.mk |1
external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 | 13
++
2 files changed, 14 insertions(+)
New commits:
commit 76b76049e57319a772b863519d8bbc57460eb6f4
Author: Matúš Kukan
Date: Wed Nov 26 22:12:01 2014 +0100
collada2gltf: Force GLSL version
Change-Id: Ia5e29cff04c3a38d992a78b956a93103ad1042a3
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
index 16b7fed..e01ca53 100644
--- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
+++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 \
external/collada2gltf/patches/shader_compatibility.patch.1 \
external/collada2gltf/patches/drop_tr1_support.patch.1 \
+ external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git
a/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1
b/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1
new file mode 100644
index 000..5da2978
--- /dev/null
+++ b/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1
@@ -0,0 +1,13 @@
+diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp
collada2gltf/shaders/commonProfileShaders.cpp
+--- collada2gltf.org/shaders/commonProfileShaders.cpp 2014-11-26
22:05:07.445842977 +0100
collada2gltf/shaders/commonProfileShaders.cpp 2014-11-26
22:07:24.313844588 +0100
+@@ -367,7 +367,8 @@
+ public:
+
+ GLSLShader(shared_ptr profile) {
+-this->_declarations = "#ifdef GL_ES_VERSION_2_0\n";
++this->_declarations = "#version 130\n";
++this->_declarations += "#ifdef GL_ES_VERSION_2_0\n";
+ this->_declarations += "precision highp float;\n";
+ this->_declarations += "#endif\n";
+ this->_body = "void main(void) {\n";
___
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 |3 +++ 1 file changed, 3 insertions(+) New commits: commit ad19a7057efff98dd8656405d045c7df11a785b1 Author: Maxim Monastirsky Date: Wed Nov 26 19:50:04 2014 +0200 Fix .uno:NumberFormatTime tooltip Change-Id: I4fb9842002f5dcc56c962a9a3437837110c7625d diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 120d1f6..9e6c7de 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1692,6 +1692,9 @@ + Format as Time + + Time ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - svx/source
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 34 -
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx |9 -
2 files changed, 8 insertions(+), 35 deletions(-)
New commits:
commit 9a410f9cedbce5276aea48479812ff68210712b0
Author: Maxim Monastirsky
Date: Wed Nov 26 22:26:39 2014 +0200
sidebar: Try to fix initial spacing values
Process SID_ATTR_METRIC status before any other,
and call SetMax methods before SetValue, so indent
values won't be truncated by a wrong max value.
Change-Id: I36d8c0cce9561902aa2c4d531740f56c80207012
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index d7828c4..e6949e4 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -563,7 +563,6 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16
/*nSID*/, SfxItemStat
long nVal = OutputDevice::LogicToLogic( maTxtLeft,
(MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nVal = (long)mpLeftIndent->Normalize( (long)nVal );
-mpLeftIndent->SetValue( nVal, FUNIT_100TH_MM );
if ( maContext.GetCombinedContext_DI() !=
CombinedEnumContext(Application_WriterVariants, Context_Text)
&& maContext.GetCombinedContext_DI() !=
CombinedEnumContext(Application_WriterVariants, Context_Default)
@@ -574,11 +573,6 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16
/*nSID*/, SfxItemStat
long nrVal = OutputDevice::LogicToLogic( aTxtRight,
(MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nrVal = (long)mpRightIndent->Normalize( (long)nrVal );
-mpRightIndent->SetValue( nrVal, FUNIT_100TH_MM );
-
-long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst,
(MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
-nfVal = (long)mpFLineIndent->Normalize( (long)nfVal );
-mpFLineIndent->SetValue( nfVal, FUNIT_100TH_MM );
switch (maContext.GetCombinedContext_DI())
{
@@ -605,6 +599,13 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16
/*nSID*/, SfxItemStat
}
}
+mpLeftIndent->SetValue( nVal, FUNIT_100TH_MM );
+mpRightIndent->SetValue( nrVal, FUNIT_100TH_MM );
+
+long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst,
(MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
+nfVal = (long)mpFLineIndent->Normalize( (long)nfVal );
+mpFLineIndent->SetValue( nfVal, FUNIT_100TH_MM );
+
mpTbxIndent_IncDec->Enable();
const sal_uInt16 nIdIncrIndent =
mpTbxIndent_IncDec->GetItemId(UNO_INCREMENTINDENT);
@@ -823,6 +824,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
get(mpTbxUL_IncDec, "paraspacing");
initial();
+m_aMetricCtl.RequestUpdate();
}
} } // end of namespace svx::sidebar
commit 3e1dc286891e7542f66ddc4ac407556a5aedc9e3
Author: Maxim Monastirsky
Date: Wed Nov 26 20:22:27 2014 +0200
Cleanup some leftovers from the line spacing popup conversion
Change-Id: Ia2e35461958ea5d79241fa2231bd7ef164fc378d
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 2867a5c..d7828c4 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -197,7 +197,6 @@ void ParaPropertyPanel::DataChanged (const
DataChangedEvent& rEvent)
ParaPropertyPanel::~ParaPropertyPanel()
{
-delete mpLnSPItem;
}
void ParaPropertyPanel::ReSize(bool /* bSize */)
@@ -487,10 +486,6 @@ void ParaPropertyPanel::NotifyItemUpdate(
StateChangedIndentImpl( nSID, eState, pState );
break;
-case SID_ATTR_PARA_LINESPACE:
-StateChangedLnSPImpl( nSID, eState, pState );
-break;
-
case SID_ATTR_PARA_ULSPACE:
StateChangedULImpl( nSID, eState, pState );
break;
@@ -657,18 +652,6 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16
/*nSID*/, SfxItemStat
}
}
-void ParaPropertyPanel::StateChangedLnSPImpl( sal_uInt16 /*nSID*/,
SfxItemState eState, const SfxPoolItem* pState )
-{
-meLnSpState = eState;
-
-if( pState && eState >= SfxItemState::DEFAULT )
-{
-if(mpLnSPItem)
-delete mpLnSPItem;
-mpLnSPItem = static_cast(pState->Clone());
-}
-}
-
void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState
eState, const SfxPoolItem* pState )
{
mpTopDist->SetMax( mpTopDist->Normalize( MAX_DURCH ),
MapToFieldUnit(m_eULSpaceUnit) );
@@ -798,8 +781,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent,
maSpace3 (SVX_RES(IMG_SPACE3)),
maIndHang (SVX_RES(IMG_INDENT_HANG)),
maTxtLeft (0),
- mpLnSPItem (NULL),
- meLnSpState (SfxItemState::DONTCARE),
mbOutLineLeft (false),
mbOutLineRight (false),
maUpper (0),
@@ -809,7 +790,6 @@ ParaPr
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/tree/genericelements.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 897513899da32495749f5c1223373154839fc109
Author: Caolán McNamara
Date: Wed Nov 26 20:49:08 2014 +
fix higher debug level build
Change-Id: Ibc2b9e56882fac4ebd181ef9fd66d91981951d32
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx
b/sdext/source/pdfimport/tree/genericelements.cxx
index 76a30e9..7332495 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -27,6 +27,7 @@
#include
#include
+#include
namespace pdfi
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 changed: What|Removed |Added Depends on||70223 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on|70223 | -- 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
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/52ce5239b43bf6b9ce1ceddfe90227920aa57657/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OpenCL nomeclature
On Sun, Nov 23, 2014 at 07:45:37PM -0200, Olivier Hallot wrote: > While translating, I stumbled into > "List of known-bad OpenCL implementation" > "List of known-good OpenCL implementation" > Is this the equivalent of > "List of known bad implementation of OpenCL" > "List of known good implementation of OpenCL" So, I'm not a native English speaker, and I'm by training akin to a logician, so maybe what I'm going to say is a "déformation professionnelle". In my understanding, "List of known-bad OpenCL implementations" (it needs to be a plural IMHO) is equivalent to "List of OpenCL implementations that are known to be bad", while "List of known bad implementations of OpenCL" is equivalent to "List of OpenCL implementations that are known and are bad". "Known to be bad" and "known and bad" are not the same statement. > Also, is there a better word for "bad" in that context? What is > "bad"? underperformance?, incomplete? unreliable? incompatible? > etc... The sentence doesn't say... Maybe the context does. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/workben
vcl/workben/vcldemo.cxx | 70 +---
1 file changed, 49 insertions(+), 21 deletions(-)
New commits:
commit 4d25f804c73e0f8637ddc6e004774e612e53a27f
Author: László Németh
Date: Wed Nov 26 19:51:30 2014 +0100
vcldemo profiling: support Windows time resolution
Change-Id: I0a8f6b256f170b351a5d46cc899d6360123b2719
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 282e61c..9ba5118 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -37,6 +37,7 @@
#define FIXME_SELF_INTERSECTING_WORKING 0
#define FIXME_BOUNCE_BUTTON 0
+#define THUMB_REPEAT_FACTOR 10
using namespace com::sun::star;
@@ -83,11 +84,15 @@ class DemoRenderer
virtual sal_uInt16 getAccelerator() = 0;
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) = 0;
-#define RENDER_DETAILS(name,key) \
+// repeating count for profiling (to exceed the poor time resolution
on Windows)
+virtual sal_uInt16 getTestRepeatCount() = 0;
+#define RENDER_DETAILS(name,key,repeat) \
virtual OUString getName() SAL_OVERRIDE \
{ return OUString(SAL_STRINGIFY(name)); } \
virtual sal_uInt16 getAccelerator() SAL_OVERRIDE \
-{ return key; }
+{ return key; } \
+virtual sal_uInt16 getTestRepeatCount() SAL_OVERRIDE \
+{ return repeat; }
double sumTime;
int countTime;
@@ -202,7 +207,7 @@ public:
struct DrawLines : public RegionRenderer
{
-RENDER_DETAILS(lines,KEY_L)
+RENDER_DETAILS(lines,KEY_L,100)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
{
@@ -289,7 +294,7 @@ public:
struct DrawText : public RegionRenderer
{
-RENDER_DETAILS(text,KEY_T)
+RENDER_DETAILS(text,KEY_T,100)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &) SAL_OVERRIDE
{
@@ -302,7 +307,7 @@ public:
struct DrawCheckered : public RegionRenderer
{
-RENDER_DETAILS(checks,KEY_C)
+RENDER_DETAILS(checks,KEY_C,20)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
{
@@ -363,7 +368,7 @@ public:
struct DrawPoly : public RegionRenderer
{
-RENDER_DETAILS(poly,KEY_P)
+RENDER_DETAILS(poly,KEY_P,20)
DrawCheckered maCheckered;
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
@@ -387,7 +392,7 @@ public:
struct DrawEllipse : public RegionRenderer
{
-RENDER_DETAILS(ellipse,KEY_E)
+RENDER_DETAILS(ellipse,KEY_E,5000)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &) SAL_OVERRIDE
{
@@ -399,7 +404,7 @@ public:
struct DrawGradient : public RegionRenderer
{
-RENDER_DETAILS(gradient,KEY_G)
+RENDER_DETAILS(gradient,KEY_G,50)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
{
@@ -469,7 +474,7 @@ public:
struct DrawBitmap : public RegionRenderer
{
-RENDER_DETAILS(bitmap,KEY_B)
+RENDER_DETAILS(bitmap,KEY_B,10)
// Simulate Page Borders rendering - which ultimately should
// be done with a shader / gradient
@@ -529,7 +534,7 @@ public:
struct DrawBitmapEx : public RegionRenderer
{
-RENDER_DETAILS(bitmapex,KEY_X)
+RENDER_DETAILS(bitmapex,KEY_X,2)
DrawCheckered maCheckered;
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
@@ -547,7 +552,7 @@ public:
struct DrawPolyPolygons : public RegionRenderer
{
-RENDER_DETAILS(polypoly,KEY_N)
+RENDER_DETAILS(polypoly,KEY_N,100)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &) SAL_OVERRIDE
{
@@ -598,7 +603,7 @@ public:
struct DrawToVirtualDevice : public RegionRenderer
{
-RENDER_DETAILS(vdev,KEY_V)
+RENDER_DETAILS(vdev,KEY_V,1)
enum RenderType {
RENDER_AS_BITMAP,
RENDER_AS_OUTDEV,
@@ -665,7 +670,7 @@ public:
struct DrawIcons : public RegionRenderer
{
-RENDER_DETAILS(icons,KEY_I)
+RENDER_DETAILS(icons,KEY_I,1)
std::vector maIconNames;
std::vector maIcons;
@@ -899,7 +904,7 @@ public:
struct FetchDrawBitmap : public RegionRenderer
{
-RENDER_DETAILS(fetchdraw,KEY_F)
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/vcldemo.cxx | 70 +---
1 file changed, 49 insertions(+), 21 deletions(-)
New commits:
commit 13c619c58c8ffa7862b491547c252fdcad1e9d9d
Author: László Németh
Date: Wed Nov 26 19:51:30 2014 +0100
vcldemo profiling: support Windows time resolution
Change-Id: I0a8f6b256f170b351a5d46cc899d6360123b2719
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 10a87c2..6ce434b 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -37,6 +37,7 @@
#define FIXME_SELF_INTERSECTING_WORKING 0
#define FIXME_BOUNCE_BUTTON 0
+#define THUMB_REPEAT_FACTOR 10
using namespace com::sun::star;
@@ -83,11 +84,15 @@ class DemoRenderer
virtual sal_uInt16 getAccelerator() = 0;
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) = 0;
-#define RENDER_DETAILS(name,key) \
+// repeating count for profiling (to exceed the poor time resolution
on Windows)
+virtual sal_uInt16 getTestRepeatCount() = 0;
+#define RENDER_DETAILS(name,key,repeat) \
virtual OUString getName() SAL_OVERRIDE \
{ return OUString(SAL_STRINGIFY(name)); } \
virtual sal_uInt16 getAccelerator() SAL_OVERRIDE \
-{ return key; }
+{ return key; } \
+virtual sal_uInt16 getTestRepeatCount() SAL_OVERRIDE \
+{ return repeat; }
double sumTime;
int countTime;
@@ -202,7 +207,7 @@ public:
struct DrawLines : public RegionRenderer
{
-RENDER_DETAILS(lines,KEY_L)
+RENDER_DETAILS(lines,KEY_L,100)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
{
@@ -289,7 +294,7 @@ public:
struct DrawText : public RegionRenderer
{
-RENDER_DETAILS(text,KEY_T)
+RENDER_DETAILS(text,KEY_T,100)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &) SAL_OVERRIDE
{
@@ -302,7 +307,7 @@ public:
struct DrawCheckered : public RegionRenderer
{
-RENDER_DETAILS(checks,KEY_C)
+RENDER_DETAILS(checks,KEY_C,20)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
{
@@ -363,7 +368,7 @@ public:
struct DrawPoly : public RegionRenderer
{
-RENDER_DETAILS(poly,KEY_P)
+RENDER_DETAILS(poly,KEY_P,20)
DrawCheckered maCheckered;
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
@@ -387,7 +392,7 @@ public:
struct DrawEllipse : public RegionRenderer
{
-RENDER_DETAILS(ellipse,KEY_E)
+RENDER_DETAILS(ellipse,KEY_E,5000)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &) SAL_OVERRIDE
{
@@ -399,7 +404,7 @@ public:
struct DrawGradient : public RegionRenderer
{
-RENDER_DETAILS(gradient,KEY_G)
+RENDER_DETAILS(gradient,KEY_G,50)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
{
@@ -469,7 +474,7 @@ public:
struct DrawBitmap : public RegionRenderer
{
-RENDER_DETAILS(bitmap,KEY_B)
+RENDER_DETAILS(bitmap,KEY_B,10)
// Simulate Page Borders rendering - which ultimately should
// be done with a shader / gradient
@@ -529,7 +534,7 @@ public:
struct DrawBitmapEx : public RegionRenderer
{
-RENDER_DETAILS(bitmapex,KEY_X)
+RENDER_DETAILS(bitmapex,KEY_X,2)
DrawCheckered maCheckered;
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &rCtx) SAL_OVERRIDE
@@ -547,7 +552,7 @@ public:
struct DrawPolyPolygons : public RegionRenderer
{
-RENDER_DETAILS(polypoly,KEY_N)
+RENDER_DETAILS(polypoly,KEY_N,100)
virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
const RenderContext &) SAL_OVERRIDE
{
@@ -598,7 +603,7 @@ public:
struct DrawToVirtualDevice : public RegionRenderer
{
-RENDER_DETAILS(vdev,KEY_V)
+RENDER_DETAILS(vdev,KEY_V,1)
enum RenderType {
RENDER_AS_BITMAP,
RENDER_AS_OUTDEV,
@@ -665,7 +670,7 @@ public:
struct DrawIcons : public RegionRenderer
{
-RENDER_DETAILS(icons,KEY_I)
+RENDER_DETAILS(icons,KEY_I,1)
std::vector maIconNames;
std::vector maIcons;
@@ -899,7 +904,7 @@ public:
struct FetchDrawBitmap : public RegionRenderer
{
-RENDER_DETAILS(fetchdraw,KEY_F)
Re: OpenCL nomeclature
On 26/11/2014 18:37, Anthonys Lists wrote: On 23/11/2014 21:45, Olivier Hallot wrote: Hi While translating, I stumbled into "List of known-bad OpenCL implementation" "List of known-good OpenCL implementation" Is this the equivalent of "List of known bad implementation of OpenCL" "List of known good implementation of OpenCL" sorry if it look stupid to ask, but when it comes to translation... Also, is there a better word for "bad" in that context? What is "bad"? underperformance?, incomplete? unreliable? incompatible? etc... I'd like to avoid naming something "bad" (that is, can be "bad for LibeOffice and "good" for another software). Actually, I'd say it needs translating into English :-) in that "list of" takes a plural noun. I'd be inclined to keep the first version but change "implementation" to "implementations". However, with the same change, the second version is equally good, just a bit more verbose. Replying to myself :-) I'd also add that "bad" in this context I simply understand as "will cause problems". In other words, if you use a "known good" version, it should work as intended. If you use a "known bad" version, you may (or may not) have problems but some people definitely will. So "known bad" doesn't mean unusable, but it means that there are known bugs when using it. Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OpenCL nomeclature
On 23/11/2014 21:45, Olivier Hallot wrote: Hi While translating, I stumbled into "List of known-bad OpenCL implementation" "List of known-good OpenCL implementation" Is this the equivalent of "List of known bad implementation of OpenCL" "List of known good implementation of OpenCL" sorry if it look stupid to ask, but when it comes to translation... Also, is there a better word for "bad" in that context? What is "bad"? underperformance?, incomplete? unreliable? incompatible? etc... I'd like to avoid naming something "bad" (that is, can be "bad for LibeOffice and "good" for another software). Actually, I'd say it needs translating into English :-) in that "list of" takes a plural noun. I'd be inclined to keep the first version but change "implementation" to "implementations". However, with the same change, the second version is equally good, just a bit more verbose. Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 43514] UI: Need an easy way to get from current position in a document to the corresponding position in the Navigatior dialog's header tree
https://bugs.freedesktop.org/show_bug.cgi?id=43514 --- Comment #10 from Cor Nouws --- (In reply to Rishabh from comment #9) > If this bug is still open, I would like to take it up as my first bug. Any > suggestions on where to start from? Thanks, Please look at comment 2 and if you need more suggestions, go to the developer mail list or irc. Cor -- 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: sal/rtl
sal/rtl/bootstrap.cxx |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 85b5e24b903b6b4438ce422e6cb3eb8c7a02035f
Author: Stephan Bergmann
Date: Wed Nov 26 18:24:41 2014 +0100
Needless indirection
Change-Id: Idf514941f4bb05834d8ac0d7bafbe86e34377611
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 5719ae4..f248819 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -213,15 +213,10 @@ static bool getFromCommandLineArgs(
return found;
}
-inline void getExecutableFile_Impl (rtl_uString ** ppFileURL)
-{
-osl_bootstrap_getExecutableFile_Impl (ppFileURL);
-}
-
static void getExecutableDirectory_Impl (rtl_uString ** ppDirURL)
{
OUString fileName;
-getExecutableFile_Impl (&(fileName.pData));
+osl_bootstrap_getExecutableFile_Impl (&(fileName.pData));
sal_Int32 nDirEnd = fileName.lastIndexOf('/');
OSL_ENSURE(nDirEnd >= 0, "Cannot locate executable directory");
@@ -259,7 +254,7 @@ static OUString & getIniFileName_Impl()
}
else
{
-getExecutableFile_Impl (&(fileName.pData));
+osl_bootstrap_getExecutableFile_Impl (&(fileName.pData));
// get rid of a potential executable extension
OUString progExt = ".bin";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source fpicker/source sd/source slideshow/source vcl/osx
avmedia/source/quicktime/framegrabber.mm |4
avmedia/source/quicktime/player.mm |4
avmedia/source/quicktime/window.mm |4
fpicker/source/aqua/CFStringUtilities.mm |2
++
fpicker/source/aqua/ControlHelper.mm |6
++
sd/source/ui/remotecontrol/BluetoothServer.cxx |2
++
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |4
vcl/osx/DragSource.cxx |3
+++
vcl/osx/a11ywrapper.mm |9
+
vcl/osx/salprn.cxx |3
+++
vcl/osx/salsys.cxx |2
++
11 files changed, 43 insertions(+)
New commits:
commit 038683bf4cf3b6f9e4f90295ddbab2d6a3d86b25
Author: Stephan Bergmann
Date: Wed Nov 26 18:12:01 2014 +0100
Silence Mac OS X 10.9/10.10 deprecations for now
Change-Id: Ie63ed8f6f66a7641ad872f93d76efb962333cec9
diff --git a/avmedia/source/quicktime/framegrabber.mm
b/avmedia/source/quicktime/framegrabber.mm
index 4e3e177..3a88689 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -30,6 +30,8 @@
using namespace ::com::sun::star;
+SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
+
namespace avmedia { namespace quicktime {
@@ -135,4 +137,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL
FrameGrabber::getSupportedServiceNames
} // namespace quicktime
} // namespace avmedia
+SAL_WNODEPRECATED_DECLARATIONS_POP
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/player.mm
b/avmedia/source/quicktime/player.mm
index d376459..79e7dd7 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -25,6 +25,8 @@
using namespace ::com::sun::star;
+SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
+
namespace avmedia { namespace quicktime {
@@ -389,4 +391,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL
Player::getSupportedServiceNames( )
} // namespace quicktime
} // namespace avmedia
+SAL_WNODEPRECATED_DECLARATIONS_POP
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/window.mm
b/avmedia/source/quicktime/window.mm
index 0950ead..52736f0 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -25,6 +25,8 @@
using namespace ::com::sun::star;
+SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
+
namespace avmedia { namespace quicktime {
static ::osl::Mutex& ImplGetOwnStaticMutex()
@@ -280,4 +282,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL
Window::getSupportedServiceNames( )
} // namespace quicktime
} // namespace avmedia
+SAL_WNODEPRECATED_DECLARATIONS_POP
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/CFStringUtilities.mm
b/fpicker/source/aqua/CFStringUtilities.mm
index 65faf9a..de92804 100644
--- a/fpicker/source/aqua/CFStringUtilities.mm
+++ b/fpicker/source/aqua/CFStringUtilities.mm
@@ -58,7 +58,9 @@ rtl::OUString FSRefToOUString(FSRef fsRef, InfoType info)
{
//DBG_PRINT_ENTRY("CFStringUtilities", __func__);
+SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 CFURLCreateFromFSRef
CFURLRef aUrlRef = CFURLCreateFromFSRef(NULL, &fsRef);
+SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::OUString sResult = CFURLRefToOUString(aUrlRef, info);
diff --git a/fpicker/source/aqua/ControlHelper.mm
b/fpicker/source/aqua/ControlHelper.mm
index 5dc9d94..5e76fb4 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -204,7 +204,9 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId )
retVal = [temp OUString];
}
else {
+SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 title
NSString* sLabel = [[pControl cell] title];
+SAL_WNODEPRECATED_DECLARATIONS_POP
retVal = [sLabel OUString];
}
@@ -232,7 +234,9 @@ void ControlHelper::setLabel( sal_Int16 nControlId,
NSString* aLabel )
m_aMapListLabels[pControl] = [aLabel retain];
} else if ([pControl class] == [NSButton class]) {
+SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 setTitle
[[pControl cell] setTitle:aLabel];
+SAL_WNODEPRECATED_DECLARATIONS_POP
}
} else {
SAL_INFO("fpicker.aqua","Control not found to set label for");
@@ -952,7 +956,9 @@ NSTextField* ControlHelper::createLabelWithString(NSString*
labelString) {
[textField setSelectable:NO];
[textField setDrawsBackground:NO];
[textField setBordered:NO];
+SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 setTitle
[[textField cell] setTitle
[Libreoffice-commits] core.git: scp2/InstallModule_python.mk
scp2/InstallModule_python.mk |4 1 file changed, 4 deletions(-) New commits: commit 210ef021f7f61d20bd1d9953916dce1f0e386970 Author: Stephan Bergmann Date: Wed Nov 26 17:33:38 2014 +0100 Remove some obsolete defines Change-Id: I6b62a824787cba47f3d3004f09ed684275c95995 diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 30ca821..7074a82 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -36,10 +36,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/python,\ $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DPYVERSION=$(PYTHON_VERSION) \ - -DPYMAJMIN=$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ - -DPYMAJOR=$(PYTHON_VERSION_MAJOR) \ - -DPY_FULL_DLL_NAME=$(if $(filter WNT-MSC,$(OS)-$(COM)),python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so) \ - $(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - dbaccess/source
dbaccess/source/ui/dlg/paramdialog.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 53819935ee018fff6225540cde2407e0b6de52f3
Author: Adolfo Jayme Barrientos
Date: Tue Nov 25 22:42:34 2014 -0600
Add missing space in translatable string
Change-Id: I88dabd5612069a7de3cad188344cc5c33ba22a7e
Reviewed-on: https://gerrit.libreoffice.org/13127
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
(cherry picked from commit 9303192c4f1ff623f20ef4501723c003678140de)
Reviewed-on: https://gerrit.libreoffice.org/13139
diff --git a/dbaccess/source/ui/dlg/paramdialog.src
b/dbaccess/source/ui/dlg/paramdialog.src
index fc8d020..23b1c55 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -21,7 +21,7 @@
String STR_COULD_NOT_CONVERT_PARAM
{
-Text [ en-US ] = "The entry could not be converted to a valid value for
the \"$name$\"column";
+Text [ en-US ] = "The entry could not be converted to a valid value for
the \"$name$\" column";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk pyuno/CustomTarget_pyuno_pythonloader_ini.mk pyuno/Module_pyuno.mk pyuno/Package_py
Repository.mk|6 + instsetoo_native/CustomTarget_setup.mk | 21 -- instsetoo_native/Package_setup.mk|1 pyuno/CustomTarget_pyuno_pythonloader_ini.mk | 35 +++ pyuno/Module_pyuno.mk|2 pyuno/Package_pyuno_pythonloader_ini.mk | 16 + scp2/InstallModule_python.mk |1 scp2/source/python/profileitem_python.scp| 83 --- 8 files changed, 59 insertions(+), 106 deletions(-) New commits: commit a756b783e3cdb9234a375014e91487ae84921170 Author: Stephan Bergmann Date: Wed Nov 26 17:20:52 2014 +0100 Use Package_pyuno_pythonloader_ini for install Change-Id: Ia4f06beea2e16b6a0235c87ae47cec8430cd1f40 diff --git a/Repository.mk b/Repository.mk index 9078590..5476f89 100644 --- a/Repository.mk +++ b/Repository.mk @@ -840,6 +840,12 @@ $(eval $(call gb_Helper_register_packages_for_install,writer_brand,\ )) endif # GUIBASE=unx +ifneq ($(DISABLE_PYTHON),TRUE) +$(eval $(call gb_Helper_register_packages_for_install,python, \ +pyuno_pythonloader_ini \ +)) +endif + # External executables $(eval $(call gb_ExternalExecutable_register_executables,\ genbrk \ diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 68d23cf..30ca821 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -46,7 +46,6 @@ endif $(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\ scp2/source/python/file_python \ scp2/source/python/file_python_librelogo \ -scp2/source/python/profileitem_python \ scp2/source/python/module_python \ )) diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp deleted file mode 100644 index 29d33e8..000 --- a/scp2/source/python/profileitem_python.scp +++ /dev/null @@ -1,83 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "macros.inc" - -#ifndef DISABLE_PYUNO - -Profile gid_Profile_Pythonloader_Uno_Ini -ModuleID = gid_Module_Pyuno; - #ifdef UNX -Name = "pythonloader.unorc"; - #else -Name = "pythonloader.uno.ini"; - #endif -Dir = GID_BRAND_DIR_ETC; -Styles = (NETWORK); -End - -#ifndef SYSTEM_PYTHON -ProfileItem gid_Profileitem_Pythonloader_Pythonhome -ProfileID = gid_Profile_Pythonloader_Uno_Ini; -ModuleID = gid_Module_Pyuno; -Section = "Bootstrap"; -Order = 1; -Key = "PYUNO_LOADER_PYTHONHOME"; - #if defined MACOSX -Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework"; - #else -Value = CONCAT2($ORIGIN/python-core-,PYVERSION); - #endif -End -#endif - -ProfileItem gid_Profileitem_Pythonloader_Pythonpath -ProfileID = gid_Profile_Pythonloader_Uno_Ini; -ModuleID = gid_Module_Pyuno; -Section = "Bootstrap"; -Order = 1; -Key = "PYUNO_LOADER_PYTHONPATH"; - #if defined SYSTEM_PYTHON -Value = "$ORIGIN"; - #elif defined MACOSX -#define FRAMEWORKLIB CONCAT2($ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN) -Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB, - /lib-dynload FRAMEWORKLIB, - /lib-tk FRAMEWORKLIB, - /site-packages $ORIGIN); - #elif defined UNX -Value = CONCAT9($ORIGIN/python-core-,PYVERSION, - /lib $ORIGIN/python-core-,PYVERSION, - /lib/lib-dynload $ORIGIN/python-core-,PYVERSION, - /lib/lib-tk $ORIGIN/python-core-,PYVERSION, - /lib/site-packages $ORIGIN); - #elif defined _gcc3 -Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION, - /lib $ORIGIN/python-core-,PYVERSION, - /lib/lib-dynload $ORIGIN/python-core-,PYVERSION, - /lib/lib-tk $ORIGIN/python-core-,PYVERSION, - /lib/site-packages $ORIGIN)); - #else -Value = STRING(CONCAT5($ORIGIN/python-core-,PYVERSION, - /lib $ORIGIN/python-core-,PYVERSION, - /lib/site-packages $ORIGIN)); - #endif -End - -// DISABLE_PYUNO -#endif commit 004e515ba659edd8cd9c3d915c1c0722be7e252c Author: Stephan Bergmann Date: Wed Nov 26 17:01:
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - cui/uiconfig
cui/uiconfig/ui/spellingdialog.ui | 42 +- 1 file changed, 37 insertions(+), 5 deletions(-) New commits: commit 2493facca9c8067e6c8db286958d27bf3a13b71a Author: Caolán McNamara Date: Wed Nov 26 16:17:10 2014 + Resolves: fdo#79707 duplicate acceserator keys in spell checking dialog Change-Id: I75d2c7ac735ad3fd430eb7a3ef28ff58930769b6 (cherry picked from commit da6ea10cd4a673661da016c6e8195f12876e7f73) diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 4d5b171..5d89284 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -1,8 +1,8 @@ - + - + False 6 @@ -35,7 +35,7 @@ -O_ptions... +_Options... True True True @@ -103,6 +103,8 @@ 1 0 +1 +1 @@ -118,6 +120,7 @@ 0 2 3 +1 @@ -132,6 +135,8 @@ 2 3 +1 +1 @@ -161,11 +166,12 @@ 0 8 3 +1 -_Correct +Co_rrect True True True @@ -175,6 +181,8 @@ 2 9 +1 +1 @@ -189,6 +197,8 @@ 2 10 +1 +1 @@ -203,11 +213,13 @@ 2 11 +1 +1 -Check _grammar +Chec_k grammar True True False @@ -219,6 +231,7 @@ 0 12 3 +1 @@ -233,6 +246,8 @@ 2 4 +1 +1 @@ -247,6 +262,8 @@ 2 5 +1 +1 @@ -261,6 +278,8 @@ 0 0 +1 +1 @@ -275,6 +294,7 @@ 0 1 2 +1 @@ -289,6 +309,8 @@ 2 1 +1 +1 @@ -301,6 +323,8 @@ 0 13 +1 +1 @@ -313,6 +337,8 @@ 1 13 +1 +1 @@ -325,6 +351,8 @@ 2 13 +1 +1 @@ -356,6 +384,8 @@ 2 6 +1 +1 @@ -370,6 +400,8 @@ 2 7 +1 +1 ___ 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/spellingdialog.ui | 42 +- 1 file changed, 37 insertions(+), 5 deletions(-) New commits: commit da6ea10cd4a673661da016c6e8195f12876e7f73 Author: Caolán McNamara Date: Wed Nov 26 16:17:10 2014 + Resolves: fdo#79707 duplicate acceserator keys in spell checking dialog Change-Id: I75d2c7ac735ad3fd430eb7a3ef28ff58930769b6 diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 4d5b171..5d89284 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -1,8 +1,8 @@ - + - + False 6 @@ -35,7 +35,7 @@ -O_ptions... +_Options... True True True @@ -103,6 +103,8 @@ 1 0 +1 +1 @@ -118,6 +120,7 @@ 0 2 3 +1 @@ -132,6 +135,8 @@ 2 3 +1 +1 @@ -161,11 +166,12 @@ 0 8 3 +1 -_Correct +Co_rrect True True True @@ -175,6 +181,8 @@ 2 9 +1 +1 @@ -189,6 +197,8 @@ 2 10 +1 +1 @@ -203,11 +213,13 @@ 2 11 +1 +1 -Check _grammar +Chec_k grammar True True False @@ -219,6 +231,7 @@ 0 12 3 +1 @@ -233,6 +246,8 @@ 2 4 +1 +1 @@ -247,6 +262,8 @@ 2 5 +1 +1 @@ -261,6 +278,8 @@ 0 0 +1 +1 @@ -275,6 +294,7 @@ 0 1 2 +1 @@ -289,6 +309,8 @@ 2 1 +1 +1 @@ -301,6 +323,8 @@ 0 13 +1 +1 @@ -313,6 +337,8 @@ 1 13 +1 +1 @@ -325,6 +351,8 @@ 2 13 +1 +1 @@ -356,6 +384,8 @@ 2 6 +1 +1 @@ -370,6 +400,8 @@ 2 7 +1 +1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice extensions to ODF: Improving documentation
On 17.11.2014 06:21, Robinson Tryon wrote: > To make it easier to keep track of what we've extended in ODF (and > what has been proposed to OASIS vs. added to the next version of ODF > vs. been implemented in LO, etc..) I thought up a few new columns to > add to our table that lists all LibreOffice extensions to ODF: > https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#List_of_LibreOffice_ODF_extensions > > This update should make it easier for both devs and users to keep > track of our ODF extensions, and to help them understand what features > will be lost if documents are saved as ODF 1.2 vs. ODF 1.2 Extended. > > Here's the extended list of columns: sounds nice, except: > ! ODF Version(s) Extended this should generally be the latest ODF version that the LO release supports, and if you select to store your files in a specific, non-extended version in Tools->Options you don't (or at least shouldn't) get any extensions... so what's the benefit of tracking this? > ! Validation Errors i'm not sure if this is so useful - you can tell the validator if you want to check strictly against the schema or allow extensions: -c: Check conformance (default for ODF 1.2 documents) -e: Check extended conformance (ODF 1.2 documents only) if the extensions are properly name-spaced then validation with -e should not report any errors, and validating a document stored as "extended" with strict conformance will inevitably report problems, so don't do that. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Embedding.xcu |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 2babe1baf46dcad936703d12cbd847393f5e467b Author: Caolán McNamara Date: Wed Nov 26 15:42:46 2014 + Resolves: fdo#75408 go back to the old way of doing things Revert "Resolves: rhbz#1012353 fdo#48846 allow starmath objects to be resized" This reverts commit 1b717e5686f34c3ce798310a6216f7ea98fb2cd9. Change-Id: Iaf8410fc1e5611cda04356d32e37ee25a7f59898 (cherry picked from commit 51221bbf0c7cca0a329393dac2059818006ab338) diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu index 44031e8..e39af5d 100644 --- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu @@ -236,7 +236,9 @@ com.sun.star.formula.FormulaProperties - + +8589934592 + PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE SAVECOPYAS ___ 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/Embedding.xcu |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 51221bbf0c7cca0a329393dac2059818006ab338 Author: Caolán McNamara Date: Wed Nov 26 15:42:46 2014 + Resolves: fdo#75408 go back to the old way of doing things Revert "Resolves: rhbz#1012353 fdo#48846 allow starmath objects to be resized" This reverts commit 1b717e5686f34c3ce798310a6216f7ea98fb2cd9. Change-Id: Iaf8410fc1e5611cda04356d32e37ee25a7f59898 diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu index 44031e8..e39af5d 100644 --- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu @@ -236,7 +236,9 @@ com.sun.star.formula.FormulaProperties - + +8589934592 + PRIMARY SHOW OPEN HIDE UIACTIVATE IPACTIVATE SAVECOPYAS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - cui/source
cui/source/dialogs/colorpicker.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 037e65cbdd76dc06593a43adbd72427c8765736c
Author: Caolán McNamara
Date: Wed Nov 26 15:24:20 2014 +
Resolves: fdo#85590 'Pick a color' circle location is incorrect when opened
Change-Id: I18a00d0ab7acc30f4751c0e19cceffefdce90474
(cherry picked from commit 7716d86f46dea72bd0e99f7074f718d558e88f49)
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index f52e724..15601c9 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -665,6 +665,7 @@ void ColorFieldControl::Paint( const Rectangle& rRect )
void ColorFieldControl::Resize()
{
UpdateBitmap();
+UpdatePosition();
Control::Resize();
}
___
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/dialogs/colorpicker.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 7716d86f46dea72bd0e99f7074f718d558e88f49
Author: Caolán McNamara
Date: Wed Nov 26 15:24:20 2014 +
Resolves: fdo#85590 'Pick a color' circle location is incorrect when opened
Change-Id: I18a00d0ab7acc30f4751c0e19cceffefdce90474
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index f52e724..15601c9 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -665,6 +665,7 @@ void ColorFieldControl::Paint( const Rectangle& rRect )
void ColorFieldControl::Resize()
{
UpdateBitmap();
+UpdatePosition();
Control::Resize();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 85113, which changed state. Bug 85113 Summary: EDITING: copying or cutting previously animated table leads to crash https://bugs.freedesktop.org/show_bug.cgi?id=85113 What|Removed |Added Status|NEW |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: Branch 'libreoffice-4-3' - sd/source
sd/source/core/stlpool.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ec8beb2fa279b8d7b1efbd9f5414895b17dfbe8b
Author: Katarina Behrens
Date: Fri Sep 5 14:11:15 2014 +0200
fdo#82681: return IsUserDefined w/o negation
when the predicate is called StyleSheetIsUserDefinedPredicate
Returning negation thereof somewhere, somehow, corrupts one of
SfxItem pools. Thus, invalid read happens and crashes Impress
and Draw.
Now the loop in SdStyleSheetPool::UpdateStdNames does nothing
(it iterates through user-defined styles, but its body does
something for non-user-defined styles), so more investigation
here is needed.
This is partial revert of commit 3440766f0ad43454287a874b5fd34b6f2af6bdf1
Change-Id: I06f0da320c49674dac2adf43b7c374babbdadb57
(cherry picked from commit a784c33fd48eeb3394dc63610e384cf866233093)
Signed-off-by: Andras Timar
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 17ca4f0..c98dff7 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -943,7 +943,7 @@ struct StyleSheetIsUserDefinedPredicate :
svl::StyleSheetPredicate
bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE
{
-return !sheet.IsUserDefined();
+return sheet.IsUserDefined();
}
};
}
___
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' - writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
| 62 +++
writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
| 62 +++
writerfilter/source/rtftok/rtfdocumentimpl.cxx
| 87 ++
3 files changed, 177 insertions(+), 34 deletions(-)
New commits:
commit 8f8dc43621029459f28cf82228fe0931124f769e
Author: Caolán McNamara
Date: Wed Aug 20 08:56:54 2014 +0100
Resolves: fdo#86449 CVE-2014-9093 backport rtf fixes
The actual bug is against 3.5.4 and 4.2 doesn't crash in anything like the
same
way but it does still crash. So these fixes stop the provided examples from
crashing in 4.2 on using top on an empty stack, which isn't the same as
actually being a fix for CVE-2014-9093 as seen in 3.5.X
empty Reference
valgrind + bff
(cherry picked from commit 0a42632a74596cbc781746931bf8f2650994b80f)
empty m_aStates
valgrind + bff
(cherry picked from commit e3247719911f4e9b61ec43ea1c9ce04bcddc4ff8)
3bd526b7ebf0f4fce5d0c7054809e0dc2908e73f
Reviewed-on: https://gerrit.libreoffice.org/12965
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
(cherry picked from commit b4840d3632e4404bee4bd192a7db916cbad3a401)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Resolves: fdo#86451 guard all the tops post pop
Reviewed-on: https://gerrit.libreoffice.org/12966
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
(cherry picked from commit 566300ebd57e6ff07fdb014321e23a92c9bcf5ee)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
98be6f014893dfc7cee770c44cd9d0be32b39f5c
Change-Id: Id3c039a46dec5d2d4a4642dfb53d23a76972dde2
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
new file mode 100644
index 000..44dae52
--- /dev/null
+++
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
@@ -0,0 +1,62 @@
+{\rtf1\ansi\deff0\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0
Arial;}{\f3\froman\fprq2\fcharset128 Times New
Roman;}{\f4\froman\fprq2\fcharset128 Arial
Narrow;}{\f5\froman\fprq0\fcharset128 Arial
Narrow;}{\f6\froman\fprq2\fcharset128 Symbol;}{\f7\froman\fprq0\fcharset128
Symbol;}{\f8\froman\fprq2\fcharset128 Wingdings;}{\f9\froman\fprq0\fcharset128
Wingdings;}{\f10\froman\fprq0\fcharset128 Times New
Roman;}{\f11\fnil\fprq2\fcharset0 Microsoft YaHei;}{\f12\fnil\fprq2\fcharset128
SimSun;}{\f13\fnil\fprq2\fcharset128 Times New Roman
(Arabic);}{\f14\fnil\fprq0\fcharset128 Times New Roman
(Arabic);}{\f15\fnil\fprq2\fcharset128 Times New
Roman;}{\f16\fnil\fprq0\fcharset128 Times New Roman;}{\f17\fnil\fprq2\fcharset0
Mangal;}{\f18\fnil\fprq0\fcharset128 Mangal;}{\f19\fnil\fprq2\fcharset128
Mangal;}{\f20\fnil\fprq2\fcharset128 Cambria Math;}{\f21\fnil\fprq0\fcharset128
Cambria Math;}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\hich\af22\langfe2052\dbch\af17\afs24\alang1081\loch\f0\fs24\lang1040
Predefinito;}
+{\s15\sbasedon0\snext16\sb240\sa120\keepn\hich\af11\dbch\af17\afs28\loch\f2\fs28
Intestazione;}
+{\s16\sbasedon0\snext16\sb0\sa120 Corpo testo;}
+{\s17\sbasedon16\snext17\sb0\sa120\dbch\af18 Elenco;}
+{\s18\sbasedon0\snext18\sb120\sa120\noline\i\dbch\af18\afs24\ai\fs24
Didascalia;}
+{\s19\sbasedon0\snext19\noline\dbch\af18 Indice;}
+}{\info{\creatim\yr2011\mo9\dy28\hr16\min28}{\revtim\yr2011\mo9\dy28\hr16\min29}{\printim\yr0\mo0\dy0\hr0\min0}{\comment
LibreOffice}{\vern3500}}\deftab720
+
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse195\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1417\margbsxn1134\pgdscnxt0
Predefinito;}}
+\formshade{\*\pgdscno0}\paperh15840\paperw12240\margl1134\margr1134\margt1417\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1417\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\trowd\trql\trleft-108\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clvertalt\cellx9864\pgndec\pard\plain
\s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\hich\af22\langfe2052\dbch\af17\afs24\alang1081\loch\f0\fs24\lang1040\intbl\qr\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\keepn{\scaps\b\hich\af14\langfe1040\dbch\af14\afs26\alang1025\ab\rtlch
\ltrch\loch\fs26\lang1040\loch\f5
+SS
[Libreoffice-commits] core.git: 2 commits - vcl/source
vcl/source/opengl/OpenGLContext.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 406883895bee90358f7840bde569abf885ca2712
Author: Michael Stahl
Date: Wed Nov 26 15:59:28 2014 +0100
vcl: prefix global variable g_vShareList
Change-Id: I13ecc76d8bd75ee65e626670995d7c93efc953ca
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 534ce88..fb0e4ed 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -33,9 +33,9 @@ using namespace com::sun::star;
// TODO use rtl::Static instead of 'static'
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
-static std::vector vShareList;
+static std::vector g_vShareList;
#elif defined(WNT)
-static std::vector vShareList;
+static std::vector g_vShareList;
#endif
GLWindow::~GLWindow()
@@ -77,7 +77,7 @@ OpenGLContext::~OpenGLContext()
#if defined( WNT )
if (m_aGLWin.hRC)
{
-vShareList.erase(std::remove(vShareList.begin(), vShareList.end(),
m_aGLWin.hRC), vShareList.end());
+g_vShareList.erase(std::remove(g_vShareList.begin(),
g_vShareList.end(), m_aGLWin.hRC), g_vShareList.end());
wglMakeCurrent( m_aGLWin.hDC, 0 );
wglDeleteContext( m_aGLWin.hRC );
@@ -90,7 +90,7 @@ OpenGLContext::~OpenGLContext()
#elif defined( UNX )
if(m_aGLWin.ctx)
{
-vShareList.erase(std::remove( vShareList.begin(), vShareList.end(),
m_aGLWin.ctx), vShareList.end());
+g_vShareList.erase(std::remove( g_vShareList.begin(),
g_vShareList.end(), m_aGLWin.ctx), g_vShareList.end());
glXMakeCurrent(m_aGLWin.dpy, None, NULL);
if( glGetError() != GL_NO_ERROR )
@@ -696,8 +696,8 @@ bool OpenGLContext::ImplInit()
SAL_INFO("vcl.opengl", "OpenGLContext::ImplInitstart");
-if( !vShareList.empty() )
-pSharedCtx = vShareList.front();
+if (!g_vShareList.empty())
+pSharedCtx = g_vShareList.front();
#ifdef DBG_UTIL
if (!mbPixmap && glXCreateContextAttribsARB && !mbRequestLegacyContext)
@@ -737,7 +737,7 @@ bool OpenGLContext::ImplInit()
if( m_aGLWin.ctx )
{
-vShareList.push_back( m_aGLWin.ctx );
+g_vShareList.push_back( m_aGLWin.ctx );
}
else
{
@@ -903,8 +903,8 @@ bool OpenGLContext::ImplInit()
return false;
HGLRC hSharedCtx = 0;
-if (!vShareList.empty())
-hSharedCtx = vShareList.front();
+if (!g_vShareList.empty())
+hSharedCtx = g_vShareList.front();
// now setup the shared context; this needs a temporary context already
// set up in order to work
@@ -926,7 +926,7 @@ bool OpenGLContext::ImplInit()
return false;
}
-vShareList.push_back(m_aGLWin.hRC);
+g_vShareList.push_back(m_aGLWin.hRC);
RECT clientRect;
GetClientRect(WindowFromDC(m_aGLWin.hDC), &clientRect);
commit bfaf877421bff1db74d1ba84a039075baf9d5800
Author: Michael Stahl
Date: Wed Nov 26 15:58:02 2014 +0100
vcl: fix STL asserts in ~OpenGLContext(), calling wrong erase() overload
Change-Id: Ia830ac1e70f74859dff871f24538af3f2f83fd9d
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index a93185f..534ce88 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -77,7 +77,7 @@ OpenGLContext::~OpenGLContext()
#if defined( WNT )
if (m_aGLWin.hRC)
{
-vShareList.erase(std::remove(vShareList.begin(), vShareList.end(),
m_aGLWin.hRC));
+vShareList.erase(std::remove(vShareList.begin(), vShareList.end(),
m_aGLWin.hRC), vShareList.end());
wglMakeCurrent( m_aGLWin.hDC, 0 );
wglDeleteContext( m_aGLWin.hRC );
@@ -90,7 +90,7 @@ OpenGLContext::~OpenGLContext()
#elif defined( UNX )
if(m_aGLWin.ctx)
{
-vShareList.erase(std::remove( vShareList.begin(), vShareList.end(),
m_aGLWin.ctx ));
+vShareList.erase(std::remove( vShareList.begin(), vShareList.end(),
m_aGLWin.ctx), vShareList.end());
glXMakeCurrent(m_aGLWin.dpy, None, NULL);
if( glGetError() != GL_NO_ERROR )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk instsetoo_native/Module_instsetoo_native.mk instsetoo_native/ooenv instsetoo_native/Package_instsetoo_native_ooenv.mk instsetoo_n
instsetoo_native/CustomTarget_setup.mk | 14 --- instsetoo_native/Module_instsetoo_native.mk|1 instsetoo_native/Package_instsetoo_native_ooenv.mk | 14 +++ instsetoo_native/Package_setup.mk |1 instsetoo_native/ooenv | 25 + 5 files changed, 40 insertions(+), 15 deletions(-) New commits: commit 233cccfe31135d77815e4c09374a18238310cc68 Author: Stephan Bergmann Date: Wed Nov 26 16:03:12 2014 +0100 Move instdir-only ooenv into its own Package Change-Id: I399f4c5c6618dd151bd649f07e1b9d661e224324 diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index abab2b3..40a8557 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -13,7 +13,6 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ $(call gb_Helper_get_rcfile,bootstrap) \ $(call gb_Helper_get_rcfile,fundamental) \ $(call gb_Helper_get_rcfile,louno) \ - $(if $(ENABLE_OOENV),ooenv) \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \ $(call gb_Helper_get_rcfile,redirect))) \ @@ -26,7 +25,6 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) \ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) \ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,louno) \ -$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv \ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) \ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) \ : $(SRCDIR)/instsetoo_native/CustomTarget_setup.mk @@ -89,18 +87,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'UNO_USER_PACKAGES_CACHE=$$UNO_USER_PACKAGES/cache' \ ) > $@ -$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv : - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - ( \ - echo 'ulimit -c unlimited' && \ - echo '# debugging assistance' && \ - echo 'export SAL_DISABLE_FLOATGRAB=1' && \ - echo 'export G_SLICE=always-malloc' && \ - echo 'export MALLOC_CHECK_=2' && \ - echo 'export MALLOC_PERTURB_=153' && \ - echo 'export OOO_DISABLE_RECOVERY=1' \ - ) > $@ - $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,pythonloader.uno) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk index 1566250..cde6859 100644 --- a/instsetoo_native/Module_instsetoo_native.mk +++ b/instsetoo_native/Module_instsetoo_native.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Module_add_targets,instsetoo_native,\ CustomTarget_setup \ Package_setup \ Package_setup_ure \ + $(if $(ENABLE_OOENV),Package_instsetoo_native_ooenv) \ )) # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Package_instsetoo_native_ooenv.mk b/instsetoo_native/Package_instsetoo_native_ooenv.mk new file mode 100644 index 000..67c667e --- /dev/null +++ b/instsetoo_native/Package_instsetoo_native_ooenv.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,instsetoo_native_ooenv,$(SRCDIR)/instsetoo_native)) + +$(eval $(call gb_Package_add_file,instsetoo_native_ooenv,$(LIBO_BIN_FOLDER)/ooenv,ooenv)) + +# vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 1f41c3d..9bf5789 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ $(call gb_Helper_get_rcfile,bootstrap) \ $(call gb_Helper_get_rcfile,fundamental) \ - $(if $(ENABLE_OOENV),ooenv) \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \ $(ca
[Libreoffice-commits] core.git: Branch 'private/moggi/windows-blacklist' - vcl/inc vcl/Library_vcl.mk vcl/opengl vcl/source
Rebased ref, commits from common ancestor:
commit 003b2e6a5fd186c3fe6237f3d0fbebf70247db1e
Author: Markus Mohrhard
Date: Mon Nov 24 16:46:15 2014 +0100
implement windows OpenGL blacklist, first step
Change-Id: I408b76855693c64473dba3bb3fa94374fff01fae
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 932ca4c..fbdb5bd 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -646,6 +646,7 @@ endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/win/gdiimpl \
+ vcl/opengl/win/WinDeviceInfo \
vcl/win/source/app/saldata \
vcl/win/source/app/salinfo \
vcl/win/source/app/salinst \
@@ -683,6 +684,7 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\
uuid \
version \
winspool \
+ setupapi \
shlwapi \
))
diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx
b/vcl/inc/opengl/win/WinDeviceInfo.hxx
new file mode 100644
index 000..140662e
--- /dev/null
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -0,0 +1,121 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_OPENGL_WIN_WINDEVICEINFO_HXX
+#define INCLUDED_VCL_OPENGL_WIN_WINDEVICEINFO_HXX
+
+#include "opengl/DeviceInfo.hxx"
+#include
+
+namespace wgl {
+
+enum OperatingSystem {
+DRIVER_OS_UNKNOWN = 0,
+DRIVER_OS_WINDOWS_XP,
+DRIVER_OS_WINDOWS_SERVER_2003,
+DRIVER_OS_WINDOWS_VISTA,
+DRIVER_OS_WINDOWS_7,
+DRIVER_OS_WINDOWS_8,
+DRIVER_OS_WINDOWS_8_1,
+DRIVER_OS_LINUX,
+DRIVER_OS_OS_X_10_5,
+DRIVER_OS_OS_X_10_6,
+DRIVER_OS_OS_X_10_7,
+DRIVER_OS_OS_X_10_8,
+DRIVER_OS_ANDROID,
+DRIVER_OS_ALL
+};
+
+enum VersionComparisonOp {
+DRIVER_LESS_THAN, // driver < version
+DRIVER_LESS_THAN_OR_EQUAL,// driver <= version
+DRIVER_GREATER_THAN, // driver > version
+DRIVER_GREATER_THAN_OR_EQUAL, // driver >= version
+DRIVER_EQUAL, // driver == version
+DRIVER_NOT_EQUAL, // driver != version
+DRIVER_BETWEEN_EXCLUSIVE, // driver > version && driver < versionMax
+DRIVER_BETWEEN_INCLUSIVE, // driver >= version && driver <= versionMax
+DRIVER_BETWEEN_INCLUSIVE_START, // driver >= version && driver < versionMax
+DRIVER_COMPARISON_IGNORED
+};
+
+enum DeviceFamily {
+IntelGMA500,
+IntelGMA900,
+IntelGMA950,
+IntelGMA3150,
+IntelGMAX3000,
+IntelGMAX4500HD,
+IntelHD3000,
+IntelMobileHDGraphics,
+NvidiaBlockD3D9Layers,
+RadeonX1000,
+Geforce7300GT,
+Nvidia310M,
+DeviceFamilyMax
+};
+
+enum DeviceVendor {
+VendorAll,
+VendorIntel,
+VendorNVIDIA,
+VendorAMD,
+VendorATI,
+VendorMicrosoft,
+DeviceVendorMax
+};
+
+}
+
+class WinOpenGLDeviceInfo : public OpenGLDeviceInfo
+{
+private:
+OUString maDriverVersion;
+OUString maDriverVersion2;
+
+OUString maDriverDate;
+OUString maDriverDate2;
+
+OUString maDeviceID;
+OUString maDeviceID2;
+
+OUString maAdapterVendorID;
+OUString maAdapterDeviceID;
+OUString maAdapterSubsysID;
+
+OUString maAdapterVendorID2;
+OUString maAdapterDeviceID2;
+OUString maAdapterSubsysID2;
+
+OUString maDeviceKey;
+OUString maDeviceKey2;
+
+OUString maDeviceString;
+OUString maDeviceString2;
+uint32_t mnWindowsVersion;
+
+bool mbHasDualGPU;
+bool mbHasDriverVersionMismatch;
+bool mbRDP;
+
+void GetData();
+OUString GetDeviceVendor(wgl::DeviceVendor eVendor);
+
+static OUString* mpDeviceVendors[wgl::DeviceVendorMax];
+
+public:
+WinOpenGLDeviceInfo();
+virtual ~WinOpenGLDeviceInfo();
+
+virtual bool isDeviceBlocked();
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
new file mode 100644
index 000..b1ddf2f
--- /dev/null
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -0,0 +1,633 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "opengl/win/WinDeviceInfo.hxx"
+
+#include
+#include
+#include
+
+OUString* WinOpenGLDeviceInfo::mpDeviceVendors[wgl::DeviceVendorMax];
+
+namespace {
+
+
+void GetDLLVersion(const sal_Unicode* aDLLPath, OUString& aVersion)
+{
+DWORD versInfoSize, vers[4] = {0};
+// version info not available case
+aVersion = OUString("0.0.0.0");
+versInfoSize = G
[Libreoffice-commits] core.git: Branch 'feature/lfrb-vcl-opengl' - include/vcl vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/opengl vcl/source vcl/unx
Rebased ref, commits from common ancestor:
commit c25d061adb5bab1d6c47008f1a93c86605659c4c
Author: Louis-Francis Ratté-Boulianne
Date: Wed Nov 26 09:22:25 2014 -0500
vcl: Use the current OpenGL context for VirtualDevice and Bitmap if possible
Change-Id: I17f6ce66fb8b5bc027d35b4016ae56c24ee0a738
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 9be9c59..1b21851 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -55,6 +55,9 @@ class NSOpenGLView;
#include
#include
+class OpenGLFramebuffer;
+class OpenGLTexture;
+
/// Holds the information of our new child window
struct GLWindow
{
@@ -177,6 +180,13 @@ public:
void AddRef();
void DeRef();
+// use these methods right after setting a context to make sure drawing
happens
+// in the right FBO (default one is for onscreen painting)
+bool AcquireDefaultFramebuffer();
+bool AcquireFramebuffer( OpenGLFramebuffer* pFramebuffer );
+OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture& rTexture );
+void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer );
+
void makeCurrent();
void resetCurrent();
void swapBuffers();
@@ -229,6 +239,11 @@ private:
bool mbPixmap; // is a pixmap instead of a window
#endif
+int mnFramebufferCount;
+OpenGLFramebuffer* mpCurrentFramebuffer;
+OpenGLFramebuffer* mpFirstFramebuffer;
+OpenGLFramebuffer* mpLastFramebuffer;
+
public:
vcl::Region maClipRegion;
int mnPainting;
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 81f774a..a231dae 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/gdiimpl \
vcl/opengl/salbmp \
vcl/opengl/scale \
+ vcl/opengl/framebuffer \
vcl/opengl/texture \
vcl/source/opengl/OpenGLContext \
vcl/source/opengl/OpenGLHelper \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 76be2c1..29695e9 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/x11/x11sys \
vcl/unx/x11/xlimits \
vcl/opengl/x11/gdiimpl \
+ vcl/opengl/x11/salvd \
))
# ultimately we want to split the x11 dependencies out
diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
new file mode 100644
index 000..4ccc1c5
--- /dev/null
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+#define INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+#include
+#include
+
+#include
+
+class VCL_PLUGIN_PUBLIC OpenGLFramebuffer
+{
+private:
+GLuintmnId;
+OpenGLTexture maAttachedTexture;
+
+public:
+OpenGLFramebuffer();
+virtual ~OpenGLFramebuffer();
+
+GLuint Id() const { return mnId; };
+
+voidBind();
+voidUnbind();
+
+boolIsFree() const;
+boolIsAttached( const OpenGLTexture& rTexture ) const;
+voidAttachTexture( const OpenGLTexture& rTexture );
+voidDetachTexture();
+
+public:
+OpenGLFramebuffer* mpPrevFramebuffer;
+OpenGLFramebuffer* mpNextFramebuffer;
+};
+
+#endif // INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 972fee0..7efa94b 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -39,6 +39,7 @@ class BitmapPalette;
class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap
{
private:
+OpenGLContext* mpContext;
OpenGLTexture maTexture;
boolmbDirtyTexture;
BitmapPalette maPalette;
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index eb003cf..ad4738a 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -22,6 +22,9 @@
#include
#include
+#include
+
+#include
class ImplOpenGLTexture
{
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index f5e5bfb..53ebe5b 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -31,8 +31,8 @@ protected:
boolIsOffscreen() const SAL_OVERRIDE;
virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE;
-virtual bool CompareWinContext( OpenGLContext* pContext ) SAL_OVERRIDE;
virtual OpenGLContext* CreatePixmapCo
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 3 commits - desktop/source pyuno/source sal/osl
desktop/source/lib/init.cxx |8
pyuno/source/module/pyuno_module.cxx |5 -
sal/osl/unx/process_impl.cxx | 25 +++--
sal/osl/w32/process.cxx | 28 +---
4 files changed, 20 insertions(+), 46 deletions(-)
New commits:
commit b7d3c7c6a0c2562625c43e5dd1f2599a54a1d43e
Author: Stephan Bergmann
Date: Wed Nov 26 14:40:34 2014 +0100
No need to call osl_setCommandArgs
...cf. 2ad716f406e0fdb9b9294876c64ae92fecbf5e27 "Revert 'pyuno: set up fake
command line in getComponentContext()'" and
54981ce9286073306513fa58405ebc7730eb6dfb "Adapt some logs and assertions."
Change-Id: I15229a29a3557b0490d7876b418dd24620ee4df5
(cherry picked from commit 2163ec3691ece9a00927891645190a971f775295)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fcef5b0..261b2f6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -666,14 +666,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
try
{
-// If we've set up the command args elsewhere then we cannot do it
-// again (as an assert will fire), this will be the case e.g.
-// for unit tests (and possibly if UNO is being used in addition
-// to LOK in an external program).
-if (!osl_areCommandArgsSet())
-{
-osl_setCommandArgs(0, NULL);
-}
initialize_uno(aAppURL);
force_c_locale();
commit 523a6710d0a28426f6f9747e1f401cf67b865c3a
Author: Stephan Bergmann
Date: Tue Nov 25 23:35:47 2014 +0100
Adapt some logs and assertions
...cf. previous 2ad716f406e0fdb9b9294876c64ae92fecbf5e27 "Revert 'pyuno:
set up
fake command line in getComponentContext().'"
Change-Id: Ia77132465ada17a5839f9d4f9ccaf20f8b113075
(cherry picked from commit 54981ce9286073306513fa58405ebc7730eb6dfb)
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 3942f14..0936b38 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -164,7 +164,9 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount (void)
sal_uInt32 result = 0;
pthread_mutex_lock (&(g_command_args.m_mutex));
-SAL_WARN_IF (g_command_args.m_nCount == 0, "sal.osl",
"osl_setCommandArgs() not called before calling osl_getCommandArgCount()");
+SAL_INFO_IF(
+g_command_args.m_nCount == 0, "sal.osl",
+"osl_getCommandArgCount w/o prior call to osl_setCommandArgs");
if (g_command_args.m_nCount > 0)
result = g_command_args.m_nCount - 1;
pthread_mutex_unlock (&(g_command_args.m_mutex));
@@ -180,7 +182,7 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32
nArg, rtl_uString ** strC
oslProcessError result = osl_Process_E_NotFound;
pthread_mutex_lock (&(g_command_args.m_mutex));
-OSL_ASSERT(g_command_args.m_nCount > 0);
+assert(g_command_args.m_nCount > 0);
if (g_command_args.m_nCount > (nArg + 1))
{
rtl_uString_assign (strCommandArg, g_command_args.m_ppArgs[nArg + 1]);
@@ -204,7 +206,7 @@ int SAL_CALL osl_areCommandArgsSet (void)
**/
void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
{
-OSL_ASSERT(argc > 0);
+assert(argc > 0);
pthread_mutex_lock (&(g_command_args.m_mutex));
assert (g_command_args.m_nCount == 0);
if (g_command_args.m_nCount == 0)
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 6db821b..23180af 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -28,11 +28,14 @@
#pragma warning(pop)
#endif
+#include
+
#include
#include
#include
#include
#include
+#include
#include "getexecutablefile.hxx"
#include "procimpl.h"
@@ -268,7 +271,7 @@ static rtl_uString ** osl_createCommandArgs_Impl (int argc,
char **)
int i;
int nArgs;
LPWSTR *wargv = CommandLineToArgvW( GetCommandLineW(), &nArgs );
-OSL_ASSERT( nArgs == argc );
+assert( nArgs == argc );
for (i = 0; i < nArgs; i++)
{
/* Convert to unicode */
@@ -334,11 +337,9 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount(void)
sal_uInt32 result = 0;
osl_acquireMutex (*osl_getGlobalMutex());
-if (g_command_args.m_nCount == 0) {
-OSL_TRACE(
-OSL_LOG_PREFIX
-"osl_getCommandArgCount w/o prior call to osl_setCommandArgs");
-}
+SAL_INFO_IF(
+g_command_args.m_nCount == 0, "sal.osl",
+"osl_getCommandArgCount w/o prior call to osl_setCommandArgs");
if (g_command_args.m_nCount > 0)
{
/* We're not counting argv[0] here. */
@@ -356,7 +357,7 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32
nArg, rtl_uString **strCo
oslProcessError result = osl_Process_E_NotFound;
osl_acquireMutex (*osl_getGlobalMutex());
-OSL_ASSERT(g_command_args.m_nCount > 0);
+assert(g
Re: LibreOffice-4.3.4.1 compile error with GCC-4.9.2
On 17.11.2014 15:04, Qurban Ullah wrote: > I tried many time with system libs and without system libs, each time I faced > the same problem. > > /build/libreoffice/libreoffice-4.3.4.1/workdir/CxxObject/helpcompiler/source/HelpIndexer_main.o: > In function `main': > HelpIndexer_main.cxx:(.text.startup+0x3b6): undefined reference to > `HelpIndexer::HelpIndexer(rtl::OUString const&, rtl::OUString const&, > rtl::OUString const&, rtl::OUString const&)' > HelpIndexer_main.cxx:(.text.startup+0x3d8): undefined reference to > `HelpIndexer::indexDocuments()' > HelpIndexer_main.cxx:(.text.startup+0x3f1): undefined reference to > `HelpIndexer::getErrorMessage()' hi Qurban, i'm unable to reproduce this problem, libreoffice-4-3 branch builds fine for me with: gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) what does the following print for you: nm --demangle workdir/CxxObject/helpcompiler/source/HelpIndexer.o |grep HelpIndexer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/lfrb-vcl-opengl' - 1874 commits - accessibility/source android/experimental animations/source apple_remote/source autogen.sh avmedia/Library_avmediagst.
Rebased ref, commits from common ancestor:
commit 88001441d3c3e7182caad3b557992371ca1dffe1
Author: Louis-Francis Ratté-Boulianne
Date: Wed Nov 26 09:22:25 2014 -0500
vcl: Use the current OpenGL context for VirtualDevice and Bitmap if possible
Change-Id: I17f6ce66fb8b5bc027d35b4016ae56c24ee0a738
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 9be9c59..1b21851 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -55,6 +55,9 @@ class NSOpenGLView;
#include
#include
+class OpenGLFramebuffer;
+class OpenGLTexture;
+
/// Holds the information of our new child window
struct GLWindow
{
@@ -177,6 +180,13 @@ public:
void AddRef();
void DeRef();
+// use these methods right after setting a context to make sure drawing
happens
+// in the right FBO (default one is for onscreen painting)
+bool AcquireDefaultFramebuffer();
+bool AcquireFramebuffer( OpenGLFramebuffer* pFramebuffer );
+OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture& rTexture );
+void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer );
+
void makeCurrent();
void resetCurrent();
void swapBuffers();
@@ -229,6 +239,11 @@ private:
bool mbPixmap; // is a pixmap instead of a window
#endif
+int mnFramebufferCount;
+OpenGLFramebuffer* mpCurrentFramebuffer;
+OpenGLFramebuffer* mpFirstFramebuffer;
+OpenGLFramebuffer* mpLastFramebuffer;
+
public:
vcl::Region maClipRegion;
int mnPainting;
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 81f774a..a231dae 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/gdiimpl \
vcl/opengl/salbmp \
vcl/opengl/scale \
+ vcl/opengl/framebuffer \
vcl/opengl/texture \
vcl/source/opengl/OpenGLContext \
vcl/source/opengl/OpenGLHelper \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 76be2c1..29695e9 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/x11/x11sys \
vcl/unx/x11/xlimits \
vcl/opengl/x11/gdiimpl \
+ vcl/opengl/x11/salvd \
))
# ultimately we want to split the x11 dependencies out
diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
new file mode 100644
index 000..4ccc1c5
--- /dev/null
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+#define INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+#include
+#include
+
+#include
+
+class VCL_PLUGIN_PUBLIC OpenGLFramebuffer
+{
+private:
+GLuintmnId;
+OpenGLTexture maAttachedTexture;
+
+public:
+OpenGLFramebuffer();
+virtual ~OpenGLFramebuffer();
+
+GLuint Id() const { return mnId; };
+
+voidBind();
+voidUnbind();
+
+boolIsFree() const;
+boolIsAttached( const OpenGLTexture& rTexture ) const;
+voidAttachTexture( const OpenGLTexture& rTexture );
+voidDetachTexture();
+
+public:
+OpenGLFramebuffer* mpPrevFramebuffer;
+OpenGLFramebuffer* mpNextFramebuffer;
+};
+
+#endif // INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 972fee0..7efa94b 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -39,6 +39,7 @@ class BitmapPalette;
class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap
{
private:
+OpenGLContext* mpContext;
OpenGLTexture maTexture;
boolmbDirtyTexture;
BitmapPalette maPalette;
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index eb003cf..ad4738a 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -22,6 +22,9 @@
#include
#include
+#include
+
+#include
class ImplOpenGLTexture
{
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index f5e5bfb..53ebe5b 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -31,8 +31,8 @@ protected:
boolIsOffscreen() const SAL_OVERRIDE;
virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE;
-virtual bool CompareWinContext( OpenGLContext* pContext ) SAL_OVERRIDE;
virtual OpenGLContext* CreatePixmapCo
RE: guidance to write a unit test for SetMacroSecurityLevel()
] > the MacroSecurityLevel is just a configuration entry, see officecfg/registry/schema/org/openoffice/Office/Common.xcs. ] > there is already one unit test that sets the MacroSecurityLevel: ] > dbaccess/qa/complex/dbaccess/DatabaseDocument.java (from JunitTest_dbaccess_complex) [nicholas ferguson] I was looking more for a c++ unit test for calc. in sc/qa/unit/helper/qahelper.cxx in load member function. I can do Line 544 SfxItemSet* pSet = pSrcMed->GetItemSet(); pSet->Put(SfxUInt16Item(SID_MACROEXECMODE,::com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN)); and add include #include I would like to see a c++ unit test for calc, which sets this dynamically? It has some issues with the VB layer...still researching... On/Off/On/Off Does anyone have that kind of test already written? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] osl_areCommandArgsSet
On 07/31/2014 10:48 AM, Stephan Bergmann wrote:
* the documentation of osl_areCommandArgsSet is missing a @since tag;
please fix
* given that osl_setCommandArgs is deprecated and for internal use only,
osl_areCommandArgsSet should arguably have been added as internal-only
functionality ("detail" identifier namespace, "PRIVATE_" ELF symbol map
namespace); please at least mark it as internal-only in the documentation
* the implementations of osl_areCommandArgsSet
(sal/osl/unx/process_impl.cxx, sal/osl/w32/process.cxx) are broken as
they access g_command_args.m_nCount without the corresponding mutex
locked; please fix
the above have apparently been addressed meanwhile
* the design of osl_areCommandArgsSet and its use in
desktop/source/lib/init.cxx are broken, as it is prone to TOCTOU
* adding osl_areCommandArgsSet was unnecessary; given that
osl_setCommandArgs(0,NULL) is already handled as a special case, that
case can be extended to silently do nothing if osl_setCommandArgs has
already been called previously; please fix the LOK use-case that way
the call in LOK is gone now with
"No need to call osl_setCommandArgs"
* "and possibly if UNO is being used in addition to LOK in an external
program": by design, osl_setCommandsArgs is exclusively called from
sal_detail_initialize, which in turn is exclusively called form
SAL_IMPLEMENT_MAIN[_WITH_ARGS], and every process that uses binary UNO
needs to implement main via those macros; note that
sal_detail_[de]initialize potentially does further things necessary for
binary UNO to work properly besides calling osl_setCommandArgs; it is
unwise to hack around that for the LOK use-case in an ad hoc way
has this been considered by the LOK authors?
* was it necessary to backport osl_areCommandArgsSet to LO 4.3 (given I
see no mention of LOK in
)?
I'm still interested in an answer here; I'm planing on moving
osl_areCommandArgsSet to an aborting stub in sal/osl/all/compat.cxx for
LO 4.4 (after b'porting the above-mentioned
2163ec3691ece9a00927891645190a971f775295), on the assumption that its
inclusion in 4.3 was a mistake and it thus will never have been called
in a released product
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/languagetool
external/languagetool/UnpackedTarball_languagetool.mk |1 +
external/languagetool/french.haiti.patch | 11 +++
2 files changed, 12 insertions(+)
New commits:
commit dce30375a0bb17b974f6dd6cb92a452e2f0dd492
Author: Caolán McNamara
Date: Wed Nov 26 13:40:43 2014 +
there is no HI country code, I suspect it should be HT for Haiti
https://github.com/languagetool-org/languagetool/pull/219
Change-Id: I32e5caac17165a77d0803e782a285a9f32752742
(cherry picked from commit 4e14439b065d3f36823029bb1a314dad5af73821)
diff --git a/external/languagetool/UnpackedTarball_languagetool.mk
b/external/languagetool/UnpackedTarball_languagetool.mk
index efca850..757a4b3 100644
--- a/external/languagetool/UnpackedTarball_languagetool.mk
+++ b/external/languagetool/UnpackedTarball_languagetool.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,languagetool,\
external/languagetool/MessageBox-apichange.patch \
external/languagetool/english.ireland.patch \
external/languagetool/esperanto.territory.patch \
+external/languagetool/french.haiti.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/languagetool/french.haiti.patch
b/external/languagetool/french.haiti.patch
new file mode 100644
index 000..207699e
--- /dev/null
+++ b/external/languagetool/french.haiti.patch
@@ -0,0 +1,11 @@
+---
misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/French.java
misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/French.java
+@@ -54,7 +54,7 @@
+ @Override
+ public String[] getCountryVariants() {
+ return new String[]{"FR", "", "BE", "CH", "CA", "LU", "MC", "CM",
+-"CI", "HI", "ML", "SN", "CD", "MA", "RE"};
++"CI", "HT", "ML", "SN", "CD", "MA", "RE"};
+ }
+
+ @Override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa writerfilter/source
sw/qa/core/data/rtf/pass/ooo121333-1.rtf | 43 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 13 ++-
2 files changed, 48 insertions(+), 8 deletions(-)
New commits:
commit c51c39ddf6d513afda83d4f15549c6277a0cc211
Author: Caolán McNamara
Date: Wed Nov 26 12:44:10 2014 +
always pass bookmark name through to domainmapper
the rtf doc has three bookmark starts but only two matching
bookmark ends.
The tokenizer has three starts 0, 1, 2, but 0 is missing an end. Without the
end of 0, the mapper never inserts an entry for it, so later inserts the
start
of rtftok index 1 as mapper index 0, and passing the end for a bare "1"
cannot
be found by index. If we pass the name then it finds it by name as mapper
index
0 and all is well.
Change-Id: I344db84e4f1c7d55fca59cdfe692080c7d0b8033
(cherry picked from commit 2b54caceab9d975bffa7e24bf732cb877b16632f)
Reviewed-on: https://gerrit.libreoffice.org/13133
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/core/data/rtf/pass/ooo121333-1.rtf
b/sw/qa/core/data/rtf/pass/ooo121333-1.rtf
new file mode 100644
index 000..7f3b531
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/ooo121333-1.rtf
@@ -0,0 +1,43 @@
+{\rtf1\ansi\deff0\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0
Arial;}{\f3\fswiss\fprq2\fcharset0 Trebuchet MS;}{\f4\fswiss\fprq2\fcharset128
Arial;}{\f5\fswiss\fprq2\fcharset0 Arial Unicode MS;}{\f6\fnil\fprq2\fcharset0
Mangal;}{\f7\fnil\fprq0\fcharset0 Mangal;}}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033
Default;}
+{\s15\sbasedon0\snext16\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sb240\sa120\keepn\ltrpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\loch\f2\fs28\lang1033
Heading;}
+{\s16\sbasedon0\snext16\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sb0\sa120\ltrpar\cf0\kerning1\hich\af0\langfe2052\dbch\af0\loch\f0\fs24\lang1033
Text body;}
+{\s17\sbasedon16\snext17\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sb0\sa120\ltrpar\cf0\kerning1\hich\af0\langfe2052\dbch\af7\loch\f0\fs24\lang1033
List;}
+{\s18\sbasedon0\snext18\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sb120\sa120\ltrpar\cf0\i\kerning1\hich\af0\langfe2052\dbch\af7\ai\loch\f0\fs24\lang1033
Caption;}
+{\s19\sbasedon0\snext19\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\ltrpar\cf0\kerning1\hich\af0\langfe2052\dbch\af7\loch\f0\fs24\lang1033
Index;}
+}{\info{\author Lisa
Stroyan}{\creatim\yr2012\mo11\dy10\hr15\min44}{\revtim\yr2012\mo11\dy10\hr16\min16}{\printim\yr0\mo0\dy0\hr0\min0}{\comment
OpenOffice.org}{\vern3410}}\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709
+
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse195\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
Default;}}
+\formshade{\*\pgdscno0}\paperh15840\paperw12240\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\pgndec\pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{\rtlch
\ltrch
+\'93}{\rtlch \ltrch\loch
+test\'94}
+\par \pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{\rtlch
\ltrch\loch
+}
+\par \pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{\rtlch
\ltrch\loch\f3
+\'93}{\rtlch \ltrch\loch\loch\f4
+Another }{\rtlch \ltrch\dbch\loch\f4
+\u21520\'3f}{\rtlch \ltrch\loch\loch\f4
+oo}{\rtlch \ltrch\loch\loch\f3
+ test\'94}
+\par \pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{\rtlch
\ltrch\loch
+}
+\par \pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{{\*\bkmkstart
__DdeLink__132_187012832}\rtlch \ltrch\loch\loch\f3
+Created (or opened) testoocharacters.odt file with angled double quotes, using
both Times and Trebuchet. Saved as RTF, closed, and reopened.}
+\par \pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch
Re: Crash test update
On Wed, Nov 26, 2014 at 01:06:37PM +, Caolán McNamara wrote: > http://cgit.freedesktop.org/libreoffice/core/commit/?id=2b54caceab9d975bffa7e24bf732cb877b16632f > > seems to do the right thing here. Thanks, it's now in 4-4 as well. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/languagetool
external/languagetool/UnpackedTarball_languagetool.mk |1 +
external/languagetool/french.haiti.patch | 11 +++
2 files changed, 12 insertions(+)
New commits:
commit 4e14439b065d3f36823029bb1a314dad5af73821
Author: Caolán McNamara
Date: Wed Nov 26 13:40:43 2014 +
there is no HI country code, I suspect it should be HT for Haiti
https://github.com/languagetool-org/languagetool/pull/219
Change-Id: I32e5caac17165a77d0803e782a285a9f32752742
diff --git a/external/languagetool/UnpackedTarball_languagetool.mk
b/external/languagetool/UnpackedTarball_languagetool.mk
index efca850..757a4b3 100644
--- a/external/languagetool/UnpackedTarball_languagetool.mk
+++ b/external/languagetool/UnpackedTarball_languagetool.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,languagetool,\
external/languagetool/MessageBox-apichange.patch \
external/languagetool/english.ireland.patch \
external/languagetool/esperanto.territory.patch \
+external/languagetool/french.haiti.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/languagetool/french.haiti.patch
b/external/languagetool/french.haiti.patch
new file mode 100644
index 000..207699e
--- /dev/null
+++ b/external/languagetool/french.haiti.patch
@@ -0,0 +1,11 @@
+---
misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/French.java
misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/French.java
+@@ -54,7 +54,7 @@
+ @Override
+ public String[] getCountryVariants() {
+ return new String[]{"FR", "", "BE", "CH", "CA", "LU", "MC", "CM",
+-"CI", "HI", "ML", "SN", "CD", "MA", "RE"};
++"CI", "HT", "ML", "SN", "CD", "MA", "RE"};
+ }
+
+ @Override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx |8
1 file changed, 8 deletions(-)
New commits:
commit 2163ec3691ece9a00927891645190a971f775295
Author: Stephan Bergmann
Date: Wed Nov 26 14:40:34 2014 +0100
No need to call osl_setCommandArgs
...cf. 2ad716f406e0fdb9b9294876c64ae92fecbf5e27 "Revert 'pyuno: set up fake
command line in getComponentContext()'" and
54981ce9286073306513fa58405ebc7730eb6dfb "Adapt some logs and assertions."
Change-Id: I15229a29a3557b0490d7876b418dd24620ee4df5
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fcef5b0..261b2f6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -666,14 +666,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
try
{
-// If we've set up the command args elsewhere then we cannot do it
-// again (as an assert will fire), this will be the case e.g.
-// for unit tests (and possibly if UNO is being used in addition
-// to LOK in an external program).
-if (!osl_areCommandArgsSet())
-{
-osl_setCommandArgs(0, NULL);
-}
initialize_uno(aAppURL);
force_c_locale();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/UndoBookmark.hxx | 18 +++
sw/source/core/undo/unbkmk.cxx | 57
sw/source/core/unocore/unobkm.cxx | 34 +++--
3 files changed, 87 insertions(+), 22 deletions(-)
New commits:
commit c7fa6687e544e7f9702da23aadbd31c1f2e0115e
Author: Matúš Kukan
Date: Wed Nov 26 11:58:13 2014 +0100
Writer: Set document as modified and add undo when renaming bookmarks
Change-Id: Id0d4695b6a7c5eae0493e679345bd41d4687d6d7
diff --git a/sw/source/core/inc/UndoBookmark.hxx
b/sw/source/core/inc/UndoBookmark.hxx
index b7e0d56..eaa0fcb 100644
--- a/sw/source/core/inc/UndoBookmark.hxx
+++ b/sw/source/core/inc/UndoBookmark.hxx
@@ -67,6 +67,24 @@ public:
virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
};
+class SwUndoRenameBookmark : public SwUndo
+{
+const OUString m_sOldName;
+const OUString m_sNewName;
+const sal_uLong m_nNode;
+const sal_Int32 m_nCntnt;
+
+public:
+SwUndoRenameBookmark( const ::sw::mark::IMark&, const OUString& rNewName );
+virtual ~SwUndoRenameBookmark();
+
+private:
+virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
+void Rename( ::sw::UndoRedoContext &, const OUString& sFrom, const
OUString& sTo );
+virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
+};
+
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index 569fe21..eb11aa9 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -19,6 +19,7 @@
#include
+#include
#include "doc.hxx"
#include "docary.hxx"
#include "swundo.hxx"
@@ -85,4 +86,60 @@ void SwUndoInsBookmark::RedoImpl(::sw::UndoRedoContext &
rContext)
SetInDoc( &rContext.GetDoc() );
}
+SwUndoRenameBookmark::SwUndoRenameBookmark( const ::sw::mark::IMark& rBkmk,
const OUString& rOldName )
+: SwUndo( UNDO_BOOKMARK_RENAME )
+, m_sOldName( rOldName )
+, m_sNewName( rBkmk.GetName() )
+, m_nNode( rBkmk.GetMarkPos().nNode.GetIndex() )
+, m_nCntnt( rBkmk.GetMarkPos().nContent.GetIndex() )
+{
+}
+
+SwUndoRenameBookmark::~SwUndoRenameBookmark()
+{
+}
+
+static OUString lcl_QuoteName(const OUString& rName)
+{
+static const OUString sStart = SW_RES(STR_START_QUOTE);
+static const OUString sEnd = SW_RES(STR_END_QUOTE);
+return sStart + rName + sEnd;
+}
+
+SwRewriter SwUndoRenameBookmark::GetRewriter() const
+{
+SwRewriter aRewriter;
+aRewriter.AddRule(UndoArg1, lcl_QuoteName(m_sOldName));
+aRewriter.AddRule(UndoArg2, SW_RES(STR_YIELDS));
+aRewriter.AddRule(UndoArg3, lcl_QuoteName(m_sNewName));
+return aRewriter;
+}
+
+void SwUndoRenameBookmark::Rename(::sw::UndoRedoContext & rContext, const
OUString& sFrom, const OUString& sTo)
+{
+IDocumentMarkAccess* const pMarkAccess =
rContext.GetDoc().getIDocumentMarkAccess();
+for ( IDocumentMarkAccess::const_iterator_t ppBkmk =
pMarkAccess->getAllMarksBegin();
+ ppBkmk != pMarkAccess->getAllMarksEnd();
+ ++ppBkmk )
+{
+if ( m_nNode == ppBkmk->get()->GetMarkPos().nNode.GetIndex()
+ && m_nCntnt == ppBkmk->get()->GetMarkPos().nContent.GetIndex()
+ && sFrom == ppBkmk->get()->GetName() )
+{
+pMarkAccess->renameMark( ppBkmk->get(), sTo );
+break;
+}
+}
+}
+
+void SwUndoRenameBookmark::UndoImpl(::sw::UndoRedoContext & rContext)
+{
+Rename(rContext, m_sNewName, m_sOldName);
+}
+
+void SwUndoRenameBookmark::RedoImpl(::sw::UndoRedoContext & rContext)
+{
+Rename(rContext, m_sOldName, m_sNewName);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unobkm.cxx
b/sw/source/core/unocore/unobkm.cxx
index 569fcd2..3697649 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -24,17 +24,17 @@
#include
#include
+#include
#include
#include
#include
#include
#include
#include
+#include
#include
#include
#include
-#include
-#include
#include
#include
#include
@@ -42,16 +42,6 @@
using namespace ::sw::mark;
using namespace ::com::sun::star;
-namespace
-{
-static OUString lcl_QuoteName(const OUString& rName)
-{
-static const OUString sStart = SW_RES(STR_START_QUOTE);
-static const OUString sEnd = SW_RES(STR_END_QUOTE);
-return sStart + rName + sEnd;
-}
-}
-
class SwXBookmark::Impl
: public SwClient
{
@@ -359,16 +349,16 @@ throw (uno::RuntimeException, std::exception)
*aPam.GetMark() = m_pImpl->m_pRegisteredBookmark->GetOtherMarkPos();
}
-SwRewriter aRewriter;
-aRewriter.AddRule(UndoArg1, lcl_QuoteName(getName()));
-aRewriter.AddRule(UndoArg2, SW_RES(STR_YIELDS));
-aRewriter.AddRule(UndoArg3, lcl_QuoteName(rName))
[Libreoffice-commits] core.git: 4 commits - extras/Module_extras.mk instsetoo_native/CustomTarget_setup.mk scp2/source
extras/Module_extras.mk|2 +- instsetoo_native/CustomTarget_setup.mk |2 +- scp2/source/ooo/directory_ooo.scp | 16 3 files changed, 2 insertions(+), 18 deletions(-) New commits: commit 97da1b3c060976089f16ea9f01fb479c119ac4d3 Author: Stephan Bergmann Date: Wed Nov 26 12:17:26 2014 +0100 share/template/shellnew/soffice.od? are only installed on Windows Change-Id: Id6afa19b5d1cbb0a76bb7d8a34d40ba4eda214ec diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 51d617f..530d076 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_gallwwwgraf \ Package_glade \ Package_labels \ - Package_newfiles \ + $(if $(filter WNT,$(OS)),Package_newfiles) \ Package_palettes \ Package_tpllayoutimpr \ Package_tplwizagenda \ commit b7e2b744e1e1348a20c120a8f9f9bb2bc4ebb1e3 Author: Stephan Bergmann Date: Wed Nov 26 12:02:43 2014 +0100 Generate consistent buildid values in instdir/ setup and version ini-files ...consistent with the values in the correpsonding ini-files in generated installation sets. Change-Id: I8466cc64d309bbb3fe4bec7833803081d14e1097 diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 01d2f9c..abab2b3 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -131,7 +131,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ echo '[Bootstrap]' \ - && echo 'buildid=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)(Build:$(LIBO_VERSION_PATCH))' \ + && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ ) > $@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) : commit 7e1c55f3c3a227ba44fb56673372cd7b857b5c0c Author: Stephan Bergmann Date: Wed Nov 26 11:23:37 2014 +0100 No need for empty presets/uno_packages/ ...it is created on demand in the UserInstallation via dp_misc::create_folder (desktop/source/deployment/misc/dp_ucb.cxx)---and was only present in installation sets, not in instdir/, anyway. Change-Id: I37caf24a9d8821c49815be9d6b9b15c08a66af95 diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 878da98..1337098 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -132,12 +132,6 @@ Directory gid_Dir_User DosName = "presets"; End -Directory gid_Dir_User_Uno_Packages -ParentID = gid_Dir_User; -DosName = "uno_packages"; -Styles = (CREATE); -End - Directory gid_Dir_User_Basic ParentID = gid_Dir_User; DosName = "basic"; commit d25228d045dd779db98ecbd83394ee019d6a89f8 Author: Stephan Bergmann Date: Wed Nov 26 11:07:48 2014 +0100 No need for empty presets/psprint/ ...it is created on demand in the UserInstallation in psp::getOfficePath (vcl/generic/fontmanager/helper.cxx)---and was only present in installation sets, not in instdir/, anyway. Change-Id: I6d7314f7fa4f6c0040e94e49ac1fe34d03e861be diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 110f67f..878da98 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -386,16 +386,6 @@ End #ifdef UNX -Directory gid_Dir_User_Psprint -ParentID = gid_Dir_User; -DosName = "psprint"; -Styles = (CREATE); -End - -#endif - -#ifdef UNX - Directory gid_Dir_Fonts_Truetype ParentID = gid_Dir_Fonts; DosName = "truetype"; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: guidance to write a unit test for SetMacroSecurityLevel()
On 18.11.2014 23:21, ad...@wingarch.xohost.com wrote: > > > Hi, > Can anyone send me how to access and change a level of the > MacroSecurityLevel? > In > > qa\xmlsecurity\qa\certext\SanCertExt.cxx there is an example of security > for certificates? > > How do I write someting similar for chaning a Macro Security Level? the MacroSecurityLevel is just a configuration entry, see officecfg/registry/schema/org/openoffice/Office/Common.xcs. there is already one unit test that sets the MacroSecurityLevel: dbaccess/qa/complex/dbaccess/DatabaseDocument.java (from JunitTest_dbaccess_complex) it would of course be nice to test more scenarios, preferably in a C++ unit test. you can access the configuration via the generated headers like so officecfg::Office::Common::MacroSecurityLevel::get() ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash test update
On Tue, 2014-11-25 at 21:05 +, Caolán McNamara wrote: > On Tue, 2014-11-25 at 17:50 +, Crashtest VM wrote: > > New crashtest update available at > > http://dev-builds.libreoffice.org/crashtest/2052ea7439790d9bb5ae5b08fda3874f74700594/ > > The vast majority of the ".doc" crashes are actually .rtfs, most of > these (and most of the detected as rtf crashes) are the same dbgutil > assert in writerfilter/source/dmapper/DomainMapper_Impl:4411 e.g. > ooo58648-1.doc is a particularly short rtf which exhibits the problem > that affects about 20+ documents and is the lowest hanging fruit with > the most gain from fixing. http://cgit.freedesktop.org/libreoffice/core/commit/?id=2b54caceab9d975bffa7e24bf732cb877b16632f seems to do the right thing here. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Childwindow slot missing
On Sat, 2014-11-15 at 13:26 -0700, julien2412 wrote: > Hello, > > As I had noticed some time ago in > https://bugs.freedesktop.org/show_bug.cgi?id=72277#c10, > " > Alfresco provides an open cmis server which you can test against: > > https://cmis.alfresco.com/cmisatom > http://cmis.alfresco.com/cmisatom > username: admin > password: admin > " > It could help to test. Aha, so it's simply the yellow area that appears at the top of a document to tell you its read-only or needs to be checked out, the SfxInfoBarContainerChild thing. I thought it was some exotic magic toolbar with lots of buttons which would only appear with a document checked out of a document server. Anyway, all silenced now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=993deeae29c12d14dbece467b207af3e65ef3ca8 and appears to continue to work as expected. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - include/sfx2 jvmfwk/plugins sfx2/sdi sfx2/source sw/qa vcl/source writerfilter/source
include/sfx2/sfxsids.hrc |2 -
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx |1
sfx2/sdi/frmslots.sdi|5 ++
sfx2/sdi/sfx.sdi | 25 -
sfx2/source/dialog/infobar.cxx |2 -
sw/qa/core/data/rtf/pass/ooo121333-1.rtf | 43 +++
vcl/source/outdev/textline.cxx |2 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 13 ++
8 files changed, 81 insertions(+), 12 deletions(-)
New commits:
commit 2b54caceab9d975bffa7e24bf732cb877b16632f
Author: Caolán McNamara
Date: Wed Nov 26 12:44:10 2014 +
always pass bookmark name through to domainmapper
the rtf doc has three bookmark starts but only two matching
bookmark ends.
The tokenizer has three starts 0, 1, 2, but 0 is missing an end. Without the
end of 0, the mapper never inserts an entry for it, so later inserts the
start
of rtftok index 1 as mapper index 0, and passing the end for a bare "1"
cannot
be found by index. If we pass the name then it finds it by name as mapper
index
0 and all is well.
Change-Id: I344db84e4f1c7d55fca59cdfe692080c7d0b8033
diff --git a/sw/qa/core/data/rtf/pass/ooo121333-1.rtf
b/sw/qa/core/data/rtf/pass/ooo121333-1.rtf
new file mode 100644
index 000..7f3b531
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/ooo121333-1.rtf
@@ -0,0 +1,43 @@
+{\rtf1\ansi\deff0\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0
Arial;}{\f3\fswiss\fprq2\fcharset0 Trebuchet MS;}{\f4\fswiss\fprq2\fcharset128
Arial;}{\f5\fswiss\fprq2\fcharset0 Arial Unicode MS;}{\f6\fnil\fprq2\fcharset0
Mangal;}{\f7\fnil\fprq0\fcharset0 Mangal;}}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033
Default;}
+{\s15\sbasedon0\snext16\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sb240\sa120\keepn\ltrpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\loch\f2\fs28\lang1033
Heading;}
+{\s16\sbasedon0\snext16\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sb0\sa120\ltrpar\cf0\kerning1\hich\af0\langfe2052\dbch\af0\loch\f0\fs24\lang1033
Text body;}
+{\s17\sbasedon16\snext17\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sb0\sa120\ltrpar\cf0\kerning1\hich\af0\langfe2052\dbch\af7\loch\f0\fs24\lang1033
List;}
+{\s18\sbasedon0\snext18\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sb120\sa120\ltrpar\cf0\i\kerning1\hich\af0\langfe2052\dbch\af7\ai\loch\f0\fs24\lang1033
Caption;}
+{\s19\sbasedon0\snext19\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\ltrpar\cf0\kerning1\hich\af0\langfe2052\dbch\af7\loch\f0\fs24\lang1033
Index;}
+}{\info{\author Lisa
Stroyan}{\creatim\yr2012\mo11\dy10\hr15\min44}{\revtim\yr2012\mo11\dy10\hr16\min16}{\printim\yr0\mo0\dy0\hr0\min0}{\comment
OpenOffice.org}{\vern3410}}\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709
+
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse195\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
Default;}}
+\formshade{\*\pgdscno0}\paperh15840\paperw12240\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\pgndec\pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{\rtlch
\ltrch
+\'93}{\rtlch \ltrch\loch
+test\'94}
+\par \pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{\rtlch
\ltrch\loch
+}
+\par \pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{\rtlch
\ltrch\loch\f3
+\'93}{\rtlch \ltrch\loch\loch\f4
+Another }{\rtlch \ltrch\dbch\loch\f4
+\u21520\'3f}{\rtlch \ltrch\loch\loch\f4
+oo}{\rtlch \ltrch\loch\loch\f3
+ test\'94}
+\par \pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{\rtlch
\ltrch\loch
+}
+\par \pard\plain
\s0\ql{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\nowidctlpar\cf0\kerning1\hich\af5\langfe2052\dbch\af6\afs24\lang1081\loch\f0\fs24\lang1033{{\*\bkmkstart
__DdeLink__132_187012832}\rtlch \ltrch\loch\loch\f3
+Created (or opened) testoocharacters.odt file with angled double quotes, using
both Times and
Re: C++11 on master (towards LO 4.5)
On 25.11.2014 09:13, Stephan Bergmann wrote: > Until now, our minimum C++ compiler requirements on master are: > >* Clang 3.1 >* GCC 4.6 (specifically for Munich; preferred 4.7) >* MSVC 2012 > > Branch-off of LO 4.4 from master seems like a good time to re-visit. > And natural candidates for consideration appear to be dropping MSVC 2012 > for 2013, and/or the feasibility of dropping GCC 4.6 for 4.7. apparently it's possible to use a "v120_xp" toolset with MSVC 2013 to get the all-important Windows XP compatibility, so our users can continue to run the latest LO on an OS that doesn't get security fixes: http://www.visualstudio.com/en-us/products/visual-studio-2013-compatibility-vs.aspx ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/galaxy icon-themes/sifr icon-themes/tango
icon-themes/galaxy/cmd/lc_datasort.png |binary icon-themes/sifr/cmd/lc_insertobjectstarmath.png |binary icon-themes/tango/cmd/lc_insertsymbol.png|binary icon-themes/tango/cmd/lc_tabledialog.png |binary 4 files changed New commits: commit d9d1ce6a765cdf0846cc52633df28b9fb2d164c9 Author: Yousuf Philips Date: Wed Nov 26 09:00:10 2014 +0400 ICONS: fix icons in galaxy and tango and added new icons to sifr and tango Change-Id: Ia0a48d0d366cf108b3eaad0b08822be9c4da087a Reviewed-on: https://gerrit.libreoffice.org/13129 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/icon-themes/galaxy/cmd/lc_datasort.png b/icon-themes/galaxy/cmd/lc_datasort.png index 9898886..e769159 100644 Binary files a/icon-themes/galaxy/cmd/lc_datasort.png and b/icon-themes/galaxy/cmd/lc_datasort.png differ diff --git a/icon-themes/sifr/cmd/lc_insertobjectstarmath.png b/icon-themes/sifr/cmd/lc_insertobjectstarmath.png new file mode 100644 index 000..4a7177f Binary files /dev/null and b/icon-themes/sifr/cmd/lc_insertobjectstarmath.png differ diff --git a/icon-themes/tango/cmd/lc_insertsymbol.png b/icon-themes/tango/cmd/lc_insertsymbol.png index 367186f..f0d3038 100644 Binary files a/icon-themes/tango/cmd/lc_insertsymbol.png and b/icon-themes/tango/cmd/lc_insertsymbol.png differ diff --git a/icon-themes/tango/cmd/lc_tabledialog.png b/icon-themes/tango/cmd/lc_tabledialog.png new file mode 100644 index 000..b790217 Binary files /dev/null and b/icon-themes/tango/cmd/lc_tabledialog.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/sifr icon-themes/tango
icon-themes/galaxy/cmd/lc_datasort.png |binary icon-themes/sifr/cmd/lc_insertobjectstarmath.png |binary icon-themes/tango/cmd/lc_insertsymbol.png|binary icon-themes/tango/cmd/lc_tabledialog.png |binary 4 files changed New commits: commit d104ae713647da9b3fb9439fbea518aa20f25ee9 Author: Yousuf Philips Date: Wed Nov 26 09:00:10 2014 +0400 ICONS: fix icons in galaxy and tango and added new icons to sifr and tango Change-Id: Ia0a48d0d366cf108b3eaad0b08822be9c4da087a Reviewed-on: https://gerrit.libreoffice.org/13128 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/icon-themes/galaxy/cmd/lc_datasort.png b/icon-themes/galaxy/cmd/lc_datasort.png index 9898886..e769159 100644 Binary files a/icon-themes/galaxy/cmd/lc_datasort.png and b/icon-themes/galaxy/cmd/lc_datasort.png differ diff --git a/icon-themes/sifr/cmd/lc_insertobjectstarmath.png b/icon-themes/sifr/cmd/lc_insertobjectstarmath.png new file mode 100644 index 000..4a7177f Binary files /dev/null and b/icon-themes/sifr/cmd/lc_insertobjectstarmath.png differ diff --git a/icon-themes/tango/cmd/lc_insertsymbol.png b/icon-themes/tango/cmd/lc_insertsymbol.png index 367186f..f0d3038 100644 Binary files a/icon-themes/tango/cmd/lc_insertsymbol.png and b/icon-themes/tango/cmd/lc_insertsymbol.png differ diff --git a/icon-themes/tango/cmd/lc_tabledialog.png b/icon-themes/tango/cmd/lc_tabledialog.png new file mode 100644 index 000..b790217 Binary files /dev/null and b/icon-themes/tango/cmd/lc_tabledialog.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/qa
starmath/qa/cppunit/test_nodetotextvisitors.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 465a4b2be8ed4c1f6d0d9995cd8d4c00ce7ae8bd
Author: Takeshi Abe
Date: Sat Nov 22 17:17:02 2014 +0900
Correct and reenable SmNodeToTextVisitor's test for RSUP
See 44a3a345ac2b9901122a9eac70538ef04417bbd4 about why ^ is chosen.
Change-Id: I05cda4d69eaa1757a95c06c199e09d9c67f47832
Reviewed-on: https://gerrit.libreoffice.org/13037
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 6940f19..b62212d 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -573,8 +573,8 @@ void Test::testBinHorInSubSup()
aCursor.InsertElement(PlusElement);
aCursor.InsertText("d");
-//FIXMEOUString sExpected = " { a rsup { b + c } + d } ";
-//FIXMECPPUNIT_ASSERT_EQUAL_MESSAGE("BinHor in SubSup", sExpected,
xDocShRef->GetText());
+OUString sExpected = " { a ^ { b + c } + d } ";
+CPPUNIT_ASSERT_EQUAL_MESSAGE("BinHor in SubSup", sExpected,
xDocShRef->GetText());
delete pTree;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/uiconfig
sd/uiconfig/simpress/toolbar/drawingobjectbar.xml |4 +++- sd/uiconfig/simpress/toolbar/graphicobjectbar.xml |2 +- sd/uiconfig/simpress/toolbar/standardbar.xml |1 + sd/uiconfig/simpress/toolbar/tableobjectbar.xml |6 +++--- sd/uiconfig/simpress/toolbar/toolbar.xml |2 +- 5 files changed, 9 insertions(+), 6 deletions(-) New commits: commit 5a08408aae1941adf90b5fffd8691a00e17dbadf Author: Yousuf Philips Date: Sun Nov 23 14:50:11 2014 +0400 fdo#84909 move zoom to object and added/hid/unhid some other buttons Change-Id: I5235c790f7e9b755ef57a9e6643b049ea802ec30 Reviewed-on: https://gerrit.libreoffice.org/13064 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml index 79a037f..33a37ee 100644 --- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml @@ -46,5 +46,7 @@ - + + + diff --git a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml index ab39430..7b34fac 100644 --- a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml @@ -33,7 +33,7 @@ - + diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml index 3f71ac7..b3bb795 100644 --- a/sd/uiconfig/simpress/toolbar/standardbar.xml +++ b/sd/uiconfig/simpress/toolbar/standardbar.xml @@ -44,6 +44,7 @@ + diff --git a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml index 156447c..280d57ae 100644 --- a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml @@ -18,12 +18,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - + + - @@ -43,6 +43,6 @@ - + diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml b/sd/uiconfig/simpress/toolbar/toolbar.xml index 2e08ab4..aaba0b0 100644 --- a/sd/uiconfig/simpress/toolbar/toolbar.xml +++ b/sd/uiconfig/simpress/toolbar/toolbar.xml @@ -46,7 +46,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/qa starmath/source
starmath/qa/cppunit/test_nodetotextvisitors.cxx |4 ++--
starmath/source/visitors.cxx| 24
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ede5d170ea25c7983ed890075d9d5479aaa08d88
Author: Takeshi Abe
Date: Mon Nov 24 10:34:13 2014 +0900
fdo#70185: Correct and reenable SmNodeToTextVisitor's test case
This fixes the order of handling csub/csup changed at
80de3c0fe6b191f6d528ae1142737e2561b12ccd.
Change-Id: I1b5ad39b367e1933f8a17ce8126feed4d996f662
Reviewed-on: https://gerrit.libreoffice.org/13086
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 09d1d6c..6940f19 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -221,8 +221,8 @@ void Test::SimpleOperators()
parseandparseagain("sum{a}", "Sum");
parseandparseagain("prod{a}", "Product");
parseandparseagain("coprod{a}", "Coproduct");
-//FIXMEparseandparseagain("int from {r_0} to {r_t} a", "Upper and lower
bounds shown with integral (from & to)");
-//FIXMEParseAndCheck("int csup {r_0} csub {r_t} a", "int csup { r rsub 0 }
csub { r rsub t } a ", "Upper and lower bounds shown with integral (csub &
csup)");
+parseandparseagain("int from {r_0} to {r_t} a", "Upper and lower bounds
shown with integral (from & to)");
+ParseAndCheck("int csup {r_0} csub {r_t} a", "int csup { r _ 0 } csub { r
_ t } a ", "Upper and lower bounds shown with integral (csub & csup)");
//FIXMEParseAndCheck("sum csup { size 8 { x - 1 } } csub { size 8 a } b ",
"sum csup { size 8 { x - 1 } } csub { size 8 a } b ", "Sum with sized upper and
lower bounds");
parseandparseagain("int{a}", "Integral");
parseandparseagain("iint{a}", "Double integral");
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index b0bf0df..60f6127 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -2238,21 +2238,21 @@ void SmNodeToTextVisitor::Visit( SmOperNode* pNode )
LineToText( pChild );
Append( "} " );
}
-if( ( pChild = pSubSup->GetSubSup( CSUB ) ) ) {
+if( ( pChild = pSubSup->GetSubSup( CSUP ) ) ) {
Separate( );
if (pSubSup->IsUseLimits())
-Append( "from { " );
+Append( "to { " );
else
-Append( "csub { " );
+Append( "csup { " );
LineToText( pChild );
Append( "} " );
}
-if( ( pChild = pSubSup->GetSubSup( CSUP ) ) ) {
+if( ( pChild = pSubSup->GetSubSup( CSUB ) ) ) {
Separate( );
if (pSubSup->IsUseLimits())
-Append( "to { " );
+Append( "from { " );
else
-Append( "csup { " );
+Append( "csub { " );
LineToText( pChild );
Append( "} " );
}
@@ -2428,20 +2428,20 @@ void SmNodeToTextVisitor::Visit( SmSubSupNode* pNode )
Append( "_ " );
LineToText( pChild );
}
-if( ( pChild = pNode->GetSubSup( CSUB ) ) ) {
+if( ( pChild = pNode->GetSubSup( CSUP ) ) ) {
Separate( );
if (pNode->IsUseLimits())
-Append( "from " );
+Append( "to " );
else
-Append( "csub " );
+Append( "csup " );
LineToText( pChild );
}
-if( ( pChild = pNode->GetSubSup( CSUP ) ) ) {
+if( ( pChild = pNode->GetSubSup( CSUB ) ) ) {
Separate( );
if (pNode->IsUseLimits())
-Append( "to " );
+Append( "from " );
else
-Append( "csup " );
+Append( "csub " );
LineToText( pChild );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/uibase/uiview/view2.cxx | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 68c378187c0eac9049141cd8ac072231f7860313
Author: Matthew J. Francis
Date: Wed Oct 29 14:39:32 2014 +0800
fdo#83308 Show thousand separators in document word/character counts
Change-Id: I7ef59f3c40c475c25dd6f110f298fcda3f0f1079
Reviewed-on: https://gerrit.libreoffice.org/12130
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
(cherry picked from commit 9673698f35ad249bc96506965b5e467d1f7ea0e9)
Reviewed-on: https://gerrit.libreoffice.org/13132
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 7dcde99..9c98971 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1364,18 +1364,16 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
{
SwDocStat selectionStats;
SwDocStat documentStats;
-{
-rShell.CountWords(selectionStats);
-documentStats =
rShell.GetDoc()->getIDocumentStatistics().GetUpdatedDocStat( true /*
complete-async */, false /* don't update fields */ );
-}
-
-OUString wordCount(SW_RES(selectionStats.nWord ?
- STR_STATUSBAR_WORDCOUNT :
STR_STATUSBAR_WORDCOUNT_NO_SELECTION));
-wordCount = wordCount.replaceFirst("%1",
-OUString::number(selectionStats.nWord ?
selectionStats.nWord : documentStats.nWord));
-wordCount = wordCount.replaceFirst("%2",
-OUString::number(selectionStats.nChar ?
selectionStats.nChar : documentStats.nChar));
-rSet.Put(SfxStringItem(FN_STAT_WORDCOUNT, wordCount));
+rShell.CountWords(selectionStats);
+documentStats =
rShell.GetDoc()->getIDocumentStatistics().GetUpdatedDocStat( true /*
complete-async */, false /* don't update fields */ );
+
+sal_uLong nWord = selectionStats.nWord ? selectionStats.nWord
: documentStats.nWord;
+sal_uLong nChar = selectionStats.nChar ? selectionStats.nChar
: documentStats.nChar;
+OUString aWordCount( SW_RES( selectionStats.nWord ?
STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION ) );
+const LocaleDataWrapper& rLocaleData =
Application::GetSettings().GetUILocaleDataWrapper();
+aWordCount = aWordCount.replaceFirst( "%1",
rLocaleData.getNum( nWord, 0 ) );
+aWordCount = aWordCount.replaceFirst( "%2",
rLocaleData.getNum( nChar, 0 ) );
+rSet.Put( SfxStringItem( FN_STAT_WORDCOUNT, aWordCount ) );
SwWordCountWrapper *pWrdCnt =
(SwWordCountWrapper*)GetViewFrame()->GetChildWindow(SwWordCountWrapper::GetChildWindowId());
if (pWrdCnt)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Two unit-tests fail by segmentation fault when using clang
On 24.11.2014 06:20, Jean-Baptiste Faure wrote: > Hi, > > I try to build LibreOffice 4.4 and master on Ubuntu 14.10 x86-64 using > clang (version 3.5.0) instead of gcc (version 4.9). > I get two unit-test fails by segmentation fault: > CppunitTest_basic_enable > CppunitTest_basic_nested_struct > > It worked with gcc, so I guess the errors are related to the use of > clang. Is there something I can do from my side? please (turn on --enable-debug or --enable-dbgutil if you haven't already and) run the tests in a debugger with: CPPUNITTRACE="gdb --args" make CppunitTest_basic_enable and when it crashes use "bt" to get a backtrace and post it here. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OpenCL nomeclature
"bad" in this context is supposed to mean "known to make our code not work as intended". Whether the root cause is in our code or the driver is irrelevant. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] mso-dumper.git: 7 commits - msodumper/vsdstream.py
msodumper/vsdstream.py | 202 +++--
1 file changed, 164 insertions(+), 38 deletions(-)
New commits:
commit 18e52f3e1c61d1d644b427cd354d694f6a457f34
Author: Miklos Vajna
Date: Wed Nov 26 12:46:20 2014 +0100
VSD: start dumping the user-defined set
diff --git a/msodumper/vsdstream.py b/msodumper/vsdstream.py
index 8dcd1bf..d2403a3 100644
--- a/msodumper/vsdstream.py
+++ b/msodumper/vsdstream.py
@@ -209,19 +209,22 @@ class PropertySetStream(DOCDirStream):
self.printAndSet("CLSID2", self.readuInt32())
self.printAndSet("CLSID3", self.readuInt32())
self.printAndSet("NumPropertySets", self.readuInt32())
-GUID(self, "FMTID").dump()
+GUID(self, "FMTID0").dump()
self.printAndSet("Offset0", self.readuInt32())
+PropertySet(self, self.Offset0).dump()
if self.NumPropertySets == 0x0002:
-print ''
-PropertySet(self).dump()
+GUID(self, "FMTID1").dump()
+self.printAndSet("Offset1", self.readuInt32())
+self.propertyIds = {}
+PropertySet(self, self.Offset1).dump()
print ''
class PropertySet(DOCDirStream):
-def __init__(self, parent):
+def __init__(self, parent, offset):
DOCDirStream.__init__(self, parent.bytes)
self.parent = parent
-self.pos = parent.Offset0
+self.pos = offset
def getCodePage(self):
for index, idAndOffset in enumerate(self.idsAndOffsets):
commit c2cd85eddf02c74e0f26955e6e847ebc61d79593
Author: Miklos Vajna
Date: Wed Nov 26 12:36:52 2014 +0100
VSD: dump PIDDSI
diff --git a/msodumper/vsdstream.py b/msodumper/vsdstream.py
index 380c7ef..8dcd1bf 100644
--- a/msodumper/vsdstream.py
+++ b/msodumper/vsdstream.py
@@ -119,7 +119,34 @@ def createVSDFile(chars, params):
return VSDFile(chars, params)
-PropertyIdentifierDocumentSummaryInformation = {
+PIDDSI = {
+0x0001: "PIDDSI_CODEPAGE",
+0x0002: "PIDDSI_CATEGORY",
+0x0003: "PIDDSI_PRESFORMAT",
+0x0004: "PIDDSI_BYTECOUNT",
+0x0005: "PIDDSI_LINECOUNT",
+0x0006: "PIDDSI_PARACOUNT",
+0x0007: "PIDDSI_SLIDECOUNT",
+0x0008: "PIDDSI_NOTECOUNT",
+0x0009: "PIDDSI_HIDDENCOUNT",
+0x000A: "PIDDSI_MMCLIPCOUNT",
+0x000B: "PIDDSI_SCALE",
+0x000C: "PIDDSI_HEADINGPAIR",
+0x000D: "PIDDSI_DOCPARTS",
+0x000E: "PIDDSI_MANAGER",
+0x000F: "PIDDSI_COMPANY",
+0x0010: "PIDDSI_LINKSDIRTY",
+0x0011: "PIDDSI_CCHWITHSPACES",
+0x0013: "PIDDSI_SHAREDDOC",
+0x0014: "PIDDSI_LINKBASE",
+0x0015: "PIDDSI_HLINKS",
+0x0016: "PIDDSI_HYPERLINKSCHANGED",
+0x0017: "PIDDSI_VERSION",
+0x0018: "PIDDSI_DIGSIG",
+0x001A: "PIDDSI_CONTENTTYPE",
+0x001B: "PIDDSI_CONTENTSTATUS",
+0x001C: "PIDDSI_LANGUAGE",
+0x001D: "PIDDSI_DOCVERSION",
}
@@ -129,11 +156,11 @@ class DocumentSummaryInformationStream(DOCDirStream):
def dump(self):
print '' %
self.size
-PropertySetStream(self,
PropertyIdentifierDocumentSummaryInformation).dump()
+PropertySetStream(self, PIDDSI).dump()
print ''
-PropertyIdentifierSummaryInformation = {
+PIDSI = {
0x0001: "CODEPAGE_PROPERTY_IDENTIFIER",
0x0002: "PIDSI_TITLE",
0x0003: "PIDSI_SUBJECT",
@@ -162,7 +189,7 @@ class SummaryInformationStream(DOCDirStream):
def dump(self):
print '' % self.size
-PropertySetStream(self, PropertyIdentifierSummaryInformation).dump()
+PropertySetStream(self, PIDSI).dump()
print ''
commit 7432d469dd0333bdb7156484c6fb32fb03e1d173
Author: Miklos Vajna
Date: Wed Nov 26 11:17:04 2014 +0100
VSD: dump GUIDs properly
diff --git a/msodumper/vsdstream.py b/msodumper/vsdstream.py
index 481f086..380c7ef 100644
--- a/msodumper/vsdstream.py
+++ b/msodumper/vsdstream.py
@@ -182,10 +182,7 @@ class PropertySetStream(DOCDirStream):
self.printAndSet("CLSID2", self.readuInt32())
self.printAndSet("CLSID3", self.readuInt32())
self.printAndSet("NumPropertySets", self.readuInt32())
-self.printAndSet("FMTID00", self.readuInt32())
-self.printAndSet("FMTID01", self.readuInt32())
-self.printAndSet("FMTID02", self.readuInt32())
-self.printAndSet("FMTID03", self.readuInt32())
+GUID(self, "FMTID").dump()
self.printAndSet("Offset0", self.readuInt32())
if self.NumPropertySets == 0x0002:
print ''
@@ -363,4 +360,23 @@ class CodePageString(DOCDirStream):
print ''
% codepage
print '' % self.name
+
+class GUID(DOCDirStream):
+def __init__(self, parent, name):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+self.parent = parent
+self.name = name
+
+def dump(self):
+Data1 = self.readuInt32()
+
Re: Who knows of a free UML tool to work with libreoffice?
UML Modeller, from the KDE stable, says that's what it does. Mark Stanton One small step for mankind... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Two unit-tests fail by segmentation fault when using clang
Hi, I try to build LibreOffice 4.4 and master on Ubuntu 14.10 x86-64 using clang (version 3.5.0) instead of gcc (version 4.9). I get two unit-test fails by segmentation fault: CppunitTest_basic_enable CppunitTest_basic_nested_struct It worked with gcc, so I guess the errors are related to the use of clang. Is there something I can do from my side? 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: Repair corrupted odt
On Sun, Nov 23, 2014 at 6:01 AM, Olivier Chorier wrote: > Hello everybody, > > I'm looking for a way to repair thousands of corrupted odt files. Those > files have been corrupted after FTP send operations, for some reason. > > The "zip" structure seems corrupted. I tried using 7-zip to unzip and zip > again the odt file, but it doesn't work every time. > Libre Office can repair them every time, but I need to open, repair, save > and close those files one by one. Any chance you could share some of the mildly-corrupted files publicly? If LibreOffice is doing a good job of repairing your corrupted files, perhaps we could add a few to our automated tests to ensure that the codebase continues to be able to recover from your particular type of file damage. > I wonder if a script or something like that could be used to repair those > files. I can't do it manually because there is thousand of them. Ideally, I > could check them, and repair them automatically using a bash or a java > script... Others know much more than I about how LibreOffice repairs files, but to verify that the files are fixed, there are some good packages for validating ODF, including the office-o-tron, which can be run on the command line: https://wiki.documentfoundation.org/ODF#Validator_Software Cheers, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 on master (towards LO 4.5)
Am 25.11.2014 um 09:13 schrieb Stephan Bergmann: > Until now, our minimum C++ compiler requirements on master are: > > * Clang 3.1 > * GCC 4.6 (specifically for Munich; preferred 4.7) > * MSVC 2012 > > Branch-off of LO 4.4 from master seems like a good time to re-visit. And > natural candidates for consideration appear to be dropping MSVC 2012 for > 2013, and/or the feasibility of dropping GCC 4.6 for 4.7. > > What could that buy us in terms of newly available C++ features? Based > on the progress from MSVC 2012 to 2013, the following list shows which > core language features became available where: > > And additionally dropping GCC 4.6 for 4.7 would give us an additional > three new features: > > * Non-static data member initializers > * Alias templates > * Delegating constructors > > Thoughts? Munichs point of view hasn't changed. I'll expect us to be on Ubuntu 12.04 for at least the next 1 1/2+ years. And we're quite reluctant to support our own build tool chain. So as long as the gcc 4.7+ features aren't needed, we would like to stay on gcc 4.6. As another datapoint, Firefox 31esr still builds on 12.04, but it's the first ESR, which doesn't build on 10.04 using gcc 4.4. I hope FF 38esr will still be compilable on 12.04. As we'll just begin switching to LO 4.1.6+ next month, I'm planning to do our next LO release based on 4.5 at the end of next year; it might even be in the support timeline of LO. Jan-Marek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Repair corrupted odt
Hi, if you are on LInux you could try "unoconv" Marco Am 23.11.2014 um 12:01 schrieb Olivier Chorier: > Hello everybody, > > I'm looking for a way to repair thousands of corrupted odt files. > Those files have been corrupted after FTP send operations, for some > reason. > > The "zip" structure seems corrupted. I tried using 7-zip to unzip and > zip again the odt file, but it doesn't work every time. > Libre Office can repair them every time, but I need to open, repair, > save and close those files one by one. > > I wonder if a script or something like that could be used to repair > those files. I can't do it manually because there is thousand of them. > Ideally, I could check them, and repair them automatically using a > bash or a java script... > > Thank you very much for your help, > Olivier. > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice -- + FOSSGIS-Konferenz 2015 Selbst beitragen? Call for Papers is out! FOSSGIS 2015, Die Konferenz für Open Source GIS mit OpenData und OpenStreetMap! Beiträge einreichen: http://www.fossgis.de/konferenz/2015/callforpapers + FOSSGIS e.V. die unabhängige Hilfe bei freier GIS-Software und freien Geodaten http://www.fossgis.de + Hinweis zu Anhängen die auf .p7m oder .asc enden: Die .p7m- und .asc-Dateien sind ungefährliche Signaturdateien (digitale Unterschriften). In E-Mail-Clients mit S/MIME Konfiguration (.p7m) oder PGP-Erweiterung (.asc) dienen sie zur: - Überprüfung des Absenders - Überprüfung einer ev. Veränderung des Inhalts während der Übermittlung über das Internet Die Signaturdateien können ebenso dazu verwendet werden dem Absender dieser Signatur eine E-Mail mit verschlüsseltem Inhalt zu senden. In E-Mail-Clients ohne S/MIME Konfiguration oder PGP-Erweiterung erscheinen die Dateien als Anhang und können ignoriert werden. 0x6A30F373.asc Description: application/pgp-keys ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Who knows of a free UML tool to work with libreoffice?
On Friday, November 21, 2014 08:12:53 AM nicholas ferguson wrote: > I recommend Umbrello[1]. I should come packaged with any Linux distribution you are using. If you are running Windows, it may be packaged by the KDE Windows project, but I am not sure. You'll have to check. [1] https://umbrello.kde.org/ [2] https://windows.kde.org/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
OpenCL nomeclature
Hi While translating, I stumbled into "List of known-bad OpenCL implementation" "List of known-good OpenCL implementation" Is this the equivalent of "List of known bad implementation of OpenCL" "List of known good implementation of OpenCL" sorry if it look stupid to ask, but when it comes to translation... Also, is there a better word for "bad" in that context? What is "bad"? underperformance?, incomplete? unreliable? incompatible? etc... I'd like to avoid naming something "bad" (that is, can be "bad for LibeOffice and "good" for another software). -- Olivier Hallot Comunidade LibreOffice http://ask.libreoffice.org/pt-br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Who knows of a free UML tool to work with libreoffice?
Nicholas, Can you clarify your request? Do you simply need a free UML tool, something that allows you to model UML from within LO, or something to create UML for use by the official LO project? Some years back, I found a UML to a project that directed that open source tools be used. If I remember correctly, we chose ArgoUML. That was sufficiently long ago that there are likely new options. http://en.wikipedia.org/wiki/List_of_Unified_Modeling_Language_tools http://en.wikipedia.org/wiki/Category:Free_UML_tools My preferred UML package for general use is Enterprise Architect by Sparx. http://www.sparxsystems.com/ The thing that I liked about their software is that they have a version that is price accessible to individual developers. For example, the Desktop version is $135. My complaint with the desktop version is that it does not support code import / export, and it is nice to be able to point at a block of code and then import it into UML class diagrams. That is supported by the professional version for $199. Even in a corporate setting I have not found the extra features overly compelling (because last I checked [8 years ago, so this may have changed], the ability to use a DBMS as the back-end stored an XML blob representing large chunks of the diagram so that multiple people could not edit "near" portions at the same time, they had to be totally separate packages). http://www.sparxsystems.com/products/ea/purchase.html The Sparx product (when I last evaluated, which was when their top version was the Corporate Edition), it did not come close to packages such as Rational Rose with respect to things like integration with multiple levels of development at the cost thousands of dollars. On the other hand, if you primarily are interested in UML, it is pretty comprehensive and their bang for the buck (so to speak) is very high. The Sparx Enterprise Architect (EA) program is able to generate very nice reports that you can then edit inside of LO, but, they don't round-trip back into EA. I expect that any of the products, free or otherwise, will allow you to generate some sort of artifact that you can then embed in an LO document, but, the standard UML packages will likely not create something that integrates with LO or allows round-tripping the data (create in tool, edit in LO, bring back into the tool). Interested if you do find something that does integrate. If you are interested in direct integration, then you will need to use Draw and do all the work yourself For example: http://mvantzet.wordpress.com/2009/10/20/drawing-uml-diagrams-in-openoffice-draw/ -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
REMINDER: FOSDEM Call for Paper
FOSDEM 15 will be held at the ULB Campus Solbosch on Saturday, January 31, and Sunday, February 1st, 2015. Open document editors are coming again to FOSDEM with a shared devroom which gives every project in this area a chance to present ODF related developments and innovations. The devroom is jointly organized by Apache OpenOffice and LibreOffice. We invite submission of talks for the Open Document Editors devroom, to be held on Saturday, January 31, from 10AM to 6PM. Length of talks should be limited to 20 minutes, as we would like to have questions after each presentation, and to fit as many presenters as possible in the schedule. Exceptions must be explicitly requested and justified. Technical talks (code, extensions, localization, QA, tools and adoption related cases) about open document editors or the ODF document format are welcome. Submissions must be done by the speakers using the Pentabarf system: https://penta.fosdem.org/submission/FOSDEM15 While filing your proposal, please provide the title of your talk, a short abstract (one or two paragraphs), some information about yourself (name, bio and photo, but please do remember that your profile might be already stored at Pentabarf) and specify what topic (Apache OpenOffice, LibreOffice, other ODF editors, ODF in general...) your talk is about. You do not need to create a new account if you already have one. If the password has been lost, you can easily recover it. The deadline is Sunday, December 14, 2014. Accepted speakers will be notified by December 28, 2014. You can send any questions to the devroom mailing list: open-document-devr...@lists.fosdem.org -- Italo Vignoli - it...@italovignoli.com mob IT +39.348.5653829 - mob EU +39.392.7481795 skype italovignoli - hangout italo.vign...@gmail.com GPG Key ID - 0xAAB8D5C0 DB75 1534 3FD0 EA5F 56B5 FDA6 DE82 934C AAB8 D5C0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/inc sc/source
sc/inc/tokenarray.hxx |6 +
sc/source/core/data/column4.cxx |2 +
sc/source/core/data/table3.cxx |4 +++
sc/source/core/tool/token.cxx | 43
4 files changed, 55 insertions(+)
New commits:
commit b38b0ba7bd6bc52dacc9a45199d6a6a951ae
Author: Eike Rathke
Date: Mon Nov 24 23:29:32 2014 +0100
fix fdo#79441 again and keep references to other sheets during sort
... also if other references are not updated. References to other sheets
are never to be treated as relative during sort, they are always
absolute, even if they have relative row/column part references.
Broken again during the big sort mess. Even if there was a unit test,
which didn't help as it got disabled / adapted to the change..
(cherry picked from commit f0e7364603c9566bc158303c515c3274ccba62ca)
Backported.
Change-Id: Ic0e61c5e1cb0728e20725c29e450ab0eb55c3305
Reviewed-on: https://gerrit.libreoffice.org/13118
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index fbb613c..75451e1 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -208,6 +208,12 @@ public:
void AdjustReferenceOnMovedOrigin( const ScAddress& rOldPos, const
ScAddress& rNewPos );
/**
+ * Adjust all internal references on base position change if they point to
+ * a sheet other than the one of rOldPos.
+ */
+void AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress& rOldPos,
const ScAddress& rNewPos );
+
+/**
* Clear sheet deleted flag from internal reference tokens if the sheet
* index falls within specified range. Note that when a reference is on a
* sheet that's been deleted, its referenced sheet index retains the
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 568b5b64..10bec05 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -454,6 +454,8 @@ public:
pCell->aPos.SetRow(nRow);
if (mbUpdateRefs)
pCell->GetCode()->AdjustReferenceOnMovedOrigin(aOldPos,
pCell->aPos);
+else
+
pCell->GetCode()->AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos,
pCell->aPos);
}
else
{
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 99d6239..e49a4dc 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -870,6 +870,10 @@ void ScTable::SortReorderByRow(
pNew->CopyAllBroadcasters(*rCell.maCell.mpFormula);
pNew->GetCode()->AdjustReferenceOnMovedOrigin(aOldPos,
aCellPos);
}
+else
+{
+
pNew->GetCode()->AdjustReferenceOnMovedOriginIfOtherSheet(aOldPos, aCellPos);
+}
sc::CellStoreType::iterator itBlk =
rCellStore.push_back(pNew);
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f78e1c1..3349434 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3599,6 +3599,49 @@ void ScTokenArray::AdjustReferenceOnMovedOrigin( const
ScAddress& rOldPos, const
}
}
+void ScTokenArray::AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress&
rOldPos, const ScAddress& rNewPos )
+{
+FormulaToken** p = pCode;
+FormulaToken** pEnd = p + static_cast(nLen);
+for (; p != pEnd; ++p)
+{
+bool bAdjust = false;
+switch ((*p)->GetType())
+{
+case svExternalSingleRef:
+bAdjust = true; // always
+// fallthru
+case svSingleRef:
+{
+ScToken* pToken = static_cast(*p);
+ScSingleRefData& rRef = pToken->GetSingleRef();
+ScAddress aAbs = rRef.toAbs(rOldPos);
+if (!bAdjust)
+bAdjust = (aAbs.Tab() != rOldPos.Tab());
+if (bAdjust)
+rRef.SetAddress(aAbs, rNewPos);
+}
+break;
+case svExternalDoubleRef:
+bAdjust = true; // always
+// fallthru
+case svDoubleRef:
+{
+ScToken* pToken = static_cast(*p);
+ScComplexRefData& rRef = pToken->GetDoubleRef();
+ScRange aAbs = rRef.toAbs(rOldPos);
+if (!bAdjust)
+bAdjust = (rOldPos.Tab() < aAbs.aStart.Tab() ||
aAbs.aEnd.Tab() < rOldPos.Tab());
+if (bAdjust)
+rRef.SetRange(aAbs, rNewPos);
+}
+break;
+default:
+;
+}
+}
+}
+
namespace {
void clearTabDeletedFlag( ScSingleRefData& rRef, const ScAddress& rPos, SCTAB
nStartTab, SCTAB nEn
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uiview/view2.cxx | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 9673698f35ad249bc96506965b5e467d1f7ea0e9
Author: Matthew J. Francis
Date: Wed Oct 29 14:39:32 2014 +0800
fdo#83308 Show thousand separators in document word/character counts
Change-Id: I7ef59f3c40c475c25dd6f110f298fcda3f0f1079
Reviewed-on: https://gerrit.libreoffice.org/12130
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 1cffd55..64ff288 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1364,18 +1364,16 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
{
SwDocStat selectionStats;
SwDocStat documentStats;
-{
-rShell.CountWords(selectionStats);
-documentStats =
rShell.GetDoc()->getIDocumentStatistics().GetUpdatedDocStat( true /*
complete-async */, false /* don't update fields */ );
-}
-
-OUString wordCount(SW_RES(selectionStats.nWord ?
- STR_STATUSBAR_WORDCOUNT :
STR_STATUSBAR_WORDCOUNT_NO_SELECTION));
-wordCount = wordCount.replaceFirst("%1",
-OUString::number(selectionStats.nWord ?
selectionStats.nWord : documentStats.nWord));
-wordCount = wordCount.replaceFirst("%2",
-OUString::number(selectionStats.nChar ?
selectionStats.nChar : documentStats.nChar));
-rSet.Put(SfxStringItem(FN_STAT_WORDCOUNT, wordCount));
+rShell.CountWords(selectionStats);
+documentStats =
rShell.GetDoc()->getIDocumentStatistics().GetUpdatedDocStat( true /*
complete-async */, false /* don't update fields */ );
+
+sal_uLong nWord = selectionStats.nWord ? selectionStats.nWord
: documentStats.nWord;
+sal_uLong nChar = selectionStats.nChar ? selectionStats.nChar
: documentStats.nChar;
+OUString aWordCount( SW_RES( selectionStats.nWord ?
STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION ) );
+const LocaleDataWrapper& rLocaleData =
Application::GetSettings().GetUILocaleDataWrapper();
+aWordCount = aWordCount.replaceFirst( "%1",
rLocaleData.getNum( nWord, 0 ) );
+aWordCount = aWordCount.replaceFirst( "%2",
rLocaleData.getNum( nChar, 0 ) );
+rSet.Put( SfxStringItem( FN_STAT_WORDCOUNT, aWordCount ) );
SwWordCountWrapper *pWrdCnt =
(SwWordCountWrapper*)GetViewFrame()->GetChildWindow(SwWordCountWrapper::GetChildWindowId());
if (pWrdCnt)
___
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 Bug 65675 depends on bug 70223, which changed state. Bug 70223 Summary: Chart not exported to PDF https://bugs.freedesktop.org/show_bug.cgi?id=70223 What|Removed |Added Status|RESOLVED|UNCONFIRMED Resolution|WORKSFORME |--- -- 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 'distro/suse/suse-4.0' - 2 commits - instsetoo_native/util scp2/inc scp2/source solenv/inc
instsetoo_native/util/openoffice.lst | 24 scp2/inc/macros.inc |2 +- scp2/source/calc/registryitem_calc.scp |4 ++-- scp2/source/draw/registryitem_draw.scp |4 ++-- scp2/source/impress/registryitem_impress.scp |4 ++-- scp2/source/math/registryitem_math.scp |4 ++-- scp2/source/writer/registryitem_writer.scp |8 solenv/inc/minor.mk |4 ++-- 8 files changed, 27 insertions(+), 27 deletions(-) New commits: commit a7dc1ecd176697051c30cea060b8c94277f714c8 Author: Andras Timar Date: Wed Nov 26 02:11:58 2014 -0800 bnc#901693 change shell command new for non-template types Change-Id: I577ad11218c09f0aa8492e56aa685257a3020538 diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index c10a136..00422eb 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -290,7 +290,7 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \ -Value = "\"\program\\" STRING(app) "\" -n \"%1\""; \ +Value = "\"\program\\" STRING(app) "\" -o \"%1\""; \ End #define REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \ diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index f9c2935..01bd206 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -355,7 +355,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_New_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; Subkey = "soffice.StarCalcDocument.6\shell\new\command"; -Value = "\"\program\soffice.exe\" -n \"%1\""; +Value = "\"\program\soffice.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command @@ -795,7 +795,7 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; Subkey = "LibreOffice.CalcDocument.1\shell\new\command"; -Value = "\"\program\soffice.exe\" -n \"%1\""; +Value = "\"\program\soffice.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp index 3673936..c475c58 100644 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -321,7 +321,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_New_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; Subkey = "soffice.StarDrawDocument.6\shell\new\command"; -Value = "\"\program\soffice.exe\" -n \"%1\""; +Value = "\"\program\soffice.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command @@ -761,7 +761,7 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; Subkey = "LibreOffice.DrawDocument.1\shell\new\command"; -Value = "\"\program\soffice.exe\" -n \"%1\""; +Value = "\"\program\soffice.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index ee1bebf..2a96304 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -355,7 +355,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_New_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; Subkey = "soffice.StarImpressDocument.6\shell\new\command"; -Value = "\"\program\soffice.exe\" -n \"%1\""; +Value = "\"\program\soffice.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command @@ -810,7 +810,7 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; Subkey = "LibreOffice.ImpressDocument.1\shell\new\command"; -Value = "\"\program\soffice.exe\" -n \"%1\""; +Value = "\"\program\soffice.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp index 1486522..ab731b9 100644 --- a/scp2/source/math/registryitem_math.scp +++ b/scp2/source/math/registryitem_math.scp @@ -354,7 +354,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_New_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Math_Bin; Subkey = "soffice.StarMathDocument.6\shell\new\command"; -Value = "\"\program\soffice.exe\" -n \"
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/source
vcl/source/outdev/textline.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e22ad3682a07ae45fcd53a0f9e29a8166eb2d48a Author: Julien Nabet Date: Tue Nov 25 23:02:48 2014 +0100 Resolves fdo#86689: Strikethrough: "With /" and "With X" "static" keyword explains why first time the option is well taken into account and not the other times. So let's remove this and the option will be taken into account all the times. Cherry-picked from f46a5d6dfddf86be0d77e00cf44f26af54a97c75 Change-Id: I9db84373e425dfe21c307b965b1796c781cd7863 Reviewed-on: https://gerrit.libreoffice.org/13125 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx index a5887c8..da1d155 100644 --- a/vcl/source/outdev/textline.cxx +++ b/vcl/source/outdev/textline.cxx @@ -591,7 +591,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, return; // prepare string for strikeout measurement -static char cStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? '/' : 'X'; +char cStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? '/' : 'X'; static const int nTestStrLen = 4; static const int nMaxStrikeStrLen = 2048; sal_Unicode aChars[nMaxStrikeStrLen+1]; // +1 for valgrind... ___ 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' - vcl/source
vcl/source/outdev/textline.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8ab7e79e30f792b0c021b437064776a42b6ebda4 Author: Julien Nabet Date: Tue Nov 25 23:02:48 2014 +0100 Resolves fdo#86689: Strikethrough: "With /" and "With X" "static" keyword explains why first time the option is well taken into account and not the other times. So let's remove this and the option will be taken into account all the times. Cherry-picked from: f46a5d6dfddf86be0d77e00cf44f26af54a97c75 Change-Id: I9db84373e425dfe21c307b965b1796c781cd7863 Reviewed-on: https://gerrit.libreoffice.org/13126 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx index 862e1ac..541fed3 100644 --- a/vcl/source/outdev/textline.cxx +++ b/vcl/source/outdev/textline.cxx @@ -587,7 +587,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY, return; // prepare string for strikeout measurement -static char cStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? '/' : 'X'; +char cStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? '/' : 'X'; static const int nTestStrLen = 4; static const int nMaxStrikeStrLen = 2048; sal_Unicode aChars[nMaxStrikeStrLen+1]; // +1 for valgrind... ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/Bootstrap instsetoo_native/CustomTarget_setup.mk ios/CustomTarget_LibreOffice_app.mk ios/CustomTarget_MobileLibreOffice_app.mk ios/CustomTarget_TiledLibreOffice
android/Bootstrap/Makefile.shared |2 -- instsetoo_native/CustomTarget_setup.mk |2 -- ios/CustomTarget_LibreOffice_app.mk |2 -- ios/CustomTarget_MobileLibreOffice_app.mk |4 +--- ios/CustomTarget_TiledLibreOffice_app.mk|4 +--- scp2/source/ooo/common_brand.scp| 18 -- solenv/bin/modules/installer/scriptitems.pm |2 -- 7 files changed, 2 insertions(+), 32 deletions(-) New commits: commit d90d47e513f21b07095722559db997fa41d1645e Author: Stephan Bergmann Date: Wed Nov 26 10:51:42 2014 +0100 version ini-file's ProductMajor/Minor are unused ...and had started to have different values in instdir (ProductMajor=450, ProductMinor=0) vs. installation sets (ProductMajor=50, ProductMinor=) Change-Id: I4db2c07b5f7b011218833fc355a3097eb13d0cd4 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index a3b8ade..8169f20 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -178,8 +178,6 @@ copy-stuff: echo 'AllLanguages=en-US' >> assets/program/versionrc echo 'BuildVersion=' >> assets/program/versionrc echo 'buildid=dead-beef' >> assets/program/versionrc - echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)0' >> assets/program/versionrc - echo 'ProductMinor=1' >> assets/program/versionrc echo 'ReferenceOOoMajorMinor=4.1' >> assets/program/versionrc # # .res files diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index f3ecebd..01d2f9c 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -170,8 +170,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'BuildVersion=$(BUILD_VER_STRING)' \ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ && echo 'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update' \ - && echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' \ - && echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \ && echo 'ReferenceOOoMajorMinor=4.1' \ && echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \ && echo 'UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \ diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index 719ff09..555c98b 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -123,8 +123,6 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) echo 'AllLanguages=en-US' && \ echo 'BuildVersion=' && \ echo 'buildid=$(buildid)' && \ - echo 'ProductMajor=360' && \ - echo 'ProductMinor=1' && \ : ) > $(appdir)/program/versionrc # # Copy a sample document... good old test1.odt... diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk index 2e4b6db..215fb5a 100644 --- a/ios/CustomTarget_MobileLibreOffice_app.mk +++ b/ios/CustomTarget_MobileLibreOffice_app.mk @@ -98,9 +98,7 @@ MobileLibreOffice_setup: echo '[Version]'> $$file; \ echo 'AllLanguages=en-US' >> $$file; \ echo 'BuildVersion='>> $$file; \ - echo "buildid=$(BUILDID)" >> $$file; \ - echo 'ProductMajor=360' >> $$file; \ - echo 'ProductMinor=1' >> $$file; + echo "buildid=$(BUILDID)" >> $$file; #== # Clean diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk index 98cc8cc..62f4456 100644 --- a/ios/CustomTarget_TiledLibreOffice_app.mk +++ b/ios/CustomTarget_TiledLibreOffice_app.mk @@ -111,9 +111,7 @@ TiledLibreOffice_setup: echo '[Version]'> $$file; \ echo 'AllLanguages=en-US' >> $$file; \ echo 'BuildVersion='>> $$file; \ - echo "buildid=$(BUILDID)" >> $$file; \ - echo 'ProductMajor=360' >> $$file; \ - echo 'ProductMinor=1' >> $$file; + echo "buildid=$(BUILDID)" >> $$file; # Clean $(call gb_CustomTarget_get_clean_target,ios/TiledLibreOffice): diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index e331f6c..a6075e7 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -882,24 +882,6 @@ End #endif -ProfileItem gid_Brand_Profileitem_Version_Productmajor -ProfileID = gid_Brand_Profile_Version_Ini; -ModuleID = gid_Module_Root_Brand; -Section = "Version"; -Order = 10; -Key = "ProductMajor"; -Valu
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/pagedesc.hxx |2 sw/inc/unotbl.hxx| 15 ++--- sw/source/core/inc/frame.hxx |4 - sw/source/core/inc/layfrm.hxx|6 +- sw/source/core/inc/txtfrm.hxx|6 +- sw/source/core/text/frmform.cxx |4 - sw/source/core/txtnode/atrflyin.cxx | 18 +++--- sw/source/core/txtnode/atrftn.cxx|6 +- sw/source/core/txtnode/fmtatr2.cxx |7 +- sw/source/core/txtnode/fntcache.cxx |2 sw/source/core/txtnode/fntcap.cxx|2 sw/source/core/txtnode/ndhints.cxx |4 - sw/source/core/txtnode/ndtxt.cxx | 10 +-- sw/source/core/txtnode/swfntcch.cxx |2 sw/source/core/txtnode/swfont.cxx| 14 ++--- sw/source/core/txtnode/thints.cxx| 74 +-- sw/source/core/txtnode/txtedt.cxx|4 - sw/source/core/undo/SwUndoFmt.cxx| 28 +- sw/source/core/undo/SwUndoPageDesc.cxx | 18 +++--- sw/source/core/undo/unattr.cxx |4 - sw/source/core/undo/undel.cxx|6 +- sw/source/core/undo/undobj.cxx |4 - sw/source/core/undo/undobj1.cxx |4 - sw/source/core/undo/undraw.cxx | 14 ++--- sw/source/core/undo/unfmco.cxx |4 - sw/source/core/undo/unins.cxx|6 +- sw/source/core/undo/unspnd.cxx |2 sw/source/core/undo/untbl.cxx| 53 +-- sw/source/core/undo/untblk.cxx |2 sw/source/core/unocore/SwXTextDefaults.cxx |6 +- sw/source/core/unocore/unocrsrhelper.cxx |4 - sw/source/core/unocore/unodraw.cxx |4 - sw/source/core/unocore/unoevent.cxx |8 +- sw/source/core/unocore/unofield.cxx | 68 sw/source/core/unocore/unoframe.cxx | 42 +++ sw/source/core/unocore/unoobj.cxx|2 sw/source/core/unocore/unoobj2.cxx | 10 +-- sw/source/core/unocore/unosett.cxx |6 +- sw/source/core/unocore/unostyle.cxx | 36 ++--- sw/source/core/unocore/unotbl.cxx| 20 +++ sw/source/filter/html/css1atr.cxx| 44 sw/source/filter/html/htmlctxt.cxx |8 +- sw/source/filter/html/htmldrawwriter.cxx | 10 +-- sw/source/filter/html/htmlfld.cxx|2 sw/source/filter/html/htmlfldw.cxx | 14 ++--- sw/source/filter/html/htmlflywriter.cxx |8 +- sw/source/filter/html/htmlform.cxx |4 - sw/source/filter/html/htmlgrin.cxx |2 sw/source/filter/html/htmlnumreader.cxx |2 sw/source/filter/html/htmlsect.cxx |6 +- sw/source/filter/html/htmltab.cxx| 10 +-- sw/source/filter/html/htmltabw.cxx |4 - sw/source/filter/html/svxcss1.cxx| 14 ++--- sw/source/filter/html/swhtml.cxx |8 +- sw/source/filter/html/wrthtml.cxx| 18 +++--- sw/source/filter/writer/wrtswtbl.cxx |2 sw/source/filter/ww8/docxattributeoutput.cxx |2 sw/source/filter/ww8/docxexport.cxx |2 sw/source/filter/ww8/rtfattributeoutput.cxx |2 sw/source/filter/ww8/rtfexport.cxx |2 sw/source/filter/ww8/wrtw8nds.cxx| 10 +-- sw/source/filter/ww8/wrtww8.cxx |2 sw/source/filter/ww8/wrtww8gr.cxx|2 sw/source/filter/ww8/ww8atr.cxx | 10 +-- sw/source/filter/ww8/ww8graf.cxx |4 - sw/source/filter/ww8/ww8par.cxx |4 - sw/source/filter/ww8/ww8par6.cxx |2 sw/source/filter/xml/xmlfmt.cxx |2 sw/source/filter/xml/xmlfmte.cxx |4 - sw/source/filter/xml/xmliteme.cxx|2 sw/source/filter/xml/xmltbli.cxx |4 - sw/source/filter/xml/xmltexte.cxx|2 sw/source/ui/chrdlg/chardlg.cxx |4 - sw/source/ui/chrdlg/numpara.cxx |8 +- sw/source/ui/config/optload.cxx |6 +- sw/source/ui/config/optpage.cxx | 12 ++-- sw/source/ui/dbui/dbinsdlg.cxx |2 sw/source/ui/dialog/uiregionsw.cxx |2 sw/source/ui/fldui/fldvar.cxx|2 sw/source/ui/index/swuiidxmrk.cxx|2 sw/source/ui/misc/num.cxx|2 sw/source/ui/misc/titlepage.cxx |2 sw/source/ui/table/tabledlg.cxx | 34 ++-- sw/source/uibase/app/apphdl.cxx |2 sw/source/uibase/app/docsh.cxx |8 +- sw/source/uibase/app/docsh2.cxx |2 sw/source/uibase/app/docst.cxx | 18 +++--- sw/source/uibase/app/docstyle.cxx
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Library.mk|2 +- solenv/gbuild/TargetLocations.mk|2 +- solenv/gbuild/platform/com_GCC_class.mk |2 +- solenv/gbuild/platform/com_MSC_class.mk |2 ++ solenv/gbuild/platform/macosx.mk|2 ++ solenv/gbuild/platform/mingw.mk |2 ++ solenv/gbuild/platform/solaris.mk |2 ++ solenv/gbuild/platform/unxgcc.mk|2 ++ 8 files changed, 13 insertions(+), 3 deletions(-) New commits: commit 47e395cad525385d4a8afdd359bcee2b6380fa22 Author: Stephan Bergmann Date: Wed Nov 26 10:21:23 2014 +0100 On Mac, the lib/libuno_*.dylib symlinks are not in the SDK ...but rather dynamically created (via the SDK's setsdkenv_unix.sh.in) in the SDK's per-user output tree. So better reflect that in instdir by putting the symlinks into workdir/LinkTarget/Library/ instead on Mac. (Which has the additional benefit that the location of the symlinks doesn't change with the versioned SDKDIRNAME.) Change-Id: I77237f6a5d64771c3cb0866e125925ed7b0ecdaf diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 6bc20f7..17135e5 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -45,7 +45,7 @@ $(WORKDIR)/Clean/Library/% : gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER_DIRS))) gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1))) -gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(INSTDIR)/$(SDKDIRNAME)/lib/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) +gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(call gb_Library_get_sdk_link_dir)/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) define gb_Library_Library $(call gb_Postprocess_register_target,AllLibraries,Library,$(1)) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index a36e629..8a7c9ad 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -209,7 +209,7 @@ $(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)).export endef define gb_Library_get_versionlink_target -$(INSTDIR)/$(SDKDIRNAME)/lib/$(basename $(call gb_Library_get_filename,$(1))) +$(call gb_Library_get_sdk_link_dir)/$(basename $(call gb_Library_get_filename,$(1))) endef define gb_Library_get_headers_target diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index e2e4a2a..c7bf4b7 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -197,7 +197,7 @@ gb_StaticLibrary_StaticLibrary_platform := gb_LinkTarget_get_linksearchpath_for_layer = \ -L$(WORKDIR)/LinkTarget/StaticLibrary \ - -L$(INSTDIR)/$(SDKDIRNAME)/lib \ + -L$(call gb_Library_get_sdk_link_dir) \ $(foreach layer,\ $(subst +, ,$(patsubst $(1):%.,%,\ $(filter $(1):%.,$(gb_LinkTarget_LAYER_LINKPATHS,\ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index b4dc1e3..1ebd72e 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -319,6 +319,8 @@ define gb_Library_get_ilibfilename $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES))) endef +gb_Library_get_sdk_link_dir = $(INSTDIR)/$(SDKDIRNAME)/lib + gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target) # StaticLibrary class diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 185fb26..4aa813f 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -220,6 +220,8 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) +gb_Library_get_sdk_link_dir = $(WORKDIR)/LinkTarget/Library + gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target) # bundle is a special kind of library that exists only on Darwin/OSX diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index f60c1fc..ea53a57 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -256,6 +256,8 @@ define gb_Library_get_ilibfilename $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES))) endef +gb_Library_get_sdk_link_dir = $(INSTDIR)/$(SDKDIRNAME)/lib + gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target) # Executable class diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index c2147d4..0f0ff13 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -229,6 +229,8 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) +gb_Librar
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/paramdialog.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9303192c4f1ff623f20ef4501723c003678140de
Author: Adolfo Jayme Barrientos
Date: Tue Nov 25 22:42:34 2014 -0600
Add missing space in translatable string
Change-Id: I88dabd5612069a7de3cad188344cc5c33ba22a7e
Reviewed-on: https://gerrit.libreoffice.org/13127
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/dbaccess/source/ui/dlg/paramdialog.src
b/dbaccess/source/ui/dlg/paramdialog.src
index fc8d020..23b1c55 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -21,7 +21,7 @@
String STR_COULD_NOT_CONVERT_PARAM
{
-Text [ en-US ] = "The entry could not be converted to a valid value for
the \"$name$\"column";
+Text [ en-US ] = "The entry could not be converted to a valid value for
the \"$name$\" column";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: io/qa
io/qa/textinputstream.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 14fa102cb972b5abb81923651904448abf79fd48
Author: Tor Lillqvist
Date: Wed Nov 26 11:00:42 2014 +0200
Fix C4716: 'anonymous namespace'::Input::readBytes : must return a value
Change-Id: I1d660da4cdd3f612ac1478e37e613446d4253fae
diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx
index efba8ac..15a59bc 100644
--- a/io/qa/textinputstream.cxx
+++ b/io/qa/textinputstream.cxx
@@ -47,7 +47,7 @@ private:
css::io::BufferSizeExceededException, css::io::IOException,
css::uno::RuntimeException, std::exception)
SAL_OVERRIDE
-{ CPPUNIT_FAIL("readLine is supposed to call readSomeBytes instead"); }
+{ CPPUNIT_FAIL("readLine is supposed to call readSomeBytes instead");
return 0;}
sal_Int32 SAL_CALL readSomeBytes(
css::uno::Sequence & aData, sal_Int32 nMaxBytesToRead)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
