Re: odf2xhtml (and other xslt filters) - tabs or spaces?

[Stephan Bergmann]

On 09/06/2017 06:34 PM, Thorsten Behrens wrote:

consistency (that we don't have anyway). Note that the original
tab2space conversion was done as a silent git rewrite, so not losing


Ah, that's a good point.  Shame we missed some types of source files 
back then...

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: external/curl

[Stephan Bergmann]

 external/curl/ExternalProject_curl.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a5139f902f36500f7a2a0a8da3eef79c26416dab
Author: Stephan Bergmann 
Date:   Wed Sep 6 23:24:08 2017 +0200

Clean up passing CPPFLAGS/LDFLAGS into external/curl

Change-Id: I3a4730c9a43f5e4904504bb136b3ccbcf29207b4
Reviewed-on: https://gerrit.libreoffice.org/42030
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 95d004e097d1..d6590c368193 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
 ifneq ($(OS),WNT)
 
 curl_CPPFLAGS :=
-curl_LDFLAGS := $(if $(filter LINUX 
FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)
+curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN)
 
 ifneq ($(OS),ANDROID)
 ifneq ($(SYSBASE),)
@@ -39,8 +39,6 @@ endif
 # use --with-nss only on platforms other than Mac OS X and iOS
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
-   CPPFLAGS="$(curl_CPPFLAGS)" \
-   LDFLAGS=$(curl_LDFLAGS) \
./configure \
$(if $(filter IOS MACOSX,$(OS)),\
--with-darwinssl,\
@@ -60,6 +58,8 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(ENABLE_DEBUG),--enable-debug) \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
+   CPPFLAGS='$(curl_CPPFLAGS)' \
+   LDFLAGS='$(curl_LDFLAGS)' \
&& cd lib \
&& $(MAKE) \
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source sd/qa

[Jan Holesovsky]

 oox/source/export/drawingml.cxx |   24 ++--
 sd/qa/unit/data/pptx/tdf106867.pptx |binary
 sd/qa/unit/export-tests-ooxml2.cxx  |   33 +
 3 files changed, 51 insertions(+), 6 deletions(-)

New commits:
commit 4aabc5164d2a0d84e22fb3f6f66e020a8df6899a
Author: Jan Holesovsky 
Date:   Wed Sep 6 11:54:33 2017 +0200

tdf#106867: Unit test for the export of embedded videos.

Change-Id: Ibbc3da56ace2eaaf4670e869a34ec4c1bad4bf5d
Reviewed-on: https://gerrit.libreoffice.org/41982
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index fe5f4c3268da..44cfc48ad089 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -967,12 +967,24 @@ void DrawingML::WriteMediaNonVisualProperties(const 
css::uno::ReferencegetMediaProperties().getMimeType();
+OUString aMimeType(pMediaObj->getMediaProperties().getMimeType());
+if (aMimeType == "application/vnd.sun.star.media")
+{
+// try to set something better
+// TODO fix the importer to actually set the mimetype on import
+if (aExtension.equalsIgnoreAsciiCase(".avi"))
+aMimeType = "video/x-msvideo";
+else if (aExtension.equalsIgnoreAsciiCase(".flv"))
+aMimeType = "video/x-flv";
+else if (aExtension.equalsIgnoreAsciiCase(".mp4"))
+aMimeType = "video/mp4";
+else if (aExtension.equalsIgnoreAsciiCase(".mov"))
+aMimeType = "video/quicktime";
+else if (aExtension.equalsIgnoreAsciiCase(".ogv"))
+aMimeType = "video/ogg";
+else if (aExtension.equalsIgnoreAsciiCase(".wmv"))
+aMimeType = "video/x-ms-wmv";
+}
 
 OUString aVideoFileRelId;
 OUString aMediaRelId;
diff --git a/sd/qa/unit/data/pptx/tdf106867.pptx 
b/sd/qa/unit/data/pptx/tdf106867.pptx
new file mode 100644
index ..5bf16d690ef2
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf106867.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 7f1bff9a7639..ce7c117e27c0 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -104,6 +104,7 @@ public:
 void testTdf111518();
 void testTdf100387();
 void testRotateFlip();
+void testTdf106867();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -135,6 +136,7 @@ public:
 CPPUNIT_TEST(testTdf111518);
 CPPUNIT_TEST(testTdf100387);
 CPPUNIT_TEST(testRotateFlip);
+CPPUNIT_TEST(testTdf106867);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -153,6 +155,7 @@ public:
 { "pic", 
"http://schemas.openxmlformats.org/drawingml/2006/picture"; },
 { "wp", 
"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"; },
 { "p", 
"http://schemas.openxmlformats.org/presentationml/2006/main"; },
+{ "p14", 
"http://schemas.microsoft.com/office/powerpoint/2010/main"; },
 { "w", 
"http://schemas.openxmlformats.org/wordprocessingml/2006/main"; },
 { "a14", "http://schemas.microsoft.com/office/drawing/2010/main"; },
 { "wps", 
"http://schemas.microsoft.com/office/word/2010/wordprocessingShape"; },
@@ -991,6 +994,36 @@ void SdOOXMLExportTest2::testRotateFlip()
 }
 }
 
+void SdOOXMLExportTest2::testTdf106867()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf106867.pptx"), 
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+const SdrPage *pPage = GetPage(1, xDocShRef.get());
+
+// first check that we have the media object
+const SdrMediaObj* pMediaObj = 
dynamic_cast(pPage->GetObj(2));
+CPPUNIT_ASSERT_MESSAGE("no media object", pMediaObj != nullptr);
+
CPPUNIT_ASSERT_EQUAL(OUString("vnd.sun.star.Package:ppt/media/media1.avi"), 
pMediaObj->getURL());
+
+xDocShRef->DoClose();
+
+// additional checks of the output file
+uno::Reference xNameAccess = 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
 tempFile.GetURL());
+// check that the document contains the video stream
+CPPUNIT_ASSERT(xNameAccess->hasByName("ppt/media/media1.avi"));
+
+// both the ooxml and the extended markup
+xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:nvPr/a:videoFile");
+assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:pic/p:nvPicPr/p:nvPr/p:extLst/p:ext/p14:media");
+
+// target the shape with the video in the command
+assertXPath(pXmlDocContent, 
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:cmd/p:cBhvr/p:tgtEl/p:spTgt",
+"spid", "42");
+}
+
 CPPUNIT_TEST

[Libreoffice-commits] core.git: include/oox oox/source

[Jan Holesovsky]

 include/oox/export/drawingml.hxx   |4 -
 include/oox/token/relationship.hxx |1 
 oox/source/export/drawingml.cxx|   77 +
 oox/source/export/shapes.cxx   |   20 -
 oox/source/token/relationship.inc  |1 
 5 files changed, 59 insertions(+), 44 deletions(-)

New commits:
commit 4d1159136ae25b437d874e0fba7f0f13651049b6
Author: Jan Holesovsky 
Date:   Wed Sep 6 10:36:10 2017 +0200

tdf#106867: Write also the extended markup to fully support embedded videos.

Change-Id: I33398bff32077a8a109e0addcebab039f734c1bb
Reviewed-on: https://gerrit.libreoffice.org/41981
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 0e497f91a4a5..c33bb40f4306 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -136,8 +136,8 @@ protected:
 /// If bRelPathToMedia is true add "../" to image folder path while adding 
the image relationship
 OUString WriteImage( const OUString& rURL, bool bRelPathToMedia = false);
 
-/// Copy a video from vnd.sun.star.Package: to the output and return RelId.
-OUString WriteMedia(const css::uno::Reference& 
xShape, bool bRelPathToMedia = false);
+/// Output the media (including copying a video from vnd.sun.star.Package: 
to the output if necessary).
+void WriteMediaNonVisualProperties(const 
css::uno::Reference& xShape);
 
 void WriteStyleProperties( sal_Int32 nTokenId, const css::uno::Sequence< 
css::beans::PropertyValue >& aProperties );
 
diff --git a/include/oox/token/relationship.hxx 
b/include/oox/token/relationship.hxx
index 329fe7407df1..18cca8523749 100644
--- a/include/oox/token/relationship.hxx
+++ b/include/oox/token/relationship.hxx
@@ -39,6 +39,7 @@ enum class Relationship
 HEADER,
 HYPERLINK,
 IMAGE,
+MEDIA,
 NOTESMASTER,
 NOTESSLIDE,
 NUMBERING,
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 32e971fa4995..fe5f4c3268da 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -951,11 +951,11 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , 
bool bRelPathToMedia )
 return sRelId;
 }
 
-OUString DrawingML::WriteMedia(const 
css::uno::Reference& xShape, bool bRelPathToMedia)
+void DrawingML::WriteMediaNonVisualProperties(const 
css::uno::Reference& xShape)
 {
 SdrMediaObj* pMediaObj = 
dynamic_cast(GetSdrObjectFromXShape(xShape));
 if (!pMediaObj)
-return OUString();
+return;
 
 // extension
 OUString aExtension;
@@ -964,6 +964,8 @@ OUString DrawingML::WriteMedia(const 
css::uno::Reference&
 if (nLastDot >= 0)
 aExtension = rURL.copy(nLastDot);
 
+bool bEmbed = rURL.startsWith("vnd.sun.star.Package:");
+
 // mime type
 // TODO add more types explicitly based on the extension (?)
 OUString aMimeType;
@@ -972,32 +974,59 @@ OUString DrawingML::WriteMedia(const 
css::uno::Reference&
 else
 aMimeType = pMediaObj->getMediaProperties().getMimeType();
 
-Reference xOutStream = 
mpFB->openFragmentStream(OUStringBuffer()
-   
.appendAscii(GetComponentDir())
-   
.append("/media/media")
-   
.append((sal_Int32) mnImageCounter)
-   
.append(aExtension)
-   
.makeStringAndClear(),
-   aMimeType);
+OUString aVideoFileRelId;
+OUString aMediaRelId;
 
-uno::Reference xInputStream(pMediaObj->GetInputStream());
-comphelper::OStorageHelper::CopyInputToOutput(xInputStream, xOutStream);
+if (bEmbed)
+{
+// copy the video stream
+Reference xOutStream = 
mpFB->openFragmentStream(OUStringBuffer()
+   
.appendAscii(GetComponentDir())
+   
.append("/media/media")
+   
.append((sal_Int32) mnImageCounter)
+   
.append(aExtension)
+   
.makeStringAndClear(),
+   
aMimeType);
 
-xOutStream->closeOutput();
+uno::Reference 
xInputStream(pMediaObj->GetInputStream());
+comphelper::OStorageHelper::CopyInputToOutput(xInputStream, 
xOutStream);
 
-// create the relation
-OString sRelPathToMedia = "media/media";
-if (bRelPathToMedia)
-sRelPathToMedia = "../" + sR

[Libreoffice-commits] core.git: include/oox oox/CppunitTest_oox_tokenmap.mk oox/Library_oox.mk oox/source sd/source

[Jan Holesovsky]

 include/oox/export/drawingml.hxx |4 ++
 include/oox/token/relationship.hxx   |1 
 oox/CppunitTest_oox_tokenmap.mk  |1 
 oox/Library_oox.mk   |3 +
 oox/source/export/drawingml.cxx  |   54 
 oox/source/export/shapes.cxx |   58 +++
 oox/source/token/relationship.inc|1 
 sd/source/filter/eppt/pptx-epptooxml.cxx |2 +
 8 files changed, 117 insertions(+), 7 deletions(-)

New commits:
commit cbcffbaee204e9dfbdc2125dda73e36d77e9b844
Author: Jan Holesovsky 
Date:   Tue Sep 5 16:53:14 2017 +0200

tdf#106867: Export videos in PPTX.

Change-Id: I7f4f389a72aa7ecef65d87f07bb69ba8f3374a14
Reviewed-on: https://gerrit.libreoffice.org/41979
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 866689fa5e21..0e497f91a4a5 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -135,6 +135,10 @@ protected:
 
 /// If bRelPathToMedia is true add "../" to image folder path while adding 
the image relationship
 OUString WriteImage( const OUString& rURL, bool bRelPathToMedia = false);
+
+/// Copy a video from vnd.sun.star.Package: to the output and return RelId.
+OUString WriteMedia(const css::uno::Reference& 
xShape, bool bRelPathToMedia = false);
+
 void WriteStyleProperties( sal_Int32 nTokenId, const css::uno::Sequence< 
css::beans::PropertyValue >& aProperties );
 
 const char* GetComponentDir();
diff --git a/include/oox/token/relationship.hxx 
b/include/oox/token/relationship.hxx
index d00552e02560..329fe7407df1 100644
--- a/include/oox/token/relationship.hxx
+++ b/include/oox/token/relationship.hxx
@@ -53,6 +53,7 @@ enum class Relationship
 STYLES,
 THEME,
 VBAPROJECT,
+VIDEO,
 VMLDRAWING,
 WORDVBADATA,
 WORKSHEET
diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
index 1ef9d85bc625..8019da7a2301 100644
--- a/oox/CppunitTest_oox_tokenmap.mk
+++ b/oox/CppunitTest_oox_tokenmap.mk
@@ -35,6 +35,7 @@ endif
 endif
 
 $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
+avmedia \
 basegfx \
 comphelper \
 cppu \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index db6e9b2d16f7..ecf760f0350c 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_api,oox,\
 ))
 
 $(eval $(call gb_Library_use_libraries,oox,\
+avmedia \
 basegfx \
 comphelper \
 cppu \
@@ -47,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,oox,\
 drawinglayer \
 msfilter \
 sal \
-   i18nlangtag \
+i18nlangtag \
 sax \
 sfx \
 svl \
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 94dcd54ed063..32e971fa4995 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -58,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -70,6 +72,8 @@
 #include 
 #include 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -88,6 +92,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -946,6 +951,55 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , 
bool bRelPathToMedia )
 return sRelId;
 }
 
+OUString DrawingML::WriteMedia(const 
css::uno::Reference& xShape, bool bRelPathToMedia)
+{
+SdrMediaObj* pMediaObj = 
dynamic_cast(GetSdrObjectFromXShape(xShape));
+if (!pMediaObj)
+return OUString();
+
+// extension
+OUString aExtension;
+const OUString& rURL(pMediaObj->getURL());
+int nLastDot = rURL.lastIndexOf('.');
+if (nLastDot >= 0)
+aExtension = rURL.copy(nLastDot);
+
+// mime type
+// TODO add more types explicitly based on the extension (?)
+OUString aMimeType;
+if (aExtension.equalsIgnoreAsciiCase(".wmv"))
+aMimeType = "video/x-ms-wmv";
+else
+aMimeType = pMediaObj->getMediaProperties().getMimeType();
+
+Reference xOutStream = 
mpFB->openFragmentStream(OUStringBuffer()
+   
.appendAscii(GetComponentDir())
+   
.append("/media/media")
+   
.append((sal_Int32) mnImageCounter)
+   
.append(aExtension)
+   
.makeStringAndClear(),
+   aMimeType);
+
+uno::Reference xInputStream(pMediaObj->GetInputStream());
+comphelper::OStorageHelper::CopyInputToOutput(xInputStream, xOutStream);
+
+xOutS

[Libreoffice-commits] core.git: sc/source

[Dennis Francis]

 sc/source/ui/inc/undocell.hxx  |1 +
 sc/source/ui/undo/undocell.cxx |   12 
 2 files changed, 13 insertions(+)

New commits:
commit f2c29539d52095ea7b914b20ef7f564469d2aa96
Author: Dennis Francis 
Date:   Wed Aug 30 18:14:15 2017 +0530

tdf#107952: Move cursor to changed cell after undo/redo in ScUndoSetCell

Change-Id: Id9f2ba2ed2d77f03c9bd56c41b958aa23921da0d
Reviewed-on: https://gerrit.libreoffice.org/42014
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 2eca5ee23328..65a9ea6f22d8 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -158,6 +158,7 @@ public:
 private:
 void SetChangeTrack();
 void SetValue( const ScCellValue& rVal );
+void MoveCursorToCell();
 
 private:
 ScAddress maPos;
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 360135d6cb97..5e0a20b3bebc 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -387,6 +387,7 @@ void ScUndoSetCell::Undo()
 {
 BeginUndo();
 SetValue(maOldValue);
+MoveCursorToCell();
 pDocShell->PostPaintCell(maPos);
 
 ScDocument& rDoc = pDocShell->GetDocument();
@@ -401,6 +402,7 @@ void ScUndoSetCell::Redo()
 {
 BeginRedo();
 SetValue(maNewValue);
+MoveCursorToCell();
 pDocShell->PostPaintCell(maPos);
 SetChangeTrack();
 EndRedo();
@@ -469,6 +471,16 @@ void ScUndoSetCell::SetValue( const ScCellValue& rVal )
 }
 }
 
+void ScUndoSetCell::MoveCursorToCell()
+{
+ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+if ( pViewShell )
+{
+pViewShell->SetTabNo( maPos.Tab() );
+pViewShell->MoveCursorAbs( maPos.Col(), maPos.Row(), SC_FOLLOW_JUMP, 
false, false );
+}
+}
+
 ScUndoPageBreak::ScUndoPageBreak( ScDocShell* pNewDocShell,
 SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
 bool bNewColumn, bool bNewInsert ) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - instsetoo_native/inc_openoffice

[Matthias Seidel]

 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |   16 
+-
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 51f6562584399090e5ca99225ec833f052b21a22
Author: Matthias Seidel 
Date:   Wed Sep 6 22:44:27 2017 +

Small optical changes to Windows Installer

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index b01ba0500b32..ac099daedf2c 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -45,13 +45,13 @@ CustomerInformation BackPushButton  164 243 
66  17  3   OOO_CONTROL_32  Next
 CustomerInformationBanner  Bitmap  0   0   374 44  1   
BannerBmp   
 CustomerInformationBannerLine  Line0   44  376 0   
1   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  SerialLabel 
+CustomerInformationCompanyEdit Edit21  100 249 17  
3   COMPANYNAME OOO_CONTROL_36  SerialLabel 
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  249 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line0   234 376 0   1   

 CustomerInformationDlgRadioGroupText   Text21  161 300 
14  3   OOO_CONTROL_39  
 CustomerInformationDlgTitleText13  6   257 25  
65539   OOO_CONTROL_40  
-CustomerInformationNameEditEdit21  63  237 17  
3   USERNAMEOOO_CONTROL_41  CompanyLabel
+CustomerInformationNameEditEdit21  63  249 17  
3   USERNAMEOOO_CONTROL_41  CompanyLabel
 CustomerInformationNameLabel   Text21  52  75  10  
3   OOO_CONTROL_42  NameEdit
 CustomerInformationNextPushButton  230 243 66  17  
3   OOO_CONTROL_43  Cancel  
 CustomerInformationRadioGroup  RadioButtonGroup63  170 
300 50  3   ApplicationUsersBack
@@ -74,7 +74,7 @@ CustomSetup   ItemDescription Text241 80  120 
50  3   OOO_CONTROL_58
 CustomSetupLocationText8   203 291 20  3   
OOO_CONTROL_59  
 CustomSetupNextPushButton  230 243 66  17  3   
OOO_CONTROL_60  Cancel  
 CustomSetupSizeText241 133 120 50  3   
OOO_CONTROL_61  
-CustomSetupTreeSelectionTree   8   70  220 118 7   
_BrowseProperty ChangeFolder
+CustomSetupTreeSelectionTree   8   70  220 118 3   
_BrowseProperty ChangeFolder
 CustomSetupTipsBanner  Bitmap  0   0   374 44  1   
BannerBmp   
 CustomSetupTipsBannerLine  Line0   44  376 0   
1   
 CustomSetupTipsDlgDesc Text21  23  249 25  65539   
OOO_CONTROL_64  
@@ -118,9 +118,9 @@ DiskSpaceRequirements   Banner  Bitmap  0   0   
374 44  1   BannerBmp
 DiskSpaceRequirements  BannerLine  Line0   44  376 0   
1   
 DiskSpaceRequirements  DlgDesc Text21  23  249 25  65539   
OOO_CONTROL_96  
 DiskSpaceRequirements  DlgLine Line0   234 376 0   1   

-DiskSpaceRequirements  DlgText Text13  185 353 41  3   
OOO_CONTROL_97  
+DiskSpaceRequirements  DlgText Text21  185 345 41  3   
OOO_CONTROL_97  
 DiskSpaceRequirements  DlgTitleText13  6   257 25  
65539   OOO_CONTROL_98  
-DiskSpaceRequirements  ListVolumeCostList  13  55  353 125 
393223  {60}{80}{70}{70}{70}
+DiskSpaceRequirements  ListVolumeCostList  21  55  345 125 
65539   {60}{80}{70}{70}{70}
 DiskSpaceRequirements  OK  PushButton  301 243 66  17  
3   OOO_CONTROL_100 
 FilesInUse Banner  Bitmap  0   0   374 44  1   
Bann

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - instsetoo_native/inc_ooolangpack

[Matthias Seidel]

 instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fa45cc518c2fa3fe739b50cf2b2162dbe13e63a
Author: Matthias Seidel 
Date:   Wed Sep 6 22:04:38 2017 +

NoWrap in DlgTitle

diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index ad5a2a21939b..f536e2da389f 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -107,7 +107,7 @@ DestinationFolder   ChangeFolderPushButton  301 
125 66  17  3   OOO_CONTROL_88  Back
 DestinationFolder  DestFolder  Icon21  112 24  24  
5242881 OpenFolderIco   
 DestinationFolder  DlgDesc Text21  23  249 25  65539   
OOO_CONTROL_304 
 DestinationFolder  DlgLine Line0   234 376 0   1   

-DestinationFolder  DlgTitleText13  6   257 25  
65539   {&MSSansBold8}[ProductName] 
+DestinationFolder  DlgTitleText13  6   257 25  
327683  {&MSSansBold8}[ProductName] 
 DestinationFolder  LocationText57  128 240 40  
3   _BrowseProperty [INSTALLLOCATION]   
 DestinationFolder  LocLabelText57  115 290 10  
3   OOO_CONTROL_92  
 DestinationFolder  NextPushButton  230 243 66  17  
3   OOO_CONTROL_93  Cancel  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Julien Nabet]

 vcl/source/app/session.cxx |   58 ++---
 1 file changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 115bed941d7b7ed1b95d6424bfb98456c1d87546
Author: Julien Nabet 
Date:   Wed Sep 6 22:05:25 2017 +0200

Rename wrong name of vars in auto loop

My commit 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=8c7b42c942d6693915dc825ede80279f720a5775
was wrong for some variable names, var in for loops aren't iterators on 
objects but objects

Change-Id: I13484e5faa50aa8585231661846afa007b7a6eab
Reviewed-on: https://gerrit.libreoffice.org/42026
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 5e56ce9115b1..d8f20efdfebb 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -115,8 +115,8 @@ void VCLSession::callSaveRequested( bool bShutdown )
 {
 osl::MutexGuard aGuard( m_aMutex );
 // reset listener states
-for (auto & it: m_aListeners) {
-it.m_bSaveDone = it.m_bInteractionRequested = 
it.m_bInteractionDone = false;
+for (auto & listener : m_aListeners) {
+listener.m_bSaveDone = listener.m_bInteractionRequested = 
listener.m_bInteractionDone = false;
 }
 
 // copy listener vector since calling a listener may remove it.
@@ -142,8 +142,8 @@ void VCLSession::callSaveRequested( bool bShutdown )
 }
 
 SolarMutexReleaser aReleaser;
-for (auto const & it: aListeners)
-it.m_xListener->doSave( bShutdown, false/*bCancelable*/ );
+for (auto const & listener: aListeners)
+listener.m_xListener->doSave( bShutdown, false/*bCancelable*/ );
 }
 
 void VCLSession::callInteractionGranted( bool bInteractionGranted )
@@ -154,9 +154,9 @@ void VCLSession::callInteractionGranted( bool 
bInteractionGranted )
 {
 osl::MutexGuard aGuard( m_aMutex );
 // copy listener vector since calling a listener may remove it.
-for (auto const & it: m_aListeners)
-if( it.m_bInteractionRequested )
-aListeners.push_back( it );
+for (auto const & listener: m_aListeners)
+if( listener.m_bInteractionRequested )
+aListeners.push_back( listener );
 
 m_bInteractionGranted = bInteractionGranted;
 
@@ -174,8 +174,8 @@ void VCLSession::callInteractionGranted( bool 
bInteractionGranted )
 }
 
 SolarMutexReleaser aReleaser;
-for (auto const & it: aListeners)
-it.m_xListener->approveInteraction( bInteractionGranted );
+for (auto const & listener: aListeners)
+listener.m_xListener->approveInteraction( bInteractionGranted );
 }
 
 void VCLSession::callShutdownCancelled()
@@ -192,8 +192,8 @@ void VCLSession::callShutdownCancelled()
 }
 
 SolarMutexReleaser aReleaser;
-for (auto const & it: aListeners)
-it.m_xListener->shutdownCanceled();
+for (auto const & listener: aListeners)
+listener.m_xListener->shutdownCanceled();
 }
 
 void VCLSession::callQuit()
@@ -210,9 +210,9 @@ void VCLSession::callQuit()
 }
 
 SolarMutexReleaser aReleaser;
-for (auto const & it: aListeners)
+for (auto const & listener: aListeners)
 {
-css::uno::Reference< XSessionManagerListener2 > xListener2( 
it.m_xListener, UNO_QUERY );
+css::uno::Reference< XSessionManagerListener2 > xListener2( 
listener.m_xListener, UNO_QUERY );
 if( xListener2.is() )
 xListener2->doQuit();
 }
@@ -292,13 +292,13 @@ void SAL_CALL VCLSession::queryInteraction( const 
css::uno::ReferencequeryInteraction();
 m_bInteractionRequested = true;
 }
-for (auto & it: m_aListeners)
+for (auto & listener: m_aListeners)
 {
-if( it.m_xListener == xListener )
+if( listener.m_xListener == xListener )
 {
-SAL_INFO("vcl.se.debug", "  it->m_xListener == xListener");
-it.m_bInteractionRequested = true;
-it.m_bInteractionDone  = false;
+SAL_INFO("vcl.se.debug", "  listener.m_xListener == xListener");
+listener.m_bInteractionRequested = true;
+listener.m_bInteractionDone  = false;
 }
 }
 }
@@ -309,15 +309,15 @@ void SAL_CALL VCLSession::interactionDone( const 
css::uno::Reference< XSessionMa
 
 osl::MutexGuard aGuard( m_aMutex );
 int nRequested = 0, nDone = 0;
-for (auto & it: m_aListeners)
+for (auto & listener: m_aListeners)
 {
-if( it.m_bInteractionRequested )
+if( listener.m_bInteractionRequested )
 {
 nRequested++;
-if( xListener == it.m_xListener )
-it.m_bInteractionDone = true;
+if( xListener == listener.m_xListener )
+listener.m_bInteractionDone = true;
 }
-if( it.m_bInteractionDone )
+if( listener.m_bInteractionDone )
 nDone++;
 }
 
@

[Libreoffice-commits] core.git: svtools/source

[Julien Nabet]

 svtools/source/graphic/grfcache.cxx |   22 +++---
 svtools/source/graphic/grfcache.hxx |   10 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit df34535d0a835ac8f7cd19e011965a8790e0c7ae
Author: Julien Nabet 
Date:   Wed Sep 6 22:24:13 2017 +0200

Replace some lists by vectors in svtools

Change-Id: Ibd0bf4a4045fa079827e211b2f5668900c8188ef
Reviewed-on: https://gerrit.libreoffice.org/42029
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/svtools/source/graphic/grfcache.cxx 
b/svtools/source/graphic/grfcache.cxx
index c5995a141b22..1f99b841cea8 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -863,7 +863,7 @@ void GraphicCache::AddGraphicObject(
   && !maGraphicCache.empty()
 )
 {
-GraphicCacheEntryList::iterator it = maGraphicCache.begin();
+GraphicCacheEntryVector::iterator it = maGraphicCache.begin();
 while(  !bInserted
  && ( it != maGraphicCache.end() )
  )
@@ -882,7 +882,7 @@ void GraphicCache::AddGraphicObject(
 
 if( !bInserted )
 {
-GraphicCacheEntryList::iterator it = maGraphicCache.begin();
+GraphicCacheEntryVector::iterator it = maGraphicCache.begin();
 std::unique_ptr< GraphicID > apID;
 
 if( !pID )
@@ -905,7 +905,7 @@ void GraphicCache::AddGraphicObject(
 // since pEntry->TryToSwapIn can modify our current 
list, we have to
 // iterate from beginning to add a reference to the 
appropriate
 // CacheEntry object; after this, quickly jump out of 
the outer iteration
-for( GraphicCacheEntryList::iterator jt = 
maGraphicCache.begin();
+for( GraphicCacheEntryVector::iterator jt = 
maGraphicCache.begin();
  !bInserted && jt != maGraphicCache.end();
  ++jt
 )
@@ -949,7 +949,7 @@ void GraphicCache::ReleaseGraphicObject( const 
GraphicObject& rObj )
 {
 // Release cached object
 boolbRemoved = false;
-GraphicCacheEntryList::iterator it = maGraphicCache.begin();
+GraphicCacheEntryVector::iterator it = maGraphicCache.begin();
 while (!bRemoved && it != maGraphicCache.end())
 {
 bRemoved = (*it)->ReleaseGraphicObjectReference( rObj );
@@ -958,7 +958,7 @@ void GraphicCache::ReleaseGraphicObject( const 
GraphicObject& rObj )
 {
 // if graphic cache entry has no more references,
 // the corresponding display cache object can be removed
-GraphicDisplayCacheEntryList::iterator it2 = 
maDisplayCache.begin();
+GraphicDisplayCacheEntryVector::iterator it2 = 
maDisplayCache.begin();
 while( it2 != maDisplayCache.end() )
 {
 GraphicDisplayCacheEntry* pDisplayEntry = *it2;
@@ -1029,7 +1029,7 @@ void GraphicCache::SetCacheTimeout( sal_uLong 
nTimeoutSeconds )
 aReleaseTime.addTime( ::salhelper::TTimeValue( nTimeoutSeconds, 0 
) );
 }
 
-for( GraphicDisplayCacheEntryList::const_iterator it = 
maDisplayCache.begin();
+for( GraphicDisplayCacheEntryVector::const_iterator it = 
maDisplayCache.begin();
  it != maDisplayCache.end(); ++it )
 {
 (*it)->SetReleaseTime( aReleaseTime );
@@ -1054,7 +1054,7 @@ bool GraphicCache::IsInDisplayCache( OutputDevice const * 
pOut, const Point& rPt
 
 if( pCacheEntry )
 {
-for( GraphicDisplayCacheEntryList::const_iterator it = 
maDisplayCache.begin();
+for( GraphicDisplayCacheEntryVector::const_iterator it = 
maDisplayCache.begin();
  !bFound && ( it != maDisplayCache.end() ); ++it )
 {
 if( (*it)->Matches( pOut, aPtPixel, aSzPixel, pCacheEntry, rAttr ) 
)
@@ -1155,7 +1155,7 @@ bool GraphicCache::DrawDisplayCacheObj( OutputDevice* 
pOut, const Point& rPt, co
 const Size  aSzPixel( pOut->LogicToPixel( rSz ) );
 const GraphicCacheEntry*pCacheEntry = ImplGetCacheEntry( rObj );
 GraphicDisplayCacheEntry*   pDisplayCacheEntry = nullptr;
-GraphicDisplayCacheEntryList::iterator it = maDisplayCache.begin();
+GraphicDisplayCacheEntryVector::iterator it = maDisplayCache.begin();
 boolbRet = false;
 
 while( !bRet && it != maDisplayCache.end() )
@@ -1194,7 +1194,7 @@ bool GraphicCache::ImplFreeDisplayCacheSpace( sal_uLong 
nSizeToFree )
 
 if( nSizeToFree )
 {
-GraphicDisplayCacheEntryList::iterator it = maDisplayCache.begin();
+GraphicDisplayCacheEntryVector::iterator it = maDisplayCache.begin();
 
 if( nSizeToFree > mnUsedDisplaySize )
 nSizeToFree = mnUsedDisplaySize;
@@ -1221,7 +1221,7 @@ GraphicCacheEntry* GraphicCache::ImplGetCacheEntry( const 
GraphicObj

[Libreoffice-commits] core.git: filter/source include/filter

[Julien Nabet]

 filter/source/msfilter/svdfppt.cxx  |7 +--
 include/filter/msfilter/svdfppt.hxx |1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 758f021601c25251f9cc5475570153022e140ee0
Author: Julien Nabet 
Date:   Wed Sep 6 21:01:33 2017 +0200

bBObjIsTemporary is never read

since 2010-02-11
author  Armin Le Grand  2010-02-11 16:35:16 (GMT)
committer   Armin Le Grand  2010-02-11 16:35:16 
(GMT)
commit  a9626fc825840c49fd3135fbf4818e276cd347cb (patch)
tree989109ecba1c8fdcc58b22974fa011cab299aca3
parent  a4d83adbf01e4d8f935ad2ded82be80d13b7cdb1 (diff)
aw079 #i99386# cleanup of define and last change from CL

see 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=a9626fc825840c49fd3135fbf4818e276cd347cb

Change-Id: Ib430ddb01b40e1c2d0ef3b888ebb94ebf073b88c
Reviewed-on: https://gerrit.libreoffice.org/42024
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 17128c1cda12..924bcd9d72c5 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -507,7 +507,6 @@ PptSlidePersistEntry::PptSlidePersistEntry() :
 nDrawingDgId( 0x ),
 pPresentationObjects( nullptr ),
 pBObj   ( nullptr ),
-bBObjIsTemporary( true ),
 ePageKind   ( PPT_MASTERPAGE ),
 bNotesMaster( false ),
 bHandoutMaster  ( false ),
@@ -2813,11 +2812,9 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, 
const PptSlidePersistEntry*
 if ( pE->nBackgroundOffset )
 {
 // do not follow master 
colorscheme?
-bool bTemporary = ( 
rSlidePersist.aSlideAtom.nFlags & 2 ) != 0;
 sal_uInt32 nPos = 
rStCtrl.Tell();
 rStCtrl.Seek( 
pE->nBackgroundOffset );
 rSlidePersist.pBObj = 
ImportObj( rStCtrl, static_cast(&aProcessData), aPageSize, aPageSize );
-rSlidePersist.bBObjIsTemporary 
= bTemporary;
 rStCtrl.Seek( nPos );
 }
 }
@@ -2834,7 +2831,6 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, 
const PptSlidePersistEntry*
 {
 
aEscherObjListHd.SeekToBegOfRecord( rStCtrl );
 rSlidePersist.pBObj = 
ImportObj( rStCtrl, static_cast(&aProcessData), aPageSize, aPageSize );
-rSlidePersist.bBObjIsTemporary 
= false;
 }
 }
 }
@@ -2922,8 +2918,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, 
const PptSlidePersistEntry*
 if ( rSlidePersist.pBObj )
 {
 // #i99386# transfer the attributes from the 
temporary BackgroundObject
-// to the Page and delete it. Maybe 
rSlidePersist.bBObjIsTemporary is
-// obsolete here, too.
+// to the Page and delete it.
 pRet->getSdrPageProperties().ClearItem();
 
pRet->getSdrPageProperties().PutItemSet(rSlidePersist.pBObj->GetMergedItemSet());
 if (rSlidePersist.pSolverContainer)
diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index 20c681b7fb98..2be1cd00dbb0 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -369,7 +369,6 @@ struct PptSlidePersistEntry
 pPresentationObjects;   // if valid, this is a pointer 
to an array that includes the offsets to the presentation objects
 // on this masterpage for each 
instance (0 - 8);
 SdrObject*  pBObj;
-boolbBObjIsTemporary;
 
 PptPageKind ePageKind;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/curl

[Stephan Bergmann]

 external/curl/ExternalProject_curl.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8067ae344014f4f61219ed3fcfff6b48e2a2b2d8
Author: Stephan Bergmann 
Date:   Wed Sep 6 23:21:40 2017 +0200

Pass "verbose" flag into external/curl

Change-Id: Ic42bbeaee8faa8a5e99fbdd22775870bd2e5bae0

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 73fd1ac63591..95d004e097d1 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -58,6 +58,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
+   $(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& cd lib \
&& $(MAKE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/source

[Julien Nabet]

 sc/inc/listenercalls.hxx  |4 ++--
 sc/inc/unoreflist.hxx |4 ++--
 sc/source/ui/unoobj/listenercalls.cxx |5 ++---
 sc/source/ui/unoobj/unoreflist.cxx|6 ++
 4 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit f8defe59ff75df2b516ee407f1dac22b0ac72a19
Author: Julien Nabet 
Date:   Wed Sep 6 21:49:59 2017 +0200

Replace some lists by vectors in unoobj (sc)

Change-Id: I611f1a217ff1d5468c77f04a0c2eddd61ee33b8b
Reviewed-on: https://gerrit.libreoffice.org/42025
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx
index 0a335a1a4ae4..d9f1a476af6c 100644
--- a/sc/inc/listenercalls.hxx
+++ b/sc/inc/listenercalls.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_LISTENERCALLS_HXX
 #define INCLUDED_SC_INC_LISTENERCALLS_HXX
 
-#include 
+#include 
 #include 
 #include 
 
@@ -52,7 +52,7 @@ struct ScUnoListenerEntry
 class ScUnoListenerCalls
 {
 private:
-::std::list aEntries;
+::std::vector aEntries;
 
 public:
 ScUnoListenerCalls();
diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx
index d9b845e22d2c..c5192d7308fc 100644
--- a/sc/inc/unoreflist.hxx
+++ b/sc/inc/unoreflist.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_UNOREFLIST_HXX
 #define INCLUDED_SC_INC_UNOREFLIST_HXX
 
-#include 
+#include 
 #include 
 #include "rangelst.hxx"
 
@@ -42,7 +42,7 @@ struct ScUnoRefEntry
 class ScUnoRefList
 {
 private:
-::std::list aEntries;
+::std::vector aEntries;
 
 public:
 ScUnoRefList();
diff --git a/sc/source/ui/unoobj/listenercalls.cxx 
b/sc/source/ui/unoobj/listenercalls.cxx
index b1d98412a183..1164043b3977 100644
--- a/sc/source/ui/unoobj/listenercalls.cxx
+++ b/sc/source/ui/unoobj/listenercalls.cxx
@@ -48,9 +48,8 @@ void ScUnoListenerCalls::ExecuteAndClear()
 
 if (!aEntries.empty())
 {
-std::list::iterator aItr(aEntries.begin());
-std::list::iterator aEndItr(aEntries.end());
-while ( aItr != aEndItr )
+std::vector::iterator aItr(aEntries.begin());
+while (aItr != aEntries.end())
 {
 ScUnoListenerEntry aEntry = *aItr;
 try
diff --git a/sc/source/ui/unoobj/unoreflist.cxx 
b/sc/source/ui/unoobj/unoreflist.cxx
index 598b25bfcf94..13d6cd06a0d6 100644
--- a/sc/source/ui/unoobj/unoreflist.cxx
+++ b/sc/source/ui/unoobj/unoreflist.cxx
@@ -35,11 +35,9 @@ void ScUnoRefList::Add( sal_Int64 nId, const ScRangeList& 
rOldRanges )
 
 void ScUnoRefList::Undo( ScDocument* pDoc )
 {
-std::list::const_iterator aEnd( aEntries.end() );
-for ( std::list::const_iterator aIter( aEntries.begin() );
-  aIter != aEnd; ++aIter )
+for (auto & entry: aEntries)
 {
-ScUnoRefUndoHint aHint( *aIter );
+ScUnoRefUndoHint aHint(entry);
 pDoc->BroadcastUno( aHint );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/java

[Damjan Jovanovic]

 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
  |3 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
|6 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
   |3 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java
 |4 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
   |  135 --
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndex.java
   |5 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexColumnContainer.java
|3 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexContainer.java
  |5 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKey.java
 |5 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyColumnContainer.java
  |3 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyContainer.java
|6 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SqlTableHelper.java
   |6 
 
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java
 |4 
 13 files changed, 92 insertions(+), 96 deletions(-)

New commits:
commit 827782b060326fd43080d610dd43025f9dc71d90
Author: Damjan Jovanovic 
Date:   Wed Sep 6 18:55:30 2017 +

Simplify the Java OContainer by requiring unique names, something C++

should probably also do as append and co check uniqueness explicitly.
This does however complicate the client code, as we have to throw
exceptions when we dedect duplication on the initial names we are
initialized with.

Patch by: me

diff --git 
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
 
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
index 638b8f31c947..d9f400192494 100644
--- 
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
+++ 
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
@@ -24,6 +24,7 @@ package com.sun.star.sdbcx.comp.postgresql;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.sun.star.container.ElementExistException;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.sdbc.XRow;
@@ -52,6 +53,7 @@ public class PostgresqlCatalog extends OCatalog {
 names.add(name);
 }
 return new PostgresqlTables(lock, metadata, this, names);
+} catch (ElementExistException elementExistException) {
 } catch (SQLException sqlException) {
 } finally {
 CompHelper.disposeComponent(results);
@@ -71,6 +73,7 @@ public class PostgresqlCatalog extends OCatalog {
 names.add(name);
 }
 return new PostgresqlTables(lock, metadata, this, names);
+} catch (ElementExistException elementExistException) {
 } catch (SQLException sqlException) {
 } finally {
 CompHelper.disposeComponent(results);
diff --git 
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
 
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
index 426bded92625..c5a285c7514e 100644
--- 
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
+++ 
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
@@ -95,6 +95,8 @@ public class PostgresqlTable extends OTable {
 try {
 List columns = new 
SqlTableHelper().readColumns(getConnection().getMetaData(), catalogName, 
schemaName, getName());
 return new OColumnContainer(lock, isCaseSensitive(), columns, 
this, getConnection().getMetaData());
+} catch (ElementExistException elementExistException) {
+return null;
 } catch (SQLException sqlException) {
 return null;
 }
@@ -105,6 +107,8 @@ public class PostgresqlTable extends OTable {
 try {
 List indexes = new 
SqlTableHelper().readIndexes(getConnection().getMetaData(), catalogName, 
schemaName, getName(), this);
 return new OIndexContainer(lock, indexes, isCaseSensitive(), this);
+} catch (ElementExi

Re: NEED HELP (please) -- Problem with dark background - ANY icon style

[Heiko Tietze]

Depends on your widget set. LibreOffice still binds to Qt4 so your KDE5 setting 
wont work well; I'm on LXQt and have to dig in three configurations. 
qtconfig-qt4, qt5-ct, and 'kcmshell5 kwindecoration' may be helpful. 
Alternatively, you could start with 'SAL_USE_VCLPLUGIN=gtk3 swriter' and adjust 
the gtk theme to your liking. And finally when talking about icon you could use 
'Breeze Dark'.

On 06.09.2017 21:38, William W. Austin wrote:
> I've been using LO ever since it first came out with StarOffice - and before 
> that StarOffice, so I've lost track of the years experience, but I've used it 
> for authoring over 5000 technical reports running 50-1500 pages.  (VERY 
> happily I no longer have that job... :-)  ).   Today I have LO installed on 4 
> machines, 3 Linux and 1 Windows, and I use all of them regularly.  FWIW, I 
> don't think I'm hitting a simple "newbie" error.
> 
> So far as I can tell, I have exactly the same settings on ALL 3 of the Linux 
> boxes (and they're virtually the same on Windows).  (all 3 boxes have Nvidia 
> graphics cards - and all they share the same display/keyboard/mouse through a 
> KVM switch).
> 
> The problem is that on my primary workstation, the background remains VERY 
> dark no matter which icon set I'm using (specifically '#33393b').  This makes 
> it virtually impossible to use some of the darker icon sets, and no matter 
> which icon set I try, this dark background leaves many of the icons nearly 
> "invisible".
> 
> I have NO idea what's causing the problem - this machine shows no other 
> display differences (on ANY application) among any of the Linux boxes.
> 
> Has anyone seen this before?  (I have searched through the past 3 years of 
> emails but I haven't seen any reference to it.)
> 
> If not, does anyone have any suggestions to try?  As this is also my main 
> writing machine this situation makes it much harder to work on anything, and 
> I've been battling this for about a year now with no helpful results.
> 
> I suspect a corrupted configuration file somewhere but I haven't been able to 
> find it, and I am the only user on this machine who has the problem. 
> 
> Any advice or suggestions will be (a) tried, and (b) greatly appreciated.
> 
> Thanks in advance,
> 
>   -- Bill
> 
> -- 
> william w. austin  wwaus...@gmail.com
> "life is just another phase i'm going through. this time, anyway ..."
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

-- 
Dr. Heiko Tietze
UX designer
Tel. +49 (0)179/1268509



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

NEED HELP (please) -- Problem with dark background - ANY icon style

[William W. Austin]

I've been using LO ever since it first came out with StarOffice - and
before that StarOffice, so I've lost track of the years experience, but
I've used it for authoring over 5000 technical reports running 50-1500
pages.  (VERY happily I no longer have that job... :-)  ).   Today I
have LO installed on 4 machines, 3 Linux and 1 Windows, and I use all of
them regularly.  FWIW, I don't think I'm hitting a simple "newbie" error.

So far as I can tell, I have exactly the same settings on ALL 3 of the
Linux boxes (and they're virtually the same on Windows).  (all 3 boxes
have Nvidia graphics cards - and all they share the same
display/keyboard/mouse through a KVM switch).

The problem is that on my primary workstation, the background remains
VERY dark no matter which icon set I'm using (specifically '#33393b'). 
This makes it virtually impossible to use some of the darker icon sets,
and no matter which icon set I try, this dark background leaves many of
the icons nearly "invisible".

I have NO idea what's causing the problem - this machine shows no other
display differences (on ANY application) among any of the Linux boxes.

Has anyone seen this before?  (I have searched through the past 3 years
of emails but I haven't seen any reference to it.)

If not, does anyone have any suggestions to try?  As this is also my
main writing machine this situation makes it much harder to work on
anything, and I've been battling this for about a year now with no
helpful results.

I suspect a corrupted configuration file somewhere but I haven't been
able to find it, and I am the only user on this machine who has the
problem. 

Any advice or suggestions will be (a) tried, and (b) greatly appreciated.

Thanks in advance,

  -- Bill

-- 
william w. austin  wwaus...@gmail.com
"life is just another phase i'm going through. this time, anyway ..."

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Changes to 'refs/tags/2.1.2-12'

[Andras Timar]

Tag '2.1.2-12' created by Andras Timar  at 
2017-09-06 19:32 +

2.1.2-12

Changes since 2.1.2-11-4:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - desktop/source

[Andras Timar]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e80c53e20845e0ffcdbd890bd0c3730c15dff42
Author: Andras Timar 
Date:   Wed Sep 6 21:25:02 2017 +0200

build fix

Change-Id: Ic364e27f8ad4996ae1756ec57222cf37fd7ca814
(cherry picked from commit a1ab6d4ec05c5d091db6f3f1ebafe38438efc5ba)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 174649ec6072..45fca4fdc8d3 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2927,7 +2927,7 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
 aDevice->SetFont(aFont);
 }
 
-aRect = tools::Rectangle(0, 0, *pFontWidth, *pFontHeight);
+aRect = Rectangle(0, 0, *pFontWidth, *pFontHeight);
 
 nFontWidth = *pFontWidth;
 nFontHeight = *pFontHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cd-5.3-23'

[Andras Timar]

Tag 'cd-5.3-23' created by Andras Timar  at 
2017-09-06 19:25 +

cd-5.3-23

Changes since cd-5.3-21-9:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/tags/cd-5.3-23' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - desktop/source

[Andras Timar]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1ab6d4ec05c5d091db6f3f1ebafe38438efc5ba
Author: Andras Timar 
Date:   Wed Sep 6 21:25:02 2017 +0200

build fix

Change-Id: Ic364e27f8ad4996ae1756ec57222cf37fd7ca814

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f146a050d336..a0c1486149b9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2926,7 +2926,7 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
 aDevice->SetFont(aFont);
 }
 
-aRect = tools::Rectangle(0, 0, *pFontWidth, *pFontHeight);
+aRect = Rectangle(0, 0, *pFontWidth, *pFontHeight);
 
 nFontWidth = *pFontWidth;
 nFontHeight = *pFontHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unoxml/qa

[Julien Nabet]

 unoxml/qa/unit/domtest.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 04f1af50c5a10e98c8af0da6fd51e03b6b7e668f
Author: Julien Nabet 
Date:   Wed Sep 6 20:49:21 2017 +0200

Typo exeption->exception (domtest.cxx)

Change-Id: Id8a6b33a643defff82fa9b5e55ebf8c0d3e9c48d
Reviewed-on: https://gerrit.libreoffice.org/42023
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx
index 18e37a8fa297..5126164091dd 100644
--- a/unoxml/qa/unit/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -235,7 +235,7 @@ struct BasicTest : public test::BootstrapFixture
 {
 try
 {
-// We DONT expect exeption here, as mxWarningInStream is valid XML 
Doc
+// We DONT expect exception here, as mxWarningInStream is valid 
XML Doc
 CPPUNIT_ASSERT_MESSAGE("Valid input file did not result in 
XDocument #2",
 mxDomBuilder->parse(
 uno::Reference(
@@ -253,7 +253,7 @@ struct BasicTest : public test::BootstrapFixture
 {
 try
 {
-// We expect exeption here, as mxErrorInStream is invalid XML Doc
+// We expect exception here, as mxErrorInStream is invalid XML Doc
 CPPUNIT_ASSERT_MESSAGE("Invalid input file result in XDocument 
#2!",
 !mxDomBuilder->parse(
 uno::Reference(
@@ -262,7 +262,7 @@ struct BasicTest : public test::BootstrapFixture
 }
 catch (const css::xml::sax::SAXParseException&)
 {
-// It's OK to catch an exeption here as we parse incorrect XML file
+// It's OK to catch an exception here as we parse incorrect XML 
file
 }
 CPPUNIT_ASSERT_MESSAGE("No parse errors in unclean input file",
 !mxErrHandler->mnWarnCount && mxErrHandler->mnErrCount /*&& 
!mxErrHandler->mnFatalCount*/);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

make install (was: Filesystem Hierarchy Standards (FHS) and certain file locations)

[Eike Rathke]

Hi Michael,

On Wednesday, 2017-09-06 16:26:09 +0200, Michael Stahl wrote:

> apparently you are trying to use "make install", which probably is
> unused and unmaintained; maybe we should remove it.

make install works fine if one configures with --prefix=..., I use it
regulary to create installations of builds and branches before I fool
around in a tree. Something like

./configure --prefix=$HOME/opt/$(basename `pwd`)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sfx2/Library_sfx.mk sfx2/source

[Noel Grandin]

 sfx2/Library_sfx.mk   |1 -
 sfx2/source/bastyp/dummytypes.cxx |   16 
 2 files changed, 17 deletions(-)

New commits:
commit a71b454eabb18c3aeb672e0b57650aadbb7c40a0
Author: Noel Grandin 
Date:   Wed Sep 6 16:49:51 2017 +0200

remove unused dummytypes.cxx

after commit 0c1532c62bc489e5e811a641919492316bcbe8e3
"removed unused type for avmedia dummytypes"

Change-Id: I6148bdc60d3b681bc4ab8f3775e0b55e0a92d67d
Reviewed-on: https://gerrit.libreoffice.org/42010
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index c0913939f31e..0d9dc14113c3 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -122,7 +122,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/appl/workwin \
 sfx2/source/appl/xpackcreator \
 sfx2/source/bastyp/bitset \
-sfx2/source/bastyp/dummytypes \
 sfx2/source/bastyp/fltfnc \
 sfx2/source/bastyp/fltlst \
 sfx2/source/bastyp/frmhtml \
diff --git a/sfx2/source/bastyp/dummytypes.cxx 
b/sfx2/source/bastyp/dummytypes.cxx
deleted file mode 100644
index 183a0ab4d811..
--- a/sfx2/source/bastyp/dummytypes.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- Mode: ObjC; 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 
-
-#include 
-
-#if !HAVE_FEATURE_AVMEDIA
-#endif
-
-// vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cd-5.3-23'

[Andras Timar]

Tag 'cd-5.3-23' created by Andras Timar  at 
2017-09-06 18:17 +

cd-5.3-23

Changes since cd-5.3-21-8:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cd-5.3-23'

[Andras Timar]

Tag 'cd-5.3-23' created by Andras Timar  at 
2017-09-06 18:17 +

cd-5.3-23

Changes since libreoffice-5-3-branch-point-28:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cd-5.3-23'

[Christian Lohmaier]

Tag 'cd-5.3-23' created by Andras Timar  at 
2017-09-06 18:17 +

cd-5.3-23

Changes since cp-5.3-10:
Christian Lohmaier (1):
  update translations for 5.3.3 rc2

---
 source/am/cui/source/options.po|8 
 source/am/cui/source/tabpages.po   |8 
 source/am/cui/uiconfig/ui.po   |8 
 source/am/fpicker/source/office.po |   10 
 source/am/officecfg/registry/data/org/openoffice/Office.po |6 
 source/am/sc/source/ui/src.po  |8 
 source/am/sfx2/source/dialog.po|   12 
 source/am/svtools/source/dialogs.po|8 
 source/am/svtools/source/misc.po   |8 
 source/am/svx/source/stbctrls.po   |8 
 source/am/svx/uiconfig/ui.po   |   10 
 source/bg/sc/uiconfig/scalc/ui.po  |   20 
 source/bg/sfx2/source/dialog.po|   12 
 source/bg/svx/source/dialog.po |   30 
 source/bg/svx/source/form.po   |   10 
 source/bg/svx/source/stbctrls.po   |8 
 source/bg/svx/source/tbxctrls.po   |6 
 source/bg/svx/uiconfig/ui.po   |  289 
 source/bg/sw/source/ui/utlui.po|   21 
 source/bg/sw/source/uibase/utlui.po|6 
 source/bg/sw/uiconfig/swriter/ui.po|5 
 source/br/cui/uiconfig/ui.po   |   70 -
 source/br/extensions/source/bibliography.po|   12 
 source/br/extensions/source/propctrlr.po   |  152 ++--
 source/br/sc/source/ui/src.po  |   12 
 source/ca/helpcontent2/source/text/scalc/00.po |   20 
 source/ca/helpcontent2/source/text/scalc/01.po |8 
 source/ca/helpcontent2/source/text/scalc/guide.po  |   10 
 source/ca/helpcontent2/source/text/shared/01.po|6 
 source/ca/helpcontent2/source/text/shared/guide.po |5 
 source/ca/helpcontent2/source/text/shared/optionen.po  |8 
 source/ca/helpcontent2/source/text/simpress/guide.po   |   10 
 source/ca/helpcontent2/source/text/swriter/01.po   |   13 
 source/ca/helpcontent2/source/text/swriter/guide.po|   25 
 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po  |8 
 source/ca/sc/uiconfig/scalc/ui.po  |6 
 source/ca/svx/uiconfig/ui.po   |   12 
 source/cy/cui/uiconfig/ui.po   |8 
 source/cy/sfx2/source/dialog.po|   12 
 source/cy/sfx2/uiconfig/ui.po  |   15 
 source/cy/svtools/source/dialogs.po|8 
 source/cy/svtools/source/misc.po   |8 
 source/cy/svx/source/stbctrls.po   |   10 
 source/cy/svx/uiconfig/ui.po   |   10 
 source/da/cui/uiconfig/ui.po   |8 
 source/da/helpcontent2/source/text/scalc/01.po |   12 
 source/da/sfx2/source/dialog.po|   14 
 source/da/sfx2/uiconfig/ui.po  |   17 
 source/da/svtools/source/dialogs.po|   10 
 source/da/svtools/source/java.po   |   12 
 source/da/svtools/source/misc.po   |   10 
 source/da/svx/source/stbctrls.po   |8 
 source/da/svx/uiconfig/ui.po   |   12 
 source/de/editeng/source/items.po  |   10 
 source/de/formula/source/core/resource.po  |8 
 source/de/helpcontent2/source/auxiliary.po |6 
 source/de/helpcontent2/source/text/sbasic/shared/01.po |   10 
 source/de/helpcontent2/source/text/scalc.po|6 
 source/de/helpcontent2/source/text/scalc/00.po |6 
 source/de/helpcontent2/source/text/scalc/01.po |  100 +-
 source/de/helpcontent2/source/text/scalc/guide.po  |   34 
 source/de/helpcontent2/source/text/schart/01.po|6 
 source/de/helpcontent2/source/text/shared/00.po|   10 
 source/de/helpcontent2/source/text/shared/01.po|   12 
 source/de/helpcontent2/source/text/shared/explorer/database.po |8 
 source/de/helpcontent2/source/text/shared/guide.po |   16 
 source/de/helpcontent2/source/text/shared/optionen.po

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cd-5.3-23'

[Olivier R]

Tag 'cd-5.3-23' created by Andras Timar  at 
2017-09-06 18:17 +

cd-5.3-23

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - configure.ac

[Andras Timar]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b07a9335d0a28661e4973c08026de1b1ff23fbdc
Author: Andras Timar 
Date:   Wed Sep 6 20:17:18 2017 +0200

Bump version to 5.3-23

Change-Id: I664a6fceae1dc90a7f5cd5deeda6351309776c5c

diff --git a/configure.ac b/configure.ac
index ca954df96b09..6af39584ea97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.3.10.22],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.23],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - include/oox oox/CppunitTest_oox_tokenmap.mk oox/Library_oox.mk oox/source sd/qa sd/source

[Jan Holesovsky]

 include/oox/export/drawingml.hxx |4 +
 oox/CppunitTest_oox_tokenmap.mk  |1 
 oox/Library_oox.mk   |3 
 oox/source/export/drawingml.cxx  |   98 +++
 oox/source/export/shapes.cxx |   42 +++--
 oox/source/ppt/timenode.cxx  |6 +
 sd/qa/unit/data/pptx/tdf106867.pptx  |binary
 sd/qa/unit/export-tests-ooxml2.cxx   |   33 ++
 sd/source/filter/eppt/epptooxml.hxx  |1 
 sd/source/filter/eppt/pptx-epptooxml.cxx |   56 +
 10 files changed, 235 insertions(+), 9 deletions(-)

New commits:
commit 05c728fc5445d00324c996a0f788d2e51e65581a
Author: Jan Holesovsky 
Date:   Tue Sep 5 16:53:14 2017 +0200

tdf#106867: Export videos in PPTX.

Contains also:

tdf#106867: Implement pptx export of AnimationNodeType::COMMAND.
tdf#106867: Import target for commands in PPTX.
tdf#106867: Write also the extended markup to fully support embedded videos.
tdf#106867: Unit test for the export of embedded videos.

Change-Id: I7f4f389a72aa7ecef65d87f07bb69ba8f3374a14
Reviewed-on: https://gerrit.libreoffice.org/42020
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index d9216d2c6bf4..fc2c4b8bd28e 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -134,6 +134,10 @@ protected:
 
 /// If bRelPathToMedia is true add "../" to image folder path while adding 
the image relationship
 OUString WriteImage( const OUString& rURL, bool bRelPathToMedia = false);
+
+/// Output the media (including copying a video from vnd.sun.star.Package: 
to the output if necessary).
+void WriteMediaNonVisualProperties(const 
css::uno::Reference& xShape);
+
 void WriteStyleProperties( sal_Int32 nTokenId, const css::uno::Sequence< 
css::beans::PropertyValue >& aProperties );
 
 const char* GetComponentDir();
diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
index 1e903a25a368..e71bcf6ba6bc 100644
--- a/oox/CppunitTest_oox_tokenmap.mk
+++ b/oox/CppunitTest_oox_tokenmap.mk
@@ -35,6 +35,7 @@ endif
 endif
 
 $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
+avmedia \
 basegfx \
 comphelper \
 cppu \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index fcd7215c23a4..e44015aaa595 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_use_api,oox,\
 ))
 
 $(eval $(call gb_Library_use_libraries,oox,\
+avmedia \
 basegfx \
 comphelper \
 cppu \
@@ -47,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,oox,\
 drawinglayer \
 msfilter \
 sal \
-   i18nlangtag \
+i18nlangtag \
 sax \
 sfx \
 svl \
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index bb90a48eb96d..3e9cc01e9ed7 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -56,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -69,6 +71,8 @@
 #include 
 #include 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -87,6 +91,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -944,6 +949,99 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , 
bool bRelPathToMedia )
 return sRelId;
 }
 
+void DrawingML::WriteMediaNonVisualProperties(const 
css::uno::Reference& xShape)
+{
+SdrMediaObj* pMediaObj = 
dynamic_cast(GetSdrObjectFromXShape(xShape));
+if (!pMediaObj)
+return;
+
+// extension
+OUString aExtension;
+const OUString& rURL(pMediaObj->getURL());
+int nLastDot = rURL.lastIndexOf('.');
+if (nLastDot >= 0)
+aExtension = rURL.copy(nLastDot);
+
+bool bEmbed = rURL.startsWith("vnd.sun.star.Package:");
+
+// mime type
+OUString aMimeType(pMediaObj->getMediaProperties().getMimeType());
+if (aMimeType == "application/vnd.sun.star.media")
+{
+// try to set something better
+// TODO fix the importer to actually set the mimetype on import
+if (aExtension.equalsIgnoreAsciiCase(".avi"))
+aMimeType = "video/x-msvideo";
+else if (aExtension.equalsIgnoreAsciiCase(".flv"))
+aMimeType = "video/x-flv";
+else if (aExtension.equalsIgnoreAsciiCase(".mp4"))
+aMimeType = "video/mp4";
+else if (aExtension.equalsIgnoreAsciiCase(".mov"))
+aMimeType = "video/quicktime";
+else if (aExtension.equalsIgnoreAsciiCase(".ogv"))
+aMimeType = "video/ogg";
+else if (aExtension.equalsIgnoreAsciiCase(".wmv"))
+aMimeType = "video/x-ms-wmv";
+}
+
+OUString aVideoFileRelId;
+OUString aMediaRelId;
+
+static const OUSt

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - include/oox oox/source sd/qa sd/source

[Jan Holesovsky]

 include/oox/export/drawingml.hxx |4 +-
 oox/source/export/drawingml.cxx  |   18 +++---
 oox/source/export/shapes.cxx |   55 +--
 sd/qa/unit/data/pptx/tdf111884.pptx  |binary
 sd/qa/unit/export-tests-ooxml1.cxx   |   43 +++-
 sd/source/filter/eppt/pptx-epptooxml.cxx |9 -
 6 files changed, 90 insertions(+), 39 deletions(-)

New commits:
commit 42c70214dc3000b609fa4ee8063b36bd9a2bdbe1
Author: Jan Holesovsky 
Date:   Thu Aug 31 18:32:58 2017 +0200

tdf#111884: Implement export of group shapes in pptx.

Contains also:

tdf#111884: Unit test.
related tdf#111884: GroupShapes are now handled in oox.

Change-Id: If12984c0670db6396cbfd0dcb8ae1f5a9b591705
Reviewed-on: https://gerrit.libreoffice.org/41766
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/42021
Tested-by: Jan Holesovsky 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 97d8dff58de6..d9216d2c6bf4 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -190,8 +190,8 @@ public:
 
 void WriteShapeTransformation( const css::uno::Reference< 
css::drawing::XShape >& rXShape,
   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, bool bSuppressRotation = false );
-void WriteTransformation( const Rectangle& rRectangle,
-  sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, sal_Int32 nRotation = 0 );
+void WriteTransformation(const Rectangle& rRectangle,
+  sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, sal_Int32 nRotation = 0, bool bIsGroupShape = false);
 
 void WriteText( const css::uno::Reference< css::uno::XInterface >& 
rXIface, const OUString& presetWarp, bool bBodyPr = true, bool bText = true, 
sal_Int32 nXmlNamespace = 0);
 void WriteParagraph( const css::uno::Reference< css::text::XTextContent >& 
rParagraph,
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c8d148aeb1c2..bb90a48eb96d 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1142,8 +1142,8 @@ void DrawingML::WriteStretch( const css::uno::Reference< 
css::beans::XPropertySe
 mpFS->endElementNS( XML_a, XML_stretch );
 }
 
-void DrawingML::WriteTransformation( const Rectangle& rRect,
-sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, sal_Int32 nRotation 
)
+void DrawingML::WriteTransformation(const Rectangle& rRect,
+sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, sal_Int32 
nRotation, bool bIsGroupShape)
 {
 mpFS->startElementNS( nXmlNamespace, XML_xfrm,
   XML_flipH, bFlipH ? "1" : nullptr,
@@ -1162,6 +1162,12 @@ void DrawingML::WriteTransformation( const Rectangle& 
rRect,
 mpFS->singleElementNS( XML_a, XML_off, XML_x, IS( 
oox::drawingml::convertHmmToEmu( nLeft ) ), XML_y, IS( 
oox::drawingml::convertHmmToEmu( nTop ) ), FSEND );
 mpFS->singleElementNS( XML_a, XML_ext, XML_cx, IS( 
oox::drawingml::convertHmmToEmu( rRect.GetWidth() ) ), XML_cy, IS( 
oox::drawingml::convertHmmToEmu( rRect.GetHeight() ) ), FSEND );
 
+if (GetDocumentType() != DOCUMENT_DOCX && bIsGroupShape)
+{
+mpFS->singleElementNS(XML_a, XML_chOff, XML_x, 
IS(oox::drawingml::convertHmmToEmu(nLeft)), XML_y, 
IS(oox::drawingml::convertHmmToEmu(nTop)), FSEND);
+mpFS->singleElementNS(XML_a, XML_chExt, XML_cx, 
IS(oox::drawingml::convertHmmToEmu(rRect.GetWidth())), XML_cy, 
IS(oox::drawingml::convertHmmToEmu(rRect.GetHeight())), FSEND);
+}
+
 mpFS->endElementNS( nXmlNamespace, XML_xfrm );
 }
 
@@ -1173,7 +1179,7 @@ void DrawingML::WriteShapeTransformation( const 
Reference< XShape >& rXShape, sa
 awt::Point aPos = rXShape->getPosition();
 awt::Size aSize = rXShape->getSize();
 
-if (m_xParent.is())
+if (GetDocumentType() == DOCUMENT_DOCX && m_xParent.is())
 {
 awt::Point aParentPos = m_xParent->getPosition();
 aPos.X -= aParentPos.X;
@@ -1202,7 +1208,11 @@ void DrawingML::WriteShapeTransformation( const 
Reference< XShape >& rXShape, sa
 if (xPropertySetInfo->hasPropertyByName("RotateAngle"))
 xPropertySet->getPropertyValue("RotateAngle") >>= nRotation;
 }
-WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( 
aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, 
OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation) );
+
+uno::Reference xServiceInfo(rXShape, 
uno::UNO_QUERY_THROW);
+bool bIsGroupShape = (xServiceInfo.is() && 
xServiceInfo->supportsService("com.sun.star.drawing.GroupShape"));
+
+WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( 
aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, 
OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation), bIsGroupShape );
 }
 
 void Dra

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - 2 commits - desktop/source oox/source

[Paul Trojahn]

 desktop/source/lib/init.cxx  |   49 ++-
 oox/source/export/shapes.cxx |3 +-
 2 files changed, 46 insertions(+), 6 deletions(-)

New commits:
commit e36e716e877c707c991db7bad87724c4a20af27c
Author: Paul Trojahn 
Date:   Sat Jun 24 13:46:46 2017 +0200

Fix PageShape export to pptx

The export code is not called, because the PageShape is actually
of type presentation.PageShape and not drawing.PageShape. A
PageShape has no text at all, which results in an empty p:txBody
element that fails validation, so it needs to be checked first if
the shape actually has text.

Change-Id: I559f15c2396739c74d5c4f36eb952754bc040ce8
Reviewed-on: https://gerrit.libreoffice.org/38574
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/42002
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 9d43654080fcc5942610f57cbfec9827b9da2102)
Reviewed-on: https://gerrit.libreoffice.org/42018

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 7bd85a8cd39f..1d4f4a20a217 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1448,7 +1448,8 @@ ShapeExport& ShapeExport::WriteTextBox( const Reference< 
XInterface >& xIface, s
 }
 }
 
-if( NonEmptyText( xIface ) )
+Reference< XText > xXText( xIface, UNO_QUERY );
+if( NonEmptyText( xIface ) && xXText.is() )
 {
 FSHelperPtr pFS = GetFS();
 
commit 24f04330cd789349ced8e7beeb6b007ec0d2d834
Author: Marco Cecchetti 
Date:   Sun Sep 3 20:29:05 2017 +0200

lok - support for watermark

Extends doc_renderFont in order to generate text of requested size.

Change-Id: I0ebd48f8714b7772b764f3aba3e13754869c5117
Reviewed-on: https://gerrit.libreoffice.org/42015
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 8d2c21e31220540af83665b5e8ad2d9b66be6b3e)
Reviewed-on: https://gerrit.libreoffice.org/42019

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9d9749469420..f146a050d336 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2880,6 +2880,8 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
 pDocSh->GetItem(SID_ATTR_CHAR_FONTLIST));
 const FontList* pList = pFonts ? pFonts->GetFontList() : nullptr;
 
+const int nDefaultFontSize = 25;
+
 if ( pList )
 {
 sal_uInt16 nFontCount = pList->GetFontNameCount();
@@ -2898,30 +2900,67 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
 nullptr, Size(1, 1), DeviceFormat::DEFAULT));
 ::Rectangle aRect;
 vcl::Font aFont(rFontMetric);
-aFont.SetFontSize(Size(0, 25));
+aFont.SetFontSize(Size(0, nDefaultFontSize));
 aDevice->SetFont(aFont);
 aDevice->GetTextBoundRect(aRect, aText);
 if (aRect.IsEmpty())
 break;
 
 int nFontWidth = aRect.BottomRight().X() + 1;
-*pFontWidth = nFontWidth;
 int nFontHeight = aRect.BottomRight().Y() + 1;
-*pFontHeight = nFontHeight;
+
 if (!(nFontWidth > 0 && nFontHeight > 0))
 break;
 
+if (*pFontWidth > 0 && *pFontHeight > 0)
+{
+double fScaleX = *pFontWidth / static_cast(nFontWidth);
+double fScaleY = *pFontHeight / 
static_cast(nFontHeight);
+
+double fScale = std::min(fScaleX, fScaleY);
+
+if (fScale >= 1.0)
+{
+int nFontSize = fScale * nDefaultFontSize;
+aFont.SetFontSize(Size(0, nFontSize));
+aDevice->SetFont(aFont);
+}
+
+aRect = tools::Rectangle(0, 0, *pFontWidth, *pFontHeight);
+
+nFontWidth = *pFontWidth;
+nFontHeight = *pFontHeight;
+
+}
+
 unsigned char* pBuffer = static_cast(malloc(4 * 
nFontWidth * nFontHeight));
 if (!pBuffer)
 break;
 
 memset(pBuffer, 0, nFontWidth * nFontHeight * 4);
-
 aDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
 aDevice->SetOutputSizePixelScaleOffsetAndBuffer(
 Size(nFontWidth, nFontHeight), Fraction(1.0), Point(),
 pBuffer);
-aDevice->DrawText(Point(0,0), aText);
+
+if (*pFontWidth > 0 && *pFontHeight > 0)
+{
+DrawTextFlags nStyle =
+DrawTextFlags::Center
+| DrawTextFlags::VCenter
+| DrawTextFlags::MultiLine
+| DrawTextFlags::WordBreakHyphenation;// | 
DrawTextFlags::WordBreak ;
+
+aDevice->DrawText(aRect, aText, nStyle);
+

[Libreoffice-commits] core.git: desktop/source

[Marco Cecchetti]

 desktop/source/lib/init.cxx |   49 +++-
 1 file changed, 44 insertions(+), 5 deletions(-)

New commits:
commit ad06345e8b5080324d4284fa428afd228bc1f87c
Author: Marco Cecchetti 
Date:   Sun Sep 3 20:29:05 2017 +0200

lok - support for watermark

Extends doc_renderFont in order to generate text of requested size.

Change-Id: I0ebd48f8714b7772b764f3aba3e13754869c5117
Reviewed-on: https://gerrit.libreoffice.org/41899
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fca53b297529..ad88ab270252 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2872,6 +2872,8 @@ unsigned char* doc_renderFont(SAL_UNUSED_PARAMETER 
LibreOfficeKitDocument* /*pTh
 pDocSh->GetItem(SID_ATTR_CHAR_FONTLIST));
 const FontList* pList = pFonts ? pFonts->GetFontList() : nullptr;
 
+const int nDefaultFontSize = 25;
+
 if ( pList )
 {
 sal_uInt16 nFontCount = pList->GetFontNameCount();
@@ -2890,30 +2892,67 @@ unsigned char* doc_renderFont(SAL_UNUSED_PARAMETER 
LibreOfficeKitDocument* /*pTh
 nullptr, Size(1, 1), DeviceFormat::DEFAULT));
 ::tools::Rectangle aRect;
 vcl::Font aFont(rFontMetric);
-aFont.SetFontSize(Size(0, 25));
+aFont.SetFontSize(Size(0, nDefaultFontSize));
 aDevice->SetFont(aFont);
 aDevice->GetTextBoundRect(aRect, aText);
 if (aRect.IsEmpty())
 break;
 
 int nFontWidth = aRect.BottomRight().X() + 1;
-*pFontWidth = nFontWidth;
 int nFontHeight = aRect.BottomRight().Y() + 1;
-*pFontHeight = nFontHeight;
+
 if (!(nFontWidth > 0 && nFontHeight > 0))
 break;
 
+if (*pFontWidth > 0 && *pFontHeight > 0)
+{
+double fScaleX = *pFontWidth / static_cast(nFontWidth);
+double fScaleY = *pFontHeight / 
static_cast(nFontHeight);
+
+double fScale = std::min(fScaleX, fScaleY);
+
+if (fScale >= 1.0)
+{
+int nFontSize = fScale * nDefaultFontSize;
+aFont.SetFontSize(Size(0, nFontSize));
+aDevice->SetFont(aFont);
+}
+
+aRect = tools::Rectangle(0, 0, *pFontWidth, *pFontHeight);
+
+nFontWidth = *pFontWidth;
+nFontHeight = *pFontHeight;
+
+}
+
 unsigned char* pBuffer = static_cast(malloc(4 * 
nFontWidth * nFontHeight));
 if (!pBuffer)
 break;
 
 memset(pBuffer, 0, nFontWidth * nFontHeight * 4);
-
 aDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
 aDevice->SetOutputSizePixelScaleOffsetAndBuffer(
 Size(nFontWidth, nFontHeight), Fraction(1.0), Point(),
 pBuffer);
-aDevice->DrawText(Point(0,0), aText);
+
+if (*pFontWidth > 0 && *pFontHeight > 0)
+{
+DrawTextFlags nStyle =
+DrawTextFlags::Center
+| DrawTextFlags::VCenter
+| DrawTextFlags::MultiLine
+| DrawTextFlags::WordBreakHyphenation;// | 
DrawTextFlags::WordBreak ;
+
+aDevice->DrawText(aRect, aText, nStyle);
+}
+else
+{
+*pFontWidth = nFontWidth;
+*pFontHeight = nFontHeight;
+
+aDevice->DrawText(Point(0,0), aText);
+}
+
 
 return pBuffer;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - desktop/source

[Marco Cecchetti]

 desktop/source/lib/init.cxx |   49 +++-
 1 file changed, 44 insertions(+), 5 deletions(-)

New commits:
commit 8d2c21e31220540af83665b5e8ad2d9b66be6b3e
Author: Marco Cecchetti 
Date:   Sun Sep 3 20:29:05 2017 +0200

lok - support for watermark

Extends doc_renderFont in order to generate text of requested size.

Change-Id: I0ebd48f8714b7772b764f3aba3e13754869c5117
Reviewed-on: https://gerrit.libreoffice.org/42015
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 748f409437ff..174649ec6072 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2881,6 +2881,8 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
 pDocSh->GetItem(SID_ATTR_CHAR_FONTLIST));
 const FontList* pList = pFonts ? pFonts->GetFontList() : nullptr;
 
+const int nDefaultFontSize = 25;
+
 if ( pList )
 {
 sal_uInt16 nFontCount = pList->GetFontNameCount();
@@ -2899,30 +2901,67 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* 
/*pThis*/,
 nullptr, Size(1, 1), DeviceFormat::DEFAULT));
 ::Rectangle aRect;
 vcl::Font aFont(rFontMetric);
-aFont.SetFontSize(Size(0, 25));
+aFont.SetFontSize(Size(0, nDefaultFontSize));
 aDevice->SetFont(aFont);
 aDevice->GetTextBoundRect(aRect, aText);
 if (aRect.IsEmpty())
 break;
 
 int nFontWidth = aRect.BottomRight().X() + 1;
-*pFontWidth = nFontWidth;
 int nFontHeight = aRect.BottomRight().Y() + 1;
-*pFontHeight = nFontHeight;
+
 if (!(nFontWidth > 0 && nFontHeight > 0))
 break;
 
+if (*pFontWidth > 0 && *pFontHeight > 0)
+{
+double fScaleX = *pFontWidth / static_cast(nFontWidth);
+double fScaleY = *pFontHeight / 
static_cast(nFontHeight);
+
+double fScale = std::min(fScaleX, fScaleY);
+
+if (fScale >= 1.0)
+{
+int nFontSize = fScale * nDefaultFontSize;
+aFont.SetFontSize(Size(0, nFontSize));
+aDevice->SetFont(aFont);
+}
+
+aRect = tools::Rectangle(0, 0, *pFontWidth, *pFontHeight);
+
+nFontWidth = *pFontWidth;
+nFontHeight = *pFontHeight;
+
+}
+
 unsigned char* pBuffer = static_cast(malloc(4 * 
nFontWidth * nFontHeight));
 if (!pBuffer)
 break;
 
 memset(pBuffer, 0, nFontWidth * nFontHeight * 4);
-
 aDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
 aDevice->SetOutputSizePixelScaleOffsetAndBuffer(
 Size(nFontWidth, nFontHeight), Fraction(1.0), Point(),
 pBuffer);
-aDevice->DrawText(Point(0,0), aText);
+
+if (*pFontWidth > 0 && *pFontHeight > 0)
+{
+DrawTextFlags nStyle =
+DrawTextFlags::Center
+| DrawTextFlags::VCenter
+| DrawTextFlags::MultiLine
+| DrawTextFlags::WordBreakHyphenation;// | 
DrawTextFlags::WordBreak ;
+
+aDevice->DrawText(aRect, aText, nStyle);
+}
+else
+{
+*pFontWidth = nFontWidth;
+*pFontHeight = nFontHeight;
+
+aDevice->DrawText(Point(0,0), aText);
+}
+
 
 return pBuffer;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/online_transform.xsl

[Adolfo Jayme Barrientos]

 help3xsl/online_transform.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc645c22ce028ce5b690621e153db29cd20373ba
Author: Adolfo Jayme Barrientos 
Date:   Wed Sep 6 12:17:43 2017 -0500

Fix Vietnamese endonym

Change-Id: I83e4eb35c9cf362e206c006974be417981b1c0b9

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index fe4666ffa..d6c9a509f 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -207,7 +207,7 @@
 Türkçe
 ئۇيغۇرچە
 Українська
-Việtnam
+Tiếng 
Việt
 中文
 中文(台灣)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 31ad6275de88b1dd5aba86ff45e3c9a159e4a48e
Author: Adolfo Jayme Barrientos 
Date:   Wed Sep 6 12:17:43 2017 -0500

Updated core
Project: help  bc645c22ce028ce5b690621e153db29cd20373ba

Fix Vietnamese endonym

Change-Id: I83e4eb35c9cf362e206c006974be417981b1c0b9

diff --git a/helpcontent2 b/helpcontent2
index 39aa38f16b83..bc645c22ce02 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 39aa38f16b837e87ec7ba04f160d0857829c2b38
+Subproject commit bc645c22ce028ce5b690621e153db29cd20373ba
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: odf2xhtml (and other xslt filters) - tabs or spaces?

[Thorsten Behrens]

Samuel Mehrbrodt wrote:
> Are there any opinions on this?
> 
Your call I'd say. I see disadvantages for both ways - just that the
status quo inconsistency is a real irritation.

Personally I value working git blame & history over tree-wide
consistency (that we don't have anyway). Note that the original
tab2space conversion was done as a silent git rewrite, so not losing
history. In conclusion: no clear winner for me, doers decide.

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: writerperfect/qa writerperfect/source

[Miklos Vajna]

 writerperfect/qa/unit/EPUBExportTest.cxx  |   
41 +++
 writerperfect/qa/unit/data/writer/epubexport/named-style-inheritance.fodt |   
39 +++
 writerperfect/source/writer/exp/txtparai.cxx  |   
54 ++
 writerperfect/source/writer/exp/txtstyli.cxx  |   
11 +-
 4 files changed, 126 insertions(+), 19 deletions(-)

New commits:
commit fe4c6063ec493c986f810ba676e2b12fe7dab7a9
Author: Miklos Vajna 
Date:   Wed Sep 6 15:35:40 2017 +0200

EPUB export: handle style parents for named styles

Character / paragraph formatting from a style hierarchy should be OK
now. Also this time test the actual CSS contents, not just that the rule
name for two paragraphs or spans differs.

Change-Id: I18a9c11aaf16bb3c4b462415b5e819f16de0893c
Reviewed-on: https://gerrit.libreoffice.org/41993
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index 1b57655180b0..7b5de434bf8f 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -47,6 +47,8 @@ public:
 void createDoc(const OUString &rFile, const 
uno::Sequence &rFilterData);
 /// Returns an XML representation of the stream named rName in the 
exported package.
 xmlDocPtr parseExport(const OUString &rName);
+/// Loads a CSS representation of the stream named rName in the exported 
package into rTree.
+void parseCssExport(const OUString &rName, std::map< OString, 
std::vector > &rTree);
 void testOutlineLevel();
 void testMimetype();
 void testEPUB2();
@@ -56,6 +58,7 @@ public:
 void testMeta();
 void testParaNamedstyle();
 void testCharNamedstyle();
+void testNamedStyleInheritance();
 
 CPPUNIT_TEST_SUITE(EPUBExportTest);
 CPPUNIT_TEST(testOutlineLevel);
@@ -67,6 +70,7 @@ public:
 CPPUNIT_TEST(testMeta);
 CPPUNIT_TEST(testParaNamedstyle);
 CPPUNIT_TEST(testCharNamedstyle);
+CPPUNIT_TEST(testNamedStyleInheritance);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -122,6 +126,25 @@ xmlDocPtr EPUBExportTest::parseExport(const OUString 
&rName)
 return parseXmlStream(pStream.get());
 }
 
+void EPUBExportTest::parseCssExport(const OUString &rName, std::map< OString, 
std::vector > &rTree)
+{
+uno::Reference xInputStream(mxZipFile->getByName(rName), 
uno::UNO_QUERY);
+std::shared_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+
+// Minimal CSS handler till orcus is up to our needs.
+OString aLine;
+OString aRuleName;
+while (!pStream->IsEof())
+{
+pStream->ReadLine(aLine);
+if (aLine.endsWith("{"))
+// '.name {' -> 'name'
+aRuleName = aLine.copy(1, aLine.getLength() - 3);
+else if (aLine.endsWith(";"))
+rTree[aRuleName].push_back(aLine);
+}
+}
+
 void EPUBExportTest::testOutlineLevel()
 {
 createDoc("outline-level.fodt", {});
@@ -246,6 +269,24 @@ void EPUBExportTest::testCharNamedstyle()
 assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]", "class", "span1");
 }
 
+void EPUBExportTest::testNamedStyleInheritance()
+{
+createDoc("named-style-inheritance.fodt", {});
+
+// Find the CSS rule for the blue text.
+mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+OUString aBlue = getXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:span[2]", "class");
+
+std::map< OString, std::vector > aTree;
+parseCssExport("OEBPS/styles/stylesheet.css", aTree);
+CPPUNIT_ASSERT(aTree.find(aBlue.toUtf8()) != aTree.end());
+const std::vector &rRule = aTree[aBlue.toUtf8()];
+CPPUNIT_ASSERT(std::find(rRule.begin(), rRule.end(), "  color: #ff;") 
!= rRule.end());
+// This failed, the span only had the properties from its style, but not
+// from the style's parent(s).
+CPPUNIT_ASSERT(std::find(rRule.begin(), rRule.end(), "  font-family: 
'Liberation Mono';") != rRule.end());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest);
 
 }
diff --git 
a/writerperfect/qa/unit/data/writer/epubexport/named-style-inheritance.fodt 
b/writerperfect/qa/unit/data/writer/epubexport/named-style-inheritance.fodt
new file mode 100644
index ..2bd6197774c5
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/epubexport/named-style-inheritance.fodt
@@ -0,0 +1,39 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:

[Libreoffice-commits] core.git: external/coinmp

[jan Iversen]

 external/coinmp/UnpackedTarball_coinmp.mk |1 
 external/coinmp/iOS.patch.1   |  189 ++
 2 files changed, 190 insertions(+)

New commits:
commit ac38af2bb850abab0039d7c9e35644752cf4feb1
Author: jan Iversen 
Date:   Wed Sep 6 17:42:37 2017 +0200

corrected commit 397e2f0cfb310ac606705c74e5907195e5ca7872

that commit removed all iOS patches for CoinMP, they are
still needed.

Updated the iOS.patch.1 to the patches config.sub(s)

Change-Id: Id69b436c85d5f3b7113522404f47872559896dd6

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index b36d328e239b..865c0f2b43e4 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/rpath.patch \
external/coinmp/libtool.patch \
external/coinmp/automake.patch \
+   external/coinmp/iOS.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/iOS.patch.1 b/external/coinmp/iOS.patch.1
new file mode 100644
index ..3a34a89a1c66
--- /dev/null
+++ b/external/coinmp/iOS.patch.1
@@ -0,0 +1,189 @@
+diff -Naur coinmp/BuildTools/config.sub coinmp_new/BuildTools/config.sub
+--- coinmp/BuildTools/config.sub   2017-09-06 17:32:53.0 +0200
 coinmp_new/BuildTools/config.sub   2017-09-06 17:37:36.0 +0200
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -374,7 +374,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
+diff -Naur coinmp/Cbc/config.sub coinmp_new/Cbc/config.sub
+--- coinmp/Cbc/config.sub  2017-09-06 17:32:53.0 +0200
 coinmp_new/Cbc/config.sub  2017-09-06 17:38:09.0 +0200
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -374,7 +374,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
+diff -Naur coinmp/Cgl/config.sub coinmp_new/Cgl/config.sub
+--- coinmp/Cgl/config.sub  2017-09-06 17:32:53.0 +0200
 coinmp_new/Cgl/config.sub  2017-09-06 17:38:32.0 +0200
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -374,7 +374,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
+diff -Naur coinmp/Clp/config.sub coinmp_new/Clp/config.sub
+--- coinmp/Clp/config.sub  2017-09-06 17:32:53.0 +0200
 coinmp_new/Clp/config.sub  2017-09-06 17:38:54.0 +0200
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -374,7 +374,7 @@
+   | alpha-* | alphaev[4-8]-* | a

[Libreoffice-commits] core.git: sd/source

[blendergeek]

 sd/source/ui/sidebar/SlideBackground.cxx |   26 --
 sd/source/ui/sidebar/SlideBackground.hxx |3 +++
 2 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 6758db065d77bdebed54e5d3532796a2c3c24088
Author: blendergeek 
Date:   Tue Sep 5 17:12:21 2017 -0400

tdf#111834: hide useless background controls in Handout View

Change-Id: Ia51c671f17dbb8cc36a73ee662c1c57e23e7818f
Reviewed-on: https://gerrit.libreoffice.org/41968
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 070b8e0119e8..447386de9e27 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -139,6 +139,7 @@ SlideBackground::SlideBackground(
 maDrawMasterContext(vcl::EnumContext::Application::Draw, 
vcl::EnumContext::Context::MasterPage),
 maImpressOtherContext(vcl::EnumContext::Application::Impress, 
vcl::EnumContext::Context::DrawPage),
 maImpressMasterContext(vcl::EnumContext::Application::Impress, 
vcl::EnumContext::Context::MasterPage),
+maImpressHandoutContext(vcl::EnumContext::Application::Impress, 
vcl::EnumContext::Context::HandoutPage),
 mbTitle(false),
 meFieldUnit(lcl_GetFieldUnit()),
 m_nPageLeftMargin(0),
@@ -153,10 +154,12 @@ SlideBackground::SlideBackground(
 //let the listbox shrink to any size so the sidebar isn't forced to grow to
 //the size of the longest master slide name in the document
 mpMasterSlide->set_width_request(0);
+get(mpBackgroundLabel, "label3");
 get(mpFillAttr, "fillattr1");
 get(mpFillGrad, "fillattr2");
 get(mpFillStyle, "fillstyle");
 get(mpFillLB, "fillattr");
+get(mpInsertImage, "button2");
 get(mpDspMasterBackground, "displaymasterbackground");
 get(mpDspMasterObjects, "displaymasterobjects");
 get(mpCloseMaster, "closemasterslide");
@@ -194,7 +197,8 @@ SlideBackground::~SlideBackground()
 bool SlideBackground::IsImpress()
 {
 return ( maContext == maImpressMasterContext ||
- maContext == maImpressOtherContext );
+ maContext == maImpressOtherContext ||
+ maContext == maImpressHandoutContext );
 }
 
 void SlideBackground::Initialize()
@@ -256,6 +260,18 @@ void SlideBackground::HandleContextChange(
 mpMasterSlide->Disable();
 mpDspMasterBackground->Disable();
 mpDspMasterObjects->Disable();
+mpFillStyle->Show();
+mpBackgroundLabel->Show();
+mpInsertImage->Show();
+}
+else if ( maContext == maImpressHandoutContext )
+{
+mpFillStyle->Hide();
+mpFillLB->Hide();
+mpFillAttr->Hide();
+mpFillGrad->Hide();
+mpBackgroundLabel->Hide();
+mpInsertImage->Hide();
 }
 else if (maContext == maImpressOtherContext )
 {
@@ -264,6 +280,9 @@ void SlideBackground::HandleContextChange(
 mpMasterSlide->Enable();
 mpDspMasterBackground->Enable();
 mpDspMasterObjects->Enable();
+mpFillStyle->Show();
+mpBackgroundLabel->Show();
+mpInsertImage->Show();
 }
 // else Draw or something else, do nothing
 }
@@ -289,7 +308,8 @@ void SlideBackground::Update()
 {
 mpFillAttr->Hide();
 mpFillGrad->Hide();
-mpFillLB->Show();
+if (maContext != maImpressHandoutContext)
+mpFillLB->Show();
 const Color aColor = GetColorSetOrDefault();
 mpFillLB->SelectEntry(aColor);
 }
@@ -520,10 +540,12 @@ void SlideBackground::dispose()
 mpPaperSizeBox.clear();
 mpPaperOrientation.clear();
 mpMasterSlide.clear();
+mpBackgroundLabel.clear();
 mpFillAttr.clear();
 mpFillGrad.clear();
 mpFillStyle.clear();
 mpFillLB.clear();
+mpInsertImage.clear();
 mpDspMasterBackground.clear();
 mpDspMasterObjects.clear();
 mpMasterLabel.clear();
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx 
b/sd/source/ui/sidebar/SlideBackground.hxx
index d8e871c0ef62..4463f233b80b 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -84,10 +84,12 @@ private:
 VclPtr mpPaperSizeBox;
 VclPtr mpPaperOrientation;
 VclPtr mpMasterSlide;
+VclPtr mpBackgroundLabel;
 VclPtr mpFillStyle;
 VclPtr mpFillLB;
 VclPtr mpFillAttr;
 VclPtr mpFillGrad;
+VclPtr mpInsertImage;
 VclPtr mpDspMasterBackground;
 VclPtr mpDspMasterObjects;
 VclPtr mpCloseMaster;
@@ -128,6 +130,7 @@ private:
 vcl::EnumContext maDrawMasterContext;
 vcl::EnumContext maImpressOtherContext;
 vcl::EnumContext maImpressMasterContext;
+vcl::EnumContext maImpressHandoutContext;
 bool mbTitle;
 FieldUnit meFieldUnit;
 long m_nPageLeftMargin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.fr

Re: Filesystem Hierarchy Standards (FHS) and certain file locations

[Paul Menzel]

Dear Michael,


On 09/06/17 16:26, Michael Stahl wrote:

On 06.09.2017 15:55, Paul Menzel wrote:

Following up on bug report #100724 [1], I have two question about the
location of some files.


TDF binary packages (rpm and deb) don't install in /usr but in /opt.


I don’t know. We don’t use binary packages.


apparently you are trying to use "make install", which probably is
unused and unmaintained; maybe we should remove it.


No, we use `start_cmd make -j distro-pack-install DESTDIR=/some/where`. 
What do you recommend?


I don’t see a good reason to divert from standards like `./configure && 
make && make install && make check # or test`. That way, it’s one more 
barrier to integrate it in continuous integration systems like Travis CI 
or similar.



Kind regards,

Paul
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: odf2xhtml (and other xslt filters) - tabs or spaces?

[Samuel Mehrbrodt]

> So this is about tabs in the XSLT source code, not in the generated 
> XHTML?
Correct.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/oox oox/source sd/qa

[Jan Holesovsky]

 dev/null   |binary
 include/oox/export/drawingml.hxx   |4 +-
 oox/source/export/drawingml.cxx|   10 --
 oox/source/export/shapes.cxx   |6 +--
 sd/qa/unit/export-tests-ooxml2.cxx |   59 -
 5 files changed, 5 insertions(+), 74 deletions(-)

New commits:
commit 3595090d6a64de78a40f7d45c0088359d9d49f7b
Author: Jan Holesovsky 
Date:   Wed Sep 6 16:33:31 2017 +0200

Revert "tdf#111798 Fix deformed export of flipped custom shapes to pptx"

This work is incomplete, rather I'll fix my conflicts.

This reverts commit 9c0387ef602d84d0079828f0ad4b53ada7ab1d8a.

Change-Id: I20961cee4a5c28fc5486ca385974e9fcd5827dbe
Reviewed-on: https://gerrit.libreoffice.org/42012
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index a3ad66897e80..97d8dff58de6 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -188,8 +188,8 @@ public:
 const OUString& rURL, bool bRelPathToMedia = false , const Graphic 
*pGraphic=nullptr );
 void WriteBlipMode( const css::uno::Reference< css::beans::XPropertySet >& 
rXPropSet, const OUString& rURL );
 
-void WriteShapeTransformation(const css::uno::Reference< 
css::drawing::XShape >& rXShape,
-  sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, bool bSuppressRotation = false, bool bSuppressFlipping = false );
+void WriteShapeTransformation( const css::uno::Reference< 
css::drawing::XShape >& rXShape,
+  sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, bool bSuppressRotation = false );
 void WriteTransformation( const Rectangle& rRectangle,
   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, sal_Int32 nRotation = 0 );
 
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index cbf3abb513d7..c8d148aeb1c2 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1165,7 +1165,7 @@ void DrawingML::WriteTransformation( const Rectangle& 
rRect,
 mpFS->endElementNS( nXmlNamespace, XML_xfrm );
 }
 
-void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape, 
sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, bool bSuppressRotation, bool 
bSuppressFlipping )
+void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape, 
sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, bool bSuppressRotation  )
 {
 SAL_INFO("oox.shape",  "write shape transformation");
 
@@ -1202,14 +1202,6 @@ void DrawingML::WriteShapeTransformation( const 
Reference< XShape >& rXShape, sa
 if (xPropertySetInfo->hasPropertyByName("RotateAngle"))
 xPropertySet->getPropertyValue("RotateAngle") >>= nRotation;
 }
-
-// OOXML flips shapes before rotating them.
-if(bFlipH != bFlipV)
-nRotation = nRotation * -1 + 36000;
-
-if(bSuppressFlipping)
-bFlipH = bFlipV = false;
-
 WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( 
aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, 
OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation) );
 }
 
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index c4edcf07f1bb..1d4f4a20a217 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -827,7 +827,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 
 if (bHasHandles && bCustGeom && pShape)
 {
-WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV, false, true 
);// do not flip, polypolygon coordinates are flipped already
+WriteShapeTransformation( xShape, XML_a ); // do not flip, polypolygon 
coordinates are flipped already
 tools::PolyPolygon aPolyPolygon( pShape->GetLineGeometry(true) );
 sal_Int32 nRotation = 0;
 // The RotateAngle property's value is independent from any flipping, 
and that's exactly what we need here.
@@ -835,10 +835,8 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 uno::Reference xPropertySetInfo = 
xPropertySet->getPropertySetInfo();
 if (xPropertySetInfo->hasPropertyByName("RotateAngle"))
 xPropertySet->getPropertyValue("RotateAngle") >>= nRotation;
-// Remove rotation
-bool bInvertRotation = bFlipH != bFlipV;
 if (nRotation != 0)
-aPolyPolygon.Rotate(Point(0,0), 
static_cast(bInvertRotation ? nRotation/10 : 3600-nRotation/10));
+aPolyPolygon.Rotate(Point(0,0), 
static_cast(3600-nRotation/10));
 WritePolyPolygon( aPolyPolygon );
 }
 else if (bCustGeom)
diff --git a/sd/qa/unit/data/odp/tdf111798.odp 
b/sd/qa/unit/data/odp/tdf111798.odp
deleted file mode 100644
index f00c0bec7fd1..
Binary files a/sd/qa/unit/data/odp/tdf111798.odp a

Re: odf2xhtml (and other xslt filters) - tabs or spaces?

[Stephan Bergmann]

On 09/06/2017 04:16 PM, Samuel Mehrbrodt wrote:

our xhtml export originally used tabs for indentation. Over time some
changes were made which were indented with spaces.
So currently it's a mix of both. I'd like to unify it and as the
majority was tabs, I converted all to tabs:
https://gerrit.libreoffice.org/#/c/41009/

Miklos suggested to convert all to 4 spaces instead as we do in C++
code.The downside is that converting to spaces touches almost all lines,
while this touches only a few.


So this is about tabs in the XSLT source code, not in the generated 
XHTML?  I'd agree with Miklos that it's better to clean up such source 
code to use spaces instead of tabs.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: filter/source

[Samuel Mehrbrodt]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4fa014099e99d91088f55b15273117fd0fc26679
Author: Samuel Mehrbrodt 
Date:   Wed Sep 6 16:07:10 2017 +0200

tdf#111492 Numbering: entry B.1 is exported as 2.1

Look for the current number format, not always for the first one

Change-Id: Ic11bcb420873bc0a5a644a05623bb801a1579dd7
Reviewed-on: https://gerrit.libreoffice.org/42000
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 40e776024e3a..6f6b4e1ccf89 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1337,7 +1337,7 @@



-   
+   



@@ -1367,7 +1367,7 @@



-   
+   



___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/uiconfig

[Andreas Brandner]

 starmath/uiconfig/smath/ui/fonttypedialog.ui |   57 +--
 1 file changed, 29 insertions(+), 28 deletions(-)

New commits:
commit 8cbe2fa1535e475ab48b450a61fc471c3522fce4
Author: Andreas Brandner 
Date:   Wed Sep 6 12:26:27 2017 +0200

tdf#101876 Math Fonts dialog: moved buttons to bottom of dialog

Change-Id: I588d9a9f2c87e57bc596cdcae823834f500c7d67
Reviewed-on: https://gerrit.libreoffice.org/41984
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui 
b/starmath/uiconfig/smath/ui/fonttypedialog.ui
index 898426702775..ce4ae9ecd349 100644
--- a/starmath/uiconfig/smath/ui/fonttypedialog.ui
+++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -13,21 +13,19 @@
 
   
 False
+vertical
 12
 
   
 False
-vertical
-start
+end
 
-  
-gtk-ok
+  
+_Modify
 True
 True
-True
-True
 True
-True
+True
   
   
 False
@@ -36,8 +34,8 @@
   
 
 
-  
-gtk-cancel
+  
+gtk-help
 True
 True
 True
@@ -46,12 +44,13 @@
   
 False
 True
-1
+0
+True
   
 
 
-  
-_Modify
+  
+_Default
 True
 True
 True
@@ -64,10 +63,12 @@
   
 
 
-  
-gtk-help
+  
+gtk-ok
 True
 True
+True
+True
 True
 True
   
@@ -78,12 +79,12 @@
   
 
 
-  
-_Default
+  
+gtk-cancel
 True
 True
 True
-True
+True
   
   
 False
@@ -131,10 +132,10 @@
   
 True
 False
-0
 _Variables:
 True
 variableCB
+0
 
   
 
@@ -148,10 +149,10 @@
   
 True
 False
-0
 _Functions:
 True
 functionCB
+0
 
   
 
@@ -165,10 +166,10 @@
   
 True
 False
-0
 _Numbers:
 True
 numberCB
+0
 
   
 
@@ -182,10 +183,10 @@
   
 True
 False
-0
 _Text:
 True
 textCB
+0
 
   
 
@@ -284,10 +285,10 @@
   
 True
 False
-0
 _Serif:
 True
 serifCB
+0
 
   
 
@@ -301,10 +302,10 @@
   
 True
 False
-0
 S_ans-serif:
 True
 sansCB
+0
 
   
 
@@ -318,10 +319,10 @@
   
 True
 False
-0
 F_ixed-width:
 True
 fixedCB

odf2xhtml (and other xslt filters) - tabs or spaces?

[Samuel Mehrbrodt]

Hi,

our xhtml export originally used tabs for indentation. Over time some
changes were made which were indented with spaces.
So currently it's a mix of both. I'd like to unify it and as the
majority was tabs, I converted all to tabs:
https://gerrit.libreoffice.org/#/c/41009/

Miklos suggested to convert all to 4 spaces instead as we do in C++
code.The downside is that converting to spaces touches almost all lines,
while this touches only a few.

Are there any opinions on this?

Thedecision should then be applied to all xslt filters in
filter/source/xslt. The situation looks to be the same for othersthere
(mainly tabs, mixed with a few spaces).

Thanks
Samuel

-- 
Samuel Mehrbrodt
Softwareentwickler LibreOffice
–––
CIB software GmbH
Geschäftsstelle Hamburg
Flachsland 10
22083 Hamburg
–––
T +49 (40) / 28 48 42 -224
F +49 (40) / 28 48 42 -100

samuel.mehrbr...@cib.de
www.cib.de
–––
Sitz: München
Registergericht München, HRB 123286
Geschäftsführer: Dipl.-Ing. Ulrich Brandner
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Filesystem Hierarchy Standards (FHS) and certain file locations

[Michael Stahl]

On 06.09.2017 15:55, Paul Menzel wrote:
> Following up on bug report #100724 [1], I have two question about the 
> location of some files.

TDF binary packages (rpm and deb) don't install in /usr but in /opt.

apparently you are trying to use "make install", which probably is
unused and unmaintained; maybe we should remove it.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - oox/source

[Paul Trojahn]

 oox/source/export/shapes.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9d43654080fcc5942610f57cbfec9827b9da2102
Author: Paul Trojahn 
Date:   Sat Jun 24 13:46:46 2017 +0200

Fix PageShape export to pptx

The export code is not called, because the PageShape is actually
of type presentation.PageShape and not drawing.PageShape. A
PageShape has no text at all, which results in an empty p:txBody
element that fails validation, so it needs to be checked first if
the shape actually has text.

Change-Id: I559f15c2396739c74d5c4f36eb952754bc040ce8
Reviewed-on: https://gerrit.libreoffice.org/38574
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/42002
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 066a1ecf1021..c4edcf07f1bb 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1450,7 +1450,8 @@ ShapeExport& ShapeExport::WriteTextBox( const Reference< 
XInterface >& xIface, s
 }
 }
 
-if( NonEmptyText( xIface ) )
+Reference< XText > xXText( xIface, UNO_QUERY );
+if( NonEmptyText( xIface ) && xXText.is() )
 {
 FSHelperPtr pFS = GetFS();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: logerrit

[Shinnok]

 logerrit |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b9ddf19ca151d2c7f7315fc26138e5b2b4d4ab8d
Author: Shinnok 
Date:   Wed Sep 6 12:29:01 2017 +0100

Improve error message on ssh login failure.

Also use the GERRITHOST variable instead of magic text.

Change-Id: I3314be81017f64fca8aa756cca1715081ad01641
Reviewed-on: https://gerrit.libreoffice.org/41988
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/logerrit b/logerrit
index 060a6d4bfd32..6e8dddcc165c 100755
--- a/logerrit
+++ b/logerrit
@@ -128,8 +128,8 @@ case "$1" in
 then
 echo "Your gerrit setup was successful!"
 else
-echo "There seems to be trouble."
-echo "please have the output of: ssh - logerrit"
+echo "There seems to be trouble. Please have the output of:"
+echo "ssh - "$GERRITHOST
 echo "at hand when looking for help."
 fi
 ;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Samuel Mehrbrodt]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3811da1b854896fa96f65a87efb1876523353618
Author: Samuel Mehrbrodt 
Date:   Wed Sep 6 14:51:09 2017 +0200

xhtml export: Rather use rem than cm for margin

follow-up for 46b4eb8b0e9325f8c29cd391baf9504bccee1837

Change-Id: I70986537b842b7fd26de9c2efd1fbdad7b5271a1
Reviewed-on: https://gerrit.libreoffice.org/41990
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 9994d3f08a10..40e776024e3a 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1282,7 +1282,7 @@



-   
margin-right:0.64cm;
+   
margin-right:0.8rem;



___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Filesystem Hierarchy Standards (FHS) and certain file locations

[Miklos Vajna]

Hi,

There are two conflicting requirements in this game. On one hand, people
want a self-contained installation set which can be unpacked anywhere,
and $instdir/program/soffice can start LO.

On the other hand, Linux distros want "system integration", where
documentation goes to /usr/share, binaries go to /usr/bin, etc.

The usual hack to resolve this conflict is that /usr/bin has symlinks to
$libdir/libreoffice/ where the installation set is stored. (Perhaps the
same is true for /usr/share.)

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: external/coinmp

[Stephan Bergmann]

 external/coinmp/UnpackedTarball_coinmp.mk |4 
 external/coinmp/android.build.patch.1 |  143 
 external/coinmp/automake.patch|17577 ++
 external/coinmp/iOS.patch.1   |  190 
 external/coinmp/macosx.build.patch.1  |  315 
 5 files changed, 17578 insertions(+), 651 deletions(-)

New commits:
commit 397e2f0cfb310ac606705c74e5907195e5ca7872
Author: Stephan Bergmann 
Date:   Wed Sep 6 12:48:44 2017 +0200

external/coinmp: Update config.{guess,sub}

...with versions of those files from the latest
.

The current versions failed for a Flathub aarch64 test build, see
.

Some existing patches already did local modifications to those
config.{guess,sub} files, apparently to address build issues on Android, 
iOS,
and macOS.  I removed all of them, hoping that the latest versions of the 
files
already address all those issues.

Change-Id: I13e58479d4e3a0598a00c69674885ca540092b53
Reviewed-on: https://gerrit.libreoffice.org/41987
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index c6836e20748d..b36d328e239b 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -19,18 +19,16 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,coinmp,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/osi_cuts_iterator.patch.0 \
-   external/coinmp/android.build.patch.1 \
external/coinmp/no-binaries.patch.1 \
external/coinmp/werror-format-security.patch.0 \
external/coinmp/werror-undef.patch.0 \
external/coinmp/coinmp-msvc-disable-sse2.patch.1 \
$(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \
-   $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
external/coinmp/werror-format-pedantic.patch.0 \
external/coinmp/ubsan.patch.0 \
external/coinmp/rpath.patch \
external/coinmp/libtool.patch \
-   external/coinmp/iOS.patch.1 \
+   external/coinmp/automake.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/android.build.patch.1 
b/external/coinmp/android.build.patch.1
deleted file mode 100644
index 3d8897bb8a3b..
--- a/external/coinmp/android.build.patch.1
+++ /dev/null
@@ -1,143 +0,0 @@
-# -*- Mode: Diff -*-
-# Patch to make the CoinMP configury recognize Android
-#
 coinmp/config.sub
-+++ coinmp/config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1218,7 +1218,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 coinmp/CoinUtils/config.sub
-+++ coinmp/CoinUtils/config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | 
linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1218,7 +1218,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+| -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* 
| -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 coinmp/Osi/config.sub
-+++ coinmp/Osi/config.sub
-@@ -120,7 +120,7 @@
- # Here

Filesystem Hierarchy Standards (FHS) and certain file locations

[Paul Menzel]

Dear LibreOffice folks,


Following up on bug report #100724 [1], I have two question about the 
location of some files.


First, the license and README files.

```
/usr/lib/libreoffice/NOTICE
/usr/lib/libreoffice/LICENSE.html
/usr/lib/libreoffice/LICENSE.fodt
/usr/lib/libreoffice/LICENSE
/usr/lib/libreoffice/CREDITS.fodt
/usr/lib/libreoffice/readmes
/usr/lib/libreoffice/readmes/README_en-US
/usr/lib/libreoffice/readmes/README_de
```

Shouldn’t those be put under `/usr/share/doc/libreoffice/`?

Second, I wonder why the “real” binaries are put under `/usr/lib` and 
not `/usr/bin/`? `/usr/lib/libreoffice/program` is normally not in a path.


```
$ ls -l /usr/bin/libreoffice
lrwxrwxrwx 1 root system 36 Sep  4 12:55 /usr/bin/libreoffice -> 
/usr/lib/libreoffice/program/soffice

$ ls -l /usr/lib/libreoffice/program/
[…]
-rw-r--r-- 1 root system50 Sep  4 12:54 redirectrc
-rwxr-xr-x 1 root system 24984 Sep  4 12:36 regmerge
-rwxr-xr-x 1 root system 13616 Sep  4 12:36 regview
drwxr-xr-x 2 root system  4096 Sep  4 12:54 resource
-rwxr-xr-x 1 root system63 Aug 24 23:39 sbase
-rwxr-xr-x 1 root system63 Aug 24 23:39 scalc
-rwxr-xr-x 1 root system63 Aug 24 23:39 sdraw
-rwxr-xr-x 1 root system 13150 Aug 24 23:39 senddoc
drwxr-xr-x 2 root system  4096 Sep  4 12:55 services
-rw-r--r-- 1 root system  8690 Sep  4 12:38 services.rdb
-rw-r--r-- 1 root system34 Sep  4 12:54 setuprc
drwxr-xr-x 2 root system22 Sep  4 12:54 shell
-rwxr-xr-x 1 root system66 Aug 24 23:39 simpress
-rwxr-xr-x 1 root system63 Aug 24 23:39 smath
-rwxr-xr-x 1 root system  6051 Sep  4 12:34 soffice
-rwxr-xr-x 1 root system  7408 Sep  4 12:48 soffice.bin
-rw-r--r-- 1 root system   453 Sep  4 12:54 sofficerc
-rwxr-xr-x 1 root system65 Aug 24 23:39 swriter
drwxr-xr-x 2 root system42 Sep  4 12:54 types
-rw-r--r-- 1 root system 57362 Sep  4 12:36 types.rdb
-rwxr-xr-x 1 root system 41024 Sep  4 12:48 ui-previewer
-rwxr-xr-x 1 root system  1508 Aug 24 23:39 uno
-rwxr-xr-x 1 root system 99120 Sep  4 12:37 uno.bin
-rw-r--r-- 1 root system 17092 Aug 24 23:39 uno.py
-rw-r--r-- 1 root system 10956 Aug 24 23:39 unohelper.py
-rwxr-xr-x 1 root system  1390 Aug 24 23:39 unoinfo
-rwxr-xr-x 1 root system  3039 Aug 24 23:39 unopkg
-rwxr-xr-x 1 root system  7456 Sep  4 12:48 unopkg.bin
-rw-r--r-- 1 root system   239 Sep  4 12:35 unorc
-rwxr-xr-x 1 root system  7736 Sep  4 12:35 uri-encode
-rw-r--r-- 1 root system   319 Sep  4 12:54 versionrc
drwxr-xr-x 9 root system   108 Sep  4 12:54 wizards
-rwxr-xr-x 1 root system  7800 Sep  4 12:35 
xid-fullscreen-on-all-monitors

-rwxr-xr-x 1 root system 60048 Sep  4 12:36 xpdfimport
```

The FHS Wikipedia article describes `/usr/lib` as below [2].

> /usr/lib – libraries for the binaries in /usr/bin/ and /usr/sbin/.


Kind regards,

Paul


[1] https://bugs.documentfoundation.org/show_bug.cgi?id=100724
[2] https://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Shinnok license statement

[Shinnok]

Hi,

All of my past & future contributions to LibreOffice may be licensed under the 
MPLv2/LGPLv3+ dual license.

--

My name is Teodor Mircea Ionita aka Shinnok, I'm the new Development Mentor 
Lead for LO, as part of TDF, so I figured I might as well take this opportunity 
to say Hi! and introduce my self to the list. Here's an introductory post on 
the blog:

https://blog.documentfoundation.org/blog/2017/08/07/shinnok/

My primary responsibility is to help new comers set up a build environment, 
identify easyHacks issues to start with, and subsequently mentor throughout the 
entire lifecycle of producing a patch for that bug and getting it reviewed and 
merged to master. I'm here to coordinate this effort and hopefully make it 
easier for everyone to get involved with LibreOffice, integrate into the 
community and push things further when they get stale.

Feel free to get in touch with me if you need help, are stuck on something, 
need to get your contribution reviewed or have ideas on how to improve this 
process and make it easier for you to contribute to the awesome project and 
community that LibreOffice and The Document Foundation are respectively.

I linger on freenode IRC with the same alias on the #libreoffice and 
#libreoffice-dev channels.

Thank you,
Shinnok

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/oox oox/source sd/qa

[Paul Trojahn]

 include/oox/export/drawingml.hxx   |4 +-
 oox/source/export/drawingml.cxx|   10 +-
 oox/source/export/shapes.cxx   |6 ++-
 sd/qa/unit/data/odp/tdf111798.odp  |binary
 sd/qa/unit/export-tests-ooxml2.cxx |   59 +
 5 files changed, 74 insertions(+), 5 deletions(-)

New commits:
commit 9c0387ef602d84d0079828f0ad4b53ada7ab1d8a
Author: Paul Trojahn 
Date:   Thu Aug 17 20:04:27 2017 +0200

tdf#111798 Fix deformed export of flipped custom shapes to pptx

Shapes were deformed because flipping wasn't considered when removing
the rotation. Also WriteShapeTransformation needs information about
flipping to convert the angle correctly.

Change-Id: I7d485e93c00e02b9ec6c73ad6ae2876e5bc6360a
Reviewed-on: https://gerrit.libreoffice.org/41462
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
Reviewed-on: https://gerrit.libreoffice.org/41996
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 97d8dff58de6..a3ad66897e80 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -188,8 +188,8 @@ public:
 const OUString& rURL, bool bRelPathToMedia = false , const Graphic 
*pGraphic=nullptr );
 void WriteBlipMode( const css::uno::Reference< css::beans::XPropertySet >& 
rXPropSet, const OUString& rURL );
 
-void WriteShapeTransformation( const css::uno::Reference< 
css::drawing::XShape >& rXShape,
-  sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, bool bSuppressRotation = false );
+void WriteShapeTransformation(const css::uno::Reference< 
css::drawing::XShape >& rXShape,
+  sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, bool bSuppressRotation = false, bool bSuppressFlipping = false );
 void WriteTransformation( const Rectangle& rRectangle,
   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, sal_Int32 nRotation = 0 );
 
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c8d148aeb1c2..cbf3abb513d7 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1165,7 +1165,7 @@ void DrawingML::WriteTransformation( const Rectangle& 
rRect,
 mpFS->endElementNS( nXmlNamespace, XML_xfrm );
 }
 
-void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape, 
sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, bool bSuppressRotation  )
+void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape, 
sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, bool bSuppressRotation, bool 
bSuppressFlipping )
 {
 SAL_INFO("oox.shape",  "write shape transformation");
 
@@ -1202,6 +1202,14 @@ void DrawingML::WriteShapeTransformation( const 
Reference< XShape >& rXShape, sa
 if (xPropertySetInfo->hasPropertyByName("RotateAngle"))
 xPropertySet->getPropertyValue("RotateAngle") >>= nRotation;
 }
+
+// OOXML flips shapes before rotating them.
+if(bFlipH != bFlipV)
+nRotation = nRotation * -1 + 36000;
+
+if(bSuppressFlipping)
+bFlipH = bFlipV = false;
+
 WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( 
aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, 
OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation) );
 }
 
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 7bd85a8cd39f..066a1ecf1021 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -827,7 +827,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 
 if (bHasHandles && bCustGeom && pShape)
 {
-WriteShapeTransformation( xShape, XML_a ); // do not flip, polypolygon 
coordinates are flipped already
+WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV, false, true 
);// do not flip, polypolygon coordinates are flipped already
 tools::PolyPolygon aPolyPolygon( pShape->GetLineGeometry(true) );
 sal_Int32 nRotation = 0;
 // The RotateAngle property's value is independent from any flipping, 
and that's exactly what we need here.
@@ -835,8 +835,10 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 uno::Reference xPropertySetInfo = 
xPropertySet->getPropertySetInfo();
 if (xPropertySetInfo->hasPropertyByName("RotateAngle"))
 xPropertySet->getPropertyValue("RotateAngle") >>= nRotation;
+// Remove rotation
+bool bInvertRotation = bFlipH != bFlipV;
 if (nRotation != 0)
-aPolyPolygon.Rotate(Point(0,0), 
static_cast(3600-nRotation/10));
+aPolyPolygon.Rotate(Point(0,0), 
static_cast(bInvertRotation ? nRotation/10 : 3600-nRotation/10));
 WritePolyPolygon( aPolyPolygon );
 }
 else if (bCustGeom)
diff --git a/sd/qa/unit/data/od

[Libreoffice-commits] core.git: include/unotools unotools/source

[Stephan Bergmann]

 include/unotools/syslocaleoptions.hxx   |2 
 unotools/source/config/syslocaleoptions.cxx |   78 +---
 2 files changed, 48 insertions(+), 32 deletions(-)

New commits:
commit 519925089defb3582c1147c75ef8bf9e5aed02b1
Author: Stephan Bergmann 
Date:   Wed Sep 6 15:43:45 2017 +0200

Don't call NotifyListeners with mutex locked

...as it causes ThreadSanitizer failures during CppunitTest_basic_macros:

> WARNING: ThreadSanitizer: lock-order-inversion (potential deadlock) 
(pid=27295)
>   Cycle in lock order graph: M290054517485674432 (0x) => 
M2405 (0x7b0c54c0) => M290054517485674432
>
>   Mutex M2405 acquired here while holding mutex M290054517485674432 in 
main thread:
> #0 pthread_mutex_lock 
compiler-rt/lib/tsan/../sanitizer_common/sanitizer_common_interceptors.inc:3800 
(cppunittester+0x45ad87)
> #1 osl_acquireMutex sal/osl/unx/mutex.cxx:97:16 
(libuno_sal.so.3+0xc1ffa)
> #2 osl::Mutex::acquire() include/osl/mutex.hxx:56:20 
(libutllo.so+0xc06c8)
> #3 osl::Guard::Guard(osl::Mutex&) 
include/osl/mutex.hxx:129:17 (libutllo.so+0xbcccf)
> #4 SvtSysLocaleOptions::SvtSysLocaleOptions() 
unotools/source/config/syslocaleoptions.cxx:504:16 (libutllo.so+0x21a4cd)
> #5 SvNumberFormatterRegistry_Impl::SvNumberFormatterRegistry_Impl() 
svl/source/numbers/zforlist.cxx:184:33 (libsvllo.so+0x3da143)
> #6 SvNumberFormatter::GetFormatterRegistry() 
svl/source/numbers/zforlist.cxx:368:34 (libsvllo.so+0x3e0a70)
> #7 SvNumberFormatter::ImpConstruct(o3tl::strong_int) svl/source/numbers/zforlist.cxx:322:5 (libsvllo.so+0x3dc328)
> #8 
SvNumberFormatter::SvNumberFormatter(com::sun::star::uno::Reference
 const&, o3tl::strong_int) 
svl/source/numbers/zforlist.cxx:263:5 (libsvllo.so+0x3dbcb9)
> #9 SbiScanner::NextSym() basic/source/comp/scanner.cxx:563:31 
(libsblo.so+0x267d29)
> #10 SbiTokenizer::Next() basic/source/comp/token.cxx:327:10 
(libsblo.so+0x2771b8)
> #11 SbModule::SetSource32(rtl::OUString const&) 
basic/source/classes/sbxmod.cxx:912:26 (libsblo.so+0x203ac8)
> #12 StarBASIC::MakeModule(rtl::OUString const&, 
com::sun::star::script::ModuleInfo const&, rtl::OUString const&) 
basic/source/classes/sb.cxx:1065:8 (libsblo.so+0x16559a)
> #13 StarBASIC::MakeModule(rtl::OUString const&, rtl::OUString const&) 
basic/source/classes/sb.cxx:1037:12 (libsblo.so+0x164fdc)
> #14 MacroSnippet::MakeModule(rtl::OUString const&) 
basic/qa/cppunit/basictest.cxx:29:22 (libtest_basic_macros.so+0xa7ac)
> #15 MacroSnippet::LoadSourceFromFile(rtl::OUString const&) 
basic/qa/cppunit/basictest.cxx:72:5 (libtest_basic_macros.so+0xb240)
> #16 (anonymous namespace)::Coverage::run_test(rtl::OUString const&) 
basic/qa/cppunit/basic_coverage.cxx:75:15 (libtest_basic_macros.so+0x113d9)
> #17 (anonymous namespace)::Coverage::process_directory(rtl::OUString 
const&) basic/qa/cppunit/basic_coverage.cxx:126:17 
(libtest_basic_macros.so+0x10f46)
> #18 (anonymous namespace)::Coverage::Coverage_Iterator() 
basic/qa/cppunit/basic_coverage.cxx:141:5 (libtest_basic_macros.so+0x1066e)
> #19 void std::__invoke_impl(std::__invoke_memfun_deref, void ((anonymous 
namespace)::Coverage::* const&)(), (anonymous namespace)::Coverage*&) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:227:14
 (libtest_basic_macros.so+0x12ffe)
> #20 std::result_of::type std::__invoke(void ((anonymous namespace)::Coverage::* const&)(), 
(anonymous namespace)::Coverage*&) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:250:14
 (libtest_basic_macros.so+0x12eed)
> #21 
_ZNKSt12_Mem_fn_baseIMN12_GLOBAL__N_18CoverageEFvvELb1EEclIJRPS1_EEEDTclsr3stdE8__invokedtdefpT6_M_pmfspclsr3stdE7forwardIT_Efp_EEEDpOS8_
 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:604:11
 (libtest_basic_macros.so+0x12dcb)
> #22 void std::_Bind ((anonymous namespace)::Coverage*)>::__call(std::tuple<>&&, std::_Index_tuple<0ul>) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:933:11
 (libtest_basic_macros.so+0x12d3b)
> #23 void std::_Bind ((anonymous namespace)::Coverage*)>::operator()<, 
void>() 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:991:17
 (libtest_basic_macros.so+0x12c46)
> #24 std::_Function_handler ((anonymous namespace)::Coverage*)> 
>::_M_invoke(std::_Any_data const&) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:1731:2
 (libtest_basic_macros.so+0x1260a)
> #25 std::function::operator()() const 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:2127:14
 (libtest_basic_macros.so+0x1a6be)
> #26 CppUnit::TestCaller<(anonymous namespace)::Coverage>::runTest() 
workdir/UnpackedTarball/cppunit/include/

[Libreoffice-commits] core.git: include/o3tl include/sfx2 o3tl/qa sd/source sfx2/source

[Noel Grandin]

 include/o3tl/array_view.hxx   |   65 ++
 include/sfx2/dispatch.hxx |2 -
 o3tl/qa/test-array_view.cxx   |   12 +--
 sd/source/ui/inc/DrawDocShell.hxx |4 +-
 sfx2/source/control/dispatch.cxx  |4 +-
 5 files changed, 59 insertions(+), 28 deletions(-)

New commits:
commit 4d830ab33c75dc07d77796d422d909c235c2c127
Author: Noel Grandin 
Date:   Wed Sep 6 10:25:54 2017 +0200

const correctness in o3tl::array_view

Change-Id: I44c1ace97ae44069c5a0c6a247aa8a0b49896ad3
Reviewed-on: https://gerrit.libreoffice.org/41985
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/o3tl/array_view.hxx b/include/o3tl/array_view.hxx
index 9da86866680e..bb4818a4c8a0 100644
--- a/include/o3tl/array_view.hxx
+++ b/include/o3tl/array_view.hxx
@@ -27,8 +27,6 @@
 #include 
 #include 
 
-// A barebones approximation of C++17(?) , haven't bothered with 
more than single-dimensional arrays
-
 #if HAVE_CXX14_CONSTEXPR
 #define CONSTEXPR constexpr
 #else
@@ -42,8 +40,12 @@ namespace o3tl {
 #pragma warning(disable: 4814) // in C++14 'constexpr' will not imply 'const'
 #endif
 
+/** A barebones approximation of C++17(?) .
+  Haven't bothered with more than single-dimensional arrays.
+*/
 template
 class array_view {
+friend class array_view;
 public:
 using value_type = T;
 using pointer = value_type *;
@@ -51,9 +53,9 @@ public:
 using reference = value_type &;
 using const_reference = value_type const &;
 using const_iterator = const_pointer;
-using iterator = const_iterator;
+using iterator = pointer;
 using const_reverse_iterator = std::reverse_iterator;
-using reverse_iterator = const_reverse_iterator;
+using reverse_iterator = std::reverse_iterator;
 using size_type = std::size_t;
 using difference_type = std::ptrdiff_t;
 
@@ -62,9 +64,9 @@ public:
 constexpr array_view() noexcept : data_(nullptr), size_(0) {}
 
 template
-CONSTEXPR array_view (T const (&a)[N]) noexcept : data_(a), size_(N) {}
+CONSTEXPR array_view (T (&a)[N]) noexcept : data_(a), size_(N) {}
 
-CONSTEXPR array_view (T const *a, size_type len) noexcept
+CONSTEXPR array_view (T *a, size_type len) noexcept
 : data_(a), size_(len)
 {
 #if HAVE_CXX14_CONSTEXPR
@@ -73,18 +75,36 @@ public:
 #endif
 }
 
-constexpr boolempty() const noexcept { return size_ == 0; }
+/// Allow for assigning array_view to array_view i.e.
+///   array_view a;
+///   array_view b = a;
+template::value > >
+array_view& operator=(array_view::type> const & other)
+{
+data_ = other.data_;
+size_ = other.size_;
+return *this;
+}
 
-constexpr const_iterator begin() const noexcept { return data_; }
-constexpr const_iterator end() const noexcept { return begin() + size(); }
+array_view& operator=(array_view const & other)
+{
+data_ = other.data_;
+size_ = other.size_;
+return *this;
+}
+
+constexpr bool empty() const noexcept { return size_ == 0; }
+
+constexpr iterator begin() const noexcept { return data_; }
+constexpr iterator end() const noexcept { return begin() + size(); }
 
 constexpr const_iterator cbegin() const noexcept { return begin(); }
 constexpr const_iterator cend() const noexcept { return end(); }
 
-constexpr const_reverse_iterator rbegin() const noexcept
-{ return const_reverse_iterator(end()); }
-constexpr const_reverse_iterator rend() const noexcept
-{ return const_reverse_iterator(begin()); }
+reverse_iterator rbegin() const noexcept
+{ return reverse_iterator(end()); }
+reverse_iterator rend() const noexcept
+{ return reverse_iterator(begin()); }
 
 constexpr const_reverse_iterator crbegin() const noexcept
 { return rbegin(); }
@@ -103,7 +123,7 @@ public:
 return npos - 1;
 }
 
-constexpr const_reference operator [](size_type pos) const {
+constexpr reference operator [](size_type pos) const {
 #if HAVE_CXX14_CONSTEXPR
 assert(pos < size());
 #endif
@@ -111,37 +131,42 @@ public:
 }
 
 CONSTEXPR
-const_reference at(size_type pos) const {
+reference at(size_type pos) const {
 if (pos >= size()) {
 throw std::out_of_range("o3tl::array_view::at");
 }
 return operator [](pos);
 }
 
-constexpr const_reference front() const {
+constexpr reference front() const {
 #if HAVE_CXX14_CONSTEXPR
 assert(!empty());
 #endif
 return operator [](0);
 }
 
-constexpr const_reference back() const {
+constexpr reference back() const {
 #if HAVE_CXX14_CONSTEXPR
 assert(!empty());
 #endif
 return operator [](size() - 1);
 }
 
-constexpr const_pointer data() const noexcept { return data_; }
+constexpr pointer data() const noexcept { return data_; }
 
 CONSTEXPR void swap(array_view & s) noexcept 

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-automate.py esc-reporting/esc-collect.py esc-reporting/esc-report.py

[Shinnok]

 esc-reporting/esc-analyze.py  |   14 +-
 esc-reporting/esc-automate.py |8 
 esc-reporting/esc-collect.py  |   14 +++---
 esc-reporting/esc-report.py   |4 ++--
 4 files changed, 22 insertions(+), 18 deletions(-)

New commits:
commit e0e308bd703b326c47556ab1027167c848a0abb9
Author: Shinnok 
Date:   Tue Sep 5 12:09:01 2017 +0200

Backport Cloph's fixes in /usr/local/bin.

Fixes issues with gerrit CLI not being able to interpret full
change IDs and adds support for BCC to sent e-mails.

Change-Id: I95b9c1578a01e62af7f3c767bc9d982eeaebc19c
Reviewed-on: https://gerrit.libreoffice.org/41989
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index e0048ce..fbe22fe 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -59,7 +59,7 @@ import re
 
 def util_errorMail(text):
 print(text)
-sendMail = 'mail -r mentor...@libreoffice.org -s "ERROR: esc-analyze 
FAILED" mentor...@libreoffice.org IsVisible() )
 m_pProgressBar->SetValue( (sal_uInt16) m_nProgress );
-
-m_aIdle.Start();
 }
 }
 
@@ -1079,6 +1083,7 @@ UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window 
*pParent, TheExtensionMan
 m_pCloseBtn->GrabFocus();
 
 m_aIdle.SetPriority( TaskPriority::LOWEST );
+m_aIdle.SetDebugName( "UpdateRequiredDialog m_aIdle TimeOutHdl" );
 m_aIdle.SetInvokeHandler( LINK( this, UpdateRequiredDialog, TimeOutHdl ) );
 }
 
@@ -1195,14 +1200,18 @@ void UpdateRequiredDialog::showProgress( bool _bStart )
 }
 
 DialogHelper::PostUserEvent( LINK( this, UpdateRequiredDialog, 
startProgress ), reinterpret_cast(bStart) );
+m_aIdle.Start();
 }
 
 
 void UpdateRequiredDialog::updateProgress( const long nProgress )
 {
-::osl::MutexGuard aGuard( m_aMutex );
-
-m_nProgress = nProgress;
+if ( m_nProgress != nProgress )
+{
+::osl::MutexGuard aGuard( m_aMutex );
+m_nProgress = nProgress;
+m_aIdle.Start();
+}
 }
 
 
@@ -1214,6 +1223,7 @@ void UpdateRequiredDialog::updateProgress( const OUString 
&rText,
 m_xAbortChannel = xAbortChannel;
 m_sProgressText = rText;
 m_bProgressChanged = true;
+m_aIdle.Start();
 }
 
 
@@ -1301,8 +1311,6 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl, Timer 
*, void)
 
 if ( m_pProgressBar->IsVisible() )
 m_pProgressBar->SetValue( (sal_uInt16) m_nProgress );
-
-m_aIdle.Start();
 }
 }
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 60a87d75b6e5..cf4f423b83f7 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -141,7 +141,7 @@ class ExtMgrDialog : public ModelessDialog,
 DECL_LINK( HandleCancelBtn, Button*, void );
 DECL_LINK( HandleCloseBtn, Button*, void );
 DECL_LINK( HandleExtTypeCbx, Button*, void );
-DECL_LINK(TimeOutHdl, Timer *, void);
+DECL_LINK( TimeOutHdl, Timer *, void );
 DECL_LINK( startProgress, void *, void );
 DECL_STATIC_LINK( ExtMgrDialog, Restart, void *, void );
 
@@ -214,7 +214,7 @@ class UpdateRequiredDialog : public ModalDialog,
 DECL_LINK( HandleUpdateBtn, Button*, void );
 DECL_LINK( HandleCloseBtn, Button*, void );
 DECL_LINK( HandleCancelBtn, Button*, void );
-DECL_LINK(TimeOutHdl, Timer *, void);
+DECL_LINK( TimeOutHdl, Timer *, void );
 DECL_LINK( startProgress, void *, void );
 
 static bool isEnabled( const css::uno::Reference< 
css::deployment::XPackage > &xPackage );
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 56ac7f2131bf..39cb514ddcbf 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -50,18 +50,18 @@ class AquaBlinker : public Timer
 tools::Rectangle   maInvalidat

[Libreoffice-commits] core.git: oox/source

[Jan Holesovsky]

 oox/source/ppt/timenode.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 2f07a533ed7b52fb0420e6f0a98f42019dcf185f
Author: Jan Holesovsky 
Date:   Tue Sep 5 17:15:03 2017 +0200

tdf#106867: Import target for commands in PPTX.

Change-Id: I859335085038433ef862a669430f8be993b92cb2
Reviewed-on: https://gerrit.libreoffice.org/41980
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index b8ce7e51af33..223cf8b31f2e 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -309,8 +309,10 @@ namespace oox { namespace ppt {
 xAnimate->setBy( aValue );
 break;
 case NP_TARGET:
-if( xAnimate.is() )
-xAnimate->setTarget( aValue );
+if (xAnimate.is())
+xAnimate->setTarget(aValue);
+if (xCommand.is())
+xCommand->setTarget(aValue);
 break;
 case NP_SUBITEM:
 if( xAnimate.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Jan Holesovsky]

 sd/source/filter/eppt/epptooxml.hxx  |1 
 sd/source/filter/eppt/pptx-epptooxml.cxx |   54 +++
 2 files changed, 55 insertions(+)

New commits:
commit e64ebbb7ac530f82bf26a67fed0e1d22b254ff93
Author: Jan Holesovsky 
Date:   Fri Sep 1 18:22:43 2017 +0200

tdf#106867: Implement pptx export of AnimationNodeType::COMMAND.

This is still not enough to make PowerPoint happy with the test file.

Change-Id: Icadcb640b44100ffb3482de57723576e4d843e7a
Reviewed-on: https://gerrit.libreoffice.org/41977
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/sd/source/filter/eppt/epptooxml.hxx 
b/sd/source/filter/eppt/epptooxml.hxx
index 41f7b393bf53..2780767230d6 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -108,6 +108,7 @@ protected:
 void WriteAnimationNodeAnimateInside( const ::sax_fastparser::FSHelperPtr& 
pFS, const css::uno::Reference< css::animations::XAnimationNode >& rXNode, bool 
bMainSeqChild, bool bSimple );
 void WriteAnimationNodeSeq( const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimationNode >& rXNode, sal_Int32 
nXmlNodeType, bool bMainSeqChild );
 void WriteAnimationNodeEffect( const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimationNode >& rXNode, sal_Int32 
nXmlNodeType, bool bMainSeqChild );
+void WriteAnimationNodeCommand(const ::sax_fastparser::FSHelperPtr& pFS, 
const css::uno::Reference< css::animations::XAnimationNode >& rXNode, sal_Int32 
nXmlNodeType, bool bMainSeqChild );
 void WriteAnimationNodeCommonPropsStart( const 
::sax_fastparser::FSHelperPtr& pFS, const css::uno::Reference< 
css::animations::XAnimationNode >& rXNode, bool bSingle, bool bMainSeqChild );
 static void WriteAnimationProperty( const ::sax_fastparser::FSHelperPtr& 
pFS, const css::uno::Any& rAny );
 void WriteAnimationTarget( const ::sax_fastparser::FSHelperPtr& pFS, const 
css::uno::Any& rTarget );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index e8c3e851b413..28c1d2870ed4 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -64,6 +65,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1104,6 +1106,7 @@ void PowerPointExport::WriteAnimationCondition(const 
FSHelperPtr& pFS, Any const
 double fDelay = 0;
 Timing eTiming;
 Event aEvent;
+Reference xShape;
 const char* pDelay = nullptr;
 const char* pEvent = nullptr;
 
@@ -1175,6 +1178,15 @@ void PowerPointExport::WriteAnimationCondition(const 
FSHelperPtr& pFS, Any const
 SAL_INFO("sd.eppt", "event offset timing: " << (int)eTiming);
 }
 }
+else if (rAny >>= xShape)
+{
+SAL_INFO("sd.eppt", "Got the xShape: " << xShape->getShapeType());
+if (xShape->getShapeType() == "com.sun.star.drawing.MediaShape" || 
xShape->getShapeType() == "com.sun.star.presentation.MediaShape")
+{
+// write the default
+bHasFDelay = true;
+}
+}
 
 WriteAnimationCondition(pFS, pDelay, pEvent, fDelay, bHasFDelay);
 }
@@ -1433,6 +1445,41 @@ void PowerPointExport::WriteAnimationNodeEffect(const 
FSHelperPtr& pFS, const Re
 }
 }
 
+void PowerPointExport::WriteAnimationNodeCommand(const FSHelperPtr& pFS, const 
Reference< XAnimationNode >& rXNode, sal_Int32, bool bMainSeqChild)
+{
+SAL_INFO("sd.eppt", "write animation node COMMAND");
+Reference xCommand(rXNode, UNO_QUERY);
+if (xCommand.is())
+{
+const char* pType = "call";
+const char* pCommand = nullptr;
+switch (xCommand->getCommand())
+{
+case EffectCommands::VERB:pType = "verb"; pCommand = "1"; /* 
FIXME hardcoded viewing */ break;
+case EffectCommands::PLAY:pCommand = "play"; break;
+case EffectCommands::TOGGLEPAUSE: pCommand = "togglePause"; break;
+case EffectCommands::STOP:pCommand = "stop"; break;
+default:
+SAL_WARN("sd.eppt", "unknown command: " << xCommand->getCommand());
+break;
+}
+
+pFS->startElementNS(XML_p, XML_cmd,
+XML_type, pType,
+XML_cmd, pCommand,
+FSEND);
+
+WriteAnimationNodeAnimateInside(pFS, rXNode, bMainSeqChild, false);
+pFS->startElementNS(XML_p, XML_cBhvr,
+FSEND);
+WriteAnimationNodeCommonPropsStart(pFS, rXNode, true, bMainSeqChild);
+WriteAnimationTarget(pFS, xCommand->getTarget());
+pFS->endElementNS(XML_p, XML_cBhvr);
+
+pFS->endElementNS(XML_p, XML_cmd);
+}
+}
+
 void PowerPointExport::WriteAnimationNode(const FSHelperPtr& pFS,

[Libreoffice-commits] core.git: sd/source

[Jan Holesovsky]

 sd/source/filter/eppt/pptx-epptooxml.cxx |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 6ac9d6d2a0def5ccc7d8b0d8893c8462f87cb9e5
Author: Jan Holesovsky 
Date:   Fri Sep 1 18:38:48 2017 +0200

related tdf#111884: GroupShapes are now handled in oox.

Change-Id: Iee960e3d4a5c3dc37fa62b4fec8e52fe7c314ec0
Reviewed-on: https://gerrit.libreoffice.org/41978
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 975a7b2c3e56..e8c3e851b413 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -312,14 +312,7 @@ ShapeExport& 
PowerPointShapeExport::WriteUnknownShape(const Reference< XShape >&
 
 SAL_INFO("sd.eppt", "shape(unknown): " << USS(sShapeType));
 
-if (sShapeType == "com.sun.star.drawing.GroupShape")
-{
-Reference< XIndexAccess > rXIndexAccess(xShape, UNO_QUERY);
-
-mrExport.EnterGroup(rXIndexAccess);
-SAL_INFO("sd.eppt", "enter group");
-}
-else if (sShapeType == "com.sun.star.presentation.PageShape")
+if (sShapeType == "com.sun.star.presentation.PageShape")
 {
 WritePageShape(xShape, mePageType, mrExport.GetPresObj());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - external/boost

[David Ostrovsky]

 external/boost/UnpackedTarball_boost.mk|4 
 external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 |   14 ++
 2 files changed, 18 insertions(+)

New commits:
commit ffdbcb111c1713297ed890b0571907f3ac4142ae
Author: David Ostrovsky 
Date:   Tue Sep 5 21:53:32 2017 +0200

Boost: Update last known MSVC version to VS2017.3

Change-Id: I41952279cc9d40769bfc51dd0f03c0b0624815d2
Reviewed-on: https://gerrit.libreoffice.org/41961
Tested-by: Jenkins 
Reviewed-by: Grzegorz Araminowicz 
Reviewed-by: Michael Stahl 
(cherry picked from commit 92012cfad0611f178ea0013674fc3e07008b8b03)
Reviewed-on: https://gerrit.libreoffice.org/41983

diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index efd23d317098..d6c53401064f 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -39,6 +39,10 @@ boost_patches += clang-cl.patch.0
 boost_patches += boost_1_60_0.undef.warning.patch
 boost_patches += boost_1_63_0.undef.warning.patch.1
 
+# Silence unknown-compiler-warning for MSVC version 19.11.25506:
+# 
https://github.com/boostorg/config/pull/177/commits/a0147b73e8bde8f4b2c19c96166353dba8fa9914
+boost_patches += boost_1_63_0.msvs2017.3.warning.patch.1
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 
b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1
new file mode 100755
index ..41557095a5e3
--- /dev/null
+++ b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1
@@ -0,0 +1,14 @@
+diff -ru boost.orig/boost/config/compiler/visualc.hpp 
boost/boost/config/compiler/visualc.hpp
+--- boost.orig/boost/config/compiler/visualc.hpp   2016-12-22 
13:33:14.0 +0100
 boost/boost/config/compiler/visualc.hpp2017-09-05 21:33:16.462142600 
+0200
+@@ -293,8 +293,8 @@
+ #endif
+ 
+ //
+-// last known and checked version is 19.10.24629 (VC++ 2017 RC):
+-#if (_MSC_VER > 1910)
++// last known and checked version is 19.11.25506 (VC++ 2017.3):
++#if (_MSC_VER > 1911)
+ #  if defined(BOOST_ASSERT_CONFIG)
+ # error "Unknown compiler version - please run the configure tests and 
report the results"
+ #  else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx include/vcl svx/source

[Jan-Marek Glogowski]

 include/svx/svdetc.hxx   |1 -
 include/vcl/timer.hxx|8 +++-
 svx/source/svdraw/svdetc.cxx |   23 +--
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit e824a49a1c12533047d6a5ab8544377e8ff29863
Author: Jan-Marek Glogowski 
Date:   Thu Aug 24 18:54:21 2017 +0200

Don't run the OLEObjCache timer for an empty cache

Change-Id: I210f6bdec14491bea6d15bca133011059091f21b

diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 171e8d1318ba..33e6a8fbeec1 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -179,7 +179,6 @@ class OLEObjCache
 size_t nSize;
 AutoTimer*  pTimer;
 
-void UnloadOnDemand();
 static bool UnloadObj( SdrOle2Obj* pObj );
 DECL_LINK( UnloadCheckHdl, Timer*, void );
 
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index d26004cc5312..ad2206f1e41c 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -59,11 +59,17 @@ public:
 
 voidSetTimeout( sal_uInt64 nTimeoutMs );
 sal_uInt64  GetTimeout() const { return mnTimeout; }
+/**
+ * Activates the timer task
+ *
+ * If the timer is already active, it's reset!
+ * Check with Task::IsActive() to prevent reset.
+ */
 virtual voidStart() override;
 };
 
 /// An auto-timer is a multi-shot timer re-emitting itself at
-/// interval until destroyed.
+/// interval until destroyed or stopped.
 class VCL_DLLPUBLIC AutoTimer : public Timer
 {
 public:
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 7ea0e0b686ba..89c17590984c 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -112,8 +112,6 @@ OLEObjCache::OLEObjCache()
 pTimer = new AutoTimer( "svx OLEObjCache pTimer UnloadCheck" );
 pTimer->SetInvokeHandler( LINK(this, OLEObjCache, UnloadCheckHdl) );
 pTimer->SetTimeout(2);
-pTimer->Invoke();
-pTimer->Start();
 }
 
 OLEObjCache::~OLEObjCache()
@@ -122,7 +120,7 @@ OLEObjCache::~OLEObjCache()
 delete pTimer;
 }
 
-void OLEObjCache::UnloadOnDemand()
+IMPL_LINK_NOARG(OLEObjCache, UnloadCheckHdl, Timer*, void)
 {
 if (nSize >= maObjs.size())
 return;
@@ -190,11 +188,12 @@ void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
 // insert object into first position
 maObjs.insert(maObjs.begin(), pObj);
 
-if ( !bFound )
-{
-// a new object was inserted, recalculate the cache
-UnloadOnDemand();
-}
+// if a new object was inserted, recalculate the cache
+if (!bFound)
+pTimer->Invoke();
+
+if (!bFound || !pTimer->IsActive())
+pTimer->Start();
 }
 
 void OLEObjCache::RemoveObj(SdrOle2Obj* pObj)
@@ -202,6 +201,8 @@ void OLEObjCache::RemoveObj(SdrOle2Obj* pObj)
 std::vector::iterator it = std::find(maObjs.begin(), 
maObjs.end(), pObj);
 if (it != maObjs.end())
 maObjs.erase(it);
+if (maObjs.empty())
+pTimer->Stop();
 }
 
 size_t OLEObjCache::size() const
@@ -243,12 +244,6 @@ bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
 return bUnloaded;
 }
 
-IMPL_LINK_NOARG(OLEObjCache, UnloadCheckHdl, Timer*, void)
-{
-UnloadOnDemand();
-}
-
-
 bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
 {
 drawing::FillStyle eFill=static_cast(rSet.Get(XATTR_FILLSTYLE)).GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/CustomTarget_build-examples.mk

[Jan-Marek Glogowski]

 odk/CustomTarget_build-examples.mk |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 9ac2aad4c1cd0f8d513c02a897da90c42f2fa961
Author: Jan-Marek Glogowski 
Date:   Fri Aug 25 22:03:47 2017 +0200

OSX fix ODK example builds with enabled SIP

The "System Integrity Protection”, introduced in macOS El Capitan,
strips DYLD_* environment variables from all calls of software in
/bin and /usr/bin.

As a workaround we copy the shell to a temporary file and use it
in our "sub-make" calls to build the examples.

Change-Id: I3f07492782d56e153e8fcdea605a042ec1898276
Reviewed-on: https://gerrit.libreoffice.org/41975
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins 

diff --git a/odk/CustomTarget_build-examples.mk 
b/odk/CustomTarget_build-examples.mk
index 81ac3a1437c6..f7dc1db1e30d 100644
--- a/odk/CustomTarget_build-examples.mk
+++ b/odk/CustomTarget_build-examples.mk
@@ -93,6 +93,11 @@ ifneq ($(gb_SUPPRESS_TESTS),)
@true
 else
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
+ifeq (MACOSX,$(OS))
+   $(eval ODK_BUILD_SHELL := $(shell $(gb_MKTEMP)))
+   cp /bin/sh "$(ODK_BUILD_SHELL)"
+   chmod 0700 "$(ODK_BUILD_SHELL)"
+endif
(saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $< \
 $(if $(filter MACOSX,$(OS)),, \
 && $(gb_Helper_LIBRARY_PATH_VAR)=$$saved_library_path) \
@@ -100,11 +105,16 @@ else
 UserInstallation=$(call gb_Helper_make_url,$(call 
gb_CustomTarget_get_workdir,odk/build-examples)/user) \
 $(foreach my_dir,$(my_example_dirs), \
 && (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
-&& printf 'yes\n' | LC_ALL=C make))) \
+&& printf 'yes\n' | LC_ALL=C make \
+$(if $(filter MACOSX,$(OS)), SHELL=$(ODK_BUILD_SHELL), 
 \
 >$(call gb_CustomTarget_get_workdir,odk/build-examples)/log 2>&1 \
 || (RET=$$? \
+$(if $(filter MACOSX,$(OS)), && rm -f $(ODK_BUILD_SHELL) , ) \
 && cat $(call gb_CustomTarget_get_workdir,odk/build-examples)/log \
 && exit $$RET)
+ifeq (MACOSX,$(OS))
+   -rm -f $(ODK_BUILD_SHELL)
+endif
 endif
 
 $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/inc svx/source

[Takeshi Abe]

 svx/inc/svdibrow.hxx   |4 ++--
 svx/source/svdraw/svdibrow.cxx |   29 +
 2 files changed, 11 insertions(+), 22 deletions(-)

New commits:
commit a72f30e518883c9b2e20c6a0cf2f1e46eac1fbf9
Author: Takeshi Abe 
Date:   Wed Sep 6 12:05:11 2017 +0900

svx: Simplify code with std::unique_ptr

Change-Id: I6f22417edc70812c64f7b4a9c6d59947059db414
Reviewed-on: https://gerrit.libreoffice.org/41971
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 76b855564c93..c97671e2ffbe 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class SfxItemSet;
 class ImpItemListRow;
@@ -32,7 +33,7 @@ class BrowserMouseEvent;
 class SdrItemBrowserControl: public BrowseBox
 {
 friend class ImpItemEdit;
-std::vector aList;
+std::vector> aList;
 long nAktPaintRow;
 VclPtr pEditControl;
 OUString aWNamMerk;
@@ -48,7 +49,6 @@ friend class ImpItemEdit;
 private:
 void ImpCtor();
 void ImpSetEntry(const ImpItemListRow& rEntry, std::size_t nEntryNum);
-ImpItemListRow* ImpGetEntry(std::size_t nPos) const { return aList[nPos]; }
 void ImpSaveWhich();
 void ImpRestoreWhich();
 std::size_t GetCurrentPos() const;
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 270e95242182..5fdc614b7a10 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -206,8 +206,7 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt)
 #define MYBROWSEMODE 
(BrowserMode::THUMBDRAGGING|BrowserMode::KEEPHIGHLIGHT|BrowserMode::NO_HSCROLL|BrowserMode::HIDECURSOR)
 
 SdrItemBrowserControl::SdrItemBrowserControl(vcl::Window* pParent):
-BrowseBox(pParent, WB_3DLOOK | WB_BORDER | WB_TABSTOP, MYBROWSEMODE),
-aList()
+BrowseBox(pParent, WB_3DLOOK | WB_BORDER | WB_TABSTOP, MYBROWSEMODE)
 {
 ImpCtor();
 }
@@ -274,10 +273,6 @@ void SdrItemBrowserControl::ImpCtor()
 
 void SdrItemBrowserControl::Clear()
 {
-const std::size_t nCount=aList.size();
-for (std::size_t nNum=0; nNum= 0 && _nRow < (sal_Int32)aList.size() )
 {
-ImpItemListRow* pEntry = ImpGetEntry(_nRow);
-if ( pEntry )
-{
+auto& pEntry = aList[_nRow];
 if ( pEntry->bComment )
 {
 if (_nColId == ITEMBROWSER_NAMECOL_ID)
@@ -330,7 +323,6 @@ OUString SdrItemBrowserControl::GetCellText(long _nRow, 
sal_uInt16 _nColId) cons
 case ITEMBROWSER_VALUECOL_ID: sRet = pEntry->aValue; break;
 } // switch
 }
-}
 }
 return sRet;
 }
@@ -342,7 +334,7 @@ void SdrItemBrowserControl::PaintField(OutputDevice& rDev, 
const tools::Rectangl
 }
 tools::Rectangle aR(rRect);
 aR.Bottom()++;
-ImpItemListRow* pEntry=ImpGetEntry(nAktPaintRow);
+auto& pEntry=aList[nAktPaintRow];
 if (pEntry->bComment)
 {
 if (nColumnId==ITEMBROWSER_NAMECOL_ID)
@@ -378,7 +370,7 @@ sal_uInt16 SdrItemBrowserControl::GetCurrentWhich() const
 sal_uInt16 nRet=0;
 const std::size_t nPos=GetCurrentPos();
 if (nPos!=ITEM_NOT_FOUND) {
-nRet=ImpGetEntry(nPos)->nWhichId;
+nRet=aList[nPos]->nWhichId;
 }
 return nRet;
 }
@@ -459,7 +451,7 @@ void SdrItemBrowserControl::ImpRestoreWhich()
 const std::size_t nCount=aList.size();
 std::size_t nNum;
 for (nNum=0; nNumbComment) {
 sal_uInt16 nWh=pEntry->nWhichId;
 if (nWh==nLastWhich) bFnd = true;
@@ -480,8 +472,8 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t 
nPos)
 {
 BreakChangeEntry();
 bool bRet = false;
-ImpItemListRow* pEntry=ImpGetEntry(nPos);
-if (pEntry!=nullptr && !pEntry->bComment) {
+auto& pEntry=aList[nPos];
+if (!pEntry->bComment) {
 SetMode(MYBROWSEMODE & BrowserMode(~BrowserMode::KEEPHIGHLIGHT));
 pEditControl=VclPtr::Create(&GetDataWindow(),this,0);
 tools::Rectangle aRect(GetFieldRectPixel(nPos, 
ITEMBROWSER_VALUECOL_ID, false));
@@ -541,10 +533,10 @@ void SdrItemBrowserControl::ImpSetEntry(const 
ImpItemListRow& rEntry, std::size_
 SAL_WARN_IF(nEntryNum > aList.size(), "svx", "trying to set item " << 
nEntryNum << "in a vector of size " << aList.size());
 if (nEntryNum >= aList.size()) {
 nEntryNum = aList.size();
-aList.push_back(new ImpItemListRow(rEntry));
+aList.emplace_back(new ImpItemListRow(rEntry));
 RowInserted(nEntryNum);
 } else {
-ImpItemListRow* pAktEntry=ImpGetEntry(nEntryNum);
+auto& pAktEntry=aList[nEntryNum];
 if (*pAktEntry!=rEntry) {
 bool bStateDiff=rEntry.eState!=pAktEntry->eState;
 bool bValueDiff=rEntry.aValue != pAktEntry->aValue;
@@ -1010,9 +1002,6 @@ void SdrItemBrowserControl::SetAttributes(const 
SfxItemSet* pSet, const SfxItemS
 
 if (aList.size()>nEntryNu

[Libreoffice-commits] help.git: help3xsl/localized.xsl

[Olivier Hallot]

 help3xsl/localized.xsl |8 
 1 file changed, 8 insertions(+)

New commits:
commit 39aa38f16b837e87ec7ba04f160d0857829c2b38
Author: Olivier Hallot 
Date:   Wed Sep 6 00:16:53 2017 -0300

 Add cs and da to helponline localization

Change-Id: I63291915ac06642d9f7ba6db9c2470b38951eff3
Reviewed-on: https://gerrit.libreoffice.org/41970
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/help3xsl/localized.xsl b/help3xsl/localized.xsl
index 70796a5b0..20ae761cb 100644
--- a/help3xsl/localized.xsl
+++ b/help3xsl/localized.xsl
@@ -18,6 +18,8 @@ Stylesheet map language-dependent parameters and translation
 Conteníu
 Змест
 Съдържание
+Obsah
+Indhold
 Inhalte
 Π
εριεχόμενα
 Contents
@@ -51,6 +53,8 @@ Stylesheet map language-dependent parameters and translation
 Índiz
 Індэкс
 Индекс
+Rejstřík
+Indeks
 Stichworte
 Ευ
ρετήριο
 Index
@@ -84,6 +88,8 @@ Stylesheet map language-dependent parameters and translation
 Alcontrar
 Пошук
 Търсене
+Najít
+Find
 Suchen
 Εύρεση
 Find
@@ -117,6 +123,8 @@ Stylesheet map language-dependent parameters and translation
 Llingua
 Мова
 Език
+Jazyk
+Sprog
 Sprache
 Γλώσσα
 Language
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 128c2badab606787d437482a759d1ed08f4e31d5
Author: Olivier Hallot 
Date:   Wed Sep 6 00:16:53 2017 -0300

Updated core
Project: help  39aa38f16b837e87ec7ba04f160d0857829c2b38

 Add cs and da to helponline localization

Change-Id: I63291915ac06642d9f7ba6db9c2470b38951eff3
Reviewed-on: https://gerrit.libreoffice.org/41970
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 88da65789dd8..39aa38f16b83 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 88da65789dd8c641d9f2c20b7240e120e2fb9537
+Subproject commit 39aa38f16b837e87ec7ba04f160d0857829c2b38
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - external/libepubgen external/libqxp i18npool/source ios/CustomTarget_Lo_Xcconfig.mk sfx2/source

[jan Iversen]

 external/libepubgen/UnpackedTarball_libepubgen.mk |3 +++
 external/libepubgen/libepubgen-ios.patch.1|   21 +
 external/libqxp/UnpackedTarball_libqxp.mk |1 +
 external/libqxp/iOS.patch.1   |   21 +
 i18npool/source/breakiterator/gendict.cxx |3 ++-
 ios/CustomTarget_Lo_Xcconfig.mk   |6 --
 sfx2/source/bastyp/dummytypes.cxx |1 -
 7 files changed, 48 insertions(+), 8 deletions(-)

New commits:
commit 7030d03c8345dd98e9470c7c8de942391ad49e6d
Author: jan Iversen 
Date:   Wed Sep 6 12:40:36 2017 +0200

iOS, avoid copying res files.

the resource files are compiled into the code, so no
need to copy the resource files.

LibreOfficeKit compiles for arm64
A few link problems outstanding

Change-Id: I82ba6f2582b01b2cc5180fd1ee732c7c8458275d

diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk
index 3e3be5eca4d1..a4bbbc577e82 100644
--- a/ios/CustomTarget_Lo_Xcconfig.mk
+++ b/ios/CustomTarget_Lo_Xcconfig.mk
@@ -59,12 +59,6 @@ $(LO_XCCONFIG) :
cp $(INSTDIR)/program/services/services.rdb $(IOSRESOURCE)/services
cp $(INSTDIR)/program/services.rdb  $(IOSRESOURCE)
 
-   # copy .res files
-   # program/resource is hardcoded in unotools/source/i18n/resmgr.cxx. 
Sure,
-   # we could set STAR_RESOURCE_PATH instead. sigh...
-   mkdir -p $(IOSRESOURCE)/program/resource
-   cp $(INSTDIR)/program/resource/*en-US.res 
$(IOSRESOURCE)/program/resource
-
# soffice.cfg
mkdir -p $(IOSRESOURCE)/share/config
cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRESOURCE)/share/config
commit 4829d41c89acbf29db6414d026275829cf69bdc1
Author: jan Iversen 
Date:   Wed Sep 6 08:42:52 2017 +0200

iOS, make gendict.cxx compile

it is not possible to take the address directly of OUString variables.

Change-Id: I8e31494523f4ec186de81aa065f03d7fb2ef475d

diff --git a/i18npool/source/breakiterator/gendict.cxx 
b/i18npool/source/breakiterator/gendict.cxx
index dd3376835dd1..677ea49812af 100644
--- a/i18npool/source/breakiterator/gendict.cxx
+++ b/i18npool/source/breakiterator/gendict.cxx
@@ -146,7 +146,8 @@ static inline void printDataArea(FILE *dictionary_fp, FILE 
*source_fp, vector
Date:   Mon Sep 4 22:45:44 2017 +0200

removed unused type for avmedia dummytypes

Removed StaticType, since opengrok can only find 1 place it is present.

Change-Id: I5a2aacb53c6a22d510e79c152b3725fa7821351d

diff --git a/sfx2/source/bastyp/dummytypes.cxx 
b/sfx2/source/bastyp/dummytypes.cxx
index 2955172ecaf1..183a0ab4d811 100644
--- a/sfx2/source/bastyp/dummytypes.cxx
+++ b/sfx2/source/bastyp/dummytypes.cxx
@@ -11,7 +11,6 @@
 #include 
 
 #if !HAVE_FEATURE_AVMEDIA
-SAL_DLLPUBLIC_EXPORT TypeId avmedia::MediaItem::StaticType() { return 0; }
 #endif
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
commit b63cbdaec5873a32bd936d24d3152c3ec4de3180
Author: jan Iversen 
Date:   Mon Sep 4 21:56:15 2017 +0200

iOS, update libqxp to allow arm64

Added iOS patch for arm64

Change-Id: I5a7c3b6d68df6fa8202c04d9a710e4a611b49b99

diff --git a/external/libqxp/UnpackedTarball_libqxp.mk 
b/external/libqxp/UnpackedTarball_libqxp.mk
index 028ae73a0e1b..e39ea71a976c 100644
--- a/external/libqxp/UnpackedTarball_libqxp.mk
+++ b/external/libqxp/UnpackedTarball_libqxp.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
external/libqxp/0001-add-missing-includes.patch.1 \
external/libqxp/0001-WaE-narrowing-conversion.patch.1 \
external/libqxp/android-workaround.patch.1 \
+   external/libqxp/iOS.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libqxp/iOS.patch.1 b/external/libqxp/iOS.patch.1
new file mode 100644
index ..28082edbee2e
--- /dev/null
+++ b/external/libqxp/iOS.patch.1
@@ -0,0 +1,21 @@
+diff -Naur libqxp/config.sub libqxp.new/config.sub
+--- libqxp/config.sub  2017-08-26 08:39:26.0 +0200
 libqxp.new/config.sub  2017-09-04 21:50:24.0 +0200
+@@ -252,7 +252,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | ba \
+   | be32 | be64 \
+@@ -374,7 +374,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64* \
+   | avr-* | avr32-* \
+   | ba-* \
+   | be32-* | be64-* \
commit 9cd591c1d954032f47

[Libreoffice-commits] core.git: oox/source

[Tamás Zolnai]

 oox/source/export/drawingml.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f3f98b8e1f9eb0804e18bea055fb02917aca42a5
Author: Tamás Zolnai 
Date:   Wed Sep 6 11:56:16 2017 +0200

tdf#111838: Revert "Decrease duplicated code"

This reverts commit 787732fac0aef255bdc51479fdaddf15532d118e.

Change-Id: Idd36f0d434c5ec867e0e1bbbfa70d8a4644d53c6
Reviewed-on: https://gerrit.libreoffice.org/41976
Reviewed-by: Michael Stahl 
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index f0d3ea78431f..94dcd54ed063 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3034,7 +3034,6 @@ void DrawingML::WriteShapeEffect( const OUString& sName, 
const Sequence< Propert
 
 if( nEffectToken > 0 )
 {
-mpFS->startElementNS(XML_a, XML_effectLst, FSEND);
 mpFS->startElement( nEffectToken, xOuterShdwAttrList );
 
 if( bContainsColor )
@@ -3046,7 +3045,6 @@ void DrawingML::WriteShapeEffect( const OUString& sName, 
const Sequence< Propert
 }
 
 mpFS->endElement( nEffectToken );
-mpFS->endElementNS(XML_a, XML_effectLst);
 }
 }
 
@@ -3090,17 +3088,23 @@ void DrawingML::WriteShapeEffects( const Reference< 
XPropertySet >& rXPropSet )
 aShadowGrabBag[2].Name = "RgbClrTransparency";
 aShadowGrabBag[2].Value = rXPropSet->getPropertyValue( 
"ShadowTransparence" );
 
+mpFS->startElementNS(XML_a, XML_effectLst, FSEND);
 WriteShapeEffect( "outerShdw", aShadowGrabBag );
+mpFS->endElementNS(XML_a, XML_effectLst);
 }
 return;
 }
 
+mpFS->startElementNS(XML_a, XML_effectLst, FSEND);
+
 for( sal_Int32 i=0; i < aEffects.getLength(); ++i )
 {
 Sequence< PropertyValue > aEffectProps;
 aEffects[i].Value >>= aEffectProps;
 WriteShapeEffect( aEffects[i].Name, aEffectProps );
 }
+
+mpFS->endElementNS(XML_a, XML_effectLst);
 }
 
 void DrawingML::WriteShape3DEffects( const Reference< XPropertySet >& xPropSet 
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sd/source

[Tamás Zolnai]

 sd/source/ui/view/sdview4.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 3ce90f78ed77c76ec6e0af3731f2fb37628ef89c
Author: Tamás Zolnai 
Date:   Sat Sep 2 06:19:05 2017 +0200

tdf#109261: Crash when adding a video to a slide with zero undo steps

When undo is disabled (no undo steps), ReplaceObjectAtView()
method frees pPickObj, so we need to save it's reused data first.

Reviewed-on: https://gerrit.libreoffice.org/41822
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 27068e6cc39aed8ebfa5fdd7a67acb89f5adcb89)

Change-Id: Icbc800d4d33cf229006aecde7d62aa2a7ea35879
Reviewed-on: https://gerrit.libreoffice.org/41861
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 96a2ffc5363c..63f8260e4aac 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -341,8 +341,12 @@ SdrMediaObj* View::InsertMediaObj( const OUString& 
rMediaURL, const OUString& rM
 else if( pPV )
 {
 Rectangle aRect( rPos, rSize );
+SdrObjUserCall* pUserCall = nullptr;
 if( pPickObj )
+{
 aRect = pPickObj->GetLogicRect();
+pUserCall = pPickObj->GetUserCall(); // ReplaceObjectAtView can 
free pPickObj
+}
 
 pNewMediaObj = new SdrMediaObj( aRect );
 
@@ -371,9 +375,9 @@ SdrMediaObj* View::InsertMediaObj( const OUString& 
rMediaURL, const OUString& rM
 
 if( pPickObj )
 {
-pNewMediaObj->AdjustToMaxRect( pPickObj->GetLogicRect() );
+pNewMediaObj->AdjustToMaxRect( aRect );
 if( bIsPres )
-pNewMediaObj->SetUserCall(pPickObj->GetUserCall());
+pNewMediaObj->SetUserCall( pUserCall );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sd/source

[Tamás Zolnai]

 sd/source/ui/view/sdview4.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 12109f0053fefcc74e54c696a940052faffea0e3
Author: Tamás Zolnai 
Date:   Sat Sep 2 06:19:05 2017 +0200

tdf#109261: Crash when adding a video to a slide with zero undo steps

When undo is disabled (no undo steps), ReplaceObjectAtView()
method frees pPickObj, so we need to save it's reused data first.

Change-Id: Icbc800d4d33cf229006aecde7d62aa2a7ea35879
Reviewed-on: https://gerrit.libreoffice.org/41822
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 27068e6cc39aed8ebfa5fdd7a67acb89f5adcb89)
Reviewed-on: https://gerrit.libreoffice.org/41824
Reviewed-by: Michael Stahl 

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 051a3cc0e5e3..ad806d8b6073 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -341,8 +341,12 @@ SdrMediaObj* View::InsertMediaObj( const OUString& 
rMediaURL, const OUString& rM
 else if( pPV )
 {
 ::tools::Rectangle aRect( rPos, rSize );
+SdrObjUserCall* pUserCall = nullptr;
 if( pPickObj )
+{
 aRect = pPickObj->GetLogicRect();
+pUserCall = pPickObj->GetUserCall(); // ReplaceObjectAtView can 
free pPickObj
+}
 
 pNewMediaObj = new SdrMediaObj( aRect );
 
@@ -371,9 +375,9 @@ SdrMediaObj* View::InsertMediaObj( const OUString& 
rMediaURL, const OUString& rM
 
 if( pPickObj )
 {
-pNewMediaObj->AdjustToMaxRect( pPickObj->GetLogicRect() );
+pNewMediaObj->AdjustToMaxRect( aRect );
 if( bIsPres )
-pNewMediaObj->SetUserCall(pPickObj->GetUserCall());
+pNewMediaObj->SetUserCall( pUserCall );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sd/source

[Tamás Zolnai]

 sd/source/filter/ppt/pptin.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bf8ba674089cea3b335c0668a40bc42274f4146a
Author: Tamás Zolnai 
Date:   Sat Sep 2 06:45:35 2017 +0200

tdf#109052: Crash after PPT import when undo is disabled

It was not a good idea to enable undo unconditionally.
Use the saved undo state instead.

Change-Id: I60875da23466b6ef54f034b447d636bdbab38151
Reviewed-on: https://gerrit.libreoffice.org/41823
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit a726c69ffef2533545e316172e3e1494b8ad327e)
Reviewed-on: https://gerrit.libreoffice.org/41825
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 3b18699b2e9c..738e865cb23a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -237,6 +237,7 @@ bool ImplSdPPTImport::Import()
 return false;
 
 pSdrModel->setLock(true);
+const bool bSavedUndoEnabled = pSdrModel->IsUndoEnabled();
 pSdrModel->EnableUndo(false);
 
 SdrOutliner& rOutl = mpDoc->GetDrawOutliner();
@@ -1407,7 +1408,7 @@ bool ImplSdPPTImport::Import()
 xDocProps->setTemplateName(OUString());
 
 pSdrModel->setLock(false);
-pSdrModel->EnableUndo(true);
+pSdrModel->EnableUndo(bSavedUndoEnabled);
 return bOk;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/boost

[David Ostrovsky]

 external/boost/UnpackedTarball_boost.mk|4 
 external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 |   14 ++
 2 files changed, 18 insertions(+)

New commits:
commit 92012cfad0611f178ea0013674fc3e07008b8b03
Author: David Ostrovsky 
Date:   Tue Sep 5 21:53:32 2017 +0200

Boost: Update last known MSVC version to VS2017.3

Change-Id: I41952279cc9d40769bfc51dd0f03c0b0624815d2
Reviewed-on: https://gerrit.libreoffice.org/41961
Tested-by: Jenkins 
Reviewed-by: Grzegorz Araminowicz 
Reviewed-by: Michael Stahl 

diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index efd23d317098..d6c53401064f 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -39,6 +39,10 @@ boost_patches += clang-cl.patch.0
 boost_patches += boost_1_60_0.undef.warning.patch
 boost_patches += boost_1_63_0.undef.warning.patch.1
 
+# Silence unknown-compiler-warning for MSVC version 19.11.25506:
+# 
https://github.com/boostorg/config/pull/177/commits/a0147b73e8bde8f4b2c19c96166353dba8fa9914
+boost_patches += boost_1_63_0.msvs2017.3.warning.patch.1
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 
b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1
new file mode 100755
index ..41557095a5e3
--- /dev/null
+++ b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1
@@ -0,0 +1,14 @@
+diff -ru boost.orig/boost/config/compiler/visualc.hpp 
boost/boost/config/compiler/visualc.hpp
+--- boost.orig/boost/config/compiler/visualc.hpp   2016-12-22 
13:33:14.0 +0100
 boost/boost/config/compiler/visualc.hpp2017-09-05 21:33:16.462142600 
+0200
+@@ -293,8 +293,8 @@
+ #endif
+ 
+ //
+-// last known and checked version is 19.10.24629 (VC++ 2017 RC):
+-#if (_MSC_VER > 1910)
++// last known and checked version is 19.11.25506 (VC++ 2017.3):
++#if (_MSC_VER > 1911)
+ #  if defined(BOOST_ASSERT_CONFIG)
+ # error "Unknown compiler version - please run the configure tests and 
report the results"
+ #  else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a8cd70cd0a1cc24e678af02e08b46f3fbafc6a82
Author: Stephan Bergmann 
Date:   Wed Sep 6 10:10:37 2017 +0200

Move git source details to solenv/flatpak-manifest.in

...from dev-tools' flatpak/build.sh, as the Flathub build plans to use that 
git
source, too

Change-Id: I5a23ad0eddd8b7d89e941217c66f5354936c10fc
(cherry picked from commit 2a74f9d8055cadd3da00a45486a8fcdab3e94715)
Reviewed-on: https://gerrit.libreoffice.org/41974
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 05c2436fd98e..39b47826e24a 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -9,7 +9,12 @@
 {
 "name": "libreoffice",
 "sources": [
-@SOURCE@,
+{
+"type": "git",
+"url": "git://gerrit.libreoffice.org/core",
+"branch": "@BRANCH@",
+"disable-fsckobjects": true
+},
 {
 "commands": [
 "mkdir external/tarballs"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source

[Jan-Marek Glogowski]

 connectivity/source/drivers/firebird/Connection.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 84e1f8567fa0a2b83323d8944307d1db7a5b45f5
Author: Jan-Marek Glogowski 
Date:   Wed Sep 6 11:20:23 2017 +0200

loplugin:unnecessaryparen

Change-Id: I1e80b1b62157f78fe3c0964773c8a0e29a901710

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index d792ecb72fb0..32e314029f7f 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -497,16 +497,16 @@ void Connection::setupTransaction()
 switch (m_aTransactionIsolation)
 {
 // TODO: confirm that these are correct.
-case(TransactionIsolation::READ_UNCOMMITTED):
+case TransactionIsolation::READ_UNCOMMITTED:
 aTransactionIsolation = isc_tpb_concurrency;
 break;
-case(TransactionIsolation::READ_COMMITTED):
+case TransactionIsolation::READ_COMMITTED:
 aTransactionIsolation = isc_tpb_read_committed;
 break;
-case(TransactionIsolation::REPEATABLE_READ):
+case TransactionIsolation::REPEATABLE_READ:
 aTransactionIsolation = isc_tpb_consistency;
 break;
-case(TransactionIsolation::SERIALIZABLE):
+case TransactionIsolation::SERIALIZABLE:
 aTransactionIsolation = isc_tpb_consistency;
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerperfect/source

[Miklos Vajna]

 writerperfect/source/writer/exp/txtparai.cxx |   97 +--
 1 file changed, 34 insertions(+), 63 deletions(-)

New commits:
commit 3621c773a867eb2bbee83035c7125ca11296e44a
Author: Miklos Vajna 
Date:   Wed Sep 6 09:56:07 2017 +0200

EPUB export: pull out FillStyle() from XMLSpan/ParaContext

To avoid repeating similar code 3 times.

Change-Id: I76a7d2329488ba9b77b789c0393ac120e8e775d1
Reviewed-on: https://gerrit.libreoffice.org/41973
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/writerperfect/source/writer/exp/txtparai.cxx 
b/writerperfect/source/writer/exp/txtparai.cxx
index 31ab25f43cad..f2df54d0e1b0 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -14,6 +14,37 @@
 
 using namespace com::sun::star;
 
+namespace
+{
+
+/// Looks for rName in rAutomaticStyles (and failing that, in rNamedStyles) 
and fills rPropertyList based on that.
+void FillStyle(const OUString &rName,
+   std::map &rNamedStyles,
+   std::map 
&rAutomaticStyles,
+   librevenge::RVNGPropertyList &rPropertyList)
+{
+auto itStyle = rAutomaticStyles.find(rName);
+if (itStyle != rAutomaticStyles.end())
+{
+// Apply properties from automatic style.
+librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
+for (itProp.rewind(); itProp.next();)
+rPropertyList.insert(itProp.key(), itProp()->clone());
+return;
+}
+
+itStyle = rNamedStyles.find(rName);
+if (itStyle != rNamedStyles.end())
+{
+// Apply properties from named style.
+librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
+for (itProp.rewind(); itProp.next();)
+rPropertyList.insert(itProp.key(), itProp()->clone());
+}
+}
+
+}
+
 namespace writerperfect
 {
 namespace exp
@@ -52,27 +83,7 @@ void XMLSpanContext::startElement(const OUString &/*rName*/, 
const css::uno::Ref
 const OUString &rAttributeName = xAttribs->getNameByIndex(i);
 const OUString &rAttributeValue = xAttribs->getValueByIndex(i);
 if (rAttributeName == "text:style-name")
-{
-// Reference to an automatic text style, try to look it up.
-auto itStyle = 
mrImport.GetAutomaticTextStyles().find(rAttributeValue);
-if (itStyle != mrImport.GetAutomaticTextStyles().end())
-{
-// Apply properties directly, librevenge has no notion of 
automatic styles.
-librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
-for (itProp.rewind(); itProp.next();)
-aPropertyList.insert(itProp.key(), itProp()->clone());
-continue;
-}
-
-itStyle = mrImport.GetTextStyles().find(rAttributeValue);
-if (itStyle != mrImport.GetTextStyles().end())
-{
-// Apply properties from text style.
-librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
-for (itProp.rewind(); itProp.next();)
-aPropertyList.insert(itProp.key(), itProp()->clone());
-}
-}
+FillStyle(rAttributeValue, mrImport.GetAutomaticTextStyles(), 
mrImport.GetTextStyles(), aPropertyList);
 else
 {
 OString sName = OUStringToOString(rAttributeName, 
RTL_TEXTENCODING_UTF8);
@@ -163,26 +174,7 @@ void XMLParaContext::startElement(const OUString 
&/*rName*/, const css::uno::Ref
 if (rAttributeName == "text:style-name")
 {
 m_aStyleName = rAttributeValue;
-
-// Reference to an automatic style, try to look it up.
-auto itStyle = 
mrImport.GetAutomaticParagraphStyles().find(m_aStyleName);
-if (itStyle != mrImport.GetAutomaticParagraphStyles().end())
-{
-// Found an automatic paragraph style.
-librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
-for (itProp.rewind(); itProp.next();)
-aPropertyList.insert(itProp.key(), itProp()->clone());
-continue;
-}
-
-itStyle = mrImport.GetParagraphStyles().find(m_aStyleName);
-if (itStyle != mrImport.GetParagraphStyles().end())
-{
-// Found a paragraph style.
-librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
-for (itProp.rewind(); itProp.next();)
-aPropertyList.insert(itProp.key(), itProp()->clone());
-}
+FillStyle(m_aStyleName, mrImport.GetAutomaticParagraphStyles(), 
mrImport.GetParagraphStyles(), aPropertyList);
 }
 else
 {
@@ -204,28 +196,7 @@ void XMLParaContext::characters(const OUString &rChars)
 {
 librevenge::RVNGPropertyList aPropertyList;
 if (!m_aStyleName.isEmpty())
-{
-// Refer

[Libreoffice-commits] core.git: sd/source

[Caolán McNamara]

 sd/source/ui/sidebar/SlideBackground.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 128856d5810ef4b103885a0a3c145ed3016a5950
Author: Caolán McNamara 
Date:   Wed Sep 6 10:13:02 2017 +0100

crashtesting: bazillion presentation format crashes

Change-Id: I2476f411275978dbdb1060c015658535ef803d50

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 8874bfc7312e..070b8e0119e8 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -78,8 +78,9 @@ namespace
 {
 FieldUnit eUnit = FUNIT_CM;
 const SfxPoolItem* pItem = nullptr;
-SfxItemState eState = 
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState( 
SID_ATTR_METRIC, pItem );
-if ( pItem && eState >= SfxItemState::DEFAULT )
+SfxViewFrame* pCurrent = SfxViewFrame::Current();
+SfxItemState eState = pCurrent ? 
pCurrent->GetBindings().GetDispatcher()->QueryState(SID_ATTR_METRIC, pItem) : 
SfxItemState::UNKNOWN;
+if (pItem && eState >= SfxItemState::DEFAULT)
 {
 eUnit = (FieldUnit)static_cast( pItem 
)->GetValue();
 }
@@ -166,10 +167,11 @@ SlideBackground::SlideBackground(
 get(m_pTopMarginEdit, "top");
 get(m_pBottomMarginEdit, "bottom");
 
-if ( SfxViewFrame::Current() )
+SfxViewFrame* pCurrent = SfxViewFrame::Current();
+if (pCurrent)
 {
 const SfxPoolItem* pItem = nullptr;
-SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState( 
SID_ATTR_PAGE_SIZE, pItem );
+pCurrent->GetBindings().GetDispatcher()->QueryState( 
SID_ATTR_PAGE_SIZE, pItem );
 if (pItem)
 {
 const SvxSizeItem* pSize = static_cast( pItem 
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/qa sw/source

[Caolán McNamara]

 sw/qa/core/data/odt/pass/tdf102018.odt |binary
 sw/source/filter/xml/xmltbli.cxx   |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eab61f66c6cfa4b290c8789a375e6894be054f32
Author: Caolán McNamara 
Date:   Tue Aug 29 12:27:23 2017 +0100

Resolves: tdf#112018 number-columns-repeated has the data type 
positiveInteger

Change-Id: I534885fe7a36a8e3ad891a3f5ed50b589f36e3b9
Reviewed-on: https://gerrit.libreoffice.org/41692
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 3415764d00044a19568b3a1b5d5382c73a0342c9)
Reviewed-on: https://gerrit.libreoffice.org/41964
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/sw/qa/core/data/odt/pass/tdf102018.odt 
b/sw/qa/core/data/odt/pass/tdf102018.odt
new file mode 100644
index ..d804aec11df0
Binary files /dev/null and b/sw/qa/core/data/odt/pass/tdf102018.odt differ
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 05d0d15f4e35..b44a68cb47ce 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -770,7 +770,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
 if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
 aStyleName = rValue;
 else if( IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) )
-nColRep = (sal_uInt32)rValue.toInt32();
+nColRep = (sal_uInt32)std::max(1, rValue.toInt32());
 else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) )
 aDfltCellStyleName = rValue;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 10/e628873f7e24462911864c0748ecf6eb1f1ff6

[Caolán McNamara]

 10/e628873f7e24462911864c0748ecf6eb1f1ff6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 18403a5793c80bfcb8e0060dc3bbbf6617c96e58
Author: Caolán McNamara 
Date:   Wed Sep 6 09:33:15 2017 +0100

Notes added by 'git notes add'

diff --git a/10/e628873f7e24462911864c0748ecf6eb1f1ff6 
b/10/e628873f7e24462911864c0748ecf6eb1f1ff6
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/10/e628873f7e24462911864c0748ecf6eb1f1ff6
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 56/7d872af2cf3779d039013b948e4c0035a3062a

[Caolán McNamara]

 56/7d872af2cf3779d039013b948e4c0035a3062a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f7479612d89c45a152bd41e645ae51beafff0e11
Author: Caolán McNamara 
Date:   Wed Sep 6 09:32:52 2017 +0100

Notes added by 'git notes add'

diff --git a/56/7d872af2cf3779d039013b948e4c0035a3062a 
b/56/7d872af2cf3779d039013b948e4c0035a3062a
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/56/7d872af2cf3779d039013b948e4c0035a3062a
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless

[Caolán McNamara]

 vcl/headless/svpgdi.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit af53581cd12a4d265719acca0c59fb4490e15951
Author: Caolán McNamara 
Date:   Wed Sep 6 09:27:22 2017 +0100

ofz#3028 check bitmap creation for failure

Change-Id: I8c1a2c3873e53153564a5aabc4cc8903622cf054

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 5b8c0a8a66e0..dea4185abea8 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1152,7 +1152,13 @@ SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, 
long nWidth, long nHeigh
 aPal[0] = Color(COL_BLACK);
 aPal[1] = Color(COL_WHITE);
 }
-pBitmap->Create(Size(nWidth, nHeight), GetBitCount(), aPal);
+
+if (!pBitmap->Create(Size(nWidth, nHeight), GetBitCount(), aPal))
+{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::getBitmap, cannot create bitmap");
+delete pBitmap;
+return nullptr;
+}
 
 cairo_surface_t* target = 
SvpSalGraphics::createCairoSurface(pBitmap->GetBuffer());
 cairo_t* cr = cairo_create(target);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/scheduler-fixes' - 11 commits - cui/source include/vcl odk/CustomTarget_build-examples.mk sc/qa svx/source sw/source vcl/headless vcl/inc vcl/Libra

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit 699189c70f959006aa88db6576996e34b81a7034
Author: Jan-Marek Glogowski 
Date:   Tue Sep 5 18:54:49 2017 +0200

OSX revert fix for i#90083

Part of commit d6f7c94e5c27ba02ff5c3229760c9808cc9b5bea

At least on my current OSX box application based window switching
"just works" "out of the box", even without the code.

With the replacement of the list with a set, the result is probably
also a bit unexpected.

Change-Id: I456503a74d8cddbd1e81b4a826b94381b424c78c

diff --git a/vcl/inc/osx/vclnsapp.h b/vcl/inc/osx/vclnsapp.h
index c899ffce59d1..39bd3170abaf 100644
--- a/vcl/inc/osx/vclnsapp.h
+++ b/vcl/inc/osx/vclnsapp.h
@@ -61,8 +61,6 @@ class AquaSalFrame;
 #endif
 -(BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: 
(BOOL)bWinVisible;
 -(void)setDockIconClickHandler: (NSObject*)pHandler;
--(void)cycleFrameForward: (AquaSalFrame*)pCurFrame;
--(void)cycleFrameBackward: (AquaSalFrame*)pCurFrame;
 @end
 
 #endif // INCLUDED_VCL_INC_OSX_VCLNSAPP_H
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 535286e698a6..337e92d4f0fe 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -136,24 +136,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 }
 }
 
-// #i90083# handle frame switching
-// FIXME: lousy workaround
-if( (nModMask & (NSControlKeyMask|NSAlternateKeyMask)) == 0 )
-{
-if( [[pEvent characters] isEqualToString: @"<"] ||
-[[pEvent characters] isEqualToString: @"~"] )
-{
-[self cycleFrameForward: pFrame];
-return;
-}
-else if( [[pEvent characters] isEqualToString: @">"] ||
- [[pEvent characters] isEqualToString: @"`"] )
-{
-[self cycleFrameBackward: pFrame];
-return;
-}
-}
-
 // get information whether the event was handled; keyDown returns 
nothing
 GetSalData()->maKeyEventAnswer[ pEvent ] = false;
 bool bHandled = false;
@@ -245,77 +227,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 [super sendEvent: pEvent];
 }
 
--(void)cycleFrameForward: (AquaSalFrame*)pCurFrame
-{
-// find current frame in list
-auto &rFrames( GetSalData()->mpFirstInstance->getFrames() );
-auto it = rFrames.find( pCurFrame );
-if( it != rFrames.end() )
-{
-++it;
-// now find the next frame (or end)
-for( ; it != rFrames.end(); ++it )
-{
-auto pFrame = static_cast( *it );
-if( pFrame->mpDockMenuEntry != nullptr && pFrame->mbShown )
-{
-[pFrame->getNSWindow() makeKeyAndOrderFront: NSApp];
-return;
-}
-}
-// cycle around, find the next up to pCurFrame
-for( it = rFrames.begin(); *it != pCurFrame; ++it )
-{
-auto pFrame = static_cast( *it );
-if( pFrame->mpDockMenuEntry != nullptr && pFrame->mbShown )
-{
-[pFrame->getNSWindow() makeKeyAndOrderFront: NSApp];
-return;
-}
-}
-}
-}
-
-template< class Iterator >
-std::reverse_iterator make_reverse_iterator( Iterator i )
-{
-return std::reverse_iterator(i);
-}
-
--(void)cycleFrameBackward: (AquaSalFrame*)pCurFrame
-{
-// do the same as cycleFrameForward only with a reverse iterator
-
-// find current frame in list
-auto &rFrames( GetSalData()->mpFirstInstance->getFrames() );
-auto search_it = rFrames.find( pCurFrame );
-if( search_it != rFrames.end() )
-{
-auto it = ::make_reverse_iterator( search_it );
-++it;
-// now find the next frame (or end)
-for( ; it != rFrames.rend(); ++it )
-{
-auto pFrame = static_cast( *it );
-if( pFrame->mpDockMenuEntry != nullptr && pFrame->mbShown )
-{
-[pFrame->getNSWindow() makeKeyAndOrderFront: NSApp];
-return;
-}
-}
-// cycle around, find the next up to pCurFrame
-for( it = rFrames.rbegin(); *it != pCurFrame; ++it )
-{
-auto pFrame = static_cast( *it );
-if( pFrame->mpDockMenuEntry != nullptr && pFrame->mbShown )
-{
-[pFrame->getNSWindow() makeKeyAndOrderFront: NSApp];
-return;
-}
-}
-}
-}
-
 -(NSMenu*)applicationDockMenu:(NSApplication *)sender
 {
 (void)sender;
commit f5a1e9dfad228936fb5282b47b9ba29608d8
Author: Jan-Marek Glogowski 
Date:   Mon Sep 4 17:40:13 2017 +0200

Unify SalUserEvent handling

Change-Id: I188b567e44fd79c162b2d9cabbd771d1f66c7dc4

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 1a2105877de5..d76567776b42 100644
--- a/vcl/Library_vcl.

[Libreoffice-commits] core.git: sc/source

[Dimitri Bouron]

 sc/source/ui/view/dbfunc3.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 3d37e10684edf9536beefe5670b144571e6c9792
Author: Dimitri Bouron 
Date:   Thu Aug 3 11:57:48 2017 +0200

tdf#111305: Fix group name refresh in pivot table

Change-Id: Ibc22bfba5765aba3014651df50afb23b893d2b5a
Reviewed-on: https://gerrit.libreoffice.org/40712
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index c6d04090c997..186007cae57a 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -73,6 +73,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace com::sun::star;
 using ::com::sun::star::uno::Any;
@@ -1333,6 +1335,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, 
const OUString& rString )
 pDPObj->BuildAllDimensionMembers();
 ScDPSaveData aData( *pDPObj->GetSaveData() );
 bool bChange = false;
+bool bNeedReloadGroups = false;
 
 DataPilotFieldOrientation nOrient = DataPilotFieldOrientation_HIDDEN;
 long nField = pDPObj->GetHeaderDim( rPos, nOrient );
@@ -1453,6 +1456,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, 
const OUString& rString )
 pSaveMember->SetName( rString );
 
 bChange = true;
+bNeedReloadGroups = true;
 }
 else
 pErrorId = STR_INVALIDNAME;
@@ -1571,6 +1575,16 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, 
const OUString& rString )
 // apply changes
 ScDBDocFunc aFunc( *GetViewData().GetDocShell() );
 pDPObj->SetSaveData( aData );
+if (bNeedReloadGroups)
+{
+ScDPCollection* pDPs = pDoc->GetDPCollection();
+if (pDPs)
+{
+std::set aRefs;
+// tdf#111305: Reload groups in cache after modifications.
+pDPs->ReloadGroupsInCache(pDPObj, aRefs);
+} // pDPs
+} // bNeedReloadGroups
 aFunc.UpdatePivotTable(*pDPObj, true, false);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa sc/source

[Winfried Donkers]

 sc/qa/unit/data/functions/text/fods/findb.fods |  225 -
 sc/source/core/tool/interpr1.cxx   |2 
 2 files changed, 81 insertions(+), 146 deletions(-)

New commits:
commit 1683f9848c3bd89fff430330a500756c4b130457
Author: Winfried Donkers 
Date:   Tue Sep 5 21:11:01 2017 +0200

tdf#107135 fix too tight constraint for FINDB.

Change-Id: I72e7214f14840146305fcb7daec7db89fcf112c9
Reviewed-on: https://gerrit.libreoffice.org/41959
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/sc/qa/unit/data/functions/text/fods/findb.fods 
b/sc/qa/unit/data/functions/text/fods/findb.fods
index 59863def186d..cc923717cff5 100644
--- a/sc/qa/unit/data/functions/text/fods/findb.fods
+++ b/sc/qa/unit/data/functions/text/fods/findb.fods
@@ -1220,11 +1220,6 @@
   5
  
  
-  
-   
-   
-   
-  
   WAAR
  
  
@@ -1233,17 +1228,32 @@
  
 
 
- 
+ 
+  5
+ 
+ 
+  5
+ 
+ 
+  WAAR
+ 
+ 
+  =FINDB("efg";"abcdefg";5)
+ 
+ 
+
+
+ 
   #VALUE!
  
  
   #VALUE!
  
- 
+ 
   WAAR
  
- 
-  =FINDB("efg";"abcdefg";5)
+ 
+  =FINDB("efg";"abcdefg";6)
  
  
 
@@ -1254,10 +1264,10 @@
  
   19
  
- 
+ 
   WAAR
  
- 
+ 
   =FINDB("ᄫᄬ";$I$2;1)
  
  
@@ -1269,10 +1279,10 @@
  
   19
  
- 
+ 
   WAAR
  
- 
+ 
   =FINDB("ᄫᄬ";$I$2;2)
  
  
@@ -1284,10 +1294,10 @@
  
   19
  
- 
+ 
   WAAR
  
- 
+ 
   =FINDB("ᄫᄬ";$I$2;18)
  
  
@@ -1299,10 +1309,10 @@
  
   19
  
- 
+ 
   WAAR
  
- 
+ 
   =FINDB("ᄫᄬ";$I$2;19)
  
  
@@ -1314,10 +1324,10 @@
  
   #VALUE!
  
- 
+ 
   WAAR
  
- 
+ 
   =FINDB("ᄫᄬ";$I$2;20)
  
  
@@ -1329,10 +1339,10 @@
  
   20
  
- 
+ 
   WAAR
  
- 
+ 
   =FINDB("ᄫᄬ";$I$3;9)
  
  
@@ -1354,10 +1364,10 @@
  
   6
  
- 
+ 
   WAAR
  
- 
+ 
   =FINDB(76;998877665544)
  
  
@@ -1377,17 +1387,17 @@
  
 
 
- 
+ 
   1
  
  
   1
  
- 
+ 
   WAAR
  
- 
-  =FINDB("M";I17)
+ 
+  =FINDB("M";I18)
  
  
  
@@ -1403,17 +1413,17 @@
  
 
 
- 
+ 
   6
  
  
   6
  
- 
+ 
   WAAR
  
- 
-  =FINDB("m";I17)
+ 
+  =FINDB("m";I18)
  
  
  
@@ -1429,17 +1439,17 @@
  
 
 
- 
+ 
   8
  
  
   8
  
- 
+ 
   WAAR
  
- 
-  =FINDB("M";I17;3)
+ 
+  =FINDB("M";I18;3)
  
  
  
@@ -1452,17 +1462,17 @@
  
 
 
- 
+ 
   Ceramic Insulators
  
  
   Ceramic Insulators
  
- 
+ 
   WAAR
  
- 
-  =MID(K17;1;FINDB(" #";K17;1)-1)
+ 
+  =MID(K18;1;FINDB(" #";K18;1)-1)
  
  
  
@@ -1476,32 +1486,32 @@
  
 
 
- 
+ 
   Copper Coils
  
  
   Copper Coils
  
- 
+ 
   WAAR
  
- 
-  =MID(K18;1;FINDB(" #";K18;1)-1)
+ 
+  =MID(K19;1;FINDB(" #";K19;1)-1)
  
  
 
 
- 
+ 
   Variable Resistors
  
  
   Variable Resistors
  
- 
+ 
   WAAR
  
- 
-  =MID(K19;1;FINDB(" #";K19;1)-1)
+ 
+  =MID(K20;1;FINDB(" #";K20;1)-1)
  
  
 
@@ -1512,26 +1522,26 @@
  
   Err:511
  
- 
+ 
   WAAR
  
- 
+ 
   =FINDB("aa")
  
  
 
 
- 
+ 
   1
  
  
   1
  
- 
+ 
   WAAR
  
- 
-  {=FINDB(O16:O21;N16:N21)}
+ 
+  {=FINDB(O17:O22;N17:N22)}
  
  
 
@@ -1542,11 +1552,11 @@
  
   2
  
- 
+ 
   WAAR
  
- 
-  {=FINDB(O16:O21;N16:N21)}
+ 
+  {=FINDB(O17:O22;N17:N22)}
  
  
 
@@ -1557,11 +1567,11 @@
  
   3
  
- 
+ 
   WAAR
  
- 
-  {=FINDB(O16:O21;N16:N21)}
+ 
+  {=FINDB(O17:O22;N17:N22)}
  
  
 
@@ -1572,11 +1582,11 @@
  
   4
  
- 
+ 
   WAAR
  
- 
-  {=FINDB(O16:O21;N16:N21)}
+ 
+  {=FINDB(O17:O22;N17:N22)}
  
  
 
@@ -1587,11 +1597,11 @@
  
   5
  
- 
+ 
   WAAR
  
- 
-  {=FINDB(O16:O21;N16:N21)}
+ 
+  {=FINDB(O17:O22;N17:N22)}
  
  
 
@@ -1602,98 +1612,23 @@
  
   6
  
- 
+ 
   WAAR
  
- 
-  {=FINDB(O16:O21;N16:N21)}
+ 
+  {=FINDB(O17:O22;N17:N22)}
  
  
 
 
- 
+ 
   
   
   
  
- 
-  
-  
- 

[Libreoffice-commits] dev-tools.git: flatpak/build.sh

[Stephan Bergmann]

 flatpak/build.sh |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 952da85614cfc59b378f1d13dfee60188cb5fb27
Author: Stephan Bergmann 
Date:   Wed Sep 6 10:19:18 2017 +0200

Adpat flatpak/build.sh to core change @SOURCE@ -> @BRANCH@

2a74f9d8055cadd3da00a45486a8fcdab3e94715 "Move git source details to
solenv/flatpak-manifest.in"

diff --git a/flatpak/build.sh b/flatpak/build.sh
index f1e7a4a..fab02d7 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -56,8 +56,7 @@ else
 fi
 
 rm -f "${my_dir?}"/manifest.json
-sed \
- "s!@SOURCE@!{ \"type\": \"git\", \"url\": 
\"git://gerrit.libreoffice.org/core\", \"branch\": \"${my_gitbranch?}\", 
\"disable-fsckobjects\": true }!" \
+sed "s/@BRANCH@/${my_gitbranch?}/" \
  < "${my_dir?}"/lo/solenv/flatpak-manifest.in > "${my_dir?}"/manifest.json
 
 flatpak-builder --default-branch="${my_flatpakbranch?}" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2a74f9d8055cadd3da00a45486a8fcdab3e94715
Author: Stephan Bergmann 
Date:   Wed Sep 6 10:10:37 2017 +0200

Move git source details to solenv/flatpak-manifest.in

...from dev-tools' flatpak/build.sh, as the Flathub build plans to use that 
git
source, too

Change-Id: I5a23ad0eddd8b7d89e941217c66f5354936c10fc

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ce13394714a1..5a2813d48569 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -9,7 +9,12 @@
 {
 "name": "libreoffice",
 "sources": [
-@SOURCE@,
+{
+"type": "git",
+"url": "git://gerrit.libreoffice.org/core",
+"branch": "@BRANCH@",
+"disable-fsckobjects": true
+},
 {
 "commands": [
 "mkdir external/tarballs"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sal sal/osl sal/util svl/source

[Stephan Bergmann]

 include/sal/backtrace.hxx|   11 ---
 sal/osl/unx/backtraceapi.cxx |4 ++--
 sal/osl/w32/backtrace.cxx|4 ++--
 sal/util/sal.map |4 ++--
 svl/source/notify/lstner.cxx |7 ---
 5 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit 796c494d78a851aae7d58e0720f64984cb5716de
Author: Stephan Bergmann 
Date:   Tue Sep 5 11:04:42 2017 +0200

Clean up sal/backtrace.hxx

Change-Id: Id78e9c0ca29ff2e52591f3d446431ac23c20ab7a
Reviewed-on: https://gerrit.libreoffice.org/41926
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/sal/backtrace.hxx b/include/sal/backtrace.hxx
index f437a3b73620..f471549b7f7a 100644
--- a/include/sal/backtrace.hxx
+++ b/include/sal/backtrace.hxx
@@ -23,20 +23,25 @@
   a small handful of recorded stack traces.
 
   @param backtraceDepth value indicating the maximum backtrace depth; must be 
> 0
+
+  @since LibreOffice 6.0
 */
 #if defined LIBO_INTERNAL_ONLY
 
+namespace sal {
+
 struct BacktraceState {
 void** buffer;
 int nDepth;
 ~BacktraceState() {delete[] buffer;}
 };
 
-SAL_DLLPUBLIC std::unique_ptr SAL_CALL sal_backtrace_get(
+SAL_DLLPUBLIC std::unique_ptr backtrace_get(
 sal_uInt32 backtraceDepth);
 
-SAL_DLLPUBLIC OUString SAL_CALL sal_backtrace_to_string(
-BacktraceState* backtraceState);
+SAL_DLLPUBLIC OUString backtrace_to_string(BacktraceState* backtraceState);
+
+}
 
 #endif
 
diff --git a/sal/osl/unx/backtraceapi.cxx b/sal/osl/unx/backtraceapi.cxx
index 4838474be36c..4216bf2cd07d 100644
--- a/sal/osl/unx/backtraceapi.cxx
+++ b/sal/osl/unx/backtraceapi.cxx
@@ -59,7 +59,7 @@ OUString osl::detail::backtraceAsString(sal_uInt32 maxDepth) {
 return b3.makeStringAndClear();
 }
 
-std::unique_ptr sal_backtrace_get(sal_uInt32 maxDepth)
+std::unique_ptr sal::backtrace_get(sal_uInt32 maxDepth)
 {
 assert(maxDepth != 0);
 auto const maxInt = static_cast(
@@ -72,7 +72,7 @@ std::unique_ptr sal_backtrace_get(sal_uInt32 
maxDepth)
 return std::unique_ptr(new BacktraceState{ b1, n });
 }
 
-OUString sal_backtrace_to_string(BacktraceState* backtraceState)
+OUString sal::backtrace_to_string(BacktraceState* backtraceState)
 {
 FreeGuard b2(backtrace_symbols(backtraceState->buffer, 
backtraceState->nDepth));
 if (b2.buffer == nullptr) {
diff --git a/sal/osl/w32/backtrace.cxx b/sal/osl/w32/backtrace.cxx
index 230adca4a2f8..574e4a450f48 100644
--- a/sal/osl/w32/backtrace.cxx
+++ b/sal/osl/w32/backtrace.cxx
@@ -65,7 +65,7 @@ OUString osl::detail::backtraceAsString(sal_uInt32 maxDepth)
 return aBuf.makeStringAndClear();
 }
 
-std::unique_ptr sal_backtrace_get(sal_uInt32 maxDepth)
+std::unique_ptr sal::backtrace_get(sal_uInt32 maxDepth)
 {
 assert(maxDepth != 0);
 auto const maxUlong = std::numeric_limits::max();
@@ -87,7 +87,7 @@ std::unique_ptr sal_backtrace_get(sal_uInt32 
maxDepth)
 return std::unique_ptr(new BacktraceState{ pStack, nFrames 
});
 }
 
-OUString sal_backtrace_to_string(BacktraceState* backtraceState)
+OUString sal::backtrace_to_string(BacktraceState* backtraceState)
 {
 OUStringBuffer aBuf;
 
diff --git a/sal/util/sal.map b/sal/util/sal.map
index e9195a1434f8..4bfe548d22f0 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -735,8 +735,8 @@ PRIVATE_1.3 { # LibreOffice 5.4
 
 PRIVATE_1.4 { # LibreOffice 6.0
 global:
-_Z17sal_backtrace_getj;
-_Z23sal_backtrace_to_stringP14BacktraceState;
+_ZN3sal13backtrace_getEj;
+_ZN3sal19backtrace_to_stringEPNS_14BacktraceStateE;
 } PRIVATE_1.3;
 
 PRIVATE_textenc.1 { # LibreOffice 3.6
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index 75928021351a..9c79da9e5185 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -35,7 +35,8 @@ struct SfxListener::Impl
 {
 SfxBroadcasterArr_Impl maBCs;
 #ifdef DBG_UTIL
-std::map> maCallStacks;
+std::map>
+maCallStacks;
 #endif
 };
 
@@ -95,7 +96,7 @@ void SfxListener::StartListening( SfxBroadcaster& 
rBroadcaster, bool bPreventDup
 if (bListeningAlready && !bPreventDuplicates)
 {
 auto f = mpImpl->maCallStacks.find( &rBroadcaster );
-SAL_WARN("svl", "previous StartListening call came from: " << 
sal_backtrace_to_string(f->second.get()));
+SAL_WARN("svl", "previous StartListening call came from: " << 
sal::backtrace_to_string(f->second.get()));
 }
 #endif
 assert(!(bListeningAlready && !bPreventDuplicates) && "duplicate listener, 
try building with DBG_UTIL to find the other insert site.");
@@ -105,7 +106,7 @@ void SfxListener::StartListening( SfxBroadcaster& 
rBroadcaster, bool bPreventDup
 rBroadcaster.AddListener(*this);
 mpImpl->maBCs.push_back( &rBroadcaster );
 #ifdef DBG_UTIL
-mpImpl->maCallStacks.emplace( &rBroadcaster, sal_backtrace_get(10) );
+mpImpl->maCallStacks.emplace( &rBroadcaster, sal::backtrace_get(10) );
 #endif
 assert(IsListening(rBroadc

[Libreoffice-commits] libmspub.git: src/conv src/lib

[Miklos Vajna]

 src/conv/raw/pub2raw.cpp   |2 
 src/conv/svg/pub2xhtml.cpp |2 
 src/lib/Fill.h |   10 
 src/lib/MSPUBCollector.cpp |   12 -
 src/lib/MSPUBParser.h  |2 
 src/lib/PolygonUtils.cpp   |  486 ++---
 src/lib/libmspub_utils.cpp |6 
 src/lib/libmspub_utils.h   |4 
 8 files changed, 262 insertions(+), 262 deletions(-)

New commits:
commit c99e38590c61677ea7c325e86bd161a984d6644d
Author: Miklos Vajna 
Date:   Wed Sep 6 09:15:17 2017 +0200

Convert 0 to nullptr where it's used as a pointer value

To make the code easier to read, because this means the remaining zeros
all mean numbers.

Change-Id: Ibced46aa923b95d500c00a8a90bd4bd3f3b0e966

diff --git a/src/conv/raw/pub2raw.cpp b/src/conv/raw/pub2raw.cpp
index 6084d27..cfc07c5 100644
--- a/src/conv/raw/pub2raw.cpp
+++ b/src/conv/raw/pub2raw.cpp
@@ -55,7 +55,7 @@ int printVersion()
 int main(int argc, char *argv[])
 {
   bool printIndentLevel = false;
-  char *file = 0;
+  char *file = nullptr;
 
   if (argc < 2)
 return printUsage();
diff --git a/src/conv/svg/pub2xhtml.cpp b/src/conv/svg/pub2xhtml.cpp
index 61349f7..6179223 100644
--- a/src/conv/svg/pub2xhtml.cpp
+++ b/src/conv/svg/pub2xhtml.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
   if (argc < 2)
 return printUsage();
 
-  char *in_file = 0, *out_file = 0;
+  char *in_file = nullptr, *out_file = nullptr;
 
   for (int i = 1; i < argc; i++)
   {
diff --git a/src/lib/Fill.h b/src/lib/Fill.h
index 5955697..1d08467 100644
--- a/src/lib/Fill.h
+++ b/src/lib/Fill.h
@@ -30,7 +30,7 @@ public:
   virtual void getProperties(librevenge::RVNGPropertyList *out) const = 0;
   virtual ~Fill() { }
 private:
-  Fill(const Fill &) : m_owner(NULL) { }
+  Fill(const Fill &) : m_owner(nullptr) { }
   Fill &operator=(const Fill &);
 };
 
@@ -46,7 +46,7 @@ public:
   ImgFill(unsigned imgIndex, const MSPUBCollector *owner, bool isTexture, int 
rotation);
   void getProperties(librevenge::RVNGPropertyList *out) const override;
 private:
-  ImgFill(const ImgFill &) : Fill(NULL), m_imgIndex(0), m_isTexture(false), 
m_rotation(0) { }
+  ImgFill(const ImgFill &) : Fill(nullptr), m_imgIndex(0), m_isTexture(false), 
m_rotation(0) { }
   ImgFill &operator=(const ImgFill &);
 };
 
@@ -58,7 +58,7 @@ public:
   PatternFill(unsigned imgIndex, const MSPUBCollector *owner, ColorReference 
fg, ColorReference bg);
   void getProperties(librevenge::RVNGPropertyList *out) const override;
 private:
-  PatternFill(const PatternFill &) : ImgFill(0, NULL, true, 0), 
m_fg(0x0800), m_bg(0x0800) { }
+  PatternFill(const PatternFill &) : ImgFill(0, nullptr, true, 0), 
m_fg(0x0800), m_bg(0x0800) { }
   PatternFill &operator=(const ImgFill &);
 };
 
@@ -70,7 +70,7 @@ public:
   SolidFill(ColorReference color, double opacity, const MSPUBCollector *owner);
   void getProperties(librevenge::RVNGPropertyList *out) const override;
 private:
-  SolidFill(const SolidFill &) : Fill(NULL), m_color(0x0800), m_opacity(1) 
{ }
+  SolidFill(const SolidFill &) : Fill(nullptr), m_color(0x0800), 
m_opacity(1) { }
   SolidFill &operator=(const SolidFill &);
 };
 
@@ -98,7 +98,7 @@ public:
   void completeComplexFill();
   void getProperties(librevenge::RVNGPropertyList *out) const override;
 private:
-  GradientFill(const GradientFill &) : Fill(NULL), m_stops(), m_angle(0), 
m_type(7), m_fillLeftVal(0.0), m_fillTopVal(0.0), m_fillRightVal(0.0), 
m_fillBottomVal(0.0) { }
+  GradientFill(const GradientFill &) : Fill(nullptr), m_stops(), m_angle(0), 
m_type(7), m_fillLeftVal(0.0), m_fillTopVal(0.0), m_fillRightVal(0.0), 
m_fillBottomVal(0.0) { }
   GradientFill &operator=(const GradientFill &);
 };
 }
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 981d345..387db1c 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -377,7 +377,7 @@ 
MSPUBCollector::MSPUBCollector(librevenge::RVNGDrawingInterface *painter) :
   m_paletteColors(), m_shapeSeqNumsOrdered(),
   m_pageSeqNumsByShapeSeqNum(), m_bgShapeSeqNumsByPageSeqNum(),
   m_skipIfNotBgSeqNums(),
-  m_currentShapeGroup(NULL), m_topLevelShapes(),
+  m_currentShapeGroup(nullptr), m_topLevelShapes(),
   m_groupsBySeqNum(), m_embeddedFonts(),
   m_shapeInfosBySeqNum(), m_masterPages(),
   m_shapesWithCoordinatesRotated90(),
@@ -1158,13 +1158,13 @@ const char *MSPUBCollector::getCalculatedEncoding() 
const
   }
   // for older versions of PUB, see if we can get ICU to tell us the encoding.
   UErrorCode status = U_ZERO_ERROR;
-  UCharsetDetector *ucd = NULL;
-  const UCharsetMatch **matches = NULL;
-  const UCharsetMatch *ucm = NULL;
+  UCharsetDetector *ucd = nullptr;
+  const UCharsetMatch **matches = nullptr;
+  const UCharsetMatch *ucm = nullptr;
   ucd = ucsdet_open(&status);
   int matchesFound = -1;
-  const char *name = NULL;
-  const char *windowsName = NULL;
+  const char *name = nullptr;
+  const char *windowsName = nullptr;
   if (m_allTe

[Libreoffice-commits] core.git: sw/qa sw/source

[Justin Luth]

 sw/qa/extras/ww8export/data/tdf112074_RTLtableJustification.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx   |   16 
++
 sw/source/filter/ww8/ww8par2.cxx|   10 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit 176a723876b0138debb20f824103b2ab0c910401
Author: Justin Luth 
Date:   Mon Aug 28 21:28:34 2017 -0400

tdf#112074 doc import: use real width if no preferred width

If the document did not specify a preferred table width, then
the indent was completely wrong. I don't think the "else" clause
ever provided a correct value.
See https://bz.apache.org/ooo/attachment.cgi?id=63705&action=diff

These documents don't round-trip at all, so making changes
here ought to be fairly regression-safe since the documents are
read-only anyway.

Change-Id: I6308ffd22b6f7ce60b9780e00b68bc6f8b09a6fa
Reviewed-on: https://gerrit.libreoffice.org/41664
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ww8export/data/tdf112074_RTLtableJustification.doc 
b/sw/qa/extras/ww8export/data/tdf112074_RTLtableJustification.doc
new file mode 100644
index ..64ea6521e814
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf112074_RTLtableJustification.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index f9e69f03cf90..0074969fbb13 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -12,6 +12,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -194,6 +196,20 @@ DECLARE_WW8EXPORT_TEST(testTdf108448_endNote, 
"tdf108448_endNote.odt")
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of paragraphs in Endnote i", 1, nRet 
);
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf112074_RTLtableJustification, 
"tdf112074_RTLtableJustification.doc")
+{
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Right To Left writing mode", 
text::WritingMode2::RL_TB, getProperty(xTable, "WritingMode"));
+if ( !mbExported )
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation", 
text::HoriOrientation::LEFT_AND_WIDTH, getProperty(xTable, 
"HoriOrient"));
+CPPUNIT_ASSERT_MESSAGE("Table Indent", getProperty(xTable, 
"LeftMargin") > 3000);
+}
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf104805, "tdf104805.doc")
 {
 uno::Reference 
xPropertySet(getStyles("NumberingStyles")->getByName("WW8Num1"), 
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index e2238338b95f..abdf24a4d85b 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2583,13 +2583,9 @@ void WW8TabDesc::CreateSwTable()
 nLeft = GetMinLeft();
 else
 {
-if (m_nPreferredWidth)
-{
-nLeft = m_pIo->m_aSectionManager.GetTextAreaWidth();
-nLeft = nLeft - m_nPreferredWidth  - m_nOrgDxaLeft;
-}
-else
-nLeft = -GetMinLeft();
+const short nTableWidth = m_nPreferredWidth ? 
m_nPreferredWidth : m_nSwWidth;
+nLeft = m_pIo->m_aSectionManager.GetTextAreaWidth();
+nLeft = nLeft - nTableWidth - m_nOrgDxaLeft;
 }
 
 aL.SetLeft(nLeft);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/xmlsecurity xmlsecurity/inc xmlsecurity/qa xmlsecurity/source xmlsecurity/workben

[Miklos Vajna]

 xmlsecurity/inc/documentsignaturehelper.hxx  |2 +-
 xmlsecurity/inc/documentsignaturemanager.hxx |2 +-
 xmlsecurity/inc/pdfio/pdfdocument.hxx|8 
 xmlsecurity/inc/pdfsignaturehelper.hxx   |2 +-
 xmlsecurity/inc/xmlsecuritydllapi.h  |6 +++---
 xmlsecurity/inc/xmlsignaturehelper.hxx   |2 +-
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx|2 +-
 xmlsecurity/source/helper/pdfsignaturehelper.cxx |2 +-
 xmlsecurity/source/pdfio/pdfdocument.cxx |2 +-
 xmlsecurity/workben/pdfverify.cxx|2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c210019f36ec4a640fe1967b562454a21c371d63
Author: Miklos Vajna 
Date:   Tue Sep 5 22:57:54 2017 +0200

xmlsecurity: no need to have pdfio/pdfdocument.hxx as a global header

Which means xmlsecurity can be again a module that has no public
headers.

Change-Id: I3d0b03680398f80196fac187263e770fd44ed0ed
Reviewed-on: https://gerrit.libreoffice.org/41966
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx 
b/xmlsecurity/inc/documentsignaturehelper.hxx
index 3997ae47260d..1c5d1b97a972 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 #include 
-#include "xmlsecurity/xmlsecuritydllapi.h"
+#include "xmlsecuritydllapi.h"
 
 #include 
 
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx 
b/xmlsecurity/inc/documentsignaturemanager.hxx
index 146943812eb0..71fd72bfeec5 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX
 #define INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREMANAGER_HXX
 
-#include "xmlsecurity/xmlsecuritydllapi.h"
+#include "xmlsecuritydllapi.h"
 
 #include 
 
diff --git a/include/xmlsecurity/pdfio/pdfdocument.hxx 
b/xmlsecurity/inc/pdfio/pdfdocument.hxx
similarity index 82%
rename from include/xmlsecurity/pdfio/pdfdocument.hxx
rename to xmlsecurity/inc/pdfio/pdfdocument.hxx
index 6f3b0f263add..622bc1ffb678 100644
--- a/include/xmlsecurity/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -8,14 +8,14 @@
  *
  */
 
-#ifndef INCLUDED_XMLSECURITY_PDFIO_PDFDOCUMENT_HXX
-#define INCLUDED_XMLSECURITY_PDFIO_PDFDOCUMENT_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
+#define INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
 
 #include 
 
 #include 
 
-#include 
+#include 
 
 struct SignatureInformation;
 
@@ -34,6 +34,6 @@ XMLSECURITY_DLLPUBLIC bool ValidateSignature(SvStream& 
rStream, vcl::filter::PDF
 } // namespace pdfio
 } // namespace xmlsecurity
 
-#endif // INCLUDED_XMLSECURITY_PDFIO_PDFDOCUMENT_HXX
+#endif // INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx 
b/xmlsecurity/inc/pdfsignaturehelper.hxx
index 7da417c46e4f..50fb5dd71c05 100644
--- a/xmlsecurity/inc/pdfsignaturehelper.hxx
+++ b/xmlsecurity/inc/pdfsignaturehelper.hxx
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_XMLSECURITY_INC_PDFSIGNATUREHELPER_HXX
 #define INCLUDED_XMLSECURITY_INC_PDFSIGNATUREHELPER_HXX
 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/include/xmlsecurity/xmlsecuritydllapi.h 
b/xmlsecurity/inc/xmlsecuritydllapi.h
similarity index 78%
rename from include/xmlsecurity/xmlsecuritydllapi.h
rename to xmlsecurity/inc/xmlsecuritydllapi.h
index 48da5464b727..f0540c799b48 100644
--- a/include/xmlsecurity/xmlsecuritydllapi.h
+++ b/xmlsecurity/inc/xmlsecuritydllapi.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_XMLSECURITY_XMLSECURITYDLLAPI_H
-#define INCLUDED_XMLSECURITY_XMLSECURITYDLLAPI_H
+#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H
+#define INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H
 
 #include 
 
@@ -18,6 +18,6 @@
 #define XMLSECURITY_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
-#endif // INCLUDED_XMLSECURITY_XMLSECURITYDLLAPI_H
+#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITYDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx 
b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 93385202e171..60d6d164db61 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 37faa04aada7..39746ac2a233 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -17,7 +17,7 @@
 #include 
 
 #include 
-#include 
+#include 
 
 using namespace com::sun::star;
 
diff --git a/xmlsecurity/source/helper/pdfs

[Libreoffice-commits] core.git: writerperfect/qa writerperfect/source

[Miklos Vajna]

 writerperfect/qa/unit/EPUBExportTest.cxx  |   14 
+++
 writerperfect/qa/unit/data/writer/epubexport/char-namedstyle.fodt |   16 

 writerperfect/source/writer/exp/txtparai.cxx  |   20 
+++---
 3 files changed, 45 insertions(+), 5 deletions(-)

New commits:
commit 4f7034b64cd6ae6cd7bc2ef99d29709ab6117a31
Author: Miklos Vajna 
Date:   Tue Sep 5 20:16:49 2017 +0200

EPUB export: handle text properties from text styles

This is the last combination of style -> direct inheritance that was not
handled previously.

Change-Id: Ie92b38b89a13b81f09cd7300b0d1b939cda3d8ff
Reviewed-on: https://gerrit.libreoffice.org/41952
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index 8ab03f6df48e..1b57655180b0 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -55,6 +55,7 @@ public:
 void testParaAutostyleCharProps();
 void testMeta();
 void testParaNamedstyle();
+void testCharNamedstyle();
 
 CPPUNIT_TEST_SUITE(EPUBExportTest);
 CPPUNIT_TEST(testOutlineLevel);
@@ -65,6 +66,7 @@ public:
 CPPUNIT_TEST(testParaAutostyleCharProps);
 CPPUNIT_TEST(testMeta);
 CPPUNIT_TEST(testParaNamedstyle);
+CPPUNIT_TEST(testCharNamedstyle);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -232,6 +234,18 @@ void EPUBExportTest::testParaNamedstyle()
 assertXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:span", "class", "span1");
 }
 
+void EPUBExportTest::testCharNamedstyle()
+{
+createDoc("char-namedstyle.fodt", {});
+
+mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+
+// Test character properties from named text style.
+assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[1]", "class", "span0");
+// This failed, character properties from text style were not exported.
+assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]", "class", "span1");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest);
 
 }
diff --git a/writerperfect/qa/unit/data/writer/epubexport/char-namedstyle.fodt 
b/writerperfect/qa/unit/data/writer/epubexport/char-namedstyle.fodt
new file mode 100644
index ..5a1b3823dd18
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/epubexport/char-namedstyle.fodt
@@ -0,0 +1,16 @@
+
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  Foobar
+
+  
+
diff --git a/writerperfect/source/writer/exp/txtparai.cxx 
b/writerperfect/source/writer/exp/txtparai.cxx
index 932ae744f4e9..31ab25f43cad 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -55,13 +55,23 @@ void XMLSpanContext::startElement(const OUString 
&/*rName*/, const css::uno::Ref
 {
 // Reference to an automatic text style, try to look it up.
 auto itStyle = 
mrImport.GetAutomaticTextStyles().find(rAttributeValue);
-if (itStyle == mrImport.GetAutomaticTextStyles().end())
+if (itStyle != mrImport.GetAutomaticTextStyles().end())
+{
+// Apply properties directly, librevenge has no notion of 
automatic styles.
+librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
+for (itProp.rewind(); itProp.next();)
+aPropertyList.insert(itProp.key(), itProp()->clone());
 continue;
+}
 
-// Apply properties directly, librevenge has no notion of 
automatic styles.
-librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
-for (itProp.rewind(); itProp.next();)
-aPropertyList.insert(itProp.key(), itProp()->clone());
+itStyle = mrImport.GetTextStyles().find(rAttributeValue);
+if (itStyle != mrImport.GetTextStyles().end())
+{
+// Apply properties from text style.
+librevenge::RVNGPropertyList::Iter itProp(itStyle->second);
+for (itProp.rewind(); itProp.next();)
+aPropertyList.insert(itProp.key(), itProp()->clone());
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits