date:20200609

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source

2020-06-09 Thread Aron Budea (via logerrit)

 vcl/source/control/field.cxx |   25 +
 1 file changed, 1 insertion(+), 24 deletions(-)

New commits:
commit e029e9e97a4c678cf9f6bf474ddc1df9bef3852d
Author: Aron Budea 
AuthorDate: Mon Sep 16 12:39:59 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Jun 10 08:30:46 2020 +0200

Revert "vcl: better decimal handling in NumericFormatter"

This reverts commit e9a48869fe1f1e90c03d299ae419ea5b1f43de50.

Further comments by tml, for the cherry-pick this branch:

This fixes the problem where even in plain interactive desktop use,
for instance entering "23" into the font size control on the Font tab
of Calc's Format>Cells... dialog causes the value "2.3" to be entered.

This also fixes corresponding problems in UI tests, like when
test_format_cell_font_effects_tab in
sc/qa/uitest/calc_tests/formatCells.py (part of UITest_calc_tests)
enters "18" into the font size box. (Sadly the failure of that to work
properly then caused UITest_calc_tests to hang, instead of producing
some failure report. At least for me.)

Change-Id: I81269296ab3ca3f071707cf22c4b59964baed863
Reviewed-on: https://gerrit.libreoffice.org/78980
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95959
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 35f298ed9477..ebbd7d41c7bd 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -202,29 +202,6 @@ bool ImplNumericGetValue( const OUString& rStr, sal_Int64& 
rValue,
 aStr1.append(std::u16string_view(aStr).substr(0, nDecPos));
 aStr2.append(std::u16string_view(aStr).substr(nDecPos+1));
 }
-else if (nDecDigits > 0 && aStr.getLength() > nDecDigits)
-{
-// We expect a decimal point and a certain number of decimal digits,
-// but seems the user has deleted the decimal point, so we restore it.
-// Otherwise, they end up with unexpectedly (to them) large numbers.
-
-// Find the first digit from the right.
-sal_Int32 nVirtualDecPos = aStr.getLength();
-while (--nVirtualDecPos > 0)
-{
-if ((aStr[nVirtualDecPos] >= '0') && (aStr[nVirtualDecPos] <= '9'))
-break;
-}
-
-if (nVirtualDecPos >= nDecDigits)
-{
-nVirtualDecPos -= nDecDigits - 1; // nVirtualDecPos is already on 
a digit (so discount it).
-aStr1.append(aStr.getStr(), nVirtualDecPos);
-aStr2.append(aStr.getStr() + nVirtualDecPos);
-}
-else
-aStr1 = aStr;
-}
 else
 aStr1 = aStr;
 
@@ -564,7 +541,7 @@ void NumericFormatter::ImplInit()
 mnFieldValue= 0;
 mnLastValue = 0;
 mnMin   = 0;
-mnMax   = 1; // A user-friendly round number.
+mnMax   = SAL_MAX_INT32;
 // a "large" value substantially smaller than SAL_MAX_INT64, to avoid
 // overflow in computations using this "dummy" value
 mnDecimalDigits = 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2020-06-09 Thread Dennis Francis (via logerrit)

 sc/source/ui/view/gridwin.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 0310c591eb5f4010de8f6d12298491d9c13634a3
Author: Dennis Francis 
AuthorDate: Fri May 1 05:39:53 2020 +0530
Commit: Dennis Francis 
CommitDate: Wed Jun 10 08:21:25 2020 +0200

lokit: fix autofilter window position...

when client zoom is not 100%. The fix and the reasoning
is same as that in

lokit: fix validation dropdown's wrong position
3405f7f1b19738cad57b58259105ec87c1108466

Conflicts:
sc/source/ui/view/gridwin.cxx

Change-Id: I04837721d82b1e178cf5aa1130bbdaf77d13edae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93240
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 
(cherry picked from commit 86019fc76473cde457ecf1634bcff9df60ad7cbf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95965
Tested-by: Jenkins

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ce9df4fe4c33..85f2cd517085 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -628,6 +628,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 {
 SCTAB nTab = pViewData->GetTabNo();
 ScDocument* pDoc = pViewData->GetDocument();
+bool bLOKActive = comphelper::LibreOfficeKit::isActive();
 
 mpAutoFilterPopup.disposeAndClear();
 int nColWidth = ScViewData::ToPixel(pDoc->GetColWidth(nCol, nTab), 
pViewData->GetPPTX());
@@ -638,7 +639,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 // If NWF renders the focus rects itself, that breaks double-buffering.
 mpAutoFilterPopup->RequestDoubleBuffering(true);
 
-if (comphelper::LibreOfficeKit::isActive())
+if (bLOKActive)
 mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
 mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, 
AutoFilterMode::Normal));
 mpAutoFilterPopup->setPopupEndAction(
@@ -650,6 +651,18 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 long nSizeX  = 0;
 long nSizeY  = 0;
 pViewData->GetMergeSizePixel(nCol, nRow, nSizeX, nSizeY);
+if (bLOKActive)
+{
+// Reverse the zoom factor from aPos and nSize[X|Y]
+// before letting the autofilter window convert the to twips
+// with no zoom information.
+double fZoomX(pViewData->GetZoomX());
+double fZoomY(pViewData->GetZoomY());
+aPos.setX(aPos.getX() / fZoomX);
+aPos.setY(aPos.getY() / fZoomY);
+nSizeX = nSizeX / fZoomX;
+nSizeY = nSizeY / fZoomY;
+}
 tools::Rectangle aCellRect(OutputToScreenPixel(aPos), Size(nSizeX, 
nSizeY));
 
 ScDBData* pDBData = pDoc->GetDBAtCursor(nCol, nRow, nTab, 
ScDBDataPortion::AREA);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: forms/source sd/source svx/source toolkit/source

2020-06-09 Thread Michael Warner (via logerrit)

 forms/source/component/Date.cxx   |   43 --
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |9 
 svx/source/accessibility/AccessibleGraphicShape.cxx   |   12 
 svx/source/accessibility/AccessibleOLEShape.cxx   |   12 
 svx/source/accessibility/AccessibleShape.cxx  |   45 --
 svx/source/table/accessiblecell.cxx   |   13 
 toolkit/source/controls/tkspinbutton.cxx  |   12 
 toolkit/source/controls/unocontrols.cxx   |  252 --
 8 files changed, 117 insertions(+), 281 deletions(-)

New commits:
commit 8d414f3a8de5c25bcd830b1d4d8a7be3c34a2ed4
Author: Michael Warner 
AuthorDate: Sat May 30 22:18:29 2020 -0400
Commit: Stephan Bergmann 
CommitDate: Wed Jun 10 08:17:31 2020 +0200

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: Id747848b222f69af3293a2095a62542f1e1116d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95215
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index cca3e06821d7..1d16109ce672 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -55,16 +55,10 @@ Sequence ODateControl::_getTypes()
 return OBoundControl::_getTypes();
 }
 
-
 css::uno::Sequence SAL_CALL ODateControl::getSupportedServiceNames()
 {
-css::uno::Sequence aSupported = 
OBoundControl::getSupportedServiceNames();
-aSupported.realloc(aSupported.getLength() + 2);
-
-OUString*pArray = aSupported.getArray();
-pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_DATEFIELD;
-pArray[aSupported.getLength()-2] = STARDIV_ONE_FORM_CONTROL_DATEFIELD;
-return aSupported;
+const css::uno::Sequence vals { FRM_SUN_CONTROL_DATEFIELD, 
STARDIV_ONE_FORM_CONTROL_DATEFIELD };
+return 
comphelper::concatSequences(OBoundControl::getSupportedServiceNames(), vals);
 }
 
 
@@ -122,26 +116,19 @@ IMPLEMENT_DEFAULT_CLONING( ODateModel )
 
 css::uno::Sequence SAL_CALL ODateModel::getSupportedServiceNames()
 {
-css::uno::Sequence aSupported = 
OBoundControlModel::getSupportedServiceNames();
-
-sal_Int32 nOldLen = aSupported.getLength();
-aSupported.realloc( nOldLen + 9 );
-OUString* pStoreTo = aSupported.getArray() + nOldLen;
-
-*pStoreTo++ = BINDABLE_CONTROL_MODEL;
-*pStoreTo++ = DATA_AWARE_CONTROL_MODEL;
-*pStoreTo++ = VALIDATABLE_CONTROL_MODEL;
-
-*pStoreTo++ = BINDABLE_DATA_AWARE_CONTROL_MODEL;
-*pStoreTo++ = VALIDATABLE_BINDABLE_CONTROL_MODEL;
-
-*pStoreTo++ = FRM_SUN_COMPONENT_DATEFIELD;
-*pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_DATEFIELD;
-*pStoreTo++ = BINDABLE_DATABASE_DATE_FIELD;
-
-*pStoreTo++ = FRM_COMPONENT_DATEFIELD;
-
-return aSupported;
+const css::uno::Sequence vals {
+   BINDABLE_CONTROL_MODEL,
+   DATA_AWARE_CONTROL_MODEL,
+   VALIDATABLE_CONTROL_MODEL,
+   BINDABLE_DATA_AWARE_CONTROL_MODEL,
+   VALIDATABLE_BINDABLE_CONTROL_MODEL,
+   FRM_SUN_COMPONENT_DATEFIELD,
+   FRM_SUN_COMPONENT_DATABASE_DATEFIELD,
+   BINDABLE_DATABASE_DATE_FIELD,
+   FRM_COMPONENT_DATEFIELD
+};
+
+return 
comphelper::concatSequences(OBoundControlModel::getSupportedServiceNames(), 
vals);
 }
 
 
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 6d13f723e14c..c042eac6254f 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -383,16 +383,11 @@ css::uno::Sequence< OUString> SAL_CALL
 AccessibleDrawDocumentView::getSupportedServiceNames()
 {
 ThrowIfDisposed();
-// Get list of supported service names from base class...
+const css::uno::Sequence vals { 
"com.sun.star.drawing.AccessibleDrawDocumentView" };
 uno::Sequence aServiceNames =
 AccessibleDocumentViewBase::getSupportedServiceNames();
-sal_Int32 nCount (aServiceNames.getLength());
 
-// ...and add additional names.
-aServiceNames.realloc (nCount + 1);
-aServiceNames[nCount] = "com.sun.star.drawing.AccessibleDrawDocumentView";
-
-return aServiceNames;
+return comphelper::concatSequences(aServiceNames, vals);
 }
 
 //=  XInterface  ==
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx 
b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 10f4d8b2..c7fe3c6fe40b 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -104,16 +104,8 @@ css::uno::Sequence< OUString> SAL_CALL
 AccessibleGraphicShape::getSupportedServiceNames()
 {
 ThrowIfDisposed ();
-// Get list of supported service names from base class...
-uno::Sequence aServiceNames =
-AccessibleShape::getSupportedServiceNames();
-

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl sd/source vcl/qa vcl/source

2020-06-09 Thread Tomaž Vajngerl (via logerrit)

 include/vcl/VectorGraphicSearch.hxx|   24 +++
 sd/source/ui/view/Outliner.cxx |   16 +++--
 vcl/qa/cppunit/VectorGraphicSearchTest.cxx |   88 -
 vcl/source/graphic/VectorGraphicSearch.cxx |   22 ---
 4 files changed, 135 insertions(+), 15 deletions(-)

New commits:
commit 456116d97b66703e23055b83ded5d87ed85c728d
Author: Tomaž Vajngerl 
AuthorDate: Thu Jun 4 18:26:58 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Jun 10 08:11:41 2020 +0200

sd: support match case, match whole word for PDF search

THis adds support for match case and match whole word to the
VectorGraphicSearch + tests.

It uses the new options in PDF seearch in Draw/Impress.

Change-Id: I20a6382c22bf01a5a021c8bae1ff78861419c0ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95530
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 112d8113388513d9c6b317e828f5d373b4a54330)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95950
Tested-by: Jenkins CollaboraOffice 

diff --git a/include/vcl/VectorGraphicSearch.hxx 
b/include/vcl/VectorGraphicSearch.hxx
index c9faaa51f1c9..4601a1f5ac1d 100644
--- a/include/vcl/VectorGraphicSearch.hxx
+++ b/include/vcl/VectorGraphicSearch.hxx
@@ -25,6 +25,28 @@ enum class SearchStartPosition
 End
 };
 
+struct VCL_DLLPUBLIC VectorGraphicSearchOptions final
+{
+SearchStartPosition meStartPosition;
+bool mbMatchCase;
+bool mbMatchWholeWord;
+
+VectorGraphicSearchOptions()
+: meStartPosition(SearchStartPosition::Begin)
+, mbMatchCase(false)
+, mbMatchWholeWord(false)
+{
+}
+
+VectorGraphicSearchOptions(SearchStartPosition eStartPosition, bool 
bMatchCase,
+   bool bMatchWholeWord)
+: meStartPosition(eStartPosition)
+, mbMatchCase(bMatchCase)
+, mbMatchWholeWord(bMatchWholeWord)
+{
+}
+};
+
 class VCL_DLLPUBLIC VectorGraphicSearch final
 {
 private:
@@ -38,7 +60,7 @@ public:
 VectorGraphicSearch(Graphic const& rGraphic);
 ~VectorGraphicSearch();
 bool search(OUString const& rSearchString,
-SearchStartPosition eStartPosition = 
SearchStartPosition::Begin);
+VectorGraphicSearchOptions const& rOptions = 
VectorGraphicSearchOptions());
 basegfx::B2DSize pageSize();
 bool next();
 bool previous();
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 3114196f7cf2..c01e2fe6fe73 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -840,8 +840,12 @@ bool 
SdOutliner::SearchAndReplaceOnce(std::vector* pSelecti
 OUString const & rString = mpSearchItem->GetSearchString();
 bool bBackwards = mpSearchItem->GetBackward();
 
-SearchStartPosition eSearchStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
-bool bResult = mpImpl->mpVectorGraphicSearch->search(rString, 
eSearchStartPosition);
+VectorGraphicSearchOptions aOptions;
+aOptions.meStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+aOptions.mbMatchCase = mpSearchItem->GetExact();
+aOptions.mbMatchWholeWord = mpSearchItem->GetWordOnly();
+
+bool bResult = mpImpl->mpVectorGraphicSearch->search(rString, 
aOptions);
 
 if (bResult)
 {
@@ -1253,11 +1257,15 @@ void SdOutliner::ProvideNextTextObject()
 auto* pGraphicObject = static_cast(mpObj);
 OUString const & rString = mpSearchItem->GetSearchString();
 bool bBackwards = mpSearchItem->GetBackward();
-SearchStartPosition eSearchStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+
+VectorGraphicSearchOptions aOptions;
+aOptions.meStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+aOptions.mbMatchCase = mpSearchItem->GetExact();
+aOptions.mbMatchWholeWord = mpSearchItem->GetWordOnly();
 
 mpImpl->mpVectorGraphicSearch = 
std::make_unique(pGraphicObject->GetGraphic());
 
-bool bResult = 
mpImpl->mpVectorGraphicSearch->search(rString, eSearchStartPosition);
+bool bResult = 
mpImpl->mpVectorGraphicSearch->search(rString, aOptions);
 if (bResult)
 {
 if (bBackwards)
diff --git a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx 
b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
index 00febce16e71..0659e4e62dcf 100644
--- a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
+++ b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
@@ -32,11 +32,15 @@ class VectorGraphicSearchTest : public 
test::Boot

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - sd/qa vcl/qa

2020-06-09 Thread Tomaž Vajngerl (via logerrit)

 sd/qa/unit/tiledrendering/LOKitSearchTest.cxx |   16 
 vcl/qa/cppunit/VectorGraphicSearchTest.cxx|6 ++
 2 files changed, 22 insertions(+)

New commits:
commit 3e20ddab50de57f8a4f915791bbb56710c4936e3
Author: Tomaž Vajngerl 
AuthorDate: Wed Jun 3 12:31:34 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Jun 10 08:11:29 2020 +0200

sd: disable LOKitSearchTest that test PDF search if no PDFium

enclose the tests with HAVE_FEATURE_PDFIUM

Change-Id: I1ce97fe090cef2cc2ab2f25fd1d2698bcaf28222
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95463
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 25da71b489228b866f20d8ea6d1926128168d1fa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95949
Tested-by: Jenkins CollaboraOffice 

diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx 
b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
index 8c2a41eeca9e..91b5ecbc8473 100644
--- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
+++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
@@ -8,6 +8,8 @@
  */
 
 #include "../sdmodeltestbase.hxx"
+#include 
+
 #include "CallbackRecorder.hxx"
 
 #include 
@@ -140,6 +142,7 @@ void lcl_search(const OUString& rKey, bool bFindAll = 
false, bool bBackwards = f
 Scheduler::ProcessEventsToIdle();
 }
 
+#if HAVE_FEATURE_PDFIUM
 SdrObject* lclGetSelectedObject(sd::ViewShell* pViewShell)
 {
 SdrView* pSdrView = pViewShell->GetView();
@@ -148,6 +151,7 @@ SdrObject* lclGetSelectedObject(sd::ViewShell* pViewShell)
 SdrObject* pObject = rMarkList.GetMark(0)->GetMarkedSdrObj();
 return pObject;
 }
+#endif
 
 } // end anonymous namespace
 
@@ -262,6 +266,7 @@ void LOKitSearchTest::testDontSearchInMasterPages()
 
 void LOKitSearchTest::testSearchInPDFNonExisting()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("PDFSearch.pdf");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -285,10 +290,12 @@ void LOKitSearchTest::testSearchInPDFNonExisting()
 lcl_search("NonExisting");
 
 CPPUNIT_ASSERT_EQUAL(false, mpCallbackRecorder->m_bFound);
+#endif
 }
 
 void LOKitSearchTest::testSearchInPDF()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("PDFSearch.pdf");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -332,10 +339,12 @@ void LOKitSearchTest::testSearchInPDF()
  mpCallbackRecorder->m_aSearchResultSelection[0]);
 CPPUNIT_ASSERT_EQUAL(tools::Rectangle(Point(3763, 1331), Size(1433, 484)),
  mpCallbackRecorder->m_aSelection[0]);
+#endif
 }
 
 void LOKitSearchTest::testSearchInPDFInMultiplePages()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("PDFSearch.pdf");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -422,10 +431,12 @@ void LOKitSearchTest::testSearchInPDFInMultiplePages()
 CPPUNIT_ASSERT_EQUAL(0, mpCallbackRecorder->m_aSearchResultPart[0]);
 CPPUNIT_ASSERT_EQUAL(OString("9463, 3382, 1099, 499"),
  mpCallbackRecorder->m_aSearchResultSelection[0]);
+#endif
 }
 
 void LOKitSearchTest::testSearchInPDFInMultiplePagesBackwards()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("PDFSearch.pdf");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -520,12 +531,14 @@ void 
LOKitSearchTest::testSearchInPDFInMultiplePagesBackwards()
 CPPUNIT_ASSERT_EQUAL(0, mpCallbackRecorder->m_aSearchResultPart[0]);
 CPPUNIT_ASSERT_EQUAL(OString("5592, 5038, 1100, 499"),
  mpCallbackRecorder->m_aSearchResultSelection[0]);
+#endif
 }
 
 // Test searching in document with mixed objects.
 // We have 2 objects: 1. Text Object, 2. Graphic Object with PDF
 void LOKitSearchTest::testSearchIn2MixedObjects()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("MixedTest1.odg");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -606,11 +619,13 @@ void LOKitSearchTest::testSearchIn2MixedObjects()
 
 CPPUNIT_ASSERT_EQUAL(OString("3546, 3174, 738, 402"),
  mpCallbackRecorder->m_aSearchResultSelection[0]);
+#endif
 }
 
 // Test searching in document with mixed objects. We have 6 objects.
 void LOKitSearchTest::testSearchIn6MixedObjects()
 {
+#if HAVE_FEATURE_PDFIUM
 SdXImpressDocument* pXImpressDocument = createDoc("MixedTest2.odg");
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
@@ -770,6 +785,7 @@ void LOKitSearchTest::testSearchIn6MixedObjects()
 CPPUNIT_ASSERT_E

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/source

2020-06-09 Thread Tomaž Vajngerl (via logerrit)

 sd/source/ui/view/Outliner.cxx |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit ca214ec3f5b3c65c8d6d335d284b0702f29b4c25
Author: Tomaž Vajngerl 
AuthorDate: Sun May 31 21:59:34 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Jun 10 08:11:00 2020 +0200

sd: allow to change the search string between searches

Before this was missing, so even with a different search string,
it still searched using the old string, which was a bug.

Change-Id: I1655cb421e216e30ae593aabd3ead3a2d5c06299
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95461
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 191288d6a7fb52b31038a21c4e71ee57ffa3bacd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95947
Tested-by: Jenkins CollaboraOffice 

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 09d84fafc3a7..3114196f7cf2 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -837,13 +837,19 @@ bool 
SdOutliner::SearchAndReplaceOnce(std::vector* pSelecti
 
 if (mpImpl->mbCurrentIsVectorGraphic)
 {
+OUString const & rString = mpSearchItem->GetSearchString();
 bool bBackwards = mpSearchItem->GetBackward();
 
-bool bResult = false;
-if (bBackwards)
-bResult = mpImpl->mpVectorGraphicSearch->previous();
-else
-bResult = mpImpl->mpVectorGraphicSearch->next();
+SearchStartPosition eSearchStartPosition = bBackwards ? 
SearchStartPosition::End : SearchStartPosition::Begin;
+bool bResult = mpImpl->mpVectorGraphicSearch->search(rString, 
eSearchStartPosition);
+
+if (bResult)
+{
+if (bBackwards)
+bResult = mpImpl->mpVectorGraphicSearch->previous();
+else
+bResult = mpImpl->mpVectorGraphicSearch->next();
+}
 
 if (bResult)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Aw: Re: Forced Updates? WTF?

2020-06-09 Thread Ralf Quint

On 6/9/2020 3:18 PM, Christoph Schäfer wrote:

Hi,
It's true, I don't know what happened. I originally installed LO via the MSI installers from the
TDF site, and I have no other "helpful software" regarding updates on my computers. Oh,
wait, on my laptop I have installed a Windows update blocker, and yet the LO update happened in the
background. At least on the laptop the "Recently Used" list wasn't lost, but the icon set
reverted to the default setting. On my PC even the list was lost, the icon set was also changed,
and the document restauration didn't work after the PC was forced to reboot, so I lost some work.

If TDF is responsible for this (and I added a qualifier to my original post), I
actually consider this to be rude behaviour.
I have LO installed for years on each and every one of my computer, a
couple of Windows 7 still, this laptop I am typing running Windows 8.1,
3 PCs running Windows 10 as well as a MacBook Pro (High Sierra only
though) and two machines running Linux Mint 19.1. Not one of them is
"updating in the background", I usually do this on the Windows machines
once a month via Ninite (though most of the initial install have been
through what you are likely referring to as TDF), I have to download a
newer version manually on the Mac (from TDF) and the only machines that
semi-automatically offer updates for LO are those two Linux boxes,
though I still have to select and confirm the update each and every time.

And at no time has any of those updates, on any of the systems above,
messed with previous system settings, at least not in a way that I would
have noticed...

1 2 >

1 - 100 of 115 matches

Mail list logo