[Libreoffice-commits] help.git: source/text

[Libreoffice Gerrit user]

 source/text/sbasic/shared/03020103.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4982dd0ac879598b87059f229abf0fa75511c7b6
Author: Andrea Gelmini 
AuthorDate: Thu Sep 20 00:16:54 2018 +0200
Commit: Julien Nabet 
CommitDate: Thu Sep 20 08:44:17 2018 +0200

Fix typo

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

diff --git a/source/text/sbasic/shared/03020103.xhp 
b/source/text/sbasic/shared/03020103.xhp
index 959a18aae..57cbd50ce 100644
--- a/source/text/sbasic/shared/03020103.xhp
+++ b/source/text/sbasic/shared/03020103.xhp
@@ -44,7 +44,7 @@
 
 
 Parameters:
- 
FileName: Name and path of the file that you wan to open. If you 
try to read a file that does not exist (Access = Read), an error message 
appears. If you try to write to a file that does not exist (Access = Write), a 
new file is created.
+ 
FileName: Name and path of the file that you want to open. If you 
try to read a file that does not exist (Access = Read), an error message 
appears. If you try to write to a file that does not exist (Access = Write), a 
new file is created.
  
Mode: Keyword that specifies the file mode. Valid values: Append 
(append to sequential file), Binary (data can be accessed by bytes using Get 
and Put), Input (opens data channel for reading), Output (opens data channel 
for writing), and Random (edits relative files).
  
IOMode: Keyword that defines the access type. Valid values: Read 
(read-only), Write (write-only), Read Write (both).
  
Protected: Keyword that defines the security status of a file 
after opening. Valid values: Shared (file may be opened by other applications), 
Lock Read (file is protected against reading), Lock Write (file is protected 
against writing), Lock Read Write (denies file access).
@@ -79,4 +79,4 @@
 
 
 
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit a1400603e3178ec937b9f5e79727d8cc83b1cdad
Author: Andrea Gelmini 
AuthorDate: Thu Sep 20 00:16:54 2018 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Sep 20 08:44:17 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix typo

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

diff --git a/helpcontent2 b/helpcontent2
index b51008a35b85..4982dd0ac879 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b51008a35b852dab0ba0d50903b174824891b420
+Subproject commit 4982dd0ac879598b87059f229abf0fa75511c7b6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source connectivity/source desktop/test forms/source include/sfx2 include/svtools include/svx include/vbahelper include/vcl include/xmloff sc/qa sc/source sd/sou

[Libreoffice Gerrit user]

 chart2/source/inc/WeakListenerAdapter.hxx|2 
 connectivity/source/drivers/mysqlc/mysqlc_connection.hxx |   50 -
 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx   |  305 
+-
 connectivity/source/drivers/mysqlc/mysqlc_driver.hxx |   21 
 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx |  179 ++---
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx  |   81 +-
 connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx  |  179 ++---
 connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx  |   42 -
 connectivity/source/drivers/mysqlc/mysqlc_statement.hxx  |   63 +-
 desktop/test/deployment/active/active_native.cxx |   22 
 desktop/test/deployment/passive/passive_native.cxx   |   22 
 forms/source/xforms/datatypes.hxx|6 
 include/sfx2/controlwrapper.hxx  |   24 
 include/sfx2/itemwrapper.hxx |4 
 include/svtools/iconview.hxx |4 
 include/svx/fmdmod.hxx   |4 
 include/vbahelper/vbareturntypes.hxx |6 
 include/vcl/notebookbar.hxx  |6 
 include/xmloff/fasttokenhandler.hxx  |6 
 sc/qa/unit/tiledrendering/tiledrendering.cxx |4 
 sc/source/ui/vba/vbacondition.hxx|6 
 sc/source/ui/vba/vbapagebreak.hxx|8 
 sc/source/ui/vba/vbatitle.hxx|   24 
 sd/source/ui/animations/CategoryListBox.hxx  |4 
 starmath/qa/cppunit/test_node.cxx|4 
 starmath/qa/cppunit/test_parse.cxx   |4 
 svtools/source/inc/iconviewimpl.hxx  |   34 -
 sw/inc/frmfmt.hxx|2 
 sw/source/filter/ww8/docxattributeoutput.hxx |2 
 sw/source/filter/ww8/ww8attributeoutput.hxx  |2 
 sw/source/uibase/inc/workctrl.hxx|2 
 sw/source/uibase/ribbar/workctrl.cxx |2 
 ucb/source/ucp/webdav-neon/NeonSession.hxx   |2 
 xmloff/source/forms/elementimport.hxx|8 
 34 files changed, 563 insertions(+), 571 deletions(-)

New commits:
commit cc2fe8c763b7050f07968f31bcdb7e45b8c7464d
Author: Stephan Bergmann 
AuthorDate: Thu Sep 20 07:27:20 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 20 08:37:20 2018 +0200

Replace SAL_OVERRIDE with override in internal code

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

diff --git a/chart2/source/inc/WeakListenerAdapter.hxx 
b/chart2/source/inc/WeakListenerAdapter.hxx
index faa3b5d3aff9..08568f25316a 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -55,7 +55,7 @@ public:
 protected:
 //  XEventListener (base of all listeners) 
 virtual void SAL_CALL disposing(
-const css::lang::EventObject& Source ) SAL_OVERRIDE
+const css::lang::EventObject& Source ) override
 {
 css::uno::Reference< css::lang::XEventListener > xEventListener(
   css::uno::Reference< Listener >( m_xListener), 
css::uno::UNO_QUERY );
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
index f2bca68fff15..6c8632c29492 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx
@@ -113,58 +113,58 @@ public:
 rtl_TextEncoding getConnectionEncoding() const { return 
m_settings.encoding; }
 
 // OComponentHelper
-virtual void SAL_CALL disposing() SAL_OVERRIDE;
+virtual void SAL_CALL disposing() override;
 
 // XServiceInfo
-virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE;
+virtual rtl::OUString SAL_CALL getImplementationName() override;
 
-virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& 
ServiceName) SAL_OVERRIDE;
+virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& 
ServiceName) override;
 
-virtual css::uno::Sequence SAL_CALL 
getSupportedServiceNames() SAL_OVERRIDE;
+virtual css::uno::Sequence SAL_CALL 
getSupportedServiceNames() override;
 
 // XConnection
-css::uno::Reference SAL_CALL createStatement() 
SAL_OVERRIDE;
+css::uno::Reference SAL_CALL createStatement() 
override;
 
 css::uno::Reference
-SAL_CALL prepareStatement(const rtl::OUString& sql) S

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

[Libreoffice Gerrit user]

 sw/source/filter/xml/xmlexp.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 475ea37809b5bec369d02a5ab500fac46ab40f0a
Author: Julien Nabet 
AuthorDate: Wed Sep 12 21:37:43 2018 +0200
Commit: Julien Nabet 
CommitDate: Thu Sep 20 08:32:03 2018 +0200

tdf#108402: avoid crash if filter doesn't match

See bt https://bugs.documentfoundation.org/attachment.cgi?id=134006
+ display warning

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

diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index c983e8f93ac8..99bba3d0d05b 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -124,6 +124,8 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
 }
 
 SwDoc *pDoc = getDoc();
+if (!pDoc)
+return ERR_SWG_WRITE_ERROR;
 
 // Make sure the layout is available to have more stability in the output
 // markup.
@@ -514,6 +516,12 @@ SwDoc* SwXMLExport::getDoc()
 if( m_pDoc != nullptr )
 return m_pDoc;
 Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
+if (!xTextDoc)
+{
+SAL_WARN("sw.filter", "Problem of mismatching filter for export.");
+return nullptr;
+}
+
 Reference < XText > xText = xTextDoc->getText();
 Reference xTextTunnel( xText, UNO_QUERY);
 assert( xTextTunnel.is());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/quartz/salbmp.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 6d0d6a875867c823603f5947f7a035601042f903
Author: Noel Grandin 
AuthorDate: Sat Sep 15 21:18:22 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 20 08:19:13 2018 +0200

loplugin:useuniqueptr in QuartzSalBitmap::CreateColorMask

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

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index e8df35c712bf..b46a7f174168 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -937,8 +937,8 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int 
nY, int nWidth,
 if (m_pUserBuffer.get() && (nX + nWidth <= mnWidth) && (nY + nHeight <= 
mnHeight))
 {
 const sal_uInt32 nDestBytesPerRow = nWidth << 2;
-sal_uInt32* pMaskBuffer = static_cast( std::malloc( 
nHeight * nDestBytesPerRow ) );
-sal_uInt32* pDest = pMaskBuffer;
+std::unique_ptr pMaskBuffer(new (std::nothrow) 
sal_uInt32[ nHeight * nDestBytesPerRow / 4] );
+sal_uInt32* pDest = pMaskBuffer.get();
 
 ImplPixelFormat* pSourcePixels = ImplPixelFormat::GetFormat( mnBits, 
maPalette );
 
@@ -967,15 +967,11 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int 
nY, int nWidth,
 pSource += mnBytesPerRow;
 }
 
-CGDataProviderRef xDataProvider( 
CGDataProviderCreateWithData(nullptr, pMaskBuffer, nHeight * nDestBytesPerRow, 
&CFRTLFree) );
+CGDataProviderRef xDataProvider( 
CGDataProviderCreateWithData(nullptr, pMaskBuffer.release(), nHeight * 
nDestBytesPerRow, &CFRTLFree) );
 xMask = CGImageCreate(nWidth, nHeight, 8, 32, nDestBytesPerRow, 
GetSalData()->mxRGBSpace, kCGImageAlphaPremultipliedFirst, xDataProvider, 
nullptr, true, kCGRenderingIntentDefault);
 SAL_INFO("vcl.cg", "CGImageCreate(" << nWidth << "x" << nHeight << 
"x8) = " << xMask );
 CFRelease(xDataProvider);
 }
-else
-{
-free(pMaskBuffer);
-}
 
 delete pSourcePixels;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/inc/edglbldc.hxx |5 +
 sw/source/core/edit/edglbldc.cxx|   27 +++
 sw/source/uibase/utlui/glbltree.cxx |   21 +
 3 files changed, 21 insertions(+), 32 deletions(-)

New commits:
commit 97c934d96be62f906c48561673866399f6469446
Author: Noel Grandin 
AuthorDate: Tue Sep 18 14:32:11 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 20 08:15:22 2018 +0200

convert SwGlblDocContents to sorted_vector>

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

diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx
index 2dabd5165643..ee246d006c73 100644
--- a/sw/inc/edglbldc.hxx
+++ b/sw/inc/edglbldc.hxx
@@ -60,10 +60,7 @@ public:
 {   return GetDocPos() < rCmp.GetDocPos(); }
 };
 
-class SwGlblDocContents : public o3tl::sorted_vector > {
-public:
-~SwGlblDocContents() { DeleteAndDestroyAll(); }
-};
+class SwGlblDocContents : public 
o3tl::sorted_vector, 
o3tl::less_uniqueptr_to > {};
 
 #endif
 
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index e2f4dd71f7bf..fc7d8b241b89 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -53,7 +53,7 @@ bool SwEditShell::IsGlblDocSaveLinks() const
 
 void SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
 {
-rArr.DeleteAndDestroyAll();
+rArr.clear();
 
 if( !getIDocumentSettingAccess().get(DocumentSettingId::GLOBAL_DOCUMENT) )
 return;
@@ -67,22 +67,21 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents& 
rArr ) const
 const SwSection* pSect = rSectFormats[ --n ]->GetGlobalDocSection();
 if( pSect )
 {
-SwGlblDocContent* pNew = nullptr;
+std::unique_ptr pNew;
 switch( pSect->GetType() )
 {
 case TOX_HEADER_SECTION:
 break;  // ignore
 case TOX_CONTENT_SECTION:
 OSL_ENSURE( dynamic_cast( pSect) !=  
nullptr, "no TOXBaseSection!" );
-pNew = new SwGlblDocContent( static_cast(pSect) );
+pNew.reset(new SwGlblDocContent( static_cast(pSect) ));
 break;
 
 default:
-pNew = new SwGlblDocContent( pSect );
+pNew.reset(new SwGlblDocContent( pSect ));
 break;
 }
-if( pNew && !rArr.insert( pNew ).second )
-delete pNew;
+rArr.insert( std::move(pNew) );
 }
 }
 
@@ -98,10 +97,8 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents& 
rArr ) const
 if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsContentNode()
 || pNd->IsSectionNode() || pNd->IsTableNode() )
 {
-SwGlblDocContent* pNew = new SwGlblDocContent( nSttIdx );
-if( !rArr.insert( pNew ).second )
-delete pNew;
-else
+std::unique_ptr pNew(new SwGlblDocContent( 
nSttIdx ));
+if( rArr.insert( std::move(pNew) ).second )
 ++n; // to the next position
 break;
 }
@@ -119,17 +116,15 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents& 
rArr ) const
 if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsContentNode()
 || pNd->IsSectionNode() || pNd->IsTableNode() )
 {
-SwGlblDocContent* pNew = new SwGlblDocContent( nSttIdx );
-if( !rArr.insert( pNew ).second )
-delete pNew;
+rArr.insert( o3tl::make_unique( nSttIdx ) );
 break;
 }
 }
 else
 {
-SwGlblDocContent* pNew = new SwGlblDocContent(
-pMyDoc->GetNodes().GetEndOfExtras().GetIndex() + 2 );
-rArr.insert( pNew );
+std::unique_ptr pNew(new SwGlblDocContent(
+pMyDoc->GetNodes().GetEndOfExtras().GetIndex() + 2 ));
+rArr.insert( std::move(pNew) );
 }
 }
 
diff --git a/sw/source/uibase/utlui/glbltree.cxx 
b/sw/source/uibase/utlui/glbltree.cxx
index 13cc616041fe..737fd2f1b1e2 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -270,7 +270,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& 
rEvt )
 {
 nEntryCount++;
 nAbsContPos++;
-pCnt = (*pTempContents)[ nAbsContPos ];
+pCnt = (*pTempContents)[ nAbsContPos ].get();
 }
 }
 }
@@ -659,7 +659,7 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData)
 SvTreeListEntry* pEntry = First();
 for (size_t i = 0; i < nCount && pEntry; i++)
 {
-SwGlblDocContent* pCont = (*m_pSwGlblDocC

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf64264.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |   17 +++
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 -
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit ace6bbf3da9ae27aca87865b6be887a3aed341fc
Author: László Németh 
AuthorDate: Wed Sep 19 13:36:57 2018 +0200
Commit: László Németh 
CommitDate: Thu Sep 20 07:54:22 2018 +0200

tdf#64264 DOCX import: fix row count of repeating table header

by ignoring isolated tblHeader settings, according to the standard.
(OOXML 17.4.49 tblHeader (Repeat Table Row on Every New Page)
"...if this row [with tblHeader property] is not contiguously connected
with the first row of the table (that is, if this table row is not
either the first row, or all rows between this row and the first row
are not marked as header rows) then this property shall be ignored.")

Note: with this fix, in a mixed environment, LibreOffice is able to
fix the known problems of MS Word 2013/2016 by removing the isolated
tblHeaders during DOCX import/export (such problems in MSO: missing
repeating headers in a few pages or in the whole table, despite the
correct settings; and non-modifiable repeat header row property in
the table settings).

Change-Id: I73e8394a75b77c937a4bac37d99ff747ad95a06e
Reviewed-on: https://gerrit.libreoffice.org/60765
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf64264.docx 
b/sw/qa/extras/ooxmlexport/data/tdf64264.docx
new file mode 100644
index ..e2fea64dada7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf64264.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 1849d05cb008..7aa03eb79cc2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -743,6 +743,23 @@ DECLARE_OOXMLEXPORT_TEST(testTdf118691, "tdf118691.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("Before\nAfter"), xCell->getString());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf64264, "tdf64264.docx")
+{
+// DOCX table rows with tblHeader setting mustn't modify the count of the
+// repeated table header rows, when there is rows before them without 
tblHeader settings.
+xmlDocPtr pDump = parseLayoutDump();
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+
+// table starts on page 1 and finished on page 2
+// and it has got only a single repeating header line
+assertXPath(pDump, "/root/page[2]/body/tab", 1);
+assertXPath(pDump, "/root/page[2]/body/tab/row", 47);
+CPPUNIT_ASSERT_EQUAL(OUString("Repeating Table Header"),
+ 
parseDump("/root/page[2]/body/tab/row[1]/cell[1]/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Text"),
+ 
parseDump("/root/page[2]/body/tab/row[2]/cell[1]/txt/text()"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 37f07f21a556..ed7dfebe97c4 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -200,7 +200,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
 case NS_ooxml::LN_CT_TrPrBase_tblHeader:
 // if nIntValue == 1 then the row is a repeated header line
 // to prevent later rows from increasing the repeating 
m_nHeaderRepeat is set to NULL when repeating stops
-if( nIntValue > 0 && m_nHeaderRepeat >= 0 )
+if( nIntValue > 0 && m_nHeaderRepeat == 
static_cast(m_nRow) )
 {
 ++m_nHeaderRepeat;
 TablePropertyMapPtr pPropMap( new TablePropertyMap );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - xmlsecurity/inc xmlsecurity/source

[Libreoffice Gerrit user]

 xmlsecurity/inc/documentsignaturehelper.hxx   |3 ++-
 xmlsecurity/source/helper/documentsignaturehelper.cxx |   10 +-
 xmlsecurity/source/helper/ooxmlsecexporter.cxx|6 +++---
 xmlsecurity/source/helper/xsecctl.cxx |2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 59cdc0023f2429be6fe25f4570e07fd81a8f5d00
Author: Samuel Mehrbrodt 
AuthorDate: Tue Sep 18 09:59:08 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Sep 20 01:54:01 2018 +0200

tdf#118567 Signature Line: Fix ooxml signing

Change-Id: Ie2467db7ab209f10e92b6db1f5680e7a9be614ab
Reviewed-on: https://gerrit.libreoffice.org/60676
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
(cherry picked from commit c3de0478fbcbe1dc22ab5dea42b423bb8e45fcba)
Reviewed-on: https://gerrit.libreoffice.org/60735
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx 
b/xmlsecurity/inc/documentsignaturehelper.hxx
index 1c5d1b97a972..bacef66746cd 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -102,7 +102,8 @@ namespace DocumentSignatureHelper
 void writeSignedProperties(
 const css::uno::Reference& 
xDocumentHandler,
 const SignatureInformation& signatureInfo,
-const OUString& sDate);
+const OUString& sDate,
+const bool bWriteSignatureLineData);
 };
 
 #endif // INCLUDED_XMLSECURITY_INC_DOCUMENTSIGNATUREHELPER_HXX
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx 
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 8bb06b84e92a..37342b536349 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -548,7 +548,7 @@ void DocumentSignatureHelper::writeDigestMethod(
 void DocumentSignatureHelper::writeSignedProperties(
 const uno::Reference& xDocumentHandler,
 const SignatureInformation& signatureInfo,
-const OUString& sDate)
+const OUString& sDate, const bool bWriteSignatureLineData)
 {
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
@@ -587,8 +587,8 @@ void DocumentSignatureHelper::writeSignedProperties(
 xDocumentHandler->endElement("xd:SignaturePolicyImplied");
 xDocumentHandler->endElement("xd:SignaturePolicyIdentifier");
 
-if (!signatureInfo.ouSignatureLineId.isEmpty() && 
signatureInfo.aValidSignatureImage.is()
-&& signatureInfo.aInvalidSignatureImage.is())
+if (bWriteSignatureLineData && !signatureInfo.ouSignatureLineId.isEmpty()
+&& signatureInfo.aValidSignatureImage.is() && 
signatureInfo.aInvalidSignatureImage.is())
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
 pAttributeList->AddAttribute(
@@ -607,7 +607,7 @@ void DocumentSignatureHelper::writeSignedProperties(
 }
 
 {
-// Write SignatureLineId element
+// Write SignatureLineValidImage element
 xDocumentHandler->startElement(
 "loext:SignatureLineValidImage",
 Reference(new SvXMLAttributeList()));
@@ -622,7 +622,7 @@ void DocumentSignatureHelper::writeSignedProperties(
 }
 
 {
-// Write SignatureLineId element
+// Write SignatureLineInvalidImage element
 xDocumentHandler->startElement(
 "loext:SignatureLineInvalidImage",
 Reference(new SvXMLAttributeList()));
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx 
b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 6f9b2eb946dc..08cf2788f554 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -353,9 +353,9 @@ void OOXMLSecExporter::Impl::writeSignatureInfo()
 pAttributeList->AddAttribute("xmlns", 
"http://schemas.microsoft.com/office/2006/digsig";);
 m_xDocumentHandler->startElement("SignatureInfoV1", 
uno::Reference(pAttributeList.get()));
 
-m_xDocumentHandler->startElement("SetupId", 
uno::Reference(new SvXMLAttributeList()));
+m_xDocumentHandler->startElement("SetupID", 
uno::Reference(new SvXMLAttributeList()));
 m_xDocumentHandler->characters(m_rInformation.ouSignatureLineId);
-m_xDocumentHandler->endElement("SetupId");
+m_xDocumentHandler->endElement("SetupID");
 m_xDocumentHandler->startElement("SignatureText", 
uno::Reference(new SvXMLAttributeList()));
 m_xDocumentHandler->endElement("SignatureText");
 m_xDocumentHandler->startElement("SignatureImage", 
uno::Reference(new SvXMLAttributeList()));
@@ -410,7 +410,7 @@ void OOXMLSecExporter::Impl::writePackageSignature()
 m_xDocumentHandler->startElement("xd:QualifyingProperties", 
uno::Reference(pAttributeList.get()));
 }
 
-DocumentSignatureHelper::writeSignedProperties(m_xDocumentHandler, 
m_rInformation, m_aS

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - comphelper/source

[Libreoffice Gerrit user]

 comphelper/source/xml/xmltools.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ceefe7c66f19e16e8e4414419e38f75c55ec6fd
Author: Samuel Mehrbrodt 
AuthorDate: Wed Sep 19 08:16:42 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Sep 20 01:52:39 2018 +0200

generateGUIDString: Fix incorrect string length

This bug caused signature line IDs in OOXML to be written
with an appended "_x_".

Change-Id: If219279a5d5177ec5fac2d9dd747dc015c16b6bc
Reviewed-on: https://gerrit.libreoffice.org/60736
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 8c7e64cd3854a912ef33b5a717a9f36856925c7c)
Reviewed-on: https://gerrit.libreoffice.org/60766
Reviewed-by: Thorsten Behrens 

diff --git a/comphelper/source/xml/xmltools.cxx 
b/comphelper/source/xml/xmltools.cxx
index e9df23c73e1e..24919ae35044 100644
--- a/comphelper/source/xml/xmltools.cxx
+++ b/comphelper/source/xml/xmltools.cxx
@@ -102,7 +102,7 @@ namespace comphelper
 aSeq[0], aSeq[1], aSeq[2], aSeq[3], aSeq[4], aSeq[5], 
aSeq[6], aSeq[7], aSeq[8],
 aSeq[9], aSeq[10], aSeq[11], aSeq[12], aSeq[13], aSeq[14], 
aSeq[15]);
 
-return OString(str, SAL_N_ELEMENTS(str));
+return OString(str);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/PythonTest_sw_python.mk |1 
 sw/qa/python/testdocuments/xscriptprovider.odt |binary
 sw/qa/python/xscriptprovider.py|   74 +
 3 files changed, 75 insertions(+)

New commits:
commit 62cd86977ca41677c56fb2d1f97bb1c5cbdbd416
Author: Vasily Melenchuk 
AuthorDate: Mon Sep 17 21:57:26 2018 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Sep 19 23:50:01 2018 +0200

sw: new unit test for XScriptProvider

Change-Id: I2954bff51d6a507fef4d8a22ff5964735f1cee60
Reviewed-on: https://gerrit.libreoffice.org/60640
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/PythonTest_sw_python.mk b/sw/PythonTest_sw_python.mk
index c47c5cbcbbd3..b9d8d509ced3 100644
--- a/sw/PythonTest_sw_python.mk
+++ b/sw/PythonTest_sw_python.mk
@@ -28,6 +28,7 @@ $(eval $(call 
gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\
set_expression \
text_portion_enumeration_test \
var_fields \
+   xscriptprovider \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/python/testdocuments/xscriptprovider.odt 
b/sw/qa/python/testdocuments/xscriptprovider.odt
new file mode 100644
index ..fa3b8ec75229
Binary files /dev/null and b/sw/qa/python/testdocuments/xscriptprovider.odt 
differ
diff --git a/sw/qa/python/xscriptprovider.py b/sw/qa/python/xscriptprovider.py
new file mode 100644
index ..b79b379ad16d
--- /dev/null
+++ b/sw/qa/python/xscriptprovider.py
@@ -0,0 +1,74 @@
+#! /usr/bin/env python
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+import unittest
+import unohelper
+from org.libreoffice.unotest import UnoInProcess
+from com.sun.star.script.provider import ScriptFrameworkErrorException
+import uno
+
+
+class TestXScriptProvider(unittest.TestCase):
+
+@classmethod
+def setUpClass(cls):
+cls._uno = UnoInProcess()
+cls._uno.setUp()
+
+@classmethod
+def tearDownClass(cls):
+cls._uno.tearDown()
+
+def test_getScriptApplication(self):
+# getScript for built-in StarBasic function
+xMasterScriptProviderFactory = self.createMasterScriptProviderFactory()
+xScriptProvider = xMasterScriptProviderFactory.createScriptProvider("")
+xScript = xScriptProvider.getScript(
+"vnd.sun.star.script:Tools.Misc.CreateNewDocument?language=Basic&"
+"location=application")
+self.assertIsNotNone(xScript, "xScript was not loaded")
+
+def test_getScriptDocument(self):
+# getScript for StarBasic function in loaded document
+xDoc = self.__class__._uno.openTemplateFromTDOC("xscriptprovider.odt")
+xMasterScriptProviderFactory = self.createMasterScriptProviderFactory()
+xScriptProvider = 
xMasterScriptProviderFactory.createScriptProvider(xDoc)
+xScript = xScriptProvider.getScript(
+"vnd.sun.star.script:Standard.Module1.Main?language=Basic&"
+"location=document")
+self.assertIsNotNone(xScript, "xScript was not loaded")
+xDoc.close(True)
+
+def test_getScriptInvalidURI(self):
+# getScript fails with invalid URI
+xMasterScriptProviderFactory = self.createMasterScriptProviderFactory()
+xScriptProvider = xMasterScriptProviderFactory.createScriptProvider("")
+with self.assertRaises(ScriptFrameworkErrorException):
+xScript = xScriptProvider.getScript("invalid URI, isn't it?")
+
+def test_getScriptNotFound(self):
+# getScript fails when script not found
+xMasterScriptProviderFactory = self.createMasterScriptProviderFactory()
+xScriptProvider = xMasterScriptProviderFactory.createScriptProvider("")
+with self.assertRaises(ScriptFrameworkErrorException):
+xScript = xScriptProvider.getScript(
+"vnd.sun.star.script:NotExisting.NotExisting.NotExisting?"
+"language=Basic&location=document")
+
+def createMasterScriptProviderFactory(self):
+xServiceManager = uno.getComponentContext().ServiceManager
+return xServiceManager.createInstanceWithContext(
+"com.sun.star.script.provider.MasterScriptProviderFactory",
+uno.getComponentContext())
+
+
+if __name__ == '__main__':
+unittest.main()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] orcus 0.14.1 lands on master

[Kohei Yoshida]

Hi there,

So, as I hinted in my previous email, I've updated the orcus library[1]
to 0.14.1 on the master branch as of several hours ago.

The changes are mostly to address coverity issues, and to address minor
improvement on numerical precision during unit conversion, which caused
unit test failure on Debian i386 platform.

Also, this does not affect LibreOffice directly, but ixion also has a
new patch release of 0.14.1.  This may be of interest for those of you
who package orcus for distros.

Thanks,

Kohei

[1] https://gitlab.com/orcus/orcus

-- 
Kohei Yoshida, LibreOffice Calc volunteer hacker
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sw/source/uibase/uiview/viewling.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit af8c304b8f984066d80d64f9a821ee9433e97781
Author: Caolán McNamara 
AuthorDate: Wed Sep 19 12:52:18 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 22:25:40 2018 +0200

null parent is a bad idea

Change-Id: Ifcd9039c2de396a4cadf3ba557df3cff3cc6001c
Reviewed-on: https://gerrit.libreoffice.org/60772
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/uibase/uiview/viewling.cxx 
b/sw/source/uibase/uiview/viewling.cxx
index 6824ea96bca9..1cb076a471d3 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -405,8 +405,8 @@ void SwView::HyphenateDocument()
 // do not hyphenate if interactive hyphenation is active elsewhere
 if (SwEditShell::HasHyphIter())
 {
-std::unique_ptr 
xBox(Application::CreateMessageDialog(nullptr, VclMessageType::Warning,
-VclButtonsType::Ok, SwResId(STR_MULT_INTERACT_HYPH_WARN)));
+std::unique_ptr 
xBox(Application::CreateMessageDialog(GetEditWin().GetFrameWeld(),
+VclMessageType::Warning, VclButtonsType::Ok, 
SwResId(STR_MULT_INTERACT_HYPH_WARN)));
 xBox->set_title(SwResId(STR_HYPH_TITLE));
 xBox->run();
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 starmath/inc/dialog.hxx |   11 ---
 starmath/inc/pch/precompiled_sm.hxx |2 --
 starmath/inc/utility.hxx|4 
 starmath/source/dialog.cxx  |2 --
 starmath/source/utility.cxx |4 
 5 files changed, 23 deletions(-)

New commits:
commit 8d40a23aafc4c0972e052fbb58862228839cc7ef
Author: Caolán McNamara 
AuthorDate: Wed Sep 19 08:54:42 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 22:20:21 2018 +0200

drop some unnecessary headers

Change-Id: Ic26c41e1d6be76e28081cc0110cd2335c03d2e27
Reviewed-on: https://gerrit.libreoffice.org/60755
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index bd1c0d4bdd40..7c3f70c2d8e1 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -19,20 +19,9 @@
 #ifndef INCLUDED_STARMATH_INC_DIALOG_HXX
 #define INCLUDED_STARMATH_INC_DIALOG_HXX
 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/starmath/inc/pch/precompiled_sm.hxx 
b/starmath/inc/pch/precompiled_sm.hxx
index 38380c516ef8..2ce98e092949 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -58,7 +58,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -96,7 +95,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index e6346d4dc6e4..bcd5736a27a5 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -23,14 +23,10 @@
 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
 
-
 inline long SmPtsTo100th_mm(long nNumPts)
 // returns the length (in 100th of mm) that corresponds to the length
 // 'nNumPts' (in units points).
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 748ad51575f0..127bcaac30d5 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -26,10 +26,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 1018bad60c04..c82b5ec6b7aa 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -17,15 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
-
 #include 
-
 #include 
 #include 
 #include 
 
-
 // return pointer to active SmViewShell, if this is not possible
 // return 0 instead.
 //!! Since this method is based on the current focus it is somewhat
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source solenv/sanitizers starmath/inc starmath/source starmath/uiconfig

[Libreoffice Gerrit user]

 extras/source/glade/libreoffice-catalog.xml.in |3 
 solenv/sanitizers/ui/modules/smath.suppr   |1 
 starmath/inc/dialog.hxx|   31 ++
 starmath/source/dialog.cxx |  112 -
 starmath/uiconfig/smath/ui/fontdialog.ui   |   93 +++-
 5 files changed, 138 insertions(+), 102 deletions(-)

New commits:
commit 98e45269e4d9f276a27c065dbd00614436856b20
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 21:41:31 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 22:01:19 2018 +0200

weld SmFontDialog

Change-Id: Id253631e7dfd44570a4261b7a7a5db1fac9d68ba
Reviewed-on: https://gerrit.libreoffice.org/60728
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 92eb0fdefdeb..8c4ce8b7d652 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -206,9 +206,6 @@
 
-
 
diff --git a/solenv/sanitizers/ui/modules/smath.suppr 
b/solenv/sanitizers/ui/modules/smath.suppr
index 075009ab02db..e9bebb698cb7 100644
--- a/solenv/sanitizers/ui/modules/smath.suppr
+++ b/solenv/sanitizers/ui/modules/smath.suppr
@@ -3,6 +3,7 @@ 
starmath/uiconfig/smath/ui/catalogdialog.ui://GtkComboBoxText[@id='symbolset'] n
 starmath/uiconfig/smath/ui/catalogdialog.ui://GtkLabel[@id='symbolname'] 
orphan-label
 
starmath/uiconfig/smath/ui/catalogdialog.ui://GtkDrawingArea[@id='symbolsetdisplay']
 no-labelled-by
 starmath/uiconfig/smath/ui/catalogdialog.ui://GtkDrawingArea[@id='preview'] 
no-labelled-by
+starmath/uiconfig/smath/ui/fontdialog.ui://GtkEntry[@id='font'] no-labelled-by
 
starmath/uiconfig/smath/ui/printeroptions.ui://GtkSpinButton[@id='scalingspin'] 
no-labelled-by
 starmath/uiconfig/smath/ui/smathsettings.ui://GtkSpinButton[@id='zoom'] 
no-labelled-by
 starmath/uiconfig/smath/ui/spacingdialog.ui://GtkLabel[@id='1label1'] 
orphan-label
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 68b56efdb4d9..bd1c0d4bdd40 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -77,41 +77,36 @@ public:
 
 /**/
 
-class SmShowFont : public vcl::Window
+class SmShowFont : public weld::CustomWidgetController
 {
 virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&) override;
 
 vcl::Font maFont;
 
 public:
-SmShowFont(vcl::Window *pParent, WinBits nStyle)
-: Window(pParent, nStyle)
+SmShowFont()
 {
 }
-virtual Size GetOptimalSize() const override;
+virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
 void SetFont(const vcl::Font& rFont);
 };
 
-class SmFontDialog : public ModalDialog
+class SmFontDialog : public weld::GenericDialogController
 {
-VclPtr   m_pFontBox;
-VclPtr   m_pAttrFrame;
-VclPtr   m_pBoldCheckBox;
-VclPtr   m_pItalicCheckBox;
-VclPtr m_pShowFont;
-
 vcl::Font maFont;
+SmShowFont m_aShowFont;
+std::unique_ptr m_xFontBox;
+std::unique_ptr m_xAttrFrame;
+std::unique_ptr m_xBoldCheckBox;
+std::unique_ptr m_xItalicCheckBox;
+std::unique_ptr m_xShowFont;
 
-DECL_LINK(FontSelectHdl, ComboBox&, void);
-DECL_LINK(FontModifyHdl, Edit&, void);
-DECL_LINK(AttrChangeHdl, Button *, void);
-
-virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
+DECL_LINK(FontSelectHdl, weld::ComboBox&, void);
+DECL_LINK(AttrChangeHdl, weld::ToggleButton&, void);
 
 public:
-SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool 
bHideCheckboxes);
+SmFontDialog(weld::Window* pParent, OutputDevice *pFntListDevice, bool 
bHideCheckboxes);
 virtual ~SmFontDialog() override;
-virtual void dispose() override;
 
 const vcl::Font& GetFont() const
 {
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 7c46a234edb6..748ad51575f0 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -226,10 +226,8 @@ VclPtr 
SmPrintOptionsTabPage::Create(TabPageParent pParent, const Sf
 return VclPtr::Create(pParent, rSet).get();
 }
 
-void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect)
+void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& /*rRect*/)
 {
-Window::Paint(rRenderContext, rRect);
-
 Color aBackColor;
 Color aTextColor;
 lclGetSettingColors(aBackColor, aTextColor);
@@ -249,11 +247,11 @@ void SmShowFont::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rectangl
   (rRenderContext.GetOutputSize().Height() - 
aTextSize.Height()) / 2), sText);
 }
 
-VCL_BUILDER_FACTORY_CONSTRUCTOR(SmShowFont, 0)
-
-Size SmShowFont::GetOptimalSize() const
+voi

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

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/templatedialog1.ui  |1 +
 sw/uiconfig/swriter/ui/templatedialog16.ui |1 +
 sw/uiconfig/swriter/ui/templatedialog2.ui  |1 +
 sw/uiconfig/swriter/ui/templatedialog4.ui  |1 +
 sw/uiconfig/swriter/ui/templatedialog8.ui  |1 +
 5 files changed, 5 insertions(+)

New commits:
commit c1ad998afeef0238f1b823fec8aea4eed7187fcf
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 17:19:07 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 22:00:48 2018 +0200

set modal flags

Change-Id: I9dca572b413f9cbd19f3f095d049be294be94e4c
Reviewed-on: https://gerrit.libreoffice.org/60719
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui 
b/sw/uiconfig/swriter/ui/templatedialog1.ui
index b00290b5bac6..fa348adf1ac2 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -7,6 +7,7 @@
 6
 Character Style
 False
+True
 dialog
 
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui 
b/sw/uiconfig/swriter/ui/templatedialog16.ui
index 815970c71fe1..e0f6aaeb47c4 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -7,6 +7,7 @@
 6
 Numbering Style
 False
+True
 dialog
 
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui 
b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 7b4527418ede..6959e31c2e65 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -7,6 +7,7 @@
 6
 Paragraph Style
 False
+True
 dialog
 
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui 
b/sw/uiconfig/swriter/ui/templatedialog4.ui
index 3f26a7034d6c..860eaef7104e 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -7,6 +7,7 @@
 6
 Frame Style
 False
+True
 dialog
 
   
diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui 
b/sw/uiconfig/swriter/ui/templatedialog8.ui
index 0e8a16c7f99d..e9fde34480db 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -7,6 +7,7 @@
 6
 Page Style
 False
+True
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/vcl vcl/source vcl/unx

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigaldlg.cxx  |   65 
 cui/source/inc/cuigaldlg.hxx  |   22 +++--
 cui/uiconfig/ui/gallerygeneralpage.ui |   37 ++--
 include/vcl/weld.hxx  |7 +++
 vcl/source/app/salvtables.cxx |   25 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   77 +++---
 6 files changed, 119 insertions(+), 114 deletions(-)

New commits:
commit af60b15af12bbb0cda2b48b99fde632f1532e1aa
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 17:13:33 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 22:00:27 2018 +0200

weld TPGalleryThemeGeneral

Change-Id: Id5ec1b1282c039f30c40fc781be0f6d72a8bfb47
Reviewed-on: https://gerrit.libreoffice.org/60718
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 18e39c8ae267..a04340bbc80e 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -574,7 +574,6 @@ GalleryThemeProperties::GalleryThemeProperties(vcl::Window* 
pParent,
 SetText( aText );
 }
 
-
 void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
 if (nId == m_nGeneralPageId)
@@ -583,39 +582,18 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, 
SfxTabPage &rPage )
 static_cast( rPage ).SetXChgData( pData );
 }
 
-
-TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const 
SfxItemSet& rSet)
-: SfxTabPage(pParent, "GalleryGeneralPage",
-"cui/ui/gallerygeneralpage.ui", &rSet)
+TPGalleryThemeGeneral::TPGalleryThemeGeneral(TabPageParent pParent, const 
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/gallerygeneralpage.ui", 
"GalleryGeneralPage", &rSet)
 , pData(nullptr)
+, m_xFiMSImage(m_xBuilder->weld_image("image"))
+, m_xEdtMSName(m_xBuilder->weld_entry("name"))
+, m_xFtMSShowType(m_xBuilder->weld_label("type"))
+, m_xFtMSShowPath(m_xBuilder->weld_label("location"))
+, m_xFtMSShowContent(m_xBuilder->weld_label("contents"))
+, m_xFtMSShowChangeDate(m_xBuilder->weld_label("modified"))
 {
-get(m_pFiMSImage, "image");
-get(m_pEdtMSName, "name");
-get(m_pFtMSShowType, "type");
-get(m_pFtMSShowPath, "location");
-get(m_pFtMSShowContent, "contents");
-get(m_pFtMSShowChangeDate, "modified");
-}
-
-
-TPGalleryThemeGeneral::~TPGalleryThemeGeneral()
-{
-disposeOnce();
-}
-
-
-void TPGalleryThemeGeneral::dispose()
-{
-m_pFiMSImage.clear();
-m_pEdtMSName.clear();
-m_pFtMSShowType.clear();
-m_pFtMSShowPath.clear();
-m_pFtMSShowContent.clear();
-m_pFtMSShowChangeDate.clear();
-SfxTabPage::dispose();
 }
 
-
 void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
 {
 pData = _pData;
@@ -627,19 +605,15 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* 
_pData )
 OUStringaType( SvxResId( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
 boolbReadOnly = pThm->IsReadOnly();
 
-m_pEdtMSName->SetText( pThm->GetName() );
-m_pEdtMSName->SetReadOnly( bReadOnly );
-
-if( bReadOnly )
-m_pEdtMSName->Disable();
-else
-m_pEdtMSName->Enable();
+m_xEdtMSName->set_text(pThm->GetName());
+m_xEdtMSName->set_editable(!bReadOnly);
+m_xEdtMSName->set_sensitive(!bReadOnly);
 
 if( pThm->IsReadOnly() )
 aType += CuiResId( RID_SVXSTR_GALLERY_READONLY );
 
-m_pFtMSShowType->SetText( aType );
-m_pFtMSShowPath->SetText( pThm->GetSdgURL().GetMainURL( 
INetURLObject::DecodeMechanism::Unambiguous ) );
+m_xFtMSShowType->set_label(aType);
+
m_xFtMSShowPath->set_label(pThm->GetSdgURL().GetMainURL(INetURLObject::DecodeMechanism::Unambiguous));
 
 // singular or plural?
 if ( 1 == pThm->GetObjectCount() )
@@ -649,7 +623,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* 
_pData )
 
 aOutStr += " " + aObjStr;
 
-m_pFtMSShowContent->SetText( aOutStr );
+m_xFtMSShowContent->set_label(aOutStr);
 
 // get locale wrapper (singleton)
 const SvtSysLocale aSysLocale;
@@ -657,7 +631,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* 
_pData )
 
 // ChangeDate/Time
 aAccess = aLocaleData.getDate( pData->aThemeChangeDate ) + ", " + 
aLocaleData.getTime( pData->aThemeChangeTime );
-m_pFtMSShowChangeDate->SetText( aAccess );
+m_xFtMSShowChangeDate->set_label(aAccess);
 
 // set image
 OUString sId;
@@ -669,21 +643,20 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* 
_pData )
 else
 sId = RID_SVXBMP_THEME_NORMAL_BIG;
 
-m_pFiMSImage->SetImage(Image(BitmapEx(sId)));
+m_xFiMSImage->set_from_icon_name(sId);
 }
 
 bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
 {
-pData->aEditedTitle = m_pEdtMSName->GetText();
+pData->aEditedTitle = m_xEdtMSName->get_text();
 return true;
 }
 
-VclPtr TPGa

[Libreoffice-commits] core.git: cui/source cui/uiconfig extras/source

[Libreoffice Gerrit user]

 cui/source/inc/grfpage.hxx |   91 ++--
 cui/source/tabpages/grfpage.cxx|  523 ++---
 cui/uiconfig/ui/croppage.ui|  134 --
 extras/source/glade/libreoffice-catalog.xml.in |4 
 4 files changed, 360 insertions(+), 392 deletions(-)

New commits:
commit dbf355e5dbffe97b64a98005d1b84edddc472e4f
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 16:23:59 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 22:00:03 2018 +0200

weld SvxGrfCropPage

Change-Id: I7e239e5487a1ae642d009f313dd4aae20ee0de81
Reviewed-on: https://gerrit.libreoffice.org/60717
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 887a93789eb6..e1b15e2c1520 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -20,31 +20,30 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_GRFPAGE_HXX
 #define INCLUDED_CUI_SOURCE_INC_GRFPAGE_HXX
 
-#include 
-#include 
-#include 
+#include 
 #include 
 #include 
 
-class SvxCropExample : public vcl::Window
+class SvxCropExample : public weld::CustomWidgetController
 {
-SizeaFrameSize;
-Point   aTopLeft, aBottomRight;
-Graphic aGrf;
+MapMode m_aMapMode;
+Sizem_aFrameSize;
+Point   m_aTopLeft, m_aBottomRight;
+Graphic m_aGrf;
 
 public:
-SvxCropExample( vcl::Window* pPar, WinBits nStyle );
+SvxCropExample();
 
 virtual void Paint(vcl::RenderContext& rRenderContext, const 
::tools::Rectangle& rRect) override;
 virtual void Resize() override;
-virtual Size GetOptimalSize() const override;
+virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
 
-void SetTop( long nVal ){ aTopLeft.setX(nVal); }
-void SetBottom( long nVal ) { aBottomRight.setX(nVal); }
-void SetLeft( long nVal )   { aTopLeft.setY(nVal); }
-void SetRight( long nVal)   { aBottomRight.setY(nVal); }
+void SetTop( long nVal ){ m_aTopLeft.setX(nVal); }
+void SetBottom( long nVal ) { m_aBottomRight.setX(nVal); }
+void SetLeft( long nVal )   { m_aTopLeft.setY(nVal); }
+void SetRight( long nVal)   { m_aBottomRight.setY(nVal); }
 void SetFrameSize( const Size& rSz );
-void SetGraphic( const Graphic& rGrf )  { aGrf = rGrf; }
+void SetGraphic( const Graphic& rGrf )  { m_aGrf = rGrf; }
 };
 
 class SvxGrfCropPage : public SfxTabPage
@@ -54,53 +53,48 @@ class SvxGrfCropPage : public SfxTabPage
 using TabPage::ActivatePage;
 using TabPage::DeactivatePage;
 
-VclPtr   m_pCropFrame;
-VclPtrm_pZoomConstRB;
-VclPtrm_pSizeConstRB;
-VclPtrm_pLeftMF;
-VclPtrm_pRightMF;
-VclPtrm_pTopMF;
-VclPtrm_pBottomMF;
-
-VclPtr   m_pScaleFrame;
-VclPtrm_pWidthZoomMF;
-VclPtrm_pHeightZoomMF;
-
-VclPtr   m_pSizeFrame;
-VclPtrm_pWidthMF;
-VclPtrm_pHeightMF;
-
-VclPtr   m_pOrigSizeGrid;
-VclPtr  m_pOrigSizeFT;
-VclPtr m_pOrigSizePB;
-
-// Example
-VclPtr m_pExampleWN;
-
-
-Timer   aTimer;
 OUStringaGraphicName;
 SizeaOrigSize;
 SizeaOrigPixelSize;
 SizeaPageSize;
-VclPtr  pLastCropField;
 longnOldWidth;
 longnOldHeight;
 boolbReset;
 boolbSetOrigSize;
 
+SvxCropExample m_aExampleWN;
 
-SvxGrfCropPage( vcl::Window *pParent, const SfxItemSet &rSet );
+std::unique_ptr m_xCropFrame;
+std::unique_ptr m_xZoomConstRB;
+std::unique_ptr m_xSizeConstRB;
+std::unique_ptr m_xLeftMF;
+std::unique_ptr m_xRightMF;
+std::unique_ptr m_xTopMF;
+std::unique_ptr m_xBottomMF;
+
+std::unique_ptr m_xScaleFrame;
+std::unique_ptr m_xWidthZoomMF;
+std::unique_ptr m_xHeightZoomMF;
+
+std::unique_ptr m_xSizeFrame;
+std::unique_ptr m_xWidthMF;
+std::unique_ptr m_xHeightMF;
+
+std::unique_ptr m_xOrigSizeGrid;
+std::unique_ptr m_xOrigSizeFT;
+std::unique_ptr m_xOrigSizePB;
+
+// Example
+std::unique_ptr m_xExampleWN;
+
+SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet);
 virtual ~SvxGrfCropPage() override;
 virtual void dispose() override;
 
-DECL_LINK( ZoomHdl, Edit&, void );
-DECL_LINK( SizeHdl, Edit&, void );
-DECL_LINK( CropHdl, SpinField&, void );
-DECL_LINK( CropLoseFocusHdl, Control&, void );
-DECL_LINK( CropModifyHdl, Edit&, void );
-DECL_LINK( OrigSizeHdl, Button*, void );
-DECL_LINK( Timeout, Timer *, void );
+DECL_LINK(ZoomHdl, weld::MetricSpinButton&, void);
+DECL_LINK(SizeHdl, weld::MetricSpinButton&, void);
+DECL_LINK(CropModifyHdl, weld::MetricSpinButton&, void);
+DECL_LINK(OrigSizeHdl, weld::Button&, void);
 
 voidCalcZoom();

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

[Libreoffice Gerrit user]

 include/sal/types.h   |   14 ++
 sd/source/ui/inc/unokywds.hxx |  238 +-
 2 files changed, 135 insertions(+), 117 deletions(-)

New commits:
commit ed510993d7db9a8ca9a3822d107af063aab5b637
Author: Stephan Bergmann 
AuthorDate: Wed Sep 19 11:06:13 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 19 21:01:48 2018 +0200

Make compilers combine sUNO_* vars across TUs

...by changing them from internal linkage to being inline (where available).
The net effect is that compilers (that HAVE_CPP_INLINE_VARIABLES) are 
required
to combine all uses of a given sUNO_* var across a Library, where before 
that
was only possible if the compiler could prove that placing multiple such 
vars
across TUs at the same address didn't change the program's behavior.

(And

> $ diff <(nm --def instdir/program/libsdlo.so | grep sUNO_ | cut -d ' ' -f 
3 | LC_ALL=C sort) <(nm --def instdir/program/libsdlo.so | grep sUNO_ | cut -d 
' ' -f 3 | LC_ALL=C sort | uniq)
> 2d1
> < _ZL16sUNO_View_ViewId
> 8d6
> < _ZL18sUNO_View_PageKind
> 23d20
> < _ZL22sUNO_View_LockedLayers
> 30d26
> < _ZL23sUNO_View_VisibleLayers
> 39d34
> < _ZL25sUNO_View_PrintableLayers

showed that there were duplicates, while

> $ nm --def instdir/program/libsdlo.so | grep sUNO_ | cut -d ' ' -f 3 | 
LC_ALL=C sort | uniq | wc -l
> 71

shows that only 71 of the 117 sUNO_* vars are actually used at all---there's
still room for clean up.)

Introduces LIBO_INTERNAL_ONLY SAL_INLINE_VARIABLE.

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

diff --git a/include/sal/types.h b/include/sal/types.h
index 474a223a2ff2..08751c33cd53 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -697,6 +697,20 @@ template< typename T1, typename T2 > inline T1 
static_int_cast(T2 n) {
 #endif
 /// @endcond
 
+/// @cond INTERNAL
+/** Inline variables, where supported.
+
+@since LibreOffice 6.2
+*/
+#if defined LIBO_INTERNAL_ONLY
+#if HAVE_CPP_INLINE_VARIABLES
+#define SAL_INLINE_VARIABLE inline
+#else
+#define SAL_INLINE_VARIABLE
+#endif
+#endif
+/// @endcond
+
 #endif // INCLUDED_SAL_TYPES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 9becfc0bd328..1e190e4f592d 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -20,137 +20,141 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_UNOKYWDS_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_UNOKYWDS_HXX
 
+#include 
+
+#include 
+
 // SdUnoPseudoStyleFamily
-const char sUNO_PseudoSheet_Title[] = "title";
-const char sUNO_PseudoSheet_SubTitle[] = "subtitle";
-const char sUNO_PseudoSheet_Background[] = "background";
-const char sUNO_PseudoSheet_Background_Objects[] = "backgroundobjects";
-const char sUNO_PseudoSheet_Notes[] = "notes";
-const char sUNO_PseudoSheet_Outline1[] = "outline1";
-const char sUNO_PseudoSheet_Outline2[] = "outline2";
-const char sUNO_PseudoSheet_Outline3[] = "outline3";
-const char sUNO_PseudoSheet_Outline4[] = "outline4";
-const char sUNO_PseudoSheet_Outline5[] = "outline5";
-const char sUNO_PseudoSheet_Outline6[] = "outline6";
-const char sUNO_PseudoSheet_Outline7[] = "outline7";
-const char sUNO_PseudoSheet_Outline8[] = "outline8";
-const char sUNO_PseudoSheet_Outline9[] = "outline9";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Title[] = "title";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_SubTitle[] = "subtitle";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Background[] = "background";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Background_Objects[] = 
"backgroundobjects";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Notes[] = "notes";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline1[] = "outline1";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline2[] = "outline2";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline3[] = "outline3";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline4[] = "outline4";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline5[] = "outline5";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline6[] = "outline6";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline7[] = "outline7";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline8[] = "outline8";
+SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline9[] = "outline9";
 
 // SdLayer
-const char sUNO_LayerName_background[] = "background";
-const char sUNO_LayerName_background_objects[] = "backgroundobjects";
-const char sUNO_LayerName_layout[] = "layout";
-const char sUNO_LayerName_controls[] = "controls";
-const char sUNO_LayerName_measurelines[] = "measurelines";
+SAL_INLINE_VARIABLE const char sUNO_LayerName_background[] = "background";
+SAL_INLINE_VARIABLE const

Minutes from the UX/design meeting 2018-Sep-12

[Heiko Tietze]

Present: Heiko

 * "Format" button in outline/chapter numbering dialog not self-explanatory
   + https://bugs.documentfoundation.org/show_bug.cgi?id=108890
   + rename to Style, Template, Preset, User-defined, Load/Save
   + Load/Save (+1 Cor)
   => let's go with Load/Save (without ellipsis)

 * Direct formatting control text Highlighting mode  not toggling off
   + https://bugs.documentfoundation.org/show_bug.cgi?id=119753 
   + WFM (Heiko, c5)
   + need more pondering (Cor)
   + help page should explain the bucket mode (Maxim)
   + WFM (Cor)
   => forward to documentation

 * Provisions/strategies for Enriching the Default Dictionaries
   + https://bugs.documentfoundation.org/show_bug.cgi?id=119898 
   + isn't download/creation of more dictionaries sufficient 
   + use custom dictionaries (László)
   => WFM

 * Autoselect font size to change it quicker
   + https://bugs.documentfoundation.org/show_bug.cgi?id=119847 
   + WFM or select all on enter?
   => select on enter; improve patch for tdf#108012 

 * Easy access to Send Outline to Clipboard
   + https://bugs.documentfoundation.org/show_bug.cgi?id=119877 
   + File > Send is known; and on the same place since ages (Cor)
   => WFM

 * CTRL+ALT+E isn't opening the extension dialog but inserts a "é"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=119676 
   + dup of https://bugs.documentfoundation.org/show_bug.cgi?id=118269
   + meta https://bugs.documentfoundation.org/show_bug.cgi?id=107244
   + see also 
https://lists.freedesktop.org/archives/libreoffice/2018-September/080955.html 
(and prior)
   + bug?
   => regression, see c5





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

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

[Libreoffice Gerrit user]

 sw/source/core/frmedt/feshview.cxx   |   17 ---
 sw/source/uibase/shells/drwbassh.cxx |   82 ---
 2 files changed, 50 insertions(+), 49 deletions(-)

New commits:
commit 1a72dbb390e9cf6e61b6503f3c575ba531d547d8
Author: Maxim Monastirsky 
AuthorDate: Mon Sep 17 21:06:05 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Wed Sep 19 20:24:46 2018 +0200

tdf#90850 Enable align commands for a single shape in Writer

Similar to images and frames. Just exposes the existing
position settings from the "Position and Size" dialog.

Change-Id: Ifa7e91f695af74d5297412e5ffeb12286ec63767
Reviewed-on: https://gerrit.libreoffice.org/60649
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 3b272f4ef007..d3e4e8c499e2 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2704,22 +2704,7 @@ void SwFEShell::SetObjAttr( const SfxItemSet& rSet )
 
 bool SwFEShell::IsAlignPossible() const
 {
-const size_t nCnt = IsObjSelected();
-if ( 0 < nCnt )
-{
-bool bRet = true;
-if ( nCnt == 1 )
-{
-SdrObject *pO = 
Imp()->GetDrawView()->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
-SwDrawContact *pC = static_cast(GetUserCall(pO));
-OSL_ENSURE( pC, "No SwDrawContact!");
-//only as character bound drawings can be aligned
-bRet = pC && pC->GetFormat()->GetAnchor().GetAnchorId() == 
RndStdIds::FLY_AS_CHAR;
-}
-if ( bRet )
-return Imp()->GetDrawView()->IsAlignPossible();
-}
-return false;
+return Imp()->GetDrawView()->IsAlignPossible();
 }
 
 // temporary fix till  SS of JOE is available
diff --git a/sw/source/uibase/shells/drwbassh.cxx 
b/sw/source/uibase/shells/drwbassh.cxx
index 10a2320a6f68..0ab94affdb5a 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -419,41 +419,57 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
 if ( bAlignPossible )
 {
 const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-if( rMarkList.GetMarkCount() == 1 && bAlignPossible )
-{   // Do not align objects to each other
-RndStdIds nAnchor = pSh->GetAnchorId();
-if (nAnchor == RndStdIds::FLY_AS_CHAR)
+if ( rMarkList.GetMarkCount() == 1 )
+{
+sal_Int16 nHorizOrient = -1, nVertOrient = -1;
+
+switch (nSlotId)
 {
-sal_Int16 nVertOrient = -1;
+case SID_OBJECT_ALIGN_LEFT:
+nHorizOrient = text::HoriOrientation::LEFT;
+break;
+case SID_OBJECT_ALIGN_CENTER:
+nHorizOrient = text::HoriOrientation::CENTER;
+break;
+case SID_OBJECT_ALIGN_RIGHT:
+nHorizOrient = text::HoriOrientation::RIGHT;
+break;
+case SID_OBJECT_ALIGN_UP:
+nVertOrient = text::VertOrientation::TOP;
+break;
+case SID_OBJECT_ALIGN_MIDDLE:
+nVertOrient = text::VertOrientation::CENTER;
+break;
+case SID_OBJECT_ALIGN_DOWN:
+nVertOrient = text::VertOrientation::BOTTOM;
+break;
+default:
+break;
+}
 
-switch (nSlotId)
-{
-case SID_OBJECT_ALIGN_UP:
-nVertOrient = text::VertOrientation::TOP;
-break;
-case SID_OBJECT_ALIGN_MIDDLE:
-nVertOrient = text::VertOrientation::CENTER;
-break;
-case SID_OBJECT_ALIGN_DOWN:
-nVertOrient = text::VertOrientation::BOTTOM;
-break;
-default:
-break;
-}
-if (nVertOrient != -1)
-{
-pSh->StartAction();
-SdrObject* pObj = 
rMarkList.GetMark(0)->GetMarkedSdrObj();
-SwFrameFormat* pFrameFormat = FindFrameFormat( 
pObj );
-SwFormatVertOrient 
aVOrient(pFrameFormat->GetFormatAttr(RES_VERT_ORIENT));
-aVOrient.SetVertOrient( nVertOrient );

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

[Libreoffice Gerrit user]

 sd/source/ui/view/drviews7.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1c2e55dc616d1f3c25b1b2c41402e28419f4b554
Author: Maxim Monastirsky 
AuthorDate: Tue Sep 18 01:11:29 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Wed Sep 19 20:05:20 2018 +0200

tdf#119819 Disable Rename Layer command when not possible

Change-Id: I5bb330295c1052679ed19ebeb0d6e5591640867d
Reviewed-on: https://gerrit.libreoffice.org/60650
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 2ed053c37beb..22bc8d5955a8 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -857,7 +857,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
 }
 
 // is it allowed to delete the current layer?
-if( SfxItemState::DEFAULT == rSet.GetItemState( SID_DELETE_LAYER ) )
+if( SfxItemState::DEFAULT == rSet.GetItemState( SID_DELETE_LAYER )
+|| SfxItemState::DEFAULT == rSet.GetItemState( SID_RENAMELAYER ) )
 {
 if(GetLayerTabControl()) // #i87182#
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/liborcus

[Libreoffice Gerrit user]

 download.lst|4 +-
 external/liborcus/0001-Missing-header-for-std-tolower.patch |   24 
 external/liborcus/UnpackedTarball_liborcus.mk   |1 
 3 files changed, 2 insertions(+), 27 deletions(-)

New commits:
commit 7dcb1592eb278437ff8ae4fef1f3dec10f70
Author: Kohei Yoshida 
AuthorDate: Tue Sep 18 17:50:39 2018 -0400
Commit: Kohei Yoshida 
CommitDate: Wed Sep 19 19:07:12 2018 +0200

Update orcus to 0.14.1.

Change-Id: I345d2655c1999ab319b92c6e8719c0eb9572000b
Reviewed-on: https://gerrit.libreoffice.org/60731
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/download.lst b/download.lst
index 4129c6298cf5..01f56e61aec6 100644
--- a/download.lst
+++ b/download.lst
@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
 export OPENSSL_SHA256SUM := 
50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
 export OPENSSL_TARBALL := openssl-1.0.2p.tar.gz
-export ORCUS_SHA256SUM := 
7bcfac3f4f490540292cfc87d3fde7b47eafa8450afa1e1a2c181d8293dcd4ef
-export ORCUS_TARBALL := liborcus-0.14.0.tar.gz
+export ORCUS_SHA256SUM := 
3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f
+export ORCUS_TARBALL := liborcus-0.14.1.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git a/external/liborcus/0001-Missing-header-for-std-tolower.patch 
b/external/liborcus/0001-Missing-header-for-std-tolower.patch
deleted file mode 100644
index 2e00be92a872..
--- a/external/liborcus/0001-Missing-header-for-std-tolower.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3a6bb93a382b4d5f1463ee3fdd54cab7048ff996 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida 
-Date: Fri, 31 Aug 2018 16:07:06 -0400
-Subject: [PATCH] Missing header for std::tolower.
-

- src/parser/sax_token_parser.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/parser/sax_token_parser.cpp b/src/parser/sax_token_parser.cpp
-index 9790b498..44ba5844 100644
 a/src/parser/sax_token_parser.cpp
-+++ b/src/parser/sax_token_parser.cpp
-@@ -9,6 +9,7 @@
- #include "orcus/tokens.hpp"
- 
- #include 
-+#include 
- 
- namespace orcus {
- 
--- 
-2.17.1
-
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index f637cc73db46..215bd4b8cc15 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
-   external/liborcus/0001-Missing-header-for-std-tolower.patch \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - Mobile/Mobile net/FakeSocket.cpp net/Socket.hpp

[Libreoffice Gerrit user]

 Mobile/Mobile/DocumentViewController.mm |6 +++---
 net/FakeSocket.cpp  |   31 ++-
 net/Socket.hpp  |4 ++--
 3 files changed, 31 insertions(+), 10 deletions(-)

New commits:
commit f4ce5df7e1277ce9ffe4a58e6a2fcbf83141ff07
Author: Tor Lillqvist 
AuthorDate: Wed Sep 19 20:01:13 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 19 20:03:24 2018 +0300

Implement the timeout parameter to fakeSocketPoll()

Adapt callers that mistakenly passed 0 assuming it meant "forever".

This also seems to help with the occasional hangs.

diff --git a/Mobile/Mobile/DocumentViewController.mm 
b/Mobile/Mobile/DocumentViewController.mm
index c3da9f6d6..5f203fdef 100644
--- a/Mobile/Mobile/DocumentViewController.mm
+++ b/Mobile/Mobile/DocumentViewController.mm
@@ -164,7 +164,7 @@
struct pollfd p;
p.fd = self.document->fakeClientFd;
p.events = POLLIN;
-   if (fakeSocketPoll(&p, 1, 0) == 1) {
+   if (fakeSocketPoll(&p, 1, -1) == 1) {
int n = 
fakeSocketAvailableDataLength(self.document->fakeClientFd);
if (n == 0)
return;
@@ -183,7 +183,7 @@
 std::string url([[[self.document fileURL] absoluteString] 
UTF8String]);
 p.fd = self.document->fakeClientFd;
 p.events = POLLOUT;
-fakeSocketPoll(&p, 1, 0);
+fakeSocketPoll(&p, 1, -1);
 fakeSocketWrite(self.document->fakeClientFd, url.c_str(), 
url.size());
 
 return;
@@ -192,7 +192,7 @@
 const char *buf = [message.body UTF8String];
 p.fd = self.document->fakeClientFd;
 p.events = POLLOUT;
-fakeSocketPoll(&p, 1, 0);
+fakeSocketPoll(&p, 1, -1);
 fakeSocketWrite(self.document->fakeClientFd, buf, strlen(buf));
 } else {
 NSLog(@"Unrecognized kind of message received from WebView: %@: %@", 
message.name, message.body);
diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index a80c6ba84..75c85fd71 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -245,15 +245,34 @@ int fakeSocketPoll(struct pollfd *pollfds, int nfds, int 
timeout)
 loggingBuffer << ",";
 loggingBuffer << "#" << pollfds[i].fd << ":" << 
pollBits(pollfds[i].events);
 }
-loggingBuffer << flush();
+loggingBuffer << ", timeout:" << timeout << flush();
 
 std::vector& fds = getFds();
 std::unique_lock fdsLock(fdsMutex);
 std::unique_lock cvLock(cvMutex);
 fdsLock.unlock();
 
-while (!checkForPoll(fds, pollfds, nfds))
-cv.wait(cvLock);
+if (timeout > 0)
+{
+auto const now = std::chrono::steady_clock::now();
+auto const end = now + std::chrono::milliseconds(timeout);
+
+while (!checkForPoll(fds, pollfds, nfds))
+if (cv.wait_until(cvLock, end) == std::cv_status::timeout)
+{
+loggingBuffer << "FakeSocket Poll timeout: 0" << flush();
+return 0;
+}
+}
+else if (timeout == 0)
+{
+checkForPoll(fds, pollfds, nfds);
+}
+else // timeout < 0
+{
+while (!checkForPoll(fds, pollfds, nfds))
+cv.wait(cvLock);
+}
 
 int result = 0;
 for (int i = 0; i < nfds; i++)
diff --git a/net/Socket.hpp b/net/Socket.hpp
index 7bb442b41..671f345ba 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -582,7 +582,7 @@ public:
 struct pollfd p;
 p.fd = fd;
 p.events = POLLOUT;
-fakeSocketPoll(&p, 1, 0);
+fakeSocketPoll(&p, 1, -1);
 #endif
 rc = fakeSocketWrite(fd, "w", 1);
 #endif
@@ -1049,7 +1049,7 @@ protected:
 struct pollfd p;
 p.fd = getFD();
 p.events = POLLOUT;
-fakeSocketPoll(&p, 1, 0);
+fakeSocketPoll(&p, 1, -1);
 return fakeSocketWrite(getFD(), buf, len);
 #endif
 }
commit 5ee96e02719070f5798ca7333ee0926c7a30e84b
Author: Tor Lillqvist 
AuthorDate: Wed Sep 19 17:18:29 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 19 20:03:24 2018 +0300

Small correction to poll semantics

diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index 4fe114777..a80c6ba84 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -196,12 +196,16 @@ static bool checkForPoll(std::vector& 
fds, struct pollfd *pollfd
 if (pollfds[i].fd < 0 || pollfds[i].fd/2 >= fds.size())
 {
 pollfds[i].revents = POLLNVAL;
+retval = true;
 }
 else
 {
 const int K = ((pollfds[i].fd)&1);
 if (fds[pollfds[i].fd/2].fd[K] == -1)
+{
 pollfds[i].revents = POLLNVAL;
+re

[Libreoffice-commits] dev-tools.git: 3 commits - esc-reporting/esc-analyze.py esc-reporting/esc-report.py qa/createBlogReport.py

[Libreoffice Gerrit user]

 esc-reporting/esc-analyze.py |   25 ++---
 esc-reporting/esc-report.py  |   24 ++--
 qa/createBlogReport.py   |2 +-
 3 files changed, 29 insertions(+), 22 deletions(-)

New commits:
commit 7e7532f2058b980d012b7034f20905c4a393bca6
Author: Xisco Fauli 
AuthorDate: Wed Sep 19 17:42:45 2018 +0200
Commit: Xisco Fauli 
CommitDate: Wed Sep 19 17:42:45 2018 +0200

QA: improve help description

diff --git a/qa/createBlogReport.py b/qa/createBlogReport.py
index 085048b..aaf74d6 100755
--- a/qa/createBlogReport.py
+++ b/qa/createBlogReport.py
@@ -334,7 +334,7 @@ def mkdate(datestr):
 if __name__ == '__main__':
 parser=argparse.ArgumentParser()
 parser.add_argument('Date',type=mkdate, nargs=2, help="Introduce the 
starting date as first" + \
-" argument and the ending date as second argument")
+" argument and the ending date as second argument. FORMAT: 
-MM-DD")
 args=parser.parse_args()
 
 if args.Date[0] >= args.Date[1]:
commit 1060701dae6cfee99d4409cc100dbea619ce76b9
Author: Xisco Fauli 
AuthorDate: Wed Sep 19 17:37:29 2018 +0200
Commit: Xisco Fauli 
CommitDate: Wed Sep 19 17:37:29 2018 +0200

ESC: try harder to match committer's name if email changes

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index a39ada6..ecfca0f 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -205,7 +205,8 @@ def util_create_statList():
   '3month': {'ABANDONED': 0, 
'MERGED': 0, 'NEW': 0, 'reviewed': 0},
   '1month': {'ABANDONED': 0, 
'MERGED': 0, 'NEW': 0, 'reviewed': 0},
   '1week':  {'ABANDONED': 0, 
'MERGED': 0, 'NEW': 0, 'reviewed': 0},
-  'total': 0}},
+  'total': 0},
+'committersNames': []},
  'trend' : {'committer':   {'owner':{'1year': {}, 
'3month': {}, '1month': {}, '1week': {}},
 'reviewMerged': {'1year': {}, 
'3month': {}, '1month': {}, '1week': {}}},
 'contributor': {'owner':{'1year': {}, 
'3month': {}, '1month': {}, '1week': {}},
@@ -303,6 +304,9 @@ def analyze_mentoring():
   statList['people'][mail]['gerrit']['reviewName'] = '{} 
<{}>'.format(row['name'],row['email'])
   statList['people'][mail]['isCommitter'] = True
   statList['people'][mail]['isContributor'] = True
+  # Sometimes, committers change their email
+  # Add the committers names to a list to compare later
+  statList['data']['gerrit']['committersNames'].append(row['name'].lower())
 statNewDate = cfg['1yearDate']
 statOldDate = cfg['nowDate']
 for key, row in gerritData['patch'].items():
@@ -778,12 +782,19 @@ def analyze_reports():
 tmpClist = sorted(statList['people'], key=lambda k: 
(statList['people'][k]['commits']['1month']['owner']),reverse=True)
 for i in tmpClist:
 if not statList['people'][i]['isCommitter']:
-x = {'mail': i, 'name': statList['people'][i]['name'],
- 'month': statList['people'][i]['commits']['1month']['owner'],
- 'year': statList['people'][i]['commits']['1year']['owner']}
-statList['reportList']['top10commit'].append(x)
-if len(statList['reportList']['top10commit']) >= 10:
-break
+#Sometimes name has the format: 
+auxName = statList['people'][i]['name'].lower()
+if ',' in auxName:
+splitName = auxName.split(',')
+auxName = splitName[1].strip() + ' ' + splitName[0].strip()
+
+if auxName not in statList['data']['gerrit']['committersNames']:
+x = {'mail': i, 'name': statList['people'][i]['name'],
+ 'month': 
statList['people'][i]['commits']['1month']['owner'],
+ 'year': 
statList['people'][i]['commits']['1year']['owner']}
+statList['reportList']['top10commit'].append(x)
+if len(statList['reportList']['top10commit']) >= 10:
+break
 tmpRlist = sorted(statList['people'], key=lambda k: 
(statList['people'][k]['gerrit']['1month']['reviewer']),reverse=True)
 for i in tmpRlist:
 if i != 'c...@libreoffice.org' and i != 
'fake-em...@fake-email-script-esc.com' and i != '*dummy*':
commit 3cb4b5d7ae588509fb8bbba366bf437b5fb19650
Author: Xisco Fauli 
AuthorDate: Wed Sep 19 13:56:51 2018 +0200
Commit: Xisco Fauli 
CommitDate: Wed Sep 19 13:56:51 2018 +0200

ESC: Show top 10 reviewers and contributors

diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index 33f548a..3805566 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -186,

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

[Libreoffice Gerrit user]

 sc/source/filter/excel/xistream.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7bc99b2ab93f6a2ca30eff738ac1669375d1a6a2
Author: Andrea Gelmini 
AuthorDate: Mon Sep 17 20:35:47 2018 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 19 17:37:03 2018 +0200

Removed duplicated include

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

diff --git a/sc/source/filter/excel/xistream.cxx 
b/sc/source/filter/excel/xistream.cxx
index 8c5365d9a4b4..2bf72262bfcf 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source extras/source include/svx svx/source

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigrfflt.cxx|5 
 cui/source/inc/backgrnd.hxx |2 
 cui/source/inc/cuigrfflt.hxx|4 
 cui/source/inc/cuitabarea.hxx   |2 
 cui/source/inc/measure.hxx  |2 
 cui/source/inc/textattr.hxx |2 
 cui/source/inc/transfrm.hxx |8 -
 cui/source/tabpages/backgrnd.cxx|2 
 extras/source/glade/libreoffice-catalog.xml.in  |3 
 include/svx/dlgctrl.hxx |   14 -
 svx/source/accessibility/svxrectctaccessiblecontext.cxx |  122 
 svx/source/dialog/dlgctrl.cxx   |   70 -
 svx/source/inc/svxrectctaccessiblecontext.hxx   |   20 +-
 13 files changed, 126 insertions(+), 130 deletions(-)

New commits:
commit 8f4a399c7a6e7337d9be358a0611006b8fac6e40
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 15:07:23 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 17:20:54 2018 +0200

drop unused cuilo-BackgroundPreview from catalog

Change-Id: Ib8707b29c44291fe18d86660d9bfaaed742afbd6
Reviewed-on: https://gerrit.libreoffice.org/60716
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 3a4be0511258..0182cba12e5e 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -218,9 +218,6 @@
 
-
 
commit 94da3afddd21ee1ca437132466995eb59a6bc05b
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 15:00:10 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 17:20:42 2018 +0200

rename RectCtl back to SvxRectCtl

Change-Id: I4adde35b198d45fed09d837de5c1370d2a879f4b
Reviewed-on: https://gerrit.libreoffice.org/60715
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 4850bd6927ca..9bc7dcf55cbf 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -396,12 +396,11 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const 
Graphic& rGraphic, double
 return aRet;
 }
 
-
 void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
 {
 const RectPoint eOldRP = GetActualRP();
 
-RectCtl::MouseButtonDown( rEvt );
+SvxRectCtl::MouseButtonDown( rEvt );
 
 if( GetActualRP() != eOldRP )
 maModifyHdl.Call( nullptr );
@@ -409,7 +408,7 @@ void EmbossControl::MouseButtonDown( const MouseEvent& rEvt 
)
 
 void EmbossControl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 {
-RectCtl::SetDrawingArea(pDrawingArea);
+SvxRectCtl::SetDrawingArea(pDrawingArea);
 Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(77, 60), 
MapMode(MapUnit::MapAppFont)));
 pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
 }
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index ebd62b0e8057..374409cb8a6f 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -92,7 +92,7 @@ private:
 std::unique_ptr pTableBck_Impl;///< Items for 
Sw-Table must be corrected
 std::unique_ptr pHighlighting;
 
-std::unique_ptr m_xWndPosition;
+std::unique_ptr m_xWndPosition;
 std::unique_ptr m_xBackgroundColorSet;
 std::unique_ptr m_xPreview1;
 std::unique_ptr m_xPreview2;
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index ae5169d4b8cc..b2e1c3d59ad4 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -158,7 +158,7 @@ public:
 virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double 
fScaleX, double fScaleY ) override;
 };
 
-class EmbossControl : public RectCtl
+class EmbossControl : public SvxRectCtl
 {
 private:
 Link maModifyHdl;
@@ -166,7 +166,7 @@ private:
 virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
 public:
 EmbossControl()
-: RectCtl(nullptr)
+: SvxRectCtl(nullptr)
 {
 }
 
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index c9d1a99bbc52..20f207aa9bb0 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -317,7 +317,7 @@ private:
 SfxItemSet& m_rXFSet;
 MapUnit m_ePoolUnit;
 
-RectCtl m_aCtlPosition;
+SvxRectCtl m_aCtlPosition;
 SvxXShadowPreview  m_aCtlXRectPreview;
 std::unique_ptr m_xTsbShowShadow;
 std::unique_ptr m_xGridShadow;
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index a9af5c54ba7d..728814315783 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -40,7 +40,7 @@ private:
 
 boolbPositionModifie

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist

[Libreoffice Gerrit user]

 loleaflet/dist/leaflet.css |8 
 1 file changed, 8 insertions(+)

New commits:
commit b28dd845004b8931ebfa73525eb3c76e6ed83756
Author: Henry Castro 
AuthorDate: Wed Sep 19 09:25:29 2018 -0400
Commit: Jan Holesovsky 
CommitDate: Wed Sep 19 17:06:18 2018 +0200

loleaflet: mobile: hide the ruler

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

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index d42802bef..2fb0a1925 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -784,6 +784,14 @@ input.clipboard {
 @media screen and (max-height: 400px) {
.loleaflet-ruler {
height: 0px;
+   display: none;
+   }
+}
+
+@media (max-width: 767px) {
+   .loleaflet-ruler {
+   height: 0px;
+   display: none;
}
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/svx/dlgctrl.hxx |   66 
 svx/source/accessibility/svxrectctaccessiblecontext.cxx | 1096 +---
 svx/source/dialog/dlgctrl.cxx   |  554 
 svx/source/inc/svxrectctaccessiblecontext.hxx   |  391 -
 4 files changed, 88 insertions(+), 2019 deletions(-)

New commits:
commit efd0a2dd23fbc069ac829167f7d9ed2e1ce88cfc
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 14:52:33 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 16:59:27 2018 +0200

drop newly unused SvxRectCtl

Change-Id: I41fc4f53bedb4d5504aed39bd4d3052e2084fa6d
Reviewed-on: https://gerrit.libreoffice.org/60714
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index b087b97e6dcc..3d9e1cb95fd5 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -76,75 +76,9 @@ namespace o3tl
 template<> struct typed_flags : is_typed_flags 
{};
 }
 
-class SvxRectCtlAccessibleContext;
 class RectCtlAccessibleContext;
 class SvxPixelCtlAccessible;
 
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxRectCtl : public Control
-{
-private:
-SVX_DLLPRIVATE void InitSettings(vcl::RenderContext& 
rRenderContext);
-SVX_DLLPRIVATE void InitRectBitmap();
-SVX_DLLPRIVATE BitmapEx&GetRectBitmap();
-SVX_DLLPRIVATE void Resize_Impl();
-
-protected:
-rtl::Reference pAccContext;
-sal_uInt16 nBorderWidth;
-sal_uInt16 nRadius;
-Size aSize;
-Point aPtLT, aPtMT, aPtRT;
-Point aPtLM, aPtMM, aPtRM;
-Point aPtLB, aPtMB, aPtRB;
-Point aPtNew;
-RectPoint eRP, eDefRP;
-std::unique_ptr pBitmap;
-CTL_STATE m_nState;
-
-bool mbUpdateForeground : 1;
-bool mbUpdateBackground : 1;
-
-void MarkToResetSettings(bool bUpdateForeground, bool bUpdateBackground);
-
-RectPoint  GetRPFromPoint( Point, bool bRTL = false ) const;
-const Point&GetPointFromRP( RectPoint ) const;
-voidSetFocusRect();
-Point   SetActualRPWithoutInvalidate( RectPoint eNewRP );  // 
returns the last point
-
-virtual voidGetFocus() override;
-virtual voidLoseFocus() override;
-
-Point   GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint 
) const;
-public:
-SvxRectCtl( vcl::Window* pParent, RectPoint eRpt = RectPoint::MM,
-sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80 );
-virtual ~SvxRectCtl() override;
-virtual void dispose() override;
-
-virtual voidPaint( vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect ) override;
-virtual voidMouseButtonDown( const MouseEvent& rMEvt ) override;
-virtual voidKeyInput( const KeyEvent& rKeyEvt ) override;
-virtual voidStateChanged( StateChangedType nStateChange ) override;
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
-virtual voidResize() override;
-virtual SizeGetOptimalSize() const override;
-
-voidReset();
-RectPoint   GetActualRP() const { return eRP;}
-voidSetActualRP( RectPoint eNewRP );
-
-voidSetState( CTL_STATE nState );
-
-static const sal_uInt8 NO_CHILDREN = 9;   // returns number of usable 
radio buttons
-
-tools::Rectangle   CalculateFocusRectangle() const;
-tools::Rectangle   CalculateFocusRectangle( RectPoint eRectPoint ) 
const;
-
-virtual css::uno::Reference< css::accessibility::XAccessible > 
CreateAccessible() override;
-
-RectPoint  GetApproxRPFromPixPt( const css::awt::Point& 
rPixelPoint ) const;
-};
-
 class SAL_WARN_UNUSED SVX_DLLPUBLIC RectCtl : public 
weld::CustomWidgetController
 {
 private:
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx 
b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index a92bdacbc632..106f639a9bbf 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -98,15 +98,9 @@ static long PointToIndex( RectPoint ePoint )
 return nRet;
 }
 
-SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
-const Reference< XAccessible >& rxParent,
-SvxRectCtl& rRepr ) :
-
-SvxRectCtlAccessibleContext_Base( m_aMutex ),
-mxParent( rxParent ),
-mpRepr( &rRepr ),
-mnClientId( 0 ),
-mnSelectedChild( NOCHILDSELECTED )
+RectCtlAccessibleContext::RectCtlAccessibleContext(RectCtl* pRepr)
+: mpRepr(pRepr)
+, mnSelectedChild(NOCHILDSELECTED)
 {
 {
 ::SolarMutexGuard aSolarGuard;
@@ -117,91 +111,37 @@ SvxRectCtlAccessibleContext::SvxRectCtlAccessibleContext(
 mvChildren.resize(MAX_NUM_OF_CHILDREN);
 }
 
-
-SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext()
-{
-
-if( IsAlive() )
-  

[Libreoffice-commits] online.git: net/FakeSocket.cpp

[Libreoffice Gerrit user]

 net/FakeSocket.cpp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9c57ffd3b36196ba94a213eee451b8820f67692a
Author: Tor Lillqvist 
AuthorDate: Wed Sep 19 17:03:52 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 19 17:55:14 2018 +0300

Avoid potential deadlock

diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index 99480dc4d..384c0ab3d 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -398,6 +398,8 @@ int fakeSocketAccept4(int fd, int flags)
 while (pair.connectingFd == -1)
 cv.wait(cvLock);
 
+cvLock.unlock();
+
 assert(pair.connectingFd >= 0 && pair.connectingFd/2 < fds.size());
 
 FakeSocketPair& pair2 = fds[pair.connectingFd/2];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigrfflt.cxx |   22 +++---
 cui/source/factory/dlgfact.cxx   |   16 
 cui/source/factory/dlgfact.hxx   |7 +++
 cui/source/inc/cuigrfflt.hxx |   16 
 4 files changed, 30 insertions(+), 31 deletions(-)

New commits:
commit 785060b22ded6e5d8d6edfdcf4aceb59e0d88e78
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 14:45:09 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 16:53:20 2018 +0200

rename to original names

Change-Id: I1f4f57b77982a71f9be7cb5cd61116c9aa77189e
Reviewed-on: https://gerrit.libreoffice.org/60713
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 1299c6a33d87..4850bd6927ca 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -125,29 +125,29 @@ void CuiGraphicPreviewWindow::Resize()
 ScaleImageToFit();
 }
 
-GraphicFilterDialogController::GraphicFilterDialogController(weld::Window* 
pParent,
+GraphicFilterDialog::GraphicFilterDialog(weld::Window* pParent,
 const OUString& rUIXMLDescription, const OString& rID,
 const Graphic& rGraphic)
 : GenericDialogController(pParent, rUIXMLDescription, rID)
-, maModifyHdl(LINK(this, GraphicFilterDialogController, ImplModifyHdl))
+, maModifyHdl(LINK(this, GraphicFilterDialog, ImplModifyHdl))
 , mxPreview(new weld::CustomWeld(*m_xBuilder, "preview", maPreview))
 {
 bIsBitmap = rGraphic.GetType() == GraphicType::Bitmap;
 
-maTimer.SetInvokeHandler(LINK(this, GraphicFilterDialogController, 
ImplPreviewTimeoutHdl));
+maTimer.SetInvokeHandler(LINK(this, GraphicFilterDialog, 
ImplPreviewTimeoutHdl));
 maTimer.SetTimeout(5);
 
 maPreview.init(&rGraphic, maModifyHdl);
 }
 
-IMPL_LINK_NOARG(GraphicFilterDialogController, ImplPreviewTimeoutHdl, Timer *, 
void)
+IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void)
 {
 maTimer.Stop();
 maPreview.SetPreview(GetFilteredGraphic(maPreview.GetScaledOriginal(),
 maPreview.GetScaleX(), maPreview.GetScaleY()));
 }
 
-IMPL_LINK_NOARG(GraphicFilterDialogController, ImplModifyHdl, LinkParamNone*, 
void)
+IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void)
 {
 if (bIsBitmap)
 {
@@ -158,7 +158,7 @@ IMPL_LINK_NOARG(GraphicFilterDialogController, 
ImplModifyHdl, LinkParamNone*, vo
 
 GraphicFilterMosaic::GraphicFilterMosaic(weld::Window* pParent, const Graphic& 
rGraphic,
  sal_uInt16 nTileWidth, sal_uInt16 
nTileHeight, bool bEnhanceEdges)
-: GraphicFilterDialogController(pParent, "cui/ui/mosaicdialog.ui", 
"MosaicDialog", rGraphic)
+: GraphicFilterDialog(pParent, "cui/ui/mosaicdialog.ui", "MosaicDialog", 
rGraphic)
 , mxMtrWidth(m_xBuilder->weld_metric_spin_button("width", FUNIT_PIXEL))
 , mxMtrHeight(m_xBuilder->weld_metric_spin_button("height", FUNIT_PIXEL))
 , mxCbxEdges(m_xBuilder->weld_check_button("edges"))
@@ -225,7 +225,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const 
Graphic& rGraphic,
 }
 
 GraphicFilterSmooth::GraphicFilterSmooth(weld::Window* pParent, const Graphic& 
rGraphic, double nRadius)
-: GraphicFilterDialogController(pParent, "cui/ui/smoothdialog.ui", 
"SmoothDialog", rGraphic)
+: GraphicFilterDialog(pParent, "cui/ui/smoothdialog.ui", "SmoothDialog", 
rGraphic)
 , mxMtrRadius(m_xBuilder->weld_spin_button("radius"))
 {
 mxMtrRadius->set_value(nRadius * 10);
@@ -267,7 +267,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const 
Graphic& rGraphic, double
 
 GraphicFilterSolarize::GraphicFilterSolarize(weld::Window* pParent, const 
Graphic& rGraphic,
  sal_uInt8 cGreyThreshold, bool 
bInvert)
-: GraphicFilterDialogController(pParent, "cui/ui/solarizedialog.ui", 
"SolarizeDialog", rGraphic)
+: GraphicFilterDialog(pParent, "cui/ui/solarizedialog.ui", 
"SolarizeDialog", rGraphic)
 , mxMtrThreshold(m_xBuilder->weld_metric_spin_button("value", 
FUNIT_PERCENT))
 , mxCbxInvert(m_xBuilder->weld_check_button("invert"))
 {
@@ -323,7 +323,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const 
Graphic& rGraphic, doub
 
 GraphicFilterSepia::GraphicFilterSepia(weld::Window* pParent, const Graphic& 
rGraphic,
sal_uInt16 nSepiaPercent)
-: GraphicFilterDialogController(pParent, "cui/ui/agingdialog.ui", 
"AgingDialog", rGraphic)
+: GraphicFilterDialog(pParent, "cui/ui/agingdialog.ui", "AgingDialog", 
rGraphic)
 , mxMtrSepia(m_xBuilder->weld_metric_spin_button("value", FUNIT_PERCENT))
 {
 mxMtrSepia->set_value(nSepiaPercent, FUNIT_PERCENT);
@@ -360,7 +360,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const 
Graphic& rGraphic, double,
 
 GraphicFilterPoster::GraphicFilterPoster(weld::Window* pParent, const Graphic& 
rGraphic,
   

[Libreoffice-commits] core.git: cui/source extras/source

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigrfflt.cxx   |  146 -
 cui/source/factory/dlgfact.cxx |6 -
 cui/source/factory/dlgfact.hxx |6 -
 cui/source/inc/cuigrfflt.hxx   |   59 --
 extras/source/glade/libreoffice-catalog.xml.in |3 
 5 files changed, 220 deletions(-)

New commits:
commit 82289b3a122378133ca6ccf2e8b20c76d5219a8a
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 14:43:20 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 16:52:53 2018 +0200

drop newly unused code

Change-Id: Ie907cfb4bed26cade09cf1c365a5e4cbc9aea31b
Reviewed-on: https://gerrit.libreoffice.org/60712
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index f489112798c4..1299c6a33d87 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -32,104 +32,6 @@
 #include 
 #include 
 
-
-GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent,
-const WinBits nStyle)
-: Control(pParent, nStyle)
-, mpOrigGraphic(nullptr)
-, mfScaleX(0.0)
-, mfScaleY(0.0)
-{
-}
-
-VCL_BUILDER_FACTORY_CONSTRUCTOR(GraphicPreviewWindow, WB_TABSTOP)
-
-Size GraphicPreviewWindow::GetOptimalSize() const
-{
-return LogicToPixel(Size(81, 73), MapMode(MapUnit::MapAppFont));
-}
-
-
-void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const 
::tools::Rectangle& rRect)
-{
-Control::Paint(rRenderContext, rRect);
-
-const Size aOutputSize(GetOutputSizePixel());
-
-if (maPreview.IsAnimated())
-{
-const Size 
aGraphicSize(rRenderContext.LogicToPixel(maPreview.GetPrefSize(), 
maPreview.GetPrefMapMode()));
-const Point aGraphicPosition((aOutputSize.Width()  - 
aGraphicSize.Width()  ) >> 1,
- (aOutputSize.Height() - 
aGraphicSize.Height() ) >> 1);
-maPreview.StartAnimation(&rRenderContext, aGraphicPosition, 
aGraphicSize);
-}
-else
-{
-const Size  aGraphicSize(maPreview.GetSizePixel());
-const Point aGraphicPosition((aOutputSize.Width()  - 
aGraphicSize.Width())  >> 1,
- (aOutputSize.Height() - 
aGraphicSize.Height()) >> 1);
-maPreview.Draw(&rRenderContext, aGraphicPosition, aGraphicSize);
-}
-}
-
-
-void GraphicPreviewWindow::SetPreview(const Graphic& rGraphic)
-{
-maPreview = rGraphic;
-Invalidate();
-}
-
-void GraphicPreviewWindow::ScaleImageToFit()
-{
-if (!mpOrigGraphic)
-return;
-
-maScaledOrig = *mpOrigGraphic;
-
-const Size  aPreviewSize( GetOutputSizePixel() );
-Size aSizePixel(LogicToPixel(mpOrigGraphic->GetPrefSize(),
-mpOrigGraphic->GetPrefMapMode()));
-Size aGrfSize(aSizePixel);
-
-if( mpOrigGraphic->GetType() == GraphicType::Bitmap &&
-aPreviewSize.Width() && aPreviewSize.Height() &&
-aGrfSize.Width() && aGrfSize.Height() )
-{
-const double fGrfWH = static_cast(aGrfSize.Width()) / 
aGrfSize.Height();
-const double fPreWH = static_cast(aPreviewSize.Width()) / 
aPreviewSize.Height();
-
-if( fGrfWH < fPreWH )
-{
-aGrfSize.setWidth( static_cast( aPreviewSize.Height() * 
fGrfWH ) );
-aGrfSize.setHeight( aPreviewSize.Height() );
-}
-else
-{
-aGrfSize.setWidth( aPreviewSize.Width() );
-aGrfSize.setHeight( static_cast( aPreviewSize.Width() / 
fGrfWH ) );
-}
-
-mfScaleX = static_cast(aGrfSize.Width()) / aSizePixel.Width();
-mfScaleY = static_cast(aGrfSize.Height()) / 
aSizePixel.Height();
-
-if( !mpOrigGraphic->IsAnimated() )
-{
-BitmapEx aBmpEx( mpOrigGraphic->GetBitmapEx() );
-
-if( aBmpEx.Scale( aGrfSize ) )
-maScaledOrig = aBmpEx;
-}
-}
-
-maModifyHdl.Call(nullptr);
-}
-
-void GraphicPreviewWindow::Resize()
-{
-Control::Resize();
-ScaleImageToFit();
-}
-
 CuiGraphicPreviewWindow::CuiGraphicPreviewWindow()
 : mpOrigGraphic(nullptr)
 , mfScaleX(0.0)
@@ -223,54 +125,6 @@ void CuiGraphicPreviewWindow::Resize()
 ScaleImageToFit();
 }
 
-GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
-const OUString& rID, const OUString& rUIXMLDescription,
-const Graphic& rGraphic)
-: ModalDialog(pParent, rID, rUIXMLDescription)
-, maModifyHdl(LINK( this, GraphicFilterDialog, ImplModifyHdl))
-, maSizePixel(LogicToPixel(rGraphic.GetPrefSize(),
-rGraphic.GetPrefMapMode()))
-{
-bIsBitmap = rGraphic.GetType() == GraphicType::Bitmap;
-
-maTimer.SetInvokeHandler( LINK( this, GraphicFilterDialog, 
ImplPreviewTimeoutHdl ) );
-maTimer.SetTimeout( 5 );
-
-get(mpPreview, "preview");
-mpPreview->init(&rGraphic, maModifyHdl);
-}
-
-
-GraphicFilterDialog::~GraphicFilterDialog()
-{
-disposeOnce();
-}
-
-
-void Grap

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

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigrfflt.cxx |   35 ---
 cui/source/factory/dlgfact.cxx   |5 ++---
 cui/source/factory/dlgfact.hxx   |2 +-
 cui/source/inc/cuigrfflt.hxx |   13 +
 cui/uiconfig/ui/posterdialog.ui  |   29 ++---
 include/svx/svxdlg.hxx   |2 +-
 svx/source/dialog/grfflt.cxx |2 +-
 7 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit 65b5fc8f66eb2facaed5d35b61a2836b3390fb01
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 14:12:21 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 16:51:32 2018 +0200

weld GraphicFilterPoster

Change-Id: I1e8af81267fdadc725eee8ac28e4dcf038cc50d9
Reviewed-on: https://gerrit.libreoffice.org/60710
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 0ba79e581a0a..0a0c9f718dce 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -522,44 +522,25 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const 
Graphic& rGraphic, double,
 return aRet;
 }
 
-
-GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& 
rGraphic,
+GraphicFilterPoster::GraphicFilterPoster(weld::Window* pParent, const Graphic& 
rGraphic,
   sal_uInt16 nPosterCount)
-: GraphicFilterDialog(pParent, "PosterDialog",
-"cui/ui/posterdialog.ui", rGraphic)
+: GraphicFilterDialogController(pParent, "cui/ui/posterdialog.ui", 
"PosterDialog", rGraphic)
+, mxNumPoster(m_xBuilder->weld_spin_button("value"))
 {
-get(mpNumPoster, "value");
-
-mpNumPoster->SetFirst( 2 );
-mpNumPoster->SetLast( rGraphic.GetBitmapEx().GetBitCount() );
-mpNumPoster->SetValue( nPosterCount );
-mpNumPoster->SetModifyHdl( LINK(this, GraphicFilterPoster, EditModifyHdl) 
);
+mxNumPoster->set_range(2, rGraphic.GetBitmapEx().GetBitCount());
+mxNumPoster->set_value(nPosterCount);
+mxNumPoster->connect_value_changed(LINK(this, GraphicFilterPoster, 
EditModifyHdl));
 }
 
-
-IMPL_LINK_NOARG(GraphicFilterPoster, EditModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(GraphicFilterPoster, EditModifyHdl, weld::SpinButton&, void)
 {
 GetModifyHdl().Call(nullptr);
 }
 
-
-GraphicFilterPoster::~GraphicFilterPoster()
-{
-disposeOnce();
-}
-
-
-void GraphicFilterPoster::dispose()
-{
-mpNumPoster.clear();
-GraphicFilterDialog::dispose();
-}
-
-
 Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, 
double, double )
 {
 Graphic  aRet;
-const sal_uInt16 nPosterCount = 
static_cast(mpNumPoster->GetValue());
+const sal_uInt16 nPosterCount = 
static_cast(mxNumPoster->get_value());
 
 if( rGraphic.IsAnimated() )
 {
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 108ac73ca14d..d8240ce678e9 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1285,11 +1285,10 @@ VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFil
 return 
VclPtr::Create(o3tl::make_unique(pParent,
 rGraphic, RectPoint::MM));
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterPoster(vcl::Window* pParent,
+VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterPoster(weld::Window* pParent,
 const Graphic& rGraphic)
 {
-VclPtrInstance pDlg( pParent, rGraphic, 16 );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 rGraphic, 16));
 }
 
 VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterSepia(weld::Window* pParent,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index d26d30fa1dce..753b12bd150d 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -755,7 +755,7 @@ public:
 const 
Link& lnkContextSupplier) override;
 virtual VclPtr   
CreateGraphicFilterEmboss(weld::Window* pParent,
 const Graphic& rGraphic) 
override;
-virtual VclPtr   
CreateGraphicFilterPoster(vcl::Window* pParent,
+virtual VclPtr   
CreateGraphicFilterPoster(weld::Window* pParent,
 const Graphic& rGraphic) 
override;
 virtual VclPtr   
CreateGraphicFilterSepia(weld::Window* pParent,
 const Graphic& rGraphic) 
override;
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 3ba2b75148e5..c202a189a95c 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -209,17 +209,14 @@ public:
 virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double 
fScaleX, double fScaleY ) override;
 };
 
-class GraphicFilterPoster : public GraphicFilterDialog
+class GraphicFilterPoster : public GraphicFilterDialo

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

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigrfflt.cxx |   34 --
 cui/source/factory/dlgfact.cxx   |5 ++---
 cui/source/factory/dlgfact.hxx   |2 +-
 cui/source/inc/cuigrfflt.hxx |   11 ---
 cui/uiconfig/ui/smoothdialog.ui  |   30 ++
 include/svx/svxdlg.hxx   |2 +-
 svx/source/dialog/grfflt.cxx |   14 +++---
 7 files changed, 49 insertions(+), 49 deletions(-)

New commits:
commit d6cee8ad86ded54004f0dc87b390e43b20560390
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 14:31:16 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 16:51:58 2018 +0200

weld GraphicFilterSmooth

Change-Id: I9f92b49bff105965c13e5977ef39788c6684da29
Reviewed-on: https://gerrit.libreoffice.org/60711
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 0a0c9f718dce..f489112798c4 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -370,42 +370,24 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const 
Graphic& rGraphic,
 return aRet;
 }
 
-
-GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& 
rGraphic, double nRadius)
-: GraphicFilterDialog(pParent, "SmoothDialog",
-"cui/ui/smoothdialog.ui", rGraphic)
+GraphicFilterSmooth::GraphicFilterSmooth(weld::Window* pParent, const Graphic& 
rGraphic, double nRadius)
+: GraphicFilterDialogController(pParent, "cui/ui/smoothdialog.ui", 
"SmoothDialog", rGraphic)
+, mxMtrRadius(m_xBuilder->weld_spin_button("radius"))
 {
-get(mpMtrRadius, "radius");
-
-mpMtrRadius->SetValue( nRadius* 10  );
-mpMtrRadius->SetModifyHdl( LINK(this, GraphicFilterSmooth, EditModifyHdl) 
);
-mpMtrRadius->GrabFocus();
+mxMtrRadius->set_value(nRadius * 10);
+mxMtrRadius->connect_value_changed(LINK(this, GraphicFilterSmooth, 
EditModifyHdl));
+mxMtrRadius->grab_focus();
 }
 
-
-IMPL_LINK_NOARG(GraphicFilterSmooth, EditModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(GraphicFilterSmooth, EditModifyHdl, weld::SpinButton&, void)
 {
 GetModifyHdl().Call(nullptr);
 }
 
-
-GraphicFilterSmooth::~GraphicFilterSmooth()
-{
-disposeOnce();
-}
-
-
-void GraphicFilterSmooth::dispose()
-{
-mpMtrRadius.clear();
-GraphicFilterDialog::dispose();
-}
-
-
 Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, 
double, double )
 {
 Graphic aRet;
-double  nRadius = mpMtrRadius->GetValue() / 10.0;
+double  nRadius = mxMtrRadius->get_value() / 10.0;
 
 if( rGraphic.IsAnimated() )
 {
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index d8240ce678e9..c6cc366e97a1 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1297,11 +1297,10 @@ VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFil
 return 
VclPtr::Create(o3tl::make_unique(pParent,
 rGraphic, 10));
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(vcl::Window* pParent,
+VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(weld::Window* pParent,
 const Graphic& rGraphic, double 
nRadius)
 {
-VclPtrInstance pDlg( pParent, rGraphic, nRadius );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 rGraphic, nRadius));
 }
 
 VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterSolarize(weld::Window* pParent,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 753b12bd150d..59b9dd574de8 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -759,7 +759,7 @@ public:
 const Graphic& rGraphic) 
override;
 virtual VclPtr   
CreateGraphicFilterSepia(weld::Window* pParent,
 const Graphic& rGraphic) 
override;
-virtual VclPtr   CreateGraphicFilterSmooth 
(vcl::Window* pParent,
+virtual VclPtr   
CreateGraphicFilterSmooth(weld::Window* pParent,
 const Graphic& rGraphic, 
double nRadius) override;
 virtual VclPtr  
CreateGraphicFilterSolarize(weld::Window* pParent,
 const Graphic& rGraphic) 
override;
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index c202a189a95c..48ee3f3b25de 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -151,18 +151,15 @@ public:
 virtual Graphic GetFilteredGraphic(const Graphic& rGraphic, double 
fScaleX, double fScaleY) = 0;
 };
 
-class GraphicFilterSmooth : public GraphicFilterDialog
+class GraphicFilterSmooth : public GraphicFilterDialogController
 {
 private:
-VclPtr   mpMtrRadius;
-DECL_LINK(EditModifyHdl, Edit&, void);
+std::unique_ptr mxMtrRadius;
+DECL_LINK(Edit

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

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigrfflt.cxx |   58 ---
 cui/source/factory/dlgfact.cxx   |5 +--
 cui/source/factory/dlgfact.hxx   |2 -
 cui/source/inc/cuigrfflt.hxx |   21 ++
 cui/uiconfig/ui/mosaicdialog.ui  |   50 ++---
 include/svx/svxdlg.hxx   |2 -
 svx/source/dialog/grfflt.cxx |4 +-
 7 files changed, 74 insertions(+), 68 deletions(-)

New commits:
commit d85d206077bd400162157dadd1a36184e4851dbf
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 14:02:30 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 16:51:09 2018 +0200

weld GraphicFilterMosaic

Change-Id: I2bd52c8a998ecfc168b4fd0cecf79e49c12604eb
Reviewed-on: https://gerrit.libreoffice.org/60709
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 3fd751a953cf..0ba79e581a0a 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -302,63 +302,43 @@ IMPL_LINK_NOARG(GraphicFilterDialogController, 
ImplModifyHdl, LinkParamNone*, vo
 }
 }
 
-GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& 
rGraphic,
-  sal_uInt16 nTileWidth, sal_uInt16 
nTileHeight, bool bEnhanceEdges )
-: GraphicFilterDialog(pParent, "MosaicDialog",
-"cui/ui/mosaicdialog.ui", rGraphic)
+GraphicFilterMosaic::GraphicFilterMosaic(weld::Window* pParent, const Graphic& 
rGraphic,
+ sal_uInt16 nTileWidth, sal_uInt16 
nTileHeight, bool bEnhanceEdges)
+: GraphicFilterDialogController(pParent, "cui/ui/mosaicdialog.ui", 
"MosaicDialog", rGraphic)
+, mxMtrWidth(m_xBuilder->weld_metric_spin_button("width", FUNIT_PIXEL))
+, mxMtrHeight(m_xBuilder->weld_metric_spin_button("height", FUNIT_PIXEL))
+, mxCbxEdges(m_xBuilder->weld_check_button("edges"))
 {
-get(mpMtrWidth, "width");
-get(mpMtrHeight, "height");
-get(mpCbxEdges, "edges");
+mxMtrWidth->set_value(nTileWidth, FUNIT_PIXEL);
+mxMtrWidth->set_max(GetGraphicSizePixel().Width(), FUNIT_PIXEL);
+mxMtrWidth->connect_value_changed(LINK(this, GraphicFilterMosaic, 
EditModifyHdl));
 
-mpMtrWidth->SetValue( nTileWidth );
-mpMtrWidth->SetLast( GetGraphicSizePixel().Width() );
-mpMtrWidth->SetModifyHdl( LINK(this, GraphicFilterMosaic, EditModifyHdl) );
+mxMtrHeight->set_value(nTileHeight, FUNIT_PIXEL);
+mxMtrHeight->set_max(GetGraphicSizePixel().Height(), FUNIT_PIXEL);
+mxMtrHeight->connect_value_changed(LINK(this, GraphicFilterMosaic, 
EditModifyHdl));
 
-mpMtrHeight->SetValue( nTileHeight );
-mpMtrHeight->SetLast( GetGraphicSizePixel().Height() );
-mpMtrHeight->SetModifyHdl( LINK(this, GraphicFilterMosaic, EditModifyHdl) 
);
+mxCbxEdges->set_active(bEnhanceEdges);
+mxCbxEdges->connect_toggled(LINK(this, GraphicFilterMosaic, 
CheckBoxModifyHdl));
 
-mpCbxEdges->Check( bEnhanceEdges );
-mpCbxEdges->SetToggleHdl( LINK(this, GraphicFilterMosaic, 
CheckBoxModifyHdl) );
-
-mpMtrWidth->GrabFocus();
+mxMtrWidth->grab_focus();
 }
 
-
-IMPL_LINK_NOARG(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, void)
+IMPL_LINK_NOARG(GraphicFilterMosaic, CheckBoxModifyHdl, weld::ToggleButton&, 
void)
 {
 GetModifyHdl().Call(nullptr);
 }
 
-
-IMPL_LINK_NOARG(GraphicFilterMosaic, EditModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(GraphicFilterMosaic, EditModifyHdl, weld::MetricSpinButton&, 
void)
 {
 GetModifyHdl().Call(nullptr);
 }
 
-
-GraphicFilterMosaic::~GraphicFilterMosaic()
-{
-disposeOnce();
-}
-
-
-void GraphicFilterMosaic::dispose()
-{
-mpMtrWidth.clear();
-mpMtrHeight.clear();
-mpCbxEdges.clear();
-GraphicFilterDialog::dispose();
-}
-
-
 Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
  double fScaleX, double 
fScaleY )
 {
 Graphic aRet;
-longnTileWidth = static_cast(mpMtrWidth->GetValue());
-longnTileHeight = static_cast(mpMtrHeight->GetValue());
+longnTileWidth = 
static_cast(mxMtrWidth->get_value(FUNIT_PIXEL));
+longnTileHeight = 
static_cast(mxMtrHeight->get_value(FUNIT_PIXEL));
 const Size  aSize( std::max( FRound( nTileWidth * fScaleX ), 1L ),
std::max( FRound( nTileHeight * fScaleY ), 1L ) );
 
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 40863a65d543..108ac73ca14d 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1311,11 +1311,10 @@ VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFil
 return 
VclPtr::Create(o3tl::make_unique(pParent,
 rGraphic, 128, false /*bInvert*/));
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (vcl::Window* pParent,
+VclPtr 
AbstractDialogFactory_Impl::

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

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigrfflt.cxx |   30 --
 cui/source/factory/dlgfact.cxx   |5 ++---
 cui/source/factory/dlgfact.hxx   |2 +-
 cui/source/inc/cuigrfflt.hxx |   12 +---
 cui/uiconfig/ui/agingdialog.ui   |   33 -
 include/svx/svxdlg.hxx   |2 +-
 6 files changed, 45 insertions(+), 39 deletions(-)

New commits:
commit b5f67308c6d19fd8bce1515312fb3fcd0eb28af4
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 13:43:46 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 16:50:50 2018 +0200

weld GraphicFilterSepia

Change-Id: Id57f29f4694a8aaa395f5f166744d06e4adfb492
Reviewed-on: https://gerrit.libreoffice.org/60708
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index c8268ac38f02..3fd751a953cf 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -505,38 +505,24 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const 
Graphic& rGraphic, doub
 return aRet;
 }
 
-GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& 
rGraphic,
-sal_uInt16 nSepiaPercent )
-: GraphicFilterDialog(pParent, "AgingDialog",
-"cui/ui/agingdialog.ui", rGraphic)
+GraphicFilterSepia::GraphicFilterSepia(weld::Window* pParent, const Graphic& 
rGraphic,
+   sal_uInt16 nSepiaPercent)
+: GraphicFilterDialogController(pParent, "cui/ui/agingdialog.ui", 
"AgingDialog", rGraphic)
+, mxMtrSepia(m_xBuilder->weld_metric_spin_button("value", FUNIT_PERCENT))
 {
-get(mpMtrSepia, "value");
-
-mpMtrSepia->SetValue( nSepiaPercent );
-mpMtrSepia->SetModifyHdl( LINK(this, GraphicFilterSepia, EditModifyHdl) );
+mxMtrSepia->set_value(nSepiaPercent, FUNIT_PERCENT);
+mxMtrSepia->connect_value_changed(LINK(this, GraphicFilterSepia, 
EditModifyHdl));
 }
 
-IMPL_LINK_NOARG(GraphicFilterSepia, EditModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(GraphicFilterSepia, EditModifyHdl, weld::MetricSpinButton&, 
void)
 {
 GetModifyHdl().Call(nullptr);
 }
 
-GraphicFilterSepia::~GraphicFilterSepia()
-{
-disposeOnce();
-}
-
-void GraphicFilterSepia::dispose()
-{
-mpMtrSepia.clear();
-GraphicFilterDialog::dispose();
-}
-
-
 Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, 
double, double )
 {
 Graphic aRet;
-sal_uInt16  nSepiaPct = sal::static_int_cast< sal_uInt16 
>(mpMtrSepia->GetValue());
+sal_uInt16  nSepiaPct = sal::static_int_cast< sal_uInt16 
>(mxMtrSepia->get_value(FUNIT_PERCENT));
 
 if( rGraphic.IsAnimated() )
 {
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 0534e2e006f8..40863a65d543 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1292,11 +1292,10 @@ VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFil
 return VclPtr::Create( pDlg );
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterSepia (vcl::Window* pParent,
+VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterSepia(weld::Window* pParent,
 const Graphic& rGraphic)
 {
-VclPtrInstance pDlg( pParent, rGraphic, 10 );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 rGraphic, 10));
 }
 
 VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(vcl::Window* pParent,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 968685e8994c..ec2a4285182e 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -757,7 +757,7 @@ public:
 const Graphic& rGraphic) 
override;
 virtual VclPtr   
CreateGraphicFilterPoster(vcl::Window* pParent,
 const Graphic& rGraphic) 
override;
-virtual VclPtr   CreateGraphicFilterSepia 
(vcl::Window* pParent,
+virtual VclPtr   
CreateGraphicFilterSepia(weld::Window* pParent,
 const Graphic& rGraphic) 
override;
 virtual VclPtr   CreateGraphicFilterSmooth 
(vcl::Window* pParent,
 const Graphic& rGraphic, 
double nRadius) override;
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 1d369d560fcd..9ff9c2b6a29a 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -199,16 +199,14 @@ public:
 boolIsInvert() const { return mxCbxInvert->get_active(); }
 };
 
-class GraphicFilterSepia : public GraphicFilterDialog
+class GraphicFilterSepia : public GraphicFilterDialogController
 {
 private:
-VclPtrmpMtrSepia;
-DECL_LINK(EditModifyHdl, Edit&, void);
+std::unique_ptr mxMtrSepia;
+DECL_LINK(EditModifyHdl, weld::MetricS

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

[Libreoffice Gerrit user]

 sw/source/core/doc/DocumentRedlineManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6f5dd32f05da716369ecb1b5a3765cd8af661731
Author: Andrea Gelmini 
AuthorDate: Wed Sep 19 15:39:37 2018 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 19 16:46:03 2018 +0200

Fix typo

Change-Id: I644fed22dd46458623a1f99f7eefbdc2a7b31fc1
Reviewed-on: https://gerrit.libreoffice.org/60770
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index a29a8da34d54..a5407a511def 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -83,7 +83,7 @@ using namespace com::sun::star;
 {
 // check for empty redlines
 // note: these can destroy sorting in SwTextNode::Update()
-// if there's another one wihout mark on the same pos.
+// if there's another one without mark on the same pos.
 OSL_ENSURE( ( *(j->GetPoint()) != *(j->GetMark()) ) ||
 ( j->GetContentIdx() != nullptr ),
 ERROR_PREFIX "empty redline" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigrfflt.cxx  |   44 ++
 cui/source/factory/dlgfact.cxx|5 +---
 cui/source/factory/dlgfact.hxx|2 -
 cui/source/inc/cuigrfflt.hxx  |   22 +++
 cui/uiconfig/ui/embossdialog.ui   |1 
 cui/uiconfig/ui/solarizedialog.ui |   33 
 include/svx/svxdlg.hxx|2 -
 svx/source/dialog/grfflt.cxx  |2 -
 8 files changed, 55 insertions(+), 56 deletions(-)

New commits:
commit 4b743a2cc1b6d29404873205a25432baf4f9c933
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 12:10:37 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 16:19:43 2018 +0200

weld GraphicFilterSolarize

Change-Id: If729ea1688e9dc15372a59d75c972ee37511f76e
Reviewed-on: https://gerrit.libreoffice.org/60680
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index f8f2b76bc4a5..c8268ac38f02 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -449,53 +449,33 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const 
Graphic& rGraphic, double
 return aRet;
 }
 
-
-GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const 
Graphic& rGraphic,
-  sal_uInt8 cGreyThreshold, bool 
bInvert )
-: GraphicFilterDialog(pParent, "SolarizeDialog",
-"cui/ui/solarizedialog.ui", rGraphic)
+GraphicFilterSolarize::GraphicFilterSolarize(weld::Window* pParent, const 
Graphic& rGraphic,
+ sal_uInt8 cGreyThreshold, bool 
bInvert)
+: GraphicFilterDialogController(pParent, "cui/ui/solarizedialog.ui", 
"SolarizeDialog", rGraphic)
+, mxMtrThreshold(m_xBuilder->weld_metric_spin_button("value", 
FUNIT_PERCENT))
+, mxCbxInvert(m_xBuilder->weld_check_button("invert"))
 {
-get(mpMtrThreshold, "value");
-get(mpCbxInvert, "invert");
-
-mpMtrThreshold->SetValue( FRound( cGreyThreshold / 2.55 ) );
-mpMtrThreshold->SetModifyHdl( LINK(this, GraphicFilterSolarize, 
EditModifyHdl) );
+mxMtrThreshold->set_value(FRound(cGreyThreshold / 2.55), FUNIT_PERCENT);
+mxMtrThreshold->connect_value_changed(LINK(this, GraphicFilterSolarize, 
EditModifyHdl));
 
-mpCbxInvert->Check( bInvert );
-mpCbxInvert->SetToggleHdl( LINK(this, GraphicFilterSolarize, 
CheckBoxModifyHdl) );
+mxCbxInvert->set_active(bInvert);
+mxCbxInvert->connect_toggled(LINK(this, GraphicFilterSolarize, 
CheckBoxModifyHdl));
 }
 
-
-IMPL_LINK_NOARG(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, void)
+IMPL_LINK_NOARG(GraphicFilterSolarize, CheckBoxModifyHdl, weld::ToggleButton&, 
void)
 {
 GetModifyHdl().Call(nullptr);
 }
 
-
-IMPL_LINK_NOARG(GraphicFilterSolarize, EditModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(GraphicFilterSolarize, EditModifyHdl, weld::MetricSpinButton&, 
void)
 {
 GetModifyHdl().Call(nullptr);
 }
 
-
-GraphicFilterSolarize::~GraphicFilterSolarize()
-{
-disposeOnce();
-}
-
-
-void GraphicFilterSolarize::dispose()
-{
-mpMtrThreshold.clear();
-mpCbxInvert.clear();
-GraphicFilterDialog::dispose();
-}
-
-
 Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, 
double, double )
 {
 Graphic aRet;
-sal_uInt8   nGreyThreshold = static_cast(FRound( 
mpMtrThreshold->GetValue() * 2.55 ));
+sal_uInt8   nGreyThreshold = 
static_cast(FRound(mxMtrThreshold->get_value(FUNIT_PERCENT) * 2.55));
 
 if( rGraphic.IsAnimated() )
 {
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 63868ad23534..0534e2e006f8 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1306,11 +1306,10 @@ VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFil
 return VclPtr::Create( pDlg );
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (vcl::Window* pParent,
+VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterSolarize(weld::Window* pParent,
 const Graphic& rGraphic)
 {
-VclPtrInstance pDlg( pParent, rGraphic, 128, 
false/*bInvert*/ );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(o3tl::make_unique(pParent,
 rGraphic, 128, false /*bInvert*/));
 }
 
 VclPtr 
AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (vcl::Window* pParent,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 6df50a3b0f52..968685e8994c 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -761,7 +761,7 @@ public:
 const Graphic& rGraphic) 
override;
 virtual VclPtr   CreateGraphicFilterSmooth 
(vcl::Window* pParent,
 const Graphic& rGraphic, 
double nRadius) override;
-virtual VclPtr  CreateGraphicFi

[Libreoffice-commits] core.git: cui/source cui/uiconfig extras/source include/svx svx/source

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigrfflt.cxx   |  163 -
 cui/source/factory/dlgfact.cxx |   15 +-
 cui/source/factory/dlgfact.hxx |   16 ++
 cui/source/inc/cuigrfflt.hxx   |   83 +++-
 cui/uiconfig/ui/embossdialog.ui|   51 ++-
 extras/source/glade/libreoffice-catalog.xml.in |3 
 include/svx/svxdlg.hxx |2 
 svx/source/dialog/grfflt.cxx   |2 
 8 files changed, 281 insertions(+), 54 deletions(-)

New commits:
commit 3a87fb18241e803f7ebffedfc59648782f560f4e
Author: Caolán McNamara 
AuthorDate: Mon Sep 17 16:53:23 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 15:51:43 2018 +0200

weld GraphicFilterEmboss

Change-Id: Ic3c816ddd7d5df9c5ced14600fffd6ca59f0096e
Reviewed-on: https://gerrit.libreoffice.org/60594
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index e9f84d1789ef..f8f2b76bc4a5 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -79,7 +79,6 @@ void GraphicPreviewWindow::SetPreview(const Graphic& rGraphic)
 Invalidate();
 }
 
-
 void GraphicPreviewWindow::ScaleImageToFit()
 {
 if (!mpOrigGraphic)
@@ -125,13 +124,105 @@ void GraphicPreviewWindow::ScaleImageToFit()
 maModifyHdl.Call(nullptr);
 }
 
-
 void GraphicPreviewWindow::Resize()
 {
 Control::Resize();
 ScaleImageToFit();
 }
 
+CuiGraphicPreviewWindow::CuiGraphicPreviewWindow()
+: mpOrigGraphic(nullptr)
+, mfScaleX(0.0)
+, mfScaleY(0.0)
+{
+}
+
+void CuiGraphicPreviewWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+{
+CustomWidgetController::SetDrawingArea(pDrawingArea);
+OutputDevice &rDevice = pDrawingArea->get_ref_device();
+maOutputSizePixel = rDevice.LogicToPixel(Size(81, 73), 
MapMode(MapUnit::MapAppFont));
+pDrawingArea->set_size_request(maOutputSizePixel.Width(), 
maOutputSizePixel.Height());
+}
+
+void CuiGraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const 
::tools::Rectangle&)
+{
+
rRenderContext.SetBackground(Wallpaper(Application::GetSettings().GetStyleSettings().GetDialogColor()));
+rRenderContext.Erase();
+
+const Size aOutputSize(GetOutputSizePixel());
+
+if (maPreview.IsAnimated())
+{
+const Size 
aGraphicSize(rRenderContext.LogicToPixel(maPreview.GetPrefSize(), 
maPreview.GetPrefMapMode()));
+const Point aGraphicPosition((aOutputSize.Width()  - 
aGraphicSize.Width()  ) >> 1,
+ (aOutputSize.Height() - 
aGraphicSize.Height() ) >> 1);
+maPreview.StartAnimation(&rRenderContext, aGraphicPosition, 
aGraphicSize);
+}
+else
+{
+const Size  aGraphicSize(maPreview.GetSizePixel());
+const Point aGraphicPosition((aOutputSize.Width()  - 
aGraphicSize.Width())  >> 1,
+ (aOutputSize.Height() - 
aGraphicSize.Height()) >> 1);
+maPreview.Draw(&rRenderContext, aGraphicPosition, aGraphicSize);
+}
+}
+
+void CuiGraphicPreviewWindow::SetPreview(const Graphic& rGraphic)
+{
+maPreview = rGraphic;
+Invalidate();
+}
+
+void CuiGraphicPreviewWindow::ScaleImageToFit()
+{
+if (!mpOrigGraphic)
+return;
+
+maScaledOrig = *mpOrigGraphic;
+
+const Size aPreviewSize(GetOutputSizePixel());
+Size aGrfSize(maOrigGraphicSizePixel);
+
+if( mpOrigGraphic->GetType() == GraphicType::Bitmap &&
+aPreviewSize.Width() && aPreviewSize.Height() &&
+aGrfSize.Width() && aGrfSize.Height() )
+{
+const double fGrfWH = static_cast(aGrfSize.Width()) / 
aGrfSize.Height();
+const double fPreWH = static_cast(aPreviewSize.Width()) / 
aPreviewSize.Height();
+
+if( fGrfWH < fPreWH )
+{
+aGrfSize.setWidth( static_cast( aPreviewSize.Height() * 
fGrfWH ) );
+aGrfSize.setHeight( aPreviewSize.Height() );
+}
+else
+{
+aGrfSize.setWidth( aPreviewSize.Width() );
+aGrfSize.setHeight( static_cast( aPreviewSize.Width() / 
fGrfWH ) );
+}
+
+mfScaleX = static_cast(aGrfSize.Width()) / 
maOrigGraphicSizePixel.Width();
+mfScaleY = static_cast(aGrfSize.Height()) / 
maOrigGraphicSizePixel.Height();
+
+if( !mpOrigGraphic->IsAnimated() )
+{
+BitmapEx aBmpEx( mpOrigGraphic->GetBitmapEx() );
+
+if( aBmpEx.Scale( aGrfSize ) )
+maScaledOrig = aBmpEx;
+}
+}
+
+maModifyHdl.Call(nullptr);
+}
+
+void CuiGraphicPreviewWindow::Resize()
+{
+maOutputSizePixel = GetOutputSizePixel();
+ScaleImageToFit();
+}
+
 GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
 const OUString& rID, const OUString& rUIXMLDescription,
 const Graphic& rGraphic)
@@ -180,6 +271,36 @@ IMPL_LINK_NOARG(Gr

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

[Libreoffice Gerrit user]

 sw/qa/extras/odfexport/data/tdf118502.odt  |binary
 sw/qa/extras/odfexport/odfexport.cxx   |   10 ++
 xmloff/source/core/xmlmultiimagehelper.cxx |4 
 3 files changed, 14 insertions(+)

New commits:
commit 088af44063c3e2d1d0e7744a9f9bd7b37ff58a75
Author: Samuel Mehrbrodt 
AuthorDate: Wed Sep 19 12:51:00 2018 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Sep 19 15:04:05 2018 +0200

tdf#118502 Fix loading of eps images with replacement graphic

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

diff --git a/sw/qa/extras/odfexport/data/tdf118502.odt 
b/sw/qa/extras/odfexport/data/tdf118502.odt
new file mode 100644
index ..f006d607ac3b
Binary files /dev/null and b/sw/qa/extras/odfexport/data/tdf118502.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 4727f2266750..e130d754b9d2 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -2113,6 +2113,16 @@ DECLARE_ODFEXPORT_TEST(tdf101856, "tdf101856.odt")
 CPPUNIT_ASSERT_EQUAL(true, getProperty(xBookmark5, 
UNO_NAME_BOOKMARK_HIDDEN));
 }
 
+DECLARE_ODFEXPORT_TEST(tdf118502, "tdf118502.odt")
+{
+uno::Reference xShape = getShape(1);
+// Make sure the replacement graphic is still there
+// (was gone because the original graphic was not recognized during load)
+auto xReplacementGraphic
+= getProperty>(xShape, 
"ReplacementGraphic");
+CPPUNIT_ASSERT(xReplacementGraphic.is());
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx 
b/xmloff/source/core/xmlmultiimagehelper.cxx
index 474e796c9ad8..36b65fdd7449 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -74,6 +74,10 @@ namespace
 {
 return 1020;
 }
+if (rMimeType == "image/x-eps")
+{
+return 1025;
+}
 if (rMimeType == "application/pdf")
 {
 return 1030;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 comphelper/source/xml/xmltools.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c7e64cd3854a912ef33b5a717a9f36856925c7c
Author: Samuel Mehrbrodt 
AuthorDate: Wed Sep 19 08:16:42 2018 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Sep 19 14:12:37 2018 +0200

generateGUIDString: Fix incorrect string length

This bug caused signature line IDs in OOXML to be written
with an appended "_x_".

Change-Id: If219279a5d5177ec5fac2d9dd747dc015c16b6bc
Reviewed-on: https://gerrit.libreoffice.org/60736
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/comphelper/source/xml/xmltools.cxx 
b/comphelper/source/xml/xmltools.cxx
index e9df23c73e1e..24919ae35044 100644
--- a/comphelper/source/xml/xmltools.cxx
+++ b/comphelper/source/xml/xmltools.cxx
@@ -102,7 +102,7 @@ namespace comphelper
 aSeq[0], aSeq[1], aSeq[2], aSeq[3], aSeq[4], aSeq[5], 
aSeq[6], aSeq[7], aSeq[8],
 aSeq[9], aSeq[10], aSeq[11], aSeq[12], aSeq[13], aSeq[14], 
aSeq[15]);
 
-return OString(str, SAL_N_ELEMENTS(str));
+return OString(str);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/uiconfig

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/watermarkdialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 01abe2764f1778ad03cf643e799f0f387bd397e8
Author: Adolfo Jayme Barrientos 
AuthorDate: Wed Sep 19 05:04:14 2018 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 19 13:30:59 2018 +0200

tdf#112356 follow-up: Make the Help button work

Change-Id: I7181e07f8d817dd402eec8bd98e8526503455f5e
(cherry picked from commit fee5b79543de5e35299b1e3576209c77ef64a4d6)
Reviewed-on: https://gerrit.libreoffice.org/60751
Reviewed-by: Xisco Faulí 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/watermarkdialog.ui 
b/sw/uiconfig/swriter/ui/watermarkdialog.ui
index 60450a06b10d..8035c6b9d47f 100644
--- a/sw/uiconfig/swriter/ui/watermarkdialog.ui
+++ b/sw/uiconfig/swriter/ui/watermarkdialog.ui
@@ -247,6 +247,7 @@
 
   ok
   cancel
+  help
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: can't build libreoffice !

[Rahul Gurung]

Sorry, I got it, I had actually changed the name of the directory from
libreoffice to lo for easy (fast) access, is there a way to configure it,
or I have to rename it back to libreoffice?



On 19 September 2018 at 16:33, Rahul Gurung  wrote:

> Hey,
>
>
> I can't build LibreOffice running make build-nocheck gives me this error
>
>
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/odk/docs/cpp/main.dox' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/include/sal/log-areas.dox' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/sal' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/salhelper' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/rtl' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/osl' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/typelib' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/uno' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/cppu' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/cppuhelper' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/Any.h' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/Any.hxx' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/genfunc.h' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/genfunc.hxx' does not
> exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/Reference.h' does not
> exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/Reference.hxx' does not
> exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/Sequence.h' does not
> exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/Sequence.hxx' does not
> exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/Type.h' does not exist
> warning: tag INPUT: input source `/home/gurungrahul2/
> libreoffice/instdir/sdk/include/com/sun/star/uno/Type.hxx' does not exist
> error: tag OUTPUT_DIRECTORY: Output directory `/home/gurungrahul2/
> libreoffice/workdir/CustomTarget/odk/docs/cpp/ref' does not exist and
> cannot be created
> /home/gurungrahul2/lo/odk/CustomTarget_doxygen.mk:56: recipe for target
> '/home/gurungrahul2/lo/workdir/CustomTarget/odk/docs/cpp/doxygen.log'
> failed
> make[1]: *** 
> [/home/gurungrahul2/lo/workdir/CustomTarget/odk/docs/cpp/doxygen.log]
> Error 1
> make[1]: *** Deleting file '/home/gurungrahul2/lo/
> workdir/CustomTarget/odk/docs/cpp/doxygen.log'
> make[1]: *** Waiting for unfinished jobs
> Makefile:286: recipe for target 'build' failed
> make: *** [build] Error 2
>
>
> Thanks,
> Rahul Gurung.
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

can't build libreoffice !

[Rahul Gurung]

Hey,


I can't build LibreOffice running make build-nocheck gives me this error


warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/odk/docs/cpp/main.dox' does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/include/sal/log-areas.dox' does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/sal' does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/salhelper' does not
exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/rtl' does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/osl' does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/typelib' does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/uno' does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/cppu' does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/cppuhelper' does not
exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/Any.h'
does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/Any.hxx'
does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/genfunc.h'
does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/genfunc.hxx'
does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/Reference.h'
does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/Reference.hxx'
does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/Sequence.h'
does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/Sequence.hxx'
does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/Type.h'
does not exist
warning: tag INPUT: input source
`/home/gurungrahul2/libreoffice/instdir/sdk/include/com/sun/star/uno/Type.hxx'
does not exist
error: tag OUTPUT_DIRECTORY: Output directory
`/home/gurungrahul2/libreoffice/workdir/CustomTarget/odk/docs/cpp/ref' does
not exist and cannot be created
/home/gurungrahul2/lo/odk/CustomTarget_doxygen.mk:56: recipe for target
'/home/gurungrahul2/lo/workdir/CustomTarget/odk/docs/cpp/doxygen.log' failed
make[1]: ***
[/home/gurungrahul2/lo/workdir/CustomTarget/odk/docs/cpp/doxygen.log] Error
1
make[1]: *** Deleting file
'/home/gurungrahul2/lo/workdir/CustomTarget/odk/docs/cpp/doxygen.log'
make[1]: *** Waiting for unfinished jobs
Makefile:286: recipe for target 'build' failed
make: *** [build] Error 2


Thanks,
Rahul Gurung.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sw/source/uibase/utlui/content.cxx |   87 +
 1 file changed, 40 insertions(+), 47 deletions(-)

New commits:
commit d36ff576c875c79706511194e72bb38c435c49a2
Author: Noel Grandin 
AuthorDate: Tue Sep 18 14:48:21 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 19 12:56:51 2018 +0200

convert SwContentArr to sorted_vector>

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 2e15c8a083d3..a0de7d4f3cfa 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -106,11 +106,9 @@ using namespace ::com::sun::star::container;
 #define NAVI_BOOKMARK_DELIM u'\x0001'
 
 class SwContentArr
-: public o3tl::sorted_vector,
+: public o3tl::sorted_vector, 
o3tl::less_uniqueptr_to,
 o3tl::find_partialorder_ptrequals>
 {
-public:
-~SwContentArr() { DeleteAndDestroyAll(); }
 };
 
 bool SwContentTree::bIsInDrag = false;
@@ -159,15 +157,15 @@ namespace
 for( SwGetINetAttrs::size_type n = 0; n < nCount; ++n )
 {
 SwGetINetAttr* p = &aArr[ n ];
-SwURLFieldContent* pCnt = new SwURLFieldContent(
+std::unique_ptr pCnt(new SwURLFieldContent(
 pCntType,
 p->sText,
 INetURLObject::decode(
 p->rINetAttr.GetINetFormat().GetValue(),
 
INetURLObject::DecodeMechanism::Unambiguous ),
 &p->rINetAttr,
-n );
-pMember->insert( pCnt );
+n ));
+pMember->insert( std::move(pCnt) );
 }
 return nCount;
 }
@@ -373,15 +371,15 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 pParentFormat = pParentFormat->GetParent();
 }
 
-SwContent* pCnt = new SwRegionContent(this, rSectionName,
+std::unique_ptr pCnt(new SwRegionContent(this, 
rSectionName,
 nLevel,
-pFormat->FindLayoutRect( false, &aNullPt ).Top());
+pFormat->FindLayoutRect( false, &aNullPt ).Top()));
 
 SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, nullptr );
 if( !pFormat->GetInfo( aAskItem ) &&
 !aAskItem.pObject ) // not visible
 pCnt->SetInvisible();
-pMember->insert(pCnt);
+pMember->insert(std::move(pCnt));
 }
 }
 nMemberCount = pMember->size();
@@ -401,7 +399,6 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 *pMember);
 }
 
-pOldMember->DeleteAndDestroyAll();
 delete pOldMember;
 }
 }
@@ -424,8 +421,8 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 nMemberCount = 0;
 if(!pMember)
 pMember.reset( new SwContentArr );
-else if(!pMember->empty())
-pMember->DeleteAndDestroyAll();
+else
+pMember->clear();
 
 nMemberCount = lcl_InsertURLFieldContent(pMember.get(), pWrtShell, 
this);
 
@@ -439,8 +436,8 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 nMemberCount = 0;
 if(!pMember)
 pMember.reset( new SwContentArr );
-else if(!pMember->empty())
-pMember->DeleteAndDestroyAll();
+else
+pMember->clear();
 
 SwPostItMgr* aMgr = pWrtShell->GetView().GetPostItMgr();
 if (aMgr)
@@ -454,12 +451,12 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 {
 OUString sEntry = 
pFormatField->GetField()->GetPar2();
 sEntry = RemoveNewline(sEntry);
-SwPostItContent* pCnt = new SwPostItContent(
+std::unique_ptr pCnt(new 
SwPostItContent(
 this,
 sEntry,
 pFormatField,
-nMemberCount);
-pMember->insert(pCnt);
+nMemberCount));
+pMember->insert(std::move(pCnt));
 nMemberCount++;
 }
 }
@@ -509,7 +506,7 @@ const SwContent* SwContentType::GetMember(size_t nIndex)
 FillMemb

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

[Libreoffice Gerrit user]

 xmloff/source/style/XMLFontAutoStylePool.cxx |   19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

New commits:
commit e4920a076f100489b229b8926064bb26a03dc55b
Author: Noel Grandin 
AuthorDate: Wed Sep 19 09:13:48 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 19 12:56:29 2018 +0200

convert XMLFontAutoStylePool_Impl to sorted_vector>

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

diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx 
b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 95f0394e16f7..9a8454897e66 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -112,8 +112,8 @@ inline 
XMLFontAutoStylePoolEntry_Impl::XMLFontAutoStylePoolEntry_Impl(
 
 struct XMLFontAutoStylePoolEntryCmp_Impl {
 bool operator()(
-XMLFontAutoStylePoolEntry_Impl* const& r1,
-XMLFontAutoStylePoolEntry_Impl* const& r2 ) const
+std::unique_ptr const& r1,
+std::unique_ptr const& r2 ) const
 {
 bool bEnc1(r1->GetEncoding() != RTL_TEXTENCODING_SYMBOL);
 bool bEnc2(r2->GetEncoding() != RTL_TEXTENCODING_SYMBOL);
@@ -134,13 +134,8 @@ struct XMLFontAutoStylePoolEntryCmp_Impl {
 }
 };
 
-class XMLFontAutoStylePool_Impl : public 
o3tl::sorted_vector
+class XMLFontAutoStylePool_Impl : public 
o3tl::sorted_vector, 
XMLFontAutoStylePoolEntryCmp_Impl>
 {
-public:
-~XMLFontAutoStylePool_Impl()
-{
-DeleteAndDestroyAll();
-}
 };
 
 XMLFontAutoStylePool::XMLFontAutoStylePool(SvXMLExport& rExp, bool 
bTryToEmbedFonts) :
@@ -201,10 +196,10 @@ OUString XMLFontAutoStylePool::Add(
 }
 }
 
-XMLFontAutoStylePoolEntry_Impl *pEntry =
+std::unique_ptr pEntry(
 new XMLFontAutoStylePoolEntry_Impl( sName, rFamilyName, rStyleName,
-nFamily, nPitch, eEnc );
-m_pFontAutoStylePool->insert( pEntry );
+nFamily, nPitch, eEnc ));
+m_pFontAutoStylePool->insert( std::move(pEntry) );
 m_aNames.insert(sName);
 }
 
@@ -403,7 +398,7 @@ void XMLFontAutoStylePool::exportXML()
 
 for (sal_uInt32 i = 0; i < nCount; i++)
 {
-const XMLFontAutoStylePoolEntry_Impl* pEntry = 
(*m_pFontAutoStylePool)[i];
+const XMLFontAutoStylePoolEntry_Impl* pEntry = 
(*m_pFontAutoStylePool)[i].get();
 
 GetExport().AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, 
pEntry->GetName());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/view/viewfrm.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c11a2c0e42add67785413bbb0afc79e7ab92161f
Author: Christian Lohmaier 
AuthorDate: Tue Sep 18 20:15:43 2018 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 19 12:53:44 2018 +0200

add locale to joinus link so hub can redirect to language specific pages

Change-Id: Ibed6f899ad0219bf0211ac50c0595484ddba8c92
Reviewed-on: https://gerrit.libreoffice.org/60696
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 17d981d795f18422e1435180d42baeba509c1280)
Reviewed-on: https://gerrit.libreoffice.org/60742
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index e2194d6ba9c1..b0b972a4f572 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -91,6 +91,8 @@
 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
@@ -1371,7 +1373,8 @@ IMPL_LINK_NOARG(SfxViewFrame, GetInvolvedHandler, 
Button*, void)
 {
 try
 {
-sfx2::openUriExternally("https://hub.libreoffice.org/joinus";, false);
+OUString sURL("https://hub.libreoffice.org/joinus/?LOlocale="; + 
utl::ConfigManager::getLocale());
+sfx2::openUriExternally(sURL, false);
 }
 catch (const Exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/ui/unoobj/servuno.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit d48eb7255dad05c3baff5194dc3151683893d56c
Author: Tor Lillqvist 
AuthorDate: Wed Sep 19 13:37:47 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 19 13:37:47 2018 +0300

Avoid unused function in the !HAVE_FEATURE_SCRIPTING case

Change-Id: I5ef5c1ce2be3de7390322a4f4f7b78a484fd7396

diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index d64abd57fb53..969c93dd69c9 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -71,6 +71,8 @@
 
 using namespace ::com::sun::star;
 
+#if HAVE_FEATURE_SCRIPTING
+
 static bool isInVBAMode( ScDocShell& rDocSh )
 {
 uno::Reference xLibContainer = 
rDocSh.GetBasicContainer();
@@ -80,6 +82,8 @@ static bool isInVBAMode( ScDocShell& rDocSh )
 return false;
 }
 
+#endif
+
 class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper< 
container::XNameAccess >
 {
 uno::Any maWorkbook;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - configure.ac filter/source sfx2/source

[Libreoffice Gerrit user]

 configure.ac   |4 ++--
 filter/source/msfilter/msvbahelper.cxx |8 
 sfx2/source/doc/sfxbasemodel.cxx   |3 +++
 sfx2/source/view/viewfrm.cxx   |4 
 4 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit b6fa941a62c1f301982732f4d7ec1b42f9330af0
Author: Tor Lillqvist 
AuthorDate: Wed Sep 19 13:21:56 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 19 13:21:56 2018 +0300

Avoid unused functions in the !HAVE_FEATURE_SCRIPTING case

Change-Id: I4b3cb1d696adb7f9a6f35b8529e49d55bd5d957b

diff --git a/filter/source/msfilter/msvbahelper.cxx 
b/filter/source/msfilter/msvbahelper.cxx
index 6e611824e163..33ec4e3ce63a 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -78,6 +78,8 @@ static OUString trimMacroName( const OUString& rMacroName )
 return aMacroName;
 }
 
+#if HAVE_FEATURE_SCRIPTING
+
 static SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath )
 {
 SfxObjectShell* pFoundShell=nullptr;
@@ -224,6 +226,8 @@ static bool hasMacro( SfxObjectShell const * pShell, const 
OUString& sLibrary, O
 return bFound;
 }
 
+#endif
+
 OUString getDefaultProjectName( SfxObjectShell const * pShell )
 {
 OUString aPrjName;
@@ -236,6 +240,8 @@ OUString getDefaultProjectName( SfxObjectShell const * 
pShell )
 return aPrjName;
 }
 
+#if HAVE_FEATURE_SCRIPTING
+
 static void parseMacro( const OUString& sMacro, OUString& sContainer, 
OUString& sModule, OUString& sProcedure )
 {
 sal_Int32 nMacroDot = sMacro.lastIndexOf( '.' );
@@ -257,6 +263,8 @@ static void parseMacro( const OUString& sMacro, OUString& 
sContainer, OUString&
sProcedure = sMacro;
 }
 
+#endif
+
 OUString resolveVBAMacro( SfxObjectShell const * pShell, const OUString& 
rLibName, const OUString& rModuleName, const OUString& rMacroName )
 {
 #if !HAVE_FEATURE_SCRIPTING
commit 83dd72cb85dc8bcd797e62d7a28b8ec2cfdb700a
Author: Tor Lillqvist 
AuthorDate: Wed Sep 19 13:07:05 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 19 13:19:23 2018 +0300

Avoid unused function in the !HAVE_FEATURE_SCRIPTING case

Change-Id: Ic41be9447a8ac068d9616252ad3b17451234956e

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 76b24debb328..d1629aff7e8d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -579,6 +579,7 @@ Sequence< sal_Int8 > SAL_CALL 
SfxBaseModel::getImplementationId()
 
 //  XStarBasicAccess
 
+#if HAVE_FEATURE_SCRIPTING
 
 static Reference< script::XStarBasicAccess > implGetStarBasicAccess( 
SfxObjectShell const * pObjectShell )
 {
@@ -596,6 +597,8 @@ static Reference< script::XStarBasicAccess > 
implGetStarBasicAccess( SfxObjectSh
 return xRet;
 }
 
+#endif
+
 Reference< container::XNameContainer > SAL_CALL 
SfxBaseModel::getLibraryContainer()
 {
 #if !HAVE_FEATURE_SCRIPTING
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 32665471a75c..da991c1ee635 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2400,6 +2400,8 @@ void SfxViewFrame::Resize( bool bForce )
 }
 }
 
+#if HAVE_FEATURE_SCRIPTING
+
 #define LINE_SEP 0x0A
 
 static void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines )
@@ -2443,6 +2445,8 @@ static void CutLines( OUString& rStr, sal_Int32 
nStartLine, sal_Int32 nLines )
 }
 }
 
+#endif
+
 /*
 add new recorded dispatch macro script into the application global basic
 lib container. It generates a new unique id for it and insert the macro
commit 4a827917373377a99b2207bdb39ac266257215c4
Author: Tor Lillqvist 
AuthorDate: Wed Sep 19 12:44:29 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 19 13:19:22 2018 +0300

iOS SDK 12.0 is the current now

Also, I don't see why we would want to use -miphoneos-version-min=12.0
just because we build against the 12.0 SDK. Use 11.0 as the minimum
runtime iOS version for now.

Change-Id: I36b9696ce367249e7e8d0a51ee61791e32972390

diff --git a/configure.ac b/configure.ac
index 45773e34e15e..ec9d8b34d416 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2946,13 +2946,13 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=11.4
+current_sdk_ver=12.0
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=$current_sdk_ver
 else
 platform=iPhoneOS
-versionmin=-miphoneos-version-min=$current_sdk_ver
+versionmin=-miphoneos-version-min=11.0
 fi
 xcode_developer=`xcode-select -print-path`
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/bitmap/BitmapEmbossGreyFilter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 13ebc1b15a61d2607096c37b03f986a017ea
Author: Caolán McNamara 
AuthorDate: Tue Sep 18 10:08:47 2018 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 19 12:08:32 2018 +0200

emboss filter broken

since...

commit 4b183ae94821ed6d08708b43e4d719ffb4540843
Author: Chris Sherlock 
Date:   Fri Apr 20 21:00:46 2018 +1000

vcl: ImplEmbossGrey() -> BitmapEmbossGreyFilter

Change-Id: I6e541e9ca9cf61dfa8df9638a4ba4b8bd1d3ad71
Reviewed-on: https://gerrit.libreoffice.org/53204
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

Change-Id: If1a96d2165a3c003b9f3cb5a922d08c12156fd29
Reviewed-on: https://gerrit.libreoffice.org/60670
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx 
b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
index f64126ac978a..e238cbc15306 100644
--- a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
+++ b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
@@ -145,7 +145,7 @@ BitmapEx BitmapEmbossGreyFilter::execute(BitmapEx const& 
rBitmapEx)
 }
 
 if (bRet)
-return rBitmapEx;
+return BitmapEx(aBitmap);
 
 return BitmapEx();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/inc/node.hxx  |7 +-
 sw/source/core/crsr/callnk.cxx   |7 +-
 sw/source/core/crsr/crsrsh.cxx   |   66 -
 sw/source/core/crsr/crstrvl.cxx  |   70 ++-
 sw/source/core/crsr/pam.cxx  |   18 +-
 sw/source/core/crsr/swcrsr.cxx   |   30 ---
 sw/source/core/crsr/trvlfnfl.cxx |5 +
 sw/source/core/crsr/trvltbl.cxx  |5 +
 sw/source/core/crsr/viscrs.cxx   |   13 +++--
 sw/source/core/doc/DocumentFieldsManager.cxx |   10 +++
 sw/source/core/doc/docedt.cxx|2 
 sw/source/core/doc/docfld.cxx|9 ++-
 sw/source/core/doc/docfly.cxx|8 ++-
 sw/source/core/doc/doctxm.cxx|4 +
 sw/source/core/docnode/ndtbl1.cxx|6 +-
 sw/source/core/docnode/node.cxx  |   25 ++---
 sw/source/core/docnode/node2lay.cxx  |8 ++-
 sw/source/core/edit/editsh.cxx   |5 +
 sw/source/core/edit/edlingu.cxx  |8 ++-
 sw/source/core/edit/edsect.cxx   |3 -
 sw/source/core/fields/cellfml.cxx|3 -
 sw/source/core/fields/docufld.cxx|   17 +-
 sw/source/core/fields/reffld.cxx |8 +--
 sw/source/core/frmedt/fecopy.cxx |4 +
 sw/source/core/frmedt/fedesc.cxx |5 +
 sw/source/core/frmedt/fefly1.cxx |   17 --
 sw/source/core/frmedt/feshview.cxx   |6 +-
 sw/source/core/frmedt/fetab.cxx  |3 -
 sw/source/core/frmedt/fews.cxx   |6 +-
 sw/source/core/frmedt/tblsel.cxx |   59 +++---
 sw/source/core/inc/frmtool.hxx   |   16 +-
 sw/source/core/layout/atrfrm.cxx |   19 ++-
 sw/source/core/layout/flycnt.cxx |3 -
 sw/source/core/layout/flylay.cxx |2 
 sw/source/core/layout/frmtool.cxx|   18 +++---
 sw/source/core/layout/ftnfrm.cxx |2 
 sw/source/core/layout/pagedesc.cxx   |3 -
 sw/source/core/layout/trvlfrm.cxx|   17 +++---
 sw/source/core/tox/txmsrt.cxx|5 +
 sw/source/core/txtnode/ndtxt.cxx |2 
 sw/source/core/txtnode/txtedt.cxx|9 +++
 sw/source/core/undo/rolbck.cxx   |2 
 sw/source/core/view/vprint.cxx   |2 
 sw/source/uibase/uiview/viewling.cxx |5 +
 44 files changed, 377 insertions(+), 165 deletions(-)

New commits:
commit 049e522490129123a120704a001528a61cf088ec
Author: Michael Stahl 
AuthorDate: Tue Sep 18 16:21:44 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Sep 19 12:08:11 2018 +0200

sw: rework annoying GetFrameOfModify/getLayoutFrame parameters

The bCalcFrame is only evaluated if a pPoint is given; this is
surprising and should be more visible in the interface, so people don't
go on a goose chase to find places that may do formatting in
inappropriate places.

So put these parameters into a pair instead, which doesn't have
particularly good ergonomics in C++, particularly since compilers
warn about taking the address of a temporary object...

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

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index f46ea9132c71..43ceb38e724c 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -394,11 +394,10 @@ public:
 bool GoNext(SwIndex *, sal_uInt16 nMode ) const;
 bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const;
 
-/// Replacement for good old GetFrame(..):
+/// @see GetFrameOfModify
 SwContentFrame *getLayoutFrame( const SwRootFrame*,
-const Point* pDocPos = nullptr,
-const SwPosition *pPos = nullptr,
-const bool bCalcFrame = true ) const;
+const SwPosition *pPos = nullptr,
+std::pair const* pViewPosAndCalcFrame = nullptr) 
const;
 /** @return the real size of the frame or an empty rectangle if
no layout exists. Needed for export filters. */
 SwRect FindLayoutRect( const bool bPrtArea = false,
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index f1f7a3f200ef..4b2e963dd9e0 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -203,7 +203,7 @@ SwCallLink::~SwCallLink() COVERITY_NOEXCEPT_FALSE
 
 const SwFrame* pFrame;
 const SwFlyFrame *pFlyFrame;
-if( !rShell.ActionPend() && nullptr != ( pFrame = 
pCNd->getLayoutFrame(rShell.GetLayout(), nullptr, nullptr, false) ) &&
+if (!rShell.ActionPend() && nullptr != (pFrame = 
pCNd->getLayoutFrame(rShell.GetLayout(), nullptr, nullptr)) &&
 nullptr != ( pFlyFrame = pFrame

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

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/watermarkdialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fee5b79543de5e35299b1e3576209c77ef64a4d6
Author: Adolfo Jayme Barrientos 
AuthorDate: Wed Sep 19 05:04:14 2018 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 19 05:04:14 2018 -0500

tdf#112356 follow-up: Make the Help button work

Change-Id: I7181e07f8d817dd402eec8bd98e8526503455f5e

diff --git a/sw/uiconfig/swriter/ui/watermarkdialog.ui 
b/sw/uiconfig/swriter/ui/watermarkdialog.ui
index 60450a06b10d..8035c6b9d47f 100644
--- a/sw/uiconfig/swriter/ui/watermarkdialog.ui
+++ b/sw/uiconfig/swriter/ui/watermarkdialog.ui
@@ -247,6 +247,7 @@
 
   ok
   cancel
+  help
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 xmloff/source/text/XMLTextListAutoStylePool.cxx |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit e750c1f35bb2f6dcd9824a9a4d6adbaf72c44a34
Author: Noel Grandin 
AuthorDate: Wed Sep 19 09:11:54 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 19 11:58:42 2018 +0200

convert XMLTextListAutoStylePool_Impl to sorted_vector>

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

diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx 
b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index a2bd595bd969..3736a201ca74 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -118,8 +118,8 @@ 
XMLTextListAutoStylePoolEntry_Impl::XMLTextListAutoStylePoolEntry_Impl(
 struct XMLTextListAutoStylePoolEntryCmp_Impl
 {
 bool operator()(
-XMLTextListAutoStylePoolEntry_Impl* const& r1,
-XMLTextListAutoStylePoolEntry_Impl* const& r2 ) const
+std::unique_ptr const& r1,
+std::unique_ptr const& r2 ) 
const
 {
 if( r1->IsNamed() )
 {
@@ -137,7 +137,7 @@ struct XMLTextListAutoStylePoolEntryCmp_Impl
 }
 }
 };
-class XMLTextListAutoStylePool_Impl : public 
o3tl::sorted_vector {};
+class XMLTextListAutoStylePool_Impl : public 
o3tl::sorted_vector, 
XMLTextListAutoStylePoolEntryCmp_Impl> {};
 
 XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) :
 rExport( rExp ),
@@ -157,8 +157,6 @@ XMLTextListAutoStylePool::XMLTextListAutoStylePool( 
SvXMLExport& rExp ) :
 
 XMLTextListAutoStylePool::~XMLTextListAutoStylePool()
 {
-// The XMLTextListAutoStylePoolEntry_Impl object in the pool need delete 
explicitly in dtor.
-pPool->DeleteAndDestroyAll();
 }
 
 void XMLTextListAutoStylePool::RegisterName( const OUString& rName )
@@ -206,12 +204,12 @@ OUString XMLTextListAutoStylePool::Add(
 }
 else
 {
-XMLTextListAutoStylePoolEntry_Impl *pEntry =
+std::unique_ptr pEntry(
 new XMLTextListAutoStylePoolEntry_Impl( pPool->size(),
rNumRules, m_aNames, sPrefix,
-   nName );
-pPool->insert( pEntry );
+   nName ));
 sName = pEntry->GetName();
+pPool->insert( std::move(pEntry) );
 }
 
 return sName;
@@ -253,7 +251,7 @@ void XMLTextListAutoStylePool::exportXML() const
 sal_uInt32 i;
 for( i=0; i < nCount; i++ )
 {
-XMLTextListAutoStylePoolEntry_Impl *pEntry = (*pPool)[i];
+XMLTextListAutoStylePoolEntry_Impl *pEntry = (*pPool)[i].get();
 SAL_WARN_IF( pEntry->GetPos() >= nCount, "xmloff", "Illegal pos" );
 aExpEntries[pEntry->GetPos()] = pEntry;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx |   12 -
 chart2/source/controller/inc/dlg_ShapeParagraph.hxx |7 
 chart2/source/controller/main/ShapeController.cxx   |6 
 chart2/uiconfig/ui/paradialog.ui|  128 ++--
 4 files changed, 125 insertions(+), 28 deletions(-)

New commits:
commit 80761fd7cd574a2d71b5b0aeead5d6920db56707
Author: Caolán McNamara 
AuthorDate: Mon Sep 17 12:43:17 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 11:41:18 2018 +0200

weld ShapeParagraphDialog

Change-Id: I8c3b3c0f6c0cfe133e1ec8eda8c10bbbaee5f010
Reviewed-on: https://gerrit.libreoffice.org/60584
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx 
b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index 76a665775741..b203e13b3d7c 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -30,11 +30,9 @@ using namespace ::com::sun::star;
 namespace chart
 {
 
-ShapeParagraphDialog::ShapeParagraphDialog(vcl::Window* pParent,
+ShapeParagraphDialog::ShapeParagraphDialog(weld::Window* pParent,
 const SfxItemSet* pAttr)
-: SfxTabDialog(pParent, "ParagraphDialog",
-"modules/schart/ui/paradialog.ui", pAttr)
-, m_nTabPageId(0)
+: SfxTabDialogController(pParent, "modules/schart/ui/paradialog.ui", 
"ParagraphDialog", pAttr)
 {
 SvtCJKOptions aCJKOptions;
 
@@ -48,12 +46,12 @@ ShapeParagraphDialog::ShapeParagraphDialog(vcl::Window* 
pParent,
 {
 RemoveTabPage("labelTP_PARA_ASIAN");
 }
-m_nTabPageId = AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
+AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
 }
 
-void ShapeParagraphDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
+void ShapeParagraphDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
 {
-if (nId == m_nTabPageId)
+if (rId == "labelTP_TABULATOR")
 {
 SfxAllItemSet aSet( *( GetInputSetImpl()->GetPool() ) );
 TabulatorDisableFlags const nFlags(( TabulatorDisableFlags::TypeMask 
&~TabulatorDisableFlags::TypeLeft ) |
diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx 
b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
index d47d7098c729..14fbf5f0cc8c 100644
--- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
@@ -26,13 +26,12 @@ namespace chart
 
 /** dialog for paragraph properties of shapes
  */
-class ShapeParagraphDialog : public SfxTabDialog
+class ShapeParagraphDialog : public SfxTabDialogController
 {
 public:
-ShapeParagraphDialog(vcl::Window* pParent, const SfxItemSet* pAttr);
+ShapeParagraphDialog(weld::Window* pParent, const SfxItemSet* pAttr);
 private:
-virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override;
-sal_uInt16 m_nTabPageId;
+virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/main/ShapeController.cxx 
b/chart2/source/controller/main/ShapeController.cxx
index 04683e058481..1c082d84505b 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -547,10 +547,10 @@ void ShapeController::executeDispatch_ParagraphDialog()
 aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
 aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
 
-ScopedVclPtrInstance< ShapeParagraphDialog > pDlg( pChartWindow, 
&aNewAttr );
-if ( pDlg->Execute() == RET_OK )
+ShapeParagraphDialog aDlg(pChartWindow->GetFrameWeld(), &aNewAttr);
+if (aDlg.execute() == RET_OK)
 {
-const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
+const SfxItemSet* pOutAttr = aDlg.GetOutputItemSet();
 pDrawViewWrapper->SetAttributes( *pOutAttr );
 }
 }
diff --git a/chart2/uiconfig/ui/paradialog.ui b/chart2/uiconfig/ui/paradialog.ui
index f32fc5fa68d6..5e89c680dd44 100644
--- a/chart2/uiconfig/ui/paradialog.ui
+++ b/chart2/uiconfig/ui/paradialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -7,6 +7,9 @@
 6
 Paragraph
 dialog
+
+  
+
 
   
 False
@@ -17,12 +20,10 @@
 False
 end
 
-  
-gtk-ok
+  
+gtk-revert-to-saved
 True
 True
-True
-True
 True
 True
   
@@ -33,10 +34,12 @@
   
 
 
-  
-gtk-cancel
+  
+gtk-ok
 True
 True
+True
+True
 Tr

[Libreoffice-commits] core.git: framework/dtd

[Libreoffice Gerrit user]

 framework/dtd/menubar.dtd |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3c24038f0e5bbaf40050b46f75915346153bd9d1
Author: Christian Lohmaier 
AuthorDate: Mon Sep 10 19:05:42 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 19 10:58:08 2018 +0200

menu:style="radio" is used since 2010, update dtd to reality

menubar definitions using  menu:style="radio" attribute were
introduced with df4017a8fffb448cd2f202ed297754f275ca6be3 / the other
commits of that cws, but the dtd wasn't adjusted accordingly

Change-Id: I7c7e1b8116800ee20cfede431ed90ef8f213cce0
Reviewed-on: https://gerrit.libreoffice.org/60276
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/framework/dtd/menubar.dtd b/framework/dtd/menubar.dtd
index 12c615cfa374..b41431f6d0ef 100644
--- a/framework/dtd/menubar.dtd
+++ b/framework/dtd/menubar.dtd
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
+
+
 
 
 
@@ -34,4 +36,5 @@
menu:id CDATA #REQUIRED
menu:helpid CDATA #IMPLIED
menu:label CDATA #IMPLIED
+   menu:style %menustyle; #IMPLIED
 >
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/view/viewfrm.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 17d981d795f18422e1435180d42baeba509c1280
Author: Christian Lohmaier 
AuthorDate: Tue Sep 18 20:15:43 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 19 10:56:59 2018 +0200

add locale to joinus link so hub can redirect to language specific pages

Change-Id: Ibed6f899ad0219bf0211ac50c0595484ddba8c92
Reviewed-on: https://gerrit.libreoffice.org/60696
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 33cd93852e32..32665471a75c 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -91,6 +91,8 @@
 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
@@ -1369,7 +1371,8 @@ IMPL_LINK_NOARG(SfxViewFrame, GetInvolvedHandler, 
Button*, void)
 {
 try
 {
-sfx2::openUriExternally("https://hub.libreoffice.org/joinus";, false);
+OUString sURL("https://hub.libreoffice.org/joinus/?LOlocale="; + 
utl::ConfigManager::getLocale());
+sfx2::openUriExternally(sURL, false);
 }
 catch (const Exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/odfexport/data/tdf118393.odt   |binary
 sw/qa/extras/odfexport/odfexport.cxx|   47 +
 sw/qa/extras/ooxmlexport/data/tdf118393.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   51 
 sw/source/filter/ww8/wrtw8sty.cxx   |7 +++
 sw/source/filter/ww8/wrtww8.cxx |1 
 sw/source/filter/ww8/wrtww8.hxx |1 
 sw/source/filter/ww8/ww8atr.cxx |   29 +++
 8 files changed, 135 insertions(+), 1 deletion(-)

New commits:
commit fa8b2c533265a6d74e16ffae55673d6aa0fbf6a5
Author: Serge Krot 
AuthorDate: Wed Jun 27 11:18:41 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Sep 19 10:50:05 2018 +0200

tdf#118393: FILESAVE: DOCX Export loses header/footer

Change-Id: If47a2e4953e4b98f41c9115779522a755eea8192
Reviewed-on: https://gerrit.libreoffice.org/56522
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/qa/extras/odfexport/data/tdf118393.odt 
b/sw/qa/extras/odfexport/data/tdf118393.odt
new file mode 100755
index ..ff8d5400950b
Binary files /dev/null and b/sw/qa/extras/odfexport/data/tdf118393.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 6bc124027511..4727f2266750 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -1399,6 +1399,53 @@ DECLARE_ODFEXPORT_TEST(testFdo86963, "fdo86963.odt")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
 }
 
+// Check for correct header/footer with special first page with TOC inside:
+// - DECLARE_ODFEXPORT_TEST(testTdf118393, "tdf118393.odt")
+// - DECLARE_OOXMLEXPORT_TEST(testTdf118393, "tdf118393.odt")
+DECLARE_ODFEXPORT_TEST(testTdf118393, "tdf118393.odt")
+{
+CPPUNIT_ASSERT_EQUAL( 7, getPages() );
+
+// First page has no header/footer
+{
+xmlDocPtr pXmlDoc = parseLayoutDump();
+
+// check first page
+xmlXPathObjectPtr pXmlPage1Header = getXPathNode(pXmlDoc, 
"/root/page[1]/header");
+CPPUNIT_ASSERT_EQUAL(0, 
xmlXPathNodeSetGetLength(pXmlPage1Header->nodesetval));
+
+xmlXPathObjectPtr pXmlPage1Footer = getXPathNode(pXmlDoc, 
"/root/page[1]/footer");
+CPPUNIT_ASSERT_EQUAL(0, 
xmlXPathNodeSetGetLength(pXmlPage1Footer->nodesetval));
+
+// check second page in the same way
+xmlXPathObjectPtr pXmlPage2Header = getXPathNode(pXmlDoc, 
"/root/page[2]/header");
+CPPUNIT_ASSERT_EQUAL(1, 
xmlXPathNodeSetGetLength(pXmlPage2Header->nodesetval));
+
+xmlXPathObjectPtr pXmlPage2Footer = getXPathNode(pXmlDoc, 
"/root/page[2]/footer");
+CPPUNIT_ASSERT_EQUAL(1, 
xmlXPathNodeSetGetLength(pXmlPage2Footer->nodesetval));
+   }
+
+// All other pages should have header/footer
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[2]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[2]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[3]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[3]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[4]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[4]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[5]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[5]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[6]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[6]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[7]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[7]/footer/txt/text()"));
+}
+
 DECLARE_ODFEXPORT_TEST(testGerrit13858, "gerrit13858.odt")
 {
 // Just make sure the output is valid.
diff --git a/sw/qa/extras/ooxmlexport/data/tdf118393.odt 
b/sw/qa/extras/ooxmlexport/data/tdf118393.odt
new file mode 100644
index ..ff8d5400950b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf118393.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a1e2a5194904..c5d6b88db4b2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -90,6 +90,53 @@ DECLARE_OOXMLEXPORT_TEST(testFooterBodyDistance, 
"footer-body-distance.docx")
 assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:br", 1);
 }
 
+// Check for correct header/footer with special first page with TOC inside:
+// - DECLARE_ODFEXPORT_TEST(testTdf118393, "tdf118393.odt")
+// - DECL

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

[Libreoffice Gerrit user]

 include/o3tl/sorted_vector.hxx |   12 ++
 o3tl/qa/test-sorted_vector.cxx |   48 +
 2 files changed, 60 insertions(+)

New commits:
commit 0bc059f2a893d812e29d6a72d4f988428b5ea346
Author: Noel Grandin 
AuthorDate: Wed Sep 19 08:55:09 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 19 10:33:28 2018 +0200

implement find(T*) for o3tl::sorted_vector when it contains unique_ptr

and add some unit tests

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

diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx
index 254d627604df..7c95a1ace24e 100644
--- a/include/o3tl/sorted_vector.hxx
+++ b/include/o3tl/sorted_vector.hxx
@@ -224,6 +224,7 @@ class sorted_vector : public 
sorted_vector::sorted_vector;
+typedef sorted_vector super_sorted_vector;
 
 sorted_vector(sorted_vector const&) = delete;
 sorted_vector& operator=(sorted_vector const&) = delete;
@@ -231,6 +232,17 @@ public:
 sorted_vector() = default;
 sorted_vector(sorted_vector&&) = default;
 sorted_vector& operator=(sorted_vector&&) = default;
+
+/**
+ * implement find for sorted_vectors containing std::unique_ptr
+ */
+typename super_sorted_vector::const_iterator find( typename 
Value::element_type const * x ) const
+{
+Value tmp(const_cast(x));
+auto ret = super_sorted_vector::find(tmp);
+tmp.release();
+return ret;
+}
 };
 
 
diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index 3de3f005f6c6..dd622e0cea0d 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -12,7 +12,9 @@
 #include 
 #include 
 
+#include 
 #include 
+#include 
 
 using namespace ::o3tl;
 
@@ -250,6 +252,50 @@ public:
 CPPUNIT_ASSERT_EQUAL( static_cast(0), aVec.size() );
 }
 
+void testUniquePtr1()
+{
+o3tl::sorted_vector, 
o3tl::less_uniqueptr_to> aVec;
+
+auto str_c = 
aVec.insert(o3tl::make_unique("c")).first->get();
+auto str_b1 = 
aVec.insert(o3tl::make_unique("b")).first->get();
+CPPUNIT_ASSERT(!aVec.insert(o3tl::make_unique("b")).second);
+aVec.insert(o3tl::make_unique("a"));
+CPPUNIT_ASSERT_EQUAL( static_cast(3), aVec.size() );
+CPPUNIT_ASSERT_EQUAL( OUString("a"), *aVec[0] );
+CPPUNIT_ASSERT_EQUAL( OUString("b"), *aVec[1] );
+CPPUNIT_ASSERT_EQUAL( OUString("c"), *aVec[2] );
+
+CPPUNIT_ASSERT( aVec.find(str_c) != aVec.end() );
+CPPUNIT_ASSERT( aVec.find(str_b1) != aVec.end() );
+
+OUString tmp("b");
+CPPUNIT_ASSERT( aVec.find(&tmp) != aVec.end() );
+OUString tmp2("z");
+CPPUNIT_ASSERT( bool(aVec.find(&tmp2) == aVec.end()) );
+}
+
+void testUniquePtr2()
+{
+o3tl::sorted_vector, 
o3tl::less_uniqueptr_to,
+o3tl::find_partialorder_ptrequals> aVec;
+
+auto str_c = 
aVec.insert(o3tl::make_unique("c")).first->get();
+auto str_b1 = 
aVec.insert(o3tl::make_unique("b")).first->get();
+auto str_b2 = 
aVec.insert(o3tl::make_unique("b")).first->get();
+aVec.insert(o3tl::make_unique("a"));
+CPPUNIT_ASSERT_EQUAL( static_cast(4), aVec.size() );
+CPPUNIT_ASSERT_EQUAL( OUString("a"), *aVec[0] );
+CPPUNIT_ASSERT_EQUAL( OUString("b"), *aVec[1] );
+CPPUNIT_ASSERT_EQUAL( OUString("b"), *aVec[2] );
+CPPUNIT_ASSERT_EQUAL( OUString("c"), *aVec[3] );
+
+CPPUNIT_ASSERT( aVec.find(str_c) != aVec.end() );
+CPPUNIT_ASSERT( aVec.find(str_b1) != aVec.end() );
+CPPUNIT_ASSERT( aVec.find(str_b2) != aVec.end() );
+
+OUString tmp2("z");
+CPPUNIT_ASSERT( bool(aVec.find(&tmp2) == aVec.end()) );
+}
 
 // Change the following lines only, if you add, remove or rename
 // member functions of the current class,
@@ -262,6 +308,8 @@ public:
 CPPUNIT_TEST(testLowerBound);
 CPPUNIT_TEST(testBasics_FindPtr);
 CPPUNIT_TEST(testErase_FindPtr);
+CPPUNIT_TEST(testUniquePtr1);
+CPPUNIT_TEST(testUniquePtr2);
 CPPUNIT_TEST_SUITE_END();
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - common/FileUtil.cpp common/Log.cpp common/Session.cpp common/Unit.cpp common/Unit.hpp ios/config.h ios/ios.h ios/ios.mm kit/ChildSession.cpp kit/ChildSess

[Libreoffice Gerrit user]

 Mobile/Mobile.xcodeproj/project.pbxproj |  101 ++---
 Mobile/Mobile/AppDelegate.mm|   32 -
 Mobile/Mobile/Document.h|7 -
 Mobile/Mobile/Document.mm   |  109 +-
 Mobile/Mobile/DocumentViewController.mm |   80 ++---
 common/FileUtil.cpp |2 
 common/Log.cpp  |   20 +--
 common/Session.cpp  |2 
 common/Unit.cpp |4 
 common/Unit.hpp |4 
 ios/config.h|8 -
 ios/ios.h   |4 
 ios/ios.mm  |4 
 kit/ChildSession.cpp|2 
 kit/ChildSession.hpp|8 -
 kit/Kit.cpp |   37 +-
 kit/Kit.hpp |   34 -
 net/ServerSocket.hpp|   14 ++
 net/Socket.cpp  |  102 +
 net/Socket.hpp  |  127 +++--
 net/WebSocketHandler.hpp|   32 +
 wsd/ClientSession.cpp   |   10 -
 wsd/DocumentBroker.cpp  |   24 +---
 wsd/DocumentBroker.hpp  |   24 
 wsd/LOOLWSD.cpp |  185 ++--
 wsd/LOOLWSD.hpp |   14 ++
 wsd/Storage.cpp |   24 +++-
 wsd/TileCache.cpp   |2 
 28 files changed, 631 insertions(+), 385 deletions(-)

New commits:
commit 95eb84921728dec5b6f6c97e62974120b6fd1e3d
Author: Tor Lillqvist 
AuthorDate: Thu Sep 13 19:16:00 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 19 11:31:18 2018 +0300

Still more iOS app and related Online C++ code hacking

Re-think the plumbing between the different parts of the C++ Online
code. Do try to have it work more like in real Online on all but the
lowest socket level. Except that we don't have multiple processes, but
threads inside the same process. And instead of using actual system
sockets for WebSocket traffic between the threads, we use our own
FakeSocket things, with no WebSocket framing of messages.

Reduce the amount of #ifdef MOBILEAPP a bit also by compiling in the
UnitFoo things. Hardcode that so that no unit testing is ever
attempted, though. We don't try to dlopen any library.

Corresponding changes in the app Objective-C code. Plus fixes and
functionality improvements.

Now it gets so far that the JavaScript code thinks it has the document
tiles presented, and doesn't crash. But it hangs occasionally. And all
tiles show up blank.

Anyway, progress.

Change-Id: I769497c9a46ddb74984bc7af36d132b7b43895d4

diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj 
b/Mobile/Mobile.xcodeproj/project.pbxproj
index 0d2062dff..da86e716c 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -57,6 +57,8 @@
BEA283582146945500848631 /* ChildSession.cpp in Sources */ = 
{isa = PBXBuildFile; fileRef = BEA283572146945500848631 /* ChildSession.cpp */; 
};
BEA2835A21470A1C00848631 /* WebKit.framework in Frameworks */ = 
{isa = PBXBuildFile; fileRef = BEA2835921470A1C00848631 /* WebKit.framework */; 
};
BEA2835D21498AD400848631 /* Socket.cpp in Sources */ = {isa = 
PBXBuildFile; fileRef = BEA2835C21498AD400848631 /* Socket.cpp */; };
+   BEA28360214ACA8500848631 /* FakeSocket.cpp in Sources */ = {isa 
= PBXBuildFile; fileRef = BEA2835F214ACA8500848631 /* FakeSocket.cpp */; };
+   BEA28377214FFD8C00848631 /* Unit.cpp in Sources */ = {isa = 
PBXBuildFile; fileRef = BEA28376214FFD8C00848631 /* Unit.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -84,6 +86,7 @@
BE5EB5D521401E0F00E0826C /* Storage.cpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
path = Storage.cpp; sourceTree = ""; };
BE5EB5D92140363100E0826C /* ios.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
name = ios.mm; path = ../../ios/ios.mm; sourceTree = ""; };
BE5EB5DB2140480B00E0826C /* icudt62l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt62l.dat; path = 
"$(LOBUILDDIR)/workdir/CustomTarget/ios/resources/icudt62l.dat"; sourceTree = 
""; };
+   BE636210215101D000F4237E /* WebSocketHandler.hpp */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path 
= WebSocketHandler.hpp; sourceTree = ""; };
BE8D77272136762500AC58EA /* Mobile.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = Mobile.app; sourceTree = BUILT_PRODUCTS_DIR; };

Supplier Surveillance, Cristi Posea (CppUnit)---ID# 100580 to 100580

[Larrabee, Kevin P]

I am a member of the Product Selection & Sustainment group at Lockheed Martin 
RMS.  Our charter is to provide market surveillance and product obsolescence 
information to Lockheed Martin programs so that they may understand the product 
availability and supportability of their systems.

Any changes to the items listed in the attached spreadsheet may affect our 
system performance and need to be tested and verified.  Please review the item 
information listed and provide updates as needed.  Please identify any upcoming 
changes to part numbers or components as well as any Product Change Notices 
(PCN) or Drawing/Specification Changes.  This includes but is not limited to 
changes in Form, Fit, Function, materials, and processes.  If specific end of 
sale and end of support dates are not available please supply product market 
entry dates and maturity levels so that we may perform end of sale forecasting 
using our predictive tools.

Your timely response is critical to Lockheed Martin and the supportability 
assessment of its programs.  Please don't hesitate to contact me if you have 
any questions.

Sincerely,

Lockheed Martin RMS Market Surveillance Team

Hello.
My name is Kevin, I monitor products for their end of sale point for my 
company, Lockheed Martin. I am a member of the Product Selection & Sustainment 
group at Lockheed Martin MST.  Our charter is to provide market surveillance 
and product obsolescence information to Lockheed Martin programs so that they 
may understand the product availability and supportability of their systems.

Any changes to the items listed in the attached spreadsheet may affect our 
system performance and need to be tested and verified.  Please review the item 
information listed and provide updates as needed.  Please identify any upcoming 
changes to part numbers or components as well as any Product Change Notices 
(PCN).  If specific end of sale and end of support dates are not available 
please supply product market entry dates and maturity levels so that we may 
perform end of sale forecasting using our predictive tools.

Has there been any significant changes in the attachment.
Please reply “ No Changes” if that is the case.
Alternatively,,,
It would help our effort tremendously if you could provide the following 
information:

Are the software products :
➢ Currently available?
➢ Currently supported?
If applicable, are there newer software versions?
• What is the current naming convention of the new software?
• What was the release date of the newer software version?
• How long is the newer software expected to be supported?
Thank you very much.
Have a great day.
Kevin
v/r
Kevin P. Larrabee
Lockheed Martin Rotary / Mission Systems
kevin.p.larra...@lmco.com
Cell (619) 384-7757
Desk (858) 267-5341








3284-Crist.xlsx
Description: 3284-Crist.xlsx
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 svl/source/items/itemiter.cxx   |2 
 sw/inc/calbck.hxx   |2 
 sw/inc/crsrsh.hxx   |   23 
 sw/inc/docary.hxx   |4 
 sw/inc/hints.hxx|   24 
 sw/inc/ndarr.hxx|3 
 sw/inc/ndgrf.hxx|3 
 sw/inc/ndole.hxx|4 
 sw/inc/ndtxt.hxx|   12 
 sw/inc/node.hxx |   22 
 sw/inc/redline.hxx  |   10 
 sw/inc/shellio.hxx  |1 
 sw/inc/swcrsr.hxx   |   42 -
 sw/inc/unocrsr.hxx  |6 
 sw/qa/core/uwriter.cxx  |   55 +-
 sw/source/core/attr/calbck.cxx  |2 
 sw/source/core/attr/hints.cxx   |   10 
 sw/source/core/crsr/crsrsh.cxx  |  136 -
 sw/source/core/crsr/crstrvl1.cxx|   64 +-
 sw/source/core/crsr/swcrsr.cxx  |  434 ++--
 sw/source/core/crsr/trvlfnfl.cxx|   10 
 sw/source/core/crsr/viscrs.cxx  |3 
 sw/source/core/doc/CntntIdxStore.cxx|   36 -
 sw/source/core/doc/DocumentContentOperationsManager.cxx |  266 ++---
 sw/source/core/doc/DocumentOutlineNodesManager.cxx  |4 
 sw/source/core/doc/DocumentRedlineManager.cxx   |  145 -
 sw/source/core/doc/docedt.cxx   |9 
 sw/source/core/doc/docredln.cxx |  114 ++--
 sw/source/core/doc/docsort.cxx  |2 
 sw/source/core/doc/doctxm.cxx   |2 
 sw/source/core/doc/tblrwcl.cxx  |2 
 sw/source/core/docnode/ndcopy.cxx   |4 
 sw/source/core/docnode/ndsect.cxx   |   23 
 sw/source/core/docnode/ndtbl.cxx|   56 +-
 sw/source/core/docnode/node.cxx |   50 +
 sw/source/core/docnode/node2lay.cxx |   25 
 sw/source/core/docnode/nodes.cxx|   33 -
 sw/source/core/docnode/section.cxx  |2 
 sw/source/core/draw/dcontact.cxx|8 
 sw/source/core/edit/eddel.cxx   |2 
 sw/source/core/edit/edglss.cxx  |2 
 sw/source/core/edit/editsh.cxx  |   14 
 sw/source/core/fields/chpfld.cxx|2 
 sw/source/core/fields/reffld.cxx|4 
 sw/source/core/frmedt/fecopy.cxx|2 
 sw/source/core/graphic/ndgrf.cxx|9 
 sw/source/core/inc/DocumentRedlineManager.hxx   |6 
 sw/source/core/inc/frmtool.hxx  |   15 
 sw/source/core/inc/ftnboss.hxx  |2 
 sw/source/core/inc/ftnfrm.hxx   |   10 
 sw/source/core/inc/mvsave.hxx   |   12 
 sw/source/core/inc/node2lay.hxx |   21 
 sw/source/core/inc/txtfrm.hxx   |   40 +
 sw/source/core/layout/atrfrm.cxx|   22 
 sw/source/core/layout/frmtool.cxx   |  162 -
 sw/source/core/layout/ftnfrm.cxx|   20 
 sw/source/core/layout/newfrm.cxx|3 
 sw/source/core/layout/pagedesc.cxx  |6 
 sw/source/core/layout/ssfrm.cxx |   20 
 sw/source/core/layout/trvlfrm.cxx   |5 
 sw/source/core/layout/wsfrm.cxx |  330 +++-
 sw/source/core/ole/ndole.cxx|9 
 sw/source/core/text/atrstck.cxx |   13 
 sw/source/core/text/frmpaint.cxx|9 
 sw/source/core/text/itratr.cxx  |   65 +-
 sw/source/core/text/itrcrsr.cxx |   10 
 sw/source/core/text/pormulti.cxx|2 
 sw/source/core/text/porrst.cxx  |3 
 sw/source/core/text/redlnitr.cxx|  148 +
 sw/source/core/text/txtfrm.cxx  |  335 ++--
 sw/source/core/tox/txmsrt.cxx   |2 
 sw/source/core/txtnode/atrftn.cxx   |8 
 sw/source/core/txtnode/ndtxt.cxx|  377 +
 sw/source/core/txtnode/thints.cxx   |2 
 sw/source/core/txtnode/txtedt.cxx   |   29 -
 sw/source/core/undo/und

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 75 commits - sw/inc sw/qa sw/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit f62ba688ca1c22fcdcf7efd811d702e982799882
Author: Michael Stahl 
AuthorDate: Tue Sep 18 16:21:44 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Sep 19 10:08:55 2018 +0200

sw: rework annoying GetFrameOfModify/getLayoutFrame parameters

The bCalcFrame is only evaluated if a pPoint is given; this is
surprising and should be more visible in the interface, so people don't
go on a goose chase to find places that may do formatting in
inappropriate places.

So put these parameters into a pair instead, which doesn't have
particularly good ergonomics in C++, particularly since compilers
warn about taking the address of a temporary object...

Change-Id: I101c6eeb5bd6baf83c2bd9a6cb91ccaa04036cc3

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index f46ea9132c71..43ceb38e724c 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -394,11 +394,10 @@ public:
 bool GoNext(SwIndex *, sal_uInt16 nMode ) const;
 bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const;
 
-/// Replacement for good old GetFrame(..):
+/// @see GetFrameOfModify
 SwContentFrame *getLayoutFrame( const SwRootFrame*,
-const Point* pDocPos = nullptr,
-const SwPosition *pPos = nullptr,
-const bool bCalcFrame = true ) const;
+const SwPosition *pPos = nullptr,
+std::pair const* pViewPosAndCalcFrame = nullptr) 
const;
 /** @return the real size of the frame or an empty rectangle if
no layout exists. Needed for export filters. */
 SwRect FindLayoutRect( const bool bPrtArea = false,
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index f1f7a3f200ef..4b2e963dd9e0 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -203,7 +203,7 @@ SwCallLink::~SwCallLink() COVERITY_NOEXCEPT_FALSE
 
 const SwFrame* pFrame;
 const SwFlyFrame *pFlyFrame;
-if( !rShell.ActionPend() && nullptr != ( pFrame = 
pCNd->getLayoutFrame(rShell.GetLayout(), nullptr, nullptr, false) ) &&
+if (!rShell.ActionPend() && nullptr != (pFrame = 
pCNd->getLayoutFrame(rShell.GetLayout(), nullptr, nullptr)) &&
 nullptr != ( pFlyFrame = pFrame->FindFlyFrame() ) && 
!rShell.IsTableMode() )
 {
 const SwNodeIndex* pIndex = 
pFlyFrame->GetFormat()->GetContent().GetContentIdx();
@@ -220,9 +220,10 @@ SwCallLink::~SwCallLink() COVERITY_NOEXCEPT_FALSE
 }
 }
 
-long SwCallLink::getLayoutFrame( const SwRootFrame* pRoot, SwTextNode const & 
rNd, sal_Int32 nCntPos, bool bCalcFrame )
+long SwCallLink::getLayoutFrame(const SwRootFrame* pRoot,
+SwTextNode const & rNd, sal_Int32 nCntPos, bool /*bCalcFrame*/)
 {
-SwTextFrame* pFrame = 
static_cast(rNd.getLayoutFrame(pRoot,nullptr,nullptr,bCalcFrame));
+SwTextFrame* pFrame = static_cast(rNd.getLayoutFrame(pRoot, 
nullptr, nullptr));
 SwTextFrame* pNext;
 if ( pFrame && !pFrame->IsHiddenNow() )
 {
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 90348e42189d..565acb6d60fd 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -623,8 +623,9 @@ bool SwCursorShell::MovePage( SwWhichPage fnWhichPage, 
SwPosPage fnPosPage )
 
 SwCursorSaveState aSaveState( *m_pCurrentCursor );
 Point& rPt = m_pCurrentCursor->GetPtPos();
+std::pair tmp(rPt, false);
 SwContentFrame * pFrame = m_pCurrentCursor->GetContentNode()->
-getLayoutFrame( GetLayout(), &rPt, 
m_pCurrentCursor->GetPoint(), false );
+getLayoutFrame(GetLayout(), m_pCurrentCursor->GetPoint(), &tmp);
 if( pFrame && ( bRet = GetFrameInPage( pFrame, fnWhichPage,
fnPosPage, m_pCurrentCursor )  ) &&
 !m_pCurrentCursor->IsSelOvr( SwCursorSelOverFlags::Toggle |
@@ -639,8 +640,10 @@ bool SwCursorShell::MovePage( SwWhichPage fnWhichPage, 
SwPosPage fnPosPage )
 bool SwCursorShell::isInHiddenTextFrame(SwShellCursor* pShellCursor)
 {
 SwContentNode *pCNode = pShellCursor->GetContentNode();
-SwContentFrame  *pFrame = pCNode ?
-pCNode->getLayoutFrame( GetLayout(), &pShellCursor->GetPtPos(), 
pShellCursor->GetPoint(), false ) : nullptr;
+std::pair tmp(pShellCursor->GetPtPos(), false);
+SwContentFrame *const pFrame = pCNode
+? pCNode->getLayoutFrame(GetLayout(), pShellCursor->GetPoint(), &tmp)
+: nullptr;
 return !pFrame || (pFrame->IsTextFrame() && 
static_cast(pFrame)->IsHiddenNow());
 }
 
@@ -650,9 +653,9 @@ static bool IsAtStartOrEndOfFrame(SwCursorShell const*const 
pShell,
 {
 SwContentNode *const pCNode = pShellCursor->GetContentNode();
 assert(pCNode); // surely can't have moved otherwise?
+std::pair tmp(pShellCursor->GetPtPos(), false);
 SwContentFrame const*const pFrame = pCNode->getLayoutFrame(
-pShell->Ge

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

[Libreoffice Gerrit user]

 extras/source/autocorr/lang/tr/DocumentList.xml |  114 +++-
 1 file changed, 112 insertions(+), 2 deletions(-)

New commits:
commit 4c8d1d2fa99aca14464c1d5f0283c1d0357cfa33
Author: Ulkem Kasapoglu 
AuthorDate: Tue Sep 11 14:39:43 2018 +0300
Commit: Muhammet Kara 
CommitDate: Wed Sep 19 10:12:24 2018 +0200

Uppercase versions of the lowercase letter are added to Turkish AutoCorrect

Change-Id: I6ab6106b071e1007b8449a90586f624c38e5f207
Reviewed-on: https://gerrit.libreoffice.org/60309
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml 
b/extras/source/autocorr/lang/tr/DocumentList.xml
index 965e5060e416..984f8e00c5ce 100644
--- a/extras/source/autocorr/lang/tr/DocumentList.xml
+++ b/extras/source/autocorr/lang/tr/DocumentList.xml
@@ -4,119 +4,229 @@
   
   
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
+  
   
+  
   
   
+  
   
+  
+  
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
+  
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
-  
+  
+  
   
+  
+  
   
   
+  
+  
   
+  
   
   
+  
   
+  http://"/>
   http://"/>
+  
   
+  
   
+  
   
   
+  
+  
   
   
+  
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
+  
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
-  
+  
   
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
+  
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
+  
+  
   
+  
   
+  
   
+  
   
   
+  
+  
   
+  
   
   
+  
+  
   
   
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/quartz vcl/source vcl/unx vcl/win

[Libreoffice Gerrit user]

 vcl/inc/sft.hxx |7 ---
 vcl/quartz/salgdi.cxx   |6 +++---
 vcl/quartz/salgdicommon.cxx |   12 ++--
 vcl/source/fontsubset/sft.cxx   |   22 +-
 vcl/unx/generic/fontmanager/fontmanager.cxx |   12 ++--
 vcl/win/gdi/salfont.cxx |   18 +-
 6 files changed, 33 insertions(+), 44 deletions(-)

New commits:
commit d469dca492e55798251c7f570bb730a38c32e893
Author: Noel Grandin 
AuthorDate: Sat Sep 15 21:14:33 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 19 10:09:33 2018 +0200

loplugin:useuniqueptr in GetTTSimpleGlyphMetrics

and only return the advance, we don't use the other field

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

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index c09834adeaef..00cf119a4ca4 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -49,6 +49,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -113,7 +114,7 @@ namespace vcl
 OVERLAP_COMPOUND  = 1<<10
 };
 
-/** Structure used by GetTTSimpleGlyphMetrics() and GetTTSimpleCharMetrics() 
functions */
+/** Structure used by GetTTSimpleCharMetrics() functions */
 typedef struct {
 sal_uInt16 adv; /**< advance width or height   
 */
 sal_Int16 sb;   /**< left or top sidebearing   
 */
@@ -377,7 +378,7 @@ namespace vcl
intnGlyphs);
 
 /**
- * Queries glyph metrics. Allocates an array of TTSimpleGlyphMetrics structs 
and returns it.
+ * Queries glyph metrics. Allocates an array of advance width/height values 
and returns it.
  *
  * @param ttf pointer to the TrueTypeFont structure
  * @param glyphArray  pointer to an array of glyphs that are to be extracted 
from ttf
@@ -386,7 +387,7 @@ namespace vcl
  * @ingroup sft
  *
  */
-TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont const *ttf, 
const sal_uInt16 *glyphArray, int nGlyphs, bool vertical);
+std::unique_ptr GetTTSimpleGlyphMetrics(TrueTypeFont const 
*ttf, const sal_uInt16 *glyphArray, int nGlyphs, bool vertical);
 
 #if defined(_WIN32) || defined(MACOSX) || defined(IOS)
 /**
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index db595a5aa37b..43ca506220c9 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -756,15 +756,15 @@ void AquaSalGraphics::GetGlyphWidths( const 
PhysicalFontFace* pFontData, bool bV
 aGlyphIds[i] = static_cast(i);
 }
 
-const TTSimpleGlyphMetrics* pGlyphMetrics = ::GetTTSimpleGlyphMetrics( 
pSftFont, &aGlyphIds[0],
+std::unique_ptr pGlyphMetrics = 
::GetTTSimpleGlyphMetrics( pSftFont, &aGlyphIds[0],

nGlyphCount, bVertical );
 if( pGlyphMetrics )
 {
 for( int i = 0; i < nGlyphCount; ++i )
 {
-rGlyphWidths[i] = pGlyphMetrics[i].adv;
+rGlyphWidths[i] = pGlyphMetrics[i];
 }
-free( const_cast(pGlyphMetrics) );
+pGlyphMetrics.reset();
 }
 
 rtl::Reference rCTFontData(new 
CoreTextFontFace(*pFontData, pFontData->GetFontId()));
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 59d836506b52..2d952244847e 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -302,21 +302,21 @@ bool AquaSalGraphics::CreateFontSubset( const OUString& 
rToFile,
 
 // fill the pGlyphWidths array
 // while making sure that the NotDef glyph is at index==0
-TTSimpleGlyphMetrics* pGlyphMetrics = ::GetTTSimpleGlyphMetrics( pSftFont, 
aShortIDs,
+std::unique_ptr pGlyphMetrics = ::GetTTSimpleGlyphMetrics( 
pSftFont, aShortIDs,
  
nGlyphCount, bVertical );
 if( !pGlyphMetrics )
 {
 return false;
 }
 
-sal_uInt16 nNotDefAdv = pGlyphMetrics[0].adv;
-pGlyphMetrics[0].adv = pGlyphMetrics[nNotDef].adv;
-pGlyphMetrics[nNotDef].adv  = nNotDefAdv;
+sal_uInt16 nNotDefAdv = pGlyphMetrics[0];
+pGlyphMetrics[0] = pGlyphMetrics[nNotDef];
+pGlyphMetrics[nNotDef]  = nNotDefAdv;
 for( int i = 0; i < nOrigCount; ++i )
 {
-pGlyphWidths[i] = pGlyphMetrics[i].adv;
+pGlyphWidths[i] = pGlyphMetrics[i];
 }
-free( pGlyphMetrics );
+pGlyphMetrics.reset();
 
 // write subset into destination file
 nRC = ::CreateTTFromTTGlyphs( pSftFont, aToFile.getStr(), aShortIDs,
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 40a5e0bf0999..1f3634b38320 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2306,7 +23

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

[Libreoffice Gerrit user]

 vcl/quartz/utils.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 21614aadc2b7a7bb6d2e00a5a081d8d233e4384b
Author: Noel Grandin 
AuthorDate: Sat Sep 15 17:28:30 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 19 09:59:38 2018 +0200

use unique_ptr in GetOUString

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

diff --git a/vcl/quartz/utils.cxx b/vcl/quartz/utils.cxx
index bbb29170a8b5..0e0ac8f4d90a 100644
--- a/vcl/quartz/utils.cxx
+++ b/vcl/quartz/utils.cxx
@@ -46,12 +46,11 @@ OUString GetOUString( CFStringRef rStr )
 return OUString( reinterpret_cast(pConstStr), 
nLength );
 }
 
-UniChar* pStr = static_cast( std::malloc( 
sizeof(UniChar)*nLength ) );
+std::unique_ptr pStr(new UniChar[nLength]);
 CFRange aRange = { 0, nLength };
-CFStringGetCharacters( rStr, aRange, pStr );
+CFStringGetCharacters( rStr, aRange, pStr.get() );
 
-OUString aRet( reinterpret_cast(pStr), nLength );
-std::free( pStr );
+OUString aRet( reinterpret_cast(pStr.get()), nLength );
 return aRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Why is syntax error 'assert(false, "some text")' not discovered by Visual Studio?

[Regina Henschel]

Hi,

Tor Lillqvist schrieb am 19-Sep-18 um 08:04:

But even if assert(e) expands to nothing, the compiler should report an
error if you pass two arguments to the assert macro that takes just one.
At least Clang on macOS and gcc on Linux do:

assert.cpp:5:17: error: too many arguments provided to function-like
macro invocation
  assert(false, "sdsdf");

and

assert.cpp:5:24: error: macro "assert" passed 2 arguments, but takes just 1
   assert(false, "sdsdf");

In the NDEBUG case, where assert is defined as:

#define assert(e)   ((void)0)

and

# define assert(expr)   (__ASSERT_VOID_CAST (0))

Regina, try adding some very obvious syntax error, some foo bar zap,
after the assert(false, "Standard layer may not be deleted.");, to see
if that line even is compiled.


The line
assert(false, "Standard layer may not be deleted.")+1;
produces an error.

And I have seen now in an isolated 'make sd.build', that the line
assert(false, "Standard layer may not be deleted.");
produces a
warning C4002: too many arguments for function-like macro invocation 
'assert'


It is likely that I have not noticed the warning in the jumble of output 
of a full build.


Nevertheless, it is corrected and I hope Jenkins will success now.

Thanks for your help.
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/scgeneralpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 993d7346c5d2f901cb26357b7a75ffc20aba1ae6
Author: Cor Nouws 
AuthorDate: Wed Jun 6 22:24:09 2018 +0200
Commit: Heiko Tietze 
CommitDate: Wed Sep 19 09:47:12 2018 +0200

tdf#113235 - new attempt: More useful description for Calc option "Use 
legacy

cursor movement behavior when selecting" - thanks to the UX meeting for
coming up with the solution

Change-Id: Id400bcd83b77cab154d2d6cb82207bfe7e90da98
Reviewed-on: https://gerrit.libreoffice.org/60440
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui 
b/sc/uiconfig/scalc/ui/scgeneralpage.ui
index 86ce8e0ff377..e395bb2a511c 100644
--- a/sc/uiconfig/scalc/ui/scgeneralpage.ui
+++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui
@@ -343,7 +343,7 @@
 
 
   
-Use legacy cursor movement 
behavior when selecting
+Position cell reference with 
selection
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/CustomTarget_qt5_moc.mk vcl/inc vcl/qt5

[Libreoffice Gerrit user]

 vcl/CustomTarget_qt5_moc.mk |1 +
 vcl/inc/qt5/Qt5Frame.hxx|   12 +++-
 vcl/inc/qt5/Qt5Timer.hxx|6 --
 vcl/qt5/Qt5Frame.cxx|   15 +++
 vcl/qt5/Qt5Timer.cxx|   23 +--
 5 files changed, 36 insertions(+), 21 deletions(-)

New commits:
commit b7d1371910dad02c05bfd9ecd65a73de97871b9c
Author: Jan-Marek Glogowski 
AuthorDate: Tue Sep 18 11:25:05 2018 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Wed Sep 19 09:44:36 2018 +0200

Qt5 minimal initial fix for Java UNO

This is just a minimal fix for Qt errors from JunitTest_svx_unoapi,
which was manipulating Qt5Timer and other timers, resulting in a
spew of timer error messages like:

QObject::killTimer: Timers cannot be stopped from another thread
QObject::startTimer: Timers cannot be started from another thread
QBasicTimer::start: QBasicTimer can only be used with threads started with 
QThread

Eventually all the QWidget manipulation in the Qt5Frame must be
redirected to the main thread, just like Qt5FilePicker already does.

Change-Id: I66054e6c90f99d27bd5818dcaa5876c515867f77
Reviewed-on: https://gerrit.libreoffice.org/60672
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/CustomTarget_qt5_moc.mk b/vcl/CustomTarget_qt5_moc.mk
index afce4d44fd2b..1ef8b89f9f48 100644
--- a/vcl/CustomTarget_qt5_moc.mk
+++ b/vcl/CustomTarget_qt5_moc.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/qt5))
 
 $(call gb_CustomTarget_get_target,vcl/qt5) : \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5FilePicker.moc \
+   $(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Frame.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Instance.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5MainWindow.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Menu.moc \
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 0eb796330e38..577a9cce2fde 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 
+#include 
+
 class Qt5Graphics;
 class Qt5Instance;
 class Qt5Menu;
@@ -37,8 +39,10 @@ class QScreen;
 class QImage;
 class SvpSalGraphics;
 
-class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
+class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame
 {
+Q_OBJECT
+
 friend class Qt5Widget;
 
 QWidget* m_pQWidget;
@@ -90,6 +94,12 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
 void TriggerPaintEvent();
 void TriggerPaintEvent(QRect aRect);
 
+private Q_SLOTS:
+void setVisible(bool);
+
+Q_SIGNALS:
+void setVisibleSignal(bool);
+
 public:
 Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nSalFrameStyle, bool 
bUseCairo);
 virtual ~Qt5Frame() override;
diff --git a/vcl/inc/qt5/Qt5Timer.hxx b/vcl/inc/qt5/Qt5Timer.hxx
index 43613d8cf4a1..9d68f0b200c5 100644
--- a/vcl/inc/qt5/Qt5Timer.hxx
+++ b/vcl/inc/qt5/Qt5Timer.hxx
@@ -30,10 +30,12 @@ class Qt5Timer final : public QObject, public SalTimer
 
 private Q_SLOTS:
 void timeoutActivated();
-void startTimer();
+void startTimer(int);
+void stopTimer();
 
 Q_SIGNALS:
-void startTimerSignal();
+void startTimerSignal(int);
+void stopTimerSignal();
 
 public:
 Qt5Timer();
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 3365ed4af3b8..b42ec5e08a0c 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 
 #include 
 #include 
@@ -108,6 +109,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags 
nStyle, bool bUseCairo)
 }
 else
 m_pQWidget = new Qt5Widget(*this, aWinFlags);
+connect(this, SIGNAL(setVisibleSignal(bool)), SLOT(setVisible(bool)));
 
 if (pParent && !(pParent->m_nStyle & SalFrameStyleFlags::PLUG))
 {
@@ -301,6 +303,14 @@ void Qt5Frame::DrawMenuBar() { /* not needed */}
 
 void Qt5Frame::SetExtendedFrameStyle(SalExtStyle /*nExtStyle*/) { /* not 
needed */}
 
+void Qt5Frame::setVisible(bool bVisible)
+{
+if (m_pTopLevel)
+m_pTopLevel->setVisible(bVisible);
+else
+m_pQWidget->setVisible(bVisible);
+}
+
 void Qt5Frame::Show(bool bVisible, bool /*bNoActivate*/)
 {
 assert(m_pQWidget);
@@ -308,10 +318,7 @@ void Qt5Frame::Show(bool bVisible, bool /*bNoActivate*/)
 if (m_bDefaultSize)
 SetDefaultSize();
 
-if (m_pTopLevel)
-m_pTopLevel->setVisible(bVisible);
-else
-m_pQWidget->setVisible(bVisible);
+Q_EMIT setVisibleSignal(bVisible);
 }
 
 void Qt5Frame::SetMinClientSize(long nWidth, long nHeight)
diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx
index 6a9faf829342..7fcb7e17dcda 100644
--- a/vcl/qt5/Qt5Timer.cxx
+++ b/vcl/qt5/Qt5Timer.cxx
@@ -24,14 +24,14 @@
 #include 
 
 #include 
+#include 
 
 Qt5Timer::Qt5Timer()
 {
 m_aTimer.setSingleShot(true);
-// run the timer itself in the main / creator

[Libreoffice-commits] online.git: net/WebSocketHandler.hpp

[Libreoffice Gerrit user]

 net/WebSocketHandler.hpp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a4f19ac22988712859008e83ce3df161a48d89c2
Author: Tor Lillqvist 
AuthorDate: Wed Sep 19 10:30:19 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 19 10:33:41 2018 +0300

Avoid double "0x" prefix for pointer values in log output

No need for explicit "0x" and std::hex when outputting a pointer. A
pointer will be output as a hex number anyway. We used to have things
like this in the log:

TRC  #25 Connected to WS Handler 0x0x3610b60| ./net/WebSocketHandler.hpp:80

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 0bb0ddc1f..104c9b879 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -77,7 +77,7 @@ public:
 void onConnect(const std::shared_ptr& socket) override
 {
 _socket = socket;
-LOG_TRC("#" << socket->getFD() << " Connected to WS Handler 0x" << 
std::hex << this << std::dec);
+LOG_TRC("#" << socket->getFD() << " Connected to WS Handler " << this);
 }
 
 /// Status codes sent to peer on shutdown.
@@ -104,7 +104,7 @@ public:
 std::shared_ptr socket = _socket.lock();
 if (socket == nullptr)
 {
-LOG_ERR("No socket associated with WebSocketHandler 0x" << 
std::hex << this << std::dec);
+LOG_ERR("No socket associated with WebSocketHandler " << this);
 return;
 }
 
@@ -309,7 +309,7 @@ public:
 std::shared_ptr socket = _socket.lock();
 if (socket == nullptr)
 {
-LOG_ERR("No socket associated with WebSocketHandler 0x" << 
std::hex << this << std::dec);
+LOG_ERR("No socket associated with WebSocketHandler " << this);
 }
 else if (_isClient && !socket->isWebSocket())
 handleClientUpgrade();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/pdfium

[Libreoffice Gerrit user]

 download.lst   |4 
 external/pdfium/0001-Add-FPDFFormObj_CountObjects-API.patch.1  |   77 
 external/pdfium/0001-Add-FPDFFormObj_GetMatrix-API.patch.1 |   96 -
 external/pdfium/0001-Add-FPDFFormObj_GetObject-API.patch.1 |  108 
--
 external/pdfium/0001-Add-FPDFTextObj_GetFontSize-API.patch.patch.1 |   67 
 external/pdfium/0001-Add-FPDFTextObj_GetText-API.patch.1   |  164 
--
 external/pdfium/0001-Add-FPDFText_GetFontName-API.patch.1  |   87 -
 external/pdfium/0001-Add-FPDFText_GetTextRenderMode-API.patch.1|  118 
---
 external/pdfium/0003-svx-import-PDF-images-as-BGRA.patch.2 |2 
 external/pdfium/Library_pdfium.mk  |   37 +-
 external/pdfium/UnpackedTarball_pdfium.mk  |   17 -
 external/pdfium/build.patch.1  |6 
 12 files changed, 31 insertions(+), 752 deletions(-)

New commits:
commit 56ac8214ab35387f8861044b62c79fae6d7ccac5
Author: Miklos Vajna 
AuthorDate: Tue Sep 18 21:07:10 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Sep 19 09:04:33 2018 +0200

pdfium: update to 3550

Allows dropping all the backports, so only one custom API patch remains.

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

diff --git a/download.lst b/download.lst
index d3506c11efa5..4129c6298cf5 100644
--- a/download.lst
+++ b/download.lst
@@ -200,8 +200,8 @@ export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b633
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
 export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
-export PDFIUM_SHA256SUM := 
4acbc905fee1743e96169ca155347a81fb2b0f381281109c1860aa4408ec6c4f
-export PDFIUM_TARBALL := pdfium-3471.tar.bz2
+export PDFIUM_SHA256SUM := 
572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679
+export PDFIUM_TARBALL := pdfium-3550.tar.bz2
 export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export LIBPNG_SHA256SUM := 
2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6
diff --git a/external/pdfium/0001-Add-FPDFFormObj_CountObjects-API.patch.1 
b/external/pdfium/0001-Add-FPDFFormObj_CountObjects-API.patch.1
deleted file mode 100644
index 190fc6b2c9b6..
--- a/external/pdfium/0001-Add-FPDFFormObj_CountObjects-API.patch.1
+++ /dev/null
@@ -1,77 +0,0 @@
-From b66077d3ef7ba594f2a831840783549f4dd70d86 Mon Sep 17 00:00:00 2001
-Date: Wed, 11 Jul 2018 13:25:02 +
-Subject: [PATCH] Add FPDFFormObj_CountObjects() API
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-To find out the number of sub-objects a form object has, similar to how
-FPDFPage_CountObjects() does it for page objects.
-
-Change-Id: I7e5775dece42b74fd5b71b1d9622a1aa37bf64ac
-Reviewed-on: https://pdfium-review.googlesource.com/37316
-Commit-Queue: Nicolás Peña Moreno 
-Reviewed-by: Nicolás Peña Moreno 

- fpdfsdk/fpdf_edit_embeddertest.cpp | 14 ++
- fpdfsdk/fpdf_editpage.cpp  | 21 +
- fpdfsdk/fpdf_view_c_api_test.c |  1 +
- public/fpdf_edit.h |  9 
- testing/resources/form_object.in   | 80 +
- testing/resources/form_object.pdf  | 91 ++
- 6 files changed, 216 insertions(+)
- create mode 100644 testing/resources/form_object.in
- create mode 100644 testing/resources/form_object.pdf
-
-diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
-index 8a1200885..4151de5df 100644
 a/fpdfsdk/fpdf_editpage.cpp
-+++ b/fpdfsdk/fpdf_editpage.cpp
-@@ -751,3 +751,24 @@ FPDFPageObj_SetLineCap(FPDF_PAGEOBJECT page_object, int 
line_cap) {
-   pPageObj->SetDirty(true);
-   return true;
- }
-+
-+FPDF_EXPORT int FPDF_CALLCONV
-+FPDFFormObj_CountObjects(FPDF_PAGEOBJECT page_object) {
-+  auto* pPageObj = CPDFPageObjectFromFPDFPageObject(page_object);
-+  if (!pPageObj)
-+return -1;
-+
-+  CPDF_FormObject* pFormObject = pPageObj->AsForm();
-+  if (!pFormObject)
-+return -1;
-+
-+  const CPDF_Form* pForm = pFormObject->form();
-+  if (!pForm)
-+return -1;
-+
-+  const CPDF_PageObjectList* pObjectList = pForm->GetPageObjectList();
-+  if (!pObjectList)
-+return -1;
-+
-+  return pObjectList->size();
-+}
-diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
-index b85537d0b..e6f193a37 100644
 a/public/fpdf_edit.h
-+++ b/public/fpdf_edit.h
-@@ -1226,6 +1226,15 @@ FPDFPageObj_CreateTextObj(FPDF_DOCUMENT document,
- // Returns one of the FPDF_TEXTRENDERMODE_* flags on success

Re: Calc research & funcalc ...

[trent shipley]

About a year ago, I thought up an idea on my own very like Funcalc, that I
called Scriptsheets.  At the time, I did not know Funcalc and its
predecessors, going back about 20 years, existed.  I briefly though I had
had a Very Original Idea.  Alas, it was not so.  See:
https://haskell.markmail.org/search/?q=scriptsheets .


I have only a degree in mathematics (at which was was not very good) and a
community college certificate in computer programming from the CIS
department (at which I did quite well).

At present, my plan is to:

   1. Finish the Haskell book I'm working on (Hutton 2016) to get some
   exposure to functional programming.
   2. Work my way through a book on writing compilers in Java. (Ronald Mak
   2009, or maybe I'll get something newer by then.)
   3. Work through the Calc/Funcalc book.
   4. Translate the Calc/Funcalc programs from C# into Java.
   5. Start the Scriptsheets project.

Given that I am one person, and woefully under-prepared in computer science
to accomplish my goals, the odds are I won't get very far on my roadmap
before getting distracted.  Even if I do embark on step 5, the odds are it
will wind up as Java-based abandonware like Frege or Jython.

But that is not why I am writing.  Can I prevail on the good graces of
either of you to look through my first draft prospectus for Scriptsheets to
see if, against all odds, there is anything of interest in it?  I would
REALLY appreciate feedback from someone involved with spreadsheet
professional programming or research.  The text runs 31 dry, boring pages.
I finished it 2017-11-02.

Regards,

Trent.

On Tue, Sep 18, 2018 at 2:56 AM Michael Meeks 
wrote:

> Hi Alexander,
>
> On 18/09/18 10:26, Alexander Bock wrote:
> > I would be delighted to join one of the hackfests if time allows. Is
> > there a schedule available somewhere?
>
> We typically have one in Hamburg at some stage in the year - which
> would be near you; the ESC minutes have details on all of those as they
> come up (posted to this list weekly). We also have a larger hackfest in
> Brussels before or after FOSDEM - which is an excellent conference to
> attend anyway =)
>
> > I know of EUSPRIG as well and their horror stories
> > 
>
> Some good stories there =) Thanks for the list of conferences.
>
> > Do you run any of the generated OpenCL kernels in parallel or do you run
> > a normal sequential recalculation and call the kernel code as necessary?
> > I would suspect the latter given the information you have provided so
> far :)
>
> Only in very recent times (the last generation) has typical GPU
> hardware become capable of running multiple kernels simultaneously
> and/or pre-empting running kernels. This leads to amusing situations -
> whereby moving the mouse while a long running sheet calculates would
> simply not be able to render - until a Windows / TDR was triggered. We
> had to come up with heuristics to break down the CL workload into
> bite-sized chunks to avoid this. More modern hardware doesn't have this
> issue though.
>
> And yes, we use CL when we think it makes sense - based on weights
> and
> complexity of the relevant formulae. Otherwise we use the old
> interpreter (or now its threaded variant - again depending on complexity).
>
> HTH,
>
> Michael.
>
> --
> michael.me...@collabora.com <><, GM Collabora Productivity
> Hangout: mejme...@gmail.com, Skype: mmeeks
> (M) +44 7795 666 147 <+44%207795%20666147> - timezone usually UK / Europe
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice