[Libreoffice-commits] core.git: 2 commits - sax/source sc/source
sax/source/fastparser/fastparser.cxx | 63 ---
sc/source/ui/dbgui/scuiimoptdlg.cxx | 12 +++---
sc/source/ui/inc/scuiimoptdlg.hxx|4 +-
3 files changed, 44 insertions(+), 35 deletions(-)
New commits:
commit 8caf5129d46d1ebfdd66ebe4dd3d8463ad1aa035
Author: Noel Grandin
AuthorDate: Thu Jul 19 12:05:57 2018 +0200
Commit: Noel Grandin
CommitDate: Fri Jul 20 08:58:56 2018 +0200
loplugin:useuniqueptr in ScImportOptionsDlg
Change-Id: I7d3a7a72c5de2915822ebb4cc73a504e65ce04a6
Reviewed-on: https://gerrit.libreoffice.org/57750
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx
b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index b67b692de098..ab8371865a6b 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -139,8 +139,8 @@ ScImportOptionsDlg::ScImportOptionsDlg(
sFieldSep = sFieldSep.replaceFirst( "%SPACE",
ScResId(SCSTR_FIELDSEP_SPACE) );
// not possible in the Ctor initializer (MSC cannot do that):
-pFieldSepTab = new ScDelimiterTable(sFieldSep);
-pTextSepTab = new ScDelimiterTable(SCSTR_TEXTSEP);
+pFieldSepTab.reset( new ScDelimiterTable(sFieldSep) );
+pTextSepTab.reset( new ScDelimiterTable(SCSTR_TEXTSEP) );
OUString aStr = pFieldSepTab->FirstDel();
sal_Unicode nCode;
@@ -265,8 +265,8 @@ ScImportOptionsDlg::~ScImportOptionsDlg()
void ScImportOptionsDlg::dispose()
{
-delete pFieldSepTab;
-delete pTextSepTab;
+pFieldSepTab.reset();
+pTextSepTab.reset();
m_pEncGrid.clear();
m_pFieldFrame.clear();
m_pFtCharset.clear();
@@ -305,9 +305,9 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const
ComboBox& rEd ) const
sal_uInt16 nCode;
if ( &rEd == m_pEdTextSep )
-pTab = pTextSepTab;
+pTab = pTextSepTab.get();
else
-pTab = pFieldSepTab;
+pTab = pFieldSepTab.get();
if ( aStr.isEmpty() )
{
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx
b/sc/source/ui/inc/scuiimoptdlg.hxx
index 7b0ec78987a1..fdc70bc026ab 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -59,8 +59,8 @@ private:
VclPtr m_pBtnOk;
-ScDelimiterTable* pFieldSepTab;
-ScDelimiterTable* pTextSepTab;
+std::unique_ptr pFieldSepTab;
+std::unique_ptr pTextSepTab;
bool m_bIsAsciiImport;
commit c6acb048e6f40ead4110750a79eeb3d6d6d5865d
Author: Noel Grandin
AuthorDate: Thu Jul 19 15:53:00 2018 +0200
Commit: Noel Grandin
CommitDate: Fri Jul 20 08:58:45 2018 +0200
tdf#79878 perf loading docx file, pendingChars
Use std::vector for pendingCharacters in SAXParser to avoid
calling the OUString utf8 conversion routine more than one per character
block. We seem to hit multiple characters() callbacks per chunk of text
fairly often in loading writer docs.
This is only good for about 0.5% performance
Change-Id: I354bb4efe9d883c4bebf49bc96dd44be4f2b1610
Reviewed-on: https://gerrit.libreoffice.org/57731
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 4ae2f4fdaf4a..3486dcd53759 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -273,7 +273,7 @@ private:
Entity *mpTop; /// std::stack::top() is amazingly
slow => cache this.
std::stack< Entity > maEntities;/// Entity stack for each call of
parseStream().
-OUString pendingCharacters; /// Data from characters()
callback that needs to be sent.
+std::vector pendingCharacters;/// Data from characters()
callback that needs to be sent.
};
} // namespace sax_fastparser
@@ -444,8 +444,7 @@ void Entity::startElement( Event const *pEvent )
xContext->startFastElement( nElementToken, xAttr );
}
// swap the reference we own in to avoid referencing thrash.
-maContextStack.top().mxContext.set( xContext.get() );
-xContext.set( nullptr, SAL_NO_ACQUIRE );
+maContextStack.top().mxContext = std::move( xContext );
}
catch (...)
{
@@ -461,10 +460,10 @@ void Entity::characters( const OUString& sChars )
return;
}
-const Reference< XFastContextHandler >& xContext(
maContextStack.top().mxContext );
-if( xContext.is() ) try
+XFastContextHandler * pContext( maContextStack.top().mxContext.get() );
+if( pContext ) try
{
-xContext->characters( sChars );
+pContext->characters( sChars );
}
catch (...)
{
@@ -481,19 +480,20 @@ void Entity::endElement()
}
const SaxContext& aContext = maContextStack.top();
-const Reference< XFastContextHandler >& xContext( aContext.mxContext );
-if( xContext.is() ) try
-{
-sal_Int32 nElementToken = aContext.mnE
[Libreoffice-commits] core.git: icon-themes/karasa_jaga
icon-themes/karasa_jaga/cmd/32/exportdirecttopdf.png |binary icon-themes/karasa_jaga/cmd/32/exporttopdf.png |binary icon-themes/karasa_jaga/cmd/32/insertfield.png |binary icon-themes/karasa_jaga/cmd/32/signpdf.png |binary icon-themes/karasa_jaga/cmd/sc_insertcaptiondialog.png |binary icon-themes/karasa_jaga/sw/res/nc2.png |binary icon-themes/karasa_jaga/sw/res/sc20236.png |binary 7 files changed New commits: commit 7ef5d73a82c5e3b57cfbd1bb0c6fd77528345663 Author: Rizal Muttaqin AuthorDate: Thu Jul 19 21:33:59 2018 +0700 Commit: Adolfo Jayme Barrientos CommitDate: Fri Jul 20 07:48:23 2018 +0200 KJ:^ PDF 32px, caption 16px, Writer's sidebar icons Change-Id: Id6f08fd29dd85e46bde487f99535ad91d2ac2712 Reviewed-on: https://gerrit.libreoffice.org/57734 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/icon-themes/karasa_jaga/cmd/32/exportdirecttopdf.png b/icon-themes/karasa_jaga/cmd/32/exportdirecttopdf.png index be751cc4cf80..2b3f5ea26595 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/exportdirecttopdf.png and b/icon-themes/karasa_jaga/cmd/32/exportdirecttopdf.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/exporttopdf.png b/icon-themes/karasa_jaga/cmd/32/exporttopdf.png index 746d14ed8854..06d83580f894 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/exporttopdf.png and b/icon-themes/karasa_jaga/cmd/32/exporttopdf.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/insertfield.png b/icon-themes/karasa_jaga/cmd/32/insertfield.png index 833d33b696fe..ff0bbc264ffc 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/insertfield.png and b/icon-themes/karasa_jaga/cmd/32/insertfield.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/signpdf.png b/icon-themes/karasa_jaga/cmd/32/signpdf.png index b035f88ee39a..a4531d3c3d3b 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/signpdf.png and b/icon-themes/karasa_jaga/cmd/32/signpdf.png differ diff --git a/icon-themes/karasa_jaga/cmd/sc_insertcaptiondialog.png b/icon-themes/karasa_jaga/cmd/sc_insertcaptiondialog.png index 799d559a88d3..ea731346a752 100644 Binary files a/icon-themes/karasa_jaga/cmd/sc_insertcaptiondialog.png and b/icon-themes/karasa_jaga/cmd/sc_insertcaptiondialog.png differ diff --git a/icon-themes/karasa_jaga/sw/res/nc2.png b/icon-themes/karasa_jaga/sw/res/nc2.png index 72fe0177beac..8024344fb18f 100644 Binary files a/icon-themes/karasa_jaga/sw/res/nc2.png and b/icon-themes/karasa_jaga/sw/res/nc2.png differ diff --git a/icon-themes/karasa_jaga/sw/res/sc20236.png b/icon-themes/karasa_jaga/sw/res/sc20236.png index 1952dc7c1b89..d984958546b9 100644 Binary files a/icon-themes/karasa_jaga/sw/res/sc20236.png and b/icon-themes/karasa_jaga/sw/res/sc20236.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extras/source
extras/source/templates/wizard/desktop/lang/bg/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/cs/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/da/url_transfer.htm|6 +++--- extras/source/templates/wizard/desktop/lang/de/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/en-GB/url_transfer.htm |4 ++-- extras/source/templates/wizard/desktop/lang/en-US/url_transfer.htm |4 ++-- extras/source/templates/wizard/desktop/lang/es/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/eu/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/fr/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/hu/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/it/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/ja/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/km/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/ko/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/nl/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/pl/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/pt-BR/url_transfer.htm |2 +- extras/source/templates/wizard/desktop/lang/pt/url_transfer.htm|6 +++--- extras/source/templates/wizard/desktop/lang/ru/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/sk/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/sl/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/sv/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/vi/url_transfer.htm|4 ++-- extras/source/templates/wizard/desktop/lang/zh-CN/url_transfer.htm |4 ++-- extras/source/templates/wizard/desktop/lang/zh-TW/url_transfer.htm |4 ++-- 25 files changed, 51 insertions(+), 51 deletions(-) New commits: commit d2dc6b897c2c406ed7e326c5146da41323b864bc Author: Matthias Seidel AuthorDate: Thu Jul 19 23:26:38 2018 + Commit: Matthias Seidel CommitDate: Thu Jul 19 23:26:38 2018 + Fixed branding and link diff --git a/extras/source/templates/wizard/desktop/lang/bg/url_transfer.htm b/extras/source/templates/wizard/desktop/lang/bg/url_transfer.htm index 0fc22bbb656b..16d271a9dbb4 100644 --- a/extras/source/templates/wizard/desktop/lang/bg/url_transfer.htm +++ b/extras/source/templates/wizard/desktop/lang/bg/url_transfer.htm @@ -38,7 +38,7 @@ -�� URL � � �� �� URL �� OpenOffice.org ��� �� � +�� URL � � �� �� URL �� OpenOffice ��� �� � � �� ��� �� ��� � ��� ���. @@ -50,7 +50,7 @@ URL ��, � � ��� � �� �� URL �� (. http://www.sun.com/staroffice";>http://www.sun.com/staroffice). + href="https://www.openoffice.org";>https://www.openoffice.org). diff --git a/extras/source/templates/wizard/desktop/lang/cs/url_transfer.htm b/extras/source/templates/wizard/desktop/lang/cs/url_transfer.htm index 45ea54ab9944..e7b2dc7a90f1 100644 --- a/extras/source/templates/wizard/desktop/lang/cs/url_transfer.htm +++ b/extras/source/templates/wizard/desktop/lang/cs/url_transfer.htm @@ -59,7 +59,7 @@ Enter the - required URL into the URL input line in OpenOffice.org or search + required URL into the URL input line in OpenOffice or search for one by using the search functions in the Hyperlink bar. @@ -70,7 +70,7 @@ Select the URL that appears in the URL input line (e.g. - http://www.sun.com/staroffice";>http://www.sun.com/staroffice). + https://www.openoffice.org";>https://www.openoffice.org). diff --git a/extras/source/templates/wizard/desktop/lang/da/url_transfer.htm b/extras/source/templates/wizard/desktop/lang/da/url_transfer.htm index 651aa81e514c..608b70848460 100644 --- a/extras/source/templates/wizard/desktop/lan
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/res
default_images/res/helpimg/feldurch.png |binary 1 file changed New commits: commit c14f452d2e051697df554a913bb11afc76030092 Author: Matthias Seidel AuthorDate: Thu Jul 19 21:20:19 2018 + Commit: Matthias Seidel CommitDate: Thu Jul 19 21:20:19 2018 + Fixed graphic for line style diff --git a/default_images/res/helpimg/feldurch.png b/default_images/res/helpimg/feldurch.png index 90c9a636794a..5256d0857b74 100644 Binary files a/default_images/res/helpimg/feldurch.png and b/default_images/res/helpimg/feldurch.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.1.0.2-buildfix1'
Tag 'libreoffice-6.1.0.2-buildfix1' created by Christian Lohmaier at 2018-07-19 21:43 + Tag libreoffice-6.1.0.2-buildfix1 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJbUQXyAAoJEPQ0oe+v7q6jMG0P/REal0+y9m0w0kfsF1KdUGw1 7wTpxjtgM86mI/8xqCfSmXEYvf+zgNWGu6VVAyfZvTlUOG46yFuZiV1eVgk/abuz wSLvJCZdsrhdJKK3eDRo8+1yiFzCzjs834CLy0KuGMUemKUt+g3nytxvFihBaC9h DPUxOG7j0E91ipRwko227k7DBiCkiOP+eJsuul0ygQ0sKYWQ48h/odY4PFqa7TAL SiklMoFaKlmW0jwDLn4TmdVmmHgv7LeDl4N61A0pjZdHJeC/vDK7hchksYsIaMr7 Y5HyyCmDBVmYM5YGEWWnvr19qtJr6c7hky/YCq/PVMxk763sSrCa69kvbA5jaEXf GtI8n6JQNoFiQaDZL4Zw0cy7ayYilsDQOe1t1yAdZ1NyA6PYQm51IYpaPiKtqQ/r 6LbpX/uoKpaGTRXEfRHu8M9vq1nESJ0ht9BA7fBAwUqJsIMYl7BGEAdvIsQo5cIJ V5X6no0ijcnJ5MG8aO7RdMhCMFjmKaxyJZg1BOjjF60gkYrC2jRoFn+xkq4fx8bG nVz9vTSniJWGqW7VfHm5H6Im+mXVKZWtI8gFjo1k8cRSNE176VNnMr7zLwtWFbAV X7NgjlSRT9BCZw2PH3xilh8aHrYVH1RlQRu5hVv0IuRC3TA7Nt2iBScrTEc7AJW3 TYNXhbMBZN3H5wC1d99o =e7P+ -END PGP SIGNATURE- Changes since libreoffice-6.1.0.2: Christian Lohmaier (1): Version 6.1.0.2, tag libreoffice-6.1.0.2-buildfix1 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.1.0.2-buildfix1'
Tag 'libreoffice-6.1.0.2-buildfix1' created by Christian Lohmaier at 2018-07-19 21:43 + Tag libreoffice-6.1.0.2-buildfix1 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJbUQX1AAoJEPQ0oe+v7q6jDncP/0zx1MtoLwcOAAY6GlUdVpB9 nQ3DN43QsLyDCAR/Dki/7/v3wdxz8t4/SLM3UN6/O6uCpB38lLGScL1ndFTPqQuY ogRTtEDCNTQQk9CYPDMU2RhjuV6rGDWHErAGhGtyxXAdhvch1CDRvxRoX4BTTS+N EQgOaTozYCUTZrI9pkqGt2MIvZFDCOprWUEcj7c458p0r+0cHs+j58zrIzzwZYhz 0eJrmPNhr8pNTAXDIT9Eys9iqPxesJTBH/jpGDroZtPyYkIbeI4aeRSP+zXeTyeU 73hkBM8eduqGkGItRC+uzygIAPKvAtvZsBMPOtZsy6t1QxM0CkorPQvyClrwpxvH nqaDts0I4iYURKkc23ZSRv8OSi3Qm+2nOHgeUm/Ol75i92FJ0QN4CeL5goBqzLJo YfmyGRlIO3EojOt0xZFoI4Z0Un397DNJe2KmHC2VtbS4TkUvPZ7QhjWU5SKAiTeN mmkBejXxLcW0sXRqU3/zpKyYo/U2snzJoeiN1dFWg8NQ7Qr4tnH3zeYSzfg8jgPy HeeY47PLMDoFw1V2vH/llVKwLk+EVYEIr0jm+AXfua4IFVEg0AdGFlWoi9+A3BF4 FKupbJnWJQxkTpH5T5zjbw2nV/8yLeTFPyjjQuK+r2BEQzmHROHlnNyxfgxJLFp5 POE58Tp6S3whNWMdVbIl =jIUh -END PGP SIGNATURE- Changes since libreoffice-6.1.0.2-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.1.0.2-buildfix1'
Tag 'libreoffice-6.1.0.2-buildfix1' created by Christian Lohmaier at 2018-07-19 21:43 + Tag libreoffice-6.1.0.2-buildfix1 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJbUQXtAAoJEPQ0oe+v7q6jk38QAMhnjwSpIJSRsPTZyu/bzP1E HNai3VlZbA98Lm5ngQbDflnJRY8SXMlND1bJZsTJkYWY3VW6GKnokO9XOS03yoxz O8hZTZCwDghumli3NXTergb84r/YsWzKf5tP6jjYKAQtedUIu6Ce500TJDNA94fH EPv+TjfjH/ch0pmnil/fqOY+5LNfAl/5bA6813DJ2YCTNutNQqpzm1LgPKQXLa8a LUmFcC4e0HC538v7Fq9adq8QCUnAruaDQA3a2g/TffBOg5VAviTph07LBAMDEOq1 wVlp+Ban9sqxAof7yLFbgxJ1PTMPuV7qNeAzGgm2rB/zAWmRF0ScdaD4HJt0SM0X oKAxmYB471lWIHM6CD697gWUchb/o4oNyDceGvS2g0HEPDmDn+SGvFeOGP//AjOc JplKWq/uArlTfwFR5wEZNVupOBDKQsZkwPDxOO1fzKBUWoiyCJOFjTCQsGdQ89PQ dBIYHUAQXgEbF1d65mAVO83RO+rGY4bAjbALiZW0iybGjqQAC60iXaWFfwwyMcPL PMj9ziTxTt4iw0O2jQqQL0OKGc6qJSs6lSynDwsmuatIPpG5xsD32ItlTj/DogLZ NJWxJceMONwwz3DhnUlBaRNd7x6uT6T0I29ywd8eS0LPcM5vYfEJGLzoIwLW1TOo ZUj5dh+XbrYg84UTC7tn =ILo0 -END PGP SIGNATURE- Changes since libreoffice-6.1.0.2: Christian Lohmaier (1): Version 6.1.0.2, tag libreoffice-6.1.0.2-buildfix1 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.1.0.2-buildfix1'
Tag 'libreoffice-6.1.0.2-buildfix1' created by Christian Lohmaier at 2018-07-19 21:43 + Tag libreoffice-6.1.0.2-buildfix1 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJbUQX4AAoJEPQ0oe+v7q6j760QAICRqqk1kPTYYHufomopGuCG qHgtByK6r4qplUscbDtjUv03OjDfP+z+wrkTs67QgiIUdpgKFToPwwFrodjmRExU DBUiCT/Ka8NXgfqi4DpaQF2ZxZ8MCUPWXoVh8d+8ovXO85WmnlnMnAYch7izkv2U rtfN3KViqjyb0O8xAS0rWUQabNr6yHh/6wXGeCPTqCi+NoVv/sQ5tIlyYv9vdQ1s WLn6s97X+bQwQgH7xucRhaizr5/WkwfgI10dg49zSax9rjbNxas4LTS/wbVLW13B qEeNtzWaxlMvEZM7WIc+4LpZkXvbjrdab8IUYL7lUl6Jfi3U/smId1fIsPuME8vM 92eDDkQr7dI4io7Dh0EXXh9kskZtDf9UN3LdZThW9YtcYzw6XT1nRHHUypJLaaCW w5DB6rCatZJuWZzYy5d68EoIqQJG7lpIoPl9lnPMZ2FBO9yDzIRKP3Z5CcjIrhbQ d6uitPn6mcNZ/5jNI9BFS8e9cFnnAqOpAg8FBRnxyommA8v2n9otqy2NE/hXHbMd 0TgfmJqw8OJK2GKLXp++FvZuG9X57cEvAB9onNwswRLypFUvDYvT1ujWD3y8MRZf b8y4yB+9uBqr6Wj0bLsxidI74HNZGAdQtKEs08RMDeJHFrZ1pcgTK7nl4UmO7rco LKH3dN4PFaGmLoV/w2HX =w20i -END PGP SIGNATURE- Changes since libreoffice-6.1.0.2: Christian Lohmaier (1): Version 6.1.0.2, tag libreoffice-6.1.0.2-buildfix1 --- dictionaries |2 +- helpcontent2 |2 +- translations |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- ___ 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-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0340ca6f23c52e78e5d0a72fc04591a5d96a22f6 Author: Christian Lohmaier AuthorDate: Thu Jul 19 23:36:11 2018 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 19 23:39:53 2018 +0200 Update git submodules * Update translations from branch 'libreoffice-6-1-0' - newlines at end of string must match what is in msgid Change-Id: I1e3ab006b238e11412f3d281fc1e9ac63169801b (cherry picked from commit 8a7d2f577bb9f9f540c61f775244a8d2af052048) - Version 6.1.0.2, tag libreoffice-6.1.0.2 Change-Id: I11374e01aa8dcebc23fb5f6f3dc7e493f8ce7396 diff --git a/translations b/translations index 565d4d30cf92..2d871cb15014 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 565d4d30cf926e7884fac0541b9c7579a9ed137e +Subproject commit 2d871cb15014b07939c7bc8c880c86bb38f4dcd7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-6-1-0' - 2 commits - source/et
source/et/uui/messages.po |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit 2d871cb15014b07939c7bc8c880c86bb38f4dcd7 Author: Christian Lohmaier Date: Thu Jul 19 23:36:11 2018 +0200 newlines at end of string must match what is in msgid Change-Id: I1e3ab006b238e11412f3d281fc1e9ac63169801b (cherry picked from commit 8a7d2f577bb9f9f540c61f775244a8d2af052048) diff --git a/source/et/uui/messages.po b/source/et/uui/messages.po index f67c44f3307..fbf918db7a5 100644 --- a/source/et/uui/messages.po +++ b/source/et/uui/messages.po @@ -597,6 +597,7 @@ msgstr "" "\n" "Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia.\n" "\n" +"$(ARG3)" #: uui/inc/strings.hrc:51 msgctxt "STR_OPENLOCKED_ALLOWIGNORE_MSG" @@ -656,8 +657,7 @@ msgstr "" "Dokumendifaili '$(ARG1)' on redigeerimiseks lukustanud\n" "$(ARG2).\n" "\n" -"Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia.\n" -"\n" +"Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia." #: uui/inc/strings.hrc:62 msgctxt "STR_OVERWRITE_IGNORELOCK_MSG" @@ -671,8 +671,7 @@ msgstr "" "Dokumendifaili '$(ARG1)' on redigeerimiseks lukustanud\n" "$(ARG2).\n" "\n" -"Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia.\n" -"\n" +"Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia." #: uui/inc/strings.hrc:63 msgctxt "STR_TRYLATER_RETRYSAVING_BTN" commit d42a1860bb17cd2405e760031714192f0183b4ba Author: Christian Lohmaier Date: Thu Jul 19 22:12:31 2018 +0200 Version 6.1.0.2, tag libreoffice-6.1.0.2 Change-Id: I11374e01aa8dcebc23fb5f6f3dc7e493f8ce7396 ___ 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' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit abd05ca85009b62ea67ae8ce27df2aa47b90b74d Author: Christian Lohmaier AuthorDate: Thu Jul 19 23:36:11 2018 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 19 23:39:08 2018 +0200 Update git submodules * Update translations from branch 'libreoffice-6-1' - newlines at end of string must match what is in msgid Change-Id: I1e3ab006b238e11412f3d281fc1e9ac63169801b diff --git a/translations b/translations index 2a103495aa40..8a7d2f577bb9 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 2a103495aa409667264dce68740a12be39e49151 +Subproject commit 8a7d2f577bb9f9f540c61f775244a8d2af052048 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-6-1' - source/et
source/et/uui/messages.po |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit 8a7d2f577bb9f9f540c61f775244a8d2af052048 Author: Christian Lohmaier Date: Thu Jul 19 23:36:11 2018 +0200 newlines at end of string must match what is in msgid Change-Id: I1e3ab006b238e11412f3d281fc1e9ac63169801b diff --git a/source/et/uui/messages.po b/source/et/uui/messages.po index f67c44f3307..fbf918db7a5 100644 --- a/source/et/uui/messages.po +++ b/source/et/uui/messages.po @@ -597,6 +597,7 @@ msgstr "" "\n" "Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia.\n" "\n" +"$(ARG3)" #: uui/inc/strings.hrc:51 msgctxt "STR_OPENLOCKED_ALLOWIGNORE_MSG" @@ -656,8 +657,7 @@ msgstr "" "Dokumendifaili '$(ARG1)' on redigeerimiseks lukustanud\n" "$(ARG2).\n" "\n" -"Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia.\n" -"\n" +"Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia." #: uui/inc/strings.hrc:62 msgctxt "STR_OVERWRITE_IGNORELOCK_MSG" @@ -671,8 +671,7 @@ msgstr "" "Dokumendifaili '$(ARG1)' on redigeerimiseks lukustanud\n" "$(ARG2).\n" "\n" -"Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia.\n" -"\n" +"Ava dokument kirjutuskaitstuna või ava redigeerimiseks dokumendi koopia." #: uui/inc/strings.hrc:63 msgctxt "STR_TRYLATER_RETRYSAVING_BTN" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/swbaslnk.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b7e139fa21607f488465fd87333db757ad0c91a2
Author: Caolán McNamara
AuthorDate: Thu Jul 19 16:27:30 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 19 22:17:42 2018 +0200
coverity#1078573 Explicit null dereferenced
since...
commit 7581730b2795a58d4fe6868e2f61572a91fde293
Date: Wed May 23 17:36:44 2018 +0900
tdf#117247 just send a GRAPHIC_ARRIVED hint after update
Change-Id: Id1a2a3bb25649f3f8e60d7edf79e5fd217b9e72f
Reviewed-on: https://gerrit.libreoffice.org/57736
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/docnode/swbaslnk.cxx
b/sw/source/core/docnode/swbaslnk.cxx
index 5d38d9371efb..27f30ba05d9f 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -173,7 +173,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem&
rItem )
if ( !bUpdate || bFrameInPaint )
return SUCCESS;
-if (bUpdate)
+if (bUpdate && pSwGrfNode)
{
if (!SetGrfFlySize(aGrfSz, pSwGrfNode, aOldSz))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/layact.cxx | 21 +
1 file changed, 9 insertions(+), 12 deletions(-)
New commits:
commit 516f1e2ac2f03bee97ca05a56984bd5fc0f4ec8a
Author: Caolán McNamara
AuthorDate: Thu Jul 19 16:17:17 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 19 22:17:20 2018 +0200
coverity#1438043 Logically dead code
Change-Id: I5f9754b96e954a8295d8fa84b2337bc8deac9bc8
Reviewed-on: https://gerrit.libreoffice.org/57735
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index ea6bbebf3def..adf37d39cf40 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -442,19 +442,16 @@ void SwLayAction::InternalAction(OutputDevice*
pRenderContext)
sal_uInt16 nPercentPageNum = 0;
while ( (pPage && !IsInterrupt()) || m_nCheckPageNum != USHRT_MAX )
{
-if ( !pPage && m_nCheckPageNum != USHRT_MAX &&
- (!pPage || pPage->GetPhyPageNum() >= m_nCheckPageNum) )
+if (!pPage && m_nCheckPageNum != USHRT_MAX)
{
-if ( !pPage || pPage->GetPhyPageNum() > m_nCheckPageNum )
-{
-SwPageFrame *pPg = static_cast(m_pRoot->Lower());
-while ( pPg && pPg->GetPhyPageNum() < m_nCheckPageNum )
-pPg = static_cast(pPg->GetNext());
-if ( pPg )
-pPage = pPg;
-if ( !pPage )
-break;
-}
+SwPageFrame *pPg = static_cast(m_pRoot->Lower());
+while (pPg && pPg->GetPhyPageNum() < m_nCheckPageNum)
+pPg = static_cast(pPg->GetNext());
+if (pPg)
+pPage = pPg;
+if (!pPage)
+break;
+
SwPageFrame *pTmp = pPage->GetPrev() ?
static_cast(pPage->GetPrev()) : pPage;
SetCheckPages( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 2c0f2e43f7152c34026d3f3bb7562d4e2f8b4d90
Author: Caolán McNamara
AuthorDate: Thu Jul 19 16:29:21 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 19 22:16:53 2018 +0200
coverity#1437527 silence Explicit null dereferenced
Change-Id: Id085fb6ab14a27c84beed0d29284a125e82d277d
Reviewed-on: https://gerrit.libreoffice.org/57737
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 8cf3a7991878..9e39dabdd957 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -688,6 +688,7 @@ void SwContentType::FillMemberList(bool*
pbLevelOrVisibilityChanged)
if(nullptr != pbLevelOrVisibilityChanged)
{
+assert(pOldMember);
// need to check visibility (and equal entry number) after
// creation due to a sorted list being used here (before,
// entries with same index were compared already at
creation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.1.0.2'
Tag 'libreoffice-6.1.0.2' created by Christian Lohmaier at 2018-07-19 20:12 + Tag libreoffice-6.1.0.2 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJbUPDIAAoJEPQ0oe+v7q6j3tcP+QH2JphZkHu0B9A1+piSwTPf 6/NzWOT2YaYYvD33TE9KlGqUfPv/ZNxIGFTAw+faL4fUsLO78lSwcETGDMhUz4Pq 5tY5ajzW0u73L2yLb0TGqqIP2Tp82TmJlEM6VQCHEvRtY/dH7FvBFRgA/QzXNrXV L/Gm4Qxlk2VBqLXOrvSvVMLNfYElssK/+t0PvNhexEHTyKD9RgXjj/RHMv/Zi8jo +ykL74mWxuW8NyvDKIbIrUno5Zr8nAwvCeKY/UI8751nfZjg1Tfvq6t330QNZhTD LvLlufWRDXGGOZXi/FvSdwBHo9EOR2KgAV4/gQ74lNJ6CF02YMBCUa+nVgZup0vD vRbEjsc6EYYwEv7TEGL3sXkwTqQfh/Iv31bMvCL7MuD9DdI+sdaXHy8eIE707J5o CapCPVrshRmP0EyYartiJBBuYv8HPwtmUAee3is972h7ZgHlwqMOet87kjdtAMLU CwvSoAdQar/HGHp0rgeqZ+uWH7c39v3l0bCCH9sECt81PM7tk9fp7EcTGcXgL5VO LnUlx75Qp6O4fAEy1bEith4u3f5nxLxkf0CRzFDfbRI9fRWExhIJVMHw5/MiSJms fxci/qMX6yHFy2ZMGizVDE3vFB6p+BeYzFumafSS1w3sDDTzPhPc0kAaEbJadoZG L94R0ne5wCUp6zKqk6OU =t0+y -END PGP SIGNATURE- Changes since libreoffice-6-1-branch-point-771: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.1.0.2'
Tag 'libreoffice-6.1.0.2' created by Christian Lohmaier at 2018-07-19 20:12 + Tag libreoffice-6.1.0.2 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJbUPC8AAoJEPQ0oe+v7q6jCVcP/24+8O9ezzWTAZM3BOJzVTNe m1IRzLnecZxKsS7XPX7W/TLLfMm7CmMeLHAACp2kjP/1jxDNaFFEon1xP2vEsnMm NOLxwlrGZcdHsWWx7Rwhn/GcZ/mGW0YkNHB+fpI4sVmCrrgIPzoB2FUCO8sOtplq W0ZTPvI/Io2+FiruaeMfjxI7/XVPYS67CJ0OD+YRfsDlB+rXF1c/+BfcjJ3BuRng m2kUUyCpeJ3bxMFGRhL8J5OyFjdtjX4bd3VtmJXuNrbSIF3nSV1O6zwlJZXiAihl /i7CoAdYthSwCohwkDEmJ3LXNt682qUP7wg43cEp7Lt9noc67tYyAdlqWG3QLaUW JpKxP5YAhzoNpTHhp3VkzluGFpfRI/1IFEoA5WSpuEoemK8FwcEzeQFTBXqGLIIo wR0zNAjl6EeqKli6A9+dffxOKtMooSPisLV2LLWCeEfrnNPeuAZEBTA5n2ePAiGt K05NlqxPvhM6r56iKhdizsgjQQTtAU0YDBNOsOc5Zhi2NoA5aISiJj6a7xdjNRhL 7QC2hU/XSDvWUv/7ayF5C8+x9pPfB0TBv2f6ZCr1L3IaqTdrwq0noDxTd77ahQ0H +w3oqHUkvValRDb4qCbfcz8RfjEVHbyFMS/Yk2/ELgYKejknmn2FTqysg4yYE2KW 52yN6OTWshzst61uhq3V =6YTg -END PGP SIGNATURE- Changes since libreoffice-6-1-branch-point-47: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c23165c0973cd30eb0a59bd155afd6830420bb0f Author: Christian Lohmaier AuthorDate: Thu Jul 19 22:13:44 2018 +0200 Commit: Christian Lohmaier CommitDate: Thu Jul 19 22:13:44 2018 +0200 bump product version to 6.1.0.2.0+ Change-Id: I12dff725995c3fdaf36525f0f98c229d29dce3e1 diff --git a/configure.ac b/configure.ac index 258370e9ec32..223d7b889df9 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[6.1.0.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.1.0.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.1.0.2'
Tag 'libreoffice-6.1.0.2' created by Christian Lohmaier at 2018-07-19 20:12 + Tag libreoffice-6.1.0.2 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJbUPDCAAoJEPQ0oe+v7q6jPgoP/2a0/k4gFJd5kIJNspSkdiN7 2lkjNGG0yo2TGnBTwziL1Mgxdj/9AN5QYJ3gS1AAFRlb5qMEKuSRs/KilF6V0q/v pxmEJGF2GDzUG092v6DGCfsqzRgbZJotal8dWamcHlv0aENiOGcQAw7atMkx3Qbc IGrw8E+Y+oz0CrkWcWhAs7khZ37+wC3XbhPEu/AY5NknwEjqjeSFEbSVamgub72R 07PH3qgWnJuSpiweKmJG6KUKQLwv7mb5rgwocQOz43okLVgKOpNz+13/LDrJU1sl k8IrDigXAx3r4F32+lALzXpQDKG6BviomG1wIemhzKYsX41iKrZ1o5YzmpIEFIzD yNdJrwz/4ptT4PxF9XTrVyntmqOpfZXH+7sPzwYSGjtSH91eUFchYvYb9gE2m4r7 6A9OWIs5V5oQRDTW8NtkmCaS2KOAClGByerJFyeQwTYevnRk5MBdC/4EJrJI56gb w6PFv/CrNoGojJe2763FpSXin3eaSn94HPh/GI8UR7PVP2273Ec5GBn5Wom3jgJC xnkHq2nTjdoA8tqA2zhK+KirpDUZOfMwD8EJTl2SjmkV3z5VDOMuy0Mm8PPL/7AM qNnw9BbQqSe4MqYuHyAIwBQfxEUhtSGDaEWlcZTeGjwSFnK4cZx8HMV8ZKJNMADg icOAuaVU04UYiSgPmTYi =YJmx -END PGP SIGNATURE- Changes since libreoffice-6-1-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.1.0.2'
Tag 'libreoffice-6.1.0.2' created by Christian Lohmaier at 2018-07-19 20:12 + Tag libreoffice-6.1.0.2 -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJbUPC2AAoJEPQ0oe+v7q6jO7YQAKXJlV+a9mOPqxO7ceDk+xqh PxgXkWKO8HXdW/NVbHsXW05qu35i6Kt2OG0N3D1EyrwGyQsSlaTEjnjnib6b2xnk oEMrILOmjhzLfUp+SXHMRz/HY0B9mxez+oO1WuohA/fYwosmQlPvxTVUjuV1LmZM rcRdKLs0WHwx1O/sBOBDLpuVxOdmf50BhONONTk1dXYAWwNkiuvMAIHjq1gQD87H qyDLbDlYPWEgmZ7/w6wLl4Q6u8NfIO2bv/nLcME4v5KlNyGBpTZw4jDuErHAz53v /b8MSxWSqeY7nhL9bnYmocC31xEL0gabB7tyqyimRwG+/jcSWB0O6pfYzxHRfLID eS1djVINapM1LBD5DMZbgM6bmvuWvDNi2d/7y0neFJQh5HUQandLtWg3WKfKEDbV WmHDWEX6jR0dQ/kVYcgLdD/G7pLApZNRQTo81OFdQ2rAQLdSw2SkDZETBP57/YNs 8IOyxYoXOnNbbq3mxrCYPGkdcXyKNhSkrX6O1XLSvjR/L7jYzhlCMZ7f9a2fC2wO HVnFttp/lMBpeiEorgzZ2gfFCA7P3sytDZsfvYytFAJl3Jwgzqyn8VVF3hZMNJ8l N7E6PSI0t1hwyxshB3vCDJ3oxi8ibM3sc+B7Z7LT+W4eKDuw/teX5WhXfzNQeL4u euINUd8x3xS3hWZ6mDwa =+G0w -END PGP SIGNATURE- Changes since libreoffice-6-1-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e6eb1644f84dd1fd48bbbf5418acdcc750f723bc Author: Christian Lohmaier AuthorDate: Thu Jul 19 22:11:32 2018 +0200 Commit: Christian Lohmaier CommitDate: Thu Jul 19 22:11:32 2018 +0200 bump product version to 6.1.1.0.0+ Change-Id: I7c8f85f0321741da21e01e1f02911c95ccf8559d diff --git a/configure.ac b/configure.ac index 258370e9ec32..64d6eaa54cfc 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[6.1.0.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.1.1.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-6-1-0'
New branch 'libreoffice-6-1-0' available with the following commits: commit ef0006571c12dd3b85f589a407a29252c0b42e75 Author: Christian Lohmaier Date: Thu Jul 19 22:08:53 2018 +0200 Branch libreoffice-6-1-0 This is 'libreoffice-6-1-0' - the stable branch for the 6.1.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.1.x release, please use the 'libreoffice-6-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ie67769a62181b764ce5d9a8be00d47555d287a5f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-6-1-0'
New branch 'libreoffice-6-1-0' available with the following commits: commit fd4d1b2b68dda3896c9592de89da69a4c0a1b94c Author: Christian Lohmaier Date: Thu Jul 19 22:08:36 2018 +0200 Branch libreoffice-6-1-0 This is 'libreoffice-6-1-0' - the stable branch for the 6.1.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.1.x release, please use the 'libreoffice-6-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I0b4bc04e4f421a06523c91e79528f667cb6ad5a7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-6-1-0'
New branch 'libreoffice-6-1-0' available with the following commits: commit 565d4d30cf926e7884fac0541b9c7579a9ed137e Author: Christian Lohmaier Date: Thu Jul 19 22:08:36 2018 +0200 Branch libreoffice-6-1-0 This is 'libreoffice-6-1-0' - the stable branch for the 6.1.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.1.x release, please use the 'libreoffice-6-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I2437a4debe7957b8ea81278c82205ddccc216b56 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-6-1-0'
New branch 'libreoffice-6-1-0' available with the following commits: commit 1695e40cfed7931a86ba56686c97032ccd6c77ee Author: Christian Lohmaier Date: Thu Jul 19 22:08:36 2018 +0200 Branch libreoffice-6-1-0 This is 'libreoffice-6-1-0' - the stable branch for the 6.1.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.1.x release, please use the 'libreoffice-6-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I70749179b1d93b29292c5dacadd9ceae590f270e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 76dda4ea7957b8cd40a04471f5601dc977dc2450 Author: Matthias Seidel AuthorDate: Thu Jul 19 18:34:19 2018 + Commit: Matthias Seidel CommitDate: Thu Jul 19 18:34:19 2018 + Set correct values for graphics cache diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index fb55dff7ef49..955d4174d502 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1493,7 +1493,7 @@ Specifies the maximum cache size for all graphical display objects. Total Graphic Cache Size - 2200 + 20971520 @@ -1501,7 +1501,7 @@ Specifies the maximum cache size for a single graphic display object. Graphic Object Cache Size - 550 + 5242880 ___ 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/source
sw/source/uibase/misc/redlndlg.cxx |2 +-
sw/source/uibase/shells/textfld.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 80e083c17422c464981d959b87589a5efc987dd8
Author: Caolán McNamara
AuthorDate: Thu Jul 19 10:54:39 2018 +0100
Commit: Christian Lohmaier
CommitDate: Thu Jul 19 22:05:25 2018 +0200
Resolves: tdf#118827 SetCareWin should be SetCareDialog
Change-Id: I84c00a193e65a18b3ba82351c07be0b63e0cd5d4
Reviewed-on: https://gerrit.libreoffice.org/57720
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/sw/source/uibase/misc/redlndlg.cxx
b/sw/source/uibase/misc/redlndlg.cxx
index e6de1254c8b6..645956b731e9 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -1128,8 +1128,8 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl,
SvSimpleTable*, void)
m_pTable->SetEntryText(sMsg.replace('\n', ' '), pEntry, 3);
}
-pDlg.disposeAndClear();
SwViewShell::SetCareDialog(nullptr);
+pDlg.disposeAndClear();
}
}
else if (nRet)
diff --git a/sw/source/uibase/shells/textfld.cxx
b/sw/source/uibase/shells/textfld.cxx
index d5d68916c371..9d89701232a1 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -617,8 +617,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
rSh.SetRedlineComment(sMsg);
}
+SwViewShell::SetCareDialog(nullptr);
pDlg.disposeAndClear();
-SwViewShell::SetCareWin(nullptr);
g_bNoInterrupt = false;
rSh.ClearMark();
GetView().AttrChangedNotify(GetShellPtr());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/formula sc/inc sc/source
include/formula/errorcodes.hxx |4
sc/inc/globstr.hrc |1 +
sc/source/core/data/global.cxx |3 +++
sc/source/core/tool/interpr7.cxx | 35 ---
4 files changed, 32 insertions(+), 11 deletions(-)
New commits:
commit da9a6f426b61937d9cda17f5be3f82d2e15e6ecd
Author: Eike Rathke
AuthorDate: Thu Jul 19 17:39:02 2018 +0200
Commit: Eike Rathke
CommitDate: Thu Jul 19 20:36:22 2018 +0200
Related: tdf#118735 introduce FormulaError::LinkFormulaNeedingCheck
(Err:540)
To indicate why the result isn't available ("External content
disabled") and in future maybe signal to the formula cell that it
could keep the hybrid string result, see source code comment.
Change-Id: Ic5d336b8489e8776f7b640b7e46815e71d0a82a4
Reviewed-on: https://gerrit.libreoffice.org/57738
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index d4324a998db0..7afce495b6de 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -83,6 +83,9 @@ enum class FormulaError : sal_uInt16
MatrixSize = 538,
// Bad inline array content, non-value/non-string.
BadArrayContent = 539,
+// Interpreter: signal result not available because updating links is not
+// allowed (yet) and tell to try hybrid string as result.
+LinkFormulaNeedingCheck = 540,
// Interpreter: NA() not available condition, not a real error
NotAvailable = 0x7fff
@@ -171,6 +174,7 @@ inline bool isPublishedFormulaError( FormulaError nErr )
return false;
case FormulaError::MatrixSize:
+case FormulaError::LinkFormulaNeedingCheck:
return true;
case FormulaError::NotAvailable:
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 326c9f01c455..09caaf80423c 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -510,6 +510,7 @@
#define STR_TEXTNC_("STR_TEXT", "Text")
#define STR_QUERY_PIVOTTABLE_DELTAB
NC_("STR_QUERY_PIVOTTABLE_DELTAB", "The selected sheet(s) contain source data
of related pivot tables that will be lost. Are you sure you want to delete the
selected sheet(s)?")
#define STR_ERR_NAME_INVALID_CELL_REF
NC_("STR_ERR_NAME_INVALID_CELL_REF", "Invalid name. Reference to a cell, or a
range of cells not allowed.")
+#define STR_ERR_LONG_LINK_FORMULA_NEEDING_CHECK
NC_("STR_ERR_LONG_LINK_FORMULA_NEEDING_CHECK", "External content disabled.")
#endif
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 825278134b43..cf0bd92371da 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -423,6 +423,9 @@ OUString ScGlobal::GetLongErrorString(FormulaError nErr)
case FormulaError::BadArrayContent:
pErrNumber = STR_ERR_LONG_BAD_ARRAY_CONTENT;
break;
+case FormulaError::LinkFormulaNeedingCheck:
+pErrNumber = STR_ERR_LONG_LINK_FORMULA_NEEDING_CHECK;
+break;
case FormulaError::NoValue:
pErrNumber = STR_LONG_ERR_NO_VALUE;
break;
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 108d5f4445ea..e2dd62717fb9 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -320,7 +320,6 @@ void ScInterpreter::ScWebservice()
ScWebServiceLink* pLink = lcl_GetWebServiceLink(mpLinkManager, aURI);
bool bWasError = (pMyFormulaCell && pMyFormulaCell->GetRawError() !=
FormulaError::NONE);
-bool bLinkFormulaNeedingCheck = false;
if (!pLink)
{
@@ -336,8 +335,7 @@ void ScInterpreter::ScWebservice()
//if the document was just loaded, but the ScDdeLink entry was
missing, then
//don't update this link until the links are updated in response
to the users
//decision
-bLinkFormulaNeedingCheck = pDok->HasLinkFormulaNeedingCheck();
-if (!bLinkFormulaNeedingCheck)
+if (!pDok->HasLinkFormulaNeedingCheck())
{
pLink->Update();
}
@@ -361,7 +359,7 @@ void ScInterpreter::ScWebservice()
// check the value
if (pLink->HasResult())
PushString(pLink->GetResult());
-else
+else if (pDok->HasLinkFormulaNeedingCheck())
{
// If this formula cell is recalculated just after load and the
// expression is exactly WEBSERVICE("literal_URI") (i.e. no other
@@ -371,18 +369,33 @@ void ScInterpreter::ScWebservice()
// external links has been disabled."
// This will work only once, as the new formula cell result won't
// be a hybrid anymore.
-if (bLinkFormulaNeedingCheck && pMyFormulaCell &&
pMyFormulaCell->GetCode()->GetCodeLen() == 2 &&
-pMyFormulaCel
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/qa sc/source
sc/qa/unit/data/functions/date_time/fods/hour.fods | 31 ++-
sc/qa/unit/data/functions/date_time/fods/minute.fods | 26 ++-
sc/qa/unit/data/functions/date_time/fods/second.fods | 26 ++-
sc/source/core/tool/interpr2.cxx |6 +--
4 files changed, 74 insertions(+), 15 deletions(-)
New commits:
commit bda9288ffee552b55eed9dbf02e1204957bd4513
Author: Winfried Donkers
AuthorDate: Thu Jul 19 12:05:14 2018 +0200
Commit: Eike Rathke
CommitDate: Thu Jul 19 19:27:28 2018 +0200
tdf#118800 fix rounding error in Calc function HOUR, MINUTE, SECOND.
Change-Id: I7a875b172493112b66fca8f70d2061371a05486c
Reviewed-on: https://gerrit.libreoffice.org/57721
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit c69e7266916ac1b8917477fb4eccdb9098da5792)
Reviewed-on: https://gerrit.libreoffice.org/57728
diff --git a/sc/qa/unit/data/functions/date_time/fods/hour.fods
b/sc/qa/unit/data/functions/date_time/fods/hour.fods
index 847632a9750a..bb5abc52ab4e 100644
--- a/sc/qa/unit/data/functions/date_time/fods/hour.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/hour.fods
@@ -154,8 +154,8 @@ Function basISODateTime(dVal#)
basISODateTime =
format(year(dt),"")&"-"&
format(Month(dt),"00")&"-"&
format(day(dt),"00")&" "&
format(Hour(dt),"00")&":"&
format(Minute(dt),"00")&":"&
format(Second(dt),"00")
End Function
-
-
+
+
@@ -1755,11 +1755,26 @@ End Function
-
-
-
-
-
+
+ 10
+
+
+ 10
+
+
+ TRUE
+
+
+ =HOUR(J10)
+
+
+ tdf11880
+
+
+
+ 10:59:59.60
+
+
@@ -2432,4 +2447,4 @@ End Function
-
\ No newline at end of file
+
diff --git a/sc/qa/unit/data/functions/date_time/fods/minute.fods
b/sc/qa/unit/data/functions/date_time/fods/minute.fods
index d27ec1ef5031..69fba0187454 100644
--- a/sc/qa/unit/data/functions/date_time/fods/minute.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/minute.fods
@@ -896,7 +896,29 @@
-
+
+
+ 11
+
+
+ 11
+
+
+ TRUE
+
+
+ =MINUTE(J9)
+
+
+ tdf11880
+
+
+
+ 10:11:59.60
+
+
+
+
@@ -1105,4 +1127,4 @@
-
\ No newline at end of file
+
diff --git a/sc/qa/unit/data/functions/date_time/fods/second.fods
b/sc/qa/unit/data/functions/date_time/fods/second.fods
index e6d2b46946e5..8db288ae3ae9 100644
--- a/sc/qa/unit/data/functions/date_time/fods/second.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/second.fods
@@ -825,7 +825,29 @@
-
+
+
+ 12
+
+
+ 12
+
+
+ TRUE
+
+
+ =SECOND(J9)
+
+
+ tdf11880
+
+
+
+ 10:11:12.60
+
+
+
+
@@ -1034,4 +1056,4 @@
-
\ No newline at end of file
+
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 45cefa1d0423..debe3509eb44 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -146,7 +146,7 @@ void ScInterpreter::ScGetMin()
{
double fTime = GetDouble();
fTime -= ::rtl::math::approxFloor(fTime); // date part absent
-long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5)) %
::tools::Time::secondPerHour;
+long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR)) %
::tools::Time::secondPerHour;
PushDouble( static_cast(nVal / ::tools::Time::secondPerMinute) );
}
@@ -154,7 +154,7 @@ void ScInterpreter::ScGetSec()
{
double fTime = GetDouble();
fTime -= ::rtl::math::approxFloor(fTime); // date part absent
-long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5)) %
::tools::Time::secondPerMinute;
+long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR)) %
::tools::Time::secondPerMinute;
PushDouble( static_cast(nVal) );
}
@@ -162,7 +162,7 @@ void ScInterpreter::ScGetHour()
{
double fTime = GetDouble();
fTime -= ::rtl::math::approxFloor(fTime); // date part absent
-long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5)) /
::tools::Time::secondPerHour;
+long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR)) /
::tools::Time::secondPerHour;
PushDouble(static_cast(nVal));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/Control.xba | 22 +- wizards/source/access2base/Database.xba | 17 ++--- 2 files changed, 19 insertions(+), 20 deletions(-) New commits: commit 3e39524d4171f0ecadad5658d6e03cf44126b2a0 Author: Jean-Pierre Ledure AuthorDate: Thu Jul 19 18:55:59 2018 +0200 Commit: Jean-Pierre Ledure CommitDate: Thu Jul 19 19:02:30 2018 +0200 Access2Base - tdf#118767 Fix DLookup for Firebird Firebird requires SELECT FIRST 1 ... syntax, while HSQLDB and other RDBMS use SELECT TOP 1 Additionally the Value property for monoselect listboxes has been reworked diff --git a/wizards/source/access2base/Control.xba b/wizards/source/access2base/Control.xba index d1a2a8292cbd..3a41609ef48e 100644 --- a/wizards/source/access2base/Control.xba +++ b/wizards/source/access2base/Control.xba @@ -1800,26 +1800,14 @@ Dim oControlEvents As Object, sEventName As String End If End If Case Else - vCurrentValue = ControlModel.getCurrentValue() ' Space or uninitialized array if no selection at all - If IsArray(vCurrentValue) Then ' Is an array if MultiSelect - If UBound(vCurrentValue) >= LBound(vCurrentValue) Then - vListboxValue = vCurrentValue(0) - Else - vListboxValue = "" - End If - Else - vListboxValue = vCurrentValue - End If - lListIndex = -1 ' Speed up getting value PM PASTIM 12/02/2013 - If vListboxValue <> "" Then - If Ubound(ControlModel.SelectedItems) >= 0 Then lListIndex = Controlmodel.Selecteditems(0) - End If + 'getCurrentValue does not return any significant value anymore + ' Speed up getting value PM PASTIM 12/02/2013 + If Ubound(ControlModel.SelectedItems) >= 0 Then lListIndex = Controlmodel.Selecteditems(0) Else lListIndex = -1 ' If listbox has hidden column = real bound field, then explore ValueItemList - bListboxBound = _ListboxBound() - If bListboxBound Then + If _ListboxBound() Then If lListIndex > -1 Then vGet = ControlModel.ValueItemList(lListIndex) ' PASTIM Else - vGet = vListboxValue + If lListIndex > -1 Then vGet = ControlModel.getItemText(lListIndex) End If End Select End If diff --git a/wizards/source/access2base/Database.xba b/wizards/source/access2base/Database.xba index 3e94c151b626..3bd3bced482b 100644 --- a/wizards/source/access2base/Database.xba +++ b/wizards/source/access2base/Database.xba @@ -1135,6 +1135,7 @@ Dim sExpr As String 'For inclusion of aggregate function Dim sTempField As String 'Random temporary field in SQL expression Dim sTarget as String, sWhere As String, sOrderBy As String, sLimit As String +Dim sProductName As String vResult = Null @@ -1144,7 +1145,14 @@ Dim sTarget as String, sWhere As String, sOrderBy As String, sLimit As String If pvOrderClause <> "" Then sOrderBy = " ORDER BY " & pvOrderClause Else sOrderBy = "" sLimit = ""
[Libreoffice-commits] core.git: sd/qa
0 files changed New commits: commit 7175dd320bda267366350c3cd26ffabfd3fb284d Author: Andrea Gelmini AuthorDate: Thu Jul 19 06:49:40 2018 +0200 Commit: Julien Nabet CommitDate: Thu Jul 19 18:55:53 2018 +0200 Removed executable permission on odp file Change-Id: I7ed142158ab9306886555f3b14d39dfc5b12080d Reviewed-on: https://gerrit.libreoffice.org/57706 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sd/qa/unit/data/odp/tdf118768-brake.odp b/sd/qa/unit/data/odp/tdf118768-brake.odp old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: setup_native/scripts vcl/qt5
setup_native/scripts/langpackscript.sh |4 ++--
vcl/qt5/Qt5Widget.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit da9bb5165152bfa00425c08cf46d6a3775da0a1b
Author: Andrea Gelmini
AuthorDate: Thu Jul 19 16:22:39 2018 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 19 18:54:50 2018 +0200
Fix typos
Change-Id: Id31aa22a98f7520a37e624cbb1dc4d949246c0fb
Reviewed-on: https://gerrit.libreoffice.org/57622
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/setup_native/scripts/langpackscript.sh
b/setup_native/scripts/langpackscript.sh
index 186390c19c05..4f0dd548467b 100644
--- a/setup_native/scripts/langpackscript.sh
+++ b/setup_native/scripts/langpackscript.sh
@@ -113,8 +113,8 @@ mkdir $outdir
#diskSpace=`df -k $outdir | $tail_prog -1 | awk '{if ( $4 ~ /%/) { print $3 }
else { print $4 } }'`
#if [ $diskSpace -lt $diskSpaceRequired ]; then
-#printf "You will need atleast %s kBytes of Disk Free\n" $diskSpaceRequired
-#printf "Please free up the required Disk Space and try again\n"
+#printf "You will need at least %s kBytes of free disk space\n"
$diskSpaceRequired
+#printf "Please free up the required disk space and try again\n"
#exit 3
#fi
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 8f96bc876322..75f95b40310e 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -208,7 +208,7 @@ void VclQtMixinBase::mixinCloseEvent(QCloseEvent* pEvent)
pEvent->accept();
// SalEvent::Close returning false may mean that user has vetoed
// closing the frame ("you have unsaved changes" dialog for example)
-// We should't process the event in such case
+// We shouldn't process the event in such case
else
pEvent->ignore();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/ref_epub_export.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bfe354c9d4291ddebf32d0cddfca24ddfd3aa950 Author: Andrea Gelmini Date: Thu Jul 19 18:16:40 2018 +0200 Fix double words Change-Id: Ibd67f546b323139eed589758721b1c00a8852502 Reviewed-on: https://gerrit.libreoffice.org/57741 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/source/text/shared/01/ref_epub_export.xhp b/source/text/shared/01/ref_epub_export.xhp index 71b0ddc63..a4013ad4e 100644 --- a/source/text/shared/01/ref_epub_export.xhp +++ b/source/text/shared/01/ref_epub_export.xhp @@ -56,7 +56,7 @@ Split method -Select the type of start of the the next EPUB section. +Select the type of start of the next EPUB section. Heading: Starts the next section on headings, according to the document outline numbering. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 35c4e29e53210e785dc12931a3c9dc841a565f84 Author: Andrea Gelmini AuthorDate: Thu Jul 19 18:16:40 2018 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 19 18:53:07 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Fix double words Change-Id: Ibd67f546b323139eed589758721b1c00a8852502 Reviewed-on: https://gerrit.libreoffice.org/57741 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/helpcontent2 b/helpcontent2 index 11a9f0c96e91..bfe354c9d429 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 11a9f0c96e91153a458f8c7881c38fc7f728f2b4 +Subproject commit bfe354c9d4291ddebf32d0cddfca24ddfd3aa950 ___ 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/unx
vcl/unx/gtk3/gtk3gtkframe.cxx | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 896b7e69a3182a0142a323ba5f76a2d8a811091a
Author: Caolán McNamara
AuthorDate: Tue Jul 17 21:29:46 2018 +0100
Commit: Xisco Faulí
CommitDate: Thu Jul 19 17:56:03 2018 +0200
Resolves: tdf#118302 drag n drop to same tab should cancel dnd
dropComplete is used to do this, follow the mac pattern here to
propogate this in the drag and drop from self to self case.
Maybe this also affects tdf#105320 ?
Change-Id: I2b8f8b0e0486f6ee45a65918fae2537750a75f2d
Reviewed-on: https://gerrit.libreoffice.org/57590
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 6a443526e8db..c1c560b3f9ce 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3422,6 +3422,9 @@ namespace
}
}
+static bool g_DropSuccessSet = false;
+static bool g_DropSuccess = false;
+
class GtkDropTargetDropContext : public
cppu::WeakImplHelper
{
GdkDragContext *m_pContext;
@@ -3447,6 +3450,11 @@ public:
virtual void SAL_CALL dropComplete(sal_Bool bSuccess) override
{
gtk_drag_finish(m_pContext, bSuccess, false, m_nTime);
+if (GtkDragSource::g_ActiveDragSource)
+{
+g_DropSuccessSet = true;
+g_DropSuccess = bSuccess;
+}
}
};
@@ -4341,9 +4349,12 @@ void GtkDragSource::startDrag(const
datatransfer::dnd::DragGestureEvent& rEvent,
// For LibreOffice internal D&D we provide the Transferable without Gtk
// intermediaries as a shortcut, see tdf#100097 for how dbaccess
depends on this
g_ActiveDragSource = this;
+g_DropSuccessSet = false;
+g_DropSuccess = false;
m_pFrame->startDrag(nDragButton, rEvent.DragOriginX,
rEvent.DragOriginY,
VclToGdk(sourceActions), pTargetList);
+
gtk_target_list_unref(pTargetList);
for (auto &a : aGtkTargets)
g_free(a.target);
@@ -4428,7 +4439,12 @@ void GtkDragSource::dragEnd(GdkDragContext* context)
{
datatransfer::dnd::DragSourceDropEvent aEv;
aEv.DropAction =
GdkToVcl(gdk_drag_context_get_selected_action(context));
-aEv.DropSuccess = true;
+// an internal drop can accept the drop but fail with dropComplete(
false )
+// this is different than the GTK API
+if (g_DropSuccessSet)
+aEv.DropSuccess = g_DropSuccess;
+else
+aEv.DropSuccess = true;
auto xListener = m_xListener;
m_xListener.clear();
xListener->dragDropEnd(aEv);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/CppunitTest_sc_recentfunctionsobj.mk
sc/CppunitTest_sc_recentfunctionsobj.mk | 31 +-- 1 file changed, 1 insertion(+), 30 deletions(-) New commits: commit 934c7fdd23c95858fba022ba1fe7c00d23f502b5 Author: Jens Carl AuthorDate: Thu Jul 19 05:28:16 2018 + Commit: Jens Carl CommitDate: Thu Jul 19 17:55:22 2018 +0200 Remove obsolete (cargo-cult copied) dependencies Change-Id: I201a8fc715b0f64f7efeb6ffa17d6c603e0c810f Reviewed-on: https://gerrit.libreoffice.org/57708 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/sc/CppunitTest_sc_recentfunctionsobj.mk b/sc/CppunitTest_sc_recentfunctionsobj.mk index d8ac2d014760..d4ccc882f670 100644 --- a/sc/CppunitTest_sc_recentfunctionsobj.mk +++ b/sc/CppunitTest_sc_recentfunctionsobj.mk @@ -18,43 +18,14 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_recentfunctionsobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_recentfunctionsobj, \ - basegfx \ - comphelper \ cppu \ - cppuhelper \ - drawinglayer \ - editeng \ - for \ - forui \ - i18nlangtag \ - msfilter \ - oox \ sal \ - salhelper \ - sax \ - sb \ - sc \ - sfx \ - sot \ subsequenttest \ - svl \ - svt \ - svx \ - svxcore \ test \ - tk \ - tl \ - ucbhelper \ unotest \ - utl \ - vbahelper \ - vcl \ - xo \ )) $(eval $(call gb_CppunitTest_set_include,sc_recentfunctionsobj,\ - -I$(SRCDIR)/sc/source/ui/inc \ - -I$(SRCDIR)/sc/inc \ $$(INCLUDE) \ )) @@ -64,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_recentfunctionsobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_recentfunctionsobj)) $(eval $(call gb_CppunitTest_use_components,sc_recentfunctionsobj,\ -$(sc_unoapi_common_components) \ + $(sc_unoapi_common_components) \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_recentfunctionsobj)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/XMLFontAutoStylePool.cxx |2 +-
xmloff/source/text/txtflde.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0288088d407e8285c9cdbf01637e56e66ab02318
Author: Andrea Gelmini
AuthorDate: Tue Jul 17 23:18:12 2018 +0200
Commit: Jens Carl
CommitDate: Thu Jul 19 17:53:45 2018 +0200
Fix typos
Change-Id: I18b19477f9697b155ecb63481c38b93a5ac8c430
Reviewed-on: https://gerrit.libreoffice.org/57607
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx
b/xmloff/source/style/XMLFontAutoStylePool.cxx
index b0515a1bbea9..8c2fa0ce9e23 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -465,7 +465,7 @@ void XMLFontAutoStylePool::exportXML()
if (sFileUrl.isEmpty())
continue;
-// When embeded only is not set or font is used
+// When embedded only is not set or font is used
if (!m_bEmbedUsedOnly ||
aUsedFontNames.find(pEntry->GetFamilyName()) !=
aUsedFontNames.end())
{
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 1d3551fba7d9..f65f26943a62 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2097,7 +2097,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
}
// else: no declarations element
-// user field field masters:
+// user field masters:
if ( !aUserName.empty() )
{
SvXMLElementExport aElem( GetExport(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_uiwriter.mk sw/qa sw/source
sw/CppunitTest_sw_uiwriter.mk |1
sw/qa/extras/uiwriter/data2/tdf101534.fodt | 28 +++
sw/qa/extras/uiwriter/uiwriter2.cxx | 60
sw/source/core/doc/DocumentContentOperationsManager.cxx |4 -
4 files changed, 92 insertions(+), 1 deletion(-)
New commits:
commit 340eaa6aa15c18cc2696a4a304350810cb36565c
Author: Miklos Vajna
AuthorDate: Thu Jul 19 15:32:59 2018 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 19 17:46:26 2018 +0200
tdf#101534 sw: fix lost indent attributes when copying into numbered
paragraph
Commit aa91dc0ccbe53ffcec9dbfec2265de057775d4e3 (CWS-TOOLING: integrate
CWS sw32numbf01, 2009-09-08) replaced the SwDoc::ReplaceNumRule() call
with SwDoc::SetNumRule(), as the later handles list ids. This required a
decision if resetting of the indent attributes is needed or not, but it
did not document why resetting was chosen.
On the other hand, the current bugdoc shows why resetting is a bad idea:
this way if you paste into a numbered paragraph which has a non-zero
paragraph indent inherited from the numbering + zero indent as direct
formatting, then this later is lost during paste.
Change-Id: Ie5dcf6ed86c240fd61c4d5bfed886910aea3648f
Reviewed-on: https://gerrit.libreoffice.org/57727
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index bb3271ec9fa3..d11d1754892b 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_uiwriter))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_uiwriter, \
sw/qa/extras/uiwriter/uiwriter \
+sw/qa/extras/uiwriter/uiwriter2 \
))
# note: this links msword only for the reason to have a order dependency,
diff --git a/sw/qa/extras/uiwriter/data2/tdf101534.fodt
b/sw/qa/extras/uiwriter/data2/tdf101534.fodt
new file mode 100644
index ..e1db2f08ee08
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data2/tdf101534.fodt
@@ -0,0 +1,28 @@
+
+http://www.w3.org/1999/xlink";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:config="urn:oas
is:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:formx="urn:openoffice:names:
experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Lorem ipsum dolor sit amet.
+
+
+ Quo dolor dolore ea, vis te dicunt
evertitur. Quo idque nostrud referrentur at, saperet volumus sententiae ut
pro.
+
+
+
+
+
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
new file mode 100644
index ..239700294b71
--- /dev/null
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+
+namespace
+{
+char const DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data2/";
+}
+
+/// Second set
[Libreoffice-commits] core.git: oox/source
oox/source/core/xmlfilterbase.cxx | 19 +--
1 file changed, 5 insertions(+), 14 deletions(-)
New commits:
commit 049d436eaad05a3fbd2e64a558dfef3c03ce7448
Author: László Németh
AuthorDate: Thu Jul 19 15:05:45 2018 +0200
Commit: László Németh
CommitDate: Thu Jul 19 17:43:56 2018 +0200
use sequenceToContainer and simplify iterator usage
clean up commit 9a5c56a9c4e04589b0a6bb710573922e459d9685
(OOXML import/export of setting "Open as read-only"),
as suggested by Eike Rathke.
Change-Id: I2a176261fa729038b5be4649b6a53d0bcc35840d
Reviewed-on: https://gerrit.libreoffice.org/57726
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 5168d81fb7fb..2121716dad4e 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -753,30 +753,23 @@ static void
writeCustomProperties( XmlFilterBase& rSelf, const Reference<
XDocumentProperties >& xProperties, bool bSecurityOptOpenReadOnly )
{
uno::Reference xUserDefinedProperties(
xProperties->getUserDefinedProperties(), uno::UNO_QUERY );
-Sequence< PropertyValue > aprop(
xUserDefinedProperties->getPropertyValues() );
-sal_Int32 nbCustomProperties = aprop.getLength();
+auto aprop = comphelper::sequenceToContainer<
std::vector
>(xUserDefinedProperties->getPropertyValues());
+sal_Int32 nbCustomProperties = aprop.size();
// tdf#89791 : if no custom properties, no need to add docProps/custom.x
// tdf#107690: except the case of read-only documents, because that
// is handled by the _MarkAsFinal custom property in MSO.
if (!nbCustomProperties && !bSecurityOptOpenReadOnly)
return;
-std::vector aprop2;
-for ( sal_Int32 n = 0; n < nbCustomProperties; ++n )
-aprop2.push_back(aprop[n]);
-
if (bSecurityOptOpenReadOnly)
{
PropertyValue aPropertyValue;
// MSO custom property for read-only documents
aPropertyValue.Name = "_MarkAsFinal";
aPropertyValue.Value <<= true;
-aprop2.push_back(aPropertyValue);
+aprop.push_back(aPropertyValue);
}
-if (!aprop2.size())
-return;
-
rSelf.addRelation(
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties";,
"docProps/custom.xml" );
@@ -788,8 +781,7 @@ writeCustomProperties( XmlFilterBase& rSelf, const
Reference< XDocumentPropertie
FSNS( XML_xmlns, XML_vt ),
OUStringToOString(rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)),
RTL_TEXTENCODING_UTF8).getStr(),
FSEND );
-auto aIt = aprop2.begin();
-for ( size_t n = 0; n < aprop2.size(); ++n )
+for (auto aIt = aprop.begin(); aIt != aprop.end(); ++aIt)
{
if ( !aIt->Name.isEmpty() )
{
@@ -797,7 +789,7 @@ writeCustomProperties( XmlFilterBase& rSelf, const
Reference< XDocumentPropertie
// pid starts from 2 not from 1 as MS supports pid from 2
pAppProps->startElement( XML_property ,
XML_fmtid, "{D5CDD505-2E9C-101B-9397-08002B2CF9AE}",
-XML_pid,OString::number(n + 2),
+XML_pid,OString::number((aIt - aprop.begin()) + 2),
XML_name, aName,
FSEND);
@@ -848,7 +840,6 @@ writeCustomProperties( XmlFilterBase& rSelf, const
Reference< XDocumentPropertie
}
pAppProps->endElement( XML_property );
}
-++aIt;
}
pAppProps->endElement( XML_Properties );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/cuicharmap.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit e8bf2cb72dbe55f4e9ac7ace48e644a934cfc503
Author: Caolán McNamara
AuthorDate: Thu Jul 19 12:20:47 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 19 16:52:49 2018 +0200
tdf#118304 reselect current glyph on changing font
preview glyph will rerender the glyph if its there, or the glyph description
changes to "missing glyph" if its not there anymore. Don't auto select
first entry of the subset when font changes, leave it as unselected and
let the glyph determine what's ends up there
Change-Id: I33d7dd3a071100175ac9bc7c7e9d44684a1aff28
Reviewed-on: https://gerrit.libreoffice.org/57724
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 67efede90e32..4caf324c9ecd 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -471,6 +471,8 @@ void SvxCharacterMap::init()
else if (m_xFontLB->get_count() )
m_xFontLB->set_active(0);
FontSelectHdl(*m_xFontLB);
+if (m_xSubsetLB->get_count())
+m_xSubsetLB->set_active(0);
m_xFontLB->connect_changed(LINK( this, SvxCharacterMap, FontSelectHdl));
m_xSubsetLB->connect_changed(LINK( this, SvxCharacterMap,
SubsetSelectHdl));
@@ -603,6 +605,8 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont )
m_xFontLB->set_active_text(aTmp.GetFamilyName());
aFont = aTmp;
FontSelectHdl(*m_xFontLB);
+if (m_xSubsetLB->get_count())
+m_xSubsetLB->set_active(0);
}
void SvxCharacterMap::fillAllSubsets(weld::ComboBoxText& rListBox)
@@ -679,14 +683,10 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl,
weld::ComboBoxText&, void)
pSubsetMap.reset(new SubsetMap( xFontCharMap ));
// update subset listbox for new font's unicode subsets
-bool bFirst = true;
for (auto const& subset : pSubsetMap->GetSubsetMap())
{
m_xSubsetLB->append(OUString::number(reinterpret_cast(&subset)),
subset.GetName());
// NOTE: subset must live at least as long as the selected font
-if (bFirst)
-m_xSubsetLB->set_active(0);
-bFirst = false;
}
if (m_xSubsetLB->get_count() <= 1)
@@ -695,6 +695,9 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl,
weld::ComboBoxText&, void)
m_xSubsetText->set_sensitive(bNeedSubset);
m_xSubsetLB->set_sensitive(bNeedSubset);
+
+// tdf#118304 reselect current glyph to see if its still there in new font
+selectCharByCode(Radix::hexadecimal);
}
void SvxCharacterMap::toggleSearchView(bool state)
@@ -998,14 +1001,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl,
SvxShowCharSet*, void)
m_xSubsetLB->set_active(-1);
}
-if(m_xShowSet->HasFocus() || m_xHexCodeText->has_focus() ||
m_xDecimalCodeText->has_focus() )
-{
-m_aShowChar.SetText( aText );
-m_aShowChar.SetFont( aFont );
-m_aShowChar.Invalidate();
+m_aShowChar.SetText( aText );
+m_aShowChar.SetFont( aFont );
+m_aShowChar.Invalidate();
-setFavButtonState(aText, aFont.GetFamilyName());
-}
+setFavButtonState(aText, aFont.GetFamilyName());
}
IMPL_LINK_NOARG(SvxCharacterMap, SearchCharHighlightHdl, SvxShowCharSet*, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: + Jmux, Michael W, Sophie, Olivier, Michael M, Xisco, Miklos, Eike, Thorsten, Cloph, Heiko, Caolan * Completed Action Items: + Submit Tirana / conference papers + https://libocon.org/2018/call-for-papers/ + lots of last-minute submissions ... + Windows tinderbox/build-bot owners to parallel install VS2017 [ Jenkins slaves all updated & building (Christian) switch already enabled on master ] + on ESC share - “Budget2018” - add your ranking before this week’s call [ hopefully getting there ] * Pending Action Items: * Release Engineering update (Christian) + 6.0.6 – rc2 due next week + 6.1.0 RC2 – next week – July 17 + delayed a little by Xisco’s revert. + plan to tag after the ESC call, later today. + 6.1 late features + calc threading default / fixing (Miklos) + 3 calc docs - are they threading related or not ? + things can be improved, but looking promising. => done – disable after a few releases. + Remotes + Android viewer + new patches but no new version yet. + Online + need an rc2 – Timar on vacation. + iOS – now has built-in l10n support in XCode on master for storyboards. * Documentation (Olivier) + New Help + included into the 6.1 release & packaged + Fixing corner case of bookmark in help page (ohallot) + Help contents + Content removal from obsoleted feature (fitoshido) + Contents updated on signatures (Caolán) + Change in terminology for tree-files (ohallot) + Guides + Reviewing chapters for book assembly * UX Update (Heiko) + Bugzilla (topicUI) statistics 251(251) (topicUI) bugs open, 291(291) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month 3 months 12 months added 15(12)24(14)30(13) 97(14) commented 48(17) 140(50) 286(46)1702(46) removed 1(1) 1(1) 1(1) 11(1) resolved 4(3) 9(2) 20(3) 170(-1) + top 10 contributors: Buovjaga made 58 changes in 1 month, and 205 changes in 1 year Foote, V Stuart made 38 changes in 1 month, and 268 changes in 1 year Tietze, Heiko made 36 changes in 1 month, and 713 changes in 1 year Xisco Faulí made 27 changes in 1 month, and 317 changes in 1 year kompilainenn made 21 changes in 1 month, and 42 changes in 1 year OfficeUser made 18 changes in 1 month, and 18 changes in 1 year Telesto made 14 changes in 1 month, and 94 changes in 1 year Henschel, Regina made 11 changes in 1 month, and 99 changes in 1 year Harald Koester made 8 changes in 1 month, and 13 changes in 1 year Kaganski, Mike made 8 changes in 1 month, and 50 changes in 1 year + just returned from vacation. + Some discussion on how close we want to be on Excel (tdf#117647) + make the top 10 elements – for conditional formatting. + is this a UI thing ? (Michael) + any file-format, functional difference seems gratuitous. + just UI (Heiko) + is the colibre icon-set finished ? (Olivier) + Andreas says – finished a month ago (Heiko) + request asking for screenshots noted. + help pages use icons (Olivier) + using Colibre as the icons. + do help pages use links.txt ? (Michael) + copy the full colibre inside the help package + when I did the analysis it was complete (Michael) + anything missing is prolly a S/W problem. + calm down the shuffling for now (Thorsten) + UI freeze reminder for 6-1 (Heiko) + everyone knows this – lets keep the freeze cf. July 8th. * Fuzz / Crash Testing (Caolan) + 20(-24) import failure, 4(+1) export failures + found a few SVG crashers from new SVG bits. + crash since Noel’s work of std::unique_ptr of SvStream + before that - was a leak wrt. Embedded spreadsheets. + going to need a chunk of energy to fix. + coverity + 17(+12, -6) + expect all to be fixed from this report. + next due-in during the day – should get back to pre-vacation + forcepoint round #8 + smaller set of issues here – only 7 + only 3 / 4 outstanding. + oss-fuzz (13 outstanding, 13 minor) + broke during Caolans’ vacation + reasonably small. * Crash Reporting (Xisco) + http://crashreport.libreoffice.org/stats/version/5.4.7.2 + 534 (last 7 days) (45) + http://crashreport.libreoffice.org/stats/version/6.0.4.2 + 967 (last 7 days) (-160) + http://crashreport.libreoffice.org/stats/version/6.0.5.2 + 1232 (last 7 days) (+137) + Update
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/misc/redlndlg.cxx |2 +-
sw/source/uibase/shells/textfld.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9c4d1503ba0ff97cdb113653b8dfe3ce66798ad5
Author: Caolán McNamara
AuthorDate: Thu Jul 19 10:54:39 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 19 16:49:39 2018 +0200
Resolves: tdf#118827 SetCareWin should be SetCareDialog
Change-Id: I84c00a193e65a18b3ba82351c07be0b63e0cd5d4
Reviewed-on: https://gerrit.libreoffice.org/57719
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/uibase/misc/redlndlg.cxx
b/sw/source/uibase/misc/redlndlg.cxx
index 1c1d40962749..b8590f525b7d 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -1125,8 +1125,8 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl,
SvSimpleTable*, void)
m_pTable->SetEntryText(sMsg.replace('\n', ' '), pEntry, 3);
}
-pDlg.disposeAndClear();
SwViewShell::SetCareDialog(nullptr);
+pDlg.disposeAndClear();
}
}
else if (nRet)
diff --git a/sw/source/uibase/shells/textfld.cxx
b/sw/source/uibase/shells/textfld.cxx
index a8fc344d7a56..a33b9a8b10fe 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -607,8 +607,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
rSh.SetRedlineComment(sMsg);
}
+SwViewShell::SetCareDialog(nullptr);
pDlg.disposeAndClear();
-SwViewShell::SetCareWin(nullptr);
g_bNoInterrupt = false;
rSh.ClearMark();
GetView().AttrChangedNotify(GetShellPtr());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/backingcomp.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit fce3d0eec508c14beb2bc4ad3b7982abf6ec3c4a
Author: Caolán McNamara
AuthorDate: Thu Jul 19 11:24:40 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 19 16:49:09 2018 +0200
tdf#93085 restore orig min window size after startcenter...
is replaced by something else, but use 1,1 if orig was 0,0 otherwise its
ignored
Change-Id: Id63ec5875cd8fb4335f0f47586bb30bb5f812145
Reviewed-on: https://gerrit.libreoffice.org/57722
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/dialog/backingcomp.cxx
b/sfx2/source/dialog/backingcomp.cxx
index 8d4ee36b4dd4..d6e36f75476b 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -92,6 +92,8 @@ private:
osl::Mutex m_aTypeProviderMutex;
+Size m_aInitialWindowMinSize;
+
public:
explicit BackingComp();
@@ -425,6 +427,12 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const
css::uno::Reference< css::f
if( pMenu )
nMenuHeight = pMenu->GetSizePixel().Height();
+m_aInitialWindowMinSize = pParent->GetMinOutputSizePixel();
+if (!m_aInitialWindowMinSize.Width())
+m_aInitialWindowMinSize.AdjustWidth(1);
+if (!m_aInitialWindowMinSize.Height())
+m_aInitialWindowMinSize.AdjustHeight(1);
+
pParent->SetMinOutputSizePixel(
Size(
pBack->get_width_request(),
@@ -573,9 +581,12 @@ void SAL_CALL BackingComp::dispose()
{
css::uno::Reference< css::awt::XWindow > xParentWindow =
m_xFrame->getContainerWindow();
VclPtr< WorkWindow > pParent =
static_cast(VCLUnoHelper::GetWindow(xParentWindow).get());
-
-// hide NotebookBar
-sfx2::SfxNotebookBar::CloseMethod(static_cast(pParent));
+if (pParent)
+{
+pParent->SetMinOutputSizePixel(m_aInitialWindowMinSize);
+// hide NotebookBar
+
sfx2::SfxNotebookBar::CloseMethod(static_cast(pParent));
+}
}
// stop listening at the window
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
1 new defect(s) introduced to LibreOffice found with Coverity Scan.
14 defect(s), reported by Coverity Scan earlier, were marked fixed in the
recent build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)
** CID 1438043:(DEADCODE)
/sw/source/core/layout/layact.cxx: 445 in
SwLayAction::InternalAction(OutputDevice *)()
/sw/source/core/layout/layact.cxx: 448 in
SwLayAction::InternalAction(OutputDevice *)()
*** CID 1438043:(DEADCODE)
/sw/source/core/layout/layact.cxx: 445 in
SwLayAction::InternalAction(OutputDevice *)()
439
440 IDocumentLayoutAccess& rLayoutAccess =
m_pRoot->GetFormat()->getIDocumentLayoutAccess();
441 bool bNoLoop = pPage && SwLayouter::StartLoopControl(
m_pRoot->GetFormat()->GetDoc(), pPage );
442 sal_uInt16 nPercentPageNum = 0;
443 while ( (pPage && !IsInterrupt()) || m_nCheckPageNum != USHRT_MAX )
444 {
>>> CID 1438043:(DEADCODE)
>>> Execution cannot reach the expression "pPage->GetPhyPageNum() >=
>>> this->m_nCheckPageNum" inside this statement: "if (!pPage &&
>>> this->m_nChec...".
445 if ( !pPage && m_nCheckPageNum != USHRT_MAX &&
446 (!pPage || pPage->GetPhyPageNum() >= m_nCheckPageNum) )
447 {
448 if ( !pPage || pPage->GetPhyPageNum() > m_nCheckPageNum )
449 {
450 SwPageFrame *pPg =
static_cast(m_pRoot->Lower());
/sw/source/core/layout/layact.cxx: 448 in
SwLayAction::InternalAction(OutputDevice *)()
442 sal_uInt16 nPercentPageNum = 0;
443 while ( (pPage && !IsInterrupt()) || m_nCheckPageNum != USHRT_MAX )
444 {
445 if ( !pPage && m_nCheckPageNum != USHRT_MAX &&
446 (!pPage || pPage->GetPhyPageNum() >= m_nCheckPageNum) )
447 {
>>> CID 1438043:(DEADCODE)
>>> Execution cannot reach the expression "pPage->GetPhyPageNum() >
>>> this->m_nCheckPageNum" inside this statement: "if (!pPage ||
>>> pPage->GetPhy...".
448 if ( !pPage || pPage->GetPhyPageNum() > m_nCheckPageNum )
449 {
450 SwPageFrame *pPg =
static_cast(m_pRoot->Lower());
451 while ( pPg && pPg->GetPhyPageNum() < m_nCheckPageNum )
452 pPg = static_cast(pPg->GetNext());
453 if ( pPg )
To view the defects in Coverity Scan visit,
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyaicp5raxBNRKMdrrCQSQrZBd26wIOlS495yuuhqd2DmKJELDyiPyCaNTVwiDTRBDRjo5qV1ZDbx9UnBpkNcK5-2FllXaGCndrpOMKzm0u3bnf3Yssfu14IAt9wNubS4rDzIxojtD-2FRKBvOgnfnlq6wEXNW6vb2q2gn5xAskYXDw2I-3D
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: .gitreview source/text
.gitreview|7 +++ source/text/shared/01/ref_epub_export.xhp |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 11a9f0c96e91153a458f8c7881c38fc7f728f2b4 Author: Miklos Vajna Date: Thu Jul 19 16:26:34 2018 +0200 tdf#118771 EPUB export: document that reflowable content has no page style Change-Id: I452b26da43c1481d7af01c0b9f4b0f27a5053ae7 Reviewed-on: https://gerrit.libreoffice.org/57732 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/.gitreview b/.gitreview new file mode 100644 index 0..f31508045 --- /dev/null +++ b/.gitreview @@ -0,0 +1,7 @@ +[gerrit] +host=logerrit +port=29418 +project=help +defaultremote=logerrit +defaultbranch=master + diff --git a/source/text/shared/01/ref_epub_export.xhp b/source/text/shared/01/ref_epub_export.xhp index 849c5c300..71b0ddc63 100644 --- a/source/text/shared/01/ref_epub_export.xhp +++ b/source/text/shared/01/ref_epub_export.xhp @@ -71,7 +71,7 @@ Determines if a reflowable or a fixed layout EPUB will be generated. -Reflowable: The content flows, or reflows, to fit the screen and to fit the needs of the user. +Reflowable: The content flows, or reflows, to fit the screen and to fit the needs of the user. This also means that page style information (for example page size or header/footer content) is not exported. Fixed: Gives greater control over presentation when a reflowable EPUB is not suitable for the content. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a08e51634ff944eef05ce802242fc90a501f462a Author: Miklos Vajna AuthorDate: Thu Jul 19 16:26:34 2018 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 19 16:27:59 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#118771 EPUB export: document that reflowable content has no page style Change-Id: I452b26da43c1481d7af01c0b9f4b0f27a5053ae7 Reviewed-on: https://gerrit.libreoffice.org/57732 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/helpcontent2 b/helpcontent2 index c58bf8545eb2..11a9f0c96e91 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c58bf8545eb2f76dee66921dad945f17b5274f6f +Subproject commit 11a9f0c96e91153a458f8c7881c38fc7f728f2b4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/karasa_jaga
icon-themes/karasa_jaga/chart2/res/gl3dbar_roundrect.png |binary icon-themes/karasa_jaga/chart2/res/typegl3dbar_16.png |binary icon-themes/karasa_jaga/cmd/32/changecasetolower.png |binary icon-themes/karasa_jaga/cmd/32/changecasetoupper.png |binary icon-themes/karasa_jaga/cmd/32/filefield.png |binary icon-themes/karasa_jaga/cmd/32/insertpagecountfield.png |binary icon-themes/karasa_jaga/cmd/32/insertpagenumberfield.png |binary icon-themes/karasa_jaga/cmd/32/move.png |binary icon-themes/karasa_jaga/cmd/32/numberformatscientific.png |binary icon-themes/karasa_jaga/cmd/32/togglesheetgrid.png|binary icon-themes/karasa_jaga/cmd/32/toolbarmode.png|binary icon-themes/karasa_jaga/cmd/lc_changecasetolower.png |binary icon-themes/karasa_jaga/cmd/lc_changecasetoupper.png |binary icon-themes/karasa_jaga/cmd/lc_filefield.png |binary icon-themes/karasa_jaga/cmd/lc_insertpagecountfield.png |binary icon-themes/karasa_jaga/cmd/lc_insertpagenumberfield.png |binary icon-themes/karasa_jaga/cmd/lc_inserttitlefield.png |binary icon-themes/karasa_jaga/cmd/lc_inserttopicfield.png |binary icon-themes/karasa_jaga/cmd/lc_move.png |binary icon-themes/karasa_jaga/cmd/lc_numberformatscientific.png |binary icon-themes/karasa_jaga/cmd/lc_toolbarmode.png|binary icon-themes/karasa_jaga/cmd/sc_alignbottom.png|binary icon-themes/karasa_jaga/cmd/sc_aligntop.png |binary icon-themes/karasa_jaga/cmd/sc_alignverticalcenter.png|binary icon-themes/karasa_jaga/cmd/sc_changecasetolower.png |binary icon-themes/karasa_jaga/cmd/sc_changecasetoupper.png |binary icon-themes/karasa_jaga/cmd/sc_filefield.png |binary icon-themes/karasa_jaga/cmd/sc_insertpagecountfield.png |binary icon-themes/karasa_jaga/cmd/sc_insertpagenumberfield.png |binary icon-themes/karasa_jaga/cmd/sc_inserttitlefield.png |binary icon-themes/karasa_jaga/cmd/sc_inserttopicfield.png |binary icon-themes/karasa_jaga/cmd/sc_move.png |binary icon-themes/karasa_jaga/cmd/sc_numberformatscientific.png |binary icon-themes/karasa_jaga/cmd/sc_spacepara15.png|binary icon-themes/karasa_jaga/cmd/sc_toolbarmode.png|binary icon-themes/karasa_jaga/cmd/sc_wordcountdialog.png|binary icon-themes/karasa_jaga/cmd/sc_wraptext.png |binary icon-themes/karasa_jaga/links.txt | 12 ++-- icon-themes/karasa_jaga/sc/res/na07.png |binary icon-themes/karasa_jaga/sw/res/sc20175.png|binary icon-themes/karasa_jaga/sw/res/sc20186.png|binary 41 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 8196549f20d9e623ec18991191ed97c6fe0c9c8b Author: Rizal Muttaqin AuthorDate: Tue Jul 17 22:51:04 2018 +0700 Commit: andreas_kainz CommitDate: Thu Jul 19 15:51:46 2018 +0200 KJ: ^ case, sheet related, numb-format, vert-alignment, navigation Change-Id: I187b289963a6fdbf8752133bc006328f9de886ba Reviewed-on: https://gerrit.libreoffice.org/57580 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/karasa_jaga/chart2/res/gl3dbar_roundrect.png b/icon-themes/karasa_jaga/chart2/res/gl3dbar_roundrect.png new file mode 100644 index ..ea152305261a Binary files /dev/null and b/icon-themes/karasa_jaga/chart2/res/gl3dbar_roundrect.png differ diff --git a/icon-themes/karasa_jaga/chart2/res/typegl3dbar_16.png b/icon-themes/karasa_jaga/chart2/res/typegl3dbar_16.png new file mode 100644 index ..d04c6b05eb21 Binary files /dev/null and b/icon-themes/karasa_jaga/chart2/res/typegl3dbar_16.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/changecasetolower.png b/icon-themes/karasa_jaga/cmd/32/changecasetolower.png index 1a7d86e84150..3ff0668b1cae 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/changecasetolower.png and b/icon-themes/karasa_jaga/cmd/32/changecasetolower.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/changecasetoupper.png b/icon-themes/karasa_jaga/cmd/32/changecasetoupper.png index f5b09ecf8524..cb922e3c95d4 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/changecasetoupper.png and b/icon-themes/karasa_jaga/cmd/32/changecasetoupper.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/filefield.png b/icon-themes/karasa_jaga/cmd/32/filefield.png new file mode 100644 index ..5c94917fd793 Binary files /dev/null and b/icon-themes/karasa_jaga/cmd/32/filefield.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/insertpagecountfield.png b/icon-themes/karasa_jaga/cmd/32/insertpagecountfield.png index fcab9913a7bc..9ccad5952d73 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/insertpagecountfield.png and b/icon-themes/karasa_jaga/cmd/32/insertpagecountfield.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/insertp
[Libreoffice-commits] core.git: include/svl sc/source svl/source sw/inc sw/source
include/svl/style.hxx |2 +-
sc/source/core/data/patattr.cxx |2 +-
sc/source/core/data/stlsheet.cxx|2 +-
sc/source/filter/xml/xmlfonte.cxx |2 +-
svl/source/items/style.cxx |4 ++--
sw/inc/docstyle.hxx |2 +-
sw/source/core/unocore/unostyle.cxx |2 +-
sw/source/uibase/app/docstyle.cxx |5 +++--
8 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit db85d367c266898d4b98fc18c9318b6bcc83725a
Author: Noel Grandin
AuthorDate: Tue Jul 17 16:13:12 2018 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 19 15:40:45 2018 +0200
return SfxStyleSheetIterator by std::unique_ptr
std::shared_ptr overkill here
Change-Id: I9bd6ee5b92f9c04e0ca48d25eba99e5c232643c7
Reviewed-on: https://gerrit.libreoffice.org/57570
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 6f328a2b7143..4bf91c357765 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -255,7 +255,7 @@ public:
SfxItemPool&GetPool() { return rPool;}
const SfxItemPool& GetPool() const { return rPool;}
-virtual std::shared_ptr
CreateIterator(SfxStyleFamily, SfxStyleSearchBits nMask);
+virtual std::unique_ptr
CreateIterator(SfxStyleFamily, SfxStyleSearchBits nMask);
sal_uInt16 Count();
SfxStyleSheetBase* operator[](sal_uInt16 nIdx);
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 70070fa52ac4..9dbf1bf83773 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -1173,7 +1173,7 @@ void ScPatternAttr::UpdateStyleSheet(const ScDocument*
pDoc)
// Assumes that "Standard" is always the 1st entry!
if (!pStyle)
{
-std::shared_ptr pIter =
pDoc->GetStyleSheetPool()->CreateIterator( SfxStyleFamily::Para,
SfxStyleSearchBits::All );
+std::unique_ptr pIter =
pDoc->GetStyleSheetPool()->CreateIterator( SfxStyleFamily::Para,
SfxStyleSearchBits::All );
pStyle = dynamic_cast< ScStyleSheet* >(pIter->First());
}
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index d9a42eb06778..21c24e4ec913 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -97,7 +97,7 @@ bool ScStyleSheet::SetParent( const OUString& rParentName )
SfxStyleSheetBase* pStyle = m_pPool->Find( aEffName, nFamily );
if (!pStyle)
{
-std::shared_ptr pIter =
m_pPool->CreateIterator( nFamily, SfxStyleSearchBits::All );
+std::unique_ptr pIter =
m_pPool->CreateIterator( nFamily, SfxStyleSearchBits::All );
pStyle = pIter->First();
if (pStyle)
aEffName = pStyle->GetName();
diff --git a/sc/source/filter/xml/xmlfonte.cxx
b/sc/source/filter/xml/xmlfonte.cxx
index b4c7e7a8808c..eeb50130fbbc 100644
--- a/sc/source/filter/xml/xmlfonte.cxx
+++ b/sc/source/filter/xml/xmlfonte.cxx
@@ -86,7 +86,7 @@
ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(ScXMLExport& rExportP,
const SfxItemPool* pEditPool(rExportP.GetDocument()->GetEditPool());
AddFontItems(aEditWhichIds, 3, pEditPool, false);
-std::shared_ptr pItr =
rExportP.GetDocument()->GetStyleSheetPool()->CreateIterator(SfxStyleFamily::Page,
SfxStyleSearchBits::All);
+std::unique_ptr pItr =
rExportP.GetDocument()->GetStyleSheetPool()->CreateIterator(SfxStyleFamily::Page,
SfxStyleSearchBits::All);
m_bEmbedUsedOnly = rExportP.GetDocument()->IsEmbedUsedFontsOnly();
m_bEmbedLatinScript = rExportP.GetDocument()->IsEmbedFontScriptLatin();
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 01873c282455..5856393f57e9 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -613,13 +613,13 @@ void SfxStyleSheetBasePool::SetSearchMask(SfxStyleFamily
eFam, SfxStyleSearchBit
}
-std::shared_ptr SfxStyleSheetBasePool::CreateIterator
+std::unique_ptr SfxStyleSheetBasePool::CreateIterator
(
SfxStyleFamily eFam,
SfxStyleSearchBits mask
)
{
-return std::make_shared(this,eFam,mask);
+return o3tl::make_unique(this,eFam,mask);
}
SfxStyleSheetBase* SfxStyleSheetBasePool::Create
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 85c7fa4ea558..0e159ac881ca 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -216,7 +216,7 @@ public:
boolIsOrganizerMode() const { return bOrganizer; }
-virtual std::shared_ptr CreateIterator(
SfxStyleFamily, SfxStyleSearchBits nMask ) override;
+virtual std::unique_ptr CreateIterator(
SfxStyleFamily, SfxStyleSearchBits nMask ) override;
SwDoc& GetDoc() const { return rDoc; }
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index e126864d756d..1f341cad9b35 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/cor
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf104797.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx| 19 +++
writerfilter/source/dmapper/DomainMapper.cxx |4 +++-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 ++
4 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit bcdebc832b272662d28035007a4796e42d1305ae
Author: László Németh
AuthorDate: Thu Jul 19 12:08:31 2018 +0200
Commit: László Németh
CommitDate: Thu Jul 19 15:34:21 2018 +0200
tdf#104797 DOCX change tracking: handle moveFrom and moveTo
data as deletion and insertion instead of importing them
as normal (unmodified) texts (messing up document content
and losing change tracking information).
Change-Id: I9c0a7da83f3e8235d65d47afdb99ffe188f52704
Reviewed-on: https://gerrit.libreoffice.org/57723
Reviewed-by: László Németh
Tested-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf104797.docx
b/sw/qa/extras/ooxmlexport/data/tdf104797.docx
new file mode 100644
index ..6e52190ce671
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf104797.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 034f252bad26..bc9e3f7f3328 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -464,6 +464,25 @@ DECLARE_OOXMLEXPORT_TEST(testMarginsFromStyle,
"margins_from_style.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(600),
getProperty(getParagraph(3), "ParaBottomMargin"));
}
+DECLARE_OOXMLIMPORT_TEST(testTdf104797, "tdf104797.docx")
+{
+// check moveFrom and moveTo
+CPPUNIT_ASSERT_EQUAL( OUString( "Will this sentence be duplicated?" ),
getParagraph( 1 )->getString());
+CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 1 ), 1
)->getString());
+CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(1), 2), "RedlineType"));
+
CPPUNIT_ASSERT_EQUAL(OUString("Delete"),getProperty(getRun(getParagraph(1),
2), "RedlineType"));
+CPPUNIT_ASSERT_EQUAL(true,getProperty(getRun(getParagraph(1), 2),
"IsStart"));
+CPPUNIT_ASSERT_EQUAL( OUString( "This is a filler sentence. Will this
sentence be duplicated ADDED STUFF?" ),
+getParagraph( 2 )->getString());
+CPPUNIT_ASSERT_EQUAL( OUString( "This is a filler sentence." ), getRun(
getParagraph( 2 ), 1 )->getString());
+CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 2 ), 2
)->getString());
+CPPUNIT_ASSERT_EQUAL( OUString( " Will this sentence be duplicated ADDED
STUFF?" ), getRun( getParagraph( 2 ), 3 )->getString());
+CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 2 ), 4
)->getString());
+CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(2), 5), "RedlineType"));
+
CPPUNIT_ASSERT_EQUAL(OUString("Insert"),getProperty(getRun(getParagraph(2),
5), "RedlineType"));
+CPPUNIT_ASSERT_EQUAL(false,getProperty(getRun(getParagraph(2), 5),
"IsStart"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 124a2061904d..b5f3d504fb77 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3823,13 +3823,15 @@ void DomainMapper::HandleRedline( Sprm& rSprm )
case XML_mod:
case XML_ins:
case XML_del:
+case XML_moveTo:
+case XML_moveFrom:
case XML_ParagraphFormat:
case XML_tableRowInsert:
case XML_tableRowDelete:
case XML_tableCellInsert:
case XML_tableCellDelete:
break;
-default: OSL_FAIL( "redline token other than mod, ins, del or table
row" ); break;
+default: OSL_FAIL( "redline token other than mod, ins, del, moveTo,
moveFrom or table row" ); break;
}
m_pImpl->EndParaMarkerChange( );
m_pImpl->SetCurrentRedlineIsRead();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e89417e99468..a1fde6baae1b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1933,9 +1933,11 @@ void
DomainMapper_Impl::CreateRedline(uno::Reference const& xR
case XML_mod:
sType = getPropertyName( PROP_FORMAT );
break;
+case XML_moveTo:
case XML_ins:
sType = getPropertyName( PROP_INSERT );
break;
+case XML_moveFrom:
case XML_del:
sType = getPropertyName( PROP_DELETE );
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa sd/source
sd/qa/unit/data/odp/tdf118783.odp|binary
sd/qa/unit/export-tests-ooxml2.cxx | 16
sd/source/filter/eppt/pptx-epptooxml.cxx | 11 ++-
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 71f7ecae6e0ef45730db4e288108cc4a3994612a
Author: Mark Hung
AuthorDate: Sun Jul 15 21:04:43 2018 +0800
Commit: Mark Hung
CommitDate: Thu Jul 19 15:10:20 2018 +0200
tdf#118783 sd:fix spin animation in saved pptx file.
The attribute name of the AnimateTransform is "Transform"
but we expect "r" for "Rotate". We need to fix it so that PowerPoint
recognize it.
Change-Id: I47590d80d28af0a0ac92ef0892b40643f1de3643
Reviewed-on: https://gerrit.libreoffice.org/57579
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sd/qa/unit/data/odp/tdf118783.odp
b/sd/qa/unit/data/odp/tdf118783.odp
new file mode 100755
index ..719db63d1d42
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf118783.odp differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 49f43fe0b8ed..74129e88aecf 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -145,6 +145,7 @@ public:
void testTdf104792();
void testTdf90627();
void testTdf104786();
+void testTdf118783();
void testTdf104789();
void testOpenDocumentAsReadOnly();
void testTdf118768();
@@ -214,6 +215,7 @@ public:
CPPUNIT_TEST(testTdf104792);
CPPUNIT_TEST(testTdf90627);
CPPUNIT_TEST(testTdf104786);
+CPPUNIT_TEST(testTdf118783);
CPPUNIT_TEST(testTdf104789);
CPPUNIT_TEST(testOpenDocumentAsReadOnly);
CPPUNIT_TEST(testTdf118768);
@@ -1687,6 +1689,20 @@ void SdOOXMLExportTest2::testTdf104786()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest2::testTdf118783()
+{
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118783.odp"), ODP);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+xDocShRef->DoClose();
+
+// check that transition attribute didn't change from 'out' to 'in'
+xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+OUString sAttributeName = getXPathContent(pXmlDocContent,
"//p:animRot/p:cBhvr/p:attrNameLst/p:attrName");
+CPPUNIT_ASSERT_EQUAL(OUString("r"), sAttributeName);
+xDocShRef->DoClose();
+}
+
void SdOOXMLExportTest2::testTdf104789()
{
::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104789.pptx"),
PPTX);
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index a1348e3e29c0..17d7c4f6835d 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1298,7 +1298,16 @@ void
PowerPointExport::WriteAnimationNodeAnimateInside(const FSHelperPtr& pFS, c
FSEND);
WriteAnimationNodeCommonPropsStart(pFS, rXNode, true, bMainSeqChild);
WriteAnimationTarget(pFS, rXAnimate->getTarget());
-WriteAnimationAttributeName(pFS, rXAnimate->getAttributeName());
+
+Reference xTransform(rXNode, UNO_QUERY);
+
+// The attribute name of AnimateTransform is "Transform", we have to fix
it.
+OUString sNewAttr;
+if (xTransform.is() && xTransform->getTransformType() ==
AnimationTransformType::ROTATE)
+sNewAttr = "Rotate";
+
+WriteAnimationAttributeName(pFS, xTransform.is() ? sNewAttr :
rXAnimate->getAttributeName());
+
pFS->endElementNS(XML_p, XML_cBhvr);
WriteAnimateValues(pFS, rXAnimate);
if (bWriteTo)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: segfault in DocumentLoader example
For the posterity, in case anyone else runs into the same problem in the future: > > > command line was: ./generator -env:URE_MORE_TYPES=file://"./offapi.rdb" > > > "./test.odt" > > > "uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" > > > > > > Libreoffice was started with: soffice > > > "-accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" > > > > Try using absolute path to the file DocumentLoader is expected to open > > (i.e. > > '/full/path/to/test.odt' instead of './test.odt') > > that fixed the problem - I wasn't aware that absolute paths are necessary > > thank you, > Oliver -- Katarina Behrens Senior Software-Entwicklerin FLOSS ––– CIB software GmbH Geschäftsstelle Hamburg Flachsland 10 22083 Hamburg ––– T +49 (40) / 28 48 42 -235 F +49 (40) / 28 48 42 -100 katarina.behr...@cib.de www.cib.de ––– Sitz: München Registergericht München, HRB 123286 Geschäftsführer: Dipl.-Ing. Ulrich Brandner ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source sd/qa sw/qa
oox/source/ole/axcontrol.cxx |9 +--
sd/qa/unit/activex-controls-tests.cxx |3 +-
sw/qa/extras/ooxmlexport/data/activex_textbox.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 25 +
4 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 076cb54472d5bba8916df9ee50074ac74433d694
Author: Balazs Varga
AuthorDate: Tue Jul 17 10:06:27 2018 +0200
Commit: Tamás Zolnai
CommitDate: Thu Jul 19 14:45:24 2018 +0200
tdf#118651 OOXML ActiveX textbox: fix multiline support
of textfield component in DOCX/PPTX by handling properties
AX_FLAGS_MULTILINE and AX_FLAGS_WORDWRAP during the import
and export. Both of them need to be enabled to get multiline
textfield in MSO, but LibreOffice has got only one multiline
property. With this fix, LibreOffice imports only really
multiline textfields as multiline, and it doesn't export
multiline textfields as single line anymore.
Change-Id: I9b567c3fcdc5d01a5838a3ec2517579f8d788954
Reviewed-on: https://gerrit.libreoffice.org/57552
Reviewed-by: László Németh
Tested-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/57619
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index c8be2ca7c7bc..fe1c36d1fb17 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -1768,7 +1768,10 @@ ApiControlType AxTextBoxModel::getControlType() const
void AxTextBoxModel::convertProperties( PropertyMap& rPropMap, const
ControlConverter& rConv ) const
{
-rPropMap.setProperty( PROP_MultiLine, getFlag( mnFlags, AX_FLAGS_MULTILINE
) );
+if (getFlag( mnFlags, AX_FLAGS_MULTILINE ) && getFlag( mnFlags,
AX_FLAGS_WORDWRAP ))
+rPropMap.setProperty( PROP_MultiLine, true );
+else
+rPropMap.setProperty( PROP_MultiLine, false );
rPropMap.setProperty( PROP_HideInactiveSelection, getFlag( mnFlags,
AX_FLAGS_HIDESELECTION ) );
rPropMap.setProperty( PROP_ReadOnly, getFlag( mnFlags, AX_FLAGS_LOCKED ) );
rPropMap.setProperty( mbAwtModel ? PROP_Text : PROP_DefaultText, maValue );
@@ -1785,8 +1788,10 @@ void AxTextBoxModel::convertProperties( PropertyMap&
rPropMap, const ControlConv
void AxTextBoxModel::convertFromProperties( PropertySet& rPropSet, const
ControlConverter& rConv )
{
bool bRes = false;
-if ( rPropSet.getProperty( bRes, PROP_MultiLine ) )
+if ( rPropSet.getProperty( bRes, PROP_MultiLine ) ) {
setFlag( mnFlags, AX_FLAGS_WORDWRAP, bRes );
+setFlag( mnFlags, AX_FLAGS_MULTILINE, bRes );
+}
if ( rPropSet.getProperty( bRes, PROP_HideInactiveSelection ) )
setFlag( mnFlags, AX_FLAGS_HIDESELECTION, bRes );
if ( rPropSet.getProperty( bRes, PROP_ReadOnly ) )
diff --git a/sd/qa/unit/activex-controls-tests.cxx
b/sd/qa/unit/activex-controls-tests.cxx
index 186d9a737624..0b9d4935d15e 100644
--- a/sd/qa/unit/activex-controls-tests.cxx
+++ b/sd/qa/unit/activex-controls-tests.cxx
@@ -266,8 +266,9 @@ void SdActiveXControlsTest::testTextBoxProperties()
xPropertySet->getPropertyValue("Enabled") >>= bEnabled;
CPPUNIT_ASSERT_EQUAL(false, bEnabled);
+// These textfields are not multilines in the pptx testfile
xPropertySet->getPropertyValue("MultiLine") >>= bMultiLine;
-CPPUNIT_ASSERT_EQUAL(true, bMultiLine);
+CPPUNIT_ASSERT_EQUAL(false, bMultiLine);
xPropertySet->getPropertyValue("TextColor") >>= nColor;
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x404040), nColor);
diff --git a/sw/qa/extras/ooxmlexport/data/activex_textbox.docx
b/sw/qa/extras/ooxmlexport/data/activex_textbox.docx
new file mode 100644
index ..6f137008ce78
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/activex_textbox.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 4711366faeb6..f769f297e13f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -934,6 +934,31 @@ DECLARE_OOXMLEXPORT_TEST(testTdf106062_nonHangingFootnote,
"tdf106062_nonHanging
CPPUNIT_ASSERT_MESSAGE( "Footnote starts with a tab",
xTextRange->getString().startsWith("\t") );
}
+DECLARE_OOXMLEXPORT_TEST( testActiveXTextfield, "activex_textbox.docx" )
+{
+uno::Reference xControlShape( getShape(1),
uno::UNO_QUERY );
+CPPUNIT_ASSERT( xControlShape.is() );
+
+// Check control type
+uno::Reference xPropertySet(
xControlShape->getControl(), uno::UNO_QUERY );
+uno::Reference xServiceInfo( xPropertySet,
uno::UNO_QUERY );
+CPPUNIT_ASSERT_EQUAL( true, bool( xServiceInfo->supportsService (
"com.sun.star.form.component.TextField" ) ) );
+
+// Check textfield is multi-line
+CPPUNIT_ASSERT_EQUAL( true, getProperty(xPropertySet, "MultiLine") );
+
+uno::Reference xControlShape2( getShape(2),
uno::UNO_QUERY );
[Libreoffice-commits] online.git: 19 commits - common/Rectangle.hpp loleaflet/src test/TileCacheTests.cpp wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/
common/Rectangle.hpp |5
loleaflet/src/layer/tile/CalcTileLayer.js| 47 -
loleaflet/src/layer/tile/GridLayer.js| 106 +++-
loleaflet/src/layer/tile/ImpressTileLayer.js | 39
loleaflet/src/layer/tile/TileLayer.js| 69 +---
loleaflet/src/layer/tile/WriterTileLayer.js | 41
test/TileCacheTests.cpp |4
wsd/ClientSession.cpp| 227 ++-
wsd/ClientSession.hpp| 55 ++
wsd/DocumentBroker.cpp | 167 ---
wsd/DocumentBroker.hpp |1
wsd/TestStubs.cpp|5
wsd/TileCache.cpp| 27 ++-
wsd/TileCache.hpp|7
wsd/protocol.txt |5
15 files changed, 551 insertions(+), 254 deletions(-)
New commits:
commit 33a0cb1ee7f1b3e6a3e234a257a6db1848ba01bc
Author: Tamás Zolnai
Date: Thu Jul 19 14:19:07 2018 +0200
Fix failing unit tests after latency changes
With the new code, wsd is waiting for tileprocessed messages
if the upper limit of tiles-on-fly limit is reached. To avoid that
send canceltiles message.
Change-Id: Iadf16c834f12d14000d630078882dfa8e11a99a0
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 10d8ba648..09fe0671e 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -247,6 +247,8 @@ void TileCacheTests::testPerformance()
std::vector tile = getResponseMessage(socket, "tile:",
"tile-performance ");
CPPUNIT_ASSERT_MESSAGE("did not receive a tile: message as
expected", !tile.empty());
}
+/// Send canceltiles message to clear tiles-on-fly list, otherwise wsd
waits for tileprocessed messages
+sendTextFrame(socket, "canceltiles");
}
std::cerr << "Tile rendering roundtrip for 5 x 8 tiles combined: " <<
timestamp.elapsed() / 1000.
@@ -430,6 +432,8 @@ void TileCacheTests::testUnresponsiveClient()
std::vector tile = getResponseMessage(socket2, "tile:",
"client2 ");
CPPUNIT_ASSERT_MESSAGE("Did not receive tile #" +
std::to_string(i+1) + " of 8: message as expected", !tile.empty());
}
+/// Send canceltiles message to clear tiles-on-fly list, otherwise wsd
waits for tileprocessed messages
+sendTextFrame(socket2, "canceltiles");
}
}
commit fe5507f134c23198eb78276836b619fa227600fa
Author: Tamás Zolnai
Date: Tue Jul 10 14:23:20 2018 +0200
Add some additional comment related to latency changes
Change-Id: I3ece60ce8a66730a8f8a93757412bcaa2b02a77d
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index a62f4b39d..1b21425d4 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -111,8 +111,10 @@ public:
/// Set WOPI fileinfo object
void setWopiFileInfo(std::unique_ptr&
wopiFileInfo) { _wopiFileInfo = std::move(wopiFileInfo); }
+/// Get requested tiles waiting for sending to the client
boost::optional>& getRequestedTiles() { return
_requestedTiles; }
+/// Mark a new tile as sent
void addTileOnFly(const TileDesc& tile);
void clearTilesOnFly();
size_t getTilesOnFlyCount() const { return _tilesOnFly.size(); }
@@ -161,12 +163,14 @@ private:
void dumpState(std::ostream& os) override;
+/// Handle invalidation message comming from a kit and transfer it to a
tile request.
void handleTileInvalidation(const std::string& message,
const std::shared_ptr&
docBroker);
/// Clear wireId map anytime when client visible area changes (visible
area, zoom, part number)
void resetWireIdMap();
+/// Generate a unique id for a tile
std::string generateTileID(const TileDesc& tile);
private:
@@ -218,11 +222,13 @@ private:
/// Client is using a text document?
bool _isTextDocument;
+/// TileID's of the sent tiles. Push by sending and pop by tileprocessed
message from the client.
std::list _tilesOnFly;
+/// Requested tiles are stored in this list, before we can send them to
the client
boost::optional> _requestedTiles;
-/// Store wireID's of the sent tiles for the actual visible area
+/// Store wireID's of the sent tiles inside the actual visible area
std::map _oldWireIds;
};
commit 3215ddfe481e00cf75191841ee052a38fc30104c
Author: Tamás Zolnai
Date: Fri Jul 6 13:48:30 2018 +0200
Set back debugging code removed by latency related code changes
Change-Id: I6634029bc8c36dfea7219e7e48e1c010b274e687
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 10cdb155b..b616155b0 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -253,6 +253,7 @@ L.CalcTileLayer = L.TileLayer.extend({
[Libreoffice-commits] core.git: sc/inc sc/source sd/source sfx2/source
sc/inc/address.hxx|2 +-
sc/source/core/data/column.cxx|2 +-
sc/source/filter/oox/formulabuffer.cxx|2 +-
sc/source/ui/Accessibility/AccessibleDocument.cxx | 14 +++---
sc/source/ui/view/viewfun3.cxx|2 +-
sd/source/ui/inc/PreviewRenderer.hxx |4 ++--
sd/source/ui/view/frmview.cxx |2 +-
sfx2/source/control/shell.cxx |2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit a6b456076f4e4f689e77cffbb661f2cae62a1502
Author: Andrea Gelmini
AuthorDate: Tue Jul 17 23:18:07 2018 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 19 14:05:44 2018 +0200
Fix typos
Change-Id: Ica623a5312196ff6a3538027e7c72ba4afe92f5c
Reviewed-on: https://gerrit.libreoffice.org/57604
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 37a401ef0194..63ddb00188ba 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -73,7 +73,7 @@ const SCROW MAXROW = MAXROWCOUNT - 1;
const SCCOL MAXCOL = MAXCOLCOUNT - 1;
const SCTAB MAXTAB = MAXTABCOUNT - 1;
const SCCOLROWMAXCOLROW = MAXROW;
-// Maximun tiled rendering values
+// Maximum tiled rendering values
const SCROW MAXTILEDROW= 50;
// Limit the initial tab count to prevent users to set the count too high,
// which could cause the memory usage of blank documents to exceed the
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 268ec1b7793c..ec19876bcd65 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -706,7 +706,7 @@ void ScColumn::SetPatternArea( SCROW nStartRow, SCROW
nEndRow,
void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr )
{
// in order to only create a new SetItem, we don't need SfxItemPoolCache.
-//TODO: Warning: SfxItemPoolCache seems to create to many Refs for the new
SetItem ??
+//TODO: Warning: SfxItemPoolCache seems to create too many Refs for the
new SetItem ??
ScDocumentPool* pDocPool = GetDoc()->GetPool();
diff --git a/sc/source/filter/oox/formulabuffer.cxx
b/sc/source/filter/oox/formulabuffer.cxx
index 0561bba62e92..ccd0cf56f357 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -155,7 +155,7 @@ void applySharedFormulas(
pCell->SetResultDouble(rDesc.maCellValue.toDouble());
/* TODO: is it on purpose that we never reset dirty here
* and thus recalculate anyway if cell was dirty? Or is it
- * never dirty and therefor set dirty below otherwise? This
+ * never dirty and therefore set dirty below otherwise?
This
* is different from the non-shared case in
* applyCellFormulaValues(). */
break;
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 421d7d5dff4b..7c1438d8792c 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1850,7 +1850,7 @@ void SAL_CALL
if (mpChildrenShapes && mpViewShell)
{
-sal_Int32 nCount(mpChildrenShapes->GetCount()); //all shapes and the
table
+sal_Int32 nCount(mpChildrenShapes->GetCount()); // all shapes and the
table
if (mxTempAcc.is())
++nCount;
if (nChildIndex < 0 || nChildIndex >= nCount)
@@ -1862,7 +1862,7 @@ void SAL_CALL
bool bWasTableSelected(IsTableSelected());
if (mpChildrenShapes)
-mpChildrenShapes->Select(nChildIndex); // throws no
lang::IndexOutOfBoundsException if Index is to high
+mpChildrenShapes->Select(nChildIndex); // throws no
lang::IndexOutOfBoundsException if Index is too high
if (bWasTableSelected)
mpViewShell->SelectAll();
@@ -1884,7 +1884,7 @@ sal_Bool SAL_CALL
if (mpChildrenShapes)
{
-sal_Int32 nCount(mpChildrenShapes->GetCount()); //all shapes and the
table
+sal_Int32 nCount(mpChildrenShapes->GetCount()); // all shapes and the
table
if (mxTempAcc.is())
++nCount;
if (nChildIndex < 0 || nChildIndex >= nCount)
@@ -1894,7 +1894,7 @@ sal_Bool SAL_CALL
if (xAccessible.is())
{
uno::Reference xShape;
-bResult = mpChildrenShapes->IsSelected(nChildIndex, xShape); //
throws no lang::IndexOutOfBoundsException if Index is to high
+bResult = mpChildrenShapes->IsSelected(nChildIndex, xShape); //
throws no lang::IndexOutOfBoundsException if Index is too high
}
else
{
@@ -1967,7 +1967,7 @@ uno::Reference SAL_CALL
bool bT
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/data/functions/date_time/fods/hour.fods | 31 ++-
sc/qa/unit/data/functions/date_time/fods/minute.fods | 26 ++-
sc/qa/unit/data/functions/date_time/fods/second.fods | 26 ++-
sc/source/core/tool/interpr2.cxx |6 +--
4 files changed, 74 insertions(+), 15 deletions(-)
New commits:
commit c69e7266916ac1b8917477fb4eccdb9098da5792
Author: Winfried Donkers
AuthorDate: Thu Jul 19 12:05:14 2018 +0200
Commit: Eike Rathke
CommitDate: Thu Jul 19 14:01:30 2018 +0200
tdf#118800 fix rounding error in Calc function HOUR, MINUTE, SECOND.
Change-Id: I7a875b172493112b66fca8f70d2061371a05486c
Reviewed-on: https://gerrit.libreoffice.org/57721
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/qa/unit/data/functions/date_time/fods/hour.fods
b/sc/qa/unit/data/functions/date_time/fods/hour.fods
index 847632a9750a..bb5abc52ab4e 100644
--- a/sc/qa/unit/data/functions/date_time/fods/hour.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/hour.fods
@@ -154,8 +154,8 @@ Function basISODateTime(dVal#)
basISODateTime =
format(year(dt),"")&"-"&
format(Month(dt),"00")&"-"&
format(day(dt),"00")&" "&
format(Hour(dt),"00")&":"&
format(Minute(dt),"00")&":"&
format(Second(dt),"00")
End Function
-
-
+
+
@@ -1755,11 +1755,26 @@ End Function
-
-
-
-
-
+
+ 10
+
+
+ 10
+
+
+ TRUE
+
+
+ =HOUR(J10)
+
+
+ tdf11880
+
+
+
+ 10:59:59.60
+
+
@@ -2432,4 +2447,4 @@ End Function
-
\ No newline at end of file
+
diff --git a/sc/qa/unit/data/functions/date_time/fods/minute.fods
b/sc/qa/unit/data/functions/date_time/fods/minute.fods
index d27ec1ef5031..69fba0187454 100644
--- a/sc/qa/unit/data/functions/date_time/fods/minute.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/minute.fods
@@ -896,7 +896,29 @@
-
+
+
+ 11
+
+
+ 11
+
+
+ TRUE
+
+
+ =MINUTE(J9)
+
+
+ tdf11880
+
+
+
+ 10:11:59.60
+
+
+
+
@@ -1105,4 +1127,4 @@
-
\ No newline at end of file
+
diff --git a/sc/qa/unit/data/functions/date_time/fods/second.fods
b/sc/qa/unit/data/functions/date_time/fods/second.fods
index e6d2b46946e5..8db288ae3ae9 100644
--- a/sc/qa/unit/data/functions/date_time/fods/second.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/second.fods
@@ -825,7 +825,29 @@
-
+
+
+ 12
+
+
+ 12
+
+
+ TRUE
+
+
+ =SECOND(J9)
+
+
+ tdf11880
+
+
+
+ 10:11:12.60
+
+
+
+
@@ -1034,4 +1056,4 @@
-
\ No newline at end of file
+
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 299fecb359f3..e055324fa679 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -146,7 +146,7 @@ void ScInterpreter::ScGetMin()
{
double fTime = GetDouble();
fTime -= ::rtl::math::approxFloor(fTime); // date part absent
-long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5)) %
::tools::Time::secondPerHour;
+long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR)) %
::tools::Time::secondPerHour;
PushDouble( static_cast(nVal / ::tools::Time::secondPerMinute) );
}
@@ -154,7 +154,7 @@ void ScInterpreter::ScGetSec()
{
double fTime = GetDouble();
fTime -= ::rtl::math::approxFloor(fTime); // date part absent
-long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5)) %
::tools::Time::secondPerMinute;
+long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR)) %
::tools::Time::secondPerMinute;
PushDouble( static_cast(nVal) );
}
@@ -162,7 +162,7 @@ void ScInterpreter::ScGetHour()
{
double fTime = GetDouble();
fTime -= ::rtl::math::approxFloor(fTime); // date part absent
-long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5)) /
::tools::Time::secondPerHour;
+long nVal =
static_cast(::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR)) /
::tools::Time::secondPerHour;
PushDouble(static_cast(nVal));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang framework/source icon-themes/colibre sw/source
compilerplugins/clang/vclwidgets.cxx |2 +-
framework/source/loadenv/loadenv.cxx |4 ++--
icon-themes/colibre/links.txt|2 +-
sw/source/filter/html/swhtml.cxx |2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit ad1fb1c3dfb04e956d8793a320714c1ae1ba5941
Author: Andrea Gelmini
AuthorDate: Wed Jul 4 13:43:33 2018 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 19 14:01:01 2018 +0200
Fix typos
Change-Id: I7d12fe95d1c65a431325273c6e95943166e2ec58
Reviewed-on: https://gerrit.libreoffice.org/56941
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/compilerplugins/clang/vclwidgets.cxx
b/compilerplugins/clang/vclwidgets.cxx
index 84d7ffea6bb2..b20963510181 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -392,7 +392,7 @@ bool VCLWidgets::VisitVarDecl(const VarDecl * pVarDecl) {
return true;
}
// std::pair seems to show up in whacky ways in clang's AST. Sometimes
it's a class, sometimes it's a typedef, and sometimes
-// its an ElaboratedType (whatever that is)
+// it's an ElaboratedType (whatever that is)
if (s.find("pair") != std::string::npos) {
return true;
}
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 6ae60ebeadc5..26f51f775049 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1394,8 +1394,8 @@ bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const
css::uno::Reference< css::
css::uno::Reference< css::document::XActionLockable > xLock(xFrame,
css::uno::UNO_QUERY);
// ? no lock interface ?
-// Might its an external written frame implementation :-(
-// Allowing using of it ... but it can fail if it's not synchronized with
our processes !
+// Maybe it's an external written frame implementation :-(
+// Allowing using of it... but it can fail if it's not synchronized with
our processes!
if (!xLock.is())
return false;
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index a30f839e4b6b..aa581b5c9f17 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -855,7 +855,7 @@ cmd/sc_arrangeframemenu.png cmd/sc_bringtofront.png
cmd/lc_setobjecttobackground.png cmd/lc_sendtoback.png
cmd/sc_setobjecttobackground.png cmd/sc_sendtoback.png
-# Cacl
+# Calc
cmd/sc_fieldmenu.png cmd/sc_insertfieldctrl.png
cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png
cmd/sc_mergecellsmenu.png cmd/sc_togglemergecells.png
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 508bbc1a4671..e6368cf07c40 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -3992,7 +3992,7 @@ void SwHTMLParser::EndPara( bool bReal )
AddParSpace();
}
-// If a DD or DT was open, its an implied definition list,
+// If a DD or DT was open, it's an implied definition list,
// which must be closed now.
if( (m_nOpenParaToken == HtmlTokenId::DT_ON || m_nOpenParaToken ==
HtmlTokenId::DD_ON) &&
m_nDefListDeep)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source comphelper/source cppuhelper/source
chart2/source/inc/LifeTime.hxx|2 +-
comphelper/source/misc/accessiblekeybindinghelper.cxx |2 +-
cppuhelper/source/propshlp.cxx|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5a8389c834ae8d09fd43acca89fb34612788a9f6
Author: Andrea Gelmini
AuthorDate: Tue Jul 17 23:17:57 2018 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 19 13:59:35 2018 +0200
Fix typos
Change-Id: If7365b05c8f4fd1bf130678cb28f05c9a1add4c7
Reviewed-on: https://gerrit.libreoffice.org/57598
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 481794b40fa1..013085d72d14 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -140,7 +140,7 @@ if it should do so.
//mutex is acquired, call is registered
{
//you might access some private members here
-//but than you need to protect access to these members always like this
+//but then you need to protect access to these members always like this
//never call to the outside here
}
diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx
b/comphelper/source/misc/accessiblekeybindinghelper.cxx
index d0af74aec1cc..8028464aff2b 100644
--- a/comphelper/source/misc/accessiblekeybindinghelper.cxx
+++ b/comphelper/source/misc/accessiblekeybindinghelper.cxx
@@ -27,7 +27,7 @@ namespace comphelper
{
-using namespace ::com::sun::star; // MT 04/2003: was
::drafts::com::sun::star - otherwise to many changes
+using namespace ::com::sun::star; // MT 04/2003: was
::drafts::com::sun::star - otherwise too many changes
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 6d1549d68e96..9aceb32a66a0 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -601,7 +601,7 @@ void OPropertySetHelper::fire
sal_Int32 * pnHandles,
const Any * pNewValues,
const Any * pOldValues,
-sal_Int32 nHandles, // These is the Count of the array
+sal_Int32 nHandles, // This is the Count of the array
sal_Bool bVetoable
)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/tango icon-themes/tango_svg
icon-themes/breeze/links.txt |2 +- icon-themes/breeze_dark/links.txt |2 +- icon-themes/breeze_svg/links.txt |2 +- icon-themes/tango/CREDITS |2 +- icon-themes/tango_svg/CREDITS |2 +- 5 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 7f801569311a2fc889efbd27063a50f1a4f6a7f8 Author: Andrea Gelmini AuthorDate: Tue Jul 17 23:18:02 2018 +0200 Commit: Julien Nabet CommitDate: Thu Jul 19 13:58:39 2018 +0200 Fix typos Change-Id: Iceeef5a003f8550063a0163d39e73de91a6378d2 Reviewed-on: https://gerrit.libreoffice.org/57601 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index b4dededcf2b9..6c9fffd9e520 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -873,7 +873,7 @@ cmd/sc_setobjecttobackground.png cmd/sc_sendtoback.png cmd/lc_insertauthoritiesentry.png cmd/lc_bibliographycomponent.png cmd/sc_insertauthoritiesentry.png cmd/sc_bibliographycomponent.png -# Cacl +# Calc cmd/sc_fieldmenu.png cmd/sc_insertfieldctrl.png cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png cmd/sc_mergecellsmenu.png cmd/sc_togglemergecells.png diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index b4dededcf2b9..6c9fffd9e520 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -873,7 +873,7 @@ cmd/sc_setobjecttobackground.png cmd/sc_sendtoback.png cmd/lc_insertauthoritiesentry.png cmd/lc_bibliographycomponent.png cmd/sc_insertauthoritiesentry.png cmd/sc_bibliographycomponent.png -# Cacl +# Calc cmd/sc_fieldmenu.png cmd/sc_insertfieldctrl.png cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png cmd/sc_mergecellsmenu.png cmd/sc_togglemergecells.png diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt index b4dededcf2b9..6c9fffd9e520 100644 --- a/icon-themes/breeze_svg/links.txt +++ b/icon-themes/breeze_svg/links.txt @@ -873,7 +873,7 @@ cmd/sc_setobjecttobackground.png cmd/sc_sendtoback.png cmd/lc_insertauthoritiesentry.png cmd/lc_bibliographycomponent.png cmd/sc_insertauthoritiesentry.png cmd/sc_bibliographycomponent.png -# Cacl +# Calc cmd/sc_fieldmenu.png cmd/sc_insertfieldctrl.png cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png cmd/sc_mergecellsmenu.png cmd/sc_togglemergecells.png diff --git a/icon-themes/tango/CREDITS b/icon-themes/tango/CREDITS index 1717d840c12f..8177bb379fab 100644 --- a/icon-themes/tango/CREDITS +++ b/icon-themes/tango/CREDITS @@ -1,4 +1,4 @@ -All artwork is licensed under under the Creative Commons Attribution-Share Alike 3.0 +All artwork is licensed under the Creative Commons Attribution-Share Alike 3.0 United States License. To view a copy of this licence, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. diff --git a/icon-themes/tango_svg/CREDITS b/icon-themes/tango_svg/CREDITS index 1717d840c12f..8177bb379fab 100644 --- a/icon-themes/tango_svg/CREDITS +++ b/icon-themes/tango_svg/CREDITS @@ -1,4 +1,4 @@ -All artwork is licensed under under the Creative Commons Attribution-Share Alike 3.0 +All artwork is licensed under the Creative Commons Attribution-Share Alike 3.0 United States License. To view a copy of this licence, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - debian/changelog loolwsd.spec.in
debian/changelog |8 +++-
loolwsd.spec.in |2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 5098848517f5aa441c75ab77fc6f027a8746be1d
Author: Jan Holesovsky
Date: Thu Jul 19 13:53:50 2018 +0200
Bump package version to 3.2.2-8
Change-Id: Iaba6cf235f0ba9cefdaa51f50d03f8d292b1ba0a
diff --git a/debian/changelog b/debian/changelog
index a971ae98f..0d06be9f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+loolwsd (3.2.2-8) unstable; urgency=medium
+
+ * see the git log: http://col.la/coolcd32
+
+ -- Jan Holesovsky Thu, 19 Jul 2018 14:00:00 +0200
+
loolwsd (3.2.2-7) unstable; urgency=medium
* see the git log: http://col.la/coolcd32
- -- Jan Holesovsky Fri, 18 Jul 2018 14:30:00 +0200
+ -- Jan Holesovsky Wed, 18 Jul 2018 14:30:00 +0200
loolwsd (3.2.2-6) unstable; urgency=medium
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 11d1b1264..6fa38b6e7 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version:@PACKAGE_VERSION@
-Release:7%{?dist}
+Release:8%{?dist}
%if 0%{?suse_version} == 1110
Group: Productivity/Office/Suite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-3.2.2-8'
Tag 'cd-3.2.2-8' created by Jan Holesovsky at 2018-07-19 11:55 + cd-3.2.2-8 Changes since cd-3.2.2-7-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/source vcl/inc vcl/README.lifecycle
toolkit/source/helper/unowrapper.cxx |2 +-
vcl/README.lifecycle | 11 +--
vcl/inc/win/winlayout.hxx|2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit c9e31a8de05b5ba4b21849a22d7809ab0768aefb
Author: Andrea Gelmini
AuthorDate: Tue Jul 17 23:18:10 2018 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 19 13:54:05 2018 +0200
Fix typos
Change-Id: I2aa5448869bf60e9c8d9b1ebabd0d0932d28f3a1
Reviewed-on: https://gerrit.libreoffice.org/57606
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/toolkit/source/helper/unowrapper.cxx
b/toolkit/source/helper/unowrapper.cxx
index c389d04ed8fa..b38ceeded3ab 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -275,7 +275,7 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow )
xWindowPeerComp->dispose();
// #102132# Iterate over frames after setting Window peer to NULL,
-// because while destroying other frames, we get get into the method again
and try
+// because while destroying other frames, we get into the method again and
try
// to destroy this window again...
// #i42462#/#116855# no, don't loop: Instead, just ensure that all our
top-window-children
// are disposed, too (which should also be a valid fix for #102132#, but
doesn't have the extreme
diff --git a/vcl/README.lifecycle b/vcl/README.lifecycle
index 6ef91ccfce51..732b1908d077 100644
--- a/vcl/README.lifecycle
+++ b/vcl/README.lifecycle
@@ -296,12 +296,12 @@ ways and often both.
the inheritance chain from children to parent, during dispose.
The easiest way to fix these is to just ensure that these
- cleanup methods, especially LoseFocus continue to work even
+ cleanup methods, especially LoseFocus, continue to work even
on disposed Window sub-class instances.
-** It crashes with some invalid memory ...
+** It crashes with some invalid memory...
-Assuming that the invalid memory is a Window sub-class itself,
+Assuming that the invalid memory is a Window sub-class itself,
then almost certainly there is some cockup in the
reference-counting; eg. if you hit an OutputDevice::release
assert on mnRefCount - then almost certainly you have a
@@ -309,13 +309,12 @@ ways and often both.
happen via this sort of pattern:
ModelessDialog *pDlg = VclPtr(nullptr /* parent */);
- // by here the pDlg quite probably points to free'd memory
- ...
+ // by here the pDlg quite probably points to free'd memory...
It is necessary in these cases to ensure that the *pDlg is
a VclPtr instead.
-** It crashes with some invalid memory #2 ...
+** It crashes with some invalid memory #2...
Often a ::dispose method will free some pImpl member, but
not NULL it; and (cf. above) we can now get various virtual
diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index 0ef5cc03b846..598d90c60588 100644
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -157,7 +157,7 @@ public:
void SetHFONT(const HFONT);
HFONT GetHFONT() const { return m_hFont; }
-// Prevend deletion of the HFONT in the WinFontInstance destructor
+// Prevent deletion of the HFONT in the WinFontInstance destructor
// Used for the ScopedFont handling
void UnsetHFONT() { m_hFont = nullptr; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - loleaflet/src
loleaflet/src/core/Socket.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ce1d469459556f38084040d8539434bd881c3523
Author: Ashod Nakashian
Date: Thu Jul 19 01:27:46 2018 -0400
leaflet: update IE11 connection limit message
Change-Id: I7299867873fb00cf2a500f17a559106f52c8ba6f
Reviewed-on: https://gerrit.libreoffice.org/57709
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index eb93d1f2f..a63648122 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -40,7 +40,7 @@ L.Socket = L.Class.extend({
var msgHint = '';
var isIE11 = !!window.MSInputMethodContext &&
!!document.documentMode; //
https://stackoverflow.com/questions/21825157/internet-explorer-11-detection
if (isIE11)
- msgHint = 'Note: IE11 has limitation on the
maximum number of WebSockets open to a single domain. Please consult this page
on how to change this limit:
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections';
+ msgHint = 'IE11 has reached its maximum number
of connections. Please see this document to increase this limit if needed:
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections';
this._map.fire('error', {msg: _('Oops, there is a
problem connecting to LibreOffice Online : ').replace('LibreOffice Online',
(typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice
Online')) + e + msgHint, cmd: 'socket', kind: 'failed', id: 3});
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 7da0e286d0ff86ca083b7475be6ba0f6f41a5fe1
Author: Ashod Nakashian
Date: Thu Jul 19 01:22:07 2018 -0400
wsd: don't anonymize 'contents' URI
Change-Id: Ia66729453a1f7db6105a0332de0f8bad3835f3f5
Reviewed-on: https://gerrit.libreoffice.org/57707
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f4d9c2235..18576188b 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2859,6 +2859,9 @@ int LOOLWSD::innerMain()
Log::logger().setLevel(LogLevel);
}
+// URI with /contents are public and we don't need to anonymize them.
+Util::mapAnonymized("contents", "contents");
+
// Start the server.
srv.start(ClientPortNumber);
___
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' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 +++-
writerfilter/source/dmapper/StyleSheetTable.cxx | 13 ++---
writerfilter/source/dmapper/StyleSheetTable.hxx |4 ++--
3 files changed, 7 insertions(+), 18 deletions(-)
New commits:
commit d3ecf6070b439e902343a2a83bc9384382e41fee
Author: Justin Luth
AuthorDate: Mon Jul 9 18:30:52 2018 +0300
Commit: Miklos Vajna
CommitDate: Thu Jul 19 13:43:32 2018 +0200
related tdf#106174 writerfilter: replace broken FindParentStyleSheet
FindParentStyleSheet didn't do anything right. An empty stylename
was supposed to check currentEntry, but instead it just returned
null. The passed stylename was completely ignored if there was
a currentEntry. And on top of that, the stylename itself was
returned, not its parent. Even worse, the currentEntry properties
were ignored because in that case it DID return the parent.
Even the comments were totally bogus. Amazing...
GetPropertyFromStyleSheet() has the potential for LOTS of use
in writerfilter. I'm surprised it has hardly been used. Perhaps
the completely wrong results led people to ignore it rather than
investigate why it didn't give the expected results.
Change-Id: I89a6b02877ab7990aa4eb58e5e0b6a572f3d10e3
Reviewed-on: https://gerrit.libreoffice.org/57195
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
(cherry picked from commit bc67bda7363df48f1983513a8e969b61738139f5)
Reviewed-on: https://gerrit.libreoffice.org/57483
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6521a08d0445..8a9c038d8c2f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -660,19 +660,17 @@ const OUString
DomainMapper_Impl::GetCurrentParaStyleName()
}
/*-
-returns a the value from the current paragraph style - if available
-TODO: What about parent styles?
+returns the value from the current paragraph style - if available
---*/
uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId)
{
StyleSheetEntryPtr pEntry;
if( m_bInStyleSheetImport )
-pEntry = GetStyleSheetTable()->FindParentStyleSheet(OUString());
+pEntry = GetStyleSheetTable()->GetCurrentEntry();
else
pEntry =
GetStyleSheetTable()->FindStyleSheetByConvertedStyleName(GetCurrentParaStyleName());
while(pEntry.get( ) )
{
-//is there a tab stop set?
if(pEntry->pProperties)
{
boost::optional aProperty =
@@ -683,7 +681,7 @@ uno::Any
DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId)
}
}
//search until the property is set or no parent is available
-StyleSheetEntryPtr pNewEntry =
GetStyleSheetTable()->FindParentStyleSheet(pEntry->sBaseStyleIdentifier);
+StyleSheetEntryPtr pNewEntry =
GetStyleSheetTable()->FindStyleSheetByISTD(pEntry->sBaseStyleIdentifier);
SAL_WARN_IF( pEntry == pNewEntry, "writerfilter.dmapper", "circular
loop in style hierarchy?");
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 69a03c6e8ea0..2aa8bd4d5caa 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1280,18 +1280,9 @@ const StyleSheetEntryPtr
StyleSheetTable::FindDefaultParaStyle()
return pRet;
}
-const StyleSheetEntryPtr StyleSheetTable::FindParentStyleSheet(const OUString&
_sBaseStyle)
+const StyleSheetEntryPtr StyleSheetTable::GetCurrentEntry()
{
-if( _sBaseStyle.isEmpty() )
-{
-StyleSheetEntryPtr pEmptyPtr;
-return pEmptyPtr;
-}
-OUString sBaseStyle = _sBaseStyle;
-if( m_pImpl->m_pCurrentEntry)
-sBaseStyle = m_pImpl->m_pCurrentEntry->sBaseStyleIdentifier;
-
-return FindStyleSheetByISTD( sBaseStyle );
+return m_pImpl->m_pCurrentEntry;
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx
b/writerfilter/source/dmapper/StyleSheetTable.hxx
index dc1f0acf3eb5..5191d0a44386 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -92,8 +92,6 @@ public:
const StyleSheetEntryPtr FindStyleSheetByISTD(const OUString& sIndex);
const StyleSheetEntryPtr FindStyleSheetByConvertedStyleName(const
OUString& rIndex);
const StyleSheetEntryPtr FindDefaultParaStyle();
-// returns the parent of the one with the given name - if empty the parent
of the current style sheet is returned
-const StyleSheetEntryPtr FindParentStyleSheet(const OUString& sBaseStyle);
OUString ConvertStyleName( const OUString& rWWName, bool bEx
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source
cui/source/dialogs/cuicharmap.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 5e5e49eba37c15b17a4d9788da91415abbca4eb1
Author: Caolán McNamara
AuthorDate: Thu Jul 19 10:10:33 2018 +0100
Commit: Christian Lohmaier
CommitDate: Thu Jul 19 13:43:07 2018 +0200
tdf#117038 set button width to max possible content width
Change-Id: I97e7c27523d213cb06cdf87a8ed0124d1ea8d5ba
Reviewed-on: https://gerrit.libreoffice.org/57718
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 678bddee71e3..d65ec3fe1926 100755
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -493,6 +493,14 @@ void SvxCharacterMap::init()
m_xHexCodeText->connect_changed( LINK( this, SvxCharacterMap,
HexCodeChangeHdl ) );
m_xFavouritesBtn->connect_clicked( LINK(this, SvxCharacterMap,
FavSelectHdl));
+// tdf#117038 set the buttons width to its max possible width so it doesn't
+// make layout change when the label changes
+m_xFavouritesBtn->set_label(CuiResId(RID_SVXSTR_REMOVE_FAVORITES));
+auto nMaxWidth = m_xFavouritesBtn->get_preferred_size().Width();
+m_xFavouritesBtn->set_label(CuiResId(RID_SVXSTR_ADD_FAVORITES));
+nMaxWidth = std::max(nMaxWidth,
m_xFavouritesBtn->get_preferred_size().Width());
+m_xFavouritesBtn->set_size_request(nMaxWidth, -1);
+
if( SvxShowCharSet::getSelectedChar() == ' ')
{
m_xOKBtn->set_sensitive(false);
@@ -560,7 +568,7 @@ void SvxCharacterMap::setFavButtonState(const OUString&
sTitle, const OUString&
else
m_xFavouritesBtn->set_sensitive(true);
-if(isFavChar(sTitle, rFont))
+if (isFavChar(sTitle, rFont))
{
m_xFavouritesBtn->set_label(CuiResId(RID_SVXSTR_REMOVE_FAVORITES));
}
___
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' - cui/uiconfig
cui/uiconfig/ui/signatureline.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 843a1dbbdbedaa58d5d24768b6a718aa9fb4a053 Author: Caolán McNamara AuthorDate: Thu Jul 19 09:58:43 2018 +0100 Commit: Christian Lohmaier CommitDate: Thu Jul 19 13:41:11 2018 +0200 Resolves: tdf#118115 add missing help response id Change-Id: Ie050285cc10d82cf80e560be3f1766c50dd1527c Reviewed-on: https://gerrit.libreoffice.org/57716 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/cui/uiconfig/ui/signatureline.ui b/cui/uiconfig/ui/signatureline.ui index 2087ff8f7b2c..34afa5f7c2ff 100644 --- a/cui/uiconfig/ui/signatureline.ui +++ b/cui/uiconfig/ui/signatureline.ui @@ -321,6 +321,7 @@ cancel ok + help ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/cuicharmap.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit b073bbdacf694fd6a0ecc1e107b6b05af2b8ac9d
Author: Caolán McNamara
AuthorDate: Thu Jul 19 10:10:33 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 19 13:39:43 2018 +0200
tdf#117038 set button width to max possible content width
Change-Id: I97e7c27523d213cb06cdf87a8ed0124d1ea8d5ba
Reviewed-on: https://gerrit.libreoffice.org/57717
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 83b05ff07812..67efede90e32 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -493,6 +493,14 @@ void SvxCharacterMap::init()
m_xHexCodeText->connect_changed( LINK( this, SvxCharacterMap,
HexCodeChangeHdl ) );
m_xFavouritesBtn->connect_clicked( LINK(this, SvxCharacterMap,
FavSelectHdl));
+// tdf#117038 set the buttons width to its max possible width so it doesn't
+// make layout change when the label changes
+m_xFavouritesBtn->set_label(CuiResId(RID_SVXSTR_REMOVE_FAVORITES));
+auto nMaxWidth = m_xFavouritesBtn->get_preferred_size().Width();
+m_xFavouritesBtn->set_label(CuiResId(RID_SVXSTR_ADD_FAVORITES));
+nMaxWidth = std::max(nMaxWidth,
m_xFavouritesBtn->get_preferred_size().Width());
+m_xFavouritesBtn->set_size_request(nMaxWidth, -1);
+
if( SvxShowCharSet::getSelectedChar() == ' ')
{
m_xOKBtn->set_sensitive(false);
@@ -560,7 +568,7 @@ void SvxCharacterMap::setFavButtonState(const OUString&
sTitle, const OUString&
else
m_xFavouritesBtn->set_sensitive(true);
-if(isFavChar(sTitle, rFont))
+if (isFavChar(sTitle, rFont))
{
m_xFavouritesBtn->set_label(CuiResId(RID_SVXSTR_REMOVE_FAVORITES));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c57d6bf9798e3a8d4d22d6dfd0f4516ee9f3825e Author: Olivier Hallot AuthorDate: Thu Jul 5 13:58:26 2018 -0300 Commit: Gerrit Code Review CommitDate: Thu Jul 19 13:23:20 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#118330 Terminology change of CONTENTS sidebar Change-Id: Ibb7b5d85f39e1a097ff85e74f2f2be69ab48bc57 Reviewed-on: https://gerrit.libreoffice.org/57018 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/helpcontent2 b/helpcontent2 index b998c942e049..c58bf8545eb2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b998c942e0491b5fbb5befb0085e5db7e15490d5 +Subproject commit c58bf8545eb2f76dee66921dad945f17b5274f6f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/auxiliary
source/auxiliary/sbasic.tree |2 +- source/auxiliary/scalc.tree|2 +- source/auxiliary/shared.tree |4 ++-- source/auxiliary/simpress.tree |2 +- source/auxiliary/smath.tree|2 +- source/auxiliary/swriter.tree |4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) New commits: commit c58bf8545eb2f76dee66921dad945f17b5274f6f Author: Olivier Hallot Date: Thu Jul 5 13:58:26 2018 -0300 tdf#118330 Terminology change of CONTENTS sidebar Change-Id: Ibb7b5d85f39e1a097ff85e74f2f2be69ab48bc57 Reviewed-on: https://gerrit.libreoffice.org/57018 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index 27ca37239..2838f9698 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + %PRODUCTNAME Basic Help Programming with %PRODUCTNAME Basic diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree index 172a56bec..28830bb55 100644 --- a/source/auxiliary/scalc.tree +++ b/source/auxiliary/scalc.tree @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + Welcome to the %PRODUCTNAME Calc Help %PRODUCTNAME Calc Features diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree index 3dcd40332..8879add90 100644 --- a/source/auxiliary/shared.tree +++ b/source/auxiliary/shared.tree @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + Changing the Association of Microsoft Office Document Types Problem Resolution with Safe Mode @@ -201,7 +201,7 @@ Turning off Bullets and Numbering for Individual Paragraphs - + %PRODUCTNAME Database Database Overview diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree index 56fd29d63..22d1af7e2 100644 --- a/source/auxiliary/simpress.tree +++ b/source/auxiliary/simpress.tree @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + Welcome to the %PRODUCTNAME Impress Help Welcome to the %PRODUCTNAME Draw Help diff --git a/source/auxiliary/smath.tree b/source/auxiliary/smath.tree index 07e61a0ce..9ffb0cd85 100644 --- a/source/auxiliary/smath.tree +++ b/source/auxiliary/smath.tree @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + Welcome to the %PRODUCTNAME Math Help %PRODUCTNAME Math Features diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree index 4066a9800..21cca6728 100644 --- a/source/auxiliary/swriter.tree +++ b/source/auxiliary/swriter.tree @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + Welcome to the %PRODUCTNAME Writer Help %PRODUCTNAME Writer Features @@ -228,7 +228,7 @@ List of Regular Expressions - + Web Pages HTML Filters and Forms Saving Text Documents in HTML Format ___ 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' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 25ca1ac37ef47b889941a08f78b5559881ef95da Author: Christian Lohmaier AuthorDate: Thu Jul 19 13:10:48 2018 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 19 13:22:00 2018 +0200 Update git submodules * Update translations from branch 'libreoffice-6-1' - update translations for 6.1.0 rc2 Change-Id: Ic312751e80079dee34a798631ac3bc7e4920d113 diff --git a/translations b/translations index 5c9bd517831c..2a103495aa40 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 5c9bd517831c988b5fac67d80333747ebca7e667 +Subproject commit 2a103495aa409667264dce68740a12be39e49151 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl svtools/source vcl/source
include/vcl/combobox.hxx |2 +-
include/vcl/edit.hxx |4
svtools/source/control/ctrlbox.cxx |1 +
vcl/source/control/combobox.cxx|5 -
vcl/source/control/edit.cxx| 12 +++-
5 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 11b60b16739bfd88cc6f9f16834870a296921883
Author: Nickson Thanda
AuthorDate: Tue Jul 3 13:54:40 2018 +0100
Commit: Muhammet Kara
CommitDate: Thu Jul 19 13:03:33 2018 +0200
tdf#108012 - Clicking in the font field should select the contents
Change-Id: I1276976e031b419ca5cc3cc8e848f2af58ce4cfb
Reviewed-on: https://gerrit.libreoffice.org/56865
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 2f7efd3e006e..4d30398e8c6e 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -90,7 +90,7 @@ public:
virtual voidRemoveEntryAt(sal_Int32 nPos);
voidClear();
-
+voidEnableSelectAll();
sal_Int32 GetEntryPos( const OUString& rStr ) const;
sal_Int32 GetEntryPos( const void* pData ) const;
Image GetEntryImage( sal_Int32 nPos ) const;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 61649aeef6f1..bee63aae0488 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -88,6 +88,7 @@ private:
sal_Int32 mnMaxWidthChars;
sal_Unicode mcEchoChar;
boolmbModified:1,
+mbSelectAllSingleClick:1,
mbInternModified:1,
mbReadOnly:1,
mbInsertMode:1,
@@ -201,6 +202,9 @@ public:
virtual voidSetReadOnly( bool bReadOnly = true );
virtual boolIsReadOnly() const { return mbReadOnly; }
+voidSetSelectAllSingleClick( bool bSelectAllSingleClick );
+boolIsSelectAllSingleClick() const { return
mbSelectAllSingleClick; }
+
voidSetInsertMode( bool bInsert );
boolIsInsertMode() const;
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 9d7911b0552c..2ae2506cf33f 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -669,6 +669,7 @@ void LineListBox::DataChanged( const DataChangedEvent&
rDCEvt )
FontNameBox::FontNameBox( vcl::Window* pParent, WinBits nWinStyle ) :
ComboBox( pParent, nWinStyle )
{
+EnableSelectAll();
mbWYSIWYG = false;
InitFontMRUEntriesFile();
}
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 4508d34022fc..92ae580010f6 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -507,7 +507,10 @@ void ComboBox::EnableAutoSize( bool bAuto )
}
}
}
-
+void ComboBox::EnableSelectAll()
+{
+m_pImpl->m_pSubEdit->SetSelectAllSingleClick(true);
+}
void ComboBox::EnableDDAutoWidth( bool b )
{
if (m_pImpl->m_pFloatWin)
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 1283b28d710b..108ce15a984f 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -272,6 +272,7 @@ void Edit::ImplInitEditData()
mbModified = false;
mbInternModified= false;
mbReadOnly = false;
+mbSelectAllSingleClick = false;
mbInsertMode= true;
mbClickedInSelection= false;
mbActivePopup = false;
@@ -1318,7 +1319,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt )
if ( rMEvt.GetClicks() < 4 )
{
mbClickedInSelection = false;
-if ( rMEvt.GetClicks() == 3 )
+if ( rMEvt.GetClicks() == 3 || mbSelectAllSingleClick )
{
ImplSetSelection( Selection( 0, EDIT_NOLIMIT) );
ImplCopyToSelectionClipboard();
@@ -2413,6 +2414,15 @@ void Edit::SetReadOnly( bool bReadOnly )
}
}
+void Edit::SetSelectAllSingleClick( bool bSelectAllSingleClick )
+{
+if ( mbSelectAllSingleClick != bSelectAllSingleClick )
+{
+mbSelectAllSingleClick = bSelectAllSingleClick;
+if ( mpSubEdit )
+mpSubEdit->SetSelectAllSingleClick( bSelectAllSingleClick );
+}
+}
void Edit::SetInsertMode( bool bInsert )
{
if ( bInsert != mbInsertMode )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/inc/transfrm.hxx |2 +
cui/source/tabpages/transfrm.cxx | 44 ++-
2 files changed, 32 insertions(+), 14 deletions(-)
New commits:
commit 9f01dca60e6539f48cd529180f0d64c2131e0ea1
Author: Caolán McNamara
AuthorDate: Thu Jul 19 09:52:29 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 19 12:43:32 2018 +0200
tdf#118816 recover initial intent of enabled possibility of tristate as a
flag
Change-Id: I0150b96e063818cc20e2404081b906ccc5ff0be6
Reviewed-on: https://gerrit.libreoffice.org/57712
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index d4f9be4e6917..95c137a2b051 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -85,6 +85,8 @@ private:
boolmbProtectDisabled;
boolmbSizeDisabled;
boolmbAdjustDisabled;
+boolmbIgnoreAutoGrowWidth;
+boolmbIgnoreAutoGrowHeight;
// from size
// #i75273#
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index fcd86eb7c082..134ac9b3e988 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -763,6 +763,8 @@
SvxPositionSizeTabPage::SvxPositionSizeTabPage(TabPageParent pParent, const SfxI
, mbProtectDisabled(false)
, mbSizeDisabled(false)
, mbAdjustDisabled(true)
+, mbIgnoreAutoGrowWidth(true)
+, mbIgnoreAutoGrowHeight(true)
, mfOldWidth(0.0)
, mfOldHeight(0.0)
, m_aCtlPos(this)
@@ -890,6 +892,10 @@ void SvxPositionSizeTabPage::Construct()
m_xTsbAutoGrowWidth->connect_toggled( LINK( this,
SvxPositionSizeTabPage, ClickSizeProtectHdl ) );
m_xTsbAutoGrowHeight->connect_toggled( LINK( this,
SvxPositionSizeTabPage, ClickSizeProtectHdl ) );
+
+// is used as flag to evaluate if its selectable
+mbIgnoreAutoGrowWidth = false;
+mbIgnoreAutoGrowHeight = false;
}
}
@@ -997,23 +1003,33 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet*
rOutAttrs )
if (m_xTsbAutoGrowWidth->get_state_changed_from_saved())
{
-if( m_xTsbAutoGrowWidth->get_inconsistent() )
-rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_AUTOWIDTH );
-else
-rOutAttrs->Put(
-SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOWIDTH ),
-m_xTsbAutoGrowWidth->get_active() ) );
+if (!mbIgnoreAutoGrowWidth)
+{
+if( m_xTsbAutoGrowWidth->get_inconsistent() )
+rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_AUTOWIDTH );
+else
+rOutAttrs->Put(
+SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOWIDTH ),
+m_xTsbAutoGrowWidth->get_active() ) );
+}
bModified = true;
}
if (m_xTsbAutoGrowHeight->get_state_changed_from_saved())
{
-if (m_xTsbAutoGrowHeight->get_inconsistent())
-rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_AUTOHEIGHT );
-else
-rOutAttrs->Put(
-SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOHEIGHT ),
-m_xTsbAutoGrowHeight->get_active() ) );
+if (!mbIgnoreAutoGrowHeight)
+{
+if (m_xTsbAutoGrowHeight->get_inconsistent())
+{
+rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_AUTOHEIGHT );
+}
+else
+{
+rOutAttrs->Put(
+SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOHEIGHT ),
+m_xTsbAutoGrowHeight->get_active() ) );
+}
+}
bModified = true;
}
@@ -1170,8 +1186,8 @@ void SvxPositionSizeTabPage::UpdateControlStates()
{
const bool bPosProtect = m_xTsbPosProtect->get_state() == TRISTATE_TRUE;
const bool bSizeProtect = m_xTsbSizeProtect->get_state() == TRISTATE_TRUE;
-const bool bHeightChecked = !m_xTsbAutoGrowHeight->get_inconsistent() &&
(m_xTsbAutoGrowHeight->get_active());
-const bool bWidthChecked = !m_xTsbAutoGrowWidth->get_inconsistent() &&
(m_xTsbAutoGrowWidth->get_active());
+const bool bHeightChecked = !mbIgnoreAutoGrowHeight &&
(m_xTsbAutoGrowHeight->get_active());
+const bool bWidthChecked = !mbIgnoreAutoGrowWidth &&
(m_xTsbAutoGrowWidth->get_active());
m_xFlPosition->set_sensitive(!bPosProtect && !mbPageDisabled);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/LibreOfficeKit
include/LibreOfficeKit/LibreOfficeKitInit.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit efe42fca7c386340575088ecf94952f3ba0447de Author: Tor Lillqvist AuthorDate: Thu Jul 19 11:51:14 2018 +0300 Commit: Tor Lillqvist CommitDate: Thu Jul 19 12:36:44 2018 +0200 Avoid gcc: "specified bound depends on the length of the source argument" Just use memcpy(). Change-Id: Icb705acb6c12baf28684c763a77da7abc514ea6d Reviewed-on: https://gerrit.libreoffice.org/57714 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h index 103c11be926c..687090a58b9f 100644 --- a/include/LibreOfficeKit/LibreOfficeKitInit.h +++ b/include/LibreOfficeKit/LibreOfficeKitInit.h @@ -200,7 +200,7 @@ static void *lok_dlopen( const char *install_path, char ** _imp_lib ) return NULL; } -strncpy(imp_lib, install_path, imp_lib_size); +memcpy(imp_lib, install_path, partial_length); extendUnoPath(install_path); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/UndoTable.hxx |4 ++--
sw/source/core/undo/untbl.cxx| 17 +
2 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 087b1fc95a1d500e75de3ddc357298c9f93bf7b5
Author: Noel Grandin
AuthorDate: Wed Jul 18 16:01:32 2018 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 19 12:35:12 2018 +0200
loplugin:useuniqueptr in SwUndoMergeTable
Change-Id: I5c75bc85019be1e4bd25b955f873e230c0ffe132
Reviewed-on: https://gerrit.libreoffice.org/57695
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 74bfedfecf2a..4343f09225ed 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -350,8 +350,8 @@ class SwUndoMergeTable : public SwUndo
{
OUString aName;
sal_uLong nTableNode;
-SaveTable* pSavTable, *pSavHdl;
-SwHistory* pHistory;
+std::unique_ptr pSavTable, pSavHdl;
+std::unique_ptr pHistory;
sal_uInt16 nMode;
bool bWithPrev;
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 411d2d8ac1a9..fb15b3d90016 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2977,8 +2977,8 @@ void SwUndoSplitTable::SaveFormula( SwHistory& rHistory )
SwUndoMergeTable::SwUndoMergeTable( const SwTableNode& rTableNd,
const SwTableNode& rDelTableNd,
bool bWithPrv, sal_uInt16 nMd )
-: SwUndo( SwUndoId::MERGE_TABLE, rTableNd.GetDoc() ), pSavTable( nullptr ),
-pHistory( nullptr ), nMode( nMd ), bWithPrev( bWithPrv )
+: SwUndo( SwUndoId::MERGE_TABLE, rTableNd.GetDoc() ),
+nMode( nMd ), bWithPrev( bWithPrv )
{
// memorize end node of the last table cell that'll stay in position
if( bWithPrev )
@@ -2987,16 +2987,17 @@ SwUndoMergeTable::SwUndoMergeTable( const SwTableNode&
rTableNd,
nTableNode = rTableNd.EndOfSectionIndex() - 1;
aName = rDelTableNd.GetTable().GetFrameFormat()->GetName();
-pSavTable = new SaveTable( rDelTableNd.GetTable() );
+pSavTable.reset(new SaveTable( rDelTableNd.GetTable() ));
-pSavHdl = bWithPrev ? new SaveTable( rTableNd.GetTable(), 1 ) : nullptr;
+if (bWithPrev)
+pSavHdl.reset( new SaveTable( rTableNd.GetTable(), 1 ) );
}
SwUndoMergeTable::~SwUndoMergeTable()
{
-delete pSavTable;
-delete pSavHdl;
-delete pHistory;
+pSavTable.reset();
+pSavHdl.reset();
+pHistory.reset();
}
void SwUndoMergeTable::UndoImpl(::sw::UndoRedoContext & rContext)
@@ -3093,7 +3094,7 @@ void SwUndoMergeTable::RepeatImpl(::sw::RepeatContext &
rContext)
void SwUndoMergeTable::SaveFormula( SwHistory& rHistory )
{
if( !pHistory )
-pHistory = new SwHistory;
+pHistory.reset( new SwHistory );
pHistory->Move( 0, &rHistory );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/signatureline.ui |1 + 1 file changed, 1 insertion(+) New commits: commit d0e8dbe92960abcc60a8b0461d8c459680197641 Author: Caolán McNamara AuthorDate: Thu Jul 19 09:58:43 2018 +0100 Commit: Caolán McNamara CommitDate: Thu Jul 19 12:27:30 2018 +0200 Resolves: tdf#118115 add missing help response id Change-Id: Ie050285cc10d82cf80e560be3f1766c50dd1527c Reviewed-on: https://gerrit.libreoffice.org/57715 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/uiconfig/ui/signatureline.ui b/cui/uiconfig/ui/signatureline.ui index 2087ff8f7b2c..34afa5f7c2ff 100644 --- a/cui/uiconfig/ui/signatureline.ui +++ b/cui/uiconfig/ui/signatureline.ui @@ -321,6 +321,7 @@ cancel ok + help ___ 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/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit a4a523aadea5c966223955517049c1246872aad9 Author: Caolán McNamara AuthorDate: Wed Jul 18 16:33:34 2018 +0100 Commit: Christian Lohmaier CommitDate: Thu Jul 19 12:19:22 2018 +0200 Resolves: tdf#118802 map GTK_RESPONSE_DELETE_EVENT to RET_CANCEL Change-Id: I8285f329e4672c90f47d96ccffe60c21c565dde7 Reviewed-on: https://gerrit.libreoffice.org/57656 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 89655fd1b654..10610c089b4d 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -2031,6 +2031,8 @@ private: ret = RET_OK; else if (ret == GTK_RESPONSE_CANCEL) ret = RET_CANCEL; +else if (ret == GTK_RESPONSE_DELETE_EVENT) +ret = RET_CANCEL; else if (ret == GTK_RESPONSE_CLOSE) ret = RET_CLOSE; else if (ret == GTK_RESPONSE_YES) ___ 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/source
sw/source/filter/html/swhtml.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit c715fd34f3c5c843e7ba6fbc781fbf76935b4509
Author: Caolán McNamara
AuthorDate: Wed Jul 18 16:13:19 2018 +0100
Commit: Christian Lohmaier
CommitDate: Thu Jul 19 12:18:04 2018 +0200
tdf#118579 ignore body in body instead of flagging as an error
Change-Id: Ie6626a320a5264aea004f7c57244643798703de8
Reviewed-on: https://gerrit.libreoffice.org/57653
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index dbf0da0a0d5e..508bbc1a4671 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1279,9 +1279,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
switch( nToken )
{
case HtmlTokenId::BODY_ON:
-if (m_bBodySeen)
-eState = SvParserState::Error;
-else
+if (!m_bBodySeen)
{
m_bBodySeen = true;
if( !m_aStyleSource.isEmpty() )
___
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' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/addwatch.png |binary icon-themes/colibre/cmd/lc_addwatch.png |binary icon-themes/colibre/cmd/sc_addwatch.png |binary icon-themes/colibre/links.txt |4 ++-- icon-themes/colibre_svg/cmd/32/addwatch.svg |2 +- icon-themes/colibre_svg/cmd/lc_addwatch.svg |2 +- icon-themes/colibre_svg/cmd/sc_addwatch.svg |2 +- 7 files changed, 5 insertions(+), 5 deletions(-) New commits: commit ad6bdfad8f0e32e29f1833690e19081813eb93ec Author: andreas kainz AuthorDate: Wed Jul 11 12:23:28 2018 +0200 Commit: Christian Lohmaier CommitDate: Thu Jul 19 12:15:08 2018 +0200 Colibre icons: fix links.txt link and update addwatch icon Change-Id: Iddb48d2cde206824f7721c5f4374166cc4979ad9 Reviewed-on: https://gerrit.libreoffice.org/57272 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 85f4ec6e0ebf4f97c1253c723d3c9c9b823ae372) Reviewed-on: https://gerrit.libreoffice.org/57465 Reviewed-by: Christian Lohmaier diff --git a/icon-themes/colibre/cmd/32/addwatch.png b/icon-themes/colibre/cmd/32/addwatch.png index c67149596f82..47288c0beb14 100644 Binary files a/icon-themes/colibre/cmd/32/addwatch.png and b/icon-themes/colibre/cmd/32/addwatch.png differ diff --git a/icon-themes/colibre/cmd/lc_addwatch.png b/icon-themes/colibre/cmd/lc_addwatch.png index aee88ada7d87..3239b1bcfd4e 100644 Binary files a/icon-themes/colibre/cmd/lc_addwatch.png and b/icon-themes/colibre/cmd/lc_addwatch.png differ diff --git a/icon-themes/colibre/cmd/sc_addwatch.png b/icon-themes/colibre/cmd/sc_addwatch.png index 2f9911280eb3..21df0c133192 100644 Binary files a/icon-themes/colibre/cmd/sc_addwatch.png and b/icon-themes/colibre/cmd/sc_addwatch.png differ diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 9af329bdfb34..4e4402930113 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -1059,8 +1059,8 @@ cmd/sc_insertslidefield.png cmd/sc_insertpagenumberfield.png cmd/sc_insertslidesfield.png cmd/sc_insertpagecountfield.png cmd/sc_insertslidetitlefield.png cmd/sc_inserttitlefield.png cmd/sc_insertfilefield.png cmd/sc_open.png -cmd/sc_insertdatefielfix.png cmd/sc_datefield.png -cmd/sc_insertdatefielvar.png cmd/sc_datefield.png +cmd/sc_insertdatefieldfix.png cmd/sc_datefield.png +cmd/sc_insertdatefieldvar.png cmd/sc_datefield.png cmd/sc_inserttimefieldfix.png cmd/sc_timefield.png cmd/sc_inserttimefieldvar.png cmd/sc_timefield.png diff --git a/icon-themes/colibre_svg/cmd/32/addwatch.svg b/icon-themes/colibre_svg/cmd/32/addwatch.svg index 004bcd4c6a11..5c8bc72e8dc9 100644 --- a/icon-themes/colibre_svg/cmd/32/addwatch.svg +++ b/icon-themes/colibre_svg/cmd/32/addwatch.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/lc_addwatch.svg b/icon-themes/colibre_svg/cmd/lc_addwatch.svg index b8b9f83f6f28..f6a8e68d291d 100644 --- a/icon-themes/colibre_svg/cmd/lc_addwatch.svg +++ b/icon-themes/colibre_svg/cmd/lc_addwatch.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/sc_addwatch.svg b/icon-themes/colibre_svg/cmd/sc_addwatch.svg index aa1cd79546f8..efc617273628 100644 --- a/icon-themes/colibre_svg/cmd/sc_addwatch.svg +++ b/icon-themes/colibre_svg/cmd/sc_addwatch.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ 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: Branch 'libreoffice-6-1' - include/vcl vcl/source vcl/unx
include/vcl/weld.hxx |9 +++--
vcl/source/app/salvtables.cxx | 30 ++
vcl/unx/gtk3/gtk3gtkinst.cxx | 18 ++
3 files changed, 27 insertions(+), 30 deletions(-)
New commits:
commit 337012970f62a8a40da2a02806363b560cf295df
Author: Caolán McNamara
AuthorDate: Mon Jul 16 10:26:19 2018 +0100
Commit: Christian Lohmaier
CommitDate: Thu Jul 19 12:13:34 2018 +0200
move freeze/thaw to Widget
Change-Id: I3944092c26ca81028912f6fb206b148b49e4f172
Reviewed-on: https://gerrit.libreoffice.org/57495
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 39ee0c867886..5cb39276ea62 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -103,6 +103,9 @@ public:
virtual bool get_direction() const = 0;
virtual void set_direction(bool bRTL) = 0;
+virtual void freeze() = 0;
+virtual void thaw() = 0;
+
virtual Container* weld_parent() const = 0;
virtual ~Widget() {}
@@ -277,9 +280,6 @@ public:
virtual bool get_entry_selection_bounds(int& rStartPos, int& rEndPos) = 0;
virtual void set_entry_completion(bool bEnable) = 0;
-virtual void freeze() = 0;
-virtual void thaw() = 0;
-
void connect_entry_activate(const Link& rLink)
{
m_aEntryActivateHdl = rLink;
@@ -313,9 +313,6 @@ public:
virtual void clear() = 0;
virtual int get_height_rows(int nRows) const = 0;
-virtual void freeze() = 0;
-virtual void thaw() = 0;
-
virtual void set_selection_mode(bool bMultiple) = 0;
virtual int count_selected_rows() const = 0;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 7f03aed3e6c2..b89ad836136c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -398,6 +398,16 @@ public:
m_xWidget->EnableRTL(bRTL);
}
+virtual void freeze() override
+{
+m_xWidget->SetUpdateMode(false);
+}
+
+virtual void thaw() override
+{
+m_xWidget->SetUpdateMode(true);
+}
+
virtual weld::Container* weld_parent() const override;
virtual ~SalInstanceWidget() override
@@ -1588,16 +1598,6 @@ public:
return nRet;
}
-virtual void freeze() override
-{
-m_xTreeView->SetUpdateMode(false);
-}
-
-virtual void thaw() override
-{
-m_xTreeView->SetUpdateMode(true);
-}
-
virtual void set_selection_mode(bool bMultiple) override
{
m_xTreeView->EnableMultiSelection(bMultiple);
@@ -2122,16 +2122,6 @@ public:
m_xComboBoxText->SetStyle(m_xComboBoxText->GetStyle() | WB_SORT);
}
-virtual void freeze() override
-{
-m_xComboBoxText->SetUpdateMode(false);
-}
-
-virtual void thaw() override
-{
-m_xComboBoxText->SetUpdateMode(true);
-}
-
virtual ~SalInstanceComboBoxText() override
{
clear();
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 26bc4dbb0e3a..89655fd1b654 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1462,6 +1462,16 @@ public:
gtk_widget_set_direction(m_pWidget, bRTL ? GTK_TEXT_DIR_RTL :
GTK_TEXT_DIR_LTR);
}
+virtual void freeze() override
+{
+gtk_widget_freeze_child_notify(m_pWidget);
+}
+
+virtual void thaw() override
+{
+gtk_widget_thaw_child_notify(m_pWidget);
+}
+
virtual ~GtkInstanceWidget() override
{
if (m_nFocusInSignalId)
@@ -3745,7 +3755,7 @@ public:
{
disable_notify_events();
g_object_ref(m_pListStore);
-gtk_widget_freeze_child_notify(GTK_WIDGET(m_pTreeView));
+GtkInstanceContainer::freeze();
gtk_tree_view_set_model(m_pTreeView, nullptr);
enable_notify_events();
}
@@ -3754,7 +3764,7 @@ public:
{
disable_notify_events();
gtk_tree_view_set_model(m_pTreeView, GTK_TREE_MODEL(m_pListStore));
-gtk_widget_thaw_child_notify(GTK_WIDGET(m_pTreeView));
+GtkInstanceContainer::thaw();
g_object_unref(m_pListStore);
enable_notify_events();
}
@@ -4762,7 +4772,7 @@ public:
virtual void freeze() override
{
-gtk_widget_freeze_child_notify(GTK_WIDGET(m_pComboBoxText));
+GtkInstanceContainer::freeze();
if (m_xSorter)
{
GtkTreeModel* pModel =
gtk_combo_box_get_model(GTK_COMBO_BOX(m_pComboBoxText));
@@ -4779,7 +4789,7 @@ public:
GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(pModel);
gtk_tree_sortable_set_sort_column_id(pSortable, 0,
GTK_SORT_ASCENDING);
}
-gtk_widget_thaw_child_notify(GTK_WIDGET(m_pComboBoxText));
+GtkInstanceContainer::thaw();
}
virtual ~GtkInstanceComboBoxText() override
___
Libreoffice-commits mailing list
libreoffi
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source
sw/source/ui/table/tabledlg.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit de607309e27616a9e53eadee2bab9cd0de74cae3
Author: Caolán McNamara
AuthorDate: Mon Jul 16 13:57:06 2018 +0100
Commit: Christian Lohmaier
CommitDate: Thu Jul 19 12:12:08 2018 +0200
tdf#118635 relative checkbox disabled on reopen
Change-Id: Ic52737e5122b1ae37390061a5f7cf17b69e7e665
Reviewed-on: https://gerrit.libreoffice.org/57499
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index d650e10f422a..12004dd51a5a 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -176,14 +176,14 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl,
weld::ToggleButton&, rBtn, void
bModified = true;
}
-IMPL_LINK(SwFormatTablePage, AutoClickHdl, weld::ToggleButton&, rControl, void)
+IMPL_LINK_NOARG(SwFormatTablePage, AutoClickHdl, weld::ToggleButton&, void)
{
bool bRestore = true,
bLeftEnable = false,
bRightEnable= false,
bWidthEnable= false,
bOthers = true;
-if (&rControl == m_xFullBtn.get())
+if (m_xFullBtn->get_active())
{
m_xLeftMF->SetPrcntValue(0);
m_xRightMF->SetPrcntValue(0);
@@ -192,26 +192,26 @@ IMPL_LINK(SwFormatTablePage, AutoClickHdl,
weld::ToggleButton&, rControl, void)
bFull = true;
bRestore = false;
}
-else if (&rControl == m_xLeftBtn.get())
+else if (m_xLeftBtn->get_active())
{
bRightEnable = bWidthEnable = true;
m_xLeftMF->SetPrcntValue(0);
}
-else if (&rControl == m_xFromLeftBtn.get())
+else if (m_xFromLeftBtn->get_active())
{
bLeftEnable = bWidthEnable = true;
m_xRightMF->SetPrcntValue(0);
}
-else if (&rControl == m_xRightBtn.get())
+else if (m_xRightBtn->get_active())
{
bLeftEnable = bWidthEnable = true;
m_xRightMF->SetPrcntValue(0);
}
-else if (&rControl == m_xCenterBtn.get())
+else if (m_xCenterBtn->get_active())
{
bLeftEnable = bWidthEnable = true;
}
-else if (&rControl == m_xFreeBtn.get())
+else if (m_xFreeBtn->get_active())
{
RightModify();
bLeftEnable = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - help3xsl/default.css
help3xsl/default.css |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8bddc0324cab7ed288fddaf6562cb2d2fc83942d
Author: Adolfo Jayme Barrientos
Date: Tue Jul 10 05:31:25 2018 -0500
Helponline: Fix alignment of TOC in sidebar
It was too close to the window border in Edge, Chrome and Firefox Nightly.
(cherry picked from commits 01319d64fae5989f35d10038d19d3371efb69d73
and 1ee609da2c58c8628535602348d2a51dd7ac9f14)
Change-Id: Ic65fd8bcddf9836cfa4c6529fe286885983c78d1
Reviewed-on: https://gerrit.libreoffice.org/57341
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 2104d01d4..092ed89ef 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -454,7 +454,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
color: #333;
z-index: 6;
display: block;
-padding: 0 0 0 20px;
+margin: 0 20px 0 20px;
}
.index-label {
font-size: 22px;
@@ -794,7 +794,7 @@ li.disabled a {
color: #333;
z-index: 6;
display: block;
-padding: 0 0 0 20px;
+margin: 0 20px 0 20px;
}
label[for=accordion-1] {
background-color: transparent;
___
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' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 77e707694f1dc4fcd28c771f6baf6681639f2a4e Author: Adolfo Jayme Barrientos AuthorDate: Tue Jul 10 05:31:25 2018 -0500 Commit: Gerrit Code Review CommitDate: Thu Jul 19 12:10:29 2018 +0200 Update git submodules * Update helpcontent2 from branch 'libreoffice-6-1' - Helponline: Fix alignment of TOC in sidebar It was too close to the window border in Edge, Chrome and Firefox Nightly. (cherry picked from commits 01319d64fae5989f35d10038d19d3371efb69d73 and 1ee609da2c58c8628535602348d2a51dd7ac9f14) Change-Id: Ic65fd8bcddf9836cfa4c6529fe286885983c78d1 Reviewed-on: https://gerrit.libreoffice.org/57341 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index d1e2ccbf4ee1..8bddc0324cab 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d1e2ccbf4ee1d0a1ae047c4fa52bd579e783b3d9 +Subproject commit 8bddc0324cab7ed288fddaf6562cb2d2fc83942d ___ 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/source
xmlsecurity/source/component/documentdigitalsignatures.cxx |4 +---
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |8
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit cab01329c36b6b29a25814bb28d542ff36c56848
Author: Miklos Vajna
AuthorDate: Tue Jul 10 21:56:59 2018 +0200
Commit: Christian Lohmaier
CommitDate: Thu Jul 19 12:09:59 2018 +0200
xmlsecurity UI: restore lost AdES default for PDF signing
Regression from 13596e704e4b48e8b0892867b3f3fc351a2729f9 (Don't pass ODF
version, just retrieve it directly, 2018-05-17).
Change-Id: Ia031e597c61db2820920c3dc1b58430dcc12
Reviewed-on: https://gerrit.libreoffice.org/57246
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit a9c0289886ee5519d4a718d8e3145d66b187faac)
Reviewed-on: https://gerrit.libreoffice.org/57259
Reviewed-by: Christian Lohmaier
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index e814d681dd91..f2d4bc6d626e 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -383,9 +383,7 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
SAL_WARN_IF( !bInit, "xmlsecurity.comp", "Error initializing security
context!" );
if ( bInit )
{
-if (rxStorage.is())
-// Something ZIP based: ODF or OOXML.
-aSignaturesDialog->SetStorage( rxStorage );
+aSignaturesDialog->SetStorage(rxStorage);
aSignaturesDialog->SetSignatureStream( xSignStream );
if ( aSignaturesDialog->Execute() )
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 26f694623646..253c18a2748c 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -229,6 +229,14 @@ bool DigitalSignaturesDialog::Init()
void DigitalSignaturesDialog::SetStorage( const css::uno::Reference <
css::embed::XStorage >& rxStore )
{
+if (!rxStore.is())
+{
+// PDF supports AdES.
+m_bAdESCompliant = true;
+m_pAdESCompliantCB->Check(m_bAdESCompliant);
+return;
+}
+
maSignatureManager.mxStore = rxStore;
maSignatureManager.maSignatureHelper.SetStorage(
maSignatureManager.mxStore, m_sODFVersion);
___
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
sw/inc/swtable.hxx |2 +-
sw/source/core/docnode/ndtbl.cxx|4 ++--
sw/source/core/inc/UndoTable.hxx| 10 +-
sw/source/core/table/swnewtable.cxx | 12
sw/source/core/undo/untbl.cxx | 18 +-
5 files changed, 21 insertions(+), 25 deletions(-)
New commits:
commit 8ee6e15080cd98c654e213d70f0b169ad541c56e
Author: Noel Grandin
AuthorDate: Wed Jul 18 15:50:12 2018 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 19 11:57:22 2018 +0200
loplugin:useuniqueptr in SwUndoSplitTable
Change-Id: I364d57e30a3b8470d1b4739096f13248e1389a08
Reviewed-on: https://gerrit.libreoffice.org/57694
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 4dc1e6831a1c..eea1f64fa53a 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -217,7 +217,7 @@ public:
// SwSavRowSpan is the structure needed by Undo to undo the split operation
// CleanUpRowSpan corrects the (top of the) second table and delivers the
structure
// for Undo
-SwSaveRowSpan* CleanUpTopRowSpan( sal_uInt16 nSplitLine );
+std::unique_ptr CleanUpTopRowSpan( sal_uInt16 nSplitLine );
// RestoreRowSpan is called by Undo to restore the old row span values
void RestoreRowSpan( const SwSaveRowSpan& );
// CleanUpBottomRowSpan corrects the overhanging row spans at the end of
the first table
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index d0e177b48548..936db89cd7e9 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3134,12 +3134,12 @@ bool SwDoc::SplitTable( const SwPosition& rPos,
SplitTable_HeadlineOption eHdlnM
if( pNew )
{
-SwSaveRowSpan* pSaveRowSp = pNew->GetTable().CleanUpTopRowSpan(
rTable.GetTabLines().size() );
+std::unique_ptr pSaveRowSp =
pNew->GetTable().CleanUpTopRowSpan( rTable.GetTabLines().size() );
SwUndoSplitTable* pUndo = nullptr;
if (GetIDocumentUndoRedo().DoesUndo())
{
pUndo = new SwUndoSplitTable(
-*pNew, pSaveRowSp, eHdlnMode, bCalcNewSize);
+*pNew, std::move(pSaveRowSp), eHdlnMode, bCalcNewSize);
GetIDocumentUndoRedo().AppendUndo(pUndo);
if( aHistory.Count() )
pUndo->SaveFormula( aHistory );
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 95fe3cad5675..74bfedfecf2a 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -324,15 +324,15 @@ public:
class SwUndoSplitTable : public SwUndo
{
sal_uLong nTableNode, nOffset;
-SwSaveRowSpan* mpSaveRowSpan; // stores row span values at the splitting
row
-SaveTable* pSavTable;
-SwHistory* pHistory;
+std::unique_ptr mpSaveRowSpan; // stores row span values at
the splitting row
+std::unique_ptr pSavTable;
+std::unique_ptr pHistory;
SplitTable_HeadlineOption nMode;
sal_uInt16 nFormulaEnd;
bool bCalcNewSize;
public:
-SwUndoSplitTable( const SwTableNode& rTableNd, SwSaveRowSpan* pRowSp,
+SwUndoSplitTable( const SwTableNode& rTableNd,
std::unique_ptr pRowSp,
SplitTable_HeadlineOption nMode, bool bCalcNewSize );
virtual ~SwUndoSplitTable() override;
@@ -342,7 +342,7 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & ) override;
void SetTableNodeOffset( sal_uLong nIdx ) { nOffset = nIdx -
nTableNode; }
-SwHistory* GetHistory() { return pHistory; }
+SwHistory* GetHistory() { return pHistory.get(); }
void SaveFormula( SwHistory& rHistory );
};
diff --git a/sw/source/core/table/swnewtable.cxx
b/sw/source/core/table/swnewtable.cxx
index 30a64747182d..89da33af871c 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -2062,17 +2062,13 @@ void SwTable::RestoreRowSpan( const SwSaveRowSpan&
rSave )
}
}
-SwSaveRowSpan* SwTable::CleanUpTopRowSpan( sal_uInt16 nSplitLine )
+std::unique_ptr SwTable::CleanUpTopRowSpan( sal_uInt16
nSplitLine )
{
-SwSaveRowSpan* pRet = nullptr;
if( !IsNewModel() )
-return pRet;
-pRet = new SwSaveRowSpan( GetTabLines()[0]->GetTabBoxes(), nSplitLine );
+return nullptr;
+std::unique_ptr pRet(new SwSaveRowSpan(
GetTabLines()[0]->GetTabBoxes(), nSplitLine ));
if( pRet->mnRowSpans.empty() )
-{
-delete pRet;
-pRet = nullptr;
-}
+return nullptr;
return pRet;
}
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index de4d29ffb07b..411d2d8ac1a9 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2843,19 +2843,19 @@ void SwUndoCpyTable::RedoImpl(::sw::UndoRedoContext &
rContext)
}
SwUndoSplitTable::SwUndoSplitTable( const SwTableNode& rTableNd,
-SwSaveRowSpan* pRow
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmlftn.cxx |8 +++-
sw/source/filter/html/htmlplug.cxx | 18 ++
sw/source/filter/html/htmltab.cxx |3 +--
sw/source/filter/html/swhtml.hxx |6 +++---
4 files changed, 13 insertions(+), 22 deletions(-)
New commits:
commit 174d8630d754c429b6a88964edae9c9dda707344
Author: Noel Grandin
AuthorDate: Wed Jul 18 11:40:10 2018 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 19 11:56:41 2018 +0200
loplugin:useuniqueptr in SwHTMLParser
Change-Id: I2be859198aa176d239dbfa5684f25ab2be8d517e
Reviewed-on: https://gerrit.libreoffice.org/57689
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/filter/html/htmlftn.cxx
b/sw/source/filter/html/htmlftn.cxx
index 096fdcd9059b..c8a50ae1f42d 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -173,7 +173,7 @@ void SwHTMLParser::InsertFootEndNote( const OUString&
rName, bool bEndNote,
bool bFixed )
{
if( !m_pFootEndNoteImpl )
-m_pFootEndNoteImpl = new SwHTMLFootEndNote_Impl;
+m_pFootEndNoteImpl.reset(new SwHTMLFootEndNote_Impl);
m_pFootEndNoteImpl->sName = rName;
if( m_pFootEndNoteImpl->sName.getLength() > 3 )
@@ -213,8 +213,7 @@ void SwHTMLParser::InsertFootEndNoteText()
void SwHTMLParser::DeleteFootEndNoteImpl()
{
-delete m_pFootEndNoteImpl;
-m_pFootEndNoteImpl = nullptr;
+m_pFootEndNoteImpl.reset();
}
SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const OUString& rName )
@@ -234,8 +233,7 @@ SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const
OUString& rName )
m_pFootEndNoteImpl->aTextFootnotes.erase(
m_pFootEndNoteImpl->aTextFootnotes.begin() + i );
if (m_pFootEndNoteImpl->aTextFootnotes.empty())
{
-delete m_pFootEndNoteImpl;
-m_pFootEndNoteImpl = nullptr;
+m_pFootEndNoteImpl.reset();
}
break;
diff --git a/sw/source/filter/html/htmlplug.cxx
b/sw/source/filter/html/htmlplug.cxx
index 22738a13b934..5864bac5a004 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -651,8 +651,7 @@ void SwHTMLParser::NewObject()
bool bPrcWidth = false, bPrcHeight = false,
bDeclare = false;
// create a new Command list
-delete m_pAppletImpl;
-m_pAppletImpl = new SwApplet_Impl( m_xDoc->GetAttrPool() );
+m_pAppletImpl.reset(new SwApplet_Impl( m_xDoc->GetAttrPool() ));
const HTMLOptions& rHTMLOptions = GetOptions();
for (size_t i = rHTMLOptions.size(); i; )
@@ -749,8 +748,7 @@ void SwHTMLParser::NewObject()
if( !bIsApplet )
{
-delete m_pAppletImpl;
-m_pAppletImpl = nullptr;
+m_pAppletImpl.reset();
return;
}
@@ -799,8 +797,7 @@ void SwHTMLParser::EndObject()
// if applicable create frames and register auto-bound frames
RegisterFlyFrame( pFlyFormat );
-delete m_pAppletImpl;
-m_pAppletImpl = nullptr;
+m_pAppletImpl.reset();
}
#else
(void) this;// Silence loplugin:staticmethods
@@ -818,8 +815,7 @@ void SwHTMLParser::InsertApplet()
sal_Int16 eHoriOri = text::HoriOrientation::NONE;
// create a new Command list
-delete m_pAppletImpl;
-m_pAppletImpl = new SwApplet_Impl( m_xDoc->GetAttrPool() );
+m_pAppletImpl.reset(new SwApplet_Impl( m_xDoc->GetAttrPool() ));
const HTMLOptions& rHTMLOptions = GetOptions();
for (size_t i = rHTMLOptions.size(); i; )
@@ -879,8 +875,7 @@ void SwHTMLParser::InsertApplet()
if( aCode.isEmpty() )
{
-delete m_pAppletImpl;
-m_pAppletImpl = nullptr;
+m_pAppletImpl.reset();
return;
}
@@ -931,8 +926,7 @@ void SwHTMLParser::EndApplet()
// if applicable create frames and register auto-bound frames
RegisterFlyFrame( pFlyFormat );
-delete m_pAppletImpl;
-m_pAppletImpl = nullptr;
+m_pAppletImpl.reset();
#else
(void) this;
#endif
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 3b6f1b33f980..9f4816e5d1ff 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -4908,8 +4908,7 @@ void SwHTMLParser::ClearFootnotesInRange(const
SwNodeIndex& rMkNdIdx, const SwNo
m_pFootEndNoteImpl->aTextFootnotes.end(), IndexInRange(rMkNdIdx,
rPtNdIdx)), m_pFootEndNoteImpl->aTextFootnotes.end());
if (m_pFootEndNoteImpl->aTextFootnotes.empty())
{
-delete m_pFootEndNoteImpl;
-m_pFootEndNoteImpl = nullptr;
+m_pFootEndNoteImpl.reset();
}
}
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 0867f3e4d0ed..e6d927c96768 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -368,
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/UndoTable.hxx |5 ++---
sw/source/core/undo/untbl.cxx| 29 +
2 files changed, 15 insertions(+), 19 deletions(-)
New commits:
commit dcfef09233972619533caa39f2706629025124cb
Author: Noel Grandin
AuthorDate: Wed Jul 18 15:06:12 2018 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 19 11:56:22 2018 +0200
loplugin:useuniqueptr in SwUndoTableCpyTable
Change-Id: I819c96ed7aec51f546cdc8442154dbba7110d961
Reviewed-on: https://gerrit.libreoffice.org/57693
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index e4f27cfbfdb4..95fe3cad5675 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -278,12 +278,11 @@ public:
};
struct UndoTableCpyTable_Entry;
-using SwUndoTableCpyTable_Entries =
std::vector>;
class SwUndoTableCpyTable : public SwUndo
{
-SwUndoTableCpyTable_Entries* m_pArr;
-SwUndoTableNdsChg* pInsRowUndo;
+std::vector> m_vArr;
+std::unique_ptr pInsRowUndo;
//b6341295: When redlining is active, PrepareRedline has to create the
//redlining attributes for the new and the old table cell content
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 87a5460c5f1e..de4d29ffb07b 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2396,15 +2396,13 @@ UndoTableCpyTable_Entry::UndoTableCpyTable_Entry( const
SwTableBox& rBox )
SwUndoTableCpyTable::SwUndoTableCpyTable(const SwDoc* pDoc)
: SwUndo( SwUndoId::TBLCPYTBL, pDoc )
-, m_pArr(new SwUndoTableCpyTable_Entries)
-, pInsRowUndo(nullptr)
{
}
SwUndoTableCpyTable::~SwUndoTableCpyTable()
{
-delete m_pArr;
-delete pInsRowUndo;
+m_vArr.clear();
+pInsRowUndo.reset();
}
void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
@@ -2413,9 +2411,9 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext
& rContext)
DEBUG_REDLINE( &rDoc )
SwTableNode* pTableNd = nullptr;
-for (size_t n = m_pArr->size(); n; )
+for (size_t n = m_vArr.size(); n; )
{
-UndoTableCpyTable_Entry *const pEntry = (*m_pArr)[ --n ].get();
+UndoTableCpyTable_Entry *const pEntry = m_vArr[ --n ].get();
sal_uLong nSttPos = pEntry->nBoxIdx + pEntry->nOffset;
SwStartNode* pSNd = rDoc.GetNodes()[ nSttPos ]->StartOfSectionNode();
if( !pTableNd )
@@ -2567,9 +2565,9 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext
& rContext)
}
SwTableNode* pTableNd = nullptr;
-for (size_t n = 0; n < m_pArr->size(); ++n)
+for (size_t n = 0; n < m_vArr.size(); ++n)
{
-UndoTableCpyTable_Entry *const pEntry = (*m_pArr)[ n ].get();
+UndoTableCpyTable_Entry *const pEntry = m_vArr[ n ].get();
sal_uLong nSttPos = pEntry->nBoxIdx + pEntry->nOffset;
SwStartNode* pSNd = rDoc.GetNodes()[ nSttPos ]->StartOfSectionNode();
if( !pTableNd )
@@ -2648,11 +2646,11 @@ void
SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext)
void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool
bDelContent )
{
-if (!m_pArr->empty() && !bDelContent)
+if (!m_vArr.empty() && !bDelContent)
return;
UndoTableCpyTable_Entry* pEntry = new UndoTableCpyTable_Entry( rBox );
-m_pArr->push_back(std::unique_ptr(pEntry));
+m_vArr.push_back(std::unique_ptr(pEntry));
SwDoc* pDoc = rBox.GetFrameFormat()->GetDoc();
DEBUG_REDLINE( pDoc )
@@ -2681,7 +2679,7 @@ void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox&
rBox, bool bDelContent
void SwUndoTableCpyTable::AddBoxAfter( const SwTableBox& rBox, const
SwNodeIndex& rIdx, bool bDelContent )
{
-UndoTableCpyTable_Entry *const pEntry = (*m_pArr).back().get();
+UndoTableCpyTable_Entry *const pEntry = m_vArr.back().get();
// If the content was deleted than remove also the temporarily created node
if( bDelContent )
@@ -2785,8 +2783,8 @@ bool SwUndoTableCpyTable::InsertRow( SwTable& rTable,
const SwSelBoxes& rBoxes,
SwTableNode* pTableNd =
const_cast(rTable.GetTabSortBoxes()[0]->
GetSttNd()->FindTableNode());
-pInsRowUndo = new SwUndoTableNdsChg( SwUndoId::TABLE_INSROW, rBoxes,
*pTableNd,
- 0, 0, nCnt, true, false );
+pInsRowUndo.reset( new SwUndoTableNdsChg( SwUndoId::TABLE_INSROW, rBoxes,
*pTableNd,
+ 0, 0, nCnt, true, false ) );
SwTableSortBoxes aTmpLst( rTable.GetTabSortBoxes() );
bool bRet = rTable.InsertRow( rTable.GetFrameFormat()->GetDoc(), rBoxes,
nCnt, /*bBehind*/true );
@@ -2794,15 +2792,14 @@ bool SwUndoTableCpyTable::InsertRow( SwTable& rTable,
const SwSelBoxes& rBoxes,
pInsRowUndo->SaveNewBoxes( *pTableNd, aTmpLst );
else
{
-delete pInsRowUndo;
-pInsRowUndo =
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/UndoTable.hxx |2 +-
sw/source/core/undo/untbl.cxx|5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 3d786062f515ab769aca172e5c08292cda9c4c8c
Author: Noel Grandin
AuthorDate: Wed Jul 18 12:16:42 2018 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 19 11:56:08 2018 +0200
loplugin:useuniqueptr in SwUndoTableNumFormat
Change-Id: I6e27bdad49ec22708cf27599e9e4d54a13a160c3
Reviewed-on: https://gerrit.libreoffice.org/57692
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 15edd3a1c01e..e4f27cfbfdb4 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -251,7 +251,7 @@ public:
class SwUndoTableNumFormat : public SwUndo
{
-SfxItemSet *m_pBoxSet;
+std::unique_ptr m_pBoxSet;
std::unique_ptr m_pHistory;
OUString m_aStr, m_aNewFormula;
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 7ea6694848a4..87a5460c5f1e 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2129,7 +2129,6 @@ void SwUndoTableMerge::SaveCollection( const SwTableBox&
rBox )
SwUndoTableNumFormat::SwUndoTableNumFormat( const SwTableBox& rBox,
const SfxItemSet* pNewSet )
: SwUndo(SwUndoId::TBLNUMFMT, rBox.GetFrameFormat()->GetDoc())
-, m_pBoxSet(nullptr)
, m_nFormatIdx(getSwDefaultTextFormat())
, m_nNewFormatIdx(0)
, m_fNum(0.0)
@@ -2162,7 +2161,7 @@ SwUndoTableNumFormat::SwUndoTableNumFormat( const
SwTableBox& rBox,
pTNd->GetpSwpHints()->DeRegister();
}
-m_pBoxSet = new SfxItemSet( pDoc->GetAttrPool(), aTableBoxSetRange );
+m_pBoxSet.reset( new SfxItemSet( pDoc->GetAttrPool(), aTableBoxSetRange )
);
m_pBoxSet->Put( rBox.GetFrameFormat()->GetAttrSet() );
if( pNewSet )
@@ -2198,7 +2197,7 @@ SwUndoTableNumFormat::SwUndoTableNumFormat( const
SwTableBox& rBox,
SwUndoTableNumFormat::~SwUndoTableNumFormat()
{
m_pHistory.reset();
-delete m_pBoxSet;
+m_pBoxSet.reset();
}
void SwUndoTableNumFormat::UndoImpl(::sw::UndoRedoContext & rContext)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Seccomp.cpp
common/Seccomp.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3352603011bda73b201992d5b491040050ea5ff4
Author: Tor Lillqvist
Date: Thu Jul 19 12:17:46 2018 +0300
Avoid cast that causes gcc warning
gcc 8 warns: cast between incompatible function types from ‘void
(*)(int, siginfo_t*, void*)’ to ‘__sighandler_t’ {aka ‘void (*)(int’}
[-Werror=cast-function-type].
The struct sigaction already has an appropriately typed field
sa_sigaction in a union with the sa_handler field, so use that. (If
that is not present in some older Linux and/or glibc that we still
need to support, this commit will have to be reverted then.)
Change-Id: I67667073c89b7b22e7de1933ccaaa60868685866
diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index e65e8b4ac..3f363923a 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -206,7 +206,7 @@ bool lockdown(Type type)
sigemptyset(&action.sa_mask);
action.sa_flags = SA_SIGINFO;
-action.sa_handler = reinterpret_cast<__sighandler_t>(handleSysSignal);
+action.sa_sigaction = handleSysSignal;
sigaction(SIGSYS, &action, nullptr);
___
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' - svx/source
svx/source/table/cell.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 1663326d292a6ed89215b7a188054a2e27d7832f
Author: Armin Le Grand
AuthorDate: Wed Jul 18 13:53:38 2018 +0200
Commit: Armin Le Grand
CommitDate: Thu Jul 19 11:29:34 2018 +0200
tdf#118354 Do not dereference non-exsisting Object
Change-Id: Ie7323302f3b29dfc19b26e2185321c2e609cab2b
Reviewed-on: https://gerrit.libreoffice.org/57629
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
Reviewed-on: https://gerrit.libreoffice.org/57711
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index b1364f6d60ff..8eadbd453804 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -511,7 +511,14 @@ void Cell::replaceContentAndFormating( const CellRef&
xSourceCell )
if( xSourceCell.is() && mpProperties )
{
mpProperties->SetMergedItemSet( xSourceCell->GetObjectItemSet() );
-SetOutlinerParaObject( new
OutlinerParaObject(*xSourceCell->GetOutlinerParaObject()) );
+
+// tdf#118354 OutlinerParaObject may be nullptr, do not dereference
when
+// not set (!)
+if(nullptr != xSourceCell->GetOutlinerParaObject())
+{
+SetOutlinerParaObject( new
OutlinerParaObject(*xSourceCell->GetOutlinerParaObject()) );
+}
+
SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() );
SdrTableObj& rSourceTableObj = dynamic_cast< SdrTableObj& >(
xSourceCell->GetObject() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Log.cpp
common/Log.cpp |4
1 file changed, 4 deletions(-)
New commits:
commit eae43a262ba36bde802b5d0108757220dd38d50b
Author: Tor Lillqvist
Date: Thu Jul 19 12:08:26 2018 +0300
Drop unused LogPrefix variable
Also gets rid of a potentially problematic strncpy() use that causes a
gcc warning: specified bound 256 equals destination size
[-Werror=stringop-truncation].
(Whether that would have caused a problem or not depends on how
LogPrefix would have been used, and whether it ever would have been
filled completely, without any terminating nul character, by that
strncpy().)
Change-Id: I92dba3726e3f46777d9b4c8cf88f557c02788fe0
diff --git a/common/Log.cpp b/common/Log.cpp
index 4725b9024..a3140bd48 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -33,8 +33,6 @@
#include "Log.hpp"
#include "Util.hpp"
-static char LogPrefix[256] = { '\0' };
-
namespace Log
{
using namespace Poco;
@@ -140,8 +138,6 @@ namespace Log
oss << Source.name << '-'
<< std::setw(5) << std::setfill('0') << Poco::Process::id();
Source.id = oss.str();
-assert (sizeof (LogPrefix) > strlen(oss.str().c_str()) + 1);
-strncpy(LogPrefix, oss.str().c_str(), sizeof(LogPrefix));
// Configure the logger.
AutoPtr channel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/WebSocketHandler.hpp
net/WebSocketHandler.hpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ff31f2dba19766b77a668a450d73745152544b96
Author: Tor Lillqvist
Date: Thu Jul 19 11:39:32 2018 +0300
Avoid potential confusion by not using the term "packet" in a comment
It confused at least me for a while into pondering whether the code
thinks TCP is packet-oriented.
Change-Id: I143fc7821abd6b4023d551cdcb42a00e1613e466
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index d6933d173..6ef1460e0 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -299,7 +299,7 @@ public:
else
{
while (handleOneIncomingMessage(socket))
-; // can have multiple msgs in one recv'd packet.
+; // might have multiple messages in the accumulated buffer.
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/WebSocketHandler.hpp
net/WebSocketHandler.hpp | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 6b96c73f46d1c27f0054aea840a05bcc58fa1930
Author: Tor Lillqvist
Date: Thu Jul 19 11:35:48 2018 +0300
Don't log binary data as such, use Util::stringifyHexLine()
Also, log the cases with still incomplete data in the buffer
separately.
Change-Id: Idfa915378c2823dd898789d6a63a0cd71a817b8a
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index e1e04dac1..d6933d173 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -133,11 +133,11 @@ public:
if (len == 0)
return false; // avoid logging.
-// FIXME: Do we really want to dump binary data as such here?
-LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket data of " <<
len << " bytes: " << std::string(socket->_inBuffer.data(),
socket->_inBuffer.size()));
-
if (len < 2) // partial read
+{
+LOG_TRC("#" << socket->getFD() << ": Still incomplete WebSocket
message, have " << len << " bytes");
return false;
+}
unsigned char *p = reinterpret_cast(&socket->_inBuffer[0]);
const bool fin = p[0] & 0x80;
@@ -150,7 +150,10 @@ public:
if (payloadLen == 126) // 2 byte length
{
if (len < 2 + 2)
+{
+LOG_TRC("#" << socket->getFD() << ": Still incomplete
WebSocket message, have " << len << " bytes");
return false;
+}
payloadLen = (((unsigned)p[2]) << 8) | ((unsigned)p[3]);
headerLen += 2;
@@ -158,8 +161,10 @@ public:
else if (payloadLen == 127) // 8 byte length
{
if (len < 2 + 8)
+{
+LOG_TRC("#" << socket->getFD() << ": Still incomplete
WebSocket message, have " << len << " bytes");
return false;
-
+}
payloadLen = uint64_t)p[9]) << 0) + (((uint64_t)p[8]) << 8) +
(((uint64_t)p[7]) << 16) + (((uint64_t)p[6]) << 24) +
(((uint64_t)p[5]) << 32) + (((uint64_t)p[4]) << 40) +
@@ -178,9 +183,12 @@ public:
if (payloadLen + headerLen > len)
{ // partial read wait for more data.
+LOG_TRC("#" << socket->getFD() << ": Still incomplete WebSocket
message, have " << len << " bytes, message is " << payloadLen + headerLen << "
bytes");
return false;
}
+LOG_TRC("#" << socket->getFD() << ": Incoming WebSocket data of " <<
len << " bytes: " << Util::stringifyHexLine(socket->_inBuffer, 0,
std::min((size_t)32, len)));
+
data = p + headerLen;
if (hasMask)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - sw/qa sw/source
sw/qa/extras/htmlexport/data/transparent-image.odt |binary
sw/qa/extras/htmlexport/htmlexport.cxx | 20
sw/qa/extras/inc/swmodeltestbase.hxx |2 ++
sw/source/filter/html/htmlflywriter.cxx|1 +
4 files changed, 23 insertions(+)
New commits:
commit ad3aecb63c0ca66a4e67bbe2a9b2b46b9753f775
Author: Miklos Vajna
AuthorDate: Wed Jul 18 14:00:29 2018 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 19 09:44:19 2018 +0200
sw HTML export: force PNG output harder in reqif mode
Need to disable one more flag to avoid GIF for transparent images.
Also start asserting reqif-xhtml output with an XML parser.
Reviewed-on: https://gerrit.libreoffice.org/57630
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 1a884ea69b2c8b98719fa3cd298b42a6d584cd41)
Conflicts:
sw/qa/extras/htmlexport/htmlexport.cxx
Change-Id: I1395812a5ddfd56cee4acacf6dea46c6e413b736
diff --git a/sw/qa/extras/htmlexport/data/transparent-image.odt
b/sw/qa/extras/htmlexport/data/transparent-image.odt
new file mode 100644
index ..0c5fb8de0790
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/transparent-image.odt
differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index ce773347d25c..9f2accc8482f 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -589,6 +589,26 @@ DECLARE_HTMLEXPORT_TEST(testList, "list.html")
CPPUNIT_ASSERT(aStream.indexOf("") != -1);
}
+DECLARE_HTMLEXPORT_TEST(testTransparentImageReqIf, "transparent-image.odt")
+{
+SvMemoryStream aStream;
+aStream.WriteCharPtr("http://www.w3.org/1999/xhtml\";>\n");
+SvFileStream aFileStream(maTempFile.GetURL(), StreamMode::READ);
+aStream.WriteStream(aFileStream);
+aStream.WriteCharPtr("\n");
+aStream.Seek(0);
+xmlDocPtr pDoc = parseXmlStream(&aStream);
+CPPUNIT_ASSERT(pDoc);
+
+OUString aSource = getXPath(
+pDoc,
+
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:p/reqif-xhtml:object/reqif-xhtml:object",
+"data");
+OUString aMessage = "src attribute is: " + aSource;
+// This was GIF, when the intention was to force PNG.
+CPPUNIT_ASSERT_MESSAGE(aMessage.toUtf8().getStr(),
aSource.endsWith(".png"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 6757f6d8b961..ff77cff14cf5 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -880,6 +880,8 @@ protected:
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("field"),
BAD_CAST("urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("formx"),
BAD_CAST("urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("css3t"),
BAD_CAST("http://www.w3.org/TR/css3-text/";));
+// reqif-xhtml
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("reqif-xhtml"),
BAD_CAST("http://www.w3.org/1999/xhtml";));
}
};
diff --git a/sw/source/filter/html/htmlflywriter.cxx
b/sw/source/filter/html/htmlflywriter.cxx
index 96492d1b75ab..6725f12cd809 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -1837,6 +1837,7 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt,
const SwFrameFormat& rF
// output.
aFilterName = "PNG";
nFlags &= ~XOutFlags::UseNativeIfPossible;
+nFlags &= ~XOutFlags::UseGifIfSensible;
aMimeType = "image/png";
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/document/OfficeDocument.py |1 - 1 file changed, 1 deletion(-) New commits: commit a8e657e9d04f908388580039a0ac5b9348dfee60 Author: Caolán McNamara AuthorDate: Wed Jul 18 13:41:15 2018 +0100 Commit: Caolán McNamara CommitDate: Thu Jul 19 09:29:27 2018 +0200 Related: rhbz#1602589 null_check: 'xComponent' Change-Id: I591f9fa611c0ad0d1631d179b7263f83613badfb Reviewed-on: https://gerrit.libreoffice.org/57640 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py index 6ebb7d389fed..b0bcbf91e27e 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.py +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py @@ -196,7 +196,6 @@ class OfficeDocument(object): bState = False else: -xComponent.dispose() bState = True return bState ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source
xmlsecurity/Library_xsec_xmlsec.mk |1
xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx| 145
++
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 21 -
xmlsecurity/source/xmlsec/xmlsec_init.cxx | 29 --
4 files changed, 44 insertions(+), 152 deletions(-)
New commits:
commit 27beb3211a595b70bc411cf5419ba7e1d9212a1a
Author: Miklos Vajna
AuthorDate: Wed Jul 18 21:44:53 2018 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 19 09:01:55 2018 +0200
xmlsecurity: stop linking to libxmlsec's mscrypto backend
This was only useful when the mscrypto to mscng porting was in progress.
Change-Id: I5a062cae744489e5ad311ab6b531d00ea21f4e0a
Reviewed-on: https://gerrit.libreoffice.org/57699
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk
b/xmlsecurity/Library_xsec_xmlsec.mk
index cc4bbdb29fe7..8efb4911fbbb 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -90,7 +90,6 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
))
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
- $(call
gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscrypto.lib \
$(call
gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscng.lib \
$(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \
))
diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
index 8918e1d80b24..aafd7d10a66c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx
@@ -24,9 +24,6 @@
#include
#include
-#include
-#include
-#include
#include
#include
#include
@@ -47,10 +44,7 @@ xmlSecKeysMngrPtr MSCryptoAppliedKeysMngrCreate()
xmlSecKeysMngrPtrkeyMngr = nullptr ;
xmlSecKeyStorePtrkeyStore = nullptr ;
-if (!svl::crypto::isMSCng())
-keyStore = xmlSecKeyStoreCreate(xmlSecMSCryptoKeysStoreId) ;
-else
-keyStore = xmlSecKeyStoreCreate(xmlSecMSCngKeysStoreId);
+keyStore = xmlSecKeyStoreCreate(xmlSecMSCngKeysStoreId);
if (keyStore == nullptr)
{
xmlSecError(XMLSEC_ERRORS_HERE,
@@ -102,33 +96,16 @@ xmlSecKeysMngrPtr MSCryptoAppliedKeysMngrCreate()
/*-
* Initialize crypto library specific data in keys manager
*/
-if (!svl::crypto::isMSCng())
+if (xmlSecMSCngKeysMngrInit(keyMngr) < 0)
{
-if (xmlSecMSCryptoKeysMngrInit(keyMngr) < 0)
-{
- xmlSecError(XMLSEC_ERRORS_HERE,
-nullptr,
-"xmlSecMSCryptoKeysMngrInit",
-XMLSEC_ERRORS_R_XMLSEC_FAILED,
-XMLSEC_ERRORS_NO_MESSAGE) ;
-
-xmlSecKeysMngrDestroy(keyMngr) ;
-return nullptr ;
-}
-}
-else
-{
-if (xmlSecMSCngKeysMngrInit(keyMngr) < 0)
-{
- xmlSecError(XMLSEC_ERRORS_HERE,
-nullptr,
-"xmlSecMSCngKeysMngrInit",
-XMLSEC_ERRORS_R_XMLSEC_FAILED,
-XMLSEC_ERRORS_NO_MESSAGE);
-
-xmlSecKeysMngrDestroy(keyMngr);
-return nullptr;
-}
+ xmlSecError(XMLSEC_ERRORS_HERE,
+nullptr,
+"xmlSecMSCngKeysMngrInit",
+XMLSEC_ERRORS_R_XMLSEC_FAILED,
+XMLSEC_ERRORS_NO_MESSAGE);
+
+xmlSecKeysMngrDestroy(keyMngr);
+return nullptr;
}
/*-
@@ -157,10 +134,7 @@ MSCryptoAppliedKeysMngrAdoptKeyStore(
xmlSecAssert2(mngr != nullptr, -1) ;
xmlSecAssert2(keyStore != nullptr, -1) ;
-if (!svl::crypto::isMSCng())
-x509Store = xmlSecKeysMngrGetDataStore(mngr,
xmlSecMSCryptoX509StoreId) ;
-else
-x509Store = xmlSecKeysMngrGetDataStore(mngr, xmlSecMSCngX509StoreId);
+x509Store = xmlSecKeysMngrGetDataStore(mngr, xmlSecMSCngX509StoreId);
if (x509Store == nullptr)
{
xmlSecError(XMLSEC_ERRORS_HERE,
@@ -171,29 +145,14 @@ MSCryptoAppliedKeysMngrAdoptKeyStore(
return -1 ;
}
-if (!svl::crypto::isMSCng())
+if (xmlSecMSCngX509StoreAdoptKeyStore(x509Store, keyStore) < 0)
{
-if (xmlSecMSCryptoX509StoreAdoptKeyStore(x509Store, keyStore) < 0)
-{
-xmlSecError(XMLSEC_ERRORS_HERE,
-
xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(x509Store)),
-"xmlSecMSCryptoX509StoreAdoptKeyStore",
-XMLSEC_ERRORS_R_XMLSEC_FAILED,
-XMLSEC_ERRORS_NO_MESSAGE) ;
-return -1 ;
-}
-}
-else
-{
-if (xmlSecMSCngX509StoreAdoptKeyStore(x509Store, keyStore) < 0)
-{
-xmlSecError(XMLSEC_ERRORS_HERE,
-
xmlSec
