Win 32
Isn't it time to start removing windows 32 support? Some changes led me to some types.h and noticed win32 stuff. If and only if we won't make win32 of the 7.1 I can remove it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/text
source/text/shared/01/ref_pdf_export_general.xhp|6 +- source/text/shared/01/ref_pdf_export_initial_view.xhp |2 ++ source/text/shared/01/ref_pdf_export_links.xhp |2 ++ source/text/shared/01/ref_pdf_export_security.xhp |2 ++ source/text/shared/01/ref_pdf_export_user_interface.xhp |2 ++ 5 files changed, 13 insertions(+), 1 deletion(-) New commits: commit b466af5d12051020df2da4adaa836a8b7b3a9c37 Author: Olivier Hallot AuthorDate: Sat Jul 18 12:06:28 2020 -0300 Commit: Olivier Hallot CommitDate: Sat Jul 18 19:35:02 2020 +0200 Add related topics section to pdf export Help pages Change-Id: I9cea01efbcce8be2b0a1e1ad4b78e0300848a3a2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/98995 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/ref_pdf_export_general.xhp b/source/text/shared/01/ref_pdf_export_general.xhp index bcb193a90..cc369a77f 100644 --- a/source/text/shared/01/ref_pdf_export_general.xhp +++ b/source/text/shared/01/ref_pdf_export_general.xhp @@ -155,6 +155,10 @@ Use reference XObjects This option affects how PDF images are exported back to PDF. When this option is disabled, then the first page of the PDF data is included in the output. The PDF export merges the used images, fonts and other resources during export. This is a complex operation, but the result can be viewed in various viewers. When the option is enabled, then the reference XObject markup is used: this is a simple operation, but viewers have to support this markup to show vector images. Otherwise a fallback bitmap is shown in the viewer. - + + + + + diff --git a/source/text/shared/01/ref_pdf_export_initial_view.xhp b/source/text/shared/01/ref_pdf_export_initial_view.xhp index dde93997c..0b990ca8a 100644 --- a/source/text/shared/01/ref_pdf_export_initial_view.xhp +++ b/source/text/shared/01/ref_pdf_export_initial_view.xhp @@ -91,6 +91,8 @@ First page is left Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Language settings - Languages in the Options dialog box. + + diff --git a/source/text/shared/01/ref_pdf_export_links.xhp b/source/text/shared/01/ref_pdf_export_links.xhp index 49d65f22a..359740179 100644 --- a/source/text/shared/01/ref_pdf_export_links.xhp +++ b/source/text/shared/01/ref_pdf_export_links.xhp @@ -56,6 +56,8 @@ Open with Internet browser Cross-document links are opened with the Internet browser. The Internet browser must be able to handle the specified file type inside the hyperlink. + + diff --git a/source/text/shared/01/ref_pdf_export_security.xhp b/source/text/shared/01/ref_pdf_export_security.xhp index 1d6246a00..dd739084e 100644 --- a/source/text/shared/01/ref_pdf_export_security.xhp +++ b/source/text/shared/01/ref_pdf_export_security.xhp @@ -80,6 +80,8 @@ Enable text access for accessibility tools Select to enable text access for accessibility tools. + + diff --git a/source/text/shared/01/ref_pdf_export_user_interface.xhp b/source/text/shared/01/ref_pdf_export_user_interface.xhp index d2f774b68..7f4b1840e 100644 --- a/source/text/shared/01/ref_pdf_export_user_interface.xhp +++ b/source/text/shared/01/ref_pdf_export_user_interface.xhp @@ -77,6 +77,8 @@ Visible bookmark levels Select to show bookmark levels down to the selected level when the reader opens the PDF file. + + ___ 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 52820b52b3bca45e2db527d1cc5f4488b2e0b9d0 Author: Olivier Hallot AuthorDate: Sat Jul 18 14:35:02 2020 -0300 Commit: Gerrit Code Review CommitDate: Sat Jul 18 19:35:02 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to b466af5d12051020df2da4adaa836a8b7b3a9c37 - Add related topics section to pdf export Help pages Change-Id: I9cea01efbcce8be2b0a1e1ad4b78e0300848a3a2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/98995 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 682a31b0baef..b466af5d1205 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 682a31b0baefe39993952265195c8c7f0e556aee +Subproject commit b466af5d12051020df2da4adaa836a8b7b3a9c37 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/source connectivity/inc connectivity/source connectivity/workben include/connectivity
configmgr/source/xmldata.hxx |6 - connectivity/inc/sdbcx/VCatalog.hxx|6 - connectivity/inc/sdbcx/VGroup.hxx |6 - connectivity/inc/sdbcx/VIndex.hxx |6 - connectivity/inc/sdbcx/VIndexColumn.hxx|6 - connectivity/inc/sdbcx/VKey.hxx|7 - connectivity/inc/sdbcx/VKeyColumn.hxx |6 - connectivity/inc/sdbcx/VTypeDef.hxx|5 connectivity/inc/sdbcx/VUser.hxx |6 - connectivity/source/drivers/evoab2/NCatalog.hxx|6 - connectivity/source/drivers/evoab2/NColumns.hxx|5 connectivity/source/drivers/evoab2/NConnection.hxx |7 - connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx |6 - connectivity/source/drivers/evoab2/NDriver.hxx |8 - connectivity/source/drivers/evoab2/NPreparedStatement.hxx |6 - connectivity/source/drivers/evoab2/NResultSet.hxx |6 - connectivity/source/drivers/evoab2/NResultSetMetaData.hxx |7 - connectivity/source/drivers/evoab2/NStatement.hxx |6 - connectivity/source/drivers/evoab2/NTable.hxx |6 - connectivity/source/drivers/evoab2/NTables.hxx |7 - connectivity/source/drivers/firebird/Blob.hxx |5 connectivity/source/drivers/firebird/Catalog.hxx |8 - connectivity/source/drivers/firebird/Clob.hxx |5 connectivity/source/drivers/firebird/Column.hxx|6 - connectivity/source/drivers/firebird/Columns.hxx |7 - connectivity/source/drivers/firebird/Connection.hxx|6 - connectivity/source/drivers/firebird/DatabaseMetaData.hxx |6 - connectivity/source/drivers/firebird/Driver.hxx|5 connectivity/source/drivers/firebird/Indexes.hxx |7 - connectivity/source/drivers/firebird/Keys.hxx |7 - connectivity/source/drivers/firebird/PreparedStatement.hxx |6 - connectivity/source/drivers/firebird/ResultSet.hxx |6 - connectivity/source/drivers/firebird/ResultSetMetaData.hxx |6 - connectivity/source/drivers/firebird/Statement.hxx |7 - connectivity/source/drivers/firebird/StatementCommonBase.hxx |6 - connectivity/source/drivers/firebird/SubComponent.hxx | 24 connectivity/source/drivers/firebird/Table.hxx |7 - connectivity/source/drivers/firebird/Tables.hxx|7 - connectivity/source/drivers/firebird/User.hxx |7 - connectivity/source/drivers/firebird/Users.hxx |7 - connectivity/source/drivers/firebird/Util.hxx |6 - connectivity/source/drivers/hsqldb/HTerminateListener.hxx |9 - connectivity/source/drivers/macab/MacabAddressBook.hxx |5 connectivity/source/drivers/macab/MacabCatalog.hxx |7 - connectivity/source/drivers/macab/MacabColumns.hxx |5 connectivity/source/drivers/macab/MacabConnection.hxx |5 connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx|5 connectivity/source/drivers/macab/MacabDriver.hxx |5 connectivity/source/drivers/macab/MacabGroup.hxx |5 connectivity/source/drivers/macab/MacabHeader.hxx |5 connectivity/source/drivers/macab/MacabPreparedStatement.hxx |5 connectivity/source/drivers/macab/MacabRecord.hxx |5 connectivity/source/drivers/macab/MacabRecords.hxx |5 connectivity/source/drivers/macab/MacabResultSet.hxx |5 connectivity/source/drivers/macab/MacabResultSetMetaData.hxx |5 connectivity/source/drivers/macab/MacabStatement.cxx |5 connectivity/source/drivers/macab/MacabStatement.hxx |5 connectivity/source/drivers/macab/MacabTable.hxx |5 connectivity/source/drivers/macab/MacabTables.hxx |5 connectivity/source/drivers/macab/macabcondition.hxx |5 connectivity/source/drivers/macab/macaborder.hxx |5 connectivity/source/drivers/macab/macabutilities.hxx |5 connectivity/source/drivers/mork/MCatalog.hxx |6 - connectivity/source/drivers/mork/MColumnAlias.hxx |6 - connectivity/source/drivers/mork/MColumns.hxx |6 - connectivity/s
[Libreoffice-commits] core.git: lingucomponent/source solenv/bin
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component |5 -
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx |8 -
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm| 50
+-
solenv/bin/native-code.py |3
4 files changed, 13 insertions(+), 53 deletions(-)
New commits:
commit d9b7ddd24d379909f9cd2d83ce28fa619953d841
Author: Noel Grandin
AuthorDate: Thu Jul 16 18:58:25 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 18 19:07:53 2020 +0200
lingucomponent/spell: create instances with uno constructors
See tdf#74608 for motivation.
Change-Id: I850e5b243750cbe168136907523d1ada7050c453
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98924
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
index 92807d4b3dfc..f318df2abfec 100644
--- a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
+++ b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
@@ -18,8 +18,9 @@
-->
http://openoffice.org/2010/uno-components";>
-
+xmlns="http://openoffice.org/2010/uno-components";>
+
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 0adc1a1cbf2f..dc9ad055d3bc 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -116,16 +116,8 @@ public:
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-static inline OUString getImplementationName_Static() throw();
-static Sequence< OUString > getSupportedServiceNames_Static() throw();
};
-inline OUString MacSpellChecker::getImplementationName_Static() throw()
-{
-return "org.openoffice.lingu.MacOSXSpellChecker";
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 1d6f84fcce78..c3f64635e071 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -514,16 +514,6 @@ Reference< XSpellAlternatives > SAL_CALL
return xAlt;
}
-/// @throws Exception
-static Reference< XInterface > MacSpellChecker_CreateInstance(
-const Reference< XMultiServiceFactory > & /*rSMgr*/ )
-{
-
-Reference< XInterface > xService = static_cast(new
MacSpellChecker);
-return xService;
-}
-
-
sal_Bool SAL_CALL
MacSpellChecker::addLinguServiceEventListener(
const Reference< XLinguServiceEventListener >& rxLstnr )
@@ -627,7 +617,7 @@ void SAL_CALL
// Service specific part
OUString SAL_CALL MacSpellChecker::getImplementationName()
{
-return getImplementationName_Static();
+return "org.openoffice.lingu.MacOSXSpellChecker";
}
sal_Bool SAL_CALL MacSpellChecker::supportsService( const OUString&
ServiceName )
@@ -637,40 +627,16 @@ sal_Bool SAL_CALL MacSpellChecker::supportsService( const
OUString& ServiceName
Sequence< OUString > SAL_CALL MacSpellChecker::getSupportedServiceNames()
{
-return getSupportedServiceNames_Static();
-}
-
-Sequence< OUString > MacSpellChecker::getSupportedServiceNames_Static()
-throw()
-{
-Sequence< OUString > aSNS { SN_SPELLCHECKER };
-return aSNS;
+return { SN_SPELLCHECKER };
}
-extern "C"
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+lingucomponent_MacSpellChecker_get_implementation(
+css::uno::XComponentContext* , css::uno::Sequence const&)
{
-
-SAL_DLLPUBLIC_EXPORT void * MacOSXSpell_component_getFactory(
-const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
-{
-void * pRet = nullptr;
-if ( MacSpellChecker::getImplementationName_Static().equalsAscii(
pImplName ) )
-{
-Reference< XSingleServiceFactory > xFactory =
-cppu::createOneInstanceFactory(
-static_cast< XMultiServiceFactory * >( pServiceManager ),
-MacSpellChecker::getImplementationName_Static(),
-MacSpellChecker_CreateInstance,
-MacSpellChecker::getSupportedServiceNames_Static());
-// acquire, because we return an interface pointer instead of a
reference
-xFactory->acquire();
-pRet = xFactory.get();
-}
-return pRet;
+static rtl::Reference g_Instance(new MacSpellChecker());
+g_Instance->acquire();
+return static_cast(g_Instance.get());
}
-}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/strings.hrc |1 +
starmath/inc/strings.hxx |1 +
starmath/inc/token.hxx|2 +-
starmath/inc/types.hxx|1 +
starmath/source/ElementsDockingWindow.cxx |1 +
starmath/source/parse.cxx |2 ++
6 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 7473452c22197b7a44a53b61f91c210ef573a1b4
Author: dante
AuthorDate: Wed Jul 15 03:03:12 2020 +0200
Commit: Andras Timar
CommitDate: Sat Jul 18 18:26:51 2020 +0200
Added fourier transform symbol
Change-Id: I6b6f09d7e094b5dafc6aca71f273ab23fce184e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98797
Tested-by: Jenkins
Reviewed-by: Dante DM
Reviewed-by: Andras Timar
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index a892c191220e..64144759f5cc 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -242,6 +242,7 @@
#define RID_PARTIAL_HELPNC_("RID_PARTIAL_HELP", "Partial" )
#define RID_NABLA_HELP NC_("RID_NABLA_HELP", "Nabla" )
#define RID_LAPLACE_HELPNC_("RID_LAPLACE_HELP", "Laplace
transform" )
+#define RID_FOURIER_HELPNC_("RID_FOURIER_HELP", "Fourier
transform" )
#define RID_WP_HELP NC_("RID_WP_HELP", "Weierstrass p"
)
#define RID_DOTSAXIS_HELP NC_("RID_DOTSAXIS_HELP", "Dots In
Middle" )
#define RID_DOTSUP_HELP NC_("RID_DOTSUP_HELP", "Dots To
Top" )
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index d8fe00f803a6..fb00ac2f4782 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -236,6 +236,7 @@
#define RID_NABLA "nabla "
#define RID_WP "wp "
#define RID_LAPLACE "laplace "
+#define RID_FOURIER "fourier "
#define RID_DOTSAXIS"dotsaxis "
#define RID_DOTSUP "dotsup "
#define RID_DOTSDOWN"dotsdown "
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index cdc91ddf4838..1403e96987a2 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -102,7 +102,7 @@ enum SmTokenType
TPRECEDESEQUIV, TSUCCEEDSEQUIV, TNOTPRECEDES, TNOTSUCCEEDS, TSILVER,
TGRAY, TMAROON,TPURPLE,TLIME, TOLIVE,
TNAVY, TTEAL, TAQUA, TFUCHSIA, TINTD,
-TRGB, TLAPLACE
+TRGB, TLAPLACE, TFOURIER
};
struct SmToken
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index 044b2fab05d1..d71c87214a4f 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -79,6 +79,7 @@ sal_Unicode const MS_EQUIV = 0x2261;
sal_Unicode const MS_PROP = 0x221D;
sal_Unicode const MS_PARTIAL = 0x2202;
sal_Unicode const MS_LAPLACE = 0x2112;
+sal_Unicode const MS_FOURIER = 0x2131;
sal_Unicode const MS_SUBSET = 0x2282;
sal_Unicode const MS_SUPSET = 0x2283;
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index ca62820488a1..30bd64cb99e7 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -231,6 +231,7 @@ const SmElementDescr SmElementsControl::m_aOthersList[] =
{RID_EXISTS, RID_EXISTS_HELP}, {RID_NOTEXISTS, RID_NOTEXISTS_HELP},
{RID_FORALL, RID_FORALL_HELP},
{RID_HBAR, RID_HBAR_HELP}, {RID_LAMBDABAR, RID_LAMBDABAR_HELP}, {RID_RE,
RID_RE_HELP},
{RID_IM, RID_IM_HELP}, {RID_WP, RID_WP_HELP}, {RID_LAPLACE,
RID_LAPLACE_HELP},
+{RID_FOURIER, RID_FOURIER_HELP},
{nullptr, nullptr},
{RID_LEFTARROW, RID_LEFTARROW_HELP}, {RID_RIGHTARROW,
RID_RIGHTARROW_HELP}, {RID_UPARROW, RID_UPARROW_HELP},
{RID_DOWNARROW, RID_DOWNARROW_HELP},
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index fd9bdfec262e..a51d65fbbc94 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -133,6 +133,7 @@ const SmTokenTableEntry aTokenTable[] =
{ "fixed", TFIXED, '\0', TG::Font, 0},
{ "font", TFONT, '\0', TG::FontAttr, 5},
{ "forall", TFORALL, MS_FORALL, TG::Standalone, 5},
+{ "fourier", TFOURIER, MS_FOURIER, TG::Standalone, 5},
{ "from", TFROM, '\0', TG::Limit, 0},
{ "fuchsia", TFUCHSIA, '\0', TG::Color, 0},
{ "func", TFUNC, '\0', TG::Function, 5},
@@ -1483,6 +1484,7 @@ std::unique_ptr SmParser::DoTerm(bool
bGroupNumberIdent)
case TPARTIAL :
case TNABLA :
case TLAPLACE :
+case TFOURIER :
case TTOWARD :
case TDOTSAXIS :
case TDOTSDIAG :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Session.hpp kit/ChildSession.hpp kit/ForKit.cpp kit/Kit.cpp
common/Session.hpp |9 +-
kit/ChildSession.hpp |7
kit/ForKit.cpp |2 -
kit/Kit.cpp | 75 ++-
4 files changed, 89 insertions(+), 4 deletions(-)
New commits:
commit ca5d5943e45b2a23a634d6825a220026b4fb5495
Author: Michael Meeks
AuthorDate: Tue Jul 14 15:20:05 2020 +0100
Commit: Michael Meeks
CommitDate: Sat Jul 18 18:21:14 2020 +0200
Kit: add initial state dumping on USR1.
Change-Id: I8225f686e8678c08e505490df056904fc813d2fe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98927
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/common/Session.hpp b/common/Session.hpp
index 02a11fa23..64e5e1502 100644
--- a/common/Session.hpp
+++ b/common/Session.hpp
@@ -53,12 +53,19 @@ public:
}
std::shared_ptr findByCanonicalId(int id)
{
-for (auto &it : *this) {
+for (const auto &it : *this) {
if (it.second->getCanonicalViewId() == id)
return it.second;
}
return std::shared_ptr();
}
+void dumpState(std::ostream& oss)
+{
+for (const auto &it : *this) {
+oss << "\tsession '" << it.first << "'\n";
+it.second->dumpState(oss);
+}
+}
};
/// Base class of a WebSocket session.
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index 48edf98b2..3b6226d8f 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -315,6 +315,13 @@ private:
return ret;
}
+public:
+void dumpState(std::ostream& oss) override
+{
+Session::dumpState(oss);
+// TODO: the rest ...
+}
+
private:
const std::string _jailId;
DocumentManagerInterface* _docManager;
diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 9daa93576..9afa62b4e 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -69,7 +69,6 @@ std::string MasterLocation;
extern "C" { void dump_forkit_state(void); /* easy for gdb */ }
-#if !MOBILEAPP
void dump_forkit_state()
{
std::ostringstream oss;
@@ -92,7 +91,6 @@ void dump_forkit_state()
fprintf(stderr, "%s", msg.c_str());
LOG_TRC(msg);
}
-#endif
class ServerWSHandler;
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 37016d420..7c8f426d0 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -105,6 +105,8 @@ using Poco::Path;
using namespace LOOLProtocol;
using std::size_t;
+extern "C" { void dump_kit_state(void); /* easy for gdb */ }
+
// We only host a single document in our lifetime.
class Document;
#ifndef BUILDING_TESTS
@@ -1549,6 +1551,43 @@ private:
sendTextFrame(msg);
}
+public:
+void dumpState(std::ostream& oss)
+{
+oss << "Kit Document:\n"
+<< "\n\tstop: " << _stop
+<< "\n\tisLoading: " << _stop
+<< "\n\tjailId: " << _jailId
+<< "\n\tdocKey: " << _docKey
+<< "\n\tdocId: " << _docId
+<< "\n\turl: " << _url
+<< "\n\tobfuscatedFileId: " << _obfuscatedFileId
+<< "\n\tjailedUrl: " << _jailedUrl
+<< "\n\trenderOpts: " << _renderOpts
+<< "\n\thaveDocPassword: " << _haveDocPassword // not the pwd
itself
+<< "\n\tisDocPasswordProtected: " << _isDocPasswordProtected
+<< "\n\tdocPasswordType: " << (int)_docPasswordType
+<< "\n\teditorId: " << _editorId
+<< "\n\teditorChangeWarning: " << _editorChangeWarning
+<< "\n";
+
+// dumpState:
+// TODO: _websocketHandler - but this is an odd one.
+// TODO: std::shared_ptr _tileQueue;
+// TODO: PngCache _pngCache;
+// TODO: std::map>
_viewIdToCallbackDescr;
+// ThreadPool _pngPool;
+
+_sessions.dumpState(oss);
+
+// TODO: std::map
_lastUpdatedAt;
+// TODO: std::map _speedCount;
+
+/// For showing disconnected user info in the doc repair dialog.
+// TODO: std::map _sessionUserInfo;
+// TODO: std::chrono::steady_clock::time_point _lastMemStatsTime;
+}
+
private:
std::shared_ptr _loKit;
const std::string _jailId;
@@ -1619,24 +1658,45 @@ class KitSocketPoll final : public SocketPoll
std::chrono::steady_clock::time_point _pollEnd;
std::shared_ptr _document;
+static KitSocketPoll *mainPoll;
+
KitSocketPoll() :
SocketPoll("kit")
{
#ifdef IOS
terminationFlag = false;
#endif
+mainPoll = this;
}
public:
~KitSocketPoll()
{
// Just to make it easier to set a breakpoint
+mainPoll = nullptr;
+}
+
+static void dumpGlobalState(std::ostream &oss)
+{
+if (mainPoll)
+{
+if (!mainPoll->_document)
+oss << "KitSocketPoll: no doc\n";
+else
+{
+mainPoll->_document->dumpState(oss);
+mainPoll->dumpState(oss);
+
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/drawingml/fillproperties.cxx |6
oox/source/export/drawingml.cxx | 106 +-
sd/qa/unit/data/odp/tdf128345_FullTransparentGradient.odp |binary
sd/qa/unit/data/odp/tdf128345_GradientAxial.odp |binary
sd/qa/unit/data/odp/tdf128345_GradientLinear.odp |binary
sd/qa/unit/data/odp/tdf128345_GradientRadial.odp |binary
sd/qa/unit/export-tests-ooxml1.cxx| 80 ++
7 files changed, 155 insertions(+), 37 deletions(-)
New commits:
commit d187f22b7ff73954e1da39fb954c64bc315298cb
Author: Regina Henschel
AuthorDate: Tue Jul 14 22:52:56 2020 +0200
Commit: Regina Henschel
CommitDate: Sat Jul 18 16:29:37 2020 +0200
tdf#128345 pptx export: add transparence gradient in solid fill
In case of solid color fill a transparence gradient was not saved.
OOXML has no separate element for gradient transparency but has
transparency in color gradient stop elements. The patch detects
a transparence gradient, combines it with the fill color and exports
it as gradFill element.
The import was already correct, besides a wrong start or end value
in case of a symmetric gradient, which becomes AXIAL in LibreOffice.
Change-Id: I4243656821629f90125d0408a38165a8a29e6e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98792
Tested-by: Jenkins
Reviewed-by: Regina Henschel
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 963c4009becf..f203e9e2823e 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -537,10 +537,8 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
aGradient.StartColor = sal_Int32(aStartColor.getColor(
rGraphicHelper, nPhClr ));
aGradient.EndColor = sal_Int32(aEndColor.getColor(
rGraphicHelper, nPhClr ));
-if( aStartColor.hasTransparency() )
-nStartTrans = aStartColor.getTransparency()*255/100;
-if( aEndColor.hasTransparency() )
-nEndTrans = aEndColor.getTransparency()*255/100;
+nStartTrans = aStartColor.hasTransparency() ?
aStartColor.getTransparency()*255/100 : 0;
+nEndTrans = aEndColor.hasTransparency() ?
aEndColor.getTransparency()*255/100 : 0;
aGradient.Border = rtl::math::round(100*nBorder);
}
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 847bee54ab97..517d9801bba6 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -398,8 +398,38 @@ void DrawingML::WriteSolidFill( const Reference<
XPropertySet >& rXPropSet )
nAlpha = (MAX_PERCENT - ( PER_PERCENT * nTransparency ) );
}
+// OOXML has no separate transparence gradient but uses transparency in
the gradient stops.
+// So we merge transparency and color and use gradient fill in such case.
+awt::Gradient aTransparenceGradient;
+bool bNeedGradientFill(false);
+if (GetProperty(rXPropSet, "FillTransparenceGradient"))
+{
+mAny >>= aTransparenceGradient;
+if (aTransparenceGradient.StartColor != aTransparenceGradient.EndColor)
+bNeedGradientFill = true;
+else if (aTransparenceGradient.StartColor != 0)
+nAlpha = GetAlphaFromTransparenceGradient(aTransparenceGradient,
true);
+}
+
// write XML
-if ( nFillColor != nOriginalColor )
+if (bNeedGradientFill)
+{
+awt::Gradient aPseudoColorGradient;
+aPseudoColorGradient.XOffset = aTransparenceGradient.XOffset;
+aPseudoColorGradient.YOffset = aTransparenceGradient.YOffset;
+aPseudoColorGradient.StartIntensity = 100;
+aPseudoColorGradient.EndIntensity = 100;
+aPseudoColorGradient.Angle = aTransparenceGradient.Angle;
+aPseudoColorGradient.Border = aTransparenceGradient.Border;
+aPseudoColorGradient.Style = aTransparenceGradient.Style;
+aPseudoColorGradient.StartColor = nFillColor;
+aPseudoColorGradient.EndColor = nFillColor;
+aPseudoColorGradient.StepCount = aTransparenceGradient.StepCount;
+mpFS->startElementNS(XML_a, XML_gradFill, XML_rotWithShape, "0");
+WriteGradientFill(aPseudoColorGradient, aTransparenceGradient);
+mpFS->endElementNS( XML_a, XML_gradFill );
+}
+else if ( nFillColor != nOriginalColor )
{
// the user has set a different color for the shape
WriteSolidFill( ::Color(nFillColor & 0xff), nAlpha );
@@ -579,25 +609,25 @@ void DrawingML::WriteGrabBagGradientFill( const Sequence<
PropertyValue >& aGrad
void DrawingML::WriteGradientFill(awt::Gradient rGradient, awt::Gradient
rTransparenceGradient,
const uno::Reference&
rXPropSet)
{
+sal
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa sw/source
sw/qa/core/unocore/unocore.cxx | 22 ++
sw/source/core/unocore/unodraw.cxx |9 -
sw/source/core/unocore/unoframe.cxx |9 -
3 files changed, 38 insertions(+), 2 deletions(-)
New commits:
commit f95b21dba6af08c0e1c5c37488024e00cb9bf2f2
Author: Michael Stahl
AuthorDate: Wed Jul 15 16:44:37 2020 +0200
Commit: Thorsten Behrens
CommitDate: Sat Jul 18 14:30:42 2020 +0200
sw: fix crash when using anchor of at-paragraph fly ...
... to insert fieldmark; the problem is that the anchor doesn't have
SwIndex so the resulting sw::mark::Fieldmark's positions won't have
SwIndex either, so they aren't updated when its dummy chars are inserted
in lcl_SetFieldMarks().
Change-Id: Id6281f45aa1f1337f1ae599877f155b129389d81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98852
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit ca2dfac3e790fb384e904502fe1ededd695001af)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98981
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx
index d8d72ecf369f..a4a39489da60 100644
--- a/sw/qa/core/unocore/unocore.cxx
+++ b/sw/qa/core/unocore/unocore.cxx
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -86,6 +87,27 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testTdf119081)
CPPUNIT_ASSERT_EQUAL(OUString("x"),
pWrtShell->GetCurrentShellCursor().GetText());
}
+CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, flyAtParaAnchor)
+{
+mxComponent = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+uno::Reference const xMSF(mxComponent,
uno::UNO_QUERY_THROW);
+uno::Reference const xTD(mxComponent,
uno::UNO_QUERY_THROW);
+uno::Reference const xTextFrame(
+xMSF->createInstance("com.sun.star.text.TextFrame"),
uno::UNO_QUERY_THROW);
+uno::Reference const xFrameProps(xTextFrame,
uno::UNO_QUERY_THROW);
+xFrameProps->setPropertyValue("AnchorType",
+
uno::makeAny(text::TextContentAnchorType_AT_PARAGRAPH));
+auto const xText = xTD->getText();
+auto const xTextCursor = xText->createTextCursor();
+CPPUNIT_ASSERT(xTextCursor.is());
+xText->insertTextContent(xTextCursor, xTextFrame, false);
+auto const xAnchor = xTextFrame->getAnchor();
+uno::Reference const xFieldmark(
+xMSF->createInstance("com.sun.star.text.Fieldmark"),
uno::UNO_QUERY_THROW);
+// this crashed because the anchor didn't have SwIndex
+xText->insertTextContent(xAnchor, xFieldmark, false);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 698b05b5ac96..a94255c55408 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2069,7 +2069,14 @@ uno::Reference< text::XTextRange > SwXShape::getAnchor()
(rAnchor.GetContentAnchor() && !rAnchor.GetPageNum()))
{
const SwPosition &rPos =
*(pFormat->GetAnchor().GetContentAnchor());
-aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(), rPos,
nullptr);
+if (rAnchor.GetAnchorId() == RndStdIds::FLY_AT_PARA)
+{ // ensure that SwXTextRange has SwIndex
+aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(),
SwPosition(rPos.nNode), nullptr);
+}
+else
+{
+aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(),
rPos, nullptr);
+}
}
}
else
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 69171335a842..e2e5c9411715 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2646,7 +2646,14 @@ uno::Reference< text::XTextRange > SwXFrame::getAnchor()
(rAnchor.GetContentAnchor() && !rAnchor.GetPageNum()))
{
const SwPosition &rPos = *(rAnchor.GetContentAnchor());
-aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(), rPos,
nullptr);
+if (rAnchor.GetAnchorId() == RndStdIds::FLY_AT_PARA)
+{ // ensure that SwXTextRange has SwIndex
+aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(),
SwPosition(rPos.nNode), nullptr);
+}
+else
+{
+aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(), rPos,
nullptr);
+}
}
return aRef;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - 2 commits - sw/qa sw/source
sw/qa/core/unocore/unocore.cxx | 22
sw/qa/extras/layout/data/footer-fly-table.fodt | 1158 +
sw/qa/extras/layout/layout.cxx | 23
sw/source/core/layout/tabfrm.cxx | 18
sw/source/core/unocore/unodraw.cxx |9
sw/source/core/unocore/unoframe.cxx|9
6 files changed, 1237 insertions(+), 2 deletions(-)
New commits:
commit 06f57231af98ec7093de705d5a310c86c7783d99
Author: Michael Stahl
AuthorDate: Wed Jul 15 16:44:37 2020 +0200
Commit: Thorsten Behrens
CommitDate: Sat Jul 18 14:30:31 2020 +0200
sw: fix crash when using anchor of at-paragraph fly ...
... to insert fieldmark; the problem is that the anchor doesn't have
SwIndex so the resulting sw::mark::Fieldmark's positions won't have
SwIndex either, so they aren't updated when its dummy chars are inserted
in lcl_SetFieldMarks().
Change-Id: Id6281f45aa1f1337f1ae599877f155b129389d81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98852
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit ca2dfac3e790fb384e904502fe1ededd695001af)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98962
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx
index d8d72ecf369f..a4a39489da60 100644
--- a/sw/qa/core/unocore/unocore.cxx
+++ b/sw/qa/core/unocore/unocore.cxx
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -86,6 +87,27 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testTdf119081)
CPPUNIT_ASSERT_EQUAL(OUString("x"),
pWrtShell->GetCurrentShellCursor().GetText());
}
+CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, flyAtParaAnchor)
+{
+mxComponent = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+uno::Reference const xMSF(mxComponent,
uno::UNO_QUERY_THROW);
+uno::Reference const xTD(mxComponent,
uno::UNO_QUERY_THROW);
+uno::Reference const xTextFrame(
+xMSF->createInstance("com.sun.star.text.TextFrame"),
uno::UNO_QUERY_THROW);
+uno::Reference const xFrameProps(xTextFrame,
uno::UNO_QUERY_THROW);
+xFrameProps->setPropertyValue("AnchorType",
+
uno::makeAny(text::TextContentAnchorType_AT_PARAGRAPH));
+auto const xText = xTD->getText();
+auto const xTextCursor = xText->createTextCursor();
+CPPUNIT_ASSERT(xTextCursor.is());
+xText->insertTextContent(xTextCursor, xTextFrame, false);
+auto const xAnchor = xTextFrame->getAnchor();
+uno::Reference const xFieldmark(
+xMSF->createInstance("com.sun.star.text.Fieldmark"),
uno::UNO_QUERY_THROW);
+// this crashed because the anchor didn't have SwIndex
+xText->insertTextContent(xAnchor, xFieldmark, false);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 5e3ec6b23d37..d21756c65720 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2068,7 +2068,14 @@ uno::Reference< text::XTextRange > SwXShape::getAnchor()
(rAnchor.GetContentAnchor() && !rAnchor.GetPageNum()))
{
const SwPosition &rPos =
*(pFormat->GetAnchor().GetContentAnchor());
-aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(), rPos,
nullptr);
+if (rAnchor.GetAnchorId() == RndStdIds::FLY_AT_PARA)
+{ // ensure that SwXTextRange has SwIndex
+aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(),
SwPosition(rPos.nNode), nullptr);
+}
+else
+{
+aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(),
rPos, nullptr);
+}
}
}
else
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index d453f1c79709..f827226d0be4 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2641,7 +2641,14 @@ uno::Reference< text::XTextRange > SwXFrame::getAnchor()
(rAnchor.GetContentAnchor() && !rAnchor.GetPageNum()))
{
const SwPosition &rPos = *(rAnchor.GetContentAnchor());
-aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(), rPos,
nullptr);
+if (rAnchor.GetAnchorId() == RndStdIds::FLY_AT_PARA)
+{ // ensure that SwXTextRange has SwIndex
+aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(),
SwPosition(rPos.nNode), nullptr);
+}
+else
+{
+aRef = SwXTextRange::CreateXTextRange(*pFormat->GetDoc(), rPos,
nullptr);
+}
}
return aRef;
commit 0b2f21056ccd8a3698593fdf6e2e31fd3743590f
Author: Michael Stahl
AuthorDate: Thu Jul 16 19:25:05 2020 +0200
Commit: Thorsten Behrens
CommitDate: Sat Jul 18 14:30:19 2020 +0200
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - include/vcl vcl/opengl vcl/qa vcl/quartz vcl/source
include/vcl/bitmap.hxx |3
include/vcl/salbtype.hxx |6
vcl/opengl/salbmp.cxx| 12 -
vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx | 167 +++
vcl/qa/cppunit/bitmaprender/data/tdf116888.gif |binary
vcl/qa/cppunit/jpeg/JpegWriterTest.cxx | 105 ++
vcl/quartz/salbmp.cxx|2
vcl/source/bitmap/bitmap.cxx | 34
vcl/source/filter/jpeg/JpegWriter.cxx|2
vcl/source/gdi/alpha.cxx |2
vcl/source/gdi/bitmap3.cxx |4
vcl/source/gdi/dibtools.cxx |4
vcl/source/gdi/pdfwriter_impl.cxx|2
13 files changed, 326 insertions(+), 17 deletions(-)
New commits:
commit b2e8d6e4cd263df09466549da7ffe91c9e3e1e96
Author: Luboš Luňák
AuthorDate: Sat Jun 27 14:48:36 2020 +0200
Commit: Thorsten Behrens
CommitDate: Sat Jul 18 14:27:52 2020 +0200
differentiate between 8bit and any-bit grey palette (tdf#121120)
Only the grey palette with 256 colors means that pixel values map
directly to color values. Tdf#121120 has an image with 2-bit
palette where color index 1 is (255,255,255), but that means
the pixel value 1 cannot be just treated as color.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97283
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit 29dc1029be6d8d02f4b639b32274a286afd0b1b3)
Change-Id: Ifbd953af7f291e4fb8032ea0f4c33c0514770856
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98933
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index b304baa5af01..8cb830d56ae4 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -150,7 +150,8 @@ public:
sal_uInt16 GetBitCount() const;
inline sal_uLongGetColorCount() const;
inline sal_uLongGetSizeBytes() const;
-boolHasGreyPalette() const;
+boolHasGreyPalette8Bit() const;
+boolHasGreyPaletteAny() const;
/** get system dependent bitmap data
@param rData
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index b965fa333c08..f825023a3db3 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -246,6 +246,12 @@ public:
}
bool IsGreyPalette() const;
+
+/// Returns true if the palette is 8-bit grey palette.
+bool IsGreyPalette8Bit() const;
+/// Returns true if the palette is a grey palette (may not be 8-bit).
+bool IsGreyPaletteAny() const;
+
};
struct VCL_DLLPUBLIC ColorMaskElement
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 6e497ff71d74..46843a98e8e2 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -496,9 +496,9 @@ GLuint OpenGLSalBitmap::CreateTexture()
determineTextureFormat(mnBits, nFormat, nType);
}
-else if( mnBits == 8 && maPalette.IsGreyPalette() )
+else if( mnBits == 8 && maPalette.IsGreyPalette8Bit() )
{
-// no conversion needed for grayscale
+// no conversion needed for 8bit grayscale
pData = mpUserBuffer.get();
nFormat = GL_LUMINANCE;
nType = GL_UNSIGNED_BYTE;
@@ -582,7 +582,8 @@ bool OpenGLSalBitmap::ReadTexture()
xContext->state().scissor().disable();
xContext->state().stencil().disable();
-if ((mnBits == 8 && maPalette.IsGreyPalette()) || mnBits == 16 || mnBits
== 24 || mnBits == 32)
+
+if ((mnBits == 8 && maPalette.IsGreyPalette8Bit()) || mnBits == 24 ||
mnBits == 32)
{
determineTextureFormat(mnBits, nFormat, nType);
@@ -929,8 +930,9 @@ bool OpenGLSalBitmap::ConvertToGreyscale()
VCL_GL_INFO("::ConvertToGreyscale");
// avoid re-converting to 8bits.
-if ( mnBits == 8 && maPalette == Bitmap::GetGreyPalette(256) )
-return false;
+
+if ( mnBits == 8 && maPalette.IsGreyPalette8Bit())
+return true;
OpenGLZone aZone;
rtl::Reference xContext = OpenGLContext::getVCLContext();
diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
index c2455e1e4e16..b2e039280354 100644
--- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@@ -38,10 +38,16 @@ public:
void testTdf104141();
void testTdf113918();
+//void testDrawAlphaBitmapEx();
+//void testAlphaVirtualDevice();
+void testTdf116888();
CPPUNIT_TEST_SUITE(BitmapRenderTest);
CPPUNIT_TEST(testTdf104141);
CPPUNIT_TEST(testTdf113918);
+//CPPUNIT_TEST(testDrawAlphaBitmapEx);
+//CPPUNIT_TEST(testAlphaVirtualDevice);
+CPPUNIT_TEST(testTdf116888);
CPPUNIT_TE
[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - drawinglayer/source
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) New commits: commit 6379f47fca8e07ac1096225a8486eb4962aee6ff Author: Tomaž Vajngerl AuthorDate: Fri Jul 17 15:09:49 2020 +0200 Commit: Tomaž Vajngerl CommitDate: Fri Jul 17 15:09:49 2020 +0200 Revert "hack for gradients split into adjacent polygons (tdf#133016)" This reverts commit 777ac5456a1f24fea29931ede983b5b8ad9a063d. diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index e6906a638084..d3e32e22ea46 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -30,7 +30,7 @@ #include #include #include -#include + using namespace com::sun::star; @@ -868,12 +868,6 @@ namespace drawinglayer::primitive2d // use color distance and discrete lengths to calculate step count const sal_uInt32 nSteps(calculateStepsForSvgGradient(getColorA(), getColorB(), fDelta, fDiscreteUnit)); -// HACK: Splitting a gradient into adjacent polygons with gradually changing color is silly. -// If antialiasing is used to draw them, the AA-ed adjacent edges won't line up perfectly -// because of the AA (see SkiaSalGraphicsImpl::mergePolyPolygonToPrevious()). -// Make the polygons a bit wider, so they the partial overlap "fixes" this. -const double fixup = SkiaHelper::isVCLSkiaEnabled() ? fDiscreteUnit / 2 : 0; - // tdf#117949 Use a small amount of discrete overlap at the edges. Usually this // should be exactly 0.0 and 1.0, but there were cases when this gets clipped // against the mask polygon which got numerically problematic. @@ -887,7 +881,7 @@ namespace drawinglayer::primitive2d basegfx::B2DRange( getOffsetA() - fDiscreteUnit, -0.0001, // -> should be 0.0, see comment above -getOffsetA() + (fDelta / nSteps) + fDiscreteUnit + fixup, +getOffsetA() + (fDelta / nSteps) + fDiscreteUnit, 1.0001))); // -> should be 1.0, see comment above // prepare loop (inside to outside, [0.0 .. 1.0[) ___ 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.
2 new defect(s) introduced to LibreOffice found with Coverity Scan.
1 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 2 of 2 defect(s)
** CID 1465260: Error handling issues (CHECKED_RETURN)
/svx/source/sidebar/inspector/InspectorTextPanel.cxx: 79 in
svx::sidebar::InspectorTextPanel::updateEntries(const
std::vector> &)()
*** CID 1465260: Error handling issues (CHECKED_RETURN)
/svx/source/sidebar/inspector/InspectorTextPanel.cxx: 79 in
svx::sidebar::InspectorTextPanel::updateEntries(const
std::vector> &)()
73 pTreeDiagram->all_foreach([pTreeDiagram](weld::TreeIter& rEntry) {
74 pTreeDiagram->expand_row(rEntry);
75 return false;
76 });
77
78 std::unique_ptr pEntry =
mpListBoxStyles->make_iterator();
>>> CID 1465260: Error handling issues (CHECKED_RETURN)
>>> Calling "get_iter_first" without checking return value (as is done
>>> elsewhere 85 out of 91 times).
79 mpListBoxStyles->get_iter_first(*pEntry);
80 mpListBoxStyles->iter_next(*pEntry);
81 mpListBoxStyles->collapse_row(*pEntry); // Collapse "Default
Paragraph Style"
82 }
83
84 InspectorTextPanel::~InspectorTextPanel() { disposeOnce(); }
** CID 1465257: Error handling issues (CHECKED_RETURN)
/svx/source/sidebar/inspector/InspectorTextPanel.cxx: 80 in
svx::sidebar::InspectorTextPanel::updateEntries(const
std::vector> &)()
*** CID 1465257: Error handling issues (CHECKED_RETURN)
/svx/source/sidebar/inspector/InspectorTextPanel.cxx: 80 in
svx::sidebar::InspectorTextPanel::updateEntries(const
std::vector> &)()
74 pTreeDiagram->expand_row(rEntry);
75 return false;
76 });
77
78 std::unique_ptr pEntry =
mpListBoxStyles->make_iterator();
79 mpListBoxStyles->get_iter_first(*pEntry);
>>> CID 1465257: Error handling issues (CHECKED_RETURN)
>>> Calling "iter_next" without checking return value (as is done elsewhere
>>> 77 out of 79 times).
80 mpListBoxStyles->iter_next(*pEntry);
81 mpListBoxStyles->collapse_row(*pEntry); // Collapse "Default
Paragraph Style"
82 }
83
84 InspectorTextPanel::~InspectorTextPanel() { disposeOnce(); }
85
To view the defects in Coverity Scan visit,
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3DlOVo_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJiIBpAznbzgneZpXuB0BFjgy83ui9RVkXwiRH3ReS-2FWsVFaWnBvaz26AuSsPfKEvXESqFbxX53gscsDRO-2BxlcmiDMQK11wIclgOljIGPOY0lyZ-2F1BIevZzljNgKr9gHwrz9Xt2LITiTO6Y6zj1gH1WeFCzsKT-2FWxpj26p86kRyLObEkv0xINNiZ0b-2F7pA3icqy
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/table/swtable.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9712e25425e22b59afce82f26a14a48ebb37cd38
Author: Justin Luth
AuthorDate: Sat Jul 18 11:45:52 2020 +0300
Commit: Justin Luth
CommitDate: Sat Jul 18 13:00:01 2020 +0200
tdf#120026 sw: keep table centered when resizing
The table was throwing away the centered value,
and setting orientation LEFT_AND_WIDTH during a resize.
No UI testing examples found of setting table properties,
and test_resize_table_with_keyboard_tdf53460
hardly seemed like it was testing resizing AFAICS.
Change-Id: I23340d7908cdf17ae3ff9dac60079f59c609f567
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98991
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index d995524615c6..69dbe1f9bfe1 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -868,7 +868,8 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const
SwTabCols &rOld,
// This is done by preserving the exact positions that have been
// set by the user.
SwFormatHoriOrient aOri( pFormat->GetHoriOrient() );
-if(text::HoriOrientation::NONE != aOri.GetHoriOrient())
+if( text::HoriOrientation::NONE != aOri.GetHoriOrient() &&
+text::HoriOrientation::CENTER != aOri.GetHoriOrient() )
{
const bool bLeftDist = rNew.GetLeft() != nShLeft;
const bool bRightDist = rNew.GetRight() + nShRight !=
rNew.GetRightMax();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/strings.hrc |7 ++-
starmath/inc/strings.hxx |5 +
starmath/source/ElementsDockingWindow.cxx | 19 ---
3 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit 785f742b64a433d59f7bf80e2bd649659ae10f54
Author: dante
AuthorDate: Wed Jul 15 03:01:21 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 18 12:42:29 2020 +0200
Added to the left pane some interesting hidden features (func, oper)
Added: func funcname (generic function)
Added: oper opername (generig operator)
The change is motivated by tdf#81267.
Change-Id: I99cc8ce652b7b5e5e030b65f5617b285c26caecf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98796
Reviewed-by: Dante DM
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index b4a22c58e546..a892c191220e 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -78,6 +78,7 @@
#define RID_XNSUBSETEQY_HELPNC_("RID_XNSUBSETEQY_HELP", "Not
Subset Or Equal" )
#define RID_XNSUPSETY_HELP NC_("RID_XNSUPSETY_HELP", "Not
Superset" )
#define RID_XNSUPSETEQY_HELPNC_("RID_XNSUPSETEQY_HELP", "Not
Superset Or Equal" )
+#define RID_FUNCX_HELP NC_("RID_FUNCX_HELP", "General
function" )
#define RID_ABSX_HELP NC_("RID_ABSX_HELP", "Absolute
Value" )
#define RID_FACTX_HELP NC_("RID_FACTX_HELP", "Factorial" )
#define RID_SQRTX_HELP NC_("RID_SQRTX_HELP", "Square
Root" )
@@ -102,6 +103,10 @@
#define RID_ARCOSHX_HELPNC_("RID_ARCOSHX_HELP", "Area
Hyperbolic Cosine" )
#define RID_ARTANHX_HELPNC_("RID_ARTANHX_HELP", "Area
Hyperbolic Tangent" )
#define RID_ARCOTHX_HELPNC_("RID_ARCOTHX_HELP", "Area
Hyperbolic Cotangent" )
+#define RID_OPERX_HELP NC_("RID_OPERX_HELP", "General
operator" )
+#define RID_OPER_FROMX_HELP NC_("RID_OPER_FROMX_HELP",
"General operator Subscript Bottom" )
+#define RID_OPER_TOX_HELP NC_("RID_OPER_TOX_HELP", "General
operator Superscript Top" )
+#define RID_OPER_FROMTOX_HELP NC_("RID_OPER_FROMTOX_HELP",
"General operator Sup/Sub script" )
#define RID_SUMX_HELP NC_("RID_SUMX_HELP", "Sum" )
#define RID_SUM_FROMX_HELP NC_("RID_SUM_FROMX_HELP", "Sum
Subscript Bottom" )
#define RID_SUM_TOX_HELPNC_("RID_SUM_TOX_HELP", "Sum
Superscript Top" )
@@ -236,7 +241,7 @@
#define RID_INFINITY_HELP NC_("RID_INFINITY_HELP",
"Infinity" )
#define RID_PARTIAL_HELPNC_("RID_PARTIAL_HELP", "Partial" )
#define RID_NABLA_HELP NC_("RID_NABLA_HELP", "Nabla" )
-#define RID_LAPLACE_HELPNC_("RID_LAPLACE_HELP", "Laplace" )
+#define RID_LAPLACE_HELPNC_("RID_LAPLACE_HELP", "Laplace
transform" )
#define RID_WP_HELP NC_("RID_WP_HELP", "Weierstrass p"
)
#define RID_DOTSAXIS_HELP NC_("RID_DOTSAXIS_HELP", "Dots In
Middle" )
#define RID_DOTSUP_HELP NC_("RID_DOTSUP_HELP", "Dots To
Top" )
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index bedd9534716d..d8fe00f803a6 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -68,6 +68,7 @@
#define RID_XNSUBSETEQY " nsubseteq "
#define RID_XNSUPSETY " nsupset "
#define RID_XNSUPSETEQY " nsupseteq "
+#define RID_FUNCX "func func() "
#define RID_ABSX"abs{} "
#define RID_FACTX "fact{} "
#define RID_SQRTX "sqrt{} "
@@ -92,6 +93,10 @@
#define RID_ARCOSHX "arcosh() "
#define RID_ARTANHX "artanh() "
#define RID_ARCOTHX "arcoth() "
+#define RID_OPERX "oper oper "
+#define RID_OPER_FROMX "oper oper from{} "
+#define RID_OPER_TOX"oper oper to{} "
+#define RID_OPER_FROMTOX"oper oper from{} to{} "
#define RID_SUMX"sum "
#define RID_SUM_FROMX "sum from{} "
#define RID_SUM_TOX "sum to{} "
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index c21933fe1be2..ca62820488a1 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -69,7 +69,7 @@ const SmElementDescr
SmElementsControl::m_aUnaryBinaryOperatorsList[] =
{RID_XODIVIDEY, RID_XODIVIDEY_HELP}, {RID_XCIRCY, RID_XCIRCY_HELP},
{RID_XWIDESLASHY, RID_XWIDESLASHY_HELP}, {RID_XWIDEBSLASHY,
RID_XWIDEBSLASHY_HELP},
{nullptr, nullptr},
-{RID_NEGX, RID_NEGX_HELP}, {RID_XANDY, RID_XANDY_HELP}, {RID_XORY,
RID_XORY_HELP},
+{RID_NEGX, RID_NEGX_HELP}, {RID_XANDY, RID_XANDY_HELP}, {RID_XORY,
RID_XORY_HELP}
};
co
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8scan.cxx | 316 +++
1 file changed, 158 insertions(+), 158 deletions(-)
New commits:
commit 600263ab7c81c3f706903914d0250e331e5d6d77
Author: Mike Kaganski
AuthorDate: Fri Jul 17 16:33:10 2020 +0300
Commit: Mike Kaganski
CommitDate: Sat Jul 18 09:22:44 2020 +0200
Use NS_sprm::v6 constants in GetWW6SprmSearcher
Change-Id: I93292b820b145dd2f1c007b829e1dc91106f474b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98985
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index b30618d17a8c..d985001f1b85 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -240,175 +240,175 @@ const wwSprmSearcher
*wwSprmParser::GetWW6SprmSearcher(const WW8Fib& rFib)
static const SprmInfoRow aSprms[] =
{
{ 0, { 0, L_FIX} }, // "Default-sprm", is skipped
-{ 2, { 2, L_FIX} }, // "sprmPIstd", pap.istd (style code)
-{ 3, { 3, L_VAR} }, // "sprmPIstdPermute pap.istd permutation
-{ 4, { 1, L_FIX} }, // "sprmPIncLv1" pap.istddifference
-{ 5, { 1, L_FIX} }, // "sprmPJc" pap.jc (justification)
-{ 6, { 1, L_FIX} }, // "sprmPFSideBySide" pap.fSideBySide
-{ 7, { 1, L_FIX} }, // "sprmPFKeep" pap.fKeep
-{ 8, { 1, L_FIX} }, // "sprmPFKeepFollow " pap.fKeepFollow
-{ 9, { 1, L_FIX} }, // "sprmPPageBreakBefore" pap.fPageBreakBefore
-{ 10, { 1, L_FIX} }, // "sprmPBrcl" pap.brcl
-{ 11, { 1, L_FIX} }, // "sprmPBrcp" pap.brcp
-{ 12, { 0, L_VAR} }, // "sprmPAnld" pap.anld (ANLD structure)
-{ 13, { 1, L_FIX} }, // "sprmPNLvlAnm" pap.nLvlAnm nn
-{ 14, { 1, L_FIX} }, // "sprmPFNoLineNumb" pap.fNoLnn
-{ 15, { 0, L_VAR} }, // "?sprmPChgTabsPapx" pap.itbdMac, ...
-{ 16, { 2, L_FIX} }, // "sprmPDxaRight" pap.dxaRight
-{ 17, { 2, L_FIX} }, // "sprmPDxaLeft" pap.dxaLeft
-{ 18, { 2, L_FIX} }, // "sprmPNest" pap.dxaLeft
-{ 19, { 2, L_FIX} }, // "sprmPDxaLeft1" pap.dxaLeft1
-{ 20, { 4, L_FIX} }, // "sprmPDyaLine" pap.lspd an LSPD
-{ 21, { 2, L_FIX} }, // "sprmPDyaBefore" pap.dyaBefore
-{ 22, { 2, L_FIX} }, // "sprmPDyaAfter" pap.dyaAfter
-{ 23, { 0, L_VAR} }, // "?sprmPChgTabs" pap.itbdMac, pap.rgdxaTab, ...
-{ 24, { 1, L_FIX} }, // "sprmPFInTable" pap.fInTable
-{ 25, { 1, L_FIX} }, // "sprmPTtp" pap.fTtp
-{ 26, { 2, L_FIX} }, // "sprmPDxaAbs" pap.dxaAbs
-{ 27, { 2, L_FIX} }, // "sprmPDyaAbs" pap.dyaAbs
-{ 28, { 2, L_FIX} }, // "sprmPDxaWidth" pap.dxaWidth
-{ 29, { 1, L_FIX} }, // "sprmPPc" pap.pcHorz, pap.pcVert
-{ 30, { 2, L_FIX} }, // "sprmPBrcTop10" pap.brcTop BRC10
-{ 31, { 2, L_FIX} }, // "sprmPBrcLeft10" pap.brcLeft BRC10
-{ 32, { 2, L_FIX} }, // "sprmPBrcBottom10" pap.brcBottom BRC10
-{ 33, { 2, L_FIX} }, // "sprmPBrcRight10" pap.brcRight BRC10
-{ 34, { 2, L_FIX} }, // "sprmPBrcBetween10" pap.brcBetween BRC10
-{ 35, { 2, L_FIX} }, // "sprmPBrcBar10" pap.brcBar BRC10
-{ 36, { 2, L_FIX} }, // "sprmPFromText10" pap.dxaFromText dxa
-{ 37, { 1, L_FIX} }, // "sprmPWr" pap.wr wr
-{ 38, { 2, L_FIX} }, // "sprmPBrcTop" pap.brcTop BRC
-{ 39, { 2, L_FIX} }, // "sprmPBrcLeft" pap.brcLeft BRC
-{ 40, { 2, L_FIX} }, // "sprmPBrcBottom" pap.brcBottom BRC
-{ 41, { 2, L_FIX} }, // "sprmPBrcRight" pap.brcRight BRC
-{ 42, { 2, L_FIX} }, // "sprmPBrcBetween" pap.brcBetween BRC
-{ 43, { 2, L_FIX} }, // "sprmPBrcBar" pap.brcBar BRC word
-{ 44, { 1, L_FIX} }, // "sprmPFNoAutoHyph" pap.fNoAutoHyph
-{ 45, { 2, L_FIX} }, // "sprmPWHeightAbs" pap.wHeightAbs w
-{ 46, { 2, L_FIX} }, // "sprmPDcs" pap.dcs DCS
-{ 47, { 2, L_FIX} }, // "sprmPShd" pap.shd SHD
-{ 48, { 2, L_FIX} }, // "sprmPDyaFromText" pap.dyaFromText dya
-{ 49, { 2, L_FIX} }, // "sprmPDxaFromText" pap.dxaFromText dxa
-{ 50, { 1, L_FIX} }, // "sprmPFLocked" pap.fLocked 0 or 1 byte
-{ 51, { 1, L_FIX} }, // "sprmPFWidowControl" pap.fWidowControl 0 or 1
byte
-{ 52, { 0, L_FIX} }, // "?sprmPRuler 52"
+{NS_sprm::v6::sprmPIstd, { 2, L_FIX} }, // pap.istd (style code)
+{NS_sprm::v6::sprmPIstdPermute, { 3, L_VAR} }, // pap.istd permutation
+{NS_sprm::v6::sprmPIncLv1, { 1, L_FIX} }, // pap.istddifference
+{NS_sprm::v6::sprmPJc, { 1, L_FIX} }, // pap.jc (justification)
+{NS_sprm::v6::sprmPFSideBySide, { 1, L_FIX} }, // pap.fSideBySide
+{NS_sprm::v6::sprmPFKeep, { 1, L_FIX} }, // pap.fKeep
+{NS_sprm::v6::sprmPFKeepFollow, { 1, L_FIX} }, // pap.fKeepFollow
+{NS_sprm::v6::sprmPPageBreakBefore, { 1, L_FIX} }, //
pap.fPageBreakBefore
+{NS_sprm::v6::sprmPBrcl, { 1, L_FIX} }, // pap.brcl
+{NS_sprm::v6::sprmPBrcp, { 1,
