date:20190418

 sc/inc/document.hxx|2 ++
 sc/source/core/data/dociter.cxx|4 ++--
 sc/source/core/data/documen3.cxx   |5 +
 sc/source/core/data/document10.cxx |9 +
 sc/source/filter/xml/XMLStylesExportHelper.cxx |1 +
 5 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit ac9aa53d51a4f359342274d107aed6df85658c55
Author: Noel Grandin 
AuthorDate: Wed Apr 17 21:40:28 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 18 08:49:41 2019 +0200

crashtesting: failure on import of ooo6593-5.stc

since
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100
tdf#50916 Makes numbers of columns dynamic

Change-Id: I858e61b3a1158bf47b5855e56d63c77cc87aa09b
Reviewed-on: https://gerrit.libreoffice.org/70902
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 48dbe6c04e69..cdeab88fdfcb 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -787,6 +787,7 @@ public:
 ScRangePairListRef& GetRowNameRangesRef() { return xRowNameRanges; }
 
 SC_DLLPUBLIC SCCOL ClampToAllocatedColumns(SCTAB nTab, SCCOL nCol) const;
+SC_DLLPUBLIC SCCOL GetAllocatedColumnsCount(SCTAB nTab) const;
 
 SC_DLLPUBLIC ScDBCollection* GetDBCollection() const { return 
pDBCollection.get();}
 void SetDBCollection( 
std::unique_ptr pNewDBCollection,
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 8458e2895684..ec81363846f2 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -829,7 +829,6 @@ ScCellIterator::ScCellIterator( ScDocument* pDoc, const 
ScRange& rRange, Subtota
 maEndPos(rRange.aEnd),
 mnSubTotalFlags(nSubTotalFlags)
 {
-maEndPos.SetCol( pDoc->ClampToAllocatedColumns(maStartPos.Tab(), 
maEndPos.Col()) );
 init();
 }
 
@@ -914,7 +913,8 @@ bool ScCellIterator::getCurrent()
 do
 {
 maCurPos.IncCol();
-if (maCurPos.Col() > maEndPos.Col())
+if (maCurPos.Col() >= 
mpDoc->GetAllocatedColumnsCount(maCurPos.Tab())
+|| maCurPos.Col() > maEndPos.Col())
 {
 maCurPos.SetCol(maStartPos.Col());
 maCurPos.IncTab();
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 75f1cdab071a..0bcf1aa37580 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -2103,4 +2103,9 @@ SCCOL ScDocument::ClampToAllocatedColumns(SCTAB nTab, 
SCCOL nCol) const
 return maTabs[nTab]->ClampToAllocatedColumns(nCol);
 }
 
+SCCOL ScDocument::GetAllocatedColumnsCount(SCTAB nTab) const
+{
+return maTabs[nTab]->GetAllocatedColumnsCount();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3df2e918408535acd2c4d028bfae70901ad24e62
Author: Noel Grandin 
AuthorDate: Wed Apr 17 21:03:26 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 18 08:49:32 2019 +0200

crashtesting: failure on export of ooo118068-1.ods  to ods

since
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100
tdf#50916 Makes numbers of columns dynamic

Change-Id: Ib8dc06b80beed81a2543f343483599c425e87369
Reviewed-on: https://gerrit.libreoffice.org/70901
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index bd6db82a7d00..48dbe6c04e69 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2454,6 +2454,7 @@ public:
 voidDeleteBroadcasters( sc::ColumnBlockPosition& 
rBlockPos, const ScAddress& rTopPos, SCROW nLength );
 
 std::unique_ptr GetColumnIterator( SCTAB nTab, SCCOL 
nCol, SCROW nRow1, SCROW nRow2 ) const;
+void CreateColumnIfNotExists( SCTAB nTab, SCCOL nCol );
 
 SC_DLLPUBLIC void StoreTabToCache(SCTAB nTab, SvStream& rStrm) const;
 SC_DLLPUBLIC void RestoreTabFromCache(SCTAB nTab, SvStream& rStream);
diff --git a/sc/source/core/data/document10.cxx 
b/sc/source/core/data/document10.cxx
index c286ecba4c98..429fc33074fb 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -916,6 +916,15 @@ std::unique_ptr 
ScDocument::GetColumnIterator( SCTAB nTab, S
 return pTab->GetColumnIterator(nCol, nRow1, nRow2);
 }
 
+void ScDocument::CreateColumnIfNotExists( SCTAB nTab, SCCOL nCol )
+{
+const ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+return;
+
+pTab->CreateColumnIfNotExists(nCol);
+}
+
 bool ScDocument::EnsureFormulaCellResults( const ScRange& rRange, bool 
bSkipRunning )
 {
 bool bAnyDirty = false;
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx 
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 6b2fb2e4a2a4..9cc648340a3c 100644
---

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - shell/source

2019-04-18 Thread Katarina Behrens (via logerrit)

 shell/source/backends/kde5be/kde5backend.cxx |   56 ---
 1 file changed, 42 insertions(+), 14 deletions(-)

New commits:
commit 15acea305b93833babe2064b9dab25acb7fcbff6
Author: Katarina Behrens 
AuthorDate: Tue Apr 16 09:47:31 2019 +0200
Commit: Michael Weghorn 
CommitDate: Thu Apr 18 12:34:40 2019 +0200

Stop qt event loop after KDE settings have been read

Two use-cases here in kde5backend
1) kde or qt vclplug has already started qt event loop => just use this
loop to read KDE settings
2) no qt event loop runs (we're most likely in gtk3_kde5 vclplug) =>
start a new event loop, read the settings and stop it

In case 2) letting qt event loop run means subsequently all UI ops
need to happen in main thread. This is problematic to enforce in
non-qt-based vclplugs

In both cases, cache those settings for future use - the assumption is,
most of them are static during a session anyway.

Change-Id: Ifa203f4cdb9a753db808f945762fb131ee83393c
Reviewed-on: https://gerrit.libreoffice.org/70808
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 5a64bc2b1214e6ad8424f57576aa5752a09815d4)
Reviewed-on: https://gerrit.libreoffice.org/70895
Reviewed-by: Michael Weghorn 

diff --git a/shell/source/backends/kde5be/kde5backend.cxx 
b/shell/source/backends/kde5be/kde5backend.cxx
index e2f6e25c0764..101a21387a4c 100644
--- a/shell/source/backends/kde5be/kde5backend.cxx
+++ b/shell/source/backends/kde5be/kde5backend.cxx
@@ -120,7 +120,7 @@ private:
 {
 }
 
-bool enabled_;
+std::map> m_KDESettings;
 };
 
 OString getDisplayArg()
@@ -148,10 +148,28 @@ OString getExecutable()
 return OUStringToOString(aBin, osl_getThreadTextEncoding());
 }
 
+void readKDESettings(std::map>& 
rSettings)
+{
+const std::vector aKeys
+= { "EnableATToolSupport",  "ExternalMailer",   
"SourceViewFontHeight",
+"SourceViewFontName",   "WorkPathVariable", 
"ooInetFTPProxyName",
+"ooInetFTPProxyPort",   "ooInetHTTPProxyName",  
"ooInetHTTPProxyPort",
+"ooInetHTTPSProxyName", "ooInetHTTPSProxyPort", "ooInetNoProxy",
+"ooInetProxyType" };
+
+for (const OUString& aKey : aKeys)
+{
+css::beans::Optional aValue = 
kde5access::getValue(aKey);
+std::pair> elem
+= std::make_pair(aKey, aValue);
+rSettings.insert(elem);
+}
+}
+
 // init the QApplication when we load the kde5backend into a non-Qt vclplug 
(e.g. Gtk3KDE5)
 // TODO: use a helper process to read these values without linking to Qt 
directly?
 // TODO: share this code somehow with Qt5Instance.cxx?
-void initQApp()
+void initQApp(std::map>& 
rSettings)
 {
 const auto aDisplay = getDisplayArg();
 int nFakeArgc = aDisplay.isEmpty() ? 2 : 3;
@@ -169,36 +187,42 @@ void initQApp()
 unsetenv("SESSION_MANAGER");
 }
 
-auto app = new QApplication(nFakeArgc, pFakeArgv);
-QObject::connect(app, ::destroyed, app, [nFakeArgc, pFakeArgv]() {
+std::unique_ptr app(new QApplication(nFakeArgc, pFakeArgv));
+QObject::connect(app.get(), ::destroyed, app.get(), [nFakeArgc, 
pFakeArgv]() {
 for (int i = 0; i < nFakeArgc; ++i)
 delete pFakeArgv[i];
 delete[] pFakeArgv;
 });
 
+readKDESettings(rSettings);
+
 if (session_manager != nullptr)
 {
 // coverity[tainted_string] - trusted source for setenv
 setenv("SESSION_MANAGER", session_manager, 1);
 free(session_manager);
 }
-
-QApplication::setQuitOnLastWindowClosed(false);
 }
 
 Service::Service()
-: enabled_(false)
 {
 css::uno::Reference 
context(css::uno::getCurrentContext());
 if (context.is())
 {
-if (!qApp)
-{
-initQApp();
-}
 OUString desktop;
 context->getValueByName("system.desktop-environment") >>= desktop;
-enabled_ = desktop == "KDE5" && qApp != nullptr;
+
+if (desktop == "KDE5")
+{
+if (!qApp) // no qt event loop yet
+{
+// so we start one and read KDE settings
+initQApp(m_KDESettings);
+}
+else // someone else (most likely kde/qt vclplug) has started qt 
event loop
+// all that is left to do is to read KDE settings
+readKDESettings(m_KDESettings);
+}
 }
 }
 
@@ -218,8 +242,12 @@ css::uno::Any Service::getPropertyValue(OUString const& 
PropertyName)
 || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == 
"ooInetNoProxy"
 || PropertyName == "ooInetProxyType")
 {
-return css::uno::makeAny(enabled_ ? kde5access::getValue(PropertyName)
-  : 
css::beans::Optional());
+std::map>::iterator it
+= m_KDESettings.find(PropertyName);
+if (it != m_KDESettings.end())
+

[Libreoffice-commits] dev-tools.git: 3 commits - uitest/mass-testing

2019-04-18 Thread Libreoffice Gerrit user

 uitest/mass-testing/calc.py |   40 +---
 uitest/mass-testing/run.py  |   23 +--
 2 files changed, 50 insertions(+), 13 deletions(-)

New commits:
commit 8b3e626d2f21a65242cf3de4f08c3810ade3e5ee
Author: Xisco Fauli 
AuthorDate: Thu Apr 18 12:48:28 2019 +0200
Commit: Xisco Fauli 
CommitDate: Thu Apr 18 12:55:53 2019 +0200

mass-uitesting: Fix UnicodeDecodeError

diff --git a/uitest/mass-testing/run.py b/uitest/mass-testing/run.py
index 8de5d35..6e3aeb6 100755
--- a/uitest/mass-testing/run.py
+++ b/uitest/mass-testing/run.py
@@ -74,8 +74,8 @@ def run_tests_and_get_results(liboPath, listFiles, isDebug):
 totalSkip = 0
 
 sofficePath = liboPath + "instdir/program/soffice"
-process = Popen([sofficePath, "--version"], encoding="utf-8", stdout=PIPE, 
stderr=PIPE)
-stdout, stderr = process.communicate()
+process = Popen([sofficePath, "--version"], stdout=PIPE, stderr=PIPE)
+stdout = process.communicate()[0].decode("utf-8")
 sourceHash = stdout.split(" ")[2].strip()
 
 #Keep track of the files run
@@ -110,9 +110,9 @@ def run_tests_and_get_results(liboPath, listFiles, isDebug):
 "--soffice=path:" + sofficePath,
 "--userdir=file://" + profilePath,
 "--file=" + component + ".py"], stdin=PIPE, stdout=PIPE, 
stderr=PIPE,
-encoding="utf-8", preexec_fn=os.setsid) as process:
+preexec_fn=os.setsid) as process:
 try:
-outputLines = process.communicate(timeout=60)[0].splitlines()
+outputLines = 
process.communicate(timeout=60)[0].decode('utf-8').splitlines()
 importantInfo = ''
 for line in outputLines:
 if isDebug:
commit 50957cb6316b0d6157dc0c787550954baf95f727
Author: Xisco Fauli 
AuthorDate: Thu Apr 18 12:42:46 2019 +0200
Commit: Xisco Fauli 
CommitDate: Thu Apr 18 12:55:53 2019 +0200

mass-uitesting: Use a different log for each component

and put them in 'logs' folder

diff --git a/uitest/mass-testing/run.py b/uitest/mass-testing/run.py
index 819ca20..8de5d35 100755
--- a/uitest/mass-testing/run.py
+++ b/uitest/mass-testing/run.py
@@ -32,12 +32,12 @@ class DefaultHelpParser(argparse.ArgumentParser):
 self.print_help()
 sys.exit(2)
 
-def start_logger():
+def start_logger(component):
 rootLogger = logging.getLogger()
 rootLogger.setLevel(os.environ.get("LOGLEVEL", "INFO"))
 
 logFormatter = logging.Formatter("%(asctime)s %(message)s")
-fileHandler = logging.FileHandler("massTesting.log")
+fileHandler = logging.FileHandler("./logs/" + component + ".log")
 fileHandler.setFormatter(logFormatter)
 rootLogger.addHandler(fileHandler)
 
@@ -81,8 +81,9 @@ def run_tests_and_get_results(liboPath, listFiles, isDebug):
 #Keep track of the files run
 filesRun = {}
 
-if os.path.exists('run.pkl'):
-with open('run.pkl', 'rb') as pickle_in:
+pklFile = './logs/' + component + '.pkl'
+if os.path.exists(pklFile):
+with open(pklFile, 'rb') as pickle_in:
 filesRun = pickle.load(pickle_in)
 
 if sourceHash not in filesRun:
@@ -148,7 +149,7 @@ def run_tests_and_get_results(liboPath, listFiles, isDebug):
 
 filesRun[sourceHash].append(fileName)
 
-with open('run.pkl', 'wb') as pickle_out:
+with open(pklFile, 'wb') as pickle_out:
 pickle.dump(filesRun, pickle_out)
 
 totalTests = totalPass + totalTimeout + totalSkip + totalFail
@@ -194,8 +195,10 @@ if __name__ == '__main__':
 os.environ["URE_BOOTSTRAP"] = "file://" + liboPath + 
"instdir/program/fundamentalrc"
 os.environ["SAL_USE_VCLPLUGIN"] = "gen"
 
-logger = start_logger()
+if not os.path.exists('./logs'):
+os.makedirs('./logs')
 
+logger = start_logger(component)
 
 listFiles = get_file_names(component, filesPath)
 
commit 6b15ed3504d6cc0cce0e9a2788047b1193ecf33d
Author: Xisco Fauli 
AuthorDate: Thu Apr 18 12:39:28 2019 +0200
Commit: Xisco Fauli 
CommitDate: Thu Apr 18 12:55:53 2019 +0200

mass-uitesting: Add a few calc tests

diff --git a/uitest/mass-testing/calc.py b/uitest/mass-testing/calc.py
index 39cbcda..14383a9 100755
--- a/uitest/mass-testing/calc.py
+++ b/uitest/mass-testing/calc.py
@@ -34,17 +34,51 @@ class massTesting(UITestCase):
 
 try:
 xDoc = self.xUITest.getTopFocusWindow()
-xEdit = xDoc.getChild("edit")
+xEdit = xDoc.getChild("grid_window")
 except:
 #In case the mimetype is wrong and the file is open with another 
component
 handle_skip()
 
 return xEdit
 
-def test_calc(self):
+def test_remove_all_and_undo(self):
 xEdit = self.load_file()
 if xEdit:
-continue
+self.xUITest.executeCommand(".uno:SelectAll")
+xEdit.executeAction("TYPE",

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

 sw/source/uibase/uiview/viewdraw.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dac004faa077a7794bb3f33aa8a5c8344e1b891e
Author: Mike Kaganski 
AuthorDate: Thu Apr 18 07:48:11 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Apr 18 08:54:16 2019 +0200

Build fix after commit 916c5834d09a4f9742cbdd00ab5d53b140a97153

Change-Id: Ia5ca829877712b9814ce6eee392d8f1f23a7e97b
Reviewed-on: https://gerrit.libreoffice.org/70915
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sw/source/uibase/uiview/viewdraw.cxx 
b/sw/source/uibase/uiview/viewdraw.cxx
index 09d49e3b52a5..86a671102228 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -353,9 +353,9 @@ void SwView::ExecDraw(SfxRequest& rReq)
 {
 m_pWrtShell->GotoObj(true);
 }
-else if (dynamic_cast(pTempFuncPtr))
+else if (dynamic_cast(pFuncPtr))
 {
-pTempFuncPtr->CreateDefaultObject();
+pFuncPtr->CreateDefaultObject();
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa

2019-04-18 Thread Miklos Vajna (via logerrit)

 sw/qa/extras/uiwriter/uiwriter2.cxx |  128 
 1 file changed, 30 insertions(+), 98 deletions(-)

New commits:
commit 3748135983a9a70784a27ba2672b5856a3fc7481
Author: Miklos Vajna 
AuthorDate: Wed Apr 17 21:12:54 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 18 09:03:09 2019 +0200

CppunitTest_sw_uiwriter2: use CPPUNIT_TEST_FIXTURE()

Change-Id: I169612264ef713027b38d1218ba71c86732da7f5
Reviewed-on: https://gerrit.libreoffice.org/70900
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index ba15c9001d51..97f7978c20b1 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -46,70 +46,6 @@ char const FLOATING_TABLE_DATA_DIRECTORY[] = 
"/sw/qa/extras/uiwriter/data/floati
 class SwUiWriterTest2 : public SwModelTestBase
 {
 public:
-void testRedlineMoveInsertInDelete();
-void testRedlineInHiddenSection();
-void testTdf47471_paraStyleBackground();
-void testTdf101534();
-void testTdf54819();
-void testTdf109376_redline();
-void testTdf109376();
-void testTdf64242_optimizeTable();
-void testTdf108687_tabstop();
-void testTdf119571();
-void testTdf119019();
-void testTdf119824();
-void testTdf105413();
-void testUnfloatButtonSmallTable();
-void testUnfloatButton();
-void testUnfloatButtonReadOnlyMode();
-void testUnfloating();
-void testRTLparaStyle_LocaleArabic();
-void testTdf122893();
-void testTdf122901();
-void testTdf122942();
-void testTdf52391();
-void testTdf101873();
-void testTableWidth();
-void testTextFormFieldInsertion();
-void testCheckboxFormFieldInsertion();
-void testDropDownFormFieldInsertion();
-void testMixedFormFieldInsertion();
-void testTdf124261();
-void testDocxAttributeTableExport();
-
-CPPUNIT_TEST_SUITE(SwUiWriterTest2);
-CPPUNIT_TEST(testRedlineMoveInsertInDelete);
-CPPUNIT_TEST(testRedlineInHiddenSection);
-CPPUNIT_TEST(testTdf47471_paraStyleBackground);
-CPPUNIT_TEST(testTdf101534);
-CPPUNIT_TEST(testTdf54819);
-CPPUNIT_TEST(testTdf109376_redline);
-CPPUNIT_TEST(testTdf109376);
-CPPUNIT_TEST(testTdf64242_optimizeTable);
-CPPUNIT_TEST(testTdf108687_tabstop);
-CPPUNIT_TEST(testTdf119571);
-CPPUNIT_TEST(testTdf119019);
-CPPUNIT_TEST(testTdf119824);
-CPPUNIT_TEST(testTdf105413);
-CPPUNIT_TEST(testUnfloatButtonSmallTable);
-CPPUNIT_TEST(testUnfloatButton);
-CPPUNIT_TEST(testUnfloatButtonReadOnlyMode);
-CPPUNIT_TEST(testUnfloating);
-CPPUNIT_TEST(testRTLparaStyle_LocaleArabic);
-CPPUNIT_TEST(testTdf122893);
-CPPUNIT_TEST(testTdf122901);
-CPPUNIT_TEST(testTdf122942);
-CPPUNIT_TEST(testTdf52391);
-CPPUNIT_TEST(testTdf101873);
-CPPUNIT_TEST(testTableWidth);
-CPPUNIT_TEST(testTextFormFieldInsertion);
-CPPUNIT_TEST(testCheckboxFormFieldInsertion);
-CPPUNIT_TEST(testDropDownFormFieldInsertion);
-CPPUNIT_TEST(testMixedFormFieldInsertion);
-CPPUNIT_TEST(testTdf124261);
-CPPUNIT_TEST(testDocxAttributeTableExport);
-CPPUNIT_TEST_SUITE_END();
-
 virtual std::unique_ptr preTest(const char* filename) override
 {
 m_aSavedSettings = Application::GetSettings();
@@ -127,8 +63,6 @@ public:
 
 protected:
 AllSettings m_aSavedSettings;
-
-private:
 SwDoc* createDoc(const char* pName = nullptr);
 };
 
@@ -161,7 +95,7 @@ SwDoc* SwUiWriterTest2::createDoc(const char* pName)
 return pTextDoc->GetDocShell()->GetDoc();
 }
 
-void SwUiWriterTest2::testTdf47471_paraStyleBackground()
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf47471_paraStyleBackground)
 {
 SwDoc* pDoc = createDoc("tdf47471_paraStyleBackground.odt");
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
@@ -194,7 +128,7 @@ void SwUiWriterTest2::testTdf47471_paraStyleBackground()
  getProperty(getParagraph(3), 
"ParaStyleName"));
 }
 
-void SwUiWriterTest2::testTdf101534()
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf101534)
 {
 // Copy the first paragraph of the document.
 load(DATA_DIRECTORY, "tdf101534.fodt");
@@ -222,7 +156,7 @@ void SwUiWriterTest2::testTdf101534()
 CPPUNIT_ASSERT(aSet.HasItem(RES_LR_SPACE));
 }
 
-void SwUiWriterTest2::testRedlineMoveInsertInDelete()
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testRedlineMoveInsertInDelete)
 {
 loadURL("private:factory/swriter", nullptr);
 SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
@@ -258,7 +192,7 @@ void SwUiWriterTest2::testRedlineMoveInsertInDelete()
 
pWrtShell->GetCursor()->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
 }
 
-void SwUiWriterTest2::testRedlineInHiddenSection()
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testRedlineInHiddenSection)
 {
 loadURL("private:factory/swriter", nullptr);
 SwXTextDocument* pTextDoc =

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

 connectivity/source/parse/sqliterator.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 81b9821b65fb5721a2ca093fcec6a53fa01b9ba7
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:05:00 2019 +
Commit: Julien Nabet 
CommitDate: Thu Apr 18 10:02:38 2019 +0200

Fix typo

Change-Id: Ief0343a128ae45ee62f7965a6ea77b2dcbd0ae49
Reviewed-on: https://gerrit.libreoffice.org/70911
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/connectivity/source/parse/sqliterator.cxx 
b/connectivity/source/parse/sqliterator.cxx
index eaec3f9ef6b1..3be9ec8b570e 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -574,7 +574,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getTableNode( 
OSQLTables& _rTables,
 if ( SQL_ISRULE( pQueryExpression, select_statement ) )
 {
 getSelect_statement( *m_pImpl->m_pSubTables, 
pQueryExpression );
-// TODO: now, we need to setup a OSQLTable from 
pQueryExpression in some way
+// TODO: now, we need to setup an OSQLTable from 
pQueryExpression in some way
 //   and stick it in _rTables[rTableRange]. Probably 
fake it by
 //   setting up a full OSQLParseTreeIterator on 
pQueryExpression
 //   and using its m_aSelectColumns
@@ -720,7 +720,7 @@ namespace
 else
 _out_rColumnName = _pColumnRef->getChild(0)->getTokenValue();
 
-// look up the column in the select column, to find an possible 
alias
+// look up the column in the select column, to find a possible 
alias
 if ( _pSelectColumns )
 {
 for (const Reference< XPropertySet >& xColumn : 
_pSelectColumns->get())
@@ -1837,7 +1837,7 @@ const OSQLParseNode* 
OSQLParseTreeIterator::getOrderTree() const
 OSL_ENSURE(pTableExp->count() == 
TABLE_EXPRESSION_CHILD_COUNT,"OSQLParseTreeIterator: error in parse tree!");
 
 pOrderClause = pTableExp->getChild(ORDER_BY_CHILD_POS);
-// If it is a order_by, it must not be empty
+// If it is an order_by, it must not be empty
 if(pOrderClause->count() != 3)
 pOrderClause = nullptr;
 return pOrderClause;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/qa sc/source

 sc/qa/unit/data/ods/pivot-table-num-fmt.ods |binary
 sc/qa/unit/pivottable_filters_test.cxx  |   27 +
 sc/source/filter/excel/xepivotxml.cxx   |   44 +---
 3 files changed, 61 insertions(+), 10 deletions(-)

New commits:
commit 83ae62c41a1d00058a3b8d0039903afb081871e8
Author: Mike Kaganski 
AuthorDate: Wed Apr 17 11:11:58 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Apr 18 09:14:15 2019 +0200

tdf#124772: export data field number format to XLSX

... otherwise Excel would reset data formatting e.g. from currency
to plain numbers upon refresh.

Excel relies on per-field format setting in pivot tables, while Calc
takes fields formatting from source.

Change-Id: Ia8cdf3f8fcd23720e3daaf989152c170057b339c
Reviewed-on: https://gerrit.libreoffice.org/70860
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/70919

diff --git a/sc/qa/unit/data/ods/pivot-table-num-fmt.ods 
b/sc/qa/unit/data/ods/pivot-table-num-fmt.ods
new file mode 100644
index ..e6cfd138c12d
Binary files /dev/null and b/sc/qa/unit/data/ods/pivot-table-num-fmt.ods differ
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index eea645d7d3c7..423e5ff63ead 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -91,6 +91,7 @@ public:
 void testTdf123939();
 void testTdf124651();
 void testTdf124736();
+void tesTtdf124772NumFmt();
 
 CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest);
 
@@ -136,6 +137,7 @@ public:
 CPPUNIT_TEST(testTdf123939);
 CPPUNIT_TEST(testTdf124651);
 CPPUNIT_TEST(testTdf124736);
+CPPUNIT_TEST(tesTtdf124772NumFmt);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2533,6 +2535,31 @@ void ScPivotTableFiltersTest::testTdf124736()
 "t", "default");
 }
 
+void ScPivotTableFiltersTest::tesTtdf124772NumFmt()
+{
+ScDocShellRef xDocSh = loadDoc("pivot-table-num-fmt.", FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(xDocSh.get(), FORMAT_XLSX);
+xDocSh->DoClose();
+
+xmlDocPtr pTable
+= XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/pivotTables/pivotTable1.xml");
+CPPUNIT_ASSERT(pTable);
+
+// This asserts that numFmtId attribute is present
+const OUString sXclNumFmt
+= getXPath(pTable, "/x:pivotTableDefinition/x:dataFields/x:dataField", 
"numFmtId");
+
+pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/styles.xml");
+CPPUNIT_ASSERT(pTable);
+
+// Check that we refer to correct format
+assertXPath(pTable, "/x:styleSheet/x:numFmts/x:numFmt[@numFmtId='" + 
sXclNumFmt.toUtf8() + "']",
+"formatCode", "\\$#,##0");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xepivotxml.cxx 
b/sc/source/filter/excel/xepivotxml.cxx
index 694eee0469d3..d333bedd379a 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -15,16 +15,21 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -1082,6 +1087,10 @@ void XclExpXmlPivotTables::SavePivotTableXml( 
XclExpXmlStream& rStrm, const ScDP
 
 if (!aDataFields.empty())
 {
+css::uno::Reference xDimsByName;
+if (auto xDimSupplier = const_cast(rDPObj).GetSource())
+xDimsByName = xDimSupplier->getDimensions();
+
 pPivotStrm->startElement(XML_dataFields,
 XML_count, OString::number(static_cast(aDataFields.size())),
 FSEND);
@@ -1097,17 +1106,32 @@ void XclExpXmlPivotTables::SavePivotTableXml( 
XclExpXmlStream& rStrm, const ScDP
 // Excel (at least 2016) seems to insist on the presence of "name" 
attribute in
 // dataField element, even if empty
 const OString sName = pName ? XclXmlUtils::ToOString(*pName) : "";
-pPivotStrm->write("<")->writeId(XML_dataField);
-rStrm.WriteAttributes(XML_name, sName, FSEND);
-
-rStrm.WriteAttributes(XML_fld, OString::number(nDimIdx).getStr(), 
FSEND);
-
-ScGeneralFunction eFunc = rDim.GetFunction();
-const char* pSubtotal = toOOXMLSubtotalType(eFunc);
+auto pItemAttList = 
sax_fastparser::FastSerializerHelper::createAttrList();
+pItemAttList->add(XML_name, sName);
+pItemAttList->add(XML_fld, OString::number(nDimIdx));
+const char* pSubtotal = toOOXMLSubtotalType(rDim.GetFunction());
 if (pSubtotal)
-rStrm.WriteAttributes(XML_subtotal, pSubtotal, FSEND);
-
-pPivotStrm->write("/>");
+

[Libreoffice-commits] core.git: ucbhelper/source vcl/qa

 ucbhelper/source/provider/contentinfo.cxx |1 -
 vcl/qa/cppunit/BitmapTest.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 78315f414ad27af65eab2145382d2957c0bfd3f8
Author: Andrea Gelmini 
AuthorDate: Wed Apr 17 13:18:22 2019 +
Commit: Julien Nabet 
CommitDate: Thu Apr 18 10:11:06 2019 +0200

Removed duplicated includes

Change-Id: Id0222c9f6a7ef04ed46dc5ceacd814619b4d7c21
Reviewed-on: https://gerrit.libreoffice.org/70912
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/ucbhelper/source/provider/contentinfo.cxx 
b/ucbhelper/source/provider/contentinfo.cxx
index a7c9bcc139e9..6dd522be6955 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index 697db737ecb1..020b01c22d55 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -28,7 +28,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 comphelper/source/container/interfacecontainer2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6742897f98e18be85abd1823edf97d5035915984
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:05:40 2019 +
Commit: Julien Nabet 
CommitDate: Thu Apr 18 10:09:26 2019 +0200

Fix typo

Change-Id: I4166a7aa9067907e563a98d76bd7f21c63370ce4
Reviewed-on: https://gerrit.libreoffice.org/70910
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/comphelper/source/container/interfacecontainer2.cxx 
b/comphelper/source/container/interfacecontainer2.cxx
index f4610d99acf4..26137cb6b0b0 100644
--- a/comphelper/source/container/interfacecontainer2.cxx
+++ b/comphelper/source/container/interfacecontainer2.cxx
@@ -159,7 +159,7 @@ void OInterfaceContainerHelper2::copyAndResetInUse()
 OSL_ENSURE( bInUse, "OInterfaceContainerHelper2 not in use" );
 if( bInUse )
 {
-// this should be the worst case. If a iterator is active
+// this should be the worst case. If an iterator is active
 // and a new Listener is added.
 if( bIsList )
 aData.pAsVector = new std::vector< Reference< XInterface > >( 
*aData.pAsVector );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-04-18 Thread andreas kainz (via logerrit)

 sc/uiconfig/scalc/popupmenu/celledit.xml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 777232d03b75ef80ab7f3c57f04dee2ce4953633
Author: andreas kainz 
AuthorDate: Thu Apr 18 09:48:01 2019 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 18 10:40:18 2019 +0200

tdf#87459 bring back HyperlinkDialog again

Change-Id: I0938894681e73aaadf8bd353185dc4c6a125e0e2
Reviewed-on: https://gerrit.libreoffice.org/70920
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sc/uiconfig/scalc/popupmenu/celledit.xml 
b/sc/uiconfig/scalc/popupmenu/celledit.xml
index 27e7efe4e02d..ea0aed174520 100644
--- a/sc/uiconfig/scalc/popupmenu/celledit.xml
+++ b/sc/uiconfig/scalc/popupmenu/celledit.xml
@@ -24,9 +24,10 @@
 
   
   
-  
   
+  
   
   
   
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: test/CppunitTest_test_xpath.mk test/Module_test.mk test/qa

 test/CppunitTest_test_xpath.mk |   27 +++
 test/Module_test.mk|4 
 test/qa/cppunit/test_xpath.cxx |   40 
 3 files changed, 71 insertions(+)

New commits:
commit 4060a94f6434b05a84d015d84e3b5f0315b44133
Author: Mike Kaganski 
AuthorDate: Wed Apr 17 18:02:49 2019 +0300
Commit: Miklos Vajna 
CommitDate: Thu Apr 18 09:06:16 2019 +0200

Add a test to check XPath testing facilities in XmlTestTools

... to guarantee that e.g. getXPath will always fail for non-empty
non-existing attribute

Change-Id: I22cf932eda020abf16608341fcd1769b35478883
Reviewed-on: https://gerrit.libreoffice.org/70891
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/test/CppunitTest_test_xpath.mk b/test/CppunitTest_test_xpath.mk
new file mode 100644
index ..f36741048657
--- /dev/null
+++ b/test/CppunitTest_test_xpath.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,test_xpath))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,test_xpath, \
+test/qa/cppunit/test_xpath \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,test_xpath,\
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,test_xpath, \
+sal \
+test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,test_xpath))
+
+# vim: set noet sw=4 ts=4:
diff --git a/test/Module_test.mk b/test/Module_test.mk
index e1051f16b5a0..080cc855b28c 100644
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -19,6 +19,10 @@ $(eval $(call gb_Module_add_targets,test,\
 Package_unittest \
 ))
 
+$(eval $(call gb_Module_add_check_targets,test,\
+CppunitTest_test_xpath \
+))
+
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/test/qa/cppunit/test_xpath.cxx b/test/qa/cppunit/test_xpath.cxx
new file mode 100644
index ..83b48c84f488
--- /dev/null
+++ b/test/qa/cppunit/test_xpath.cxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+
+class TestXPath : public CppUnit::TestFixture, public XmlTestTools
+{
+};
+
+CPPUNIT_TEST_FIXTURE(TestXPath, test_getXPath)
+{
+const xmlChar s_xml[] = ""
+"text";
+xmlDocPtr pTable = xmlParseDoc(s_xml);
+CPPUNIT_ASSERT(pTable);
+// Must get existing element content without errors
+CPPUNIT_ASSERT_ASSERTION_PASS(getXPath(pTable, "/xml/item", ""));
+// Must error out when getting non-existing element
+CPPUNIT_ASSERT_ASSERTION_FAIL(getXPath(pTable, "/xml/no_item", ""));
+// Must get existing attribute value correctly
+CPPUNIT_ASSERT_ASSERTION_PASS(getXPath(pTable, "/xml/item", "attrib"));
+// Must fail when requested non-empty attribute doesn't exist
+CPPUNIT_ASSERT_ASSERTION_FAIL(getXPath(pTable, "/xml/item", "no_attrib"));
+// Must return empty string if not asking an attribute, regardless what is 
its content
+CPPUNIT_ASSERT_EQUAL(OUString(), getXPath(pTable, "/xml/item", ""));
+// Must properly return attribute content
+CPPUNIT_ASSERT_EQUAL(OUString("val"), getXPath(pTable, "/xml/item", 
"attrib"));
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/IwyuFilter_sw.yaml sw/qa

2019-04-18 Thread Gabor Kelemen (via logerrit)

 sw/IwyuFilter_sw.yaml  |   55 +
 sw/qa/api/SwXDocumentIndex.cxx |1 
 sw/qa/api/SwXDocumentSettings.cxx  |1 
 sw/qa/core/Test-BigPtrArray.cxx|7 --
 sw/qa/core/filters-test.cxx|6 -
 sw/qa/core/macros-test.cxx |   16 
 sw/qa/core/test_ToxLinkProcessor.cxx   |5 -
 sw/qa/core/test_ToxTextGenerator.cxx   |2 
 sw/qa/core/test_ToxWhitespaceStripper.cxx  |2 
 sw/qa/core/uwriter.cxx |   10 ---
 sw/qa/extras/accessibility/accessible_relation_set.cxx |1 
 sw/qa/extras/docbookexport/docbookexport.cxx   |6 -
 sw/qa/extras/globalfilter/globalfilter.cxx |2 
 sw/qa/extras/htmlexport/htmlexport.cxx |3 
 sw/qa/extras/htmlexport/xhtmlexport.cxx|   12 ---
 sw/qa/extras/htmlimport/htmlimport.cxx |6 -
 sw/qa/extras/inc/bordertest.hxx|9 ++
 sw/qa/extras/inc/swmodeltestbase.hxx   |9 --
 sw/qa/extras/mailmerge/mailmerge.cxx   |   16 +---
 sw/qa/extras/odfexport/odfexport.cxx   |4 -
 sw/qa/extras/odfimport/odfimport.cxx   |4 -
 sw/qa/extras/ooxmlexport/ooxmlencryption.cxx   |1 
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |3 
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |   17 -
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |   16 
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |   47 --
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |7 --
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx  |   23 ---
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx  |   26 
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |   29 
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx  |   38 ---
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx  |1 
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx  |8 --
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx  |   24 ---
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx  |3 
 sw/qa/extras/ooxmlexport/ooxmlexport_template.cxx  |1 
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx  |   40 
 sw/qa/extras/ooxmlexport/ooxmllinks.cxx|2 
 sw/qa/extras/ooxmlexport/ooxmlw14export.cxx|2 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |8 --
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx  |3 
 sw/qa/extras/rtfexport/rtfexport2.cxx  |9 --
 sw/qa/extras/rtfexport/rtfexport3.cxx  |6 -
 sw/qa/extras/rtfexport/rtfexport4.cxx  |   21 --
 sw/qa/extras/rtfexport/rtfexport5.cxx  |   13 
 sw/qa/extras/rtfimport/rtfimport.cxx   |   14 
 sw/qa/extras/tiledrendering/tiledrendering.cxx |1 
 sw/qa/extras/txtexport/txtexport.cxx   |4 -
 sw/qa/extras/uiwriter/uiwriter.cxx |8 +-
 sw/qa/extras/uiwriter/uiwriter2.cxx|   15 +---
 sw/qa/extras/ww8export/ww8export2.cxx  |4 -
 sw/qa/extras/ww8export/ww8export3.cxx  |5 -
 sw/qa/extras/ww8import/ww8import.cxx   |1 
 sw/qa/unit/sw-dialogs-test.cxx |5 -
 sw/qa/unit/sw-dialogs-test_2.cxx   |6 -
 55 files changed, 93 insertions(+), 495 deletions(-)

New commits:
commit 5503c8904a735f2b47adc29a1fc6500961c01be6
Author: Gabor Kelemen 
AuthorDate: Tue Apr 16 23:16:31 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 18 10:06:40 2019 +0200

tdf#42949 Fix IWYU warnings in sw/qa/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ia0c79c2455a3b40384332c8c35215671e257a07f
Reviewed-on: https://gerrit.libreoffice.org/70847
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index ce7961e08ca0..7405d42fa7e0 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -262,3 +262,58 @@ blacklist:
 sw/source/core/inc/frame.hxx:
 # Needed for direct member access
 - com/sun/star/style/TabStop.hpp
+sw/qa/extras/odfexport/odfexport.cxx:
+# Needed for getProperty template
+- com/sun/star/graphic/XGraphic.hpp
+sw/qa/extras/odfimport/odfimport.cxx:
+# Needed for direct member access
+- com/sun/star/text/XTextSection.hpp
+sw/qa/extras/ooxmlexport/ooxmlexport.cxx:
+# Needed for direct member access
+- com/sun/star/graphic/XGraphic.hpp
+- com/sun/star/text/TableColumnSeparator.hpp
+

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

 comphelper/source/container/embeddedobjectcontainer.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b839763531a11abcc9524539e19ebd3e21528bed
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:05:42 2019 +
Commit: Julien Nabet 
CommitDate: Thu Apr 18 10:12:13 2019 +0200

Fix typo

Change-Id: Ia778edadc6ca4cf56868e250f0c29efeeef3ca9f
Reviewed-on: https://gerrit.libreoffice.org/70909
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index ff0ec3a2dce5..f76da99d2790 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -713,7 +713,7 @@ uno::Reference < embed::XEmbeddedObject > 
EmbeddedObjectContainer::CopyAndGetEmb
 uno::Reference< embed::XLinkageSupport > xOrigLinkage( xObj, 
uno::UNO_QUERY );
 if ( xOrigLinkage.is() && xOrigLinkage->isLink() )
 {
-// this is a OOo link, it has no persistence
+// this is an OOo link, it has no persistence
 OUString aURL = xOrigLinkage->getLinkURL();
 if ( aURL.isEmpty() )
 throw uno::RuntimeException();
@@ -1335,7 +1335,7 @@ bool EmbeddedObjectContainer::StoreChildren(bool 
_bOasisFormat,bool _bObjectsOnl
 
 // begin:all charts will be persisted as xml format on disk when 
saving, which is time consuming.
 // '_bObjectsOnly' mean we are storing to alien formats.
-//  'isStorageElement' mean current object is NOT an MS 
OLE format. (may also include in future), i120168
+//  'isStorageElement' mean current object is NOT a MS OLE 
format. (may also include in future), i120168
 if (_bObjectsOnly && (nCurState == 
embed::EmbedStates::LOADED || nCurState == embed::EmbedStates::RUNNING)
 && (pImpl->mxStorage->isStorageElement( *pIter ) ))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - drawinglayer/source

 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |9 ++
 drawinglayer/source/processor2d/vclprocessor2d.cxx|   45 +++---
 2 files changed, 31 insertions(+), 23 deletions(-)

New commits:
commit 6affe1576e34d6bc111d1db38416492375fd5fcc
Author: Caolán McNamara 
AuthorDate: Fri Mar 29 14:05:55 2019 +
Commit: Miklos Vajna 
CommitDate: Thu Apr 18 12:26:15 2019 +0200

tdf#115843 avoid using transparent virtualdevice when 100% opaque

which for the common case avoids the narrowing of hidpi outputdevices
through non-hidpi bitmaps

Change-Id: Ibdc004a0946e8cb118818e58a01e5791c869353a
Reviewed-on: https://gerrit.libreoffice.org/69930
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit b1f961e3a459d2772f12da556ab74fa635d6a46a)

after...

copy between the outputdevices without interim Bitmap

Change-Id: I6c0097b1b069cad2771c94210986714d59431e4f
Reviewed-on: https://gerrit.libreoffice.org/69929
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 11fe18ea21974e4fdc01a3f4a455725cec8ce11a)
Reviewed-on: https://gerrit.libreoffice.org/69938
Reviewed-by: Miklos Vajna 

diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx 
b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index b22ddabf00a0..53c9b4876927 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -334,7 +334,6 @@ namespace drawinglayer
 
 mrOutDev.EnableMapMode(false);
 mpContent->EnableMapMode(false);
-Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
 
 #ifdef DBG_UTIL
 if(bDoSaveForVisualControl)
@@ -346,6 +345,7 @@ namespace drawinglayer
 "~/content.bmp",
 #endif
 StreamMode::WRITE|StreamMode::TRUNC);
+Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
 WriteDIB(aContent, aNew, false, true);
 }
 #endif
@@ -373,6 +373,7 @@ namespace drawinglayer
 }
 #endif
 
+Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
 mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), 
BitmapEx(aContent, aAlphaMask));
 }
 else if(mpMask)
@@ -394,17 +395,21 @@ namespace drawinglayer
 }
 #endif
 
+Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
 mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), 
BitmapEx(aContent, aMask));
 }
 else if(0.0 != fTrans)
 {
 sal_uInt8 
nMaskValue(static_cast(basegfx::fround(fTrans * 255.0)));
 const AlphaMask aAlphaMask(aSizePixel, );
+Bitmap aContent(mpContent->GetBitmap(aEmptyPoint, aSizePixel));
 mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), 
BitmapEx(aContent, aAlphaMask));
 }
 else
 {
-mrOutDev.DrawBitmap(maDestPixel.TopLeft(), aContent);
+mrOutDev.DrawOutDev(maDestPixel.TopLeft(), aSizePixel,
+aEmptyPoint, aSizePixel,
+*mpContent);
 }
 
 mrOutDev.SetRasterOp(aOrigRasterOp);
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index de94ac307120..40c36abac9e9 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -726,29 +726,32 @@ namespace drawinglayer
 // back to old OutDev
 mpOutputDevice = pLastOutputDevice;
 
-// draw mask
-if(getOptionsDrawinglayer().IsAntiAliasing())
+// if the mask fills the whole area we can skip
+// creating a transparent vd and filling it.
+if (!basegfx::utils::isRectangle(aMask))
 {
-// with AA, use 8bit AlphaMask to get nice borders
-VirtualDevice& rTransparence = 
aBufferDevice.getTransparence();
-rTransparence.SetLineColor();
-rTransparence.SetFillColor(COL_BLACK);
-rTransparence.DrawPolyPolygon(aMask);
-
-// dump buffer to outdev
-aBufferDevice.paint();
-}
-else
-{
-// No AA, use 1bit mask
-VirtualDevice& rMask = aBufferDevice.getMask();
-rMask.SetLineColor();

Re: Tagging text as being in arbitrary complex-script languages

2019-04-18 Thread Eike Rathke

Hi,

On Wednesday, 2019-04-17 22:11:58 +0100, Richard Wordingham wrote:

> Is there a pointer as to which tag sequences that "strictly follow the
> BCP 47 language tag specification" are "correct"?

"strictly" here means, do not invent stuff, specifically not anything
that is not covered by the syntax defined, e.g. es-ES_tradnl is not
a valid language tag; do not invent language codes, tags or subtags, do
not use unassigned language codes. Be aware that an "x-..." private use
tag indeed *does* mean private and thus should not be stored in
documents that reach the wild.

"correct" here also means, furthermore than being strict it should make
sense.. e.g. assigning a ...-Latn tag to the CTL category does not make
sense, a language-script combination that does not exist also doesn't
make sense.

> As far as I can tell, the following all strictly follow the
> specification:

Yes.

> "sa-IN" Sanskrit as used in India - so far as I can tell, that could be
> in, for example, Devanagari, Grantha or even the Tamil script!  For
> Devanagari at least, I understand that this implies that homorganic
> nasals may be written using U+0902 DEVANAGARI SIGN ANUSVARA.

If in doubt, ask Microsoft if the in isolang.cxx assigned LCID isn't
LANGUAGE_USER_..., here it is LANGUAGE_SANSKRIT 0x044F. Most of these
even predate the existance of BCP 47 when only combinations of language
code and country code were used (also due to the Java Locale
restrictions).

What I usually did is, lookup the language at SIL and the Ethnologue and
use the most prevalent script as implied default script. Which here
https://www.ethnologue.com/language/san would lead to Devanagari, but in
this case more important is also what MS assigned the LCID for.

> "sa-150" Sanskrit written using European conventions - so, any script,
> but, at least for Devanagari, the anusvara sign is not used for
> homorganic nasals.

Though valid, LibreOffice doesn't use the numeric UN M.49 code, it may
be accepted but might not work everywhere.

> "sa-Deva-150" Sanskrit written in Devanagari in the manner used in
> Europe.

Same here.

> "sa-Latn" Sanskrit written in the Roman script.
> 
> "sa-Latf" Sanskrit written in Fraktur (I'm not sure that this exists.
> It might need a hint as to where to find a Fraktur script with a
> combining candrabindu.)

Both perfectly valid, if they serve any purpose. Though with sa-Latn
I doubt there's a use case, so I wouldn't call that "correct" in common
sense.

I also just learned that sa-Latf somehow exists..

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A

signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 forms/source/component/formcontrolfont.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 271dc5920d0f94e9fb876ccbbd9f4463d93a2612
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 15:59:58 2019 +
Commit: Julien Nabet 
CommitDate: Thu Apr 18 10:09:09 2019 +0200

Fix typo

Change-Id: If0104ebab265a98982808fa5003a499deae542b6
Reviewed-on: https://gerrit.libreoffice.org/70908
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/forms/source/component/formcontrolfont.cxx 
b/forms/source/component/formcontrolfont.cxx
index c00ecad5b0f7..cbb19a741cc2 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -439,7 +439,7 @@ namespace frm
 {
 if (isFontAggregateProperty(nHandle))
 {
-// need to fire a event for PROPERTY_ID_FONT too apparently, so:
+// need to fire an event for PROPERTY_ID_FONT too apparently, so:
 FontDescriptor font(getFont());
 
 // first set new value on backup copy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

 compilerplugins/clang/singlevalfields.results |   13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 1fee3f1da6291bfbcd75455512726215d41b3e83
Author: Andrea Gelmini 
AuthorDate: Sun Mar 10 00:41:33 2019 +0100
Commit: Julien Nabet 
CommitDate: Thu Apr 18 10:14:00 2019 +0200

Removed spurious chars

Same thing as in commit e5efd197ad403619ac274c88e2e3be648886aa3d

Change-Id: I84faa989387cefef18aa25fa813890d04858f7f2
Reviewed-on: https://gerrit.libreoffice.org/68987
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/compilerplugins/clang/singlevalfields.results 
b/compilerplugins/clang/singlevalfields.results
index 596df914cf76..b060a0f8a75d 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -1272,7 +1272,6 @@ sw/source/filter/ww8/ww8par3.cxx:370
 1
 sw/source/filter/ww8/ww8par5.cxx:1539
 SwWW8ImplReader::Read_F_DocInfo aName10
-
 sw/source/filter/ww8/ww8par5.cxx:1540
 SwWW8ImplReader::Read_F_DocInfo aName11
 TITEL
@@ -1287,13 +1286,12 @@ sw/source/filter/ww8/ww8par5.cxx:1546
 TITRO
 sw/source/filter/ww8/ww8par5.cxx:1548
 SwWW8ImplReader::Read_F_DocInfo aName20
-
 sw/source/filter/ww8/ww8par5.cxx:1549
 SwWW8ImplReader::Read_F_DocInfo aName21
 ERSTELLDATUM
 sw/source/filter/ww8/ww8par5.cxx:1551
 SwWW8ImplReader::Read_F_DocInfo aName22
-CR��
+CRÉÉ
 sw/source/filter/ww8/ww8par5.cxx:1553
 SwWW8ImplReader::Read_F_DocInfo aName23
 CREATED
@@ -1302,7 +1300,6 @@ sw/source/filter/ww8/ww8par5.cxx:1555
 CREADO
 sw/source/filter/ww8/ww8par5.cxx:1557
 SwWW8ImplReader::Read_F_DocInfo aName30
-
 sw/source/filter/ww8/ww8par5.cxx:1558
 SwWW8ImplReader::Read_F_DocInfo aName31
 ZULETZTGESPEICHERTZEIT
@@ -1317,13 +1314,12 @@ sw/source/filter/ww8/ww8par5.cxx:1564
 MODIFICADO
 sw/source/filter/ww8/ww8par5.cxx:1566
 SwWW8ImplReader::Read_F_DocInfo aName40
-
 sw/source/filter/ww8/ww8par5.cxx:1567
 SwWW8ImplReader::Read_F_DocInfo aName41
 ZULETZTGEDRUCKT
 sw/source/filter/ww8/ww8par5.cxx:1569
 SwWW8ImplReader::Read_F_DocInfo aName42
-DERNI�REIMPRESSION
+DERNIÈREIMPRESSION
 sw/source/filter/ww8/ww8par5.cxx:1571
 SwWW8ImplReader::Read_F_DocInfo aName43
 LASTPRINTED
@@ -1332,13 +1328,12 @@ sw/source/filter/ww8/ww8par5.cxx:1573
 HUPS PUPS
 sw/source/filter/ww8/ww8par5.cxx:1575
 SwWW8ImplReader::Read_F_DocInfo aName50
-
 sw/source/filter/ww8/ww8par5.cxx:1576
 SwWW8ImplReader::Read_F_DocInfo aName51
-�BERARBEITUNGSNUMMER
+ÜBERARBEITUNGSNUMMER
 sw/source/filter/ww8/ww8par5.cxx:1578
 SwWW8ImplReader::Read_F_DocInfo aName52
-NUM�RODEREVISION
+NUMÉRODEREVISION
 sw/source/filter/ww8/ww8par5.cxx:1580
 SwWW8ImplReader::Read_F_DocInfo aName53
 REVISIONNUMBER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/qa xmloff/source

2019-04-18 Thread David Vogt (via logerrit)

 sw/qa/extras/odfimport/data/tdf113289.odt  |binary
 sw/qa/extras/odfimport/odfimport.cxx   |9 +
 xmloff/source/style/XMLFootnoteSeparatorImport.cxx |5 -
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit a601e0867d0ac2c80342308622bfcc3546fce746
Author: David Vogt 
AuthorDate: Wed Mar 13 13:11:39 2019 +0100
Commit: Xisco Faulí 
CommitDate: Thu Apr 18 12:17:44 2019 +0200

tdf#113289: Default value for footnote separator

In old versions of LO/AOO, separator style was defaulting to a solid
line. When you have an old document that doesn't have the style set
explicitly, the line would disappear.

Since newer versions explicitly set the style, we should set the default
to what it was before.

Change-Id: I8dacea75fcf2f95f9bc145442b22ab0d173e7c5a
Reviewed-on: https://gerrit.libreoffice.org/69167
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 4aa8a6ab08b755e3d82860e8dbc294f854336477)
Reviewed-on: https://gerrit.libreoffice.org/70892
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/odfimport/data/tdf113289.odt 
b/sw/qa/extras/odfimport/data/tdf113289.odt
new file mode 100644
index ..01aa5700c6d5
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf113289.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 0d71f95cb8e1..4df20d9e42a8 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -926,5 +927,13 @@ DECLARE_ODFIMPORT_TEST(testTdf123829, "tdf123829.odt")
 
pDoc->getIDocumentSettingAccess().get(DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA));
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf113289, "tdf113289.odt")
+{
+uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
+
CPPUNIT_ASSERT_EQUAL(static_cast(style::FootnoteLineStyle::SOLID),
+ getProperty(aPageStyle, 
"FootnoteLineStyle"));
+}
+
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx 
b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index a41a31d725f9..bfc57f62b27a 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -80,7 +80,10 @@ void XMLFootnoteSeparatorImport::StartElement(
 text::HorizontalAdjust eLineAdjust = text::HorizontalAdjust_LEFT;
 sal_Int32 nLineTextDistance = 0;
 sal_Int32 nLineDistance = 0;
-sal_Int8 nLineStyle = 0;
+
+// Default separator line style should be SOLID (used to be default before
+// the choice selector was available)
+sal_Int8 nLineStyle = 1;
 
 // iterate over xattribute list and fill values
 sal_Int16 nLength = xAttrList->getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

2019-04-18 Thread Tamás Zolnai (via logerrit)

 sw/source/uibase/docvw/edtwin.cxx   |2 +-
 sw/source/uibase/inc/uitool.hxx |   12 
 sw/source/uibase/shells/textsh1.cxx |   26 +++---
 sw/source/uibase/utlui/uitool.cxx   |   34 ++
 4 files changed, 50 insertions(+), 24 deletions(-)

New commits:
commit bb1e671f2ef54e36102bb3299b44582f46752b4a
Author: Tamás Zolnai 
AuthorDate: Sat Apr 6 18:16:24 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 18 12:28:18 2019 +0200

tdf#114801: Cannot use the highlight 'bucket' function with docx file

Change-Id: I00df0022a20e83d76484d7c6e7b903ecd3c54aa0
Reviewed-on: https://gerrit.libreoffice.org/70347
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 84d4125b28c384f9ac6285737a5bb9093978798e)
Reviewed-on: https://gerrit.libreoffice.org/70454
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 4ccbd77d9c1c..0f4a669bcf05 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4750,7 +4750,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 m_pApplyTempl->nUndo =
 std::min(m_pApplyTempl->nUndo, 
rSh.GetDoc()->GetIDocumentUndoRedo().GetUndoActionCount());
 if (nId == RES_CHRATR_BACKGROUND)
-rSh.SetAttrItem( SvxBrushItem( 
m_aWaterCanTextBackColor, nId ) );
+ApplyCharBackground(m_aWaterCanTextBackColor, rSh);
 else
 rSh.SetAttrItem( SvxColorItem( m_aWaterCanTextColor, 
nId ) );
 rSh.UnSetVisibleCursor();
diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx
index 68def8b554bc..384005ad6c93 100644
--- a/sw/source/uibase/inc/uitool.hxx
+++ b/sw/source/uibase/inc/uitool.hxx
@@ -37,6 +37,7 @@ class SwFrameFormat;
 class SwTabCols;
 class DateTime;
 class SfxViewFrame;
+class SwEditShell;
 
 // switch a metric
 SW_DLLPUBLIC void SetMetric(MetricFormatter& rCtrl, FieldUnit eUnit);
@@ -60,6 +61,17 @@ SW_DLLPUBLIC void ConvertAttrCharToGen(SfxItemSet& rSet);
 **/
 SW_DLLPUBLIC void ConvertAttrGenToChar(SfxItemSet& rSet, const SfxItemSet& 
rOrigSet);
 
+
+/**
+* Apply characeter background on the shell. Need to use this to hide the mixed
+* charachter background and character highlighting attribute, which were
+* added for MSO compatibility where there are two kind of character background.
+*
+* @param[in]   rBackgroundColorthe color to apply on the shell
+* @param[in,out]   rShell  the shell on which we apply the new 
attirbute
+**/
+SW_DLLPUBLIC void ApplyCharBackground(const Color& rBackgroundColor, 
SwWrtShell& rShell);
+
 // SfxItemSets <-> PageDesc
 void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc );
 void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet);
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index 5a77cbefec63..dde3a8a853e3 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1195,11 +1195,9 @@ void SwTextShell::Execute(SfxRequest )
 {
 if (nSlot != SID_ATTR_CHAR_COLOR_EXT)
 {
-rWrtSh.StartUndo( SwUndoId::INSATTR );
-
 SfxItemSet aCoreSet( rWrtSh.GetView().GetPool(), 
svl::Items<
- RES_CHRATR_BACKGROUND, 
RES_CHRATR_BACKGROUND,
- RES_CHRATR_GRABBAG, 
RES_CHRATR_GRABBAG>{} );
+ RES_CHRATR_BACKGROUND, 
RES_CHRATR_BACKGROUND>{} );
+
 rWrtSh.GetCurAttr( aCoreSet );
 
 // Remove highlight if already set of the same color
@@ -1207,25 +1205,7 @@ void SwTextShell::Execute(SfxRequest )
 if ( aSet == rBrushItem.GetColor() )
 aSet = COL_TRANSPARENT;
 
-rWrtSh.SetAttrItem( SvxBrushItem(aSet, 
RES_CHRATR_BACKGROUND) );
-
-// Remove MS specific highlight when background is set
-rWrtSh.SetAttrItem( SvxBrushItem(RES_CHRATR_HIGHLIGHT) );
-
-// Remove shading marker
-const SfxPoolItem *pTmpItem;
-if( SfxItemState::SET == aCoreSet.GetItemState( 
RES_CHRATR_GRABBAG, false,  ) )
-{
-SfxGrabBagItem aGrabBag(*static_cast(pTmpItem));
-std::map& rMap = 
aGrabBag.GetGrabBag();
-auto aIterator = rMap.find("CharShadingMarker");
-if( aIterator != rMap.end() )
-{
-aIterator->second <<= false;
-}
-rWrtSh.SetAttrItem( aGrabBag );
-}

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

 vcl/source/gdi/bmpacc.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 314d101b1336748b22df6582e7aacd455aa4171f
Author: Caolán McNamara 
AuthorDate: Thu Apr 18 10:24:19 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 18 12:26:35 2019 +0200

forcepoint#78 large double cast to sal_Int32 wraps to neg

Change-Id: I831d0dd62d0b28dc19b90b03de3eaa159984347c
Reviewed-on: https://gerrit.libreoffice.org/70922
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index a0b9427b24b1..a03147696c7e 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -221,8 +221,8 @@ BitmapColor 
BitmapReadAccess::GetInterpolatedColorWithFallback( double fY, doubl
 // double values, e.g. static_cast< sal_Int32 >(-0.25) is 0, not -1, but 
*has* to be outside (!)
 if(mpBuffer && fX >= 0.0 && fY >= 0.0)
 {
-const sal_Int32 nX(static_cast< sal_Int32 >(fX));
-const sal_Int32 nY(static_cast< sal_Int32 >(fY));
+const sal_Int64 nX(static_cast(fX));
+const sal_Int64 nY(static_cast(fY));
 
 if(nX < mpBuffer->mnWidth && nY < mpBuffer->mnHeight)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry

2019-04-18 Thread Andras Timar (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ec742cca9de214fa03ca4215829eb0410363d346
Author: Andras Timar 
AuthorDate: Thu Apr 18 12:38:11 2019 +0200
Commit: Andras Timar 
CommitDate: Thu Apr 18 12:38:11 2019 +0200

[cp] ViewPDFAfterExport default true

Change-Id: I2c054ba672c7ab52a6e3f3f085823fd5015f0d62

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 6aee83bbce97..a84787e28a26 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -4833,7 +4833,7 @@
 
   Specifies if PDF automatically opens after export.
 
-false
+true
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 connectivity/source/drivers/firebird/SubComponent.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 408fcdf20c4ce505c1905d63d2fa6a14a12fc7f5
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:05:17 2019 +
Commit: Julien Nabet 
CommitDate: Thu Apr 18 10:03:03 2019 +0200

Fix typo

Change-Id: I1021d7cfc2b27924e3a30d0f0d6a936e2bec99f9
Reviewed-on: https://gerrit.libreoffice.org/70907
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx 
b/connectivity/source/drivers/firebird/SubComponent.hxx
index 3fa7727db2ea..ae100956ed1a 100644
--- a/connectivity/source/drivers/firebird/SubComponent.hxx
+++ b/connectivity/source/drivers/firebird/SubComponent.hxx
@@ -76,7 +76,7 @@ namespace connectivity
 This method needs to be implemented in derived classes.
 
 The method gets called with s_aMutex acquired.
-@return an pointer to the newly 
created array helper. Must not be NULL.
+@return a pointer to the newly created 
array helper. Must not be NULL.
 */
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const = 
0;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa

2019-04-18 Thread Miklos Vajna (via logerrit)

 sw/qa/extras/uiwriter/uiwriter2.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ea6049306858b4bb074fcdafa6defbf08ce2f4c6
Author: Miklos Vajna 
AuthorDate: Thu Apr 18 10:39:17 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 18 10:39:33 2019 +0200

sw: fix missing include

Change-Id: If6a50542e8e2c4899b1d89ba6456e0f39b4cf39a

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 4c58cd743722..2a106ed74581 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl

 sal/osl/unx/nlsupport.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 56bc0b1a376f62570a7287e9bb4193e00360c978
Author: Stephan Bergmann 
AuthorDate: Thu Apr 18 09:01:22 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 18 10:51:25 2019 +0200

Don't set locale env vars on macOS

macosx_getLocale (via getProcessLocale, both sal/osl/unx/osxlocale.cxx) 
obtains
from the system a locale string like "en-DE".  (Whether that is even a sane 
and
recommended way to obtain the system locale on macOS I don't know; but lets
leave it at that for now.)

However, setting a locale env var (LANG, LC_ALL) to such a value causes a
constructor call std::locale("") to throw a std::runtime_error
"collate_byname::collate_byname failed to construct for ", at least on
macOS 10.14.4.  And libdivvun (which might be bundled with a LO extension) 
is
known to be hit by that, see 
"locale("") gives 'collate_byname::collate_byname failed to construct
for ' on LO on mac".

The code setting LC_ALL/LC_CTYPE/LANG was there ever since
8737d1831b48acd8a4793c4728ad8563f77b5bf8 "INTEGRATION:
CWS geordi2q14: #111934#: merge CWS ooo111fix2", but for unclear reasons.  
Lets
assume that it had no purpose (any longer).

Change-Id: I0b519ad567a713d61f662aa984791db1a91c708c
Reviewed-on: https://gerrit.libreoffice.org/70918
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 03a7c1c550ca..616447ecafe3 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -835,12 +835,6 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
 
 /* return the locale */
 *ppLocale = parse_locale( locale.getStr() );
-
-#ifndef IOS
-setenv( "LC_ALL", locale.getStr(), 1);
-setenv("LC_CTYPE", locale.getStr(), 1 );
-setenv("LANG", locale.getStr(), 1 );
-#endif
 }
 #else
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-04-18 Thread Jan Holesovsky (via logerrit)

 sc/source/ui/dbgui/sfiltdlg.cxx |   33 ++---
 sc/source/ui/inc/filtdlg.hxx|7 ++-
 2 files changed, 16 insertions(+), 24 deletions(-)

New commits:
commit 9bb32c6629b068c18d1f7df63a86d1cab66856eb
Author: Jan Holesovsky 
AuthorDate: Wed Apr 17 18:22:46 2019 +0200
Commit: Aron Budea 
CommitDate: Thu Apr 18 13:52:40 2019 +0200

sc: Get rid of the Idle hack in the Special Filter Dialog.

The problem is that with LOK, the creation of Idle here causes a
deadlock when the dialog is being opened and its first paint is
requested.

No real idea what change now causes the problem (this used to work), but
given that the use of the Idle is a hack in the first place, let's use
the GetFocus/LoseFocus handlers instead, and act accordingly only when
the focus of the interesting controls changes.

Change-Id: Ib6c0267a064cb31438544e47fe3e0869b575ef7c
Reviewed-on: https://gerrit.libreoffice.org/70917
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index fe441db8bd16..2366af951e5e 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -57,8 +57,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, 
SfxChildWindow* pCW, vc
 pViewData   ( nullptr ),
 pDoc( nullptr ),
 pRefInputEdit   ( nullptr ),
-bRefInputMode   ( false ),
-pIdle  ( nullptr )
+bRefInputMode   ( false )
 {
 get(pLbFilterArea,"lbfilterarea");
 get(pEdFilterArea,"edfilterarea");
@@ -83,14 +82,18 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, 
SfxChildWindow* pCW, vc
 get(pExpander,"more");
 
 Init( rArgSet );
-pEdFilterArea->GrabFocus();
 
-// hack: control of RefInput
-pIdle = new Idle("Special Filter Dialog");
-// FIXME: this is an abomination
-pIdle->SetPriority( TaskPriority::LOWEST );
-pIdle->SetInvokeHandler( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) );
-pIdle->Start();
+Link aLink = LINK(this, ScSpecialFilterDlg, 
RefInputControlHdl);
+pEdCopyArea->SetGetFocusHdl(aLink);
+pRbCopyArea->SetGetFocusHdl(aLink);
+pEdFilterArea->SetGetFocusHdl(aLink);
+pRbFilterArea->SetGetFocusHdl(aLink);
+pEdCopyArea->SetLoseFocusHdl(aLink);
+pRbCopyArea->SetLoseFocusHdl(aLink);
+pEdFilterArea->SetLoseFocusHdl(aLink);
+pRbFilterArea->SetLoseFocusHdl(aLink);
+
+pEdFilterArea->GrabFocus();
 }
 
 ScSpecialFilterDlg::~ScSpecialFilterDlg()
@@ -109,10 +112,6 @@ void ScSpecialFilterDlg::dispose()
 
 delete pOutItem;
 
-// hack: control of RefInput
-pIdle->Stop();
-delete pIdle;
-
 pLbFilterArea.clear();
 pEdFilterArea.clear();
 pRbFilterArea.clear();
@@ -389,11 +388,9 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, 
void )
 }
 }
 
-IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pIdle, void )
+IMPL_LINK_NOARG(ScSpecialFilterDlg, RefInputControlHdl, Control&, void)
 {
-// every 50ms check whether RefInputMode is still true
-
-if( (_pIdle == pIdle) && IsActive() )
+if (IsActive())
 {
 if( pEdCopyArea->HasFocus() || pRbCopyArea->HasFocus() )
 {
@@ -411,8 +408,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pIdle, 
void )
 bRefInputMode = false;
 }
 }
-
-pIdle->Start();
 }
 
 IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void )
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 1505a0bec22f..829cb0b2c7fa 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -206,9 +206,6 @@ private:
 VclPtr   pRefInputEdit;
 boolbRefInputMode;
 
-// Hack: RefInput control
-Idle*  pIdle;
-
 private:
 voidInit( const SfxItemSet& rArgSet );
 ScQueryItem*GetOutputItem( const ScQueryParam& rParam,
@@ -219,8 +216,8 @@ private:
 DECL_LINK( FilterAreaModHdl, Edit&, void );
 DECL_LINK( EndDlgHdl,  Button*, void );
 
-// Hack: RefInput control
-DECL_LINK( TimeOutHdl, Timer*, void );
+// RefInput control
+DECL_LINK( RefInputControlHdl, Control&, void );
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/core/data/table2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f33942b7f418e8774d99d5c56aad4455c07eb809
Author: Noel Grandin 
AuthorDate: Thu Apr 18 11:56:52 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 18 13:22:45 2019 +0200

tdf#124815 CRASH: inserting a column

regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100
tdf#50916 Makes numbers of columns dynamic.

Change-Id: If82689218344d1fea025d7d6e409dd5ec9e2d3b3
Reviewed-on: https://gerrit.libreoffice.org/70924
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index fa35ef22e2e5..218ca0c8e1cc 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1501,7 +1501,7 @@ bool ScTable::SetFormulaCells( SCCOL nCol, SCROW nRow, 
std::vectorhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/core/data/table2.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5585dfdaf7180c5ab6fb1543ae2b66337c641fd5
Author: Noel Grandin 
AuthorDate: Thu Apr 18 12:21:36 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 18 14:15:40 2019 +0200

tdf#124818 CRASH selecting all and switching spreadsheet

regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100
tdf#50916 Makes numbers of columns dynamic.

Change-Id: I033bcae2bdc97c3aae24557c5949c7759041b3bc
Reviewed-on: https://gerrit.libreoffice.org/70925
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 218ca0c8e1cc..4c303d9d3996 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1692,7 +1692,8 @@ bool ScTable::ContainsNotesInRange( const ScRange& rRange 
) const
 {
 SCROW nStartRow = rRange.aStart.Row();
 SCROW nEndRow = rRange.aEnd.Row();
-for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
+SCCOL nEndCol = ClampToAllocatedColumns(rRange.aEnd.Col());
+for (SCCOL nCol = rRange.aStart.Col(); nCol <= nEndCol; ++nCol)
 {
 bool bContainsNote = !aCol[nCol].IsNotesEmptyBlock(nStartRow, nEndRow);
 if(bContainsNote)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

 solenv/flatpak-manifest.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit db698a94ad52d1fbc387df66845907595615bb4f
Author: Stephan Bergmann 
AuthorDate: Thu Apr 18 13:34:23 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 18 14:25:13 2019 +0200

Disable OpenCL by default for LO Flatpak

...merging  "Disable OpenCL by default for LO
Flatpak":

"This fixes 

'LibreOffice cannot be launched with flatpak in normal mode on ASUS E402YA',
where LO was found hanging (for as yet unclear exact reasons) on one machine
when OpenCL was enabled.  There have been other issues with OpenCL like
 'LibreOffice crashes 
on
startup' on Fedora, so for a Flatpak build targeting a wide range of 
distros,
the conservative approach is probably to disable OpenCL by default and have
users explicitly enable it instead."

Change-Id: I887137d1ceb5d97f007f09cba636c59f197f1bff
Reviewed-on: https://gerrit.libreoffice.org/70928
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 4fcf0f5f1383..ef5802713baf 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -574,7 +574,8 @@
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak",
 "make $(if test \"$FLATPAK_ARCH\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
-"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
+"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
+"printf '\\nhttp://www.w3.org/2001/XMLSchema\; 
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\; 
xmlns:oor=\"http://openoffice.org/2001/registry\;>false'
 >/app/libreoffice/share/registry/flatpak.xcd"
 ]
 }
 ],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: CustomTarget_html.mk

2019-04-18 Thread Libreoffice Gerrit user

 CustomTarget_html.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a21dc1cc51f0363b33e59b5c34c74d5c6737f1e
Author: Stephan Bergmann 
AuthorDate: Thu Apr 18 13:57:32 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 18 15:38:51 2019 +0200

Don't set LANG env var by accident

...as setting a GNU Make LANG var exports it to recipes as an env var, and 
see
e.g. 56bc0b1a376f62570a7287e9bb4193e00360c978 "Don't set locale env vars on
macOS" for potential problems caused by that.

This is the help half of a change spanning the core and help repos.

Change-Id: Ib5faf612e9030db384f7408ecd4fd03e65120f17
Reviewed-on: https://gerrit.libreoffice.org/70930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 45d3f284b..42ff2afee 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -83,7 +83,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/langnames.js : \
 define html_gen_contents_html_dep
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : 
$(call gb_HelpTarget__get_treefile,$(1),$(3))
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : 
TREE_FILE := $(call gb_HelpTarget__get_treefile,$(1),$(3))
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : 
LANG := $(2)
+$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : 
LANGUAGE := $(2)
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : 
MODULE := $(lastword $(subst :, ,$(filter $(module):%, $(html_BMARK_MODULES
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2 librelogo/CustomTarget_librelogo.mk solenv/gbuild wizards/CustomTarget_wizards.mk

 helpcontent2|2 +-
 librelogo/CustomTarget_librelogo.mk |8 
 solenv/gbuild/Configuration.mk  |4 ++--
 solenv/gbuild/Dictionary.mk |8 
 wizards/CustomTarget_wizards.mk |8 
 5 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 4985446a827c53bf2f1840a279b07f065f622f0e
Author: Stephan Bergmann 
AuthorDate: Thu Apr 18 13:57:32 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Apr 18 15:38:51 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Don't set LANG env var by accident

...as setting a GNU Make LANG var exports it to recipes as an env var, 
and see
e.g. 56bc0b1a376f62570a7287e9bb4193e00360c978 "Don't set locale env 
vars on
macOS" for potential problems caused by that.

This is the help half of a change spanning the core and help repos.

Change-Id: Ib5faf612e9030db384f7408ecd4fd03e65120f17
Reviewed-on: https://gerrit.libreoffice.org/70930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/helpcontent2 b/helpcontent2
index a1e2a03853bb..8a21dc1cc51f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a1e2a03853bb6efebfc0e09679fef829d87745a9
+Subproject commit 8a21dc1cc51f0363b33e59b5c34c74d5c6737f1e
commit 2c1a12d351d1792bac3c57dfbc7caab5b65978d6
Author: Stephan Bergmann 
AuthorDate: Thu Apr 18 13:54:28 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 18 15:38:27 2019 +0200

Don't set LANG env var by accident

...as setting a GNU Make LANG var exports it to recipes as an env var, and 
see
e.g. 56bc0b1a376f62570a7287e9bb4193e00360c978 "Don't set locale env vars on
macOS" for potential problems caused by that.

This is the core half of a change spanning the core and help repos.

Change-Id: Ib7ae3b6edcef0b70e211a01aad4b3bd5c8905e06
Reviewed-on: https://gerrit.libreoffice.org/70929
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/librelogo/CustomTarget_librelogo.mk 
b/librelogo/CustomTarget_librelogo.mk
index a523d501b2de..6cc693f34aa2 100644
--- a/librelogo/CustomTarget_librelogo.mk
+++ b/librelogo/CustomTarget_librelogo.mk
@@ -17,7 +17,7 @@ $(call 
librelogo_Properties__Properties_impl,$(librelogo_DIR)/LibreLogo_$(1).pro
 endef
 
 define librelogo_Properties__Properties_impl
-$(1) : LANG := $(4)
+$(1) : LANGUAGE := $(4)
 $(1) : POFILE := $(3)
 $(1) : SOURCE := $(2)
 
@@ -37,20 +37,20 @@ $(librelogo_DIR)/LibreLogo_%.properties : \
| $(librelogo_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1)
$(call gb_Helper_abbreviate_dirs, \
-   $(if $(filter-out qtz,$(LANG)), \
+   $(if $(filter-out qtz,$(LANGUAGE)), \
MERGEINPUT=$(call var2file,$(shell 
$(gb_MKTEMP)),100,$(POFILE)) && \
$(call gb_Executable_get_command,propex) \
-i $(SOURCE) \
-o $@ \
-m $${MERGEINPUT} \
-   -l $(LANG) && \
+   -l $(LANGUAGE) && \
rm -rf $${MERGEINPUT} \
, \
$(call gb_Executable_get_command,propex) \
-i $(SOURCE) \
-o $@ \
-m \
-   -l $(LANG) \
+   -l $(LANGUAGE) \
) \
)
 
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 2abf9be737c3..378a3d5625b4 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -190,7 +190,7 @@ define gb_XcuLangpackTarget__command
 $(call gb_Output_announce,$(2),$(true),XCL,1)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
-   sed -e "s/__LANGUAGE__/$(LANG)/" -f 
$(gb_XcuLangpackTarget_SED_delcomment)\
+   sed -e "s/__LANGUAGE__/$(LANGUAGE)/" -f 
$(gb_XcuLangpackTarget_SED_delcomment)\
$(3) > $(1))
 endef
 
@@ -384,7 +384,7 @@ $(call gb_Configuration_get_target,$(1)) : \
$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4))
 $(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : \
$(SRCDIR)/$(2)/$(3).tmpl
-$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : LANG := $(4)
+$(call gb_XcuLangpackTarget__get_target_with_lang,$(3),$(4)) : LANGUAGE := $(4)
 
 endef
 
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 8b8c8c56f8f9..6c4e6a7490e7 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -60,18 +60,18 @@ gb_PropertiesTranslateTarget_DEPS := $(call 
gb_Executable_get_runtime_dependenci
 define gb_PropertiesTranslateTarget__command
 $(call

[Libreoffice-commits] core.git: include/sal vcl/unx

2019-04-18 Thread Jens Carl (via logerrit)

 include/sal/log-areas.dox  |1 +
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx |8 
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2a8f2fd072c9de7b5dc538419565e3351bd0936a
Author: Jens Carl 
AuthorDate: Wed Apr 17 15:41:20 2019 -0700
Commit: Stephan Bergmann 
CommitDate: Thu Apr 18 13:47:27 2019 +0200

tdf#43157 Clean up OSL_TRACE (replace with SAL_INFO)

Change-Id: Ifa196dec38d1b84ef14e9bb3a6b45d5ead72064a
Reviewed-on: https://gerrit.libreoffice.org/70904
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 9ee69be03b6f..da6fd1c4a171 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -470,6 +470,7 @@ certain functionality.
 @li @c vcl.gdi.fontmetric
 @li @c vcl.gtk - Gtk+ 2/3 plugin
 @li @c vcl.gtk3
+@li @c vcl.gtkkde5
 @li @c vcl.harfbuzz - HarfBuzz text layout
 @li @c vcl.headless - bitmap-based backend
 @li @c vcl.helper
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index 8006bc37c7dc..47398d01f5c0 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -177,7 +177,7 @@ void SAL_CALL Gtk3KDE5FilePicker::setValue(sal_Int16 
controlId, sal_Int16 nContr
 }
 else
 {
-OSL_TRACE("set value of unhandled type %d", controlId);
+SAL_INFO("vcl.gtkkde5", "set value of unhandled type " << controlId);
 }
 }
 
@@ -403,7 +403,7 @@ void SAL_CALL Gtk3KDE5FilePicker::initialize(const 
uno::Sequence& args
 break;
 
 default:
-OSL_TRACE("Unknown templates %d", templateId);
+SAL_INFO("vcl.gtkkde5", "unknown templates " << templateId);
 return;
 }
 
@@ -446,7 +446,7 @@ void Gtk3KDE5FilePicker::filterChanged()
 {
 FilePickerEvent aEvent;
 aEvent.ElementId = LISTBOX_FILTER;
-OSL_TRACE("filter changed");
+SAL_INFO("vcl.gtkkde5", "filter changed");
 if (m_xListener.is())
 m_xListener->controlStateChanged(aEvent);
 }
@@ -454,7 +454,7 @@ void Gtk3KDE5FilePicker::filterChanged()
 void Gtk3KDE5FilePicker::selectionChanged()
 {
 FilePickerEvent aEvent;
-OSL_TRACE("file selection changed");
+SAL_INFO("vcl.gtkkde5", "file selection changed");
 if (m_xListener.is())
 m_xListener->fileSelectionChanged(aEvent);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - external/libxslt jvmfwk/inc jvmfwk/plugins jvmfwk/source solenv/clang-format svx/source

2019-04-18 Thread Michael Stahl (via logerrit)

 external/libxslt/UnpackedTarball_libxslt.mk   |1 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 |  120 
 jvmfwk/inc/fwkbase.hxx|   11 
 jvmfwk/inc/libxmlutil.hxx |4 
 jvmfwk/inc/vendorplugin.hxx   |   94 ---
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx   |  109 +--
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx|7 
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx  |   17 
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx  |5 
 jvmfwk/source/elements.cxx|4 
 jvmfwk/source/framework.cxx   |  275 
+++---
 jvmfwk/source/fwkbase.cxx |   18 
 jvmfwk/source/libxmlutil.cxx  |2 
 solenv/clang-format/blacklist |4 
 svx/source/svdraw/svdundo.cxx |8 
 15 files changed, 317 insertions(+), 362 deletions(-)

New commits:
commit a8a394bf9fe86c288f6c3d5ef521e5663ce0b6aa
Author: Michael Stahl 
AuthorDate: Wed Apr 17 14:50:10 2019 +0200
Commit: Andras Timar 
CommitDate: Thu Apr 18 15:39:24 2019 +0200

libxslt: add patch for CVE-2019-11068

Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4
Reviewed-on: https://gerrit.libreoffice.org/70879
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e)

diff --git a/external/libxslt/UnpackedTarball_libxslt.mk 
b/external/libxslt/UnpackedTarball_libxslt.mk
index eae318ef74b9..beb591b8b2a8 100644
--- a/external/libxslt/UnpackedTarball_libxslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
+   external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
new file mode 100644
index ..260f35d1a35e
--- /dev/null
+++ b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
@@ -0,0 +1,120 @@
+From e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer 
+Date: Sun, 24 Mar 2019 09:51:39 +0100
+Subject: [PATCH] Fix security framework bypass
+
+xsltCheckRead and xsltCheckWrite return -1 in case of error but callers
+don't check for this condition and allow access. With a specially
+crafted URL, xsltCheckRead could be tricked into returning an error
+because of a supposedly invalid URL that would still be loaded
+succesfully later on.
+
+Fixes #12.
+
+Thanks to Felix Wilhelm for the report.
+---
+ libxslt/documents.c | 18 ++
+ libxslt/imports.c   |  9 +
+ libxslt/transform.c |  9 +
+ libxslt/xslt.c  |  9 +
+ 4 files changed, 25 insertions(+), 20 deletions(-)
+
+diff --git a/libxslt/documents.c b/libxslt/documents.c
+index 3f3a7312..4aad11bb 100644
+--- a/libxslt/documents.c
 b/libxslt/documents.c
+@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const 
xmlChar *URI) {
+   int res;
+ 
+   res = xsltCheckRead(ctxt->sec, ctxt, URI);
+-  if (res == 0) {
+-  xsltTransformError(ctxt, NULL, NULL,
+-   "xsltLoadDocument: read rights for %s denied\n",
+-   URI);
++  if (res <= 0) {
++if (res == 0)
++xsltTransformError(ctxt, NULL, NULL,
++ "xsltLoadDocument: read rights for %s denied\n",
++ URI);
+   return(NULL);
+   }
+ }
+@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const 
xmlChar *URI) {
+   int res;
+ 
+   res = xsltCheckRead(sec, NULL, URI);
+-  if (res == 0) {
+-  xsltTransformError(NULL, NULL, NULL,
+-   "xsltLoadStyleDocument: read rights for %s denied\n",
+-   URI);
++  if (res <= 0) {
++if (res == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsltLoadStyleDocument: read rights for %s denied\n",
++ URI);
+   return(NULL);
+   }
+ }
+diff --git a/libxslt/imports.c b/libxslt/imports.c
+index 874870cc..3783b247 100644
+--- a/libxslt/imports.c
 b/libxslt/imports.c
+@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, 
xmlNodePtr cur) {
+   int secres;
+ 
+   secres = xsltCheckRead(sec, NULL, URI);
+-  if (secres == 0)

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - solenv/flatpak-manifest.in

 solenv/flatpak-manifest.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ca0ac3938020e8a544071fc6b08eb6b2830b5cc1
Author: Stephan Bergmann 
AuthorDate: Thu Apr 18 13:34:23 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 18 17:06:43 2019 +0200

Disable OpenCL by default for LO Flatpak

...merging  "Disable OpenCL by default for LO
Flatpak":

"This fixes 

'LibreOffice cannot be launched with flatpak in normal mode on ASUS E402YA',
where LO was found hanging (for as yet unclear exact reasons) on one machine
when OpenCL was enabled.  There have been other issues with OpenCL like
 'LibreOffice crashes 
on
startup' on Fedora, so for a Flatpak build targeting a wide range of 
distros,
the conservative approach is probably to disable OpenCL by default and have
users explicitly enable it instead."

Change-Id: I887137d1ceb5d97f007f09cba636c59f197f1bff
Reviewed-on: https://gerrit.libreoffice.org/70928
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit db698a94ad52d1fbc387df66845907595615bb4f)
Reviewed-on: https://gerrit.libreoffice.org/70931

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 79d4571a2a13..45b7470a65a5 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -563,7 +563,8 @@
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak",
 "make $(if test \"$FLATPAK_ARCH\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
-"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
+"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
+"printf '\\nhttp://www.w3.org/2001/XMLSchema\; 
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\; 
xmlns:oor=\"http://openoffice.org/2001/registry\;>false'
 >/app/libreoffice/share/registry/flatpak.xcd"
 ]
 }
 ],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa sw/source

 sw/qa/extras/layout/data/forcepoint79-1.doc |binary
 sw/qa/extras/layout/layout.cxx  |3 +++
 sw/source/core/layout/findfrm.cxx   |   10 --
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 453e6fb7c1827d317dc775df32a6cf91b2bb5a67
Author: Caolán McNamara 
AuthorDate: Thu Apr 18 11:29:37 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 18 17:13:24 2019 +0200

forcepoint#79 FindStartEndOfRowSpanCell returning null

Change-Id: I85f5b17b7dc2d3c4dfef92f64451fab451f58112
Reviewed-on: https://gerrit.libreoffice.org/70927
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/layout/data/forcepoint79-1.doc 
b/sw/qa/extras/layout/data/forcepoint79-1.doc
new file mode 100644
index ..ba53db79f278
Binary files /dev/null and b/sw/qa/extras/layout/data/forcepoint79-1.doc differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index e44acc8ba1c0..91705c8e18d9 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2564,6 +2564,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint75)
 //just care it doesn't crash/assert
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint76) { 
createDoc("forcepoint76-1.rtf"); }
 
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint79) { 
createDoc("forcepoint79-1.doc"); }
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118058)
 {
 SwDoc* pDoc = createDoc("tdf118058.fodt");
diff --git a/sw/source/core/layout/findfrm.cxx 
b/sw/source/core/layout/findfrm.cxx
index 7a411d549ba6..1e98e7549947 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1668,8 +1668,6 @@ SwCellFrame* SwCellFrame::GetPreviousCell() const
 // --> NEW TABLES
 const SwCellFrame& SwCellFrame::FindStartEndOfRowSpanCell( bool bStart ) const
 {
-const SwCellFrame* pRet = nullptr;
-
 const SwTabFrame* pTableFrame = dynamic_cast(GetUpper()->GetUpper());
 
 if ( !bStart && pTableFrame && pTableFrame->IsFollow() && 
pTableFrame->IsInHeadline( *this ) )
@@ -1726,17 +1724,17 @@ const SwCellFrame& 
SwCellFrame::FindStartEndOfRowSpanCell( bool bStart ) const
 
 if ( pMasterTable == pTableFrame )
 {
-pRet = pMasterCell;
-break;
+return *pMasterCell;
 }
 }
 }
 }
 
-assert(pRet && "SwCellFrame::FindStartRowSpanCell: No result");
+SAL_WARN("sw.core", "SwCellFrame::FindStartRowSpanCell: No result");
 
-return *pRet;
+return *this;
 }
+
 // <-- NEW TABLES
 
 const SwRowFrame* SwFrame::IsInSplitTableRow() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: MacUpdate - your app listing has been updated

2019-04-18 Thread Michael H

Seems like it might be a security issue to having a public account with a
community mailing list as the contact/recovery email...

On Thu, Apr 18, 2019 at 11:54 AM MacUpdate  wrote:

>
> 
> [image: top background]
>
> App Listing Updated
>
> *Hi The Document Foundation*, We have updated your application listing
> for *LibreOffice 6.2.3.2* on MacUpdate.com
> .
> Please take a moment to review your application's information to make sure
> that everything is correct.
> View your updated app listing [image: view your updated app]
> 
> You can login to your Developer Account
> 
> to reply to comments and view stats, or submit new updates and changes
> 
> to your app listing.
> [image: MacUpdate Desktop install compatibility]
> 
>
> Desktop Install Compatibility
>
> MacUpdate Desktop 6 is helping developers make it easier for users to
> fully install and use their apps. Download Desktop 6 and to ensure your app
> works with the “Install” link on our download pages.
> Advertise With MacUpdate
>
> The best Mac devs advertise their apps on MacUpdate.com because it’s the
> most targeted, highly performing Mac app advertising you can find on the
> web. Contact a...@macupdate.com to guarantee your annual ad campaigns get
> booked and expand your app’s audience.
> Learn more [image: view your updated app]
> 
> [image: MacUpdate Desktop install compatibility]*Questions?* Contact our
> Content Update Team upda...@macupdate.com.
> [image: bottom background]
>
> You are receiving this offer because you have an app listed on
> MacUpdate.com. Add us to your address book or white list to ensure reliable
> delivery.
>
> © 2018 MacUpdate - All Rights Reserved
> 526 W. 14th St. #100 • Traverse City, MI 49684
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg

2019-04-18 Thread andreas kainz (via logerrit)

 dev/null  |binary
 icon-themes/breeze/links.txt  |   15 ++-
 icon-themes/breeze_svg/cmd/sc_autopilotmenu.svg   |7 ---
 icon-themes/sifr/links.txt|9 -
 icon-themes/sifr_svg/cmd/sc_auditmenu.svg |6 --
 icon-themes/sifr_svg/cmd/sc_autoformatmenu.svg|6 --
 icon-themes/sifr_svg/cmd/sc_columnmenu.svg|   10 --
 icon-themes/sifr_svg/cmd/sc_editlinksmenu.svg |6 --
 icon-themes/sifr_svg/cmd/sc_editselectmenu.svg|   10 --
 icon-themes/sifr_svg/cmd/sc_exportasmenu.svg  |6 --
 icon-themes/sifr_svg/cmd/sc_filtermenu.svg|6 --
 icon-themes/sifr_svg/cmd/sc_graphicmenu.svg   |6 --
 icon-themes/sifr_svg/cmd/sc_indexesmenu.svg   |6 --
 icon-themes/sifr_svg/cmd/sc_languagemenu.svg  |6 --
 icon-themes/sifr_svg/cmd/sc_objectmenu.svg|6 --
 icon-themes/sifr_svg/cmd/sc_rowmenu.svg   |   10 --
 icon-themes/sifr_svg/cmd/sc_selectionmodemenu.svg |6 --
 icon-themes/sifr_svg/cmd/sc_sendtomenu.svg|6 --
 icon-themes/sifr_svg/cmd/sc_shapesmenu.svg|6 --
 icon-themes/sifr_svg/cmd/sc_signaturesmenu.svg|6 --
 icon-themes/sifr_svg/cmd/sc_slidemovemenu.svg |   10 --
 icon-themes/sifr_svg/cmd/sc_snaplinesmenu.svg |6 --
 icon-themes/sifr_svg/cmd/sc_tableautofitmenu.svg  |6 --
 icon-themes/sifr_svg/cmd/sc_tableconvertmenu.svg  |6 --
 icon-themes/sifr_svg/cmd/sc_tabledeletemenu.svg   |   10 --
 icon-themes/sifr_svg/cmd/sc_tableinsertmenu.svg   |   10 --
 icon-themes/sifr_svg/cmd/sc_tablemenu.svg |6 --
 icon-themes/sifr_svg/cmd/sc_tableselectmenu.svg   |   10 --
 icon-themes/sifr_svg/cmd/sc_templatemenu.svg  |6 --
 icon-themes/sifr_svg/cmd/sc_toolsformsmenu.svg|6 --
 icon-themes/sifr_svg/cmd/sc_zoommenu.svg  |6 --
 31 files changed, 2 insertions(+), 219 deletions(-)

New commits:
commit 0684e6feb3e04f70c37e16904fab613cfc7a4b1a
Author: andreas kainz 
AuthorDate: Thu Apr 18 18:29:46 2019 +0200
Commit: andreas_kainz 
CommitDate: Fri Apr 19 00:26:56 2019 +0200

tdf#124649 menubar: show icons for important items breeze, sifr

Change-Id: Ie3209121ade4b12c946dbe878ccc606199d02103
Reviewed-on: https://gerrit.libreoffice.org/70946
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/breeze/cmd/sc_autopilotmenu.png 
b/icon-themes/breeze/cmd/sc_autopilotmenu.png
deleted file mode 100644
index 65d909642845..
Binary files a/icon-themes/breeze/cmd/sc_autopilotmenu.png and /dev/null differ
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 1e42ece182d2..400d4ac72b0e 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -103,9 +103,7 @@ cmd/sc_insertformradio.png cmd/sc_radiobutton.png
 cmd/sc_insertformspin.png cmd/sc_spinbutton.png
 cmd/sc_insertformula.png cmd/sc_dbviewfunctions.png
 cmd/sc_insertformvscroll.png cmd/sc_scrollbar.png
-cmd/sc_scrollbarmenu.png cmd/sc_scrollbar.png
 cmd/sc_insertframeinteract.png cmd/sc_insertframe.png
-cmd/sc_insertframemenu.png cmd/sc_insertframe.png
 cmd/sc_insertframeinteractnocolumns.png cmd/sc_insertframe.png
 cmd/sc_insertgraphic.png cmd/sc_gallery.png
 cmd/sc_insertimagecontrol.png cmd/sc_drawchart.png
@@ -125,9 +123,9 @@ cmd/sc_inserttimefield.png cmd/sc_timefield.png
 cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
 cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
 cmd/sc_tracechangemode.png cmd/sc_trackchanges.png
+cmd/sc_changesmenu.png cmd/sc_trackchangesbar.png
+cmd/sc_viewtrackchanges.png cmd/sc_addwatch.png
 cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
-cmd/sc_shapesmenu.png cmd/sc_polygon_diagonal_unfilled.png
-cmd/sc_shapesmenu.png cmd/sc_basicshapes.round-quadrat.png
 cmd/sc_charactermenu.png cmd/sc_fontdialog.png
 cmd/sc_paragraphmenu.png cmd/sc_paragraphdialog.png
 cmd/sc_numberingmenu.png cmd/sc_outlinebullet.png
@@ -229,9 +227,6 @@ cmd/sc_deleteallnotes.png cmd/sc_deleteallannotation.png
 cmd/lc_deleteallnotes.png cmd/lc_deleteallannotation.png
 cmd/sc_formatallnotes.png cmd/sc_editannotation.png
 
-# Template Menu
-cmd/sc_templatemenu.png cmd/sc_adddirect.png
-
 # Animation
 cmd/lc_customanimation.png cmd/lc_animationobjects.png
 cmd/sc_customanimation.png cmd/sc_animationobjects.png
@@ -666,7 +661,6 @@ cmd/sc_numberformatdate.png cmd/sc_datefield.png
 # Notebookbar
 cmd/lc_headerandfooter.png cmd/lc_editheaderandfooter.png
 cmd/sc_headerandfooter.png cmd/sc_editheaderandfooter.png
-cmd/sc_insertheaderfootermenu.png cmd/sc_editheaderandfooter.png
 cmd/lc_recalcpivottable.png cmd/lc_calculate.png
 cmd/sc_recalcpivottable.png cmd/sc_calculate.png
 cmd/lc_dataproviderrefresh.png cmd/lc_calculate.png
@@ -769,7 +763,6 @@

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

 sc/source/filter/excel/excrecds.cxx  |   12 ++---
 sc/source/filter/excel/xepivotxml.cxx|   11 +++-
 sc/source/filter/excel/xerecord.cxx  |7 +
 sc/source/filter/inc/xerecord.hxx|4 ---
 sc/source/filter/inc/xestream.hxx|5 ---
 sc/source/filter/xcl97/XclExpChangeTrack.cxx |   34 +++
 sc/source/filter/xcl97/xcl97rec.cxx  |   16 +++-
 7 files changed, 31 insertions(+), 58 deletions(-)

New commits:
commit 5e4a02028a8b885997eab7693ef131f4a0c02d8a
Author: Mike Kaganski 
AuthorDate: Fri Apr 19 01:05:01 2019 +0300
Commit: Mike Kaganski 
CommitDate: Fri Apr 19 01:47:35 2019 +0200

Further cleanup to not use FSEND and useless string conversions

... in XclExpXmlStream::WriteAttributes

Change-Id: Ideae6685e7f035970850d86bcaea74c525f1ec81
Reviewed-on: https://gerrit.libreoffice.org/70957
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sc/source/filter/excel/excrecds.cxx 
b/sc/source/filter/excel/excrecds.cxx
index 07926576e087..fc0b2bbd2caa 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -265,16 +265,12 @@ void Exc1904::SaveXml( XclExpXmlStream& rStrm )
 
 if( bISOIEC )
 {
-rStrm.WriteAttributes(
-XML_dateCompatibility, ToPsz( bDateCompatibility ),
-FSEND );
+rStrm.WriteAttributes(XML_dateCompatibility, 
ToPsz(bDateCompatibility));
 }
 
 if( !bISOIEC || bDateCompatibility )
 {
-rStrm.WriteAttributes(
-XML_date1904, ToPsz( bVal ),
-FSEND );
+rStrm.WriteAttributes(XML_date1904, ToPsz(bVal));
 }
 }
 
@@ -408,9 +404,7 @@ XclExpWindowProtection::XclExpWindowProtection(bool bValue) 
:
 
 void XclExpWindowProtection::SaveXml( XclExpXmlStream& rStrm )
 {
-rStrm.WriteAttributes(
-XML_lockWindows, ToPsz( GetBool() ),
-FSEND );
+rStrm.WriteAttributes(XML_lockWindows, ToPsz(GetBool()));
 }
 
 // XclExpDocProtection 
===
diff --git a/sc/source/filter/excel/xepivotxml.cxx 
b/sc/source/filter/excel/xepivotxml.cxx
index 43dc30196160..e2d7b03c7884 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -823,15 +823,14 @@ void XclExpXmlPivotTables::SavePivotTableXml( 
XclExpXmlStream& rStrm, const ScDP
 pPivotStrm->write("<")->writeId(XML_location);
 rStrm.WriteAttributes(XML_ref,
 XclXmlUtils::ToOString(aOutRange),
-XML_firstHeaderRow, OString::number(nFirstHeaderRow).getStr(),
-XML_firstDataRow, OString::number(nFirstDataRow).getStr(),
-XML_firstDataCol, OString::number(nFirstDataCol).getStr(),
-FSEND);
+XML_firstHeaderRow, OUString::number(nFirstHeaderRow),
+XML_firstDataRow, OUString::number(nFirstDataRow),
+XML_firstDataCol, OUString::number(nFirstDataCol));
 
 if (!aPageFields.empty())
 {
-rStrm.WriteAttributes(XML_rowPageCount, 
OString::number(static_cast(aPageFields.size())).getStr(), FSEND);
-rStrm.WriteAttributes(XML_colPageCount, OString::number(1).getStr(), 
FSEND);
+rStrm.WriteAttributes(XML_rowPageCount, 
OUString::number(static_cast(aPageFields.size(;
+rStrm.WriteAttributes(XML_colPageCount, OUString::number(1));
 }
 
 pPivotStrm->write("/>");
diff --git a/sc/source/filter/excel/xerecord.cxx 
b/sc/source/filter/excel/xerecord.cxx
index 85fb4a51a663..ff4d7cefce38 100644
--- a/sc/source/filter/excel/xerecord.cxx
+++ b/sc/source/filter/excel/xerecord.cxx
@@ -160,9 +160,7 @@ void XclExpValueRecord::SaveXml( XclExpXmlStream& 
rStrm )
 {
 if( mnAttribute == -1 )
 return;
-rStrm.WriteAttributes(
-mnAttribute,OString::number( maValue ).getStr(),
-FSEND );
+rStrm.WriteAttributes(mnAttribute, OUString::number(maValue));
 }
 
 void XclExpBoolRecord::WriteBody( XclExpStream& rStrm )
@@ -177,8 +175,7 @@ void XclExpBoolRecord::SaveXml( XclExpXmlStream& rStrm )
 
 rStrm.WriteAttributes(
 // HACK: HIDEOBJ (excdoc.cxx) should be its own object to handle 
XML_showObjects
-mnAttribute, mnAttribute == XML_showObjects ? "all" : ToPsz( 
mbValue ),
-FSEND );
+mnAttribute, mnAttribute == XML_showObjects ? "all" : ToPsz( 
mbValue ));
 }
 
 XclExpDummyRecord::XclExpDummyRecord( sal_uInt16 nRecId, const void* pRecData, 
std::size_t nRecSize ) :
diff --git a/sc/source/filter/inc/xerecord.hxx 
b/sc/source/filter/inc/xerecord.hxx
index 0e3f019374c5..e3e81a017c6a 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -214,9 +214,7 @@ void XclExpValueRecord< Type >::SaveXml( XclExpXmlStream& 
rStrm )
 {
 if( mnAttribute == -1 )
 return;
-rStrm.WriteAttributes(
-mnAttribute,OString::number( maValue ).getStr(),
-FSEND );
+

Re: Tagging text as being in arbitrary complex-script languages

2019-04-18 Thread Richard Wordingham

On Thu, 18 Apr 2019 12:25:11 +0200
Eike Rathke  wrote:

> What I usually did is, lookup the language at SIL and the Ethnologue
> and use the most prevalent script as implied default script. Which
> here https://www.ethnologue.com/language/san would lead to
> Devanagari, but in this case more important is also what MS assigned
> the LCID for.

So I shouldn't be misled by the fact that the CTL script I most
frequently write Sanskrit in is Thai -:)  Seriously, though, I believe
the script of sa-TH is Thai is rather than Devanagari, and I am quite
sure that the script of sa-MM is Mymr.

It sounds as though one has to specify the script where there is doubt
as to what type of script will dominate. Is it an issue if there are
two competing scripts of the same type, e.g Thai v. Lanna for Northern
Thai?  A dual script dictionary would correct inefficiently.

> > "sa-150" Sanskrit written using European conventions - so, any
> > script, but, at least for Devanagari, the anusvara sign is not used
> > for homorganic nasals.  
> 
> Though valid, LibreOffice doesn't use the numeric UN M.49 code, it may
> be accepted but might not work everywhere.
> 
> > "sa-Deva-150" Sanskrit written in Devanagari in the manner used in
> > Europe.  
> 
> Same here.
> 
> > "sa-Latn" Sanskrit written in the Roman script.
> > 
> > "sa-Latf" Sanskrit written in Fraktur (I'm not sure that this
> > exists. It might need a hint as to where to find a Fraktur script
> > with a combining candrabindu.)  
> 
> Both perfectly valid, if they serve any purpose. Though with sa-Latn
> I doubt there's a use case, so I wouldn't call that "correct" in
> common sense.

So how do you suggest we tag Sanskrit in Latin script?  Within English
works, its not uncommon for any Sankrit quoted precisely to be in the
Latin script; about half the English language articles in the
'International Journal of Sanskrit
Research' (http://www.anantaajournal.com/) that quote Sanskrit passages
quote them in the Latin script.  Several papers would benefit from the
application of sa-Latn proofing tools, though I don't denying that
proofing Sanskrit may be difficult.

Moreover, I've only ever seen U+0310 COMBINING CANDRABINDU in examples
of Sanskrit in Latin text. 

> I also just learned that sa-Latf somehow exists..

That example is in the same spirit as en-Thai (which I've successfully
used for privacy) and notes I've seen kept in en-Runr on a publicly
accessible whiteboard.

I was wondering whether Sanskrit was printed in Antiqua or Fraktur in
early 20th Century Germany.  You seem to think neither.

Richard.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 uui/source/passworddlg.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5f30114c25f233fee2760645e3b1f194c8157438
Author: Caolán McNamara 
AuthorDate: Thu Apr 18 16:21:26 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 18 22:29:17 2019 +0200

Resolves: tdf#115964 force password dialog to center on parent size request

this is similar to...

commit d17d9500a23705a315992ff42cb7c449894fc2ce
Date:   Tue Apr 16 14:49:46 2019 +0100

tdf#124597 template select dialog launched before parent gets final size

where the dialog is launched before its parent window has got to its final 
size

Change-Id: I0f54a8da482ed75fa939e230b69c0eb918782bf5
Reviewed-on: https://gerrit.libreoffice.org/70943
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 9229f9ec9a46..ffa2897b24dc 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -41,6 +41,9 @@ PasswordDialog::PasswordDialog(weld::Window* pParent,
 , aPasswdMismatch(Translate::get(STR_PASSWORD_MISMATCH, rLocale))
 , rResLocale(rLocale)
 {
+// tdf#115964 we can be launched before the parent has resized to its 
final size
+m_xDialog->set_centered_on_parent_geometry_request();
+
 if( nDialogMode == task::PasswordRequestMode_PASSWORD_REENTER )
 {
 const char* pOpenToModifyErrStrId = bOpenToModify ? 
STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/objdsc

2019-04-18 Thread Jens Carl (via logerrit)

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv |4 
 1 file changed, 4 deletions(-)

New commits:
commit 91ff3d136a9841607d815713081583b6a4e1da9d
Author: Jens Carl 
AuthorDate: Thu Apr 18 13:17:12 2019 -0700
Commit: Jens Carl 
CommitDate: Thu Apr 18 23:48:13 2019 +0200

tdf#45904 Remove already converted tests

Change-Id: I0f7ed57336a4cfa5f143b3c49626dfa8dd590905
Reviewed-on: https://gerrit.libreoffice.org/70953
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index 179c8841d4ae..3e2bbaf97550 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -22,8 +22,6 @@
 
"ScCellRangeObj";"com::sun::star::table::CellProperties";"DiagonalBLTR#optional"
 "ScCellRangeObj";"com::sun::star::table::CellProperties";"ShrinkToFit#optional"
 "ScCellRangeObj";"com::sun::star::util::XSearchable";"createSearchDescriptor()"
-"ScCellRangeObj";"com::sun::star::util::XSearchable";"findAll()"
-"ScCellRangeObj";"com::sun::star::util::XSearchable";"findFirst()"
 "ScCellRangeObj";"com::sun::star::util::XSearchable";"findNext()"
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"CharHeightAsian"
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"CharWeightAsian"
@@ -37,8 +35,6 @@
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsCharacterDistance"
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsForbiddenRules"
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsHangingPunctuation"
-"ScCellRangeObj";"com::sun::star::util::XReplaceable";"createReplaceDescriptor()"
-"ScCellRangeObj";"com::sun::star::util::XReplaceable";"replaceAll()"
 
"ScCellRangeObj";"com::sun::star::chart::XChartData";"addChartDataChangeEventListener()"
 
"ScCellRangeObj";"com::sun::star::chart::XChartData";"removeChartDataChangeEventListener()"
 "ScCellRangeObj";"com::sun::star::chart::XChartData";"getNotANumber()"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/filter/excel/xestream.cxx |   26 +
 sc/source/filter/inc/xestream.hxx   |   55 +---
 2 files changed, 23 insertions(+), 58 deletions(-)

New commits:
commit 124c93f6cf4fbe501b6cbbc99b9b8634e401d4e8
Author: Mike Kaganski 
AuthorDate: Thu Apr 18 21:30:23 2019 +0200
Commit: Mike Kaganski 
CommitDate: Thu Apr 18 22:43:05 2019 +0200

C++11-ify XclExpXmlStream::WriteAttributes

This gets rid of some macro mess; and also enables passing OUString as
attribute values.

Change-Id: I25a8af4adabd905e0016c604d6710c9c5d2f889d
Reviewed-on: https://gerrit.libreoffice.org/70952
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/sc/source/filter/excel/xestream.cxx 
b/sc/source/filter/excel/xestream.cxx
index 22bd91c4edeb..3f815e71358c 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -943,31 +943,11 @@ sax_fastparser::FSHelperPtr 
XclExpXmlStream::GetStreamForPath( const OUString& s
 return maOpenedStreamMap[ sPath ].second;
 }
 
-sax_fastparser::FSHelperPtr& XclExpXmlStream::WriteAttributesInternal( 
sal_Int32 nAttribute, ... )
+void XclExpXmlStream::WriteAttribute(sal_Int32 nAttr, const OUString& sVal)
 {
-sax_fastparser::FSHelperPtr& rStream = GetCurrentStream();
-
-va_list args;
-va_start( args, nAttribute );
-do {
-const char* pValue = va_arg( args, const char* );
-if( pValue )
-{
-rStream->write( " " )
-->writeId( nAttribute )
-->write( "=\"" )
-->writeEscaped( OUString(pValue, strlen(pValue), 
RTL_TEXTENCODING_UTF8) )
-->write( "\"" );
-}
-
-nAttribute = va_arg( args, sal_Int32 );
-if( nAttribute == FSEND_internal )
-break;
-} while( true );
-va_end( args );
-
-return rStream;
+GetCurrentStream()->write(" 
")->writeId(nAttr)->write("=\"")->writeEscaped(sVal)->write("\"");
 }
+
 sax_fastparser::FSHelperPtr XclExpXmlStream::CreateOutputStream (
 const OUString& sFullStream,
 const OUString& sRelativeStream,
diff --git a/sc/source/filter/inc/xestream.hxx 
b/sc/source/filter/inc/xestream.hxx
index d70446730644..859fc59d2c8f 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -286,11 +286,16 @@ public:
 
 sax_fastparser::FSHelperPtr GetStreamForPath( const OUString& rPath );
 
-// FIXME: if written through this cannot be checked for well-formedness
-sax_fastparser::FSHelperPtr&WriteAttributes( sal_Int32 nAttribute, 
const char* value, FSEND_t )
-{ return WriteAttributesInternal( nAttribute, value, FSEND_internal ); 
}
-sax_fastparser::FSHelperPtr&WriteAttributes( sal_Int32 nAttribute, 
const OString& value, FSEND_t )
-{ return WriteAttributesInternal( nAttribute, value.getStr(), 
FSEND_internal ); }
+template  void WriteAttributes(sal_Int32 nAttribute, const 
Str& value, FSEND_t)
+{
+WriteAttribute(nAttribute, value);
+}
+template 
+void WriteAttributes(sal_Int32 nAttribute, const Str& value, Args... rest)
+{
+WriteAttribute(nAttribute, value);
+WriteAttributes(rest...);
+}
 
 sax_fastparser::FSHelperPtr CreateOutputStream (
 const OUString& sFullStream,
@@ -310,40 +315,20 @@ public:
 virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() 
override;
 virtual oox::drawingml::chart::ChartConverter* getChartConverter() 
override;
 
-/*
-  Now create all the overloads in a typesafe way (i.e. without varargs) by 
creating a number of overloads
-  up to a certain reasonable limit (feel free to raise it). This would be 
a lot easier with C++11 vararg templates.
-*/
-// now overloads for 2 and more pairs
-#define SAX_ARGS_FUNC_DECL( argsdecl, argsuse ) \
-sax_fastparser::FSHelperPtr&WriteAttributes( argsdecl, FSEND_t ) \
-{ return WriteAttributesInternal( argsuse, FSEND_internal ); }
-#define SAX_ARGS_FUNC_NUM( decl1, decl2, use1, use2, convert, num ) \
-SAX_ARGS_FUNC_DECL( SAX_ARGS_ARG##num( decl1, decl2, ), 
SAX_ARGS_ARG##num( use1, use2, convert ))
-#define SAX_ARGS_FUNC_SUBST( type, convert, num ) \
-SAX_ARGS_FUNC_NUM( sal_Int32 attribute, type value, attribute, value, 
convert, num )
-#define SAX_ARGS_FUNC( arg, convert ) SAX_ARGS_FUNC_SUBST( arg, convert, 2 
) \
-SAX_ARGS_FUNC_SUBST( arg, convert, 3 ) SAX_ARGS_FUNC_SUBST( arg, 
convert, 4 ) \
-SAX_ARGS_FUNC_SUBST( arg, convert, 5 ) SAX_ARGS_FUNC_SUBST( arg, 
convert, 6 ) \
-SAX_ARGS_FUNC_SUBST( arg, convert, 7 ) SAX_ARGS_FUNC_SUBST( arg, 
convert, 8 ) \
-SAX_ARGS_FUNC_SUBST( arg, convert, 9 ) SAX_ARGS_FUNC_SUBST( arg, 
convert, 10 ) \
-SAX_ARGS_FUNC_SUBST( arg, convert, 11 ) SAX_ARGS_FUNC_SUBST( arg, 
convert, 12 ) \
-

[Libreoffice-commits] core.git: include/sax

 include/sax/fshelper.hxx |   24 
 1 file changed, 24 deletions(-)

New commits:
commit b56678eaf231d4e8998aef928ab314918c5bd187
Author: Mike Kaganski 
AuthorDate: Thu Apr 18 22:47:52 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri Apr 19 01:31:03 2019 +0200

SAX_ARGS_ARG macro pack is unused

Change-Id: Icb7dca3456b3b355b68e8cb08f91f97b8504575a
Reviewed-on: https://gerrit.libreoffice.org/70955
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 159b834a2fe1..e46a1fab60b7 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -39,30 +39,6 @@ struct FSEND_t { FSEND_t() {}; };
 static const FSEND_t FSEND = FSEND_t();
 const sal_Int32 FSEND_internal = -1; // same as XML_TOKEN_INVALID
 
-#define SAX_ARGS_ARG( arg1, arg2, convert, num ) arg1##num, arg2##num convert
-#define SAX_ARGS_ARG1( arg1, arg2, convert ) SAX_ARGS_ARG( arg1, arg2, 
convert, 1 )
-#define SAX_ARGS_ARG2( arg1, arg2, convert ) SAX_ARGS_ARG1( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 2 )
-#define SAX_ARGS_ARG3( arg1, arg2, convert ) SAX_ARGS_ARG2( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 3 )
-#define SAX_ARGS_ARG4( arg1, arg2, convert ) SAX_ARGS_ARG3( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 4 )
-#define SAX_ARGS_ARG5( arg1, arg2, convert ) SAX_ARGS_ARG4( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 5 )
-#define SAX_ARGS_ARG6( arg1, arg2, convert ) SAX_ARGS_ARG5( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 6 )
-#define SAX_ARGS_ARG7( arg1, arg2, convert ) SAX_ARGS_ARG6( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 7 )
-#define SAX_ARGS_ARG8( arg1, arg2, convert ) SAX_ARGS_ARG7( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 8 )
-#define SAX_ARGS_ARG9( arg1, arg2, convert ) SAX_ARGS_ARG8( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 9 )
-#define SAX_ARGS_ARG10( arg1, arg2, convert ) SAX_ARGS_ARG9( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 10 )
-#define SAX_ARGS_ARG11( arg1, arg2, convert ) SAX_ARGS_ARG10( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 11 )
-#define SAX_ARGS_ARG12( arg1, arg2, convert ) SAX_ARGS_ARG11( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 12 )
-#define SAX_ARGS_ARG13( arg1, arg2, convert ) SAX_ARGS_ARG12( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 13 )
-#define SAX_ARGS_ARG14( arg1, arg2, convert ) SAX_ARGS_ARG13( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 14 )
-#define SAX_ARGS_ARG15( arg1, arg2, convert ) SAX_ARGS_ARG14( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 15 )
-#define SAX_ARGS_ARG16( arg1, arg2, convert ) SAX_ARGS_ARG15( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 16 )
-#define SAX_ARGS_ARG17( arg1, arg2, convert ) SAX_ARGS_ARG16( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 17 )
-#define SAX_ARGS_ARG18( arg1, arg2, convert ) SAX_ARGS_ARG17( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 18 )
-#define SAX_ARGS_ARG19( arg1, arg2, convert ) SAX_ARGS_ARG18( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 19 )
-#define SAX_ARGS_ARG20( arg1, arg2, convert ) SAX_ARGS_ARG19( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 20 )
-#define SAX_ARGS_ARG21( arg1, arg2, convert ) SAX_ARGS_ARG20( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 21 )
-#define SAX_ARGS_ARG22( arg1, arg2, convert ) SAX_ARGS_ARG21( arg1, arg2, 
convert ), SAX_ARGS_ARG( arg1, arg2, convert, 22 )
-
 namespace sax_fastparser {
 
 enum class MergeMarks { APPEND = 0, PREPEND = 1, POSTPONE = 2};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cui/source/customize/SvxMenuConfigPage.cxx|   18 --
 cui/source/customize/SvxToolbarConfigPage.cxx |   20 ++--
 2 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit 592ec4b9949818944a471a6d0efe821605957f29
Author: Caolán McNamara 
AuthorDate: Thu Apr 18 16:10:44 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 18 22:28:54 2019 +0200

Related: tdf#124809 cannot assume that icon size is same as checkbox size

cause can be using large icon size

Change-Id: I4661199b658ff0d2013a7bbd7159b1c134ade043
Reviewed-on: https://gerrit.libreoffice.org/70942
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
index f87cbd085906..b92a3d3121db 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -165,9 +165,23 @@ IMPL_LINK(SvxMenuConfigPage, MenuEntriesSizeAllocHdl, 
const Size&, rSize, void)
 {
 weld::TreeView& rTreeView = m_xContentsListBox->get_widget();
 std::vector aWidths;
-int nImageColWidth = rTreeView.get_checkbox_column_width();
+
+int nExpectedSize = 16;
+
+int nStandardImageColWidth = rTreeView.get_checkbox_column_width();
+int nMargin = nStandardImageColWidth - nExpectedSize;
+if (nMargin < 16)
+nMargin = 16;
+
+if (SvxConfigPageHelper::GetImageType() & css::ui::ImageType::SIZE_LARGE)
+nExpectedSize = 24;
+else if (SvxConfigPageHelper::GetImageType() & css::ui::ImageType::SIZE_32)
+nExpectedSize = 32;
+
+int nImageColWidth = nExpectedSize + nMargin;
+
 aWidths.push_back(nImageColWidth);
-aWidths.push_back(rSize.Width() - 2 * nImageColWidth);
+aWidths.push_back(rSize.Width() - (nImageColWidth + 
nStandardImageColWidth));
 rTreeView.set_column_fixed_widths(aWidths);
 }
 
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx 
b/cui/source/customize/SvxToolbarConfigPage.cxx
index 046a3d84b315..49b693f91cae 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -104,9 +104,25 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(TabPageParent 
pParent, const SfxItemS
 weld::TreeView& rTreeView = m_xContentsListBox->get_widget();
 Size aSize(m_xFunctions->get_size_request());
 rTreeView.set_size_request(aSize.Width(), aSize.Height());
-aWidths.push_back(rTreeView.get_checkbox_column_width());
-aWidths.push_back(rTreeView.get_checkbox_column_width());
+
+int nExpectedSize = 16;
+
+int nStandardImageColWidth = rTreeView.get_checkbox_column_width();
+int nMargin = nStandardImageColWidth - nExpectedSize;
+if (nMargin < 16)
+nMargin = 16;
+
+if (SvxConfigPageHelper::GetImageType() & css::ui::ImageType::SIZE_LARGE)
+nExpectedSize = 24;
+else if (SvxConfigPageHelper::GetImageType() & css::ui::ImageType::SIZE_32)
+nExpectedSize = 32;
+
+int nImageColWidth = nExpectedSize + nMargin;
+
+aWidths.push_back(nStandardImageColWidth);
+aWidths.push_back(nImageColWidth);
 rTreeView.set_column_fixed_widths(aWidths);
+
 rTreeView.set_hexpand(true);
 rTreeView.set_vexpand(true);
 rTreeView.set_help_id( HID_SVX_CONFIG_TOOLBAR_CONTENTS );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry sd/uiconfig

2019-04-18 Thread Muhammet Kara (via logerrit)

 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |2 +-
 sd/uiconfig/sdraw/toolbar/redactedexportbar.xml |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 39ea1a6997ba214602792b0fbcc25e1d97522f59
Author: Muhammet Kara 
AuthorDate: Tue Apr 16 17:43:22 2019 +0300
Commit: Andras Timar 
CommitDate: Thu Apr 18 22:50:19 2019 +0200

Switch redacted export options

Bring White option to the first place,
to save toner on print as users tend to
click on the first option.

Change-Id: Id63c4402f8dc07a83eef69c3dfde3dd086c899b8
Reviewed-on: https://gerrit.libreoffice.org/70831
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
(cherry picked from commit d5b59b8d9d798b884dbcf0c97f403d739b01e1cc)
Reviewed-on: https://gerrit.libreoffice.org/70868
Tested-by: Muhammet Kara 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 260a20b4cd1e..fcf28c113ac0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -611,7 +611,7 @@
   com.sun.star.comp.framework.SubToolBarController
 
 
-  redactedexportbar;.uno:RedactedExportBlack
+  redactedexportbar;.uno:RedactedExportWhite
 
   
   
diff --git a/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml 
b/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml
index 727a34ba72d5..42cc31a59d98 100644
--- a/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml
@@ -18,6 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar; 
xmlns:xlink="http://www.w3.org/1999/xlink;>
- 
  
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/qa

2019-04-18 Thread Tomaž Vajngerl (via logerrit)

 vcl/qa/cppunit/svm/svmtest.cxx |  192 +++--
 1 file changed, 164 insertions(+), 28 deletions(-)

New commits:
commit 68bc7b4795d72e9e099219d1e933e6843b7813d1
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 18 19:25:03 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Apr 19 04:40:00 2019 +0200

vcl: extend SVM (MetaFile) BitmapEx tests

Change-Id: I92ce3bbcd7e7d52c53b70a1b9339c2e110c2ccbb
Reviewed-on: https://gerrit.libreoffice.org/70926
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index 37a6d36ab67d..f1347447c227 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #if HAVE_FEATURE_OPENGL
@@ -31,6 +32,8 @@ class SvmTest : public test::BootstrapFixture, public 
XmlTestTools
 return m_directories.getURLFromSrc(maDataUrl) + sFileName;
 }*/
 
+void checkRendering(ScopedVclPtrInstance const & 
pVirtualDev, const GDIMetaFile& rMetaFile);
+
 xmlDocPtr dumpMeta(const GDIMetaFile& rMetaFile);
 
 void checkVirtualDevice(xmlDocPtr pDoc);
@@ -155,6 +158,34 @@ static void setupBaseVirtualDevice(VirtualDevice& rDevice, 
GDIMetaFile& rMeta)
 rDevice.Erase();
 }
 
+void SvmTest::checkRendering(ScopedVclPtrInstance const & 
pVirtualDev, const GDIMetaFile& rMetaFile)
+{
+BitmapEx aSourceBitmapEx = pVirtualDev->GetBitmapEx(Point(), Size(10, 10));
+ScopedVclPtrInstance pVirtualDevResult;
+const_cast(rMetaFile).Play(pVirtualDevResult.get());
+BitmapEx aResultBitmapEx = pVirtualDev->GetBitmapEx(Point(), Size(10, 10));
+
+const bool bWriteCompareBitmap = false;
+
+if (bWriteCompareBitmap)
+{
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+
+{
+SvFileStream aStream(aTempFile.GetURL() + ".source.png", 
StreamMode::WRITE | StreamMode::TRUNC);
+vcl::PNGWriter aPNGWriter(aSourceBitmapEx);
+aPNGWriter.Write(aStream);
+}
+{
+SvFileStream aStream(aTempFile.GetURL() + ".result.png", 
StreamMode::WRITE | StreamMode::TRUNC);
+vcl::PNGWriter aPNGWriter(aResultBitmapEx);
+aPNGWriter.Write(aStream);
+}
+}
+CPPUNIT_ASSERT_EQUAL(aSourceBitmapEx.GetChecksum(), 
aResultBitmapEx.GetChecksum());
+}
+
 static GDIMetaFile readMetafile(const OUString& rUrl)
 {
 SvFileStream aFileStream(rUrl, StreamMode::READ);
@@ -823,30 +854,69 @@ void SvmTest::checkBitmapExs(const GDIMetaFile& rMetaFile)
 {
 xmlDocPtr pDoc = dumpMeta(rMetaFile);
 
-OUString crc1 = "b8dee5da";
-OUString crc2 = "281fc589";
-OUString crc3 = "5e01ddcc";
+std::vector aExpectedCRC;
+
 #if HAVE_FEATURE_OPENGL
 if (OpenGLHelper::isVCLOpenGLEnabled())
 {
-crc1 = "5e01ddcc";
-crc2 = "281fc589";
-crc3 = "b8dee5da";
+aExpectedCRC.insert(aExpectedCRC.end(),
+{
+"08feb5d3",
+"281fc589",
+"b8dee5da",
+"4df0e464",
+"7d3a8da3",
+"1426653b",
+"4fd547df",
+"71efc447",
+});
 }
+else
 #endif
+{
+aExpectedCRC.insert(aExpectedCRC.end(),
+{
+"d8377d4f",
+"281fc589",
+"5e01ddcc",
+"4df0e464",
+"34434a50",
+"d1736327",
+"b37875c2",
+"a85d44b8",
+});
+}
 
 assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {
-{"x", "1"}, {"y", "2"}, {"crc", crc1}, {"transparenttype", "bitmap"}
+{"x", "1"}, {"y", "1"}, {"crc", aExpectedCRC[0]}, {"transparenttype", 
"bitmap"}
 });
 assertXPathAttrs(pDoc, "/metafile/bmpexscale[1]", {
-{"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"},
-{"crc", crc2}, {"transparenttype", "bitmap"}
+{"x", "5"}, {"y", "0"}, {"width", "2"}, {"height", "3"},
+{"crc", aExpectedCRC[1]}, {"transparenttype", "bitmap"}
 });
 assertXPathAttrs(pDoc, "/metafile/bmpexscalepart[1]", {
-{"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", 
"4"},
-{"srcx", "2"},  {"srcy", "1"},  {"srcwidth", "4"},  {"srcheight", "3"},
-{"crc", crc3}, {"transparenttype", "bitmap"}
+{"destx", "7"}, {"desty", "1"}, {"destwidth", "2"}, {"destheight", 
"2"},
+{"srcx", "0"},  {"srcy", "0"},  {"srcwidth", "3"},  {"srcheight", "4"},
+{"crc", aExpectedCRC[2]}, {"transparenttype", "bitmap"}
+});
+
+#ifndef MACOSX
+assertXPathAttrs(pDoc, "/metafile/bmpex[2]", {
+{"x", "6"}, {"y", "6"}, {"crc", aExpectedCRC[3]}, {"transparenttype", 
"bitmap"}
+});
+assertXPathAttrs(pDoc, "/metafile/bmpex[3]", {
+{"x", "0"}, {"y", "6"}, {"crc", aExpectedCRC[4]}, {"transparenttype", 
"bitmap"}
+});
+assertXPathAttrs(pDoc, "/metafile/bmpex[4]", {
+

[Libreoffice-commits] core.git: include/sax

 include/sax/fshelper.hxx |   44 
 1 file changed, 44 deletions(-)

New commits:
commit cab700c69edc4a0b66a60e80b2852380217163cd
Author: Mike Kaganski 
AuthorDate: Fri Apr 19 00:20:36 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri Apr 19 06:12:46 2019 +0200

Remove redundant functions from FastSerializerHelper

They are identical to what compiler autogenerates from templated overload

Change-Id: I0b1361a5dae7e6520a1ec21d735fdebbe0c9a76e
Reviewed-on: https://gerrit.libreoffice.org/70959
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index e46a1fab60b7..c5148dcd0b00 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -63,23 +63,12 @@ public:
 pushAttributeValue(attribute, value);
 startElement(elementTokenId, std::forward(args)...);
 }
-void startElement(sal_Int32 elementTokenId, sal_Int32 attribute, const 
char* value, FSEND_t)
-{
-if (value)
-pushAttributeValue(attribute, value);
-startElement(elementTokenId, FSEND);
-}
 template
 void startElement(sal_Int32 elementTokenId, sal_Int32 attribute, const 
OString& value, Args &&... args)
 {
 pushAttributeValue(attribute, value);
 startElement(elementTokenId, std::forward(args)...);
 }
-void startElement(sal_Int32 elementTokenId, sal_Int32 attribute, const 
OString& value, FSEND_t)
-{
-pushAttributeValue(attribute, value);
-startElement(elementTokenId, FSEND);
-}
 void startElement(sal_Int32 elementTokenId, FSEND_t);
 
 /// Start an element. After the first two arguments there can be a number 
of (attribute, value) pairs.
@@ -90,23 +79,12 @@ public:
 pushAttributeValue(attribute, value);
 startElementNS(namespaceTokenId, elementTokenId, 
std::forward(args)...);
 }
-void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const char* value, FSEND_t)
-{
-if (value)
-pushAttributeValue(attribute, value);
-startElementNS(namespaceTokenId, elementTokenId, FSEND);
-}
 template
 void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const OString& value, Args &&... args)
 {
 pushAttributeValue(attribute, value);
 startElementNS(namespaceTokenId, elementTokenId, 
std::forward(args)...);
 }
-void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const OString& value, FSEND_t)
-{
-pushAttributeValue(attribute, value);
-startElementNS(namespaceTokenId, elementTokenId, FSEND);
-}
 void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
FSEND_t)
 {
 startElement(FSNS(namespaceTokenId, elementTokenId), FSEND);
@@ -120,23 +98,12 @@ public:
 pushAttributeValue(attribute, value);
 singleElement(elementTokenId, std::forward(args)...);
 }
-void singleElement(sal_Int32 elementTokenId, sal_Int32 attribute, const 
char* value, FSEND_t)
-{
-if (value)
-pushAttributeValue(attribute, value);
-singleElement(elementTokenId, FSEND);
-}
 template
 void singleElement(sal_Int32 elementTokenId, sal_Int32 attribute, const 
OString& value, Args &&... args)
 {
 pushAttributeValue(attribute, value);
 singleElement(elementTokenId, std::forward(args)...);
 }
-void singleElement(sal_Int32 elementTokenId, sal_Int32 attribute, const 
OString& value, FSEND_t)
-{
-pushAttributeValue(attribute, value);
-singleElement(elementTokenId, FSEND);
-}
 void singleElement(sal_Int32 elementTokenId, FSEND_t);
 
 /// Create a single element. After the first two arguments there can be a 
number of (attribute, value) pairs.
@@ -147,23 +114,12 @@ public:
 pushAttributeValue(attribute, value);
 singleElementNS(namespaceTokenId, elementTokenId, 
std::forward(args)...);
 }
-void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const char* value, FSEND_t)
-{
-if (value)
-pushAttributeValue(attribute, value);
-singleElementNS(namespaceTokenId, elementTokenId, FSEND);
-}
 template
 void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const OString& value, Args &&... args)
 {
 pushAttributeValue(attribute, value);
 singleElementNS(namespaceTokenId, elementTokenId, 
std::forward(args)...);
 }
-void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const OString& value, FSEND_t)
-{
-pushAttributeValue(attribute, value);
-singleElementNS(namespaceTokenId, elementTokenId, FSEND);
-

[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source

2019-04-18 Thread Jens Carl (via logerrit)

 include/test/chart/xchartdata.hxx  |   35 ++
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv |4 
 sc/qa/extras/sccellrangeobj.cxx|  134 
+-
 test/Library_subsequenttest.mk |1 
 test/source/chart/xchartdata.cxx   |   93 ++
 5 files changed, 201 insertions(+), 66 deletions(-)

New commits:
commit eb7a731bcfbacec15b77889f0ac545d36ef5ad19
Author: Jens Carl 
AuthorDate: Thu Apr 18 14:47:40 2019 -0700
Commit: Jens Carl 
CommitDate: Fri Apr 19 05:00:46 2019 +0200

tdf#45904 Move XChartData Java tests to C++

Fix tdf#43309: Move XChartData Java tests to C++ for ScCellRangeObj.

Change-Id: I6b57db53fdddab2ff382354d32809404224a2e1e
Reviewed-on: https://gerrit.libreoffice.org/70956
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/include/test/chart/xchartdata.hxx 
b/include/test/chart/xchartdata.hxx
new file mode 100644
index ..315d727ed5a3
--- /dev/null
+++ b/include/test/chart/xchartdata.hxx
@@ -0,0 +1,35 @@
+/* -*- 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/.
+ */
+
+#pragma once
+
+#include 
+
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XChartData
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testChartDataChangeEventListener();
+void testGetNotANumber();
+void testIsNotANumber();
+
+protected:
+~XChartData() {}
+};
+
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index 3e2bbaf97550..0e3a7ab8191e 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -35,10 +35,6 @@
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsCharacterDistance"
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsForbiddenRules"
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsHangingPunctuation"
-"ScCellRangeObj";"com::sun::star::chart::XChartData";"addChartDataChangeEventListener()"
-"ScCellRangeObj";"com::sun::star::chart::XChartData";"removeChartDataChangeEventListener()"
-"ScCellRangeObj";"com::sun::star::chart::XChartData";"getNotANumber()"
-"ScCellRangeObj";"com::sun::star::chart::XChartData";"isNotANumber()"
 "ScCellRangeObj";"com::sun::star::style::ParagraphProperties";"ParaAdjust"
 
"ScCellRangeObj";"com::sun::star::style::ParagraphProperties";"ParaLineSpacing#optional"
 
"ScCellRangeObj";"com::sun::star::style::ParagraphProperties";"ParaBackColor#optional"
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index a529c9b4eb1f..aba1a458b9eb 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -8,6 +8,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -30,60 +31,62 @@
 #include 
 #include 
 #include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
 #include 
 
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
+
+#include 
 #include 
 #include 
 
 using namespace css;
-using namespace css::uno;
-
-namespace sc_apitest {
-
-class ScCellRangeObj : public CalcUnoApiTest, public apitest::CellProperties,
-  public apitest::SheetCellRange,
-  public 
apitest::XArrayFormulaRange,
-  public 
apitest::XCellFormatRangesSupplier,
-  public 
apitest::XCellRangeAddressable,
-  public apitest::XCellRangeData,
-  public 
apitest::XCellRangeFormula,
-  public apitest::XCellRangesQuery,
-  public apitest::XCellSeries,
-  public apitest::XColumnRowRange,
-  public apitest::XFormulaQuery,
-  public apitest::XIndent,
-  public apitest::XMergeable,
-  public 
apitest::XMultipleOperation,
-  public

Re: Tagging text as being in arbitrary complex-script languages

2019-04-18 Thread Richard Wordingham

On Thu, 18 Apr 2019 20:40:01 +0100
Richard Wordingham  wrote:

> On Thu, 18 Apr 2019 12:25:11 +0200
> Eike Rathke  wrote:

> > Though with sa-Latn
> > I doubt there's a use case, so I wouldn't call that "correct" in
> > common sense.  
> 
> So how do you suggest we tag Sanskrit in Latin script?

In answer to what was intended to be a rhetorical question, I suppose
und-Latn-t-sa-m0-iast and und-Latn-t-sa-m0-iso would work for the
normative forms. I've successfully loaded a mocked up extension for the
former (as explicitly using a Western script), though I don't much like
the consequent tagging  in
the document's content.xml. That's a problem with the 't' extension.
Transliteration may change the language of place names in isolation,
but it doesn't really change the language of paragraphs of text.

Richard.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

2019-04-18 Thread Xisco Fauli

Hi Michael,

El 18/4/19 a les 16:55, Michael Meeks ha escrit:
> + UI testing tool update ?
>   + Code is in 
> https://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/uitest/mass-testing
>   + Calc: Found some crashes related to the dynamic number of columns work
>   - E.g. 
> https://bugs.documentfoundation.org/show_bug.cgi?id=124818
>   - Noel fixing them
>   + Writer: Many files crashing with paste + undo
>   - Mostly related to 
>   https://bugs.documentfoundation.org/show_bug.cgi?id=117215
> + inherited from OpenOffice
>   - 13800 crashes in crashreport of this signature → 
> https://crashreport.libreoffice.org/stats/signature/BigPtrArray::Index2Block(unsigned%20long)
> + what is a big number for traces ? (Michael)
>+ difficult to tell (Xisco)
>   + don’t know in total; think it’s a big #
>   + tested 2500 files, and 30 crash.

I've just remembered we can retrieve the total number of crashes from
the crashreport API [1], so the crash mentioned above represents the 0.3
of the total

Regards

[1] http://crashreport.libreoffice.org/api/get/crash-count

-- 
Xisco Faulí
Libreoffice QA Team
IRC: x1sc0

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/qa sw/source

 sw/qa/extras/uiwriter/data/forcepoint80-1.rtf |1 +
 sw/qa/extras/uiwriter/uiwriter.cxx|   21 +
 sw/source/core/layout/ssfrm.cxx   |   12 ++--
 3 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit 0fe112dbd98b82145bbc68efe00c59764684632b
Author: Caolán McNamara 
AuthorDate: Thu Apr 18 12:53:12 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 18 17:34:48 2019 +0200

forcepoint#80 avoid crash

Change-Id: I7a96d2951fbcd5f53a2f7e65e8c07926fc035a11
Reviewed-on: https://gerrit.libreoffice.org/70936
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/uiwriter/data/forcepoint80-1.rtf 
b/sw/qa/extras/uiwriter/data/forcepoint80-1.rtf
new file mode 100644
index ..319f6f571826
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/forcepoint80-1.rtf
@@ -0,0 +1 @@
+{\rtf1\cnsi 
\ansicpg1252\stshfloch0{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green102\blue204;\red102\green99\blue98;\red143\green142\blue142;\red75\green60\blue52;}{\fonttbl{\f0\froman\cpg1257\fcharset186
 Palatino Linotype;}{\f1\froman\cpg0\fcharset0 Palatino 
Linotype;}{\f2\froman\cpg1252\fcharset0 Palatino 
Linotype;}{\f3\fswiss\cpg1257\fcharset186 Arial 
Black;}{\f4\fswiss\cpg0\fcharset0 Arial Black;}{\f5\fswiss\cpg1252\fcharset0 
Arial Black;}{\f6\fro-an\cpg1257\fcharset186 Times New 
Roman;}{\f7\froman\cpg0\fcharset0 Times New 
Roman;}{\f8\froman\cpg1252\fcharset0 Times New 
Roman;}{\f9\fmodern\cpg1257\fcharset186 Courier 
New;}{\f10\fmodern\cpg0\fcharset0 Courier New;}{\f11\fmodern\cpg1252\fcharset0 
Courier New;}}{\stylesheet {\ql Normal;}{\s1\sbasedon0\ql\fi-120\sl-276\slmult0 
Style1;}{\s2\sbasedon0\qj\fi560\sl-300\slmult0 Style2;}{\s
 3\sbasedon0\ql\sl-264\slmult0 Style3;}{\s4\sbasedon0\ql\fi-1088\sl-320\slmult0 
Style4;}{\s5\sbasedon0\ql Style5;}{\s6\sbasedon0\ql 
Style6;}{\s7\sbasedon0\ql\sl-320\slmult0 Style7;}{\s8\sbasedon0\qr 
Style8;}{\s9\sbasedon0\ql Style9;}{\s10\sbasedon0\qj\sl-264\slmult0 
Style10;}{\s11\sbasedon0\qj\sl-298\slmult0 
Style11;}{\s12\sbasedon0\qj\sl-288\slmult0 Style12;}{\s13\sbasedon0\ql 
Style13;}{\s14\sbasedon0\ql\fi600\sl-329\slmult0 
Style14;}{\s15\sbasedon0\ql\sl-240\slmult0 Style15;}{\s16\sbasedon0\ql 
Style16;}{\s17\sbasedon0\ql\fi576\sl-328\slmult0 Style17;}{\s18\sbasedon0\ql 
Style18;}{\s19\sbasedon0\ql\sl-271\slmult0 
Style19;}{\s20\sbasedon0\ql\fi2406\sl-339\slmult0 Style20;}{\s21\sbasedon0\ql 
Style21;}{\s22\sbasedon0\ql\fi2821\sl-161\slmult0 
Style22;}{\s23\sbasedon0\ql\fi568\sl-306\slmult0 Style23;}{\s24\sbasedon0\ql 
Style24;}{\s25\sbasedon0\ql Style25;}{\s26\sbasedon0\ql 
Style26;}{\s27\sbasedon0\ql Style27;}{\s28\sbasedon0\qj\sl-271\slmult0 
Style28;}{\s29\sbasedon0\ql\fi568\sl-322\slmu
 lt0 Style29;}{\s30\sbasedon0\ql Style30;}{\s31\sbasedon0\ql 
Style31;}{\s32\sbasedon0\ql Style32;}{\s33\sbasedon0\ql 
Style33;}{\s34\sbasedon0\ql Style34;}{\s35\sbasedon0\ql 
Style35;}{\*\cs36\additive Default Paragraph 
Font;}{\*\cs37\sbasedon36\additive\b\charscalex120\f2\fs58 Font 
Style37;}{\*\cs38\sbasedon36\additive\b\charscalex30\f2\fs400 Font 
Style38;}{\*\cs39\sbasedon36\additive\i\f2\fs22 Font 
Style39;}{\*\cs40\sbasedon36\additive\scaps\f8\fs8 Font 
Style40;}{\*\cs41\sbasedon36\additive\i\b\f2\fs10 Font 
Style41;}{\*\cs42\sbasedon36\additive\f5\fs8 Font 
Style42;}{\*\cs43\sbasedon36\additive\b\expndtw200\f2\fs10 Font 
Style43;}{\*\cs44\sbasedon36\additive\f2\fs22 Font 
Style44;}{\*\cs45\sbasedon36\additive\b\expndtw-10\f2\fs22 Font 
Style45;}{\*\cs46\sbasedon36\additive\scaps\f2\fs20 Font 
Style46;}{\*\cs47\sbasedon36\additive\charscalex20\f2\fs104 Font 
Style47;}{\*\cs48\sbasedon36\additive\b\f2\fs20 Font 
Style48;}{\*\cs49\sbasedon36\additive\f2\fs22 Font 
Style49;}{\*\cs50\sbasedon36\a
 dditive\b\f2\fs38 Font Style50;}{\*\cs51\sbasedon36\additive\f2\fs20 Font 
Style51;}{\*\cs52\sbasedon36\additive\expndtw-20\f2\fs30 Font 
Style52;}{\*\cs53\sbasedon36\additive\i\expndtw-10\f2\fs22 Font 
Style53;}{\*\cs54\sbasedon36\additive\i\expndtw-20\f2\fs22 Font 
Style54;}{\*\cs55\sbasedon36\additive\f2\fs22 Font 
Style55;}{\*\cs56\sbasedon36\additive\f2\fs18 Font 
Style56;}{\*\cs57\sbasedon36\additive\b\expndtw10\f2\fs16 Font 
Style57;}{\*\cs58\sbasedon36\additive\b\f2\fs20 Font 
Style58;}{\*\cs59\sbasedon36\additive\i\b\expndtw-10\f11\fs22 Font 
Style59;}{\*\cs60\sbasedon36\additive\f2\fs20 Font 
Style60;}{\*\cs61\sbasedon36\additive\f2\fs12 Font 
Style61;}{\*\cs62\sbasedon36\additive\f2\fs18 Font 
Style62;}{\*\cs63\sbasedon36\additive\i\expndtw-20\f2\fs22 Font 
Style63;}{\*\cs64\sbasedon36\additive\b\expndtw-20\f2\fs26 Font 
Style64;}}\fet2{\*\ftnsep {\chftnsep\par }}{\*\aftnsep {\chftnsep\par 
}}\expshrtn\widowctrl\paperw20384\paperh12312\margl360\margr360\margt360\margb360
 \sectd \sbknone

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

 sc/source/core/data/table2.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a606fc64cb18df14f01f2e14e677a1e729025ad7
Author: Noel Grandin 
AuthorDate: Thu Apr 18 16:06:09 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 18 18:24:40 2019 +0200

tdf#124822 CRASH: cutting and undoing

regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100
tdf#50916 Makes numbers of columns dynamic.

Change-Id: I17312ca978a83a431dfaf6edda2c98e6302eb2d1
Reviewed-on: https://gerrit.libreoffice.org/70938
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 4c303d9d3996..4880e02d45c7 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1852,6 +1852,7 @@ bool ScTable::BroadcastBroadcasters( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCRO
 bool bBroadcasted = false;
 sc::AutoCalcSwitch aSwitch(*pDocument, false);
 rHint.GetAddress().SetTab(nTab);
+nCol2 = ClampToAllocatedColumns(nCol2);
 for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
 bBroadcasted |= aCol[nCol].BroadcastBroadcasters( nRow1, nRow2, rHint);
 return bBroadcasted;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/doc/doc.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 15e32eb2a8c817e31e9bcaf3832a503f6b488200
Author: Noel Grandin 
AuthorDate: Thu Apr 18 16:46:03 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 18 18:25:52 2019 +0200

don't use SwSectionFormats here

since SwSectionFormats wants to own the things it points to, and we
don't want to own here. The only reason it was working is because we
call clear() on the horrible SwVectorModifyBase base class here, which
removes the pointers without deleting the pointed-to objects.

Change-Id: I8aba61e74ce1463ff4be439c0feb830d1aa8988e
Reviewed-on: https://gerrit.libreoffice.org/70940
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 6d2841fc6be3..77408b4e9f53 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1467,7 +1467,7 @@ bool SwDoc::RemoveInvisibleContent()
 
 {
 // Delete/empty all hidden areas
-SwSectionFormats aSectFormats;
+o3tl::sorted_vector aSectFormats;
 SwSectionFormats& rSectFormats = GetSections();
 
 for( SwSectionFormats::size_type n = rSectFormats.size(); n; )
@@ -1487,10 +1487,7 @@ bool SwDoc::RemoveInvisibleContent()
 pParent = pTmp;
 }
 
-SwSectionFormats::iterator it = std::find(
-aSectFormats.begin(), aSectFormats.end(), 
pSect->GetFormat() );
-if (it == aSectFormats.end())
-aSectFormats.insert( aSectFormats.begin(), 
pSect->GetFormat() );
+aSectFormats.insert( pSect->GetFormat() );
 }
 if( !pSect->GetCondition().isEmpty() )
 {
@@ -1501,7 +1498,7 @@ bool SwDoc::RemoveInvisibleContent()
 }
 }
 
-SwSectionFormats::size_type n = aSectFormats.size();
+auto n = aSectFormats.size();
 
 if( 0 != n )
 {
@@ -1541,7 +1538,6 @@ bool SwDoc::RemoveInvisibleContent()
 
 }
 }
-aSectFormats.clear();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig

 cui/source/customize/cfg.cxx  |2 +-
 cui/uiconfig/ui/iconselectordialog.ui |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c9956772ec0678498515fb60dca41e9a77457f86
Author: Caolán McNamara 
AuthorDate: Thu Apr 18 15:27:25 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 18 18:32:03 2019 +0200

Resolves: tdf#124809 spacing ignored unless WB_ITEMBORDER is set

Change-Id: I29d63926c605d3f143c242337e31388123f22cff
Reviewed-on: https://gerrit.libreoffice.org/70939
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 2796a2ddd910..7075423ffc7a 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2648,7 +2648,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog(weld::Window 
*pWindow,
 
m_xFtNote->set_label(SvxConfigPageHelper::replaceSixteen(m_xFtNote->get_label(),
 m_nExpectedSize));
 }
 
-m_xTbSymbol->SetStyle(m_xTbSymbol->GetStyle() | WB_VSCROLL);
+m_xTbSymbol->SetStyle(m_xTbSymbol->GetStyle() | WB_ITEMBORDER | 
WB_VSCROLL);
 m_xTbSymbol->SetColCount(11);
 m_xTbSymbol->SetLineCount(5);
 m_xTbSymbol->SetItemWidth(m_nExpectedSize);
diff --git a/cui/uiconfig/ui/iconselectordialog.ui 
b/cui/uiconfig/ui/iconselectordialog.ui
index a12fee076901..4f55c547cdbc 100644
--- a/cui/uiconfig/ui/iconselectordialog.ui
+++ b/cui/uiconfig/ui/iconselectordialog.ui
@@ -127,6 +127,10 @@
 True
 True
 GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK
+3
+3
+3
+3
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

MacUpdate - your app listing has been updated

2019-04-18 Thread MacUpdate

Title: Untitled Document

App Listing Updated
Hi The Document Foundation, We have updated your application listing for LibreOffice 6.2.3.2 on MacUpdate.com. Please take a moment to review your application's information to make sure that everything is correct.

View your updated app listing

You can login to your Developer Account to reply to comments and view stats, or submit new updates and changes to your app listing.

Desktop Install Compatibility
MacUpdate Desktop 6 is helping developers make it easier for users to fully install and use their apps. Download Desktop 6 and to ensure your app works with the “Install” link on our download pages.

Advertise With MacUpdate
The best Mac devs advertise their apps on MacUpdate.com because it’s the most targeted, highly performing Mac app advertising you can find on the web. Contact a...@macupdate.com to guarantee your annual ad campaigns get booked and expand your app’s audience.

Learn more

Questions? Contact our Content Update Team upda...@macupdate.com.

You are receiving this offer because you have an app listed on MacUpdate.com. Add us to your address book or white list to ensure reliable delivery.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: extras/source include/formula include/vcl sc/qa sc/source sc/uiconfig solenv/bin solenv/sanitizers vcl/source vcl/unx