[Libreoffice-commits] core.git: chart2/qa codemaker/source comphelper/source compilerplugins/clang connectivity/source cppuhelper/source cppu/source cui/source editeng/source filter/source i18npool/so
chart2/qa/extras/chart2dump/chart2dump.cxx |4 codemaker/source/cppumaker/cppuoptions.cxx | 20 +- codemaker/source/javamaker/javaoptions.cxx | 14 - comphelper/source/misc/storagehelper.cxx|2 compilerplugins/clang/stringadd.cxx | 89 ++-- compilerplugins/clang/test/stringadd.cxx| 44 + connectivity/source/drivers/firebird/Util.cxx |2 cppu/source/uno/EnvStack.cxx|2 cppu/source/uno/lbenv.cxx |2 cppuhelper/source/implbase_ex.cxx |2 cui/source/dialogs/FontFeaturesDialog.cxx |3 cui/source/dialogs/about.cxx|2 editeng/source/items/borderline.cxx |2 editeng/source/items/frmitems.cxx | 20 +- editeng/source/items/itemtype.cxx |4 editeng/source/items/textitem.cxx |2 filter/source/msfilter/rtfutil.cxx |2 i18npool/source/breakiterator/breakiterator_unicode.cxx |2 i18npool/source/localedata/localedata.cxx |2 idlc/inc/astsequence.hxx|2 include/oox/export/utils.hxx|2 include/rtl/stringconcat.hxx| 12 + jvmfwk/source/fwkbase.cxx | 18 +- l10ntools/source/po.cxx |8 - l10ntools/source/pocheck.cxx| 20 +- oox/source/export/drawingml.cxx |8 - opencl/source/openclwrapper.cxx |2 package/qa/cppunit/test_package.cxx |4 sal/osl/unx/file_misc.cxx |2 sal/qa/osl/file/osl_File.cxx|8 - sal/rtl/uri.cxx |2 sc/qa/unit/helper/shared_test_impl.hxx |2 sc/qa/unit/subsequent_export-test.cxx |6 sc/qa/unit/ucalc.cxx|2 sc/qa/unit/ucalc_formula.cxx|6 sc/source/filter/ftools/ftools.cxx |8 - sc/source/filter/html/htmlexp.cxx |2 sc/source/filter/lotus/lotform.cxx |2 sc/source/ui/dbgui/scuiasciiopt.cxx |2 sc/source/ui/miscdlgs/acredlin.cxx |2 sc/source/ui/navipi/content.cxx |6 sc/source/ui/view/tabview5.cxx |2 sd/qa/unit/export-tests.cxx |8 - sd/source/filter/ppt/pptin.cxx |2 sd/source/ui/dlg/copydlg.cxx| 16 +- sfx2/source/control/msg.cxx |2 sfx2/source/statbar/stbitem.cxx |2 sfx2/source/view/lokhelper.cxx |6 shell/source/unix/exec/shellexec.cxx|2 stoc/source/corereflection/criface.cxx |4 svl/qa/unit/svl.cxx |8 - svtools/source/dialogs/addresstemplate.cxx |4 svx/source/svdraw/svdmrkv.cxx |2 sw/qa/extras/globalfilter/globalfilter.cxx | 30 ++-- sw/qa/extras/inc/swmodeltestbase.hxx|4 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |2 sw/qa/extras/uiwriter/uiwriter2.cxx |4 sw/qa/extras/ww8export/ww8export2.cxx |2 sw/source/core/fields/docufld.cxx |2 sw/source/core/fields/reffld.cxx|2 sw/source/filter/html/css1atr.cxx |8 - sw/source/filter/html/htmlatr.cxx |6 sw/source/filter/html/htmlfld.cxx |3 sw/source/filter/html/htmlforw.cxx | 16 +- sw/source/filter/html/htmlnumwriter.cxx |2 sw/source/filter/html/wrthtml.cxx |2 sw/source/filter/ww8/docxattributeoutput.cxx|2 sw/source/filter/ww8/rtfattributeoutput.cxx |2 sw/source/filter/ww8/wrtw8nds.cxx |4 sw/source/filter/ww8/ww8atr.cxx |2 sw/source/filter/ww8/ww8scan.cxx|2 sw/source/ui/index/cnttab.cxx
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/sft.hxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit fa7132032c968feb16ff65be328b5b8ff5e4
Author: Julien Nabet
AuthorDate: Sun Oct 13 20:55:17 2019 +0200
Commit: Noel Grandin
CommitDate: Mon Oct 14 08:17:37 2019 +0200
Fix numbering of font tables in sft.hxx (vcl)
Following kern table removal done with
e3caecb5a33288dd46a80b2ffcc47a2288305052
Change-Id: Ifb42f5dc85e25faf9f1a94db7179b981abb150df
Reviewed-on: https://gerrit.libreoffice.org/80742
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index de97bec26abe..b3f783fdeb77 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -713,12 +713,12 @@ constexpr sal_uInt32 T_CFF = 0x43464620;
#define O_vmtx 9 /* 'vmtx' */
#define O_OS2 10/* 'OS/2' */
#define O_post 11/* 'post' */
-#define O_cvt 13/* 'cvt_' - only used in TT->TT generation */
-#define O_prep 14/* 'prep' - only used in TT->TT generation */
-#define O_fpgm 15/* 'fpgm' - only used in TT->TT generation */
-#define O_gsub 16/* 'GSUB' */
-#define O_CFF 17/* 'CFF' */
-#define NUM_TAGS 18
+#define O_cvt 12/* 'cvt_' - only used in TT->TT generation */
+#define O_prep 13/* 'prep' - only used in TT->TT generation */
+#define O_fpgm 14/* 'fpgm' - only used in TT->TT generation */
+#define O_gsub 15/* 'GSUB' */
+#define O_CFF 16/* 'CFF' */
+#define NUM_TAGS 17
struct TrueTypeFont {
char*fname;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New LibreOffice Impress remote release for Android
Hello everyone, Following the fix of this bug [1], would you mind releasing a new app version on the stores (Play Store and F-Droid)? This fix has been highly requested on Twitter. Now it is available, it would be nice to make everyone benefiting of it. Regards, [1] https://bugs.documentfoundation.org/show_bug.cgi?id=118485 -- William Gathoye ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/sfx2 include/unotools offapi/com sc/source sd/source sfx2/source sw/qa sw/source unotools/source
include/sfx2/sfxsids.hrc |1 + include/sfx2/viewsh.hxx |1 + include/unotools/mediadescriptor.hxx |1 + offapi/com/sun/star/document/MediaDescriptor.idl |8 offapi/com/sun/star/frame/XModel2.idl|1 + sc/source/ui/drawfunc/drawsh2.cxx|6 ++ sc/source/ui/drawfunc/drtxtob.cxx|6 ++ sc/source/ui/view/cellsh.cxx |3 +++ sc/source/ui/view/editsh.cxx |8 sd/source/ui/view/drviews7.cxx |2 +- sd/source/ui/view/drviewsj.cxx |5 + sd/source/ui/view/outlnvsh.cxx |3 ++- sfx2/source/appl/appuno.cxx | 14 ++ sfx2/source/doc/sfxbasemodel.cxx |9 - sfx2/source/view/viewsh.cxx | 12 sw/qa/python/check_xmodel.py |4 +++- sw/source/uibase/dochdl/swdtflvr.cxx |3 +++ sw/source/uibase/docvw/edtdd.cxx |3 +++ sw/source/uibase/shells/annotsh.cxx |6 +++--- sw/source/uibase/shells/basesh.cxx |2 +- sw/source/uibase/shells/drwtxtex.cxx |2 +- sw/source/uibase/shells/textsh1.cxx |7 +++ unotools/source/misc/mediadescriptor.cxx |6 ++ 23 files changed, 104 insertions(+), 9 deletions(-) New commits: commit 075f20a4b696f9e85d11dc977806e41a49e6de61 Author: Samuel Mehrbrodt AuthorDate: Thu Oct 10 08:13:51 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon Oct 14 08:15:31 2019 +0200 Add document-level option to lock down content extraction Setting this option will prevent copying/dragging any content from LO to another program or even another LO window. Change-Id: Ifbc032a4fa69ac1a17d4b500f5a30f5399d84ed7 Reviewed-on: https://gerrit.libreoffice.org/80586 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index d77279cb44d3..6124255f2756 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -258,6 +258,7 @@ class SvxSearchItem; #define SID_TOOLBAR_MODE(SID_SFX_START + 1728) #define SID_NO_FILE_SYNC(SID_SFX_START + 1729) #define SID_NO_THUMBNAIL(SID_SFX_START + 1730) +#define SID_LOCK_CONTENT_EXTRACTION (SID_SFX_START + 1731) // Used to export a temporary file for preview in Mail Merge Wizard, where saving the data source is // not required for preview, but interferes with not-yet-saved embedded data source for main document. #define SID_NO_EMBEDDED_DS TypedWhichId(SID_SFX_START + 1731) diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index d3856243e9f5..fff76219ea3b 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -288,6 +288,7 @@ public: voidAddRemoveClipboardListener( const css::uno::Reference < css::datatransfer::clipboard::XClipboardListener>&, bool ); css::uno::Reference< css::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier() const; +bool isContentExtractionLocked(); SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const; SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const css::uno::Reference < css::ui::XContextMenuInterceptor >& xInterceptor ); diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 6a826ce309ac..b2260b5652ff 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -100,6 +100,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap static const OUString& PROP_VIEWONLY(); static const OUString& PROP_DOCUMENTBASEURL(); static const OUString& PROP_SUGGESTEDSAVEASNAME(); +static const OUString& PROP_LOCKCONTENTEXTRACTION(); // interface public: diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl index 58e773311875..0a4ba28f611b 100644 --- a/offapi/com/sun/star/document/MediaDescriptor.idl +++ b/offapi/com/sun/star/document/MediaDescriptor.idl @@ -560,6 +560,14 @@ service MediaDescriptor /** specifies the frame containing the document. May be empty. */ [optional,property] com::sun::star::frame::XFrame Frame; + +/** Setting this option will prevent copying/dragging any content anywhere. +The commands 'Copy' and 'Cut' will be disabled; selection clipboard won't work, +and dragging with mouse will also be disabled. + +@since LibreOffice 6.4 + */ +[optional,property] boolean LockContentExtraction; }; diff --git a/offapi/com/sun/star/frame/XModel2.idl b/offapi/com/sun/star/frame/XModel2.idl
[Libreoffice-commits] core.git: oox/source
oox/source/ppt/pptimport.cxx | 28
1 file changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 03ec3b7dd11656c8b64a94efb172e17d97ea662e
Author: Mike Kaganski
AuthorDate: Mon Oct 14 00:12:23 2019 +0300
Commit: Jim Raykowski
CommitDate: Mon Oct 14 08:02:31 2019 +0200
tdf#125191: Disable Undo during pptx save
Change-Id: I07fe6895cc2ba43dfa1716e67bdbb4e697e3420c
Reviewed-on: https://gerrit.libreoffice.org/80727
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index b154196de2ac..01f572a54dcf 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -231,17 +232,28 @@ sal_Bool SAL_CALL PowerPointImport::filter( const
Sequence< PropertyValue >& rDe
Reference
aFactory(getComponentContext()->getServiceManager(), UNO_QUERY_THROW);
Reference< XExporter >
xExporter(aFactory->createInstanceWithArguments("com.sun.star.comp.Impress.oox.PowerPointExport",
aArguments), UNO_QUERY);
-if (xExporter.is())
+if (Reference xFilter{ xExporter, UNO_QUERY })
{
-Reference< XComponent > xDocument( getModel(), UNO_QUERY );
-Reference< XFilter > xFilter( xExporter, UNO_QUERY );
-
-if (xFilter.is())
+Reference xUndoManager;
+bool bWasUnLocked = true;
+if (Reference xUMS{ getModel(),
UNO_QUERY })
{
-xExporter->setSourceDocument( xDocument );
-if( xFilter->filter( rDescriptor ) )
-return true;
+xUndoManager = xUMS->getUndoManager();
+if (xUndoManager.is())
+{
+bWasUnLocked = !xUndoManager->isLocked();
+xUndoManager->lock();
+}
}
+comphelper::ScopeGuard aGuard([xUndoManager, bWasUnLocked] {
+if (xUndoManager && bWasUnLocked)
+xUndoManager->unlock();
+});
+
+Reference< XComponent > xDocument(getModel(), UNO_QUERY);
+xExporter->setSourceDocument(xDocument);
+if (xFilter->filter(rDescriptor))
+return true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Infra call on Tue, Oct 15 at 16:30 UTC
Hi there, The next infra call will take place at `date -d "Tue Oct 15 16:30:00 UTC 2019"` (18:30:00 Berlin time). We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes to https://pad.documentfoundation.org/p/infra . Agenda TBA. See you there! Cheers, -- Guilhem. signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - oox/source
oox/source/core/xmlfilterbase.cxx | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit e195e6d24255a30bf1ebe57473116b2772182459
Author: Vasily Melenchuk
AuthorDate: Sun Oct 13 23:56:39 2019 +0300
Commit: Vasily Melenchuk
CommitDate: Sun Oct 13 23:56:39 2019 +0300
oox: init OLE container if any encryption data is present
Some encryption methods could use other than "OOXPassword"
values. So we could rely just on "EncryptionData" exists and
it is not empty
Change-Id: Iece53601282a1bd30b592c998c77185c9dcbbe7c
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index c1c2972f4e9c..fe7e541de4b3 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -881,17 +881,7 @@ Reference XmlFilterBase::implGetOutputStream(
MediaDescriptor& rMediaDe
MediaDescriptor::PROP_ENCRYPTIONDATA(),
Sequence< NamedValue >() );
-OUString aPassword;
-for (int i=0; i>= aPassword;
-break;
-}
-}
-if (aPassword.isEmpty())
+if (aMediaEncData.getLength() == 0)
{
return FilterBase::implGetOutputStream( rMediaDescriptor );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - 2 commits - include/oox offapi/com oox/source
include/oox/crypto/AgileEngine.hxx |8 ++--
include/oox/crypto/Standard2007Engine.hxx |7 +---
offapi/com/sun/star/packages/XPackageEncryption.idl |8
oox/source/core/filterbase.cxx | 35 ++--
oox/source/crypto/AgileEngine.cxx | 29 +++-
oox/source/crypto/DocumentEncryption.cxx|7
oox/source/crypto/Standard2007Engine.cxx| 33 --
7 files changed, 70 insertions(+), 57 deletions(-)
New commits:
commit b199349fb8adaf3eedf232aea607a5b9e909e2ac
Author: Vasily Melenchuk
AuthorDate: Sun Oct 13 23:53:22 2019 +0300
Commit: Vasily Melenchuk
CommitDate: Sun Oct 13 23:53:22 2019 +0300
oox: XPackageEncryption interface simplification
instead of two methods to write ecrypted data and encryption info
just one is used.
Change-Id: Ie31f363a0b76cfe5b67b15c1b98b0e556578b5c8
diff --git a/include/oox/crypto/AgileEngine.hxx
b/include/oox/crypto/AgileEngine.hxx
index afef194e53e9..de3836ffdb19 100644
--- a/include/oox/crypto/AgileEngine.hxx
+++ b/include/oox/crypto/AgileEngine.hxx
@@ -128,6 +128,9 @@ private:
void setupEncryptionParameters(AgileEncryptionParameters const &
rAgileEncryptionParameters);
bool setupEncryptionKey(OUString const & rPassword);
+css::uno::Sequence writeEncryptionInfo();
+css::uno::Sequence writeEncryptedDocument(const
css::uno::Reference& rxInputStream);
+
public:
AgileEngine(const css::uno::Reference< css::uno::XComponentContext >&
rxContext);
@@ -143,10 +146,7 @@ public:
// Encryption
-virtual css::uno::Sequence SAL_CALL
writeEncryptionInfo() override;
-
-virtual void SAL_CALL encrypt(const
css::uno::Reference& rxInputStream,
- css::uno::Reference& rxOutputStream)
override;
+virtual css::uno::Sequence SAL_CALL encrypt(const
css::uno::Reference& rxInputStream) override;
virtual sal_Bool SAL_CALL setupEncryption(const
css::uno::Sequence& rMediaEncData) override;
diff --git a/include/oox/crypto/Standard2007Engine.hxx
b/include/oox/crypto/Standard2007Engine.hxx
index feaf6a3ada6f..50be627a86e7 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -37,6 +37,8 @@ class OOX_DLLPUBLIC Standard2007Engine : public
cppu::WeakImplHelper getStream(const
css::uno::Sequence & rStreams, const OUString
sStreamName);
+css::uno::Sequence writeEncryptionInfo();
+css::uno::Sequence writeEncryptedDocument(const
css::uno::Reference& rxInputStream);
public:
Standard2007Engine(const css::uno::Reference&
rxContext);
@@ -53,10 +55,7 @@ public:
// Encryption
-virtual css::uno::Sequence SAL_CALL
writeEncryptionInfo() override;
-
-virtual void SAL_CALL encrypt(const
css::uno::Reference& rxInputStream,
- css::uno::Reference& rxOutputStream)
override;
+virtual css::uno::Sequence SAL_CALL encrypt(const
css::uno::Reference& rxInputStream) override;
virtual sal_Bool SAL_CALL setupEncryption(const
css::uno::Sequence& rMediaEncData) override;
diff --git a/offapi/com/sun/star/packages/XPackageEncryption.idl
b/offapi/com/sun/star/packages/XPackageEncryption.idl
index 298a089af6c7..0fba1d9c3ba7 100644
--- a/offapi/com/sun/star/packages/XPackageEncryption.idl
+++ b/offapi/com/sun/star/packages/XPackageEncryption.idl
@@ -52,11 +52,6 @@ interface XPackageEncryption: com::sun::star::uno::XInterface
/**
TODO
*/
-sequence writeEncryptionInfo();
-
-/**
-TODO
- */
sequence createEncryptionData([in]
string rPassword);
/**
@@ -67,8 +62,7 @@ interface XPackageEncryption: com::sun::star::uno::XInterface
/**
TODO
*/
-void encrypt([in] com::sun::star::io::XInputStream rxInputStream,
- [out] com::sun::star::io::XOutputStream rxOutputStream);
+sequence encrypt([in]
com::sun::star::io::XInputStream rxInputStream);
/**
TODO
diff --git a/oox/source/crypto/AgileEngine.cxx
b/oox/source/crypto/AgileEngine.cxx
index 35104903d918..54dd841ef2bf 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -756,7 +756,7 @@ bool AgileEngine::setupEncryptionKey(OUString const &
rPassword)
return true;
}
-css::uno::Sequence AgileEngine::writeEncryptionInfo()
+css::uno::Sequence AgileEngine::writeEncryptionInfo()
{
Reference aEncryptionInfoStream(
mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.io.SequenceOutputStream",
mxContext),
@@ -820,20 +820,19 @@ css::uno::Sequence
AgileEngine::writeEncryptionInfo()
rStream.close();
aEncryptionInfoStream->flush();
-// Store all streams into sequence and return back
-comphelper::SequenceAsHashMap aStreams;
-
Reference
aEncryptionInfoSequenceStream(aEncryptionInfoStream, UNO_QUERY);
-aStreams["EncryptionIn
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/sft.hxx | 160 1 file changed, 80 insertions(+), 80 deletions(-) New commits: commit 70db7576c05800c986c46514b41548743e531b87 Author: Julien Nabet AuthorDate: Sun Oct 13 20:39:44 2019 +0200 Commit: Julien Nabet CommitDate: Sun Oct 13 22:47:53 2019 +0200 Replace "static const" by "constexpr" in sft.hxx (vcl) Change-Id: I7ee86442cf822a2e866f379a98dae901f5291b8f Reviewed-on: https://gerrit.libreoffice.org/80741 Reviewed-by: Noel Grandin Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index e52657fe4933..de97bec26abe 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -256,27 +256,27 @@ namespace vcl => length for OS/2 table version 5 = 100 bytes */ -static const int OS2_Legacy_length = 68; -static const int OS2_V0_length = 78; -static const int OS2_V1_length = 86; - -static const int OS2_usWeightClass_offset = 4; -static const int OS2_usWidthClass_offset = 6; -static const int OS2_fsType_offset = 8; -static const int OS2_panose_offset = 32; -static const int OS2_panoseNbBytes_offset = 10; -static const int OS2_ulUnicodeRange1_offset = 42; -static const int OS2_ulUnicodeRange2_offset = 46; -static const int OS2_ulUnicodeRange3_offset = 50; -static const int OS2_ulUnicodeRange4_offset = 54; -static const int OS2_fsSelection_offset = 62; -static const int OS2_typoAscender_offset = 68; -static const int OS2_typoDescender_offset = 70; -static const int OS2_typoLineGap_offset = 72; -static const int OS2_winAscent_offset = 74; -static const int OS2_winDescent_offset = 76; -static const int OS2_ulCodePageRange1_offset = 78; -static const int OS2_ulCodePageRange2_offset = 82; +constexpr int OS2_Legacy_length = 68; +constexpr int OS2_V0_length = 78; +constexpr int OS2_V1_length = 86; + +constexpr int OS2_usWeightClass_offset = 4; +constexpr int OS2_usWidthClass_offset = 6; +constexpr int OS2_fsType_offset = 8; +constexpr int OS2_panose_offset = 32; +constexpr int OS2_panoseNbBytes_offset = 10; +constexpr int OS2_ulUnicodeRange1_offset = 42; +constexpr int OS2_ulUnicodeRange2_offset = 46; +constexpr int OS2_ulUnicodeRange3_offset = 50; +constexpr int OS2_ulUnicodeRange4_offset = 54; +constexpr int OS2_fsSelection_offset = 62; +constexpr int OS2_typoAscender_offset = 68; +constexpr int OS2_typoDescender_offset = 70; +constexpr int OS2_typoLineGap_offset = 72; +constexpr int OS2_winAscent_offset = 74; +constexpr int OS2_winDescent_offset = 76; +constexpr int OS2_ulCodePageRange1_offset = 78; +constexpr int OS2_ulCodePageRange2_offset = 82; /* Some table hhea consts @@ -305,13 +305,13 @@ static const int OS2_ulCodePageRange2_offset = 82; => length for hhea table = 36 bytes */ -static const int HHEA_Length = 36; +constexpr int HHEA_Length = 36; -static const int HHEA_ascender_offset = 4; -static const int HHEA_descender_offset = 6; -static const int HHEA_lineGap_offset = 8; -static const int HHEA_caretSlopeRise_offset = 18; -static const int HHEA_caretSlopeRun_offset = 20; +constexpr int HHEA_ascender_offset = 4; +constexpr int HHEA_descender_offset = 6; +constexpr int HHEA_lineGap_offset = 8; +constexpr int HHEA_caretSlopeRise_offset = 18; +constexpr int HHEA_caretSlopeRun_offset = 20; /* Some table post consts @@ -325,10 +325,10 @@ static const int HHEA_caretSlopeRun_offset = 20; ... */ -static const int POST_italicAngle_offset = 4; -static const int POST_underlinePosition_offset = 8; -static const int POST_underlineThickness_offset = 10; -static const int POST_isFixedPitch_offset = 12; +constexpr int POST_italicAngle_offset = 4; +constexpr int POST_underlinePosition_offset = 8; +constexpr int POST_underlineThickness_offset = 10; +constexpr int POST_isFixedPitch_offset = 12; /* Some table head consts @@ -357,23 +357,23 @@ static const int POST_isFixedPitch_offset = 12; => length head table = 54 bytes */ -static const int HEAD_Length = 54; - -static const int HEAD_majorVersion_offset = 0; -static const int HEAD_fontRevision_offset = 4; -static const int HEAD_magicNumber_offset = 12; -static const int HEAD_flags_offset = 16; -static const int HEAD_unitsPerEm_offset = 18; -static const int HEAD_created_offset = 20; -static const int HEAD_xMin_offset = 36; -static const int HEAD_yMin_offset = 38; -static const int HEAD_xMax_offset = 40; -static const int HEAD_yMax_offset = 42; -static const int HEAD_macStyle_offset = 44; -static const int HEAD_lowestRecPPEM_offset = 46; -static const int HEAD_fontDirectionHint_offset = 48; -static const int HEAD_indexToLocFormat_offset = 50; -static const int HEAD_glyphDataFormat_offset = 52; +constexpr int HEAD_Length = 54; + +constexpr int HEAD_majorVersion_offset = 0; +constexpr int HEAD_fontRevision_offset = 4; +constexpr int HEAD_magicNumber_offset = 12; +constexpr int HEAD_flags_offset = 16; +constexpr int HEAD_unitsPerEm_offset = 18; +constexpr int HEAD_created_offset = 20; +constexpr int
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - oox/source sd/qa
oox/source/drawingml/textcharacterproperties.cxx |3 +++
oox/source/token/properties.txt |1 +
sd/qa/unit/data/pptx/tdf127129.pptx |binary
sd/qa/unit/import-tests.cxx | 22 ++
4 files changed, 26 insertions(+)
New commits:
commit 3ff748399ded70c71c9340ee6f1fdd7e7af28180
Author: Xisco Fauli
AuthorDate: Thu Oct 10 21:29:50 2019 +0200
Commit: Xisco Faulí
CommitDate: Sun Oct 13 21:15:17 2019 +0200
tdf#127129: pptx: map highlight to CharBackColor
Change-Id: I033c15db6848e96ba6b6bd7a2852c9e4d1524a8e
Reviewed-on: https://gerrit.libreoffice.org/80630
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit 57cfbc6830c3d8dc64107aed4a613415f069)
Reviewed-on: https://gerrit.libreoffice.org/80738
Reviewed-by: Xisco Faulí
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index 552dcf933e81..bc078d491737 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -156,6 +156,9 @@ void TextCharacterProperties::pushToPropMap( PropertyMap&
rPropMap, const XmlFil
rPropMap.setProperty( PROP_CharUnderlineColor,
maUnderlineColor.getColor( rFilter.getGraphicHelper() ));
}
// TODO If bUnderlineFillFollowText uFillTx
(CT_TextUnderlineFillFollowText) is set, fill color of the underline should be
the same color as the text
+
+if( maHighlightColor.isUsed() )
+rPropMap.setProperty( PROP_CharBackColor, maHighlightColor.getColor(
rFilter.getGraphicHelper() ));
}
static void pushToGrabBag( PropertySet& rPropSet, const
std::vector& aVectorOfProperyValues )
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 0bbd14b79b30..44320afe0e87 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -50,6 +50,7 @@ CellStyle
CenterHorizontally
CenterVertically
Change
+CharBackColor
CharCaseMap
CharColor
CharContoured
diff --git a/sd/qa/unit/data/pptx/tdf127129.pptx
b/sd/qa/unit/data/pptx/tdf127129.pptx
new file mode 100644
index ..680fcf631be4
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf127129.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 04ac4b474ab8..6252ca27161f 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -154,6 +154,7 @@ public:
void testBnc910045();
void testRowHeight();
void testTdf93830();
+void testTdf127129();
void testTdf93097();
void testTdf62255();
void testTdf93124();
@@ -247,6 +248,7 @@ public:
CPPUNIT_TEST(testBnc910045);
CPPUNIT_TEST(testRowHeight);
CPPUNIT_TEST(testTdf93830);
+CPPUNIT_TEST(testTdf127129);
CPPUNIT_TEST(testTdf93097);
CPPUNIT_TEST(testTdf62255);
CPPUNIT_TEST(testTdf93124);
@@ -1281,6 +1283,7 @@ void SdImportTest::testRowHeight()
xDocShRef->DoClose();
}
+
void SdImportTest::testTdf93830()
{
// Text shape offset was ignored
@@ -1299,6 +1302,25 @@ void SdImportTest::testTdf93830()
xDocShRef->DoClose();
}
+void SdImportTest::testTdf127129()
+{
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf127129.pptx"),
PPTX);
+uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0,
xDocShRef ) );
+uno::Reference< text::XTextRange > xParagraph( getParagraphFromShape( 0,
xShape ) );
+uno::Reference< text::XTextRange > xRun( getRunFromParagraph( 0,
xParagraph ) );
+uno::Reference< beans::XPropertySet > xPropSet( xRun, uno::UNO_QUERY_THROW
);
+
+sal_Int32 nCharColor;
+xPropSet->getPropertyValue( "CharColor" ) >>= nCharColor;
+CPPUNIT_ASSERT_EQUAL( sal_Int32(0x00), nCharColor );
+
+// Without the accompanying fix in place, the highlight would be -1
+sal_Int32 nCharBackColor;
+xPropSet->getPropertyValue( "CharBackColor" ) >>= nCharBackColor;
+CPPUNIT_ASSERT_EQUAL( sal_Int32(0xFF00), nCharBackColor );
+
+xDocShRef->DoClose();
+}
void SdImportTest::testTdf93097()
{
// Throwing metadata import aborted the filter, check that metadata is now
imported.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Configure options for faster Jenkins builds
Hello, is there any specific reason why the Jenkins builds do not use --disable-dependency-tracking and/or --disable-symbols? I've noticed in the logs that Jenkins builds do 'make clean' at the start, so they are one-time builds and thus do not need dependency tracking, so they just work just fine with --disable-dependency-tracking (and apparently they do, https://gerrit.libreoffice.org/#/c/80730). I have not tried with a complete build, but just with the relatively small 'make starmath.build' adding 'nodep=TRUE' saves about 10% of build time here (on Windows, where it probably makes the biggest difference). And --disable-symbols is basically like adding -g0 to CXXFLAGS. Most setups build with --enable-dbgutils to build with full debug builds, but in fact generating debug symbols mostly seems like a waste for Jenkins builds. Is that actually used for something? I know unittests on Linux print backtraces on crashes/aborts, but I've just tried adding abort() in a random unittest and the backtrace is not very useful, because it doesn't use debug symbols anyway. And with just 'make starmath.build' adding 'ENABLE_SYMBOLS_FOR=' saves again about 10% of build time here. Does somebody know a good reason why I shouldn't push these changes? -- Luboš Luňák l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/export/drawingml.cxx| 11 +++
sd/qa/unit/data/odp/tdf128096.odp |binary
sd/qa/unit/export-tests-ooxml2.cxx | 16
3 files changed, 27 insertions(+)
New commits:
commit 3e0811660ba4cecd0ab27918c27a5ddab47cc5c5
Author: Xisco Fauli
AuthorDate: Fri Oct 11 17:43:46 2019 +0200
Commit: Xisco Faulí
CommitDate: Sun Oct 13 20:36:39 2019 +0200
tdf#128096: pptx: export highlight
Change-Id: If3084f7ffaceb774dba1b1f195229313a8f1d04a
Reviewed-on: https://gerrit.libreoffice.org/80670
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6e114430dc20..83c709c4633e 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1874,6 +1874,17 @@ void DrawingML::WriteRunProperties( const Reference<
XPropertySet >& rRun, bool
}
}
+if (GetProperty(rXPropSet, "CharBackColor"))
+{
+::Color color(*o3tl::doAccess(mAny));
+if( color != COL_AUTO )
+{
+mpFS->startElementNS(XML_a, XML_highlight);
+WriteColor( color );
+mpFS->endElementNS( XML_a, XML_highlight );
+}
+}
+
if (underline
&& ((bCheckDirect
&& GetPropertyAndState(rXPropSet, rXPropState,
"CharUnderlineColor", eState)
diff --git a/sd/qa/unit/data/odp/tdf128096.odp
b/sd/qa/unit/data/odp/tdf128096.odp
new file mode 100644
index ..827239973c84
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf128096.odp differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index bdfae4ab25ec..78452a763f01 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -163,6 +163,7 @@ public:
void testTdf118768();
void testTdf118836();
void testTdf116350TextEffects();
+void testTdf128096();
void testTdf120573();
void testTdf118825();
void testTdf119118();
@@ -262,6 +263,7 @@ public:
CPPUNIT_TEST(testTdf118768);
CPPUNIT_TEST(testTdf118836);
CPPUNIT_TEST(testTdf116350TextEffects);
+CPPUNIT_TEST(testTdf128096);
CPPUNIT_TEST(testTdf120573);
CPPUNIT_TEST(testTdf118825);
CPPUNIT_TEST(testTdf119118);
@@ -2059,6 +2061,20 @@ void SdOOXMLExportTest2::testTdf116350TextEffects()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest2::testTdf128096()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf128096.odp"), ODP);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+xDocShRef->DoClose();
+
+xmlDocPtr pXmlDocContent1 = parseExport(tempFile, "ppt/slides/slide1.xml");
+assertXPath(pXmlDocContent1,
"//p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:r/a:rPr/a:highlight/a:srgbClr",
"val", "00");
+
+// Check that underlined content is also highlighted
+xmlDocPtr pXmlDocContent2 = parseExport(tempFile, "ppt/slides/slide2.xml");
+assertXPath(pXmlDocContent2,
"//p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:p/a:r/a:rPr/a:highlight/a:srgbClr",
"val", "00");
+}
void SdOOXMLExportTest2::testTdf120573()
{
::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(
"sd/qa/unit/data/pptx/tdf120573.pptx" ), PPTX );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/sft.hxx| 23 ++
vcl/source/fontsubset/sft.cxx | 52 +++--
vcl/source/fontsubset/ttcr.cxx | 32 +++--
vcl/source/fontsubset/ttcr.hxx |4 +--
4 files changed, 49 insertions(+), 62 deletions(-)
New commits:
commit a17fb721bd0b6ddde88c4aaf3ceba9650f4e7879
Author: Julien Nabet
AuthorDate: Sun Oct 13 13:51:39 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Oct 13 19:46:37 2019 +0200
Refactor + fix TrueTypeTableNew_post + some reading types for sft/ttcr (vcl)
Move const in sft.hxx and replace define by static const
Also, fix some errors with data formats
+ TrueTypeTableNew_post definition
Following https://docs.microsoft.com/en-us/typography/opentype/spec/otff:
Fixed = 32-bit signed fixed-point number (16.16)
FWORD = int16
UFWORD = uint16
Change-Id: I8c460e517b9f25077f5ad81a6da656695c8e6fa1
Reviewed-on: https://gerrit.libreoffice.org/80733
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 27a5093e61e7..e52657fe4933 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -425,6 +425,29 @@ static const int GLYF_yMin_offset = 4;
static const int GLYF_xMax_offset = 6;
static const int GLYF_yMax_offset = 8;
+static const sal_uInt32 T_true = 0x74727565;/* 'true' */
+static const sal_uInt32 T_ttcf = 0x74746366;/* 'ttcf' */
+static const sal_uInt32 T_otto = 0x4f54544f;/* 'OTTO' */
+
+// standard TrueType table tags
+static const sal_uInt32 T_maxp = 0x6D617870;
+static const sal_uInt32 T_glyf = 0x676C7966;
+static const sal_uInt32 T_head = 0x68656164;
+static const sal_uInt32 T_loca = 0x6C6F6361;
+static const sal_uInt32 T_name = 0x6E616D65;
+static const sal_uInt32 T_hhea = 0x68686561;
+static const sal_uInt32 T_hmtx = 0x686D7478;
+static const sal_uInt32 T_cmap = 0x636D6170;
+static const sal_uInt32 T_vhea = 0x76686561;
+static const sal_uInt32 T_vmtx = 0x766D7478;
+static const sal_uInt32 T_OS2 = 0x4F532F32;
+static const sal_uInt32 T_post = 0x706F7374;
+static const sal_uInt32 T_cvt = 0x63767420;
+static const sal_uInt32 T_prep = 0x70726570;
+static const sal_uInt32 T_fpgm = 0x6670676D;
+static const sal_uInt32 T_gsub = 0x47535542;
+static const sal_uInt32 T_CFF = 0x43464620;
+
/**
* @defgroup sft Sun Font Tools Exported Functions
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 7c527887dc65..2f29ca97cbd3 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -103,29 +103,6 @@ struct GlyphOffsets {
sal_uInt32 *offs; /* array of nGlyphs offsets */
};
-static const sal_uInt32 T_true = 0x74727565;/* 'true' */
-static const sal_uInt32 T_ttcf = 0x74746366;/* 'ttcf' */
-static const sal_uInt32 T_otto = 0x4f54544f;/* 'OTTO' */
-
-/* standard TrueType table tags */
-#define T_maxp 0x6D617870
-#define T_glyf 0x676C7966
-#define T_head 0x68656164
-#define T_loca 0x6C6F6361
-#define T_name 0x6E616D65
-#define T_hhea 0x68686561
-#define T_hmtx 0x686D7478
-#define T_cmap 0x636D6170
-#define T_vhea 0x76686561
-#define T_vmtx 0x766D7478
-#define T_OS2 0x4F532F32
-#define T_post 0x706F7374
-#define T_cvt 0x63767420
-#define T_prep 0x70726570
-#define T_fpgm 0x6670676D
-#define T_gsub 0x47535542
-#define T_CFF 0x43464620
-
static void *smalloc(size_t size)
{
void *res = malloc(size);
@@ -1937,7 +1914,7 @@ SFErrCodes CreateTTFromTTGlyphs(TrueTypeFont *ttf,
/** hhea **/
const sal_uInt8* p = getTable(ttf, O_hhea);
if (p) {
-hhea = TrueTypeTableNew_hhea(GetUInt16(p, HHEA_ascender_offset),
GetUInt16(p, HHEA_descender_offset), GetUInt16(p, HHEA_lineGap_offset),
GetUInt16(p, HHEA_caretSlopeRise_offset), GetUInt16(p,
HHEA_caretSlopeRun_offset));
+hhea = TrueTypeTableNew_hhea(GetInt16(p, HHEA_ascender_offset),
GetInt16(p, HHEA_descender_offset), GetInt16(p, HHEA_lineGap_offset),
GetInt16(p, HHEA_caretSlopeRise_offset), GetInt16(p,
HHEA_caretSlopeRun_offset));
} else {
hhea = TrueTypeTableNew_hhea(0, 0, 0, 0, 0);
}
@@ -1946,7 +1923,7 @@ SFErrCodes CreateTTFromTTGlyphs(TrueTypeFont *ttf,
p = getTable(ttf, O_head);
assert(p != nullptr);
-head = TrueTypeTableNew_head(GetUInt32(p, HEAD_fontRevision_offset),
+head = TrueTypeTableNew_head(GetInt32(p, HEAD_fontRevision_offset),
GetUInt16(p, HEAD_flags_offset),
GetUInt16(p, HEAD_unitsPerEm_offset),
p+HEAD_created_offset,
@@ -1988,10 +1965,10 @@ SFErrCodes CreateTTFromTTGlyphs(TrueTypeFont *ttf,
/** post **/
if ((p = getTable(ttf, O_post)) != nullptr) {
post = TrueTypeTableNew_post(0x0003,
- GetUInt32(p, POST
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/sdi sd/source svx/uiconfig
sd/sdi/_drvwsh.sdi| 10
sd/sdi/sdraw.sdi | 34 ++
sd/source/ui/view/drviews2.cxx|2
sd/source/ui/view/drviewsj.cxx|8 +++
svx/uiconfig/ui/sidebarpossize.ui | 88 ++
5 files changed, 142 insertions(+)
New commits:
commit cb8c0ed38ac17f14f3fe9cb3f45c1100da5f0ee3
Author: Tomaž Vajngerl
AuthorDate: Sun Oct 13 12:00:50 2019 +0200
Commit: Tomaž Vajngerl
CommitDate: Sun Oct 13 18:12:40 2019 +0200
tdf#125566 Add arrangement functions to position & size sidebar
Adds arrangement actions to position & size sidebar so it is
possible to move the object up/down in the stack.
As Draw/Impress uses it's own action names for the same UNO action
(Forward/Back in Draw and ObjectForwardOne and ObjectBackOne in
Writer/Calc) also add the global ones to Draw/Impress and connect
them to the same function as Forward/Back. This commit does not
unify them however (Forward/Back are still used in menus/toolbars)
but this could be done in the future.
Change-Id: Ibb152f29dbe11dfb1b6a057e6ea60b21029912e2
Reviewed-on: https://gerrit.libreoffice.org/80729
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit b2e5f9ead2bb7f2979afe4ba13e3950e8a3cc278)
Reviewed-on: https://gerrit.libreoffice.org/80734
Tested-by: Jenkins CollaboraOffice
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 4e1b9d2abfab..54e3f0a61a5d 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -544,6 +544,11 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_FRAME_UP // ole : no, status : play rec
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_BEFORE_OBJ // ole : no, status : no
[
ExecMethod = FuTemporary ;
@@ -564,6 +569,11 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_FRAME_DOWN // ole : no, status : play rec
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_FRAME_TO_BOTTOM // ole : no, status : play rec
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index e182c1cb34f6..58df5356271f 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -158,6 +158,23 @@ SfxVoidItem Backward SID_MOREBACK
GroupId = SfxGroupId::Modify;
]
+SfxVoidItem ObjectBackOne SID_FRAME_DOWN
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Modify;
+]
+
SfxVoidItem BeforeObject SID_BEFORE_OBJ
()
[
@@ -1441,6 +1458,23 @@ SfxVoidItem Forward SID_MOREFRONT
GroupId = SfxGroupId::Modify;
]
+SfxVoidItem ObjectForwardOne SID_FRAME_UP
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Modify;
+]
+
SfxVoidItem GetBlue SID_GETBLUE
(SfxUInt32Item WhatKind ID_VAL_WHATKIND)
[
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 28848dd50bb9..735ce76378aa 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2820,6 +2820,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break;
case SID_MOREFRONT: // BASIC
+case SID_FRAME_UP: // BASIC
{
mpDrawView->MovMarkedToTop();
Cancel();
@@ -2828,6 +2829,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break;
case SID_MOREBACK: // BASIC
+case SID_FRAME_DOWN: // BASIC
{
mpDrawView->MovMarkedToBtm();
Cancel();
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index f0c32d1bf830..cfd849874386 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -93,7 +93,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
SfxItemState::DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN
) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_TO_TOP ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_MOREFRONT ) ||
+SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_UP ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_MOREBACK ) ||
+SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_DOWN ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_TO_BOTTOM )
||
SfxItemState::DEFAULT == rSet.GetItemState( SID_BEFORE_OBJ ) ||
Sf
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/sdi sd/source svx/uiconfig
sd/sdi/_drvwsh.sdi| 10
sd/sdi/sdraw.sdi | 34 ++
sd/source/ui/view/drviews2.cxx|2
sd/source/ui/view/drviewsj.cxx|8 +++
svx/uiconfig/ui/sidebarpossize.ui | 88 ++
5 files changed, 142 insertions(+)
New commits:
commit 307ea1aebb30ee2e72efa7337179fb8d5a473134
Author: Tomaž Vajngerl
AuthorDate: Sun Oct 13 12:00:50 2019 +0200
Commit: Tomaž Vajngerl
CommitDate: Sun Oct 13 18:12:50 2019 +0200
tdf#125566 Add arrangement functions to position & size sidebar
Adds arrangement actions to position & size sidebar so it is
possible to move the object up/down in the stack.
As Draw/Impress uses it's own action names for the same UNO action
(Forward/Back in Draw and ObjectForwardOne and ObjectBackOne in
Writer/Calc) also add the global ones to Draw/Impress and connect
them to the same function as Forward/Back. This commit does not
unify them however (Forward/Back are still used in menus/toolbars)
but this could be done in the future.
Change-Id: Ibb152f29dbe11dfb1b6a057e6ea60b21029912e2
Reviewed-on: https://gerrit.libreoffice.org/80729
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit b2e5f9ead2bb7f2979afe4ba13e3950e8a3cc278)
Reviewed-on: https://gerrit.libreoffice.org/80735
Tested-by: Jenkins CollaboraOffice
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 9e30bfc2aaf1..d7c836cc5b58 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -544,6 +544,11 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_FRAME_UP // ole : no, status : play rec
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_BEFORE_OBJ // ole : no, status : no
[
ExecMethod = FuTemporary ;
@@ -564,6 +569,11 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_FRAME_DOWN // ole : no, status : play rec
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_FRAME_TO_BOTTOM // ole : no, status : play rec
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index e0c6e03b254f..465751caa27c 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -158,6 +158,23 @@ SfxVoidItem Backward SID_MOREBACK
GroupId = SfxGroupId::Modify;
]
+SfxVoidItem ObjectBackOne SID_FRAME_DOWN
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Modify;
+]
+
SfxVoidItem BeforeObject SID_BEFORE_OBJ
()
[
@@ -1441,6 +1458,23 @@ SfxVoidItem Forward SID_MOREFRONT
GroupId = SfxGroupId::Modify;
]
+SfxVoidItem ObjectForwardOne SID_FRAME_UP
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Modify;
+]
+
SfxVoidItem GetBlue SID_GETBLUE
(SfxUInt32Item WhatKind ID_VAL_WHATKIND)
[
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index a5349306dc71..c98532f34f42 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2839,6 +2839,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break;
case SID_MOREFRONT: // BASIC
+case SID_FRAME_UP: // BASIC
{
mpDrawView->MovMarkedToTop();
Cancel();
@@ -2847,6 +2848,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break;
case SID_MOREBACK: // BASIC
+case SID_FRAME_DOWN: // BASIC
{
mpDrawView->MovMarkedToBtm();
Cancel();
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index f0c32d1bf830..cfd849874386 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -93,7 +93,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
SfxItemState::DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN
) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_TO_TOP ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_MOREFRONT ) ||
+SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_UP ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_MOREBACK ) ||
+SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_DOWN ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_TO_BOTTOM )
||
SfxItemState::DEFAULT == rSet.GetItemState( SID_BEFORE_OBJ ) ||
Sf
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |6 +++---
connectivity/source/drivers/postgresql/pq_statement.cxx| 10
++
connectivity/source/drivers/postgresql/pq_tools.cxx|7 +++
connectivity/source/drivers/postgresql/pq_tools.hxx|2 ++
4 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit 0c46c81e04530e8f6ce4f34195d8f0443ed8bfc3
Author: Julien Nabet
AuthorDate: Sun Oct 13 00:26:10 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Oct 13 16:40:15 2019 +0200
tdf#128111: "adsrc" doesn't exist from Postgresql 12
Before Postgresql 8.0, there was only "adsrc"
then it's been deprecated
"The adsrc field is historical, and is best not used, because it does not
track outside changes
that might affect the representation of the default value.
Reverse-compiling the adbin field (with pg_get_expr for example) is a
better way to display the default value
"
and finally it's been removed with version 12
See evolution with:
- https://www.postgresql.org/docs/8/catalog-pg-attrdef.html
- https://www.postgresql.org/docs/11/catalog-pg-attrdef.html
- https://www.postgresql.org/docs/12/catalog-pg-attrdef.html
Change-Id: I57e9da423a23b5a96bbb64b0e026b160e9643ab9
Reviewed-on: https://gerrit.libreoffice.org/80722
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 4f89e807185a..bedd686b0082 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1514,7 +1514,7 @@ css::uno::Reference< XResultSet >
DatabaseMetaData::getColumns(
//allow NULL values. An empty string means
//nobody knows.
// => pg_attribute.attnotnull
-
+OUString strDefaultValue = getDefaultValue(m_pSettings);
Reference< XPreparedStatement > statement = m_origin->prepareStatement(
"SELECT pg_namespace.nspname, " // 1
"pg_class.relname, " // 2
@@ -1524,8 +1524,8 @@ css::uno::Reference< XResultSet >
DatabaseMetaData::getColumns(
"pg_attribute.attnotnull, " // 6
"pg_type.typdefault, " // 7
"pg_type.typtype, " // 8
-"pg_attrdef.adsrc, " // 9
-"pg_description.description, " // 10
++ strDefaultValue + // 9
+",pg_description.description, " // 10
"pg_type.typbasetype, " // 11
"pg_attribute.attnum " // 12
"FROM pg_class, "
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx
b/connectivity/source/drivers/postgresql/pq_statement.cxx
index f9c9f25abe1d..fd822034c480 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -629,10 +629,12 @@ static void getAutoValues(
String2StringMap & result,
const Reference< XConnection > & connection,
const OUString &schemaName,
-const OUString & tableName )
+const OUString & tableName,
+ConnectionSettings *pConnectionSettings )
{
+OUString strDefaultValue = getDefaultValue(pConnectionSettings);
Reference< XPreparedStatement > stmt = connection->prepareStatement(
- "SELECT pg_attribute.attname, pg_attrdef.adsrc "
+ "SELECT pg_attribute.attname, " + strDefaultValue +
"FROM pg_class, pg_namespace, pg_attribute "
"LEFT JOIN pg_attrdef ON pg_attribute.attrelid =
pg_attrdef.adrelid AND "
"pg_attribute.attnum =
pg_attrdef.adnum "
@@ -642,7 +644,7 @@ static void getAutoValues(
// LEM TODO: this is weird; why "LIKE" and not "="?
// Most probably gives problems if tableName contains '%'
"pg_class.relname LIKE ? AND "
-"pg_attrdef.adsrc != ''"
++ strDefaultValue + " != ''"
);
DisposeGuard guard( stmt );
Reference< XParameters > paras( stmt, UNO_QUERY );
@@ -736,7 +738,7 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert(
{
if( autoValues.empty() )
{
-getAutoValues( autoValues, connection, schemaName,
tableName );
+getAutoValues( autoValues, connection, schemaName,
tableName, pConnectionSettings );
}
// this could mean, that the column is a default or auto
value, check this ...
bool bColumnMatchAutoValue = false;
diff --git a/connectivity/source/drive
[Libreoffice-commits] core.git: 2 commits - cui/source include/vcl reportdesign/source
cui/source/options/optgdlg.cxx |2 +-
include/vcl/toolbox.hxx | 10 --
include/vcl/vclenum.hxx | 10 ++
reportdesign/source/ui/dlg/Condition.hxx |6 --
4 files changed, 11 insertions(+), 17 deletions(-)
New commits:
commit 414d10d8a3041e5e2aa899b59c1919e41c75371d
Author: Caolán McNamara
AuthorDate: Sat Oct 12 20:04:46 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 13 16:18:19 2019 +0200
move ToolBoxButtonSize into vclenum
Change-Id: I684d192296642bc507a6f75dd52a5ce72b028157
Reviewed-on: https://gerrit.libreoffice.org/80721
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index fb320a25c289..1aae24ea20e1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -68,10 +68,10 @@
#include
#include
+#include
#include
#include
#include
-#include
#if HAVE_FEATURE_OPENGL
#include
#endif
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 0fa569248dd2..56fe90bff710 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -58,16 +58,6 @@ namespace o3tl
template<> struct typed_flags :
is_typed_flags {};
}
-// small, large, size32 force an exact toolbox size for proper alignment
-// DontCare will let the toolbox decide about its size
-enum class ToolBoxButtonSize
-{
-DontCare,
-Small,
-Large,
-Size32,
-};
-
enum class ToolBoxLayoutMode
{
Normal, // traditional layout, items are centered in the toolbar
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index c7ced830da49..7d8728e90dc1 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -288,6 +288,16 @@ namespace o3tl
template<> struct typed_flags :
is_typed_flags {};
}
+// small, large, size32 force an exact toolbox size for proper alignment
+// DontCare will let the toolbox decide about its size
+enum class ToolBoxButtonSize
+{
+DontCare,
+Small,
+Large,
+Size32,
+};
+
#endif // INCLUDED_VCL_VCLENUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d0a537a26a5f9def5d85f5c027a9029dda1e58bd
Author: Caolán McNamara
AuthorDate: Sat Oct 12 19:51:13 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 13 16:18:08 2019 +0200
drop some unnecessary includes
Change-Id: I07693dd5199a1fcc08c7ba25bd986d9da76958b3
Reviewed-on: https://gerrit.libreoffice.org/80720
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/reportdesign/source/ui/dlg/Condition.hxx
b/reportdesign/source/ui/dlg/Condition.hxx
index 680632e8db51..d16e81ce8ca3 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -27,12 +27,6 @@
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source include/svx reportdesign/inc reportdesign/source sc/source svx/source sw/source
cui/source/inc/FontFeaturesDialog.hxx |2
cui/source/inc/chardlg.hxx |2
include/svx/fntctrl.hxx|6 +-
reportdesign/inc/pch/precompiled_rpt.hxx | 37 +++--
reportdesign/inc/pch/precompiled_rptui.hxx |6 +-
reportdesign/inc/pch/precompiled_rptxml.hxx|4 +
reportdesign/source/ui/dlg/Condition.hxx |2
sc/source/ui/condformat/condformatdlgentry.cxx |2
sc/source/ui/inc/condformatdlgentry.hxx|6 +-
svx/source/dialog/fntctrl.cxx | 52 -
sw/source/ui/config/optpage.cxx| 12 ++---
sw/source/uibase/inc/optpage.hxx |8 +--
12 files changed, 60 insertions(+), 79 deletions(-)
New commits:
commit b883c7142b081ec121c546845ca1a228ea31ebb7
Author: Caolán McNamara
AuthorDate: Sat Oct 12 16:39:46 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 13 16:17:33 2019 +0200
rename FontPrevWindow back to SvxFontPrevWindow
Change-Id: Ife6f7bbc64f397e502d50c629769a8b637a591c8
Reviewed-on: https://gerrit.libreoffice.org/80718
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/FontFeaturesDialog.hxx
b/cui/source/inc/FontFeaturesDialog.hxx
index d30f92305067..93e5f7c4a76e 100644
--- a/cui/source/inc/FontFeaturesDialog.hxx
+++ b/cui/source/inc/FontFeaturesDialog.hxx
@@ -48,7 +48,7 @@ private:
OUString m_sFontName;
OUString m_sResultFontName;
-FontPrevWindow m_aPreviewWindow;
+SvxFontPrevWindow m_aPreviewWindow;
std::unique_ptr m_xContentWindow;
std::unique_ptr m_xContentGrid;
std::unique_ptr m_xPreviewWindow;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 15906a085657..7cf7f8e315ec 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -35,7 +35,7 @@ class FontList;
class SvxCharBasePage : public SfxTabPage
{
protected:
-FontPrevWindow m_aPreviewWin;
+SvxFontPrevWindow m_aPreviewWin;
std::unique_ptr m_xPreviewWin;
boolm_bPreviewBackgroundToCharacter;
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index f2489c750f3c..af085725dc3d 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -28,7 +28,7 @@
class SfxItemSet;
class FontPrevWin_Impl;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FontPrevWindow : public
weld::CustomWidgetController
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontPrevWindow : public
weld::CustomWidgetController
{
private:
std::unique_ptr pImpl;
@@ -39,8 +39,8 @@ private:
SVX_DLLPRIVATE static void SetFontLang(const SfxItemSet& rSet, sal_uInt16
nSlot, SvxFont& rFont);
public:
-FontPrevWindow();
-virtual ~FontPrevWindow() override;
+SvxFontPrevWindow();
+virtual ~SvxFontPrevWindow() override;
SvxFont&GetFont();
const SvxFont& GetFont() const;
diff --git a/reportdesign/source/ui/dlg/Condition.hxx
b/reportdesign/source/ui/dlg/Condition.hxx
index 1b9a5ea365fa..680632e8db51 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -89,7 +89,7 @@ namespace rptui
ConditionalExpressions m_aConditionalExpressions;
-FontPrevWindow m_aPreview;
+SvxFontPrevWindow m_aPreview;
weld::Window* m_pDialog;
std::unique_ptr m_xBuilder;
std::unique_ptr m_xContainer;
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 39170fcb9c77..4471ea81f80b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -417,7 +417,7 @@ void ScConditionFrmtEntry::Notify(SfxBroadcaster&, const
SfxHint& rHint)
namespace {
-void StyleSelect(weld::Window* pDialogParent, weld::ComboBox& rLbStyle, const
ScDocument* pDoc, FontPrevWindow& rWdPreview)
+void StyleSelect(weld::Window* pDialogParent, weld::ComboBox& rLbStyle, const
ScDocument* pDoc, SvxFontPrevWindow& rWdPreview)
{
if (rLbStyle.get_active() == 0)
{
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx
b/sc/source/ui/inc/condformatdlgentry.hxx
index ed987a03c7ae..7110115355d6 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -99,7 +99,7 @@ public:
class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener
{
//cond format ui elements
-FontPrevWindow maWdPreview;
+SvxFontPrevWindow maWdPreview;
std::unique_ptr mxLbCondType;
std::unique_ptr mxEdVal1;
std::unique_ptr mxEdVal2;
@@ -149,7 +149,7 @@ public:
class ScFormulaFrmtEntry : public ScCondFrmtEntry
{
-FontPrevWindow maWdPreview;
+SvxFontPrevWindow maWdPreview;
std::unique_ptr mxFtStyle;
std::unique_ptr mxLbS
[Libreoffice-commits] core.git: 2 commits - dbaccess/Library_dbu.mk dbaccess/source include/dbaccess include/svx reportdesign/source solenv/clang-format svx/source
dbaccess/Library_dbu.mk |1
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 102 --
include/dbaccess/ToolBoxHelper.hxx| 70
include/svx/colorwindow.hxx |1
reportdesign/source/ui/dlg/Condition.cxx |2
solenv/clang-format/blacklist |2
svx/source/tbxctrls/tbcontrl.cxx |5 -
7 files changed, 1 insertion(+), 182 deletions(-)
New commits:
commit 3e8828508310b1203ca14a87a4d3967d2ef1d30a
Author: Caolán McNamara
AuthorDate: Sat Oct 12 16:34:50 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 13 16:17:04 2019 +0200
no longer need bInterimBuilder
Change-Id: Ieff1e34de9665c80ded39d605656fe7d0626aec7
Reviewed-on: https://gerrit.libreoffice.org/80716
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 4656f3d37af7..8b1cc35e7565 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -166,7 +166,6 @@ public:
sal_uInt16 nSlotId,
const css::uno::Reference< css::frame::XFrame >& rFrame,
weld::Window* pParentWindow, const MenuOrToolMenuButton
&rMenuButton,
-bool bInterimBuilder,
ColorSelectFunction const& rColorSelectFunction);
weld::Container* GetWidget() { return mxTopLevel.get(); }
virtual ~ColorWindow() override;
diff --git a/reportdesign/source/ui/dlg/Condition.cxx
b/reportdesign/source/ui/dlg/Condition.cxx
index 9e79c3d8830b..5676b6b91017 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -173,7 +173,6 @@ void Condition::SetBackgroundDropdownClick()
nullptr,
m_pDialog,
MenuOrToolMenuButton(m_xActions.get(),
"background"),
-/*bInterimBuilder*/false,
m_aBackColorWrapper));
m_xActions->set_item_popover("background", m_xBackColorFloat->GetWidget());
@@ -188,7 +187,6 @@ void Condition::SetForegroundDropdownClick()
nullptr,
m_pDialog,
MenuOrToolMenuButton(m_xActions.get(),
"foreground"),
-/*bInterimBuilder*/false,
m_aForeColorWrapper));
m_xActions->set_item_popover("foreground", m_xForeColorFloat->GetWidget());
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6dc4292b57ec..510d695ffba0 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1705,11 +1705,9 @@ ColorWindow::ColorWindow(std::shared_ptr
const & rPaletteManager
const Reference< XFrame >& rFrame,
weld::Window* pParentWindow,
const MenuOrToolMenuButton& rMenuButton,
- bool bInterimBuilder,
ColorSelectFunction const & aFunction)
: ToolbarPopupBase(rFrame)
-, m_xBuilder(bInterimBuilder ?
Application::CreateInterimBuilder(rMenuButton.get_widget(),
"svx/ui/colorwindow.ui")
- :
Application::CreateBuilder(rMenuButton.get_widget(), "svx/ui/colorwindow.ui"))
+, m_xBuilder(Application::CreateBuilder(rMenuButton.get_widget(),
"svx/ui/colorwindow.ui"))
, theSlotId(nSlotId)
, mpParentWindow(pParentWindow)
, maMenuButton(rMenuButton)
@@ -4077,7 +4075,6 @@ void ColorListBox::createColorWindow()
xFrame,
m_pTopLevel,
m_xButton.get(),
-/*bInterimBuilder*/false,
m_aColorWrapper));
SetNoSelection();
commit f7a475dc7c202e1f3e8a905cb7bedbf06ec0
Author: Caolán McNamara
AuthorDate: Fri Oct 11 14:23:07 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 13 16:16:52 2019 +0200
ToolBoxHelper is now unused
Change-Id: I5e492fda0ce2b88c4e6790a6972bc36f082003a1
Reviewed-on: https://gerrit.libreoffice.org/80691
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 121584ef3426..74223abd7038 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -172,7 +172,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/misc/stringlistitem \
dbaccess/source/ui/misc/TableCopyHelper \
dbaccess/source/ui/misc/TokenWriter \
-dbaccess/source/ui/misc/ToolBoxHelper \
dbaccess/source/ui/misc/uiservices \
dbaccess/source/ui/misc/UITools \
dbaccess/source/ui/misc/WColumnSelect \
diff --git a/dbaccess/source/ui/misc/Tool
[Libreoffice-commits] core.git: 2 commits - extras/source include/svx include/vcl reportdesign/source reportdesign/uiconfig sc/uiconfig solenv/bin svx/inc svx/source vcl/source vcl/unx
extras/source/glade/libreoffice-catalog.xml.in| 12
include/svx/colorwindow.hxx | 21 +
include/svx/fntctrl.hxx | 35 --
include/vcl/weld.hxx |9
reportdesign/source/ui/dlg/AddField.cxx | 10
reportdesign/source/ui/dlg/CondFormat.cxx | 228 ++---
reportdesign/source/ui/dlg/Condition.cxx | 295 ++--
reportdesign/source/ui/dlg/Condition.hxx | 116 +++---
reportdesign/source/ui/inc/AddField.hxx |6
reportdesign/source/ui/inc/CondFormat.hxx | 40 --
reportdesign/source/ui/inc/GroupsSorting.hxx |2
reportdesign/source/ui/misc/UITools.cxx |3
reportdesign/source/ui/report/ReportController.cxx|4
reportdesign/uiconfig/dbreport/ui/condformatdialog.ui | 10
reportdesign/uiconfig/dbreport/ui/conditionwin.ui | 82 ++--
sc/uiconfig/scalc/ui/conditionalentrymobile.ui|2
solenv/bin/native-code.py |1
svx/inc/pch/precompiled_svx.hxx |4
svx/inc/pch/precompiled_svxcore.hxx | 27 -
svx/source/dialog/fntctrl.cxx | 313 --
svx/source/tbxctrls/tbcontrl.cxx | 59 ++-
vcl/source/app/salvtables.cxx | 59 +++
vcl/unx/gtk3/gtk3gtkinst.cxx | 79
23 files changed, 501 insertions(+), 916 deletions(-)
New commits:
commit d854687a1316783e40d227756fef08af925e93e6
Author: Caolán McNamara
AuthorDate: Fri Oct 11 13:04:14 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 13 16:16:39 2019 +0200
SvxFontPrevWindow is now unused
sc/uiconfig/scalc/ui/conditionalentrymobile.ui was already non-functional
before this change
Change-Id: I07743a8fcca4b3cf325ce3d3d0699bf68c0115f3
Reviewed-on: https://gerrit.libreoffice.org/80690
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index 5332c98ed52e..f2489c750f3c 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -28,35 +28,6 @@
class SfxItemSet;
class FontPrevWin_Impl;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontPrevWindow : public vcl::Window
-{
-using OutputDevice::SetFont;
-private:
-std::unique_ptr pImpl;
-bool mbResetForeground : 1;
-bool mbResetBackground : 1;
-
-SVX_DLLPRIVATE void ResetSettings(bool bForeground, bool bBackground);
-SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext)
override;
-SVX_DLLPRIVATE void Init ();
-
-public:
-SvxFontPrevWindow(vcl::Window* pParent, WinBits
nStyle);
-virtual ~SvxFontPrevWindow() override;
-virtual voiddispose() override;
-
-virtual voidStateChanged( StateChangedType nStateChange ) override;
-virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
-
-voidSetFont( const SvxFont& rNormalFont, const SvxFont&
rCJKFont, const SvxFont& rCTLFont );
-voidSetBackColor( const Color& rColor );
-voidPaint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& ) override;
-
-boolIsTwoLines() const;
-
-virtual Size GetOptimalSize() const override;
-};
-
class SAL_WARN_UNUSED SVX_DLLPUBLIC FontPrevWindow : public
weld::CustomWidgetController
{
private:
diff --git a/sc/uiconfig/scalc/ui/conditionalentrymobile.ui
b/sc/uiconfig/scalc/ui/conditionalentrymobile.ui
index a4f1b39185bd..3b1cda8a5661 100644
--- a/sc/uiconfig/scalc/ui/conditionalentrymobile.ui
+++ b/sc/uiconfig/scalc/ui/conditionalentrymobile.ui
@@ -92,7 +92,7 @@
-
+
False
Example
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 083aff353175..85a2bc8ba450 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which
presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-10-02 17:03:44 using:
+ Generated on 2019-10-11 13:05:53 using:
./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module
--include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -59,10 +59,8 @@
#include
#include
#include
-#include
#include
#include
-#include
#include
#include
#include
diff --git a/svx/inc/pch/precompiled_svxcore.hxx
b/svx/inc/pch/precompiled_svxcore.hxx
index a576a2da5eca..3978d42f17cd 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -13,7
[Libreoffice-commits] core.git: sd/sdi sd/source svx/uiconfig
sd/sdi/_drvwsh.sdi| 10
sd/sdi/sdraw.sdi | 34 ++
sd/source/ui/view/drviews2.cxx|2
sd/source/ui/view/drviewsj.cxx|8 +++
svx/uiconfig/ui/sidebarpossize.ui | 88 ++
5 files changed, 142 insertions(+)
New commits:
commit b2e5f9ead2bb7f2979afe4ba13e3950e8a3cc278
Author: Tomaž Vajngerl
AuthorDate: Sun Oct 13 12:00:50 2019 +0200
Commit: Tomaž Vajngerl
CommitDate: Sun Oct 13 14:39:17 2019 +0200
tdf#125566 Add arrangement functions to position & size sidebar
Adds arrangement actions to position & size sidebar so it is
possible to move the object up/down in the stack.
As Draw/Impress uses it's own action names for the same UNO action
(Forward/Back in Draw and ObjectForwardOne and ObjectBackOne in
Writer/Calc) also add the global ones to Draw/Impress and connect
them to the same function as Forward/Back. This commit does not
unify them however (Forward/Back are still used in menus/toolbars)
but this could be done in the future.
Change-Id: Ibb152f29dbe11dfb1b6a057e6ea60b21029912e2
Reviewed-on: https://gerrit.libreoffice.org/80729
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index e746482960aa..b49088f395c0 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -554,6 +554,11 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_FRAME_UP // ole : no, status : play rec
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_BEFORE_OBJ // ole : no, status : no
[
ExecMethod = FuTemporary ;
@@ -574,6 +579,11 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_FRAME_DOWN // ole : no, status : play rec
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_FRAME_TO_BOTTOM // ole : no, status : play rec
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index bbaff36c3d1b..b73fa0d779f1 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -175,6 +175,23 @@ SfxVoidItem Backward SID_MOREBACK
GroupId = SfxGroupId::Modify;
]
+SfxVoidItem ObjectBackOne SID_FRAME_DOWN
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Modify;
+]
+
SfxVoidItem BeforeObject SID_BEFORE_OBJ
()
[
@@ -1458,6 +1475,23 @@ SfxVoidItem Forward SID_MOREFRONT
GroupId = SfxGroupId::Modify;
]
+SfxVoidItem ObjectForwardOne SID_FRAME_UP
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Modify;
+]
+
SfxVoidItem GetBlue SID_GETBLUE
(SfxUInt32Item WhatKind ID_VAL_WHATKIND)
[
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 0928056174de..bd4f39205b3d 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2899,6 +2899,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break;
case SID_MOREFRONT: // BASIC
+case SID_FRAME_UP: // BASIC
{
mpDrawView->MovMarkedToTop();
Cancel();
@@ -2907,6 +2908,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break;
case SID_MOREBACK: // BASIC
+case SID_FRAME_DOWN: // BASIC
{
mpDrawView->MovMarkedToBtm();
Cancel();
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 165a9c3038d5..addc54e4fc9f 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -83,7 +83,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
SfxItemState::DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN
) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_TO_TOP ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_MOREFRONT ) ||
+SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_UP ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_MOREBACK ) ||
+SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_DOWN ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_FRAME_TO_BOTTOM )
||
SfxItemState::DEFAULT == rSet.GetItemState( SID_BEFORE_OBJ ) ||
SfxItemState::DEFAULT == rSet.GetItemState( SID_BEHIND_OBJ ) ||
@@ -220,7 +222,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.Disable
Re: a developer's goodbye
Hi Winfried, one little 'thank you' from me but much more appreciation for the tremendous work you did from the community. Don't write in past tense, you will always be part of it. All the best to you, Heiko On 11.10.19 15:02, Winfried Donkers wrote: > Hi all, > > The past 8 years I have had the honour and pleasure to contribute as > developer to LibreOffice (mainly Calc). > > Alas, because of health reasons I must end my contributions. > > It was great to be part of a large community focussed on making a great open > source project a success. > > Thank you all! > > > Winfried > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice -- Dr. Heiko Tietze, UX-Designer and UX-Mentor Tel: +49 30 5557992-63 | Mail: heiko.tie...@documentfoundation.org The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: https://www.documentfoundation.org/imprint signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/sft.hxx| 29 +++--
vcl/source/fontsubset/sft.cxx | 22 +++---
vcl/source/fontsubset/ttcr.cxx | 16
3 files changed, 46 insertions(+), 21 deletions(-)
New commits:
commit 9e4cbac83094c13ffbfd117f534d4275cc1ffb16
Author: Julien Nabet
AuthorDate: Sun Oct 13 09:37:16 2019 +0200
Commit: Julien Nabet
CommitDate: Sun Oct 13 12:28:31 2019 +0200
Add glyf constants + remove "offset" pattern for length var (vcl)
Change-Id: I35bf0cda789cbbaa5272b78b30a58fa8c4d8c08a
Reviewed-on: https://gerrit.libreoffice.org/80726
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 39bc2ecfd421..27a5093e61e7 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -357,7 +357,7 @@ static const int POST_isFixedPitch_offset = 12;
=> length head table = 54 bytes
*/
-static const int HEAD_Length_offset = 54;
+static const int HEAD_Length = 54;
static const int HEAD_majorVersion_offset = 0;
static const int HEAD_fontRevision_offset = 4;
@@ -393,7 +393,7 @@ static const int HEAD_glyphDataFormat_offset = 52;
...
*/
-static const int MAXP_Version1Length_offset = 32;
+static const int MAXP_Version1Length = 32;
static const int MAXP_numGlyphs_offset = 4;
static const int MAXP_maxPoints_offset = 6;
@@ -401,6 +401,31 @@ static const int MAXP_maxContours_offset = 8;
static const int MAXP_maxCompositePoints_offset = 10;
static const int MAXP_maxCompositeContours_offset = 12;
+/*
+ Some table glyf consts
+ cf https://docs.microsoft.com/fr-fr/typography/opentype/spec/glyf
+ For 0.5 version
+ TYPE NAME FROM BYTE
+ int16 numberOfContours 0
+ int16 xMin 2
+ int16 yMin 4
+ int16 xMax 6
+ int16 yMax 8
+
+ END 10
+
+ => length glyf table = 10 bytes
+
+*/
+static const int GLYF_Length = 10;
+
+static const int GLYF_numberOfContours_offset = 0;
+static const int GLYF_xMin_offset = 2;
+static const int GLYF_yMin_offset = 4;
+static const int GLYF_xMax_offset = 6;
+static const int GLYF_yMax_offset = 8;
+
+
/**
* @defgroup sft Sun Font Tools Exported Functions
*/
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 9da262cf4a42..7c527887dc65 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -386,15 +386,15 @@ static int GetSimpleTTOutline(TrueTypeFont const *ttf,
sal_uInt32 glyphID, Contr
if( glyphID >= ttf->nglyphs ) /*- glyph is not present in the
font */
return 0;
const sal_uInt8* ptr = table + ttf->goffsets[glyphID];
-const sal_Int16 numberOfContours = GetInt16(ptr, 0);
+const sal_Int16 numberOfContours = GetInt16(ptr,
GLYF_numberOfContours_offset);
if( numberOfContours <= 0 ) /*- glyph is not simple */
return 0;
if (metrics) {/*-
GetCompoundTTOutline() calls this function with NULL metrics -*/
-metrics->xMin = GetInt16(ptr, 2);
-metrics->yMin = GetInt16(ptr, 4);
-metrics->xMax = GetInt16(ptr, 6);
-metrics->yMax = GetInt16(ptr, 8);
+metrics->xMin = GetInt16(ptr, GLYF_xMin_offset);
+metrics->yMin = GetInt16(ptr, GLYF_yMin_offset);
+metrics->xMax = GetInt16(ptr, GLYF_xMax_offset);
+metrics->yMax = GetInt16(ptr, GLYF_yMax_offset);
GetMetrics(ttf, glyphID, metrics);
}
@@ -516,14 +516,14 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf,
sal_uInt32 glyphID, ControlPo
return 0;
const sal_uInt8* ptr = table + ttf->goffsets[glyphID];
-if (GetInt16(ptr, 0) != -1) /* number of contours - glyph is not
compound */
+if (GetInt16(ptr, GLYF_numberOfContours_offset) != -1) /* number of
contours - glyph is not compound */
return 0;
if (metrics) {
-metrics->xMin = GetInt16(ptr, 2);
-metrics->yMin = GetInt16(ptr, 4);
-metrics->xMax = GetInt16(ptr, 6);
-metrics->yMax = GetInt16(ptr, 8);
+metrics->xMin = GetInt16(ptr, GLYF_xMin_offset);
+metrics->yMin = GetInt16(ptr, GLYF_yMin_offset);
+metrics->xMax = GetInt16(ptr, GLYF_xMax_offset);
+metrics->yMax = GetInt16(ptr, GLYF_yMax_offset);
GetMetrics(ttf, glyphID, metrics);
}
@@ -1639,7 +1639,7 @@ static SFErrCodes doOpenTTFont( sal_uInt32 facenum,
TrueTypeFont* t )
table = getTable(t, O_head);
table_size = getTableSize(t, O_head);
-if (table_size < HEAD_Length_offset) {
+if (table_size < HEAD_Length) {
return SFErrCodes::TtFormat;
}
t->unitsPerEm = GetUInt16(table, HEAD_unitsPerEm_offset);
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index a52f8fda08b0..f6d78ef5520c 100644
--- a/vcl/so
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |1 -
1 file changed, 1 deletion(-)
New commits:
commit fb4a44b31197598843dbf1c3cb15b1fced57ae2e
Author: Tamás Zolnai
AuthorDate: Sun Oct 13 12:03:45 2019 +0200
Commit: Tamás Zolnai
CommitDate: Sun Oct 13 12:03:45 2019 +0200
This is not needed here.
Change-Id: Ib3775bdaa0ea2ca570152cb59dd604346cf0d0a8
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 1d022c22c..fd4199e2a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -640,7 +640,6 @@ L.Control.Menubar = L.Control.extend({
// SmartMenus mobile menu toggle button
$(function() {
var $mainMenuState = $('#main-menu-state');
- $('#main-menu-state').checked = false;
if ($mainMenuState.length) {
// animate mobile menu
$mainMenuState.change(function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/unoidl/unomodel.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9f5d2305437fd2bb2a6ff00247e8d4d4736f6433
Author: Jim Raykowski
AuthorDate: Sun Oct 13 09:10:29 2019 +0200
Commit: Jim Raykowski
CommitDate: Sun Oct 13 10:03:18 2019 +0200
Revert "tdf#127164 Don't add SdrUndoDelPage undos during pptx save"
Wont work because it will disable undo during any scripts that luck/unlock
documents for their duration
This reverts commit fae4f1506fc481b8dc2977d3bf9363dd8eaf4945.
Change-Id: I447560c9200d381ea93e2275abd57f91c5acc819
Reviewed-on: https://gerrit.libreoffice.org/80725
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 5ce14c618a65..c7f8113a0513 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2938,7 +2938,7 @@ void SAL_CALL SdDrawPagesAccess::remove( const
uno::Reference< drawing::XDrawPag
SdPage* pNotesPage = static_cast< SdPage* >( rDoc.GetPage(
nPage+1 ) );
-bool bUndo = rDoc.IsUndoEnabled() && !rDoc.isLocked();
+bool bUndo = rDoc.IsUndoEnabled();
if( bUndo )
{
// Add undo actions and delete the pages. The order of
adding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
