[Libreoffice-commits] core.git: chart2/source
chart2/source/inc/WrappedPropertySet.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ccf0bedc472a14e309ea39434af33082d838614 Author: Andrea Gelmini AuthorDate: Thu Jan 31 17:44:49 2019 + Commit: Julien Nabet CommitDate: Sun Feb 3 07:29:21 2019 +0100 Fix typo Change-Id: Iaaae552001af05d0d9cfd5d942876ae488d89e3b Reviewed-on: https://gerrit.libreoffice.org/67299 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index b0ea15f0ef00..09c768fc75f0 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -111,7 +111,7 @@ protected: //member std::unique_ptr m_pWrappedPropertyMap;//holds all wrapped properties (containing the special mapping from inner to outer properties) -//Container for the XProperyChangedListener. The listeners are inserted by handle. +//Container for the XPropertyChangedListener. The listeners are inserted by handle. //OMultiTypeInterfaceContainerHelperInt32 m_aBoundListenerContainer; //Container for the XPropertyVetoableListener. The listeners are inserted by handle. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/filter/hsqldb/parseschema.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 850527869590094a29a5175779a0d984e4699763
Author: Julien Nabet
AuthorDate: Sun Feb 3 07:27:10 2019 +0100
Commit: Julien Nabet
CommitDate: Sun Feb 3 07:27:26 2019 +0100
Revert "tdf#123020: migration to Firebird fix tablename for indexes"
This patch is wrong (see comments on gerrit)
This reverts commit b35a64be6025b59e88231a4dc0f025273adb63c5.
Change-Id: Ib093e83cf68460671e9a14b3f1dc2a8d884de0b9
Reviewed-on: https://gerrit.libreoffice.org/67300
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/dbaccess/source/filter/hsqldb/parseschema.cxx
b/dbaccess/source/filter/hsqldb/parseschema.cxx
index 89796e3c06ee..e04998c80f28 100644
--- a/dbaccess/source/filter/hsqldb/parseschema.cxx
+++ b/dbaccess/source/filter/hsqldb/parseschema.cxx
@@ -74,9 +74,8 @@ public:
OUString getTableName() const
{
-// SET TABLE "" INDEX'...
-// 9 corresponds to nb chars in "SET TABLE"
-return m_sql.copy(m_sql.indexOf("\""), m_sql.lastIndexOf("\"") - 9);
+// SET TABLE
+return string::split(m_sql, u' ')[2];
}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2019-03-02 03:32:27 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Re: WIP migration towards Firebird 3.0.4, cannot find -ltommath
I gave up, it’s just a mess to integrate Firebird on lo. -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/filtuno.hxx |6 ++
sc/source/ui/unoobj/filtuno.cxx | 12 +++-
2 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 573a473275ad7c76d0cada9b7e73d4923e7a79d5
Author: Caolán McNamara
AuthorDate: Sat Feb 2 17:30:52 2019 +
Commit: Caolán McNamara
CommitDate: Sat Feb 2 22:57:31 2019 +0100
set parent for ascii import options dialog in calc
Change-Id: I039ac4bfda4b36f76b66f043187beada4af0cacd
Reviewed-on: https://gerrit.libreoffice.org/67294
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx
index dd6b55950d09..fc3d3981b126 100644
--- a/sc/inc/filtuno.hxx
+++ b/sc/inc/filtuno.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
@@ -36,6 +37,7 @@ class ScFilterOptionsObj : public ::cppu::WeakImplHelper<
css::ui::dialogs::XExecutableDialog,
css::document::XImporter,
css::document::XExporter,
+css::lang::XInitialization,
css::lang::XServiceInfo >
{
private:
@@ -43,6 +45,7 @@ private:
OUString aFilterName;
OUString aFilterOptions;
css::uno::Reference< css::io::XInputStream > xInputStream;
+css::uno::Reference< css::awt::XWindow > xDialogParent;
bool bExport;
public:
@@ -65,6 +68,9 @@ public:
// XExporter
virtual void SAL_CALL setSourceDocument( const css::uno::Reference<
css::lang::XComponent >& xDoc ) override;
+// XInitialization
+virtual void SAL_CALL initialize(const
css::uno::Sequence& rArguments) override;
+
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
override;
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 73f319263992..947f59869903 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#include
@@ -208,7 +209,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute()
{
// HTML import.
ScopedVclPtr pDlg(
-pFact->CreateScTextImportOptionsDlg(nullptr));
+
pFact->CreateScTextImportOptionsDlg(Application::GetFrameWeld(xDialogParent)));
if (pDlg->Execute() == RET_OK)
{
@@ -354,4 +355,13 @@ void SAL_CALL ScFilterOptionsObj::setSourceDocument( const
uno::Reference&
rArguments)
+{
+::comphelper::NamedValueCollection aProperties(rArguments);
+if (aProperties.has("ParentWindow"))
+aProperties.get("ParentWindow") >>= xDialogParent;
+}
+
/* 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: Branch 'libreoffice-6-2' - icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga
icon-themes/elementary/cmd/32/entergroup.png |binary icon-themes/elementary/cmd/32/formatgroup.png|binary icon-themes/elementary/cmd/32/formatungroup.png |binary icon-themes/elementary/cmd/32/leavegroup.png |binary icon-themes/elementary/cmd/32/navigationbar.png |binary icon-themes/elementary/cmd/32/numericfield.png |binary icon-themes/elementary/cmd/lc_entergroup.png |binary icon-themes/elementary/cmd/lc_formatgroup.png|binary icon-themes/elementary/cmd/lc_formatungroup.png |binary icon-themes/elementary/cmd/lc_leavegroup.png |binary icon-themes/elementary/cmd/lc_navigationbar.png |binary icon-themes/elementary/cmd/lc_numericfield.png |binary icon-themes/elementary/cmd/sc_entergroup.png |binary icon-themes/elementary/cmd/sc_formatgroup.png|binary icon-themes/elementary/cmd/sc_formatungroup.png |binary icon-themes/elementary/cmd/sc_leavegroup.png |binary icon-themes/elementary/cmd/sc_navigationbar.png |binary icon-themes/elementary/cmd/sc_numericfield.png |binary icon-themes/elementary/links.txt | 32 - icon-themes/elementary/res/im30822.png |binary icon-themes/elementary/res/im30840.png |binary icon-themes/elementary/res/im30841.png |binary icon-themes/elementary_svg/cmd/32/entergroup.svg |2 icon-themes/elementary_svg/cmd/32/formatgroup.svg|2 icon-themes/elementary_svg/cmd/32/formattedfield.svg |2 icon-themes/elementary_svg/cmd/32/formatungroup.svg |2 icon-themes/elementary_svg/cmd/32/leavegroup.svg |2 icon-themes/elementary_svg/cmd/32/navigationbar.svg |1 icon-themes/elementary_svg/cmd/32/numericfield.svg |1 icon-themes/elementary_svg/cmd/lc_entergroup.svg |2 icon-themes/elementary_svg/cmd/lc_formatgroup.svg|2 icon-themes/elementary_svg/cmd/lc_formatungroup.svg |2 icon-themes/elementary_svg/cmd/lc_leavegroup.svg |2 icon-themes/elementary_svg/cmd/lc_navigationbar.svg |1 icon-themes/elementary_svg/cmd/lc_numericfield.svg |1 icon-themes/elementary_svg/cmd/lc_unsetcellsreadonly.svg | 387 --- icon-themes/elementary_svg/cmd/sc_entergroup.svg |2 icon-themes/elementary_svg/cmd/sc_formatgroup.svg|2 icon-themes/elementary_svg/cmd/sc_formatungroup.svg |2 icon-themes/elementary_svg/cmd/sc_hfixedline.svg |3 icon-themes/elementary_svg/cmd/sc_leavegroup.svg |2 icon-themes/elementary_svg/cmd/sc_navigationbar.svg |1 icon-themes/elementary_svg/cmd/sc_numericfield.svg |1 icon-themes/elementary_svg/cmd/sc_vfixedline.svg |3 icon-themes/elementary_svg/res/baswatr.svg | 352 - icon-themes/elementary_svg/res/im30822.svg |1 icon-themes/elementary_svg/res/im30840.svg |1 icon-themes/elementary_svg/res/im30841.svg |1 icon-themes/karasa_jaga/links.txt|3 49 files changed, 44 insertions(+), 771 deletions(-) New commits: commit e66cc1f00b2820dfb44c22d03f2a1cf720bf0f65 Author: Rizal Muttaqin AuthorDate: Thu Jan 31 04:49:43 2019 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 2 22:38:06 2019 +0100 elementary:Update shape's group & ungroup KJ & elementary: Add %PRODUCTNAME Basic icon Change-Id: Ica1bbd66ea753a07c640eaf6d70d32cd919a4eac Reviewed-on: https://gerrit.libreoffice.org/67296 Reviewed-by: Rizal Muttaqin Tested-by: Rizal Muttaqin diff --git a/icon-themes/elementary/cmd/32/entergroup.png b/icon-themes/elementary/cmd/32/entergroup.png index 286c88a9a159..f42604a9fa1e 100644 Binary files a/icon-themes/elementary/cmd/32/entergroup.png and b/icon-themes/elementary/cmd/32/entergroup.png differ diff --git a/icon-themes/elementary/cmd/32/formatgroup.png b/icon-themes/elementary/cmd/32/formatgroup.png index f95a23549185..80c7dcd173a5 100644 Binary files a/icon-themes/elementary/cmd/32/formatgroup.png and b/icon-themes/elementary/cmd/32/formatgroup.png differ diff --git a/icon-themes/elementary/cmd/32/formatungroup.png b/icon-themes/elementary/cmd/32/formatungroup.png index 2ea637d1346f..1d8f096a9cd8 100644 Binary files a/icon-themes/elementary/cmd/32/formatungroup.png and b/icon-themes/elementary/cmd/32/formatungroup.png differ diff --git a/icon-themes/elementary/cmd/32/leavegroup.png b/icon-themes/elementary/cmd/32/leavegroup.png index 37524be85801..e3211e61d894 100644 Binary files a/icon-themes/elementary/cmd/32/leavegroup.png and b/icon-themes/elementary/cmd/32/leavegroup.png differ diff --git a/icon-themes/elementary/cmd/32/navigationbar.png b/icon-themes/elementary/cmd/32/navigationbar.png new file mode
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga
icon-themes/elementary/cmd/32/entergroup.png |binary icon-themes/elementary/cmd/32/formatgroup.png|binary icon-themes/elementary/cmd/32/formatungroup.png |binary icon-themes/elementary/cmd/32/leavegroup.png |binary icon-themes/elementary/cmd/32/navigationbar.png |binary icon-themes/elementary/cmd/32/numericfield.png |binary icon-themes/elementary/cmd/lc_entergroup.png |binary icon-themes/elementary/cmd/lc_formatgroup.png|binary icon-themes/elementary/cmd/lc_formatungroup.png |binary icon-themes/elementary/cmd/lc_leavegroup.png |binary icon-themes/elementary/cmd/lc_navigationbar.png |binary icon-themes/elementary/cmd/lc_numericfield.png |binary icon-themes/elementary/cmd/sc_entergroup.png |binary icon-themes/elementary/cmd/sc_formatgroup.png|binary icon-themes/elementary/cmd/sc_formatungroup.png |binary icon-themes/elementary/cmd/sc_leavegroup.png |binary icon-themes/elementary/cmd/sc_navigationbar.png |binary icon-themes/elementary/cmd/sc_numericfield.png |binary icon-themes/elementary/links.txt | 32 - icon-themes/elementary/res/im30822.png |binary icon-themes/elementary/res/im30840.png |binary icon-themes/elementary/res/im30841.png |binary icon-themes/elementary_svg/cmd/32/entergroup.svg |2 icon-themes/elementary_svg/cmd/32/formatgroup.svg|2 icon-themes/elementary_svg/cmd/32/formattedfield.svg |2 icon-themes/elementary_svg/cmd/32/formatungroup.svg |2 icon-themes/elementary_svg/cmd/32/leavegroup.svg |2 icon-themes/elementary_svg/cmd/32/navigationbar.svg |1 icon-themes/elementary_svg/cmd/32/numericfield.svg |1 icon-themes/elementary_svg/cmd/lc_entergroup.svg |2 icon-themes/elementary_svg/cmd/lc_formatgroup.svg|2 icon-themes/elementary_svg/cmd/lc_formatungroup.svg |2 icon-themes/elementary_svg/cmd/lc_leavegroup.svg |2 icon-themes/elementary_svg/cmd/lc_navigationbar.svg |1 icon-themes/elementary_svg/cmd/lc_numericfield.svg |1 icon-themes/elementary_svg/cmd/lc_unsetcellsreadonly.svg | 387 --- icon-themes/elementary_svg/cmd/sc_entergroup.svg |2 icon-themes/elementary_svg/cmd/sc_formatgroup.svg|2 icon-themes/elementary_svg/cmd/sc_formatungroup.svg |2 icon-themes/elementary_svg/cmd/sc_hfixedline.svg |3 icon-themes/elementary_svg/cmd/sc_leavegroup.svg |2 icon-themes/elementary_svg/cmd/sc_navigationbar.svg |1 icon-themes/elementary_svg/cmd/sc_numericfield.svg |1 icon-themes/elementary_svg/cmd/sc_vfixedline.svg |3 icon-themes/elementary_svg/res/baswatr.svg | 352 - icon-themes/elementary_svg/res/im30822.svg |1 icon-themes/elementary_svg/res/im30840.svg |1 icon-themes/elementary_svg/res/im30841.svg |1 icon-themes/karasa_jaga/links.txt|3 49 files changed, 44 insertions(+), 771 deletions(-) New commits: commit 70459f7bb7f7a214991e56e7ae6c83cbacf5a643 Author: Rizal Muttaqin AuthorDate: Thu Jan 31 04:49:43 2019 +0700 Commit: Rizal Muttaqin CommitDate: Sat Feb 2 22:37:44 2019 +0100 elementary:Update shape's group & ungroup KJ & elementary: Add %PRODUCTNAME Basic icon Change-Id: Ica1bbd66ea753a07c640eaf6d70d32cd919a4eac Reviewed-on: https://gerrit.libreoffice.org/67181 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/elementary/cmd/32/entergroup.png b/icon-themes/elementary/cmd/32/entergroup.png index 286c88a9a159..f42604a9fa1e 100644 Binary files a/icon-themes/elementary/cmd/32/entergroup.png and b/icon-themes/elementary/cmd/32/entergroup.png differ diff --git a/icon-themes/elementary/cmd/32/formatgroup.png b/icon-themes/elementary/cmd/32/formatgroup.png index f95a23549185..80c7dcd173a5 100644 Binary files a/icon-themes/elementary/cmd/32/formatgroup.png and b/icon-themes/elementary/cmd/32/formatgroup.png differ diff --git a/icon-themes/elementary/cmd/32/formatungroup.png b/icon-themes/elementary/cmd/32/formatungroup.png index 2ea637d1346f..1d8f096a9cd8 100644 Binary files a/icon-themes/elementary/cmd/32/formatungroup.png and b/icon-themes/elementary/cmd/32/formatungroup.png differ diff --git a/icon-themes/elementary/cmd/32/leavegroup.png b/icon-themes/elementary/cmd/32/leavegroup.png index 37524be85801..e3211e61d894 100644 Binary files a/icon-themes/elementary/cmd/32/leavegroup.png and b/icon-themes/elementary/cmd/32/leavegroup.png differ diff --git a/icon-themes/elementary/cmd/32/navigationbar.png b/icon-themes/elementary/cmd/32/navigationbar.png new file mode 100644 i
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/file/filtask.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 045c5bb758c263585d96b6ff361cf80e51a2f77a
Author: Julien Nabet
AuthorDate: Sat Feb 2 15:26:48 2019 +0100
Commit: Julien Nabet
CommitDate: Sat Feb 2 22:19:54 2019 +0100
tdf#123067: fix assert when exporting template
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=148772
Change-Id: I7bd6a7dcb7cf7677b92abe79abb781105dfb6019
Reviewed-on: https://gerrit.libreoffice.org/67285
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 39004e13eb39..4ccd50573a1d 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -1418,7 +1418,7 @@ TaskManager::copy(
}
case NameClash::RENAME:
{
-OUString newDstUnqPath;
+OUString newDstUnqPath = dstUnqPath;
nError = copy_recursive( rslvdSrcUnqPath,dstUnqPath,IsWhat,true );
if( nError == osl::FileBase::E_EXIST )
___
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' - cui/uiconfig
cui/uiconfig/ui/formatcellsdialog.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 3b2e876f52ab3ae4ec778d2d5dc3adee0b75aca0 Author: Caolán McNamara AuthorDate: Sat Feb 2 17:06:56 2019 + Commit: Adolfo Jayme Barrientos CommitDate: Sat Feb 2 21:16:08 2019 +0100 Resolves: tdf#123128 impress format->table dialog too tall it needs to be resizable if it has the modifiable western vs ctl+cjk font page Change-Id: I0498baaf566328549a365e57ac440161b7199ad9 Reviewed-on: https://gerrit.libreoffice.org/67293 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/cui/uiconfig/ui/formatcellsdialog.ui b/cui/uiconfig/ui/formatcellsdialog.ui index a7f3488e3fcf..dde69f6862ba 100644 --- a/cui/uiconfig/ui/formatcellsdialog.ui +++ b/cui/uiconfig/ui/formatcellsdialog.ui @@ -6,7 +6,6 @@ False 6 Table Properties -False True 0 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/formatcellsdialog.ui |1 - 1 file changed, 1 deletion(-) New commits: commit b9dbc9592f6f75b12a8cdcfd4f77d927a75fa982 Author: Caolán McNamara AuthorDate: Sat Feb 2 17:06:56 2019 + Commit: Adolfo Jayme Barrientos CommitDate: Sat Feb 2 21:15:55 2019 +0100 Resolves: tdf#123128 impress format->table dialog too tall it needs to be resizable if it has the modifiable western vs ctl+cjk font page Change-Id: I0498baaf566328549a365e57ac440161b7199ad9 Reviewed-on: https://gerrit.libreoffice.org/67292 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/cui/uiconfig/ui/formatcellsdialog.ui b/cui/uiconfig/ui/formatcellsdialog.ui index a7f3488e3fcf..dde69f6862ba 100644 --- a/cui/uiconfig/ui/formatcellsdialog.ui +++ b/cui/uiconfig/ui/formatcellsdialog.ui @@ -6,7 +6,6 @@ False 6 Table Properties -False True 0 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Temporarily yielding SolarMutex to another thread
Am 2. Februar 2019 14:49:29 MEZ schrieb Noel Grandin : >Assuming that there is no other way to accomplish this, how could it >work >to allow multiple child widgets to "own" the SolarMutex simultaneously? >We >just need one of those threads to trigger an update to something like a >cache, and one of the other threads is likely to crash because of a >stale >pointer. > >Unless you are talking about passing some kind of permission down to >the >child threads, which says "this thread is allowed to also take the >SolarMutex, even though it is already locked", which means we'd need >another counter, and then how would that interact with >SolarMutexReleaser. > >Possibly another way here is to make the parts of the child threads >that >currently need the SolarMutex, to get their own mutex, preferably a >reader/writer mutex, so that multiple of them can run in parallel. The only real fix is to get rid of SolarMutex (SM) ;-) While that is a long term goal, the way to do this is IMHO to keep the SM in the parent thread and use some messaging to transfer SM work from child to parent. Your idea is basically what the OSX VCL backend is doing: transfer work via code block passing and a flag to ignore SM in the main thread while working on the code block in main. Have a look at https://cgit.freedesktop.org/libreoffice/core/tree/vcl/inc/osx/runinmain.hxx In VCL we kind of do this on all platforms using different mechanisms, as all of them require to do GUI stuff in the main thread (unless you use threaded OpenGL), except GTK+, which also has a kind of SM (GDK lock), as it has to honour the platforms constraints anyway. All the non-GUI work should use its own synchronisation primitive. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Commit 66203
Hey Eike, Thanks alot for the help. So, I think I have done the required changes. Can you please check and suggest me what is to be done next? Regards, Komal On Jan 23, 2019 7:32 PM, "Eike Rathke" wrote: > Hi Komal, > > On Wednesday, 2019-01-23 14:48:18 +0100, Eike Rathke wrote: > > > You somehow have multiple changes on the branch you want to push to > > gerrit. > > Also, for the future (but get your change merge corrected and pushed > first) I recommend to use git-review to handle branches and changes to > be pushed to gerrit, which among other things exactly warns of multiple > changes to be pushed. See > https://wiki.documentfoundation.org/Development/GitReview > > Eike > > -- > GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 > 2D3A > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source sc/uiconfig
sc/inc/scabstdlg.hxx |2
sc/qa/unit/screenshots/screenshots.cxx|2
sc/source/ui/attrdlg/scdlgfact.cxx| 16 ---
sc/source/ui/attrdlg/scdlgfact.hxx| 11 -
sc/source/ui/dbgui/textimportoptions.cxx | 64 +++---
sc/source/ui/inc/textimportoptions.hxx| 28 +
sc/source/ui/unoobj/filtuno.cxx |2
sc/source/ui/view/viewfun5.cxx|3 -
sc/uiconfig/scalc/ui/textimportoptions.ui | 21 ++---
9 files changed, 74 insertions(+), 75 deletions(-)
New commits:
commit c744995d7acbfd1ba06eb61c8f00d119a59d3cbf
Author: Caolán McNamara
AuthorDate: Sat Feb 2 16:19:16 2019 +
Commit: Caolán McNamara
CommitDate: Sat Feb 2 18:20:06 2019 +0100
weld ScTextImportOptionsDlg
Change-Id: If558a805e48bc7cfa57e729143588a533060a65b
Reviewed-on: https://gerrit.libreoffice.org/67291
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index fa82d4550da9..8c1153fcabc1 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -398,7 +398,7 @@ public:
SvStream*
pInStream,
ScImportAsciiCall eCall) = 0;
-virtual VclPtr
CreateScTextImportOptionsDlg() = 0;
+virtual VclPtr
CreateScTextImportOptionsDlg(weld::Window* pParent) = 0;
virtual VclPtr
CreateScAutoFormatDlg(vcl::Window* pParent,
ScAutoFormat*
pAutoFormat,
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 8f212bbda1e8..a036b693702c 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -209,7 +209,7 @@ VclPtr
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
case 10: // "modules/scalc/ui/textimportoptions.ui"
{
-pReturnDialog = mpFact->CreateScTextImportOptionsDlg();
+pReturnDialog =
mpFact->CreateScTextImportOptionsDlg(mpViewShell->GetFrameWeld());
break;
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 161297ab80d2..12599e6f6ca4 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -198,7 +198,12 @@ short AbstractScTabBgColorDlg_Impl::Execute()
}
IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
+
+short AbstractScTextImportOptionsDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
IMPL_ABSTDLG_BASE(ScAbstractTabDialog_Impl);
AbstractScLinkedAreaDlg_Impl::~AbstractScLinkedAreaDlg_Impl()
@@ -684,12 +689,12 @@ void AbstractScImportOptionsDlg_Impl::SaveImportOptions()
const
LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const
{
-return pDlg->getLanguageType();
+return m_xDlg->getLanguageType();
}
bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
{
-return pDlg->isDateConversionSet();
+return m_xDlg->isDateConversionSet();
}
short ScAbstractTabController_Impl::Execute()
@@ -737,10 +742,9 @@ VclPtr
ScAbstractDialogFactory_Impl::CreateScImportAsc
return VclPtr::Create( pDlg );
}
-VclPtr
ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg()
+VclPtr
ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(weld::Window*
pParent)
{
-VclPtr pDlg =
VclPtr::Create(nullptr);
-return VclPtr::Create(pDlg);
+return
VclPtr::Create(std::make_unique(pParent));
}
VclPtr
ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(vcl::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 8413310703f8..1519074fa28e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -505,7 +505,14 @@ class AbstractScImportOptionsDlg_Impl : public
AbstractScImportOptionsDlg
class AbstractScTextImportOptionsDlg_Impl : public
AbstractScTextImportOptionsDlg
{
-DECL_ABSTDLG_BASE( AbstractScTextImportOptionsDlg_Impl,
ScTextImportOptionsDlg)
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit
AbstractScTextImportOptionsDlg_Impl(std::unique_ptr p)
+: m_xDlg(std::move(p))
+{
+}
+virtual short Execute() override;
virtual LanguageType GetLanguageType() const override;
virtual bool IsDateConversionSet() const override;
};
@@ -552,7 +559,7 @@ public:
SvStream*
pInStream,
ScImportAsciiCall eCall) override;
-virtual VclPtr
CreateScTextImportOptionsDlg() override;
+virtual VclPtr
CreateScTextImportOptionsDlg(weld::Window* pParent) over
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/dapiuno.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit fe8d62dc89b5de2a720b30a64a1a6a7e7d47344f
Author: Jens Carl
AuthorDate: Sat Feb 2 02:01:05 2019 +
Commit: Eike Rathke
CommitDate: Sat Feb 2 16:35:57 2019 +0100
Remove obsolete TODO comments
The comments were introduced with commit
87ec4dbf4ad505c9e908db59144a6d41ecd89b5c,
but didn't have any further explanations.
Change-Id: I4519037361f3f4c961e4455a766917c1a061288f
Reviewed-on: https://gerrit.libreoffice.org/67271
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index e9bc8db1be47..ca1ddda16cc8 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1629,7 +1629,6 @@ static bool lcl_GetFieldDataByName( ScDPObject* pDPObj,
const OUString& rFieldNa
ScDataPilotFieldObj* ScDataPilotFieldsObj::GetObjectByIndex_Impl( sal_Int32
nIndex ) const
{
-// TODO
if (ScDPObject* pObj = GetDPObject())
{
ScFieldIdentifier aFieldId;
@@ -1663,7 +1662,6 @@ Reference SAL_CALL
ScDataPilotFieldsObj::createEnumeration()
sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount()
{
SolarMutexGuard aGuard;
-// TODO
ScDPObject* pDPObj = GetDPObject();
return pDPObj ? lcl_GetFieldCount( pDPObj->GetSource(), maOrient ) : 0;
}
@@ -1705,7 +1703,6 @@ Any SAL_CALL ScDataPilotFieldsObj::getByName( const
OUString& aName )
Sequence SAL_CALL ScDataPilotFieldsObj::getElementNames()
{
SolarMutexGuard aGuard;
-// TODO
if (ScDPObject* pDPObj = GetDPObject())
{
Sequence< OUString > aSeq( lcl_GetFieldCount( pDPObj->GetSource(),
maOrient ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/00/0406.xhp|3 +++ source/text/scalc/01/0607.xhp|1 + source/text/scalc/01/0608.xhp|1 + source/text/shared/optionen/01060900.xhp |4 4 files changed, 9 insertions(+) New commits: commit e97ba44f1792c187910964c7f28a20fafcc0b251 Author: Mark AuthorDate: Thu Jan 31 09:23:29 2019 -0800 Commit: Olivier Hallot CommitDate: Sat Feb 2 15:37:41 2019 +0100 Bug 107930 - Help needs to be corrected and amended for Recalculation add 'recalculate' bookmark_value to 0608.xhp and 0607.xhp, created 'exnbr' section in 0406.xhp for 'Tools -> Options -> LibreOffice Calc -> Formula' and added 'embed' tag to 01060900.xhp changed 0406.xhp LibreOffice text to %PRODUCTNAME Change-Id: Id3c6dffd31b1b72a854a5bd11902d2c22109900a Reviewed-on: https://gerrit.libreoffice.org/67237 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/00/0406.xhp b/source/text/scalc/00/0406.xhp index 43cce5a3e..40b1a51fe 100644 --- a/source/text/scalc/00/0406.xhp +++ b/source/text/scalc/00/0406.xhp @@ -57,6 +57,9 @@ Choose Data - Calculate - Recalculate. F9 + +Choose Tools - Options - %PRODUCTNAME Calc - Formula. + Choose Data - Calculate - AutoCalculate. Choose Tools - AutoInput. diff --git a/source/text/scalc/01/0607.xhp b/source/text/scalc/01/0607.xhp index 41679363a..e5aee52f3 100644 --- a/source/text/scalc/01/0607.xhp +++ b/source/text/scalc/01/0607.xhp @@ -29,6 +29,7 @@ calculating; auto calculating sheets +recalculate;auto calculating sheets recalculating;auto calculating sheets AutoCalculate function in sheets correcting sheets automatically diff --git a/source/text/scalc/01/0608.xhp b/source/text/scalc/01/0608.xhp index 739b0d8d2..b704a3c29 100644 --- a/source/text/scalc/01/0608.xhp +++ b/source/text/scalc/01/0608.xhp @@ -29,6 +29,7 @@ recalculating;all formulas in sheets +recalculate;all formulas in sheets formulas; recalculating manually cell contents; recalculating mw changed "recalculating;...", "formulas;..." and "cell..." entries and deleted "recalculating formulas" diff --git a/source/text/shared/optionen/01060900.xhp b/source/text/shared/optionen/01060900.xhp index cb22ea252..a08065663 100644 --- a/source/text/shared/optionen/01060900.xhp +++ b/source/text/shared/optionen/01060900.xhp @@ -36,6 +36,7 @@ separators;function separators;array column separators;array row +recalculate;formula options recalculating;formula options recalculating;large spreadsheet files loading;large spreadsheet files @@ -76,6 +77,9 @@ Recalculation on File Load + + + Recalculating formulas can take significant time while loading very large files. Excel 2007 and newer: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1204af25fde368cfd3539915dc6cc4edcecec041 Author: Mark AuthorDate: Thu Jan 31 09:23:29 2019 -0800 Commit: Gerrit Code Review CommitDate: Sat Feb 2 15:37:41 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Bug 107930 - Help needs to be corrected and amended for Recalculation add 'recalculate' bookmark_value to 0608.xhp and 0607.xhp, created 'exnbr' section in 0406.xhp for 'Tools -> Options -> LibreOffice Calc -> Formula' and added 'embed' tag to 01060900.xhp changed 0406.xhp LibreOffice text to %PRODUCTNAME Change-Id: Id3c6dffd31b1b72a854a5bd11902d2c22109900a Reviewed-on: https://gerrit.libreoffice.org/67237 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ae3c8a0a8a17..e97ba44f1792 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ae3c8a0a8a17b5cd3c427d7c62a4832631e18bb2 +Subproject commit e97ba44f1792c187910964c7f28a20fafcc0b251 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/inc/protectiondlg.hxx | 44 +-
sc/source/ui/miscdlgs/protectiondlg.cxx | 133
sc/source/ui/view/tabvwsh3.cxx |9 +-
sc/uiconfig/scalc/ui/protectsheetdlg.ui | 95 +++---
4 files changed, 175 insertions(+), 106 deletions(-)
New commits:
commit 65d4676eedeb0de91cdf7105453f18f600b3f13a
Author: Caolán McNamara
AuthorDate: Sat Feb 2 11:26:08 2019 +
Commit: Caolán McNamara
CommitDate: Sat Feb 2 14:58:41 2019 +0100
weld ScTableProtectionDlg
Change-Id: Icbf9e3b679b58d2781a52a0f55b16511eed14485
Reviewed-on: https://gerrit.libreoffice.org/67279
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/inc/protectiondlg.hxx
b/sc/source/ui/inc/protectiondlg.hxx
index 3f30ea33180b..e0dd803e3f61 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -20,23 +20,18 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_PROTECTIONDLG_HXX
#define INCLUDED_SC_SOURCE_UI_INC_PROTECTIONDLG_HXX
-#include
-#include
-#include
-#include
-
+#include
#include
namespace vcl { class Window; }
class ScTableProtection;
-class ScTableProtectionDlg : public ModalDialog
+class ScTableProtectionDlg : public weld::GenericDialogController
{
public:
ScTableProtectionDlg() = delete;
-explicit SC_DLLPUBLIC ScTableProtectionDlg(vcl::Window* pParent);
+explicit SC_DLLPUBLIC ScTableProtectionDlg(weld::Window* pParent);
virtual ~ScTableProtectionDlg() override;
-virtual void dispose() override;
void SetDialogData(const ScTableProtection& rData);
@@ -47,17 +42,6 @@ private:
void EnableOptionalWidgets(bool bEnable);
-VclPtrm_pBtnProtect;
-
-VclPtrm_pPasswords;
-VclPtrm_pOptions;
-VclPtrm_pPassword1Edit;
-VclPtrm_pPassword2Edit;
-
-VclPtr m_pOptionsListBox;
-
-VclPtrm_pBtnOk;
-
OUString m_aSelectLockedCells;
OUString m_aSelectUnlockedCells;
OUString m_aInsertColumns;
@@ -65,9 +49,25 @@ private:
OUString m_aDeleteColumns;
OUString m_aDeleteRows;
-DECL_LINK( OKHdl, Button*, void );
-DECL_LINK( CheckBoxHdl, Button*, void );
-DECL_LINK( PasswordModifyHdl, Edit&, void );
+std::unique_ptr m_xBtnProtect;
+std::unique_ptr m_xPasswords;
+std::unique_ptr m_xOptions;
+std::unique_ptr m_xPassword1Edit;
+std::unique_ptr m_xPassword2Edit;
+std::unique_ptr m_xOptionsListBox;
+std::unique_ptr m_xBtnOk;
+std::unique_ptr m_xProtected;
+std::unique_ptr m_xUnprotected;
+std::unique_ptr m_xInsertColumns;
+std::unique_ptr m_xInsertRows;
+std::unique_ptr m_xDeleteColumns;
+std::unique_ptr m_xDeleteRows;
+
+void InsertEntry(const OUString& rTxt);
+
+DECL_LINK(OKHdl, weld::Button&, void);
+DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
+DECL_LINK(PasswordModifyHdl, weld::Entry&, void);
};
#endif
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx
b/sc/source/ui/miscdlgs/protectiondlg.cxx
index 28712c3b16c3..0f3e1384ae3c 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -38,118 +38,123 @@ const std::vector aOptions = {
}
-ScTableProtectionDlg::ScTableProtectionDlg(vcl::Window* pParent)
-: ModalDialog( pParent, "ProtectSheetDialog",
"modules/scalc/ui/protectsheetdlg.ui" )
+ScTableProtectionDlg::ScTableProtectionDlg(weld::Window* pParent)
+: weld::GenericDialogController(pParent,
"modules/scalc/ui/protectsheetdlg.ui", "ProtectSheetDialog")
+, m_xBtnProtect(m_xBuilder->weld_check_button("protect"))
+, m_xPasswords(m_xBuilder->weld_container("passwords"))
+, m_xOptions(m_xBuilder->weld_container("options"))
+, m_xPassword1Edit(m_xBuilder->weld_entry("password1"))
+, m_xPassword2Edit(m_xBuilder->weld_entry("password2"))
+, m_xOptionsListBox(m_xBuilder->weld_tree_view("checklist"))
+, m_xBtnOk(m_xBuilder->weld_button("ok"))
+, m_xProtected(m_xBuilder->weld_label("protected"))
+, m_xUnprotected(m_xBuilder->weld_label("unprotected"))
+, m_xInsertColumns(m_xBuilder->weld_label("insert-columns"))
+, m_xInsertRows(m_xBuilder->weld_label("insert-rows"))
+, m_xDeleteColumns(m_xBuilder->weld_label("delete-columns"))
+, m_xDeleteRows(m_xBuilder->weld_label("delete-rows"))
{
-get(m_pPasswords, "passwords");
-get(m_pOptions, "options");
-get(m_pBtnProtect, "protect");
-get(m_pOptionsListBox, "checklist");
-get(m_pPassword1Edit, "password1");
-get(m_pPassword2Edit, "password2");
-get(m_pBtnOk, "ok");
-
-m_aSelectLockedCells = get("protected")->GetText();
-m_aSelectUnlockedCells = get("unprotected")->GetText();
-m_aInsertColumns = get("insert-columns")->GetText();
-m_aInsertRows = get("insert-rows")->GetText();
-m_aDeleteColumns = get("delete-col
Re: Temporarily yielding SolarMutex to another thread
Assuming that there is no other way to accomplish this, how could it work to allow multiple child widgets to "own" the SolarMutex simultaneously? We just need one of those threads to trigger an update to something like a cache, and one of the other threads is likely to crash because of a stale pointer. Unless you are talking about passing some kind of permission down to the child threads, which says "this thread is allowed to also take the SolarMutex, even though it is already locked", which means we'd need another counter, and then how would that interact with SolarMutexReleaser. Possibly another way here is to make the parts of the child threads that currently need the SolarMutex, to get their own mutex, preferably a reader/writer mutex, so that multiple of them can run in parallel. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/qa
sc/qa/uitest/autofilter/data/tdf117276.ods |binary
sc/qa/uitest/autofilter/tdf117276.py | 115 +
2 files changed, 115 insertions(+)
New commits:
commit 1b36fbaa7f110739873c69f0d5eeb4fc5d1cf335
Author: Zdeněk Crhonek
AuthorDate: Fri Dec 21 18:17:07 2018 +0100
Commit: Thorsten Behrens
CommitDate: Sat Feb 2 14:29:30 2019 +0100
uitest for bug tdf#117276
Change-Id: Ib61eee95d7ed4e6ede9455b058406eccd140e31c
Reviewed-on: https://gerrit.libreoffice.org/6
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
(cherry picked from commit 83e957bfbfa22980461b6c0f07231902549504d4)
Reviewed-on: https://gerrit.libreoffice.org/67257
Reviewed-by: Thorsten Behrens
diff --git a/sc/qa/uitest/autofilter/data/tdf117276.ods
b/sc/qa/uitest/autofilter/data/tdf117276.ods
new file mode 100644
index ..d1310526e727
Binary files /dev/null and b/sc/qa/uitest/autofilter/data/tdf117276.ods differ
diff --git a/sc/qa/uitest/autofilter/tdf117276.py
b/sc/qa/uitest/autofilter/tdf117276.py
new file mode 100644
index ..c5129e145b9b
--- /dev/null
+++ b/sc/qa/uitest/autofilter/tdf117276.py
@@ -0,0 +1,115 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_sheet_from_doc
+from libreoffice.calc.conditional_format import
get_conditional_format_from_sheet
+from uitest.debug import sleep
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from libreoffice.calc.document import get_row
+# import org.libreoffice.unotest
+# import pathlib
+from uitest.path import get_srcdir_url
+
+def get_url_for_data_file(file_name):
+#return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+return get_srcdir_url() + "/sc/qa/uitest/autofilter/data/" + file_name
+
+def is_row_hidden(doc, index):
+row = get_row(doc, index)
+val = row.getPropertyValue("IsVisible")
+return not val
+
+#Bug 117276 - Autofilter settings being reset in some cases
+
+class tdf117276(UITestCase):
+def test_tdf117276_autofilter(self):
+calc_doc =
self.ui_test.load_file(get_url_for_data_file("tdf117276.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+# 1. open attached file
+# 2. open filter of column B (Fabrikat) and deselect (Citroen, Fiat,
Ford, Opel, Peugeot, Renault, Tesla)
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "1", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xTreeList = xCheckListMenu.getChild("check_list_box")
+
+xCitroenEntry = xTreeList.getChild("2")
+xCitroenEntry.executeAction("CLICK", tuple()) #Citroen
+xFiatEntry = xTreeList.getChild("3")
+xFiatEntry.executeAction("CLICK", tuple()) #Fiat
+xFordEntry = xTreeList.getChild("4")
+xFordEntry.executeAction("CLICK", tuple()) #Ford
+xOpelEntry = xTreeList.getChild("6")
+xOpelEntry.executeAction("CLICK", tuple()) #Opel
+xPeugeotEntry = xTreeList.getChild("7")
+xPeugeotEntry.executeAction("CLICK", tuple()) #Peugeot
+xRenaultEntry = xTreeList.getChild("9")
+xRenaultEntry.executeAction("CLICK", tuple()) #Renault
+xTeslaEntry = xTreeList.getChild("10")
+xTeslaEntry.executeAction("CLICK", tuple()) #Tesla
+
+xOkBtn = xFloatWindow.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+self.assertFalse(is_row_hidden(calc_doc, 0))
+self.assertFalse(is_row_hidden(calc_doc, 1))
+self.assertTrue(is_row_hidden(calc_doc, 3))
+
+# 3. open filter of column I (Wert) and deselect 8000 (Values 7000 and
9000 are not shown)
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "8", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xTreeList = xCheckListMenu.getChild("check_list_box")
+
+xCitroenEntry = xTreeList.getChild("0")
+xCitroenEntry.executeAction("CLICK", tuple())
+
+xOkBtn = xFloatWindow.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+self.assertFalse(is_row_hidden(calc_doc, 0))
+self.assertFalse(is_row_hidden(calc_doc, 1))
+self.as
Re: Conflict with submitted change
Hi, On 02.02.2019 9:48, Aditya Sahu wrote: > Hi, > I submitted a change ( Change-Id: > I440c637dd2a566f820a6e8fac826f35cabb9c05f ) but after doing that, I > found out that it is having conflict with some other change ( Change-Id: > I937ed12f2a96943664087ddcdd035f1347e84a57 ). > What should be my move here? As discussed on IRC, that was a misunderstanding: gerrit shown "Conflict with:" information about a change modifying the same file (in a different place: [1], [2]). The changes don't actually conflict. [1] https://gerrit.libreoffice.org/#/c/67102/2/svtools/source/dialogs/PlaceEditDialog.cxx [2] https://gerrit.libreoffice.org/#/c/66055/11/svtools/source/dialogs/PlaceEditDialog.cxx -- Best regards, Mike Kaganski ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/Qt5DragAndDrop.cxx | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit b8ac898eb0e1ce9f068e5b4e0c4b04a729a394cb
Author: Katarina Behrens
AuthorDate: Sat Feb 2 10:07:21 2019 +0100
Commit: Katarina Behrens
CommitDate: Sat Feb 2 14:21:39 2019 +0100
tdf#120772: DnD of multiple URLs from file manager -> LibO
Change-Id: I8d6fc446eff46fd6ab1152a3af836df891dde52a
Reviewed-on: https://gerrit.libreoffice.org/67277
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/vcl/qt5/Qt5DragAndDrop.cxx b/vcl/qt5/Qt5DragAndDrop.cxx
index 9352eea1cc47..fcd65fe39049 100644
--- a/vcl/qt5/Qt5DragAndDrop.cxx
+++ b/vcl/qt5/Qt5DragAndDrop.cxx
@@ -44,9 +44,18 @@ css::uno::Any Qt5DnDTransferable::getTransferData(const
css::datatransfer::DataF
if (urlList.size() > 0)
{
-//FIXME: multiple URLs, here we take only 1st one
-QString url = urlList.at(0).path();
-std::string aStr = url.toStdString();
+std::string aStr;
+
+// transfer data is list of URLs
+for (int i = 0; i < urlList.size(); ++i)
+{
+QString url = urlList.at(i).path();
+aStr += url.toStdString();
+// separated by newline if more than 1
+if (i < urlList.size() - 1)
+aStr += "\n";
+}
+
Sequence aSeq(reinterpret_cast(aStr.c_str()), aStr.length());
aAny <<= aSeq;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: WIP migration towards Firebird 3.0.4, cannot find -ltommath
On Thu, 2019-01-31 at 13:09 -0700, julien2412 wrote: > Hello, > > I'm giving a try to migrate Firebird from 3.0.0 towards 3.0.4 From what I read, Firebird 4.0 is going to make it easy to handle dates more like HSQLDB does. 4.0 is still pre-release, and I have not seen a projected date for release. Is it a good idea to move to 4.0? Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: First-time development/C++ Contributor
I feel like going for it by myself so I learn a thing or two along the way probably what I am going to do. Thanks for the info! Any help will be appreciated, I might hop on IRC but am more used to Telegram as a source of communication at the moment On Mon, Jan 28, 2019 at 12:43 PM Kaganski Mike wrote: > On 28.01.2019 14:40, Michael Weghorn wrote: > > The use of "lode" is not mandatory, you can also manually do the > > required setup, but be aware that lode will simplify the setup > > True, but > > > and > > you're more on your own if you encounter any issues while doing things > > by yourself. > > Personally I feel more comfortable helping those on IRC who do it by > themselves, because that's how I did, and so because I'm more familiar > with that setup. > > -- > Best regards, > Mike Kaganski > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
size of word/document.xml
When I unzip a docx file and browse through the word/document.xml file, I see lots of things like: w:rsidRDefault="" w:rsidRPr="" w14:paraId="004D"> all thorough the file. Why not just write it like: with a default value of "0" for missing attributes? Regards, Claude ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Conflict with submitted change
Hi, I submitted a change ( Change-Id: I440c637dd2a566f820a6e8fac826f35cabb9c05f ) but after doing that, I found out that it is having conflict with some other change ( Change-Id: I937ed12f2a96943664087ddcdd035f1347e84a57 ). What should be my move here? -- Best Regards, Aditya Sahu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig
sc/inc/scabstdlg.hxx |4 -
sc/source/ui/attrdlg/scdlgfact.cxx | 14 ++-
sc/source/ui/attrdlg/scdlgfact.hxx | 13 ++-
sc/source/ui/dbgui/scendlg.cxx | 122 ++---
sc/source/ui/docshell/docsh4.cxx |3
sc/source/ui/inc/scendlg.hxx | 36 -
sc/source/ui/view/cellsh3.cxx |2
sc/uiconfig/scalc/ui/scenariodialog.ui | 47 +---
8 files changed, 129 insertions(+), 112 deletions(-)
New commits:
commit e666102498dc37988630eb06071670e2c64abdfb
Author: Caolán McNamara
AuthorDate: Sat Feb 2 10:21:55 2019 +
Commit: Caolán McNamara
CommitDate: Sat Feb 2 12:26:23 2019 +0100
weld ScNewScenarioDlg
Change-Id: I30bab36cc4163872a5e72abd2c111ff9b0b5846e
Reviewed-on: https://gerrit.libreoffice.org/67278
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 8542a283375b..fa82d4550da9 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -494,8 +494,8 @@ public:
ScDPObject&
rDPObj,
css::sheet::DataPilotFieldOrientation nOrient ) = 0;
-virtual VclPtr CreateScNewScenarioDlg (
vcl::Window* pParent, const OUString& rName,
-bool bEdit,
bool bSheetProtected ) = 0;
+virtual VclPtr
CreateScNewScenarioDlg(weld::Window* pParent, const OUString& rName,
+bool
bEdit, bool bSheetProtected) = 0;
virtual VclPtr CreateScShowTabDlg(weld::Window*
pParent) = 0;
virtual VclPtr
CreateScStringInputDlg(weld::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 4f2ecd2092a0..161297ab80d2 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -172,7 +172,10 @@ short AbstractScDPShowDetailDlg_Impl::Execute()
return m_xDlg->run();
}
-IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl);
+short AbstractScNewScenarioDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
short AbstractScShowTabDlg_Impl::Execute()
{
@@ -623,13 +626,13 @@ OUString
AbstractScDPShowDetailDlg_Impl::GetDimensionName() const
void AbstractScNewScenarioDlg_Impl::SetScenarioData(
const OUString& rName, const OUString& rComment, const Color& rColor,
ScScenarioFlags nFlags )
{
-pDlg->SetScenarioData(rName, rComment, rColor, nFlags);
+m_xDlg->SetScenarioData(rName, rComment, rColor, nFlags);
}
void AbstractScNewScenarioDlg_Impl::GetScenarioData(
OUString& rName, OUString& rComment, Color& rColor, ScScenarioFlags&
rFlags ) const
{
-pDlg->GetScenarioData(rName, rComment, rColor, rFlags);
+m_xDlg->GetScenarioData(rName, rComment, rColor, rFlags);
}
void AbstractScShowTabDlg_Impl::Insert( const OUString& rString, bool
bSelected )
@@ -923,11 +926,10 @@ VclPtr
ScAbstractDialogFactory_Impl::CreateScDPShowDe
return VclPtr::Create(new
ScDPShowDetailDlg(pParent, rDPObj, nOrient));
}
-VclPtr
ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(vcl::Window* pParent,
const OUString& rName,
+VclPtr
ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(weld::Window* pParent,
const OUString& rName,
bool bEdit, bool bSheetProtected)
{
-VclPtr pDlg = VclPtr::Create(pParent,
rName, bEdit, bSheetProtected);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new
ScNewScenarioDlg(pParent, rName, bEdit, bSheetProtected));
}
VclPtr
ScAbstractDialogFactory_Impl::CreateScShowTabDlg(weld::Window* pParent)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index bcf0fa6e0c8e..8413310703f8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -426,7 +426,14 @@ public:
class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg
{
-DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg )
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractScNewScenarioDlg_Impl(ScNewScenarioDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
+
virtual void SetScenarioData( const OUString& rName, const OUString&
rComment,
const Color& rColor, ScScenarioFlags nFlags )
override;
@@ -641,8 +648,8 @@ public:
ScDPObject&
rDPObj,
css::sheet::DataPilotFieldOrientation nOrient) override;
-virtual VclPtr CreateScNewScenarioDlg (
vcl::Window* pParent, const OUString& rName,
-bool bEdit,
bool bSheetProtected ) override;
+virtual VclPtr
[Libreoffice-commits] core.git: svtools/source
svtools/source/dialogs/PlaceEditDialog.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit f875364d5bf2207410814efe39e1b41f3c283356 Author: Aditya AuthorDate: Thu Jan 31 03:50:55 2019 +0530 Commit: Mike Kaganski CommitDate: Sat Feb 2 10:37:08 2019 +0100 tdf#119812: Hide "Windows Share" server type in Windows OS. The "Windows Share" server type is non-functional in Windows OS but still shown in the File Services (PlaceEditDialog) dialog. This patch removes its entry from dialog on Windows only so that no more non-functional service can be created. Change-Id: I440c637dd2a566f820a6e8fac826f35cabb9c05f Reviewed-on: https://gerrit.libreoffice.org/66055 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index dfaba1f22488..df8f6f46fddb 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -223,10 +223,17 @@ void PlaceEditDialog::InitDetails( ) xSshDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) ); m_aDetailsContainers.push_back(xSshDetails); +// Remove Windows Share entry from dialog on Windows OS, where it's non-functional +#if defined(_WIN32) +// nPos is the position of first item that is pre-defined in svtools/uiconfig/ui/placeedit.ui, +// after other CMIS types were inserted +m_xLBServerType->remove(nPos + 3); +#else // Create Windows Share control std::shared_ptr xSmbDetails(std::make_shared(this)); xSmbDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) ); m_aDetailsContainers.push_back(xSmbDetails); +#endif // Set default to first value m_xLBServerType->set_active(0); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
