[Libreoffice-commits] core.git: cli_ure/source
cli_ure/source/climaker/climaker_emit.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 47a5f90d42923fa045814d5c739c686381913c4c Author: Andrea Gelmini AuthorDate: Thu Jan 31 17:44:48 2019 + Commit: Julien Nabet CommitDate: Mon Feb 4 07:07:07 2019 +0100 Fix typo Change-Id: If5772a609d7333f3fc07ade887e9a25762ebb75a Reviewed-on: https://gerrit.libreoffice.org/67340 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index ed864e18298f..f4526eb037a5 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -624,7 +624,7 @@ Assembly ^ TypeEmitter::type_resolve( } } ::System::String ^ cts_name = to_cts_name( uno_name ); -// if the struct is an instantiated polymorpic struct then we create the simple struct name +// if the struct is an instantiated polymorphic struct then we create the simple struct name // For example: // void func ([in] PolyStruct arg); //PolyStruct will be converted to PolyStruct ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Libre 6.1.4 bugs with vlookup
Hello, I've used libreoffice version 5 (don't know exactly the version) until now and there was no bugs for me. Today, I've installed version 6.1.4 (for Windows 7) and found 2 bugs: 1. Function vlookup (in calc) is not working between two different files. When the function wizard window is active and I want to set the second parameter (array) of this function, if needed array is in the other file, when I go to that file, the function wizard window disappears. Even if I select needed array, and go manually back to the first file, the function wizard window is active there, but the selection of array is not reflected in it. Both files are .ods format. 2. Second bug is also with the function Vlookup: if the seccond parameter (array) of the function is in the same file as function, but in the other sheet, there is not possible to select whole columns using columns lable. For example if I need to select whole first two columns, in the past I could do it by marking column lables A and B (the result in function wizard is A:B). Now it's not working and I can only select cells A1 and B1 (in the function wizard window will be A1:B1) after this I delete both "1" manually and have needed A:B. So it was easyer in the old versions. Is it possible co correct these bugs? Sergiu Iabanji E-Mail: iabanji1...@gmail.com Phone: +373 794 68 960 Skype: sergiu1402 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source include/avmedia slideshow/source svx/source
avmedia/source/framework/mediaitem.cxx| 45 ++
include/avmedia/mediaitem.hxx | 15 ++
slideshow/source/engine/animationnodes/animationaudionode.cxx |3
slideshow/source/engine/slide/slideimpl.cxx |6
slideshow/source/engine/slideshowcontext.cxx |2
slideshow/source/engine/slideshowimpl.cxx | 46 ++
slideshow/source/engine/soundplayer.cxx | 17 +-
slideshow/source/inc/mediafilemanager.hxx | 36 +
slideshow/source/inc/slide.hxx|2
slideshow/source/inc/slideshowcontext.hxx |6
slideshow/source/inc/soundplayer.hxx | 11 +
svx/source/svdraw/svdomedia.cxx | 69 +-
12 files changed, 187 insertions(+), 71 deletions(-)
New commits:
commit 6b6c0b120f3275be6bd9dbb26480f8f1df355e00
Author: Mark Hung
AuthorDate: Sun Jan 27 13:41:34 2019 +0800
Commit: Mark Hung
CommitDate: Mon Feb 4 01:15:22 2019 +0100
tdf#44223 allow slideshow to play embedded media.
Implement MediaFileManager that create the temp media
file for package urls when making slideshow.
Change-Id: I10a5ddc405928b4322ad72eb603508faf25bf0db
Reviewed-on: https://gerrit.libreoffice.org/67209
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/avmedia/source/framework/mediaitem.cxx
b/avmedia/source/framework/mediaitem.cxx
index 6f960f49f3bc..0fca80f6d5b4 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
@@ -475,6 +476,50 @@ bool EmbedMedia(uno::Reference const&
xModel,
return false;
}
+bool CreateMediaTempFile(uno::Reference const& xInStream,
+OUString& o_rTempFileURL, const OUString& rDesiredExtension)
+{
+OUString tempFileURL;
+::osl::FileBase::RC const err =
+::osl::FileBase::createTempFile(nullptr, nullptr, & tempFileURL);
+if (::osl::FileBase::E_None != err)
+{
+SAL_WARN("avmedia", "cannot create temp file");
+return false;
+}
+
+if (!rDesiredExtension.isEmpty())
+{
+OUString newTempFileURL = tempFileURL + rDesiredExtension;
+if (osl::File::move(tempFileURL, newTempFileURL) !=
osl::FileBase::E_None)
+{
+SAL_WARN("avmedia", "Could not rename file '" << tempFileURL << "'
to '" << newTempFileURL << "'");
+return false;
+}
+tempFileURL = newTempFileURL;
+}
+
+try
+{
+::ucbhelper::Content tempContent(tempFileURL,
+uno::Reference(),
+comphelper::getProcessComponentContext());
+tempContent.writeStream(xInStream, true); // copy stream to file
+}
+catch (uno::Exception const& e)
+{
+SAL_WARN("avmedia", "exception: '" << e << "'");
+return false;
+}
+o_rTempFileURL = tempFileURL;
+return true;
+}
+
+MediaTempFile::~MediaTempFile()
+{
+::osl::File::remove(m_TempFileURL);
+}
+
} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index b2b624bee4db..1b7b235b7b6e 100644
--- a/include/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
@@ -131,10 +131,25 @@ bool AVMEDIA_DLLPUBLIC EmbedMedia(
::css::uno::Reference<::css::io::XInputStream> const& xInputStream =
::css::uno::Reference<::css::io::XInputStream>());
+bool AVMEDIA_DLLPUBLIC CreateMediaTempFile(
+::css::uno::Reference<::css::io::XInputStream> const& xInStream,
+OUString& o_rTempFileURL,
+const OUString& rDesiredExtension);
+
OUString GetFilename(OUString const& rSourceURL);
::css::uno::Reference< ::css::io::XStream> CreateStream(
const ::css::uno::Reference< ::css::embed::XStorage>& xStorage, const
OUString& rFilename);
+
+struct AVMEDIA_DLLPUBLIC MediaTempFile
+{
+OUString const m_TempFileURL;
+MediaTempFile(OUString const& rURL)
+: m_TempFileURL(rURL)
+{}
+~MediaTempFile();
+};
+
}
#endif
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx
b/slideshow/source/engine/animationnodes/animationaudionode.cxx
index 4aa02f5da7dd..b024de24de53 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.cxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx
@@ -152,7 +152,8 @@ void AnimationAudioNode::createPlayer() const
{
mpPlayer = SoundPlayer::create( getContext().mrEventMultiplexer,
maSoundURL,
-getContext().mxComponentContext );
+getContext().mxComponentContext,
+
[Libreoffice-commits] core.git: avmedia/source include/avmedia oox/source sd/qa
avmedia/source/framework/mediaitem.cxx | 25 -
include/avmedia/mediaitem.hxx |4 +++-
oox/source/ppt/soundactioncontext.cxx | 12 +---
oox/source/ppt/timenode.cxx |4
oox/source/ppt/timenodelistcontext.cxx |9 ++---
oox/source/ppt/timetargetelementcontext.cxx | 13 -
sd/qa/unit/data/pptx/tdf44223.pptx |binary
sd/qa/unit/import-tests.cxx | 25 +
8 files changed, 75 insertions(+), 17 deletions(-)
New commits:
commit 8a1321362a0229a25869e4e3d0422a5a51c5b5be
Author: Mark Hung
AuthorDate: Sun Jan 20 20:33:26 2019 +0800
Commit: Mark Hung
CommitDate: Mon Feb 4 01:03:00 2019 +0100
tdf#44223 oox: import embedded media stream.
- Handle cTn and tgtEl of MediaNodeContext.
- Setting the audio source of XAudio.
- Embed the media in TimeNodeTargetElementContext.
- Embed the media in SoundActionContext.
- Allow avmedia::EmbedMedia to embed media from a XInputStream.
Change-Id: I164ac50f97f2036db4bfa2f99adedff0bba382e2
Reviewed-on: https://gerrit.libreoffice.org/67208
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/avmedia/source/framework/mediaitem.cxx
b/avmedia/source/framework/mediaitem.cxx
index 851e501e18cb..6f960f49f3bc 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -415,14 +415,10 @@ CreateStream(uno::Reference const&
xStorage,
bool EmbedMedia(uno::Reference const& xModel,
-OUString const& rSourceURL, OUString & o_rEmbeddedURL)
+OUString const& rSourceURL, OUString & o_rEmbeddedURL,
uno::Reference const& xInputStream)
{
try
{
-::ucbhelper::Content sourceContent(rSourceURL,
-uno::Reference(),
-comphelper::getProcessComponentContext());
-
uno::Reference const xSBD(xModel,
uno::UNO_QUERY_THROW);
uno::Reference const xStorage(
@@ -439,10 +435,22 @@ bool EmbedMedia(uno::Reference const&
xModel,
uno::Reference const xOutStream(
xStream->getOutputStream(), uno::UNO_SET_THROW);
-if (!sourceContent.openStream(xOutStream)) // copy file to storage
+if (xInputStream.is())
{
-SAL_INFO("avmedia", "openStream to storage failed");
-return false;
+// Throw Exception if failed.
+::comphelper::OStorageHelper::CopyInputToOutput(xInputStream,
xOutStream);
+}
+else
+{
+::ucbhelper::Content sourceContent(rSourceURL,
+uno::Reference(),
+comphelper::getProcessComponentContext());
+
+if (!sourceContent.openStream(xOutStream)) // copy file to storage
+{
+SAL_INFO("avmedia", "openStream to storage failed");
+return false;
+}
}
uno::Reference const xSubTransaction(
@@ -467,7 +475,6 @@ bool EmbedMedia(uno::Reference const& xModel,
return false;
}
-
} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index 1f92d0b0d7b6..b2b624bee4db 100644
--- a/include/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
@@ -127,7 +127,9 @@ typedef ::avmedia::MediaItem avmedia_MediaItem;
bool AVMEDIA_DLLPUBLIC EmbedMedia(
const ::css::uno::Reference< ::css::frame::XModel>& xModel,
const OUString& rSourceURL,
-OUString & o_rEmbeddedURL);
+OUString & o_rEmbeddedURL,
+::css::uno::Reference<::css::io::XInputStream> const& xInputStream =
+::css::uno::Reference<::css::io::XInputStream>());
OUString GetFilename(OUString const& rSourceURL);
diff --git a/oox/source/ppt/soundactioncontext.cxx
b/oox/source/ppt/soundactioncontext.cxx
index 775ebf688767..51b2c771867c 100644
--- a/oox/source/ppt/soundactioncontext.cxx
+++ b/oox/source/ppt/soundactioncontext.cxx
@@ -27,6 +27,8 @@
#include
#include
#include
+#include
+#include
using namespace ::oox::core;
using namespace ::com::sun::star::xml::sax;
@@ -54,11 +56,15 @@ namespace oox { namespace ppt {
if( mbHasStartSound )
{
OUString url;
-// TODO this is very wrong
if ( !msSndName.isEmpty() )
{
-// try the builtIn version
-url = msSndName;
+Reference
+xInputStream = getFilter().openInputStream(msSndName);
+if (xInputStream.is())
+{
+::avmedia::EmbedMedia(getFilter().getModel(),
msSndName, url, xInputStream);
+xInputStream->closeInput();
+}
}
if ( !url.isEmpty() )
{
di
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 04160a24e34beb6802cea356b947ed9d8d382d19 Author: Adolfo Jayme Barrientos AuthorDate: Sun Feb 3 15:55:14 2019 -0600 Commit: Gerrit Code Review CommitDate: Sun Feb 3 22:56:37 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Encouraging precise language: “click” for mouse interactions Please reserve the verb “press” for interactions with keys or physical buttons. Change-Id: Ie05da647f1cf3bfafdf0231d6b5dc3bdcc38dad7 diff --git a/helpcontent2 b/helpcontent2 index e97ba44f1792..e3dd1cb6d3b0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e97ba44f1792c187910964c7f28a20fafcc0b251 +Subproject commit e3dd1cb6d3b006c7db6e28e702f86ee229f2e301 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/guide/openpgp.xhp |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit e3dd1cb6d3b006c7db6e28e702f86ee229f2e301 Author: Adolfo Jayme Barrientos AuthorDate: Sun Feb 3 15:55:14 2019 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Sun Feb 3 15:55:14 2019 -0600 Encouraging precise language: “click” for mouse interactions Please reserve the verb “press” for interactions with keys or physical buttons. Change-Id: Ie05da647f1cf3bfafdf0231d6b5dc3bdcc38dad7 diff --git a/source/text/shared/guide/openpgp.xhp b/source/text/shared/guide/openpgp.xhp index d24a450d8..10aa9c6d9 100644 --- a/source/text/shared/guide/openpgp.xhp +++ b/source/text/shared/guide/openpgp.xhp @@ -28,7 +28,7 @@ %PRODUCTNAME can encrypt documents using OpenPGP public key cryptography. The document is encrypted using a symmetric encryption algorithm. -Choose menu File - Save as, select Encrypt with GPG key, Press Save. +Choose menu File - Save as, select Encrypt with GPG key, Click Save. %PRODUCTNAME can encrypt documents confidentially using OpenPGP. The document is encrypted using a symmetric encryption algorithm, which requires a symmetric key. Each symmetric key is used only once and is also called a session key. The document and its session key are sent to the recipient. The session key must be sent to the recipients so they know how to decrypt the document, but to protect it during transmission it is encrypted with the recipient's public key. Only the private key belonging to the recipient can decrypt the session key. @@ -66,13 +66,13 @@ Mark the Encrypt with GPG key checkbox. -Press Save. %PRODUCTNAME opens the OpenPGP public key selection dialog. +Click Save. %PRODUCTNAME opens the OpenPGP public key selection dialog. Choose the public key of the recipient. You can select multiple keys at the time. -Press OK to close the dialog and save the file. +Click OK to close the dialog and save the file. The file is saved encrypted with the selected public keys. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 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 1c3634ba14694f1b416629db063e96fa273ada7c
Author: Zdeněk Crhonek
AuthorDate: Fri Dec 21 18:17:07 2018 +0100
Commit: Thorsten Behrens
CommitDate: Sun Feb 3 20:13:06 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/67258
Reviewed-by: Thorsten Behrens
Tested-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_hidd
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/qa sc/source
sc/qa/uitest/autofilter/data/tdf117276.ods |binary
sc/qa/uitest/autofilter/data/tdf122260.ods |binary
sc/qa/uitest/autofilter/tdf117276.py | 115 +
sc/qa/uitest/autofilter/tdf122260.py | 102 +
sc/source/ui/view/gridwin.cxx |1
5 files changed, 218 insertions(+)
New commits:
commit 275c3bc2f2a7c26338ae37d57d59d54beebe539c
Author: Zdeněk Crhonek
AuthorDate: Fri Dec 21 18:17:07 2018 +0100
Commit: Thorsten Behrens
CommitDate: Sun Feb 3 20:09:31 2019 +0100
tdf#122260 sc: Autofilters not properly cleared
incl. uitest for bug tdf#117276
Change-Id: Ib61eee95d7ed4e6ede9455b058406eccd140e31c
Reviewed-on: https://gerrit.libreoffice.org/6
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
tdf#122260 sc: Autofilters not properly cleared
Change-Id: I301b9ae8640e93b1ecf9e6818c9792ce45993cba
Reviewed-on: https://gerrit.libreoffice.org/67001
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/67304
Tested-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/data/tdf122260.ods
b/sc/qa/uitest/autofilter/data/tdf122260.ods
new file mode 100644
index ..00c86d00a398
Binary files /dev/null and b/sc/qa/uitest/autofilter/data/tdf122260.ods differ
diff --git a/sc/qa/uitest/autofilter/tdf117276.py
b/sc/qa/uitest/autofilter/tdf117276.py
new file mode 100644
index ..acd7d11899b5
--- /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
9
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/qa sc/source
sc/qa/uitest/autofilter/data/tdf122260.ods |binary
sc/qa/uitest/autofilter/tdf117276.py |2
sc/qa/uitest/autofilter/tdf122260.py | 102 +
sc/source/ui/view/gridwin.cxx |1
4 files changed, 104 insertions(+), 1 deletion(-)
New commits:
commit eb2d8e088fef630bd16fea3317a6ac74ebd2f3ce
Author: Serge Krot
AuthorDate: Mon Jan 28 11:02:37 2019 +0100
Commit: Thorsten Behrens
CommitDate: Sun Feb 3 20:06:09 2019 +0100
tdf#122260 sc: Autofilters not properly cleared
Change-Id: I301b9ae8640e93b1ecf9e6818c9792ce45993cba
Reviewed-on: https://gerrit.libreoffice.org/67001
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit fb3c3216ba1a6fc978176eebcef0cab4599a39e7)
Reviewed-on: https://gerrit.libreoffice.org/67302
diff --git a/sc/qa/uitest/autofilter/data/tdf122260.ods
b/sc/qa/uitest/autofilter/data/tdf122260.ods
new file mode 100644
index ..00c86d00a398
Binary files /dev/null and b/sc/qa/uitest/autofilter/data/tdf122260.ods differ
diff --git a/sc/qa/uitest/autofilter/tdf117276.py
b/sc/qa/uitest/autofilter/tdf117276.py
index c5129e145b9b..acd7d11899b5 100644
--- a/sc/qa/uitest/autofilter/tdf117276.py
+++ b/sc/qa/uitest/autofilter/tdf117276.py
@@ -101,7 +101,7 @@ class tdf117276(UITestCase):
xCheckListMenu = xFloatWindow.getChild("check_list_menu")
xTreeList = xCheckListMenu.getChild("check_list_box")
-x8000Entry = xTreeList.getChild("0")
+x8000Entry = xTreeList.getChild("1") # check "8000"
x8000Entry.executeAction("CLICK", tuple())
xOkBtn = xFloatWindow.getChild("ok")
diff --git a/sc/qa/uitest/autofilter/tdf122260.py
b/sc/qa/uitest/autofilter/tdf122260.py
new file mode 100644
index ..7d9df8564ab7
--- /dev/null
+++ b/sc/qa/uitest/autofilter/tdf122260.py
@@ -0,0 +1,102 @@
+# -*- 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 libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from libreoffice.calc.document import get_row
+
+
+from uitest.path import get_srcdir_url
+def get_url_for_data_file(file_name):
+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 122260 - EDITING Autofilters not properly cleared
+class tdf122260(UITestCase):
+def check_value_in_AutoFilter(self, gridwin, columnIndex, valueIndex):
+# open filter pop-up window
+self.assertIsNotNone(gridwin)
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": columnIndex, "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+self.assertIsNotNone(xFloatWindow)
+
+# get check list
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+self.assertIsNotNone(xCheckListMenu)
+
+xTreeList = xCheckListMenu.getChild("check_list_box")
+self.assertIsNotNone(xTreeList)
+
+# on/off required checkbox
+xEntry = xTreeList.getChild(valueIndex)
+self.assertIsNotNone(xEntry)
+xEntry.executeAction("CLICK", tuple())
+
+# close pop-up window
+xOkBtn = xFloatWindow.getChild("ok")
+self.assertIsNotNone(xOkBtn)
+xOkBtn.executeAction("CLICK", tuple())
+
+def get_values_count_in_AutoFilter(self, gridwin, columnIndex):
+# open filter pop-up window
+self.assertIsNotNone(gridwin)
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": columnIndex, "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+self.assertIsNotNone(xFloatWindow)
+
+# get check list
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+self.assertIsNotNone(xCheckListMenu)
+
+xTreeList = xCheckListMenu.getChild("check_list_box")
+self.assertIsNotNone(xTreeList)
+
+valuesCount = len(xTreeList.getChildren())
+
+# close pop-up window
+xOkBtn = xFloatWindow.getChild("ok")
+self.assertIsNotNone(xOkBtn)
+xOkBtn.executeAction("CLICK", tuple())
+
+return valuesCount
+
+def test_tdf122260_autofilter(self):
+calc_doc =
self.ui_test.load_file(get_url_for_data_file("tdf122260.ods"))
+xCa
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg
icon-themes/sifr/cmd/sc_checkbox.png |binary icon-themes/sifr/cmd/sc_drawtext.png |binary icon-themes/sifr/cmd/sc_exportdirecttoepub.png |binary icon-themes/sifr/cmd/sc_exportdirecttopdf.png |binary icon-themes/sifr/cmd/sc_exportto.png |binary icon-themes/sifr/cmd/sc_importfromfile.png |binary icon-themes/sifr/cmd/sc_navigateback.png |binary icon-themes/sifr/cmd/sc_navigateforward.png|binary icon-themes/sifr/cmd/sc_paragraphdialog.png|binary icon-themes/sifr/cmd/sc_paralefttoright.png|binary icon-themes/sifr/cmd/sc_pararighttoleft.png|binary icon-themes/sifr/cmd/sc_pie.png|binary icon-themes/sifr/cmd/sc_pie_unfilled.png |binary icon-themes/sifr/cmd/sc_selectobject.png |binary icon-themes/sifr/cmd/sc_setobjecttobackground.png |binary icon-themes/sifr/cmd/sc_setobjecttoforeground.png |binary icon-themes/sifr/cmd/sc_setoutline.png |binary icon-themes/sifr/cmd/sc_spacing.png|binary icon-themes/sifr/cmd/sc_spelling.png |binary icon-themes/sifr/cmd/sc_spellonline.png|binary icon-themes/sifr/cmd/sc_text.png |binary icon-themes/sifr/cmd/sc_texttoolbox.png|binary icon-themes/sifr/cmd/sc_verticaltext.png |binary icon-themes/sifr/cmd/sc_wrapcontour.png|binary icon-themes/sifr/cmd/sc_wrapideal.png |binary icon-themes/sifr/cmd/sc_wrapleft.png |binary icon-themes/sifr/cmd/sc_wrapoff.png|binary icon-themes/sifr/cmd/sc_wrapon.png |binary icon-themes/sifr/cmd/sc_wrapright.png |binary icon-themes/sifr/cmd/sc_wraptext.png |binary icon-themes/sifr/cmd/sc_wrapthrough.png|binary icon-themes/sifr/cmd/sc_xportdirecttopdf.png |binary icon-themes/sifr_dark/cmd/sc_checkbox.png |binary icon-themes/sifr_dark/cmd/sc_drawtext.png |binary icon-themes/sifr_dark/cmd/sc_exportdirecttoepub.png|binary icon-themes/sifr_dark/cmd/sc_exportdirecttopdf.png |binary icon-themes/sifr_dark/cmd/sc_exportto.png |binary icon-themes/sifr_dark/cmd/sc_importfromfile.png|binary icon-themes/sifr_dark/cmd/sc_navigateback.png |binary icon-themes/sifr_dark/cmd/sc_navigateforward.png |binary icon-themes/sifr_dark/cmd/sc_paragraphdialog.png |binary icon-themes/sifr_dark/cmd/sc_paralefttoright.png |binary icon-themes/sifr_dark/cmd/sc_pararighttoleft.png |binary icon-themes/sifr_dark/cmd/sc_pie.png |binary icon-themes/sifr_dark/cmd/sc_pie_unfilled.png |binary icon-themes/sifr_dark/cmd/sc_selectobject.png |binary icon-themes/sifr_dark/cmd/sc_setobjecttobackground.png |binary icon-themes/sifr_dark/cmd/sc_setobjecttoforeground.png |binary icon-themes/sifr_dark/cmd/sc_setoutline.png|binary icon-themes/sifr_dark/cmd/sc_spacing.png |binary icon-themes/sifr_dark/cmd/sc_spelling.png |binary icon-themes/sifr_dark/cmd/sc_spellonline.png |binary icon-themes/sifr_dark/cmd/sc_text.png |binary icon-themes/sifr_dark/cmd/sc_texttoolbox.png |binary icon-themes/sifr_dark/cmd/sc_verticaltext.png |binary icon-themes/sifr_dark/cmd/sc_wrapcontour.png |binary icon-themes/sifr_dark/cmd/sc_wrapideal.png |binary icon-themes/sifr_dark/cmd/sc_wrapleft.png |binary icon-themes/sifr_dark/cmd/sc_wrapoff.png |binary icon-themes/sifr_dark/cmd/sc_wrapon.png|binary icon-themes/sifr_dark/cmd/sc_wrapright.png |binary icon-themes/sifr_dark/cmd/sc_wraptext.png |binary icon-themes/sifr_dark/cmd/sc_wrapthrough.png |binary icon-themes/sifr_dark/cmd/sc_xportdirecttopdf.png |binary icon-themes/sifr_svg/cmd/sc_checkbox.svg | 10 +++--- icon-themes/sifr_svg/cmd/sc_drawtext.svg |6 ++ icon-themes/sifr_svg/cmd/sc_exportdirecttoepub.svg | 10 ++ icon-themes/sifr_svg/cmd/sc_exportdirecttopdf.svg | 10 ++ icon-themes/sifr_svg/cmd/sc_exportto.svg | 10 ++ icon-themes/sifr_svg/cmd/sc_importfromfile.svg | 10 ++ icon-themes/sifr_svg/cmd/sc_paragraphdialog.svg|6 ++ icon-themes/sifr_svg/cmd/sc_paralefttoright.svg|6 ++ icon-themes/sifr_svg/cmd/sc_pararighttoleft.svg|6 ++ icon-themes/sifr_svg/cmd/sc_pie.svg|6 ++ icon-themes/sifr_svg/cmd/sc_pie_unfilled.svg | 10 ++ icon-themes/sifr_svg/cmd/sc_recsearch.svg |2 +- icon-themes/sifr_svg/cmd/sc_selectobject.s
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/RowSet.cxx | 12
dbaccess/source/core/api/RowSetBase.cxx |3 +--
dbaccess/source/core/api/RowSetBase.hxx |2 +-
3 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 65f6a4088ad5d51a3225905aa6e2fa175f3eab49
Author: Michael Stahl
AuthorDate: Fri Feb 1 16:35:03 2019 +0100
Commit: Michael Stahl
CommitDate: Sun Feb 3 16:09:32 2019 +0100
dbaccess: convert ORowSetBase::m_pCache to shared_ptr
Change-Id: Ic6f95a226e0d900fbc633796d7e27edcd13f5482
Reviewed-on: https://gerrit.libreoffice.org/67286
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index dd5bd93d5e80..349d70716b7b 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -569,7 +569,7 @@ void ORowSet::freeResources( bool _bComplete )
// let our warnings container forget the reference to the (possibly
disposed) old result set
m_aWarnings.setExternalWarnings( nullptr );
-DELETEZ(m_pCache);
+m_pCache.reset();
impl_resetTables_nothrow();
@@ -1700,13 +1700,9 @@ Reference< XResultSet >
ORowSet::impl_prepareAndExecute_throw()
aComposedUpdateTableName = composeTableName(
m_xActiveConnection->getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName,
m_aUpdateTableName, false, ::dbtools::EComposeRule::InDataManipulation );
SAL_INFO("dbaccess", "ORowSet::impl_prepareAndExecute_throw: creating
cache" );
-if(m_pCache)
-{
-DELETEZ(m_pCache);
-}
-m_pCache
-= new ORowSetCache(xResultSet, m_xComposer.get(), m_aContext,
aComposedUpdateTableName,
- m_bModified, m_bNew, *m_aParameterValueForCache,
m_aFilter, m_nMaxRows);
+m_pCache.reset(
+new ORowSetCache(xResultSet, m_xComposer.get(), m_aContext,
aComposedUpdateTableName,
+ m_bModified, m_bNew, *m_aParameterValueForCache, m_aFilter,
m_nMaxRows));
if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
{
m_nPrivileges = Privilege::SELECT;
diff --git a/dbaccess/source/core/api/RowSetBase.cxx
b/dbaccess/source/core/api/RowSetBase.cxx
index 84d18d8aae34..94c7e9e7dd37 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -81,7 +81,6 @@ ORowSetBase::ORowSetBase( const Reference&
_rContext, ::cppu:
:OPropertyStateContainer(_rBHelper)
,m_pMutex(_pMutex)
,m_pMySelf(nullptr)
-,m_pCache(nullptr)
,m_rBHelper(_rBHelper)
,m_aContext( _rContext )
,m_nLastColumnIndex(-1)
@@ -793,7 +792,7 @@ bool SAL_CALL
ORowSetBase::move(std::function const & _aChe
bool bMoved = ( bWasNew || !_aCheckFunctor(this) );
-bRet = _aMovementFunctor(m_pCache);
+bRet = _aMovementFunctor(m_pCache.get());
doCancelModification( );
if ( bRet )
diff --git a/dbaccess/source/core/api/RowSetBase.hxx
b/dbaccess/source/core/api/RowSetBase.hxx
index a6508b362952..af94d6da92ff 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -85,7 +85,7 @@ namespace dbaccess
connectivity::ORowSetValue m_aEmptyValue; // only
for error case
::cppu::OWeakObject*m_pMySelf; // set by
derived classes
-ORowSetCache* m_pCache; // the
cache is used by the rowset and his clone (shared)
+std::shared_ptr m_pCache; // the
cache is used by the rowset and his clone (shared)
std::unique_ptr m_pColumns; //
represent the select columns
::cppu::OBroadcastHelper& m_rBHelper; // must be
set from the derived classes
// is used when the formatkey for database types is set
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg
dev/null |binary icon-themes/sifr/cmd/sc_backgroundcolor.png |binary icon-themes/sifr/cmd/sc_conddateformatdialog.png |binary icon-themes/sifr/cmd/sc_datasort.png |binary icon-themes/sifr/cmd/sc_datefield.png |binary icon-themes/sifr/cmd/sc_dbnewform.png |binary icon-themes/sifr/cmd/sc_dbnewformautopilot.png|binary icon-themes/sifr/cmd/sc_dbnewquery.png|binary icon-themes/sifr/cmd/sc_dbnewquerysql.png |binary icon-themes/sifr/cmd/sc_dbtabledelete.png |binary icon-themes/sifr/cmd/sc_dbtableedit.png |binary icon-themes/sifr/cmd/sc_dbtableopen.png |binary icon-themes/sifr/cmd/sc_dbtablerename.png |binary icon-themes/sifr/cmd/sc_dbviewfunctions.png |binary icon-themes/sifr/cmd/sc_decrementindent.png |binary icon-themes/sifr/cmd/sc_defaultnumbering.png |binary icon-themes/sifr/cmd/sc_defineprintarea.png |binary icon-themes/sifr/cmd/sc_delete.png|binary icon-themes/sifr/cmd/sc_deleteallannotation.png |binary icon-themes/sifr/cmd/sc_deleteannotation.png |binary icon-themes/sifr/cmd/sc_deletetable.png |binary icon-themes/sifr/cmd/sc_exitsearch.png|binary icon-themes/sifr/cmd/sc_hangingindent.png |binary icon-themes/sifr/cmd/sc_incrementindent.png |binary icon-themes/sifr/cmd/sc_insertannotation.png |binary icon-themes/sifr/cmd/sc_insertdatefield.png |binary icon-themes/sifr/cmd/sc_inserttable.png |binary icon-themes/sifr/cmd/sc_paraspacedecrease.png |binary icon-themes/sifr/cmd/sc_paraspaceincrease.png |binary icon-themes/sifr/cmd/sc_print.png |binary icon-themes/sifr/cmd/sc_printdefault.png |binary icon-themes/sifr/cmd/sc_printersetup.png |binary icon-themes/sifr/cmd/sc_printpreview.png |binary icon-themes/sifr/cmd/sc_recsearch.png |binary icon-themes/sifr/cmd/sc_searchdialog.png |binary icon-themes/sifr/cmd/sc_selecttable.png |binary icon-themes/sifr/cmd/sc_showannotations.png |binary icon-themes/sifr/cmd/sc_sortascending.png |binary icon-themes/sifr/cmd/sc_sortdescending.png|binary icon-themes/sifr/cmd/sc_sortdown.png |binary icon-themes/sifr/cmd/sc_sortup.png|binary icon-themes/sifr_dark/cmd/sc_backgroundcolor.png |binary icon-themes/sifr_dark/cmd/sc_conddateformatdialog.png |binary icon-themes/sifr_dark/cmd/sc_datasort.png |binary icon-themes/sifr_dark/cmd/sc_datefield.png|binary icon-themes/sifr_dark/cmd/sc_dbnewform.png|binary icon-themes/sifr_dark/cmd/sc_dbnewformautopilot.png |binary icon-themes/sifr_dark/cmd/sc_dbnewquery.png |binary icon-themes/sifr_dark/cmd/sc_dbnewquerysql.png|binary icon-themes/sifr_dark/cmd/sc_dbtabledelete.png|binary icon-themes/sifr_dark/cmd/sc_dbtableedit.png |binary icon-themes/sifr_dark/cmd/sc_dbtableopen.png |binary icon-themes/sifr_dark/cmd/sc_dbtablerename.png|binary icon-themes/sifr_dark/cmd/sc_dbviewfunctions.png |binary icon-themes/sifr_dark/cmd/sc_decrementindent.png |binary icon-themes/sifr_dark/cmd/sc_defaultnumbering.png |binary icon-themes/sifr_dark/cmd/sc_defineprintarea.png |binary icon-themes/sifr_dark/cmd/sc_delete.png |binary icon-themes/sifr_dark/cmd/sc_deleteallannotation.png |binary icon-themes/sifr_dark/cmd/sc_deleteannotation.png |binary icon-themes/sifr_dark/cmd/sc_deletetable.png |binary icon-themes/sifr_dark/cmd/sc_exitsearch.png |binary icon-themes/sifr_dark/cmd/sc_hangingindent.png|binary icon-themes/sifr_dark/cmd/sc_incrementindent.png |binary icon-themes/sifr_dark/cmd/sc_insertannotation.png |binary icon-themes/sifr_dark/cmd/sc_insertdatefield.png |binary icon-themes/sifr_dark/cmd/sc_inserttable.png |binary icon-themes/sifr_dark/cmd/sc_paraspacedecrease.png|binary icon-themes/sifr_dark/cmd/sc_paraspaceincrease.png|binary icon-themes/sifr_dark/cmd/sc_print.png|binary icon-themes/sifr_dark/cmd/sc_printdefault.png |binary icon-themes/sifr_dark/cmd/sc_printersetup.png |binary icon-themes/sifr_dark/cmd/sc_printpreview.png |binary icon-themes/sifr_dark/cmd/sc_recsearch.png|binary icon-themes/sifr_dark/cmd/sc_searchdialog.png |binary icon-themes/sifr_dark/cmd/sc_selecttable.png |binary icon-themes/sifr_dark/cmd/sc_showannotations.png |binary icon-themes/sifr_dark/cmd/sc_sortascending.png|binary icon-themes/sifr_dark/cmd/sc_sortdescending.png |binary icon-themes/sifr_dark
Re: [ABANDONED] Re: WIP migration towards Firebird 3.0.4, cannot find -ltommath
On 02.02.19 23:09, julien2412 wrote: I gave up, it’s just a mess to integrate Firebird on lo. okay that's understandable, firebird is quite the unmaintainable mess... for the record, where we are stuck now is that on MacOSX, firebird builds but the unit tests fail with SIGILL, perhaps due to some '-msse4' usage in the build; on Windows, firebird build fails before it even starts with: make[2]: Entering directory 'C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/firebird' C:/cygwin/home/tdf/lode/opt/bin/make -C gen Debug make[3]: Entering directory 'C:/cygwin/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/firebird/gen' Makefile:653: /home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/UnpackedTarball/firebird/gen/make.shared.targets: No such file or directory ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/firebird
external/firebird/ExternalProject_firebird.mk | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 0a42105a8d95473646b850eed6d428ebb93fc01f
Author: Michael Stahl
AuthorDate: Fri Feb 1 19:35:03 2019 +0100
Commit: Michael Stahl
CommitDate: Sun Feb 3 14:59:27 2019 +0100
firebird: fix CXXFLAGS
In 3.0.4, the horrible makefiles override the CXXFLAGS variable:
firebird/builds/posix/prefix.linux_generic:CXXFLAGS=-std=gnu++03
Work around that by passing LO's customised CXXFLAGS as a command-line
parameter to make, which in turn overrides the definition in the
makefile.
Other platforms, in particular Darwin, apparently extend CXXFLAGS
instead of overwriting.
To nobody's surprise, gnu++03 doesn't even build with clang because ICU
headers use C++11 features (although strangely gcc doesn't complain).
Change-Id: If3b26482a4f4bf284057e261677cd7182656154f
Reviewed-on: https://gerrit.libreoffice.org/67255
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index d0614e202951..3b444397442d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -97,9 +97,17 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
- $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug)
$(INVOKE_FPA) SHELL='$(SHELL)' LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst
$$,,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)))' $(MAKE_POST); \
+ $(MAKE_PRE) $(MAKE) \
+ $(if $(filter
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+ $(if $(ENABLE_DEBUG),Debug)
$(INVOKE_FPA) SHELL='$(SHELL)' \
+ LIBO_TUNNEL_LIBRARY_PATH='$(subst
','\'',$(subst $$,,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
+ $(MAKE_POST); \
else \
- $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug)
SHELL='$(SHELL)' LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst
$$,,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)))' $(MAKE_POST); \
+ $(MAKE_PRE) $(MAKE) \
+ $(if $(filter
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+ $(if $(ENABLE_DEBUG),Debug)
SHELL='$(SHELL)' \
+ LIBO_TUNNEL_LIBRARY_PATH='$(subst
','\'',$(subst $$,,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
+ $(MAKE_POST); \
fi \
)
# vim: set noet sw=4 ts=4:
___
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/filter/ww8/wrtw8num.cxx | 15 ---
sw/source/filter/ww8/wrtw8sty.cxx |2 +-
sw/source/filter/ww8/wrtww8.cxx | 14 ++
sw/source/filter/ww8/wrtww8.hxx |4 ++--
sw/source/filter/ww8/ww8atr.cxx | 21 +++--
5 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 3a5e05ebdd2da36c6a3d28d486bd114e491a951b
Author: Michael Stahl
AuthorDate: Fri Feb 1 17:17:38 2019 +0100
Commit: Michael Stahl
CommitDate: Sun Feb 3 14:46:31 2019 +0100
sw: convert WW8Export::pO to unique_ptr
Change-Id: I2cb029574a3f44105a847debaef2caea16e5b66d
Reviewed-on: https://gerrit.libreoffice.org/67288
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/filter/ww8/wrtw8num.cxx
b/sw/source/filter/ww8/wrtw8num.cxx
index 3fdd90134014..508ea7d0aad6 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -281,11 +281,11 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8
/*nLevel*/,
SwWW8Writer::WriteLong( *m_rWW8Export.pTableStrm, 0 );
// cbGrpprlChpx
-ww::bytes aCharAtrs;
+std::unique_ptr pCharAtrs;
if ( pOutSet )
{
-ww::bytes* pOldpO = m_rWW8Export.pO;
-m_rWW8Export.pO = &aCharAtrs;
+std::unique_ptr pOldpO = std::move(m_rWW8Export.pO);
+m_rWW8Export.pO.reset(new ww::bytes);
if ( pFont )
{
sal_uInt16 nFontID = m_rWW8Export.m_aFontHelper.GetId( *pFont );
@@ -310,9 +310,10 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8
/*nLevel*/,
}
}
-m_rWW8Export.pO = pOldpO;
+pCharAtrs = std::move(m_rWW8Export.pO);
+m_rWW8Export.pO = std::move(pOldpO);
}
-m_rWW8Export.pTableStrm->WriteUChar( sal_uInt8( aCharAtrs.size() ) );
+m_rWW8Export.pTableStrm->WriteUChar(sal_uInt8(pCharAtrs ?
pCharAtrs->size() : 0));
// cbGrpprlPapx
sal_uInt8 aPapSprms [] = {
@@ -336,8 +337,8 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8
/*nLevel*/,
m_rWW8Export.pTableStrm->WriteBytes(aPapSprms, sizeof(aPapSprms));
// write Chpx
-if( !aCharAtrs.empty() )
-m_rWW8Export.pTableStrm->WriteBytes(aCharAtrs.data(),
aCharAtrs.size());
+if (pCharAtrs && !pCharAtrs->empty())
+m_rWW8Export.pTableStrm->WriteBytes(pCharAtrs->data(),
pCharAtrs->size());
// write the num string
SwWW8Writer::WriteShort( *m_rWW8Export.pTableStrm,
rNumberingString.getLength() );
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index b3b2edb700fa..e41b5fa51ed9 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -376,7 +376,7 @@ OString const & MSWordStyles::GetStyleId(sal_uInt16 nId)
const
}
/// For WW8 only - extend pO so that the size of pTableStrm is even.
-static void impl_SkipOdd( ww::bytes* pO, std::size_t nTableStrmTell )
+static void impl_SkipOdd(std::unique_ptr const& pO, std::size_t
nTableStrmTell)
{
if ( ( nTableStrmTell + pO->size() ) & 1 ) // start on even
pO->push_back( sal_uInt8(0) ); // Address
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 6cfc0f019e54..00ef5bc377c4 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1946,7 +1946,7 @@ void MSWordExportBase::SaveData( sal_uLong nStt,
sal_uLong nEnd )
m_bStartTOX = false;
m_bInWriteTOX = false;
-m_aSaveData.push( aData );
+m_aSaveData.push( std::move(aData) );
}
void MSWordExportBase::RestoreData()
@@ -1981,8 +1981,8 @@ void WW8Export::SaveData( sal_uLong nStt, sal_uLong nEnd )
if ( !pO->empty() )
{
-rData.pOOld = pO;
-pO = new ww::bytes;
+rData.pOOld = std::move(pO);
+pO.reset(new ww::bytes);
}
else
rData.pOOld = nullptr; // reuse pO
@@ -2000,8 +2000,7 @@ void WW8Export::RestoreData()
OSL_ENSURE( pO->empty(), "pO is not empty in WW8Export::RestoreData()" );
if ( rData.pOOld )
{
-delete pO;
-pO = rData.pOOld;
+pO = std::move(rData.pOOld);
}
MSWordExportBase::RestoreData();
@@ -3340,7 +3339,7 @@ ErrCode WW8Export::ExportDocument_Impl()
m_pPapPlc.reset(new WW8_WrPlcPn( *this, PAP, pFib->m_fcMin ));
m_pChpPlc.reset(new WW8_WrPlcPn( *this, CHP, pFib->m_fcMin ));
-pO = new ww::bytes;
+pO.reset(new ww::bytes);
m_pStyles.reset(new MSWordStyles( *this ));
m_pFieldMain.reset(new WW8_WrPlcField( 2, TXT_MAINTEXT ));
m_pFieldHdFt.reset(new WW8_WrPlcField( 2, TXT_HDFT ));
@@ -3435,7 +3434,7 @@ ErrCode WW8Export::ExportDocument_Impl()
m_pFieldHdFt.reset();;
m_pFieldMain.reset();;
m_pStyles.reset();;
-DELETEZ( pO );
+pO.reset();
m_pChpPlc.reset();;
m_pPapPlc.reset();;
pSepx.reset();
@@ -3650,7 +3649,6 @@ WW8Export::WW8Export( SwWW8Writer *pWriter,
SwDoc *pDocument, SwPaM *pCurre
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/dbmgr.cxx | 31 +++
1 file changed, 15 insertions(+), 16 deletions(-)
New commits:
commit 4e897ceede564c6ad5400e985bf0962fa210bf24
Author: Michael Stahl
AuthorDate: Fri Feb 1 16:47:22 2019 +0100
Commit: Michael Stahl
CommitDate: Sun Feb 3 14:44:05 2019 +0100
sw: convert SwDBManager_Impl::pMergeData to unique_ptr
Change-Id: I46848932bedc0287e55e950339bad9e656a6aca4
Reviewed-on: https://gerrit.libreoffice.org/67287
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 5137003c9da7..6a2d272824e9 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -303,7 +303,7 @@ void SwDataSourceRemovedListener::Dispose()
struct SwDBManager::SwDBManager_Impl
{
-SwDSParam*pMergeData;
+std::unique_ptr pMergeData;
VclPtr pMergeDialog;
rtl::Reference
m_xDisposeListener;
rtl::Reference m_xDataSourceRemovedListener;
@@ -311,8 +311,7 @@ struct SwDBManager::SwDBManager_Impl
uno::Reference< mail::XMailMessage> m_xLastMessage;
explicit SwDBManager_Impl(SwDBManager& rDBManager)
-: pMergeData( nullptr )
-, m_xDisposeListener(new ConnectionDisposedListener_Impl(rDBManager))
+: m_xDisposeListener(new ConnectionDisposedListener_Impl(rDBManager))
{}
~SwDBManager_Impl()
@@ -484,7 +483,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor&
rMergeDesc )
return false;
}
-pImpl->pMergeData = new SwDSParam(aData, xResSet, aSelection);
+pImpl->pMergeData.reset(new SwDSParam(aData, xResSet, aSelection));
SwDSParam* pTemp = FindDSData(aData, false);
if(pTemp)
*pTemp = *pImpl->pMergeData;
@@ -516,7 +515,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor&
rMergeDesc )
pImpl->pMergeData->xConnection = xConnection;
// add an XEventListener
-lcl_ToNextRecord(pImpl->pMergeData, SwDBNextRecord::FIRST);
+lcl_ToNextRecord(pImpl->pMergeData.get(), SwDBNextRecord::FIRST);
uno::Reference xSource =
SwDBManager::getDataSourceAsParent(xConnection,aData.sDataSource);
@@ -564,7 +563,7 @@ bool SwDBManager::Merge( const SwMergeDescriptor&
rMergeDesc )
break;
}
-DELETEZ( pImpl->pMergeData );
+pImpl->pMergeData.reset();
if( xWorkObjSh.Is() )
{
@@ -1343,7 +1342,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
if( !bIsMergeSilent && !bMT_PRINTER )
{
sal_Int32 nRecordCount = 1;
-lcl_getCountFromResultSet( nRecordCount, pImpl->pMergeData );
+lcl_getCountFromResultSet( nRecordCount, pImpl->pMergeData.get() );
// Synchronized docs don't auto-advance the record set, but there
is a
// "security" check, which will always advance the record set, if
there
@@ -2123,7 +2122,7 @@ bool SwDBManager::GetColumnCnt(const OUString&
rSourceName, const OUString& rTab
rSourceName == pImpl->pMergeData->sDataSource &&
rTableName == pImpl->pMergeData->sCommand)
{
-pFound = pImpl->pMergeData;
+pFound = pImpl->pMergeData.get();
}
else
{
@@ -2184,14 +2183,14 @@ boolSwDBManager::GetMergeColumnCnt(const OUString&
rColumnName, LanguageType
return false;
}
-bool bRet = lcl_GetColumnCnt(pImpl->pMergeData, rColumnName, nLanguage,
rResult, pNumber);
+bool bRet = lcl_GetColumnCnt(pImpl->pMergeData.get(), rColumnName,
nLanguage, rResult, pNumber);
return bRet;
}
bool SwDBManager::ToNextMergeRecord()
{
assert( pImpl->pMergeData && pImpl->pMergeData->xResultSet.is() && "no
data source in merge" );
-return lcl_ToNextRecord( pImpl->pMergeData );
+return lcl_ToNextRecord( pImpl->pMergeData.get() );
}
bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter,
@@ -2225,7 +2224,7 @@ bool SwDBManager::FillCalcWithMergeData(
SvNumberFormatter *pDocFormatter,
aType >>= nColumnType;
double aNumber = DBL_MAX;
-lcl_GetColumnCnt( pImpl->pMergeData, xColumnProps, nLanguage,
aString, &aNumber );
+lcl_GetColumnCnt( pImpl->pMergeData.get(), xColumnProps,
nLanguage, aString, &aNumber );
sal_uInt32 nFormat = GetColumnFormat(
pImpl->pMergeData->sDataSource,
pImpl->pMergeData->sCommand,
@@ -2267,7 +2266,7 @@ void SwDBManager::ToNextRecord(
rDataSource == pImpl->pMergeData->sDataSource &&
rCommand == pImpl->pMergeData->sCommand)
{
-pFound = pImpl->pMergeData;
+pFound = pImpl->pMergeData.get();
}
else
{
@@ -2374,7 +2373,7 @@ bool SwDBManager::ToRecordId(sal_Int32 nSet)
bool bRet = false;
sal_Int32 nAbsPos = nSet;
assert(nAbsPos >= 0);
-bRet = lcl_MoveAbsolute(pImpl->pMergeData, nAbsPos);
+bRet = l
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svx vcl/unx
cui/source/dialogs/multipat.cxx| 191 +
cui/source/factory/dlgfact.cxx | 16 +--
cui/source/factory/dlgfact.hxx | 12 +-
cui/source/inc/multipat.hxx| 31 +++---
cui/source/options/optpath.cxx |2
cui/uiconfig/ui/multipathdialog.ui | 80 ---
include/svx/svxdlg.hxx |2
vcl/unx/gtk3/gtk3gtkinst.cxx |5
8 files changed, 189 insertions(+), 150 deletions(-)
New commits:
commit 9e8383999ce2ae44dbe4fecdbbcc74e4deb2891a
Author: Caolán McNamara
AuthorDate: Sat Feb 2 22:47:36 2019 +
Commit: Caolán McNamara
CommitDate: Sun Feb 3 11:03:38 2019 +0100
weld SvxMultiPathDialog
Change-Id: I9a509654d72bbe5b346002a3b23793bf69330720
Reviewed-on: https://gerrit.libreoffice.org/67297
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 60a70e64b741..35ea7c80d489 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -41,33 +41,54 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void)
+IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, weld::TreeView&, void)
{
-sal_uLong nCount = m_pRadioLB->GetEntryCount();
-bool bIsSelected = m_pRadioLB->FirstSelected() != nullptr;
+auto nCount = m_xRadioLB->n_children();
+bool bIsSelected = m_xRadioLB->get_selected_index() != -1;
bool bEnable = nCount > 1;
-m_pDelBtn->Enable(bEnable && bIsSelected);
+m_xDelBtn->set_sensitive(bEnable && bIsSelected);
}
IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl, weld::TreeView&, void)
{
-sal_uLong nCount = m_xPathLB->n_children();
+auto nCount = m_xPathLB->n_children();
bool bIsSelected = m_xPathLB->get_selected_index() != -1;
bool bEnable = nCount > 1;
m_xDelBtn->set_sensitive(bEnable && bIsSelected);
}
-IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void )
+void SvxMultiPathDialog::HandleEntryChecked(int nRow)
+{
+m_xRadioLB->select(nRow);
+bool bChecked = m_xRadioLB->get_toggle(nRow, 0);
+if (bChecked)
+{
+// we have radio button behavior -> so uncheck the other entries
+int nCount = m_xRadioLB->n_children();
+for (int i = 0; i < nCount; ++i)
+{
+if (i != nRow)
+m_xRadioLB->set_toggle(i, false, 0);
+}
+}
+}
+
+IMPL_LINK(SvxMultiPathDialog, CheckHdl_Impl, const row_col&, rRowCol, void)
{
-SvTreeListEntry* pEntry =
-pBox
-? pBox->GetEntry(
static_cast(pBox)->GetCurMousePoint() )
-: m_pRadioLB->FirstSelected();
-if ( pEntry )
-m_pRadioLB->HandleEntryChecked( pEntry );
+HandleEntryChecked(rRowCol.first);
}
-IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl, Button*, void)
+void SvxMultiPathDialog::AppendEntry(const OUString& rText, const OUString&
rId)
+{
+m_xRadioLB->insert(nullptr, -1, nullptr, nullptr, nullptr,
+ nullptr, nullptr, false);
+const int nRow = m_xRadioLB->n_children() - 1;
+m_xRadioLB->set_toggle(nRow, false, 0);
+m_xRadioLB->set_text(nRow, rText, 1);
+m_xRadioLB->set_id(nRow, rId);
+}
+
+IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl, weld::Button&, void)
{
Reference < XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
Reference < XFolderPicker2 > xFolderPicker =
FolderPicker::create(xContext);
@@ -80,25 +101,20 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl, Button*,
void)
OUString sInsPath;
osl::FileBase::getSystemPathFromFileURL(aURL, sInsPath);
-sal_uLong nPos = m_pRadioLB->GetEntryPos( sInsPath, 1 );
-if ( 0x == nPos ) //See svtools/source/contnr/svtabbx.cxx
SvTabListBox::GetEntryPos
-{
-OUString sNewEntry( '\t' );
-sNewEntry += sInsPath;
-SvTreeListEntry* pEntry = m_pRadioLB->InsertEntry( sNewEntry );
-OUString* pData = new OUString( aURL );
-pEntry->SetUserData( pData );
-}
-else
+if (m_xRadioLB->find_text(sInsPath) != -1)
{
OUString sMsg( CuiResId( RID_MULTIPATH_DBL_ERR ) );
sMsg = sMsg.replaceFirst( "%1", sInsPath );
-std::unique_ptr
xInfoBox(Application::CreateMessageDialog(GetFrameWeld(),
+std::unique_ptr
xInfoBox(Application::CreateMessageDialog(m_xDialog.get(),
VclMessageType::Info, VclButtonsType::Ok, sMsg));
xInfoBox->run();
}
+else
+{
+AppendEntry(sInsPath, aURL);
+}
-SelectHdl_Impl( nullptr );
+SelectHdl_Impl(*m_xRadioLB);
}
}
@@ -132,30 +
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg
icon-themes/sifr/cmd/sc_animationeffects.png |binary icon-themes/sifr/cmd/sc_apply.png |binary icon-themes/sifr/cmd/sc_assignlayout.png |binary icon-themes/sifr/cmd/sc_autofilter.png |binary icon-themes/sifr/cmd/sc_autopilotmenu.png |binary icon-themes/sifr/cmd/sc_autosum.png|binary icon-themes/sifr/cmd/sc_avmediaplayer.png |binary icon-themes/sifr/cmd/sc_backcolor.png |binary icon-themes/sifr/cmd/sc_backward.png |binary icon-themes/sifr/cmd/sc_beforeobject.png |binary icon-themes/sifr/cmd/sc_behindobject.png |binary icon-themes/sifr/cmd/sc_bezier_unfilled.png|binary icon-themes/sifr/cmd/sc_bezierfill.png |binary icon-themes/sifr/cmd/sc_bold.png |binary icon-themes/sifr/cmd/sc_borderdialog.png |binary icon-themes/sifr/cmd/sc_bringtofront.png |binary icon-themes/sifr/cmd/sc_browseview.png |binary icon-themes/sifr/cmd/sc_bulletsandnumberingdialog.png |binary icon-themes/sifr/cmd/sc_centerpara.png |binary icon-themes/sifr/cmd/sc_chainframes.png|binary icon-themes/sifr/cmd/sc_closedoc.png |binary icon-themes/sifr/cmd/sc_color.png |binary icon-themes/sifr/cmd/sc_colorscaleformatdialog.png |binary icon-themes/sifr/cmd/sc_conddateformatdialog.png |binary icon-themes/sifr/cmd/sc_conditionalformatdialog.png|binary icon-themes/sifr/cmd/sc_conditionalformatmenu.png |binary icon-themes/sifr/cmd/sc_controlcodes.png |binary icon-themes/sifr/cmd/sc_controlproperties.png |binary icon-themes/sifr/cmd/sc_copy.png |binary icon-themes/sifr/cmd/sc_crop.png |binary icon-themes/sifr/cmd/sc_currencyfield.png |binary icon-themes/sifr/cmd/sc_customanimation.png|binary icon-themes/sifr/cmd/sc_cut.png|binary icon-themes/sifr/cmd/sc_databarformatdialog.png|binary icon-themes/sifr/cmd/sc_datafilterautofilter.png |binary icon-themes/sifr/cmd/sc_datafilterstandardfilter.png |binary icon-themes/sifr/cmd/sc_defaultbullet.png |binary icon-themes/sifr/cmd/sc_downsearch.png |binary icon-themes/sifr/cmd/sc_firstpage.png |binary icon-themes/sifr/cmd/sc_forward.png|binary icon-themes/sifr/cmd/sc_iconsetformatdialog.png|binary icon-themes/sifr/cmd/sc_justifypara.png|binary icon-themes/sifr/cmd/sc_lastpage.png |binary icon-themes/sifr/cmd/sc_leftpara.png |binary icon-themes/sifr/cmd/sc_presentationlayout.png |binary icon-themes/sifr/cmd/sc_rightpara.png |binary icon-themes/sifr/cmd/sc_sendtoback.png |binary icon-themes/sifr/cmd/sc_spacepara1.png |binary icon-themes/sifr/cmd/sc_spacepara15.png|binary icon-themes/sifr/cmd/sc_spacepara2.png |binary icon-themes/sifr/cmd/sc_toggleobjectbeziermode.png |binary icon-themes/sifr/cmd/sc_upsearch.png |binary icon-themes/sifr/cmd/sc_zoom.png |binary icon-themes/sifr/cmd/sc_zoom100percent.png |binary icon-themes/sifr/cmd/sc_zoomin.png |binary icon-themes/sifr/cmd/sc_zoomminus.png |binary icon-themes/sifr/cmd/sc_zoommode.png |binary icon-themes/sifr/cmd/sc_zoomobjects.png|binary icon-themes/sifr/cmd/sc_zoomoptimal.png|binary icon-themes/sifr/cmd/sc_zoomout.png|binary icon-themes/sifr/cmd/sc_zoompage.png |binary icon-themes/sifr/cmd/sc_zoompagewidth.png |binary icon-themes/sifr/cmd/sc_zoompanning.png|binary icon-themes/sifr/cmd/sc_zoomplus.png |binary icon-themes/sifr/cmd/sc_zoomtoolbox.png|binary icon-themes/sifr_dark/cmd/sc_animationeffects.png |binary icon-themes/sifr_dark/cmd/sc_apply.png |binary icon-themes/sifr_dark/cmd/sc_assignlayout.png |binary icon-themes/sifr_dark/cmd/sc_autofilter.png|binary icon-themes/sifr_dark/cmd/sc_autopilotmenu.png |binary icon-themes/sifr_dark/cmd/sc_autosum.png |binary icon-themes/sifr_dark/cmd/sc_avmediaplayer.png |binary icon-themes/sifr_dark/cmd/sc_backcolor.png |binary icon-themes/sifr_dark/cmd/sc_backw
