[Libreoffice-commits] core.git: test/Library_subsequenttest.mk
test/Library_subsequenttest.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 498805290a5a6f3e8342b3a62ae365bda051f75d Author: Tor Lillqvist Date: Mon Jul 9 09:49:22 2018 +0300 Fix typo Change-Id: I73b808f7dc34f1bdd4b84086b79cf56541e5072c diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 701fa3b9192a..e31f44bdfb41 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -1,4 +1,4 @@ -a -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source basctl/source
accessibility/source/extended/accessiblelistboxentry.cxx |3 +--
basctl/source/basicide/localizationmgr.cxx |3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 79c0328f4824300426333ba05c43bb300e2de4e7
Author: Ulkem Kasapoglu
Date: Wed Jul 4 14:55:36 2018 +0300
tdf#100726: Improve readability of OUString/OString concatenations
Change-Id: Ie78ca074a2472a57fb32c43f8dee9cc4cf5614c7
Reviewed-on: https://gerrit.libreoffice.org/56945
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 4d409d80299a..943047213a1c 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -474,8 +474,7 @@ namespace accessibility
OUString altText = getListBox()->GetEntryAltText( pEntry );
if (!altText.isEmpty())
{
-sRet += " ";
-sRet += altText;
+sRet += " " + altText;
}
return sRet;
diff --git a/basctl/source/basicide/localizationmgr.cxx
b/basctl/source/basicide/localizationmgr.cxx
index 4d248c16dc9d..8822ee21c9ba 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -172,8 +172,7 @@ OUString implCreatePureResourceId
+ aDot;
if( !aCtrlName.isEmpty() )
{
-aPureIdStr += aCtrlName;
-aPureIdStr += aDot;
+aPureIdStr += aCtrlName + aDot;
}
aPureIdStr += aPropName;
return aPureIdStr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/karasa_jaga officecfg/registry
dev/null |binary icon-themes/karasa_jaga/cmd/32/donation.png |binary icon-themes/karasa_jaga/cmd/32/heading1parastyle.png |binary icon-themes/karasa_jaga/cmd/32/heading2parastyle.png |binary icon-themes/karasa_jaga/cmd/32/heading3parastyle.png |binary icon-themes/karasa_jaga/cmd/32/heading4parastyle.png |binary icon-themes/karasa_jaga/cmd/32/heading5parastyle.png |binary icon-themes/karasa_jaga/cmd/32/heading6parastyle.png |binary icon-themes/karasa_jaga/cmd/32/insertsymbol.png |binary icon-themes/karasa_jaga/cmd/32/sendfeedback.png |binary icon-themes/karasa_jaga/cmd/32/showtoolbar.png |binary icon-themes/karasa_jaga/cmd/32/subtitleparastyle.png |binary icon-themes/karasa_jaga/cmd/32/titleparastyle.png|binary icon-themes/karasa_jaga/cmd/lc_autosum.png |binary icon-themes/karasa_jaga/cmd/lc_donation.png |binary icon-themes/karasa_jaga/cmd/lc_heading1parastyle.png |binary icon-themes/karasa_jaga/cmd/lc_heading2parastyle.png |binary icon-themes/karasa_jaga/cmd/lc_heading3parastyle.png |binary icon-themes/karasa_jaga/cmd/lc_heading4parastyle.png |binary icon-themes/karasa_jaga/cmd/lc_heading5parastyle.png |binary icon-themes/karasa_jaga/cmd/lc_heading6parastyle.png |binary icon-themes/karasa_jaga/cmd/lc_insertsymbol.png |binary icon-themes/karasa_jaga/cmd/lc_sendfeedback.png |binary icon-themes/karasa_jaga/cmd/lc_showtoolbar.png |binary icon-themes/karasa_jaga/cmd/lc_subtitleparastyle.png |binary icon-themes/karasa_jaga/cmd/lc_titleparastyle.png|binary icon-themes/karasa_jaga/cmd/sc_donation.png |binary icon-themes/karasa_jaga/cmd/sc_emphasischarstyle.png |binary icon-themes/karasa_jaga/cmd/sc_heading1parastyle.png |binary icon-themes/karasa_jaga/cmd/sc_heading2parastyle.png |binary icon-themes/karasa_jaga/cmd/sc_heading3parastyle.png |binary icon-themes/karasa_jaga/cmd/sc_heading4parastyle.png |binary icon-themes/karasa_jaga/cmd/sc_heading5parastyle.png |binary icon-themes/karasa_jaga/cmd/sc_heading6parastyle.png |binary icon-themes/karasa_jaga/cmd/sc_insertsymbol.png |binary icon-themes/karasa_jaga/cmd/sc_sendfeedback.png |binary icon-themes/karasa_jaga/cmd/sc_showtoolbar.png |binary icon-themes/karasa_jaga/cmd/sc_subtitleparastyle.png |binary icon-themes/karasa_jaga/cmd/sc_titleparastyle.png|binary icon-themes/karasa_jaga/links.txt|3 +++ icon-themes/karasa_jaga/sw/res/envhc_l.png |binary icon-themes/karasa_jaga/sw/res/envhc_u.png |binary icon-themes/karasa_jaga/sw/res/envhl_l.png |binary icon-themes/karasa_jaga/sw/res/envhl_u.png |binary icon-themes/karasa_jaga/sw/res/envhr_l.png |binary icon-themes/karasa_jaga/sw/res/envhr_u.png |binary icon-themes/karasa_jaga/sw/res/envvc_l.png |binary icon-themes/karasa_jaga/sw/res/envvc_u.png |binary icon-themes/karasa_jaga/sw/res/envvl_l.png |binary icon-themes/karasa_jaga/sw/res/envvl_u.png |binary icon-themes/karasa_jaga/sw/res/envvr_l.png |binary icon-themes/karasa_jaga/sw/res/envvr_u.png |binary officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |6 ++ 53 files changed, 9 insertions(+) New commits: commit 064c26edafd801c68d6112be223440ab4d9692d3 Author: Rizal Muttaqin Date: Sat Jul 7 13:21:19 2018 +0700 KJ icons: ^ envelope, symbol, char style; + toolbar, sendfeedback & donation Change-Id: I5cfee18784a469b3aa025f9be16d429b04d05ef5 Reviewed-on: https://gerrit.libreoffice.org/57106 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit bea0ff42be603adf43dc4b7b9adc04dc6307) Reviewed-on: https://gerrit.libreoffice.org/57173 Tested-by: Adolfo Jayme Barrientos diff --git a/icon-themes/karasa_jaga/cmd/32/charmapcontrol.png b/icon-themes/karasa_jaga/cmd/32/charmapcontrol.png deleted file mode 100755 index ceeb10aed922.. Binary files a/icon-themes/karasa_jaga/cmd/32/charmapcontrol.png and /dev/null differ diff
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|4 +++
writerfilter/source/dmapper/StyleSheetTable.cxx | 27 +++-
2 files changed, 26 insertions(+), 5 deletions(-)
New commits:
commit 39a4f21fc4a16f7c57a9b6f1ddd5ce2953781576
Author: Justin Luth
Date: Fri Jul 6 15:19:26 2018 +0300
tdf#102619 writerfilter: first create style, then set FollowStyle
Styles were having FollowStyle set to themselves (Heading 1),
not to a defined follow (Text body).
The style was being created with a FollowStyle property that
identified a style which had not yet been created.
So svl code was warning
"svl.items", "StyleSheet-Follow not found"
This section of code should really be cleaned up, but that will
happen in a separate commit.
Change-Id: Iae79fac917f64cdaa14ca6568e7d903ec6dc60fa
Reviewed-on: https://gerrit.libreoffice.org/57074
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ca24b6420e5e..732a938c8094 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -818,6 +818,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf89791, "tdf89791.docx")
uno::Reference xNameAccess =
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
maTempFile.GetURL());
CPPUNIT_ASSERT_EQUAL(false,
bool(xNameAccess->hasByName("docProps/custom.xml")));
}
+
+//tdf#102619 - setting FollowStyle with a not-yet-created style was
failing. (Titre is created before Corps de texte).
+uno::Reference< beans::XPropertySet >
properties(getStyles("ParagraphStyles")->getByName("Titre"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Corps de texte"),
getProperty(properties, "FollowStyle"));
}
DECLARE_OOXMLEXPORT_TEST(testTdf91261, "tdf91261.docx")
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 383ac0d5a0f9..14c2348fb0d5 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -903,6 +903,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr&
rFontTable )
if(xCharStyles.is() && xParaStyles.is())
{
std::vector< ::std::pair>
> aMissingParent;
+std::vector< ::std::pair>
> aMissingFollow;
std::vector aTableStylesVec;
std::vector< StyleSheetEntryPtr >::iterator aIt =
m_pImpl->m_aStyleSheetEntries.begin();
while( aIt != m_pImpl->m_aStyleSheetEntries.end() )
@@ -1133,10 +1134,16 @@ void StyleSheetTable::ApplyStyleSheets( const
FontTablePtr& rFontTable )
{
if (!(*it)->sStyleName.isEmpty() &&
(*it)->sStyleIdentifierD == pEntry->sNextStyleIdentifier)
{
-beans::PropertyValue aNew;
-aNew.Name = "FollowStyle";
-aNew.Value <<=
ConvertStyleName((*it)->sStyleName);
-aSortedPropVals.Insert(aNew);
+const OUString sFollowStyle =
ConvertStyleName((*it)->sStyleName);
+if ( !xStyles->hasByName( sFollowStyle ) )
+aMissingFollow.emplace_back(
sFollowStyle, xStyle );
+else
+{
+beans::PropertyValue aNew;
+aNew.Name = "FollowStyle";
+aNew.Value <<= sFollowStyle;
+aSortedPropVals.Insert(aNew);
+}
break;
}
}
@@ -1210,12 +1217,22 @@ void StyleSheetTable::ApplyStyleSheets( const
FontTablePtr& rFontTable )
++aIt;
}
-// Update the styles that were created before their parents
+// Update the styles that were created before their parents or
next-styles
for( auto const & iter : aMissingParent )
{
iter.second->setParentStyle( iter.first );
}
+for( auto const & iter : aMissingFollow )
+{
+try
+{
+uno::Reference
xPropertySet(iter.second, uno::UNO_QUERY);
+xPropertySet->setPropertyValue( "FollowStyle",
uno::makeAny(iter.first) );
+}
+catch( uno::Exception & ) {}
+}
+
if (!aTableStylesVec.empty())
{
// If we had any table styles, add a new document-level
Inte
[Libreoffice-commits] core.git: vcl/source
vcl/source/uitest/uiobject.cxx | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit a7699fc27240f1329602a5d442667c326525ad55
Author: Markus Mohrhard
Date: Mon Jul 9 00:48:16 2018 +0200
uitest: test for ui elements children first
Change-Id: I837721533bc40cea55cbccaa14e1f14686aa3e3a
Reviewed-on: https://gerrit.libreoffice.org/57165
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 1a292862ec52..0540b9ba0ec4 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -421,8 +421,15 @@ void addChildren(vcl::Window const * pParent,
std::set& rChildren)
std::unique_ptr WindowUIObject::get_child(const OUString& rID)
{
-vcl::Window* pDialogParent = get_top_parent(mxWindow.get());
-vcl::Window* pWindow = findChild(pDialogParent, rID);
+// in a first step try the real children before moving to the top level
parent
+// This makes it easier to handle cases with the same ID as there is a way
+// to resolve conflicts
+vcl::Window* pWindow = findChild(mxWindow.get(), rID);
+if (!pWindow)
+{
+vcl::Window* pDialogParent = get_top_parent(mxWindow.get());
+pWindow = findChild(pDialogParent, rID);
+}
if (!pWindow)
throw css::uno::RuntimeException("Could not find child with id: " +
rID);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9d7166b448198875bdff43d7054d0f5914e675de
Author: Markus Mohrhard
Date: Mon Jul 9 00:54:02 2018 +0200
fix compile_commands.json when generated with modern gcc
Change-Id: I4a17cfb567f5ebec8bb416b9aa4d58763ff36c36
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 90a732d7c614..b016bfe02a0c 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -379,7 +379,7 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
command += ' -c '
command += file
# Help clang when the tree is configured for gcc.
-for gnu in ('-std=gnu++11', '-std=gnu++1y'):
+for gnu in ('-std=gnu++11', '-std=gnu++1y', '-std=gnu++17'):
command = command.replace(gnu, '-std=c++11')
return command
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source
sw/source/uibase/utlui/content.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a900c91447897e725fc0cf674205eee633b326eb
Author: Michael Stahl
Date: Fri Jul 6 18:39:20 2018 +0200
tdf#115890 sw: fix invalid cast in SwContentTree::GetEntryAltText()
AccessibleListBoxEntry calls this for any entry.
This was always broken but now we have asserts to tell us about it.
Change-Id: I7094a1dfbffd359e0f536ca60cba2478e2a62464
Reviewed-on: https://gerrit.libreoffice.org/57086
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit 2986f4baa8bdef1f9ab9108240ea890075321be1)
Reviewed-on: https://gerrit.libreoffice.org/57152
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 9b59a912c722..9012fd86fbcf 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -902,7 +902,7 @@ Size SwContentTree::GetOptimalSize() const
OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
{
-if( pEntry == nullptr)
+if (pEntry == nullptr || !lcl_IsContent(pEntry))
return OUString();
assert(pEntry->GetUserData() == nullptr ||
dynamic_cast(static_cast(pEntry->GetUserData(;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/dbgui/validate.cxx |2 +- sc/uiconfig/scalc/ui/erroralerttabpage.ui |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit c3c2ca43686b8cf63e60f783b81cb353d91973fa Author: Markus Mohrhard Date: Sun Jul 8 23:06:34 2018 +0200 rename UI element to prevent duplicate IDs in same dialog Small improvement for the UI testing. Change-Id: I49fa6a7566a492930532719271b6c83005bc85a8 Reviewed-on: https://gerrit.libreoffice.org/57163 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index fe6bd005f669..688ebe5b7043 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -767,7 +767,7 @@ ScTPValidationError::ScTPValidationError( vcl::Window* pParent, get(m_pTsbShow,"tsbshow"); get(m_pLbAction,"actionCB"); get(m_pBtnSearch,"browseBtn"); -get(m_pEdtTitle,"title"); +get(m_pEdtTitle,"erroralert_title"); get(m_pFtError,"errormsg_label"); get(m_pEdError,"errorMsg"); m_pEdError->set_height_request(m_pEdError->GetTextHeight() * 12); diff --git a/sc/uiconfig/scalc/ui/erroralerttabpage.ui b/sc/uiconfig/scalc/ui/erroralerttabpage.ui index 0abfaa75340a..ef8f9bc8191d 100644 --- a/sc/uiconfig/scalc/ui/erroralerttabpage.ui +++ b/sc/uiconfig/scalc/ui/erroralerttabpage.ui @@ -75,7 +75,7 @@ 0 _Title: True -title +erroralert_title 0 @@ -106,7 +106,7 @@ - + True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/qa/unit/datatransformation_test.cxx |8 -
sc/source/ui/dataprovider/datatransformation.cxx | 124 ---
sc/source/ui/inc/dataproviderdlg.hxx |1
sc/source/ui/inc/datatransformation.hxx |4
sc/source/ui/miscdlgs/dataproviderdlg.cxx| 79 ++
sc/uiconfig/scalc/ui/texttransformationentry.ui | 109
7 files changed, 261 insertions(+), 65 deletions(-)
New commits:
commit 9546f6fec9c16c0440ef6db940aa704d2f8c6657
Author: Manuj Vashist
Date: Mon Jul 2 17:14:11 2018 +0530
added Text transformation in data provider dlg
Change-Id: I69d8aae9289ad6d1cbdf92307c16299a533fcd56
Reviewed-on: https://gerrit.libreoffice.org/56807
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 6eb7c34d49f9..498540b645fb 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -156,6 +156,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/mergecellsdialog \
sc/uiconfig/scalc/ui/mergecolumnentry \
+ sc/uiconfig/scalc/ui/texttransformationentry \
sc/uiconfig/scalc/ui/movecopysheet \
sc/uiconfig/scalc/ui/movingaveragedialog \
sc/uiconfig/scalc/ui/multipleoperationsdialog \
diff --git a/sc/qa/unit/datatransformation_test.cxx
b/sc/qa/unit/datatransformation_test.cxx
index 3546104fdbee..baea46c694ad 100644
--- a/sc/qa/unit/datatransformation_test.cxx
+++ b/sc/qa/unit/datatransformation_test.cxx
@@ -170,7 +170,7 @@ void ScDataTransformationTest::testTextToLower()
m_pDoc->SetString(2, 2, 0, "Paris");
m_pDoc->SetString(2, 3, 0, "Peking");
-sc::TextTransformation aTransform(2, sc::TEXT_TRANSFORM_TYPE::TO_LOWER);
+sc::TextTransformation aTransform({2}, sc::TEXT_TRANSFORM_TYPE::TO_LOWER);
aTransform.Transform(*m_pDoc);
CPPUNIT_ASSERT_EQUAL(OUString("berlin"), m_pDoc->GetString(2, 0, 0));
@@ -186,7 +186,7 @@ void ScDataTransformationTest::testTextToUpper()
m_pDoc->SetString(2, 2, 0, "Paris");
m_pDoc->SetString(2, 3, 0, "Peking");
-sc::TextTransformation aTransform(2, sc::TEXT_TRANSFORM_TYPE::TO_UPPER);
+sc::TextTransformation aTransform({2}, sc::TEXT_TRANSFORM_TYPE::TO_UPPER);
aTransform.Transform(*m_pDoc);
CPPUNIT_ASSERT_EQUAL(OUString("BERLIN"), m_pDoc->GetString(2, 0, 0));
@@ -202,7 +202,7 @@ void ScDataTransformationTest::testTextCapitalize()
m_pDoc->SetString(2, 2, 0, "si tu la ves");
m_pDoc->SetString(2, 3, 0, "cUaNdO mE EnAmOro");
-sc::TextTransformation aTransform(2, sc::TEXT_TRANSFORM_TYPE::CAPITALIZE);
+sc::TextTransformation aTransform({2},
sc::TEXT_TRANSFORM_TYPE::CAPITALIZE);
aTransform.Transform(*m_pDoc);
CPPUNIT_ASSERT_EQUAL(OUString("Hello World"), m_pDoc->GetString(2, 0, 0));
@@ -217,7 +217,7 @@ void ScDataTransformationTest::testTextTrim()
m_pDoc->SetString(2, 1, 0, "Brussels ");
m_pDoc->SetString(2, 2, 0, " Paris ");
-sc::TextTransformation aTransform(2, sc::TEXT_TRANSFORM_TYPE::TRIM);
+sc::TextTransformation aTransform({2}, sc::TEXT_TRANSFORM_TYPE::TRIM);
aTransform.Transform(*m_pDoc);
CPPUNIT_ASSERT_EQUAL(OUString("Berlin"), m_pDoc->GetString(2, 0, 0));
diff --git a/sc/source/ui/dataprovider/datatransformation.cxx
b/sc/source/ui/dataprovider/datatransformation.cxx
index a1eae17c0df9..75e84a23c2ef 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -176,7 +176,7 @@ const ScSortParam & SortTransformation::getSortParam() const
return maSortParam;
}
-TextTransformation::TextTransformation(SCCOL nCol, const TEXT_TRANSFORM_TYPE
rType):
+TextTransformation::TextTransformation(const std::set& nCol, const
TEXT_TRANSFORM_TYPE rType):
mnCol(nCol),
maType(rType)
{
@@ -184,85 +184,91 @@ TextTransformation::TextTransformation(SCCOL nCol, const
TEXT_TRANSFORM_TYPE rTy
void TextTransformation::Transform(ScDocument& rDoc) const
{
-SCROW nEndRow = getLastRow(rDoc, mnCol);
-
-switch (maType)
+SCROW nEndRow = 0;
+for(auto& rCol : mnCol)
{
-case TEXT_TRANSFORM_TYPE::TO_LOWER:
+nEndRow = getLastRow(rDoc, rCol);
+}
+for(auto& rCol : mnCol)
+{
+switch (maType)
{
-for (SCROW nRow = 0; nRow <= nEndRow; ++nRow)
+case TEXT_TRANSFORM_TYPE::TO_LOWER:
{
-CellType eType;
-rDoc.GetCellType(mnCol, nRow, 0, eType);
-if (eType == CELLTYPE_STRING)
+for (SCROW nRow = 0; nRow <= nEndRow; ++nRow)
{
-OUString aStr = rDoc.GetString(mnCol, nRow, 0);
-rDoc.SetString(mnCol, nRow, 0,
ScGlobal::pCharClass->lowercase(aStr));
+CellType
[Libreoffice-commits] core.git: sc/inc sc/Library_sc.mk sc/qa sc/source
sc/Library_sc.mk |1
sc/inc/datamapper.hxx |6 +
sc/qa/unit/data/dataprovider/xml/test1.xml| 19 +++
sc/qa/unit/dataproviders_test.cxx | 44
sc/source/ui/dataprovider/dataprovider.cxx| 16 +++
sc/source/ui/dataprovider/xmldataprovider.cxx | 128 ++
sc/source/ui/dataprovider/xmldataprovider.hxx | 41
7 files changed, 255 insertions(+)
New commits:
commit e300efd3a029672e24114914355c5c690fb725d5
Author: Vikas Mahato
Date: Sun Jun 24 20:53:01 2018 +0530
Added XML data provider
Change-Id: Ib5727912977eb79cdf1f84bf874919beafc693eb
Reviewed-on: https://gerrit.libreoffice.org/56356
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 2f4f06b6ea25..5425d681caab 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -399,6 +399,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/dataprovider/dataprovider \
sc/source/ui/dataprovider/datatransformation \
sc/source/ui/dataprovider/htmldataprovider \
+sc/source/ui/dataprovider/xmldataprovider \
sc/source/ui/dbgui/asciiopt \
sc/source/ui/dbgui/consdlg \
sc/source/ui/dbgui/csvcontrol \
diff --git a/sc/inc/datamapper.hxx b/sc/inc/datamapper.hxx
index 1d7e710051c0..9c59a7461b82 100644
--- a/sc/inc/datamapper.hxx
+++ b/sc/inc/datamapper.hxx
@@ -16,6 +16,8 @@
#include
+#include "orcusxml.hxx"
+
class ScDocument;
class ScDBData;
@@ -62,6 +64,8 @@ private:
*/
OUString maID;
+ScOrcusImportXMLParam maParam;
+
double mnUpdateFrequency;
std::shared_ptr mpDataProvider;
@@ -83,10 +87,12 @@ public:
void setID(const OUString& rID);
void setURL(const OUString& rURL);
void setProvider(const OUString& rProvider);
+void setXMLImportParam(const ScOrcusImportXMLParam& rParam);
const OUString& getURL() const;
const OUString& getProvider() const;
const OUString& getID() const;
+const ScOrcusImportXMLParam& getXMLImportParam() const;
double getUpdateFrequency() const;
OUString getDBName() const;
void setDBData(const OUString& rDBName);
diff --git a/sc/qa/unit/data/dataprovider/xml/test1.xml
b/sc/qa/unit/data/dataprovider/xml/test1.xml
new file mode 100644
index ..03ba28288825
--- /dev/null
+++ b/sc/qa/unit/data/dataprovider/xml/test1.xml
@@ -0,0 +1,19 @@
+
+
+
+1
+test1
+
+
+2
+test2
+
+
+3
+test3
+
+
+4
+test4
+
+
\ No newline at end of file
diff --git a/sc/qa/unit/dataproviders_test.cxx
b/sc/qa/unit/dataproviders_test.cxx
index 1960fa59eecf..aef3ec6abb05 100644
--- a/sc/qa/unit/dataproviders_test.cxx
+++ b/sc/qa/unit/dataproviders_test.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
@@ -29,11 +30,13 @@ public:
void testCSVImport();
void testDataLargerThanDB();
void testHTMLImport();
+void testXMLImport();
CPPUNIT_TEST_SUITE(ScDataProvidersTest);
CPPUNIT_TEST(testCSVImport);
CPPUNIT_TEST(testDataLargerThanDB);
CPPUNIT_TEST(testHTMLImport);
+CPPUNIT_TEST(testXMLImport);
CPPUNIT_TEST_SUITE_END();
private:
@@ -137,6 +140,47 @@ void ScDataProvidersTest::testHTMLImport()
}
}
+void ScDataProvidersTest::testXMLImport()
+{
+ScDBData* pDBData = new ScDBData("testDB", 0, 0, 0, 10, 10);
+bool bInserted = m_pDoc->GetDBCollection()->getNamedDBs().insert(pDBData);
+CPPUNIT_ASSERT(bInserted);
+
+OUString aFileURL;
+ScOrcusImportXMLParam aParam;
+
+ScOrcusImportXMLParam::RangeLink aRangeLink;
+aRangeLink.maPos = ScAddress(0,0,0);
+aRangeLink.maFieldPaths.push_back("/bookstore/book/title");
+aRangeLink.maFieldPaths.push_back("/bookstore/book/author");
+aParam.maRangeLinks.push_back(aRangeLink);
+
+createFileURL("test1.", "xml", aFileURL);
+sc::ExternalDataSource aDataSource(aFileURL, "org.libreoffice.calc.xml",
m_pDoc);
+aDataSource.setDBData("testDB");
+aDataSource.setXMLImportParam(aParam);
+
+
+m_pDoc->GetExternalDataMapper().insertDataSource(aDataSource);
+auto& rDataSources = m_pDoc->GetExternalDataMapper().getDataSources();
+CPPUNIT_ASSERT(!rDataSources.empty());
+
+rDataSources[0].refresh(m_pDoc, true);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(OUString("title"), m_pDoc->GetString(0, 0, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("author"), m_pDoc->GetString(1, 0, 0));
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(0, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("test1"), m_pDoc->GetString(1, 1, 0));
+CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(0, 2, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("test2"), m_pDoc->GetString(1, 2, 0));
+CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(0, 3, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("test3"), m_pDoc->GetString(1, 3, 0));
+CPPUNIT_ASSERT_EQUAL(4.0, m_pDoc
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/core/tool/interpr1.cxx | 36 +++-
1 file changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 8f3515b5e54dabb08ddb01253d9503e9c16cfebe
Author: Eike Rathke
Date: Sat Jul 7 23:00:50 2018 +0200
Resolves: tdf#118561 handle external references as jump matrix result
Change-Id: I0381179347960293f5d470ed231d626cb6707b5a
Reviewed-on: https://gerrit.libreoffice.org/57144
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit a5b9bb7be70c7aec2388199e68a0cf86dd220955)
Reviewed-on: https://gerrit.libreoffice.org/57148
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 49c7d009f05a..cb0ac61a3cc6 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -714,10 +714,44 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
}
}
break;
+case svExternalSingleRef:
+{
+ScExternalRefCache::TokenRef pToken;
+PopExternalSingleRef(pToken);
+if (nGlobalError != FormulaError::NONE)
+{
+pJumpMatrix->PutResultDouble( CreateDoubleError(
nGlobalError), nC, nR );
+nGlobalError = FormulaError::NONE;
+}
+else
+{
+switch (pToken->GetType())
+{
+case svDouble:
+pJumpMatrix->PutResultDouble(
pToken->GetDouble(), nC, nR );
+break;
+case svString:
+pJumpMatrix->PutResultString(
pToken->GetString(), nC, nR );
+break;
+case svEmptyCell:
+pJumpMatrix->PutResultEmpty( nC, nR );
+break;
+default:
+// svError was already handled (set by
+// PopExternalSingleRef()) with nGlobalError
+// above.
+assert(!"unhandled svExternalSingleRef case");
+pJumpMatrix->PutResultDouble(
CreateDoubleError(
+
FormulaError::UnknownStackVariable), nC, nR );
+}
+}
+}
+break;
+case svExternalDoubleRef:
case svMatrix:
{ // match matrix offsets
double fVal;
-ScMatrixRef pMat = PopMatrix();
+ScMatrixRef pMat = GetMatrix();
if ( nGlobalError != FormulaError::NONE )
{
fVal = CreateDoubleError( nGlobalError );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source
sc/source/ui/undo/undotab.cxx |2 ++
sc/source/ui/view/viewfunc.cxx | 13 +
2 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit dc9c326c378f252df83aa90a61df51a60d574c8c
Author: Eike Rathke
Date: Fri Jul 6 20:09:55 2018 +0200
tdf#118547: Remove lock mark only if password is correct, tdf#95880
follow-up
This is a combination of 3 commits.
tdf#118547: Remove lock mark only if password is correct
Reviewed-on: https://gerrit.libreoffice.org/57044
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit c3a732a11c320b98e31dad79f421d4d73f33a15b)
Related: tdf#118547 handle multi-sheet un-/protect, tdf#95880 follow-up
Also don't attempt to remove a lock for TABLEID_DOC that is not a
sheet.
Reviewed-on: https://gerrit.libreoffice.org/57060
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 7eba8e98508d547f43fecbe3175a11a05956b30a)
Handle protection lock mark in Undo/Redo, tdf#68290 follow-up
Reviewed-on: https://gerrit.libreoffice.org/57063
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 6fb449d127d1da165f610c4c99c2c7d9c5afbb97)
Change-Id: I9f5731dfaaf9b4cc67e600a8b1c01709e7c9ba99
28775a068215a59063ed95fd141e125cf2155aa7
c88cb375f9f6030c9268fca84de7a5434bb82dc1
Reviewed-on: https://gerrit.libreoffice.org/57091
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index db0c34d0568c..f8bd5dc6940b 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -1254,6 +1254,8 @@ void ScUndoTabProtect::DoProtect(bool bProtect)
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
{
+if (ScTabView* pTabView = pViewShell->GetViewData().GetView())
+pTabView->SetTabProtectionSymbol( mnTab, bProtect);
pViewShell->UpdateLayerLocks();
pViewShell->UpdateInputHandler(true); // so that input can be
immediately entered again
}
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 27e9ad05d738..3f6e583c6f60 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2489,12 +2489,14 @@ void ScViewFunc::ProtectSheet( SCTAB nTab, const
ScTableProtection& rProtect )
ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
for (; itr != itrEnd; ++itr)
+{
rFunc.ProtectSheet(*itr, rProtect);
+SetTabProtectionSymbol(*itr, true);
+}
if (bUndo)
pDocSh->GetUndoManager()->LeaveListAction();
-SetTabProtectionSymbol(nTab, true);
UpdateLayerLocks(); //! broadcast to all views
}
@@ -2552,15 +2554,18 @@ bool ScViewFunc::Unprotect( SCTAB nTab, const OUString&
rPassword )
ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
for (; itr != itrEnd; ++itr)
+{
if ( rFunc.Unprotect( *itr, rPassword, false ) )
-bChanged = true;
+{
+bChanged = true;
+SetTabProtectionSymbol( *itr, false);
+}
+}
if (bUndo)
pDocSh->GetUndoManager()->LeaveListAction();
}
-SetTabProtectionSymbol(nTab, false);
-
if (bChanged)
UpdateLayerLocks(); //! broadcast to all views
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/datatransformation_test.cxx | 213
sc/source/ui/dataprovider/datatransformation.cxx | 236 +++
sc/source/ui/inc/datatransformation.hxx | 19 +
3 files changed, 467 insertions(+), 1 deletion(-)
New commits:
commit 510073cf047101cf6297fcec2ad8296f9e63c486
Author: Vikas
Date: Tue Jul 3 11:47:14 2018 +0530
Added number transformations for external data
- Round allows you to round the numbers in the column up to a given number
of decimal places
- Round Up rounds the numbers in the column up to the nearest whole number
- Round Down rounds the numbers in the column down to the nearest whole
number
- Absolute Value returns the absolute value of the numbers in the column
- Logarithm
- Natural returns the natural logarithm
- Base-10 returns the base-10 logarithm
- Cube returns the cube of the numbers
- Square returns the square of the numbers
- Square Root returns the square root of the numbers
- Is Even returns TRUE if the values in the column are eve
- Is Odd returns TRUE if the values in the column are odd
- Sign returns 1 if the values in the column are positive, -1 if they are
negative, and 0 otherwise.
Change-Id: I7458d0d61da3749fe497b3999449373234391b04
Reviewed-on: https://gerrit.libreoffice.org/56886
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/qa/unit/datatransformation_test.cxx
b/sc/qa/unit/datatransformation_test.cxx
index c011941a6cb7..3546104fdbee 100644
--- a/sc/qa/unit/datatransformation_test.cxx
+++ b/sc/qa/unit/datatransformation_test.cxx
@@ -39,6 +39,18 @@ public:
void testAggregateAverage();
void testAggregateMin();
void testAggregateMax();
+void testNumberRound();
+void testNumberRoundUp();
+void testNumberRoundDown();
+void testNumberAbsolute();
+void testNumberLogE();
+void testNumberLog10();
+void testNumberCube();
+void testNumberSquare();
+void testNumberSquareRoot();
+void testNumberEven();
+void testNumberOdd();
+void testNumberSign();
CPPUNIT_TEST_SUITE(ScDataTransformationTest);
CPPUNIT_TEST(testColumnRemove);
@@ -52,6 +64,18 @@ public:
CPPUNIT_TEST(testAggregateAverage);
CPPUNIT_TEST(testAggregateMin);
CPPUNIT_TEST(testAggregateMax);
+CPPUNIT_TEST(testNumberRound);
+CPPUNIT_TEST(testNumberRoundUp);
+CPPUNIT_TEST(testNumberRoundDown);
+CPPUNIT_TEST(testNumberAbsolute);
+CPPUNIT_TEST(testNumberLogE);
+CPPUNIT_TEST(testNumberLog10);
+CPPUNIT_TEST(testNumberCube);
+CPPUNIT_TEST(testNumberSquare);
+CPPUNIT_TEST(testNumberSquareRoot);
+CPPUNIT_TEST(testNumberEven);
+CPPUNIT_TEST(testNumberOdd);
+CPPUNIT_TEST(testNumberSign);
CPPUNIT_TEST_SUITE_END();
private:
@@ -272,6 +296,195 @@ void ScDataTransformationTest::testAggregateMax()
CPPUNIT_ASSERT_DOUBLES_EQUAL(2034, m_pDoc->GetValue(3, 4, 0), 1e-10);
}
+void ScDataTransformationTest::testNumberRound()
+{
+m_pDoc->SetValue(2, 0, 0, 2034.342453456);
+m_pDoc->SetValue(2, 1, 0, 2342.252678567542);
+m_pDoc->SetValue(2, 2, 0, 57453.651345687654345676);
+m_pDoc->SetValue(2, 3, 0, -453.22234567543);
+
+sc::NumberTransformation aTransform(2, sc::NUMBER_TRANSFORM_TYPE::ROUND,
4);
+aTransform.Transform(*m_pDoc);
+
+CPPUNIT_ASSERT_EQUAL(2034.3425, m_pDoc->GetValue(2, 0, 0));
+CPPUNIT_ASSERT_EQUAL(2342.2527, m_pDoc->GetValue(2, 1, 0));
+CPPUNIT_ASSERT_EQUAL(57453.6513, m_pDoc->GetValue(2, 2, 0));
+CPPUNIT_ASSERT_EQUAL(-453.2223, m_pDoc->GetValue(2, 3, 0));
+}
+
+void ScDataTransformationTest::testNumberRoundUp()
+{
+m_pDoc->SetValue(2, 0, 0, 2034.34);
+m_pDoc->SetValue(2, 1, 0, 2342.22);
+m_pDoc->SetValue(2, 2, 0, 57453.65);
+m_pDoc->SetValue(2, 3, 0, -453.22);
+
+sc::NumberTransformation aTransform(2,
sc::NUMBER_TRANSFORM_TYPE::ROUND_UP);
+aTransform.Transform(*m_pDoc);
+
+CPPUNIT_ASSERT_EQUAL(2035.0, m_pDoc->GetValue(2, 0, 0));
+CPPUNIT_ASSERT_EQUAL(2343.0, m_pDoc->GetValue(2, 1, 0));
+CPPUNIT_ASSERT_EQUAL(57454.0, m_pDoc->GetValue(2, 2, 0));
+CPPUNIT_ASSERT_EQUAL(-453.0, m_pDoc->GetValue(2, 3, 0));
+}
+
+void ScDataTransformationTest::testNumberRoundDown()
+{
+m_pDoc->SetValue(2, 0, 0, 2034.34);
+m_pDoc->SetValue(2, 1, 0, 2342.22);
+m_pDoc->SetValue(2, 2, 0, 57453.65);
+m_pDoc->SetValue(2, 3, 0, -453.22);
+
+sc::NumberTransformation aTransform(2,
sc::NUMBER_TRANSFORM_TYPE::ROUND_DOWN);
+aTransform.Transform(*m_pDoc);
+
+CPPUNIT_ASSERT_EQUAL(2034.0, m_pDoc->GetValue(2, 0, 0));
+CPPUNIT_ASSERT_EQUAL(2342.0, m_pDoc->GetValue(2, 1, 0));
+CPPUNIT_ASSERT_EQUAL(57453.0, m_pDoc->GetValue(2, 2, 0));
+CPPUNIT_ASSERT_EQUAL(-454.0, m_pDoc->GetValue(2, 3, 0));
+}
+
+void ScDataTransformationTest::testNumberAbsolute()
+{
+m_pDoc->SetValue(2, 0, 0, 2034.34);
+m_pDoc->SetValue(2
Is there someone who successfully make their own build of LibreOffice with Visual Studio 15.8.0 Preview 3.0 ?
Is there someone who successfully make their own build of LibreOffice
with Visual Studio 15.8.0 Preview 3.0 ?
by asking this question, I'm trying to be sure that the error was not my
fault.
I get the following error
C:/build/workdir/UnpackedTarball/libmwaw/src/lib/ClarisDrawText.cxx(58):
fatal error C1075: '{': no matching token found
even after adding seekpos as follows
https://developercommunity.visualstudio.com/content/problem/282567/member-seekpos-in-class-fpos-is-missing.html
If I remember what I have done myself correctly, I haven't changed any
parts of sourcecode of libmwaw since I successfully made my own build in
June with previous version of Visual Studio.
---
himajin10
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source
sc/source/core/tool/interpr1.cxx | 36 +++-
1 file changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 57e908136f4b7135e6c4a35a81e45c47f9f1b548
Author: Eike Rathke
Date: Sat Jul 7 23:00:50 2018 +0200
Resolves: tdf#118561 handle external references as jump matrix result
Change-Id: I0381179347960293f5d470ed231d626cb6707b5a
Reviewed-on: https://gerrit.libreoffice.org/57144
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit a5b9bb7be70c7aec2388199e68a0cf86dd220955)
Reviewed-on: https://gerrit.libreoffice.org/57147
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index dd1aaca90d53..33cd8c3f840e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -713,10 +713,44 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
}
}
break;
+case svExternalSingleRef:
+{
+ScExternalRefCache::TokenRef pToken;
+PopExternalSingleRef(pToken);
+if (nGlobalError != FormulaError::NONE)
+{
+pJumpMatrix->PutResultDouble( CreateDoubleError(
nGlobalError), nC, nR );
+nGlobalError = FormulaError::NONE;
+}
+else
+{
+switch (pToken->GetType())
+{
+case svDouble:
+pJumpMatrix->PutResultDouble(
pToken->GetDouble(), nC, nR );
+break;
+case svString:
+pJumpMatrix->PutResultString(
pToken->GetString(), nC, nR );
+break;
+case svEmptyCell:
+pJumpMatrix->PutResultEmpty( nC, nR );
+break;
+default:
+// svError was already handled (set by
+// PopExternalSingleRef()) with nGlobalError
+// above.
+assert(!"unhandled svExternalSingleRef case");
+pJumpMatrix->PutResultDouble(
CreateDoubleError(
+
FormulaError::UnknownStackVariable), nC, nR );
+}
+}
+}
+break;
+case svExternalDoubleRef:
case svMatrix:
{ // match matrix offsets
double fVal;
-ScMatrixRef pMat = PopMatrix();
+ScMatrixRef pMat = GetMatrix();
if ( nGlobalError != FormulaError::NONE )
{
fVal = CreateDoubleError( nGlobalError );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source sc/uiconfig
sc/qa/uitest/statistics/data/regression.ods |binary
sc/source/ui/StatisticsDialogs/RegressionDialog.cxx |2 +-
sc/uiconfig/scalc/ui/regressiondialog.ui|9 -
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 187af5be47db42e2f4ab94319f932b847f897ce2
Author: Dennis Francis
Date: Sun Jul 8 11:12:14 2018 +0530
tdf#118556 : Respect locale specific decimal separator...
in Regression dialog box's confidence-level entry.
Do not write floating-point numbers to cells as strings using
OUString::number() converter if the cell is supposed to be a
numeric one.
This also amends the uitest document such that the "expected"
confidence level cell is numeric and not string.
Thanks to Julien Nabet for pointing me to
the specific issue.
Change-Id: I7d12674bf69fc53348366a03b7e6ff0af9588511
Reviewed-on: https://gerrit.libreoffice.org/57151
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/sc/qa/uitest/statistics/data/regression.ods
b/sc/qa/uitest/statistics/data/regression.ods
index e38d0a7ab26b..f9f65bfda0f5 100644
Binary files a/sc/qa/uitest/statistics/data/regression.ods and
b/sc/qa/uitest/statistics/data/regression.ods differ
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 086ef9b451cd..b3e744cdf71d 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -513,7 +513,7 @@ void
ScRegressionDialog::WriteRegressionANOVAResults(AddressWalkerWriter& rOutpu
rOutput.newLine();
rOutput.writeString(ScResId(STR_LABEL_CONFIDENCE_LEVEL));
rOutput.nextColumn();
-rOutput.writeString(OUString::number(mpConfidenceLevelField->GetValue() /
100.0));
+rOutput.writeValue(mpConfidenceLevelField->GetValue() / 100.0);
rTemplate.autoReplaceAddress("%CONFIDENCE_LEVEL_ADDR%", rOutput.current());
rOutput.newLine();
}
diff --git a/sc/uiconfig/scalc/ui/regressiondialog.ui
b/sc/uiconfig/scalc/ui/regressiondialog.ui
index 4ef37adfafdd..faa4aa307cfd 100644
--- a/sc/uiconfig/scalc/ui/regressiondialog.ui
+++ b/sc/uiconfig/scalc/ui/regressiondialog.ui
@@ -3,6 +3,12 @@
+
+1
+0.94996
+0.01
+0.10001
+
False
6
@@ -466,7 +472,8 @@
True
start
center
-0.95
+0,95
+confidencelevel-adjustment
2
True
0.94996
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/sdi
sw/sdi/swriter.sdi |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit eedeeb63d1287ed0416e1fe3d2f7ba37632626d0 Author: Xisco Fauli Date: Sat Jul 7 00:39:38 2018 +0200 tdf#89893: Enable previous/next track changes in read-only mode Change-Id: Ie7dd41b2f79347e9b959a73d5915379f2e2a Reviewed-on: https://gerrit.libreoffice.org/57100 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 058fc4bc09f6..19aa9dfeae05 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -7263,7 +7263,7 @@ SfxVoidItem NextTrackedChange FN_REDLINE_NEXT_CHANGE [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = FALSE, +ReadOnlyDoc = TRUE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -7281,7 +7281,7 @@ SfxVoidItem PreviousTrackedChange FN_REDLINE_PREV_CHANGE [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = FALSE, +ReadOnlyDoc = TRUE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/settings.cxx | 253 +++-
1 file changed, 88 insertions(+), 165 deletions(-)
New commits:
commit ce2a2c6cdf36d21dd208c3f2f4907de483ce6fd3
Author: Jochen Nitschke
Date: Sat Jul 7 15:05:34 2018 +0200
cppcheck: useInitializationList in settings.cxx
and remove some default-able constructors
Change-Id: I3ff5cb9d68143bb13a362383255da98f7bf6bd86
Reviewed-on: https://gerrit.libreoffice.org/57135
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 92904ec759d6..a000b065092d 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -59,26 +59,23 @@ using namespace ::com::sun::star;
struct ImplMouseData
{
-ImplMouseData();
-ImplMouseData( const ImplMouseData& rData
);
-
-MouseSettingsOptionsmnOptions;
-sal_uInt64 mnDoubleClkTime;
-longmnDoubleClkWidth;
-longmnDoubleClkHeight;
-longmnStartDragWidth;
-longmnStartDragHeight;
-sal_uInt16 mnStartDragCode;
-sal_uInt16 mnContextMenuCode;
-sal_uInt16 mnContextMenuClicks;
-sal_uLong mnScrollRepeat;
-sal_uLong mnButtonStartRepeat;
-sal_uLong mnButtonRepeat;
-sal_uLong mnActionDelay;
-sal_uLong mnMenuDelay;
-MouseFollowFlagsmnFollow;
-MouseMiddleButtonAction mnMiddleButtonAction;
-MouseWheelBehaviour mnWheelBehavior;
+MouseSettingsOptionsmnOptions =
MouseSettingsOptions::NONE;
+sal_uInt64 mnDoubleClkTime = 500;
+longmnDoubleClkWidth= 2;
+longmnDoubleClkHeight = 2;
+longmnStartDragWidth= 2 ;
+longmnStartDragHeight = 2;
+sal_uInt16 mnStartDragCode = MOUSE_LEFT;
+sal_uInt16 mnContextMenuCode = MOUSE_RIGHT;
+sal_uInt16 mnContextMenuClicks = 1;
+sal_uLong mnScrollRepeat = 100;
+sal_uLong mnButtonStartRepeat = 370;
+sal_uLong mnButtonRepeat = 90;
+sal_uLong mnActionDelay = 250;
+sal_uLong mnMenuDelay = 150;
+MouseFollowFlagsmnFollow=
MouseFollowFlags::Menu | MouseFollowFlags::DDList;
+MouseMiddleButtonAction mnMiddleButtonAction=
MouseMiddleButtonAction::AutoScroll;
+MouseWheelBehaviour mnWheelBehavior =
MouseWheelBehaviour::ALWAYS;
};
struct ImplStyleData
@@ -213,7 +210,6 @@ struct ImplStyleData
struct ImplMiscData
{
ImplMiscData();
-ImplMiscData( const ImplMiscData& rData );
TriStatemnEnableATT;
boolmbEnableLocalizedDecimalSep;
TriStatemnDisablePrinting;
@@ -222,12 +218,9 @@ struct ImplMiscData
struct ImplHelpData
{
-ImplHelpData();
-ImplHelpData( const ImplHelpData& rData );
-
-sal_uLong mnTipDelay;
-sal_uLong mnTipTimeout;
-sal_uLong mnBalloonDelay;
+sal_uLong mnTipDelay = 500;
+sal_uLong mnTipTimeout = 3000;
+sal_uLong mnBalloonDelay = 1500;
};
struct ImplAllSettingsData
@@ -250,48 +243,6 @@ struct ImplAllSettingsData
SvtSysLocalemaSysLocale;
};
-ImplMouseData::ImplMouseData()
-{
-mnOptions = MouseSettingsOptions::NONE;
-mnDoubleClkTime = 500;
-mnDoubleClkWidth= 2;
-mnDoubleClkHeight = 2;
-mnStartDragWidth= 2;
-mnStartDragHeight = 2;
-mnStartDragCode = MOUSE_LEFT;
-mnContextMenuCode = MOUSE_RIGHT;
-mnContextMenuClicks = 1;
-mnMiddleButtonAction= MouseMiddleButtonAction::AutoScroll;
-mnScrollRepeat = 100;
-mnButtonStartRepeat = 370;
-mnButtonRepeat = 90;
-mnActionDelay = 250;
-mnMenuDelay = 150;
-mnFollow= MouseFollowFlags::Menu |
MouseFollowFlags::DDList;
-mnWheelBehavior = MouseWheelBehaviour::ALWAYS;
-}
-
-ImplMouseData::ImplMouseData( const ImplMous
[Libreoffice-commits] core.git: canvas/source io/test package/source sal/qa sw/source testtools/source vcl/unx vcl/workben
canvas/source/directx/dx_9rm.cxx |7 ++-
io/test/stm/pumptest.cxx |5 ++---
io/test/testconnection.cxx|6 ++
package/source/zipapi/ZipOutputStream.cxx |3 +--
sal/qa/osl/mutex/osl_Mutex.cxx|5 +
sal/qa/osl/pipe/osl_Pipe.cxx |5 +
sal/qa/osl/process/osl_Thread.cxx |9 +
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 10 +-
sw/source/core/docnode/finalthreadmanager.cxx | 10 ++
testtools/source/bridgetest/cppobj.cxx|7 ++-
testtools/source/performance/ubtest.cxx |6 ++
vcl/unx/generic/dtrans/X11_selection.cxx | 11 ++-
vcl/workben/vcldemo.cxx | 19 ---
13 files changed, 27 insertions(+), 76 deletions(-)
New commits:
commit d0f44d8ba7e87aa263008d3cfc4e68294d783162
Author: Kevin Dubrulle
Date: Sat Jul 7 13:34:20 2018 +0200
tdf#84323 - sal - add sane sleep interface: cleanup osl_waitThread
Replace osl_waitThread by osl::Thread::wait.
Use std::chrono instead of TimeValue.
Change-Id: I71691d014feeeb0c5d0ba29d048bda8e25e6e7dd
Reviewed-on: https://gerrit.libreoffice.org/57130
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 3cc7fd5437a3..55165bbcedcc 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -27,7 +27,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -880,10 +880,7 @@ namespace dxcanvas
return true;
}
-TimeValue aTimeout;
-aTimeout.Seconds=1;
-aTimeout.Nanosec=0;
-osl_waitThread(&aTimeout);
+osl::Thread::wait(std::chrono::seconds(1));
}
while(hr == D3DERR_DEVICELOST);
diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx
index 8077760a351f..d337bc21a81a 100644
--- a/io/test/stm/pumptest.cxx
+++ b/io/test/stm/pumptest.cxx
@@ -35,7 +35,7 @@
#include
#include
#include
-#include
+#include
#include
@@ -50,8 +50,7 @@ using namespace ::com::sun::star::test;
static void mywait()
{
-TimeValue a = { 0, 1 };
-osl_waitThread( &a );
+osl::Thread::wait(std::chrono::microseconds(10));
osl_yieldThread();
osl_yieldThread();
}
diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx
index 69a2bdeccfb8..68621643f0ec 100644
--- a/io/test/testconnection.cxx
+++ b/io/test/testconnection.cxx
@@ -127,8 +127,7 @@ void testConnection( const OUString &sConnectionDescription
,
try
{
// Why is this wait necessary
-TimeValue value = {1,0};
-osl_waitThread( &value );
+osl::Thread::wait(std::chrono::seconds(1));
r = rConnector->connect( sConnectionDescription );
OSL_ASSERT( r.is() );
doWrite( r );
@@ -238,8 +237,7 @@ int SAL_CALL main( int argc, char * argv[] )
MyThread thread( rAcceptor , OUString("socket,host=localhost,port=2001") );
thread.create();
-TimeValue value = {0,1};
-osl_waitThread( &value );
+osl::Thread::wait(std::chrono::nanoseconds(1));
try
{
rAcceptor->accept( OUString("socket,host=localhost,port=2001") );
diff --git a/package/source/zipapi/ZipOutputStream.cxx
b/package/source/zipapi/ZipOutputStream.cxx
index 94f8d024dd7c..c15fdaee48ef 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -154,8 +154,7 @@ void
ZipOutputStream::reduceScheduledThreadsToGivenNumberOrLess(sal_Int32 nThrea
if(static_cast< sal_Int32 >(m_aEntries.size()) > nThreads)
{
-const TimeValue aTimeValue(0, 10);
-osl_waitThread(&aTimeValue);
+osl::Thread::wait(std::chrono::microseconds(100));
}
}
}
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 90f5b31e2c79..c9959038c5ea 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -34,10 +34,7 @@ namespace ThreadHelper
{
void thread_sleep_tenth_sec(sal_uInt32 _nTenthSec)
{
-TimeValue nTV;
-nTV.Seconds = _nTenthSec/10;
-nTV.Nanosec = ( (_nTenthSec%10 ) * 1 );
-osl_waitThread(&nTV);
+osl::Thread::wait(std::chrono::milliseconds(_nTenthSec * 100));
}
void thread_sleep( sal_uInt32 _nSec )
{
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index ea29fdd7c742..dbd224e50da5 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -743,10 +743,7 @@ namespace osl_StreamPipe
/// print statement in t
[Libreoffice-commits] core.git: include/sax sax/source writerfilter/source
include/sax/fastattribs.hxx| 11 +
sax/source/fastparser/fastparser.cxx | 13 ++-
sax/source/tools/fastattribs.cxx | 18 +++-
writerfilter/source/ooxml/OOXMLFactory.cxx | 32 +++--
4 files changed, 48 insertions(+), 26 deletions(-)
New commits:
commit a2193f8f33565cc896592acb9d3ab65c756d97fb
Author: Noel Grandin
Date: Thu Jul 5 12:33:51 2018 +0200
tdf#79878 perf loading docx file, sax improvements
these are the smaller improvements, they make about 5% worth of
difference
- use std::vector instead of std::deque
- use std::move on pendingCharacters instead of copying
- in FastAttributeList::add, when reallocate the buffer, allocate twice
the existing size, instead of increasing to only what we need
- in FastAttributeList, create getAttributeIndex and friends, so
we can avoid iterating the attribute list more often than necessary
Change-Id: I3e3380ea50b77c6845b66e83404e245778ec06eb
Reviewed-on: https://gerrit.libreoffice.org/57021
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index b5fbe225ee28..029f3a12f780 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -93,6 +93,9 @@ public:
bool getAsInteger( sal_Int32 nToken, sal_Int32 &rInt) const;
bool getAsDouble( sal_Int32 nToken, double &rDouble) const;
bool getAsChar( sal_Int32 nToken, const char*& rPos ) const;
+sal_Int32 getAsIntegerByIndex( sal_Int32 nTokenIndex ) const;
+const char* getAsCharByIndex( sal_Int32 nTokenIndex ) const;
+OUString getValueByIndex( sal_Int32 nTokenIndex ) const;
// XFastAttributeList
virtual sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) override;
@@ -103,6 +106,14 @@ public:
virtual css::uno::Sequence< css::xml::Attribute > SAL_CALL
getUnknownAttributes( ) override;
virtual css::uno::Sequence< css::xml::FastAttribute > SAL_CALL
getFastAttributes() override;
+sal_Int32 getAttributeIndex( ::sal_Int32 Token )
+{
+for (size_t i=0; i& xAttrList )
{
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 2765584a08fc..9477559c12e8 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -178,13 +178,13 @@ struct Entity : public ParserData
void throwException( const ::rtl::Reference< FastLocatorImpl >
&xDocumentLocator,
bool mbDuringParse );
-std::stack< NameWithToken > maNamespaceStack;
+std::stack< NameWithToken, std::vector > maNamespaceStack;
/* Context for main thread consuming events.
* startElement() stores the data, which characters() and endElement() uses
*/
-std::stack< SaxContext> maContextStack;
+std::stack< SaxContext, std::vector > maContextStack;
// Determines which elements of maNamespaceDefines are valid in current
context
-std::stack< sal_uInt32 > maNamespaceCount;
+std::stack< sal_uInt32, std::vector > maNamespaceCount;
std::vector< std::shared_ptr< NamespaceDefine > >
maNamespaceDefines;
@@ -270,7 +270,7 @@ private:
ParserData maData; /// Cached parser configuration
for next call of parseStream().
Entity *mpTop; /// std::stack::top() is amazingly
slow => cache this.
-std::stack< Entity > maEntities; /// Entity stack for each call of
parseStream().
+std::stack< Entity > maEntities;/// Entity stack for each call of
parseStream().
OUString pendingCharacters; /// Data from characters()
callback that needs to be sent.
};
@@ -674,11 +674,12 @@ sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const
xmlChar* pPrefix, int nPr
sal_uInt32 nNamespace = rEntity.maNamespaceCount.top();
while( nNamespace-- )
{
-const OString& rPrefix(
rEntity.maNamespaceDefines[nNamespace]->maPrefix );
+const auto & rNamespaceDefine = rEntity.maNamespaceDefines[nNamespace];
+const OString& rPrefix( rNamespaceDefine->maPrefix );
if( (rPrefix.getLength() == nPrefixLen) &&
(strncmp( rPrefix.getStr(), XML_CAST( pPrefix ), nPrefixLen ) == 0
) )
{
-nNamespaceToken = rEntity.maNamespaceDefines[nNamespace]->mnToken;
+nNamespaceToken = rNamespaceDefine->mnToken;
break;
}
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index a9f0baf7a2c0..30a764368947 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -86,7 +86,7 @@ void FastAttributeList::add( sal_Int32 nToken, const
sal_Char* pValue, size_t nV
maAttributeValues.push_back( maAttributeValues.back() + nValueLength + 1 );
if (maAt
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
include/test/sheet/xsheetcellcursor.hxx | 39 +
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |6
qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java| 340
--
sc/qa/extras/sccellcursorobj.cxx| 15
test/Library_subsequenttest.mk |5
test/source/sheet/xsheetcellcursor.cxx | 138
7 files changed, 195 insertions(+), 349 deletions(-)
New commits:
commit 8164399df0df976784ddc1a76b46939c53ae51ee
Author: Jens Carl
Date: Wed Nov 22 03:46:59 2017 +
tdf#45904 Move _XSheetCellCursor Java tests to C++
Change-Id: I9d12f9a13d3e0c59b7a28ff91563878efde22b68
Reviewed-on: https://gerrit.libreoffice.org/45067
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/sheet/xsheetcellcursor.hxx
b/include/test/sheet/xsheetcellcursor.hxx
new file mode 100644
index ..3686ac521f5e
--- /dev/null
+++ b/include/test/sheet/xsheetcellcursor.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XSHEETCELLCURSOR_HXX
+#define INCLUDED_TEST_SHEET_XSHEETCELLCURSOR_HXX
+
+#include
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XSheetCellCursor
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testCollapseToCurrentArray();
+void testCollapseToCurrentRegion();
+void testCollapseToMergedArea();
+void testCollapseToSize();
+void testExpandToEntireColumns();
+void testExpandToEntireRows();
+
+protected:
+~XSheetCellCursor() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XSHEETCELLCURSOR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 5d1291937bdb..57b0dbf6e34b 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -568,7 +568,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery \
qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster \
qadevOOo/tests/java/ifc/sheet/_XRangeSelection \
-qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
qadevOOo/tests/java/ifc/style/_CharacterProperties \
qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \
qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index 2e0517525f23..1a7e1096bf15 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -194,12 +194,6 @@
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"setRowDescriptions()"
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"getColumnDescriptions()"
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"setColumnDescriptions()"
-"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToCurrentRegion()"
-"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToCurrentArray()"
-"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToMergedArea()"
-"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"expandToEntireColumns()"
-"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"expandToEntireRows()"
-"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToSize()"
"ScCellCursorObj";"com::sun::star::util::XModifyBroadcaster#optional";"addModifyListener()"
"ScCellCursorObj";"com::sun::star::util::XModifyBroadcaster#optional";"removeModifyListener()"
"ScCellCursorObj";"com::sun::star::util::XImportable";"createImportDescriptor()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java
b/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java
deleted file mode 100644
index a1015a64475a..
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE
[Libreoffice-commits] core.git: dbaccess/source framework/source offapi/com qadevOOo/runner ridljar/com sc/source svtools/source sw/source vcl/source
dbaccess/source/filter/hsqldb/fbcreateparser.cxx |2 +-
framework/source/dispatch/closedispatcher.cxx|2 +-
framework/source/jobs/jobdata.cxx|6 +++---
framework/source/services/pathsettings.cxx |2 +-
offapi/com/sun/star/document/FilterFactory.idl |2 +-
offapi/com/sun/star/util/XStringSubstitution.idl |6 +++---
qadevOOo/runner/lib/TestCase.java|2 +-
ridljar/com/sun/star/uno/UnoRuntime.java |6 +++---
sc/source/filter/excel/excform.cxx |2 +-
sc/source/filter/excel/xihelper.cxx |2 +-
sc/source/filter/excel/xilink.cxx|2 +-
svtools/source/misc/acceleratorexecute.cxx |4 ++--
sw/source/filter/ww8/ww8par6.cxx |2 +-
vcl/source/graphic/GraphicObject.cxx |2 +-
14 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit dc8ed4b8e1fa5ed3b934bfcf5999ddb75ea07b0a
Author: Andrea Gelmini
Date: Fri Jul 6 17:56:22 2018 +0200
Fix typo
Change-Id: I1cc4544e807d7c04aa171358ccd1c204040dff55
Reviewed-on: https://gerrit.libreoffice.org/57078
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
index 768c7286185b..aed3552536e3 100644
--- a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
@@ -86,7 +86,7 @@ OUString lcl_DataTypetoFbTypeName(sal_Int32 eType)
OUString lcl_getTypeModifier(sal_Int32 eType)
{
// TODO bind -9546 magic number to a common definition. It also appears
-// in the connectivity modul.
+// in the connectivity module.
switch (eType)
{
case DataType::CLOB:
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index b986b9a9467f..d3c77c970fde 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -414,7 +414,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback,
LinkParamNone*, void)
// This method was called asynchronous from our main thread by using a
pointer.
// We reached this method only, by using a reference to ourself :-)
// Further this member is used to detect still running and not yet finished
-// asynchronous operations. So its time now to release this reference.
+// asynchronous operations. So it's time now to release this reference.
// But hold it temp alive. Otherwise we die before we can finish this
method really :-))
css::uno::Reference< css::uno::XInterface > xTempHold = m_xSelfHold;
m_xSelfHold.clear();
diff --git a/framework/source/jobs/jobdata.cxx
b/framework/source/jobs/jobdata.cxx
index 05ab9f0145b2..b2f0eb254743 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -525,9 +525,9 @@ std::vector< OUString > JobData::getEnabledJobsForEvent(
const css::uno::Referen
return std::vector< OUString >();
// get all alias names of jobs, which are part of this job list
-// But Some of them can be disabled by its time stamp values.
-// We create an additional job name list with the same size, then the
original list ...
-// step over all job entries ... check her time stamps ... and put only
job names to the
+// But Some of them can be disabled by its timestamp values.
+// We create an additional job name list with the same size, then the
original list...
+// step over all job entries... check her timestamps... and put only job
names to the
// destination list, which represent an enabled job.
css::uno::Sequence< OUString > lAllJobs = xJobList->getElementNames();
sal_Int32 c = lAllJobs.getLength();
diff --git a/framework/source/services/pathsettings.cxx
b/framework/source/services/pathsettings.cxx
index f24d4976c604..e047ee53057e 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -396,7 +396,7 @@ private:
void impl_rebuildPropertyDescriptor();
/** provides direct access to the list of path values
-using it's internal property id.
+using its internal property id.
*/
css::uno::Any impl_getPathValue( sal_Int32 nID ) const;
void impl_setPathValue( sal_Int32 nID ,
diff --git a/offapi/com/sun/star/document/FilterFactory.idl
b/offapi/com/sun/star/document/FilterFactory.idl
index df7f35c60526..120d6128b9c1 100644
--- a/offapi/com/sun/star/document/FilterFactory.idl
+++ b/offapi/com/sun/star/document/FilterFactory.idl
@@ -51,7 +51,7 @@ published service FilterFactory
The methods createInstance() or createInstanceWithArguments() of this
interface must be
called with an internal type name!. This name is used internally to
search a suitable
(mostly the default) filter for this type then. Th
