Re: Windows and 256 color displays
On 9.9.2023 3.35, Chris Sherlock wrote: Do we still support Windows on a 256 color display? If not, we could remove a huge chunk of dithering code in ImplInitSalGDI() and vastly simplify multiplatform support. We advertise 256 colors for all operating systems: https://www.libreoffice.org/get-help/system-requirements Whether that is true for non-Windows anymore, I don't know. Doing some searches, Windows 7 can be fully changed to 256 colors via Screen Resolution - Advanced Settings - Adapter - List All Modes, but Win 10/11 only offer compatibility mode for applications. Win 7 popularity relative to other Win versions is crashing finally, being 3.5% now, which *is* roughly the same that Win XP was in early 2018 when LibreOffice removed support for it and Vista. Of course dropping 256 color support doesn't have to be tied to a platform bump. Ilmari
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/wrtsh/wrtsh1.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 10689e0f24e96781664e734fe23d109af6df77f1
Author: Jim Raykowski
AuthorDate: Wed Sep 6 21:02:48 2023 -0800
Commit: Jim Raykowski
CommitDate: Sat Sep 9 02:41:12 2023 +0200
Improve the HasFoldedOutlineContentSelected function
Return false immediatly if there are no outline nodes in the document
since then there can be no folded outline content selected.
Adjust selection that includes the end of content node so that the
end of content node is not included in the selection. This fixes a
crash that occurs when outline folding is enabled and Master
document 'Text' is deleted by using the Navigator popup menu item
'Delete'.
Change-Id: I28be127566c3820b3e78834495bbb354cf2d01aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156631
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index af96916885d5..923fabb06167 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -2643,12 +2643,19 @@ bool SwWrtShell::GetAttrOutlineContentVisible(const
size_t nPos) const
bool SwWrtShell::HasFoldedOutlineContentSelected() const
{
+// No need to check for selection over folded outline content when there
are no outline nodes.
+if (GetDoc()->GetNodes().GetOutLineNds().empty())
+return false;
for(const SwPaM& rPaM : GetCursor()->GetRingContainer())
{
SwPaM aPaM(*rPaM.GetMark(), *rPaM.GetPoint());
aPaM.Normalize();
SwNodeIndex aPointIdx(aPaM.GetPoint()->GetNode());
SwNodeIndex aMarkIdx(aPaM.GetMark()->GetNode());
+// Prevent crash in the for loop below by adjusting the mark if it is
set to the end of
+// content node.
+if (aMarkIdx.GetNode() == GetDoc()->GetNodes().GetEndOfContent())
+--aMarkIdx;
if (aPointIdx == aMarkIdx)
continue;
// Return true if any nodes in PaM are folded outline content nodes.
Windows and 256 color displays
Do we still support Windows on a 256 color display? If not, we could remove a huge chunk of dithering code in ImplInitSalGDI() and vastly simplify multiplatform support. Chris Sent from my iPhone
[Libreoffice-commits] core.git: odk/examples odk/Package_examples.mk solenv/clang-format
odk/Package_examples.mk |8 odk/examples/OLE/activex/Makefile | 12 ++-- odk/examples/OLE/activex/SOActiveX.cxx |2 +- odk/examples/OLE/activex/StdAfx2.cxx|6 +++--- odk/examples/OLE/activex/so_activex.cxx |2 +- solenv/clang-format/excludelist |2 +- 6 files changed, 16 insertions(+), 16 deletions(-) New commits: commit 65325f9c2f9aff6782fa5df910e8f2f5e63dfd93 Author: Hossein AuthorDate: Thu Sep 7 17:16:24 2023 +0200 Commit: Hossein CommitDate: Sat Sep 9 01:20:46 2023 +0200 Rename .cpp examples to .cxx The files are renamed, and the associated lines in Makefiles and elsewhere are also changed. Change-Id: Ieec38055690e03afd8982320ee0836904a3f41eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156670 Tested-by: Jenkins Reviewed-by: Hossein diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk index 457aea37e166..f533a91a346c 100644 --- a/odk/Package_examples.mk +++ b/odk/Package_examples.mk @@ -366,17 +366,17 @@ $(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples, DevelopersGuide/UCB/data/data.txt \ OLE/activex/Makefile \ OLE/activex/README.txt \ -OLE/activex/SOActiveX.cpp \ +OLE/activex/SOActiveX.cxx \ OLE/activex/SOActiveX.h \ OLE/activex/SOActiveX.rgs \ -OLE/activex/SOComWindowPeer.cpp \ +OLE/activex/SOComWindowPeer.cxx \ OLE/activex/SOComWindowPeer.h \ OLE/activex/SOComWindowPeer.rgs \ -OLE/activex/StdAfx2.cpp \ +OLE/activex/StdAfx2.cxx \ OLE/activex/StdAfx2.h \ OLE/activex/example.html \ OLE/activex/resource.h \ -OLE/activex/so_activex.cpp \ +OLE/activex/so_activex.cxx \ OLE/activex/so_activex.def \ OLE/activex/so_activex.idl \ OLE/activex/so_activex.rc \ diff --git a/odk/examples/OLE/activex/Makefile b/odk/examples/OLE/activex/Makefile index 15167bc93ba4..ca893a44362a 100644 --- a/odk/examples/OLE/activex/Makefile +++ b/odk/examples/OLE/activex/Makefile @@ -50,12 +50,12 @@ OUT_COMP_SLO=$(OUT_SLO)/$(COMPONENT_NAME) MIDLFILES = so_activex.idl -CXXFILES = SOActiveX.cpp \ -SOComWindowPeer.cpp \ -so_activex.cpp \ -StdAfx2.cpp +CXXFILES = SOActiveX.cxx \ +SOComWindowPeer.cxx \ +so_activex.cxx \ +StdAfx2.cxx -SLOFILES = $(patsubst %.cpp,$(OUT_COMP_SLO)/%.$(OBJ_EXT),$(CXXFILES)) +SLOFILES = $(patsubst %.cxx,$(OUT_COMP_SLO)/%.$(OBJ_EXT),$(CXXFILES)) # Targets .PHONY: ALL @@ -76,7 +76,7 @@ $(OUT_COMP_GEN)/so_activex.res : so_activex.rc $(OUT_COMP_INC)/so_activex.h -$(MKDIR) $(subst /,$(PS),$(@D)) rc $(CC_INCLUDES) /R /FO$@ so_activex.rc -$(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cpp +$(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< diff --git a/odk/examples/OLE/activex/SOActiveX.cpp b/odk/examples/OLE/activex/SOActiveX.cxx similarity index 99% rename from odk/examples/OLE/activex/SOActiveX.cpp rename to odk/examples/OLE/activex/SOActiveX.cxx index 81159e489f2e..e29a439f3552 100644 --- a/odk/examples/OLE/activex/SOActiveX.cpp +++ b/odk/examples/OLE/activex/SOActiveX.cxx @@ -33,7 +33,7 @@ * */ -// SOActiveX.cpp : Implementation of CSOActiveX +// SOActiveX.cxx : Implementation of CSOActiveX #include "stdafx2.h" #include "so_activex.h" diff --git a/odk/examples/OLE/activex/SOComWindowPeer.cpp b/odk/examples/OLE/activex/SOComWindowPeer.cxx similarity index 100% rename from odk/examples/OLE/activex/SOComWindowPeer.cpp rename to odk/examples/OLE/activex/SOComWindowPeer.cxx diff --git a/odk/examples/OLE/activex/StdAfx2.cpp b/odk/examples/OLE/activex/StdAfx2.cxx similarity index 95% rename from odk/examples/OLE/activex/StdAfx2.cpp rename to odk/examples/OLE/activex/StdAfx2.cxx index 3911bcf24003..46743f22c2a0 100644 --- a/odk/examples/OLE/activex/StdAfx2.cpp +++ b/odk/examples/OLE/activex/StdAfx2.cxx @@ -33,7 +33,7 @@ * */ -// stdafx1.cpp : source file that includes just the standard includes +// stdafx1.cxx : source file that includes just the standard includes // stdafx1.pch will be the pre-compiled header // stdafx1.obj will contain the pre-compiled type information @@ -41,9 +41,9 @@ #ifdef _ATL_STATIC_REGISTRY #include -#include +#include #endif -#include +#include /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/OLE/activex/so_activex.cpp b/odk/examples/OLE/activex/so_activex.cxx similarity index 98% rename from odk/examples/OLE/activex/so_activex.cpp rename to odk/examples/OLE/activex/so_activex.cxx index b2cf16a80349..614d9866a7ec 100644 --- a/odk/examples/OLE/activex/so_activex.cpp +++ b/odk/exam
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/dataaccess/databasecontext.cxx |9 +
dbaccess/source/core/dataaccess/databaseregistrations.cxx |8
dbaccess/source/core/dataaccess/databaseregistrations.hxx |4 ++--
dbaccess/source/core/inc/databasecontext.hxx |2 --
4 files changed, 7 insertions(+), 16 deletions(-)
New commits:
commit debd9a749cbaaa6ec97992b6908293ec5d41bffc
Author: Noel Grandin
AuthorDate: Fri Sep 8 11:25:50 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 22:15:45 2023 +0200
no need to use XAggregation for DatabaseRegistrations
the delegating class already implements the interface and forwards the
method calls
Change-Id: I8b0c74be87656675a887ddda2e7c44b63f165c2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156699
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index dce39f3badd4..5677b5fe316f 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -177,12 +177,7 @@ ODatabaseContext::ODatabaseContext( const Reference<
XComponentContext >& _rxCon
#endif
osl_atomic_increment( &m_refCount );
-{
-m_xDBRegistrationAggregate.set( createDataSourceRegistrations(
m_aContext ), UNO_SET_THROW );
-m_xDatabaseRegistrations.set( m_xDBRegistrationAggregate,
UNO_QUERY_THROW );
-
-m_xDBRegistrationAggregate->setDelegator( *this );
-}
+m_xDatabaseRegistrations = createDataSourceRegistrations( m_aContext );
osl_atomic_decrement( &m_refCount );
}
@@ -193,8 +188,6 @@ ODatabaseContext::~ODatabaseContext()
#endif
m_xDatabaseDocumentLoader.clear();
-m_xDBRegistrationAggregate->setDelegator( nullptr );
-m_xDBRegistrationAggregate.clear();
m_xDatabaseRegistrations.clear();
}
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 40fa526d1ba7..9e53a8429ef3 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -27,7 +27,7 @@
#include
#include
-#include
+#include
#include
#include
#include
@@ -67,8 +67,8 @@ namespace dbaccess
}
// DatabaseRegistrations - declaration
-typedef ::cppu::WeakAggImplHelper1 < XDatabaseRegistrations
-> DatabaseRegistrations_Base;
+typedef ::cppu::WeakImplHelper< XDatabaseRegistrations
+ > DatabaseRegistrations_Base;
namespace {
@@ -359,7 +359,7 @@ namespace dbaccess
}
// DatabaseRegistrations - factory
-Reference< XAggregation > createDataSourceRegistrations( const
Reference & _rxContext )
+Reference< XDatabaseRegistrations > createDataSourceRegistrations( const
Reference & _rxContext )
{
return new DatabaseRegistrations( _rxContext );
}
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.hxx
b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
index 709bc9f98490..52def1de5aa2 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.hxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
@@ -20,11 +20,11 @@
#pragma once
#include
-#include
+#include
namespace dbaccess
{
-css::uno::Reference
+css::uno::Reference
createDataSourceRegistrations(const
css::uno::Reference& _rxContext);
} // namespace dbaccess
diff --git a/dbaccess/source/core/inc/databasecontext.hxx
b/dbaccess/source/core/inc/databasecontext.hxx
index 2f9bf326c9e0..d94df018d1c0 100644
--- a/dbaccess/source/core/inc/databasecontext.hxx
+++ b/dbaccess/source/core/inc/databasecontext.hxx
@@ -86,8 +86,6 @@ private:
css::uno::Reference< css::uno::XComponentContext >
m_aContext;
-css::uno::Reference< css::uno::XAggregation >
-m_xDBRegistrationAggregate;
css::uno::Reference< css::sdb::XDatabaseRegistrations >
m_xDatabaseRegistrations;
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/pdfdecomposer.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit d3e0130b1e5a0beb7995565b6e365aec248eece0
Author: Noel Grandin
AuthorDate: Fri Sep 8 14:02:13 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 22:15:27 2023 +0200
XPdfDecomposer does not need to implement XAggreggation
Checked on jenkins using 'make check' and
+void SAL_CALL setDelegator(css::uno::Reference
const &) final { assert(false); }
+
Change-Id: I324e0f8825f8b9e8619b1238624b4288720b08cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156719
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/pdf/pdfdecomposer.cxx
b/filter/source/pdf/pdfdecomposer.cxx
index c1a02c776262..e13ffbb8e162 100644
--- a/filter/source/pdf/pdfdecomposer.cxx
+++ b/filter/source/pdf/pdfdecomposer.cxx
@@ -40,6 +40,11 @@ public:
XPdfDecomposer(const XPdfDecomposer&) = delete;
XPdfDecomposer& operator=(const XPdfDecomposer&) = delete;
+void SAL_CALL setDelegator(css::uno::Reference
const&) final
+{
+assert(false);
+}
+
// XPdfDecomposer
uno::Sequence> SAL_CALL
getDecomposition(const uno::Reference&
xDataContainer,
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - cui/source sw/source vcl/jsdialog
cui/source/dialogs/QrCodeGenDialog.cxx | 27 +++
cui/source/factory/dlgfact.cxx |4 ++--
cui/source/factory/dlgfact.hxx |2 +-
cui/source/inc/QrCodeGenDialog.hxx |5 -
sw/source/uibase/uiview/viewdlg2.cxx |6 --
vcl/jsdialog/enabled.cxx |1 +
6 files changed, 39 insertions(+), 6 deletions(-)
New commits:
commit 6ed38adb5578d0b52d11d8f2077e345f9a8c7ade
Author: Darshan-upadhyay1110
AuthorDate: Thu Sep 7 13:00:50 2023 +0530
Commit: Szymon Kłos
CommitDate: Fri Sep 8 20:38:53 2023 +0200
Enable QR and barcode dialog for online
- enable QR and barcode genration dialog for online
- Change Qr code genration dialog to async
Change-Id: Ia46b8e27a3002adcc893e5ef4c2545d7edcc3e41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156642
Reviewed-by: Szymon Kłos
Tested-by: Jenkins CollaboraOffice
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index 817be7f21ede..43f6f26279ae 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -231,6 +231,33 @@ short QrCodeGenDialog::run()
#endif
}
+bool QrCodeGenDialog::runAsync(const std::shared_ptr&
rController,
+ const std::function& rFunc)
+{
+#if ENABLE_ZXING
+
+weld::GenericDialogController::runAsync(rController, [rController,
rFunc](sal_Int32 nResult) {
+if (nResult == RET_OK)
+{
+try
+{
+rController->Apply();
+}
+catch (const std::exception&)
+{
+std::unique_ptr
xBox(Application::CreateMessageDialog(
+rController->GetParent(), VclMessageType::Warning,
VclButtonsType::Ok,
+CuiResId(RID_CUISTR_QRCODEDATALONG)));
+xBox->run();
+}
+}
+
+rFunc(nResult);
+});
+#endif
+return true;
+}
+
void QrCodeGenDialog::Apply()
{
#if ENABLE_ZXING
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 091caf4d2bb7..a571b99887ae 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -113,7 +113,6 @@ IMPL_ABSTDLG_CLASS(AbstractGraphicFilterDialog)
IMPL_ABSTDLG_CLASS(AbstractHangulHanjaConversionDialog)
IMPL_ABSTDLG_CLASS(AbstractInsertObjectDialog)
IMPL_ABSTDLG_CLASS(AbstractLinksDialog)
-IMPL_ABSTDLG_CLASS(AbstractQrCodeGenDialog)
IMPL_ABSTDLG_CLASS(AbstractScreenshotAnnotationDlg)
IMPL_ABSTDLG_CLASS(AbstractSignatureLineDialog)
IMPL_ABSTDLG_CLASS(AbstractSignSignatureLineDialog)
@@ -132,6 +131,7 @@ IMPL_ABSTDLG_CLASS(AbstractSvxZoomDialog)
IMPL_ABSTDLG_CLASS(AbstractTitleDialog)
IMPL_ABSTDLG_CLASS(AbstractURLDlg)
IMPL_ABSTDLG_CLASS_ASYNC(AbstractPasswordToOpenModifyDialog,weld::DialogController)
+IMPL_ABSTDLG_CLASS_ASYNC(AbstractQrCodeGenDialog,QrCodeGenDialog)
IMPL_ABSTDLG_CLASS_ASYNC(AbstractPasteDialog,SfxDialogController)
IMPL_ABSTDLG_CLASS_ASYNC(AbstractScriptSelectorDialog,SfxDialogController)
IMPL_ABSTDLG_CLASS_ASYNC(AbstractSpellDialog,SfxDialogController)
@@ -1490,7 +1490,7 @@ VclPtr
AbstractDialogFactory_Impl::CreateQrCodeGenDialo
weld::Window* pParent, const Reference xModel, bool bEditExisting)
{
return VclPtr::Create(
-std::make_unique(pParent, xModel, bEditExisting));
+std::make_shared(pParent, xModel, bEditExisting));
}
VclPtr
AbstractDialogFactory_Impl::CreateAdditionsDialog(
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 991ec082ad48..0d60011a922b 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -406,7 +406,7 @@
DECL_ABSTDLG_CLASS(AbstractSignatureLineDialog,SignatureLineDialog)
};
// AbstractQrCodeGenDialog_Impl
-DECL_ABSTDLG_CLASS(AbstractQrCodeGenDialog,QrCodeGenDialog)
+DECL_ABSTDLG_CLASS_ASYNC(AbstractQrCodeGenDialog,QrCodeGenDialog)
};
// AbstractSignSignatureLineDialog_Impl
diff --git a/cui/source/inc/QrCodeGenDialog.hxx
b/cui/source/inc/QrCodeGenDialog.hxx
index 001df88c5581..e477c0b44879 100644
--- a/cui/source/inc/QrCodeGenDialog.hxx
+++ b/cui/source/inc/QrCodeGenDialog.hxx
@@ -24,9 +24,11 @@ public:
bool bEditExisting);
virtual short run() override;
+static bool runAsync(const std::shared_ptr& rController,
+ const std::function& rFunc);
-protected:
void Apply();
+weld::Widget* GetParent() { return mpParent; }
private:
css::uno::Reference m_xModel;
@@ -34,6 +36,7 @@ private:
std::unique_ptr m_xECC[4];
std::unique_ptr m_xSpinBorder;
std::unique_ptr m_xComboType;
+
#if ENABLE_ZXING
weld::Widget* mpParent;
#endif
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx
b/sw/source/uibase/uiview/viewdlg2.cxx
index 19678d38fdcb..597731645ebe 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.
[Libreoffice-commits] core.git: include/editeng
include/editeng/unotext.hxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 59bf2fbb5f6ebe62b4176c040054ff1c80e2d29a
Author: Noel Grandin
AuthorDate: Fri Sep 8 13:52:00 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 20:20:56 2023 +0200
SvUnoTextRangeEnumeration does not need to implement XAggreggation
Checked on jenkins using 'make check' and
+void SAL_CALL setDelegator(css::uno::Reference
const &) final { assert(false); }
+
Change-Id: I4313e8c25ab3fec4b96c7a0643c7acf9ba89785f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156717
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 213c5efa6b4f..59e670a0f06d 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -43,6 +43,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -611,7 +612,7 @@ public:
};
-class SvxUnoTextRangeEnumeration final : public ::cppu::WeakAggImplHelper1<
css::container::XEnumeration >
+class SvxUnoTextRangeEnumeration final : public ::cppu::WeakImplHelper<
css::container::XEnumeration >
{
private:
std::unique_ptr mpEditSource;
[Libreoffice-commits] core.git: emfio/source
emfio/source/emfuno/xemfparser.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b438f10910234241f7367d2598c81e0bf1e44cd4
Author: Noel Grandin
AuthorDate: Fri Sep 8 11:27:38 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 20:20:20 2023 +0200
XEmfParser does not need to implement XAggreggation
Checked on jenkins using 'make check' and
+void SAL_CALL setDelegator(css::uno::Reference
const &) final { assert(false); }
+
Change-Id: I5ff6b1e166aff1ad67464785cf39d748f5dfc236
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156700
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/emfio/source/emfuno/xemfparser.cxx
b/emfio/source/emfuno/xemfparser.cxx
index c8641d3f2acc..077446078936 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -21,7 +21,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -43,7 +43,7 @@ namespace emfio::emfreader
{
namespace {
-class XEmfParser : public ::cppu::WeakAggImplHelper2<
graphic::XEmfParser, lang::XServiceInfo >
+class XEmfParser : public ::cppu::WeakImplHelper< graphic::XEmfParser,
lang::XServiceInfo >
{
private:
uno::Reference< uno::XComponentContext > context_;
[Libreoffice-commits] core.git: sc/qa sw/qa
sc/qa/uitest/calc_tests8/navigator.py |3 ++-
sw/qa/uitest/navigator/tdf144672.py | 30 +++---
sw/qa/uitest/navigator/tdf154521.py |7 ---
3 files changed, 21 insertions(+), 19 deletions(-)
New commits:
commit f2ba17fecb60d936599efb975d96a3ea06c2a43f
Author: Noel Grandin
AuthorDate: Fri Sep 8 14:41:58 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 19:27:44 2023 +0200
disable more flakey navigator UITest
Change-Id: Icf6a28f1270fc95a4edfc81a06fc79d5d2da17df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156720
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/qa/uitest/calc_tests8/navigator.py
b/sc/qa/uitest/calc_tests8/navigator.py
index 313b0d572e31..d0a3280619a5 100644
--- a/sc/qa/uitest/calc_tests8/navigator.py
+++ b/sc/qa/uitest/calc_tests8/navigator.py
@@ -142,7 +142,8 @@ class navigator(UITestCase):
xColumn.executeAction("TYPE", mkPropertyValues({"TEXT":"B"}))
xColumn.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"RETURN"}))
xToolkit.processEventsToIdle()
-self.assertEqual(get_state_as_dict(xColumn)['Value'], '2')
+# disable flakey UITest
+#self.assertEqual(get_state_as_dict(xColumn)['Value'], '2')
xRow.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
xRow.executeAction("TYPE",
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
diff --git a/sw/qa/uitest/navigator/tdf144672.py
b/sw/qa/uitest/navigator/tdf144672.py
index 4bded66dcb08..790840ad3329 100644
--- a/sw/qa/uitest/navigator/tdf144672.py
+++ b/sw/qa/uitest/navigator/tdf144672.py
@@ -40,21 +40,21 @@ class tdf144672(UITestCase):
# tdf#129625: Without the fix in place, this test would have
failed with
# AssertionError: 'true' != 'false'
self.assertEqual('true',
get_state_as_dict(xReferences)['IsSemiTransparent'])
-
-xIndexes = self.get_item(xContentTree, 'Indexes')
-self.assertEqual('Indexes', get_state_as_dict(xIndexes)['Text'])
-self.assertEqual('false',
get_state_as_dict(xIndexes)['IsSemiTransparent'])
-
-xIndexes.executeAction("EXPAND", tuple())
-
-self.assertEqual('3', get_state_as_dict(xIndexes)['Children'])
-
-for i in range(3):
-# Without the fix in place, this test would have failed here
with
-# AssertionError: 'false' != 'true'
-self.assertEqual('false',
get_state_as_dict(xIndexes.getChild(i))['IsSemiTransparent'])
-
-xIndexes.executeAction("COLLAPSE", tuple())
+# disable flakey UITest
+#xIndexes = self.get_item(xContentTree, 'Indexes')
+#self.assertEqual('Indexes', get_state_as_dict(xIndexes)['Text'])
+#self.assertEqual('false',
get_state_as_dict(xIndexes)['IsSemiTransparent'])
+#
+#xIndexes.executeAction("EXPAND", tuple())
+#
+#self.assertEqual('3', get_state_as_dict(xIndexes)['Children'])
+#
+#for i in range(3):
+## Without the fix in place, this test would have failed here
with
+## AssertionError: 'false' != 'true'
+#self.assertEqual('false',
get_state_as_dict(xIndexes.getChild(i))['IsSemiTransparent'])
+#
+#xIndexes.executeAction("COLLAPSE", tuple())
self.xUITest.executeCommand(".uno:Sidebar")
diff --git a/sw/qa/uitest/navigator/tdf154521.py
b/sw/qa/uitest/navigator/tdf154521.py
index 7b2125646ec6..c2140f2ce889 100644
--- a/sw/qa/uitest/navigator/tdf154521.py
+++ b/sw/qa/uitest/navigator/tdf154521.py
@@ -155,9 +155,10 @@ class tdf154521(UITestCase):
# Try the same selection with Bookmark 2
xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"UP"}))
-self.ui_test.wait_until_property_is_updated(xContentTree,
"SelectEntryText", "Bookmark 2")
-
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark
2")
-
self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1")
+# disable flakey UITest
+#self.ui_test.wait_until_property_is_updated(xContentTree,
"SelectEntryText", "Bookmark 2")
+#
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark
2")
+#
self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1")
xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"RETURN"}))
self.ui_test.wait_until_property_is_updated(xContentTree,
"SelectEntryText", "Bookmark 2")
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark
2")
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/PropertyMapper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9e24e0160b3cb0d2bbd5ffe584d98a126783d279
Author: Noel Grandin
AuthorDate: Fri Sep 8 13:47:38 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 18:39:37 2023 +0200
improve log message
Change-Id: Ifb793b9f1d1476617239b826705f8838bdc66303
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156714
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/view/main/PropertyMapper.cxx
b/chart2/source/view/main/PropertyMapper.cxx
index 2700769f595c..c3241049057a 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -119,7 +119,7 @@ void PropertyMapper::setMappedProperties(
}
catch( const uno::Exception& )
{
-TOOLS_WARN_EXCEPTION("chart2", "" );
+TOOLS_WARN_EXCEPTION("chart2", "exception mapping property from "
<< rSource << " to " << rTarget);
}
}
if (nN == 0)
[Libreoffice-commits] core.git: include/svl svl/source sw/inc sw/source
include/svl/itemset.hxx | 44 + svl/source/items/itemset.cxx | 972 +++ svl/source/items/poolcach.cxx|2 sw/inc/swatrset.hxx |2 sw/source/core/attr/swatrset.cxx | 12 5 files changed, 530 insertions(+), 502 deletions(-) New commits: commit c1f3b34f871d2a6bb9ee7b912492be1164eec96f Author: Armin Le Grand (allotropia) AuthorDate: Tue Aug 29 11:17:59 2023 +0200 Commit: Armin Le Grand CommitDate: Fri Sep 8 17:38:24 2023 +0200 ITEM: preparations for more/easier changes II Again this is a change to improve understandabilty/changeability of SfxItemSet code plus some cleanups. Still did a callgrind round to check - it slightly got faster. In a start/load(complex SW doc)/ show/shutdown cycle compared with master I get 96.722 mio cycles compared with 99.851 mio in master. Main focus was to isolate two aspects: preparation and cleanup of an Item for usage in an SfxItemSet. For that we now have implCreateItemEntry: to do all needed actions to create/prepare an Item for membership, including evtl. AddRef/Cloning/using ItemPool stuff. implCleanupItemEntry: to do all needed actios to correctly clean that Item up again. All formally accesses distributed over SfxItemSet (and other places) are cleaned-up to use these. The Item-counter in DBG code that I already added helped a lot to do this. Also cleaned up PutImpl to 1st check if action is necessary (Item is already in place) or not, reducing spot to cleanup an Item that was handed over as bPassingOwnership to one place. I also added a 2nd flag, bItemIsSetMember, that tells if the Item given as input is already member of an SfxItemSet, in that case a shortcut can be used (increase AddRef, use). Adapted all places AFAP to use the new container interface (begin(), end(), ...) where useful. Made GetItemState inline and directly use the tooling method. Same for InvalidateItem. Added much more comments to describe what's going on or to hint at problems (check for CAUTION). Removed PutDirect - not needed anymore, probably was there to not get recursive death loop with callbacks in SW. More smaller changes. Checked with all apps, played around. Still, stuff may come up, so I put on gerrit the tests will show and give further hints. At last SfxItemSet is a minefield :-) Had to adapt SfxItemSet::implCreateItemEntry when input Item is a StaticDefaultItem. SfxItemPool::PutImpl needs to be called in that case. Had to correct bItemIsSetMember in all cases if the transfer of SfxPoolItems is between SfxItemSets with different SfxItemPools. This is and will be necessary as long as the Items are stored at the pool. After a hard deep-dive I found the error: m_nCount was not in all cases correct, invalid items get counted. Win build *insists* for initialzation of local var aEntry in SfxItemSet::PutImpl, triggers warning C4701: "potentially uninitialized local variable 'aEntry' used". This is not the case here, but I know of no way to silence the warning in another way, so added an extra-call to begin(). Re-added to use static pool defaults directly, possible After the fix 6d8c6e8d60956fd36094035a526c1a29a902204b, thanks for that. This avoids some cloning of Items. CAUTION: static default items are not *that* static as it seems (or: should be). If they are freed with the Pool (see ::ReleaseDefaults) they will be deleted. If the target pool is different from the source pool static default items from the source pool can be used that then might be deleted (sigh). A solution would be to change all pools to really work on static instances of default items. Another one would be to know here that the targetPool != sourcePool, so maybe extend bItemIsSetMember -> bSamePool. A good test for this is CppunitTest_chart2_uichart/testTdf98690. Until solving/cleaning up we unfortunately *have* to continue to clone static default items... Change-Id: Ibd8dc6d612f594a5ad88c75fcee8726d89a6090c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156306 Tested-by: Jenkins Reviewed-by: Armin Le Grand diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 37141a0a79b3..ba14c21b8e6c 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -85,9 +85,7 @@ private: const SfxItemSet& operator=(const SfxItemSet &) = delete; protected: -voidPutDirect(const SfxPoolItem &rItem); - -virtual const SfxPoolItem* PutImpl( const SfxPoolItem&, sal_uInt16 nWhich, bool bPassingOwnership ); +virtual const SfxPoolItem* PutImpl( const SfxPoolItem&, sal_uInt16 nWhich, bool bItemIsSetMember,
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/CppunitTest_sc_theme_import_export_test.mk
sc/CppunitTest_sc_theme_import_export_test.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 4c884a7924e4f10217e7785ffa81f137db6c32eb Author: Mike Kaganski AuthorDate: Thu Jun 29 12:04:02 2023 +0300 Commit: Mike Kaganski CommitDate: Fri Sep 8 16:35:05 2023 +0200 Fix build Failing like ThemeImportExportTest.o : error LNK2019: unresolved external symbol "__declspec(dllimport) public: class Color const & __cdecl SvxBrushItem::GetColor(void)const " (__imp_?GetColor@SvxBrushItem@@QEBAAEBVColor@@XZ) referenced in function "public: void __cdecl testCellBackgroundThemeColor::TestBody(void)" (?TestBody@testCellBackgroundThemeColor@@QEAAXXZ) ThemeImportExportTest.o : error LNK2019: unresolved external symbol "__declspec(dllimport) public: class model::ComplexColor const & __cdecl SvxBrushItem::getComplexColor(void)const " (__imp_?getComplexColor@SvxBrushItem@@QEBAAEBVComplexColor@model@@XZ) referenced in function "public: void __cdecl testCellBackgroundThemeColor::TestBody(void)" (?TestBody@testCellBackgroundThemeColor@@QEAAXXZ) C:\lo\src\build\workdir\LinkTarget\CppunitTest\test_sc_theme_import_export_test.dll : fatal error LNK1120: 2 unresolved externals Change-Id: I7a64405e3e8bf774163d8f101681c2c0de892767 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153736 Tested-by: Jenkins Reviewed-by: Mike Kaganski Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156704 Tested-by: Jenkins CollaboraOffice diff --git a/sc/CppunitTest_sc_theme_import_export_test.mk b/sc/CppunitTest_sc_theme_import_export_test.mk index 22b0a2eea6a2..9b2ce60f595f 100644 --- a/sc/CppunitTest_sc_theme_import_export_test.mk +++ b/sc/CppunitTest_sc_theme_import_export_test.mk @@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_theme_import_export_test, \ comphelper \ cppu \ cppuhelper \ +editeng \ sal \ salhelper \ sax \
Re: CppunitTest_dbaccess_hsqldb_test failure
On Fri, 8 Sep 2023 14:02:54 +0200 Dan Horák wrote: > Hello, > > I am seeing CppunitTest_dbaccess_hsqldb_test failing on some systems and > on some occasions. > > ... > Running scope as unit: > -home-jenkins-workspace-libreoffice\x2dupstream\x2dbundled-label-LO\x2dppc64le-workdir-CppunitTest-dbaccess_hsqldb_test.test:20230907213220:2142227.scope > [_RUN_] HSQLDBTest::testEmptyDBConnection > HSQLDBTest::testEmptyDBConnection finished in: 1353ms > OK (1) >PID: 2142247 (cppunittester) >UID: 1003 (jenkins) >GID: 1003 (jenkins) > Signal: 5 (TRAP) > Timestamp: Thu 2023-09-07 21:32:22 UTC (15s ago) > Command Line: > /home/jenkins/workspace/libreoffice-upstream-bundled/label/LO-ppc64le/workdir/LinkTarget/Executable/cppunittester > > /home/jenkins/workspace/libreoffice-upstream-bundled/label/LO-ppc64le/workdir/LinkTarget/CppunitTest/libtest_dbaccess_hsqldb_test.so > --headless > -env:BRAND_BASE_DIR=file:///home/jenkins/workspace/libreoffice-upstream-bundled/label/LO-ppc64le/instdir > -env:BRAND_SHARE_SUBDIR=share > -env:BRAND_SHARE_RESOURCE_SUBDIR=program/resource > ... > > > I suspect it's because the time to complete the check is over 1000ms. > When the run time captured in > workdir/CppunitTest/dbaccess_hsqldb_test.test.log > is bellow 1000 (usually 600-800ms), the test passes. The obvious > question is where I can extend the timeout? hmm, or it is not a timeout, got a passed test with added 5 sec sleep in HSQLDBTest::testEmptyDBConnection() ... Dan
[Libreoffice-commits] core.git: solenv/flatpak-manifest.in
solenv/flatpak-manifest.in |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 93aa47535267435fd327368875e46a33f86b39d6
Author: Stephan Bergmann
AuthorDate: Fri Sep 8 12:27:26 2023 +0200
Commit: Stephan Bergmann
CommitDate: Fri Sep 8 15:56:19 2023 +0200
Flatpak build needs external/java_websocket
Change-Id: Ie327885b238134092b4d3dd5f406941cf452239a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156707
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 84c35e99a7e6..bb5a174cba3f 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -681,6 +681,13 @@
"dest": "external/tarballs",
"dest-filename": "@FROZEN_TARBALL@"
},
+{
+"url":
"https://dev-www.libreoffice.org/src/@JAVA_WEBSOCKET_TARBALL@";,
+"sha256": "@JAVA_WEBSOCKET_SHA256SUM@",
+"type": "file",
+"dest": "external/tarballs",
+"dest-filename": "@JAVA_WEBSOCKET_TARBALL@"
+},
{
"url":
"https://dev-www.libreoffice.org/extern/@OPENSYMBOL_TTF@";,
"sha256": "@OPENSYMBOL_SHA256SUM@",
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/XMLIndexSimpleEntryContext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 425ca75d71497aebae5f5fdfdb20f65a6422a9d3
Author: Noel Grandin
AuthorDate: Fri Sep 8 13:29:49 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 15:36:48 2023 +0200
WARN->INFO in XMLIndexSimpleEntryContext
This is not generally a problem
Change-Id: If7957da45e5ad00f881ef3a7c5c676b09494ec77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156713
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index d8f2e79bc259..6c59f13380f3 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -75,7 +75,7 @@ void XMLIndexSimpleEntryContext::startFastElement(
m_bCharStyleNameOK = false;
}
else
-XMLOFF_WARN_UNKNOWN("xmloff", aIter);
+XMLOFF_INFO_UNKNOWN("xmloff", aIter);
}
// if we have a style name, set it!
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/qa
sc/qa/unit/ThemeImportExportTest.cxx | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 48720d869df42bdcf2d9444e508068e91a3bd9c3
Author: Mike Kaganski
AuthorDate: Tue Jul 4 11:50:01 2023 +0200
Commit: Mike Kaganski
CommitDate: Fri Sep 8 15:19:04 2023 +0200
Fix build on Win64, where int != sal_Int32
Change-Id: Id835da668042a656ace0f09a7fa9bc852b968b3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153926
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit b68e4a2d0179558180085bfe28a32a1510aeb3e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154251
Reviewed-by: Michael Stahl
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156703
Tested-by: Jenkins CollaboraOffice
diff --git a/sc/qa/unit/ThemeImportExportTest.cxx
b/sc/qa/unit/ThemeImportExportTest.cxx
index 7d0eb47ee2c9..e8e1a31dbbff 100644
--- a/sc/qa/unit/ThemeImportExportTest.cxx
+++ b/sc/qa/unit/ThemeImportExportTest.cxx
@@ -194,9 +194,9 @@ void checkCellBackgroundThemeColor(ScDocument* pDoc)
auto& rTransformations = aComplexColor.getTransformations();
CPPUNIT_ASSERT_EQUAL(size_t(2), rTransformations.size());
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod,
rTransformations[0].meType);
-CPPUNIT_ASSERT_EQUAL(20, roundToPercent(rTransformations[0].mnValue));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(20),
roundToPercent(rTransformations[0].mnValue));
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumOff,
rTransformations[1].meType);
-CPPUNIT_ASSERT_EQUAL(80, roundToPercent(rTransformations[1].mnValue));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(80),
roundToPercent(rTransformations[1].mnValue));
}
// A3
@@ -213,7 +213,7 @@ void checkCellBackgroundThemeColor(ScDocument* pDoc)
auto& rTransformations = aComplexColor.getTransformations();
CPPUNIT_ASSERT_EQUAL(size_t(1), rTransformations.size());
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod,
rTransformations[0].meType);
-CPPUNIT_ASSERT_EQUAL(50, roundToPercent(rTransformations[0].mnValue));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(50),
roundToPercent(rTransformations[0].mnValue));
}
}
@@ -265,9 +265,9 @@ void checkCellTextThemeColor(ScDocument* pDoc)
auto& rTransformations = aComplexColor.getTransformations();
CPPUNIT_ASSERT_EQUAL(size_t(2), rTransformations.size());
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod,
rTransformations[0].meType);
-CPPUNIT_ASSERT_EQUAL(60, roundToPercent(rTransformations[0].mnValue));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(60),
roundToPercent(rTransformations[0].mnValue));
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumOff,
rTransformations[1].meType);
-CPPUNIT_ASSERT_EQUAL(40, roundToPercent(rTransformations[1].mnValue));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(40),
roundToPercent(rTransformations[1].mnValue));
}
// B3
@@ -284,7 +284,7 @@ void checkCellTextThemeColor(ScDocument* pDoc)
auto& rTransformations = aComplexColor.getTransformations();
CPPUNIT_ASSERT_EQUAL(size_t(1), rTransformations.size());
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod,
rTransformations[0].meType);
-CPPUNIT_ASSERT_EQUAL(50, roundToPercent(rTransformations[0].mnValue));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(50),
roundToPercent(rTransformations[0].mnValue));
}
}
@@ -350,9 +350,9 @@ void checkCellBorderThemeColor(ScDocument* pDoc)
auto& rTransformations = aComplexColor.getTransformations();
CPPUNIT_ASSERT_EQUAL(size_t(2), rTransformations.size());
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod,
rTransformations[0].meType);
-CPPUNIT_ASSERT_EQUAL(20,
roundToPercent(rTransformations[0].mnValue));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(20),
roundToPercent(rTransformations[0].mnValue));
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumOff,
rTransformations[1].meType);
-CPPUNIT_ASSERT_EQUAL(80,
roundToPercent(rTransformations[1].mnValue));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(80),
roundToPercent(rTransformations[1].mnValue));
}
{
auto* pTop = pBoxItem->GetRight();
@@ -363,9 +363,9 @@ void checkCellBorderThemeColor(ScDocument* pDoc)
auto& rTransformations = aComplexColor.getTransformations();
CPPUNIT_ASSERT_EQUAL(size_t(2), rTransformations.size());
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod,
rTransformations[0].meType);
-CPPUNIT_ASSERT_EQUAL(20,
roundToPercent(rTransformations[0].mnValue));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(20),
roundToPercent(rTransformations[0].mnValue));
CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumOff,
rTransformations[1].meType);
-CPPUNIT_ASSER
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - filter/source filter/uiconfig offapi/com offapi/UnoApi_offapi.mk sc/inc sc/qa sc/source sd/qa sw/qa
filter/source/pdf/impdialog.cxx | 62 +++---
filter/source/pdf/impdialog.hxx | 12 -
filter/source/pdf/pdfexport.cxx |9
filter/uiconfig/ui/pdfgeneralpage.ui | 62 ++
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/sheet/XSheetRange.idl | 42
sc/inc/viewuno.hxx|5 ++
sc/qa/uitest/calc_tests4/exportToPDF.py |2
sc/source/ui/unoobj/docuno.cxx| 13 +-
sc/source/ui/unoobj/viewuno.cxx | 32 +++
sc/source/ui/view/printfun.cxx|2
sd/qa/uitest/impress_tests/exportToPDF.py |2
sw/qa/uitest/writer_tests4/exportToPDF.py |2
13 files changed, 217 insertions(+), 29 deletions(-)
New commits:
commit dd9f787875a9a953d1fb84de44e04fd2a0c2f8c1
Author: NickWingate
AuthorDate: Tue Aug 29 15:31:08 2023 +0100
Commit: Szymon Kłos
CommitDate: Fri Sep 8 15:04:41 2023 +0200
Add export sheet range option to calc
User can specify which sheets to export e.g. '2-5,7'
exports sheets 2,3,4,5,7.
Note: this is different from exporting pages as one
sheet may contain several pages worth of content.
Also fix a bug where exporting only a selected sheet
causes the next sheet to be exported. e.g.:
Sheet 1 is empty, Sheet 2 has content. Exporting Sheet 1
results in Sheet 2's content being exported
Signed-off-by: NickWingate
Change-Id: Iecd42188ddbbbcd70eb37bec80783e29e3cb5b19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156255
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 2723afbf0ab8..d9f3f3576a4e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -106,8 +106,10 @@ ImpPDFTabDialog::ImpPDFTabDialog(weld::Window* pParent,
const Sequence< Property
mbCanCopyOrExtract( false ),
mbCanExtractForAccessibility( true ),
-mbIsRangeChecked( false ),
+mbIsPageRangeChecked( false ),
msPageRange( ' ' ),
+mbIsSheetRangeChecked( false ),
+msSheetRange( ' ' ),
mbSelectionIsChecked( false ),
mbExportRelativeFsysLinks( false ),
@@ -492,8 +494,10 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
comphelper::makePropertyValue("RestrictPermissions",
mbRestrictPermissions),
comphelper::makePropertyValue("PreparedPermissionPassword",
maPreparedOwnerPassword)
};
-if( mbIsRangeChecked )
+if( mbIsPageRangeChecked )
aRet.push_back(comphelper::makePropertyValue("PageRange",
msPageRange));
+if( mbIsSheetRangeChecked )
+aRet.push_back(comphelper::makePropertyValue("SheetRange",
msSheetRange));
else if( mbSelectionIsChecked )
aRet.push_back(comphelper::makePropertyValue("Selection",
maSelection));
@@ -517,9 +521,11 @@
ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(weld::Container* pPage, weld::DialogC
, mbIsWriter(false)
, mpParent(nullptr)
, mxRbAll(m_xBuilder->weld_radio_button("all"))
-, mxRbRange(m_xBuilder->weld_radio_button("range"))
+, mxRbPageRange(m_xBuilder->weld_radio_button("pagerange"))
+, mxRbSheetRange(m_xBuilder->weld_radio_button("sheetrange"))
, mxRbSelection(m_xBuilder->weld_radio_button("selection"))
, mxEdPages(m_xBuilder->weld_entry("pages"))
+, mxEdSheets(m_xBuilder->weld_entry("sheets"))
,
mxRbLosslessCompression(m_xBuilder->weld_radio_button("losslesscompress"))
, mxRbJPEGCompression(m_xBuilder->weld_radio_button("jpegcompress"))
, mxQualityFrame(m_xBuilder->weld_widget("qualityframe"))
@@ -550,7 +556,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(weld::Container*
pPage, weld::DialogC
, mxFtWatermark(m_xBuilder->weld_label("watermarklabel"))
, mxEdWatermark(m_xBuilder->weld_entry("watermarkentry"))
, mxSlidesFt(m_xBuilder->weld_label("slides"))
-, mxSheetsFt(m_xBuilder->weld_label("selectedsheets"))
+, mxSheetsSelectionFt(m_xBuilder->weld_label("selectedsheets"))
{
}
@@ -565,11 +571,13 @@ void
ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
mpParent = pParent;
// init this class data
-mxRbRange->connect_toggled( LINK( this, ImpPDFTabGeneralPage,
TogglePagesHdl ) );
+mxRbPageRange->connect_toggled( LINK( this, ImpPDFTabGeneralPage,
TogglePagesHdl ) );
+mxRbSheetRange->connect_toggled( LINK( this, ImpPDFTabGeneralPage,
ToggleSheetsHdl ) );
mxRbAll->set_active(true);
mxRbAll->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleAllHdl )
);
TogglePagesHdl();
+ToggleSheetsHdl();
mxRbSelection->set_sensitive( pParent->mbSelectionPresent );
if ( pParent->mbSelectionPresent )
@@ -654,7 +662,7 @@ void
ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
if ( mbIsPresent
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uno/unomod.cxx | 38 +++---
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit edffc763fb56453dc2eba15bb8c9450639c69db1
Author: Noel Grandin
AuthorDate: Fri Sep 8 13:28:05 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 14:54:41 2023 +0200
improve exception message
Change-Id: If4d924b07875ffb8586e93eb84b4f01cd0c3ba34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156712
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 499f4ebea0e7..63250ede8526 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -284,11 +284,11 @@ void SwXPrintSettings::_preSetValues ()
namespace
{
-bool tryBoolAccess(const uno::Any &rValue)
+bool tryBoolAccess(std::u16string_view rName, const uno::Any &rValue)
{
const std::optional xPrSet = o3tl::tryAccess(rValue);
if (!xPrSet.has_value())
-throw lang::IllegalArgumentException();
+throw
lang::IllegalArgumentException(OUString(OUString::Concat(rName) + " no value"),
nullptr, 0);
return *xPrSet;
}
}
@@ -299,62 +299,62 @@ void SwXPrintSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo,
{
case HANDLE_PRINTSET_LEFT_PAGES:
{
-mpPrtOpt->SetPrintLeftPage(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintLeftPage(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_RIGHT_PAGES:
{
-mpPrtOpt->SetPrintRightPage(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintRightPage(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_REVERSED:
{
-mpPrtOpt->SetPrintReverse(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintReverse(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_PROSPECT:
{
-mpPrtOpt->SetPrintProspect(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintProspect(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_GRAPHICS:
{
-mpPrtOpt->SetPrintGraphic(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintGraphic(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_TABLES:
{
-mpPrtOpt->SetPrintTable(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintTable(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_DRAWINGS:
{
-mpPrtOpt->SetPrintDraw(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintDraw(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_CONTROLS:
{
-mpPrtOpt->SetPrintControl(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintControl(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_PAGE_BACKGROUND:
{
-mpPrtOpt->SetPrintPageBackground(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintPageBackground(tryBoolAccess(rInfo.maName,
rValue));
}
break;
case HANDLE_PRINTSET_BLACK_FONTS:
{
-mpPrtOpt->SetPrintBlackFont(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintBlackFont(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_SINGLE_JOBS:
{
-mpPrtOpt->SetPrintSingleJobs(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintSingleJobs(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_PAPER_FROM_SETUP:
{
-mpPrtOpt->SetPaperFromSetup(tryBoolAccess(rValue));
+mpPrtOpt->SetPaperFromSetup(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_ANNOTATION_MODE:
@@ -363,14 +363,14 @@ void SwXPrintSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo,
rValue >>= nTmp;
SwPostItMode nVal = static_cast(nTmp);
if(nVal > SwPostItMode::EndPage)
-throw lang::IllegalArgumentException();
+throw lang::IllegalArgumentException(OUString::number(nTmp) +
" > SwPostItMode::EndPage", nullptr, 0);
mpPrtOpt->SetPrintPostIts(nVal);
}
break;
case HANDLE_PRINTSET_EMPTY_PAGES:
{
-mpPrtOpt->SetPrintEmptyPages(tryBoolAccess(rValue));
+mpPrtOpt->SetPrintEmptyPages(tryBoolAccess(rInfo.maName, rValue));
}
break;
case HANDLE_PRINTSET_FAX_NAME:
@@ -384,17 +384,17 @@ void SwXPrintSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo,
break;
case HANDLE_PRINTSET_PROSPECT_RTL:
{
-
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/AccessibilityIssue.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2768ada1943a4dfb7ac2fc080656e151dd55efb8
Author: Samuel Mehrbrodt
AuthorDate: Thu Sep 7 13:56:30 2023 +0200
Commit: Samuel Mehrbrodt
CommitDate: Fri Sep 8 14:07:11 2023 +0200
tdf#157134 Fix selecting shape when image was selected before
Change-Id: Ia45385aa5f76390f17fbcb14f7872ba0a0d9e14f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156665
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/core/access/AccessibilityIssue.cxx
b/sw/source/core/access/AccessibilityIssue.cxx
index 731930a9500e..6ec39238cda9 100644
--- a/sw/source/core/access/AccessibilityIssue.cxx
+++ b/sw/source/core/access/AccessibilityIssue.cxx
@@ -91,6 +91,8 @@ void AccessibilityIssue::gotoIssue() const
case IssueObject::SHAPE:
{
SwWrtShell* pWrtShell =
TempIssueObject.m_pDoc->GetDocShell()->GetWrtShell();
+if (pWrtShell->IsFrameSelected())
+pWrtShell->LeaveSelFrameMode();
pWrtShell->GotoDrawingObject(TempIssueObject.m_sObjectID);
if (comphelper::LibreOfficeKit::isActive())
pWrtShell->ShowCursor();
[Libreoffice-commits] core.git: include/cppuhelper sc/inc sc/source
include/cppuhelper/queryinterface.hxx | 248 ++
sc/inc/miscuno.hxx| 10 -
sc/source/ui/unoobj/cellsuno.cxx | 133 ++
sc/source/ui/unoobj/cursuno.cxx | 11 -
sc/source/ui/unoobj/dapiuno.cxx |9 -
sc/source/ui/unoobj/docuno.cxx| 37 ++---
sc/source/ui/unoobj/viewuno.cxx | 50 --
7 files changed, 385 insertions(+), 113 deletions(-)
New commits:
commit fbe8cc7feb9ead5918b0c52d4211caf4a10c8212
Author: Noel Grandin
AuthorDate: Fri Sep 8 11:28:30 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 14:03:14 2023 +0200
inline SC_QUERYINTERFACE macros
which means we need a few more cppu::queryInterface variants
Change-Id: I5cf7805ab9576919bfd66a3b239917e48a7f8f61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156701
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/cppuhelper/queryinterface.hxx
b/include/cppuhelper/queryinterface.hxx
index df9c9916cf8e..25961154b4d1 100644
--- a/include/cppuhelper/queryinterface.hxx
+++ b/include/cppuhelper/queryinterface.hxx
@@ -519,6 +519,254 @@ inline css::uno::Any SAL_CALL queryInterface(
return css::uno::Any();
}
+/** Compares demanded type to given template argument types.
+@return acquired interface of demanded type or empty Any
+*/
+template< class Interface1, class Interface2, class Interface3, class
Interface4, class Interface5,
+ class Interface6, class Interface7, class Interface8, class
Interface9, class Interface10,
+ class Interface11, class Interface12, class Interface13 >
+inline css::uno::Any SAL_CALL queryInterface(
+const css::uno::Type & rType,
+Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4,
Interface5 * p5,
+Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9,
Interface10 * p10,
+Interface11 * p11, Interface12 * p12, Interface13 * p13 )
+{
+if (rType == Interface1::static_type())
+return css::uno::Any( &p1, rType );
+else if (rType == Interface2::static_type())
+return css::uno::Any( &p2, rType );
+else if (rType == Interface3::static_type())
+return css::uno::Any( &p3, rType );
+else if (rType == Interface4::static_type())
+return css::uno::Any( &p4, rType );
+else if (rType == Interface5::static_type())
+return css::uno::Any( &p5, rType );
+else if (rType == Interface6::static_type())
+return css::uno::Any( &p6, rType );
+else if (rType == Interface7::static_type())
+return css::uno::Any( &p7, rType );
+else if (rType == Interface8::static_type())
+return css::uno::Any( &p8, rType );
+else if (rType == Interface9::static_type())
+return css::uno::Any( &p9, rType );
+else if (rType == Interface10::static_type())
+return css::uno::Any( &p10, rType );
+else if (rType == Interface11::static_type())
+return css::uno::Any( &p11, rType );
+else if (rType == Interface12::static_type())
+return css::uno::Any( &p12, rType );
+else if (rType == Interface13::static_type())
+return css::uno::Any( &p13, rType );
+else
+return css::uno::Any();
+}
+
+/** Compares demanded type to given template argument types.
+@return acquired interface of demanded type or empty Any
+*/
+template< class Interface1, class Interface2, class Interface3, class
Interface4, class Interface5,
+ class Interface6, class Interface7, class Interface8, class
Interface9, class Interface10,
+ class Interface11, class Interface12, class Interface13, class
Interface14 >
+inline css::uno::Any SAL_CALL queryInterface(
+const css::uno::Type & rType,
+Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4,
Interface5 * p5,
+Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9,
Interface10 * p10,
+Interface11 * p11, Interface12 * p12, Interface13 * p13, Interface14 * p14
)
+{
+if (rType == Interface1::static_type())
+return css::uno::Any( &p1, rType );
+else if (rType == Interface2::static_type())
+return css::uno::Any( &p2, rType );
+else if (rType == Interface3::static_type())
+return css::uno::Any( &p3, rType );
+else if (rType == Interface4::static_type())
+return css::uno::Any( &p4, rType );
+else if (rType == Interface5::static_type())
+return css::uno::Any( &p5, rType );
+else if (rType == Interface6::static_type())
+return css::uno::Any( &p6, rType );
+else if (rType == Interface7::static_type())
+return css::uno::Any( &p7, rType );
+else if (rType == Interface8::static_type())
+return css::uno::Any( &p8, rType );
+else if (rType == Interface9::static_type())
+return css::uno::Any( &p9, rType );
+else if (rType == Interface10::static_type())
+return css::uno::Any( &p10, rType
CppunitTest_dbaccess_hsqldb_test failure
Hello, I am seeing CppunitTest_dbaccess_hsqldb_test failing on some systems and on some occasions. ... Running scope as unit: -home-jenkins-workspace-libreoffice\x2dupstream\x2dbundled-label-LO\x2dppc64le-workdir-CppunitTest-dbaccess_hsqldb_test.test:20230907213220:2142227.scope [_RUN_] HSQLDBTest::testEmptyDBConnection HSQLDBTest::testEmptyDBConnection finished in: 1353ms OK (1) PID: 2142247 (cppunittester) UID: 1003 (jenkins) GID: 1003 (jenkins) Signal: 5 (TRAP) Timestamp: Thu 2023-09-07 21:32:22 UTC (15s ago) Command Line: /home/jenkins/workspace/libreoffice-upstream-bundled/label/LO-ppc64le/workdir/LinkTarget/Executable/cppunittester /home/jenkins/workspace/libreoffice-upstream-bundled/label/LO-ppc64le/workdir/LinkTarget/CppunitTest/libtest_dbaccess_hsqldb_test.so --headless -env:BRAND_BASE_DIR=file:///home/jenkins/workspace/libreoffice-upstream-bundled/label/LO-ppc64le/instdir -env:BRAND_SHARE_SUBDIR=share -env:BRAND_SHARE_RESOURCE_SUBDIR=program/resource ... I suspect it's because the time to complete the check is over 1000ms. When the run time captured in workdir/CppunitTest/dbaccess_hsqldb_test.test.log is bellow 1000 (usually 600-800ms), the test passes. The obvious question is where I can extend the timeout? Thanks, Dan
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tparea.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit b69e14038288387b5f288a06821fb5df66dcf94e
Author: Julien Nabet
AuthorDate: Thu Sep 7 16:34:53 2023 +0200
Commit: Samuel Mehrbrodt
CommitDate: Fri Sep 8 13:26:15 2023 +0200
tdf#157138: Can't switch from Use Background to None area fill
Revert partly tdf#151260 fix
Change-Id: I4c052e2cd1cb41dc8bda4b388b46e4416e351434
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156669
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 23946aa7c4b7..9107bace195c 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -240,11 +240,8 @@ DeactivateRC SvxAreaTabPage::DeactivatePage( SfxItemSet*
_pSet )
{
XFillStyleItem aStyleItem( drawing::FillStyle_NONE );
_pSet->Put( aStyleItem );
-if (_pSet->HasItem(XATTR_FILLUSESLIDEBACKGROUND))
-{
-XFillUseSlideBackgroundItem aFillBgItem( false );
-_pSet->Put( aFillBgItem );
-}
+XFillUseSlideBackgroundItem aFillBgItem( false );
+_pSet->Put( aFillBgItem );
}
break;
}
[Libreoffice-commits] core.git: cui/source include/cui include/svx sw/inc sw/source
cui/source/dialogs/dlgname.cxx |5 -
cui/source/factory/dlgfact.cxx |4 ++--
cui/source/factory/dlgfact.hxx |2 +-
include/cui/dlgname.hxx |3 ++-
include/svx/svxdlg.hxx |2 +-
sw/inc/AccessibilityCheckStrings.hrc |3 ++-
sw/source/core/access/AccessibilityIssue.cxx |6 +++---
7 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit c7a608a6691c790783c63f504010bc796c36af25
Author: Samuel Mehrbrodt
AuthorDate: Thu Sep 7 12:49:46 2023 +0200
Commit: Samuel Mehrbrodt
CommitDate: Fri Sep 8 13:24:21 2023 +0200
tdf#155503 Add title to document title dialog
Otherwise the title was just "Name"
Change-Id: I883d2468c7bd97782b0aef4165a6afe4ff39ce31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156659
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index fa12a158445f..4e6847e0f5cc 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -25,7 +25,8 @@
|*
\/
-SvxNameDialog::SvxNameDialog(weld::Window* pParent, const OUString& rName,
const OUString& rDesc)
+SvxNameDialog::SvxNameDialog(weld::Window* pParent, const OUString& rName,
const OUString& rDesc,
+ const OUString& rTitle)
: GenericDialogController(pParent, "cui/ui/namedialog.ui", "NameDialog")
, m_xEdtName(m_xBuilder->weld_entry("name_entry"))
, m_xFtDescription(m_xBuilder->weld_label("description_label"))
@@ -36,6 +37,8 @@ SvxNameDialog::SvxNameDialog(weld::Window* pParent, const
OUString& rName, const
m_xEdtName->select_region(0, -1);
ModifyHdl(*m_xEdtName);
m_xEdtName->connect_changed(LINK(this, SvxNameDialog, ModifyHdl));
+if (!rTitle.isEmpty())
+set_title(rTitle);
}
IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl, weld::Entry&, void)
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index d0b0fceed8a3..f558f9e4a37d 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1092,9 +1092,9 @@ VclPtr
AbstractDialogFactory_Impl::CreateSvxEditDictionaryDia
}
VclPtr
AbstractDialogFactory_Impl::CreateSvxNameDialog(weld::Window* pParent,
-const OUString& rName, const OUString&
rDesc)
+const OUString& rName, const OUString&
rDesc, const OUString& rTitle)
{
-return
VclPtr::Create(std::make_unique(pParent,
rName, rDesc));
+return
VclPtr::Create(std::make_unique(pParent,
rName, rDesc, rTitle));
}
VclPtr
AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(weld::Window* pParent,
const OUString& rName)
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index cd3f638aced5..4adc0d82ee47 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -521,7 +521,7 @@ public:
virtual VclPtr
CreateSvxNewDictionaryDialog(weld::Window* pParent) override;
virtual VclPtr
CreateSvxEditDictionaryDialog(weld::Window* pParent, const OUString& rName)
override;
virtual VclPtr CreateSvxNameDialog(weld::Window*
pParent,
-const OUString& rName, const
OUString& rDesc) override;
+const OUString& rName, const
OUString& rDesc, const OUString& rTitle = "") override;
// #i68101#
virtual VclPtr
CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName)
override;
virtual VclPtr
CreateSvxObjectTitleDescDialog(weld::Window* pParent, const OUString& rTitle,
const OUString& rDescription, bool isDecorative) override;
diff --git a/include/cui/dlgname.hxx b/include/cui/dlgname.hxx
index 9083177ee980..16938734ff97 100644
--- a/include/cui/dlgname.hxx
+++ b/include/cui/dlgname.hxx
@@ -36,7 +36,8 @@ private:
DECL_LINK(ModifyHdl, weld::Entry&, void);
public:
-SvxNameDialog(weld::Window* pWindow, const OUString& rName, const
OUString& rDesc);
+SvxNameDialog(weld::Window* pWindow, const OUString& rName, const
OUString& rDesc,
+ const OUString& rTitle = "");
OUString GetName() const { return m_xEdtName->get_text(); }
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index d5a0b5fec7fc..436bfd430368 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -377,7 +377,7 @@ public:
virtual VclPtr
CreateSvxNewDictionaryDialog(weld::Window* pParent) = 0;
virtual VclPtr
CreateSvxEditDictionaryDialog(weld::Window* pParent, const OUString& rName) = 0;
virtual VclPtr CreateSvxNameDialog(weld::Window*
pParent,
-const OUString& rName, const
OUString& rDesc ) = 0;
+const OUSt
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/AccessibilityIssue.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 48129cabb9a5636207d3b8f4f9fa4e4abac61b8a
Author: Samuel Mehrbrodt
AuthorDate: Thu Sep 7 11:35:52 2023 +0200
Commit: Samuel Mehrbrodt
CommitDate: Fri Sep 8 13:23:18 2023 +0200
tdf#157085 Make doc title dialog modal
Change-Id: I7a7574c3ffaa45aeb9bb97d9a1963c52d5619d99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156658
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/core/access/AccessibilityIssue.cxx
b/sw/source/core/access/AccessibilityIssue.cxx
index 080ce2ec7a9e..a915289f26ea 100644
--- a/sw/source/core/access/AccessibilityIssue.cxx
+++ b/sw/source/core/access/AccessibilityIssue.cxx
@@ -236,8 +236,11 @@ void AccessibilityIssue::quickFixIssue() const
case IssueObject::DOCUMENT_TITLE:
{
OUString aDesc = SwResId(STR_ENTER_DOCUMENT_TITLE);
-SvxNameDialog aNameDialog(m_pParent, "", aDesc);
-if (aNameDialog.run() == RET_OK)
+SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
+SwWrtShell* pWrtShell = m_pDoc->GetDocShell()->GetWrtShell();
+ScopedVclPtr aNameDialog(
+
pFact->CreateSvxNameDialog(pWrtShell->GetView().GetFrameWeld(), "", aDesc));
+if (aNameDialog->Execute() == RET_OK)
{
SwDocShell* pShell = m_pDoc->GetDocShell();
if (!pShell)
@@ -247,7 +250,9 @@ void AccessibilityIssue::quickFixIssue() const
pShell->GetModel(), uno::UNO_QUERY_THROW);
const uno::Reference
xDocumentProperties(
xDPS->getDocumentProperties());
-xDocumentProperties->setTitle(aNameDialog.GetName());
+OUString sName;
+aNameDialog->GetName(sName);
+xDocumentProperties->setTitle(sName);
m_pDoc->getOnlineAccessibilityCheck()->resetAndQueueDocumentLevel();
}
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/miscuno.hxx |8
sc/source/core/data/dpoutput.cxx |2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 7585667c83578e7f073409b2b94a4d34e7124115
Author: Noel Grandin
AuthorDate: Fri Sep 8 11:30:25 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 13:12:05 2023 +0200
replace ScUnoHelpFunctions::VectorToSequence..
with the more standard comphelper::containerToSequence
Change-Id: I29a67e52e7c25c2d67b0cd617acc7068737bad5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156702
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index 1a17e7afe7ea..362212c1564b 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -195,14 +195,6 @@ public:
SetOptionalPropertyValue(rPropSet, rPropName, any);
}
-template
-static css::uno::Sequence VectorToSequence( const
std::vector& rVector )
-{
-if (rVector.empty())
-return css::uno::Sequence();
-
-return css::uno::Sequence(&rVector[0],
static_cast(rVector.size()));
-}
private:
static sal_Int32GetEnumPropertyImpl( const css::uno::Reference<
css::beans::XPropertySet>& xProp,
const OUString& rName, sal_Int32
nDefault );
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index c964dda14c7a..c74f43d10bd7 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -501,7 +501,7 @@ uno::Sequence
getVisiblePageMembersAsResults( const uno::Re
// All members are visible. Return empty result.
return uno::Sequence();
-return ScUnoHelpFunctions::VectorToSequence(aRes);
+return comphelper::containerToSequence(aRes);
}
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - oox/source sd/qa sw/qa sw/source
oox/source/drawingml/fillproperties.cxx |4 +++-
sd/qa/unit/data/pptx/tdf156649.pptx |binary
sd/qa/unit/export-tests.cxx | 14 ++
sw/qa/core/layout/flycnt.cxx|8
sw/source/core/layout/tabfrm.cxx|4 +++-
sw/source/core/text/txtfly.cxx | 17 +
6 files changed, 45 insertions(+), 2 deletions(-)
New commits:
commit 8ac547a463c4061961f924e858a377525ea821b1
Author: Miklos Vajna
AuthorDate: Thu Sep 7 08:25:18 2023 +0200
Commit: Xisco Fauli
CommitDate: Fri Sep 8 12:54:20 2023 +0200
sw floattable, nesting: fix position of the inner follow table
The bugdoc was no longer crashing, but the inner table's follow part on
page 2 was not visible.
The problem was that lcl_ArrangeLowers() didn't try to update the fly's
position when the cell's position changed, now we do this for split
flys.
The other problem was that as SwTextFly::GetTop() is called by
SwTextFly::InitAnchoredObjList(), the inner flys were ignored while
collecting the intersecting fly frames for a paragraph, leading to an
overlap between the inner follow fly and the inner anchor text. This is
now fixed by explicitly checking for the splitfly-in-splitfly case.
With this, the ODT bugdoc now renders correctly when opened. (This is
related to tdf#55160.)
Change-Id: I60997e7913984872319250b0fb1cb91e02512800
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156632
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 3aa3f0a1638a8d8006955b62bb647526768be3d8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156607
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/core/layout/flycnt.cxx b/sw/qa/core/layout/flycnt.cxx
index 0839e6a34b36..797d5d8c5691 100644
--- a/sw/qa/core/layout/flycnt.cxx
+++ b/sw/qa/core/layout/flycnt.cxx
@@ -1060,6 +1060,14 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyNested)
CPPUNIT_ASSERT(pPage2Fly1);
CPPUNIT_ASSERT(pPage2Fly1->GetAnchorFrameContainingAnchPos()->IsInFly());
CPPUNIT_ASSERT(pPage2Fly1->GetPrecede());
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected greater than: 6204
+// - Actual : 1725
+// i.e. the inner follow fly had a bad position, it was outside the page
rectangle, it was not
+// rendered and this way the inner anchor had no fly portion, either.
+CPPUNIT_ASSERT_GREATER(pPage2->getFrameArea().Top(),
pPage2Fly1->getFrameArea().Top());
+
auto pPage2Fly2 =
rPage2Objs[1]->DynCastFlyFrame()->DynCastFlyAtContentFrame();
CPPUNIT_ASSERT(pPage2Fly2);
CPPUNIT_ASSERT(!pPage2Fly2->GetAnchorFrameContainingAnchPos()->IsInFly());
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index e592467751b7..f7e889094adc 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -5303,10 +5303,12 @@ static bool lcl_ArrangeLowers( SwLayoutFrame *pLay,
tools::Long lYStart, bool bI
// on the object positioning.
// #i52904# - no direct move of objects,
// whose vertical position doesn't depend on anchor
frame.
+// Also move split flys directly, otherwise the
follows would not be moved
+// at all.
const bool bDirectMove =
FAR_AWAY != pFly->getFrameArea().Top() &&
bVertPosDepOnAnchor &&
-!pFly->ConsiderObjWrapInfluenceOnObjPos();
+(!pFly->ConsiderObjWrapInfluenceOnObjPos() ||
pFly->IsFlySplitAllowed());
if ( bDirectMove )
{
{
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index e5bf03162db4..a290ac4d2010 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -679,6 +679,23 @@ bool SwTextFly::GetTop( const SwAnchoredObject*
_pAnchoredObj,
bool bEvade = !mpCurrAnchoredObj ||
Is_Lower_Of( mpCurrAnchoredObj->DynCastFlyFrame(),
pNew);
+auto pFly = _pAnchoredObj->DynCastFlyFrame();
+if (pFly && pFly->IsFlySplitAllowed())
+{
+// Check if _pAnchoredObj is a split fly inside an other split
fly. Always collect such
+// flys, otherwise the inner anchor text will overlap with the
inner fly.
+SwFrame* pFlyAnchor = const_cast(_pAnchoredObj)
+->GetAnchorFrameContainingAnchPos();
+if (pFlyAnchor && pFlyAnchor->IsInFly())
+{
+auto pOuterFly = pFlyAnchor->FindFlyFrame();
+if (pOuterFly && pOuterFly->IsFlySplitAllowed())
+{
+return true;
+}
+
[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - sfx2/source
sfx2/source/dialog/backingwindow.cxx | 18 +-
1 file changed, 1 insertion(+), 17 deletions(-)
New commits:
commit 096c70435c7f1e0cd1f91933dd9f1aff4eaf1ceb
Author: Balazs Varga
AuthorDate: Thu Sep 7 23:17:52 2023 +0200
Commit: Balazs Varga
CommitDate: Fri Sep 8 12:53:22 2023 +0200
Remove external link from start center brand image
Change-Id: I601a65c526ba1c3b6e49f02a0401f04379c3e82b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156683
Reviewed-by: Gabor Kelemen
Tested-by: Balazs Varga
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index a69fd7eac7f7..32a5e28236f6 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -78,7 +78,7 @@ public:
OutputDevice& rDevice = pDrawingArea->get_ref_device();
rDevice.SetBackground(Wallpaper(rStyleSettings.GetWindowColor()));
-SetPointer(PointerStyle::RefHand);
+// SetPointer(PointerStyle::RefHand);
}
virtual void Resize() override
@@ -119,22 +119,6 @@ public:
weld::CustomWidgetController::StyleUpdated();
}
-virtual bool MouseButtonUp(const MouseEvent& rMEvt) override
-{
-if (rMEvt.IsLeft())
-{
-OUString sURL =
officecfg::Office::Common::Menus::ReleaseNotesURL::get();
-// localizeWebserviceURI(sURL);
-
-Reference const
xSystemShellExecute(
-css::system::SystemShellExecute::create(
-::comphelper::getProcessComponentContext()));
-xSystemShellExecute->execute(sURL, OUString(),
-
css::system::SystemShellExecuteFlags::URIS_ONLY);
-}
-return true;
-}
-
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&) override
{
rRenderContext.DrawBitmapEx(Point(0, 0), maBrandImage);
[Libreoffice-commits] core.git: include/xmloff
include/xmloff/unoatrcn.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 033959aae1744a7bc7315e9abd051805805b33a3
Author: Noel Grandin
AuthorDate: Fri Sep 8 09:32:50 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 12:40:33 2023 +0200
SvUnoAttributeContainer does not need to implement XAggreggation
Checked on jenkins using 'make check' and
+void SAL_CALL setDelegator(css::uno::Reference
const &) final { assert(false); }
+
Change-Id: Iddfef9353c3a63547546e2db49083083d2dc74c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156695
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx
index b09a06250215..454885c26641 100644
--- a/include/xmloff/unoatrcn.hxx
+++ b/include/xmloff/unoatrcn.hxx
@@ -31,12 +31,12 @@
#include
-#include
+#include
extern css::uno::Reference< css::uno::XInterface >
SvUnoAttributeContainer_CreateInstance();
class XMLOFF_DLLPUBLIC SvUnoAttributeContainer final :
-public ::cppu::WeakAggImplHelper2<
+public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::container::XNameContainer >
{
[Libreoffice-commits] core.git: vcl/source
vcl/source/uitest/uno/uiobject_uno.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 74895033b99ba8b1496dc71699f52402b6d3db11
Author: Noel Grandin
AuthorDate: Fri Sep 8 11:14:56 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 12:28:44 2023 +0200
add SAL_WARN to UIObjectUnoObj::getChild
to help track down an intermittent UITest failure on jenkins, which
would otherwise assert inside the UIObjectUnoObj constructor
Change-Id: I1b06c1eef5fe3402857b7a300decd48488ec621c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156698
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx
b/vcl/source/uitest/uno/uiobject_uno.cxx
index 0d23fe9272a7..1a59520f1943 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -56,6 +56,7 @@ css::uno::Reference SAL_CALL
UIObjectUnoObj::getChild(
{
SolarMutexGuard aGuard;
std::unique_ptr pObj = mpObj->get_child(rID);
+SAL_WARN_IF(!pObj, "vcl", "child " << rID << " of parent " <<
mpObj->dumpState() << " does not exist");
return new UIObjectUnoObj(std::move(pObj));
}
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 777252f9f091ddaa51423e1978e233fa9510cabe Author: Olivier Hallot AuthorDate: Fri Sep 8 06:58:50 2023 -0300 Commit: Gerrit Code Review CommitDate: Fri Sep 8 11:58:50 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to ba616b2299e419762f2eca9ba5b55ed5a4f31c9f - tdf#155875 UI cmds Writer/Table in Help(35) + refactoring + Table - AutoFormat Styles (part 35) + uno:AutoFormat refers to similar dialogs in Calc and Writer + but each on its module + merged in shared/01/AutoFormat.xhp with app switch + removed obsolete files (merged) Change-Id: I9324c517f19934027311c297d012397650b60cf4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156685 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8daa94aa1ff1..ba616b2299e4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8daa94aa1ff1135d3d2552182c7f2d23cc21d6f2 +Subproject commit ba616b2299e419762f2eca9ba5b55ed5a4f31c9f
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk AllLangHelp_shared.mk AllLangHelp_swriter.mk source/text
AllLangHelp_scalc.mk |1 AllLangHelp_shared.mk|1 AllLangHelp_swriter.mk |1 source/text/scalc/00/0405.xhp| 82 +++-- source/text/scalc/01/0511.xhp| 78 - source/text/shared/00/00040503.xhp | 31 ++ source/text/shared/01/AutoFormat.xhp | 160 +++ source/text/shared/01/Protect.xhp|7 + source/text/swriter/01/05150101.xhp | 103 -- source/text/swriter/main0110.xhp |3 10 files changed, 232 insertions(+), 235 deletions(-) New commits: commit ba616b2299e419762f2eca9ba5b55ed5a4f31c9f Author: Olivier Hallot AuthorDate: Thu Sep 7 19:45:50 2023 -0300 Commit: Olivier Hallot CommitDate: Fri Sep 8 11:58:50 2023 +0200 tdf#155875 UI cmds Writer/Table in Help(35) + refactoring + Table - AutoFormat Styles (part 35) + uno:AutoFormat refers to similar dialogs in Calc and Writer + but each on its module + merged in shared/01/AutoFormat.xhp with app switch + removed obsolete files (merged) Change-Id: I9324c517f19934027311c297d012397650b60cf4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156685 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index f69425a60f..04a1ba353b 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -111,7 +111,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/05080300 \ helpcontent2/source/text/scalc/01/05080400 \ helpcontent2/source/text/scalc/01/0510 \ -helpcontent2/source/text/scalc/01/0511 \ helpcontent2/source/text/scalc/01/0512 \ helpcontent2/source/text/scalc/01/05120100 \ helpcontent2/source/text/scalc/01/05120200 \ diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index d19ddefb7c..f6779849d3 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -336,6 +336,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/0708 \ helpcontent2/source/text/shared/01/about_meta_tags \ helpcontent2/source/text/shared/01/addsignatureline \ +helpcontent2/source/text/shared/01/AutoFormat \ helpcontent2/source/text/shared/01/certificatepath \ helpcontent2/source/text/shared/01/classificationbar \ helpcontent2/source/text/shared/01/classificationdialog \ diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index 0fcd7e2805..c93efbc5f7 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -144,7 +144,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/0514 \ helpcontent2/source/text/swriter/01/0515 \ helpcontent2/source/text/swriter/01/05150100 \ -helpcontent2/source/text/swriter/01/05150101 \ helpcontent2/source/text/swriter/01/05150104 \ helpcontent2/source/text/swriter/01/05150200 \ helpcontent2/source/text/swriter/01/05150300 \ diff --git a/source/text/scalc/00/0405.xhp b/source/text/scalc/00/0405.xhp index cf3956717f..fb6506f971 100644 --- a/source/text/scalc/00/0405.xhp +++ b/source/text/scalc/00/0405.xhp @@ -20,7 +20,7 @@ -Format Menu +Format Menu /text/scalc/00/0405.xhp @@ -30,50 +30,50 @@ Format Menu -Choose Format - Cells. +Choose Format - Cells. Press CommandCtrl+1. -Choose Format - Cells - Cell Protection tab. -Choose Format - Rows. -Choose Format - Rows - Optimal Height. +Choose Format - Cells - Cell Protection tab. +Choose Format - Rows. +Choose Format - Rows - Optimal Height. -Choose Format - Rows - Hide. -Choose Format - Columns - Hide. -Choose Sheet - Hide Sheet. +Choose Format - Rows - Hide. +Choose Format - Columns - Hide. +Choose Sheet - Hide Sheet. -Choose Format - Rows - Show. -Choose Format - Columns - Show. +Choose Format - Rows - Show. +Choose Format - Columns - Show. -Choose Format - Columns. +Choose Format - Columns. -Choose Format - Columns - Optimal Width. -Double-click right column separator in column headers. +Choose Format - Columns - Optimal Width. +Double-click right column separator in column headers. -Choose Sheet. +Choose Sheet. -Choose Format - Page Style. -Choose Format - Page Style - Sheet tab. -Choose Format - Print Ranges. -Choose Format - Print Ranges - Define. -Choose Format - Print Ranges - Add. -Choose Format - Print Ranges - Clear. -Choose Format - Print Ranges - Edit. +Choose Format - Page Style. +Choose Format - Page Style - Sheet tab. +Choose Format - Print Ranges. +Choose Format - Print Ranges - Define. +Choose Format - Print Ranges - Add. +Choose Format - Print Ranges - Clear. +Choose Format - Print Ranges - Edit. - Choose Format - Conditional - Condition. + Choose Format - Conditional - Condition. On the Formatting
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 19e32f6a3661a5f161db0d5a722f25fb315bd45a Author: Olivier Hallot AuthorDate: Fri Sep 8 06:58:21 2023 -0300 Commit: Gerrit Code Review CommitDate: Fri Sep 8 11:58:21 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 8daa94aa1ff1135d3d2552182c7f2d23cc21d6f2 - tdf#155875 UI cmds Writer/Table in Help(34) + refactoring + Table - Protection (part 34) + protection is called by "uno.Protect" in menus + in Calc: protect sheet dialog + in Writer: protect cell directly + merged in shared/01/Protect.xhp with app switch + removed obsolete files Change-Id: Ieada8a774a14a19f79f58e22fd807bf5aacaf64b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156678 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5f31e41620bb..8daa94aa1ff1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5f31e41620bb668c611701c87a9f2b1cbf3c93c9 +Subproject commit 8daa94aa1ff1135d3d2552182c7f2d23cc21d6f2
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk AllLangHelp_shared.mk AllLangHelp_swriter.mk source/text
AllLangHelp_scalc.mk |1 AllLangHelp_shared.mk |1 AllLangHelp_swriter.mk|1 source/text/scalc/01/0606.xhp |6 - source/text/scalc/01/06060100.xhp | 111 source/text/scalc/guide/cell_protect.xhp |4 source/text/scalc/menu/sheet_tab_menu.xhp |2 source/text/shared/01/Protect.xhp | 137 ++ source/text/swriter/00/0405.xhp | 37 +++- source/text/swriter/01/0510.xhp |2 source/text/swriter/01/05100300.xhp | 41 source/text/swriter/01/05100400.xhp | 31 +++--- source/text/swriter/main0110.xhp |7 - 13 files changed, 196 insertions(+), 185 deletions(-) New commits: commit 8daa94aa1ff1135d3d2552182c7f2d23cc21d6f2 Author: Olivier Hallot AuthorDate: Thu Sep 7 14:16:13 2023 -0300 Commit: Olivier Hallot CommitDate: Fri Sep 8 11:58:21 2023 +0200 tdf#155875 UI cmds Writer/Table in Help(34) + refactoring + Table - Protection (part 34) + protection is called by "uno.Protect" in menus + in Calc: protect sheet dialog + in Writer: protect cell directly + merged in shared/01/Protect.xhp with app switch + removed obsolete files Change-Id: Ieada8a774a14a19f79f58e22fd807bf5aacaf64b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156678 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 6192819d40..f69425a60f 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -133,7 +133,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/0604 \ helpcontent2/source/text/scalc/01/0605 \ helpcontent2/source/text/scalc/01/0606 \ -helpcontent2/source/text/scalc/01/06060100 \ helpcontent2/source/text/scalc/01/06060200 \ helpcontent2/source/text/scalc/01/0607 \ helpcontent2/source/text/scalc/01/0608 \ diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index c40c7c4209..d19ddefb7c 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -383,6 +383,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/pasterowabove \ helpcontent2/source/text/shared/01/pastecolumnleft \ helpcontent2/source/text/shared/01/profile_safe_mode \ +helpcontent2/source/text/shared/01/Protect \ helpcontent2/source/text/shared/01/qrcode \ helpcontent2/source/text/shared/01/quickcolorselector \ helpcontent2/source/text/shared/01/ref_epub_export \ diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index 26ffea7b41..0fcd7e2805 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -129,7 +129,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/05090201 \ helpcontent2/source/text/swriter/01/05090300 \ helpcontent2/source/text/swriter/01/0510 \ -helpcontent2/source/text/swriter/01/05100300 \ helpcontent2/source/text/swriter/01/05100400 \ helpcontent2/source/text/swriter/01/05110100 \ helpcontent2/source/text/swriter/01/05110300 \ diff --git a/source/text/scalc/01/0606.xhp b/source/text/scalc/01/0606.xhp index b57bd65a69..fc4972f06a 100644 --- a/source/text/scalc/01/0606.xhp +++ b/source/text/scalc/01/0606.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -38,8 +38,8 @@ -Sheets - +Sheets + Documents diff --git a/source/text/scalc/01/06060100.xhp b/source/text/scalc/01/06060100.xhp deleted file mode 100644 index 0e39d0d27e..00 --- a/source/text/scalc/01/06060100.xhp +++ /dev/null @@ -1,111 +0,0 @@ - - - - - -Protecting Sheet -/text/scalc/01/06060100.xhp - - - - - - - -insert rows;protected sheet -insert columns;protected sheet -delete columns;protected sheet -delete rows;protected sheet -protected sheet;insert columns -protected sheet;insert rows -protected sheet;delete rows -protected sheet;delete columns -protect;sheet -selection;in protected cells - - -Protect Sheet -Protects the cells in the current sheet from being modified. - -Choose Tools - Protect Sheet to open the Protect Sheet dialog in which you then specify sheet protection with or without a password, and select the elements of the sheet to protect. - - - - -To protect cells from further editing, the Protected check box must be checked on the Format - Cells - Cell Protection tab page or on the Format Cells context menu. - -Protect this sheet and contents of the protected cells -Mark this checkbox to activate protection of sheet and cell contents. -Password / Confirm -Allows you to enter a password to protect the sheet from unauthorized changes. Confirm the passwo
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 87f9e703bfa13652e2bca59e89f45b196f9d9580 Author: Olivier Hallot AuthorDate: Fri Sep 8 06:57:46 2023 -0300 Commit: Gerrit Code Review CommitDate: Fri Sep 8 11:57:46 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 5f31e41620bb668c611701c87a9f2b1cbf3c93c9 - tdf#155875 UI cmds Writer/Table in Help(33) + refactoring + Table - split/merge table (part 33) Change-Id: I86a47fc6b6941d7efd89e485e299271bea737826 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156677 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index f9f74aac7105..5f31e41620bb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f9f74aac7105208ded70127e5acd6cd2bae8b093 +Subproject commit 5f31e41620bb668c611701c87a9f2b1cbf3c93c9
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05100200.xhp |6 +++-- source/text/swriter/00/0405.xhp | 26 ++-- source/text/swriter/01/0519.xhp | 38 ++-- source/text/swriter/01/0520.xhp | 22 ++-- source/text/swriter/main0110.xhp|6 + 5 files changed, 60 insertions(+), 38 deletions(-) New commits: commit 5f31e41620bb668c611701c87a9f2b1cbf3c93c9 Author: Olivier Hallot AuthorDate: Thu Sep 7 10:00:58 2023 -0300 Commit: Olivier Hallot CommitDate: Fri Sep 8 11:57:46 2023 +0200 tdf#155875 UI cmds Writer/Table in Help(33) + refactoring + Table - split/merge table (part 33) Change-Id: I86a47fc6b6941d7efd89e485e299271bea737826 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156677 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/05100200.xhp b/source/text/shared/01/05100200.xhp index 482a0b3d7f..662c62bcd0 100644 --- a/source/text/shared/01/05100200.xhp +++ b/source/text/shared/01/05100200.xhp @@ -44,8 +44,10 @@ -Split Cells -Displays the Split Cells Dialog where the split can be defined as either horizontally or vertically and the number the each cell will be split into. + +Split Cells +Displays the Split Cells Dialog where the split can be defined as either horizontally or vertically and the number the each cell will be split into. + diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index c947f2d49b..167397b411 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -260,8 +260,30 @@ - Choose Table - Split Table. - Choose Table - Merge Table. + + + + Choose Table - Split Table. + + Choose Table - Split Table. + + + + +Icon Split Table + + +Split Table + + + + + On the Table deck of the Properties panel, click on Split Table. + + + + Choose Table - Merge Table. + Choose Table - Properties - Table tab. Choose Table - Properties - Columns tab. Choose Table - Properties - Text Flow tab. diff --git a/source/text/swriter/01/0519.xhp b/source/text/swriter/01/0519.xhp index 38851d7ed9..cad232864c 100644 --- a/source/text/swriter/01/0519.xhp +++ b/source/text/swriter/01/0519.xhp @@ -1,6 +1,4 @@ - - - -Split Table +Split Table /text/swriter/01/0519.xhp @@ -31,32 +28,35 @@ -tables; splitting +tables; splitting splitting tables; at cursor position dividing tables - - - + + + Split Table -Splits the current table into two separate tables at the cursor position. You can also access this command by right-clicking in a table cell. +Splits the current table into two separate tables at the cursor position. You can also access this command by right-clicking in a table cell. - + Mode - + Copy heading -Includes the first row of the original table as the first row of the second table. - +Includes the first row of the original table as the first row of the second table. + Custom heading (apply style) -Inserts a blank header row in the second table that is formatted with the style of the first row in the original table. - +Inserts a blank header row in the second table that is formatted with the style of the first row in the original table. + Custom heading -Inserts an additional blank row in the second table. - +Inserts an additional blank row in the second table. + No heading -Splits the table without copying the header row. -When you split a table that contains formulas, the formulas may be affected. +Splits the table without copying the header row. +When you split a table that contains formulas, the formulas may be affected. + + + diff --git a/source/text/swriter/01/0520.xhp b/source/text/swriter/01/0520.xhp index 4f6620d93a..53f9304606 100644 --- a/source/text/swriter/01/0520.xhp +++ b/source/text/swriter/01/0520.xhp @@ -1,6 +1,4 @@ - - - -Merge Table +Merge Table /text/swriter/01/0520.xhp @@ -31,18 +28,21 @@ -tables; merging +tables; merging merging; tables - - - + + + Merge Table -Combines two consecutive tables into a single table. The tables must be directly next to each other and not separated by an empty paragraph. +Combines two consecutive tables into a single table. The tables must be directly next to each other and not separated by an empty paragraph. - + -If you choose this command when the cursor is in the middle of three consecutive tables, you are prompted to select the table that you want to merge with. +If you choose this command when the cursor is in the middle of three consecutive tables, you are prompted to select the table that
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - 3 commits - configure.ac solenv/bin sysui/CustomTarget_deb.mk sysui/CustomTarget_rpm.mk sysui/CustomTarget_solaris.mk
configure.ac |9 ++ solenv/bin/modules/installer/download.pm | 37 +- solenv/bin/modules/installer/epmfile.pm | 19 ++--- solenv/bin/modules/installer/simplepackage.pm | 10 ++- sysui/CustomTarget_deb.mk |7 ++-- sysui/CustomTarget_rpm.mk |2 - sysui/CustomTarget_solaris.mk |2 - 7 files changed, 35 insertions(+), 51 deletions(-) New commits: commit 55200cee2ff3229bc32323eb74501b62b370b419 Author: Michael Weghorn AuthorDate: Thu Feb 15 16:37:23 2018 +0100 Commit: Vasily Melenchuk CommitDate: Fri Sep 8 12:06:04 2023 +0300 tdf#115554: Fix ownership in desktop-integration tars Use fakeroot to call tar when creating the tar.gz archives holding the desktop-integration parts to have root:root as owner of the files inside those. Change-Id: Idcdcb4dd398f330773671266dafb354711b0f093 Reviewed-on: https://gerrit.libreoffice.org/49827 Reviewed-by: Michael Stahl Tested-by: Michael Stahl Reviewed-by: Thorsten Behrens diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk index dd75ee913c62..92cda34a3bfe 100644 --- a/sysui/CustomTarget_deb.mk +++ b/sysui/CustomTarget_deb.mk @@ -25,7 +25,7 @@ $(foreach product,$(PRODUCTLIST),\ )) $(deb_WORKDIR)/%-desktop-integration.tar.gz: $(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb - $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@ + fakeroot $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@ $(deb_WORKDIR)/%/DEBIAN/postrm: $(deb_SRCDIR)/postrm cat $< | tr -d "\015" | \ diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk index 8cc56ed80e34..a76b4161e2af 100644 --- a/sysui/CustomTarget_rpm.mk +++ b/sysui/CustomTarget_rpm.mk @@ -54,6 +54,6 @@ $(foreach product,$(PRODUCTLIST),\ )) $(rpm_WORKDIR)/%-desktop-integration.tar.gz: - $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@ + fakeroot $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@ # vim: set noet sw=4 ts=4: diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk index ed264fe95960..306a30429174 100644 --- a/sysui/CustomTarget_solaris.mk +++ b/sysui/CustomTarget_solaris.mk @@ -50,6 +50,6 @@ $(solaris_WORKDIR)/%/prototype: $(solaris_SRCDIR)/prototype $(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/%/copyright $(solaris_WORKDIR)/%/pkginfo $(solaris_WORKDIR)/%/depend $(solaris_WORKDIR)/%/mailcap $(solaris_WORKDIR)/%/postinstall $(solaris_WORKDIR)/%/postremove $(solaris_WORKDIR)/%/prototype $(call gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml # pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f $(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all VERSION=$(PKGVERSION.$*) - $(GNUTAR) -cf - -C $(solaris_WORKDIR) $*$(LIBO_MAJOR) -desktop-int | gzip > $@ + fakeroot $(GNUTAR) -cf - -C $(solaris_WORKDIR) $*$(LIBO_MAJOR) -desktop-int | gzip > $@ # vim: set noet sw=4 ts=4: commit 4debe1fe558ae23e13a65dc79ef78ae600a231a5 Author: Michael Weghorn AuthorDate: Tue Feb 13 20:29:10 2018 +0100 Commit: Vasily Melenchuk CommitDate: Fri Sep 8 12:04:05 2023 +0300 tdf#115554: Create tar archives using 'fakeroot' 'tar' must be run as root or faked to be run as root, to make sure that file ownerships and permissions inside the created tar archives are as desired (root:root). Have fakeroot take care about creating an appropriate environment rather than using the custom "libgetuid", to no longer have to care about tar internals by ourselves. This fixes the problem that file ownerships are incorrect when tar version >= 1.24 is used for * tar archives holding all the generated deb/rpm packages (created in 'download.pm') * tar archives created by using the '--with-pacakage-format=archive' autogen option (created in 'simplepackage.pm') Change-Id: Id20ccce4d002ff95c75292eda8080ca299eee3a5 Reviewed-on: https://gerrit.libreoffice.org/49682 Reviewed-by: Michael Stahl Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/configure.ac b/configure.ac index 94a65c0c0d9a..d81ed648bae7 100644 --- a/configure.ac +++ b/configure.ac @@ -4457,6 +4457,15 @@ msi - Windows .msi ;; esac done +# fakeroot is needed to ensure correct file ownerships/permissions +# inside deb packages and tar archives created on Linux and Solaris. +if test "$OS" = "LINUX" || test "$OS" = "SOLARIS"; then +AC_PATH_PROG(FAKEROOT, fakeroot, no) +i
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/datatransfer/XTransferableTextSupplier.idl |2 -
offapi/com/sun/star/document/XDocumentProperties2.idl |2 -
offapi/com/sun/star/frame/status/Template.idl |2 -
offapi/com/sun/star/sdbc/DataType.idl | 20
+-
4 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 2bd5b489db722905a81e40f9d6dd90c5a73a2d89
Author: Stephan Bergmann
AuthorDate: Fri Sep 8 09:03:55 2023 +0200
Commit: Stephan Bergmann
CommitDate: Fri Sep 8 11:16:50 2023 +0200
Fix some misspelled LibreOffice @since tags
Change-Id: Id6602a06574e435b09a36997f3d1dd5cf3a6859e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156693
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/offapi/com/sun/star/datatransfer/XTransferableTextSupplier.idl
b/offapi/com/sun/star/datatransfer/XTransferableTextSupplier.idl
index 18255d9074bc..7b4c84ecb23f 100644
--- a/offapi/com/sun/star/datatransfer/XTransferableTextSupplier.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferableTextSupplier.idl
@@ -11,7 +11,7 @@
module com { module sun { module star { module datatransfer {
-/** @since LO 7.2
+/** @since LibreOffice 7.2
*/
interface XTransferableTextSupplier
{
diff --git a/offapi/com/sun/star/document/XDocumentProperties2.idl
b/offapi/com/sun/star/document/XDocumentProperties2.idl
index c0d2a18b4af2..5b4acbfe2e47 100644
--- a/offapi/com/sun/star/document/XDocumentProperties2.idl
+++ b/offapi/com/sun/star/document/XDocumentProperties2.idl
@@ -11,7 +11,7 @@ module com { module sun { module star { module document
{
/** Extends XDocumentProperties interface to provide additional attributes
-@since LibreOffice 24.02
+@since LibreOffice 24.2
*/
interface XDocumentProperties2: com::sun::star::document::XDocumentProperties
{
diff --git a/offapi/com/sun/star/frame/status/Template.idl
b/offapi/com/sun/star/frame/status/Template.idl
index ca8939d6bf9d..dfee1152adf4 100644
--- a/offapi/com/sun/star/frame/status/Template.idl
+++ b/offapi/com/sun/star/frame/status/Template.idl
@@ -41,7 +41,7 @@ struct Template
/** specifies an identifier name in English (only for standard style).
-@since LO 7.2
+@since LibreOffice 7.2
*/
string StyleNameIdentifier;
};
diff --git a/offapi/com/sun/star/sdbc/DataType.idl
b/offapi/com/sun/star/sdbc/DataType.idl
index 375a76f30a86..794b824a6b71 100644
--- a/offapi/com/sun/star/sdbc/DataType.idl
+++ b/offapi/com/sun/star/sdbc/DataType.idl
@@ -129,70 +129,70 @@ published constants DataType
/** indicates a type representing an SQL DATALINK.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long DATALINK = 70;
/** indicates a type representing an SQL ROWID.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long ROWID = -8;
/** indicates a type representing an SQL NCHAR.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long NCHAR = -15;
/** indicates a type representing an SQL NVARCHAR.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long NVARCHAR = -9;
/** indicates a type representing an SQL LONGNVARCHAR.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long LONGNVARCHAR = -16;
/** indicates a type representing an SQL NCLOB.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long NCLOB = 2011;
/** indicates a type representing an SQL XML.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long SQLXML = 2009;
/** indicates a type representing an SQL REF CURSOR.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long REF_CURSOR = 2012;
/** indicates a type representing an SQL TIME WITH TIMEZONE.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long TIME_WITH_TIMEZONE = 2013;
/** indicates a type representing an SQL TIMESTAMP WITH TIMEZONE.
*
- * @since LO 24.02
+ * @since LibreOffice 24.2
*/
const long TIMESTAMP_WITH_TIMEZONE= 2014;
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 380b586d6e69412aa5f4b9558ebb192ed8bcfc38
Author: Noel Grandin
AuthorDate: Thu Sep 7 13:02:41 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Sep 8 10:53:15 2023 +0200
XPrimitive2DRenderer does not need to implement XAggreggation
Checked on jenkins using 'make check' and
+void SAL_CALL setDelegator(css::uno::Reference
const &) final { assert(false); }
+
Change-Id: I2b3c0cfd43a3437a1376e64421a66c595083e486
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156661
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 2eb1373df0ae..58df9f4a7b28 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -43,7 +43,7 @@ namespace drawinglayer::unorenderer
namespace {
class XPrimitive2DRenderer:
-public cppu::WeakAggImplHelper2<
+public cppu::WeakImplHelper<
css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo>
{
public:
[Libreoffice-commits] core.git: include/svl
include/svl/numuno.hxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 3f0d41c14d2198fcf86104050dd42cdb82b3e9a4 Author: Noel Grandin AuthorDate: Thu Sep 7 16:08:25 2023 +0200 Commit: Noel Grandin CommitDate: Fri Sep 8 10:52:53 2023 +0200 document SvNumberFormatsSupplierObj Change-Id: Ic07f09f1f01f850caa489f0dfdb5622d8b49a990 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156694 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index a439b95599ae..c7c04194187b 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -35,9 +35,10 @@ namespace comphelper } -// SvNumberFormatsSupplierObj: aggregate to document, -// construct with SvNumberFormatter - +/** + * Factory for XNumberFormats objects. + * Implements XAggregation because it is aggregated to ScModelObj + */ class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2< css::util::XNumberFormatsSupplier, css::lang::XUnoTunnel>
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 28 ++--
1 file changed, 3 insertions(+), 25 deletions(-)
New commits:
commit e653ddd24ab4b75db212431461035ecbd9d625fa
Author: Gökay Şatır
AuthorDate: Thu Sep 7 11:22:25 2023 +0300
Commit: Miklos Vajna
CommitDate: Fri Sep 8 10:41:50 2023 +0200
We can allow one to answer their own comment.
Other office implementations allow this.
I think we can enable reply button for the owner of the comment, unless
there is a good reason to not to.
Signed-off-by: Gökay Şatır
Change-Id: I6969122efe24d2804b4092e0afe0709a2fd1ef98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156688
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 1696f7e6d338..11d755cbd7e2 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -66,13 +66,11 @@ IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl,
weld::Toggleable&, void)
if (!mxMenuButton->get_active())
return;
-bool bReplyVis = true;
-
bool bReadOnly = IsReadOnly();
if (bReadOnly)
{
mxMenuButton->set_item_visible("reply", false);
-bReplyVis = false;
+mxMenuButton->set_item_visible("sep1", false); // Separator after
reply button.
mxMenuButton->set_item_visible("resolve", false);
mxMenuButton->set_item_visible("unresolve", false);
mxMenuButton->set_item_visible("resolvethread", false);
@@ -81,6 +79,8 @@ IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl,
weld::Toggleable&, void)
}
else
{
+mxMenuButton->set_item_visible("reply", !IsProtected());
+mxMenuButton->set_item_visible("sep1", !IsProtected());
mxMenuButton->set_item_visible("resolve", !IsResolved());
mxMenuButton->set_item_visible("unresolve", IsResolved());
mxMenuButton->set_item_visible("resolvethread", !IsThreadResolved());
@@ -92,28 +92,6 @@ IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl,
weld::Toggleable&, void)
mxMenuButton->set_item_visible("deleteby", !bReadOnly);
mxMenuButton->set_item_visible("deleteall", !bReadOnly);
mxMenuButton->set_item_visible("formatall", !bReadOnly);
-
-if (IsProtected())
-{
-mxMenuButton->set_item_visible("reply", false);
-bReplyVis = false;
-}
-else
-{
-SvtUserOptions aUserOpt;
-OUString sAuthor;
-if ((sAuthor = aUserOpt.GetFullName()).isEmpty())
-{
-if ((sAuthor = aUserOpt.GetID()).isEmpty())
-{
-sAuthor = SwResId(STR_REDLINE_UNKNOWN_AUTHOR);
-}
-}
-// do not allow to reply to ourself and no answer possible if this
note is in a protected section
-bReplyVis = sAuthor != GetAuthor();
-mxMenuButton->set_item_visible("reply", bReplyVis);
-}
-mxMenuButton->set_item_visible("sep1", bReplyVis);
}
IMPL_LINK(SwAnnotationWin, KeyInputHdl, const KeyEvent&, rKeyEvt, bool)
[Libreoffice-commits] core.git: odk/examples
odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.py | 62 ++
1 file changed, 62 insertions(+)
New commits:
commit 7dc3be651b050c7b4d383d8ee25b69728418acc7
Author: Hossein
AuthorDate: Fri Sep 8 01:16:29 2023 +0200
Commit: Hossein
CommitDate: Fri Sep 8 10:16:06 2023 +0200
tdf#143123 Port DevelopersGuide/FirstSteps/FirstLoadComponent to Python
Porting FirstSteps/FirstLoadComponent.java to Python is done. More
information on this example can be found on LibreOffice DevGuide:
LibreOffice Developer's Guide: Chapter 1 - First Steps - First Contact
https://wiki.documentfoundation.org/Documentation/DevGuide/First_Steps
This is the last of the 3 examples in the first chapter which are ported
to Python.
Change-Id: Iac0682943d4286168bbdadf792423670f41bdee6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156686
Tested-by: Hossein
Reviewed-by: Hossein
diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.py
b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.py
new file mode 100755
index ..a5d93d799f8c
--- /dev/null
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.py
@@ -0,0 +1,62 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import uno
+import officehelper
+import sys
+import traceback
+from com.sun.star.sheet.CellFlags import FORMULA
+
+
+def main():
+try:
+remote_context = officehelper.bootstrap()
+if remote_context is None:
+print("ERROR: Could not bootstrap default Office.")
+sys.exit(1)
+srv_mgr = remote_context.getServiceManager()
+desktop =
srv_mgr.createInstanceWithContext("com.sun.star.frame.Desktop", remote_context)
+spreadsheet_component =
desktop.loadComponentFromURL("private:factory/scalc", "_blank", 0, tuple())
+spreadsheets = spreadsheet_component.getSheets()
+spreadsheets.insertNewByName("MySheet", 0)
+elem_type = spreadsheets.getElementType()
+print(elem_type)
+sheet = spreadsheets.getByName("MySheet")
+cell = sheet.getCellByPosition(0, 0)
+cell.setValue(21)
+cell = sheet.getCellByPosition(0, 1)
+cell.setValue(21)
+cell = sheet.getCellByPosition(0, 2)
+cell.setFormula("=sum(A1:A2)")
+
+cell.setPropertyValue("CellStyle", "Result")
+
+spreadsheet_controller = spreadsheet_component.getCurrentController()
+spreadsheet_controller.setActiveSheet(sheet)
+cell.setPropertyValue("VertJustify",
"com.sun.star.table.CellVertJustify.TOP")
+formula_cells = sheet.queryContentCells(FORMULA)
+formulas = formula_cells.getCells()
+formula_enum = formulas.createEnumeration()
+
+while formula_enum.hasMoreElements():
+formula_cell = formula_enum.nextElement()
+print("Formula cell in column " +
str(formula_cell.getCellAddress().Column)
+ + ", row " + str(formula_cell.getCellAddress().Row)
+ + " contains " + cell.getFormula())
+
+except Exception as e:
+print(e)
+traceback.print_exc()
+sys.exit(1)
+
+
+if __name__ == "__main__":
+main()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/layout/flycnt.cxx |7 +++
sw/source/core/layout/objectformatter.cxx |7 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit facdac2443d50339f81415d09c1869d19dded7bf
Author: Miklos Vajna
AuthorDate: Fri Sep 8 08:26:40 2023 +0200
Commit: Miklos Vajna
CommitDate: Fri Sep 8 09:25:19 2023 +0200
sw floattable, nesting: fix PDF export
The problem was that the bugdoc rendered fine when opened interactively,
but not when converted to PDF via 'soffice --convert-to pdf'.
The direct cause was that the interactive case also enabled the
navigator that did one more calculation for each fly, and that fixes the
layout. The headless export to PDF has no navigator, so that didn't
happen.
The root of the problem seems to be that:
1) There is a bad left position for the inner follow fly (it's outside
the page rectangle).
2) SwTabFrame::Split() for the outer tab normally calls
lcl_RecalcSplitLine() which moves flys away + back.
3) Moving away happens in lcl_InvalidateLowerObjs() in the
_bMoveObjsOutOfRange case, here we move away both fly 10 and 20 (both
inner flys).
4) Moving back happens in
SwToContentAnchoredObjectPosition::CalcPosition(), but that's not
invoked for the inner follow fly.
Fix the problem by extending SwObjectFormatter::FormatObjsAtFrame_() to
be more consistent here and move back both flys.
This is related to tdf#55160.
Change-Id: Ia264a828f36cf2bc1d67986ab3a97d57e9d167a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156691
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/core/layout/flycnt.cxx b/sw/qa/core/layout/flycnt.cxx
index 797d5d8c5691..1c69606c8a24 100644
--- a/sw/qa/core/layout/flycnt.cxx
+++ b/sw/qa/core/layout/flycnt.cxx
@@ -1068,6 +1068,13 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyNested)
// rendered and this way the inner anchor had no fly portion, either.
CPPUNIT_ASSERT_GREATER(pPage2->getFrameArea().Top(),
pPage2Fly1->getFrameArea().Top());
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected less than: 12523
+// - Actual : 15312
+// i.e. the inner follow fly was not "moved back" to its place to have the
wanted 4400 position,
+// which makes the "Inner A2" text visible.
+CPPUNIT_ASSERT_LESS(pPage2->getFrameArea().Right(),
pPage2Fly1->getFrameArea().Right());
+
auto pPage2Fly2 =
rPage2Objs[1]->DynCastFlyFrame()->DynCastFlyAtContentFrame();
CPPUNIT_ASSERT(pPage2Fly2);
CPPUNIT_ASSERT(!pPage2Fly2->GetAnchorFrameContainingAnchPos()->IsInFly());
diff --git a/sw/source/core/layout/objectformatter.cxx
b/sw/source/core/layout/objectformatter.cxx
index 15ca544a2d9c..b99da6a0fe4b 100644
--- a/sw/source/core/layout/objectformatter.cxx
+++ b/sw/source/core/layout/objectformatter.cxx
@@ -390,7 +390,12 @@ bool SwObjectFormatter::FormatObjsAtFrame_( SwTextFrame*
_pMasterTextFrame )
pAnchorCharFrame != pAnchoredObj->GetAnchorFrame() &&
pAnchorCharFrame->FindBodyFrame() ==
static_cast(pAnchoredObj->AnchorFrame())->FindBodyFrame();
-if ( bAnchoredAtFollowInSameBodyAsMaster )
+// Make sure that in case nested split flys are moved "out of range" in
+// lcl_InvalidateLowerObjs(), then we moved them back here.
+SwFlyFrame* pFly = pAnchoredObj->DynCastFlyFrame();
+bool bSplitFly = pFly && pFly->IsFlySplitAllowed();
+bool bNestedSplitFly = bSplitFly && pAnchorCharFrame &&
pAnchorCharFrame->IsInFly();
+if (bAnchoredAtFollowInSameBodyAsMaster && !bNestedSplitFly)
{
continue;
}
