[Libreoffice-commits] core.git: filter/source include/filter sw/source writerfilter/source
filter/source/msfilter/util.cxx |5 ++---
include/filter/msfilter/util.hxx|2 +-
sw/source/filter/ww8/wrtww8gr.cxx |4 ++--
sw/source/filter/ww8/ww8atr.cxx |2 +-
sw/source/filter/ww8/ww8par6.cxx| 14 +++---
sw/source/filter/ww8/ww8struc.hxx |2 +-
writerfilter/source/rtftok/rtfsdrimport.cxx | 14 ++
7 files changed, 20 insertions(+), 23 deletions(-)
New commits:
commit 5bbaca6d3ccef10223b8618c25f41b91dd467ffc
Author: Noel Grandin
AuthorDate: Sat Jan 16 19:20:07 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Jan 17 08:51:14 2021 +0100
return Color from BGRToRGB
instead of converting at all the call-sites
Change-Id: I4732082fcd4731f6fd46aef197a15564586f0c90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109450
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index c72a2802c7be..63d12f514c24 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -42,15 +42,14 @@ rtl_TextEncoding getBestTextEncodingFromLocale(const
css::lang::Locale &rLocale)
return RTL_TEXTENCODING_MS_1252;
}
-sal_uInt32 BGRToRGB(sal_uInt32 nColor)
+::Color BGRToRGB(sal_uInt32 nColor)
{
sal_uInt8
r(static_cast(nColor&0xFF)),
g(static_cast((nColor>>8)&0xFF)),
b(static_cast((nColor>>16)&0xFF)),
t(static_cast((nColor>>24)&0xFF));
-nColor = (t<<24) + (r<<16) + (g<<8) + b;
-return nColor;
+return ::Color(ColorTransparency, (t<<24) + (r<<16) + (g<<8) + b);
}
DateTime DTTM2DateTime( tools::Long lDTTM )
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index cb70198ebedd..7e25e701420d 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -34,7 +34,7 @@ namespace msfilter::util {
MSFILTER_DLLPUBLIC rtl_TextEncoding getBestTextEncodingFromLocale(const
css::lang::Locale &rLocale);
/// Convert a color in BGR format to RGB.
-MSFILTER_DLLPUBLIC sal_uInt32 BGRToRGB(sal_uInt32 nColour);
+MSFILTER_DLLPUBLIC ::Color BGRToRGB(sal_uInt32 nColour);
/** Convert from DTTM to Writer's DateTime
*/
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx
b/sw/source/filter/ww8/wrtww8gr.cxx
index aedca139434b..b79641c5372a 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -524,8 +524,8 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const
ww8::Frame &rFly,
{
WW8_BRCVer9 aBrc90 = WW8Export::TranslateBorderLine( *pLn,
pBox->GetDistance( i ), bShadow );
-sal_uInt8 ico =
msfilter::util::TransColToIco(Color(ColorTransparency, msfilter::util::BGRToRGB(
-aBrc90.cv(;
+sal_uInt8 ico =
msfilter::util::TransColToIco(msfilter::util::BGRToRGB(
+aBrc90.cv()));
aBrc = WW8_BRC(aBrc90.dptLineWidth(), aBrc90.brcType(),
ico,
aBrc90.dptSpace(), aBrc90.fShadow(), aBrc90.fFrame());
}
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 2d5ae8d3a31a..e6501dc34ca3 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4408,7 +4408,7 @@ void WW8Export::Out_BorderLine(ww::bytes& rO, const
SvxBorderLine* pLine,
if( pLine && pLine->GetBorderLineStyle() != SvxBorderLineStyle::NONE )
{
aBrcVer9 = TranslateBorderLine( *pLine, nDist, bShadow );
-sal_uInt8 ico = msfilter::util::TransColToIco(
Color(ColorTransparency, msfilter::util::BGRToRGB(aBrcVer9.cv())) );
+sal_uInt8 ico = msfilter::util::TransColToIco(
msfilter::util::BGRToRGB(aBrcVer9.cv()) );
aBrcVer8 = WW8_BRC( aBrcVer9.dptLineWidth(), aBrcVer9.brcType(), ico,
aBrcVer9.dptSpace(), aBrcVer9.fShadow(), aBrcVer9.fFrame() );
}
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e717e797a2a9..815c3ef97bef 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1458,7 +1458,7 @@ static void GetLineIndex(SvxBoxItem &rBox, short
nLineThickness, short nSpace,
aLine.SetWidth(fConverted);
//No AUTO for borders as yet, so if AUTO, use BLACK
-Color col = (cv==0xff00) ? COL_BLACK : Color(ColorTransparency,
msfilter::util::BGRToRGB(cv));
+Color col = (cv==0xff00) ? COL_BLACK : msfilter::util::BGRToRGB(cv);
aLine.SetColor(col);
@@ -3600,7 +3600,7 @@ void SwWW8ImplReader::Read_TextForeColor(sal_uInt16,
const sal_uInt8* pData, sho
m_xCtrlStck->SetAttr( *m_pPaM->GetPoint(), RES_CHRATR_COLOR );
else
{
-Color aColor(ColorTransparency,
msfilter::util::BGRToRGB(SVBT32ToUInt32(pData)));
+Color aColor = msfilter::util::BGRToRGB(SVBT32ToU
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/edtwin.cxx|1 +
sw/source/uibase/shells/txtcrsr.cxx |5 +
sw/source/uibase/uiview/viewmdi.cxx |2 ++
sw/source/uibase/uiview/viewsrch.cxx |2 ++
sw/source/uibase/wrtsh/move.cxx |1 +
sw/source/uibase/wrtsh/navmgr.cxx|8
6 files changed, 19 insertions(+)
New commits:
commit 50678a771daa6cd5d3414c25930761c65aab4244
Author: Jim Raykowski
AuthorDate: Sat Dec 26 17:32:31 2020 -0900
Commit: Jim Raykowski
CommitDate: Sun Jan 17 07:10:41 2021 +0100
tdf#115817 add places that add current position to navigation manager
Change-Id: If011b51fac6587b4f551a498866aa71f62ba0fcc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108529
Reviewed-by: V, Stuart Foote
Reviewed-by: Jim Raykowski
Tested-by: Jenkins
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 2bb328138d6e..143a3259a991 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2831,6 +2831,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
m_rView.GetPostItMgr()->SetActiveSidebarWin(nullptr);
GrabFocus();
+rSh.addCurrentPosition();
//ignore key modifiers for format paintbrush
{
diff --git a/sw/source/uibase/shells/txtcrsr.cxx
b/sw/source/uibase/shells/txtcrsr.cxx
index 4ca50d6dab4e..1290c2070679 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -117,6 +117,7 @@ void SwTextShell::ExecBasicMove(SfxRequest &rReq)
void SwTextShell::ExecMove(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
+rSh.addCurrentPosition();
SwEditWin& rTmpEditWin = GetView().GetEditWin();
rTmpEditWin.FlushInBuffer();
@@ -175,6 +176,7 @@ void SwTextShell::ExecMove(SfxRequest &rReq)
void SwTextShell::ExecMovePage(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
+rSh.addCurrentPosition();
GetView().GetEditWin().FlushInBuffer();
switch( rReq.GetSlot() )
@@ -225,6 +227,7 @@ void SwTextShell::ExecMovePage(SfxRequest &rReq)
void SwTextShell::ExecMoveCol(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
+rSh.addCurrentPosition();
switch ( rReq.GetSlot() )
{
case FN_START_OF_COLUMN:
@@ -255,6 +258,7 @@ void SwTextShell::ExecMoveCol(SfxRequest &rReq)
void SwTextShell::ExecMoveLingu(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
+rSh.addCurrentPosition();
GetView().GetEditWin().FlushInBuffer();
switch ( rReq.GetSlot() )
@@ -311,6 +315,7 @@ void SwTextShell::ExecMoveLingu(SfxRequest &rReq)
void SwTextShell::ExecMoveMisc(SfxRequest &rReq)
{
SwWrtShell &rSh = GetShell();
+rSh.addCurrentPosition();
const sal_uInt16 nSlot = rReq.GetSlot();
bool bSetRetVal = true, bRet = true;
switch ( nSlot )
diff --git a/sw/source/uibase/uiview/viewmdi.cxx
b/sw/source/uibase/uiview/viewmdi.cxx
index 348a9a0d3621..541a0ba210c3 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -340,6 +340,8 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
if (pActiveSidebarWin)
pActiveSidebarWin->SwitchToFieldPos();
}
+if (NID_RECENCY != m_nMoveType && NID_PGE != m_nMoveType && NID_SRCH_REP
!= m_nMoveType)
+rSh.addCurrentPosition();
switch( m_nMoveType )
{
case NID_PGE:
diff --git a/sw/source/uibase/uiview/viewsrch.cxx
b/sw/source/uibase/uiview/viewsrch.cxx
index 66d8dfd60a3f..3b4b4375a966 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -124,6 +124,8 @@ static void lcl_emitSearchResultCallbacks(SvxSearchItem
const * pSearchItem, SwW
void SwView::ExecSearch(SfxRequest& rReq)
{
+GetWrtShell().addCurrentPosition();
+
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = nullptr;
bool bQuiet = false;
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index c1873967fcb6..933bdba0f57b 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -572,6 +572,7 @@ bool SwWrtShell::PageCursor(SwTwips lOffset, bool bSelect)
bool SwWrtShell::GotoPage(sal_uInt16 nPage, bool bRecord)
{
+addCurrentPosition();
ShellMoveCursor aTmp( this, false);
if( SwCursorShell::GotoPage(nPage) && bRecord)
{
diff --git a/sw/source/uibase/wrtsh/navmgr.cxx
b/sw/source/uibase/wrtsh/navmgr.cxx
index b8c1f32582d1..10130fbe4b4f 100644
--- a/sw/source/uibase/wrtsh/navmgr.cxx
+++ b/sw/source/uibase/wrtsh/navmgr.cxx
@@ -20,9 +20,12 @@
#include
#include
+#include
+
// This method positions the cursor to the position rPos.
void SwNavigationMgr::GotoSwPosition(const SwPosition &rPos) {
+m_rMyShell.GetView().GetEditWin().GrabFocus();
// EnterStdMode() prevents the cursor to 'block' the current
// shell when it should move from the image back to the normal shell
m_rMyShell.Enter
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svtools/uiconfig vcl/uiconfig vcl/unx
svtools/uiconfig/ui/combocontrol.ui|4 svtools/uiconfig/ui/listcontrol.ui |3 +++ svtools/uiconfig/ui/thineditcontrol.ui |3 +++ vcl/uiconfig/ui/combobox.ui|1 + vcl/unx/gtk3/gtk3gtkdata.cxx | 13 + vcl/unx/gtk3/gtk3gtkinst.cxx |4 6 files changed, 24 insertions(+), 4 deletions(-) New commits: commit 0c5cf69cb123fea5b340d9c9b1a292df2efa61cb Author: Caolán McNamara AuthorDate: Fri Jan 15 15:34:21 2021 + Commit: Adolfo Jayme Barrientos CommitDate: Sun Jan 17 03:45:33 2021 +0100 tdf#137695 shrink widget height below natural min within data browser Change-Id: Iba3c12376200b7ce800b48155a4b84ca2e47d63f Change-Id: Iba3c12376200b7ce800b48155a4b84ca2e47d63f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109350 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/svtools/uiconfig/ui/combocontrol.ui b/svtools/uiconfig/ui/combocontrol.ui index e9a60df380f9..38a0d6af1206 100644 --- a/svtools/uiconfig/ui/combocontrol.ui +++ b/svtools/uiconfig/ui/combocontrol.ui @@ -16,8 +16,12 @@ True True +False + ++ True diff --git a/svtools/uiconfig/ui/listcontrol.ui b/svtools/uiconfig/ui/listcontrol.ui index a9f2444e24ff..d633ec43d497 100644 --- a/svtools/uiconfig/ui/listcontrol.ui +++ b/svtools/uiconfig/ui/listcontrol.ui @@ -11,6 +11,9 @@ True False True + + + True diff --git a/svtools/uiconfig/ui/thineditcontrol.ui b/svtools/uiconfig/ui/thineditcontrol.ui index 095dc18e1985..fae64f377a13 100644 --- a/svtools/uiconfig/ui/thineditcontrol.ui +++ b/svtools/uiconfig/ui/thineditcontrol.ui @@ -46,6 +46,9 @@ True True 1 + + + 0 diff --git a/vcl/uiconfig/ui/combobox.ui b/vcl/uiconfig/ui/combobox.ui index 2c25d7ac8620..23cfe7ed9e31 100644 --- a/vcl/uiconfig/ui/combobox.ui +++ b/vcl/uiconfig/ui/combobox.ui @@ -3,6 +3,7 @@ +combobox True False True diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index 58109aae148a..cef4b3e0d30c 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -522,14 +522,19 @@ void GtkSalData::Init() G_CALLBACK(signalMonitorsChanged), GetGtkDisplay() ); /* - set a provider to allow certain buttons to have no padding + set a provider to allow certain widgets to have no padding a) little close button in menubar to close back to start-center - b) small buttons in view->data sources - c) small toolbar button in infobars + b) and small buttons in view->data sources (button.small-button) + c) small toolbar button in infobars (toolbar.small-button button) + d) comboboxes in the data browser for tdf#137695 (box#combobox button.small-button, + which would instead be combobox button.small-button if we didn't replace GtkComboBox, + see GtkInstanceComboBox for an explanation for why we do that) + e) entry in the data browser for tdf#137695 (entry.small-button) */ GtkCssProvider* pSmallButtonProvider = gtk_css_provider_new(); -static const gchar data[] = "button.small-button, toolbar.small-button button { " +static const gchar data[] = + "button.small-button, toolbar.small-button button, combobox.small-button *.combo, box#combobox.small-button *.combo, entry.small-button { " "padding: 0;" "margin-left: 0px;" "margin-right: 0px;" diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 5b11fba37947..f29c0c018ad3 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -15170,6 +15170,10 @@ public: , m_nMaxMRUCount(0) { int nActive = gtk_combo_box_get_active(m_pComboBox); + +if (gtk_style_context_has_class(gtk_widget_get_style_context(GTK_WIDGET(m_pComboBox)), "small-button")) + gtk_style_context_add_class(gtk_widget_get_style_context(GTK_WIDGET(getContainer())), "small-button"); + insertAsParent(GTK_WIDGET(m_pComboBox), GTK_WIDGET(getContainer())); gtk_widget_set_visible(GTK_WIDGET(m_pComboBox), false); gtk_widget_set_no_show_all(GTK_WIDGET(m_pComboBox), true); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/pdfexport/data/BrownFoxLazyDog.odt |binary
vcl/qa/cppunit/pdfexport/pdfexport.cxx| 89 ++
2 files changed, 89 insertions(+)
New commits:
commit 07d9819378192231322bb19a61f2cbd469f4611a
Author: Tomaž Vajngerl
AuthorDate: Sun Jan 17 00:10:00 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Jan 17 01:07:54 2021 +0100
tdf#139643: added a test, that checks the PDF/UA metadata is set
If we enable support for PDF/UA, then the metadata object must be
present and the metadata must have the PDF/UA flags set, or else
the PDF document won't be recognied as having PDF/UA. The added
test checks for this.
Change-Id: I9baa31f17f5db73820d71d941979d6b9a90f4555
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109443
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/qa/cppunit/pdfexport/data/BrownFoxLazyDog.odt
b/vcl/qa/cppunit/pdfexport/data/BrownFoxLazyDog.odt
new file mode 100644
index ..2e87c33c7194
Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/BrownFoxLazyDog.odt
differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index b55d4856fbee..2b84591c3dca 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2570,8 +2571,96 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest,
testReexportDocumentWithComplexResources)
}
#endif
}
+
+// Tests that at export the PDF has the PDF/UA metadata properly set
+// when we enable PDF/UA support.
+CPPUNIT_TEST_FIXTURE(PdfExportTest, testPdfUaMetadata)
+{
+// Import a basic document (document doesn't really matter)
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"BrownFoxLazyDog.odt";
+mxComponent = loadFromDesktop(aURL);
+CPPUNIT_ASSERT(mxComponent.is());
+
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+
+// Enable PDF/UA
+uno::Sequence aFilterData(
+comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true)
} }));
+aMediaDescriptor["FilterData"] <<= aFilterData;
+xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+
+// Parse the export result.
+vcl::filter::PDFDocument aDocument;
+SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ);
+CPPUNIT_ASSERT(aDocument.Read(aStream));
+
+auto* pCatalog = aDocument.GetCatalog();
+CPPUNIT_ASSERT(pCatalog);
+auto* pCatalogDictionary = pCatalog->GetDictionary();
+CPPUNIT_ASSERT(pCatalogDictionary);
+auto* pMetadataObject = pCatalogDictionary->LookupObject("Metadata");
+CPPUNIT_ASSERT(pMetadataObject);
+auto* pMetadataDictionary = pMetadataObject->GetDictionary();
+auto* pType
+=
dynamic_cast(pMetadataDictionary->LookupElement("Type"));
+CPPUNIT_ASSERT(pType);
+CPPUNIT_ASSERT_EQUAL(OString("Metadata"), pType->GetValue());
+
+auto* pStreamObject = pMetadataObject->GetStream();
+CPPUNIT_ASSERT(pStreamObject);
+auto& rStream = pStreamObject->GetMemory();
+rStream.Seek(0);
+
+// Search for the PDF/UA mrker in the metadata
+
+tools::XmlWalker aWalker;
+CPPUNIT_ASSERT(aWalker.open(&rStream));
+CPPUNIT_ASSERT_EQUAL(OString("xmpmeta"), aWalker.name());
+
+bool bPdfUaMarkerFound = false;
+OString aPdfUaPart;
+
+aWalker.children();
+while (aWalker.isValid())
+{
+if (aWalker.name() == "RDF"
+&& aWalker.namespaceHref() ==
"http://www.w3.org/1999/02/22-rdf-syntax-ns#";)
+{
+aWalker.children();
+while (aWalker.isValid())
+{
+if (aWalker.name() == "Description"
+&& aWalker.namespaceHref() ==
"http://www.w3.org/1999/02/22-rdf-syntax-ns#";)
+{
+aWalker.children();
+while (aWalker.isValid())
+{
+if (aWalker.name() == "part"
+&& aWalker.namespaceHref() ==
"http://www.aiim.org/pdfua/ns/id/";)
+{
+aPdfUaPart = aWalker.content();
+bPdfUaMarkerFound = true;
+}
+aWalker.next();
+}
+aWalker.parent();
+}
+aWalker.next();
+}
+aWalker.parent();
+}
+aWalker.next();
+}
+aWalker.parent();
+
+CPPUNIT_ASSERT(bPdfUaMarkerFound);
+CPPUNIT_ASSERT_EQUAL(OString("1"), aPdfUaPart);
}
+} // end anonymous namespace
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_
[Libreoffice-commits] core.git: include/tools tools/qa tools/source
include/tools/XmlWalker.hxx |2 ++
tools/qa/cppunit/test_xmlwalker.cxx |5 +
tools/qa/data/test.xml |2 ++
tools/source/xml/XmlWalker.cxx | 10 ++
4 files changed, 19 insertions(+)
New commits:
commit cd65d6c06760caf0109664d2a320cfb29d634ab2
Author: Tomaž Vajngerl
AuthorDate: Sun Jan 17 00:08:08 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Jan 17 01:07:29 2021 +0100
tools: support reading xml namespace with XmlWalker
Adds methods namespaceHref and namespacePrefix for reading the
current element's namespace prefix and the href.
Change-Id: I1c16857c6fc0bdfde2d983d8f42f15319029
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109442
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/tools/XmlWalker.hxx b/include/tools/XmlWalker.hxx
index 204d71b5f48c..65beb4531003 100644
--- a/include/tools/XmlWalker.hxx
+++ b/include/tools/XmlWalker.hxx
@@ -41,6 +41,8 @@ public:
bool open(SvStream* pStream);
OString name();
+OString namespaceHref();
+OString namespacePrefix();
OString content();
void children();
diff --git a/tools/qa/cppunit/test_xmlwalker.cxx
b/tools/qa/cppunit/test_xmlwalker.cxx
index 9f442c73c347..ec0a695b62d1 100644
--- a/tools/qa/cppunit/test_xmlwalker.cxx
+++ b/tools/qa/cppunit/test_xmlwalker.cxx
@@ -74,6 +74,11 @@ void XmlWalkerTest::testReadXML()
}
aWalker.parent();
}
+else if (aWalker.name() == "with-namespace")
+{
+CPPUNIT_ASSERT_EQUAL(OString("adobe:ns:meta/"),
aWalker.namespaceHref());
+CPPUNIT_ASSERT_EQUAL(OString("xx"), aWalker.namespacePrefix());
+}
aWalker.next();
}
aWalker.parent();
diff --git a/tools/qa/data/test.xml b/tools/qa/data/test.xml
index 7a0473d7f8f9..c2736e8bb6ac 100644
--- a/tools/qa/data/test.xml
+++ b/tools/qa/data/test.xml
@@ -8,4 +8,6 @@
+
+
diff --git a/tools/source/xml/XmlWalker.cxx b/tools/source/xml/XmlWalker.cxx
index 219bf10c8bb5..34a3d8746f6b 100644
--- a/tools/source/xml/XmlWalker.cxx
+++ b/tools/source/xml/XmlWalker.cxx
@@ -61,6 +61,16 @@ bool XmlWalker::open(SvStream* pStream)
OString XmlWalker::name() { return reinterpret_cast(mpImpl->mpCurrent->name); }
+OString XmlWalker::namespaceHref()
+{
+return reinterpret_cast(mpImpl->mpCurrent->ns->href);
+}
+
+OString XmlWalker::namespacePrefix()
+{
+return reinterpret_cast(mpImpl->mpCurrent->ns->prefix);
+}
+
OString XmlWalker::content()
{
OString aContent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sfx2/source
sfx2/source/sidebar/Deck.cxx |7 +--
sfx2/source/sidebar/DeckLayouter.cxx |7 ++-
sfx2/source/sidebar/SidebarController.cxx |6 +-
sfx2/source/sidebar/TabBar.cxx|5 +
4 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit eecedf21f4869dd52a6498377e35d85d2321ac80
Author: Michael Meeks
AuthorDate: Sat Jan 16 17:56:34 2021 +
Commit: Michael Meeks
CommitDate: Sun Jan 17 00:13:56 2021 +0100
sidebar: avoid invalidation thrash with LOK.
Avoids complete sidebar invalidate when entering text into a cell
and hitting enter.
Change-Id: I88ee3792589a1c0a16ae555da77ed7c12ca5f296
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109403
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source/sidebar/DeckLayouter.cxx
index c4c9cd4b9a81..f90ec176b2d0 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -613,7 +613,12 @@ void UpdateFiller (
vcl::Window& rFiller,
const tools::Rectangle& rBox)
{
-if (rBox.GetHeight() > 0)
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Not shown on LOK, and causes invalidation thrash
+rFiller.Hide();
+}
+else if (rBox.GetHeight() > 0)
{
// Show the filler.
rFiller.SetBackground(Theme::GetColor(Theme::Color_PanelBackground));
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 168719f84d23..60013c9b9274 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -793,7 +793,11 @@ void SidebarController::SwitchToDeck (
msCurrentDeckId = rDeckDescriptor.msId;
}
-mpTabBar->Invalidate();
+
+// invisible with LOK, so avoid invalidations
+if (!comphelper::LibreOfficeKit::isActive())
+mpTabBar->Invalidate();
+
mpTabBar->HighlightDeck(msCurrentDeckId);
// Determine the panels to display in the deck.
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index fc6124f79659..b989cb7d0964 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include
#include
@@ -104,6 +105,10 @@ sal_Int32 TabBar::GetDefaultWidth()
void TabBar::SetDecks(const ResourceManager::DeckContextDescriptorContainer&
rDecks)
{
+// invisible with LOK, so keep empty to avoid invalidations
+if (comphelper::LibreOfficeKit::isActive())
+return;
+
// Remove the current buttons.
maItems.clear();
for (auto const& deck : rDecks)
commit 8941f3f65e149c9f53c425c9cc153b32d8cd2482
Author: Michael Meeks
AuthorDate: Sat Jan 16 17:56:06 2021 +
Commit: Michael Meeks
CommitDate: Sun Jan 17 00:13:44 2021 +0100
sidebar: only invalidate when things change.
Change-Id: Icc9c5bcde224cc979b834585531b847f1c5f7d0b
Signed-off-by: Michael Meeks
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109457
Tested-by: Jenkins
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index ac376f571eb7..8578c398e3fa 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -435,8 +435,11 @@ void
Deck::ScrollContainerWindow::Paint(vcl::RenderContext& rRenderContext, cons
void Deck::ScrollContainerWindow::SetSeparators (const
::std::vector& rSeparators)
{
-maSeparators = rSeparators;
-Invalidate();
+if (rSeparators != maSeparators)
+{
+maSeparators = rSeparators;
+Invalidate();
+}
}
} // end of namespace sfx2::sidebar
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About upgrading towards Postgresql 13.1
Jan-Marek Glogowski wrote > Am 16.01.21 um 10:28 schrieb julien2412: >> Taking a look at >> https://bugs.documentfoundation.org/show_bug.cgi?id=139598, >> could someone retrieve postgresql-13.1.tar.bz2 from >> https://www.postgresql.org/ftp/source/v13.1/ and make it available on >> https://dev-www.libreoffice.org/src/ ? > > Done > ... Thank you for the quick feedback! I submitted https://gerrit.libreoffice.org/c/core/+/109456 but it's a WIP it doesn't even build on Linux. I removed all patches because I think it's better to start from scratch. Julien -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/uitest/navigator/tdf114724.py |4 ++--
sw/qa/uitest/navigator/tdf137274.py |9 +++--
sw/source/core/crsr/crstrvl.cxx |6 ++
sw/source/uibase/utlui/content.cxx |2 +-
sw/source/uibase/utlui/navipi.cxx |5 +
5 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit 602a044014b55a5a1b1a5f0e96af603590ee899f
Author: Jim Raykowski
AuthorDate: Tue Dec 29 15:12:44 2020 -0900
Commit: Jim Raykowski
CommitDate: Sat Jan 16 23:31:18 2021 +0100
tdf#137358 Fix incorrect outline position returned
when the cursor position is before the first outline node and there are
outline nodes in the document model extras section.
plus fix to update Navigator tracking on Navigator show
Change-Id: Ib93ba0d460128314efef228810c06dbd929c672e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108492
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/qa/uitest/navigator/tdf114724.py
b/sw/qa/uitest/navigator/tdf114724.py
index 9c538739048f..a84bab60da60 100644
--- a/sw/qa/uitest/navigator/tdf114724.py
+++ b/sw/qa/uitest/navigator/tdf114724.py
@@ -22,8 +22,8 @@ class tdf114724(UITestCase):
xWriterEdit.executeAction("FOCUS", tuple())
-self.ui_test.wait_until_property_is_updated(xNavigatorPanel,
"selectedtext", "Headings")
-self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectedtext"],
"Headings")
+self.ui_test.wait_until_property_is_updated(xNavigatorPanel,
"selectedtext", "HEADING 1")
+self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectedtext"],
"HEADING 1")
self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectioncount"],
"1")
for _ in range(0,3):
xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"DOWN"}))
diff --git a/sw/qa/uitest/navigator/tdf137274.py
b/sw/qa/uitest/navigator/tdf137274.py
index 2c23960ddf75..f1e153992e2d 100644
--- a/sw/qa/uitest/navigator/tdf137274.py
+++ b/sw/qa/uitest/navigator/tdf137274.py
@@ -30,13 +30,10 @@ class tdf137274(UITestCase):
xWriterEdit.executeAction("SIDEBAR", mkPropertyValues({"PANEL":
"SwNavigatorPanel"}))
-xNavigatorPanel = xWriterEdit.getChild("NavigatorPanelParent")
-
-xWriterEdit.executeAction("FOCUS", tuple())
+# wait until the navigator panel is available
+self.ui_test.wait_until_child_is_available(xMainWindow,
'NavigatorPanelParent')
-# Wait until the navigator is available
-self.ui_test.wait_until_property_is_updated(xNavigatorPanel,
"selectedtext", "Headings")
-self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectedtext"],
"Headings")
+xNavigatorPanel = xWriterEdit.getChild("NavigatorPanelParent")
xContentTree = xNavigatorPanel.getChild("contenttree")
xComments = xContentTree.getChild('10')
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index a41f3ae86799..893233c7ec1a 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1148,6 +1148,12 @@ SwOutlineNodes::size_type
SwCursorShell::GetOutlinePos(sal_uInt8 nLevel, SwPaM*
if (sw::IsParaPropsNode(*GetLayout(), *pNd->GetTextNode())
&& pNd->GetTextNode()->GetAttrOutlineLevel()-1 <= nLevel)
{
+if (pNd->GetIndex() < rNds.GetEndOfExtras().GetIndex()
+&& pCursor->GetNode().GetIndex() >
rNds.GetEndOfExtras().GetIndex())
+{
+// node found in extras but cursor position is not in extras
+return SwOutlineNodes::npos;
+}
return nPos;
}
}
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 5ac56dbabc43..5b3ce3b6474b 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3210,7 +3210,7 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate, Timer *, void)
void SwContentTree::UpdateTracking()
{
-if (State::HIDDEN == m_eState)
+if (State::HIDDEN == m_eState || !m_pActiveShell)
return;
// m_bIgnoreViewChange is set on delete
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index 725e4257ee14..7c440647e4e3 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -750,6 +750,11 @@ void SwNavigationPI::StateChanged(StateChangedType
nStateChange)
// show content if docked
if (SfxChildWindowContext::GetFloatingWindow(GetParent()) == nullptr
&& IsZoomedIn())
ZoomOut();
+if (m_xContentTree)
+{
+m_xContentTree->SetActiveShell(GetActiveWrtShell());
+m_xContentTree->UpdateTracking();
+}
}
else if (nStateChange == StateChangedType::ControlFocus)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedes
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/tdf116394.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 19 +++
2 files changed, 19 insertions(+)
New commits:
commit 63239749683ad718e10a5f561f17ca3c41ab4466
Author: Xisco Fauli
AuthorDate: Sat Jan 16 15:32:00 2021 +0100
Commit: Xisco Fauli
CommitDate: Sat Jan 16 21:57:32 2021 +0100
tdf#116394: sw_ooxmlexport15: Add unittest
Although the fix says in its message
"There is no point in adding a unit test for this."
The issue is a regression so I think it's better to have one,
just in case
Change-Id: Ica4774dd85c5c5fb73d5b54eb677fe8ab552a936
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109441
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/ooxmlexport/data/tdf116394.docx
b/sw/qa/extras/ooxmlexport/data/tdf116394.docx
new file mode 100644
index ..b152a0f3db9b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf116394.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 47c901dbd32f..b363d261fbf7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -180,6 +180,25 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123401, "tdf123401.fodt")
assertXPathContent(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r[2]/w:instrText", "
=AVERAGE(A1:A3)");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf116394, "tdf116394.docx")
+{
+uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference
xFields(xFieldsAccess->createEnumeration());
+
+uno::Reference
xEnumerationAccess(xFields->nextElement(), uno::UNO_QUERY);
+
+// Without the fix in place, this test would have failed with
+// - Expected: ab=cd..
+// - Actual : abcd..
+CPPUNIT_ASSERT_EQUAL(OUString("ab=cd.."),
xEnumerationAccess->getPresentation(true).trim());
+
+xmlDocUniquePtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/w:instrText", "
MERGEFIELD ab=cd ");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf123356, "tdf123356.fodt")
{
uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/wordcompletionpage.ui |1 - 1 file changed, 1 deletion(-) New commits: commit bafa5d9fbd93ae959208092f4018144b00e41422 Author: Caolán McNamara AuthorDate: Sat Jan 16 17:17:57 2021 + Commit: Caolán McNamara CommitDate: Sat Jan 16 21:00:21 2021 +0100 drop only remaining CheckBox yalign Change-Id: If387c518090c81cb6bd3ba0d18cf612ebdc51792 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109449 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/cui/uiconfig/ui/wordcompletionpage.ui b/cui/uiconfig/ui/wordcompletionpage.ui index 2898ca698b3d..f19609d3d08a 100644 --- a/cui/uiconfig/ui/wordcompletionpage.ui +++ b/cui/uiconfig/ui/wordcompletionpage.ui @@ -341,7 +341,6 @@ False True 0 -0 True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/uiconfig
xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui |1 - 1 file changed, 1 deletion(-) New commits: commit b197c89e2059015cef1025fed1e450a467740221 Author: Caolán McNamara AuthorDate: Fri Jan 15 20:20:47 2021 + Commit: Caolán McNamara CommitDate: Sat Jan 16 20:59:50 2021 +0100 drop unusual xalign 0.5 the whole widget is aligned start anyway so it makes no difference Change-Id: I2f7991eb20cd9df8580676c5be9fb863482bd464 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109419 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui index 5d0d7963026a..cf2404c613dd 100644 --- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui +++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui @@ -491,7 +491,6 @@ True start True -0.5 True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source
canvas/source/cairo/cairo_canvashelper_text.cxx |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 4499eb5b868b54512751b4e73c68df2a79e22606
Author: Noel
AuthorDate: Sat Jan 16 19:03:57 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jan 16 20:08:14 2021 +0100
return value from setupOutDevState is unused
Change-Id: Ic3006e3f73c5b1233076706d5982fefe12b8d511
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109448
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx
b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 056ae519201f..2763800d5283 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -108,7 +108,7 @@ namespace cairocanvas
return true;
}
-static int
+static void
setupOutDevState( OutputDevice& rOutDev,
const rendering::XCanvas* pOwner,
const rendering::ViewState& viewState,
@@ -120,8 +120,6 @@ namespace cairocanvas
2,
3 /* text */ );
-int nTransparency(0);
-
// TODO(P2): Don't change clipping all the time, maintain current clip
// state and change only when update is necessary
::canvas::tools::clipOutDev(viewState, renderState, rOutDev);
@@ -135,12 +133,9 @@ namespace cairocanvas
// extract alpha, and make color opaque
// afterwards. Otherwise, OutputDevice won't draw anything
-nTransparency = 255 - aColor.GetAlpha();
aColor.SetAlpha(255);
rOutDev.SetTextColor( aColor );
-
-return nTransparency;
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9e6f2b5eb712cc483d735132b0557dee4e593193 Author: Eike Rathke AuthorDate: Fri Jan 15 18:21:30 2021 +0100 Commit: Eike Rathke CommitDate: Sat Jan 16 18:06:11 2021 +0100 Update language-subtag-registry to 2020-12-18 Change-Id: I8c813005d8a1165e0baab81fd9f8b47c0aa3aa62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109387 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/download.lst b/download.lst index f4a442525c03..c2e11b17c695 100644 --- a/download.lst +++ b/download.lst @@ -142,8 +142,8 @@ export JFREEREPORT_SAC_SHA256SUM := 085f2112c51fa8c1783fac12fbd45265059641512134 export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip export LIBJPEG_TURBO_SHA256SUM := b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz -export LANGTAGREG_SHA256SUM := cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f -export LANGTAGREG_TARBALL := language-subtag-registry-2020-09-29.tar.bz2 +export LANGTAGREG_SHA256SUM := 62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1 +export LANGTAGREG_TARBALL := language-subtag-registry-2020-12-18.tar.bz2 export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_SHA256SUM := dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - xmloff/CppunitTest_xmloff_text.mk xmloff/qa xmloff/source
xmloff/CppunitTest_xmloff_text.mk |1
xmloff/qa/unit/text.cxx | 48 ++
xmloff/source/text/txtflde.cxx| 23 --
3 files changed, 60 insertions(+), 12 deletions(-)
New commits:
commit d16aeba7dbbb8a4fe9564cbb0b895b103444f31a
Author: Miklos Vajna
AuthorDate: Fri Jan 15 11:57:50 2021 +0100
Commit: Caolán McNamara
CommitDate: Sat Jan 16 18:01:14 2021 +0100
tdf#136861 ODT export: fix writing resolved state for non-ranged comments
It was probably not intentional to write the resolved state only in case
the annotation has a name.
(cherry picked from commit f3b5356bdc51b03f9910ed544b8c17d6f919bc12)
Change-Id: Ia3a6b2320e2288528c43c832211ebfcde492881e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109379
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/xmloff/CppunitTest_xmloff_text.mk
b/xmloff/CppunitTest_xmloff_text.mk
index e3259672605b..8e757fd584b2 100644
--- a/xmloff/CppunitTest_xmloff_text.mk
+++ b/xmloff/CppunitTest_xmloff_text.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,xmloff_text, \
sal \
test \
unotest \
+utl \
))
$(eval $(call gb_CppunitTest_use_sdk_api,xmloff_text))
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
index 3d1873d02e83..aff33db6a229 100644
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@@ -10,7 +10,13 @@
#include
#include
+#include
#include
+#include
+#include
+
+#include
+#include
using namespace ::com::sun::star;
@@ -52,6 +58,48 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMailMergeInEditeng)
CPPUNIT_ASSERT(getComponent().is());
}
+CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testCommentResolved)
+{
+getComponent() = loadFromDesktop("private:factory/swriter");
+uno::Sequence aCommentProps =
comphelper::InitPropertySequence({
+{ "Text", uno::makeAny(OUString("comment")) },
+});
+dispatchCommand(getComponent(), ".uno:InsertAnnotation", aCommentProps);
+uno::Reference xTextDocument(getComponent(),
uno::UNO_QUERY);
+uno::Reference
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+uno::Reference xParaEnum =
xParaEnumAccess->createEnumeration();
+uno::Reference
xPara(xParaEnum->nextElement(), uno::UNO_QUERY);
+uno::Reference xPortionEnum =
xPara->createEnumeration();
+uno::Reference xPortion(xPortionEnum->nextElement(),
uno::UNO_QUERY);
+uno::Reference
xField(xPortion->getPropertyValue("TextField"),
+ uno::UNO_QUERY);
+xField->setPropertyValue("Resolved", uno::makeAny(true));
+
+uno::Reference xStorable(getComponent(), uno::UNO_QUERY);
+uno::Sequence aStoreProps =
comphelper::InitPropertySequence({
+{ "FilterName", uno::makeAny(OUString("writer8")) },
+});
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+xStorable->storeToURL(aTempFile.GetURL(), aStoreProps);
+getComponent()->dispose();
+
+getComponent() = loadFromDesktop(aTempFile.GetURL());
+xTextDocument.set(getComponent(), uno::UNO_QUERY);
+xParaEnumAccess.set(xTextDocument->getText(), uno::UNO_QUERY);
+xParaEnum = xParaEnumAccess->createEnumeration();
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+xPortionEnum = xPara->createEnumeration();
+xPortion.set(xPortionEnum->nextElement(), uno::UNO_QUERY);
+xField.set(xPortion->getPropertyValue("TextField"), uno::UNO_QUERY);
+bool bResolved = false;
+xField->getPropertyValue("Resolved") >>= bResolved;
+// Without the accompanying fix in place, this test would have failed, as
the resolved state was
+// not saved for non-range comments.
+CPPUNIT_ASSERT(bResolved);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 2654a23bca7e..892c92b82ee7 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1752,18 +1752,17 @@ void XMLTextFieldExport::ExportFieldHelper(
if (!aName.isEmpty())
{
GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, aName);
-SvtSaveOptions::ODFSaneDefaultVersion eVersion =
rExport.getSaneDefaultVersion();
-if (eVersion & SvtSaveOptions::ODFSVER_EXTENDED)
-{
-bool b = GetBoolProperty("Resolved", rPropSet);
-OUString aResolvedText;
-OUStringBuffer aResolvedTextBuffer;
-::sax::Converter::convertBool(aResolvedTextBuffer, b);
-aResolvedText = aResolvedTextBuffer.makeStringAndClear();
-
-GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, XML_RESOLVED,
-aResolvedText);
-}
+}
+SvtSaveOptions::ODFSan
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/core/doc/DocumentRedlineManager.cxx |2 ++ sw/source/core/text/txtfrm.cxx|2 ++ 2 files changed, 4 insertions(+) New commits: commit 092f1a810d5b10aa8d6d8455491f7ae42caf3a08 Author: Michael Stahl AuthorDate: Thu Jan 14 20:10:24 2021 +0100 Commit: Caolán McNamara CommitDate: Sat Jan 16 17:59:55 2021 +0100 tdf#135014 sw_redlinehide: fix missing frames when removing fieldmark A fieldmark was deleted. UpdateFramesForRemoveDeleteRedline() deleted the MergedPara but its start node was before the start node of the fieldmark, and then MakeFrames() didn't find a frame on the preceding node and did nothing. Similar problem likely possible with redline. Change-Id: I532f9a67c0268f3287736a61da4cc9fefec7b8e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109307 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 32e104c1d6be0ffe6ed6c4e08af868c87b3c258c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109347 Reviewed-by: Caolán McNamara diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index f3aaa13a60d1..90d957bab92f 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -301,6 +301,8 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc, SwPaM const& rPam) pFrame->SetMergedPara(sw::CheckParaRedlineMerge( *pFrame, rFirstNode, eMode)); eMode = sw::FrameMode::New; // Existing is not idempotent! +// update pNode so MakeFrames starts on 2nd node +pNode = &rFirstNode; } } if (pLast != pNode) diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 2d585994ec05..ec1957dbaaaf 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -1278,6 +1278,8 @@ void SwTextFrame::SetMergedPara(std::unique_ptr p) pFirst->Add(this); // must register at node again } } +// postcondition: frame must be listening somewhere +assert(m_pMergedPara || GetDep()); } const OUString& SwTextFrame::GetText() const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/uiconfig vcl/uiconfig vcl/unx
svtools/uiconfig/ui/combocontrol.ui|4 svtools/uiconfig/ui/listcontrol.ui |3 +++ svtools/uiconfig/ui/thineditcontrol.ui |3 +++ vcl/uiconfig/ui/combobox.ui|1 + vcl/unx/gtk3/gtk3gtkdata.cxx | 13 + vcl/unx/gtk3/gtk3gtkinst.cxx |4 6 files changed, 24 insertions(+), 4 deletions(-) New commits: commit 444e0ce07c6652346dcc34f8d9ec4a4403b2109b Author: Caolán McNamara AuthorDate: Fri Jan 15 15:34:21 2021 + Commit: Caolán McNamara CommitDate: Sat Jan 16 17:53:31 2021 +0100 tdf#137695 shrink widget height below natural min within data browser Change-Id: Iba3c12376200b7ce800b48155a4b84ca2e47d63f Change-Id: Iba3c12376200b7ce800b48155a4b84ca2e47d63f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109380 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/svtools/uiconfig/ui/combocontrol.ui b/svtools/uiconfig/ui/combocontrol.ui index e9a60df380f9..38a0d6af1206 100644 --- a/svtools/uiconfig/ui/combocontrol.ui +++ b/svtools/uiconfig/ui/combocontrol.ui @@ -16,8 +16,12 @@ True True +False + ++ True diff --git a/svtools/uiconfig/ui/listcontrol.ui b/svtools/uiconfig/ui/listcontrol.ui index a9f2444e24ff..d633ec43d497 100644 --- a/svtools/uiconfig/ui/listcontrol.ui +++ b/svtools/uiconfig/ui/listcontrol.ui @@ -11,6 +11,9 @@ True False True + + + True diff --git a/svtools/uiconfig/ui/thineditcontrol.ui b/svtools/uiconfig/ui/thineditcontrol.ui index 3f6285d6ad9f..504606663b7b 100644 --- a/svtools/uiconfig/ui/thineditcontrol.ui +++ b/svtools/uiconfig/ui/thineditcontrol.ui @@ -46,6 +46,9 @@ True True 1 + + + 0 diff --git a/vcl/uiconfig/ui/combobox.ui b/vcl/uiconfig/ui/combobox.ui index 2c25d7ac8620..23cfe7ed9e31 100644 --- a/vcl/uiconfig/ui/combobox.ui +++ b/vcl/uiconfig/ui/combobox.ui @@ -3,6 +3,7 @@ +combobox True False True diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index 58109aae148a..cef4b3e0d30c 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -522,14 +522,19 @@ void GtkSalData::Init() G_CALLBACK(signalMonitorsChanged), GetGtkDisplay() ); /* - set a provider to allow certain buttons to have no padding + set a provider to allow certain widgets to have no padding a) little close button in menubar to close back to start-center - b) small buttons in view->data sources - c) small toolbar button in infobars + b) and small buttons in view->data sources (button.small-button) + c) small toolbar button in infobars (toolbar.small-button button) + d) comboboxes in the data browser for tdf#137695 (box#combobox button.small-button, + which would instead be combobox button.small-button if we didn't replace GtkComboBox, + see GtkInstanceComboBox for an explanation for why we do that) + e) entry in the data browser for tdf#137695 (entry.small-button) */ GtkCssProvider* pSmallButtonProvider = gtk_css_provider_new(); -static const gchar data[] = "button.small-button, toolbar.small-button button { " +static const gchar data[] = + "button.small-button, toolbar.small-button button, combobox.small-button *.combo, box#combobox.small-button *.combo, entry.small-button { " "padding: 0;" "margin-left: 0px;" "margin-right: 0px;" diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 963f46f90b27..da649144a750 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -15284,6 +15284,10 @@ public: , m_nMaxMRUCount(0) { int nActive = gtk_combo_box_get_active(m_pComboBox); + +if (gtk_style_context_has_class(gtk_widget_get_style_context(GTK_WIDGET(m_pComboBox)), "small-button")) + gtk_style_context_add_class(gtk_widget_get_style_context(GTK_WIDGET(getContainer())), "small-button"); + insertAsParent(GTK_WIDGET(m_pComboBox), GTK_WIDGET(getContainer())); gtk_widget_set_visible(GTK_WIDGET(m_pComboBox), false); gtk_widget_set_no_show_all(GTK_WIDGET(m_pComboBox), true); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/cellalignment.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a56ed9edff41867a93c8ea06c0f874793f8e88d Author: Caolán McNamara AuthorDate: Fri Jan 15 20:28:42 2021 + Commit: Caolán McNamara CommitDate: Sat Jan 16 17:53:05 2021 +0100 remove unusual 0.5 align from "Asian layout mode" its sibling doesn't have it and they should both be the same Change-Id: I4a0e4c3c04c7014537462221a40b0bef9c646f3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109420 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui index ae55d06857fc..472c2b6eb1cb 100644 --- a/cui/uiconfig/ui/cellalignment.ui +++ b/cui/uiconfig/ui/cellalignment.ui @@ -147,7 +147,7 @@ False 12 True -0.5 +0 True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/RawBitmap.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 508c2e4a2d2b26d6b1842ff98e9aaa4d3adddf80
Author: Noel Grandin
AuthorDate: Sat Jan 16 11:52:40 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jan 16 17:47:57 2021 +0100
transparency->alpha in vcl::RawBitmap
Change-Id: I68e0518f0dc6a7c01d2fec734b0d0aff0d48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109427
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/include/vcl/RawBitmap.hxx b/include/vcl/RawBitmap.hxx
index d3dcb642cf6c..26e08dbdedac 100644
--- a/include/vcl/RawBitmap.hxx
+++ b/include/vcl/RawBitmap.hxx
@@ -47,7 +47,7 @@ public:
mpData[p++] = nColor.GetGreen();
mpData[p++] = nColor.GetBlue();
if (mnBitCount == 32)
-mpData[p] = 255 - nColor.GetAlpha();
+mpData[p] = nColor.GetAlpha();
}
Color GetPixel(tools::Long nY, tools::Long nX) const
{
@@ -55,7 +55,7 @@ public:
if (mnBitCount == 24)
return Color(mpData[p], mpData[p + 1], mpData[p + 2]);
else
-return Color(ColorTransparency, mpData[p + 3], mpData[p], mpData[p
+ 1], mpData[p + 2]);
+return Color(ColorAlpha, mpData[p + 3], mpData[p], mpData[p + 1],
mpData[p + 2]);
}
// so we don't accidentally leave any code in that uses palette color
indexes
void SetPixel(tools::Long nY, tools::Long nX, BitmapColor nColor) = delete;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit d864b799e0460c2c8ada62fd598e7adcb1ac6700
Author: Justin Luth
AuthorDate: Sat Jan 16 12:12:04 2021 +0300
Commit: Xisco Fauli
CommitDate: Sat Jan 16 17:43:43 2021 +0100
tdf#116394 writerfilter: append '=' if not a formula marker
Oops - a silly mistake to throw away the character if
it didn't match a special purpose.
There is no point in adding a unit test for this.
Change-Id: I3b48af578ae96744405ec0919ff341d1c9b43f65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109426
Tested-by: Jenkins
Reviewed-by: Justin Luth
(cherry picked from commit b232b422a3cfe3b410bbc75e0fffdfc238fd10e7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109397
Reviewed-by: Xisco Fauli
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e8a45ef3b5c0..5325190d5ef2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3533,6 +3533,8 @@ static OUString lcl_ExtractToken(OUString const& rCommand,
++rIndex;
return "FORMULA";
}
+else
+token.append('=');
break;
default:
token.append(currentChar);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 1b5ff41ae250ccd6b0e73b412ab7bd655f489d74
Author: Justin Luth
AuthorDate: Sat Jan 16 12:12:04 2021 +0300
Commit: Xisco Fauli
CommitDate: Sat Jan 16 17:42:12 2021 +0100
tdf#116394 writerfilter: append '=' if not a formula marker
Oops - a silly mistake to throw away the character if
it didn't match a special purpose.
There is no point in adding a unit test for this.
Change-Id: I3b48af578ae96744405ec0919ff341d1c9b43f65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109426
Tested-by: Jenkins
Reviewed-by: Justin Luth
(cherry picked from commit b232b422a3cfe3b410bbc75e0fffdfc238fd10e7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109398
Reviewed-by: Xisco Fauli
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7a248ca36aa2..d0d5a9fa5b0d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3387,6 +3387,8 @@ static OUString lcl_ExtractToken(OUString const& rCommand,
++rIndex;
return "FORMULA";
}
+else
+token.append('=');
break;
default:
token.append(currentChar);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2 vcl/source
helpcontent2 |2 +-
vcl/source/gdi/pdfwriter_impl.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1cc0fc1f3cdae597912d7204256427e060fcde61
Author: Julien Nabet
AuthorDate: Sat Jan 16 14:32:42 2021 +0100
Commit: Julien Nabet
CommitDate: Sat Jan 16 16:35:17 2021 +0100
tdf#139643: fix missing PDF/UA flag
Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/vcl/source/gdi/pdfwriter_impl.cxx?id=a795886762a6a4aabd601183598c4e6c819bcb1f
author Arnaud Versini 2019-09-20 19:01:34
+0200
committer Arnaud Versini 2020-02-08
15:03:07 +0100
commit a795886762a6a4aabd601183598c4e6c819bcb1f (patch)
tree93a58d738bf27a0c5f75f80dc7e651763916ee5f
/vcl/source/gdi/pdfwriter_impl.cxx
parent a2f62a861ba7036e689070c47f72214b1bdd49d4 (diff)
Add minimum support for PDF/A3
here:
sal_Int32 PDFWriterImpl::emitDocumentMetadata()
{
-if (!m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_UA)
+if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 )
Change-Id: Id4b3b9a74ccf5a5abd9e7149cb09b3475dd4ffee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109437
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index aee37877c7f6..7339c4cbeb19 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5236,7 +5236,7 @@ static void lcl_assignMeta(const OUString& aValue,
OString& aMeta)
// emits the document metadata
sal_Int32 PDFWriterImpl::emitDocumentMetadata()
{
-if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 )
+if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 && !m_bIsPDF_UA)
return 0;
//get the object number for all the destinations
commit 208a2e51c32a8918388216bf2f47b513948ebd7d
Author: Ilmari Lauhakangas
AuthorDate: Sat Jan 16 17:35:09 2021 +0200
Commit: Gerrit Code Review
CommitDate: Sat Jan 16 16:35:09 2021 +0100
Update git submodules
* Update helpcontent2 from branch 'master'
to 91413eacbe8790505dfd4cc452b0fa2e5589ac33
- Use switches for Ctrl vs. Command on macOS
Change-Id: I13829b216081021ae321a5c7111de0e11e65a7ee
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109440
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/helpcontent2 b/helpcontent2
index 942c4de7eb85..91413eacbe87 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 942c4de7eb854bb99e3ed79caa283608ec1891a7
+Subproject commit 91413eacbe8790505dfd4cc452b0fa2e5589ac33
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/guide/undo_formatting.xhp |8 source/text/simpress/01/0211.xhp |2 +- source/text/simpress/guide/keyboard.xhp | 16 source/text/swriter/guide/insert_graphic_fromdraw.xhp |4 ++-- source/text/swriter/guide/pageorientation.xhp |2 +- source/text/swriter/guide/resize_navigator.xhp|4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) New commits: commit 91413eacbe8790505dfd4cc452b0fa2e5589ac33 Author: Ilmari Lauhakangas AuthorDate: Sat Jan 16 16:21:07 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jan 16 16:35:09 2021 +0100 Use switches for Ctrl vs. Command on macOS Change-Id: I13829b216081021ae321a5c7111de0e11e65a7ee Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109440 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/guide/undo_formatting.xhp b/source/text/shared/guide/undo_formatting.xhp index faea762d9..7c295dd1b 100644 --- a/source/text/shared/guide/undo_formatting.xhp +++ b/source/text/shared/guide/undo_formatting.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 . --> - + @@ -44,7 +44,7 @@ Removing all Direct Formatting in a $[officename] Writer Document -Press Ctrl+A to select the whole text. +Press CommandCtrl+A to select the whole text. Choose Format - Clear Direct Formatting. @@ -56,7 +56,7 @@ While pressing the Shift key click the first and then the last sheet tab to select all sheets. -Press Ctrl+A to select the whole text. +Press CommandCtrl+A to select the whole text. Choose Format - Clear Direct Formatting. @@ -68,7 +68,7 @@ Click the Outline tab to open outline view. -Press Ctrl+A to select the whole text. +Press CommandCtrl+A to select the whole text. Choose Format - Clear Direct Formatting. diff --git a/source/text/simpress/01/0211.xhp b/source/text/simpress/01/0211.xhp index 71f018635..fba514458 100644 --- a/source/text/simpress/01/0211.xhp +++ b/source/text/simpress/01/0211.xhp @@ -43,7 +43,7 @@ -Press Ctrl+Shift+F5 to open the Navigator when you are editing a presentation. +Press CommandCtrl+Shift+F5 to open the Navigator when you are editing a presentation. Pointer Switches the mouse pointer to a pen that you can use to write on slides during a slide show. You cannot change the color of the pen. diff --git a/source/text/simpress/guide/keyboard.xhp b/source/text/simpress/guide/keyboard.xhp index 553b88e4b..54fe3f6bb 100644 --- a/source/text/simpress/guide/keyboard.xhp +++ b/source/text/simpress/guide/keyboard.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 . --> - + @@ -37,11 +37,11 @@ You can use the keyboard to access $[officename] Impress commands as well as to navigate through the workspace. $[officename] Impress uses the same shortcut keys as $[officename] Draw to create drawing objects. Selecting placeholders -$[officename] Impress AutoLayouts use placeholders for slide titles, text, and objects. To select a placeholder, press Ctrl+Enter. To move to the next placeholder, press Ctrl+Enter again. -If you press Ctrl+Enter after you reach the last placeholder in a slide, a new slide is inserted after the current slide. The new slide uses the same layout as the current slide. +$[officename] Impress AutoLayouts use placeholders for slide titles, text, and objects. To select a placeholder, press CommandCtrl+Enter. To move to the next placeholder, press CommandCtrl+Enter again. +If you press CommandCtrl+Enter after you reach the last placeholder in a slide, a new slide is inserted after the current slide. The new slide uses the same layout as the current slide. During a Slide Show -To start a slide show, press Ctrl+F2 or F5. +To start a slide show, press CommandCtrl+F2 or F5. Advance to the next slide or to the next animation effect Spacebar @@ -65,19 +65,19 @@ Copying a slide: -Use the arrow keys to navigate to the slide that you want to copy, and then press Ctrl+C. +Use the arrow keys to navigate to the slide that you want to copy, and then press CommandCtrl+C. -Move to the slide where you want to paste the copied slide, and then press Ctrl+V. +Move to the slide where you want to paste the copied slide, and then press CommandCtrl+V. Moving a slide: -Use the arrow keys to navigate to the slide that you want to move, and then press Ctrl+X. +Use the arrow keys to navigate to the slide that you want to move, and then press CommandCtrl+X. -Navigate to the slide where you want to move the slide, and then press Ctrl+V. +Navigate to the slide where you want to move the slide, and then press CommandCtrl+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8b9708b0e4d1bc26cb8e300cfcf7a5071eb42d7c Author: Johnny_M AuthorDate: Sat Jan 16 16:25:53 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Jan 16 16:25:53 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 942c4de7eb854bb99e3ed79caa283608ec1891a7 - tdf#132643 Translate German section IDs Change-Id: Ic28f919518537829b86c6afc1efe66d9ac004601 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109433 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 606d802dc2c9..942c4de7eb85 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 606d802dc2c97bc3186983b7c3da7485b4d5b4d1 +Subproject commit 942c4de7eb854bb99e3ed79caa283608ec1891a7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05210300.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 942c4de7eb854bb99e3ed79caa283608ec1891a7 Author: Johnny_M AuthorDate: Sat Jan 16 12:48:29 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Jan 16 16:25:53 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ic28f919518537829b86c6afc1efe66d9ac004601 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109433 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/05210300.xhp b/source/text/shared/01/05210300.xhp index 16d96dcd3..23d0e8ff5 100644 --- a/source/text/shared/01/05210300.xhp +++ b/source/text/shared/01/05210300.xhp @@ -26,7 +26,7 @@ - + Gradients ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b922cbb51b7bf7514d7d51c05cf0fff7a04f9033 Author: Johnny_M AuthorDate: Sat Jan 16 16:25:12 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Jan 16 16:25:12 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 606d802dc2c97bc3186983b7c3da7485b4d5b4d1 - tdf#132643 Translate German section IDs Change-Id: I50abb30e9ce171c54767f78535dda3a577414522 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109432 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 320ca7e3c001..606d802dc2c9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 320ca7e3c001621f9bd4266ee940d7d1fd1ba4c0 +Subproject commit 606d802dc2c97bc3186983b7c3da7485b4d5b4d1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/main0202.xhp |4 ++-- source/text/scalc/main0205.xhp |4 ++-- source/text/shared/00/00040502.xhp |4 ++-- source/text/shared/01/05020100.xhp |2 +- source/text/shared/01/0511.xhp |2 +- source/text/shared/01/05110100.xhp |4 ++-- source/text/shared/submenu_text.xhp |2 +- source/text/simpress/main0203.xhp |4 ++-- source/text/swriter/main0202.xhp|4 ++-- source/text/swriter/main0220.xhp|4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 606d802dc2c97bc3186983b7c3da7485b4d5b4d1 Author: Johnny_M AuthorDate: Sat Jan 16 12:46:00 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Jan 16 16:25:12 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I50abb30e9ce171c54767f78535dda3a577414522 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109432 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0202.xhp b/source/text/scalc/main0202.xhp index a545648cc..a2d75e36e 100644 --- a/source/text/scalc/main0202.xhp +++ b/source/text/scalc/main0202.xhp @@ -38,8 +38,8 @@ - - + + diff --git a/source/text/scalc/main0205.xhp b/source/text/scalc/main0205.xhp index 457fae4bb..ef776e636 100644 --- a/source/text/scalc/main0205.xhp +++ b/source/text/scalc/main0205.xhp @@ -39,8 +39,8 @@ - - + + diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp index eb5bf397c..9d330c751 100644 --- a/source/text/shared/00/00040502.xhp +++ b/source/text/shared/00/00040502.xhp @@ -273,9 +273,9 @@ Open context menu - choose Style. - + Open context menu - choose Style - Bold. - + diff --git a/source/text/shared/01/05020100.xhp b/source/text/shared/01/05020100.xhp index 0d2656a1c..faa556c23 100644 --- a/source/text/shared/01/05020100.xhp +++ b/source/text/shared/01/05020100.xhp @@ -81,7 +81,7 @@ Typeface Select the formatting that you want to apply. - + diff --git a/source/text/shared/01/0511.xhp b/source/text/shared/01/0511.xhp index 8e19bb1c0..aa0716204 100644 --- a/source/text/shared/01/0511.xhp +++ b/source/text/shared/01/0511.xhp @@ -43,7 +43,7 @@ If you place the cursor in a word and do not make a selection, the font style is applied to the entire word. If the cursor is not inside a word, and no text is selected, then the font style is applied to the text that you type. - + diff --git a/source/text/shared/01/05110100.xhp b/source/text/shared/01/05110100.xhp index 14f5788d8..ce3d90162 100644 --- a/source/text/shared/01/05110100.xhp +++ b/source/text/shared/01/05110100.xhp @@ -30,7 +30,7 @@ - + text; bold bold; text characters; bold @@ -41,7 +41,7 @@ If the cursor is not inside a word, and no text is selected, then the font style is applied to the text that you type. - + diff --git a/source/text/shared/submenu_text.xhp b/source/text/shared/submenu_text.xhp index 152e2cabd..07d4b3df2 100644 --- a/source/text/shared/submenu_text.xhp +++ b/source/text/shared/submenu_text.xhp @@ -36,7 +36,7 @@ - + diff --git a/source/text/simpress/main0203.xhp b/source/text/simpress/main0203.xhp index 1c9f1cf4d..4c61b4286 100644 --- a/source/text/simpress/main0203.xhp +++ b/source/text/simpress/main0203.xhp @@ -35,8 +35,8 @@ - - + + diff --git a/source/text/swriter/main0202.xhp b/source/text/swriter/main0202.xhp index 335e8a184..e9f34ec6d 100644 --- a/source/text/swriter/main0202.xhp +++ b/source/text/swriter/main0202.xhp @@ -37,8 +37,8 @@ - - + + diff --git a/source/text/swriter/main0220.xhp b/source/text/swriter/main0220.xhp index 2f57cfc45..35514e81c 100644 --- a/source/text/swriter/main0220.xhp +++ b/source/text/swriter/main0220.xhp @@ -39,8 +39,8 @@ - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cad06caf89645a76268e77aedca6cf771505ceae Author: Johnny_M AuthorDate: Sat Jan 16 16:23:42 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Jan 16 16:23:42 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 320ca7e3c001621f9bd4266ee940d7d1fd1ba4c0 - tdf#132643 Translate German section IDs Change-Id: I991a5aaa37ddbc22fd193cab837bec2c672daf1f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109431 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 88b1c44c82a5..320ca7e3c001 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 88b1c44c82a5ead09f54420266e8c30bb5ebaa4a +Subproject commit 320ca7e3c001621f9bd4266ee940d7d1fd1ba4c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0535.xhp |2 +- source/text/shared/01/05350500.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 320ca7e3c001621f9bd4266ee940d7d1fd1ba4c0 Author: Johnny_M AuthorDate: Sat Jan 16 12:38:35 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Jan 16 16:23:42 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I991a5aaa37ddbc22fd193cab837bec2c672daf1f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109431 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0535.xhp b/source/text/shared/01/0535.xhp index f8e51ef62..6c5808d01 100644 --- a/source/text/shared/01/0535.xhp +++ b/source/text/shared/01/0535.xhp @@ -44,7 +44,7 @@ - + diff --git a/source/text/shared/01/05350500.xhp b/source/text/shared/01/05350500.xhp index c5de946e6..7c174db79 100644 --- a/source/text/shared/01/05350500.xhp +++ b/source/text/shared/01/05350500.xhp @@ -27,7 +27,7 @@ - + Textures Sets the properties of the surface texture for the selected 3D object. This feature is only available after you apply a surface texture to the selected object. To quickly apply a surface texture, open the Gallery, hold down Shift+CommandCtrl, and then drag an image onto the selected 3D object. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7f89903119db999a168daca1c713a3467a2ab61 Author: Johnny_M AuthorDate: Sat Jan 16 16:22:54 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Jan 16 16:22:54 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 88b1c44c82a5ead09f54420266e8c30bb5ebaa4a - tdf#132643 Translate German section IDs Change-Id: Ia437c42384398d61afad346cfdd66819ffa7d4f6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109430 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 0cd762484faa..88b1c44c82a5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0cd762484faa2059ca5d85c2f98c47c86b836f7e +Subproject commit 88b1c44c82a5ead09f54420266e8c30bb5ebaa4a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0511.xhp |2 +- source/text/shared/01/05110800.xhp |2 +- source/text/shared/submenu_text.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 88b1c44c82a5ead09f54420266e8c30bb5ebaa4a Author: Johnny_M AuthorDate: Sat Jan 16 12:36:33 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Jan 16 16:22:54 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ia437c42384398d61afad346cfdd66819ffa7d4f6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109430 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0511.xhp b/source/text/shared/01/0511.xhp index 7c2570768..8e19bb1c0 100644 --- a/source/text/shared/01/0511.xhp +++ b/source/text/shared/01/0511.xhp @@ -49,6 +49,6 @@ - + diff --git a/source/text/shared/01/05110800.xhp b/source/text/shared/01/05110800.xhp index d5325cf62..a2366b614 100644 --- a/source/text/shared/01/05110800.xhp +++ b/source/text/shared/01/05110800.xhp @@ -30,7 +30,7 @@ - + Subscript Reduces the font size of the selected text and lowers the text below the baseline. diff --git a/source/text/shared/submenu_text.xhp b/source/text/shared/submenu_text.xhp index 9648f4410..152e2cabd 100644 --- a/source/text/shared/submenu_text.xhp +++ b/source/text/shared/submenu_text.xhp @@ -48,7 +48,7 @@ - + Shadow ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7fa4c3c195912917b0de00cc3531d06a9fb91dc5 Author: Johnny_M AuthorDate: Sat Jan 16 16:21:54 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Jan 16 16:21:54 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 0cd762484faa2059ca5d85c2f98c47c86b836f7e - tdf#132643 Translate German section IDs Change-Id: Ib73fca400cb77824c149e9080c9a1486ebd77a79 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109429 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d97287d7f83c..0cd762484faa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d97287d7f83c7e48c27d2541895a7230f09b0ee8 +Subproject commit 0cd762484faa2059ca5d85c2f98c47c86b836f7e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/0212.xhp |2 +- source/text/scalc/01/02120100.xhp |2 +- source/text/scalc/01/0507.xhp |2 +- source/text/shared/00/00040500.xhp |2 +- source/text/shared/01/05040300.xhp |4 ++-- source/text/swriter/01/0504.xhp |2 +- source/text/swriter/02/1901.xhp |2 +- 7 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 0cd762484faa2059ca5d85c2f98c47c86b836f7e Author: Johnny_M AuthorDate: Sat Jan 16 12:34:28 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Jan 16 16:21:54 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ib73fca400cb77824c149e9080c9a1486ebd77a79 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109429 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/0212.xhp b/source/text/scalc/01/0212.xhp index 99198b4de..53214c215 100644 --- a/source/text/scalc/01/0212.xhp +++ b/source/text/scalc/01/0212.xhp @@ -34,7 +34,7 @@ - + \ No newline at end of file diff --git a/source/text/scalc/01/02120100.xhp b/source/text/scalc/01/02120100.xhp index b3851f35d..7ca98d272 100644 --- a/source/text/scalc/01/02120100.xhp +++ b/source/text/scalc/01/02120100.xhp @@ -26,7 +26,7 @@ - + page styles; headers page styles; footers headers; defining diff --git a/source/text/scalc/01/0507.xhp b/source/text/scalc/01/0507.xhp index 939237081..f49d79567 100644 --- a/source/text/scalc/01/0507.xhp +++ b/source/text/scalc/01/0507.xhp @@ -45,7 +45,7 @@ - + diff --git a/source/text/shared/00/00040500.xhp b/source/text/shared/00/00040500.xhp index 16b66b058..f4aaa3fa1 100644 --- a/source/text/shared/00/00040500.xhp +++ b/source/text/shared/00/00040500.xhp @@ -191,7 +191,7 @@ - + Choose Format - Page - Header tab. Choose View - Styles - open context menu of a page style entry and choose Modify/New - Header tab. diff --git a/source/text/shared/01/05040300.xhp b/source/text/shared/01/05040300.xhp index 6e494c183..e7854e713 100644 --- a/source/text/shared/01/05040300.xhp +++ b/source/text/shared/01/05040300.xhp @@ -27,7 +27,7 @@ - + @@ -40,7 +40,7 @@ - + To add a header to the current page style, select Header on, and then click OK. diff --git a/source/text/swriter/01/0504.xhp b/source/text/swriter/01/0504.xhp index 836f1ae70..626fc98bf 100644 --- a/source/text/swriter/01/0504.xhp +++ b/source/text/swriter/01/0504.xhp @@ -40,7 +40,7 @@ - + diff --git a/source/text/swriter/02/1901.xhp b/source/text/swriter/02/1901.xhp index 0c93f48a4..9e8d3d5a7 100644 --- a/source/text/swriter/02/1901.xhp +++ b/source/text/swriter/02/1901.xhp @@ -30,7 +30,7 @@ - + Insert Header Displays the header of an HTML document if headers are enabled on the Format - Page - Header tab page.help text still visible in Customize - Toolbars, so do not remove ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/uiconfig
vcl/uiconfig/ui/screenshotparent.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ffc8409024c0de97cd1cb5fadbe72d90c3fd7d3b Author: Julien Nabet AuthorDate: Fri Jan 15 21:47:28 2021 +0100 Commit: Caolán McNamara CommitDate: Sat Jan 16 16:08:35 2021 +0100 Cancel action here vcl/screenshotparent Change-Id: I136fa04e873932621b92004e8eafd7b3a32ef945 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109423 Tested-by: Jenkins Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/vcl/uiconfig/ui/screenshotparent.ui b/vcl/uiconfig/ui/screenshotparent.ui index 620338c80cf8..629b1741b5de 100644 --- a/vcl/uiconfig/ui/screenshotparent.ui +++ b/vcl/uiconfig/ui/screenshotparent.ui @@ -23,7 +23,7 @@ end -_Close +_Cancel True True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
include/vcl/toolkit/roadmap.hxx |2 +-
vcl/inc/wizdlg.hxx |2 +-
vcl/source/app/salvtables.cxx|2 +-
vcl/source/control/roadmap.cxx |5 +++--
vcl/source/control/roadmapwizard.cxx |4 ++--
5 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit a4c9b7f3722cb496c01ae72c5897f3243523658d
Author: Caolán McNamara
AuthorDate: Fri Jan 15 16:39:08 2021 +
Commit: Caolán McNamara
CommitDate: Sat Jan 16 16:03:19 2021 +0100
tdf#138829 don't grab focus to roadmap label when sync timer fires
Change-Id: Icc8a03a2ce5d63f3a2c477671a9aa52aefd1df96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109385
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index c2654c1fd56e..7cfd6d7bd290 100644
--- a/include/vcl/toolkit/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
@@ -73,7 +73,7 @@ public:
voidDeleteRoadmapItem( ItemIndex _nIndex );
ItemId GetCurrentRoadmapItemID() const;
-boolSelectRoadmapItemByID( ItemId _nItemID );
+boolSelectRoadmapItemByID(ItemId nItemID, bool bGrabFocus =
true);
voidSetItemSelectHdl( const Link& _rHdl );
Link const & GetItemSelectHdl( ) const;
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index 32a6401a6799..7c6af8636260 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -145,7 +145,7 @@ namespace vcl
voidInsertRoadmapItem(int nIndex, const OUString& rLabel,
int nId, bool bEnabled);
voidDeleteRoadmapItems();
int GetCurrentRoadmapItemID() const;
-voidSelectRoadmapItemByID(int nId);
+voidSelectRoadmapItemByID(int nId, bool bGrabFocus = true);
voidSetItemSelectHdl( const Link&
_rHdl );
voidShowRoadmap(bool bShow);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index cb806a5174bd..d10a2450d5c0 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1913,7 +1913,7 @@ IMPL_LINK_NOARG(SalInstanceAssistant, UpdateRoadmap_Hdl,
Timer*, void)
m_xWizard->InsertRoadmapItem(nPos++, rLabel, m_aIds[i], bSensitive);
}
-m_xWizard->SelectRoadmapItemByID(m_aIds[get_current_page()]);
+m_xWizard->SelectRoadmapItemByID(m_aIds[get_current_page()], false);
m_xWizard->ShowRoadmap(nPos != 0);
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index f1df11cff5bb..bc6a9c125de8 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -523,7 +523,7 @@ void ORoadmap::GetFocus()
pCurHyperLabel->GrabFocus();
}
-bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
+bool ORoadmap::SelectRoadmapItemByID(ItemId _nNewID, bool bGrabFocus)
{
DeselectOldRoadmapItems();
RoadmapItem* pItem = GetByID( _nNewID );
@@ -534,7 +534,8 @@ bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
const StyleSettings& rStyleSettings =
GetSettings().GetStyleSettings();
pItem->ToggleBackgroundColor( rStyleSettings.GetHighlightColor()
); //HighlightColor
-pItem->GrabFocus();
+if (bGrabFocus)
+pItem->GrabFocus();
m_pImpl->setCurItemID(_nNewID);
Select();
diff --git a/vcl/source/control/roadmapwizard.cxx
b/vcl/source/control/roadmapwizard.cxx
index d73cc1a18a5b..1b24e39cc4fc 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -827,9 +827,9 @@ namespace vcl
m_xRoadmapImpl->pRoadmap->InsertRoadmapItem(nItemIndex, rText,
nItemId, bEnable);
}
-void RoadmapWizard::SelectRoadmapItemByID(int nItemId)
+void RoadmapWizard::SelectRoadmapItemByID(int nItemId, bool bGrabFocus)
{
-m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(nItemId);
+m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(nItemId, bGrabFocus);
}
void RoadmapWizard::DeleteRoadmapItems()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/cmisline.ui |2 -- 1 file changed, 2 deletions(-) New commits: commit 63fef8576efd2c63cea461a979117569f3603b74 Author: Caolán McNamara AuthorDate: Fri Jan 15 20:34:49 2021 + Commit: Caolán McNamara CommitDate: Sat Jan 16 16:02:24 2021 +0100 remove apparently bogus yaligns of 0 from cmisline RadioButtons Change-Id: I753128047672831329ba5dff25dda005dfca4d5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109421 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sfx2/uiconfig/ui/cmisline.ui b/sfx2/uiconfig/ui/cmisline.ui index 8d4041bafa40..88b32d585ab1 100644 --- a/sfx2/uiconfig/ui/cmisline.ui +++ b/sfx2/uiconfig/ui/cmisline.ui @@ -62,7 +62,6 @@ False True 0 -0 True True @@ -78,7 +77,6 @@ False True 0 -0 True yes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/uiconfig cui/uiconfig dbaccess/uiconfig reportdesign/uiconfig sc/uiconfig sd/uiconfig svx/uiconfig sw/uiconfig uui/uiconfig xmlsecurity/uiconfig
chart2/uiconfig/ui/paradialog.ui |2 +- chart2/uiconfig/ui/tp_AxisPositions.ui|2 +- cui/uiconfig/ui/comment.ui|4 ++-- cui/uiconfig/ui/dimensionlinestabpage.ui |2 +- cui/uiconfig/ui/fmsearchdialog.ui |2 +- cui/uiconfig/ui/iconselectordialog.ui |2 +- cui/uiconfig/ui/javastartparametersdialog.ui |4 ++-- cui/uiconfig/ui/numberingoptionspage.ui |2 +- cui/uiconfig/ui/searchformatdialog.ui |4 ++-- dbaccess/uiconfig/ui/admindialog.ui |2 +- dbaccess/uiconfig/ui/advancedsettingsdialog.ui|2 +- dbaccess/uiconfig/ui/fielddialog.ui |2 +- dbaccess/uiconfig/ui/useradmindialog.ui |2 +- reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui |2 +- reportdesign/uiconfig/dbreport/ui/pagedialog.ui |2 +- sc/uiconfig/scalc/ui/analysisofvariancedialog.ui |2 +- sc/uiconfig/scalc/ui/createnamesdialog.ui |8 sc/uiconfig/scalc/ui/externaldata.ui |2 +- sc/uiconfig/scalc/ui/optdlg.ui|2 +- sc/uiconfig/scalc/ui/paradialog.ui|2 +- sc/uiconfig/scalc/ui/sheetprintpage.ui|2 +- sd/uiconfig/sdraw/ui/drawparadialog.ui|2 +- sd/uiconfig/simpress/ui/insertslides.ui |2 +- sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |4 ++-- sd/uiconfig/simpress/ui/publishingdialog.ui |2 +- svx/uiconfig/ui/findreplacedialog-mobile.ui |4 ++-- svx/uiconfig/ui/findreplacedialog.ui |4 ++-- svx/uiconfig/ui/headfootformatpage.ui |2 +- svx/uiconfig/ui/textcontrolparadialog.ui |2 +- sw/uiconfig/swriter/ui/formattablepage.ui |2 +- sw/uiconfig/swriter/ui/paradialog.ui |4 ++-- sw/uiconfig/swriter/ui/sortdialog.ui |2 +- uui/uiconfig/ui/masterpassworddlg.ui |2 +- xmlsecurity/uiconfig/ui/certpage.ui |2 +- 34 files changed, 44 insertions(+), 44 deletions(-) New commits: commit 7bd729a65d7e7a7539bf4383d656667ed227cc91 Author: Caolán McNamara AuthorDate: Fri Jan 15 20:05:38 2021 + Commit: Caolán McNamara CommitDate: Sat Jan 16 16:01:26 2021 +0100 snap near 0.5 align values to 0.5 Change-Id: Idcedba97e1738f097a36845614a17f143c20c7c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109416 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/chart2/uiconfig/ui/paradialog.ui b/chart2/uiconfig/ui/paradialog.ui index 0914213b2cdc..18ceaf4ff377 100644 --- a/chart2/uiconfig/ui/paradialog.ui +++ b/chart2/uiconfig/ui/paradialog.ui @@ -180,7 +180,7 @@ True False Alignment -0.469988079071 +0.5 1 diff --git a/chart2/uiconfig/ui/tp_AxisPositions.ui b/chart2/uiconfig/ui/tp_AxisPositions.ui index 7ba6c1e5595b..c519998cb275 100644 --- a/chart2/uiconfig/ui/tp_AxisPositions.ui +++ b/chart2/uiconfig/ui/tp_AxisPositions.ui @@ -641,7 +641,7 @@ True True True -0.4900953674316 +0.5 1 diff --git a/cui/uiconfig/ui/comment.ui b/cui/uiconfig/ui/comment.ui index 9dc63848fd11..21123ea6fc4e 100644 --- a/cui/uiconfig/ui/comment.ui +++ b/cui/uiconfig/ui/comment.ui @@ -38,7 +38,7 @@ True True True -0.509904632568 +0.5 False @@ -67,7 +67,7 @@ True True True -0.519809265137 +0.5 False diff --git a/cui/uiconfig/ui/dimensionlinestabpage.ui b/cui/uiconfig/ui/dimensionlinestabpage.ui index 7335f41f93c4..4cfbb1b924a8 100644 --- a/cui/uiconfig/ui/dimensionlinestabpage.ui +++ b/cui/uiconfig/ui/dimensionlinestabpage.ui @@ -74,7 +74,7 @@ True MTR_LINE_DIST 0 -0.469988079071 +0.5 0 diff --git a/cui/uiconfig/ui/fmsearchdialog.ui b/cui/uiconfig/ui/fmsearchdialog.ui index 83ad01955203..1159b3c0768e 100644 --- a/cui/uiconfig/ui/fmsearchdialog.ui +++ b/cui/uiconfig/ui/fmsearchdialog.ui @@ -637,7 +637,7 @@ True center end -0.4198688697815 +0.5
[Libreoffice-commits] core.git: writerperfect/uiconfig
writerperfect/uiconfig/ui/wpftencodingdialog.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 933a311c12929568b7912b8f26445ac314f57f6b Author: Caolán McNamara AuthorDate: Fri Jan 15 20:07:27 2021 + Commit: Caolán McNamara CommitDate: Sat Jan 16 16:01:08 2021 +0100 drop unwanted stray yalign Change-Id: Ic397aae6e9a9cd2258b0e65cd66c72c4218c6946 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109415 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/writerperfect/uiconfig/ui/wpftencodingdialog.ui b/writerperfect/uiconfig/ui/wpftencodingdialog.ui index 409bb7ba2fa1..cf6da9c698c8 100644 --- a/writerperfect/uiconfig/ui/wpftencodingdialog.ui +++ b/writerperfect/uiconfig/ui/wpftencodingdialog.ui @@ -31,7 +31,6 @@ True True True -0.6200476837158 True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/uiconfig cui/uiconfig sc/uiconfig svtools/uiconfig sw/uiconfig
chart2/uiconfig/ui/titlerotationtabpage.ui |2 +- chart2/uiconfig/ui/tp_ChartType.ui |2 +- chart2/uiconfig/ui/tp_axisLabel.ui |2 +- cui/uiconfig/ui/cellalignment.ui |2 +- sc/uiconfig/scalc/ui/textimportcsv.ui |2 +- svtools/uiconfig/ui/graphicexport.ui |2 +- sw/uiconfig/swriter/ui/findentrydialog.ui |2 +- sw/uiconfig/swriter/ui/inserttable.ui |2 +- sw/uiconfig/swriter/ui/sortdialog.ui |2 +- 9 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 2186ea6b5532a5ba24d3906d8b631f9bee4a0d4b Author: Caolán McNamara AuthorDate: Fri Jan 15 17:26:02 2021 + Commit: Caolán McNamara CommitDate: Sat Jan 16 16:00:27 2021 +0100 replace near-zero xalign values that should be zero Change-Id: I10c7d542064cffd44b1cd50972775db51f0f7e27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109388 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/chart2/uiconfig/ui/titlerotationtabpage.ui b/chart2/uiconfig/ui/titlerotationtabpage.ui index 4c21bbc4d914..98471f73ff4d 100644 --- a/chart2/uiconfig/ui/titlerotationtabpage.ui +++ b/chart2/uiconfig/ui/titlerotationtabpage.ui @@ -94,7 +94,7 @@ True False True -0.01999552965164 +0 True True diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui index 65511a9ca699..86c179b6a1d8 100644 --- a/chart2/uiconfig/ui/tp_ChartType.ui +++ b/chart2/uiconfig/ui/tp_ChartType.ui @@ -391,7 +391,7 @@ True False True -0.02999329447746 +0 True diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui index e505a0bbc4d3..eeddbebb430b 100644 --- a/chart2/uiconfig/ui/tp_axisLabel.ui +++ b/chart2/uiconfig/ui/tp_axisLabel.ui @@ -339,7 +339,7 @@ True False True -0.01999552965164 +0 True True diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui index 00ee94448195..ae55d06857fc 100644 --- a/cui/uiconfig/ui/cellalignment.ui +++ b/cui/uiconfig/ui/cellalignment.ui @@ -125,7 +125,7 @@ True False True -0.01999552965164 +0 True True diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui b/sc/uiconfig/scalc/ui/textimportcsv.ui index 0987e8c8734d..7c7a2a6ef44f 100644 --- a/sc/uiconfig/scalc/ui/textimportcsv.ui +++ b/sc/uiconfig/scalc/ui/textimportcsv.ui @@ -594,7 +594,7 @@ True False True -0.00999776482582 +0 True diff --git a/svtools/uiconfig/ui/graphicexport.ui b/svtools/uiconfig/ui/graphicexport.ui index ae3fdf16d23e..95acd66216fb 100644 --- a/svtools/uiconfig/ui/graphicexport.ui +++ b/svtools/uiconfig/ui/graphicexport.ui @@ -838,7 +838,7 @@ True False True -0.0599865889549 +0 True True diff --git a/sw/uiconfig/swriter/ui/findentrydialog.ui b/sw/uiconfig/swriter/ui/findentrydialog.ui index 9e25895ce310..352b8d47496f 100644 --- a/sw/uiconfig/swriter/ui/findentrydialog.ui +++ b/sw/uiconfig/swriter/ui/findentrydialog.ui @@ -141,7 +141,7 @@ True False True -0.01999552965164 +0 True diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui index dacd1ca25d01..f299c048e296 100644 --- a/sw/uiconfig/swriter/ui/inserttable.ui +++ b/sw/uiconfig/swriter/ui/inserttable.ui @@ -289,7 +289,7 @@ True False True -0.022351741291 +0 True diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui index 5c9a9475b95c..5e5f48fa0549 100644 --- a/sw/uiconfig/swriter/ui/sortdialog.ui +++ b/sw/uiconfig/swriter/ui/sortdialog.ui @@ -393,7 +393,7 @@
License statement allotropia software GmbH
To whom it may concern, allotropia software has a general policy of contributing source code to open source projects under the respective project's existing licensing terms. Therefore: All contributions past, present, and future made to LibreOffice from allotropia may be licensed under the MPLv2/LGPLv3+ dual license. Best regards, Thorsten -- Thorsten Behrens Managing Director ––– allotropia software GmbH Flachsland 10 22083 Hamburg Germany ––– thorsten.behr...@allotropia.de https://www.allotropia.de ––– Registered office: Hamburg, Germany Registration court Hamburg, HRB 165405 Managing director: Thorsten Behrens VAT-ID: DE 335606919 --- signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
About Jenkins/TBs synchro
Hello, As you already know, there are often some Jenkins failures for reason unrelated to the commit. These generate a waste of time (even with resume build/rebase action, some commits may be stuck waiting in gerrit). In addition, we see that it happens some commits that were ok for Jenkins make some TBs fail. Eg: https://gerrit.libreoffice.org/c/core/+/107435 which was ok for Jenkins make TB Jenkins_Win64_Dbg fail with: 4789 NEXT C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win64_dbg/cui/source/dialogs/FontFeaturesDialog.cxx(79): error C2672: ´std::min´: no matching overloaded function found 4790 NEXT C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win64_dbg/cui/source/dialogs/FontFeaturesDialog.cxx(81): error C2780: ´_Ty std::min(std::initializer_list<_Elem>)´: expects 1 arguments - 2 provided 4791 C:\PROGRA~2\MIB055~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\algorithm(4551): note: see declaration of ´std::min´ 4792 NEXT C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win64_dbg/cui/source/dialogs/FontFeaturesDialog.cxx(81): error C2782: ´const _Ty &std::min(const _Ty &,const _Ty &) noexcept()´: template parameter ´_Ty´ is ambiguous 4793 C:\PROGRA~2\MIB055~1\2019\COMMUN~1\VC\Tools\MSVC\1425~1.286\Include\algorithm(4538): note: see declaration of ´std::min´ 4794 C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win64_dbg/cui/source/dialogs/FontFeaturesDialog.cxx(81): note: could be ´long´ 4795 C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win64_dbg/cui/source/dialogs/FontFeaturesDialog.cxx(81): note: or ´_Ty´ 4796 with 4797 [ 4798 _Ty=tools::Long 4799 ] 4800 NEXTC:/cygwin/home Considering https://gerrit.libreoffice.org/q/status:abandoned, I see there've been recent actions to try tackle Jenkins pbs but are there planned actions for TBs too? Julien -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/scshapetest.cxx | 59 +++
sc/source/core/data/drwlayer.cxx | 14 +
sc/source/ui/view/drawvie3.cxx |8 -
3 files changed, 75 insertions(+), 6 deletions(-)
New commits:
commit 6ce66560c59470a9eb76fbf80f439b452166d3e4
Author: Regina Henschel
AuthorDate: Fri Jan 15 17:40:10 2021 +0100
Commit: Regina Henschel
CommitDate: Sat Jan 16 15:27:04 2021 +0100
tdf#139583 fix case rot 180deg for cell anchored shapes
Method adjustAnchoredPosition() in ScDrawView::Notify() needs to
distinguish whether an object really has a changed geometry or only
becomes visible. The previous solution used the snap rectangle for this.
But in the case of a 180deg rotation only the logic rectangle changes,
not the snap rectangle. The patch extends the test to consider logic
rectangle as well. SetCellAnchoredFromPosition is adjusted to create
maShapeRect, which is compared to the logic rectangle.
Change-Id: Iba8a173938da05178f1058ef98e9ef526cca490e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109386
Tested-by: Jenkins
Reviewed-by: Regina Henschel
diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index 64f3416c0264..bc5df4d4854c 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
@@ -39,6 +40,7 @@ public:
ScShapeTest();
void saveAndReload(css::uno::Reference& xComponent,
const OUString& rFilter);
+void testTdf139583_Rotate180deg();
void testTdf137033_FlipHori_Resize();
void testTdf137033_RotShear_ResizeHide();
void testTdf137033_RotShear_Hide();
@@ -58,6 +60,7 @@ public:
void testCustomShapeCellAnchoredRotatedShape();
CPPUNIT_TEST_SUITE(ScShapeTest);
+CPPUNIT_TEST(testTdf139583_Rotate180deg);
CPPUNIT_TEST(testTdf137033_FlipHori_Resize);
CPPUNIT_TEST(testTdf137033_RotShear_ResizeHide);
CPPUNIT_TEST(testTdf137033_RotShear_Hide);
@@ -145,6 +148,62 @@ static void
lcl_AssertPointEqualWithTolerance(std::string_view sInfo, const Poin
CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(), std::abs(rExpected.Y() -
rActual.Y()) <= nTolerance);
}
+void ScShapeTest::testTdf139583_Rotate180deg()
+{
+// Load an empty document.
+OUString aFileURL;
+createFileURL(u"ManualColWidthRowHeight.ods", aFileURL);
+uno::Reference xComponent =
loadFromDesktop(aFileURL);
+CPPUNIT_ASSERT(xComponent.is());
+
+// Get ScDocShell
+SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+ScDocShell* pDocSh = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT(pDocSh);
+
+// Get SdrPage
+ScDocument& rDoc = pDocSh->GetDocument();
+ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
+CPPUNIT_ASSERT_MESSAGE("No ScDrawLayer", pDrawLayer);
+SdrPage* pPage = pDrawLayer->GetPage(0);
+CPPUNIT_ASSERT_MESSAGE("No draw page", pPage);
+
+// Insert Shape
+const tools::Rectangle aRect(Point(3000, 4000), Size(5000, 2000));
+SdrRectObj* pObj = new SdrRectObj(*pDrawLayer, aRect);
+CPPUNIT_ASSERT_MESSAGE("Could not create rectangle", pObj);
+pPage->InsertObject(pObj);
+
+// Anchor "to cell (resize with cell)" and then rotate it by 180deg around
center
+// The order is important here.
+ScDrawLayer::SetCellAnchoredFromPosition(*pObj, rDoc, 0 /*SCTAB*/, true
/*bResizeWithCell*/);
+pObj->Rotate(aRect.Center(), Degree100(18000), 0.0, -1.0);
+
+// Save and reload.
+saveAndReload(xComponent, "calc8");
+CPPUNIT_ASSERT(xComponent);
+
+// Get ScDocShell
+pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT_MESSAGE("Reload: Failed to access document shell",
pFoundShell);
+pDocSh = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT(pDocSh);
+
+// Get document and object
+ScDocument& rDoc2 = pDocSh->GetDocument();
+pDrawLayer = rDoc2.GetDrawLayer();
+CPPUNIT_ASSERT_MESSAGE("Reload: No ScDrawLayer", pDrawLayer);
+pPage = pDrawLayer->GetPage(0);
+CPPUNIT_ASSERT_MESSAGE("Reload: No draw page", pPage);
+pObj = dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT_MESSAGE("Reload: Shape no longer exists", pObj);
+
+// Without the fix in place, the shape would have nearly zero size.
+lcl_AssertRectEqualWithTolerance("Show: Object geometry should not
change", aRect,
+ pObj->GetSnapRect(), 1);
+}
+
void ScShapeTest::testTdf137033_FlipHori_Resize()
{
// Load a document, which has a rotated custom shape, which is horizontal
flipped. Error was, that
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 5d8f50d14be1..067b2bc38b0f 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -
[SOLVED] Re: Building LO on Raspberry pi 4b, error: unknown attribute 'externally_visible' on jni part
Just for the record, after commit https://cgit.freedesktop.org/libreoffice/core/commit/?id=ebb0ac4c922b51191979ca376f7c7d7581ace62e done with Stephan's help, the build on Raspberry pi 4b succeeded with quoted autogen.input. (see https://cgit.freedesktop.org/libreoffice/core/log/?qt=grep&q=raspberry for the list of related patches). -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - tools/source
tools/source/misc/json_writer.cxx | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 5db3e8596254cf5a2e1c66e2d9dd7e5a347fcc03
Author: Tor Lillqvist
AuthorDate: Fri Jan 15 03:03:41 2021 +0200
Commit: Tor Lillqvist
CommitDate: Sat Jan 16 15:08:07 2021 +0100
Make JsonWriter::writeEscapedOUString() handle surrogate pairs properly
It is wrong to iterate over UTF-16 code units one by one. We have
OUString::iterateCodePoints() to iterate over Unicode code points.
The two UTF-16 code units of a surrogate pair (for a non-BMP code
point) should not be encoded separately to UTF-8 bytes. It is the code
point that should be encoded (to four bytes).
Change-Id: Ica4341308deb6618c9c2da8dcee8a11ef4e8238d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109318
Tested-by: Jenkins
Reviewed-by: Noel Grandin
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109425
Tested-by: Jenkins CollaboraOffice
diff --git a/tools/source/misc/json_writer.cxx
b/tools/source/misc/json_writer.cxx
index be891ef18423..d1e1997320a1 100644
--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@@ -134,9 +134,10 @@ void JsonWriter::put(const char* pPropName, const
OUString& rPropVal)
mPos += 4;
// Convert from UTF-16 to UTF-8 and perform escaping
-for (int i = 0; i < rPropVal.getLength(); ++i)
+sal_Int32 i = 0;
+while (i < rPropVal.getLength())
{
-sal_Unicode ch = rPropVal[i];
+sal_uInt32 ch = rPropVal.iterateCodePoints(&i);
if (ch == '\\')
{
*mPos = static_cast(ch);
@@ -163,7 +164,7 @@ void JsonWriter::put(const char* pPropName, const OUString&
rPropVal)
*mPos = 0x80 | (ch & 0x3F); /* 10xx */
++mPos;
}
-else
+else if (ch <= 0x)
{
*mPos = 0xE0 | (ch >> 12); /* 1110 */
++mPos;
@@ -172,6 +173,17 @@ void JsonWriter::put(const char* pPropName, const
OUString& rPropVal)
*mPos = 0x80 | (ch & 0x3F); /* 10xx */
++mPos;
}
+else
+{
+*mPos = 0xF0 | (ch >> 18); /* 0xxx */
+++mPos;
+*mPos = 0x80 | ((ch >> 12) & 0x3F); /* 10xx */
+++mPos;
+*mPos = 0x80 | ((ch >> 6) & 0x3F); /* 10xx */
+++mPos;
+*mPos = 0x80 | (ch & 0x3F); /* 10xx */
+++mPos;
+}
}
*mPos = '"';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/python/ScriptForgeHelper.py |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 19e5606df73994bbf6ddd8089843be645bd4d8be
Author: Jean-Pierre Ledure
AuthorDate: Sat Jan 16 13:11:22 2021 +0100
Commit: Jean-Pierre Ledure
CommitDate: Sat Jan 16 14:35:47 2021 +0100
ScriptForge - (ScriptForgeHelper.py) add empty list of visible routines
The g_exportedScripts variable contains the list of the methods
in the script that may be made visible in LO IDE's
(APSO and alike)
Currently that list (in fact, a tuple) must be empty
Change-Id: I86abc0bb55be524a3f9d39da7c6bd248abec8668
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109435
Tested-by: Jean-Pierre Ledure
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/source/scriptforge/python/ScriptForgeHelper.py
b/wizards/source/scriptforge/python/ScriptForgeHelper.py
index f18433938b73..ca520434a2a9 100644
--- a/wizards/source/scriptforge/python/ScriptForgeHelper.py
+++ b/wizards/source/scriptforge/python/ScriptForgeHelper.py
@@ -261,6 +261,12 @@ def _SF_String__HashStr(string: str, algorithm: str) ->
str: # used by SF_Strin
return ''
+# #
+# lists the scripts, that shall be visible inside the Basic/Python IDE
+# #
+
+g_exportedScripts = ()
+
if __name__ == "__main__":
print(_SF_Platform('Architecture'))
print(_SF_Platform('ComputerName'))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
About upgrading towards Postgresql 13.1
Hello, Taking a look at https://bugs.documentfoundation.org/show_bug.cgi?id=139598, could someone retrieve postgresql-13.1.tar.bz2 from https://www.postgresql.org/ftp/source/v13.1/ and make it available on https://dev-www.libreoffice.org/src/ ? I don't pretend being able to make it on my own (considering all the pbs there were for the Firebird 3.0.7 upgrade) but perhaps with some help we may do this big leap (9.2.24 -> 13.1) Julien -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/devtools/DevelopmentToolDockingWindow.hxx |7
svx/source/devtools/DevelopmentToolDockingWindow.cxx | 340 --
2 files changed, 317 insertions(+), 30 deletions(-)
New commits:
commit 0ffebfb691ae6fcc8df4df4a0611276bb4f33b59
Author: Tomaž Vajngerl
AuthorDate: Sat Jan 16 00:22:27 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jan 16 13:58:41 2021 +0100
devtools: Add more elements to the document model tree view
This change adds more elements to the document model tree view.
for all: style families and styles
for Writer: shapes, graphic objects, OLE objects, frames, tables
for Impress: master slides
for Calc: shapes, charts, pivot tables
Change-Id: Ic6d2c6c8f45fe7881e17aee3727864aeb4d701c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109376
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
index 159efae16425..4676a77a5466 100644
--- a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
@@ -43,7 +43,14 @@ private:
void fillSheets(weld::TreeIter const& rParent);
void fillPages(weld::TreeIter const& rParent);
void fillSlides(weld::TreeIter const& rParent);
+void fillMasterSlides(weld::TreeIter const& rParent);
void fillParagraphs(weld::TreeIter const& rParent);
+void fillShapes(weld::TreeIter const& rParent);
+void fillTables(weld::TreeIter const& rParent);
+void fillFrames(weld::TreeIter const& rParent);
+void fillGraphicObjects(weld::TreeIter const& rParent);
+void fillOLEObjects(weld::TreeIter const& rParent);
+void fillStyleFamilies(weld::TreeIter const& rParent);
public:
DevelopmentToolDockingWindow(SfxBindings* pBindings, SfxChildWindow*
pChildWindow,
diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
index f62d3b6eab25..4bfd6df94463 100644
--- a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -46,11 +46,24 @@
#include
#include
#include
+#include
+#include
+
#include
#include
#include
#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
using namespace css;
@@ -95,11 +108,32 @@ private:
SelectionChangeHandler& operator=(const SelectionChangeHandler&) = delete;
};
+void lclAppendToParent(std::unique_ptr& rTree, weld::TreeIter
const& rParent,
+ OUString const& rString, bool bChildrenOnDemand = false)
+{
+rTree->insert(&rParent, -1, &rString, nullptr, nullptr, nullptr,
bChildrenOnDemand, nullptr);
+}
+
+void lclAppendToParentWithIter(std::unique_ptr& rTree,
+ weld::TreeIter const& rParent, weld::TreeIter&
rCurrent,
+ OUString const& rString, bool bChildrenOnDemand
= false)
+{
+rTree->insert(&rParent, -1, &rString, nullptr, nullptr, nullptr,
bChildrenOnDemand, &rCurrent);
+}
+
void lclAppend(std::unique_ptr& rTree, OUString const& rString)
{
rTree->insert(nullptr, -1, &rString, nullptr, nullptr, nullptr, true,
nullptr);
}
+OUString lclGetNamed(uno::Reference const& xObject)
+{
+uno::Reference xNamed(xObject, uno::UNO_QUERY);
+if (!xNamed.is())
+return OUString();
+return xNamed->getName();
+}
+
} // end anonymous namespace
DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings*
pInputBindings,
@@ -160,6 +194,39 @@ IMPL_LINK(DevelopmentToolDockingWindow,
ModelTreeViewExpanding, weld::TreeIter c
clearChildren(rParent);
fillParagraphs(rParent);
}
+else if (aText == "Shapes")
+{
+if (msDocumentType == "Text Document")
+{
+clearChildren(rParent);
+fillShapes(rParent);
+}
+}
+else if (aText == "Tables")
+{
+clearChildren(rParent);
+fillTables(rParent);
+}
+else if (aText == "Frames")
+{
+clearChildren(rParent);
+fillFrames(rParent);
+}
+else if (aText == "Graphic Objects")
+{
+clearChildren(rParent);
+fillGraphicObjects(rParent);
+}
+else if (aText == "Embedded Objects")
+{
+clearChildren(rParent);
+fillOLEObjects(rParent);
+}
+else if (aText == "Styles")
+{
+clearChildren(rParent);
+fillStyleFamilies(rParent);
+}
else if (aText == "Pages")
{
clearChildren(rParent);
@@ -170,11 +237,17 @@ IMPL_LINK(DevelopmentToolDockingWindow,
ModelTreeViewExpanding, weld::TreeIter c
clearChildren(rParent);
fillSlides(rParent);
}
+else if (aText == "Master Slides")
+{
+clearChildren(rParent);
+fillMasterSlides(rParent);
+}
el
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c9f7a8c73d28dc26a9939dfcd082fb72a7e59e30 Author: Olivier Hallot AuthorDate: Sat Jan 16 09:55:48 2021 -0300 Commit: Gerrit Code Review CommitDate: Sat Jan 16 13:55:48 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to d97287d7f83c7e48c27d2541895a7230f09b0ee8 - tdf#139543 Update Calc sort Option page - Add missing checkbox - Refactor headings Change-Id: Id88cba0bd89db3ad3265f7e4088de1a29252a053 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109424 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 9497d20bf4a6..d97287d7f83c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9497d20bf4a61cbf2ddc14d372d2a4cb40994242 +Subproject commit d97287d7f83c7e48c27d2541895a7230f09b0ee8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/12030200.xhp | 42 +- 1 file changed, 24 insertions(+), 18 deletions(-) New commits: commit d97287d7f83c7e48c27d2541895a7230f09b0ee8 Author: Olivier Hallot AuthorDate: Fri Jan 15 22:38:28 2021 -0300 Commit: Olivier Hallot CommitDate: Sat Jan 16 13:55:48 2021 +0100 tdf#139543 Update Calc sort Option page - Add missing checkbox - Refactor headings Change-Id: Id88cba0bd89db3ad3265f7e4088de1a29252a053 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109424 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/12030200.xhp b/source/text/scalc/01/12030200.xhp index 013f65f58..2dbd0cb88 100644 --- a/source/text/scalc/01/12030200.xhp +++ b/source/text/scalc/01/12030200.xhp @@ -45,45 +45,51 @@ Case sensitive - Sorts first by uppercase letters and then by lowercase letters. For Asian languages, special handling applies. +Sorts first by uppercase letters and then by lowercase letters. For Asian languages, special handling applies. For Asian languages: Check Case Sensitive to apply multi-level collation. With multi-level collation, entries are first compared in their primitive forms with their cases and diacritics ignored. If they evaluate as the same, their diacritics are taken into account for the second-level comparison. If they still evaluate as the same, their cases, character widths, and Japanese Kana difference are considered for the third-level comparison.UFI: see #112590# and #112507# - Range contains column/row labels +Range contains row/column labels Omits the first row or the first column in the selection from the sort. The Direction setting at the bottom of the dialog defines the name and function of this check box. - Include formats + Include formats Preserves the current cell formatting. -Enable natural sort +Enable natural sort Natural sort is a sort algorithm that sorts string-prefixed numbers based on the value of the numerical element in each sorted number, instead of the traditional way of sorting them as ordinary strings. For instance, let's assume you have a series of values such as, A1, A2, A3, A4, A5, A6, ..., A19, A20, A21. When you put these values into a range of cells and run the sort, it will become A1, A11, A12, A13, ..., A19, A2, A20, A21, A3, A4, A5, ..., A9. While this sorting behavior may make sense to those who understand the underlying sorting mechanism, to the rest of the population it seems completely bizarre, if not outright inconvenient. With the natural sort feature enabled, values such as the ones in the above example get sorted "properly", which improves the convenience of sorting operations in general. + +Include boundary column(s)/row(s) containing only comments +Range boundary columns (for sorting rows) or boundary rows (for sorting columns) of a sorting range are not sorted by default if they are empty. Check this option if boundary columns or boundary rows containing comments are also to be sorted. + +Include boundary column(s)/row(s) containing only images +Border columns (for sorting rows) or border rows (for sorting columns) of a sorting area are not sorted by default if they are empty. Check this option if boundary columns or boundary rows containing images are also to be sorted. - Copy sort results to: + Copy sort results to: Copies the sorted list to the cell range that you specify. - Sort results - Select a named cell range where you want to display the sorted list, or enter a cell range in the input box. + Sort results (named ranges list) + Select a named cell range where you want to display the sorted list. - Sort results - Enter the cell range where you want to display the sorted list, or select a named range from the list. + Sort results (input box) +Enter the cell range where you want to display the sorted list. - Custom sort order + Custom sort order Click here and then select the custom sort order that you want. - Custom sort order - Select the custom sort order that you want to apply. To define a custom sort order, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Calc - Sort Lists . - Language + Custom sort order list + Select the custom sort order that you want to apply. To define a custom sort order, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Calc - Sort Lists. + Language - Language + Language Select the language for the sorting rules. - Options + Options Select a sorting option for the language. For example, select the "phonebook" option for German to include the umlaut special character in the sorting. - Direction + Direction - Top to Bottom (Sort Rows) + Top to Bottom (Sort Rows) Sorts rows by the values in the active columns of the selected range. - Left to Right (Sort Columns) + Left to Right (Sort Columns) Sorts columns by the values in the active rows of t
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d0df5bca258c19b96fb99b635ad07f979c41a18 Author: Olivier Hallot AuthorDate: Sat Jan 16 09:55:29 2021 -0300 Commit: Gerrit Code Review CommitDate: Sat Jan 16 13:55:29 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 9497d20bf4a61cbf2ddc14d372d2a4cb40994242 - Update specialfilters.xhp * synch with UI strings * Mute l10n on numbers and sheet headers Change-Id: Iad23a22b01200ac378b571e4b24b5e62f7398703 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109377 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e642d444e695..9497d20bf4a6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e642d444e695b75d6f05d95829bd648c89b67971 +Subproject commit 9497d20bf4a61cbf2ddc14d372d2a4cb40994242 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/guide/specialfilter.xhp | 66 ++ 1 file changed, 32 insertions(+), 34 deletions(-) New commits: commit 9497d20bf4a61cbf2ddc14d372d2a4cb40994242 Author: Olivier Hallot AuthorDate: Fri Jan 15 12:40:32 2021 -0300 Commit: Olivier Hallot CommitDate: Sat Jan 16 13:55:29 2021 +0100 Update specialfilters.xhp * synch with UI strings * Mute l10n on numbers and sheet headers Change-Id: Iad23a22b01200ac378b571e4b24b5e62f7398703 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109377 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/guide/specialfilter.xhp b/source/text/scalc/guide/specialfilter.xhp index 0def973e0..3cb7367ae 100644 --- a/source/text/scalc/guide/specialfilter.xhp +++ b/source/text/scalc/guide/specialfilter.xhp @@ -40,40 +40,38 @@ Copy the column headers of the sheet ranges to be filtered into an empty area of the sheet, and then enter the criteria for the filter in a row beneath the headers. Horizontally arranged data in a row will always be logically connected with AND, and vertically arranged data in a column will always be logically connected with OR. -Once you have created a filter matrix, select the sheet ranges to be filtered. Open the Advanced Filter dialog by choosing Data - Filter - Advanced Filter, and define the filter conditions. +Once you have created a filter matrix, select the sheet ranges to be filtered. Open the Advanced Filter dialog by choosing Data - More Filters - Advanced Filter, and define the filter conditions. -Then click OK, and you will see that only the rows from the original sheet whose contents have met the search criteria are still visible. All other rows are temporarily hidden and can be made to reappear with the Format - Rows - Show command. + Then click OK, and you will see that only the rows from the original sheet whose contents have met the search criteria are still visible. All other rows are temporarily hidden and can be made to reappear with the Format - Rows - Show command. - Example + Example Load a spreadsheet with a large number of records. We are using a fictional Turnover document, but you can just as easily use any other document. The document has the following layout: - - - A + A - B + B - C + C - D + D - E + E - 1 + 1 Month @@ -93,53 +91,53 @@ - 2 + 2 January - 125600 + 125600 - 200500 + 200500 - 24 + 24 - 17 + 17 - 3 + 3 February - 16 + 16 - 180300 + 180300 - 362000 + 362000 - 22 + 22 - 4 + 4 March - 17 + 17 @@ -161,24 +159,24 @@ - A + A - B + B - C + C - D + D - E + E - 20 + 20 Month @@ -198,7 +196,7 @@ - 21 + 21 January @@ -218,13 +216,13 @@ - 22 + 22 - <16 + <16 @@ -237,8 +235,8 @@ - Specify that only rows which either have the value January in the Month cells OR a value of under 16 in the Standardstandard not default, look at U59!!! cells will be displayed. - Choose Data - Filter - Advanced Filter, and then select the range A20:E22. After you click OK, only the filtered rows will be displayed. The other rows will be hidden from view. + Specify that only rows which either have the value January in the Month cells OR a value of under 16 in the Standardstandard not default, look at U59!!! cells will be displayed. + Choose Data - More Filters - Advanced Filter, and then select the range A20:E22. After you click OK, only the filtered rows will be displayed. The other rows will be hidden from view. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 970d34f88051ddc1edc6b7fc47fc654899ccc058 Author: Seth Chaiklin AuthorDate: Sat Jan 16 13:54:27 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Jan 16 13:54:27 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to e642d444e695b75d6f05d95829bd648c89b67971 - improve explanation about character style ( swriter/01/05130002.xhp ) (Character Style) * improve/expand explanation of character style + add about how to use character style + add about how to remove direct formatting + add about how to find out what properties are applied by a character style * replace German id ( swriter/01/05130002.xhp ) (Character formatting) + add appl-switch for WRITER, with a and link to "Character Style" ( swriter/00/0405.xhp ) * update access command to editing Character Styles + add icon for Character Styles * add sys-switch for F11 for List Styles * replace German id ( swriter/01/0514.xhp ) ( Styles sidebar ) * repair path to Paragraph Style and Character Style icons Change-Id: Idafef996a833bda317d45ff90c23fb7d84813e57 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109125 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 7709cb9bdc86..e642d444e695 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7709cb9bdc8637379db25a29f8a40960cf4e309a +Subproject commit e642d444e695b75d6f05d95829bd648c89b67971 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0502.xhp |7 +++ source/text/swriter/00/0405.xhp | 28 +--- source/text/swriter/01/05130002.xhp |8 ++-- source/text/swriter/01/0514.xhp |4 ++-- 4 files changed, 40 insertions(+), 7 deletions(-) New commits: commit e642d444e695b75d6f05d95829bd648c89b67971 Author: Seth Chaiklin AuthorDate: Wed Jan 13 13:18:57 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Jan 16 13:54:27 2021 +0100 improve explanation about character style ( swriter/01/05130002.xhp ) (Character Style) * improve/expand explanation of character style + add about how to use character style + add about how to remove direct formatting + add about how to find out what properties are applied by a character style * replace German id ( swriter/01/05130002.xhp ) (Character formatting) + add appl-switch for WRITER, with a and link to "Character Style" ( swriter/00/0405.xhp ) * update access command to editing Character Styles + add icon for Character Styles * add sys-switch for F11 for List Styles * replace German id ( swriter/01/0514.xhp ) ( Styles sidebar ) * repair path to Paragraph Style and Character Style icons Change-Id: Idafef996a833bda317d45ff90c23fb7d84813e57 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109125 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0502.xhp b/source/text/shared/01/0502.xhp index 6d0aec10b..6e6e45378 100644 --- a/source/text/shared/01/0502.xhp +++ b/source/text/shared/01/0502.xhp @@ -57,5 +57,12 @@ + + + +Character Style + + + diff --git a/source/text/swriter/00/0405.xhp b/source/text/swriter/00/0405.xhp index dad235691..04a20c930 100644 --- a/source/text/swriter/00/0405.xhp +++ b/source/text/swriter/00/0405.xhp @@ -78,14 +78,36 @@ Choose View - Styles - open context menu Modify/New (for Paragraph Styles). - - Choose View - Styles - open context menu Modify/New (for Character Styles). + + + + Choose View - Styles or Styles - Manage Styles (Command+TF11) to open Styles deck. + + + Select Character Style icon at top of deck, then select a character style. + + + Right-click to open context menu and choose Modify/New. + + + + + + +Character Style Icon + + + +Character Style icon + + + Choose View - Styles - open context menu Modify/New (for Frame Styles). - Choose View - Styles (F11) - open context menu Modify/New (for List Styles). + Choose View - Styles (Command+TF11) - open context menu Modify/New (for List Styles). Choose Tools - AutoCorrect - While Typing. Choose Tools - AutoCorrect. diff --git a/source/text/swriter/01/05130002.xhp b/source/text/swriter/01/05130002.xhp index a9558a96a..36ea42ba4 100644 --- a/source/text/swriter/01/05130002.xhp +++ b/source/text/swriter/01/05130002.xhp @@ -28,11 +28,15 @@ Character Style -Here, you can create a font style. +Character styles provide a way to customize the formatting for individual characters. Use character styles when you want to change the appearance or attributes of a character, word or selected part of a paragraph. When you apply a character style to a text selection, the properties defined in the character style override the corresponding paragraph properties, changing the appearance and other attributes of the selection, depending on the definitions in the character style. +For example, if you apply a character style with 15pt font size to a selected part of a paragraph that is formatted with 12pt font size, either directly or with a paragraph style, then the selection appears with 15pt font size, while the rest of the paragraph remains with 12pt font size. If you remove the applied character style, by applying the Default Character Style, then the paragraph properties of the selection are applicable again. +It can be useful to define character styles for particular kinds of content, such as page numbers, footnote numbers, hyperlinks, dates, words in different languages. - + +Direct formatting overrides any formatting provided by a character style. To remove direct formatting from a selection, use Format - Clear Direct Formatting (CommandCtrl+M). +Use the Contains section in the Organizer to see what properties are applied by a character style. diff --git a/source/text/swriter/01/0514.xhp b/source/text/swriter/01/0514.xhp index 165edad20..0285ab4dd 100644 --- a/source/text/swriter/01/0514.xhp +++ b/sou
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/dbdocfun.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit fa95e0e290608ef58a3cf79f8e3773927677de33
Author: Dennis Francis
AuthorDate: Tue Jan 12 11:20:34 2021 +0530
Commit: Dennis Francis
CommitDate: Sat Jan 16 13:43:53 2021 +0100
lok: sort: invalidate the row-height cache too
Change-Id: I13e59dc045b23a6ea60cd4cf34dda3166dbf5aad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109208
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
(cherry picked from commit 7ef5fcc08f6678ad6a61c46b187e1920fca74d23)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109275
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 6dbb7f38c71a..6b10b53beb8f 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -592,6 +592,17 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam&
rSortParam,
if (comphelper::LibreOfficeKit::isActive())
{
SfxViewShell* pSomeViewForThisDoc = rDocShell.GetBestViewShell(false);
+SfxViewShell* pViewShell = SfxViewShell::GetFirst();
+while (pViewShell)
+{
+ScTabViewShell* pTabViewShell =
dynamic_cast(pViewShell);
+if (pTabViewShell && pTabViewShell->GetDocId() ==
pSomeViewForThisDoc->GetDocId())
+{
+
pTabViewShell->GetViewData().GetLOKHeightHelper(nTab)->invalidateByIndex(nStartRow);
+}
+pViewShell = SfxViewShell::GetNext(*pViewShell);
+}
+
ScTabViewShell::notifyAllViewsSheetGeomInvalidation(
pSomeViewForThisDoc, false /* bColumns */, true /* bRows */, true
/* bSizes*/,
true /* bHidden */, true /* bFiltered */, true /* bGroups */,
nTab);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 00d268422d0c1682adaf59fca6f60f35a9d5f221 Author: Ilmari Lauhakangas AuthorDate: Sat Jan 16 14:17:34 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jan 16 13:17:34 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 7709cb9bdc8637379db25a29f8a40960cf4e309a - Use switches for Ctrl vs. Command on macOS Change-Id: Ib03896ff4f3b9c757c3cad96906210d72c9191f6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109236 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 10f14ef2d4c0..7709cb9bdc86 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 10f14ef2d4c0eec654ae02c00388fac7127cc980 +Subproject commit 7709cb9bdc8637379db25a29f8a40960cf4e309a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/simpress/guide/individual.xhp|2 +- source/text/simpress/guide/photo_album.xhp |2 +- source/text/swriter/01/0211.xhp | 10 +- source/text/swriter/01/0212.xhp |4 ++-- source/text/swriter/01/0215.xhp |2 +- source/text/swriter/01/0401.xhp |2 +- source/text/swriter/01/04090003.xhp |4 ++-- source/text/swriter/01/04130100.xhp |2 +- source/text/swriter/01/outlinecontent_visibility.xhp |2 +- source/text/swriter/guide/fields_enter.xhp |4 ++-- source/text/swriter/guide/footnote_usage.xhp |4 ++-- source/text/swriter/guide/join_numbered_lists.xhp|6 +++--- source/text/swriter/guide/page_break.xhp | 10 +- source/text/swriter/guide/references_modify.xhp |4 ++-- source/text/swriter/guide/reset_format.xhp |8 source/text/swriter/guide/smarttags.xhp |8 source/text/swriter/librelogo/LibreLogo.xhp |2 +- 17 files changed, 38 insertions(+), 38 deletions(-) New commits: commit 7709cb9bdc8637379db25a29f8a40960cf4e309a Author: Ilmari Lauhakangas AuthorDate: Wed Jan 13 17:45:48 2021 +0200 Commit: Olivier Hallot CommitDate: Sat Jan 16 13:17:34 2021 +0100 Use switches for Ctrl vs. Command on macOS Change-Id: Ib03896ff4f3b9c757c3cad96906210d72c9191f6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109236 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/simpress/guide/individual.xhp b/source/text/simpress/guide/individual.xhp index 202b81a2d..9ce17360d 100644 --- a/source/text/simpress/guide/individual.xhp +++ b/source/text/simpress/guide/individual.xhp @@ -48,7 +48,7 @@ Click New and enter a name for your slide show in the Name box. -Under Existing Slides, select the slides you want to add to your slide show, and click the >> button. Hold down Shift to select a range of slides, or Ctrl to select multiple slides. +Under Existing Slides, select the slides you want to add to your slide show, and click the >> button. Hold down Shift to select a range of slides, or CommandCtrl to select multiple slides. You can change the order of the slides in your custom slide show, by dragging and dropping the slides under Selected Slides. diff --git a/source/text/simpress/guide/photo_album.xhp b/source/text/simpress/guide/photo_album.xhp index 7f2e640a3..dd56eecc8 100644 --- a/source/text/simpress/guide/photo_album.xhp +++ b/source/text/simpress/guide/photo_album.xhp @@ -63,7 +63,7 @@ Locate the files you want to insert. -If several images are in the same folder, you can select a group of photos using the Shift or Ctrl keys while clicking on their filenames. +If several images are in the same folder, you can select a group of photos using the Shift or CommandCtrl keys while clicking on their filenames. Click Open to add the files to the Photo Album. diff --git a/source/text/swriter/01/0211.xhp b/source/text/swriter/01/0211.xhp index 567ee16dd..0ea90e412 100644 --- a/source/text/swriter/01/0211.xhp +++ b/source/text/swriter/01/0211.xhp @@ -38,7 +38,7 @@ -To open the Navigator, choose View - Navigator (F5). To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left, right or bottom edge of the workspace. To undock the Navigator, hold down the Ctrl key and double-click on a grey area of the Navigator. +To open the Navigator, choose View - Navigator (F5). To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left, right or bottom edge of the workspace. To undock the Navigator, hold down the CommandCtrl key and double-click on a grey area of the Navigator. Click the plus sign (+) (or arrow) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator. To jump to the next or previous item in a document, use the Navigate by box to select the item category, and then click the up or down arrows. @@ -432,7 +432,7 @@ Promote Level -Increases the outline level of the selected heading, and the headings that occur below the heading, by one. To only increase the outline level of the selected heading, hold down Ctrl, and then click this icon. +Increases the outline level of the selected heading, and the headings that occur below the heading, by one. To only increase the outline level of the selected heading, hold down CommandCtrl, and then click this icon. @@ -448,7 +448,7 @@ Demote Level -Decreases the outline level of the selected heading, and the headings that occur below the head
Re: About upgrading towards Postgresql 13.1
Am 16.01.21 um 10:28 schrieb julien2412: Taking a look at https://bugs.documentfoundation.org/show_bug.cgi?id=139598, could someone retrieve postgresql-13.1.tar.bz2 from https://www.postgresql.org/ftp/source/v13.1/ and make it available on https://dev-www.libreoffice.org/src/ ? Done I don't pretend being able to make it on my own (considering all the pbs there were for the Firebird 3.0.7 upgrade) but perhaps with some help we may do this big leap (9.2.24 -> 13.1) ... have fun? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit b232b422a3cfe3b410bbc75e0fffdfc238fd10e7
Author: Justin Luth
AuthorDate: Sat Jan 16 12:12:04 2021 +0300
Commit: Justin Luth
CommitDate: Sat Jan 16 12:32:22 2021 +0100
tdf#116394 writerfilter: append '=' if not a formula marker
Oops - a silly mistake to throw away the character if
it didn't match a special purpose.
There is no point in adding a unit test for this.
Change-Id: I3b48af578ae96744405ec0919ff341d1c9b43f65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109426
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f41f03a09a41..c0aff5d713a3 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3534,6 +3534,8 @@ static OUString lcl_ExtractToken(OUString const& rCommand,
++rIndex;
return "FORMULA";
}
+else
+token.append('=');
break;
default:
token.append(currentChar);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source sc/source
reportdesign/source/ui/report/DesignView.cxx |1 +
sc/source/core/data/documen2.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit 5b4486a898968eb5019376ca6c4bd07a97ec537d
Author: homeboy445
AuthorDate: Thu Jan 7 19:02:57 2021 +0530
Commit: Jan-Marek Glogowski
CommitDate: Sat Jan 16 12:18:31 2021 +0100
tdf#97087 Give unique, comphrehensible names to idles
Change-Id: I6823486a45311f81f0ed789dedff6c02b8fb3893
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109056
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/reportdesign/source/ui/report/DesignView.cxx
b/reportdesign/source/ui/report/DesignView.cxx
index e4eb5f653659..6accf6c82559 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -88,6 +88,7 @@ ODesignView::ODesignView( vcl::Window* pParent,
,m_aScrollWindow(VclPtr::Create(this))
,m_pPropWin(nullptr)
,m_pCurrentView(nullptr)
+,m_aMarkIdle("reportdesign ODesignView Mark Idle")
,m_eMode( DlgEdMode::Select )
,m_eActObj( OBJ_NONE )
,m_aGridSizeCoarse( 1000, 1000 )// #i93595# 100TH_MM changed to grid
using coarse 1 cm grid
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 2e607a669896..56e4fac4d711 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -119,6 +119,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
SfxObjectShell* pDocShell ) :
nUnoObjectId( 0 ),
nRangeOverflowType( 0 ),
aCurTextWidthCalcPos(MaxCol(),0,0),
+aTrackIdle("sc ScDocument Track Idle"),
nFormulaCodeInTree(0),
nXMLImportedFormulaCount( 0 ),
nInterpretLevel(0),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/o3tl
include/o3tl/safeint.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ebb0ac4c922b51191979ca376f7c7d7581ace62e Author: Julien Nabet AuthorDate: Fri Jan 15 10:01:51 2021 +0100 Commit: Julien Nabet CommitDate: Sat Jan 16 11:19:23 2021 +0100 Fix o3tl::checked_multiply for Raspberry pi 4b usr/bin/ld : /usr/bin/ld: Erreur DWARF: ne peut repérer la spécification de variable au décalage 8953 /usr/bin/ld: Erreur DWARF: ne peut repérer la spécification de variable au décalage 93da /usr/bin/ld: Erreur DWARF: ne peut repérer la spécification de variable au décalage 967a /usr/bin/ld: Erreur DWARF: ne peut repérer la spécification de variable au décalage 991a /home/pi/lo/libreoffice/workdir/CxxObject/sw/source/filter/xml/xmlimp.o : dans la fonction « bool o3tl::checked_multiply(long long, long long, long long&) » : /home/pi/lo/libreoffice/include/o3tl/safeint.hxx:121 : référence indéfinie vers « __mulodi4 » /usr/bin/ld : /home/pi/lo/libreoffice/include/o3tl/safeint.hxx:121 : référence indéfinie vers « __mulodi4 » /usr/bin/ld : /home/pi/lo/libreoffice/include/o3tl/safeint.hxx:121 : référence indéfinie vers « __mulodi4 » /usr/bin/ld : /home/pi/lo/libreoffice/include/o3tl/safeint.hxx:121 : référence indéfinie vers « __mulodi4 » clang: error: linker command failed with exit code 1 (use -v to see invocation) make[1]: *** [/home/pi/lo/libreoffice/sw/Library_sw.mk:20 : /home/pi/lo/libreoffice/instdir/program/libswlo.so] Erreur 1 DWARF Error: can't find spec of var at offset 8953 undefined reference to "__mulodi4" Change-Id: I1c88a1567e25370eb5759912ea4918d7183f3786 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109322 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx index 0ed36c910fa3..9df92ea1a9d1 100644 --- a/include/o3tl/safeint.hxx +++ b/include/o3tl/safeint.hxx @@ -113,7 +113,7 @@ template inline bool checked_sub(T a, T b, T& result) return !msl::utilities::SafeSubtract(a, b, result); } -#elif (defined __GNUC__ && !defined __clang__) || (__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined __clang__) && !(defined(__clang__) && defined(__i386__))) +#elif (defined __GNUC__ && !defined __clang__) || (__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined __clang__) && !(defined(__clang__) && (defined(__arm__) || defined(__i386__ // 32-bit clang fails with undefined reference to `__mulodi4' template inline bool checked_multiply(T a, T b, T& result) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source compilerplugins/clang cui/source dbaccess/source desktop/source drawinglayer/source editeng/source emfio/source extensions/source filter/qa filter/source
UnoControls/source/controls/progressbar.cxx|4 UnoControls/source/inc/progressbar.hxx |8 UnoControls/source/inc/progressmonitor.hxx |4 UnoControls/source/inc/statusindicator.hxx |6 chart2/source/controller/dialogs/DataBrowser.cxx |8 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx |4 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |2 chart2/source/controller/main/ChartController_Tools.cxx|2 chart2/source/controller/sidebar/ChartAreaPanel.cxx|2 chart2/source/view/main/VDataSeries.cxx|8 compilerplugins/clang/colorcheck.cxx | 95 ++ cui/source/options/cfgchart.cxx|2 cui/source/tabpages/tpcolor.cxx|2 dbaccess/source/ui/misc/TokenWriter.cxx| 15 - desktop/source/splash/splash.cxx |2 drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 10 drawinglayer/source/tools/emfpbrush.cxx| 18 - drawinglayer/source/tools/emfphelperdata.cxx |4 editeng/source/accessibility/AccessibleEditableTextPara.cxx|8 editeng/source/items/frmitems.cxx |8 editeng/source/items/textitem.cxx |8 editeng/source/uno/unonrule.cxx|6 emfio/source/reader/mtftools.cxx |2 extensions/source/propctrlr/fontdialog.cxx |4 extensions/source/propctrlr/standardcontrol.cxx|2 filter/qa/cppunit/msfilter-test.cxx|2 filter/source/graphicfilter/ieps/ieps.cxx |2 filter/source/graphicfilter/itga/itga.cxx |2 filter/source/msfilter/escherex.cxx|8 forms/source/component/Grid.cxx|2 forms/source/component/navigationbar.cxx |4 include/oox/helper/helper.hxx |2 include/sax/tools/converter.hxx| 10 include/svx/ColorSets.hxx |2 include/svx/colorwindow.hxx|2 include/tools/color.hxx| 38 ++ include/vcl/BitmapColor.hxx| 18 + include/vcl/RawBitmap.hxx |2 include/vcl/salgtype.hxx |2 oox/source/drawingml/chart/objectformatter.cxx |4 oox/source/drawingml/color.cxx |8 oox/source/drawingml/shape.cxx |4 oox/source/export/chartexport.cxx |8 oox/source/export/drawingml.cxx| 22 - oox/source/export/shapes.cxx |2 oox/source/ole/olehelper.cxx |2 reportdesign/source/core/api/ImageControl.cxx |2 reportdesign/source/core/api/Section.cxx |2 reportdesign/source/ui/dlg/Condition.cxx |4 reportdesign/source/ui/misc/UITools.cxx|6 reportdesign/source/ui/report/FixedTextColor.cxx |6 reportdesign/source/ui/report/ReportController.cxx |4 reportdesign/source/ui/report/ReportSection.cxx|4 sc/qa/extras/new_cond_format.cxx |2 sc/source/core/tool/appoptio.cxx |8 sc/source/core/tool/viewopti.cxx |7 sc/source/filter/excel/xestream.cxx|2 sc/source/filter/excel/xestyle.cxx |2 sc/source/filter/excel/xlchart.cxx |4 sc/source/filter/ftools/fapihelper.cxx |4 sc/source/filter/inc/condformatbuffer.hxx |2 sc/source/filter/oox/condformatbuffer.cxx |2 sc/source/filter/oox/pagesettings.cxx |2 sc/source/filter/oox/stylesbuffer.cxx |6 sc/source/filter/orcus/interface.cxx |2 sc/source/ui/drawfunc/drawsh.cxx
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - postprocess/CustomTarget_signing.mk
postprocess/CustomTarget_signing.mk |7 +++ 1 file changed, 7 insertions(+) New commits: commit 2b3b94f962c10b85df4506921faf59c6c5972c6e Author: Mike Kaganski AuthorDate: Fri Jan 15 22:42:05 2021 +0300 Commit: Mike Kaganski CommitDate: Sat Jan 16 10:04:15 2021 +0100 tdf#68198: sign the rest of binaries Change-Id: I89bad00245e9e2c9f8cad1cdc33e40007ae6f80d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109414 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit d534a4c7b45ff254b339e806c6a11f13d9ff0043) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109396 Tested-by: Jenkins CollaboraOffice diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 7ba7c5832f17..413de6397e07 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -44,7 +44,14 @@ ifneq ($(ENABLE_DBGUTIL),TRUE) $(INSTDIR)/URE/bin/*.exe \ $(INSTDIR)/program/*.dll \ $(INSTDIR)/program/*.exe \ + $(INSTDIR)/program/*.com \ $(INSTDIR)/program/soffice.bin \ + $(INSTDIR)/program/unopkg.bin \ + $(INSTDIR)/program/pyuno.pyd \ + $(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/*.exe \ + $(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/*.dll \ + $(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/*.pyd \ + $(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/distutils/command/*.exe \ $(INSTDIR)/program/shlxthdl/*.dll \ $(INSTDIR)/sdk/cli/*.dll \ $(INSTDIR)/sdk/bin/*.exe \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk
postprocess/CustomTarget_signing.mk |7 +++ 1 file changed, 7 insertions(+) New commits: commit d534a4c7b45ff254b339e806c6a11f13d9ff0043 Author: Mike Kaganski AuthorDate: Fri Jan 15 22:42:05 2021 +0300 Commit: Mike Kaganski CommitDate: Sat Jan 16 09:28:23 2021 +0100 tdf#68198: sign the rest of binaries Change-Id: I89bad00245e9e2c9f8cad1cdc33e40007ae6f80d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109414 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index a00faa857f2a..6fdd4950f4cb 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -45,7 +45,14 @@ ifneq ($(ENABLE_DBGUTIL),TRUE) $(INSTDIR)/URE/bin/*.exe \ $(INSTDIR)/program/*.dll \ $(INSTDIR)/program/*.exe \ + $(INSTDIR)/program/*.com \ $(INSTDIR)/program/soffice.bin \ + $(INSTDIR)/program/unopkg.bin \ + $(INSTDIR)/program/pyuno.pyd \ + $(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/*.exe \ + $(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/*.dll \ + $(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/*.pyd \ + $(INSTDIR)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/distutils/command/*.exe \ $(INSTDIR)/program/shlxthdl/*.dll \ $(INSTDIR)/sdk/cli/*.dll \ $(INSTDIR)/sdk/bin/*.exe \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/DataFlavorMapping.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit a42fa14a1d48ca7a880171c16a395eadf07efcad
Author: Tor Lillqvist
AuthorDate: Fri Jan 15 18:19:11 2021 +0200
Commit: Tor Lillqvist
CommitDate: Sat Jan 16 09:17:05 2021 +0100
Enable pasting of LINK data from the system pasteboard on macOS
Also add more documentation on how the flavorMap array works. The
interesting thing is that the code stores anything you throw at it on
the system pasteboard. But in another LibreOffice process, it won't
accept types not mentioned in the array even if it as such is a type
that other parts of the code would look for.
Thus, adding the
"application/x-openoffice-link;windows_formatname=\"Link\"" type to
the array means that if there is such data on the system pasteboard
(from an earlier or simultaneous run of LibreOffice), it will be
pasteable also in a different LibreOffice process from the one that
put it there.
(While at it, order the FLAVOR_FOO variable definitions to be in the
same order as their use in the array entries.)
Change-Id: I913cc732e4dfb32d4b098505aa10806976db6326
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109384
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 5659ce1e342b..82065b2c88be 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -74,7 +74,6 @@ namespace
return [NSString stringWithCString: utf8Str.getStr() encoding:
NSUTF8StringEncoding];
}
- const char* FLAVOR_SODX =
"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object
Descriptor (XML)\"";
const char* FLAVOR_SESX =
"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed
Source (XML)\"";
const char* FLAVOR_SLSDX =
"application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link
Source Descriptor (XML)\"";
const char* FLAVOR_ESX =
"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed
Source (XML)\"";
@@ -84,7 +83,8 @@ namespace
const char* FLAVOR_GDIMF =
"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"";
const char* FLAVOR_WMF =
"application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
const char* FLAVOR_EMF =
"application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
-
+ const char* FLAVOR_SODX =
"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object
Descriptor (XML)\"";
+ const char* FLAVOR_LINK =
"application/x-openoffice-link;windows_formatname=\"Link\"";
const char* FLAVOR_DUMMY_INTERNAL = "application/x-openoffice-internal";
struct FlavorMap
@@ -95,6 +95,16 @@ namespace
bool DataTypeOUString; // sequence otherwise
};
+ // This is a list of the bidirectional mapping between (internal) MIME types
and (system)
+ // pasteboard types.
+
+ // Only pasteboard types mentioned here will be recognized, mapped, and
available for pasting in a
+ // fresh LibreOffice process. When copy-pasting in-process, the situation is
different.
+
+ // Also MIME types not mentioned here will be stored on the pasteboard
(using the same type name),
+ // though. But that is IMHO a bit pointless as they in general won't then be
pasteable anyway in a
+ // new LibreOffice process. See the use of the maOfficeOnlyTypes array.
+
// The SystemFlavor member is nil for the cases where there is no predefined
pasteboard type UTI
// and we use the internal MIME type (media type) also on the pasteboard.
That is OK in macOS,
// there is no requirement that the types are well-formed UTIs. It is
different on iOS, I think,
@@ -128,6 +138,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
{ nil, FLAVOR_WMF, "Windows MetaFile", false },
{ nil, FLAVOR_EMF, "Windows Enhanced MetaFile", false },
{ nil, FLAVOR_SODX, "Star Object Descriptor (XML)", false },
+ { nil, FLAVOR_LINK, "Dynamic Data Exchange (DDE link)", false },
{ nil, FLAVOR_DUMMY_INTERNAL, "internal data",false }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/devtools/DevelopmentToolDockingWindow.hxx | 18 -
svx/source/devtools/DevelopmentToolDockingWindow.cxx | 199 +++---
2 files changed, 138 insertions(+), 79 deletions(-)
New commits:
commit 059c9172d99f69a95fea7834623f72d04e2f0618
Author: Tomaž Vajngerl
AuthorDate: Thu Jan 14 23:34:24 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jan 16 09:10:13 2021 +0100
devtools: change to on-expand filling of the doc. model tree-view
Instead of traversing the document model at once and filling the
tree-view, only fill the root element names first, and fill the
children on expand.
For example first add "Paragraphs" root node, and when the user
expands that node, fill the child nodes of the tree with actual
paragraphs.
Change-Id: Ifa71603a4fa1b69d2b1b590f0d0493e22092deb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109375
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
index 19d286093cd3..159efae16425 100644
--- a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
@@ -32,8 +32,19 @@ private:
std::unordered_map>
maUnoObjectMap;
+DECL_LINK(ModelTreeViewExpanding, const weld::TreeIter&, bool);
+
DECL_LINK(LeftSideSelected, weld::TreeView&, void);
+void inspectDocument();
+
+void clearChildren(weld::TreeIter const& rParent);
+
+void fillSheets(weld::TreeIter const& rParent);
+void fillPages(weld::TreeIter const& rParent);
+void fillSlides(weld::TreeIter const& rParent);
+void fillParagraphs(weld::TreeIter const& rParent);
+
public:
DevelopmentToolDockingWindow(SfxBindings* pBindings, SfxChildWindow*
pChildWindow,
vcl::Window* pParent);
@@ -44,13 +55,6 @@ public:
virtual void ToggleFloatingMode() override;
-void inspectDocument();
-
-void inspectSpreadsheet();
-void inspectPresentation();
-void inspectDrawing();
-void inspectText();
-
void introspect(css::uno::Reference const&
xInterface);
};
diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
index 69bf4682da77..f62d3b6eab25 100644
--- a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -95,6 +95,11 @@ private:
SelectionChangeHandler& operator=(const SelectionChangeHandler&) = delete;
};
+void lclAppend(std::unique_ptr& rTree, OUString const& rString)
+{
+rTree->insert(nullptr, -1, &rString, nullptr, nullptr, nullptr, true,
nullptr);
+}
+
} // end anonymous namespace
DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings*
pInputBindings,
@@ -107,6 +112,8 @@
DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings* pInputBi
, mpLeftSideTreeView(m_xBuilder->weld_tree_view("leftside_treeview_id"))
{
mpLeftSideTreeView->connect_changed(LINK(this,
DevelopmentToolDockingWindow, LeftSideSelected));
+mpLeftSideTreeView->connect_expanding(
+LINK(this, DevelopmentToolDockingWindow, ModelTreeViewExpanding));
auto* pViewFrame = pInputBindings->GetDispatcher()->GetFrame();
@@ -126,24 +133,66 @@
DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings* pInputBi
}
}
+void DevelopmentToolDockingWindow::clearChildren(weld::TreeIter const& rParent)
+{
+bool bChild = false;
+do
+{
+bChild = mpLeftSideTreeView->iter_has_child(rParent);
+if (bChild)
+{
+std::unique_ptr pChild =
mpLeftSideTreeView->make_iterator(&rParent);
+bChild = mpLeftSideTreeView->iter_children(*pChild);
+if (bChild)
+{
+mpLeftSideTreeView->remove(*pChild);
+}
+}
+} while (bChild);
+}
+
+IMPL_LINK(DevelopmentToolDockingWindow, ModelTreeViewExpanding, weld::TreeIter
const&, rParent,
+ bool)
+{
+OUString aText = mpLeftSideTreeView->get_text(rParent);
+if (aText == "Paragraphs")
+{
+clearChildren(rParent);
+fillParagraphs(rParent);
+}
+else if (aText == "Pages")
+{
+clearChildren(rParent);
+fillPages(rParent);
+}
+else if (aText == "Slides")
+{
+clearChildren(rParent);
+fillSlides(rParent);
+}
+else if (aText == "Sheets")
+{
+clearChildren(rParent);
+fillSheets(rParent);
+}
+return true;
+}
+
IMPL_LINK_NOARG(DevelopmentToolDockingWindow, LeftSideSelected,
weld::TreeView&, void)
{
OUString sID = mpLeftSideTreeView->get_selected_text();
+if (maUnoObjectMap.find(sID) == maUnoObjectMap.end())
+return;
auto& rObject = maUnoObjectMap.at(sID);
if (rObject.is())
introspect(rObject);
}
-void Developm
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/devtools/DevelopmentToolDockingWindow.hxx |5
svx/source/devtools/DevelopmentToolDockingWindow.cxx | 190 ++
2 files changed, 156 insertions(+), 39 deletions(-)
New commits:
commit a93d26fb1eaa185f5eec774f85a76deedd0205e6
Author: Tomaž Vajngerl
AuthorDate: Mon Jan 11 09:57:57 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jan 16 09:09:35 2021 +0100
devtools: fill left-side document model view for all document types
Change-Id: I19f1cfdbdde86b3fbeb2a0a7e3e4255ef0055cf5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109073
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
index 2856bc3698df..19d286093cd3 100644
--- a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
@@ -46,6 +46,11 @@ public:
void inspectDocument();
+void inspectSpreadsheet();
+void inspectPresentation();
+void inspectDrawing();
+void inspectText();
+
void introspect(css::uno::Reference const&
xInterface);
};
diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
index 0b3dbd06a9e5..69bf4682da77 100644
--- a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -43,7 +43,14 @@
#include
-#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
using namespace css;
@@ -127,63 +134,168 @@ IMPL_LINK_NOARG(DevelopmentToolDockingWindow,
LeftSideSelected, weld::TreeView&,
introspect(rObject);
}
-void DevelopmentToolDockingWindow::inspectDocument()
+void DevelopmentToolDockingWindow::inspectSpreadsheet()
{
-uno::Reference xDocument(mxRoot, uno::UNO_QUERY_THROW);
+msDocumentType = "Spreadsheet Document";
-if (xDocument->supportsService("com.sun.star.sheet.SpreadsheetDocument"))
+std::unique_ptr pParent =
mpLeftSideTreeView->make_iterator();
+mpLeftSideTreeView->insert(nullptr, -1, &msDocumentType, nullptr, nullptr,
nullptr, false,
+ pParent.get());
+maUnoObjectMap.emplace(msDocumentType, mxRoot);
+
+uno::Reference xSheetDoc(mxRoot,
uno::UNO_QUERY);
+uno::Reference xSheets = xSheetDoc->getSheets();
+uno::Reference xIndex(xSheets, uno::UNO_QUERY);
+for (sal_Int32 i = 0; i < xIndex->getCount(); ++i)
{
-msDocumentType = "Spreadsheet Document";
+uno::Reference xSheet(xIndex->getByIndex(i),
uno::UNO_QUERY);
+
+std::unique_ptr pCurrentSheet =
mpLeftSideTreeView->make_iterator();
+OUString aSlideString = "Sheet " + OUString::number(i + 1);
+maUnoObjectMap.emplace(aSlideString, xSheet);
+mpLeftSideTreeView->insert(pParent.get(), -1, &aSlideString, nullptr,
nullptr, nullptr,
+ false, pCurrentSheet.get());
}
-else if
(xDocument->supportsService("com.sun.star.presentation.PresentationDocument"))
+}
+
+void DevelopmentToolDockingWindow::inspectPresentation()
+{
+msDocumentType = "Presentation Document";
+
+std::unique_ptr pParent =
mpLeftSideTreeView->make_iterator();
+mpLeftSideTreeView->insert(nullptr, -1, &msDocumentType, nullptr, nullptr,
nullptr, false,
+ pParent.get());
+maUnoObjectMap.emplace(msDocumentType, mxRoot);
+
+uno::Reference xRet;
+
+uno::Reference xDrawPagesSupplier(mxRoot,
uno::UNO_QUERY);
+uno::Reference xDrawPages =
xDrawPagesSupplier->getDrawPages();
+for (sal_Int32 i = 0; i < xDrawPages->getCount(); ++i)
{
-msDocumentType = "Presentation Document";
+uno::Reference xPage(xDrawPages->getByIndex(i),
uno::UNO_QUERY);
+
+std::unique_ptr pCurrentPage =
mpLeftSideTreeView->make_iterator();
+OUString aPageString = "Slide " + OUString::number(i + 1);
+maUnoObjectMap.emplace(aPageString, xPage);
+mpLeftSideTreeView->insert(pParent.get(), -1, &aPageString, nullptr,
nullptr, nullptr,
+ false, pCurrentPage.get());
+
+for (sal_Int32 j = 0; j < xPage->getCount(); ++j)
+{
+uno::Reference xShape(xPage->getByIndex(j),
uno::UNO_QUERY);
+
+OUString aShapeName = xShape->getName();
+if (aShapeName.isEmpty())
+aShapeName = "Shape " + OUString::number(j);
+
+std::unique_ptr pCurrentShape =
mpLeftSideTreeView->make_iterator();
+mpLeftSideTreeView->insert(pCurrentPage.get(), -1, &aShapeName,
nullptr, nullptr,
+ nullptr, false, pCurrentShape.get());
+maUnoObjectMap.emplace(aShapeName, xShape);
+}
}
-else if
(xDocument->supportsService("com.sun.star.drawing.DrawingDocument"))
+}
+
+void DevelopmentToolDock
[Libreoffice-commits] core.git: drawinglayer/source include/vcl vcl/source
drawinglayer/source/primitive2d/sceneprimitive2d.cxx |2 +-
drawinglayer/source/processor2d/hittestprocessor2d.cxx |2 +-
include/vcl/bitmapex.hxx |8
vcl/source/bitmap/BitmapEx.cxx | 16
4 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ef7f98ff3c73182528995057a3f691a6d1aefdd5
Author: Noel Grandin
AuthorDate: Fri Jan 15 20:49:05 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jan 16 09:00:25 2021 +0100
transparency->alpha in BitmapEx
Change-Id: I631f4ca5a2bdcb8c7691a9a8c71d3de15377213b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109390
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index fa35085e0f1f..b96cca222e7f 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -557,7 +557,7 @@ namespace drawinglayer::primitive2d
const sal_Int32 nY(basegfx::fround(fRelativeY *
aBitmapSizePixel.Height()));
// try to get a statement about transparency in that pixel
-o_rResult = (0xff !=
maOldRenderedBitmap.GetTransparency(nX, nY));
+o_rResult = (0 != maOldRenderedBitmap.GetAlpha(nX, nY));
return true;
}
}
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index 65a03548cb1c..04505489c6f2 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -452,7 +452,7 @@ namespace drawinglayer::processor2d
const sal_Int32
nX(basegfx::fround(aRelativePoint.getX() * rSizePixel.Width()));
const sal_Int32
nY(basegfx::fround(aRelativePoint.getY() * rSizePixel.Height()));
-mbHit = (0xff !=
aBitmapEx.GetTransparency(nX, nY));
+mbHit = (0 != aBitmapEx.GetAlpha(nX, nY));
}
}
else
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 14bbee535485..75e605cb96a9 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -359,7 +359,7 @@ public:
bool bInvert = false,
bool msoBrightness = false );
-/** Get transparency at given position
+/** Get alpha at given position
@param nX
integer X-Position in Bitmap
@@ -367,10 +367,10 @@ public:
@param nY
integer Y-Position in Bitmap
-@return transparency value in the range of [0 .. 255] where
-0 is not transparent, 255 is fully transparent
+@return alpha value in the range of [0 .. 255] where
+0 is fully transparent, 255 is not transparent
*/
-sal_uInt8 GetTransparency(
+sal_uInt8 GetAlpha(
sal_Int32 nX,
sal_Int32 nY) const;
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx
index 1f5da07218c4..65698b6bbad9 100644
--- a/vcl/source/bitmap/BitmapEx.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
@@ -675,22 +675,22 @@ BitmapEx BitmapEx:: AutoScaleBitmap(BitmapEx const &
aBitmap, const tools::Long
return aRet;
}
-sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const
+sal_uInt8 BitmapEx::GetAlpha(sal_Int32 nX, sal_Int32 nY) const
{
-sal_uInt8 nTransparency(0xff);
+sal_uInt8 nAlpha(0);
if(!maBitmap.IsEmpty())
{
if (nX >= 0 && nX < GetSizePixel().Width() && nY >= 0 && nY <
GetSizePixel().Height())
{
if (maBitmap.GetBitCount() == 32)
-return 255 - GetPixelColor(nX, nY).GetAlpha();
+return GetPixelColor(nX, nY).GetAlpha();
switch(meTransparent)
{
case TransparentType::NONE:
{
// Not transparent, ergo all covered
-nTransparency = 0x00;
+nAlpha = 255;
break;
}
case TransparentType::Color:
@@ -704,7 +704,7 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32
nY) const
// If color is not equal to TransparentColor, we are
not transparent
if (aBmpColor != maTransparentColor)
-nTransparency = 0x00;
+nAlpha = 255;
}
break;
@@ -722,13 +722,13 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX,
sal_Int32 nY) co
