[Libreoffice-commits] core.git: 3 commits - editeng/source sc/source sw/source
editeng/source/misc/svxacorr.cxx| 11 +++
sc/source/filter/excel/xeescher.cxx |2 +-
sw/source/uibase/shells/translatehelper.cxx |2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 004807caaa5f5e4516ba5cc9fac085fe8cd30dee
Author: Caolán McNamara
AuthorDate: Fri Dec 1 11:50:19 2023 +
Commit: Caolán McNamara
CommitDate: Fri Dec 1 18:06:54 2023 +0100
cid#1546413 silence Using invalid iterator
sample to test silencing this
Change-Id: I73a8e22a5266367d7b2c76aa00d38d40431b4841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160213
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 4c4b6883f247..ab8a43091b00 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1888,11 +1888,14 @@ bool SvxAutoCorrect::PutText( const OUString& rShort,
const OUString& rLong,
LanguageType eLang )
{
LanguageTag aLanguageTag( eLang);
-auto const iter = m_aLangTable.find(aLanguageTag);
-if (iter != m_aLangTable.end())
+if (auto const iter = m_aLangTable.find(aLanguageTag); iter !=
m_aLangTable.end())
return iter->second.PutText(rShort, rLong);
-if(CreateLanguageFile(aLanguageTag))
-return m_aLangTable.find(aLanguageTag)->second.PutText(rShort, rLong);
+if (CreateLanguageFile(aLanguageTag))
+{
+auto const iter = m_aLangTable.find(aLanguageTag);
+assert (iter != m_aLangTable.end());
+return iter->second.PutText(rShort, rLong);
+}
return false;
}
commit fc288036a51f3d6a529ef4f145468f3ee3c8fc32
Author: Caolán McNamara
AuthorDate: Fri Dec 1 11:45:07 2023 +
Commit: Caolán McNamara
CommitDate: Fri Dec 1 18:06:46 2023 +0100
cid#1555476 silence Unchecked return value
Change-Id: I55db6a470a2aca5ebcbace7859236b08bb67e25b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160212
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 4ed990be33d3..c85089fc0736 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1566,7 +1566,7 @@ XclExpChartObj::XclExpChartObj( XclExpObjectManager&
rObjMgr, Reference< XShape
// load the chart OLE object
if( SdrOle2Obj* pSdrOleObj = dynamic_cast< SdrOle2Obj* >( pSdrObj ) )
-svt::EmbeddedObjectRef::TryRunningState( pSdrOleObj->GetObjRef() );
+(void)svt::EmbeddedObjectRef::TryRunningState(pSdrOleObj->GetObjRef());
// create the chart substream object
ScfPropertySet aShapeProp( xShape );
commit e0014555f562feb1096dc80b1350e2b881ca2a9e
Author: Caolán McNamara
AuthorDate: Fri Dec 1 11:43:40 2023 +
Commit: Caolán McNamara
CommitDate: Fri Dec 1 18:06:40 2023 +0100
cid#1558172 Division or modulo by zero
Change-Id: I4060b003fc03c8fe3e0396f9618e64a69715131c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160211
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/shells/translatehelper.cxx
b/sw/source/uibase/shells/translatehelper.cxx
index a3d03542ba5a..eb9bcaedbb05 100644
--- a/sw/source/uibase/shells/translatehelper.cxx
+++ b/sw/source/uibase/shells/translatehelper.cxx
@@ -193,7 +193,7 @@ void TranslateDocumentCancellable(SwWrtShell& rWrtSh, const
TranslateAPIConfig&
rConfig.m_xTargetLanguage, rConfig.m_xAPIUrl,
rConfig.m_xAuthKey, aOut);
SwTranslateHelper::PasteHTMLToPaM(rWrtSh, cursor.get(),
aTranslatedOut);
-if (xStatusIndicator.is())
+if (xStatusIndicator.is() && nCount)
xStatusIndicator->setValue((100 * ++nProgress) / nCount);
Idle aIdle("ProgressBar::SetValue aIdle");
[Libreoffice-commits] core.git: 3 commits - android/source
android/source/AndroidManifest.xml |2 --
android/source/build.gradle |2 +-
android/source/res/layout/activity_main.xml |3 ++-
3 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit cebf1b118788ee080e3888115abbeb2e42a7fd15
Author: Michael Weghorn
AuthorDate: Wed Nov 29 12:07:20 2023 +0100
Commit: Michael Weghorn
CommitDate: Thu Nov 30 12:17:37 2023 +0100
android: Use 'compileSdk' instead of deprecated 'compileSdkVersion'
See [1] and [2]. From what I can see, they are equivalent
for our use.
This addresses a "'compileSdkVersion' is deprectaed." warning shown
in Android Studio.
[1]
https://developer.android.com/reference/tools/gradle-api/7.0/com/android/build/api/dsl/CommonExtension#compilesdk
[2]
https://developer.android.com/reference/tools/gradle-api/7.0/com/android/build/api/dsl/CommonExtension#compilesdkversion
Change-Id: I9a7416d8b3750a5f8f8281c6e226fc7bbe665776
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160084
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 1ae292ba1006..e623c9305e2b 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -39,7 +39,7 @@ dependencies {
android {
namespace 'org.libreoffice'
-compileSdkVersion 33
+compileSdk 33
// uses non-conventional source layout, so need to reconfigure accordingly
// ToDo move to conventional layout, so stuff can be stripped down.
sourceSets {
commit c33c375b90ac6ec4d0d339486ac779d6d7b441e5
Author: Michael Weghorn
AuthorDate: Wed Nov 29 11:34:39 2023 +0100
Commit: Michael Weghorn
CommitDate: Thu Nov 30 12:17:30 2023 +0100
android: No longer extract native libs
As described in more detail in
commit 45fbfbfeae1de12e87d0a3748e22553b69adbc4a
Author: Michael Weghorn
Date: Fri Mar 27 17:04:37 2020 +0100
tdf#131622 android: Extract native libs again
, extracting native libraries was necessary for the NSS
library to be able to load modules like `libnssckbi.so`
at runtime. Without this, opening password-protected
files would fail.
However, this has in the meanwhile been addressed
differently in the following commit (probably in the
context of the online-based/Collabora Online app), so
extracting libs is no longer needed:
commit 16a7f98f99d334ea865b800e0b32d6fed1483942
Author: Mert Tumer
Date: Wed Sep 30 17:14:59 2020 +0300
Fix libnssckbi not found error on Android
This error causes Android App to be unable to
open Password-protected documents.
Change-Id: Iacbacb1c780025752e2447db325b075c58947818
Signed-off-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103658
Tested-by: Jenkins
Reviewed-by: Andras Timar
Therefore, no longer extract the libraries, which also addresses
addresses this warning shown during the build:
> Task :processStrippedUIEditingDebugMainManifest
.../android/source/AndroidManifest.xml:16:9-41 Warning:
android:extractNativeLibs should not be specified in this
source AndroidManifest.xml file. See
https://d.android.com/guide/topics/manifest/application-element#extractNativeLibs
for more information.
The AGP Upgrade Assistant can remove the attribute from the
AndroidManifest.xml file and update the build file accordingly. See
https://d.android.com/studio/build/agp-upgrade-assistant for more information.
Change-Id: I867beea0bce8398806375048e87a152e1348d016
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160079
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/android/source/AndroidManifest.xml
b/android/source/AndroidManifest.xml
index 9d1d309d7c9b..0a11a1d3654b 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -9,11 +9,9 @@
-
AuthorDate: Wed Nov 29 10:53:45 2023 +0100
Commit: Michael Weghorn
CommitDate: Thu Nov 30 12:17:22 2023 +0100
tdf#124480 android: Set bg color for calc formula bar
For the layout containing the Calc address/formula bar,
explicitly set a background color that matches the theme.
Otherwise, those text views would be using white font on
white background when using dark theme, making the text
unreadable.
Change-Id: I5fdf9e04f8bb331ca6a57bf3046a7ebb9ccb0d1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160078
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/android/source/res/layout/activity_main.xml
b/android/source/res/layout/activity_main.xml
index 590a7de025b4..e503cb90f0eb 100644
--- a/android/source/res/layout/activity_main.xml
+++
[Libreoffice-commits] core.git: 3 commits - android/source
android/source/res/drawable-hdpi/ic_folder_48dp.xml |2
android/source/res/drawable/label_background.xml |2
android/source/res/layout/activity_document_browser.xml | 34
+++---
android/source/res/values-night/colors.xml|2
android/source/res/values/colors.xml |5 +
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |5 -
6 files changed, 23 insertions(+), 27 deletions(-)
New commits:
commit c82a594da3189fe82052f8081fda16e9e3cb0c0f
Author: Michael Weghorn
AuthorDate: Wed Nov 29 10:30:55 2023 +0100
Commit: Michael Weghorn
CommitDate: Thu Nov 30 12:17:14 2023 +0100
tdf#124480 android: Avoid using color attr requiring API 23
Using "colorBackgroundFloating" requires API level 23 [1],
but our current minimum API level is 16 (when building with
NDK 23).
Therefore, define an own color `background_floating` instead
and use the correspodning color values from the material theme
(`background_floating_material_{dark,light}` depending on whether
dark/night mode is enabled or not.
This makes the app work again in a quick test with an x86 AVD
with API level 16 instead of crashing on startup.
Change-Id: I7b8378b42e9fc7430ec4ed263d4cb8b42027a930
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160077
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/android/source/res/drawable/label_background.xml
b/android/source/res/drawable/label_background.xml
index 3e5b7b1cb907..2727c7d9ab0b 100644
--- a/android/source/res/drawable/label_background.xml
+++ b/android/source/res/drawable/label_background.xml
@@ -2,7 +2,7 @@
http://schemas.android.com/apk/res/android;>
-
+
diff --git a/android/source/res/layout/activity_document_browser.xml
b/android/source/res/layout/activity_document_browser.xml
index bb022683b2ae..72b6e42b29b2 100644
--- a/android/source/res/layout/activity_document_browser.xml
+++ b/android/source/res/layout/activity_document_browser.xml
@@ -109,7 +109,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
-app:backgroundTint="?attr/colorBackgroundFloating"
+app:backgroundTint="@color/background_floating"
app:fabSize="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
@@ -141,7 +141,7 @@
android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:clickable="true"
-app:backgroundTint="?attr/colorBackgroundFloating"
+app:backgroundTint="@color/background_floating"
app:fabSize="mini"
app:srcCompat="@drawable/writer"
app:useCompatPadding="true" />
@@ -173,7 +173,7 @@
android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:clickable="true"
-app:backgroundTint="?attr/colorBackgroundFloating"
+app:backgroundTint="@color/background_floating"
app:fabSize="mini"
app:srcCompat="@drawable/impress"
app:useCompatPadding="true" />
@@ -205,7 +205,7 @@
android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:clickable="true"
-app:backgroundTint="?attr/colorBackgroundFloating"
+app:backgroundTint="@color/background_floating"
app:fabSize="mini"
app:srcCompat="@drawable/calc"
app:useCompatPadding="true" />
@@ -237,7 +237,7 @@
android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:clickable="true"
-app:backgroundTint="?attr/colorBackgroundFloating"
+app:backgroundTint="@color/background_floating"
app:fabSize="mini"
app:srcCompat="@drawable/draw"
app:useCompatPadding="true" />
diff --git a/android/source/res/values-night/colors.xml
b/android/source/res/values-night/colors.xml
index e02863b10340..c6260c191d3e 100644
--- a/android/source/res/values-night/colors.xml
+++ b/android/source/res/values-night/colors.xml
@@ -1,4 +1,6 @@
+@color/background_floating_material_dark
+
#efefef
diff --git a/android/source/res/values/colors.xml
b/android/source/res/values/colors.xml
index 791c0f23da23..8f97b3e67130 100644
--- a/android/source/res/values/colors.xml
+++ b/android/source/res/values/colors.xml
@@ -4,6 +4,11 @@
- file, You can obtain one at
[Libreoffice-commits] core.git: 3 commits - android/source
android/source/res/drawable/ic_add_black_24dp.xml|2 +- android/source/res/drawable/ic_arrow_back_black_24dp.xml |2 +- android/source/res/drawable/ic_content_copy_black_24dp.xml |2 +- android/source/res/drawable/ic_content_cut_black_24dp.xml|2 +- android/source/res/drawable/ic_content_paste_black_24dp.xml |2 +- android/source/res/drawable/ic_filter_list_black_24dp.xml|2 +- android/source/res/drawable/ic_folder_black_24dp.xml |2 +- android/source/res/drawable/ic_format_clear_black_24dp.xml |2 +- android/source/res/drawable/ic_grid_off_black_24dp.xml |2 +- android/source/res/drawable/ic_grid_on_black_24dp.xml|2 +- android/source/res/drawable/ic_insert_drive_file_black_24dp.xml |7 --- android/source/res/drawable/ic_keyboard_backspace_black_24dp.xml |9 - android/source/res/drawable/ic_line.xml |2 +- android/source/res/drawable/ic_rect.xml |2 +- android/source/res/drawable/ic_sd_card_black_24dp.xml|9 - android/source/res/drawable/ic_settings_black_24dp.xml |2 +- android/source/res/drawable/ic_sort_black_24dp.xml |2 +- android/source/res/drawable/ic_storage_black_24dp.xml|9 - android/source/res/drawable/ic_usb_black_24dp.xml|7 --- android/source/res/values-night/colors.xml |4 dev/null |binary 21 files changed, 18 insertions(+), 55 deletions(-) New commits: commit f37dcb43c0373e75e92fabd82b4f2a17b1fe6055 Author: Michael Weghorn AuthorDate: Tue Nov 28 14:22:54 2023 +0100 Commit: Michael Weghorn CommitDate: Thu Nov 30 12:16:41 2023 +0100 tdf#124480 android: Use themed color for more icons These icons used in the toolbars were previously using a hard-coded fill color. Most of them were using black, but `ic_line` and `ic_rect` used in the "Insert" tab of the bottom toolbar, were previously using a lighter gray than the other items in there for no apparent reason. Switch all of them to use the themed `toolbar_foreground` color that other icons are also using. Together with Change-Id Ic699fd1cecc607bd5e748648113336fe045e72b1 Author: Michael Weghorn Date: Tue Nov 28 13:13:12 2023 +0100 tdf#124480 android: Override icon color for dark theme , this makes these icons use a light color when using the dark system theme. Given the icons are no longer hard-coded to be black, the files with a "_black" suffix will be renamed in a follow-up commit. (Separate commit to keep the diff clearer.) Change-Id: I2061878067d21dcd743ad6ca8d1018db323755d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160073 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/drawable/ic_add_black_24dp.xml b/android/source/res/drawable/ic_add_black_24dp.xml index 0258249cc482..7f7afe05c114 100644 --- a/android/source/res/drawable/ic_add_black_24dp.xml +++ b/android/source/res/drawable/ic_add_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/android/source/res/drawable/ic_arrow_back_black_24dp.xml b/android/source/res/drawable/ic_arrow_back_black_24dp.xml index beafea3959eb..deb00257fb1d 100644 --- a/android/source/res/drawable/ic_arrow_back_black_24dp.xml +++ b/android/source/res/drawable/ic_arrow_back_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml b/android/source/res/drawable/ic_content_copy_black_24dp.xml index 8a894a3bcd73..26f2aefd40a2 100644 --- a/android/source/res/drawable/ic_content_copy_black_24dp.xml +++ b/android/source/res/drawable/ic_content_copy_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml b/android/source/res/drawable/ic_content_cut_black_24dp.xml index 1c0f96a37b42..6a6ba24f2b7f 100644 --- a/android/source/res/drawable/ic_content_cut_black_24dp.xml +++ b/android/source/res/drawable/ic_content_cut_black_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml b/android/source/res/drawable/ic_content_paste_black_24dp.xml index a902d9a856a0..e01601364307 100644 --- a/android/source/res/drawable/ic_content_paste_black_24dp.xml +++ b/android/source/res/drawable/ic_content_paste_black_24dp.xml @@ -4,6 +4,6 @@
[Libreoffice-commits] core.git: 3 commits - officecfg/registry sd/source sd/uiconfig sw/inc sw/qa sw/source
officecfg/registry/schema/org/openoffice/Office/Security.xcs |6
sd/source/ui/dlg/present.cxx | 14 -
sd/source/ui/inc/present.hxx |2
sd/source/ui/remotecontrol/Server.cxx| 17 -
sd/source/ui/view/drviews7.cxx |6
sd/uiconfig/simpress/ui/presentationdialog.ui| 17 +
sw/inc/IDocumentMarkAccess.hxx |3
sw/qa/extras/uiwriter/uiwriter.cxx | 146 +++
sw/source/core/attr/cellatr.cxx |2
sw/source/core/doc/DocumentContentOperationsManager.cxx |5
sw/source/core/doc/docbm.cxx | 12
sw/source/core/doc/docfmt.cxx|2
sw/source/core/doc/docftn.cxx|4
sw/source/core/docnode/ndtbl.cxx |2
sw/source/core/inc/MarkManager.hxx |3
sw/source/core/inc/mvsave.hxx|3
sw/source/core/inc/rolbck.hxx| 12
sw/source/core/undo/rolbck.cxx | 75 ++---
sw/source/core/undo/undel.cxx| 30 ++
sw/source/core/undo/undobj.cxx | 24 +
sw/source/core/undo/unins.cxx|4
sw/source/core/undo/unmove.cxx |6
sw/source/core/undo/untbl.cxx|4
23 files changed, 311 insertions(+), 88 deletions(-)
New commits:
commit 57974af130e7421da6b07589d4a63a754b757ad6
Author: Michael Stahl
AuthorDate: Thu Nov 23 20:45:09 2023 +0100
Commit: Michael Stahl
CommitDate: Fri Nov 24 10:23:51 2023 +0100
tdf#148389 sw: fix Delete Undo/Redo of bookmark positions
The main problem is that in SwUndoSaveContent::DelContentIndex() if the
selection start/end is equal to the bookmark start/end, the bookmark is
not deleted and no SwHistoryBookmark is created, hence on Undo the
bookmark positions are not restored.
Since deleting bookmarks in more situations might cause user complaints,
let's just extend the creation of SwHistoryBookmark to these cases,
which means we need to take care both here and in
SwHistoryBookmark::SetInDoc() that there is now a situation where all
bookmark positions are saved and restored but the bookmark still exists
in the document because it wasn't deleted.
The next problem is that using Backspace/Delete keys sets the
ArtificialSelection flag which is stored in SwUndoDelete, but when used
multiple times the SwUndoDelete::CanGrouping() extends an existing
SwUndoDelete, and if it previously would not delete a bookmark, the
extended range might fully contain the bookmark and thus delete it on
Redo, so check if there are saved bookmark positions and prevent
grouping in that case.
Another problem is then that SwUndoDelete::RedoImpl() deletes the
bookmark anyway, as already indicated with a FIXME comment.
This can be prevented by passing the now-existing m_DeleteFlags into
DelBookmarks() from DeleteRangeImplImpl().
Change-Id: Id5eb1a58927aaa6e7e8b75be82d7f854d8057cfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159875
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index d53f180d3fe9..d63b58f606c4 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -228,7 +228,8 @@ class IDocumentMarkAccess
const SwNode& rEnd,
std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, // Ugly:
SaveBookmark is core-internal
std::optional oStartContentIdx,
-std::optional oEndContentIdx) =0;
+std::optional oEndContentIdx,
+bool isReplace) = 0;
/** Deletes a mark.
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index a58853ec7a65..9825b2090204 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1435,6 +1435,152 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testBookmarkUndo)
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pMarkAccess->getAllMarksCount());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf148389_Left)
+{
+createSwDoc();
+SwDoc* pDoc = getSwDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+pWrtShell->Insert("foo bar baz");
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/false, 4,
/*bBasicCall=*/false);
+pWrtShell->Left(SwCursorSkipMode::Chars, /*bSelect=*/true, 3,
/*bBasicCall=*/false);
+IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
+
+auto
[Libreoffice-commits] core.git: 3 commits - cui/Library_cui.mk cui/source include/sal include/sfx2 include/svl sc/source sc/uiconfig sfx2/source sfx2/uiconfig svl/Library_svl.mk svl/source uui/source
cui/Library_cui.mk |3 --
cui/source/dialogs/passwdomdlg.cxx | 13 +---
cui/source/inc/PasswordStrength.hxx | 28 --
cui/source/util/PasswordStrength.cxx| 48
include/sal/log-areas.dox |2 -
include/sfx2/passwd.hxx |2 +
include/svl/PasswordHelper.hxx | 25
sc/source/ui/inc/protectiondlg.hxx |1
sc/source/ui/miscdlgs/protectiondlg.cxx |9 +-
sc/uiconfig/scalc/ui/protectsheetdlg.ui | 25
sfx2/source/dialog/passwd.cxx | 21 +-
sfx2/uiconfig/ui/password.ui| 34 --
svl/Library_svl.mk |2 +
svl/source/misc/PasswordHelper.cxx | 48
uui/source/masterpasscrtdlg.cxx |7
uui/source/masterpasscrtdlg.hxx |1
uui/uiconfig/ui/setmasterpassworddlg.ui | 23 +++
17 files changed, 188 insertions(+), 104 deletions(-)
New commits:
commit 861ebce9ca52cbe87121879f159d8ec0cb572755
Author: Sarper Akdemir
AuthorDate: Wed Nov 8 09:20:34 2023 +0300
Commit: Sarper Akdemir
CommitDate: Wed Nov 15 19:48:49 2023 +0100
tdf#157518: add password strength bar to protectsheetdlg.ui
Change-Id: Iedd6793446c2c339cc17d32a28c6b195dfb250e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159372
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir
diff --git a/sc/source/ui/inc/protectiondlg.hxx
b/sc/source/ui/inc/protectiondlg.hxx
index d36c8a820fad..e59fb3accf77 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -51,6 +51,7 @@ private:
std::unique_ptr m_xOptions;
std::unique_ptr m_xPassword1Edit;
std::unique_ptr m_xPassword2Edit;
+std::unique_ptr m_xPasswordStrengthBar;
std::unique_ptr m_xOptionsListBox;
std::unique_ptr m_xBtnOk;
std::unique_ptr m_xProtected;
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx
b/sc/source/ui/miscdlgs/protectiondlg.cxx
index 920e7bfc4888..1353f5f154cc 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -19,6 +19,7 @@
#include
#include
+#include
#include
@@ -43,6 +44,7 @@ ScTableProtectionDlg::ScTableProtectionDlg(weld::Window*
pParent)
, m_xOptions(m_xBuilder->weld_container("options"))
, m_xPassword1Edit(m_xBuilder->weld_entry("password1"))
, m_xPassword2Edit(m_xBuilder->weld_entry("password2"))
+, m_xPasswordStrengthBar(m_xBuilder->weld_level_bar("passwordbar"))
, m_xOptionsListBox(m_xBuilder->weld_tree_view("checklist"))
, m_xBtnOk(m_xBuilder->weld_button("ok"))
, m_xProtected(m_xBuilder->weld_label("protected"))
@@ -144,9 +146,14 @@ IMPL_LINK_NOARG(ScTableProtectionDlg, OKHdl,
weld::Button&, void)
m_xDialog->response(RET_OK);
}
-IMPL_LINK_NOARG(ScTableProtectionDlg, PasswordModifyHdl, weld::Entry&, void)
+IMPL_LINK(ScTableProtectionDlg, PasswordModifyHdl, weld::Entry&, rEntry, void)
{
OUString aPass1 = m_xPassword1Edit->get_text();
+if ( == m_xPassword1Edit.get())
+{
+m_xPasswordStrengthBar->set_percentage(
+SvPasswordHelper::GetPasswordStrengthPercentage(aPass1));
+}
OUString aPass2 = m_xPassword2Edit->get_text();
m_xBtnOk->set_sensitive(aPass1 == aPass2);
}
diff --git a/sc/uiconfig/scalc/ui/protectsheetdlg.ui
b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
index 547af8e8d34e..83f1a1af012a 100644
--- a/sc/uiconfig/scalc/ui/protectsheetdlg.ui
+++ b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
@@ -1,5 +1,5 @@
-
+
@@ -117,7 +117,7 @@
-
+
True
False
@@ -150,8 +150,8 @@
1
-0
-1
+0
+2
@@ -182,10 +182,23 @@
password
-1
-1
+1
+2
+
+
+
+
+True
+False
+
+
+1
+1
+
+
+
False
commit e8fc5d7fcab6b283ec0655b1d7cab5bf28fde240
Author: Sarper Akdemir
AuthorDate: Wed Nov 8 08:43:41 2023 +0300
Commit: Sarper Akdemir
CommitDate: Wed Nov 15 19:48:44 2023
[Libreoffice-commits] core.git: 3 commits - android/source sfx2/source sw/source
android/source/src/java/org/mozilla/gecko/gfx/GLController.java |3 ++-
sfx2/source/doc/exoticfileloadexception.cxx |7 +--
sfx2/source/doc/exoticfileloadexception.hxx |6 --
sw/source/core/doc/docfmt.cxx |2 +-
sw/source/core/inc/DocumentContentOperationsManager.hxx |2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit c621e6a2614dd8277def293b55d0444ea28c3d4e
Author: Noel Grandin
AuthorDate: Wed Nov 8 10:17:26 2023 +0200
Commit: Noel Grandin
CommitDate: Thu Nov 9 13:16:28 2023 +0100
loplugin:fieldcast in ExoticFileLoadException
Change-Id: Ia4fac9b3313adc22e0f371cbff6828add474d097
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159174
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/doc/exoticfileloadexception.cxx
b/sfx2/source/doc/exoticfileloadexception.cxx
index 91dc9c273929..2b2500d71aef 100644
--- a/sfx2/source/doc/exoticfileloadexception.cxx
+++ b/sfx2/source/doc/exoticfileloadexception.cxx
@@ -27,11 +27,6 @@ ExoticFileLoadException::ExoticFileLoadException(const
OUString& rURL,
m_aRequest <<= aReq;
}
-bool ExoticFileLoadException::isApprove() const
-{
-comphelper::OInteractionApprove* pBase
-= static_cast(m_xApprove.get());
-return pBase->wasSelected();
-}
+bool ExoticFileLoadException::isApprove() const { return
m_xApprove->wasSelected(); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/exoticfileloadexception.hxx
b/sfx2/source/doc/exoticfileloadexception.hxx
index 8204d6f55426..9a4211d5d6f9 100644
--- a/sfx2/source/doc/exoticfileloadexception.hxx
+++ b/sfx2/source/doc/exoticfileloadexception.hxx
@@ -12,7 +12,9 @@
#include
#include
+#include
#include
+#include
class ExoticFileLoadException : public
cppu::WeakImplHelper
{
@@ -33,8 +35,8 @@ public:
// member
private:
css::uno::Any m_aRequest;
-css::uno::Reference m_xAbort;
-css::uno::Reference m_xApprove;
+rtl::Reference m_xAbort;
+rtl::Reference m_xApprove;
css::uno::Sequence>
m_lContinuations;
};
commit 444548b4c7ac47028cdfe0a6c45b1cc32514848a
Author: Noel Grandin
AuthorDate: Tue Nov 7 16:13:38 2023 +0200
Commit: Noel Grandin
CommitDate: Thu Nov 9 13:16:18 2023 +0100
loplugin:fieldcast in ParaRstFormat
Change-Id: I684e53a2c06ed1a6b2e85eb07162cd4ef43d0dd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159136
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index c7deb91478b9..b6ac04ef682a 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1013,7 +1013,7 @@ static bool lcl_SetTextFormatColl( SwNode* pNode, void*
pArgs )
}
}
-SwTextFormatColl* pFormat =
static_cast(pPara->pFormatColl);
+SwTextFormatColl* pFormat = pPara->pFormatColl;
if ( pPara->bReset )
{
lcl_RstAttr(pCNd, pPara);
diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx
b/sw/source/core/inc/DocumentContentOperationsManager.hxx
index 434eaf7ed07b..8332cf34bf92 100644
--- a/sw/source/core/inc/DocumentContentOperationsManager.hxx
+++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx
@@ -117,7 +117,7 @@ public:
//originallyfrom docfmt.cxx
struct ParaRstFormat
{
-SwFormatColl* pFormatColl;
+SwTextFormatColl* pFormatColl;
SwHistory* pHistory;
const SwPosition *pSttNd, *pEndNd;
const SfxItemSet* pDelSet;
commit d9a43fa5f94839d79cbd8524ba5c0b1865e6ad52
Author: Michael Weghorn
AuthorDate: Thu Nov 9 08:54:08 2023 +0100
Commit: Michael Weghorn
CommitDate: Thu Nov 9 13:16:16 2023 +0100
tdf#158125 android: Don't insist on RGB 565 EGL config
As the `eglChooseConfig` doc [1] says:
> eglChooseConfig returns in configs a list of all EGL frame buffer
> configurations that match the attributes specified
> [...]
> Attributes are matched in an attribute-specific manner. Some of the
> attributes, such as EGL_LEVEL, must match the specified value exactly.
> Others, such as, EGL_RED_SIZE must meet or exceed the specified minimum
> values.
The config/attribute list used for Android Viewer specifies
EGL_RED_SIZE=5, EGL_GREEN_SIZE=6, and EGL_BLUE_SIZE=5 and so
far, only configs using exactly those bit sizes were accepted,
causing 1 of the 11 devices used in automated tests in Google Play CI
crashing with this stack trace:
Exception org.mozilla.gecko.gfx.GLController$GLControllerException: No
suitable EGL configuration found
at org.mozilla.gecko.gfx.GLController.chooseConfig
(GLController.java:219)
at org.mozilla.gecko.gfx.GLController.initEGL (GLController.java:172)
at
[Libreoffice-commits] core.git: 3 commits - desktop/source include/unotools lingucomponent/config lingucomponent/source postprocess/CustomTarget_registry.mk unotools/source
desktop/source/lib/init.cxx| 195
++
include/unotools/lingucfg.hxx |2
lingucomponent/config/Linguistic-lingucomponent-grammarchecker.xcu | 30 +
lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx | 58 +-
postprocess/CustomTarget_registry.mk |1
unotools/source/config/lingucfg.cxx| 21 +
6 files changed, 123 insertions(+), 184 deletions(-)
New commits:
commit ef5afb766553dfa9bf1c577e5f6bcb5bf5412782
Author: Szymon Kłos
AuthorDate: Fri Feb 10 14:56:06 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 22 19:02:19 2023 +0200
lok: remove old hack for LanguageTool locales
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146779
Reviewed-by: Henry Castro
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153962
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154162
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
(cherry picked from commit 9a5329a266bd74abc4794f1fcbae3db07582dbde)
Change-Id: I44cc4a5b1a0d92e2b0857cdc1d68c931ab95c0d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158332
Reviewed-by: Caolán McNamara
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2fdeaf2d18f0..880374e2d0f5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5864,132 +5864,6 @@ static void
doc_setGraphicSelection(LibreOfficeKitDocument* pThis, int nType, in
pDoc->setGraphicSelection(nType, nX, nY);
}
-static void getDocLanguages(LibreOfficeKitDocument* pThis,
uno::Sequence& rSeq)
-{
-SfxViewFrame* pViewFrame = SfxViewFrame::Current();
-if (!pViewFrame)
-return;
-
-SfxDispatcher* pDispatcher = pViewFrame->GetBindings().GetDispatcher();
-if (!pDispatcher)
-return;
-
-css::uno::Any aLangStatus;
-pDispatcher->QueryState(SID_LANGUAGE_STATUS, aLangStatus);
-
-OUString sCurrent;
-OUString sKeyboard;
-OUString sGuessText;
-SvtScriptType eScriptType = SvtScriptType::LATIN | SvtScriptType::ASIAN
-| SvtScriptType::COMPLEX;
-
-Sequence aSeqLang;
-if (aLangStatus >>= aSeqLang)
-{
-if (aSeqLang.getLength() == 4)
-{
-sCurrent = aSeqLang[0];
-eScriptType = static_cast(aSeqLang[1].toInt32());
-sKeyboard = aSeqLang[1];
-sGuessText = aSeqLang[2];
-}
-}
-else
-{
-aLangStatus >>= sCurrent;
-}
-
-LanguageType nLangType;
-std::set aLangItems;
-
-if (!sCurrent.isEmpty())
-{
-nLangType = SvtLanguageTable::GetLanguageType(sCurrent);
-if (nLangType != LANGUAGE_DONTKNOW)
-{
-aLangItems.insert(nLangType);
-}
-}
-
-const AllSettings& rAllSettings = Application::GetSettings();
-nLangType = rAllSettings.GetLanguageTag().getLanguageType();
-if (nLangType != LANGUAGE_DONTKNOW &&
-(eScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType)))
-{
-aLangItems.insert(nLangType);
-}
-
-nLangType = rAllSettings.GetUILanguageTag().getLanguageType();
-if (nLangType != LANGUAGE_DONTKNOW &&
-(eScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType)))
-{
-aLangItems.insert(nLangType);
-}
-
-if (!sKeyboard.isEmpty())
-{
-nLangType = SvtLanguageTable::GetLanguageType(sKeyboard);
-if (nLangType != LANGUAGE_DONTKNOW &&
-(eScriptType &
SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType)))
-{
-aLangItems.insert(nLangType);
-}
-}
-
-if (!sGuessText.isEmpty())
-{
-Reference xLangGuesser;
-try
-{
-xLangGuesser = linguistic2::LanguageGuessing::create(xContext);
-}
-catch(...)
-{
-}
-
-if (xLangGuesser.is())
-{
-lang::Locale aLocale =
xLangGuesser->guessPrimaryLanguage(sGuessText, 0,
-
sGuessText.getLength());
-LanguageTag aLanguageTag(aLocale);
-nLangType = aLanguageTag.getLanguageType(false);
-if (nLangType != LANGUAGE_DONTKNOW &&
-(eScriptType &
SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType)))
-{
-aLangItems.insert(nLangType);
-}
-}
-}
-
-LibLODocument_Impl* pDocument = static_cast(pThis);
-Reference
xDocumentLanguages(pDocument->mxComponent, UNO_QUERY);
-if (xDocumentLanguages.is())
-{
-const Sequence
aLocales(xDocumentLanguages->getDocumentLanguages(
-
static_cast(eScriptType), 64));
-
-for (const lang::Locale& aLocale : aLocales)
-
[Libreoffice-commits] core.git: 3 commits - configure.ac cui/uiconfig download.lst external/libcmis sc/uiconfig sfx2/uiconfig svx/uiconfig ucb/source
configure.ac | 18 cui/uiconfig/ui/spellingdialog.ui |2 download.lst |4 external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch | 69 external/libcmis/UnpackedTarball_libcmis.mk |9 external/libcmis/libcmis-boost-string.patch | 11 external/libcmis/libcmis-libxml2_compatibility.patch | 14 external/libcmis/libcmis_gdrive.patch.1 | 702 -- external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 | 185 -- external/libcmis/libcmis_onedrive.patch | 445 -- sc/uiconfig/scalc/ui/functionpanel.ui |1 sfx2/uiconfig/ui/deck.ui |2 svx/uiconfig/ui/medialine.ui |7 svx/uiconfig/ui/mediawindow.ui |7 ucb/source/ucp/cmis/auth_provider.hxx |8 15 files changed, 4 insertions(+), 1480 deletions(-) New commits: commit a72ce599f9ccc8ae847f8a3017858516dd9e2537 Author: Caolán McNamara AuthorDate: Tue Oct 10 20:39:04 2023 +0100 Commit: Caolán McNamara CommitDate: Wed Oct 11 09:30:45 2023 +0200 drop can-focus of False in GtkToolButtons Change-Id: I12add968fdb5cb4d29087c24aa885cde23488fb4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157794 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 71772829f104..f661a5a8b80e 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -292,7 +292,6 @@ True -False Paste True edit-paste @@ -305,7 +304,6 @@ True -False Special Character True cmd/sc_insertsymbol.png diff --git a/sfx2/uiconfig/ui/deck.ui b/sfx2/uiconfig/ui/deck.ui index b4854579b77b..4d02ca2f442a 100644 --- a/sfx2/uiconfig/ui/deck.ui +++ b/sfx2/uiconfig/ui/deck.ui @@ -98,7 +98,6 @@ True -False Help about this sidebar deck center center @@ -117,7 +116,6 @@ True -False Close Sidebar Deck True window-close-symbolic diff --git a/svx/uiconfig/ui/medialine.ui b/svx/uiconfig/ui/medialine.ui index cfbef49e1e41..4c90cae1d213 100644 --- a/svx/uiconfig/ui/medialine.ui +++ b/svx/uiconfig/ui/medialine.ui @@ -31,7 +31,6 @@ False -False True Open True @@ -44,7 +43,6 @@ -False True Apply True @@ -68,7 +66,6 @@ True -False Play True avmedia/res/av02049.png @@ -81,7 +78,6 @@ True -False Pause True avmedia/res/av02050.png @@ -94,7 +90,6 @@ True -False Stop True avmedia/res/av02051.png @@ -117,7 +112,6 @@ True -False Repeat True avmedia/res/av02052.png @@ -202,7 +196,6 @@ True -False Mute True avmedia/res/av02054.png diff --git a/svx/uiconfig/ui/mediawindow.ui b/svx/uiconfig/ui/mediawindow.ui index a942a6c86cae..327c52356d21 100644 --- a/svx/uiconfig/ui/mediawindow.ui +++ b/svx/uiconfig/ui/mediawindow.ui @@ -97,7 +97,6 @@ True -False Open True avmedia/res/av02048.png @@ -110,7 +109,6 @@ True -False
[Libreoffice-commits] core.git: 3 commits - external/frozen pyuno/source sfx2/source
external/frozen/cid1538304_reference_ctor.0 | 17 +
pyuno/source/module/pyuno_runtime.cxx | 15 +--
sfx2/source/view/lokcharthelper.cxx |2 +-
3 files changed, 27 insertions(+), 7 deletions(-)
New commits:
commit 1ca97423ab6980a6f6d85c2ca52e400c56baa1e1
Author: Caolán McNamara
AuthorDate: Fri Sep 29 09:21:16 2023 +0100
Commit: Caolán McNamara
CommitDate: Fri Sep 29 14:14:25 2023 +0200
cid#1545913 Big parameter passed by value
Change-Id: I5fd72f80a01808f9c24dae7ab6e79391fc9603da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157400
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/external/frozen/cid1538304_reference_ctor.0
b/external/frozen/cid1538304_reference_ctor.0
index 8ed0a7533fd4..c627686cd2bd 100644
--- a/external/frozen/cid1538304_reference_ctor.0
+++ b/external/frozen/cid1538304_reference_ctor.0
@@ -14,3 +14,20 @@
: map{items, Compare{}} {}
constexpr map(std::initializer_list items, Compare const
)
+--- include/frozen/set.h 2023-09-29 09:19:22.208195458 +0100
include/frozen/set.h 2023-09-29 09:20:21.175291240 +0100
+@@ -59,12 +59,12 @@
+ /* constructors */
+ constexpr set(const set ) = default;
+
+- constexpr set(container_type keys, Compare const & comp)
++ constexpr set(const container_type& keys, Compare const & comp)
+ : less_than_{comp}
+ , keys_(bits::quicksort(keys, less_than_)) {
+ }
+
+- explicit constexpr set(container_type keys)
++ explicit constexpr set(const container_type& keys)
+ : set{keys, Compare{}} {}
+
+ constexpr set(std::initializer_list keys, Compare const & comp)
commit ace3634dacfc177a9ad92db8b2d0b596891c1814
Author: Caolán McNamara
AuthorDate: Fri Sep 29 09:15:00 2023 +0100
Commit: Caolán McNamara
CommitDate: Fri Sep 29 14:14:18 2023 +0200
cid#1546831 Dereference after null check
Change-Id: I8c51dd1b312f02534f138b4fe6752ad26f5ac96c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157399
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/view/lokcharthelper.cxx
b/sfx2/source/view/lokcharthelper.cxx
index c7941e6aa2ac..f8e8ec47ea4e 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -175,7 +175,7 @@ bool LokChartHelper::HitAny(const Point& aPos, bool
bNegativeX)
SfxViewShell* pViewShell = SfxViewShell::GetFirst();
while (pViewShell)
{
-if (pViewShell->GetDocId() == pCurView->GetDocId() &&
pViewShell->getPart() == nPartForCurView)
+if (pCurView && pViewShell->GetDocId() == pCurView->GetDocId() &&
pViewShell->getPart() == nPartForCurView)
{
LokChartHelper aChartHelper(pViewShell, bNegativeX);
if (aChartHelper.Hit(aPos))
commit 86160b081b316532ed83cb9365714a06b1c13326
Author: Caolán McNamara
AuthorDate: Fri Sep 29 08:52:19 2023 +0100
Commit: Caolán McNamara
CommitDate: Fri Sep 29 14:14:13 2023 +0200
cid#1546834 Unchecked return value
Change-Id: Id2c54c61d3d44611ab02db81b8e64cedb0010ba7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157398
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
index 7f3eb7a6e95f..799752fefee3 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -239,14 +239,17 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE
**ppFile )
*ppFile = stderr;
else
{
-oslProcessInfo data;
-data.Size = sizeof( data );
-osl_getProcessInfo(
-nullptr , osl_Process_IDENTIFIER , );
osl_getSystemPathFromFileURL( str.pData, );
OString o = OUStringToOString( str, osl_getThreadTextEncoding() );
-o += ".";
-o += OString::number( data.Ident );
+
+oslProcessInfo data;
+data.Size = sizeof( data );
+if (osl_getProcessInfo(
+nullptr , osl_Process_IDENTIFIER , ) == osl_Process_E_None)
+{
+o += ".";
+o += OString::number(data.Ident);
+}
*ppFile = fopen( o.getStr() , "w" );
if ( *ppFile )
[Libreoffice-commits] core.git: 3 commits - cppuhelper/source reportdesign/source svl/source sw/source
cppuhelper/source/paths.cxx|7 +++
reportdesign/source/core/sdr/RptObject.cxx |2 +-
svl/source/items/itemset.cxx |2 +-
sw/source/core/unocore/unoframe.cxx|2 +-
sw/source/filter/html/SwAppletImpl.cxx |2 +-
sw/source/uibase/shells/textsh.cxx |2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 348591702a84209476aedc8cc286cc90ff16558a
Author: Caolán McNamara
AuthorDate: Fri Sep 29 08:44:26 2023 +0100
Commit: Caolán McNamara
CommitDate: Fri Sep 29 14:14:06 2023 +0200
cid#1545230 Unchecked return value
Change-Id: If25dcbb9784c041b61fe9aaea213035a4769962b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157397
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 48f0679e481d..62f4df050577 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -1284,7 +1284,7 @@ sal_uInt16 SfxItemSet::GetWhichByOffset( sal_uInt16
nOffset ) const
// 1st try to get a set SfxPoolItem and fetch the WhichID from there.
const SfxPoolItem* pItem(nullptr);
-GetItemState_ForOffset(nOffset, );
+(void)GetItemState_ForOffset(nOffset, );
if (nullptr != pItem && 0 != pItem->Which())
return pItem->Which();
commit d282d737921e33bacb3ca81b16270702903fdbed
Author: Caolán McNamara
AuthorDate: Fri Sep 29 08:41:27 2023 +0100
Commit: Caolán McNamara
CommitDate: Fri Sep 29 14:14:00 2023 +0200
cid#1537991 Unchecked return value
Change-Id: I303817f007dd0035e64d15b3f9310a06aab18060
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157396
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index 28a1d34658b3..cf8c748ee7e0 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -38,12 +38,11 @@ namespace {
OUString get_this_libpath() {
static OUString s_uri = []() {
OUString uri;
-
osl::Module::getUrlFromAddress(reinterpret_cast(get_this_libpath),
uri);
-sal_Int32 i = uri.lastIndexOf('/');
+sal_Int32 i = -1;
+if
(osl::Module::getUrlFromAddress(reinterpret_cast(get_this_libpath),
uri))
+i = uri.lastIndexOf('/');
if (i == -1)
-{
throw css::uno::DeploymentException("URI " + uri + " is expected
to contain a slash");
-}
return uri.copy(0, i);
}();
commit 56c6e1d6f2e5f16ac498305470fb35d4f5e1fea1
Author: Caolán McNamara
AuthorDate: Fri Sep 29 08:36:56 2023 +0100
Commit: Caolán McNamara
CommitDate: Fri Sep 29 14:13:54 2023 +0200
cid#1546827 Unchecked return value
and
cid#1546828 Unchecked return value
cid#1546830 Unchecked return value
cid#1546833 Unchecked return value
Change-Id: I9ed0246f27a3e652d31346e0543b207249f7e1a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157395
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index 7432e238f7cc..55dd6034e928 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -944,7 +944,7 @@ OOle2Obj::OOle2Obj(SdrModel& rSdrModel, OOle2Obj const &
rSource)
m_bIsListening = true;
OReportModel& rRptModel(static_cast< OReportModel&
>(getSdrModelFromSdrObject()));
-svt::EmbeddedObjectRef::TryRunningState( GetObjRef() );
+(void)svt::EmbeddedObjectRef::TryRunningState( GetObjRef() );
impl_createDataProvider_nothrow(rRptModel.getReportDefinition());
uno::Reference< chart2::data::XDatabaseDataProvider > xSource(
lcl_getDataProvider(rSource.GetObjRef()) );
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 61dde3157e31..329517cc11da 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2994,7 +2994,7 @@ void
SwXFrame::attachToRange(uno::Reference const& xTextRange,
sal_Int64 nAspect = m_nDrawAspect;
// TODO/LEAN: VisualArea still needs running state
-svt::EmbeddedObjectRef::TryRunningState( xIPObj );
+(void)svt::EmbeddedObjectRef::TryRunningState( xIPObj );
// set parent to get correct VisArea(in case of object
needing parent printer)
uno::Reference < container::XChild > xChild( xIPObj,
uno::UNO_QUERY );
diff --git a/sw/source/filter/html/SwAppletImpl.cxx
b/sw/source/filter/html/SwAppletImpl.cxx
index 9c0d64bb7c01..9dbca2748305 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -123,7 +123,7 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode,
const OUString& rName,
// create Applet; it
[Libreoffice-commits] core.git: 3 commits - starmath/CppunitTest_starmath_export.mk starmath/CppunitTest_starmath_qa_cppunit.mk starmath/inc starmath/Library_sm.mk starmath/source
starmath/CppunitTest_starmath_export.mk |1
starmath/CppunitTest_starmath_qa_cppunit.mk |5 +
starmath/Library_sm.mk |1
starmath/inc/dialog.hxx |6 +-
starmath/inc/node.hxx |2
starmath/source/dialog.cxx | 33 +--
starmath/source/node.cxx| 80 +---
7 files changed, 87 insertions(+), 41 deletions(-)
New commits:
commit ff28544c5310870cd98402d89ba53cfa7b7f598d
Author: Khaled Hosny
AuthorDate: Thu Sep 28 10:41:41 2023 +0300
Commit: خالد حسني
CommitDate: Thu Sep 28 14:34:28 2023 +0200
starmath: Arabic text should always be upright
Change-Id: Ibe9f3092432ae4ffd81903df8672daf90947000c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157349
Tested-by: Jenkins
Reviewed-by: خالد حسني
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 695e1b4e3a8c..1a89b52c4110 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1868,8 +1868,24 @@ void SmTextNode::Prepare(const SmFormat , const
SmDocShell , i
// special handling for ':' where it is a token on its own and is likely
// to be used for mathematical notations. (E.g. a:b = 2:3)
// In that case it should not be displayed in italic.
-if (GetToken().aText.getLength() == 1 && GetToken().aText[0] == ':')
+if (maText.getLength() == 1 && GetToken().aText[0] == ':')
Attributes() &= ~FontAttribute::Italic;
+
+// Arabic text should not be italic, so we check for any charcter in
Arabic script and
+// remove italic attribute.
+if (!maText.isEmpty())
+{
+sal_Int32 nIndex = 0;
+while (nIndex < maText.getLength())
+{
+sal_uInt32 cChar = maText.iterateCodePoints();
+if (u_getIntPropertyValue(cChar, UCHAR_SCRIPT) == USCRIPT_ARABIC)
+{
+Attributes() &= ~FontAttribute::Italic;
+break;
+}
+}
+}
};
commit c7f20a1dad66a7d3241c103546cd268152bc778f
Author: Khaled Hosny
AuthorDate: Thu Sep 28 10:15:03 2023 +0300
Commit: خالد حسني
CommitDate: Thu Sep 28 14:34:22 2023 +0200
tdf#142095: Render symbols in Math Symbols Catalogue using document settings
Use the document format to resolve the font and style of the symbol.
This makes the symbols use the current document font, as well as apply
settings like GreekCharStyle.
Change-Id: I668e582704b7e011e032f8b9e1dfb509e0d00d3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157348
Tested-by: Jenkins
Reviewed-by: خالد حسني
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index bed55f9ddabf..66db01d295f4 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -247,6 +247,7 @@ public:
class SmShowSymbolSet final : public weld::CustomWidgetController
{
+SmViewShell _rViewShell;
Size m_aOldSize;
SymbolPtrVec_t aSymbolSet;
Link aSelectHdlLink;
@@ -268,7 +269,7 @@ class SmShowSymbolSet final : public
weld::CustomWidgetController
DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void);
public:
-SmShowSymbolSet(std::unique_ptr pScrolledWindow);
+SmShowSymbolSet(std::unique_ptr pScrolledWindow,
SmViewShell );
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override
{
@@ -291,6 +292,7 @@ public:
class SmShowSymbol final : public weld::CustomWidgetController
{
private:
+SmViewShell _rViewShell;
vcl::Font m_aFont;
OUString m_aText;
@@ -302,7 +304,7 @@ private:
void setFontSize(vcl::Font ) const;
public:
-SmShowSymbol();
+SmShowSymbol(SmViewShell );
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override
{
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index c87b987660e4..585f5a0df475 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -85,6 +85,24 @@ public:
const OUString& GetStyleName(sal_uInt16 nIdx) const;
};
+vcl::Font lclGetSymbolFont(const SmViewShell& rViewShell, const SmSym )
+{
+const SmDocShell* pDoc = rViewShell.GetDoc();
+if (pDoc)
+{
+// If we have a document, we want to render the symbol useing the font
and style used in
+// the documnet, so we do that by creating a node and preparing it,
then get the resolved
+// font and style from it.
+SmToken token(TSPECIAL, '\0', "%" + rSymbol.GetUiName());
+SmSpecialNode aNode(token);
+aNode.Prepare(pDoc->GetFormat(), *pDoc, 1);
+aNode.PrepareAttributes();
+return aNode.GetFont();
+}
+
+return rSymbol.GetFace();
+}
+
} // end anonymous namespace
SmFontStyles::SmFontStyles()
@@ -985,8 +1003,9 @@ void SmAlignDialog::WriteTo(SmFormat ) const
rFormat.RequestApplyChanges();
}
-SmShowSymbolSet::SmShowSymbolSet(std::unique_ptr
pScrolledWindow)
-:
[Libreoffice-commits] core.git: 3 commits - download.lst external/more_fonts Makefile.fetch vcl/qa
Makefile.fetch |3 +- download.lst |9 ++- external/more_fonts/ExternalPackage_noto_kufi_arabic.mk |7 -- external/more_fonts/ExternalPackage_noto_naskh_arabic.mk | 17 +++ external/more_fonts/Module_more_fonts.mk |6 +++-- external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk |4 +-- external/more_fonts/UnpackedTarball_noto_naskh_arabic.mk | 14 vcl/qa/cppunit/complextext.cxx | 14 ++-- 8 files changed, 54 insertions(+), 20 deletions(-) New commits: commit 2902ab24ecc5ffbf4907ea83b2028508b9de6364 Author: Khaled Hosny AuthorDate: Tue Sep 26 16:11:27 2023 +0300 Commit: خالد حسني CommitDate: Tue Sep 26 22:00:56 2023 +0200 tdf#124591: Rename *noto.mk to *noto_kufi_arabic.mk Since it is the only one left in this package. Still using the old tarball, though, since there does not exist any releases upstream (yet): https://github.com/notofonts/arabic Change-Id: I9a21fda5519bbf184af9b2e70b8cf65e3046a724 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157283 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/Makefile.fetch b/Makefile.fetch index 1a91c7f785c9..41d6a85d13c0 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -179,7 +179,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_KUFI_ARABIC_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_TARBALL) \ diff --git a/download.lst b/download.lst index e06dbad101f6..20b9e5d754aa 100644 --- a/download.lst +++ b/download.lst @@ -157,8 +157,8 @@ FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-201 # three static lines # so that git cherry-pick # will not run into conflicts -FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 -FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz +FONT_NOTO_KUFI_ARABIC_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 +FONT_NOTO_KUFI_ARABIC_TARBALL := noto-fonts-20171024.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk similarity index 96% rename from external/more_fonts/ExternalPackage_noto.mk rename to external/more_fonts/ExternalPackage_noto_kufi_arabic.mk index c9b25163b888..ed6b9fea3f85 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_kufi_arabic)) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ NotoKufiArabic-Bold.ttf \ diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index f37a5c34fbc0..e17af9a15141 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_liberation_narrow \ ExternalPackage_libertineg \ ExternalPackage_libre_hebrew \ - ExternalPackage_noto \ + ExternalPackage_noto_kufi_arabic \ ExternalPackage_noto_naskh_arabic \ ExternalPackage_noto_sans \ ExternalPackage_noto_sans_arabic \ @@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_liberation_narrow \ UnpackedTarball_libertineg \ UnpackedTarball_libre_hebrew \ - UnpackedTarball_noto \ + UnpackedTarball_noto_kufi_arabic \ UnpackedTarball_noto_naskh_arabic \ UnpackedTarball_noto_sans \ UnpackedTarball_noto_sans_arabic \ diff --git a/external/more_fonts/UnpackedTarball_noto.mk b/external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk similarity index 66% rename from external/more_fonts/UnpackedTarball_noto.mk rename to external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk index ee6f223f8cad..482727dd6246 100644 --- a/external/more_fonts/UnpackedTarball_noto.mk +++
[Libreoffice-commits] core.git: 3 commits - download.lst external/more_fonts Makefile.fetch
Makefile.fetch|3 +++ download.lst | 15 +++ external/more_fonts/ExternalPackage_noto.mk |5 - external/more_fonts/ExternalPackage_noto_sans_lao.mk | 17 + external/more_fonts/ExternalPackage_noto_sans_lisu.mk | 17 + external/more_fonts/ExternalPackage_noto_serif_lao.mk | 17 + external/more_fonts/Module_more_fonts.mk |6 ++ external/more_fonts/UnpackedTarball_noto_sans_lao.mk | 14 ++ external/more_fonts/UnpackedTarball_noto_sans_lisu.mk | 14 ++ external/more_fonts/UnpackedTarball_noto_serif_lao.mk | 14 ++ 10 files changed, 117 insertions(+), 5 deletions(-) New commits: commit 00db8423d18d75f982b337744ec39c4b7269a433 Author: Khaled Hosny AuthorDate: Tue Sep 26 13:15:29 2023 +0300 Commit: خالد حسني CommitDate: Tue Sep 26 22:00:38 2023 +0200 tdf#124591: Update Noto Sans Lisu to v2.102 from: https://github.com/notofonts/lisu/releases/tag/NotoSansLisu-v2.102 Change-Id: I205cf05d6f33e1083e30193d7ed775d9775af2f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157280 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/Makefile.fetch b/Makefile.fetch index 7d089de612ed..c8ea14b3a6bc 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -191,6 +191,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_GEORGIAN_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_LAO_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_LAO_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_LISU_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ diff --git a/download.lst b/download.lst index 06a7ac8e2f52..b470064253a0 100644 --- a/download.lst +++ b/download.lst @@ -217,6 +217,11 @@ FONT_NOTO_SERIF_LAO_TARBALL := NotoSerifLao-v2.003.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SANS_LISU_SHA256SUM := b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268 +FONT_NOTO_SANS_LISU_TARBALL := NotoSansLisu-v2.102.zip +# three static lines +# so that git cherry-pick +# will not run into conflicts FONT_CULMUS_SHA256SUM := c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05 FONT_CULMUS_TARBALL := culmus-0.133.tar.gz # three static lines diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk index f953ec31646a..d5bfe4cf8b88 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -17,7 +17,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoNaskhArabic-Regular.ttf \ NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ - NotoSansLisu-Regular.ttf \ )) # vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_noto_sans_lisu.mk b/external/more_fonts/ExternalPackage_noto_sans_lisu.mk new file mode 100644 index ..9200e5698741 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_sans_lisu.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_lisu)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSansLisu/full/ttf/NotoSansLisu-Bold.ttf \ + NotoSansLisu/full/ttf/NotoSansLisu-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index ac4031bedcf6..12bcabcc604d 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_noto_sans_georgian \ ExternalPackage_noto_sans_hebrew \ ExternalPackage_noto_sans_lao \ + ExternalPackage_noto_sans_lisu \ ExternalPackage_noto_serif \ ExternalPackage_noto_serif_armenian \ ExternalPackage_noto_serif_georgian \ @@ -53,6 +54,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ UnpackedTarball_noto_sans_georgian \ UnpackedTarball_noto_sans_hebrew \
[Libreoffice-commits] core.git: 3 commits - download.lst external/more_fonts Makefile.fetch
Makefile.fetch |3 ++ download.lst | 15 +++ external/more_fonts/ExternalPackage_noto.mk|6 external/more_fonts/ExternalPackage_noto_sans_georgian.mk | 17 + external/more_fonts/ExternalPackage_noto_serif_armenian.mk | 17 + external/more_fonts/ExternalPackage_noto_serif_georgian.mk | 17 + external/more_fonts/Module_more_fonts.mk |6 external/more_fonts/UnpackedTarball_noto_sans_georgian.mk | 14 ++ external/more_fonts/UnpackedTarball_noto_serif_armenian.mk | 14 ++ external/more_fonts/UnpackedTarball_noto_serif_georgian.mk | 14 ++ 10 files changed, 117 insertions(+), 6 deletions(-) New commits: commit 0d49ac1ba30e2cb6247a77e75383176a4624adfd Author: Khaled Hosny AuthorDate: Tue Sep 26 12:56:53 2023 +0300 Commit: خالد حسني CommitDate: Tue Sep 26 21:54:19 2023 +0200 tdf#124591: Update Noto Serif Georgian to v2.003 from: https://github.com/notofonts/georgian/releases/tag/NotoSerifGeorgian-v2.003 Change-Id: I230b8eed49f024e2361e27df963424d7113e52fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157277 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/Makefile.fetch b/Makefile.fetch index 6f1e8a8b4bdc..52b272a2f31f 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -188,6 +188,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARMENIAN_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_ARMENIAN_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_GEORGIAN_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_GEORGIAN_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ diff --git a/download.lst b/download.lst index d89d86fbe62f..b1797173b71f 100644 --- a/download.lst +++ b/download.lst @@ -202,6 +202,11 @@ FONT_NOTO_SANS_GEORGIAN_TARBALL := NotoSansGeorgian-v2.003.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SERIF_GEORGIAN_SHA256SUM := cfb41a264b97d463bab6807a5be937ba4a6ddcfa93d519a21b98b0ba73ca27d4 +FONT_NOTO_SERIF_GEORGIAN_TARBALL := NotoSerifGeorgian-v2.003.zip +# three static lines +# so that git cherry-pick +# will not run into conflicts FONT_CULMUS_SHA256SUM := c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05 FONT_CULMUS_TARBALL := culmus-0.133.tar.gz # three static lines diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk index 3b622aa65114..76e6dab93ebb 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -20,8 +20,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ NotoSansLisu-Regular.ttf \ - NotoSerifGeorgian-Bold.ttf \ - NotoSerifGeorgian-Regular.ttf \ NotoSerifLao-Bold.ttf \ NotoSerifLao-Regular.ttf \ )) diff --git a/external/more_fonts/ExternalPackage_noto_serif_georgian.mk b/external/more_fonts/ExternalPackage_noto_serif_georgian.mk new file mode 100644 index ..8210e620bbc8 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_serif_georgian.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_serif_georgian)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSerifGeorgian/full/ttf/NotoSerifGeorgian-Bold.ttf \ + NotoSerifGeorgian/full/ttf/NotoSerifGeorgian-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index 00f65930408f..d99dcaf618a6 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_noto_sans_hebrew \ ExternalPackage_noto_serif \ ExternalPackage_noto_serif_armenian \ + ExternalPackage_noto_serif_georgian \ ExternalPackage_noto_serif_hebrew \ ExternalPackage_reem \ ExternalPackage_scheherazade \ @@ -51,6 +52,7
[Libreoffice-commits] core.git: 3 commits - download.lst external/more_fonts Makefile.fetch
Makefile.fetch|3 ++ download.lst | 15 external/more_fonts/ExternalPackage_noto.mk |6 external/more_fonts/ExternalPackage_noto_sans_armenian.mk | 17 ++ external/more_fonts/ExternalPackage_noto_sans_hebrew.mk | 17 ++ external/more_fonts/ExternalPackage_noto_serif_hebrew.mk | 17 ++ external/more_fonts/Module_more_fonts.mk |6 external/more_fonts/UnpackedTarball_noto_sans_armenian.mk | 14 +++ external/more_fonts/UnpackedTarball_noto_sans_hebrew.mk | 14 +++ external/more_fonts/UnpackedTarball_noto_serif_hebrew.mk | 14 +++ 10 files changed, 117 insertions(+), 6 deletions(-) New commits: commit d69317ca8f4b39c7fe62e9404f93d5d43e5495d6 Author: Khaled Hosny AuthorDate: Tue Sep 26 12:28:42 2023 +0300 Commit: خالد حسني CommitDate: Tue Sep 26 21:54:00 2023 +0200 tdf#124591: Update Noto Sans Armenian to v2.008 from: https://github.com/notofonts/armenian/releases/tag/NotoSansArmenian-v2.008 Change-Id: I92bd6f05e9022b6c1f25ac460e64b12209016297 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157274 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/Makefile.fetch b/Makefile.fetch index 1f7306941de6..3daedcb32695 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -185,6 +185,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_HEBREW_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARMENIAN_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ diff --git a/download.lst b/download.lst index 1a3a1f2e0af3..f62fedfcddcf 100644 --- a/download.lst +++ b/download.lst @@ -187,6 +187,11 @@ FONT_NOTO_SANS_HEBREW_TARBALL := NotoSansHebrew-v2.003.zip # three static lines # so that git cherry-pick # will not run into conflicts +FONT_NOTO_SANS_ARMENIAN_SHA256SUM := eab89b99e134177ca6a3f9f0412a7cb812aafceb13175d686b4c45cb237f64ac +FONT_NOTO_SANS_ARMENIAN_TARBALL := NotoSansArmenian-v2.008.zip +# three static lines +# so that git cherry-pick +# will not run into conflicts FONT_CULMUS_SHA256SUM := c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05 FONT_CULMUS_TARBALL := culmus-0.133.tar.gz # three static lines diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk index dfb3b170e187..514b17933e43 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -17,8 +17,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoNaskhArabic-Regular.ttf \ NotoNaskhArabicUI-Bold.ttf \ NotoNaskhArabicUI-Regular.ttf \ - NotoSansArmenian-Bold.ttf \ - NotoSansArmenian-Regular.ttf \ NotoSansGeorgian-Bold.ttf \ NotoSansGeorgian-Regular.ttf \ NotoSansLao-Bold.ttf \ diff --git a/external/more_fonts/ExternalPackage_noto_sans_armenian.mk b/external/more_fonts/ExternalPackage_noto_sans_armenian.mk new file mode 100644 index ..d6b7a12753c2 --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto_sans_armenian.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_armenian)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoSansArmenian/full/ttf/NotoSansArmenian-Bold.ttf \ + NotoSansArmenian/full/ttf/NotoSansArmenian-Regular.ttf \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk index 464b8ab74142..d5ed948db7ff 100644 --- a/external/more_fonts/Module_more_fonts.mk +++ b/external/more_fonts/Module_more_fonts.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ ExternalPackage_noto \ ExternalPackage_noto_sans \ ExternalPackage_noto_sans_arabic \ + ExternalPackage_noto_sans_armenian \ ExternalPackage_noto_sans_hebrew \ ExternalPackage_noto_serif \ ExternalPackage_noto_serif_hebrew \
[Libreoffice-commits] core.git: 3 commits - starmath/inc starmath/source sw/source
starmath/inc/strings.hrc |8
starmath/inc/strings.hxx |8
starmath/source/ElementsDockingWindow.cxx | 10 ++
sw/source/core/inc/unocontentcontrol.hxx |5 +++--
sw/source/core/inc/unometa.hxx| 14 --
sw/source/core/inc/unoport.hxx|3 ++-
sw/source/core/txtnode/attrcontentcontrol.cxx |1 +
sw/source/core/txtnode/fmtatr2.cxx|3 ++-
sw/source/core/unocore/unocoll.cxx|1 +
sw/source/core/unocore/unoobj.cxx |1 +
sw/source/core/unocore/unoportenum.cxx| 14 +++---
sw/source/core/unocore/unotext.cxx|6 +++---
sw/source/uibase/uno/unotxdoc.cxx |1 +
13 files changed, 55 insertions(+), 20 deletions(-)
New commits:
commit acdc5c50938a3c7032a00ab08efbb4916519e06b
Author: Noel Grandin
AuthorDate: Sun Sep 17 19:16:27 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 18 08:09:07 2023 +0200
use more concrete UNO types in sw
Change-Id: Ied57649bba82b3d9c7324e1e1c6d29a8b4f5390c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156999
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 9ca70148accd..62d0f49280c8 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -99,7 +99,7 @@ public:
/// @throws lang::IllegalArgumentException
/// @throws uno::RuntimeException
-uno::Reference< text::XTextRange >
+rtl::Reference
finishOrAppendParagraph(
const uno::Sequence< beans::PropertyValue >&
rCharacterAndParagraphProperties,
@@ -1151,7 +1151,7 @@ SwXText::finishParagraphInsert(
return m_pImpl->finishOrAppendParagraph(rProperties, xInsertPosition);
}
-uno::Reference< text::XTextRange >
+rtl::Reference
SwXText::Impl::finishOrAppendParagraph(
const uno::Sequence< beans::PropertyValue > & rProperties,
const uno::Reference< text::XTextRange >& xInsertPosition)
@@ -1167,7 +1167,7 @@ SwXText::Impl::finishOrAppendParagraph(
throw uno::RuntimeException();
}
-uno::Reference< text::XTextRange > xRet;
+rtl::Reference xRet;
bool bIllegalException = false;
bool bRuntimeException = false;
OUString sMessage;
commit 2cedcebc15f7199c8a3c16bb3f25c7a422770ecc
Author: Khaled Hosny
AuthorDate: Sun Sep 17 19:52:47 2023 +0300
Commit: خالد حسني
CommitDate: Mon Sep 18 08:09:00 2023 +0200
tdf#111705: Add the new maj and hadd operators to the elements panel
Change-Id: Ib62592d86a1bf2e5d94348fca731473dba92be74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156996
Tested-by: Jenkins
Reviewed-by: خالد حسني
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index 015c7e7c453a..b6eeff196633 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -119,6 +119,10 @@
#define RID_SUM_FROMX_HELP NC_("RID_SUM_FROMX_HELP", "Sum
Subscript Bottom" )
#define RID_SUM_TOX_HELPNC_("RID_SUM_TOX_HELP", "Sum
Superscript Top" )
#define RID_SUM_FROMTOX_HELPNC_("RID_SUM_FROMTOX_HELP", "Sum
Sup/Sub script" )
+#define RID_MAJX_HELP NC_("RID_MAJX_HELP", "Summation
(Arabic)" )
+#define RID_MAJ_FROMX_HELP NC_("RID_MAJ_FROMX_HELP",
"Summation Subscript Bottom (Arabic)" )
+#define RID_MAJ_TOX_HELPNC_("RID_MAJ_TOX_HELP", "Summation
Superscript Top (Arabic)" )
+#define RID_MAJ_FROMTOX_HELPNC_("RID_MAJ_FROMTOX_HELP",
"Summation Sup/Sub script (Arabic)" )
#define RID_PRODX_HELP NC_("RID_PRODX_HELP", "Product" )
#define RID_PROD_FROMX_HELP NC_("RID_PROD_FROMX_HELP",
"Product Subscript Bottom" )
#define RID_PROD_TOX_HELP NC_("RID_PROD_TOX_HELP", "Product
Superscript Top" )
@@ -139,6 +143,10 @@
#define RID_LIMSUP_FROMX_HELP NC_("RID_LIMSUP_FROMX_HELP",
"Limit Superior Subscript Bottom" )
#define RID_LIMSUP_TOX_HELP NC_("RID_LIMSUP_TOX_HELP", "Limit
Superior Superscript Top" )
#define RID_LIMSUP_FROMTOX_HELP NC_("RID_LIMSUP_FROMTOX_HELP",
"Limit Superior Sup/Sub script" )
+#define RID_HADDX_HELP NC_("RID_HADDX_HELP", "Limits
(Persian)" )
+#define RID_HADD_FROMX_HELP NC_("RID_HADD_FROMX_HELP", "Limits
Subscript Bottom (Persian)" )
+#define RID_HADD_TOX_HELP NC_("RID_HADD_TOX_HELP", "Limits
Superscript Top (Persian)" )
+#define RID_HADD_FROMTOX_HELP NC_("RID_HADD_FROMTOX_HELP",
"Limits Sup/Sub script (Persian)" )
#define RID_EXISTS_HELP NC_("RID_EXISTS_HELP", "There
Exists" )
#define RID_NOTEXISTS_HELP NC_("RID_NOTEXISTS_HELP", "There
does not
[Libreoffice-commits] core.git: 3 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 58cfb2ca63b1f08cc1f527d342ece0e4c68035c9 Author: Olivier Hallot AuthorDate: Sun Sep 3 09:13:00 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Sep 3 14:13:00 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 2ae7099c3ba435fc466b2483d2d63d5e1bf493f6 - tdf#155875 Tab'd UI cmds Writer/Table in Help(30) + refactoring + Table - Select menu (part 30) Change-Id: I50fb5b6ce2e9f9853ae6d182e9c022b66b20a33a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156481 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3f4db3969860..2ae7099c3ba4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3f4db39698603879915e68dad07c67251dacb417 +Subproject commit 2ae7099c3ba435fc466b2483d2d63d5e1bf493f6 commit b83dc3b47c5c46fedb7d8b042b0ccd43b02a9147 Author: Olivier Hallot AuthorDate: Sun Sep 3 09:12:51 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Sep 3 14:12:51 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 3f4db39698603879915e68dad07c67251dacb417 - tdf#155875 Tab'd UI cmds Writer/Table in Help(29) + refactoring + Table - Delete menu (part 29) Change-Id: Ic4220a237cd8bf71eb22a6c028c6ab126b1b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156478 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4d7d0008afcb..3f4db3969860 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4d7d0008afcbcca0d8e3724eeff9125ddae37e77 +Subproject commit 3f4db39698603879915e68dad07c67251dacb417 commit cd49503f6e8a65d9f42ac04b5ec6d9df45f8fc89 Author: Olivier Hallot AuthorDate: Sun Sep 3 09:12:41 2023 -0300 Commit: Gerrit Code Review CommitDate: Sun Sep 3 14:12:41 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 4d7d0008afcbcca0d8e3724eeff9125ddae37e77 - tdf#155875 Tab'd UI cmds Writer/Table in Help(28) + refactoring + Table menu (part 28) Change-Id: I86e159ff2bcfb5edbd3b840dad5b1a7279fe57b4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/156477 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index dd8981d39d51..4d7d0008afcb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dd8981d39d51a2b75f014a7196f16fb7622461a7 +Subproject commit 4d7d0008afcbcca0d8e3724eeff9125ddae37e77
[Libreoffice-commits] core.git: 3 commits - accessibility/inc accessibility/source include/toolkit toolkit/inc toolkit/source
accessibility/inc/standard/vclxaccessibleedit.hxx|3 +
accessibility/source/helper/acc_factory.cxx |7 ++
accessibility/source/standard/vclxaccessibleedit.cxx | 52 ++---
include/toolkit/awt/vclxwindows.hxx | 57 +++
include/toolkit/helper/accessiblefactory.hxx |6 ++
toolkit/inc/awt/vclxwindows.hxx | 55 --
toolkit/source/awt/vclxwindows.cxx |5 +
toolkit/source/helper/accessibilityclient.cxx|5 +
8 files changed, 115 insertions(+), 75 deletions(-)
New commits:
commit a766f7555c55c73e2dfd167e66f1bf32c75de6df
Author: Michael Weghorn
AuthorDate: Fri Sep 1 10:59:31 2023 +0200
Commit: Michael Weghorn
CommitDate: Fri Sep 1 16:13:31 2023 +0200
tdf#104833 a11y: Use VCLXAccessibleEdit for VCLXMultiLineEdit
Instead of the generic `VCLXAccessibleComponent`,
use `VCLXAccessibleEdit` as a11y class for
`VCLXMultiLineEdit` (the component interface
class for MultiLineEdit) as well, not just for `VCLXEdit`.
With the preparatory changes from
Change-Id I8218db61feb07605f6ea5309f26eebd38312458a
tdf#104833 a11y: Don't use VCLXEdit in VCLXAccessibleEdit
in place, it behaves as expected when interacting
with the multi line edit from the sample dialog in
attachment 189287 in tdf#104833 using Accerciser and
the qt6 or gtk3 VCL plugin (and the text can also be
edited when removing the readonly flag from the control)
or the update dialog (which uses UNO controls,
`UnoControlEditModel` for the panes that were not
announced, s. extensions/source/update/check/updatehdl.cxx ).
In particular, the a11y text interface is supported by
the multi line edit on the a11y layer, which makes
Orca with the gtk3 VCL plugin announce the text content
when the control gets focused.
NVDA on Windows still announces "Checking..." instead
of using the actual text that would be retrievable via
the IAccessibleText interface now. This is probably
because "Checking..." is the (outdated) accessible name,
as can be seen by interacting with the object in NVDA's
Python console:
>>> focus.name
'Checking...'
>>> txt = focus.IAccessibleTextObject
>>> txt.text(0, txt.nCharacters)
'LibreOfficeDev 24.2 is up to date.'
For both, gtk3 and qt6, the a11y object does have the
new text as a11y name as well, as can be verified in
Accerciser:
In [10]: acc.name
Out[10]: 'LibreOfficeDev 24.2 is up to date.'
In [11]: txt = acc.queryText()
In [12]: txt.getTextAtOffset(0,3)
Out[12]: ('LibreOfficeDev 24.2 is up to date.', 0, 34)
Change-Id: Id80e191cdd5342b3215fdb9d2ad3847470366337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156402
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/helper/acc_factory.cxx
b/accessibility/source/helper/acc_factory.cxx
index fb0468fe6d65..4dcc63e4ab12 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -102,6 +102,8 @@ public:
createAccessibleContext( VCLXScrollBar* _pXWindow ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXEdit* _pXWindow ) override;
+virtual css::uno::Reference< css::accessibility::XAccessibleContext >
+createAccessibleContext( VCLXMultiLineEdit* _pXWindow ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXComboBox* _pXWindow ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
@@ -280,6 +282,11 @@ Reference< XAccessibleContext >
AccessibleFactory::createAccessibleContext( VCLX
return new VCLXAccessibleEdit( _pXWindow );
}
+Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext(
VCLXMultiLineEdit* _pXWindow )
+{
+return new VCLXAccessibleEdit( _pXWindow );
+}
+
Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext(
VCLXComboBox* _pXWindow )
{
bool bIsDropDownBox = false;
diff --git a/include/toolkit/awt/vclxwindows.hxx
b/include/toolkit/awt/vclxwindows.hxx
index 3a86cdecdfef..b6d74a3f 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -461,6 +461,9 @@ public:
static void ImplGetPropertyIds( std::vector< sal_uInt16 > );
virtual voidGetPropertyIds( std::vector< sal_uInt16 > ) override
{ return ImplGetPropertyIds( aIds ); }
+
+protected:
+virtual css::uno::Reference
CreateAccessibleContext() override;
};
// class VCLXSpinField
diff --git a/include/toolkit/helper/accessiblefactory.hxx
b/include/toolkit/helper/accessiblefactory.hxx
index bd7ae90976d4..6c0532ce9edb
[Libreoffice-commits] core.git: 3 commits - sw/qa sw/source
sw/qa/extras/layout/layout3.cxx |2 -
sw/source/core/inc/tabfrm.hxx |2 -
sw/source/core/layout/frmtool.cxx |7 +++
sw/source/core/layout/layact.cxx |5 --
sw/source/core/layout/tabfrm.cxx | 68 --
5 files changed, 68 insertions(+), 16 deletions(-)
New commits:
commit c303981cfd95ce1c3881366023d5495ae2edce97
Author: Michael Stahl
AuthorDate: Wed Aug 23 15:50:59 2023 +0200
Commit: Michael Stahl
CommitDate: Thu Aug 24 12:43:25 2023 +0200
tdf#156724 sw: layout: fix tables not splitting due to footnotes differently
Revert commit 610c6f02b11b4b4c555a78b0feb2a1eb35159e39 and
and 61a78a523a6131ff98b5d846368e5626fe58d99c instead do the
opposite: never calc content frames in FormatLayout().
There were a few cases where documents looked worse with the fix, such
as the somewhat pathological tdf120139-1.odt and tdf124474-1.odt, but
typically these went from a bad layout to a worse layout, e.g.
--convert-to pdf tdf120139-1.odt went from 11 minutes to 33 minutes
(dbgutil) with twice as many more half-empty pages.
Worse is that the previous fix appears to prevent tdf#128437 from
working.
It should also be less risky to never calc content frames in
FormatLayout(), because with IsPaintLocked() check that used to be done
led to doing it only for pages which were visible when loading the
document, so any regressions with this new approach would appear on few
pages at the start of the document, instead of many pages at the end.
Note that without the previous commit, this would cause
* CppunitTest_sw_core_layout CPPUNIT_TEST_NAME="testTablePrintAreaLeft"
to fail
* tdf#137523 SwLayoutWriter3 testTdf137523 to fail,
*only* on the last text frame
This also appears to fix tdf#125749.
Change-Id: I3d72f8e9d2b89aa3738e554308fd9dce12e92238
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155988
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 28b48e7ec0c9..08020de73489 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -108,7 +108,7 @@ class SW_DLLPUBLIC SwTabFrame final: public SwLayoutFrame,
public SwFlowFrame
* created and constructed and inserted directly after this.
* Join() gets the Follow's content and destroys it.
*/
-bool Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep );
+bool Split(const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep,
bool & rIsFootnoteGrowth);
void Join();
void UpdateAttr_(
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 49d7573dd547..e7ee78a9ae6f 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1431,10 +1431,7 @@ bool SwLayAction::FormatLayout( OutputDevice
*pRenderContext, SwLayoutFrame *pLa
PopFormatLayout();
}
}
-else if (!pLay->IsColBodyFrame())
-{ // tdf#156724 unconditionally for frames in tables, so their
footnotes exist before trying to split
-pLow->OptCalc();
-}
+// else: don't calc content frames any more
if ( IsAgain() )
return false;
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 4acef7ffe5d1..e4be17237e58 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -646,7 +646,8 @@ inline void TableSplitRecalcLock( SwFlowFrame *pTab ) {
pTab->LockJoin(); }
inline void TableSplitRecalcUnlock( SwFlowFrame *pTab ) { pTab->UnlockJoin(); }
static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, SwRowFrame&
rFollowLine,
- SwTwips nRemainingSpaceForLastRow, SwTwips
nAlreadyFree )
+ SwTwips nRemainingSpaceForLastRow, SwTwips
nAlreadyFree,
+ bool & rIsFootnoteGrowth)
{
bool bRet = true;
@@ -655,6 +656,34 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine,
SwRowFrame& rFollowLine,
SwRectFnSet aRectFnSet(rTab.GetUpper());
SwTwips nCurLastLineHeight =
aRectFnSet.GetHeight(rLastLine.getFrameArea());
+SwTwips nFootnoteHeight(0);
+if (SwFootnoteBossFrame const*const pBoss = rTab.FindFootnoteBossFrame())
+{
+if (SwFootnoteContFrame const*const pCont = pBoss->FindFootnoteCont())
+{
+for (SwFootnoteFrame const* pFootnote =
static_cast(pCont->Lower());
+ pFootnote != nullptr;
+ pFootnote = static_cast(pFootnote->GetNext()))
+{
+SwContentFrame const*const pAnchor = pFootnote->GetRef();
+SwTabFrame const* pTab = pAnchor->FindTabFrame();
+if (pTab == )
+{
+while
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/source
include/vcl/window.hxx |2 +-
vcl/source/window/accessibility.cxx | 22 +++---
vcl/source/window/brdwin.cxx|9 +++--
vcl/source/window/window.cxx|2 +-
vcl/source/window/window2.cxx | 12
5 files changed, 20 insertions(+), 27 deletions(-)
New commits:
commit eb812cb94f20dd04fa4cf3ec89df8bb813811359
Author: Michael Weghorn
AuthorDate: Wed Aug 16 19:07:54 2023 +0200
Commit: Michael Weghorn
CommitDate: Fri Aug 18 06:04:44 2023 +0200
Rename Window::ImplIsAccessibleNativeFrame and make it public
The way to determine whether this window is a "native frame"
doesn't look particularly specific to a11y, so rename it
to just `Window::IsNativeFrame` and make it public in order
to reuse it in a follow-up commit.
Also move the implementation out of the source file that
implements accessibility-specific Window methods for
consistency.
Change-Id: I980f251cacce6a601e86fc6261a231b799b30317
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155798
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 2d64be451370..0f9c6f3f45b5 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -779,6 +779,7 @@ public:
boolIsDialog() const;
boolIsMenuFloatingWindow() const;
boolIsToolbarFloatingWindow() const;
+boolIsNativeFrame() const;
boolIsTopWindow() const;
SystemWindow* GetSystemWindow() const;
@@ -1187,7 +1188,6 @@ protected:
private:
SAL_DLLPRIVATE bool ImplIsAccessibleCandidate() const;
-SAL_DLLPRIVATE bool ImplIsAccessibleNativeFrame() const;
///@}
/*
diff --git a/vcl/source/window/accessibility.cxx
b/vcl/source/window/accessibility.cxx
index 0656720b6986..3c6103ac31d9 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -95,24 +95,12 @@ bool Window::ImplIsAccessibleCandidate() const
if( !mpWindowImpl->mbBorderWin )
return true;
-return ImplIsAccessibleNativeFrame();
-}
-
-bool Window::ImplIsAccessibleNativeFrame() const
-{
-if( mpWindowImpl->mbFrame )
-// #101741 do not check for WB_CLOSEABLE because undecorated floaters
(like menus!) are closeable
-if( mpWindowImpl->mnStyle & (WB_MOVEABLE | WB_SIZEABLE) )
-return true;
-else
-return false;
-else
-return false;
+return IsNativeFrame();
}
vcl::Window* Window::GetAccessibleParentWindow() const
{
-if (!mpWindowImpl || ImplIsAccessibleNativeFrame())
+if (!mpWindowImpl || IsNativeFrame())
return nullptr;
vcl::Window* pParent = mpWindowImpl->mpParent;
@@ -327,7 +315,7 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
case WindowType::BORDERWINDOW:
case WindowType::SYSTEMCHILDWINDOW:
default:
-if (ImplIsAccessibleNativeFrame() )
+if (IsNativeFrame() )
nRole = accessibility::AccessibleRole::FRAME;
else if( IsScrollable() )
nRole = accessibility::AccessibleRole::SCROLL_PANE;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f7920f793f43..869516b45902 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -157,7 +157,7 @@ void Window::dispose()
CallEventListeners( VclEventId::ObjectDying );
// do not send child events for frames that were registered as native
frames
-if( !ImplIsAccessibleNativeFrame() && mpWindowImpl->mbReallyVisible )
+if( !IsNativeFrame() && mpWindowImpl->mbReallyVisible )
if ( ImplIsAccessibleCandidate() && GetAccessibleParentWindow() )
GetAccessibleParentWindow()->CallEventListeners(
VclEventId::WindowChildDestroyed, this );
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 5e9ffd2ef529..c9720139585d 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1040,6 +1040,18 @@ bool Window::IsToolbarFloatingWindow() const
return mpWindowImpl && mpWindowImpl->mbToolbarFloatingWindow;
}
+bool Window::IsNativeFrame() const
+{
+if( mpWindowImpl->mbFrame )
+// #101741 do not check for WB_CLOSEABLE because undecorated floaters
(like menus!) are closeable
+if( mpWindowImpl->mnStyle & (WB_MOVEABLE | WB_SIZEABLE) )
+return true;
+else
+return false;
+else
+return false;
+}
+
void Window::EnableAllResize()
{
mpWindowImpl->mbAllResize = true;
commit 756febf9a889cc969c3c7812806ef999d0befb95
Author: Michael Weghorn
AuthorDate: Wed Aug 16 18:02:27 2023 +0200
Commit: Michael Weghorn
[Libreoffice-commits] core.git: 3 commits - canvas/source include/sfx2 include/vcl sfx2/inc sfx2/source vcl/source vcl/unx
canvas/source/cairo/cairo_canvas.hxx | 22 --
canvas/source/cairo/cairo_canvasbitmap.hxx | 22 --
canvas/source/cairo/cairo_canvascustomsprite.hxx | 22 --
canvas/source/cairo/cairo_spritecanvas.hxx | 22 --
canvas/source/opengl/ogl_spritecanvas.hxx| 22 --
canvas/source/vcl/canvas.hxx | 22 --
canvas/source/vcl/canvascustomsprite.hxx | 22 --
canvas/source/vcl/spritecanvas.hxx | 22 --
include/sfx2/sfxbasemodel.hxx| 21 +
include/sfx2/stbitem.hxx |3 +++
include/vcl/toolbox.hxx |1 +
sfx2/inc/templatedefaultview.hxx |2 ++
sfx2/source/control/templatedefaultview.cxx |5 +
sfx2/source/control/templatedlglocalview.cxx |2 +-
sfx2/source/doc/SfxDocumentMetaData.cxx |2 +-
sfx2/source/doc/docundomanager.cxx |4 ++--
sfx2/source/doc/templatedlg.cxx |2 +-
sfx2/source/doc/zoomitem.cxx |2 +-
sfx2/source/sidebar/SidebarToolBox.cxx |2 +-
sfx2/source/statbar/stbitem.cxx | 12
vcl/source/app/idle.cxx |2 +-
vcl/source/app/salvtables.cxx|8
vcl/source/control/PriorityMergedHBox.cxx| 10 +-
vcl/source/control/combobox.cxx |8
vcl/source/control/imp_listbox.cxx |2 +-
vcl/source/control/spinfld.cxx |2 +-
vcl/source/edit/vclmedit.cxx |4 ++--
vcl/source/uitest/uiobject.cxx |6 +++---
vcl/source/window/menubarwindow.cxx |2 +-
vcl/source/window/toolbox.cxx|5 +
vcl/unx/gtk3/gtkinst.cxx |2 +-
31 files changed, 111 insertions(+), 174 deletions(-)
New commits:
commit c6f6349a679c4aeed906115f62edf7a66d200240
Author: Noel Grandin
AuthorDate: Sun Aug 13 12:06:33 2023 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 13 14:03:51 2023 +0200
Revert "clang-tidy bugprone-parent-virtual-call in vcl"
This reverts commit 69972719542cd686687ddd91f2b5284483513608.
There are some odd things gone in with some of these changes that I do
understand. Reverting until I have worked it out.
Change-Id: If5316654c16a697a2aff5eccdffaa5b2a6e0052d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155598
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index aa24a6d5c2c4..6cf448a30b1d 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -291,6 +291,7 @@ public:
virtual voidResizing( Size& rSize ) override;
virtual SizeGetOptimalSize() const override;
virtual voiddoDeferredInit(WinBits nBits) override;
+virtual voidqueue_resize(StateChangedType eReason =
StateChangedType::Layout) override;
/// Insert a command (like '.uno:Save').
virtual voidInsertItem( const OUString& rCommand,
diff --git a/vcl/source/app/idle.cxx b/vcl/source/app/idle.cxx
index 0aed942beb79..7e5756537164 100644
--- a/vcl/source/app/idle.cxx
+++ b/vcl/source/app/idle.cxx
@@ -33,7 +33,7 @@ Idle::Idle( const char *pDebugName )
void Idle::Start(const bool bStartTimer)
{
-Timer::Start(false);
+Task::Start(false);
sal_uInt64 nPeriod = Scheduler::ImmediateTimeoutMs;
if (Scheduler::GetDeterministicMode())
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 1ce6cf936316..80772536adeb 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6227,22 +6227,22 @@ void SalInstanceDrawingArea::queue_draw_area(int x, int
y, int width, int height
void SalInstanceDrawingArea::connect_size_allocate(const Link& rLink)
{
-SalInstanceWidget::connect_size_allocate(rLink);
+weld::Widget::connect_size_allocate(rLink);
}
void SalInstanceDrawingArea::connect_key_press(const Link& rLink)
{
-SalInstanceWidget::connect_key_press(rLink);
+weld::Widget::connect_key_press(rLink);
}
void SalInstanceDrawingArea::connect_key_release(const Link& rLink)
{
-SalInstanceWidget::connect_key_release(rLink);
+weld::Widget::connect_key_release(rLink);
}
void SalInstanceDrawingArea::connect_style_updated(const Link&
rLink)
{
-SalInstanceWidget::connect_style_updated(rLink);
+weld::Widget::connect_style_updated(rLink);
}
void SalInstanceDrawingArea::set_cursor(PointerStyle ePointerStyle)
diff --git a/vcl/source/control/PriorityMergedHBox.cxx
b/vcl/source/control/PriorityMergedHBox.cxx
index 5d5e6249ed16..fd5aa5814dac
[Libreoffice-commits] core.git: 3 commits - winaccessibility/source
winaccessibility/source/UAccCOM/AccTextBase.cxx | 16 -
winaccessibility/source/UAccCOM/MAccessible.cxx | 76 ++--
2 files changed, 48 insertions(+), 44 deletions(-)
New commits:
commit d1d07992a89ba503f1d457a8f79926063f4d3f9c
Author: Michael Weghorn
AuthorDate: Tue Aug 8 19:43:09 2023 +0100
Commit: Michael Weghorn
CommitDate: Wed Aug 9 06:14:52 2023 +0200
tdf#156679 wina11y: Convert screen to local coords as needed
When `AccTextBase::get_offsetAtPoint` gets called with
screen coordinates, convert them to local coordinates
within the text object first, because that is what
`XAccessibleText::getIndexAtPoint` expects.
Not doing so resulted in NVDA failing to create
a TextInfo object in the mouse event handler [1]
when hovering over a Calc cell containing text,
because the method would always return an offset
of -1.
With this change in place, NVDA now announces the
text when hovering over the text and mouse tracking
is enabled in NVDA (which is the case by default).
Other than with Microsoft Excel, the text is only
announced when the mouse is actually over the text,
not over free space in the cell, which might be
because Excel uses UIA and the UIA equivalent,
`ITextProvider::RangeFromPoint` [2] shall also return
the index of the closest character when the point
itself is not over the actual bounds of any
character.
[1]
https://github.com/nvaccess/nvda/blob/a198c9b5f27e47ff2830f77c833eec584078dfd8/source/NVDAObjects/__init__.py#L1209
[2]
https://learn.microsoft.com/en-us/windows/win32/api/uiautomationcore/nf-uiautomationcore-itextprovider-rangefrompoint
Change-Id: I1e4ab2dd3dace5fea1de2eef67a91fe3c31218a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155492
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx
b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index 183ec3467655..b70b13c0a980 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -417,7 +417,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTextBase::get_nSelections(long * nSelectio
* @param offset Variant to accept offset.
* @return Result.
*/
-COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTextBase::get_offsetAtPoint(long x, long
y, IA2CoordinateType, long * offset)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTextBase::get_offsetAtPoint(long x, long
y, IA2CoordinateType coordType, long * offset)
{
SolarMutexGuard g;
@@ -432,6 +432,20 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTextBase::get_offsetAtPoint(long x, long y
css::awt::Point point;
point.X = x;
point.Y = y;
+
+if (coordType == IA2_COORDTYPE_SCREEN_RELATIVE)
+{
+// convert from screen to local coordinates
+Reference xContext =
pUNOInterface->getAccessibleContext();
+Reference xComponent(xContext, UNO_QUERY);
+if (!xComponent.is())
+return S_FALSE;
+
+css::awt::Point aObjectPos = xComponent->getLocationOnScreen();
+point.X -= aObjectPos.X;
+point.Y -= aObjectPos.Y;
+}
+
*offset = GetXInterface()->getIndexAtPoint(point);
return S_OK;
commit 39302875c27d4cf4246bb7520ed90abcf0af777a
Author: Michael Weghorn
AuthorDate: Tue Aug 8 18:27:16 2023 +0100
Commit: Michael Weghorn
CommitDate: Wed Aug 9 06:14:44 2023 +0200
tdf#156679 wina11y: Implement accHitTest via UNO equivalent
Instead of manually iterating over the children
and checking whether the given position is in the location
that they're in in `CMAccessible::accHitTest`, use
`XAccessibleComponent::XAccessibleComponent`, which
provides exactly the functionality that's needed.
(This is similar to what the Qt-based VCL plugins
on Linux do, s. `QtAccessibleWidget::childAt`.)
This also drops the need to limit this to objects
that have at most a certain amount of children
for performance reasons (previously 256) and thus
makes this work e.g. also to identify a Calc cell
that the mouse pointer is currently over while previously
the document was returned, as could be seen also in
NVDA's Python console:
1) start NVDA
2) hover over a Calc cell
3) press NVDA+Ctrl+Z to capture snapshot variables
4) check what NVDA identifies as the mouse object
via the Python Console:
Before:
>>> mouse
>>> mouse.name
'Untitled 1 - LibreOfficeDev Spreadsheets'
>>> mouse.role
With this change in place:
>>> mouse
>>> mouse.name
>>> mouse.role
The cell's text still isn't announced by NVDA even
with mouse tracking enabled, but that's another issue.
Change-Id: Ib821020cef6303ab786c4c3fc3ccd917398214f1
Reviewed-on:
[Libreoffice-commits] core.git: 3 commits - winaccessibility/inc winaccessibility/source
winaccessibility/inc/AccObjectManagerAgent.hxx|2
winaccessibility/inc/AccObjectWinManager.hxx |2
winaccessibility/source/service/AccComponentEventListener.cxx | 30
+++---
winaccessibility/source/service/AccContainerEventListener.cxx | 44
+-
winaccessibility/source/service/AccDescendantManagerEventListener.cxx | 12 +-
winaccessibility/source/service/AccEventListener.cxx | 16
+--
winaccessibility/source/service/AccFrameEventListener.cxx |2
winaccessibility/source/service/AccListEventListener.cxx |4
winaccessibility/source/service/AccMenuEventListener.cxx |2
winaccessibility/source/service/AccObjectManagerAgent.cxx |5 -
winaccessibility/source/service/AccObjectWinManager.cxx |7 -
winaccessibility/source/service/AccParagraphEventListener.cxx |4
winaccessibility/source/service/AccTableEventListener.cxx | 16
+--
winaccessibility/source/service/AccTopWindowListener.cxx |6 -
winaccessibility/source/service/AccTreeEventListener.cxx |2
15 files changed, 77 insertions(+), 77 deletions(-)
New commits:
commit 0724cb04e7f20ad01fa544a0d75ae58ab0e9cd8a
Author: Michael Weghorn
AuthorDate: Mon Aug 7 12:07:54 2023 +0100
Commit: Michael Weghorn
CommitDate: Tue Aug 8 08:18:13 2023 +0200
wina11y: Align param order with other methods
Switch the param order in `AccObjectManagerAgent::NotifyAccEvent`
to be consistent with all of its other methods that take the
`XAccessible*` first, and also with
`AccObjectWinManager::NotifyAccEvent` that is called by the
method.
This is also in preparation of dropping
AccObjectManagerAgent altogether.
Change-Id: I83d331176971cc728524266d87939f33acd375f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155438
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx
b/winaccessibility/inc/AccObjectManagerAgent.hxx
index 064de74505a7..8ff8d407dbe8 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -57,7 +57,7 @@ public:
virtual void DeleteAccObj( css::accessibility::XAccessible* pXAcc );
virtual IMAccessible* GetIMAccByXAcc(css::accessibility::XAccessible*
pXAcc);
-bool NotifyAccEvent(UnoMSAAEvent eEvent, css::accessibility::XAccessible*
pXAcc);
+bool NotifyAccEvent(css::accessibility::XAccessible* pXAcc, UnoMSAAEvent
eEvent);
bool InsertChildrenAccObj(css::accessibility::XAccessible* pXAcc,
HWND hWnd = nullptr);
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx
b/winaccessibility/source/service/AccComponentEventListener.cxx
index 060fb201136c..a4ab118f54e6 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -93,7 +93,7 @@ void AccComponentEventListener::notifyEvent( const
css::accessibility::Accessib
void AccComponentEventListener::HandleValueChangedEvent(Any, Any)
{
pAgent->UpdateValue(m_xAccessible.get());
-pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE,
m_xAccessible.get());
+pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_VALUECHANGE);
}
/**
@@ -102,7 +102,7 @@ void
AccComponentEventListener::HandleValueChangedEvent(Any, Any)
void AccComponentEventListener::HandleActionChangedEvent()
{
pAgent->UpdateAction(m_xAccessible.get());
-pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_DEFACTIONCHANGE,
m_xAccessible.get());
+pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_DEFACTIONCHANGE);
}
/**
@@ -114,7 +114,7 @@ void AccComponentEventListener::HandleActionChangedEvent()
void AccComponentEventListener::HandleTextChangedEvent(Any, Any newValue)
{
pAgent->UpdateValue(m_xAccessible.get(), newValue);
-pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE,
m_xAccessible.get());
+pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_VALUECHANGE);
}
/**
@@ -125,7 +125,7 @@ void AccComponentEventListener::HandleTextChangedEvent(Any,
Any newValue)
*/
void AccComponentEventListener::HandleCaretChangedEvent(Any, Any)
{
-pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_CARETCHANGE,
m_xAccessible.get());
+pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_CARETCHANGE);
}
/**
@@ -219,25 +219,25 @@ void
AccComponentEventListener::FireStatePropertyChange(sal_Int64 state, bool se
if (!pAgent->IsSpecialToolbarItem(m_xAccessible.get()))
{
-pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_CHECKED,
m_xAccessible.get());
+pAgent->NotifyAccEvent(m_xAccessible.get(),
[Libreoffice-commits] core.git: 3 commits - winaccessibility/inc winaccessibility/source
winaccessibility/inc/AccObjectManagerAgent.hxx|2
winaccessibility/inc/AccObjectWinManager.hxx |1
winaccessibility/source/service/AccDescendantManagerEventListener.cxx |3
winaccessibility/source/service/AccObjectManagerAgent.cxx | 146
+++---
winaccessibility/source/service/AccObjectWinManager.cxx |9
5 files changed, 65 insertions(+), 96 deletions(-)
New commits:
commit e5aab6900f86042e4360bb792bc47690d09eaed7
Author: Michael Weghorn
AuthorDate: Mon Aug 7 09:17:45 2023 +0100
Commit: Michael Weghorn
CommitDate: Tue Aug 8 08:17:52 2023 +0200
wina11y: Move GetIAccessibleFromXAccessible logic
Move the logic from AccObjectManagerAgent::GetIAccessibleFromXAccessible
to the new AccObjectWinManager::GetIAccessibleFromXAccessible and just
forward to that one.
This is in preparation of dropping the AccObjectManagerAgent
indirection altogether.
Change-Id: Ic276a04cf7dda3762cee0d3932962e2a0947cfde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155435
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx
b/winaccessibility/inc/AccObjectWinManager.hxx
index 86a75c80fad7..55640fd8c6cb 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -123,6 +123,7 @@ public:
static bool IsContainer( css::accessibility::XAccessible* pAccessible );
IMAccessible* GetIMAccByXAcc( css::accessibility::XAccessible* pXAcc );
+bool GetIAccessibleFromXAccessible(css::accessibility::XAccessible* pXAcc,
IAccessible** ppIA);
IMAccessible* GetIAccessibleFromResID(long resID);
void NotifyDestroy( css::accessibility::XAccessible* pXAcc );
diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx
b/winaccessibility/source/service/AccObjectManagerAgent.cxx
index 073a5da7f748..eb242c243183 100644
--- a/winaccessibility/source/service/AccObjectManagerAgent.cxx
+++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx
@@ -258,10 +258,7 @@ bool AccObjectManagerAgent::GetIAccessibleFromXAccessible(
XAccessible* pXAcc, IAccessible** ppXI)
{
assert(pWinManager);
-*ppXI = pWinManager->GetIMAccByXAcc(pXAcc);
-if(*ppXI)
-return true;
-return false;
+return pWinManager->GetIAccessibleFromXAccessible(pXAcc, ppXI);
}
XAccessible* AccObjectManagerAgent::GetParentXAccessible( XAccessible* pXAcc )
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx
b/winaccessibility/source/service/AccObjectWinManager.cxx
index c8e5c7ac936b..dfc74f7bd4ef 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -1023,6 +1023,15 @@ IMAccessible*
AccObjectWinManager::GetIMAccByXAcc(XAccessible* pXAcc)
}
}
+bool
AccObjectWinManager::GetIAccessibleFromXAccessible(css::accessibility::XAccessible*
pXAcc,
+IAccessible** ppIA)
+{
+*ppIA = GetIMAccByXAcc(pXAcc);
+if (*ppIA)
+return true;
+return false;
+}
+
/**
* Query and get IAccessible interface by child id from list.
* @param resID, childID.
commit 532078a68b7e491845262524ba5e8338cd42f303
Author: Michael Weghorn
AuthorDate: Mon Aug 7 09:04:32 2023 +0100
Commit: Michael Weghorn
CommitDate: Tue Aug 8 08:17:44 2023 +0200
wina11y: Replace nullptr check with assert
`AccObjectManagerAgent::pWinManager` gets set
in the ctor and is never reset explicitly, so
I don't see any way it can ever be null before
the `AccObjectManagerAgent` object itself gets
destroyed.
Change-Id: I027ca0d15cbc7ca8e183b71b0dbee7ce1acc925d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155434
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx
b/winaccessibility/source/service/AccObjectManagerAgent.cxx
index f5fbecb0eb98..073a5da7f748 100644
--- a/winaccessibility/source/service/AccObjectManagerAgent.cxx
+++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx
@@ -46,8 +46,8 @@ AccObjectManagerAgent::~AccObjectManagerAgent()
*/
void AccObjectManagerAgent::UpdateAccName( XAccessible* pXAcc )
{
-if( pWinManager )
-pWinManager->UpdateAccName( pXAcc );
+assert(pWinManager);
+pWinManager->UpdateAccName( pXAcc );
}
/**
@@ -57,8 +57,8 @@ void AccObjectManagerAgent::UpdateAccName( XAccessible*
pXAcc )
*/
void AccObjectManagerAgent::UpdateAction( XAccessible* pXAcc )
{
-if( pWinManager )
-pWinManager->UpdateAction( pXAcc );
+assert(pWinManager);
+pWinManager->UpdateAction( pXAcc );
}
/**
@@ -69,8 +69,8 @@ void AccObjectManagerAgent::UpdateAction( XAccessible* pXAcc
)
*/
void
[Libreoffice-commits] core.git: 3 commits - vcl/inc vcl/Library_vcl.mk vcl/source vcl/unx
vcl/Library_vcl.mk |6
vcl/inc/fontsubset.hxx |5
vcl/inc/jobdata.hxx|2
vcl/inc/sft.hxx| 47
vcl/inc/unx/printergfx.hxx | 346 --
vcl/inc/unx/printerjob.hxx | 129 --
vcl/source/fontsubset/fontsubset.cxx | 63 -
vcl/source/fontsubset/sft.cxx | 710
vcl/unx/generic/print/bitmap_gfx.cxx | 674
vcl/unx/generic/print/common_gfx.cxx | 1152 -
vcl/unx/generic/print/glyphset.cxx | 297 -
vcl/unx/generic/print/glyphset.hxx | 81 -
vcl/unx/generic/print/printerjob.cxx | 969 -
vcl/unx/generic/print/psputil.cxx | 184 ---
vcl/unx/generic/print/psputil.hxx | 55 -
vcl/unx/generic/print/text_gfx.cxx | 158 --
vcl/unx/generic/printer/configuration/psprint.conf |5
vcl/unx/generic/printer/jobdata.cxx| 12
vcl/unx/generic/printer/printerinfomanager.cxx |8
19 files changed, 2 insertions(+), 4901 deletions(-)
New commits:
commit 3a01df55db376ecbed0d89ebb4dd9d2d2f4b520f
Author: Khaled Hosny
AuthorDate: Sun Jul 30 14:23:58 2023 +
Commit: خالد حسني
CommitDate: Sun Jul 30 20:45:12 2023 +0200
Drop freshly unused font subsetting code
These output font formats were for PostScript that is now gone.
Change-Id: Ib29f921fe25432aaa558ba842ee77fe1e8023d47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155069
Reviewed-by: خالد حسني
Tested-by: خالد حسني
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index a1ba31aa58d8..1b218ed2e389 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -38,8 +38,6 @@ enum class FontType {
TYPE1_PFA = 1<<3, ///< PSType1 Postscript Font Ascii
TYPE1_PFB = 1<<4, ///< PSType1 Postscript Font Binary
CFF_FONT= 1<<5, ///< CFF-container with PSType2
glyphs
-TYPE3_FONT = 1<<6, ///< PSType3 Postscript font
-TYPE42_FONT = 1<<7, ///< PSType42 wrapper for an
SFNT_TTF
ANY_SFNT= SFNT_TTF | SFNT_CFF,
ANY_TYPE1 = TYPE1_PFA | TYPE1_PFB
};
@@ -55,7 +53,6 @@ public:
voidLoadFont( FontType eInFontType,
const unsigned char* pFontBytes, int nByteLength );
-voidLoadFont( vcl::TrueTypeFont* pSftTrueTypeFont );
boolCreateFontSubset( FontType nOutFontTypeMask,
SvStream* pOutFile, const char* pOutFontName,
@@ -77,7 +74,6 @@ private:
unsigned const char*mpInFontBytes;
int mnInByteLength;
FontTypemeInFontType; ///< allowed mask of input
font-types
-vcl::TrueTypeFont* mpSftTTFont;
// subset-request details
FontTypemnReqFontTypeMask; ///< allowed subset-target
font types
@@ -88,7 +84,6 @@ private:
int mnReqGlyphCount;
boolCreateFontSubsetFromCff();
-boolCreateFontSubsetFromSfnt();
};
int VCL_DLLPUBLIC TestFontSubset(const void* data, sal_uInt32 size);
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index b5fc71b44530..339914e4fb73 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -61,7 +61,7 @@ namespace vcl
typedef sal_Int32 F16Dot16; /**< fixed: 16.16 */
/*@}*/
-/** Return value of OpenTTFont() and CreateT3FromTTGlyphs() */
+/** Return value of OpenTTFont() */
enum class SFErrCodes {
Ok, /**< no error
*/
BadFile, /**< file not found
*/
@@ -565,25 +565,6 @@ class TrueTypeFont;
void GetTTNameRecords(AbstractTrueTypeFont const *ttf,
std::vector& nr);
-/**
- * Generates a new PostScript Type 3 font and dumps it to outf file.
- * This function substitutes glyph 0 for all glyphIDs that are not found in
the font.
- * @param ttf pointer to the TrueTypeFont structure
- * @param outfthe resulting font is written to this stream
- * @param fname font name for the new font. If it is NULL the PostScript
name of the
- *original font will be used
- * @param glyphArray pointer to an array of glyphs that are to be extracted
from ttf
- * @param encodingarray of encoding values. encoding[i] specifies the
position of the glyph
- *glyphArray[i] in the encoding vector of the resulting
Type3 font
- * @param nGlyphs number of glyph IDs in glyphArray and encoding values in
encoding
- * @param wmode writing mode for the output file: 0 - horizontal, 1 -
vertical
- * @return
[Libreoffice-commits] core.git: 3 commits - vcl/headless vcl/inc vcl/Library_vcl.mk vcl/unx
vcl/Library_vcl.mk |1
vcl/headless/svpprn.cxx|1
vcl/inc/salprn.hxx |2
vcl/inc/unx/GenPspGfxBackend.hxx | 126
vcl/inc/unx/genprn.h |3
vcl/inc/unx/genpspgraphics.h | 16 -
vcl/unx/generic/app/sm.cxx |1
vcl/unx/generic/print/GenPspGfxBackend.cxx | 410 -
vcl/unx/generic/print/genprnpsp.cxx|4
vcl/unx/generic/print/genpspgraphics.cxx | 120
vcl/unx/gtk3/gtkinst.cxx |1
11 files changed, 28 insertions(+), 657 deletions(-)
New commits:
commit 4998de76ed1da4039e30718941d50d6f1dfe4f82
Author: Khaled Hosny
AuthorDate: Sun Jul 30 07:40:48 2023 +
Commit: خالد حسني
CommitDate: Sun Jul 30 20:44:50 2023 +0200
tdf#156230: Drop freshly unused GenPspGfxBackend
Change-Id: Idfc4364b99ed605462aae58391e98960be6021b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155064
Tested-by: Jenkins
Reviewed-by: خالد حسني
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 1c18f470cfeb..6293e292b25e 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -564,7 +564,6 @@ vcl_headless_freetype_code=\
vcl/unx/generic/print/glyphset \
vcl/unx/generic/print/printerjob \
vcl/unx/generic/print/psputil \
-vcl/unx/generic/print/GenPspGfxBackend \
vcl/unx/generic/print/genpspgraphics \
vcl/unx/generic/print/genprnpsp \
vcl/unx/generic/print/prtsetup \
diff --git a/vcl/inc/unx/GenPspGfxBackend.hxx b/vcl/inc/unx/GenPspGfxBackend.hxx
deleted file mode 100644
index 31d85290361c..
--- a/vcl/inc/unx/GenPspGfxBackend.hxx
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- */
-
-#pragma once
-
-#include
-
-namespace psp
-{
-class PrinterGfx;
-}
-
-class GenPspGfxBackend final : public SalGraphicsImpl
-{
-private:
-psp::PrinterGfx* m_pPrinterGfx;
-
-public:
-GenPspGfxBackend(psp::PrinterGfx* pPrinterGfx);
-~GenPspGfxBackend() override;
-
-void Init() override;
-void freeResources() override;
-OUString getRenderBackendName() const override { return "genpsp"; }
-
-void setClipRegion(vcl::Region const& rRegion) override;
-void ResetClipRegion() override;
-
-sal_uInt16 GetBitCount() const override;
-
-tools::Long GetGraphicsWidth() const override;
-
-void SetLineColor() override;
-void SetLineColor(Color nColor) override;
-void SetFillColor() override;
-void SetFillColor(Color nColor) override;
-void SetXORMode(bool bSet, bool bInvertOnly) override;
-void SetROPLineColor(SalROPColor nROPColor) override;
-void SetROPFillColor(SalROPColor nROPColor) override;
-
-void drawPixel(tools::Long nX, tools::Long nY) override;
-void drawPixel(tools::Long nX, tools::Long nY, Color nColor) override;
-
-void drawLine(tools::Long nX1, tools::Long nY1, tools::Long nX2,
tools::Long nY2) override;
-void drawRect(tools::Long nX, tools::Long nY, tools::Long nWidth,
tools::Long nHeight) override;
-void drawPolyLine(sal_uInt32 nPoints, const Point* pPointArray) override;
-void drawPolygon(sal_uInt32 nPoints, const Point* pPointArray) override;
-void drawPolyPolygon(sal_uInt32 nPoly, const sal_uInt32* pPoints,
- const Point** pPointArray) override;
-
-bool drawPolyPolygon(const basegfx::B2DHomMatrix& rObjectToDevice,
- const basegfx::B2DPolyPolygon&, double fTransparency)
override;
-
-bool drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDevice, const
basegfx::B2DPolygon&,
- double fTransparency, double fLineWidth, const
std::vector* pStroke,
- basegfx::B2DLineJoin, css::drawing::LineCap, double
fMiterMinimumAngle,
- bool bPixelSnapHairline) override;
-
-bool drawPolyLineBezier(sal_uInt32 nPoints, const Point* pPointArray,
-const PolyFlags* pFlagArray) override;
-
-bool drawPolygonBezier(sal_uInt32 nPoints, const Point* pPointArray,
- const PolyFlags* pFlagArray) override;
-
-bool drawPolyPolygonBezier(sal_uInt32 nPoly, const sal_uInt32* pPoints,
- const Point* const* pPointArray,
- const PolyFlags* const* pFlagArray) override;
-
-void copyArea(tools::Long nDestX, tools::Long nDestY, tools::Long nSrcX,
tools::Long nSrcY,
- tools::Long nSrcWidth, tools::Long nSrcHeight, bool
bWindowInvalidate) override;
-
-void copyBits(const SalTwoRect&
[Libreoffice-commits] core.git: 3 commits - bin/find-can-be-private-symbols.functions.results include/vcl officecfg/registry svtools/source vcl/inc vcl/source vcl/unx
bin/find-can-be-private-symbols.functions.results |2
include/vcl/printer/Options.hxx|4
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 12
svtools/source/config/printoptions.cxx |6
vcl/inc/jobdata.hxx|4
vcl/inc/unx/genprn.h |3
vcl/source/printer/Options.cxx |2
vcl/unx/generic/print/genprnpsp.cxx| 222 -
vcl/unx/generic/printer/cpdmgr.cxx |3
vcl/unx/generic/printer/cupsmgr.cxx|9
vcl/unx/generic/printer/jobdata.cxx| 55 ---
vcl/unx/generic/printer/printerinfomanager.cxx | 11
12 files changed, 24 insertions(+), 309 deletions(-)
New commits:
commit 4a0c8c722289f9a94e87cbc90eca17e1b865be64
Author: Khaled Hosny
AuthorDate: Wed Jul 26 15:13:56 2023 +
Commit: خالد حسني
CommitDate: Sun Jul 30 20:44:29 2023 +0200
tdf#156230: Drop freshly dead PspSalPrinter code
Change-Id: I272c8f3a4d70ef9d5d03eecc8c91ee8423c52ccc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154976
Tested-by: Jenkins
Reviewed-by: خالد حسني
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index 0c92446d5286..67bf42bf9547 100644
--- a/vcl/inc/unx/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -22,7 +22,6 @@
#include
#include
-#include
#include
class GenPspGraphics;
@@ -59,8 +58,6 @@ public:
OUString m_aFileName;
OUString m_aTmpFile;
SalInfoPrinter* m_pInfoPrinter;
-std::unique_ptr m_xGraphics;
-psp::PrinterJob m_aPrintJob;
psp::JobDatam_aJobData;
psp::PrinterGfx m_aPrinterGfx;
sal_uInt32 m_nCopies;
diff --git a/vcl/unx/generic/print/genprnpsp.cxx
b/vcl/unx/generic/print/genprnpsp.cxx
index 84de26e1f9cc..560f0f4ec62f 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -243,93 +243,6 @@ static void copyJobDataToJobSetup( ImplJobSetup*
pJobSetup, JobData& rData )
pJobSetup->SetPapersizeFromSetup( rData.m_bPapersizeFromSetup );
}
-// Needs a cleaner abstraction ...
-static bool passFileToCommandLine( const OUString& rFilename, const OUString&
rCommandLine )
-{
-bool bSuccess = false;
-
-rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-OString aCmdLine(OUStringToOString(rCommandLine, aEncoding));
-OString aFilename(OUStringToOString(rFilename, aEncoding));
-
-bool bPipe = aCmdLine.indexOf( "(TMP)" ) == -1;
-
-// setup command line for exec
-if( ! bPipe )
-aCmdLine = aCmdLine.replaceAll("(TMP)", aFilename);
-
-#if OSL_DEBUG_LEVEL > 1
-SAL_INFO("vcl.unx.print", (bPipe ? "piping to" : "executing")
-<< " commandline: \"" << aCmdLine << "\".");
-struct stat aStat;
-SAL_WARN_IF(stat( aFilename.getStr(), ),
-"vcl.unx.print", "stat( " << aFilename << " ) failed.");
-SAL_INFO("vcl.unx.print", "Tmp file " << aFilename
-<< " has modes: "
-<< std::showbase << std::oct
-<< (long)aStat.st_mode);
-#endif
-const char* argv[4];
-if( ! ( argv[ 0 ] = getenv( "SHELL" ) ) )
-argv[ 0 ] = "/bin/sh";
-argv[ 1 ] = "-c";
-argv[ 2 ] = aCmdLine.getStr();
-argv[ 3 ] = nullptr;
-
-bool bHavePipes = false;
-int pid, fd[2];
-
-if( bPipe )
-bHavePipes = pipe( fd ) == 0;
-if( ( pid = fork() ) > 0 )
-{
-if( bPipe && bHavePipes )
-{
-close( fd[0] );
-char aBuffer[ 2048 ];
-FILE* fp = fopen( aFilename.getStr(), "r" );
-while (fp && !feof(fp))
-{
-size_t nBytesRead = fread(aBuffer, 1, sizeof( aBuffer ), fp);
-if (nBytesRead )
-{
-size_t nBytesWritten = write(fd[1], aBuffer, nBytesRead);
-OSL_ENSURE(nBytesWritten == nBytesRead, "short write");
-if (nBytesWritten != nBytesRead)
-break;
-}
-}
-fclose( fp );
-close( fd[ 1 ] );
-}
-int status = 0;
-if(waitpid( pid, , 0 ) != -1)
-{
-if( ! status )
-bSuccess = true;
-}
-}
-else if( ! pid )
-{
-if( bPipe && bHavePipes )
-{
-close( fd[1] );
-if( fd[0] != STDIN_FILENO ) // not probable, but who knows :)
-dup2( fd[0], STDIN_FILENO );
-}
-execv( argv[0], const_cast(argv) );
-fprintf( stderr, "failed to execute \"%s\"\n", aCmdLine.getStr() );
-_exit( 1 );
-}
-else
-fprintf( stderr, "failed to fork\n" );
-
-// clean up the mess
-unlink( aFilename.getStr() );
[Libreoffice-commits] core.git: 3 commits - drawinglayer/source include/drawinglayer include/vcl sfx2/source vcl/inc vcl/source
drawinglayer/source/primitive2d/textlayoutdevice.cxx |4 +-
include/drawinglayer/primitive2d/textlayoutdevice.hxx |4 +-
include/vcl/outdev.hxx|4 --
sfx2/source/control/thumbnailviewitem.cxx |7 ++-
vcl/inc/textlayout.hxx|7 +++
vcl/source/gdi/textlayout.cxx | 12 --
vcl/source/outdev/map.cxx | 12 --
vcl/source/outdev/text.cxx| 34 +-
vcl/source/outdev/textline.cxx| 13 ++
9 files changed, 47 insertions(+), 50 deletions(-)
New commits:
commit ecf352701411fe178b51841b5714e27bef500206
Author: Khaled Hosny
AuthorDate: Wed Jul 19 08:19:06 2023 +0300
Commit: خالد حسني
CommitDate: Sun Jul 23 06:04:17 2023 +0200
vcl: Use GetTextArray() when drawing mnemonics
Instead of using a different function to get the character width, use
the same function used for getting the character widths elsewhere.
Change-Id: I21428f34bb0f3a60fa17f5e8ecc3420545356337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154609
Tested-by: Jenkins
Reviewed-by: خالد حسني
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index ea9fed02a20f..2b0356518285 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -294,7 +294,7 @@ void TextLayouterDevice::addTextRectActions(const
::tools::Rectangle& rRectangle
}
std::vector TextLayouterDevice::getTextArray(const OUString& rText,
sal_uInt32 nIndex,
- sal_uInt32 nLength) const
+ sal_uInt32 nLength, bool
bCaret) const
{
std::vector aRetval;
sal_uInt32 nTextLength(nLength);
@@ -308,7 +308,7 @@ std::vector TextLayouterDevice::getTextArray(const
OUString& rText, sal_
if (nTextLength)
{
KernArray aArray;
-mrDevice.GetTextArray(rText, , nIndex, nTextLength);
+mrDevice.GetTextArray(rText, , nIndex, nTextLength, bCaret);
aRetval.reserve(aArray.size());
for (size_t i = 0, nEnd = aArray.size(); i < nEnd; ++i)
aRetval.push_back(aArray[i]);
diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index 6348de0ddd25..dfb5ba6c5c37 100644
--- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -96,8 +96,8 @@ public:
void addTextRectActions(const tools::Rectangle& rRectangle, const
OUString& rText,
DrawTextFlags nStyle, GDIMetaFile& rGDIMetaFile)
const;
-::std::vector getTextArray(const OUString& rText, sal_uInt32
nIndex,
- sal_uInt32 nLength) const;
+::std::vector getTextArray(const OUString& rText, sal_uInt32
nIndex, sal_uInt32 nLength,
+ bool bCaret = false) const;
::std::vector getCaretPositions(const OUString& rText, sal_uInt32
nIndex,
sal_uInt32 nLength) const;
diff --git a/sfx2/source/control/thumbnailviewitem.cxx
b/sfx2/source/control/thumbnailviewitem.cxx
index b2c3ef75274b..ca8920acafd2 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -319,10 +319,11 @@ void ThumbnailViewItem::addTextPrimitives (const
OUString& rText, const Thumbnai
{
rSeq.resize(nFinalPrimCount + 1);
-auto aCaretPositions = aTextDev.getCaretPositions(aText,
nLineStart, nLineLength);
+auto aTextArray = aTextDev.getTextArray(aText, nLineStart,
nLineLength, true);
-auto lc_x1 = aCaretPositions[2*(nMnemonicPos - nLineStart)];
-auto lc_x2 = aCaretPositions[2*(nMnemonicPos - nLineStart)+1];
+auto nPos = nMnemonicPos - nLineStart;
+auto lc_x1 = nPos ? aTextArray[nPos - 1] : 0;
+auto lc_x2 = aTextArray[nPos];
auto fMnemonicWidth = std::abs(lc_x1 - lc_x2);
auto fMnemonicHeight = aTextDev.getUnderlineHeight();
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 43757d6421b3..311938acdb18 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -33,6 +33,7 @@ namespace vcl
virtual voidDrawText( const Point& _rStartPoint, const
OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength,
std::vector< tools::Rectangle >* _pVector,
OUString* _pDisplayText ) = 0;
virtual voidGetCaretPositions( const OUString& _rText,
sal_Int32* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const =
0;
+virtual tools::Long GetTextArray(
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/inc vcl/qa vcl/quartz vcl/skia vcl/source
include/vcl/outdev.hxx |2
include/vcl/vcllayout.hxx |6 +-
vcl/inc/ImplLayoutArgs.hxx |4 -
vcl/inc/font/FontMetricData.hxx |6 +-
vcl/inc/font/LogicalFontInstance.hxx|2
vcl/inc/impglyphitem.hxx| 33 ---
vcl/inc/quartz/salgdi.h |4 -
vcl/inc/sallayout.hxx | 16 +++
vcl/inc/skia/osx/gdiimpl.hxx|3 -
vcl/qa/cppunit/complextext.cxx |2
vcl/quartz/salgdi.cxx |6 +-
vcl/skia/osx/gdiimpl.cxx|4 -
vcl/source/font/LogicalFontInstance.cxx |2
vcl/source/gdi/CommonSalLayout.cxx | 16 +++
vcl/source/gdi/pdfwriter_impl.cxx |2
vcl/source/gdi/sallayout.cxx| 70 +++-
vcl/source/outdev/text.cxx | 64 +
vcl/source/text/ImplLayoutArgs.cxx |2
18 files changed, 109 insertions(+), 135 deletions(-)
New commits:
commit c46f8c356d812230c3a43cd08fb79674be88d9a8
Author: Khaled Hosny
AuthorDate: Mon Jul 17 12:16:58 2023 +0300
Commit: خالد حسني
CommitDate: Sun Jul 23 06:01:31 2023 +0200
vcl: Simplify AquaGraphics*::drawTextLayout() calling
Take TextRenderModeForResolutionIndependentLayout() from the SalLayout
argument instead of passing it separately.
Change-Id: I155ea645e401618ad884fdc36c4c1aeab69980ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154516
Tested-by: Jenkins
Reviewed-by: خالد حسني
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 01826c5c93e0..026f5e066382 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -292,7 +292,7 @@ public:
const tools::Rectangle ,
ControlState nState,
const ImplControlValue ) = 0;
-virtual void drawTextLayout(const GenericSalLayout& layout, bool
bTextRenderModeForResolutionIndependentLayout) = 0;
+virtual void drawTextLayout(const GenericSalLayout& layout) = 0;
virtual void Flush() {}
virtual void Flush( const tools::Rectangle& ) {}
virtual void WindowBackingPropertiesChanged() {};
@@ -445,7 +445,7 @@ public:
ControlState nState,
const ImplControlValue ) override;
-virtual void drawTextLayout(const GenericSalLayout& layout, bool
bTextRenderModeForResolutionIndependentLayout) override;
+virtual void drawTextLayout(const GenericSalLayout& layout) override;
bool supportsOperation(OutDevSupportType eType) const override;
};
diff --git a/vcl/inc/skia/osx/gdiimpl.hxx b/vcl/inc/skia/osx/gdiimpl.hxx
index b90b576a873f..b97245e86e11 100644
--- a/vcl/inc/skia/osx/gdiimpl.hxx
+++ b/vcl/inc/skia/osx/gdiimpl.hxx
@@ -38,8 +38,7 @@ public:
const tools::Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue) override;
-virtual void drawTextLayout(const GenericSalLayout& layout,
-bool
bTextRenderModeForResolutionIndependentLayout) override;
+virtual void drawTextLayout(const GenericSalLayout& layout) override;
virtual void Flush() override;
virtual void Flush(const tools::Rectangle&) override;
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 4af4b28ffa2c..b06e0d41bdbd 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -306,10 +306,10 @@ bool
AquaSalGraphics::AddTempDevFont(vcl::font::PhysicalFontCollection*,
void AquaSalGraphics::DrawTextLayout(const GenericSalLayout& rLayout)
{
-mpBackend->drawTextLayout(rLayout,
rLayout.GetTextRenderModeForResolutionIndependentLayout());
+mpBackend->drawTextLayout(rLayout);
}
-void AquaGraphicsBackend::drawTextLayout(const GenericSalLayout& rLayout, bool
bTextRenderModeForResolutionIndependentLayout)
+void AquaGraphicsBackend::drawTextLayout(const GenericSalLayout& rLayout)
{
#ifdef IOS
if (!mrShared.checkContext())
@@ -397,7 +397,7 @@ void AquaGraphicsBackend::drawTextLayout(const
GenericSalLayout& rLayout, bool b
CGContextSetTextDrawingMode(mrShared.maContextHolder.get(),
kCGTextFillStroke);
}
-if (bTextRenderModeForResolutionIndependentLayout)
+if (rLayout.GetTextRenderModeForResolutionIndependentLayout())
{
CGContextSetAllowsFontSubpixelQuantization(mrShared.maContextHolder.get(),
false);
CGContextSetShouldSubpixelQuantizeFonts(mrShared.maContextHolder.get(), false);
diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx
index fd0bdca04333..e392587c8836 100644
--- a/vcl/skia/osx/gdiimpl.cxx
+++ b/vcl/skia/osx/gdiimpl.cxx
@@ -294,9 +294,9 @@ bool AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType
nType, ControlPart n
return bOK;
}
[Libreoffice-commits] core.git: 3 commits - accessibility/source vcl/source
accessibility/source/extended/accessibletablistboxtable.cxx |7 ---
vcl/source/treelist/svtabbx.cxx |8
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 10129ea98f808c19990abe08aba2e62ed10ebf81
Author: Michael Weghorn
AuthorDate: Fri Jul 21 09:00:09 2023 +0200
Commit: Michael Weghorn
CommitDate: Fri Jul 21 15:03:08 2023 +0200
tdf#99609 a11y: Fix bound rect reporting for tab list box
As described in more detail for the case in
Change-Id I35f7280d2c386a9a8e04e636ebf34850a733c84a
("tdf#99609 a11y: Announce the correct entry in tab list box"),
this also needs to use `SvTabListBox::GetEntryOnPos` for the
correct entry to be used.
With this in place, Accerciser now highlights the correct entry
when clicking on the corresponding object in its treeview of
LO's a11y hierarchy.
Change-Id: I850247cd384a6a9bb909f51b39c4743548ec1105
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154689
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index cad1a46bbb58..d9b3e2eaecb9 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -773,7 +773,7 @@ tools::Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs(
sal_Int32 _nRow, sal_
{
DBG_ASSERT( !_bIsHeader || 0 == _nRow, "invalid parameters" );
tools::Rectangle aRect;
-SvTreeListEntry* pEntry = GetEntry( _nRow );
+SvTreeListEntry* pEntry = GetEntryOnPos(_nRow );
if ( pEntry )
{
aRect = _bIsHeader ? calcHeaderRect( true, false ) : GetBoundingRect(
pEntry );
commit 44de8e68c40be6c4bddeadd627d58251639487e2
Author: Michael Weghorn
AuthorDate: Fri Jul 21 08:34:20 2023 +0200
Commit: Michael Weghorn
CommitDate: Fri Jul 21 15:03:00 2023 +0200
tdf#99609 a11y: Fix reporting selection in tab list table
The previous calculation of row and column index
in `AccessibleTabListBoxTable::getSelectedAccessibleChild`
based on the selection index was wrong, so fix that.
Only increase the the loop variable `nRow` in
`AccessibleTabListBoxTable::implGetSelRow` at the end
of the loop, since the comparison still needs to use
the original value. (Index starts at 0. Trying to retrieve
the first selected child at index 0 would otherwise
fail, and always return the fallback value of row index 0,
making NVDA always announce the first row as selected instead
of the actually selected one.
The issue could also be observed with Accerciser and the qt6
VCL plugin. With the "org.openoffice.LDAP" row selected
in the dialog, and the table object selected in Accerciser's
treeview of the a11y hierarchy, the cells in the first
row ("org.openoffice.VCL") would always be returned when
querying the selection using the AT-SPI Selection interface:
In [1]: sel = acc.querySelection()
In [2]: sel.nSelectedChildren
Out[2]: 4
In [3]: sel.getSelectedChild(0).name
Out[3]: 'org.openoffice.VCL'
This works as expected now with this fix in place:
In [4]: sel = acc.querySelection()
In [5]: sel.nSelectedChildren
Out[5]: 4
In [6]: sel.getSelectedChild(0).name
Out[6]: 'org.openoffice.LDAP'
With this fix in place, NVDA now properly announces the
currently focused row in the Expert Configuration
dialog (i.e. both, the focused cell first, and then
the whole row as selection).
Change-Id: I394027695616b17f7290136d8ee10c06a0282e80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154688
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx
b/accessibility/source/extended/accessibletablistboxtable.cxx
index fd8c2bb045ed..a6997d37d5bf 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -237,10 +237,10 @@ namespace accessibility
SvTreeListEntry* pEntry = m_pTabListBox->FirstSelected();
while ( pEntry )
{
-++nRow;
if ( nRow == nSelRow )
return m_pTabListBox->GetEntryPos( pEntry );
pEntry = m_pTabListBox->NextSelected( pEntry );
+++nRow;
}
}
@@ -324,8 +324,9 @@ namespace accessibility
if ( nRows == 0 )
throw IndexOutOfBoundsException();
-sal_Int32 nRow = implGetSelRow( nSelectedChildIndex % nRows );
-sal_Int32 nColumn = nSelectedChildIndex / nRows;
+const sal_Int32 nColCount = implGetColumnCount();
+const sal_Int32 nRow = implGetSelRow(nSelectedChildIndex / nColCount);
+const sal_Int32 nColumn = nSelectedChildIndex % nColCount;
return
[Libreoffice-commits] core.git: 3 commits - sw/CppunitTest_sw_apitests.mk sw/qa
sw/CppunitTest_sw_apitests.mk |3
sw/qa/api/SwXFieldEnumeration.cxx | 109 ++
sw/qa/api/SwXFrames.cxx | 90 +
sw/qa/api/SwXNumberingRules.cxx | 134 ++
4 files changed, 336 insertions(+)
New commits:
commit 73367f09716f5709264885486a2bb03626d39884
Author: anfanite396
AuthorDate: Tue Jul 11 21:05:30 2023 +0530
Commit: Tomaž Vajngerl
CommitDate: Fri Jul 14 03:13:35 2023 +0200
Move SwXNumberingRules Java tests to C++
Change-Id: I3f5b1b6ce5ed475ef923f2c605c6ada7d29e0439
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154336
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/CppunitTest_sw_apitests.mk b/sw/CppunitTest_sw_apitests.mk
index e0af4cb0b29d..659b582b49c0 100644
--- a/sw/CppunitTest_sw_apitests.mk
+++ b/sw/CppunitTest_sw_apitests.mk
@@ -32,6 +32,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,sw_apitests, \
sw/qa/api/SwXFootnoteText \
sw/qa/api/SwXFootnotes \
sw/qa/api/SwXHeadFootText \
+sw/qa/api/SwXNumberingRules \
sw/qa/api/SwXStyleFamilies \
sw/qa/api/SwXTextFrame \
sw/qa/api/SwXTextField \
diff --git a/sw/qa/api/SwXNumberingRules.cxx b/sw/qa/api/SwXNumberingRules.cxx
new file mode 100644
index ..74febc1c027a
--- /dev/null
+++ b/sw/qa/api/SwXNumberingRules.cxx
@@ -0,0 +1,134 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+using namespace css;
+using namespace css::uno;
+
+namespace
+{
+/**
+ * Initial tests for SwXNumberingRules.
+ */
+class SwXNumberingRules final : public UnoApiTest,
+public apitest::XElementAccess,
+public apitest::XIndexAccess,
+public apitest::XPropertySet
+{
+public:
+SwXNumberingRules()
+: UnoApiTest("")
+, XElementAccess(cppu::UnoType>::get())
+, XIndexAccess(10)
+{
+}
+
+virtual void setUp() override
+{
+UnoApiTest::setUp();
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+mxComponent = loadFromDesktop("private:factory/swriter");
+CPPUNIT_ASSERT(mxComponent.is());
+}
+
+Reference init() override
+{
+Reference xTextDocument(mxComponent,
UNO_QUERY_THROW);
+
+Reference xIndexAccess;
+Reference xNumRules;
+
+Reference xText = xTextDocument->getText();
+Reference xCursor = xText->createTextCursor();
+
+try
+{
+xText->insertString(xCursor, "The quick brown fox jumps over the
lazy dog", false);
+xText->insertControlCharacter(xCursor,
text::ControlCharacter::PARAGRAPH_BREAK, false);
+}
+catch (lang::IllegalArgumentException&)
+{
+}
+
+Reference xStyleFam(xTextDocument,
UNO_QUERY_THROW);
+
+try
+{
+Reference xStyleFamNames =
xStyleFam->getStyleFamilies();
+Reference xNumStyles(
+xStyleFamNames->getByName("NumberingStyles"), UNO_QUERY_THROW);
+xIndexAccess = Reference(xNumStyles,
UNO_QUERY_THROW);
+}
+catch (lang::WrappedTargetException&)
+{
+}
+catch (container::NoSuchElementException&)
+{
+}
+catch (lang::IllegalArgumentException&)
+{
+}
+
+try
+{
+Reference
xPropSet(xIndexAccess->getByIndex(0), UNO_QUERY_THROW);
+xNumRules = Reference(
+xPropSet->getPropertyValue("NumberingRules"), UNO_QUERY_THROW);
+}
+catch (lang::WrappedTargetException&)
+{
+}
+catch (lang::IndexOutOfBoundsException&)
+{
+}
+catch (beans::UnknownPropertyException&)
+{
+}
+catch (lang::IllegalArgumentException&)
+{
+}
+
+return Reference(xNumRules, UNO_QUERY_THROW);
+}
+
+CPPUNIT_TEST_SUITE(SwXNumberingRules);
+CPPUNIT_TEST(testGetElementType);
+CPPUNIT_TEST(testHasElements);
+CPPUNIT_TEST(testGetCount);
+CPPUNIT_TEST(testGetByIndex);
+CPPUNIT_TEST(testGetPropertySetInfo);
+CPPUNIT_TEST(testSetPropertyValue);
+CPPUNIT_TEST(testGetPropertyValue);
+CPPUNIT_TEST(testPropertyChangeListener);
+CPPUNIT_TEST(testVetoableChangeListener);
+CPPUNIT_TEST_SUITE_END();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SwXNumberingRules);
+}
+
+/* vim:set shiftwidth=4
[Libreoffice-commits] core.git: 3 commits - sw/source vcl/source
sw/source/uibase/uiview/viewport.cxx | 51 +++
vcl/source/app/help.cxx | 21 ++
2 files changed, 43 insertions(+), 29 deletions(-)
New commits:
commit 1652fe3ece911af37b6d3a65d452cbcf86513c42
Author: Mike Kaganski
AuthorDate: Fri Jul 7 07:52:34 2023 +0300
Commit: Mike Kaganski
CommitDate: Fri Jul 7 09:32:10 2023 +0200
Some refactor to combine code deciding bNoDelay value
Change-Id: Ie04288c14801dfc8090ed8bd92a85e426a66d654
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154153
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 9f92a46b856c..8336a5b1c20f 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -529,10 +529,6 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16
nHelpWinStyle, QuickHe
if (rHelpText.isEmpty())
return;
-sal_uInt64 nCurTime = tools::Time::GetSystemTicks();
-if ( ( nCurTime - aHelpData.mnLastHelpHideTime ) <
o3tl::make_unsigned(HelpSettings::GetTipDelay()) )
-bNoDelay = true;
-
VclPtr pHelpWin = VclPtr::Create( pParent,
rHelpText, nHelpWinStyle, nStyle );
aHelpData.mpHelpWin = pHelpWin;
pHelpWin->SetHelpArea( rHelpArea );
@@ -542,8 +538,19 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16
nHelpWinStyle, QuickHe
pHelpWin->SetOutputSizePixel( aSz );
ImplSetHelpWindowPos( pHelpWin, nHelpWinStyle, nStyle, rScreenPos,
rHelpArea );
// if not called from Window::RequestHelp, then without delay...
-if ( !aHelpData.mbRequestingHelp )
-bNoDelay = true;
+if (!bNoDelay)
+{
+if ( !aHelpData.mbRequestingHelp )
+{
+bNoDelay = true;
+}
+else
+{
+sal_uInt64 nCurTime = tools::Time::GetSystemTicks();
+if ( ( nCurTime - aHelpData.mnLastHelpHideTime ) <
o3tl::make_unsigned(HelpSettings::GetTipDelay()) )
+bNoDelay = true;
+}
+}
pHelpWin->ShowHelp(bNoDelay);
}
commit a6b8c40d26c023cf8936017b92821f2b0df7ec58
Author: Mike Kaganski
AuthorDate: Fri Jul 7 07:42:13 2023 +0300
Commit: Mike Kaganski
CommitDate: Fri Jul 7 09:32:04 2023 +0200
Related: tdf#155462 Repaint changed tooltip text immediately
When moving scrollbar thumb, its tooltip is constantly updated. This
changes the window position and size, which appear immediately; but
the text wasn't repainted, until events with higher priorities were
processed, which gave visible discrepancies between the window size
and its contents. When tooltip window size decreased, the old text
could become cropped; or the window could become much larger.
Also, not updating the text broke the idea that the tooltip helps
user to see where they are in the document in real time.
Change-Id: Ibdc7cc15bd40896428004ef70bbe8c8c5a0858ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154152
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 2c6d020537e4..9f92a46b856c 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -363,6 +363,8 @@ void HelpTextWindow::SetHelpText( const OUString& rHelpText
)
Size aSize( CalcOutSize() );
SetOutputSizePixel( aSize );
+if (IsVisible())
+PaintImmediately();
}
void HelpTextWindow::ImplShow()
commit b4a0680d6cf059aef5b274e8ce5a0453cf376655
Author: Mike Kaganski
AuthorDate: Fri Jul 7 07:28:55 2023 +0300
Commit: Mike Kaganski
CommitDate: Fri Jul 7 09:31:57 2023 +0200
Related: tdf#155462 Avoid tooltip window hide before showing again
SwView::EndScrollHdl calls Help::ShowQuickHelp with empty text when
nPgNum is not 0, which hides and destroys the window immediately.
When moving the scrollbar thumb, tooltip should just move to the new
position (and update text), which happens in ImplShowHelpWindow, if
the window exist, and its parent is unchanged.
So avoid hiding/destroying the tooltip window before checking if it
should be updated, and only do that when necessary.
Additionally, I noticed that the guarding condition around the code
showing tooltip, 'if( !nPgNum || nPgNum != nPhNum )', was always
true, because SwView::EndScrollHdl called previously makes sure that
nPgNum is 0 unconditionally.
Change-Id: Id10dd6236379660ab0b1d6f14159cfd4f9c61256
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154151
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/source/uibase/uiview/viewport.cxx
b/sw/source/uibase/uiview/viewport.cxx
index e12c6adeda51..651a4abcf4c8 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -668,6 +668,8 @@ bool SwView::PageDownCursor(bool bSelect)
return false;
}
+static void
[Libreoffice-commits] core.git: 3 commits - cui/source include/svx svx/source
cui/source/options/optlingu.cxx | 10 +-
include/svx/langbox.hxx |4 ++--
svx/source/dialog/langbox.cxx | 31 +++
3 files changed, 26 insertions(+), 19 deletions(-)
New commits:
commit f831b1edd87d934d74fc931a3650e3737ccfe3a8
Author: Mike Kaganski
AuthorDate: Tue Jun 6 10:18:33 2023 +0300
Commit: Mike Kaganski
CommitDate: Tue Jun 6 11:54:16 2023 +0200
Drop the unneeded optimization for "[All]"
It will only be used *at most* once, but often will not be used at all.
Change-Id: I13b0e9ab8a4918c56a7e710c80d6d9d36019c605
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152644
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 1ab9c478d805..af09654bfc62 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -59,7 +59,6 @@ public:
private:
std::unique_ptr m_xControl;
Link m_aChangeHdl;
-OUString m_aAllString;
std::unique_ptr> m_xSpellUsedLang;
LanguageType m_eSavedLanguage;
EditedAndValid m_eEditedAndValid;
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 6ce694ca0cc5..fae7cf66e8d8 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -337,7 +337,7 @@ weld::ComboBoxEntry SvxLanguageBox::BuildEntry(const
LanguageType nLangType, sal
}
OUString aStrEntry = (LANGUAGE_NONE == nLang && m_bHasLangNone &&
m_bLangNoneIsLangAll)
- ? m_aAllString
+ ? SvxResId(RID_SVXSTR_LANGUAGE_ALL)
: SvtLanguageTable::GetLanguageString(nLang);
LanguageType nRealLang = nLang;
@@ -446,7 +446,6 @@ IMPL_LINK(SvxLanguageBox, ChangeHdl, weld::ComboBox&,
rControl, void)
SvxLanguageBox::SvxLanguageBox(std::unique_ptr pControl)
: m_xControl(std::move(pControl))
-, m_aAllString(SvxResId(RID_SVXSTR_LANGUAGE_ALL))
, m_eSavedLanguage(LANGUAGE_DONTKNOW)
, m_eEditedAndValid(EditedAndValid::No)
, m_bHasLangNone(false)
commit 1ae50dc4f816f37df50bfcb9d97c071fdf1e143f
Author: Mike Kaganski
AuthorDate: Mon Jun 5 17:36:32 2023 +0300
Commit: Mike Kaganski
CommitDate: Tue Jun 6 11:54:09 2023 +0200
Sort languages in Edit Modules dialog
After commit e855481ead996a3b8270fae91bd23d6c8d75ef25, these languages
are already ordered according to css::lang::Locale sorting implemented
there; but this ordering does not follow the UI language sorting rules.
TODO: put language without country/variant before respective languages
having country/variant.
Change-Id: Ic98b50ef4a500c799110611f7c35c74b4a239ed4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152641
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 6097f307038f..d13ca464bbe0 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1603,11 +1603,11 @@ SvxEditModulesDlg::SvxEditModulesDlg(weld::Window*
pParent, SvxLinguData_Impl& r
//fill language box
const auto& rLoc = rLinguData.GetAllSupportedLocales();
-for (Locale const & locale : rLoc)
-{
-LanguageType nLang = LanguageTag::convertToLanguageType( locale );
-m_xLanguageLB->InsertLanguage(nLang);
-}
+std::vector aLanguages;
+aLanguages.reserve(rLoc.size());
+std::transform(rLoc.begin(), rLoc.end(), std::back_inserter(aLanguages),
+ [](Locale const& locale) { return
LanguageTag::convertToLanguageType(locale); });
+m_xLanguageLB->InsertLanguages(aLanguages);
LanguageType eSysLang = MsLangId::getConfiguredSystemLanguage();
m_xLanguageLB->set_active_id( eSysLang );
if (m_xLanguageLB->get_active_id() != eSysLang)
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 08893e8e1ce4..1ab9c478d805 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -69,7 +69,7 @@ private:
SVX_DLLPRIVATE weld::ComboBoxEntry BuildEntry(const LanguageType
nLangType, sal_Int16 nType = css::i18n::ScriptType::WEAK);
SVX_DLLPRIVATE void AddLanguages(const std::vector< LanguageType >&
rLanguageTypes, SvxLanguageListFlags nLangList,
- std::vector&
rEntries);
+ std::vector&
rEntries, bool requireSublang);
DECL_DLLPRIVATE_LINK(ChangeHdl, weld::ComboBox&, void);
public:
@@ -80,6 +80,7 @@ public:
LanguageType eDefaultLangType = LANGUAGE_NONE,
sal_Int16 nDefaultType = 0 );
voidInsertLanguage(const LanguageType nLangType);
+void InsertLanguages(const std::vector& rLanguageTypes);
EditedAndValid GetEditedAndValid() const { return m_eEditedAndValid;}
SvxLanguageBox* SaveEditedAsEntry( SvxLanguageBox* ppBoxes[3] /*
[Libreoffice-commits] core.git: 3 commits - svx/uiconfig vcl/unx
svx/uiconfig/ui/colorwindow.ui | 89 -
vcl/unx/gtk3/gtkinst.cxx |4 +
2 files changed, 48 insertions(+), 45 deletions(-)
New commits:
commit 0fff72154d0dbb44e09546ff59f8a5ec288dfd2e
Author: Caolán McNamara
AuthorDate: Thu Jun 1 17:18:16 2023 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 1 20:16:22 2023 +0200
Resolves: tdf#155425 turn off overlay scrolling for color selector
the overlay width is too close to the column width to easily select
the colors in the column beside/underneath an overlay scrollbar
Change-Id: I096a6f2414eb69f10a79a4a0591f3a210c6784de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152507
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 27addb77194b..437f9e8719db 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -108,6 +108,7 @@
never
never
in
+False
True
commit 068f28aa67bf7a17b722b3342689c845dda533f7
Author: Caolán McNamara
AuthorDate: Thu Jun 1 17:17:12 2023 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 1 20:16:15 2023 +0200
Related: tdf#155425 use preferred_size instead of allocated_width
the scrollbar might not actually be visible so has no real
allocated width yet
Change-Id: Id15af9e481b9971bf79f16da16581f820f8303d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152506
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 03c89ba40f68..29c95858e87f 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -8420,7 +8420,9 @@ public:
{
if (gtk_scrolled_window_get_overlay_scrolling(m_pScrolledWindow))
return 0;
-return
gtk_widget_get_allocated_width(gtk_scrolled_window_get_vscrollbar(m_pScrolledWindow));
+GtkRequisition size;
+
gtk_widget_get_preferred_size(gtk_scrolled_window_get_vscrollbar(m_pScrolledWindow),
nullptr, );
+return size.width;
}
virtual void set_scroll_thickness(int nThickness) override
commit 1ae15fb6fdf7a1a537e51c4ed6973bb5d95a8ab0
Author: Caolán McNamara
AuthorDate: Thu Jun 1 17:04:36 2023 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 1 20:16:09 2023 +0200
resave with latest glade
Change-Id: If9a61d218ccee6bb82adf533dc1932cb2dd46ad0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152505
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 7f7cf5fa90c6..27addb77194b 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -1,51 +1,51 @@
-
+
True
-False
-cmd/sc_square_unfilled.png
+False
+cmd/sc_square_unfilled.png
True
-False
+False
6
-cmd/sc_colorsettings.png
+cmd/sc_colorsettings.png
True
-False
-cmd/sc_square_unfilled.png
+False
+cmd/sc_square_unfilled.png
-False
-True
-4
+False
+True
+4
none
True
-False
+False
vertical
True
-False
+False
6
True
True
-True
-True
-True
-True
+True
+True
+True
+True
auto_icon
none
-True
+True
0
-True
+True
False
@@ -56,15 +56,15 @@
None
-True
-True
-True
-True
+True
+True
+True
+True
none_icon
none
-True
+True
0
-True
+True
False
@@ -82,7 +82,7 @@
True
-False
+False
False
@@ -93,7 +93,7 @@
True
-False
+False
False
@@ -104,19 +104,19 @@
True
-True
-never
-never
-in
+True
+never
+never
+in
True
-False
+False
[Libreoffice-commits] core.git: 3 commits - include/rtl sal/rtl
include/rtl/strbuf.hxx | 75 --
include/rtl/ustrbuf.hxx | 103 ++--
sal/rtl/strtmpl.hxx | 12 -
3 files changed, 59 insertions(+), 131 deletions(-)
New commits:
commit 1db728a70cd2378bfd31c5ea76facd223175f823
Author: Mike Kaganski
AuthorDate: Fri May 5 20:54:37 2023 +0200
Commit: Mike Kaganski
CommitDate: Sat May 6 07:24:52 2023 +0200
Simplify a bit
No need to use different temporary objects here
Change-Id: I1b47cae8b80adea5426c780003bddf68310a0060
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151380
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx
index aa126faac1e8..ba182f87817e 100644
--- a/sal/rtl/strtmpl.hxx
+++ b/sal/rtl/strtmpl.hxx
@@ -724,16 +724,6 @@ template T toInt(S str, sal_Int16
nRadix)
/* === */
template using Char_T =
std::remove_extent_t;
-template struct STRINGDATA_;
-template <> struct STRINGDATA_
-{
-using T = rtl_String;
-};
-template <> struct STRINGDATA_
-{
-using T = rtl_uString;
-};
-template using STRINGDATA = typename STRINGDATA_::T;
template rtl_tString* Alloc(sal_Int32 nLen)
{
@@ -1756,7 +1746,7 @@ void doubleToString(rtl_tString** pResult, sal_Int32*
pResultCapacity, sal_Int32
template sal_Int32 SAL_CALL
valueOfFP(C* pStr, T f)
{
assert(pStr);
-STRINGDATA* pResult = nullptr;
+rtl_String* pResult = nullptr;
doubleToString(, nullptr, 0, f, rtl_math_StringFormat_G,
maxLen - std::size("-x.E-xxx") + 1, '.', nullptr, 0, true);
const sal_Int32 nLen = pResult->length;
commit e15e809e331e9fdb7a7ed46937f2ad5f83e27dc5
Author: Mike Kaganski
AuthorDate: Fri May 5 16:18:28 2023 +0200
Commit: Mike Kaganski
CommitDate: Sat May 6 07:24:47 2023 +0200
Simplify O(U)StringBuffer's append - delegate to insert
This limits the number of places that know how to deal
with a given type.
O(U)StringNumber doesn't need an own overload, because
it has operator basic_string_view.
Change-Id: I6e82dc2cef103b578153fbc3ce16e96247ea9d74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151379
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index cb842bb5839e..780923ebf67b 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -348,8 +348,7 @@ public:
template
OStringBuffer & operator =(OStringNumber && n)
{
-*this = OStringBuffer( std::move ( n ));
-return *this;
+return operator =(std::string_view(n));
}
#endif
@@ -543,7 +542,7 @@ public:
*/
OStringBuffer & append(const OString )
{
-return append( str.getStr(), str.getLength() );
+return insert(getLength(), str);
}
#endif
@@ -561,13 +560,13 @@ public:
template< typename T >
typename libreoffice_internal::CharPtrDetector< T, OStringBuffer& >::Type
append( const T& str )
{
-return append( str, rtl_str_getLength( str ) );
+return insert(getLength(), str);
}
template< typename T >
typename libreoffice_internal::NonConstCharArrayDetector< T,
OStringBuffer& >::Type append( T& str )
{
-return append( str, rtl_str_getLength( str ) );
+return insert(getLength(), str);
}
/**
@@ -578,12 +577,7 @@ public:
template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, OStringBuffer&
>::Type append( T& literal )
{
-RTL_STRING_CONST_FUNCTION
-assert(
-libreoffice_internal::ConstCharArrayDetector::isValid(literal));
-return append(
-
libreoffice_internal::ConstCharArrayDetector::toPointer(literal),
-libreoffice_internal::ConstCharArrayDetector::length);
+return insert(getLength(), literal);
}
/**
@@ -601,9 +595,7 @@ public:
*/
OStringBuffer & append( const char * str, sal_Int32 len)
{
-assert( len == 0 || str != NULL ); // cannot assert that in
rtl_stringbuffer_insert
-rtl_stringbuffer_insert( , , getLength(), str, len );
-return *this;
+return insert(getLength(), str, len);
}
#ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
@@ -615,33 +607,18 @@ public:
OStringBuffer& append( OStringConcat< T1, T2 >&& c )
{
sal_Int32 l = c.length();
-if( l == 0 )
-return *this;
-l += pData->length;
-rtl_stringbuffer_ensureCapacity( , , l );
-char* end = c.addData( pData->buffer + pData->length );
-*end = '\0';
-pData->length = l;
+if (l != 0)
+c.addData(appendUninitialized(l));
return *this;
}
-/**
- @overload
- @internal
-*/
-template< std::size_t N >
-
[Libreoffice-commits] core.git: 3 commits - sax/source sax/test scripting/source sot/source
sax/source/expatwrap/saxwriter.cxx |4 ++--
sax/test/sax/testsax.cxx|3 +--
scripting/source/dlgprov/dlgevtatt.cxx |2 +-
scripting/source/protocolhandler/scripthandler.cxx |4 ++--
scripting/source/provider/BrowseNodeFactoryImpl.cxx |2 +-
scripting/source/stringresource/stringresource.cxx |2 +-
sot/source/sdstor/ucbstorage.cxx|8
sot/source/unoolestorage/xolesimplestorage.cxx |2 +-
8 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit d4d994321464b1f0301c3cb86f55d851794d5f88
Author: Mike Kaganski
AuthorDate: Sun Apr 23 20:14:26 2023 +0300
Commit: Mike Kaganski
CommitDate: Sun Apr 30 20:35:10 2023 +0200
Use getXWeak in sax
Change-Id: I24d61be2a1e1c21c08e50790b2d7bbb794c4fb07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150862
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sax/source/expatwrap/saxwriter.cxx
b/sax/source/expatwrap/saxwriter.cxx
index 708efc573983..3b75255ee9ef 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -1035,8 +1035,8 @@ public: // XActiveDataSource
}
catch (const SAXException& e)
{
-throw css::lang::WrappedTargetRuntimeException(
-e.Message, static_cast(this),
e.WrappedException);
+throw css::lang::WrappedTargetRuntimeException(e.Message,
getXWeak(),
+ e.WrappedException);
}
}
virtual Reference SAL_CALL getOutputStream() override {
return m_out; }
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx
index 882a7a96dfa7..b6fa70a93875 100644
--- a/sax/test/sax/testsax.cxx
+++ b/sax/test/sax/testsax.cxx
@@ -83,8 +83,7 @@ private:
/// @note for external binding
Reference < XInterface > SAL_CALL OSaxParserTest_CreateInstance( const
Reference < XMultiServiceFactory > & rSMgr ) throw(Exception)
{
-OSaxParserTest *p = new OSaxParserTest( rSMgr );
-return Reference < XInterface > ( (static_cast< OWeakObject * >(p)) );
+return getXWeak(new OSaxParserTest( rSMgr ));
}
OUString OSaxParserTest_getServiceName( ) throw ()
commit d74c010192a3d9605364bfb942f18c9199a75804
Author: Mike Kaganski
AuthorDate: Sun Apr 23 20:14:32 2023 +0300
Commit: Mike Kaganski
CommitDate: Sun Apr 30 20:35:05 2023 +0200
Use getXWeak in scripting
Change-Id: I4370c0bfaa75b150bd05f03a5961e7152ac41e7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150864
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx
b/scripting/source/dlgprov/dlgevtatt.cxx
index 06a09fc62eda..d697628c4f01 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -377,7 +377,7 @@ namespace dlgprov
void DialogAllListenerImpl::firing_impl( const AllEventObject& Event, Any*
pRet )
{
ScriptEvent aScriptEvent;
-aScriptEvent.Source = static_cast(this); //
get correct XInterface
+aScriptEvent.Source = getXWeak(); // get correct XInterface
aScriptEvent.ListenerType = Event.ListenerType;
aScriptEvent.MethodName = Event.MethodName;
aScriptEvent.Arguments = Event.Arguments;
diff --git a/scripting/source/protocolhandler/scripthandler.cxx
b/scripting/source/protocolhandler/scripthandler.cxx
index 5aabb4654b0a..54ca264b32f6 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -149,7 +149,7 @@ void SAL_CALL
ScriptProtocolHandler::dispatchWithNotification(
if ( xListener.is() )
{
css::frame::DispatchResultEvent aEvent(
-static_cast< ::cppu::OWeakObject* >( this ),
+getXWeak(),
css::frame::DispatchResultState::FAILURE,
invokeResult );
try
@@ -265,7 +265,7 @@ void SAL_CALL
ScriptProtocolHandler::dispatchWithNotification(
// executed a macro instead!
css::frame::DispatchResultEvent aEvent;
-aEvent.Source = static_cast< ::cppu::OWeakObject* >( this );
+aEvent.Source = getXWeak();
aEvent.Result = invokeResult;
if ( bSuccess )
{
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 8af44a4570a2..3ea45aeecd7e 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -374,7 +374,7 @@ public:
before m_refCount is decremented again */
{
m_xAggProxy->setDelegator(
-static_cast< cppu::OWeakObject * >( this ) );
+
[Libreoffice-commits] core.git: 3 commits - vcl/inc vcl/jsdialog vcl/source
vcl/inc/jsdialog/jsdialogbuilder.hxx |1
vcl/inc/salvtables.hxx | 54
vcl/jsdialog/executor.cxx| 22 +
vcl/jsdialog/jsdialogbuilder.cxx | 12
vcl/source/app/salvtables.cxx| 438 +--
5 files changed, 304 insertions(+), 223 deletions(-)
New commits:
commit b9484dfdc2545a1c8eb954b260b5e122d1ede56c
Author: Szymon Kłos
AuthorDate: Thu Mar 9 14:17:23 2023 +0100
Commit: Szymon Kłos
CommitDate: Tue Mar 21 07:18:06 2023 +
Move SalInstanceScrolledWindow declaration to header file
Change-Id: I8848358cf04ad0298867903350476f1f3b38b7da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148608
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149160
Tested-by: Jenkins
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 1bbf37b4f7fb..3c421fc89c90 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -2108,4 +2108,58 @@ public:
virtual void set_image(const css::uno::Reference&
rImage) override;
};
+class SalInstanceScrolledWindow : public SalInstanceContainer, public virtual
weld::ScrolledWindow
+{
+private:
+VclPtr m_xScrolledWindow;
+Link m_aOrigVScrollHdl;
+Link m_aOrigHScrollHdl;
+bool m_bUserManagedScrolling;
+
+DECL_LINK(VscrollHdl, ScrollBar*, void);
+DECL_LINK(HscrollHdl, ScrollBar*, void);
+
+static void customize_scrollbars(ScrollBar& rScrollBar, const Color&
rButtonTextColor,
+ const Color& rBackgroundColor, const
Color& rShadowColor,
+ const Color& rFaceColor);
+
+public:
+SalInstanceScrolledWindow(VclScrolledWindow* pScrolledWindow,
SalInstanceBuilder* pBuilder,
+ bool bTakeOwnership, bool bUserManagedScrolling);
+
+virtual void hadjustment_configure(int value, int lower, int upper, int
step_increment,
+ int page_increment, int page_size)
override;
+virtual int hadjustment_get_value() const override;
+virtual void hadjustment_set_value(int value) override;
+virtual int hadjustment_get_upper() const override;
+virtual void hadjustment_set_upper(int upper) override;
+virtual int hadjustment_get_page_size() const override;
+virtual void hadjustment_set_page_size(int size) override;
+virtual void hadjustment_set_page_increment(int size) override;
+virtual void hadjustment_set_step_increment(int size) override;
+virtual void set_hpolicy(VclPolicyType eHPolicy) override;
+virtual VclPolicyType get_hpolicy() const override;
+
+virtual void vadjustment_configure(int value, int lower, int upper, int
step_increment,
+ int page_increment, int page_size)
override;
+virtual int vadjustment_get_value() const override;
+virtual void vadjustment_set_value(int value) override;
+virtual int vadjustment_get_upper() const override;
+virtual void vadjustment_set_upper(int upper) override;
+virtual int vadjustment_get_lower() const override;
+virtual void vadjustment_set_lower(int lower) override;
+virtual int vadjustment_get_page_size() const override;
+virtual void vadjustment_set_page_size(int size) override;
+virtual void vadjustment_set_page_increment(int size) override;
+virtual void vadjustment_set_step_increment(int size) override;
+
+virtual void set_vpolicy(VclPolicyType eVPolicy) override;
+virtual VclPolicyType get_vpolicy() const override;
+virtual int get_scroll_thickness() const override;
+virtual void set_scroll_thickness(int nThickness) override;
+virtual void customize_scrollbars(const Color& rBackgroundColor, const
Color& rShadowColor,
+ const Color& rFaceColor) override;
+virtual ~SalInstanceScrolledWindow() override;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 61fa56dd3223..4a31b3d2cd3d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2247,257 +2247,251 @@ public:
virtual int get_position() const override { return
m_xPaned->get_position(); }
};
+}
-class SalInstanceScrolledWindow : public SalInstanceContainer, public virtual
weld::ScrolledWindow
-{
-private:
-VclPtr m_xScrolledWindow;
-Link m_aOrigVScrollHdl;
-Link m_aOrigHScrollHdl;
-bool m_bUserManagedScrolling;
-
-DECL_LINK(VscrollHdl, ScrollBar*, void);
-DECL_LINK(HscrollHdl, ScrollBar*, void);
-
-static void customize_scrollbars(ScrollBar& rScrollBar, const Color&
rButtonTextColor,
- const Color& rBackgroundColor, const
Color& rShadowColor,
- const Color& rFaceColor)
-{
-
[Libreoffice-commits] core.git: 3 commits - helpcontent2 sc/source wizards/source
helpcontent2 |2 +-
sc/source/core/tool/interpr1.cxx |4 ++--
wizards/source/sfdialogs/SF_DialogListener.xba |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c673f0f04a2c1697e96c7fc228e1de33e112aa83
Author: Andrea Gelmini
AuthorDate: Tue Mar 14 14:19:07 2023 +0100
Commit: Julien Nabet
CommitDate: Tue Mar 14 14:02:19 2023 +
Fix typo
Change-Id: Ie08c4c4b6997b13eea7b29f987f994d8a894a331
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148875
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/wizards/source/sfdialogs/SF_DialogListener.xba
b/wizards/source/sfdialogs/SF_DialogListener.xba
index 805a43d8c358..e2c62236a22b 100644
--- a/wizards/source/sfdialogs/SF_DialogListener.xba
+++ b/wizards/source/sfdialogs/SF_DialogListener.xba
@@ -408,7 +408,7 @@ Public Function _SetOnProperty(ByRef poInstance As Object _
poInstance: a SF_Dialog or a SF_DialogControl
instance
psProperty: one of the applicable On properties
(OnFocusGained, OnMouseMoved, ...)
psScript: the script to run when the event is
triggered
- When the zero-length
strng, the trigger is deactivated
+ When the zero-length
string, the trigger is deactivated
Dim bSet As Boolean
Return value
Dim oModel As Object
com.sun.star.awt.XControlModel
@@ -630,4 +630,4 @@ Catch:
End Sub
SFDialogs.SF_Dialoglistener._TriggerEvent
REM END OF
SFDIALOGS.SF_DIALOGLISTENER
-
\ No newline at end of file
+
commit 248f63cee242bc21451bfa0b6c54f2c9da0b8e99
Author: Eike Rathke
AuthorDate: Tue Mar 14 15:02:18 2023 +0100
Commit: Gerrit Code Review
CommitDate: Tue Mar 14 14:02:18 2023 +
Update git submodules
* Update helpcontent2 from branch 'master'
to c3a560d632327fea245b60b7a40e7950974f3cd7
- Related: tdf#154167 ERROR.TYPE(#NULL) is for Err:521
Change-Id: Id30b59e13feac935fb5307f67bd5a5423b1e9fb0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/148881
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/helpcontent2 b/helpcontent2
index f3a16adcb018..c3a560d63232 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f3a16adcb0187df5cf9c01ae6b4550785c03375b
+Subproject commit c3a560d632327fea245b60b7a40e7950974f3cd7
commit 8dc4bea8323783b4abbf8010c492bf8d8de76481
Author: Eike Rathke
AuthorDate: Tue Mar 14 00:41:02 2023 +0100
Commit: Eike Rathke
CommitDate: Tue Mar 14 14:02:08 2023 +
Resolves: tdf#154167 ERROR.TYPE(#NULL!) must return 1
Error #NULL! is an alias of FormularError::NoCode Err:521 that is also
mapped to import/export Excel docs. ParameterExpected Err:511 was wrong.
Change-Id: I08dc4e5747cb6c6ab7c2b309b02b942340ed4484
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148820
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 94dd9446ab4b..a73be313a8e7 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -10036,7 +10036,7 @@ void ScInterpreter::ScErrorType_ODF()
switch ( nErr )
{
-case FormulaError::ParameterExpected : // #NULL!
+case FormulaError::NoCode : // #NULL!
nErrType = 1;
break;
case FormulaError::DivisionByZero : // #DIV/0!
@@ -10054,7 +10054,7 @@ void ScInterpreter::ScErrorType_ODF()
case FormulaError::IllegalFPOperation : // #NUM!
nErrType = 6;
break;
-case FormulaError::NotAvailable : // #N/A
+case FormulaError::NotAvailable : // #N/A
nErrType = 7;
break;
/*
[Libreoffice-commits] core.git: 3 commits - include/svx svx/source vcl/unx
include/svx/fontworkgallery.hxx |4 +++
svx/source/tbxctrls/fontworkgallery.cxx | 14
vcl/unx/gtk3/gtkinst.cxx| 35
3 files changed, 45 insertions(+), 8 deletions(-)
New commits:
commit 1255e9b3c0ed82014a8c0832c40e4c7d8f9c5756
Author: Michael Weghorn
AuthorDate: Thu Mar 9 12:24:00 2023 +0100
Commit: Michael Weghorn
CommitDate: Fri Mar 10 10:48:36 2023 +
tdf#140659 gtk a11y: Don't unset model when freezing icon view
As described in Change-Id I10249bbd8c684e89174ba91ce4690d37c24b5d5c
("tdf#153657 gtk3 a11y: Use IconView item tooltip as a11y desc"),
freezing the gtk3 icon view previously resulted in the accessible
child objects not being created at the time of insertion,
so setting the accessible description on them doesn't work.
As a result, e.g. the Orca screen reader would not properly
announce the focused item in Math's elements dock window when using
the gtk3 VCL plugin.
This was caused by clearing the model in
`GtkInstanceIconView::freeze` (and resetting it in
`GtkInstanceIconView::thaw`).
Stop doing that to fix the problem.
Thanks to Caolán for this suggestion!
This also allows to revert
commit 4e8331b77a2dcad2b10d3ca5b788711ea4e83a1b
Date: Wed Dec 7 13:20:03 2022 +
Resolves: tdf#152411 clear before freeze to let gtk a11y drop
reference
in a follow-up commit since the problem described in
tdf#152411 also no longer happens with this in place.
Also switch the previous check + SAL_WARN to an assert
now that the underlying cause has been addressed.
Change-Id: Id0c241d68ec4fbf933312008f7d0ee86bd3eab0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148535
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index fd1124e6cb00..6be688f06b93 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -16837,16 +16837,8 @@ private:
assert(gtk_tree_path_get_depth(pPath) == 1);
int* indices = gtk_tree_path_get_indices(pPath);
const int nIndex = indices[0];
-const int nChildCount =
atk_object_get_n_accessible_children(pAtkObject);
-if (nIndex >= nChildCount)
-{
-SAL_WARN("vcl.gtk",
- "item index "
- << nIndex << " greater than ItemView's accessible
child count "
- << nChildCount
- << ". Is the IconView frozen, preventing creation of
a11y children?");
-return;
-}
+assert(nIndex < atk_object_get_n_accessible_children(pAtkObject)
+ && "item index too high for ItemView's accessible child count");
const OUString sTooltipText =
signal_query_tooltip(GtkInstanceTreeIter(iter));
AtkObject* pChild = atk_object_ref_accessible_child(pAtkObject,
nIndex);
@@ -17013,11 +17005,7 @@ public:
bool bIsFirstFreeze = IsFirstFreeze();
GtkInstanceWidget::freeze();
if (bIsFirstFreeze)
-{
-g_object_ref(m_pTreeStore);
-gtk_icon_view_set_model(m_pIconView, nullptr);
g_object_freeze_notify(G_OBJECT(m_pTreeStore));
-}
enable_notify_events();
}
@@ -17025,11 +17013,7 @@ public:
{
disable_notify_events();
if (IsLastThaw())
-{
g_object_thaw_notify(G_OBJECT(m_pTreeStore));
-gtk_icon_view_set_model(m_pIconView, GTK_TREE_MODEL(m_pTreeStore));
-g_object_unref(m_pTreeStore);
-}
GtkInstanceWidget::thaw();
enable_notify_events();
}
commit ba0e36e607d1c380fd09b6725a4ebcb69ff399de
Author: Michael Weghorn
AuthorDate: Thu Mar 9 11:38:36 2023 +0100
Commit: Michael Weghorn
CommitDate: Fri Mar 10 10:48:29 2023 +
tdf#153657 tdf#140659 gtk3 a11y: Use IconView item tooltip as a11y desc
Similar to how the non-gtk SalInstanceIconView does since
commit 2a28ebeef5ea3e2b01d836a7233d2316b765bf38
Date: Wed Jun 1 11:18:26 2022 +0300
Accessibility for IconView
, use the tooltip as accessible description for
the gtk3's IconView implementation as well.
(Another alternative might be to always require passing
a text/name in weld::IconView::insert, e.g. by turning the
`const OUString* pStr` param into a `const OUString&`
and adding a bool param to indicate whether the text
should be shown on screen or only used for the accessible
*name*. Might make sense to reconsider that when looking into
the remaining aspects from the IconView a11y discussions in [1]
and [2].)
Together with Change-Id Ic77cf485ed4b2b413d3d3368c15b788d693111cd
"tdf#153657 a11y: Set tooltip/a11y desc for
[Libreoffice-commits] core.git: 3 commits - dbaccess/source desktop/source extensions/source
dbaccess/source/ui/control/sqledit.cxx |6 ++---
dbaccess/source/ui/inc/sqledit.hxx |3 +-
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 18
desktop/source/deployment/gui/dp_gui_dialog2.hxx |4 +--
extensions/source/bibliography/datman.cxx| 25 +--
extensions/source/bibliography/datman.hxx| 13 ---
extensions/source/bibliography/general.cxx |1
7 files changed, 37 insertions(+), 33 deletions(-)
New commits:
commit 838036c304d474fc4c19e2fc59cadc6ba457c9ee
Author: Noel Grandin
AuthorDate: Tue Mar 7 13:46:29 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Mar 8 06:43:46 2023 +
osl::Mutex->std::mutex in UpdateRequiredDialog
Change-Id: Ic4161d946190f74d016dd81aca44a7623a4e2dcc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148436
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 14fe03882ede..528d92fd5328 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1080,7 +1080,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn,
weld::Button&, void)
IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface, void )
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
bool bLockInterface = static_cast(_bLockInterface);
if ( m_bStartProgress && !m_bHasProgress )
@@ -1106,7 +1106,7 @@ IMPL_LINK( UpdateRequiredDialog, startProgress, void*,
_bLockInterface, void )
void UpdateRequiredDialog::showProgress( bool _bStart )
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
bool bStart = _bStart;
@@ -1132,7 +1132,7 @@ void UpdateRequiredDialog::updateProgress( const
tools::Long nProgress )
{
if ( m_nProgress != nProgress )
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
m_nProgress = nProgress;
m_aIdle.Start();
}
@@ -1142,7 +1142,7 @@ void UpdateRequiredDialog::updateProgress( const
tools::Long nProgress )
void UpdateRequiredDialog::updateProgress( const OUString ,
const uno::Reference<
task::XAbortChannel > )
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
m_xAbortChannel = xAbortChannel;
m_sProgressText = rText;
@@ -1172,7 +1172,7 @@ void UpdateRequiredDialog::updatePackageInfo( const
uno::Reference< deployment::
IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn, weld::Button&, void)
{
-::osl::ClearableMutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
std::vector< uno::Reference< deployment::XPackage > > vUpdateEntries;
sal_Int32 nCount = m_xExtensionBox->GetEntryCount();
@@ -1183,7 +1183,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn,
weld::Button&, void)
vUpdateEntries.push_back( pEntry->m_xPackage );
}
-aGuard.clear();
+aGuard.unlock();
m_pManager->getCmdQueue()->checkForUpdates( std::move(vUpdateEntries) );
}
@@ -1191,7 +1191,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn,
weld::Button&, void)
IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn, weld::Button&, void)
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
if ( !isBusy() )
{
@@ -1302,7 +1302,7 @@ bool UpdateRequiredDialog::checkDependencies( const
uno::Reference< deployment::
bool UpdateRequiredDialog::hasActiveEntries()
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
bool bRet = false;
tools::Long nCount = m_xExtensionBox->GetEntryCount();
@@ -1323,7 +1323,7 @@ bool UpdateRequiredDialog::hasActiveEntries()
void UpdateRequiredDialog::disableAllEntries()
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
incBusy();
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 9be38f1d7571..8802997e2f20 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -25,7 +25,7 @@
#include
#include
-#include
+#include
#include
@@ -184,7 +184,7 @@ class UpdateRequiredDialog : public
weld::GenericDialogController
{
const OUString m_sCloseText;
OUString m_sProgressText;
-::osl::Mutex m_aMutex;
+std::mutex m_aMutex;
bool m_bHasProgress;
bool m_bProgressChanged;
bool m_bStartProgress;
commit 474f68e38b88ca6495cb7c5cc4038100c2786063
Author: Noel Grandin
AuthorDate: Tue Mar 7 13:48:17 2023 +0200
Commit: Noel Grandin
[Libreoffice-commits] core.git: 3 commits - filter/source sd/source sfx2/source sw/inc sw/qa sw/source vcl/source
filter/source/msfilter/msdffimp.cxx |1
filter/source/t602/t602filter.cxx|2 -
sd/source/ui/app/sdxfer.cxx | 18 -
sd/source/ui/inc/sdxfer.hxx |4 +-
sfx2/source/control/templatedlglocalview.cxx |1
sfx2/source/dialog/StyleList.cxx |2 -
sw/inc/ToxLinkProcessor.hxx |3 +
sw/inc/breakit.hxx |7 ++-
sw/qa/core/test_ToxLinkProcessor.cxx |4 +-
sw/source/core/bastyp/breakit.cxx|2 -
sw/source/core/tox/ToxLinkProcessor.cxx | 13 +++
sw/source/core/unocore/unoidx.cxx| 30
sw/source/filter/ww8/ww8graf.cxx |4 +-
sw/source/filter/ww8/ww8par.cxx |4 +-
sw/source/filter/ww8/ww8par.hxx |2 -
sw/source/filter/ww8/ww8par3.cxx |2 -
sw/source/filter/ww8/ww8par6.cxx |6 +--
sw/source/ui/index/cntex.cxx | 22 ++--
sw/source/ui/index/cnttab.cxx|2 -
sw/source/uibase/dochdl/swdtflvr.cxx | 14 +++
sw/source/uibase/inc/conttree.hxx|4 +-
sw/source/uibase/inc/swdtflvr.hxx|4 +-
sw/source/uibase/inc/swuicnttab.hxx |2 -
sw/source/uibase/sidebar/TableEditPanel.cxx | 49 ---
sw/source/uibase/sidebar/TableEditPanel.hxx |4 +-
sw/source/uibase/utlui/glbltree.cxx | 16
vcl/source/fontsubset/sft.cxx|1
27 files changed, 107 insertions(+), 116 deletions(-)
New commits:
commit 20ab6da2ce6ed5728683b6cfc1dbe11a2f676ae0
Author: Noel Grandin
AuthorDate: Mon Mar 6 15:04:35 2023 +0200
Commit: Noel Grandin
CommitDate: Tue Mar 7 06:58:42 2023 +
no need to allocate these separately
they are all one or two words in size
Change-Id: I701be7fd8bd4402af9c7b1473c9f4b3c8a9c0e90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148339
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 2e048542f9b6..a6cf586eef65 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -130,7 +130,7 @@ SdTransferable::~SdTransferable()
delete mpSdDrawDocumentIntern;
moGraphic.reset();
-mpBookmark.reset();
+moBookmark.reset();
mpImageMap.reset();
mpVDev.disposeAndClear();
@@ -147,7 +147,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
mpOLEDataHelper.reset();
moGraphic.reset();
-mpBookmark.reset();
+moBookmark.reset();
mpImageMap.reset();
if( auto pOleObj = dynamic_cast< SdrOle2Obj* >( pObj ) )
@@ -200,7 +200,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
xPropSet->getPropertyValue( "Label" ) >>= aLabel;
xPropSet->getPropertyValue( "TargetURL" ) >>= aURL;
-mpBookmark.reset( new INetBookmark( aURL, aLabel ) );
+moBookmark.emplace( aURL, aLabel );
}
}
}
@@ -226,7 +226,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
// when both are unused
if(!pObj->HasFillStyle() && !pObj->HasLineStyle())
{
-mpBookmark.reset( new INetBookmark( pURL->GetURL(),
pURL->GetRepresentation() ) );
+moBookmark.emplace( pURL->GetURL(),
pURL->GetRepresentation() );
}
}
}
@@ -413,7 +413,7 @@ void SdTransferable::AddSupportedFormats()
AddFormat( SotClipboardFormatId::BITMAP );
}
}
-else if( mpBookmark )
+else if( moBookmark )
{
AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
AddFormat( SotClipboardFormatId::STRING );
@@ -518,9 +518,9 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
mpSdDrawDocumentIntern->SetOnlineSpell(true);
}
}
-else if( ( nFormat == SotClipboardFormatId::STRING ) && mpBookmark )
+else if( ( nFormat == SotClipboardFormatId::STRING ) && moBookmark )
{
-bOK = SetString( mpBookmark->GetURL() );
+bOK = SetString( moBookmark->GetURL() );
}
else if( ( nFormat == SotClipboardFormatId::SVXB ) && moGraphic )
{
@@ -530,9 +530,9 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
{
bOK = SetImageMap( *mpImageMap );
}
-else if( mpBookmark )
+else if( moBookmark )
{
-bOK = SetINetBookmark( *mpBookmark, rFlavor );
+bOK = SetINetBookmark( *moBookmark, rFlavor );
}
else if( nFormat == SotClipboardFormatId::EMBED_SOURCE )
{
diff --git
[Libreoffice-commits] core.git: 3 commits - chart2/source lingucomponent/source sc/source vcl/inc vcl/jsdialog
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 12 ++
lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx | 36
---
lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx |2
sc/source/ui/drawfunc/fuins2.cxx |5 -
vcl/inc/jsdialog/jsdialogbuilder.hxx |4
vcl/inc/salvtables.hxx|7 +
vcl/jsdialog/enabled.cxx |7 +
vcl/jsdialog/jsdialogbuilder.cxx | 47
++
8 files changed, 98 insertions(+), 22 deletions(-)
New commits:
commit 5b9089a23757805ffdc852944d6483cf0db15121
Author: Mike Kaganski
AuthorDate: Fri Mar 3 21:58:48 2023 +0300
Commit: Mike Kaganski
CommitDate: Sat Mar 4 07:08:18 2023 +
tdf#153948: LanguageTool: cache the prepared request
So that when the same text is re-checked using different
settings (e.g., language), the cached result is not used.
Change-Id: Ic4ed63c6835f9d3935f1b9541c80822bb52313c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148200
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
index fb8228890bdc..0856be3f741d 100644
--- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
+++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
@@ -224,17 +224,8 @@ ProofreadingResult SAL_CALL
LanguageToolGrammarChecker::doProofreading(
xRes.nBehindEndOfSentencePosition
= std::min(xRes.nStartOfNextSentencePosition, aText.getLength());
-auto cachedResult = mCachedResults.find(aText);
-if (cachedResult != mCachedResults.end())
-{
-xRes.aErrors = cachedResult->second;
-return xRes;
-}
-
-tools::Long http_code = 0;
-std::string response_body;
OUString langTag(aLocale.Language + "-" + aLocale.Country);
-
+OString postData;
if (rLanguageOpts.getRestProtocol() == sDuden)
{
std::stringstream aStream;
@@ -245,16 +236,28 @@ ProofreadingResult SAL_CALL
LanguageToolGrammarChecker::doProofreading(
aTree.put("spellchecking-level", 3);
aTree.put("correction-proposals", true);
boost::property_tree::write_json(aStream, aTree);
-response_body = makeDudenHttpRequest(checkerURL,
HTTP_METHOD::HTTP_POST,
- aStream.str().c_str(), http_code);
+postData = OString(aStream.str());
}
else
{
-OString postData(OUStringToOString(Concat2View("text=" + aText +
"=" + langTag),
- RTL_TEXTENCODING_UTF8));
-response_body = makeHttpRequest(checkerURL, HTTP_METHOD::HTTP_POST,
postData, http_code);
+postData = OUStringToOString(Concat2View("text=" + aText +
"=" + langTag),
+ RTL_TEXTENCODING_UTF8);
+}
+
+if (auto cachedResult = mCachedResults.find(postData); cachedResult !=
mCachedResults.end())
+{
+xRes.aErrors = cachedResult->second;
+return xRes;
}
+tools::Long http_code = 0;
+std::string response_body;
+if (rLanguageOpts.getRestProtocol() == sDuden)
+response_body
+= makeDudenHttpRequest(checkerURL, HTTP_METHOD::HTTP_POST,
postData, http_code);
+else
+response_body = makeHttpRequest(checkerURL, HTTP_METHOD::HTTP_POST,
postData, http_code);
+
if (http_code != 200)
{
return xRes;
@@ -274,8 +277,7 @@ ProofreadingResult SAL_CALL
LanguageToolGrammarChecker::doProofreading(
parseProofreadingJSONResponse(xRes, response_body);
}
// cache the result
-mCachedResults.insert(
-std::pair>(aText,
xRes.aErrors));
+mCachedResults.insert(std::make_pair(postData, xRes.aErrors));
return xRes;
}
diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx
b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx
index 00513851888d..0fc5edf877f0 100644
--- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx
+++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx
@@ -47,7 +47,7 @@ class LanguageToolGrammarChecker
css::lang::XServiceInfo,
css::lang::XServiceDisplayName>
{
css::uno::Sequence m_aSuppLocales;
-o3tl::lru_map>
+o3tl::lru_map>
mCachedResults;
LanguageToolGrammarChecker(const LanguageToolGrammarChecker&) = delete;
LanguageToolGrammarChecker& operator=(const LanguageToolGrammarChecker&) =
delete;
commit 92e93f25e5db2f6a2a6368c131ae83244b0c5a7f
Author: Szymon Kłos
AuthorDate: Thu Mar 2 16:11:14 2023 +0100
Commit: Szymon Kłos
CommitDate: Sat Mar 4 07:08:13 2023 +
jsdialog:
[Libreoffice-commits] core.git: 3 commits - sd/source
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 21 ++---
sd/source/ui/inc/AccessibleSlideSorterView.hxx | 10 --
sd/source/ui/inc/DrawSubController.hxx |9 --
sd/source/ui/inc/SdUnoDrawView.hxx |5 -
sd/source/ui/inc/SdUnoOutlineView.hxx|9 --
sd/source/ui/inc/SdUnoSlideView.hxx |4
sd/source/ui/slideshow/slideshowimpl.cxx | 62 +++
sd/source/ui/slideshow/slideshowimpl.hxx |8 -
sd/source/ui/unoidl/SdUnoDrawView.cxx|3
sd/source/ui/unoidl/SdUnoOutlineView.cxx |7 -
sd/source/ui/unoidl/SdUnoSlideView.cxx |3
11 files changed, 59 insertions(+), 82 deletions(-)
New commits:
commit b4029ccb6ab58d955c773e8452ce064b869b1740
Author: Noel Grandin
AuthorDate: Wed Mar 1 15:48:06 2023 +0200
Commit: Noel Grandin
CommitDate: Thu Mar 2 06:39:36 2023 +
BaseMutex->std::mutex in SlideShowListenerProxy
Change-Id: Iab518e2cb994372b5d601c5cd569f07531499804
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148056
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 9e0db0948ba4..4648ac379b20 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -3132,8 +3132,7 @@ void PresentationSettingsEx::SetPropertyValue(
std::u16string_view rProperty, co
// XAnimationListener
SlideShowListenerProxy::SlideShowListenerProxy( rtl::Reference< SlideshowImpl
> xController, css::uno::Reference< css::presentation::XSlideShow > xSlideShow )
-: maListeners( m_aMutex )
-, mxController(std::move( xController ))
+: mxController(std::move( xController ))
, mxSlideShow(std::move( xSlideShow ))
{
}
@@ -3180,21 +3179,23 @@ void SlideShowListenerProxy::removeShapeEventListener(
const css::uno::Reference
void SlideShowListenerProxy::addSlideShowListener( const css::uno::Reference<
css::presentation::XSlideShowListener >& xListener )
{
-maListeners.addInterface(xListener);
+std::unique_lock g(m_aMutex);
+maListeners.addInterface(g, xListener);
}
void SlideShowListenerProxy::removeSlideShowListener( const
css::uno::Reference< css::presentation::XSlideShowListener >& xListener )
{
-maListeners.removeInterface(xListener);
+std::unique_lock g(m_aMutex);
+maListeners.removeInterface(g, xListener);
}
void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference<
XAnimationNode >& xNode )
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
-if( maListeners.getLength() >= 0 )
+if( maListeners.getLength(aGuard) >= 0 )
{
-maListeners.forEach(
+maListeners.forEach(aGuard,
[&] (Reference const& xListener) {
return xListener->beginEvent(xNode);
} );
@@ -3203,11 +3204,11 @@ void SAL_CALL SlideShowListenerProxy::beginEvent( const
Reference< XAnimationNod
void SAL_CALL SlideShowListenerProxy::endEvent( const Reference<
XAnimationNode >& xNode )
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
-if( maListeners.getLength() >= 0 )
+if( maListeners.getLength(aGuard) >= 0 )
{
-maListeners.forEach(
+maListeners.forEach(aGuard,
[&] (Reference const& xListener) {
return xListener->endEvent(xNode);
} );
@@ -3216,11 +3217,11 @@ void SAL_CALL SlideShowListenerProxy::endEvent( const
Reference< XAnimationNode
void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode
>& xNode, ::sal_Int32 nRepeat )
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
-if( maListeners.getLength() >= 0 )
+if( maListeners.getLength(aGuard) >= 0 )
{
-maListeners.forEach(
+maListeners.forEach(aGuard,
[&] (Reference const& xListener) {
return xListener->repeat(xNode, nRepeat);
} );
@@ -3231,9 +3232,9 @@ void SAL_CALL SlideShowListenerProxy::repeat( const
Reference< XAnimationNode >&
void SAL_CALL SlideShowListenerProxy::paused( )
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
-maListeners.forEach(
+maListeners.forEach(aGuard,
[](uno::Reference const& xListener)
{
xListener->paused();
@@ -3242,9 +3243,9 @@ void SAL_CALL SlideShowListenerProxy::paused( )
void SAL_CALL SlideShowListenerProxy::resumed( )
{
-::osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
-maListeners.forEach(
+maListeners.forEach(aGuard,
[](uno::Reference const& xListener)
{
xListener->resumed();
@@ -3253,9 +3254,9 @@ void SAL_CALL
[Libreoffice-commits] core.git: 3 commits - fpicker/source sc/inc sc/source
fpicker/source/office/contentenumeration.cxx | 16
fpicker/source/office/contentenumeration.hxx |3 ++-
sc/inc/rangeseq.hxx |5 ++---
sc/source/core/tool/compiler.cxx | 17 -
sc/source/core/tool/ddelink.cxx |3 +--
sc/source/core/tool/rangeseq.cxx | 21 +
sc/source/ui/docshell/docsh4.cxx |4 ++--
7 files changed, 36 insertions(+), 33 deletions(-)
New commits:
commit f52dfc6fff0fa5f94aed433b22a87764c13e8e53
Author: Mike Kaganski
AuthorDate: Mon Feb 27 10:04:31 2023 +0300
Commit: Mike Kaganski
CommitDate: Mon Feb 27 10:20:47 2023 +
Simplify a bit
Change-Id: I2b4dc36e102f47b7fe61cd7c32bb2810cb35ea7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147855
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index d37823695fd5..0c6a4baee7bd 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3093,17 +3093,16 @@ bool ScCompiler::ParseOpCode( const OUString& rName,
bool bInArray )
bool ScCompiler::ParseOpCode2( std::u16string_view rName )
{
-bool bFound = false;
-sal_uInt16 i;
-
-for( i = ocInternalBegin; i <= ocInternalEnd && !bFound; i++ )
-bFound = o3tl::equalsAscii( rName, pInternal[ i-ocInternalBegin ] );
-
-if (bFound)
+for (sal_uInt16 i = ocInternalBegin; i <= ocInternalEnd; i++)
{
-maRawToken.SetOpCode( static_cast(--i) );
+if (o3tl::equalsAscii(rName, pInternal[i - ocInternalBegin]))
+{
+maRawToken.SetOpCode(static_cast(i));
+return true;
+}
}
-return bFound;
+
+return false;
}
static bool lcl_ParenthesisFollows( const sal_Unicode* p )
commit b3b18f8606131fc9998e872de84aab475acabf1a
Author: Mike Kaganski
AuthorDate: Mon Feb 27 09:56:06 2023 +0300
Commit: Mike Kaganski
CommitDate: Mon Feb 27 10:20:39 2023 +
Related: tdf#151429 Move fix for tdf#152717 to ScByteSequenceToString
The GetString method is only used in DDE context; and allowing it to
handle Anys with OUStrings generalizes the fix, simplifying its use.
Change-Id: I50952c25fa736a9ca73515801cc1b1903c62453e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147753
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index d1dc7f9cd4b7..9f424d0f3812 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -94,10 +94,9 @@ public:
class ScByteSequenceToString
{
public:
-// rAny must contain Sequence,
+// rAny must contain either OUString or Sequence (thread
encoding assumed),
// may or may not contain 0-bytes at the end
-static bool GetString( OUString& rString, const css::uno::Any& rAny,
-sal_uInt16 nEncoding );
+static bool GetString( OUString& rString, const css::uno::Any& rAny );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 775c71808488..5000e0bf8769 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -130,8 +130,7 @@ sfx2::SvBaseLink::UpdateResult ScDdeLink::DataChanged(
return SUCCESS;
OUString aLinkStr;
-if (!(rValue >>= aLinkStr))
-ScByteSequenceToString::GetString( aLinkStr, rValue,
osl_getThreadTextEncoding() );
+ScByteSequenceToString::GetString( aLinkStr, rValue );
aLinkStr = convertLineEnd(aLinkStr, LINEEND_LF);
// if string ends with line end, discard:
diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx
index c4ceea23d3e1..75652b720aa9 100644
--- a/sc/source/core/tool/rangeseq.cxx
+++ b/sc/source/core/tool/rangeseq.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
@@ -429,18 +430,22 @@ ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const
css::uno::Any & rAny )
return xMatrix;
}
-bool ScByteSequenceToString::GetString( OUString& rString, const uno::Any&
rAny,
-sal_uInt16 nEncoding )
+bool ScByteSequenceToString::GetString( OUString& rString, const uno::Any&
rAny )
{
-uno::Sequence aSeq;
-if ( rAny >>= aSeq )
+bool bResult = false;
+if (rAny >>= rString)
+{
+bResult = true;
+}
+else if (uno::Sequence aSeq; rAny >>= aSeq)
{
rString = OUString( reinterpret_cast(aSeq.getConstArray()),
-aSeq.getLength(), nEncoding );
-rString = comphelper::string::stripEnd(rString, 0);
-return true;
+aSeq.getLength(), osl_getThreadTextEncoding() );
+bResult = true;
}
-return false;
+if (bResult)
+rString =
[Libreoffice-commits] core.git: 3 commits - basic/CppunitTest_basic_macros.mk basic/qa dbaccess/Executable_odbcconfig.mk dbaccess/win32 include/systools solenv/gbuild
basic/CppunitTest_basic_macros.mk |2 basic/qa/cppunit/test_vba.cxx |9 +--- dbaccess/Executable_odbcconfig.mk |5 -- dbaccess/win32/source/odbcconfig/odbcconfig.cxx | 12 ++--- include/systools/win32/odbccp32.hxx | 54 solenv/gbuild/platform/com_MSC_class.mk |7 +-- 6 files changed, 67 insertions(+), 22 deletions(-) New commits: commit e403bf00af7767060f624077840921ceab04895d Author: Mike Kaganski AuthorDate: Fri Feb 24 15:13:39 2023 +0300 Commit: Mike Kaganski CommitDate: Fri Feb 24 17:05:53 2023 + Fix build in a specific VS2022 environment Building libraries in setup_native using VS2022 failed for me reproducibly for some time, with mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/reg_dlls.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_reg_dlls.mk:10: C:/lo/src/build/instdir/program/reg_dlls.dll] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/reg4allmsdoc.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_reg4allmsdoc.mk:10: C:/lo/src/build/instdir/program/reg4allmsdoc.dll] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/regactivex.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_regactivex.mk:10: C:/lo/src/build/instdir/program/regactivex.dll] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/sdqsmsi.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_sdqsmsi.mk:10: C:/lo/src/build/instdir/program/sdqsmsi.dll] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/sellangmsi.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_sellangmsi.mk:10: C:/lo/src/build/instdir/program/sellangmsi.dll] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/shlxtmsi.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_shlxtmsi.mk:10: C:/lo/src/build/instdir/program/shlxtmsi.dll] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/sn_tools.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_sn_tools.mk:10: C:/lo/src/build/instdir/program/sn_tools.dll] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/odbcconfig.exe". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/dbaccess/Executable_odbcconfig.mk:10: C:/lo/src/build/instdir/program/odbcconfig.exe] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/instooofiltmsi.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_instooofiltmsi.mk:10: C:/lo/src/build/instdir/program/instooofiltmsi.dll] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/qslnkmsi.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_qslnkmsi.mk:10: C:/lo/src/build/instdir/program/qslnkmsi.dll] Error 139 mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "C:/lo/src/build/instdir/program/inst_msu_msi.dll". The file or directory is corrupted and unreadable. make[1]: *** [C:/lo/src/core/setup_native/Library_inst_msu_msi.mk:10: C:/lo/src/build/instdir/program/inst_msu_msi.dll] Error 139 It is caused by the -U_DLL and the first entries in gb_Library_use_system_win32_libs: libcmt, libcpmt, libucrt, libvcruntime. They are needed to make the denerated DLLs standalone, not dependent on presence of VCRT on the target system (they are called from installer, when VCRT may not yet be present). It seems to work OK for others, but somehow, this conflicts with the fastlink option on my system, so just avoid it
[Libreoffice-commits] core.git: 3 commits - helpcontent2 sw/inc sw/source
helpcontent2|2 +-
sw/inc/swabstdlg.hxx|2 +-
sw/source/ui/dialog/swdlgfact.cxx |4 ++--
sw/source/ui/dialog/swdlgfact.hxx |2 +-
sw/source/ui/misc/glossary.cxx |4 ++--
sw/source/uibase/dochdl/gloshdl.cxx |6 +++---
sw/source/uibase/inc/gloshdl.hxx|4 ++--
sw/source/uibase/inc/glossary.hxx |2 +-
sw/source/uibase/uiview/view.cxx|2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 0ffa1607c57600930fb6494ab6642f5da0d5447e
Author: Alain Romedenne
AuthorDate: Fri Feb 17 15:43:21 2023 +
Commit: Gerrit Code Review
CommitDate: Fri Feb 17 15:43:21 2023 +
Update git submodules
* Update helpcontent2 from branch 'master'
to ff28b2273c769b7085c031f135131724af25d2c7
- typo
Change-Id: I67540e5f1feec3baa6d585a508fc5b270c0981ae
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147241
Tested-by: Jenkins
Reviewed-by: Alain Romedenne
diff --git a/helpcontent2 b/helpcontent2
index aeb4e62cc9ff..ff28b2273c76 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit aeb4e62cc9ffe7406cbe976c0dc59215c45b4bba
+Subproject commit ff28b2273c769b7085c031f135131724af25d2c7
commit 2d3b13d6b803f4a58c0302f7d9b58ba9766836d8
Author: Caolán McNamara
AuthorDate: Fri Feb 17 12:38:49 2023 +
Commit: Caolán McNamara
CommitDate: Fri Feb 17 15:43:16 2023 +
use a reference here to flag its never null
Change-Id: Ib57be7f076f4ec720d9d153034d00915a82e9ae7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147215
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index da48badefdd8..9c27f098eb29 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -502,7 +502,7 @@ public:
const OString& sPage,
SwWrtShell* pActShell,
boolbNew) = 0;
-virtual VclPtrCreateGlossaryDlg(SfxViewFrame*
pViewFrame,
+virtual VclPtrCreateGlossaryDlg(SfxViewFrame&
rViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) = 0;
virtual VclPtr
CreateFieldInputDlg(weld::Widget *pParent,
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 9bcae1e2ef33..ecf45ec06109 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1130,10 +1130,10 @@ VclPtr
SwAbstractDialogFactory_Impl::CreateTemplateDi
sPage, pActShell, bNew));
}
-VclPtr
SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
+VclPtr
SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame& rViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell)
{
-return
VclPtr::Create(std::make_unique(pViewFrame,
pGlosHdl, pWrtShell));
+return
VclPtr::Create(std::make_unique(rViewFrame,
pGlosHdl, pWrtShell));
}
VclPtr
SwAbstractDialogFactory_Impl::CreateFieldInputDlg(weld::Widget *pParent,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 7ee78f4a5c05..d31e212accf4 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -794,7 +794,7 @@ public:
const OString& sPage,
SwWrtShell* pActShell,
boolbNew)
override;
-virtual VclPtrCreateGlossaryDlg(SfxViewFrame*
pViewFrame,
+virtual VclPtrCreateGlossaryDlg(SfxViewFrame&
rViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell)
override;
virtual VclPtr
CreateFieldInputDlg(weld::Widget *pParent,
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 33aefaa2ce39..a1b328e6a20e 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -288,9 +288,9 @@ public:
}
};
-SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame const * pViewFrame,
+SwGlossaryDlg::SwGlossaryDlg(const SfxViewFrame& rViewFrame,
SwGlossaryHdl * pGlosHdl, SwWrtShell *pWrtShell)
-: SfxDialogController(pViewFrame->GetFrameWeld(),
"modules/swriter/ui/autotext.ui", "AutoTextDialog")
+: SfxDialogController(rViewFrame.GetFrameWeld(),
"modules/swriter/ui/autotext.ui", "AutoTextDialog")
,
[Libreoffice-commits] core.git: 3 commits - include/drawinglayer sw/source
include/drawinglayer/attribute/fillgradientattribute.hxx |4 ++-- sw/source/uibase/docvw/edtdd.cxx |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 60d7056184e558ab27c67a1500f705db5dfb9d02 Author: Andrea Gelmini AuthorDate: Sun Feb 12 12:39:20 2023 +0100 Commit: Julien Nabet CommitDate: Sun Feb 12 19:36:03 2023 + Fix typo Change-Id: Ia21de983bd4295f399e9753c29bc2a3cace2f250 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146835 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx index 0afd20245f76..7a10806b1e9f 100644 --- a/include/drawinglayer/attribute/fillgradientattribute.hxx +++ b/include/drawinglayer/attribute/fillgradientattribute.hxx @@ -110,7 +110,7 @@ public: Start/EndColor will be added to the internal ColorSteps with the according default offsets. A rigid correction/input data - testing is done by the construtor, including to sort the + testing is done by the constructor, including to sort the ColorSteps by offset. To access e.g. the StartColor, use getColorSteps().front(), and commit f1fddf82234c3925d98a01e52a9ecfb5093a0e60 Author: Andrea Gelmini AuthorDate: Sun Feb 12 12:05:35 2023 +0100 Commit: Julien Nabet CommitDate: Sun Feb 12 19:33:49 2023 + Fix typo Change-Id: I28253e80065c690dca45658111a2cd54857b186a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146833 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index 278030c1f5ec..8631226e55bf 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -122,7 +122,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) return; // If the add selection mode has been pushed in the MouseButtonDown handler it needs to be -// popped or it will remain active and noticable in the statusbar selection control until the +// popped or it will remain active and noticeable in the statusbar selection control until the // next MouseButtonUp event after the DnD, since a MouseButtonUp event is not received by the // edit window when DnD is done. if (g_bModePushed) commit 393b55e4428bb5e6f5df69be4cdea371a12ce67e Author: Andrea Gelmini AuthorDate: Sun Feb 12 12:39:02 2023 +0100 Commit: Julien Nabet CommitDate: Sun Feb 12 19:32:15 2023 + Fix typo Change-Id: I51b5c88e1d82c596b926e7074ee3a7e1395a21a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146834 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx index 11b87f1b3a32..0afd20245f76 100644 --- a/include/drawinglayer/attribute/fillgradientattribute.hxx +++ b/include/drawinglayer/attribute/fillgradientattribute.hxx @@ -114,7 +114,7 @@ public: ColorSteps by offset. To access e.g. the StartColor, use getColorSteps().front(), and - getColorSteps().back(), accordingly, for EndColor. The existance + getColorSteps().back(), accordingly, for EndColor. The existence of at least one entry is guaranteed, so no need to check before accessing using of front()/back() calls. If only one color entry exists, start == end color is assumed, so not really a gradient
[Libreoffice-commits] core.git: 3 commits - sd/Library_sd.mk sd/source svx/source
sd/Library_sd.mk |1
sd/source/filter/eppt/pptx-animations-cond.cxx| 105 ++
sd/source/filter/eppt/pptx-animations-cond.hxx| 31
sd/source/filter/eppt/pptx-animations.cxx | 95
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |3
svx/source/accessibility/svxrectctaccessiblecontext.cxx |3
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 11 -
svx/source/inc/svxrectctaccessiblecontext.hxx | 12 -
8 files changed, 145 insertions(+), 116 deletions(-)
New commits:
commit 0a55335ef3b91bbf573f6e5eaa4241d14a15a4ee
Author: Mark Hung
AuthorDate: Fri Jan 27 22:13:36 2023 +0800
Commit: Noel Grandin
CommitDate: Sat Jan 28 17:44:37 2023 +
sd/filter/pptx-anmiation refactor Cond class.
Change-Id: Iffb0eeb1454a858987680d402add3f5122f7b6db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146292
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 86ad12f6a2b9..297c2bc23654 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -187,6 +187,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/filter/eppt/pptx-epptbase \
sd/source/filter/eppt/pptx-epptooxml \
sd/source/filter/eppt/pptx-animations \
+sd/source/filter/eppt/pptx-animations-cond \
sd/source/filter/eppt/pptx-grouptable \
sd/source/filter/eppt/pptx-stylesheet \
sd/source/filter/eppt/pptx-text \
diff --git a/sd/source/filter/eppt/pptx-animations-cond.cxx
b/sd/source/filter/eppt/pptx-animations-cond.cxx
new file mode 100644
index ..440d31885dad
--- /dev/null
+++ b/sd/source/filter/eppt/pptx-animations-cond.cxx
@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include "pptx-animations-cond.hxx"
+
+using namespace ::com::sun::star::animations;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::uno;
+
+namespace
+{
+const char* convertEventTrigger(sal_Int16 nTrigger)
+{
+const char* pEvent = nullptr;
+switch (nTrigger)
+{
+case EventTrigger::ON_NEXT:
+pEvent = "onNext";
+break;
+case EventTrigger::ON_PREV:
+pEvent = "onPrev";
+break;
+case EventTrigger::BEGIN_EVENT:
+pEvent = "begin";
+break;
+case EventTrigger::END_EVENT:
+pEvent = "end";
+break;
+case EventTrigger::ON_BEGIN:
+pEvent = "onBegin";
+break;
+case EventTrigger::ON_END:
+pEvent = "onEnd";
+break;
+case EventTrigger::ON_CLICK:
+pEvent = "onClick";
+break;
+case EventTrigger::ON_DBL_CLICK:
+pEvent = "onDblClick";
+break;
+case EventTrigger::ON_STOP_AUDIO:
+pEvent = "onStopAudio";
+break;
+case EventTrigger::ON_MOUSE_ENTER:
+pEvent = "onMouseOver"; // not exact?
+break;
+case EventTrigger::ON_MOUSE_LEAVE:
+pEvent = "onMouseOut";
+break;
+}
+return pEvent;
+}
+}
+
+namespace oox::core
+{
+Cond::Cond(const Any& rAny, bool bIsMainSeqChild)
+: mpEvent(nullptr)
+{
+bool bHasFDelay = false;
+double fDelay = 0;
+Timing eTiming;
+Event aEvent;
+
+if (rAny >>= eTiming)
+{
+if (eTiming == Timing_INDEFINITE)
+msDelay = "indefinite";
+}
+else if (rAny >>= aEvent)
+{
+if (aEvent.Trigger == EventTrigger::ON_NEXT && bIsMainSeqChild)
+msDelay = "indefinite";
+else
+{
+mpEvent = convertEventTrigger(aEvent.Trigger);
+if (!(aEvent.Source >>= mxShape))
+aEvent.Source >>= mxNode;
+
+if (aEvent.Offset >>= fDelay)
+bHasFDelay = true;
+}
+}
+else if (rAny >>= fDelay)
+bHasFDelay = true;
+
+if (bHasFDelay)
+{
+sal_Int32 nDelay = static_cast(fDelay * 1000.0);
+msDelay = OString::number(nDelay);
+}
+}
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptx-animations-cond.hxx
b/sd/source/filter/eppt/pptx-animations-cond.hxx
new file mode 100644
index ..ec101c429ef1
--- /dev/null
+++ b/sd/source/filter/eppt/pptx-animations-cond.hxx
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ *
[Libreoffice-commits] core.git: 3 commits - svx/source
svx/source/accessibility/charmapacc.cxx |3 --
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |3 --
svx/source/inc/charmapacc.hxx | 19 ++
svx/source/inc/svxpixelctlaccessiblecontext.hxx |9 ++
4 files changed, 8 insertions(+), 26 deletions(-)
New commits:
commit c6dcbf93577632fdd6ecc1d94ab1642143c6bbca
Author: Stephan Bergmann
AuthorDate: Fri Jan 27 16:01:51 2023 +0100
Commit: Stephan Bergmann
CommitDate: Sat Jan 28 17:44:16 2023 +
Use ImplInheritanceHelper in SvxPixelCtlAccessible
Change-Id: I9509bfcbcc015876cba1c17e84e4de5e28de3cf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146282
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index d31af4062d49..23847464b58c 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -49,9 +49,6 @@ SvxPixelCtlAccessible::~SvxPixelCtlAccessible()
ensureDisposed();
}
-IMPLEMENT_FORWARD_XINTERFACE2( SvxPixelCtlAccessible,
OAccessibleSelectionHelper, OAccessibleHelper_Base )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxPixelCtlAccessible,
OAccessibleSelectionHelper, OAccessibleHelper_Base )
-
uno::Reference< XAccessibleContext >
SvxPixelCtlAccessible::getAccessibleContext( )
{
return this;
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index fb14ac4720e7..25c2cfa77a35 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include
@@ -97,15 +98,13 @@ private:
tools::Long mnIndexInParent;
};
-class SvxPixelCtlAccessible final : public
::comphelper::OAccessibleSelectionHelper,
-public OAccessibleHelper_Base
+class SvxPixelCtlAccessible final : public cppu::ImplInheritanceHelper<
+
::comphelper::OAccessibleSelectionHelper,
+css::accessibility::XAccessible>
{
public:
SvxPixelCtlAccessible(SvxPixelCtl* pPixelCtl);
-DECLARE_XINTERFACE( )
-DECLARE_XTYPEPROVIDER( )
-
//XAccessibleComponent
virtual void SAL_CALL grabFocus( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
commit 64716d41e2e6c74dea1762bb59ea5485c265557b
Author: Stephan Bergmann
AuthorDate: Fri Jan 27 15:51:18 2023 +0100
Commit: Stephan Bergmann
CommitDate: Sat Jan 28 17:44:09 2023 +
OAccessibleHelper_Base_2 is unused
...ever since 374599f8c26713905a310673d2b429083321186a "weld SvxCharacterMap
dialog"
Change-Id: I955a399756c2802295168e07dfdfe30f1515a64c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146281
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 2183e1d7a52a..c909756c22d1 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -24,7 +24,6 @@
#include
#include
#include
-#include
#include
#include
@@ -33,9 +32,6 @@ class SvxShowCharSet;
namespace svx
{
-typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible
-> OAccessibleHelper_Base_2;
-
class SvxShowCharSetAcc;
class SvxShowCharSetItemAcc;
commit c2f14c9a0aa07c36446ea308b9192248e4c6213d
Author: Stephan Bergmann
AuthorDate: Fri Jan 27 15:48:15 2023 +0100
Commit: Stephan Bergmann
CommitDate: Sat Jan 28 17:44:01 2023 +
Use ImplInheritanceHelper in SvxShowCharSetItemAcc
Change-Id: I0baaac510afcbae5a8a9fa5886daa8b4f83145e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146280
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/svx/source/accessibility/charmapacc.cxx
b/svx/source/accessibility/charmapacc.cxx
index 89e0b62199dc..d6c8b4b49216 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -379,9 +379,6 @@ SvxShowCharSetItemAcc::~SvxShowCharSetItemAcc()
ensureDisposed();
}
-IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetItemAcc,
OAccessibleComponentHelper, OAccessibleHelper_Base_3 )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetItemAcc,
OAccessibleComponentHelper, OAccessibleHelper_Base_3 )
-
void SvxShowCharSetItemAcc::ParentDestroyed()
{
const ::osl::MutexGuard aGuard( GetMutex() );
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 339192ced108..2183e1d7a52a 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -25,7 +25,6 @@
[Libreoffice-commits] core.git: 3 commits - sd/source svx/source
sd/source/filter/eppt/pptx-animations.cxx| 15 +++
svx/source/accessibility/AccessibleFrameSelector.cxx |3 ---
svx/source/accessibility/charmapacc.cxx |3 ---
svx/source/inc/AccessibleFrameSelector.hxx | 11 +++
svx/source/inc/charmapacc.hxx| 14 +-
5 files changed, 15 insertions(+), 31 deletions(-)
New commits:
commit 28f3aeff99fa635f7d59ab88f1f41ff6a036bebb
Author: Mark Hung
AuthorDate: Fri Jan 27 20:56:55 2023 +0800
Commit: Noel Grandin
CommitDate: Sat Jan 28 17:43:54 2023 +
sd/source/filter refactor pptx animation export.
Refactor "Any NodeContext::getCondition(bool bBegin) const" to
"const Reference& NodeContext::getNodeForCondition()
const", to get rid of the bool arguement of getCondition.
Change-Id: Ic61d2caecaad2d3ada38556346f66aedb258e554
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146291
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/filter/eppt/pptx-animations.cxx
b/sd/source/filter/eppt/pptx-animations.cxx
index 1d53833fa89f..03c8e6cc7b49 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -572,7 +572,7 @@ public:
const OUString& getEffectPresetSubType() const { return
msEffectPresetSubType; }
bool isValid() const { return mbValid; }
const std::vector& getChildNodes() const { return
maChildNodes; };
-Any getCondition(bool bBegin) const;
+const Reference& getNodeForCondition() const;
};
struct Cond
@@ -1101,8 +1101,8 @@ void
PPTXAnimationExport::WriteAnimationNodeCommonPropsStart()
sax_fastparser::UseIf(OString::number(nPresetSubType),
bPresetSubType), XML_repeatCount,
sRepeatCount);
-WriteAnimationCondList(mpContext->getCondition(true), XML_stCondLst);
-WriteAnimationCondList(mpContext->getCondition(false), XML_endCondLst);
+WriteAnimationCondList(mpContext->getNodeForCondition()->getBegin(),
XML_stCondLst);
+WriteAnimationCondList(mpContext->getNodeForCondition()->getEnd(),
XML_endCondLst);
if (rXNode->getType() == AnimationNodeType::ITERATE)
{
@@ -1287,8 +1287,8 @@ void PPTXAnimationExport::WriteAnimationNodeMedia()
{
mpFS->startElementNS(XML_p, XML_cTn);
}
-WriteAnimationCondList(mpContext->getCondition(true), XML_stCondLst);
-WriteAnimationCondList(mpContext->getCondition(false), XML_endCondLst);
+WriteAnimationCondList(mpContext->getNodeForCondition()->getBegin(),
XML_stCondLst);
+WriteAnimationCondList(mpContext->getNodeForCondition()->getEnd(),
XML_endCondLst);
mpFS->endElementNS(XML_p, XML_cTn);
mpFS->startElementNS(XML_p, XML_tgtEl);
@@ -1528,13 +1528,12 @@ bool NodeContext::initChildNodes()
return bValid;
}
-Any NodeContext::getCondition(bool bBegin) const
+const Reference& NodeContext::getNodeForCondition() const
{
const bool bParent
= (mnEffectNodeType != EffectNodeType::INTERACTIVE_SEQUENCE ||
maChildNodes.empty());
const Reference& rNode = bParent ? mxNode :
maChildNodes[0]->getNode();
-
-return bBegin ? rNode->getBegin() : rNode->getEnd();
+return rNode;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 131904c23ab539a3eb2aba5467cbbeee0650632b
Author: Stephan Bergmann
AuthorDate: Fri Jan 27 15:44:13 2023 +0100
Commit: Stephan Bergmann
CommitDate: Sat Jan 28 17:43:52 2023 +
Use ImplInheritanceHelper in SvxShowCharSetAcc
Change-Id: I9009b6168c66a1b340a34aaf804e097bfe614d21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146279
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/svx/source/accessibility/charmapacc.cxx
b/svx/source/accessibility/charmapacc.cxx
index 46fe8b11ac15..89e0b62199dc 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -91,9 +91,6 @@ void SAL_CALL SvxShowCharSetAcc::disposing()
m_pParent = nullptr;
}
-IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetAcc, OAccessibleSelectionHelper,
OAccessibleHelper_Base )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc,
OAccessibleSelectionHelper, OAccessibleHelper_Base )
-
bool SvxShowCharSetAcc::implIsSelected( sal_Int64 nAccessibleChildIndex )
{
if (!m_pParent)
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index e94567e8c32d..339192ced108 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -60,17 +61,15 @@ namespace svx
};
-typedef ::cppu::ImplHelper2 < css::accessibility::XAccessible,
-css::accessibility::XAccessibleTable
-> OAccessibleHelper_Base;
-
// - SvxShowCharSetAcc -
/** The table implementation of the vcl control.
[Libreoffice-commits] core.git: 3 commits - sc/source
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 74 +---
sc/source/ui/inc/AccessibleCsvControl.hxx | 53 +++---
2 files changed, 18 insertions(+), 109 deletions(-)
New commits:
commit 28b7b783202d251f43658b2ff1d8df3f10d6d1b8
Author: Stephan Bergmann
AuthorDate: Fri Jan 27 15:30:06 2023 +0100
Commit: Stephan Bergmann
CommitDate: Sat Jan 28 17:43:29 2023 +
Use ImplInheritanceHelper in ScAccessibleCsvCell
Change-Id: I46e9985fe3bb05dc677b4046b3cad18dea1086b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146276
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 075657fd9b21..eeaee6e2f91c 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -1219,7 +1219,7 @@ ScAccessibleCsvCell::ScAccessibleCsvCell(
ScCsvGrid& rGrid,
OUString aCellText,
sal_Int32 nRow, sal_Int32 nColumn ) :
-ScAccessibleCsvControl( rGrid ),
+ImplInheritanceHelper( rGrid ),
AccessibleStaticTextBase( SvxEditSourcePtr() ),
maCellText(std::move( aCellText )),
mnLine( nRow ? (nRow + rGrid.GetFirstVisLine() - 1) : CSV_LINE_HEADER ),
@@ -1310,11 +1310,11 @@ sal_Int64 SAL_CALL
ScAccessibleCsvCell::getAccessibleStateSet()
// XInterface -
-IMPLEMENT_FORWARD_XINTERFACE2( ScAccessibleCsvCell, ScAccessibleCsvControl,
AccessibleStaticTextBase )
+IMPLEMENT_FORWARD_XINTERFACE2( ScAccessibleCsvCell, ImplInheritanceHelper,
AccessibleStaticTextBase )
// XTypeProvider --
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScAccessibleCsvCell, ScAccessibleCsvControl,
AccessibleStaticTextBase )
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScAccessibleCsvCell, ImplInheritanceHelper,
AccessibleStaticTextBase )
// helpers
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx
b/sc/source/ui/inc/AccessibleCsvControl.hxx
index ea3308fc4eb5..cb1efc309353 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -30,7 +30,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -400,8 +399,9 @@ private:
};
/** Accessible class representing a cell of the CSV grid control. */
-class ScAccessibleCsvCell : public ScAccessibleCsvControl
- , public
cppu::ImplHelper1
+class ScAccessibleCsvCell : public cppu::ImplInheritanceHelper<
+ScAccessibleCsvControl,
+css::accessibility::XAccessible>
, public ::accessibility::AccessibleStaticTextBase
{
protected:
commit ec68d4bb894882835aed28cee8537481afd0e302
Author: Stephan Bergmann
AuthorDate: Fri Jan 27 15:25:24 2023 +0100
Commit: Stephan Bergmann
CommitDate: Sat Jan 28 17:43:22 2023 +
Use ImplInheritanceHelper in ScAccessibleCsvGrid
Change-Id: I1713fb24ed16ef9db6d2815a286d4182f19a5e6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146275
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index bc5dd8208b80..075657fd9b21 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -727,7 +727,7 @@ static sal_uInt32 lcl_GetGridColumn( sal_Int32 nApiColumn )
}
ScAccessibleCsvGrid::ScAccessibleCsvGrid(ScCsvGrid& rGrid)
-: ScAccessibleCsvControl(rGrid)
+: ImplInheritanceHelper(rGrid)
{
}
@@ -1069,39 +1069,6 @@ void SAL_CALL
ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int64 nSelectedC
implSelectColumn( nColumn, false );
}
-// XInterface -
-
-Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const css::uno::Type& rType )
-{
-Any aAny( ScAccessibleCsvGridImpl::queryInterface( rType ) );
-return aAny.hasValue() ? aAny : ScAccessibleCsvControl::queryInterface(
rType );
-}
-
-void SAL_CALL ScAccessibleCsvGrid::acquire() noexcept
-{
-ScAccessibleCsvControl::acquire();
-}
-
-void SAL_CALL ScAccessibleCsvGrid::release() noexcept
-{
-ScAccessibleCsvControl::release();
-}
-
-// XTypeProvider --
-
-Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes()
-{
-return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(),
-Sequence {
-cppu::UnoType::get(),
-cppu::UnoType::get() });
-}
-
-Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId()
-{
-return
[Libreoffice-commits] core.git: 3 commits - comphelper/source sw/source
comphelper/source/misc/hash.cxx |5 -
sw/source/core/crsr/bookmark.cxx | 21 +
sw/source/core/doc/docbm.cxx | 18 ++
sw/source/core/docnode/nodes.cxx | 20
sw/source/core/inc/bookmark.hxx |1 +
5 files changed, 64 insertions(+), 1 deletion(-)
New commits:
commit 15397a10585e223733c651287c9f84a719180128
Author: Andras Timar
AuthorDate: Fri Nov 4 17:44:10 2022 +0100
Commit: Andras Timar
CommitDate: Wed Jan 25 08:33:41 2023 +
more detailed NSS error report
Change-Id: I1b005a331aeed1c00d6bf18a6dff0ffa844ba6f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142286
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146041
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/comphelper/source/misc/hash.cxx b/comphelper/source/misc/hash.cxx
index 50fd8cd0f961..980097e234d0 100644
--- a/comphelper/source/misc/hash.cxx
+++ b/comphelper/source/misc/hash.cxx
@@ -18,6 +18,7 @@
#if USE_TLS_NSS
#include
+#include
#include
#elif USE_TLS_OPENSSL
#include
@@ -78,7 +79,9 @@ struct HashImpl
#if USE_TLS_NSS
auto const e = NSS_NoDB_Init(nullptr);
if (e != SECSuccess) {
-throw css::uno::RuntimeException("NSS_NoDB_Init failed with " +
OUString::number(e));
+PRErrorCode error = PR_GetError();
+const char* errorText = PR_ErrorToName(error);
+throw css::uno::RuntimeException("NSS_NoDB_Init failed with " +
OUString(errorText, strlen(errorText), RTL_TEXTENCODING_UTF8) + " (" +
OUString::number(static_cast(error)) + ")");
}
mpContext = HASH_Create(getNSSType());
HASH_Begin(mpContext);
commit b03790dac08f97594b2cdc8a4ab0394d62fb851f
Author: Pranam Lashkari
AuthorDate: Mon Jan 23 19:55:58 2023 +0530
Commit: Miklos Vajna
CommitDate: Wed Jan 25 08:33:36 2023 +
sw: send LOK call back on section deletion
this helps with zotero when user deletes or undo a bibliography stored as a
section
without this online will be unaware of any such changes made by user
Signed-off-by: Pranam Lashkari
Change-Id: I6a8ae3924d548e97299a8d74f8c93c3345d1a430
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146007
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146101
Tested-by: Jenkins
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index afef83e76df5..7fcba8858721 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -20,6 +20,10 @@
#include
#include
#include
+#include
+#include
+#include
+
#include
#include
#include
@@ -2438,6 +2442,22 @@ void SwNodes::RemoveNode( SwNodeOffset nDelPos,
SwNodeOffset nSz, bool bDel )
// 'Extra Redlines' array
pTableNode->RemoveRedlines();
}
+
+SwSectionNode* pSectionNode = pNode->GetSectionNode();
+if (pSectionNode && !GetDoc().IsClipBoard() && SfxViewShell::Current())
+{
+OUString fieldCommand =
pSectionNode->GetSection().GetSectionName();
+tools::JsonWriter aJson;
+aJson.put("commandName", ".uno:DeleteSection");
+aJson.put("success", true);
+{
+auto result = aJson.startNode("result");
+aJson.put("DeleteSection", fieldCommand);
+}
+
+
SfxViewShell::Current()->libreOfficeKitViewCallback(LOK_CALLBACK_UNO_COMMAND_RESULT,
aJson.extractData());
+
+}
}
SwNodeOffset nEnd = nDelPos + nSz;
commit c8e49e7a49a99fd76a25ea825319d2243fed5c22
Author: Pranam Lashkari
AuthorDate: Thu Jan 19 15:57:26 2023 +0530
Commit: Miklos Vajna
CommitDate: Wed Jan 25 08:33:28 2023 +
sw: send LOK call back on bookmark deletion
this helps with zotero when user deletes a bookmark or use undo
without this online will be unaware of any such changes made by user
Signed-off-by: Pranam Lashkari
Change-Id: Id5ea4ee0ee1d16c399460cd177ec8e33256ce3dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145777
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
(cherry picked from commit ea112b6d85a6914e1df40e064cd5df6d46248d68)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146022
Tested-by: Jenkins
diff --git a/sw/source/core/crsr/bookmark.cxx b/sw/source/core/crsr/bookmark.cxx
index 8165b30a98b1..c43dd04c2496 100644
--- a/sw/source/core/crsr/bookmark.cxx
+++ b/sw/source/core/crsr/bookmark.cxx
@@ -420,6 +420,27 @@ namespace sw::mark
m_aName = rName;
}
+void Bookmark::sendLOKDeleteCallback()
+{
+if (GetMarkPos().GetDoc().IsClipBoard())
+return;
+
+SfxViewShell* pViewShell = SfxViewShell::Current();
+
[Libreoffice-commits] core.git: 3 commits - android/source unoxml/source
android/source/build.gradle | 23 +++
unoxml/source/dom/documentbuilder.hxx |2 +-
2 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit bcce2205313b6c3a427d0ab12b65526a577fe996
Author: Michael Weghorn
AuthorDate: Mon Jan 16 16:07:11 2023 +0100
Commit: Michael Weghorn
CommitDate: Tue Jan 17 06:17:42 2023 +
tdf#153009 android: Include more doc layout related XML files
instdir/share/config/soffice.cfg/simpress/objectlist.xml
contains default positions for elements that are used
in new Impress presentations, but that file wasn't
included in the Android app/APK previously, so
couldn't be read from in `SdDrawDocument::InitObjectVector`.
As a result, the title and text were misplaced when creating a
new presentation in Android Viewer.
Include all of the related Impress XML files into the app to
make this work as expected.
(At least a failed attempt to read from `layoutlist.xml`
was also observed while debugging the issue mentioned
above.)
Change-Id: Iba1ac68c0b983d3e465515f07b3fc67162a0ee3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145621
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 245d1c41d71e..b31b82eb1120 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -149,7 +149,7 @@ task copyAssets(type: Copy) {
into ('config') {
from ("${liboInstdir}/share/config")
includes = ['images_**.zip',
-'**/simpress/styles.xml',
+'**/simpress/**.xml',
'**/annotation.ui',
'**/hfmenubutton.ui',
'**/inforeadonlydialog.ui',
commit 48916eb11bea29ac2f7963d779b18491d6015737
Author: Michael Weghorn
AuthorDate: Mon Jan 16 11:23:21 2023 +0100
Commit: Michael Weghorn
CommitDate: Tue Jan 17 06:17:36 2023 +
tdf#153009 Use recursive mutex in CDocumentBuilder
This was changed from `osl::Mutex` to `std::mutex`
in
commit e66fdb597b30fc701bb068824d0ae4d89fecd55f
Date: Sat Jul 31 20:12:30 2021 +0200
osl::Mutex->std::mutex in CDocumentBuilder
, but `DOM::CDocumentBuilder::parseURI` locks the mutex and
then calls `DOM::CDocumentBuilder::parse` for the
// if we failed to parse the URI as a simple file, lets try via a
ucb stream.
// For Android file:///assets/ URLs which must go via the osl/ file
API.
case, which would result in a deadlock because
`DOM::CDocumentBuilder::parse` wants to lock the mutex
again.
This happens once that code path is executed
on Android Viewer when creating a new Impress presentation
with Change-Id Iba1ac68c0b983d3e465515f07b3fc67162a0ee3f
("tdf#153009 android: Include more doc layout related XML files")
in place.
Fix the deadlock by using a "std::recursive_mutex` instead.
Part of the backtrace:
DOM::CDocumentBuilder::parse(const com::sun::star::uno::Reference<…> &)
documentbuilder.cxx:331
DOM::CDocumentBuilder::parseURI(const rtl::OUString &)
documentbuilder.cxx:387
non-virtual thunk to DOM::CDocumentBuilder::parseURI(rtl::OUString
const&) documentbuilder.cxx:0
SdDrawDocument::InitLayoutVector() drawdoc.cxx:1130
SdDrawDocument::SdDrawDocument(DocumentType, SfxObjectShell *)
drawdoc.cxx:147
sd::DrawDocShell::Construct(bool) docshell.cxx:94
sd::DrawDocShell::DrawDocShell(SfxModelFlags, bool, DocumentType)
docshell.cxx:140
sd_PresentationDocument_get_implementation::$_1::operator()(SfxModelFlags)
const unodoc.cxx:65
std::__ndk1::__invoke<…>(sd_PresentationDocument_get_implementation::$_1 &,
SfxModelFlags &&) type_traits:4353
std::__ndk1::__invoke_void_return_wrapper::__call<…>(sd_PresentationDocument_get_implementation::$_1
&, SfxModelFlags &&) __functional_base:318
std::__ndk1::__function::__alloc_func::operator()(SfxModelFlags &&)
functional:1527
std::__ndk1::__function::__func::operator()(SfxModelFlags &&)
functional:1651
std::__ndk1::__function::__value_func::operator()(SfxModelFlags &&)
const functional:1799
std::__ndk1::function::operator()(SfxModelFlags) const functional:2347
sfx2::createSfxModelInstance(const com::sun::star::uno::Sequence<…> &,
std::__ndk1::function<…>) sfxmodelfactory.cxx:82
sd_PresentationDocument_get_implementation(com::sun::star::uno::XComponentContext
*, const com::sun::star::uno::Sequence<…> &) unodoc.cxx:61
std::__ndk1::__invoke<…>(com::sun::star::uno::XInterface
*(*&)(com::sun::star::uno::XComponentContext *, const
com::sun::star::uno::Sequence<…> &), com::sun::star::uno::XComponentContext
*&&, const com::sun::star::uno::Sequence<…>
[Libreoffice-commits] core.git: 3 commits - extensions/source svx/source vcl/unx
extensions/source/update/check/download.cxx |4 ++--
svx/source/sidebar/nbdtmg.cxx |5 +++--
vcl/unx/generic/gdi/cairo_xlib_cairo.cxx|3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit b03cc1dd65908a40e804c48f52f42fc6ece63ab2
Author: Caolán McNamara
AuthorDate: Sun Jan 15 20:16:31 2023 +
Commit: Caolán McNamara
CommitDate: Mon Jan 16 10:33:02 2023 +
cid#1474008 silence Unchecked return value from library
Change-Id: I23228ae5d61654e2c2d401453bc741a2a6074278
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145539
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/extensions/source/update/check/download.cxx
b/extensions/source/update/check/download.cxx
index ba371bdee570..8f090ed9b6dd 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -234,9 +234,9 @@ static bool curl_run(std::u16string_view rURL, OutData&
out, const OString& aPro
(void)curl_easy_setopt(pCURL, CURLOPT_FOLLOWLOCATION, 1);
// only allow redirect to https://
#if (LIBCURL_VERSION_MAJOR > 7) || (LIBCURL_VERSION_MAJOR == 7 &&
LIBCURL_VERSION_MINOR >= 85)
-curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS_STR, "https");
+(void)curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS_STR, "https");
#else
-curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
+(void)curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS,
CURLPROTO_HTTPS);
#endif
// write function
commit 093a7f422c1184fb8043740cfb6a4f03ed328fa6
Author: Caolán McNamara
AuthorDate: Sun Jan 15 20:15:19 2023 +
Commit: Caolán McNamara
CommitDate: Mon Jan 16 10:32:55 2023 +
cid#1519046 Uninitialized scalar variable
bogus, but earlier return makes things easier anyway
Change-Id: Id6c0a72b0ec9bbae061cc1f883b383fbef88e771
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145538
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 2519ece7e60c..5cc216324a58 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -300,6 +300,9 @@ sal_uInt16
BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe
void BulletsTypeMgr::ReplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel)
{
+if ( nIndex >= DEFAULT_BULLET_TYPES )
+return;
+
if ( mLevel == sal_uInt16(0x) || mLevel == 0)
return;
@@ -314,8 +317,6 @@ void BulletsTypeMgr::ReplaceNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uIn
SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
sal_UCS4 cChar = aFmt.GetBulletChar();
std::optional pFont = aFmt.GetBulletFont();
-if ( nIndex >= DEFAULT_BULLET_TYPES )
-return;
pActualBullets[nIndex]->cBulletChar = cChar;
if ( pFont )
commit 8003a7b117f822a03b661db86534cc6b4787475a
Author: Caolán McNamara
AuthorDate: Sun Jan 15 20:13:33 2023 +
Commit: Caolán McNamara
CommitDate: Mon Jan 16 10:32:47 2023 +
cid#1412875 Uninitialized pointer field
Change-Id: I551a18eddb5a2f436ecb947411faef09ac74d016
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145537
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index 9ec8167fbfdd..26d8876a8906 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -65,7 +65,8 @@ namespace cairo
pDisplay(pSysDat.pDisplay),
hDrawable(pSysDat.hDrawable),
pVisual(pSysDat.pVisual),
-nScreen(pSysDat.nScreen)
+nScreen(pSysDat.nScreen),
+pRenderFormat(nullptr)
{}
X11SysData::X11SysData( const SystemEnvData& pSysDat, const SalFrame*
pReference ) :
[Libreoffice-commits] core.git: 3 commits - accessibility/source toolkit/inc toolkit/source
accessibility/source/standard/vclxaccessibletoolbox.cxx | 35 +---
toolkit/inc/awt/vclxpointer.hxx |6 --
toolkit/inc/awt/vclxregion.hxx |7 ---
toolkit/source/awt/vclxpointer.cxx |3 -
toolkit/source/awt/vclxregion.cxx |3 -
toolkit/source/awt/vclxwindow.cxx |2
toolkit/source/helper/vclunohelper.cxx |2
7 files changed, 7 insertions(+), 51 deletions(-)
New commits:
commit 8a1108a0c7bf8e531d9771a5ca29a81a2aeea167
Author: Noel Grandin
AuthorDate: Fri Jan 13 18:32:00 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Jan 16 06:42:00 2023 +
XUnoTunnel->dynamic_cast in OToolBoxWindowItem
Change-Id: I65e535d9f9a81a3712b14b50cc4906b534533e86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145536
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx
b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 062ba442c32c..4722db1a0de9 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -78,14 +77,9 @@ namespace
// = OToolBoxWindowItem
-typedef ::cppu::ImplHelper1 < XUnoTunnel
-> OToolBoxWindowItem_Base;
-
/** XAccessible implementation for a toolbox item which is represented by
a VCL Window
*/
-class OToolBoxWindowItem
-:public OAccessibleWrapper
-,public OToolBoxWindowItem_Base
+class OToolBoxWindowItem : public OAccessibleWrapper
{
private:
sal_Int32 m_nIndexInParent;
@@ -94,8 +88,6 @@ namespace
sal_Int32getIndexInParent() const{ return
m_nIndexInParent; }
void setIndexInParent( sal_Int32 _nNewIndex ){
m_nIndexInParent = _nNewIndex; }
-static const Sequence< sal_Int8 > & getUnoTunnelId();
-
public:
OToolBoxWindowItem(sal_Int32 _nIndexInParent,
const css::uno::Reference< css::uno::XComponentContext >&
_rxContext,
@@ -110,38 +102,17 @@ namespace
}
protected:
-// XInterface
-DECLARE_XINTERFACE( )
-DECLARE_XTYPEPROVIDER( )
-
// OAccessibleWrapper
virtual rtl::Reference
createAccessibleContext(
const css::uno::Reference<
css::accessibility::XAccessibleContext >& _rxInnerContext
) override;
-
-// XUnoTunnel
-virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >&
aIdentifier ) override;
};
-IMPLEMENT_FORWARD_XINTERFACE2( OToolBoxWindowItem, OAccessibleWrapper,
OToolBoxWindowItem_Base )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( OToolBoxWindowItem, OAccessibleWrapper,
OToolBoxWindowItem_Base )
-
rtl::Reference
OToolBoxWindowItem::createAccessibleContext(
const Reference< XAccessibleContext >& _rxInnerContext )
{
return new OToolBoxWindowItemContext( m_nIndexInParent,
getComponentContext(), _rxInnerContext, this, getParent() );
}
-
-const Sequence< sal_Int8 > & OToolBoxWindowItem::getUnoTunnelId()
-{
-static const comphelper::UnoIdInit implId;
-return implId.getSeq();
-}
-
-sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence<
sal_Int8 >& _rId )
-{
-return comphelper::getSomethingImpl(_rId, this);
-}
}
// VCLXAccessibleToolBox
@@ -296,7 +267,7 @@ void VCLXAccessibleToolBox::implReleaseToolboxItem(
ToolBoxItemsMap::iterator co
NotifyAccessibleEvent( AccessibleEventId::CHILD, Any( xItemAcc ),
Any() );
}
-auto pWindowItem =
comphelper::getFromUnoTunnel(xItemAcc);
+auto pWindowItem = dynamic_cast(xItemAcc.get());
if ( !pWindowItem )
{
static_cast< VCLXAccessibleToolBoxItem* >( xItemAcc.get()
)->ReleaseToolBox();
@@ -328,7 +299,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl(
ToolBox::ImplToolItems::size_type _
{
Reference< XAccessible > xItemAcc( aIndexAdjust->second );
-auto pWindowItem =
comphelper::getFromUnoTunnel(xItemAcc);
+auto pWindowItem = dynamic_cast(xItemAcc.get());
if ( !pWindowItem )
{
VCLXAccessibleToolBoxItem* pItem = static_cast<
VCLXAccessibleToolBoxItem* >( xItemAcc.get() );
commit 96cd6623662b719f09596cb700a1f828c75228fd
Author: Noel Grandin
AuthorDate: Fri Jan 13 15:34:29 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Jan 16 06:41:53 2023 +
XUnoTunnel->dynamic_cast in VCLXPointer
Change-Id: I322115c214de5d476f84650eb53dae8452d5d1a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145533
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git
[Libreoffice-commits] core.git: 3 commits - include/svx oox/source svx/source
include/svx/ColorSets.hxx | 15 --
oox/source/drawingml/clrscheme.cxx | 24 ++--
svx/source/styles/ColorSets.cxx| 214 +
3 files changed, 162 insertions(+), 91 deletions(-)
New commits:
commit 2ec4a66b6d049f5d11f4ceb993ed907c790ed592
Author: Tomaž Vajngerl
AuthorDate: Thu Jan 5 23:37:18 2023 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat Jan 14 04:44:15 2023 +
svx: add UX defined theme color sets
Change-Id: I82cbe16fcfaa8367dacda7ff977e18b0ed39ec2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145086
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx
index cf634b735c37..439c63d1ee35 100644
--- a/svx/source/styles/ColorSets.cxx
+++ b/svx/source/styles/ColorSets.cxx
@@ -171,7 +171,103 @@ ColorSets::~ColorSets()
void ColorSets::init()
{
-//{
+{
+ColorSet aColorSet("LibreOffice");
+aColorSet.add(model::ThemeColorType::Dark1, 0x00);
+aColorSet.add(model::ThemeColorType::Light1, 0xFF);
+aColorSet.add(model::ThemeColorType::Dark2, 0x00);
+aColorSet.add(model::ThemeColorType::Light2, 0xFF);
+aColorSet.add(model::ThemeColorType::Accent1, 0x18A303);
+aColorSet.add(model::ThemeColorType::Accent2, 0x0369A3);
+aColorSet.add(model::ThemeColorType::Accent3, 0xA33E03);
+aColorSet.add(model::ThemeColorType::Accent4, 0x8E03A3);
+aColorSet.add(model::ThemeColorType::Accent5, 0xC99C00);
+aColorSet.add(model::ThemeColorType::Accent6, 0xC9211E);
+aColorSet.add(model::ThemeColorType::Hyperlink, 0xEE);
+aColorSet.add(model::ThemeColorType::FollowedHyperlink, 0x551A8B);
+maColorSets.push_back(aColorSet);
+}
+{
+ColorSet aColorSet("Rainbow");
+aColorSet.add(model::ThemeColorType::Dark1, 0x00);
+aColorSet.add(model::ThemeColorType::Light1, 0xFF);
+aColorSet.add(model::ThemeColorType::Dark2, 0x1C1C1C);
+aColorSet.add(model::ThemeColorType::Light2, 0xDD);
+aColorSet.add(model::ThemeColorType::Accent1, 0xFF);
+aColorSet.add(model::ThemeColorType::Accent2, 0xFF8000);
+aColorSet.add(model::ThemeColorType::Accent3, 0x00);
+aColorSet.add(model::ThemeColorType::Accent4, 0x00A933);
+aColorSet.add(model::ThemeColorType::Accent5, 0x2A6099);
+aColorSet.add(model::ThemeColorType::Accent6, 0x800080);
+aColorSet.add(model::ThemeColorType::Hyperlink, 0xEE);
+aColorSet.add(model::ThemeColorType::FollowedHyperlink, 0x551A8B);
+maColorSets.push_back(aColorSet);
+}
+{
+ColorSet aColorSet("Beach");
+aColorSet.add(model::ThemeColorType::Dark1, 0x00);
+aColorSet.add(model::ThemeColorType::Light1, 0xFF);
+aColorSet.add(model::ThemeColorType::Dark2, 0xFFBF00);
+aColorSet.add(model::ThemeColorType::Light2, 0x33);
+aColorSet.add(model::ThemeColorType::Accent1, 0xFFF5CE);
+aColorSet.add(model::ThemeColorType::Accent2, 0xDEE6EF);
+aColorSet.add(model::ThemeColorType::Accent3, 0xE8F2A1);
+aColorSet.add(model::ThemeColorType::Accent4, 0xFFD7D7);
+aColorSet.add(model::ThemeColorType::Accent5, 0xDEE7E5);
+aColorSet.add(model::ThemeColorType::Accent6, 0xDDDBB6);
+aColorSet.add(model::ThemeColorType::Hyperlink, 0xEE);
+aColorSet.add(model::ThemeColorType::FollowedHyperlink, 0xEE77D7);
+maColorSets.push_back(aColorSet);
+}
+{
+ColorSet aColorSet("Sunset");
+aColorSet.add(model::ThemeColorType::Dark1, 0x00);
+aColorSet.add(model::ThemeColorType::Light1, 0xFF);
+aColorSet.add(model::ThemeColorType::Dark2, 0x492300);
+aColorSet.add(model::ThemeColorType::Light2, 0xF6F9D4);
+aColorSet.add(model::ThemeColorType::Accent1, 0x00);
+aColorSet.add(model::ThemeColorType::Accent2, 0xFFBF00);
+aColorSet.add(model::ThemeColorType::Accent3, 0xFF8000);
+aColorSet.add(model::ThemeColorType::Accent4, 0xFF4000);
+aColorSet.add(model::ThemeColorType::Accent5, 0xBF0041);
+aColorSet.add(model::ThemeColorType::Accent6, 0x800080);
+aColorSet.add(model::ThemeColorType::Hyperlink, 0xEE);
+aColorSet.add(model::ThemeColorType::FollowedHyperlink, 0x551A8B);
+maColorSets.push_back(aColorSet);
+}
+{
+ColorSet aColorSet("Ocean");
+aColorSet.add(model::ThemeColorType::Dark1, 0x00);
+aColorSet.add(model::ThemeColorType::Light1, 0xFF);
+aColorSet.add(model::ThemeColorType::Dark2, 0x2A6099);
+aColorSet.add(model::ThemeColorType::Light2, 0xCC);
+aColorSet.add(model::ThemeColorType::Accent1, 0x800080);
+aColorSet.add(model::ThemeColorType::Accent2, 0x55308D);
+
[Libreoffice-commits] core.git: 3 commits - sc/source vcl/source vcl/unx
sc/source/filter/inc/workbookhelper.hxx |2 --
sc/source/filter/oox/defnamesbuffer.cxx |4 ++--
sc/source/filter/oox/workbookhelper.cxx | 25 -
vcl/source/font/font.cxx|3 ++-
vcl/unx/generic/gdi/cairotextrender.cxx |6 ++
5 files changed, 22 insertions(+), 18 deletions(-)
New commits:
commit eba5cfe961d3b6e429ee88d452001e689268f3ff
Author: Caolán McNamara
AuthorDate: Sun Dec 11 20:45:48 2022 +
Commit: Caolán McNamara
CommitDate: Sun Dec 11 23:11:08 2022 +
ofz#54221 Out-of-memory
Change-Id: I4b4da37dfa0a961f77bc3bccdf2d25321f7d2447
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143951
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 7bd74f0a4830..878eb3e1ac99 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -266,6 +266,12 @@ void CairoTextRender::DrawTextLayout(const
GenericSalLayout& rLayout, const SalG
return;
}
+if (nWidth > 4024)
+{
+SAL_WARN("vcl", "rendering text would use > 2G Memory: " << nWidth);
+return;
+}
+
if (__lsan_disable)
__lsan_disable();
#endif
commit c6fcdc2a4a354f284ddb5f000572e2146a706715
Author: jsala
AuthorDate: Fri Dec 9 19:44:30 2022 +0100
Commit: Eike Rathke
CommitDate: Sun Dec 11 23:11:02 2022 +
tdf#91367 Remove ApiTokenSequence uses.
Remove unneeded empty ApiTokenSequence parameters.
They go throught some calls and then are converted to ScTokenArray.
A call to ConvertToTokenArray can be removed.
Change-Id: Ic22845e0e06e3af3a91dab966538e59c3e21d470
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143886
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/filter/inc/workbookhelper.hxx
b/sc/source/filter/inc/workbookhelper.hxx
index 0234c50252ff..7aec3a68409c 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -168,7 +168,6 @@ public:
@param orName (in/out-parameter) Returns the resulting used name. */
RangeDataRet createNamedRangeObject(
OUString& orName,
-const css::uno::Sequence<
css::sheet::FormulaToken>& rTokens,
sal_Int32 nIndex,
sal_Int32 nNameFlags, bool bHidden ) const;
@@ -177,7 +176,6 @@ public:
@param orName (in/out-parameter) Returns the resulting used name. */
RangeDataRet createLocalNamedRangeObject(
OUString& orName,
-const css::uno::Sequence<
css::sheet::FormulaToken>& rTokens,
sal_Int32 nIndex,
sal_Int32 nNameFlags, sal_Int32 nTab, bool bHidden
) const;
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx
b/sc/source/filter/oox/defnamesbuffer.cxx
index 8cae1fb737bd..4f8155cae40e 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -234,9 +234,9 @@ void DefinedName::createNameObject( sal_Int32 nIndex )
// create the name and insert it into the document, maCalcName will be
changed to the resulting name
if (maModel.mnSheet >= 0)
-maScRangeData = createLocalNamedRangeObject( maCalcName,
ApiTokenSequence(), nIndex, nNameFlags, maModel.mnSheet, maModel.mbHidden );
+maScRangeData = createLocalNamedRangeObject(maCalcName, nIndex,
nNameFlags, maModel.mnSheet, maModel.mbHidden);
else
-maScRangeData = createNamedRangeObject( maCalcName,
ApiTokenSequence(), nIndex, nNameFlags, maModel.mbHidden );
+maScRangeData = createNamedRangeObject( maCalcName, nIndex,
nNameFlags, maModel.mbHidden);
mnTokenIndex = nIndex;
}
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 1f07567f1672..7d651b9764ab 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -150,9 +150,9 @@ public:
/** Returns the specified cell or page style from the Calc document. */
Reference< XStyle > getStyleObject( const OUString& rStyleName, bool
bPageStyle ) const;
/** Creates and returns a defined name on-the-fly in the Calc document. */
-WorkbookHelper::RangeDataRet createNamedRangeObject( OUString& orName,
const Sequence< FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags,
bool bHidden );
+WorkbookHelper::RangeDataRet createNamedRangeObject(OUString& orName,
sal_Int32 nIndex, sal_Int32 nNameFlags, bool bHidden);
/** Creates and returns a defined name on the-fly in the correct Calc
sheet. */
-WorkbookHelper::RangeDataRet createLocalNamedRangeObject( OUString&
orName, const Sequence< FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32
nNameFlags,
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/inc vcl/unx
include/vcl/metaact.hxx| 12
vcl/inc/unx/gtk/gtksalmenu.hxx |1
vcl/unx/gtk3/gtksalmenu.cxx| 60 -
3 files changed, 43 insertions(+), 30 deletions(-)
New commits:
commit 210bbdead214531172d74d0d2975f47cf973bc69
Author: Caolán McNamara
AuthorDate: Sun Oct 10 18:07:31 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 10 20:32:47 2021 +0200
gtk4: popdown context menu when radio/check is toggled
Change-Id: I6cee9ee639b85c76c140d1ee0ad735fb57dae905
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123345
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index f001a17c75d8..818cdcd9b57f 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -1416,7 +1416,9 @@ void GtkSalMenu::DispatchCommand(const gchar *pCommand)
}
if (pTopLevel->mpMenuWidget)
{
-#if !GTK_CHECK_VERSION(4, 0, 0)
+#if GTK_CHECK_VERSION(4, 0, 0)
+gtk_popover_popdown(GTK_POPOVER(pTopLevel->mpMenuWidget));
+#else
gtk_menu_shell_deactivate(GTK_MENU_SHELL(pTopLevel->mpMenuWidget));
#endif
}
commit 4a9ecab08c1ea6879919cb807e243ac1899f61f3
Author: Rene Engelhard
AuthorDate: Sun Oct 10 08:20:57 2021 +0200
Commit: Tomaž Vajngerl
CommitDate: Sun Oct 10 20:32:40 2021 +0200
fix (cppunit test) build with --enable-mergelibs
S=/home/rene/LibreOffice/git/master && I=$S/instdir && W=$S/workdir &&
/usr/bin/ccache x86_64-linux-gnu-g++ -pthread -shared -Wl,-z,noexecstack
-Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program
-Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc
-Wl,--hash-style=gnu -Wl,-Bsymbolic-functions -L$W/LinkTarget/StaticLibrary
-L$I/sdk/lib -L$I/program -L$I/program -L$W/LinkTarget/Library -Wl,-z,relro
$W/CxxObject/vcl/qa/cppunit/BackendTest.o -Wl,--start-group -lcppunit
-Wl,--end-group -Wl,--no-as-needed -lmergedlo -luno_cppu -luno_cppuhelpergcc3
-luno_sal -ltest -lunotest -o
$W/LinkTarget/CppunitTest/libtest_vcl_backend_test.so
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in
function `VclOutdevTest::testDrawPixel()':
././vcl/qa/cppunit/outdev.cxx:1091: undefined reference to `typeinfo for
MetaPixelAction'
/usr/bin/ld:
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in
function `VclOutdevTest::testDrawRect()':
././vcl/qa/cppunit/outdev.cxx:1203: undefined reference to `typeinfo for
MetaRoundRectAction'
/usr/bin/ld:
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in
function `VclOutdevTest::testDrawEllipse()':
././vcl/qa/cppunit/outdev.cxx:1225: undefined reference to `typeinfo for
MetaEllipseAction'
/usr/bin/ld:
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in
function `VclOutdevTest::testDrawPie()':
././vcl/qa/cppunit/outdev.cxx:1243: undefined reference to `typeinfo for
MetaPieAction'
/usr/bin/ld:
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in
function `VclOutdevTest::testDrawChord()':
././vcl/qa/cppunit/outdev.cxx:1263: undefined reference to `typeinfo for
MetaChordAction'
/usr/bin/ld:
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in
function `VclOutdevTest::testDrawArc()':
././vcl/qa/cppunit/outdev.cxx:1284: undefined reference to `typeinfo for
MetaArcAction'
Change-Id: I65f79d726de553d894c848a89cf1dd97d5e45b54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123329
Tested-by: Jenkins
Reviewed-by: Chris Sherlock
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index dc14179712e1..ca977a18e1e9 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -101,7 +101,7 @@ protected:
static void WriteColor(SvStream& rIStm, ::Color aColor);
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPixelAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPixelAction final : public MetaAction
{
private:
Point maPt;
@@ -218,7 +218,7 @@ public:
voidSetRect(const tools::Rectangle& rRect) { maRect =
rRect; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRoundRectAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaRoundRectAction final : public MetaAction
{
private:
@@ -252,7 +252,7 @@ public:
voidSetVertRound(sal_uInt32 rVertRound) { mnVertRound =
rVertRound; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaEllipseAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaEllipseAction final : public MetaAction
{
private:
@@ -279,7 +279,7 @@ public:
voidSetRect(const tools::Rectangle& rRect) { maRect =
rRect; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaArcAction final : public
[Libreoffice-commits] core.git: 3 commits - accessibility/source animations/source chart2/source comphelper/source configmgr/source connectivity/source dbaccess/source editeng/source embeddedobj/sourc
accessibility/source/standard/vclxaccessibletoolbox.cxx | 11 - animations/source/animcore/animcore.cxx | 16 -- chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx |8 - chart2/source/view/main/ChartView.cxx |7 - comphelper/source/misc/accimplaccess.cxx | 11 - configmgr/source/access.cxx | 10 - configmgr/source/childaccess.cxx |5 configmgr/source/childaccess.hxx |2 connectivity/source/commontools/ConnectionWrapper.cxx |8 - connectivity/source/commontools/TConnection.cxx | 10 - connectivity/source/drivers/ado/AColumn.cxx | 11 - connectivity/source/drivers/ado/AConnection.cxx | 13 -- connectivity/source/drivers/ado/ADriver.cxx |5 connectivity/source/drivers/ado/AGroup.cxx| 11 - connectivity/source/drivers/ado/AIndex.cxx| 11 - connectivity/source/drivers/ado/AKey.cxx | 11 - connectivity/source/drivers/ado/ATable.cxx| 11 - connectivity/source/drivers/ado/AUser.cxx | 11 - connectivity/source/drivers/ado/AView.cxx | 11 - connectivity/source/drivers/calc/CTable.cxx | 11 - connectivity/source/drivers/dbase/DIndex.cxx | 13 -- connectivity/source/drivers/dbase/DIndexes.cxx|2 connectivity/source/drivers/dbase/DTable.cxx | 23 +--- connectivity/source/drivers/dbase/DTables.cxx |2 connectivity/source/drivers/file/FConnection.cxx | 10 - connectivity/source/drivers/file/FResultSet.cxx | 11 - connectivity/source/drivers/file/FStatement.cxx |7 - connectivity/source/drivers/file/FTable.cxx | 11 - connectivity/source/drivers/firebird/Connection.cxx |7 - connectivity/source/drivers/flat/ETable.cxx | 11 - connectivity/source/drivers/hsqldb/HTable.cxx | 11 - connectivity/source/drivers/mysql_jdbc/YTable.cxx | 10 - connectivity/source/drivers/writer/WTable.cxx | 10 - connectivity/source/sdbcx/VDescriptor.cxx |9 - dbaccess/source/core/api/RowSet.cxx | 20 +-- dbaccess/source/core/api/TableDeco.cxx|8 - dbaccess/source/core/api/querydescriptor.cxx | 10 - dbaccess/source/core/api/table.cxx| 15 -- dbaccess/source/core/dataaccess/ContentHelper.cxx | 10 - dbaccess/source/core/dataaccess/databasecontext.cxx | 11 - dbaccess/source/core/dataaccess/databasedocument.cxx |7 - dbaccess/source/ui/querydesign/JoinExchange.cxx | 11 - editeng/source/items/xmlcnitm.cxx |9 - editeng/source/uno/unofield.cxx |6 - editeng/source/uno/unotext.cxx| 24 embeddedobj/source/msole/olecomponent.cxx |3 extensions/source/propctrlr/formcomponenthandler.cxx |4 filter/source/msfilter/msvbahelper.cxx|7 - filter/source/xsltdialog/xmlfilterdialogcomponent.cxx |5 forms/source/component/Columns.cxx|2 forms/source/richtext/richtextmodel.cxx |9 - forms/source/xforms/binding.cxx |7 - forms/source/xforms/model.cxx |8 - forms/source/xforms/submission.cxx|7 - forms/source/xforms/xpathlib/xpathlib.cxx |6 - framework/inc/classes/imagewrapper.hxx|2 framework/inc/classes/rootactiontriggercontainer.hxx |1 framework/source/fwe/classes/imagewrapper.cxx | 11 - framework/source/fwe/classes/rootactiontriggercontainer.cxx |8 - framework/source/fwe/helper/actiontriggerhelper.cxx | 20 +-- framework/source/fwi/uielement/constitemcontainer.cxx |6 - framework/source/fwi/uielement/rootitemcontainer.cxx |4
[Libreoffice-commits] core.git: 3 commits - basegfx/source basegfx/test comphelper/source compilerplugins/clang sfx2/source svx/source vcl/headless vcl/source vcl/unx
basegfx/source/polygon/b2dtrapezoid.cxx |6 +++---
basegfx/test/boxclipper.cxx |2 +-
comphelper/source/processfactory/processfactory.cxx |3 ++-
compilerplugins/clang/sequenceloop.cxx |5 -
sfx2/source/appl/appopen.cxx|2 --
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |2 +-
svx/source/svdraw/svdotextpathdecomposition.cxx |2 +-
vcl/headless/svpgdi.cxx |2 +-
vcl/source/filter/wmf/emfwr.cxx |4 ++--
vcl/source/filter/wmf/wmfwr.cxx |4 ++--
vcl/source/gdi/FileDefinitionWidgetDraw.cxx |2 +-
vcl/source/gdi/lineinfo.cxx |4 ++--
vcl/source/outdev/line.cxx |8
vcl/source/outdev/polygon.cxx |4 ++--
vcl/source/outdev/transparent.cxx |4 ++--
vcl/unx/generic/gdi/salgdi.cxx |2 +-
16 files changed, 29 insertions(+), 27 deletions(-)
New commits:
commit f29ef71073bb31f05d6cc50f952e827134868c2d
Author: Noel Grandin
AuthorDate: Tue Aug 17 14:46:29 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 18 08:55:23 2021 +0200
avoid constructing OUString on hot path (tdf#105575)
Change-Id: I7c9925fc7f68cdc9bd1a9c1834daabff09c8cf6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120604
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/comphelper/source/processfactory/processfactory.cxx
b/comphelper/source/processfactory/processfactory.cxx
index 8df1e244ca19..ea5595646e4c 100644
--- a/comphelper/source/processfactory/processfactory.cxx
+++ b/comphelper/source/processfactory/processfactory.cxx
@@ -86,8 +86,9 @@ Reference< XComponentContext > getComponentContext(
Reference< XComponentContext > xRet;
uno::Reference const xProps( factory, uno::UNO_QUERY
);
if (xProps.is()) {
+static constexpr OUStringLiteral DEFAULT_CONTEXT = u"DefaultContext";
try {
-xRet.set( xProps->getPropertyValue("DefaultContext"),
+xRet.set( xProps->getPropertyValue(DEFAULT_CONTEXT),
uno::UNO_QUERY );
}
catch (beans::UnknownPropertyException & e) {
commit cc9bc379de14a5ecfcb7b510fe74beeab768f875
Author: Noel Grandin
AuthorDate: Tue Aug 17 20:14:27 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 18 08:54:56 2021 +0200
remove dead code
ever since
commit fd069bee7e57ad529c3c0974559fd2d84ec3151a
Date: Mon Sep 18 16:07:07 2000 +
initial import
Change-Id: I1fd724f2e4f31353da60d2615e6c840bbb88dfcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120619
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 15c47a31c0e5..5936accbfedb 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -504,8 +504,6 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
}
ErrCode lErr = ERRCODE_NONE;
-SfxItemSet* pSet = new SfxAllItemSet( GetPool() );
-pSet->Put( SfxBoolItem( SID_TEMPLATE, true ) );
if ( !bDirect )
{
SfxDocumentTemplates aTmpFac;
commit f46740abc225f5b4c7f604bf3ef32c503c7fc858
Author: Noel Grandin
AuthorDate: Tue Aug 17 20:16:33 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 18 08:54:36 2021 +0200
loplugin:sequenceloop also check for B2DPolyPolygon
which has the same problem
Change-Id: I98f9924626f26739e91d6a9d21e4276473ea314d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120620
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx
b/basegfx/source/polygon/b2dtrapezoid.cxx
index f30001f52d2a..3a255c18a7a3 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -496,7 +496,7 @@ namespace basegfx::trapezoidhelper
aSource = aSource.getDefaultAdaptiveSubdivision();
}
-for(const auto& aPolygonCandidate : aSource)
+for(const auto& aPolygonCandidate : std::as_const(aSource))
{
// 1st run: count points
const sal_uInt32 nCount(aPolygonCandidate.count());
@@ -513,7 +513,7 @@ namespace basegfx::trapezoidhelper
// after 2nd loop since pointers to it are used in the
edges
maPoints.reserve(nAllPointCount);
-for(const auto& aPolygonCandidate : aSource)
+for(const auto& aPolygonCandidate : std::as_const(aSource))
{
// 2nd run: add points
const sal_uInt32 nCount(aPolygonCandidate.count());
@@ -533,7 +533,7 @@ namespace
[Libreoffice-commits] core.git: 3 commits - include/o3tl sccomp/source sd/source sw/source
include/o3tl/deleter.hxx | 49 ---
sccomp/source/solver/SwarmSolver.cxx |2 -
sd/source/ui/view/sdview.cxx |5 ++-
sw/source/core/undo/undobj.cxx |4 ++
sw/source/uibase/uno/unoatxt.cxx |4 ++
5 files changed, 38 insertions(+), 26 deletions(-)
New commits:
commit 6c7075ee60e799db8b8f94a6d0317ad9bcb75b5d
Author: Caolán McNamara
AuthorDate: Sat Jun 19 21:32:12 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Jun 20 15:17:25 2021 +0200
cid#1485150 suppress Uncaught exception
Change-Id: Ic1b2a44afd15e0720edd48f3502dd2799795551a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117508
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/o3tl/deleter.hxx b/include/o3tl/deleter.hxx
index 7cb9145eb2a1..ed8b1a583094 100644
--- a/include/o3tl/deleter.hxx
+++ b/include/o3tl/deleter.hxx
@@ -17,6 +17,33 @@
#include
#include
+#if defined(__COVERITY__)
+#define suppress_fun_call_w_exception(expr)
\
+do
\
+{
\
+try
\
+{
\
+expr;
\
+}
\
+catch (const css::uno::Exception& ex)
\
+{
\
+SAL_WARN("vcl.app", "Fatal exception: " << exceptionToString(ex));
\
+std::terminate();
\
+}
\
+catch (const std::exception& e)
\
+{
\
+SAL_WARN("vcl.app", "Fatal exception: " << e.what());
\
+std::terminate();
\
+}
\
+} while (false)
+#else
+#define suppress_fun_call_w_exception(expr)
\
+do
\
+{
\
+expr;
\
+} while (false)
+#endif
+
namespace o3tl
{
/** To markup std::unique_ptr that coverity warns might throw exceptions
@@ -25,27 +52,7 @@ namespace o3tl
*/
template struct default_delete
{
-void operator()(T* p) noexcept
-{
-#if defined(__COVERITY__)
-try
-{
-delete p;
-}
-catch (const css::uno::Exception& ex)
-{
-SAL_WARN("vcl.app", "Fatal exception: " << exceptionToString(ex));
-std::terminate();
-}
-catch (const std::exception& e)
-{
-SAL_WARN("vcl.app", "Fatal exception: " << e.what());
-std::terminate();
-}
-#else
-delete p;
-#endif
-}
+void operator()(T* p) noexcept { suppress_fun_call_w_exception(delete p); }
};
struct free_delete
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 3f3120606776..8470118e6ceb 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -145,8 +146,8 @@ View::~View()
while(PaintWindowCount())
{
// remove all registered OutDevs
-// coverity[fun_call_w_exception : SUPPRESS] - cid#485150 silence
Uncaught exception
-DeleteWindowFromPaintView(GetFirstOutputDevice() /*GetWin(0)*/);
+// cid#1485150 silence Uncaught exception
+
suppress_fun_call_w_exception(DeleteWindowFromPaintView(GetFirstOutputDevice()));
}
}
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 5c2405f32966..02d2a5327c38 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
// This
[Libreoffice-commits] core.git: 3 commits - cui/uiconfig vcl/unx
cui/uiconfig/ui/areatabpage.ui | 47 +++-- vcl/unx/gtk3/gtkinst.cxx |9 +++ vcl/unx/gtk4/convert3to4.cxx | 51 ++--- 3 files changed, 66 insertions(+), 41 deletions(-) New commits: commit ecdb4b2ca8a55b8b2d077cabd930964a41624736 Author: Caolán McNamara AuthorDate: Tue Jun 15 16:58:32 2021 +0100 Commit: Caolán McNamara CommitDate: Wed Jun 16 09:53:52 2021 +0200 gtk4: use image-position to position elements within replacement box enable insert, section with pick button in color subtab of background tabpage as example usage Change-Id: Ie972e2de9181888b59159a7a12651e6f7f7dec26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117275 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 2f04556c88f1..b8ece3292b5d 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -22242,8 +22242,11 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIFile != "cui/ui/acorreplacepage.ui" && rUIFile != "cui/ui/applyautofmtpage.ui" && rUIFile != "cui/ui/applylocalizedpage.ui" && +rUIFile != "cui/ui/areatabpage.ui" && rUIFile != "cui/ui/autocorrectdialog.ui" && +rUIFile != "cui/ui/bitmaptabpage.ui" && rUIFile != "cui/ui/breaknumberoption.ui" && +rUIFile != "cui/ui/colorpage.ui" && rUIFile != "cui/ui/colorpickerdialog.ui" && rUIFile != "cui/ui/editdictionarydialog.ui" && rUIFile != "cui/ui/eventassigndialog.ui" && @@ -22264,6 +22267,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIFile != "cui/ui/macroassigndialog.ui" && rUIFile != "cui/ui/macroassignpage.ui" && rUIFile != "cui/ui/macroselectordialog.ui" && +rUIFile != "cui/ui/namedialog.ui" && rUIFile != "cui/ui/objectnamedialog.ui" && rUIFile != "cui/ui/objecttitledescdialog.ui" && rUIFile != "cui/ui/optjsearchpage.ui" && @@ -22336,6 +22340,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIFile != "modules/BasicIDE/ui/newlibdialog.ui" && rUIFile != "modules/BasicIDE/ui/organizedialog.ui" && rUIFile != "modules/scalc/ui/advancedfilterdialog.ui" && +rUIFile != "modules/scalc/ui/checkwarningdialog.ui" && rUIFile != "modules/scalc/ui/colwidthdialog.ui" && rUIFile != "modules/scalc/ui/consolidatedialog.ui" && rUIFile != "modules/scalc/ui/dataform.ui" && @@ -22401,11 +22406,14 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIFile != "modules/swriter/ui/exchangedatabases.ui" && rUIFile != "modules/swriter/ui/footendnotedialog.ui" && rUIFile != "modules/swriter/ui/footnotepage.ui" && +rUIFile != "modules/swriter/ui/footnotesendnotestabpage.ui" && rUIFile != "modules/swriter/ui/gotopagedialog.ui" && +rUIFile != "modules/swriter/ui/indentpage.ui" && rUIFile != "modules/swriter/ui/indexentry.ui" && rUIFile != "modules/swriter/ui/insertbookmark.ui" && rUIFile != "modules/swriter/ui/insertbreak.ui" && rUIFile != "modules/swriter/ui/insertfootnote.ui" && +rUIFile != "modules/swriter/ui/insertsectiondialog.ui" && rUIFile != "modules/swriter/ui/inserttable.ui" && rUIFile != "modules/swriter/ui/linenumbering.ui" && rUIFile != "modules/swriter/ui/newuserindexdialog.ui" && @@ -22417,6 +22425,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIFile != "modules/swriter/ui/printoptionspage.ui" && rUIFile != "modules/swriter/ui/renameautotextdialog.ui" && rUIFile != "modules/swriter/ui/renameobjectdialog.ui" && +rUIFile != "modules/swriter/ui/sectionpage.ui" && rUIFile != "modules/swriter/ui/statisticsinfopage.ui" && rUIFile != "modules/swriter/ui/titlepage.ui" && rUIFile != "modules/swriter/ui/watermarkdialog.ui" && diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx index 24b67f01e576..2ef37b99c72b 100644 --- a/vcl/unx/gtk4/convert3to4.cxx +++ b/vcl/unx/gtk4/convert3to4.cxx @@ -310,23 +310,23 @@ struct ConvertResult bool m_bHasVisible; bool m_bHasIconSize; bool m_bAlwaysShowImage; -bool m_bImageAtTop; bool m_bUseUnderline; bool m_bVertOrientation; +GtkPositionType m_eImagePos; css::uno::Reference m_xPropertyLabel; css::uno::Reference m_xPropertyIconName; ConvertResult(bool bChildCanFocus, bool bHasVisible, bool bHasIconSize, bool bAlwaysShowImage, - bool bImageAtTop, bool bUseUnderline, bool bVertOrientation, + bool bUseUnderline, bool bVertOrientation, GtkPositionType eImagePos,
[Libreoffice-commits] core.git: 3 commits - sc/source sd/source vcl/unx
sc/source/filter/lotus/lotimpop.cxx | 36 ++
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 10 ---
sd/source/ui/inc/AccessibleDocumentViewBase.hxx |5 -
vcl/unx/gtk3/a11y/atkwrapper.hxx |1
vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx | 28 ++
5 files changed, 65 insertions(+), 15 deletions(-)
New commits:
commit 1bc297cb63e52b5cad3580ac5a3cb274c6dfcf66
Author: Caolán McNamara
AuthorDate: Wed Mar 24 09:30:18 2021 +
Commit: Caolán McNamara
CommitDate: Wed Mar 24 20:41:58 2021 +0100
cid#1474363 Untrusted value as argument
and...
cid#1474164 Untrusted value as argument
cid#1474033 Untrusted value as argument
cid#1473968 Untrusted value as argument
cid#1473922 Untrusted value as argument
cid#1473817 Untrusted value as argument
Change-Id: I19d3b758767c2b0cb4369257efbe477c37f231ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113027
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/filter/lotus/lotimpop.cxx
b/sc/source/filter/lotus/lotimpop.cxx
index 78ff31f824ef..1fa5c14632e7 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -173,6 +173,12 @@ void ImportLotus::Errcell()
Read( aA );
+if (!rD.ValidAddress(aA))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
ScSetStringParam aParam;
aParam.setTextInput();
rD.EnsureTable(aA.Tab());
@@ -185,6 +191,12 @@ void ImportLotus::Nacell()
Read( aA );
+if (!rD.ValidAddress(aA))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
ScSetStringParam aParam;
aParam.setTextInput();
rD.EnsureTable(aA.Tab());
@@ -201,6 +213,12 @@ void ImportLotus::Labelcell()
Read( cAlign );
Read( aLabel );
+if (!rD.ValidAddress(aA))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
ScSetStringParam aParam;
aParam.setTextInput();
rD.EnsureTable(aA.Tab());
@@ -215,6 +233,12 @@ void ImportLotus::Numbercell()
Read( aAddr );
Read( fVal );
+if (!rD.ValidAddress(aAddr))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
rD.EnsureTable(aAddr.Tab());
rD.SetValue(aAddr, fVal);
}
@@ -227,6 +251,12 @@ void ImportLotus::Smallnumcell()
Read( aAddr );
Read( nVal );
+if (!rD.ValidAddress(aAddr))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
rD.EnsureTable(aAddr.Tab());
rD.SetValue(aAddr, SnumToDouble(nVal));
}
@@ -251,6 +281,12 @@ void ImportLotus::Formulacell( sal_uInt16 n )
if (!aConv.good())
return;
+if (!rD.ValidAddress(aAddr))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
ScFormulaCell* pCell = pErg ? new ScFormulaCell(rD, aAddr,
std::move(pErg)) : new ScFormulaCell(rD, aAddr);
pCell->AddRecalcMode( ScRecalcMode::ONLOAD_ONCE );
rD.EnsureTable(aAddr.Tab());
commit c72a00868cd13be911798d2c508c10b6367606ab
Author: Caolán McNamara
AuthorDate: Tue Mar 23 13:13:37 2021 +
Commit: Caolán McNamara
CommitDate: Wed Mar 24 20:39:29 2021 +0100
Related: tdf#135363 don't keep a reference to the vcl::Window
in fact, why keep a VclPtr reference to that window at all
Change-Id: I3f0511b41434cba744a63d4a9e185c97a6cef5e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112992
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index a819ca19b3e4..2e198ba8827e 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -66,7 +66,6 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase (
pViewShell->GetDoc()->GetDocumentType() ==
DocumentType::Impress ?
AccessibleRole::DOCUMENT_PRESENTATION :
AccessibleRole::DOCUMENT),
- mpWindow (pSdWindow),
mxController (rxController),
maViewForwarder (
static_cast(pViewShell->GetView()),
@@ -88,17 +87,10 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase (
mpViewShell = pViewShell;
}
-void AccessibleDocumentViewBase::ReleaseWindow()
-{
-SolarMutexGuard g;
-mpWindow.reset();
-}
-
AccessibleDocumentViewBase::~AccessibleDocumentViewBase()
{
// At this place we should be disposed. You may want to add a
// corresponding assertion into the destructor of a derived class.
-ReleaseWindow(); // this should already be done by impl_dispose
}
void AccessibleDocumentViewBase::Init()
@@ -488,8 +480,6 @@ void
[Libreoffice-commits] core.git: 3 commits - officecfg/registry sc/Module_sc.mk sfx2/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 - sc/Module_sc.mk |8 +++ sfx2/uiconfig/ui/loadtemplatedialog.ui | 11 +- sfx2/uiconfig/ui/templatedlg.ui |7 +- 4 files changed, 17 insertions(+), 11 deletions(-) New commits: commit 008cf21683f2b072532ab706f25a7a6bd1126231 Author: Seth Chaiklin AuthorDate: Mon Jan 11 14:38:53 2021 +0100 Commit: Heiko Tietze CommitDate: Wed Jan 13 14:11:11 2021 +0100 tdf#138846 change "Settings" to "Tools" in Template Manager dialog And add "extended tooltip" to explain what is hidden inside the icon Change-Id: I46903d7001c180af44a47ebf0de32bd3d932c3a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109007 Tested-by: Jenkins Reviewed-by: Seth Chaiklin Reviewed-by: Heiko Tietze diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui index 1ea6b4b4c499..5246f7542e41 100644 --- a/sfx2/uiconfig/ui/templatedlg.ui +++ b/sfx2/uiconfig/ui/templatedlg.ui @@ -661,12 +661,17 @@ True False -Settings +Tools image7 none True menu1 False + + +Provides commands to create, rename and delete categories, reset default templates, and refresh the template manager. + + False commit 9b36407b7a3d1052a79077ca54904e3b3b8d0bce Author: Xisco Fauli AuthorDate: Tue Jan 12 18:17:19 2021 +0100 Commit: Xisco Fauli CommitDate: Wed Jan 13 14:10:53 2021 +0100 move CppunitTest_sc_jumbosheets_test from subsequentcheck to slowcheck and sort the list this way, Jenkins executes this module on Windows and Mac as well. Before I submitted this test, I ran 'make clean && make CppunitTest_sc_uicalc' on a Win machine Change-Id: I906255bcf82e19917036aa3e99344f9ecf2a26fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109190 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 5d5b033711f9..58bd568e0e00 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -61,13 +61,14 @@ endif $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_cond_format_merge \ + CppunitTest_sc_copypaste \ + CppunitTest_sc_html_export_test \ + CppunitTest_sc_jumbosheets_test \ CppunitTest_sc_new_cond_format_api \ CppunitTest_sc_pdf_export \ + CppunitTest_sc_pivottable_filters_test \ CppunitTest_sc_subsequent_filters_test \ CppunitTest_sc_subsequent_export_test \ - CppunitTest_sc_html_export_test \ - CppunitTest_sc_copypaste \ - CppunitTest_sc_pivottable_filters_test \ CppunitTest_sc_uicalc \ )) @@ -175,7 +176,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_indexenumeration_tablerowsenumeration \ CppunitTest_sc_indexenumeration_textfieldenumeration \ CppunitTest_sc_importdescriptorbaseobj \ - CppunitTest_sc_jumbosheets_test \ CppunitTest_sc_labelrangeobj \ CppunitTest_sc_labelrangesobj \ CppunitTest_sc_macros_test \ commit e58b2365e6ec962d8832636283b1e74b5c0246c6 Author: Seth Chaiklin AuthorDate: Mon Jan 11 13:48:10 2021 +0100 Commit: Heiko Tietze CommitDate: Wed Jan 13 14:08:48 2021 +0100 tdf#102002 update labels and tooltip in 'Load Styles' dialog box Change-Id: I9091e19dcfb44e9aeb89eb005b4f309d29359549 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109006 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 35a4e60a69bb..0c593f09373f 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1187,7 +1187,7 @@ - ~Load Styles... + ~Load Styles from Template 1 diff --git a/sfx2/uiconfig/ui/loadtemplatedialog.ui b/sfx2/uiconfig/ui/loadtemplatedialog.ui index 2ff9f8cf22fe..fb08a626b01d 100644 --- a/sfx2/uiconfig/ui/loadtemplatedialog.ui +++ b/sfx2/uiconfig/ui/loadtemplatedialog.ui @@ -259,7 +259,7 @@ True -Te_xt +_Paragraph and Character True False True @@ -299,7 +299,7 @@
[Libreoffice-commits] core.git: 3 commits - drawinglayer/source sw/qa translations
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |2 +- translations|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 668525eeeb4a84bafb90b1d920e68a1cc3e8dfaf Author: Andrea Gelmini AuthorDate: Wed Dec 16 20:52:10 2020 +0100 Commit: Julien Nabet CommitDate: Thu Dec 17 18:37:08 2020 +0100 Removed executable bits on fodt file Change-Id: I6abb926efe745e27190cd36e249d2b8845c348f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107855 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/sw/qa/extras/layout/data/tdf137819.fodt b/sw/qa/extras/layout/data/tdf137819.fodt old mode 100755 new mode 100644 commit 5cf7d315891147ca20c57b2ced9193938160189b Author: Andrea Gelmini AuthorDate: Wed Dec 16 20:51:59 2020 +0100 Commit: Julien Nabet CommitDate: Thu Dec 17 18:36:48 2020 +0100 Fix typo Change-Id: I1790f37a3d0a6d4921f819b27c29cc6ee59ce00c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107854 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index ebbc41744734..1402459297bb 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -711,7 +711,7 @@ void VclPixelProcessor2D::processControlPrimitive2D( // Tiled Rendering clients usually do *not* have real VCL-Windows for the controls, but // exactly that would be needed on each client displaying the tiles (what would be hard // to do but also would have advantages - the clients would have real controls in the -// shape of their traget system which could be interacted with...). It is also what the +// shape of their target system which could be interacted with...). It is also what the // office does. // For now, fallback to just render these controls when Tiled Rendering is active to just // have them displayed on all clients. commit 22214e27c7b0a8ef5612326d85dd9b847819413d Author: Christian Lohmaier AuthorDate: Thu Dec 17 18:36:04 2020 +0100 Commit: Gerrit Code Review CommitDate: Thu Dec 17 18:36:04 2020 +0100 Update git submodules * Update translations from branch 'master' to 14f402c21427505066d2b5e093bdf48488ac5964 - update translations for 7.1.0 rc1 and force-fix errors usinc pocheck Change-Id: I302feb12a0180d134f32c450c15f2eae5cc6b19b diff --git a/translations b/translations index 0c5bce2255d6..14f402c21427 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 0c5bce2255d6cab360e066c391a14d85d7e7d115 +Subproject commit 14f402c21427505066d2b5e093bdf48488ac5964 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig dbaccess/source translations
cui/source/dialogs/hlmailtp.cxx|2 +-
cui/uiconfig/ui/hyperlinkmailpage.ui |8
dbaccess/source/ui/control/RelationControl.cxx |2 +-
translations |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit f353fa15b547cbeb70e2be1ed2d3d89a84ebad33
Author: Caolán McNamara
AuthorDate: Mon Sep 28 09:48:54 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 28 13:13:56 2020 +0200
adressbook->addressbook
Change-Id: Ic72f00a704b7cbb5d1f5639c1cf726cf4693b470
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103536
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 4e2e111fcc9b..1cae4b29d2fa 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star;
SvxHyperlinkMailTp::SvxHyperlinkMailTp(weld::Container* pParent, SvxHpLinkDlg*
pDlg, const SfxItemSet* pItemSet)
: SvxHyperlinkTabPageBase(pParent, pDlg, "cui/ui/hyperlinkmailpage.ui",
"HyperlinkMailPage", pItemSet)
, m_xCbbReceiver(new SvxHyperURLBox(xBuilder->weld_combo_box("receiver")))
-, m_xBtAdrBook(xBuilder->weld_button("adressbook"))
+, m_xBtAdrBook(xBuilder->weld_button("addressbook"))
, m_xFtSubject(xBuilder->weld_label("subject_label"))
, m_xEdSubject(xBuilder->weld_entry("subject"))
{
diff --git a/cui/uiconfig/ui/hyperlinkmailpage.ui
b/cui/uiconfig/ui/hyperlinkmailpage.ui
index 82963b3a4250..fde97f377f9c 100644
--- a/cui/uiconfig/ui/hyperlinkmailpage.ui
+++ b/cui/uiconfig/ui/hyperlinkmailpage.ui
@@ -51,16 +51,16 @@
-
+
True
True
True
-Data Sources...
+Data Sources...
image1
True
-
-Hides or
shows the data source browser.
+
+Hides
or shows the data source browser.
commit 70866d4663e7e7414539a5e8664385d8b13ba034
Author: Caolán McNamara
AuthorDate: Sun Sep 27 20:06:17 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 28 13:12:42 2020 +0200
Related: tdf#137016 check if subcontrol has the focus
Change-Id: I632188bc0512c9d8935bd0898c96e066881ebeb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103523
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/source/ui/control/RelationControl.cxx
b/dbaccess/source/ui/control/RelationControl.cxx
index d9de91ba494b..69f0a00cae2d 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -184,7 +184,7 @@ namespace dbaui
bool ORelationControl::PreNotify(NotifyEvent& rNEvt)
{
-if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS &&
!HasChildPathFocus() )
+if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS &&
!HasChildPathFocus() && !ControlHasFocus())
PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate),
nullptr, true);
else if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
PostUserEvent(LINK(this, ORelationControl, AsynchActivate),
nullptr, true);
commit 82ae5d148123b0514c119f6b775fa595737cbd7c
Author: Christian Lohmaier
AuthorDate: Mon Sep 28 13:08:38 2020 +0200
Commit: Gerrit Code Review
CommitDate: Mon Sep 28 13:08:38 2020 +0200
Update git submodules
* Update translations from branch 'master'
to b7dd30b210d1d080404aed2dc7cf2270a10d1260
- update translations for master
and force-fix errors using pocheck
Change-Id: Ifb5878eff9d322124054a88241a83402f35e2fa1
diff --git a/translations b/translations
index 14a72851d401..b7dd30b210d1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 14a72851d401d86cf9fd72a5e139ab87eb0f47d1
+Subproject commit b7dd30b210d1d080404aed2dc7cf2270a10d1260
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - cui/source slideshow/source translations
cui/source/options/optjava.cxx | 19 ++
cui/source/options/optjava.hxx |1
slideshow/source/engine/animationfactory.cxx |2 -
slideshow/source/engine/box2dtools.cxx |6 +---
slideshow/source/inc/box2dtools.hxx | 36 +--
translations |2 -
6 files changed, 37 insertions(+), 29 deletions(-)
New commits:
commit 3bc2154ebf043da3cb2b29e30dac9fff5508a82a
Author: Sarper Akdemir
AuthorDate: Mon Aug 17 12:56:44 2020 +0300
Commit: Thorsten Behrens
CommitDate: Mon Aug 17 14:19:03 2020 +0200
fix box2dtools build error for non debug builds
Removed the asserts and moved the functions out of the
box2DWorld class.
Change-Id: Ifa58bceb2c64c1012e5d0e65bc12646312ab1c16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100856
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/slideshow/source/engine/animationfactory.cxx
b/slideshow/source/engine/animationfactory.cxx
index bc1848f68435..7f5910cfb992 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -434,7 +434,7 @@ namespace slideshow::internal
mbAnimationStarted = false;
// Animation have ended for this body, make it static
-mpBox2DWorld->makeBodyStatic( mpBox2DBody );
+box2d::utils::makeBodyStatic( mpBox2DBody );
if( !(mnFlags & AnimationFactory::FLAG_NO_SPRITE) )
mpShapeManager->leaveAnimationMode( mpShape );
diff --git a/slideshow/source/engine/box2dtools.cxx
b/slideshow/source/engine/box2dtools.cxx
index c188234105d7..c02a967a5f87 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -367,9 +367,8 @@ Box2DBodySharedPtr box2DWorld::makeShapeDynamic(const
slideshow::internal::Shape
return makeBodyDynamic(pBox2DBody);
}
-Box2DBodySharedPtr box2DWorld::makeBodyDynamic(const Box2DBodySharedPtr&
pBox2DBody)
+Box2DBodySharedPtr makeBodyDynamic(const Box2DBodySharedPtr& pBox2DBody)
{
-assert(mpBox2DWorld);
if (pBox2DBody->getType() != BOX2D_DYNAMIC_BODY)
{
pBox2DBody->setType(BOX2D_DYNAMIC_BODY);
@@ -384,9 +383,8 @@ Box2DBodySharedPtr box2DWorld::makeShapeStatic(const
slideshow::internal::ShapeS
return makeBodyStatic(pBox2DBody);
}
-Box2DBodySharedPtr box2DWorld::makeBodyStatic(const Box2DBodySharedPtr&
pBox2DBody)
+Box2DBodySharedPtr makeBodyStatic(const Box2DBodySharedPtr& pBox2DBody)
{
-assert(mpBox2DWorld);
if (pBox2DBody->getType() != BOX2D_STATIC_BODY)
{
pBox2DBody->setType(BOX2D_STATIC_BODY);
diff --git a/slideshow/source/inc/box2dtools.hxx
b/slideshow/source/inc/box2dtools.hxx
index dacf24845b45..77543ea919e1 100644
--- a/slideshow/source/inc/box2dtools.hxx
+++ b/slideshow/source/inc/box2dtools.hxx
@@ -202,15 +202,6 @@ public:
*/
Box2DBodySharedPtr makeShapeDynamic(const
slideshow::internal::ShapeSharedPtr& pShape);
-/** Make the Box2D body a dynamic one
-
-A dynamic body will be affected by other bodies and the gravity.
-
-@param pBox2DBody
-Pointer to the Box2D body
- */
-Box2DBodySharedPtr makeBodyDynamic(const Box2DBodySharedPtr& pBox2DBody);
-
/** Make the Box2D body corresponding to the given shape a static one
A static body will not be affected by other bodies and the gravity.
@@ -220,15 +211,6 @@ public:
*/
Box2DBodySharedPtr makeShapeStatic(const
slideshow::internal::ShapeSharedPtr& pShape);
-/** Make the Box2D body a dynamic one
-
-A static body will not be affected by other bodies and the gravity.
-
-@param pBox2DBody
-Pointer to the Box2D body
- */
-Box2DBodySharedPtr makeBodyStatic(const Box2DBodySharedPtr& pBox2DBody);
-
/// Create a static body from the given shape's bounding box
Box2DBodySharedPtr
createStaticBodyFromBoundingBox(const slideshow::internal::ShapeSharedPtr&
rShape,
@@ -322,6 +304,24 @@ public:
/// @return type of the body
box2DBodyType getType();
};
+
+/** Make the Box2D body a dynamic one
+
+A dynamic body will be affected by other bodies and the gravity.
+
+@param pBox2DBody
+Pointer to the Box2D body
+ */
+Box2DBodySharedPtr makeBodyDynamic(const Box2DBodySharedPtr& pBox2DBody);
+
+/** Make the Box2D body a static one
+
+A static body will not be affected by other bodies and the gravity.
+
+@param pBox2DBody
+Pointer to the Box2D body
+ */
+Box2DBodySharedPtr makeBodyStatic(const Box2DBodySharedPtr& pBox2DBody);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
commit f7fe1e93da753d74485a13d46fe15fb198411932
Author: Stephan Bergmann
AuthorDate: Mon Aug 17 13:06:50 2020 +0200
Commit: Stephan
[Libreoffice-commits] core.git: 3 commits - codemaker/source comphelper/source configmgr/source oox/source sc/qa sc/source
codemaker/source/commoncpp/commoncpp.cxx |4 ++-- codemaker/source/commonjava/commonjava.cxx |4 ++-- codemaker/source/cppumaker/dependencies.cxx |4 ++-- codemaker/source/cppumaker/dumputils.cxx |4 ++-- comphelper/source/misc/automationinvokedzone.cxx |5 + comphelper/source/misc/comphelper_module.cxx |4 ++-- comphelper/source/misc/comphelper_services.cxx |4 ++-- comphelper/source/misc/lok.cxx |7 +-- comphelper/source/misc/random.cxx|5 + comphelper/source/misc/servicedecl.cxx |4 +--- comphelper/source/misc/string.cxx|4 ++-- comphelper/source/misc/xmlsechelper.cxx |5 + comphelper/source/streaming/memorystream.cxx |2 +- comphelper/source/xml/xmltools.cxx |5 + configmgr/source/configurationprovider.cxx |4 ++-- configmgr/source/configurationregistry.cxx |8 configmgr/source/dconf.cxx |4 ++-- configmgr/source/defaultprovider.cxx |4 ++-- configmgr/source/readonlyaccess.cxx |4 ++-- configmgr/source/readwriteaccess.cxx |4 ++-- configmgr/source/update.cxx |4 ++-- configmgr/source/xmldata.cxx |6 +- oox/source/core/binarycodec.cxx |4 +--- oox/source/core/contexthandler.cxx |4 +--- oox/source/core/contexthandler2.cxx |4 +--- oox/source/core/fastparser.cxx |4 +--- oox/source/core/fasttokenhandler.cxx |4 +--- oox/source/core/filterbase.cxx |4 +--- oox/source/core/filterdetect.cxx |4 +--- oox/source/core/fragmenthandler.cxx |4 +--- oox/source/core/fragmenthandler2.cxx |4 +--- oox/source/core/recordparser.cxx |4 +--- oox/source/core/relations.cxx|4 +--- oox/source/core/relationshandler.cxx |4 +--- oox/source/core/xmlfilterbase.cxx|4 +--- oox/source/crypto/AgileEngine.cxx|4 +--- oox/source/crypto/CryptTools.cxx |4 +--- oox/source/crypto/DocumentDecryption.cxx |4 +--- oox/source/crypto/DocumentEncryption.cxx |4 +--- oox/source/crypto/Standard2007Engine.cxx |4 +--- oox/source/docprop/docprophandler.cxx|4 +--- oox/source/docprop/ooxmldocpropimport.cxx|4 +--- oox/source/drawingml/ThemeOverrideFragmentHandler.cxx|4 +--- oox/source/drawingml/chart/axiscontext.cxx |6 +- oox/source/drawingml/chart/axisconverter.cxx |6 +- oox/source/drawingml/chart/axismodel.cxx |6 +- oox/source/drawingml/chart/chartcontextbase.cxx |6 +- oox/source/drawingml/chart/chartconverter.cxx|6 +- oox/source/drawingml/chart/chartdrawingfragment.cxx |6 +- oox/source/drawingml/chart/chartspaceconverter.cxx |6 +- oox/source/drawingml/chart/chartspacefragment.cxx|6 +- oox/source/drawingml/chart/chartspacemodel.cxx |6 +- oox/source/drawingml/chart/converterbase.cxx |6 +- oox/source/drawingml/chart/datasourcecontext.cxx |6 +- oox/source/drawingml/chart/datasourceconverter.cxx |6 +- oox/source/drawingml/chart/datasourcemodel.cxx |6 +- oox/source/drawingml/chart/modelbase.cxx |6 +- oox/source/drawingml/chart/objectformatter.cxx |6 +- oox/source/drawingml/chart/plotareacontext.cxx |6 +- oox/source/drawingml/chart/plotareaconverter.cxx |6 +- oox/source/drawingml/chart/plotareamodel.cxx |6 +- oox/source/drawingml/chart/seriescontext.cxx |6 +- oox/source/drawingml/chart/seriesconverter.cxx |6 +- oox/source/drawingml/chart/seriesmodel.cxx |6 +- oox/source/drawingml/chart/titlecontext.cxx |6 +- oox/source/drawingml/chart/titleconverter.cxx|6 +- oox/source/drawingml/chart/titlemodel.cxx
[Libreoffice-commits] core.git: 3 commits - chart2/source chart2/uiconfig
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 73 --
chart2/source/controller/sidebar/ChartAxisPanel.hxx | 19 +-
chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 106 ++
chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 22 +--
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 115 +++-
chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 29 +---
chart2/uiconfig/ui/sidebaraxis.ui | 11 +
chart2/uiconfig/ui/sidebarerrorbar.ui | 41 +++--
chart2/uiconfig/ui/sidebarseries.ui |5
9 files changed, 200 insertions(+), 221 deletions(-)
New commits:
commit 750033e66585ddd4b4a8e5fe29b5a6739351403f
Author: Caolán McNamara
AuthorDate: Fri Dec 20 15:06:23 2019 +
Commit: Caolán McNamara
CommitDate: Sat Dec 21 11:26:07 2019 +0100
weld ChartAxisPanel
Change-Id: Iea04954e950ad1eabc2c178e9782eb0ae20026cf
Reviewed-on: https://gerrit.libreoffice.org/85613
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index 419c287d3eeb..a6fd71c96d44 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -26,8 +26,6 @@
#include "ChartAxisPanel.hxx"
#include
-#include
-#include
using namespace css;
using namespace css::uno;
@@ -206,19 +204,17 @@ ChartAxisPanel::ChartAxisPanel(
vcl::Window* pParent,
const css::uno::Reference& rxFrame,
ChartController* pController)
- : PanelLayout(pParent, "ChartAxisPanel", "modules/schart/ui/sidebaraxis.ui",
rxFrame),
-mxModel(pController->getModel()),
-mxModifyListener(new ChartSidebarModifyListener(this)),
-mxSelectionListener(new ChartSidebarSelectionListener(this,
OBJECTTYPE_AXIS)),
-mbModelValid(true)
+: PanelLayout(pParent, "ChartAxisPanel",
"modules/schart/ui/sidebaraxis.ui", rxFrame, true)
+, mxCBShowLabel(m_xBuilder->weld_check_button("checkbutton_show_label"))
+, mxCBReverse(m_xBuilder->weld_check_button("checkbutton_reverse"))
+, mxLBLabelPos(m_xBuilder->weld_combo_box("comboboxtext_label_position"))
+, mxGridLabel(m_xBuilder->weld_widget("label_props"))
+, mxNFRotation(m_xBuilder->weld_metric_spin_button("spinbutton1",
FieldUnit::DEGREE))
+, mxModel(pController->getModel())
+, mxModifyListener(new ChartSidebarModifyListener(this))
+, mxSelectionListener(new ChartSidebarSelectionListener(this,
OBJECTTYPE_AXIS))
+, mbModelValid(true)
{
-get(mpCBShowLabel, "checkbutton_show_label");
-get(mpCBReverse, "checkbutton_reverse");
-
-get(mpLBLabelPos, "comboboxtext_label_position");
-get(mpNFRotation, "spinbutton1");
-get(mpGridLabel, "label_props");
-
Initialize();
}
@@ -236,13 +232,13 @@ void ChartAxisPanel::dispose()
if (xSelectionSupplier.is())
xSelectionSupplier->removeSelectionChangeListener(mxSelectionListener);
-mpCBShowLabel.clear();
-mpCBReverse.clear();
+mxCBShowLabel.reset();
+mxCBReverse.reset();
-mpLBLabelPos.clear();
-mpGridLabel.clear();
+mxLBLabelPos.reset();
+mxGridLabel.reset();
-mpNFRotation.clear();
+mxNFRotation.reset();
PanelLayout::dispose();
}
@@ -258,14 +254,14 @@ void ChartAxisPanel::Initialize()
updateData();
-Link aLink = LINK(this, ChartAxisPanel, CheckBoxHdl);
-mpCBShowLabel->SetClickHdl(aLink);
-mpCBReverse->SetClickHdl(aLink);
+Link aLink = LINK(this, ChartAxisPanel,
CheckBoxHdl);
+mxCBShowLabel->connect_toggled(aLink);
+mxCBReverse->connect_toggled(aLink);
-Link aSpinButtonLink = LINK(this, ChartAxisPanel,
TextRotationHdl);
-mpNFRotation->SetModifyHdl(aSpinButtonLink);
+Link aSpinButtonLink = LINK(this,
ChartAxisPanel, TextRotationHdl);
+mxNFRotation->connect_value_changed(aSpinButtonLink);
-mpLBLabelPos->SetSelectHdl(LINK(this, ChartAxisPanel, ListBoxHdl));
+mxLBLabelPos->connect_changed(LINK(this, ChartAxisPanel, ListBoxHdl));
}
void ChartAxisPanel::updateData()
@@ -276,11 +272,11 @@ void ChartAxisPanel::updateData()
OUString aCID = getCID(mxModel);
SolarMutexGuard aGuard;
-mpCBShowLabel->Check(isLabelShown(mxModel, aCID));
-mpCBReverse->Check(isReverse(mxModel, aCID));
+mxCBShowLabel->set_active(isLabelShown(mxModel, aCID));
+mxCBReverse->set_active(isReverse(mxModel, aCID));
-mpLBLabelPos->SelectEntryPos(getLabelPosition(mxModel, aCID));
-mpNFRotation->SetValue(getAxisRotation(mxModel, aCID));
+mxLBLabelPos->set_active(getLabelPosition(mxModel, aCID));
+mxNFRotation->set_value(getAxisRotation(mxModel, aCID), FieldUnit::DEGREE);
}
VclPtr ChartAxisPanel::Create (
@@ -347,33 +343,32 @@ void ChartAxisPanel::selectionChanged(bool bCorrectType)
[Libreoffice-commits] core.git: 3 commits - basic/source bridges/source extensions/source
basic/source/basmgr/basicmanagerrepository.cxx | 19 +
bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | 22 ---
extensions/source/propctrlr/modulepcr.cxx | 29 ++--
3 files changed, 12 insertions(+), 58 deletions(-)
New commits:
commit 10f4db67b6690cecfe449b4283b52f56400f07e2
Author: Noel Grandin
AuthorDate: Tue Dec 17 14:00:18 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Dec 18 08:00:23 2019 +0100
Elide use of rtl_Instance (which is obsoleted by C++11 thread-safe statics)
Change-Id: Ib0965f57cb929a220fc9df381abdca654985c9de
Reviewed-on: https://gerrit.libreoffice.org/85330
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/extensions/source/propctrlr/modulepcr.cxx
b/extensions/source/propctrlr/modulepcr.cxx
index a7da05f3e947..88b6d4d97152 100644
--- a/extensions/source/propctrlr/modulepcr.cxx
+++ b/extensions/source/propctrlr/modulepcr.cxx
@@ -19,38 +19,27 @@
#include "modulepcr.hxx"
-#include
-#include
#include
#include
#include
namespace pcr
{
-struct CreateModuleClass
-{
-PcrModule* operator()()
-{
-static PcrModule* pModule = new PcrModule;
-return pModule;
-/* yes, in theory, this is a resource leak, since the PcrModule
-will never be cleaned up. However, using a non-heap instance
of PcrModule
-would not work: It would be cleaned up when the module is
unloaded.
-This might happen (and is likely to happen) *after* the
tools-library
-has been unloaded. However, the module's dtor is where we
would delete
-our resource manager (in case not all our clients
de-registered) - which
-would call into the already-unloaded tools-library. */
-}
-};
-
PcrModule::PcrModule()
{
}
PcrModule& PcrModule::getInstance()
{
-return *rtl_Instance< PcrModule, CreateModuleClass, ::osl::MutexGuard,
::osl::GetGlobalMutex >::
-create( CreateModuleClass(), ::osl::GetGlobalMutex() );
+static PcrModule* pModule = new PcrModule;
+return *pModule;
+/* yes, in theory, this is a resource leak, since the PcrModule
+will never be cleaned up. However, using a non-heap instance of
PcrModule
+would not work: It would be cleaned up when the module is unloaded.
+This might happen (and is likely to happen) *after* the
tools-library
+has been unloaded. However, the module's dtor is where we would
delete
+our resource manager (in case not all our clients de-registered) -
which
+would call into the already-unloaded tools-library. */
}
OUString PcrRes(const char* pId)
commit 51e7a590976f664deb0a386d23b66bee38ea5687
Author: Noel Grandin
AuthorDate: Tue Dec 17 13:58:20 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Dec 18 07:59:59 2019 +0100
Elide use of rtl_Instance (which is obsoleted by C++11 thread-safe statics)
Change-Id: Ie3e099a6561c22646f07dab418f1a2f8123f1449
Reviewed-on: https://gerrit.libreoffice.org/85329
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index c493da8bd29d..1e9378ff864b 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -38,8 +38,6 @@
#include
#include
-#include
-#include
#include
#include
@@ -198,19 +196,6 @@ namespace basic
StarBASIC* impl_getDefaultAppBasicLibrary();
};
-namespace {
-
-struct CreateImplRepository
-{
-ImplRepository* operator()()
-{
-static ImplRepository repository;
-return
-}
-};
-
-}
-
ImplRepository::ImplRepository()
{
}
@@ -218,8 +203,8 @@ namespace basic
ImplRepository& ImplRepository::Instance()
{
-return *rtl_Instance< ImplRepository, CreateImplRepository,
::osl::MutexGuard, ::osl::GetGlobalMutex >::
-create( CreateImplRepository(), ::osl::GetGlobalMutex() );
+static ImplRepository repository;
+return repository;
}
BasicManager* ImplRepository::getDocumentBasicManager( const Reference<
XModel >& _rxDocumentModel )
commit 8473ac2e27efff3ec902a358896a669ce05f047a
Author: Noel Grandin
AuthorDate: Tue Dec 17 13:56:07 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Dec 18 07:59:40 2019 +0100
Elide use of rtl_Instance (which is obsoleted by C++11 thread-safe statics)
which does not seem to have been doing anything useful here anyway, not
since
commit 730399de90add4e35da9754a8f7525b443237026
Date: Wed Jul 18 11:16:06 2007 +
INTEGRATION: CWS unomacli64 (1.6.50); FILE MERGED
2007/06/20 10:29:46
[Libreoffice-commits] core.git: 3 commits - bridges/source shell/source vcl/win
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |2 -
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx | 32 +---
vcl/win/gdi/salgdi2.cxx |8 +---
3 files changed, 14 insertions(+), 28 deletions(-)
New commits:
commit 3e3e2d454ccc907f4a780d7015b6c8941d41648a
Author: Stephan Bergmann
AuthorDate: Tue Dec 10 15:31:56 2019 +0100
Commit: Stephan Bergmann
CommitDate: Tue Dec 10 20:51:14 2019 +0100
loplugin:unusedmember (clang-cl)
ColorScanlineConverter::meDestinationFormat was unused ever since the code
was
introduced in 6b571ae4608ac15256eb7582f442ce69975370f3 "opengl: change from
BGRA
to RGBA color arrangement on Windows".
Change-Id: Ieb530e291270d97613176250f126c223aee8faa9
Reviewed-on: https://gerrit.libreoffice.org/84863
Reviewed-by: Tomaž Vajngerl
Tested-by: Jenkins
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 9c5c44deb35e..6ccf3140c169 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -72,16 +72,14 @@ class ColorScanlineConverter
{
public:
ScanlineFormat meSourceFormat;
-ScanlineFormat meDestinationFormat;
int mnComponentSize;
int mnComponentExchangeIndex;
long mnScanlineSize;
-ColorScanlineConverter(ScanlineFormat eSourceFormat, ScanlineFormat
eDestinationFormat, int nComponentSize, long nScanlineSize)
+ColorScanlineConverter(ScanlineFormat eSourceFormat, int nComponentSize,
long nScanlineSize)
: meSourceFormat(eSourceFormat)
-, meDestinationFormat(eDestinationFormat)
, mnComponentSize(nComponentSize)
, mnComponentExchangeIndex(0)
, mnScanlineSize(nScanlineSize)
@@ -127,10 +125,10 @@ void convertToWinSalBitmap(SalBitmap& rSalBitmap,
WinSalBitmap& rWinSalBitmap)
std::unique_ptr pConverter;
if (pRead->mnFormat == ScanlineFormat::N24BitTcRgb)
-pConverter.reset(new
ColorScanlineConverter(ScanlineFormat::N24BitTcRgb, ScanlineFormat::N24BitTcBgr,
+pConverter.reset(new
ColorScanlineConverter(ScanlineFormat::N24BitTcRgb,
3, pRead->mnScanlineSize));
else if (pRead->mnFormat == ScanlineFormat::N32BitTcRgba)
-pConverter.reset(new
ColorScanlineConverter(ScanlineFormat::N32BitTcRgba,
ScanlineFormat::N32BitTcBgra,
+pConverter.reset(new
ColorScanlineConverter(ScanlineFormat::N32BitTcRgba,
4, pRead->mnScanlineSize));
if (pConverter)
{
commit 4b0c05f5c15f460118ef28ce5925a1b732e370c3
Author: Stephan Bergmann
AuthorDate: Tue Dec 10 15:25:34 2019 +0100
Commit: Stephan Bergmann
CommitDate: Tue Dec 10 20:51:00 2019 +0100
loplugin:unusedmember (clang-cl)
(The struct that is the type of EHExceptionRecord::params does not need a
name.)
Change-Id: I372630563dce26c3ac190a9492eabfad9a55a943
Reviewed-on: https://gerrit.libreoffice.org/84861
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index c725bca543c8..daa0426a2c17 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -793,7 +793,7 @@ bool DetectRethrow(void* ppExcept)
struct _EXCEPTION_RECORD* ExceptionRecord;
PVOID ExceptionAddress;
DWORD NumberParameters;
-struct alignas(8) EHParameters
+struct alignas(8)
{
DWORD magicNumber;
PVOID pExceptionObject;
commit 7e5de5480255c830ec8ce88b6fcd39e3a36672e8
Author: Stephan Bergmann
AuthorDate: Tue Dec 10 15:21:04 2019 +0100
Commit: Stephan Bergmann
CommitDate: Tue Dec 10 20:50:41 2019 +0100
loplugin:unusedmember (clang-cl)
PROPERTYMAP members pszXPathParent and pszValueNodeName were unused ever
since
85e0cc246d4350122b17fbe2bfd15635a190ad77 "dv17: #i70994#: Use property
handler
instead of column info for Windows Vista" introduced the code. (And
removing
them allowed to simplify the code further in the obvious way.)
Change-Id: Ie1247cbee31a172a15fd57c4b752d74711b1d3a1
Reviewed-on: https://gerrit.libreoffice.org/84860
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index ae547afd2973..5b7121bcf333 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -39,28 +39,16 @@
long g_DllRefCnt = 0;
static HINSTANCE g_hModule = nullptr;
-namespace {
-
-// Map of property keys to the locations of their value(s) in the .??? XML
schema
-struct PROPERTYMAP
-{
-PROPERTYKEY key;
-PCWSTR pszXPathParent;
-PCWSTR pszValueNodeName;
-};
-
[Libreoffice-commits] core.git: 3 commits - bridges/source config_host.mk.in configure.ac connectivity/source fpicker/source sfx2/source shell/source solenv/gbuild vcl/osx vcl/quartz
bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx|4 +++
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx |4 +++
config_host.mk.in|1
configure.ac | 20 ---
connectivity/source/drivers/macab/MacabServices.cxx |2 +
connectivity/source/drivers/macab/MacabStatement.cxx |1
fpicker/source/aqua/resourceprovider.mm |8 ++
sfx2/source/appl/shutdowniconaqua.mm |4 +++
shell/source/backends/macbe/macbackend.mm|7 ++---
solenv/gbuild/LinkTarget.mk |2 -
solenv/gbuild/platform/com_GCC_defs.mk |2 -
solenv/gbuild/platform/com_MSC_defs.mk |2 -
vcl/osx/DataFlavorMapping.cxx| 25 +--
vcl/osx/printaccessoryview.mm| 12 +
vcl/osx/salinst.cxx |4 +++
vcl/osx/salobj.cxx |4 +++
vcl/quartz/ctfonts.cxx |6 +++-
vcl/quartz/salbmp.cxx|9 +-
vcl/quartz/salgdi.cxx|4 +++
19 files changed, 101 insertions(+), 20 deletions(-)
New commits:
commit 2ccaf4eecacaa912997d71a857dd84edf5af58cf
Author: Stephan Bergmann
AuthorDate: Fri Dec 6 16:58:02 2019 +0100
Commit: Stephan Bergmann
CommitDate: Fri Dec 6 19:21:53 2019 +0100
loplugin:redundantcast (macOS)
Change-Id: Ia514e105d913b8cf77d4fe931deb6b559b3525d3
Reviewed-on: https://gerrit.libreoffice.org/84655
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index d100e03b8910..4f9657b993b4 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -257,7 +257,7 @@ static hb_blob_t* getFontTable(hb_face_t* /*face*/,
hb_tag_t nTableTag, void* pU
hb_font_t* CoreTextStyle::ImplInitHbFont()
{
-hb_face_t* pHbFace = hb_face_create_for_tables(getFontTable,
const_cast(GetFontFace()), nullptr);
+hb_face_t* pHbFace = hb_face_create_for_tables(getFontTable,
GetFontFace(), nullptr);
return InitHbFont(pHbFace);
}
commit b1acb9c62701d8f09fafdf5b7c2b690249a277b8
Author: Stephan Bergmann
AuthorDate: Fri Dec 6 16:50:38 2019 +0100
Commit: Stephan Bergmann
CommitDate: Fri Dec 6 19:21:21 2019 +0100
loplugin:external (macOS)
* OldEntry in fpicker/source/aqua/resourceprovider.mm was apparently unused
ever
since it got introduced with 00657aef09d854c74fb426a935a3e8b1fc390bb0
"migrate to boost::gettext"
* impl_throwError is used from multiple TU,
connectivity/source/drivers/macab/MacabStatement.cxx just missed the
relevant
#include
Change-Id: Iba131da57aa20085bb1c634ba9a3a59566070abd
Reviewed-on: https://gerrit.libreoffice.org/84653
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
index 3da3adac5fc3..ceed901f9e11 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
@@ -58,6 +58,8 @@
using namespace x86_64;
+namespace {
+
/* Register class used for passing given 64bit part of the argument.
These represent classes as documented by the PS ABI, with the exception
of SSESF, SSEDF classes, that are basically SSE class, just gcc will
@@ -80,6 +82,8 @@ enum x86_64_reg_class
X86_64_MEMORY_CLASS
};
+}
+
#define MAX_CLASSES 4
/* x86-64 register passing implementation. See x86-64 ABI for details. Goal
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index c31cf180a704..c4cfe5123ec9 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -141,6 +141,8 @@ static OUString toUNOname( char const * p )
#endif
}
+namespace {
+
class RTTI
{
typedef std::unordered_map< OUString, std::type_info * > t_rtti_map;
@@ -158,6 +160,8 @@ public:
std::type_info * getRTTI( typelib_CompoundTypeDescription * );
};
+}
+
RTTI::RTTI()
: m_hApp( dlopen( nullptr, RTLD_LAZY ) )
{
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx
b/connectivity/source/drivers/macab/MacabServices.cxx
index 8642c03e61e3..a550fcb94f58 100644
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -37,6 +37,7 @@ typedef Reference< XSingleServiceFactory >
(*createFactoryFunc)
rtl_ModuleCount*
);
+namespace {
struct ProviderRequest
{
@@ -74,6 +75,7 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void*
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/backendtest vcl/inc vcl/skia vcl/unx vcl/win
include/vcl/skia/SkiaHelper.hxx | 34 +++---
vcl/backendtest/VisualBackendTest.cxx |9 +
vcl/inc/skia/gdiimpl.hxx | 12 --
vcl/inc/skia/salbmp.hxx | 32 +++--
vcl/inc/skia/utils.hxx| 56 ++
vcl/skia/SkiaHelper.cxx | 131 ++-
vcl/skia/gdiimpl.cxx | 188 +-
vcl/skia/salbmp.cxx | 164 +
vcl/skia/win/gdiimpl.cxx | 34 +++---
vcl/unx/generic/app/salinst.cxx |4
vcl/win/app/salinst.cxx |3
11 files changed, 423 insertions(+), 244 deletions(-)
New commits:
commit 8fede4e7870579251c58823566c88476df2038b0
Author: Luboš Luňák
AuthorDate: Wed Dec 4 18:01:47 2019 +0100
Commit: Luboš Luňák
CommitDate: Fri Dec 6 14:26:45 2019 +0100
make all Skia drawing GPU-backed, if possible
This primarily means using SkiaHelper::createSkSurface(), which will
create a GPU-backed SkSurface if Vulkan is used, and it is used in place
of temporary SkBitmap instances, which are always raster-based.
Change-Id: I3fe35866f962030f464d5c1d1c4bf518c20ee9af
Reviewed-on: https://gerrit.libreoffice.org/84562
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index 7365d58f9173..d54c09d67eb8 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -193,10 +193,11 @@ public:
#ifdef DBG_UTIL
void dump(const char* file) const;
-static void dump(const SkBitmap& bitmap, const char* file);
#endif
// Default blend mode for SkPaint is SkBlendMode::kSrcOver
+void drawImage(const SalTwoRect& rPosAry, const sk_sp& aImage,
+ SkBlendMode eBlendMode = SkBlendMode::kSrcOver);
void drawBitmap(const SalTwoRect& rPosAry, const SkBitmap& aBitmap,
SkBlendMode eBlendMode = SkBlendMode::kSrcOver);
@@ -237,7 +238,7 @@ protected:
// get the height of the device
int GetHeight() const { return mProvider ? mProvider->GetHeight() : 1; }
-void drawMask(const SalTwoRect& rPosAry, const SkImage& rImage, Color
nMaskColor);
+void drawMask(const SalTwoRect& rPosAry, const sk_sp& rImage,
Color nMaskColor);
// When drawing using GPU, rounding errors may result in off-by-one errors,
// see https://bugs.chromium.org/p/skia/issues/detail?id=9611 . Compensate
for
@@ -246,10 +247,6 @@ protected:
SkScalar toSkX(long x) const { return mIsGPU ? x + 0.5 : x; }
SkScalar toSkY(long y) const { return mIsGPU ? y + 0.5 : y; }
-#ifdef DBG_UTIL
-void prefillSurface();
-#endif
-
template
friend inline std::basic_ostream&
operator<<(std::basic_ostream& stream, const
SkiaSalGraphicsImpl* graphics)
diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index 0b0e1aa5439c..ea25d477c985 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -22,15 +22,13 @@
#include
-#include
-
-class SkImage;
+#include
class VCL_PLUGIN_PUBLIC SkiaSalBitmap : public SalBitmap
{
public:
SkiaSalBitmap();
-SkiaSalBitmap(const SkImage& image);
+SkiaSalBitmap(const sk_sp& image);
virtual ~SkiaSalBitmap() override;
// SalBitmap methods
@@ -59,12 +57,11 @@ public:
sal_uInt8 nTol) override;
virtual bool ConvertToGreyscale() override;
-// Accesses the internal SkBitmap. If the bit count is one that Skia does
-// not support natively, data from the internal buffer is converted
-// to a 32bpp SkBitmap.
-const SkBitmap& GetSkBitmap() const;
+// Returns the contents as SkImage (possibly GPU-backed).
+const sk_sp& GetSkImage() const;
-const SkBitmap& GetAlphaSkBitmap() const;
+// Returns the contents as alpha SkImage (possibly GPU-backed)
+const sk_sp& GetAlphaSkImage() const;
#ifdef DBG_UTIL
void dump(const char* file) const;
@@ -72,6 +69,7 @@ public:
private:
void ResetCachedBitmap();
+SkBitmap GetAsSkBitmap() const;
#ifdef DBG_UTIL
void verify() const;
#else
@@ -82,16 +80,18 @@ private:
friend inline std::basic_ostream&
operator<<(std::basic_ostream& stream, const SkiaSalBitmap*
bitmap)
{ // TODO GPU-based, once it's done
-// B - has SkBitmap, A - has alpha SkBitmap, D - has data buffer
+// B - has SkBitmap, D - has data buffer, I/i - has SkImage (on
GPU/CPU),
+// A/a - has alpha SkImage (on GPU/CPU)
return stream << static_cast(bitmap) << " " <<
bitmap->GetSize() << "/"
<< bitmap->mBitCount << (!bitmap->mBitmap.drawsNothing()
? "B" : "")
- << (!bitmap->mAlphaBitmap.drawsNothing() ? "A" : "")
- << (bitmap->mBuffer.get() ? "D" : "");
+ << (bitmap->mBuffer.get() ? "D" : "")
+ << (bitmap->mImage ?
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/source
include/vcl/field.hxx|5
vcl/source/control/field.cxx | 50 +++
2 files changed, 18 insertions(+), 37 deletions(-)
New commits:
commit cda2b94f6deec442c37ebd80dbf865890893a03c
Author: Caolán McNamara
AuthorDate: Wed Dec 4 20:21:54 2019 +
Commit: Caolán McNamara
CommitDate: Thu Dec 5 10:41:49 2019 +0100
turn NumericFormatter::ImplInit into initializer list
Change-Id: I5f936ea61a3e17bb534282e4649b21c0ae2565c8
Reviewed-on: https://gerrit.libreoffice.org/84462
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index ae94f80199dc..e7c193dad617 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -183,8 +183,6 @@ protected:
virtual sal_Int64 GetValueFromString(const OUString& rStr) const;
private:
-SAL_DLLPRIVATE void ImplInit();
-
sal_uInt16 mnDecimalDigits;
boolmbThousandSep;
boolmbShowTrailingZeros;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 85abf1b3f0b7..2cd63600a5df 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -535,32 +535,25 @@ void NumericFormatter::ImplNumericReformat()
FormatValue();
}
-void NumericFormatter::ImplInit()
-{
-mnFieldValue= 0;
-mnLastValue = 0;
-mnMin = 0;
-mnMax = SAL_MAX_INT32;
-// a "large" value substantially smaller than SAL_MAX_INT64, to avoid
-// overflow in computations using this "dummy" value
-mnDecimalDigits = 2;
-mbThousandSep = true;
-mbShowTrailingZeros = true;
-mbWrapOnLimits = false;
-mbFormatting = false;
-
-// for fields
-mnSpinSize = 1;
-mnFirst = mnMin;
-mnLast = mnMax;
-
-SetDecimalDigits( 0 );
-}
-
NumericFormatter::NumericFormatter(Edit* pEdit)
: FormatterBase(pEdit)
+, mnFieldValue(0)
+, mnLastValue(0)
+, mnMin(0)
+// a "large" value substantially smaller than SAL_MAX_INT64, to avoid
+// overflow in computations using this "dummy" value
+, mnMax(SAL_MAX_INT32)
+, mbWrapOnLimits(false)
+, mbFormatting(false)
+, mnSpinSize(1)
+// for fields
+, mnFirst(mnMin)
+, mnLast(mnMax)
+, mnDecimalDigits(2)
+, mbThousandSep(true)
+, mbShowTrailingZeros(true)
{
-ImplInit();
+SetDecimalDigits( 0 );
}
NumericFormatter::~NumericFormatter()
commit 2e838e80d4519319c3d26fa0128a2f6bcaf09040
Author: Caolán McNamara
AuthorDate: Wed Dec 4 20:16:12 2019 +
Commit: Caolán McNamara
CommitDate: Thu Dec 5 10:41:26 2019 +0100
turn MetricFormatter::ImplInit into initializer list
Change-Id: Iccb732517d7827eda1d8962d4dccdb3a01ebce78
Reviewed-on: https://gerrit.libreoffice.org/84461
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index fa3cc9af0bbd..ae94f80199dc 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -244,8 +244,6 @@ protected:
virtual sal_Int64 GetValueFromStringUnit(const OUString& rStr,
FieldUnit eOutUnit) const;
private:
-SAL_DLLPRIVATE voidImplInit();
-
OUStringmaCustomUnitText;
OUStringmaCurUnitText;
};
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index c64746e5ce17..85abf1b3f0b7 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1401,16 +1401,11 @@ void MetricFormatter::ImplMetricReformat( const
OUString& rStr, double& rValue,
rOutStr = CreateFieldText( static_cast(nTempVal) );
}
-inline void MetricFormatter::ImplInit()
-{
-mnBaseValue = 0;
-meUnit = FieldUnit::NONE;
-}
-
MetricFormatter::MetricFormatter(Edit* pEdit)
: NumericFormatter(pEdit)
+, mnBaseValue(0)
+, meUnit(FieldUnit::NONE)
{
-ImplInit();
}
MetricFormatter::~MetricFormatter()
commit 35f234ec898af275daabb5c0c72eb89f12fa82a0
Author: Caolán McNamara
AuthorDate: Wed Dec 4 20:01:24 2019 +
Commit: Caolán McNamara
CommitDate: Thu Dec 5 10:40:59 2019 +0100
replace only use of GetDefaultUnit() with FieldUnit::NONE
Change-Id: Idf3cf6d0a361c67d4005d627f661ac49e0e3e9de
Reviewed-on: https://gerrit.libreoffice.org/84459
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index db71ee3ebb4b..fa3cc9af0bbd 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -486,7 +486,6 @@ public:
void SetLast(sal_Int64 last) { SetLast(last, FieldUnit::NONE);
}
sal_Int64 GetLast( FieldUnit eOutUnit ) const;
-static FieldUnitGetDefaultUnit();
[Libreoffice-commits] core.git: 3 commits - include/connectivity officecfg/registry oox/source sd/inc sd/source
include/connectivity/sqlerror.hxx|2
officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu | 15 +
oox/source/drawingml/table/tableproperties.cxx |9 +--
oox/source/drawingml/table/tablestyletextstylecontext.cxx|8 +-
sd/inc/CustomAnimationEffect.hxx |4 -
sd/source/core/CustomAnimationEffect.cxx | 32 ---
sd/source/core/EffectMigration.cxx |2
sd/source/ui/animations/CustomAnimationPane.cxx | 11 +++
sd/source/ui/func/fuconbez.cxx | 17 +
9 files changed, 79 insertions(+), 21 deletions(-)
New commits:
commit d0e040698de6a88793f4ddd3b257a3dde0644b2f
Author: Stephan Bergmann
AuthorDate: Sat Nov 30 14:01:46 2019 +0100
Commit: Stephan Bergmann
CommitDate: Sat Nov 30 15:00:29 2019 +0100
Assign bool directly to boost::optional
...instead of going via boost::optional. (In preparation of
replacing
boost::optional with std::optional, which doesn't support implicit
conversion
from std::optional to std::optional.)
Change-Id: I5dd74dd1c6346c99bd3e2a9b1156c9fce56db77c
Reviewed-on: https://gerrit.libreoffice.org/84116
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/oox/source/drawingml/table/tableproperties.cxx
b/oox/source/drawingml/table/tableproperties.cxx
index b6f9a8a59cfc..b6d8bf378127 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -135,11 +135,10 @@ static void SetTableStyleProperties(const
std::unique_ptr
pTableStyle->getBand1V().getFillProperties() = pBand1HFillProperties;
//tet bold for 1st row/last row/column
-::boost::optional< sal_Bool > textBoldStyle(true);
-pTableStyle->getFirstRow().getTextBoldStyle() = textBoldStyle;
-pTableStyle->getLastRow().getTextBoldStyle() = textBoldStyle;
-pTableStyle->getFirstCol().getTextBoldStyle() = textBoldStyle;
-pTableStyle->getLastCol().getTextBoldStyle() = textBoldStyle;
+pTableStyle->getFirstRow().getTextBoldStyle() = true;
+pTableStyle->getLastRow().getTextBoldStyle() = true;
+pTableStyle->getFirstCol().getTextBoldStyle() = true;
+pTableStyle->getLastCol().getTextBoldStyle() = true;
}
static std::unique_ptr CreateTableStyle(const OUString& styleId)
diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx
b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
index 5b93f25d9ca3..7567ac4c8130 100644
--- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx
+++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
@@ -39,17 +39,17 @@ TableStyleTextStyleContext::TableStyleTextStyleContext(
ContextHandler2Helper co
if( rAttribs.hasAttribute( XML_b ) ) {
sal_Int32 nB = rAttribs.getToken( XML_b, XML_def );
if ( nB == XML_on )
-mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool
>( true );
+mrTableStylePart.getTextBoldStyle() = true;
else if ( nB == XML_off )
-mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool
>( false );
+mrTableStylePart.getTextBoldStyle() = false;
}
if( rAttribs.hasAttribute( XML_i ) ) {
sal_Int32 nI = rAttribs.getToken( XML_i, XML_def );
if ( nI == XML_on )
-mrTableStylePart.getTextItalicStyle() = ::boost::optional<
sal_Bool >( true );
+mrTableStylePart.getTextItalicStyle() = true;
else if ( nI == XML_off )
-mrTableStylePart.getTextItalicStyle() = ::boost::optional<
sal_Bool >( false );
+mrTableStylePart.getTextItalicStyle() = false;
}
}
commit d86cfcaf709638d73fcb0de5067b902dab7a7f2f
Author: Mark Hung
AuthorDate: Mon Nov 18 00:49:03 2019 +0800
Commit: Mark Hung
CommitDate: Sat Nov 30 15:00:09 2019 +0100
tdf#94947 Set preset-id for user defined motion paths.
User defined motion paths ( curve, polygon, freeform line )
did not have preset-id. Set the preset-id so that the
preset type will be highlighted in the custom animation
pane after editing.
"libo-motionpath-curve", "libo-motionpath-polygon",
and "libo-motionpath-freeform-line" are used for the three
user defined motion paths.
This patch is related to tdf#94947, though it doesn't
make the original document display correctly by guessing
the missing preset-id, but it prevent empty preset-id
to be generated when creating those three motion path
animation.
Change-Id: I50c0133bea32e022b07e5d8c0a024810844f124d
Reviewed-on: https://gerrit.libreoffice.org/83079
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index
[Libreoffice-commits] core.git: 3 commits - sc/qa sdext/source sd/source
sc/qa/unit/ucalc_column.cxx|9 ++--
sc/qa/unit/ucalc_sort.cxx | 31 ++---
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx |1
sdext/source/presenter/PresenterProtocolHandler.cxx|2 -
4 files changed, 16 insertions(+), 27 deletions(-)
New commits:
commit 8cb7deff9bf49d17b7519d9d49aea5943d14baa3
Author: Stephan Bergmann
AuthorDate: Tue Nov 26 19:59:05 2019 +0100
Commit: Stephan Bergmann
CommitDate: Wed Nov 27 08:55:49 2019 +0100
Remove unused Dispatch::Action
(found by upcoming loplugin:unusedmember)
Change-Id: I2e4b78b209b4d1a11f50519b06a1a9b0a154ccf0
Reviewed-on: https://gerrit.libreoffice.org/83820
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx
b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 32739fdd2b1d..fc07441e673f 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -168,8 +168,6 @@ class PresenterProtocolHandler::Dispatch
public PresenterDispatchInterfaceBase
{
public:
-typedef void (PresenterProtocolHandler::Dispatch::* Action)();
-
/** Create a new Dispatch object. When the given command name
(rsURLPath) is not known then an empty reference is returned.
*/
commit 02cbe59776e75f045fe5b62f4435ee7b7343b900
Author: Stephan Bergmann
AuthorDate: Tue Nov 26 19:56:09 2019 +0100
Commit: Stephan Bergmann
CommitDate: Wed Nov 27 08:55:28 2019 +0100
Remove unused RecentlyUsedPageCaches::value_type
(found by upcoming loplugin:unusedmember)
Change-Id: Ib0d6afbafcc210fbf839b64c370743071c51f5b4
Reviewed-on: https://gerrit.libreoffice.org/83819
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index 8288b7851e61..cfe121c64b9f 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -136,7 +136,6 @@ class PageCacheManager::RecentlyUsedPageCaches
public:
typedef DocumentKey key_type;
typedef RecentlyUsedQueue mapped_type;
-typedef std::pair value_type;
typedef std::map::iteratoriterator;
private:
std::map maMap;
commit 478a2406d15250dba529dbe17bbbf76e9f2192ec
Author: Stephan Bergmann
AuthorDate: Tue Nov 26 19:53:36 2019 +0100
Commit: Stephan Bergmann
CommitDate: Wed Nov 27 08:54:58 2019 +0100
Remove unused sc/qa/unit/ucalc_*.cxx data
(found by upcoming loplugin:unusedmember)
Change-Id: I2ed1fd158779716297a93fade34b1cf541c44aba
Reviewed-on: https://gerrit.libreoffice.org/83818
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sc/qa/unit/ucalc_column.cxx b/sc/qa/unit/ucalc_column.cxx
index 35ffc0151a77..a60ac250b58b 100644
--- a/sc/qa/unit/ucalc_column.cxx
+++ b/sc/qa/unit/ucalc_column.cxx
@@ -101,7 +101,6 @@ void Test::testSetFormula()
static struct aInputs
{
-const char* aName;
SCROW const nRow;
SCCOL const nCol;
const char* aFormula1; // Represents the formula that is input to
SetFormula function.
@@ -109,10 +108,10 @@ void Test::testSetFormula()
formula::FormulaGrammar::Grammar const eGram;
} const aTest[] = {
-{ "Rock and Roll" ,5 , 4 , "=SUM($D$2:$F$3)"
,"=SUM($D$2:$F$3)" , formula::FormulaGrammar::Grammar::GRAM_ENGLISH },
-{ "Blues" ,5 , 5 , "=A1-$C2+B$3-$F$4"
,"=A1-$C2+B$3-$F$4", formula::FormulaGrammar::Grammar::GRAM_NATIVE },
-{ "Acoustic" ,6 , 6 , "=A1-$C2+B$3-$F$4"
,"=A1-$C2+B$3-$F$4", formula::FormulaGrammar::Grammar::GRAM_NATIVE_XL_A1},
-{ "Nursery Rhymes",7 , 8 ,
"=[.A1]-[.$C2]+[.G$3]-[.$F$4]","=A1-$C2+G$3-$F$4",
formula::FormulaGrammar::Grammar::GRAM_ODFF}
+{ 5 , 4 , "=SUM($D$2:$F$3)" ,"=SUM($D$2:$F$3)" ,
formula::FormulaGrammar::Grammar::GRAM_ENGLISH },
+{ 5 , 5 , "=A1-$C2+B$3-$F$4","=A1-$C2+B$3-$F$4",
formula::FormulaGrammar::Grammar::GRAM_NATIVE },
+{ 6 , 6 , "=A1-$C2+B$3-$F$4","=A1-$C2+B$3-$F$4",
formula::FormulaGrammar::Grammar::GRAM_NATIVE_XL_A1},
+{ 7 , 8 , "=[.A1]-[.$C2]+[.G$3]-[.$F$4]","=A1-$C2+G$3-$F$4",
formula::FormulaGrammar::Grammar::GRAM_ODFF}
};
for(size_t i = 0; i < SAL_N_ELEMENTS(aTest); ++i)
diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index c01cf53f231a..db1dbba29391 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -507,31 +507,24 @@ void Test::testSortInFormulaGroup()
m_pDoc->Sort(0, aSortData, false, true, nullptr, nullptr);
-static const
[Libreoffice-commits] core.git: 3 commits - oovbaapi/ooo sw/inc sw/source
oovbaapi/ooo/vba/word/XDocuments.idl |1
sw/inc/ndarr.hxx |2 -
sw/source/core/crsr/pam.cxx | 10
sw/source/core/docnode/nodes.cxx | 43 +++
4 files changed, 20 insertions(+), 36 deletions(-)
New commits:
commit 648758906e2d4a7a953d4eda27e95bc9478d336a
Author: Michael Stahl
AuthorDate: Mon Nov 25 19:01:57 2019 +0100
Commit: Michael Stahl
CommitDate: Tue Nov 26 11:10:11 2019 +0100
sw: remove SwNodes::CheckNodesRange()
Looks like it's the same as ::CheckNodesRange(..., false).
Change-Id: I1938892cdba9ff1d9758a0f1b6cb516e28f5d8bd
Reviewed-on: https://gerrit.libreoffice.org/83708
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 2f2958c977bc..da52d06377f6 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -181,8 +181,6 @@ public:
void SectionUp( SwNodeRange *);
void SectionDown( SwNodeRange *pRange, SwStartNodeType = SwNormalStartNode
);
-bool CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd )
const;
-
static void GoStartOfSection(SwNodeIndex *);
static void GoEndOfSection(SwNodeIndex *);
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index c1fdb7f87d95..b0a6055d782f 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -893,8 +893,10 @@ void SwNodes::SectionDown(SwNodeRange *pRange,
SwStartNodeType eSttNdTyp )
{
if( pRange->aStart >= pRange->aEnd ||
pRange->aEnd >= Count() ||
-!CheckNodesRange( pRange->aStart, pRange->aEnd ))
+!::CheckNodesRange(pRange->aStart, pRange->aEnd, false))
+{
return;
+}
// If the beginning of a range is before or at a start node position, so
// delete it, otherwise empty S/E or E/S nodes would be created.
@@ -945,9 +947,11 @@ void SwNodes::SectionUp(SwNodeRange *pRange)
{
if( pRange->aStart >= pRange->aEnd ||
pRange->aEnd >= Count() ||
-!CheckNodesRange( pRange->aStart, pRange->aEnd ) ||
+!::CheckNodesRange(pRange->aStart, pRange->aEnd, false) ||
( HighestLevel( *this, *pRange ) <= 1 ))
+{
return;
+}
// If the beginning of a range is before or at a start node position, so
// delete it, otherwise empty S/E or E/S nodes would be created.
@@ -1073,8 +1077,10 @@ void SwNodes::Delete(const SwNodeIndex ,
sal_uLong nNodes)
// check if [rIndex..rIndex + nCnt] is larger than the range
if( ( !aRg.aStart.GetNode().StartOfSectionIndex() &&
!aRg.aStart.GetIndex() ) ||
-! CheckNodesRange( aRg.aStart, aRg.aEnd ) )
+!::CheckNodesRange(aRg.aStart, aRg.aEnd, false))
+{
return;
+}
// if aEnd is not on a ContentNode, search the previous one
while( ( pCurrentNode = ())->GetStartNode() ||
@@ -1302,37 +1308,6 @@ SwContentNode* SwNodes::GoPrevious(SwNodeIndex *pIdx)
return static_cast(pNd);
}
-static bool TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, sal_uLong nStt,
sal_uLong nEnd )
-{
-return nStt < nSttIdx && nEnd >= nSttIdx &&
-nStt < nEndIdx && nEnd >= nEndIdx;
-}
-
-/** Check if the given range is inside one of the defined top-level sections.
- *
- * The top-level sections are Content, AutoText, PostIts, Inserts, and
Redlines.
- *
- * @param rStt start index of the range
- * @param rEnd end index of the range
- * @return if valid range
- */
-bool SwNodes::CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex&
rEnd ) const
-{
-sal_uLong nStt = rStt.GetIndex(), nEnd = rEnd.GetIndex();
-if( TstIdx( nStt, nEnd, m_pEndOfContent->StartOfSectionIndex(),
-m_pEndOfContent->GetIndex() )) return true;
-if( TstIdx( nStt, nEnd, m_pEndOfAutotext->StartOfSectionIndex(),
-m_pEndOfAutotext->GetIndex() )) return true;
-if( TstIdx( nStt, nEnd, m_pEndOfPostIts->StartOfSectionIndex(),
-m_pEndOfPostIts->GetIndex() )) return true;
-if( TstIdx( nStt, nEnd, m_pEndOfInserts->StartOfSectionIndex(),
-m_pEndOfInserts->GetIndex() )) return true;
-if( TstIdx( nStt, nEnd, m_pEndOfRedlines->StartOfSectionIndex(),
-m_pEndOfRedlines->GetIndex() )) return true;
-
-return false; // is somewhere in the middle, ERROR
-}
-
/** Delete a number of nodes
*
* @param rStart starting position in this nodes array
commit 7424588115568576c61005386242e3d7e9662dfd
Author: Michael Stahl
AuthorDate: Mon Nov 25 18:29:15 2019 +0100
Commit: Michael Stahl
CommitDate: Tue Nov 26 11:09:46 2019 +0100
sw: document CheckNodesRange functions
Change-Id: I6ca104773eee6809258fdea6be6370b726da8fd4
Reviewed-on: https://gerrit.libreoffice.org/83707
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index
[Libreoffice-commits] core.git: 3 commits - filter/source soltools/cpp
filter/source/flash/swfwriter1.cxx |4 ++--
filter/source/svg/svgwriter.cxx|3 ++-
soltools/cpp/_macro.c |1 +
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit a15729a63ea90a066a6a98a762f4a1c2b19f9389
Author: Caolán McNamara
AuthorDate: Sun Nov 17 19:12:44 2019 +
Commit: Caolán McNamara
CommitDate: Mon Nov 18 10:02:15 2019 +0100
cid#1430070 Copy-paste error
add annotation
Change-Id: I6973335b8877b48d5cf0a08f4e291585de352446
Reviewed-on: https://gerrit.libreoffice.org/83035
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 9253bbace5f3..ca4a2368bd9d 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2428,7 +2428,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos,
const OUString& rText,
if ( aTextColor == COL_BLACK )
aTextColor = COL_WHITE;
-if ( aTextColor == COL_WHITE )
+// coverity[copy_paste_error : FALSE] - aReliefColor depending on
aTextColor is correct
+if (aTextColor == COL_WHITE)
aReliefColor = COL_BLACK;
commit 24a8e873bba179cf50b2157e95a97d089e379e1c
Author: Caolán McNamara
AuthorDate: Sun Nov 17 19:14:07 2019 +
Commit: Caolán McNamara
CommitDate: Mon Nov 18 10:01:57 2019 +0100
cid#1430063 Copy-paste error
add annotation
Change-Id: I162b4f388baff243425d34a13c1104dfdaf92588
Reviewed-on: https://gerrit.libreoffice.org/83036
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/filter/source/flash/swfwriter1.cxx
b/filter/source/flash/swfwriter1.cxx
index 5416ab869442..4bc117c0dccf 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -402,10 +402,10 @@ void Writer::Impl_writeText( const Point& rPos, const
OUString& rText, const lon
if ( aTextColor == COL_BLACK )
aTextColor = COL_WHITE;
-if ( aTextColor == COL_WHITE )
+// coverity[copy_paste_error : FALSE] - aReliefColor depending on
aTextColor is correct
+if (aTextColor == COL_WHITE)
aReliefColor = COL_BLACK;
-
Point aPos( rPos );
Point aOffset( 6,6 );
commit de38c4a5ea015f0f881b80f7ec0dcbaf323bc1e0
Author: Caolán McNamara
AuthorDate: Sun Nov 17 17:54:20 2019 +
Commit: Caolán McNamara
CommitDate: Mon Nov 18 10:01:42 2019 +0100
cid#1448469 Out-of-bounds access
add an annotation
Change-Id: I70a431fecd8a87f2167bdce53ec2397d22436a9d
Reviewed-on: https://gerrit.libreoffice.org/83025
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index eaafb86034ef..ef41b992edae 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -411,6 +411,7 @@ int
ntok++;
if (trp->tp >= trp->lp)
{
+// coverity[overrun-buffer-arg: FALSE] - a multiple of trp->max is
allocated, not trp->max itself
gettokens(trp, 0);
if ((trp->lp - 1)->type == END)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - bean/com sc/source vcl/source
bean/com/sun/star/comp/beans/OOoBean.java |6 +-
sc/source/filter/excel/xistring.cxx |2 +-
vcl/source/gdi/FileDefinitionWidgetDraw.cxx |7 ++-
3 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 46920005f74edcb70acfb8dd1a0ffb9553e5c2b2
Author: Caolán McNamara
AuthorDate: Sat Nov 16 17:22:22 2019 +
Commit: Caolán McNamara
CommitDate: Sat Nov 16 20:25:07 2019 +0100
cid#1448516 silence Dereference null return value
Change-Id: Ifb7e14183e97c225ed7e68f93e6142d10c4a87b0
Reviewed-on: https://gerrit.libreoffice.org/82991
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java
b/bean/com/sun/star/comp/beans/OOoBean.java
index 0345d48ca45e..3475447368e4 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -291,12 +291,16 @@ public class OOoBean
// avoid concurrent access from multiple threads
final OfficeConnection iConn = getOOoConnection();
+com.sun.star.uno.XComponentContext xComponentContext =
iConn.getComponentContext();
+if (xComponentContext == null)
+throw new NoConnectionException();
+
Thread aConnectorThread = new Thread("getServiceManager") {
@Override
public void run()
{
com.sun.star.lang.XMultiComponentFactory aFactory =
-iConn.getComponentContext().getServiceManager();
+xComponentContext.getServiceManager();
xServiceFactory = UnoRuntime.queryInterface(
com.sun.star.lang.XMultiServiceFactory.class, aFactory
);
}
commit 9aab980711f82471b012b1691699d9a28ef836f5
Author: Tomaž Vajngerl
AuthorDate: Sat Nov 16 11:01:38 2019 +0100
Commit: Tomaž Vajngerl
CommitDate: Sat Nov 16 20:25:02 2019 +0100
widget theme: allow for default "stacked" spinbuttons
Change-Id: I2943616a641de72a615f57784e8a9927c12edcf7
Reviewed-on: https://gerrit.libreoffice.org/82979
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 0eb0484d4cbe..3d650719eb79 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -737,9 +737,14 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
auto const& pEntirePart
= m_pWidgetDefinition->getDefinition(eType,
ControlPart::Entire);
+
OString sOrientation = pEntirePart->msOrientation;
-if (sOrientation.isEmpty() || sOrientation ==
"decrease-edit-increase")
+if (sOrientation.isEmpty() || sOrientation == "stacked")
+{
+return false;
+}
+else if (sOrientation == "decrease-edit-increase")
{
if (ePart == ControlPart::ButtonUp)
{
commit d6f00ac943fbcdc56e828db0c9ff96337c1e74f7
Author: Caolán McNamara
AuthorDate: Sat Nov 16 17:44:17 2019 +
Commit: Caolán McNamara
CommitDate: Sat Nov 16 20:24:51 2019 +0100
cid#1448453 Untrusted value as argument
coverity doesn't warn about XclImpString::ReadFormats
Change-Id: Ide6285f39fed09a1767c2a2272f30ec213a20106
Reviewed-on: https://gerrit.libreoffice.org/82993
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/filter/excel/xistring.cxx
b/sc/source/filter/excel/xistring.cxx
index 4b06f3447978..096507ba8351 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -80,7 +80,7 @@ void XclImpString::Read( XclImpStream& rStrm, XclStrFlags
nFlags )
maString = rStrm.ReadRawUniString( nChars, b16Bit );
// --- formatting ---
-if( nRunCount > 0 )
+if (nRunCount)
ReadFormats( rStrm, maFormats, nRunCount );
// --- extended (FarEast) information ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/source qadevOOo/tests sfx2/source
chart2/source/controller/dialogs/dlg_CreationWizard.cxx |7 ---
qadevOOo/tests/java/ifc/frame/_XController.java |3 ++-
sfx2/source/control/request.cxx | 14 +-
3 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 31fd3641b363c81ab23e10e6425a39e27a224c3d
Author: Caolán McNamara
AuthorDate: Sat Nov 16 16:40:33 2019 +
Commit: Caolán McNamara
CommitDate: Sat Nov 16 20:24:33 2019 +0100
cid#1453998 Wrapper object use after free
Change-Id: I1dc733e72ba63db1eaa20113a7599ea7580eef31
Reviewed-on: https://gerrit.libreoffice.org/82988
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index ccf2cdc5221f..2bdedc962856 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -68,6 +68,10 @@ CreationWizard::CreationWizard(weld::Window* pParent, const
uno::Reference(GetOrCreatePage(STATE_CHARTTYPE));
+assert(m_pTemplateProvider && "must exist");
+m_pDialogModel->setTemplate(m_pTemplateProvider->getCurrentTemplate());
+
SetRoadmapHelpId(HID_SCH_WIZARD_ROADMAP);
if (!m_pDialogModel->getModel().isDataFromSpreadsheet())
@@ -97,9 +101,6 @@ std::unique_ptr
CreationWizard::createPage(WizardState nState)
{
m_aTimerTriggeredControllerLock.startTimer();
xRet = std::make_unique(pPageContainer, this,
m_xChartModel);
-m_pTemplateProvider = static_cast(xRet.get());
-if (m_pDialogModel)
-m_pDialogModel->setTemplate(
m_pTemplateProvider->getCurrentTemplate());
break;
}
case STATE_SIMPLE_RANGE:
commit 591c305541306d41d3777ad5e2c92f875072e2d9
Author: Caolán McNamara
AuthorDate: Sat Nov 16 17:54:26 2019 +
Commit: Caolán McNamara
CommitDate: Sat Nov 16 20:24:16 2019 +0100
cid#1448447 silence RV: Bad use of return value
Change-Id: If24d5fffb4ecf86fa6a43d824b5e40fcef29a691
Reviewed-on: https://gerrit.libreoffice.org/82995
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/qadevOOo/tests/java/ifc/frame/_XController.java
b/qadevOOo/tests/java/ifc/frame/_XController.java
index af467456e9e6..0419976a8ca2 100644
--- a/qadevOOo/tests/java/ifc/frame/_XController.java
+++ b/qadevOOo/tests/java/ifc/frame/_XController.java
@@ -153,7 +153,8 @@ public class _XController extends MultiMethodTest {
log.println("as expected, see #82938");
}
tRes.tested("attachModel()", result);
-oObj.attachModel(firstModel);
+boolean bResult = oObj.attachModel(firstModel);
+log.println("attachModel() --> " + bResult);
}
/**
commit 2d6f56e4f7e492ba5394a86f13bc710bf6c68335
Author: Caolán McNamara
AuthorDate: Sat Nov 16 16:30:59 2019 +
Commit: Caolán McNamara
CommitDate: Sat Nov 16 20:24:02 2019 +0100
cid#1455212 Uncaught exception
Change-Id: I75956bfc3dccdf3ef400c3b9dcea40606abb8504
Reviewed-on: https://gerrit.libreoffice.org/82987
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index fcdb5c036f32..ec3d36eb4467 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -74,7 +74,7 @@ struct SfxRequest_Impl: public SfxListener
SfxViewFrame* pViewFrame;
css::uno::Reference< css::frame::XDispatchRecorder > xRecorder;
-css::uno::Reference< uno::XComponentContext > xContext;
+css::uno::Reference< css::util::XURLTransformer > xTransform;
explicit SfxRequest_Impl( SfxRequest *pOwner )
: pAnti( pOwner)
@@ -88,7 +88,6 @@ struct SfxRequest_Impl: public SfxListener
, nCallMode( SfxCallMode::SYNCHRON )
, bAllowRecording( false )
, pViewFrame(nullptr)
-, xContext(comphelper::getProcessComponentContext())
{
}
@@ -167,6 +166,8 @@ SfxRequest::SfxRequest
{
pImpl->SetPool( >pShell->GetPool() );
pImpl->xRecorder = SfxRequest::GetMacroRecorder(pImpl->pViewFrame);
+if (pImpl->xRecorder)
+pImpl->xTransform =
util::URLTransformer::create(comphelper::getProcessComponentContext());
pImpl->aTarget = pImpl->pShell->GetName();
}
else
@@ -206,6 +207,8 @@ SfxRequest::SfxRequest
{
pImpl->SetPool( >pShell->GetPool() );
pImpl->xRecorder = SfxRequest::GetMacroRecorder( pViewFrame );
+if (pImpl->xRecorder)
+pImpl->xTransform =
util::URLTransformer::create(comphelper::getProcessComponentContext());
pImpl->aTarget = pImpl->pShell->GetName();
}
else
@@ -333,10 +336,11 @@ void SfxRequest_Impl::Record
*/
[Libreoffice-commits] core.git: 3 commits - cui/uiconfig sfx2/uiconfig
cui/uiconfig/ui/optonlineupdatepage.ui | 550 +++- cui/uiconfig/ui/optviewpage.ui | 703 --- sfx2/uiconfig/ui/optprintpage.ui | 743 ++--- 3 files changed, 1141 insertions(+), 855 deletions(-) New commits: commit 342a759dae8c58f2256e5aa92e1d27fd4a3601c7 Author: andreas kainz AuthorDate: Mon Nov 11 22:52:37 2019 +0100 Commit: andreas_kainz CommitDate: Sat Nov 16 09:12:52 2019 +0100 tdf#128721 Options -> View Dialog update Change-Id: I3e769846c1dd5d57e62276a624fb209ca6bd7673 Reviewed-on: https://gerrit.libreoffice.org/82473 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index c72eaab3eb09..188a3f9e2d09 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -15,39 +15,42 @@ start start 6 -12 +24 - + True False -18 +True +12 - + True False +True 0 none - + True False +True 6 12 - + True False -Requires restart -6 +True +3 +6 - -Use hard_ware acceleration + True -True -False +False +_Positioning: True +mousepos 0 -True 0 @@ -55,14 +58,13 @@ - -Use anti-a_liasing + True -True -False +False +Middle _button: True +mousemiddle 0 -True 0 @@ -70,59 +72,37 @@ - -Use OpenGL for all rendering -True -True -False -True -0 -True - - -0 -2 - - - - -Ignore OpenGL blacklist + True -True -False -Requires restart. Enabling this may expose driver bugs -12 -True -0 -True - - -0 -3 - - - - False -12 -GL is currently enabled. -0 +start +True + + Default button + Dialog center + No automatic positioning + -0 -4 +1 +0 - + +True False -12 -GL is currently disabled. -0 +start +True + + No function + Automatic scrolling + Paste clipboard + -0 -5 +1 +1 @@ -130,10 +110,10 @@
[Libreoffice-commits] core.git: 3 commits - chart2/source dbaccess/source extensions/source include/vcl solenv/clang-format svx/source sw/source toolkit/source vcl/source vcl/workben
chart2/source/controller/dialogs/DataBrowser.cxx |2 -- dbaccess/source/ui/control/tabletree.cxx |1 - dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx|1 - dbaccess/source/ui/inc/WCPage.hxx|1 - dbaccess/source/ui/relationdesign/RelationController.cxx |1 - extensions/source/propctrlr/standardcontrol.hxx |1 - include/vcl/toolkit/roadmap.hxx |2 +- include/vcl/toolkit/throbber.hxx |2 +- include/vcl/uitest/uiobject.hxx |4 ++-- solenv/clang-format/blacklist|4 ++-- svx/source/fmcomp/fmgridcl.cxx |1 - sw/source/core/doc/docedt.cxx|1 - sw/source/core/docnode/ndcopy.cxx|1 - sw/source/ui/dbui/mmresultdialogs.cxx|2 +- sw/source/ui/index/cnttab.cxx|1 - sw/source/uibase/app/docsh.cxx |1 - sw/source/uibase/uiview/viewsrch.cxx |1 - sw/source/uibase/utlui/navipi.cxx|1 - toolkit/source/awt/vclxspinbutton.cxx|2 +- toolkit/source/awt/vclxtoolkit.cxx |4 ++-- toolkit/source/awt/vclxwindows.cxx |2 +- vcl/source/control/imgctrl.cxx |2 +- vcl/source/control/spinbtn.cxx |2 +- vcl/source/uitest/uiobject.cxx |2 +- vcl/workben/svpclient.cxx|2 +- 25 files changed, 15 insertions(+), 29 deletions(-) New commits: commit f645993593ff931d1659e701487131e3bd1b40f5 Author: Caolán McNamara AuthorDate: Tue Oct 29 17:22:19 2019 + Commit: Caolán McNamara CommitDate: Wed Oct 30 09:13:07 2019 +0100 imgctrl.hxx only used by vcl and toolkit Change-Id: I77e2efa77d9fbc0830553faed269e1fec2b2a286 Reviewed-on: https://gerrit.libreoffice.org/81713 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/vcl/imgctrl.hxx b/include/vcl/toolkit/imgctrl.hxx similarity index 100% rename from include/vcl/imgctrl.hxx rename to include/vcl/toolkit/imgctrl.hxx diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx index 0c08147b0784..3ec6f7574a2c 100644 --- a/include/vcl/toolkit/roadmap.hxx +++ b/include/vcl/toolkit/roadmap.hxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include class Bitmap; diff --git a/include/vcl/toolkit/throbber.hxx b/include/vcl/toolkit/throbber.hxx index b0f49b18c38e..7034bfa82b22 100644 --- a/include/vcl/toolkit/throbber.hxx +++ b/include/vcl/toolkit/throbber.hxx @@ -21,7 +21,7 @@ #define INCLUDED_VCL_THROBBER_HXX #include -#include +#include #include #include diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index a113d1c9cb2c..c3693241d5af 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7818,7 +7818,6 @@ include/vcl/imapcirc.hxx include/vcl/imapobj.hxx include/vcl/imappoly.hxx include/vcl/imaprect.hxx -include/vcl/imgctrl.hxx include/vcl/inetimg.hxx include/vcl/inputctx.hxx include/vcl/inputtypes.hxx @@ -7900,6 +7899,7 @@ include/vcl/threadex.hxx include/vcl/timer.hxx include/vcl/toolbox.hxx include/vcl/toolkit/group.hxx +include/vcl/toolkit/imgctrl.hxx include/vcl/toolkit/morebtn.hxx include/vcl/toolkit/roadmap.hxx include/vcl/toolkit/spin.hxx diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index b0ccf3b64870..754176927e2e 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -90,7 +90,6 @@ #include #include #include -#include #include #include #include @@ -108,6 +107,7 @@ #include #include #include +#include #include #include #include diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 5d327f6b13d3..4d072ced46e6 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 7e6fca11b0eb..3c60d92a4429 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 74ccb9f9205f..93fa276b61f2 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include commit
[Libreoffice-commits] core.git: 3 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 51435bdf9d246869f0adc711e2dd97c282627a1b Author: Olivier Hallot AuthorDate: Thu Oct 24 13:34:18 2019 -0300 Commit: Gerrit Code Review CommitDate: Thu Oct 24 18:38:28 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Update screenshots for View Option page Use kde5 breeze theme Change-Id: I9a5eb3d7c26a7e24a9dde6291ad31593677106c2 Reviewed-on: https://gerrit.libreoffice.org/81471 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index abf00f5fcbbf..1e056e15fb9f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit abf00f5fcbbf4070356323bd6a1c4a1676a7af19 +Subproject commit 1e056e15fb9fae16f6052bfa286a5e8ba1dcb385 commit 5cb6f3c5b9ecb560d11bab116c5b320749077ecd Author: Olivier Hallot AuthorDate: Thu Oct 24 13:27:41 2019 -0300 Commit: Gerrit Code Review CommitDate: Thu Oct 24 18:38:05 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Update screenshot for A11y Option page Use kde5 Breeze theme Change-Id: I8b263f065e6cd31e04830d1b287032fed125dd18 Reviewed-on: https://gerrit.libreoffice.org/81470 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4b6b76cb0e9e..abf00f5fcbbf 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4b6b76cb0e9ef587dc7fa49c2e9c0202b5afb356 +Subproject commit abf00f5fcbbf4070356323bd6a1c4a1676a7af19 commit 5d79aa2630288092f3e7fbb9dad83a44f2436929 Author: Olivier Hallot AuthorDate: Thu Oct 24 13:23:24 2019 -0300 Commit: Gerrit Code Review CommitDate: Thu Oct 24 18:37:44 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Update screenshots for HTML option page Use kde5 breeze theme Change-Id: I41e7d6d892d174ac127323b37cfbe491900d23f5 Reviewed-on: https://gerrit.libreoffice.org/81469 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b4004ab6c999..4b6b76cb0e9e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b4004ab6c999dc7026ae214ceada646aea1f1ba6 +Subproject commit 4b6b76cb0e9ef587dc7fa49c2e9c0202b5afb356 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - officecfg/registry sw/qa sw/source writerfilter/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 +++
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |2 -
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |2 -
sw/source/filter/ww8/docxattributeoutput.cxx | 21 +++--
sw/source/filter/ww8/docxattributeoutput.hxx |7 +++-
sw/source/filter/ww8/rtfattributeoutput.cxx| 21 -
writerfilter/source/dmapper/DomainMapper.cxx |8 +++-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 +
writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 +
9 files changed, 56 insertions(+), 17 deletions(-)
New commits:
commit ddd08c8996d444d7c0fe49d083c4f70f0a278d14
Author: Michael Stahl
AuthorDate: Wed Oct 2 18:49:47 2019 +0200
Commit: Michael Stahl
CommitDate: Wed Oct 23 13:09:44 2019 +0200
writerfilter: add config to import all fields as generic, incl. commands
Change-Id: I02d178de3672200b69e60ba5841c993fa0d797f9
Reviewed-on: https://gerrit.libreoffice.org/80076
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 5eeb6c570331..8f33efdb29cb 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3870,6 +3870,12 @@
true
+
+
+ Experimental: force all fields in RTF/DOCX to be imported
as dumb generic enhanced fields.
+
+false
+
Specifies if LO should create MSO lock files next to the
LO lock files
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index cb46699fad95..5ad13d6145e5 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3111,8 +3111,10 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_,
size_t len)
m_pImpl->SetCustomFtnMark( false );
//otherwise ignore sText
}
-else if( m_pImpl->IsOpenFieldCommand() )
+else if (m_pImpl->IsOpenFieldCommand() &&
!m_pImpl->IsForceGenericFields())
+{
m_pImpl->AppendFieldCommand(sText);
+}
else if( m_pImpl->IsOpenField() && m_pImpl->IsFieldResultAsString())
/*depending on the success of the field insert operation this
result will be
set at the field or directly inserted into the text*/
@@ -3380,8 +3382,10 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
pContext->GetFootnote()->setLabel( sText );
//otherwise ignore sText
}
-else if( m_pImpl->IsOpenFieldCommand() )
+else if (m_pImpl->IsOpenFieldCommand() &&
!m_pImpl->IsForceGenericFields())
+{
m_pImpl->AppendFieldCommand(sText);
+}
else if( m_pImpl->IsOpenField() &&
m_pImpl->IsFieldResultAsString())
/*depending on the success of the field insert operation this
result will be
set at the field or directly inserted into the text*/
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f23775bc8731..9df643e07f4f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -193,6 +193,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_xTextDocument( xModel, uno::UNO_QUERY ),
m_xTextFactory( xModel, uno::UNO_QUERY ),
m_xComponentContext( xContext ),
+m_bForceGenericFields(!utl::ConfigManager::IsFuzzing() &&
officecfg::Office::Common::Filter::Microsoft::Import::ForceImportWWFieldsAsGenericFields::get(m_xComponentContext)),
m_bSetUserFieldContent( false ),
m_bSetCitation( false ),
m_bSetDateValue( false ),
@@ -4354,7 +4355,7 @@ void DomainMapper_Impl::CloseFieldCommand()
FieldConversionMap_t::const_iterator const aIt =
aFieldConversionMap.find(std::get<0>(field));
-if(aIt != aFieldConversionMap.end())
+if (aIt != aFieldConversionMap.end() && !m_bForceGenericFields)
{
pContext->SetFieldId(aIt->second.eFieldId);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 6f5aaedd1fed..813d45bab770 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -418,6 +418,7 @@ private:
std::stack
m_aAnchoredStack;
std::stack
[Libreoffice-commits] core.git: 3 commits - sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |5 -
sw/source/core/doc/docbm.cxx| 16 +---
sw/source/core/txtnode/swfont.cxx |2 ++
3 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit a0fa6911a013dc5cc844fdbee13132a467f4a437
Author: Michael Stahl
AuthorDate: Tue Oct 15 12:41:37 2019 +0200
Commit: Michael Stahl
CommitDate: Wed Oct 23 13:03:14 2019 +0200
sw: fix copying of fieldmarks in lcl_CopyBookmarks()
Surprisingly this handles CHECKBOX_FIELDMARK differently than the others
but clearly it's a bug not to copy a fully selected TEXT_FIELDMARK as
seen in CppunitTest_sw_ooxmlexport testMultiPageToc, where a header is
copied with its CH_TXT_ATR_FIELD* but not the fieldmark.
Change-Id: Ibf4d934ea834c1ac9fe4e541259605a745246049
Reviewed-on: https://gerrit.libreoffice.org/80914
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index baff9f898f4d..c7faedd49eab 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -251,7 +251,10 @@ namespace
if ( rMarkStart >= rStt && rMarkEnd <= rEnd
&& ( bIsNotOnBoundary
|| aMarkType ==
IDocumentMarkAccess::MarkType::ANNOTATIONMARK
- || aMarkType ==
IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK ) )
+ || aMarkType ==
IDocumentMarkAccess::MarkType::TEXT_FIELDMARK
+ || aMarkType ==
IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK
+ || aMarkType ==
IDocumentMarkAccess::MarkType::DROPDOWN_FIELDMARK
+ || aMarkType ==
IDocumentMarkAccess::MarkType::DATE_FIELDMARK))
{
vMarksToCopy.push_back(pMark);
}
commit 19a559b0ec9b806519c405651d6d2b2e14712b4a
Author: Michael Stahl
AuthorDate: Mon Oct 14 16:55:50 2019 +0200
Commit: Michael Stahl
CommitDate: Wed Oct 23 13:02:52 2019 +0200
sw: SwSubFont::GetTextSize_() assert on presumably dead code
Change-Id: Iced0776a719dbc7e9d19db7bd547c408caa6a04f
Reviewed-on: https://gerrit.libreoffice.org/80913
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/txtnode/swfont.cxx
b/sw/source/core/txtnode/swfont.cxx
index 4de9b2b2ee90..9816212aa690 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1118,6 +1118,7 @@ Size SwSubFont::GetTextSize_( SwDrawTextInfo& rInf )
if (TextFrameIndex(1) == rInf.GetLen()
&& CH_TXT_ATR_FIELDSTART == rInf.GetText()[sal_Int32(rInf.GetIdx())])
{
+assert(!"this is presumably dead code");
TextFrameIndex const nOldIdx(rInf.GetIdx());
TextFrameIndex const nOldLen(rInf.GetLen());
const OUString aNewText(CH_TXT_ATR_SUBST_FIELDSTART);
@@ -1131,6 +1132,7 @@ Size SwSubFont::GetTextSize_( SwDrawTextInfo& rInf )
else if (TextFrameIndex(1) == rInf.GetLen()
&& CH_TXT_ATR_FIELDEND == rInf.GetText()[sal_Int32(rInf.GetIdx())])
{
+assert(!"this is presumably dead code");
TextFrameIndex const nOldIdx(rInf.GetIdx());
TextFrameIndex const nOldLen(rInf.GetLen());
const OUString aNewText(CH_TXT_ATR_SUBST_FIELDEND);
commit d426964c0d3e42058f93f764eab1257cf9d21d4c
Author: Michael Stahl
AuthorDate: Mon Oct 14 16:45:28 2019 +0200
Commit: Michael Stahl
CommitDate: Wed Oct 23 13:02:34 2019 +0200
sw: getFieldmarkFor() and GetCurrentFieldmark() return innermost one
In case of nested fieldmarks, this seems plausible to me.
Change-Id: Iefa6a3836421fc93d7687eeb608f21d63fb45e81
Reviewed-on: https://gerrit.libreoffice.org/80912
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 4f94baab5c90..68914f38c0b3 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1293,13 +1293,23 @@ namespace sw { namespace mark
IFieldmark* MarkManager::getFieldmarkFor(const SwPosition& rPos) const
{
-auto const pFieldmark = find_if(
+auto itFieldmark = find_if(
m_vFieldmarks.begin(),
m_vFieldmarks.end(),
[] (const ::sw::mark::MarkBase *const pMark) { return
pMark->IsCoveringPosition(rPos); } );
-if(pFieldmark == m_vFieldmarks.end())
+if (itFieldmark == m_vFieldmarks.end())
return nullptr;
-return dynamic_cast(*pFieldmark);
+auto pFieldmark(*itFieldmark);
+for ( ; itFieldmark != m_vFieldmarks.end()
+&& (**itFieldmark).IsCoveringPosition(rPos); ++itFieldmark)
+{ // find the innermost fieldmark
+if
[Libreoffice-commits] core.git: 3 commits - cui/uiconfig sw/uiconfig
cui/uiconfig/ui/paragalignpage.ui |6 ++ cui/uiconfig/ui/paratabspage.ui |4 - sw/uiconfig/swriter/ui/numparapage.ui | 91 -- 3 files changed, 51 insertions(+), 50 deletions(-) New commits: commit 48e68eddb9bc1d8356eaf493cfd4a520f64ce4d1 Author: andreas kainz AuthorDate: Fri Oct 18 22:56:30 2019 +0200 Commit: andreas_kainz CommitDate: Tue Oct 22 22:04:30 2019 +0200 tdf#128239 Paragraph Dialog: Update Alignment tab Change-Id: Ia2649902e4ad8c2990ffef5fd0c22df32484fcd7 Reviewed-on: https://gerrit.libreoffice.org/81113 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui index ddc3690fffa7..289585fa390c 100644 --- a/cui/uiconfig/ui/paragalignpage.ui +++ b/cui/uiconfig/ui/paragalignpage.ui @@ -440,4 +440,10 @@ + + + + + + commit 5456719e2a2cc4f3d9bfc2f107a054c593cd5480 Author: andreas kainz AuthorDate: Fri Oct 18 22:07:44 2019 +0200 Commit: andreas_kainz CommitDate: Tue Oct 22 22:04:22 2019 +0200 tdf#128239 Paragraph Dialog: Update Outline tab Change-Id: Icb22f2a9f24852898ab4550bc0cec32732ad32dd Reviewed-on: https://gerrit.libreoffice.org/81103 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/swriter/ui/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui index 0ff72c8eadfd..5339ba2ae8b9 100644 --- a/sw/uiconfig/swriter/ui/numparapage.ui +++ b/sw/uiconfig/swriter/ui/numparapage.ui @@ -17,7 +17,6 @@ True False -True 6 vertical 12 @@ -25,28 +24,23 @@ True False -True 0 none True False -True 6 12 True False -True 12 True False -start -True Outline level: True comboLB_OUTLINE_LEVEL @@ -62,7 +56,6 @@ True False -True Text Body Level 1 @@ -108,28 +101,24 @@ True False -True 0 none True False -True 6 12 True False -True vertical 6 True False -True 12 @@ -149,13 +138,37 @@ - + True False -True - - None - +12 + + +True +False + + None + + + +False +True +0 + + + + +Edit Style +True +True +False + + +False +True +1 + + False @@ -163,19 +176,6 @@ 1 - - -Edit Style -True -True -False - - -False -True -2 - - False @@ -206,13 +206,11 @@ False False -True 12 True False -
[Libreoffice-commits] core.git: 3 commits - compilerplugins/clang include/sfx2 include/svx sd/source sfx2/source svx/source
compilerplugins/clang/virtualdead.unusedparams.results |9 -
include/sfx2/emojiviewitem.hxx |2 +-
include/sfx2/thumbnailviewitem.hxx |2 +-
include/svx/fmtools.hxx|2 +-
include/svx/svdhdl.hxx |2 +-
sd/source/ui/view/viewoverlaymanager.cxx |4 ++--
sfx2/source/control/emojiviewitem.cxx |2 +-
sfx2/source/control/thumbnailview.cxx |4 ++--
sfx2/source/control/thumbnailviewitem.cxx |2 +-
svx/source/fmcomp/gridctrl.cxx |2 +-
svx/source/form/fmtools.cxx|4 ++--
svx/source/svdraw/svdhdl.cxx |2 +-
svx/source/svdraw/svdmrkv.cxx |2 +-
13 files changed, 15 insertions(+), 24 deletions(-)
New commits:
commit 4a20922e0eebe9c7a9fe59b3aac8a8d996bee0e7
Author: Noel Grandin
AuthorDate: Fri Oct 18 10:55:51 2019 +0200
Commit: Noel Grandin
CommitDate: Mon Oct 21 08:33:22 2019 +0200
loplugin:virtualdead unused param in
ThumbnailViewItem::calculateItemsPosition
Change-Id: I8db99a3672e3603a25ee1f6ca4741a02b73c9516
Reviewed-on: https://gerrit.libreoffice.org/81184
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results
b/compilerplugins/clang/virtualdead.unusedparams.results
index 9ed08fc878f6..c216a504b8b7 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -148,9 +148,6 @@ include/sfx2/sidebar/TitleBar.hxx:61
include/sfx2/stbitem.hxx:100
_Bool SfxStatusBarControl::MouseButtonUp(const class MouseEvent &,)
0
-include/sfx2/thumbnailviewitem.hxx:118
-void ThumbnailViewItem::calculateItemsPosition(const long,const long,const
long,unsigned int,const struct ThumbnailItemAttributes *,)
-10111
include/svl/svdde.hxx:228
_Bool DdeGetPutItem::Put(const class DdeData *,)
0
diff --git a/include/sfx2/emojiviewitem.hxx b/include/sfx2/emojiviewitem.hxx
index e0aa57675f9a..0e995664e768 100644
--- a/include/sfx2/emojiviewitem.hxx
+++ b/include/sfx2/emojiviewitem.hxx
@@ -26,7 +26,7 @@ public:
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs) override;
-virtual void calculateItemsPosition (const long nThumbnailHeight, const
long nDisplayHeight,
+virtual void calculateItemsPosition (const long nThumbnailHeight,
const long nPadding, sal_uInt32
nMaxTextLength,
const ThumbnailItemAttributes
*pAttrs) override;
private:
diff --git a/include/sfx2/thumbnailviewitem.hxx
b/include/sfx2/thumbnailviewitem.hxx
index 1d001de2469b..a3d1a09b1fb0 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -115,7 +115,7 @@ public:
const tools::Rectangle& getDrawArea () const { return maDrawArea; }
-virtual void calculateItemsPosition (const long nThumbnailHeight, const
long nDisplayHeight,
+virtual void calculateItemsPosition (const long nThumbnailHeight,
const long nPadding, sal_uInt32
nMaxTextLength,
const ThumbnailItemAttributes
*pAttrs);
diff --git a/sfx2/source/control/emojiviewitem.cxx
b/sfx2/source/control/emojiviewitem.cxx
index f393738d045f..52bbf1d0f2e0 100644
--- a/sfx2/source/control/emojiviewitem.cxx
+++ b/sfx2/source/control/emojiviewitem.cxx
@@ -37,7 +37,7 @@ EmojiViewItem::~EmojiViewItem ()
}
-void EmojiViewItem::calculateItemsPosition (const long /*nThumbnailHeight*/,
const long,
+void EmojiViewItem::calculateItemsPosition (const long /*nThumbnailHeight*/,
const long /*nPadding*/,
sal_uInt32 nMaxTextLength,
const ThumbnailItemAttributes
*pAttrs)
{
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 9d4225539351..6f4ca606ea1b 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -354,7 +354,7 @@ void ThumbnailView::CalculateItemPositions (bool
bScrollBarUsed)
}
pItem->setDrawArea(::tools::Rectangle( Point(x,y),
Size(mnItemWidth, mnItemHeight) ));
-
pItem->calculateItemsPosition(mnThumbnailHeight,mnDisplayHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get());
+
pItem->calculateItemsPosition(mnThumbnailHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get());
if ( !((nCurCount+1) % mnCols) )
{
@@ -1510,7 +1510,7 @@ void SfxThumbnailView::CalculateItemPositions(bool
bScrollBarUsed)
[Libreoffice-commits] core.git: 3 commits - desktop/source icon-themes/elementary icon-themes/elementary_svg officecfg/registry sw/source
desktop/source/lib/init.cxx | 36
--
icon-themes/elementary/links.txt |3
icon-themes/elementary/sw/res/sc20245.png |binary
icon-themes/elementary/sw/res/sc20246.png |binary
icon-themes/elementary/sw/res/sc20247.png |binary
icon-themes/elementary/sw/res/sc20248.png |binary
icon-themes/elementary_svg/sfx2/res/chevron.svg |2
icon-themes/elementary_svg/sfx2/res/grip.svg |2
icon-themes/elementary_svg/sw/res/sc20245.svg |1
icon-themes/elementary_svg/sw/res/sc20246.svg |1
icon-themes/elementary_svg/sw/res/sc20247.svg |1
icon-themes/elementary_svg/sw/res/sc20248.svg |1
officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |8 ++
sw/source/uibase/shells/textfld.cxx |6 +
14 files changed, 52 insertions(+), 9 deletions(-)
New commits:
commit 2fca4bcfda927c6e63f67f70a3331d2d748e65ca
Author: Kelemen Gábor
AuthorDate: Tue Oct 15 13:34:02 2019 +0200
Commit: Miklos Vajna
CommitDate: Fri Oct 18 08:41:35 2019 +0200
tdf#86188 Compatibility setting enabling comments to footnotes
For better OOXML interoperability allow disabling the insertion
of comments to footnotes/endnotes.
It is not possible to add comments to footnotes/endnotes in Word
so no wonder Writer generates invalid XML if one tries to save
comments added to footnotes as DOCX.
Prevent that by adding a centrally manageably key for disabling the
menu item if the cursor is in a footnote/endnote. In OOXML-heavy
environments sysadmins should be able to disable this and thus
hide the footgun from users.
Default setting is true so it means no change compared to current
feature set.
Change-Id: I2f799cb3f77a47fc14fa60b55fc5689a2710aff7
Reviewed-on: https://gerrit.libreoffice.org/80829
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 5d781baf6b64..1712a85a30cc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -163,6 +163,14 @@
false
+
+
+
+Specifies whether adding comments to footnotes is allowed.
This is allowed for ODF but not in OOXML and can result in invalid docx files
being saved.
+Allow adding comments to footnotes. Disable for better
OOXML interperability.
+
+true
+
diff --git a/sw/source/uibase/shells/textfld.cxx
b/sw/source/uibase/shells/textfld.cxx
index d5c4e6b73154..ea78347f73a9 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -81,6 +81,7 @@
#include
#include
#include
+#include
using namespace nsSwDocInfoSubType;
@@ -904,6 +905,11 @@ void SwTextShell::StateField( SfxItemSet )
{
rSet.DisableItem(nWhich);
}
+// tdf#86188 Allow disabling comment insertion on
footnote/endnote for better OOXML interoperability
+else if ( rSh.IsCursorInFootnote() &&
!officecfg::Office::Compatibility::View::AllowCommentsInFootnotes::get() )
+{
+rSet.DisableItem(nWhich);
+}
}
break;
commit cdeff4f1b4021c5fca55743e119a70fa2bd52b91
Author: Szymon Kłos
AuthorDate: Thu Oct 17 19:23:22 2019 +0200
Commit: Szymon Kłos
CommitDate: Fri Oct 18 08:41:15 2019 +0200
jsdialogs: handle combobox selections
Change-Id: Ib968bfaf7ad9e7becd16355259142d583bf7b5e3
Reviewed-on: https://gerrit.libreoffice.org/80991
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ee0161d4eaf8..b3cd142d9790 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3279,35 +3279,63 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument*
/*pThis*/, unsigned nWin
}
char* pIdChar = strtok(pCopy, " ");
+char* pOptionalEventType = strtok(nullptr, " ");
+char* pOptionalData = strtok(nullptr, " ");
if (!pIdChar) {
SetLastExceptionMsg("Error parsing the command.");
+free(pCopy);
return;
}
OUString sId = OUString::createFromAscii(pIdChar);
-free(pCopy);
VclPtr pWindow = vcl::Window::FindLOKWindow(nWindowId);
if (!pWindow)
{
SetLastExceptionMsg("Document doesn't support dialog rendering, or
window not found.");
+free(pCopy);
[Libreoffice-commits] core.git: 3 commits - include/rtl odk/Package_odk_headers.mk
include/rtl/stringconcat.hxx | 24 +++-
odk/Package_odk_headers.mk |1 -
2 files changed, 11 insertions(+), 14 deletions(-)
New commits:
commit bc02e34235c6f61422f7ea46d4c166d8486e97fe
Author: Stephan Bergmann
AuthorDate: Sat Oct 12 08:33:43 2019 +0200
Commit: Stephan Bergmann
CommitDate: Sat Oct 12 15:34:00 2019 +0200
Use std::enable_if
Change-Id: Ib9b27e2715034ef3e81d041526b705786837c491
Reviewed-on: https://gerrit.libreoffice.org/80707
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx
index 466eb76746aa..595a0aa049c5 100644
--- a/include/rtl/stringconcat.hxx
+++ b/include/rtl/stringconcat.hxx
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
@@ -255,7 +256,7 @@ struct ToStringHelper< OUStringConcat< T1, T2 > >
template< typename T1, typename T2 >
[[nodiscard]]
inline
-typename libreoffice_internal::Enable< OStringConcat< T1, T2 >,
ToStringHelper< T1 >::allowOStringConcat && ToStringHelper< T2
>::allowOStringConcat >::Type operator+( const T1& left, const T2& right )
+typename std::enable_if_t< ToStringHelper< T1 >::allowOStringConcat &&
ToStringHelper< T2 >::allowOStringConcat, OStringConcat< T1, T2 > > operator+(
const T1& left, const T2& right )
{
return OStringConcat< T1, T2 >( left, right );
}
@@ -264,7 +265,7 @@ typename libreoffice_internal::Enable< OStringConcat< T1,
T2 >, ToStringHelper<
template< typename T, int N >
[[nodiscard]]
inline
-typename libreoffice_internal::Enable< OStringConcat< T, const char[ N ] >,
ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, const
char ()[ N ] )
+typename std::enable_if_t< ToStringHelper< T >::allowOStringConcat,
OStringConcat< T, const char[ N ] > > operator+( const T& left, const char
()[ N ] )
{
return OStringConcat< T, const char[ N ] >( left, right );
}
@@ -272,7 +273,7 @@ typename libreoffice_internal::Enable< OStringConcat< T,
const char[ N ] >, ToSt
template< typename T, int N >
[[nodiscard]]
inline
-typename libreoffice_internal::Enable< OStringConcat< const char[ N ], T >,
ToStringHelper< T >::allowOStringConcat >::Type operator+( const char ()[
N ], const T& right )
+typename std::enable_if_t< ToStringHelper< T >::allowOStringConcat,
OStringConcat< const char[ N ], T > > operator+( const char ()[ N ], const
T& right )
{
return OStringConcat< const char[ N ], T >( left, right );
}
@@ -280,7 +281,7 @@ typename libreoffice_internal::Enable< OStringConcat< const
char[ N ], T >, ToSt
template< typename T, int N >
[[nodiscard]]
inline
-typename libreoffice_internal::Enable< OStringConcat< T, char[ N ] >,
ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, char
()[ N ] )
+typename std::enable_if_t< ToStringHelper< T >::allowOStringConcat,
OStringConcat< T, char[ N ] > > operator+( const T& left, char ()[ N ] )
{
return OStringConcat< T, char[ N ] >( left, right );
}
@@ -288,7 +289,7 @@ typename libreoffice_internal::Enable< OStringConcat< T,
char[ N ] >, ToStringHe
template< typename T, int N >
[[nodiscard]]
inline
-typename libreoffice_internal::Enable< OStringConcat< char[ N ], T >,
ToStringHelper< T >::allowOStringConcat >::Type operator+( char ()[ N ],
const T& right )
+typename std::enable_if_t< ToStringHelper< T >::allowOStringConcat,
OStringConcat< char[ N ], T > > operator+( char ()[ N ], const T& right )
{
return OStringConcat< char[ N ], T >( left, right );
}
@@ -296,7 +297,7 @@ typename libreoffice_internal::Enable< OStringConcat< char[
N ], T >, ToStringHe
template< typename T1, typename T2 >
[[nodiscard]]
inline
-typename libreoffice_internal::Enable< OUStringConcat< T1, T2 >,
ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2
>::allowOUStringConcat >::Type operator+( const T1& left, const T2& right )
+typename std::enable_if_t< ToStringHelper< T1 >::allowOUStringConcat &&
ToStringHelper< T2 >::allowOUStringConcat, OUStringConcat< T1, T2 > >
operator+( const T1& left, const T2& right )
{
return OUStringConcat< T1, T2 >( left, right );
}
@@ -304,7 +305,7 @@ typename libreoffice_internal::Enable< OUStringConcat< T1,
T2 >, ToStringHelper<
template< typename T1, typename T2 >
[[nodiscard]]
inline
-typename libreoffice_internal::Enable< OUStringConcat< T1, T2 >,
ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2
>::allowOUStringConcat && libreoffice_internal::ConstCharArrayDetector< T1,
void >::ok >::Type operator+( T1& left, const T2& right )
+typename std::enable_if_t< ToStringHelper< T1 >::allowOUStringConcat &&
ToStringHelper< T2 >::allowOUStringConcat &&
libreoffice_internal::ConstCharArrayDetector< T1, void >::ok, OUStringConcat<
T1, T2 > > operator+( T1& left, const T2& right )
{
return OUStringConcat< T1, T2 >( left, right );
}
@@ -312,7
[Libreoffice-commits] core.git: 3 commits - compilerplugins/Makefile-clang.mk configure.ac vcl/osx
compilerplugins/Makefile-clang.mk |3 ++-
configure.ac |4 +++-
vcl/osx/saldata.cxx |5 -
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 8bfdb0a48d474f9288fcc368000c90bffbea6506
Author: Stephan Bergmann
AuthorDate: Tue Oct 8 17:40:35 2019 +0200
Commit: Stephan Bergmann
CommitDate: Tue Oct 8 23:50:29 2019 +0200
loplugin:external
Change-Id: I31bf0f87cb66ac19dfa49566e9a190c8af8d408e
Reviewed-on: https://gerrit.libreoffice.org/80486
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 8fda9e6f5fdf..ef46d6f4aa60 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -121,6 +121,7 @@ void SalData::ensureThreadAutoreleasePool()
}
}
+namespace {
NSImage* load_icon_by_name(const OUString& rIconName)
{
@@ -141,6 +142,8 @@ NSImage* load_icon_by_name(const OUString& rIconName)
return image;
}
+}
+
#define MAKE_CURSOR( vcl_name, name, name2 ) \
case vcl_name: \
aHotSpot = NSPoint{name##curs_x_hot, name##curs_y_hot}; \
commit ed654adf92eab0cd21744fbfbfe54ff6d42bed87
Author: Stephan Bergmann
AuthorDate: Tue Oct 8 17:39:33 2019 +0200
Commit: Stephan Bergmann
CommitDate: Tue Oct 8 23:50:01 2019 +0200
loplugin:nullptr
Change-Id: I69e746d32b8a900fd9ee74ddc90b72cc6f9361db
Reviewed-on: https://gerrit.libreoffice.org/80484
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index e0e974ff1f3d..8fda9e6f5fdf 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -256,7 +256,7 @@ NSCursor* SalData::getCursor( PointerStyle i_eStyle )
NSAffineTransform *xform = [[NSAffineTransform alloc] init];
[xform scaleBy:scale];
id hints = @{ NSImageHintCTM: xform };
-CGImageRef rasterCGImage = [theImage CGImageForProposedRect:NULL
context:nil hints:hints];
+CGImageRef rasterCGImage = [theImage
CGImageForProposedRect:nullptr context:nil hints:hints];
NSBitmapImageRep *rep = [[NSBitmapImageRep alloc]
initWithCGImage:rasterCGImage];
[rep setSize:cursorSize];
[multiResImage addRepresentation:rep];
commit ffdd79eda08b7ce4492d33fa265d24c60b88d173
Author: Stephan Bergmann
AuthorDate: Tue Oct 8 16:28:54 2019 +0200
Commit: Stephan Bergmann
CommitDate: Tue Oct 8 23:49:36 2019 +0200
My Windows clang-cl build still doesn't use LO_CLANG_SHARED_PLUGINS
...so disable the new configure.ac checks introduced with
ad5cbcf6ba0afdc1d8d7405c2641cce8de4a360b "try to autodetect flags needed to
build Clang plugins" that are only relevant when using
LO_CLANG_SHARED_PLUGINS
and would fail miserably for my clang-cl build
Change-Id: I58f7f1f4608f1a615175f0c0d0d98c03c442a36c
Reviewed-on: https://gerrit.libreoffice.org/80477
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/Makefile-clang.mk
b/compilerplugins/Makefile-clang.mk
index 0d599dcef59a..eb1ae04d0bf4 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -37,7 +37,8 @@ endif
# Whether to make plugins use one shared ASTRecursiveVisitor (plugins run
faster).
# By default enabled, disable if you work on an affected plugin (re-generating
takes time).
LO_CLANG_SHARED_PLUGINS=1
-#TODO:
+#TODO: Windows doesn't use LO_CLANG_SHARED_PLUGINS for now, see corresponding
TODO comment in
+# configure.ac:
ifeq ($(OS),WNT)
LO_CLANG_SHARED_PLUGINS=
endif
diff --git a/configure.ac b/configure.ac
index e387e4429f0b..5f3b2e71d2b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7041,7 +7041,9 @@ if test "$COM_IS_CLANG" = "TRUE"; then
add_warning "Cannot find Clang headers to build compiler
plugins, plugins disabled."
fi
])
-if test -n "$COMPILER_PLUGINS"; then
+dnl TODO: Windows doesn't use LO_CLANG_SHARED_PLUGINS for now, see
corresponding TODO
+dnl comment in compilerplugins/Makefile-clang.mk:
+if test -n "$COMPILER_PLUGINS" && test "$_os" != "WINNT"; then
LDFLAGS=""
AC_MSG_CHECKING([for clang libraries to use])
if test -z "$CLANGTOOLLIBS"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/ucbhelper sc/inc sc/source ucbhelper/source
include/ucbhelper/resultsethelper.hxx | 22 +
include/ucbhelper/resultsetmetadata.hxx | 19 ---
sc/inc/cellsuno.hxx | 38 ++-
sc/source/ui/unoobj/cellsuno.cxx| 58
ucbhelper/source/provider/resultsethelper.cxx | 33 -
ucbhelper/source/provider/resultsetmetadata.cxx | 31
6 files changed, 21 insertions(+), 180 deletions(-)
New commits:
commit 6ce4cf4ca87a2a7d0bbba6f7c94619de3e493263
Author: Noel Grandin
AuthorDate: Mon Oct 7 14:55:51 2019 +0200
Commit: Noel Grandin
CommitDate: Tue Oct 8 08:27:49 2019 +0200
use cppu::WeakImplHelper in ScCellRangesBase
Change-Id: Ic1f380ef1ace1e3d57853e070e00c91a19d831db
Reviewed-on: https://gerrit.libreoffice.org/80410
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 30d5d0038a6b..0c6790f39eb1 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -159,21 +159,21 @@ namespace ooo
}
}
-class SC_DLLPUBLIC ScCellRangesBase : public css::beans::XPropertySet,
- public css::beans::XMultiPropertySet,
- public css::beans::XPropertyState,
- public css::sheet::XSheetOperation,
- public css::chart::XChartDataArray,
- public css::util::XIndent,
- public css::sheet::XCellRangesQuery,
- public css::sheet::XFormulaQuery,
- public css::util::XReplaceable,
- public css::util::XModifyBroadcaster,
- public css::lang::XServiceInfo,
- public css::lang::XUnoTunnel,
- public css::lang::XTypeProvider,
- public css::beans::XTolerantMultiPropertySet,
- public cppu::OWeakObject,
+class SC_DLLPUBLIC ScCellRangesBase :
+ public cppu::WeakImplHelper<
+css::beans::XPropertySet,
+ css::beans::XMultiPropertySet,
+ css::beans::XPropertyState,
+ css::sheet::XSheetOperation,
+ css::chart::XChartDataArray,
+ css::util::XIndent,
+ css::sheet::XCellRangesQuery,
+ css::sheet::XFormulaQuery,
+ css::util::XReplaceable,
+ css::util::XModifyBroadcaster,
+ css::lang::XServiceInfo,
+ css::lang::XUnoTunnel,
+ css::beans::XTolerantMultiPropertySet>,
public SfxListener
{
friend class ScTabViewObj; // for select()
@@ -239,10 +239,6 @@ public:
ScCellRangesBase(ScDocShell* pDocSh, const
ScRangeList& rR);
virtual ~ScCellRangesBase() override;
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType ) override;
-virtual void SAL_CALL acquire() throw() override;
-virtual void SAL_CALL release() throw() override;
-
virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint
) override;
virtual voidRefChanged();
@@ -384,10 +380,6 @@ public:
// XUnoTunnel
UNO3_GETIMPLEMENTATION_DECL(ScCellRangesBase)
-
-// XTypeProvider
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
override;
};
class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase,
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 737e5bcb4176..f7339ba9f568 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1723,64 +1723,6 @@ void ScCellRangesBase::SetCursorOnly( bool bSet )
bCursorOnly = bSet;
}
-uno::Any SAL_CALL ScCellRangesBase::queryInterface( const uno::Type& rType )
-{
-SC_QUERYINTERFACE( beans::XPropertySet )
-SC_QUERYINTERFACE( beans::XMultiPropertySet )
-SC_QUERYINTERFACE( beans::XTolerantMultiPropertySet )
-SC_QUERYINTERFACE( beans::XPropertyState )
-SC_QUERYINTERFACE( sheet::XSheetOperation )
-SC_QUERYINTERFACE( chart::XChartDataArray )
-SC_QUERYINTERFACE( chart::XChartData )
-SC_QUERYINTERFACE( util::XIndent )
-SC_QUERYINTERFACE( sheet::XCellRangesQuery )
-SC_QUERYINTERFACE( sheet::XFormulaQuery )
-SC_QUERYINTERFACE( util::XReplaceable )
-SC_QUERYINTERFACE( util::XSearchable )
-SC_QUERYINTERFACE( util::XModifyBroadcaster )
-SC_QUERYINTERFACE( lang::XServiceInfo )
-SC_QUERYINTERFACE( lang::XUnoTunnel )
-
[Libreoffice-commits] core.git: 3 commits - include/toolkit include/ucbhelper toolkit/source ucbhelper/source
include/toolkit/awt/vclxregion.hxx | 18 +---
include/ucbhelper/contentidentifier.hxx | 20 -
include/ucbhelper/contentinfo.hxx | 19
toolkit/source/awt/vclxregion.cxx | 23 --
ucbhelper/source/provider/contentidentifier.cxx | 52
ucbhelper/source/provider/contentinfo.cxx | 29 -
6 files changed, 8 insertions(+), 153 deletions(-)
New commits:
commit e47172ce2ac486b909ee8f46380dca8efedb6a24
Author: Noel Grandin
AuthorDate: Mon Oct 7 14:37:52 2019 +0200
Commit: Noel Grandin
CommitDate: Tue Oct 8 08:25:53 2019 +0200
use cppu::WeakImplHelper in PropertySetInfo
Change-Id: I4da5d73ee7b531927066a1a4d4d7561ef9648483
Reviewed-on: https://gerrit.libreoffice.org/80402
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/contentinfo.hxx
b/include/ucbhelper/contentinfo.hxx
index b6d2bad87e65..f3f455af98ff 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
@@ -45,9 +45,7 @@ class ContentImplHelper;
* Core Properties that may have been added to the content.
*/
class PropertySetInfo :
-public cppu::OWeakObject,
-public css::lang::XTypeProvider,
-public css::beans::XPropertySetInfo
+public cppu::WeakImplHelper
{
css::uno::Reference< css::ucb::XCommandEnvironment >
m_xEnv;
@@ -65,19 +63,6 @@ public:
ContentImplHelper* pContent );
virtual ~PropertySetInfo() override;
-// XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType ) override;
-virtual void SAL_CALL acquire()
-throw() override;
-virtual void SAL_CALL release()
-throw() override;
-
-// XTypeProvider
-virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-getImplementationId() override;
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-getTypes() override;
-
// XPropertySetInfo
virtual css::uno::Sequence<
css::beans::Property > SAL_CALL
diff --git a/ucbhelper/source/provider/contentinfo.cxx
b/ucbhelper/source/provider/contentinfo.cxx
index c64bba28212b..64feb16e2b74 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -56,35 +56,6 @@ PropertySetInfo::~PropertySetInfo()
}
-// XInterface methods.
-
-void SAL_CALL PropertySetInfo::acquire()
-throw()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL PropertySetInfo::release()
-throw()
-{
-OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL PropertySetInfo::queryInterface( const css::uno::Type &
rType )
-{
-css::uno::Any aRet = cppu::queryInterface( rType,
- static_cast<
lang::XTypeProvider* >(this),
- static_cast<
beans::XPropertySetInfo* >(this)
- );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-XTYPEPROVIDER_IMPL_2( PropertySetInfo,
- lang::XTypeProvider,
- beans::XPropertySetInfo );
-
-
// XPropertySetInfo methods.
commit c1c619f4b087cc4e26866a5f3d591bb610158d66
Author: Noel Grandin
AuthorDate: Mon Oct 7 14:36:09 2019 +0200
Commit: Noel Grandin
CommitDate: Tue Oct 8 08:25:43 2019 +0200
use cppu::WeakImplHelper in ContentIdentifier
Change-Id: Id9c0d5d1f69c516efdf45b070982bdf341e86ce8
Reviewed-on: https://gerrit.libreoffice.org/80401
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/contentidentifier.hxx
b/include/ucbhelper/contentidentifier.hxx
index 093544c2b6da..85ba76570032 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX
#define INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX
-#include
+#include
#include
#include
#include
@@ -40,28 +40,12 @@ struct ContentIdentifier_Impl;
* be done, because URL schemes are never case sensitive.
*/
class UCBHELPER_DLLPUBLIC ContentIdentifier :
-public cppu::OWeakObject,
-public css::lang::XTypeProvider,
-public css::ucb::XContentIdentifier
+public cppu::WeakImplHelper
{
public:
ContentIdentifier( const OUString& rURL );
virtual ~ContentIdentifier() override;
-// XInterface
-virtual css::uno::Any SAL_CALL
-queryInterface( const css::uno::Type & rType ) override;
-virtual void SAL_CALL
-acquire() throw() override;
-virtual void SAL_CALL
-release() throw() override;
-
-// XTypeProvider
-virtual
[Libreoffice-commits] core.git: 3 commits - cui/source include/svx reportdesign/source sc/source sd/source
cui/source/tabpages/page.cxx |6 +++---
include/svx/svxids.hrc |4 ++--
reportdesign/source/ui/report/ReportController.cxx |6 +++---
sc/source/ui/dbgui/validate.cxx| 12 ++--
sc/source/ui/view/cellsh2.cxx | 12 ++--
sd/source/ui/dlg/dlgpage.cxx |4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit b0b8851021cee26412182b51ed28fe574632a4d6
Author: Noel Grandin
AuthorDate: Fri Oct 4 18:26:53 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Oct 5 09:10:58 2019 +0200
Convert various FID_VALID_* to SfxUInt16Item
Change-Id: Ic21ec69513ee520cedc026b8c2d657464beed19b
Reviewed-on: https://gerrit.libreoffice.org/80250
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index b6d880b92bd1..2ee9cf39f446 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -416,13 +416,13 @@ void ScTPValidationValue::Reset( const SfxItemSet*
rArgSet )
sal_uInt16 nLbPos = SC_VALIDDLG_ALLOW_ANY;
if( rArgSet->GetItemState( FID_VALID_MODE, true, ) ==
SfxItemState::SET )
nLbPos = lclGetPosFromValMode( static_cast< ScValidationMode >(
-static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
+static_cast< const SfxUInt16Item* >( pItem )->GetValue() ) );
m_xLbAllow->set_active( nLbPos );
nLbPos = SC_VALIDDLG_DATA_EQUAL;
if( rArgSet->GetItemState( FID_VALID_CONDMODE, true, ) ==
SfxItemState::SET )
nLbPos = lclGetPosFromCondMode( static_cast< ScConditionMode >(
-static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
+static_cast< const SfxUInt16Item* >( pItem )->GetValue() ) );
m_xLbValue->set_active( nLbPos );
// *** check boxes ***
@@ -463,9 +463,9 @@ bool ScTPValidationValue::FillItemSet( SfxItemSet* rArgSet )
ScConditionMode eCondMode = bCustom ?
ScConditionMode::Direct : lclGetCondModeFromPos(
m_xLbValue->get_active() );
-rArgSet->Put( SfxAllEnumItem( FID_VALID_MODE,
sal::static_int_cast(
+rArgSet->Put( SfxUInt16Item( FID_VALID_MODE,
sal::static_int_cast(
lclGetValModeFromPos( nLbPos ) ) ) );
-rArgSet->Put( SfxAllEnumItem( FID_VALID_CONDMODE,
sal::static_int_cast( eCondMode ) ) );
+rArgSet->Put( SfxUInt16Item( FID_VALID_CONDMODE,
sal::static_int_cast( eCondMode ) ) );
rArgSet->Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) );
rArgSet->Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) );
rArgSet->Put( SfxBoolItem( FID_VALID_BLANK, m_xCbAllow->get_active() ) );
@@ -775,7 +775,7 @@ void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
m_xTsbShow->set_state( TRISTATE_TRUE ); // check by default
if ( rArgSet->GetItemState( FID_VALID_ERRSTYLE, true, ) ==
SfxItemState::SET )
-m_xLbAction->set_active( static_cast(pItem)->GetValue() );
+m_xLbAction->set_active( static_cast(pItem)->GetValue() );
else
m_xLbAction->set_active( 0 );
@@ -795,7 +795,7 @@ void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet )
{
rArgSet->Put( SfxBoolItem( FID_VALID_SHOWERR, m_xTsbShow->get_state() ==
TRISTATE_TRUE ) );
-rArgSet->Put( SfxAllEnumItem( FID_VALID_ERRSTYLE,
m_xLbAction->get_active() ) );
+rArgSet->Put( SfxUInt16Item( FID_VALID_ERRSTYLE, m_xLbAction->get_active()
) );
rArgSet->Put( SfxStringItem( FID_VALID_ERRTITLE, m_xEdtTitle->get_text() )
);
rArgSet->Put( SfxStringItem( FID_VALID_ERRTEXT, m_xEdError->get_text() ) );
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index d7f88f710513..ef5c0086b7cd 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -869,8 +869,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
bShowHelp = pOldData->GetInput( aHelpTitle,
aHelpText );
bShowError = pOldData->GetErrMsg( aErrTitle,
aErrText, eErrStyle );
-aArgSet.Put( SfxAllEnumItem( FID_VALID_MODE,
sal::static_int_cast(eMode) ) );
-aArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE,
sal::static_int_cast(eOper) ) );
+aArgSet.Put( SfxUInt16Item( FID_VALID_MODE,
sal::static_int_cast(eMode) ) );
+aArgSet.Put( SfxUInt16Item( FID_VALID_CONDMODE,
sal::static_int_cast(eOper) ) );
aArgSet.Put( SfxStringItem( FID_VALID_VALUE1,
aExpr1 ) );
aArgSet.Put( SfxStringItem( FID_VALID_VALUE2,
aExpr2 ) );
aArgSet.Put( SfxBoolItem(FID_VALID_BLANK,
bBlank )
[Libreoffice-commits] core.git: 3 commits - dbaccess/source formula/source sc/source sd/inc sfx2/source svx/source sw/inc
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx|2
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |1
dbaccess/source/ui/dlg/TextConnectionHelper.hxx |1
dbaccess/source/ui/dlg/adminpages.hxx |2
dbaccess/source/ui/dlg/advancedsettings.hxx |3
dbaccess/source/ui/inc/WCPage.hxx |2
dbaccess/source/ui/inc/WNameMatch.hxx |2
formula/source/ui/dlg/ControlHelper.hxx |2
sc/source/ui/dbgui/consdlg.cxx|1
sc/source/ui/inc/tpusrlst.hxx |3
sc/source/ui/optdlg/tpusrlst.cxx |1
sd/inc/pch/precompiled_sd.hxx | 89 +++---
sfx2/source/dialog/mgetempl.cxx |1
svx/source/dialog/dialcontrol.cxx |1
sw/inc/pch/precompiled_msword.hxx | 50 +++-
15 files changed, 32 insertions(+), 129 deletions(-)
New commits:
commit b0f2e3880cde52f06913fea55187075fb2c54bba
Author: Caolán McNamara
AuthorDate: Wed Oct 2 19:42:35 2019 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 3 09:55:21 2019 +0200
drop some unnecessary includes
Change-Id: Ia388aef3063c99f3b0d9282f53e78edfda5ce4bb
Reviewed-on: https://gerrit.libreoffice.org/80085
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 5ad6b7022bed..b1333aff70f8 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -25,8 +25,6 @@
#include
#include
-#include
-
namespace dbaui
{
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index b0f51a854a0f..422500e19938 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -29,7 +29,6 @@
#include
#include
-#include
namespace dbaui
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index 6c69b24874c8..b284f7edbc05 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -26,7 +26,6 @@
#include
#include
#include
-#include
#include
namespace dbaui
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx
b/dbaccess/source/ui/dlg/adminpages.hxx
index 0caab50c9636..9db03a7b1296 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -24,8 +24,6 @@
#include
#include
#include
-#include
-#include
#include
class NumericField;
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx
b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 85848c716c97..8efc8642863d 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -22,9 +22,6 @@
#include "adminpages.hxx"
#include
-
-#include
-
#include
namespace dbaui
diff --git a/dbaccess/source/ui/inc/WCPage.hxx
b/dbaccess/source/ui/inc/WCPage.hxx
index e3fc5af1bc57..f89c89821800 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -23,8 +23,6 @@
#include "QEnumTypes.hxx"
#include
-#include
-#include
namespace dbaui
{
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx
b/dbaccess/source/ui/inc/WNameMatch.hxx
index 8aa2b6befaa8..eb843569e404 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -22,8 +22,6 @@
#include "WTabPage.hxx"
#include "marktree.hxx"
#include "DExport.hxx"
-#include
-#include
#include "WCopyTable.hxx"
namespace dbaui
diff --git a/formula/source/ui/dlg/ControlHelper.hxx
b/formula/source/ui/dlg/ControlHelper.hxx
index fbc7e49cfda6..3fb82de8bac1 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_FORMULA_SOURCE_UI_DLG_CONTROLHELPER_HXX
#include
-#include
+
namespace formula
{
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index d5a1de99c164..3cb87621353e 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -32,7 +32,6 @@
#include
#include
-#include
#include
#include
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index dd3d4cf133a4..c237da9a9fb2 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -21,9 +21,6 @@
#define INCLUDED_SC_SOURCE_UI_INC_TPUSRLST_HXX
#include
-#include
-#include
-#include
class ScUserList;
class ScDocument;
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 8aec1aa7e1dc..652c4b2d0919 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -20,6 +20,7 @@
#undef
[Libreoffice-commits] core.git: 3 commits - basctl/inc dbaccess/source sc/inc
basctl/inc/pch/precompiled_basctl.hxx | 58 + dbaccess/source/ui/inc/SqlNameEdit.hxx |1 sc/inc/pch/precompiled_scui.hxx|7 +-- 3 files changed, 19 insertions(+), 47 deletions(-) New commits: commit c2af17df9b01fd387e1eaeb11c009e4df918596b Author: Caolán McNamara AuthorDate: Wed Oct 2 19:36:22 2019 +0100 Commit: Caolán McNamara CommitDate: Thu Oct 3 09:54:11 2019 +0200 update sc pch Change-Id: I3ae5ee611d83ca1a3296711f72b96fcb9b475b38 Reviewed-on: https://gerrit.libreoffice.org/80082 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx index d86729e00edb..6bbfa3803c5c 100644 --- a/sc/inc/pch/precompiled_scui.hxx +++ b/sc/inc/pch/precompiled_scui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-04-29 21:16:41 using: + Generated on 2019-10-02 19:35:59 using: ./bin/update_pch sc scui --cutoff=1 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -22,6 +22,7 @@ #if PCH_LEVEL >= 1 #include +#include #include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 @@ -33,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -86,7 +86,6 @@ #include #include #include -#include #include #include #include @@ -104,8 +103,8 @@ #include #include #include -#include #include +#include #include #include #include commit 758851a68a665094b089c350ed6b30ad3ae3e7b7 Author: Caolán McNamara AuthorDate: Wed Oct 2 19:34:56 2019 +0100 Commit: Caolán McNamara CommitDate: Thu Oct 3 09:53:51 2019 +0200 drop unnecessary include Change-Id: I2b93cda4110b15184cef657e4b63fec9b9aa166f Reviewed-on: https://gerrit.libreoffice.org/80081 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index f9f0dc23530c..7a6e43c15b32 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -20,7 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_SQLNAMEEDIT_HXX #include -#include #include namespace dbaui commit 3bf512ec01b9b3bcb6226ebd6ffa748cdb230e85 Author: Caolán McNamara AuthorDate: Wed Oct 2 19:33:57 2019 +0100 Commit: Caolán McNamara CommitDate: Thu Oct 3 09:53:31 2019 +0200 update basctl pch Change-Id: Ia8adfaf9e4dfb31e44d401a411960abde7f28044 Reviewed-on: https://gerrit.libreoffice.org/80079 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index d7acb4db5274..7d49f748910a 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-05-12 16:56:45 using: + Generated on 2019-10-02 19:33:38 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -51,6 +51,7 @@ #include #include #include +#include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include @@ -80,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -91,30 +93,27 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include -#include #include #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include @@ -130,26 +129,21 @@ #include #include #include -#include #include #include #include -#include #include #include #include #include #include -#include #include #include #include #include +#include #include #include -#include -#include -#include #include #include #include @@ -193,7 +187,6 @@ #include #include #include -#include #include #include #include @@ -205,26 +198,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include #include #include #include #include -#include #include #include -#include #include -#include #include +#include #include #include -#include #include #include #include @@ -241,6 +225,7 @@ #include #include #include +#include
[Libreoffice-commits] core.git: 3 commits - starmath/source svx/source sw/source
starmath/source/dialog.cxx|3 -
svx/source/dialog/svxruler.cxx| 63 --
sw/source/uibase/inc/numfmtlb.hxx |1
3 files changed, 1 insertion(+), 66 deletions(-)
New commits:
commit c00de80189caa204e4d3cef60c7f56b2e8a66533
Author: Caolán McNamara
AuthorDate: Wed Oct 2 19:33:16 2019 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 3 09:53:11 2019 +0200
drop some unnecessary includes
Change-Id: I76eceb7eec534171420f2ac26918e44dde0dd738
Reviewed-on: https://gerrit.libreoffice.org/80078
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index e33e4d114944..3d5442fb4075 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -26,7 +26,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -1930,7 +1929,7 @@ bool SmSymDefineDialog::SelectSymbol(weld::ComboBox&
rComboBox,
// if there's a change of the old symbol, show only the available
ones, otherwise show none
const SmSym *pOldSymbol = nullptr;
OUString aTmpOldSymbolSetName;
-if (nPos != COMBOBOX_ENTRY_NOTFOUND)
+if (nPos != -1)
{
pOldSymbol= m_aSymbolMgrCopy.GetSymbolByName(aNormName);
aTmpOldSymbolSetName = m_xOldSymbolSets->get_active_text();
commit 13dffd2be76ad1e4911cd74f7b25485e5df02eb7
Author: Caolán McNamara
AuthorDate: Wed Oct 2 17:38:08 2019 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 3 09:52:52 2019 +0200
drop debugging RulerDebugWindow
Change-Id: Icf0da14e17ca023bd93ca2a94290f5bbb8289f96
Reviewed-on: https://gerrit.libreoffice.org/80068
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5cb7769bb2df..556d3438587d 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -62,66 +62,6 @@
#define INDENT_RIGHT_MARGIN 4
#define INDENT_COUNT3 //without the first two old values
-#ifdef DEBUG_RULER
-#include
-class RulerDebugWindow : public vcl::Window
-{
-ListBox aBox;
-public:
-explicit RulerDebugWindow(vcl::Window* pParent) :
-Window(pParent,
WB_BORDER|WB_SIZEMOVE|WB_DIALOGCONTROL|WB_CLIPCHILDREN|WB_SYSTEMWINDOW),
-aBox(this, WB_BORDER)
-{
-Size aOutput(200, 400);
-SetOutputSizePixel(aOutput);
-aBox.SetSizePixel(aOutput);
-aBox.Show();
-Show();
-Size aParentSize(pParent->GetOutputSizePixel());
-Size aOwnSize(GetSizePixel());
-aParentSize.setWidth(aParentSize.Width() - aOwnSize.Width());
-aParentSize.setHeight(aParentSize.Height() -
aOwnSize.Height());
-SetPosPixel(Point(aParentSize.Width(), aParentSize.Height()));
-}
-~RulerDebugWindow();
-
-ListBox& GetLBox() {return aBox;}
-static void AddDebugText(const sal_Char* pDescription, const
OUString& rText );
-};
-static RulerDebugWindow* pDebugWindow = 0;
-
-RulerDebugWindow::~RulerDebugWindow()
-{
-pDebugWindow = 0;
-}
-void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const
OUString& rText )
-{
-if(!pDebugWindow)
-{
-vcl::Window* pParent = Application::GetFocusWindow();
-while(pParent->GetParent())
-pParent = pParent->GetParent();
-pDebugWindow = new RulerDebugWindow(pParent);
-}
-OUString sContent( OUString::createFromAscii(pDescription) );
-sContent += rText;
-sal_uInt16 nPos = pDebugWindow->GetLBox().InsertEntry(sContent);
-pDebugWindow->GetLBox().SelectEntryPos(nPos);
-pDebugWindow->GrabFocus();
-}
-
-#define ADD_DEBUG_TEXT(cDescription, sValue) \
-RulerDebugWindow::AddDebugText(cDescription, sValue);
-
-#define REMOVE_DEBUG_WINDOW \
-delete pDebugWindow;\
-pDebugWindow = 0;
-
-#else
-#define ADD_DEBUG_TEXT(cDescription, sValue)
-#define REMOVE_DEBUG_WINDOW
-#endif
-
struct SvxRuler_Impl {
std::unique_ptr pPercBuf;
std::unique_ptr pBlockBuf;
@@ -350,7 +290,6 @@ SvxRuler::~SvxRuler()
void SvxRuler::dispose()
{
/* Destructor ruler; release internal buffer */
-REMOVE_DEBUG_WINDOW
if(bListening)
EndListening(*pBindings);
@@ -1344,7 +1283,6 @@ long SvxRuler::GetCorrectedDragPos( bool bLeft, bool
bRight )
const long lNullPix = Ruler::GetNullOffset();
long lDragPos = GetDragPos() + lNullPix;
-ADD_DEBUG_TEXT("lDragPos: ", OUString::number(lDragPos))
bool bHoriRows = bHorz && mxRulerImpl->bIsTableRows;
if((bLeft || bHoriRows) && lDragPos < nMaxLeft)
lDragPos = nMaxLeft;
@@ -1760,7 +1698,6 @@ void SvxRuler::DragBorders()
{
case RulerDragSize::Move:
[Libreoffice-commits] core.git: 3 commits - canvas/source compilerplugins/clang embedserv/source extensions/source fpicker/source shell/inc shell/source vcl/inc winaccessibility/source
canvas/source/directx/dx_9rm.cxx |2
compilerplugins/clang/duplicate-defines.cxx |4
embedserv/source/embed/ed_idataobj.cxx| 18 -
embedserv/source/embed/ed_iinplace.cxx| 12 -
embedserv/source/embed/ed_ioleobject.cxx | 50 ++--
embedserv/source/embed/ed_ipersiststr.cxx | 28 +-
embedserv/source/embed/servprov.cxx | 10
embedserv/source/inprocserv/dllentry.cxx | 10
embedserv/source/inprocserv/inprocembobj.cxx | 150 +++---
extensions/source/activex/SOActionsApproval.cxx |2
extensions/source/activex/SOActiveX.cxx | 10
extensions/source/activex/SOComWindowPeer.cxx |2
extensions/source/activex/SODispatchInterceptor.cxx |2
extensions/source/ole/jscriptclasses.cxx | 30 +-
extensions/source/ole/servprov.cxx| 10
extensions/source/ole/unoobjw.cxx | 24 +-
extensions/source/ole/unotypewrapper.cxx | 12 -
fpicker/source/win32/asyncrequests.hxx|2
shell/inc/columninfo.hxx | 12 -
shell/inc/infotips.hxx|4
shell/source/win32/shlxthandler/columninfo/columninfo.cxx | 12 -
shell/source/win32/shlxthandler/infotips/infotips.cxx |4
vcl/inc/win/salbmp.h |2
vcl/inc/win/salframe.h|2
winaccessibility/source/UAccCOM/AccAction.cxx | 14 -
winaccessibility/source/UAccCOM/AccActionBase.cxx | 14 -
winaccessibility/source/UAccCOM/AccComponent.cxx |6
winaccessibility/source/UAccCOM/AccComponentBase.cxx | 12 -
winaccessibility/source/UAccCOM/AccEditableText.cxx | 16 -
winaccessibility/source/UAccCOM/AccHyperLink.cxx | 26 +-
winaccessibility/source/UAccCOM/AccHypertext.cxx | 46 ++--
winaccessibility/source/UAccCOM/AccImage.cxx |8
winaccessibility/source/UAccCOM/AccRelation.cxx | 12 -
winaccessibility/source/UAccCOM/AccTable.cxx | 60 ++---
winaccessibility/source/UAccCOM/AccText.cxx | 38 +--
winaccessibility/source/UAccCOM/AccTextBase.cxx | 42 +--
winaccessibility/source/UAccCOM/AccValue.cxx | 10
winaccessibility/source/UAccCOM/EnumVariant.cxx |2
winaccessibility/source/UAccCOM/MAccessible.cxx | 128 +--
winaccessibility/source/UAccCOM/UNOXWrapper.cxx |4
40 files changed, 426 insertions(+), 426 deletions(-)
New commits:
commit 9d99dc8a835d66cbe27e4cbf5869e6704dd781f9
Author: Stephan Bergmann
AuthorDate: Tue Oct 1 19:10:34 2019 +0200
Commit: Stephan Bergmann
CommitDate: Wed Oct 2 08:19:26 2019 +0200
-Werror,-Winconsistent-missing-override
Change-Id: I4cfb01582e5cfef55909ae56fd14ce8ccd5c14be
Reviewed-on: https://gerrit.libreoffice.org/79990
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/duplicate-defines.cxx
b/compilerplugins/clang/duplicate-defines.cxx
index 2dacdb0f3cbd..0209d0893a36 100644
--- a/compilerplugins/clang/duplicate-defines.cxx
+++ b/compilerplugins/clang/duplicate-defines.cxx
@@ -35,9 +35,9 @@ class DuplicateDefines : public clang::PPCallbacks, public
Plugin
public:
explicit DuplicateDefines(const InstantiationData& data);
virtual void run() override;
-void MacroDefined(const Token& MacroNameTok, const MacroDirective* MD);
+void MacroDefined(const Token& MacroNameTok, const MacroDirective* MD)
override;
void MacroUndefined(const Token& MacroNameTok, const MacroDefinition& MD,
-const MacroDirective* Undef);
+const MacroDirective* Undef) override;
enum
{
isPPCallback = true
commit b7e4e20b6214198224e0ac42f5248b42f44342ee
Author: Stephan Bergmann
AuthorDate: Tue Oct 1 16:28:43 2019 +0200
Commit: Stephan Bergmann
CommitDate: Wed Oct 2 08:19:12 2019 +0200
loplugin:fragiledestructor (clang-cl)
Change-Id: Ibf5b8022df00bb6c49b53853811b65031467
Reviewed-on: https://gerrit.libreoffice.org/79971
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index f1557af69961..872b537aa769 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -120,7 +120,7 @@ namespace dxcanvas
/// Default implementation of IDXRenderModule
-class DXRenderModule : public IDXRenderModule
+class DXRenderModule final: public IDXRenderModule
{
public:
explicit DXRenderModule( const vcl::Window& rWindow );
diff --git
[Libreoffice-commits] core.git: 3 commits - extras/source
extras/source/autotext/lang/uk/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/uz/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/ve/standard/FN/content.xml |6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 6954ff54d8bcf7ef028227a561acfbbd13036ba3 Author: Laurent BP AuthorDate: Sun Sep 15 20:26:00 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:56:10 2019 +0200 Improve FN AutoText for ve Translate names which appear in Navigator Change-Id: I1a99c43bc97fdf94e8f3d322b057756a7cb32d12 Reviewed-on: https://gerrit.libreoffice.org/78964 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ve/standard/FN/content.xml b/extras/source/autotext/lang/ve/standard/FN/content.xml index b41b40baf853..d9d081b79a4c 100644 --- a/extras/source/autotext/lang/ve/standard/FN/content.xml +++ b/extras/source/autotext/lang/ve/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 7d5cf9f77b5d33c29b25fd9fc8d2f9a1a53292fb Author: Laurent BP AuthorDate: Sun Sep 15 20:20:29 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:55:49 2019 +0200 Improve FN AutoText for uz Translate names which appear in Navigator Change-Id: I8497e3777b25f63ba2db86c8e547d29b394a8403 Reviewed-on: https://gerrit.libreoffice.org/78963 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/uz/standard/FN/content.xml b/extras/source/autotext/lang/uz/standard/FN/content.xml index b41b40baf853..9e0c4004d743 100644 --- a/extras/source/autotext/lang/uz/standard/FN/content.xml +++ b/extras/source/autotext/lang/uz/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit df48c123880126c83ba1b5f8d2e13518f59532a1 Author: Laurent BP AuthorDate: Sun Sep 15 20:13:55 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:55:31 2019 +0200 Improve FN AutoText for uk Translate names which appear in Navigator Change-Id: I120f18237215c6bd18f52f8d5fe551a09e398e10 Reviewed-on: https://gerrit.libreoffice.org/78962 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/uk/standard/FN/content.xml b/extras/source/autotext/lang/uk/standard/FN/content.xml index b41b40baf853..13aee757b647 100644 --- a/extras/source/autotext/lang/uk/standard/FN/content.xml +++ b/extras/source/autotext/lang/uk/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - extras/source
extras/source/autotext/lang/th/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/tn/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/ts/standard/FN/content.xml |6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 6c462bb28c151e1390c8e9822a9d9d01c8771e02 Author: Laurent BP AuthorDate: Sun Sep 15 18:01:35 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:54:16 2019 +0200 Improve FN AutoText for ts Translate names which appear in Navigator Change-Id: I94d05a49198c4e4092862a931cbbb483c5832b53 Reviewed-on: https://gerrit.libreoffice.org/78958 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ts/standard/FN/content.xml b/extras/source/autotext/lang/ts/standard/FN/content.xml index b41b40baf853..d9d081b79a4c 100644 --- a/extras/source/autotext/lang/ts/standard/FN/content.xml +++ b/extras/source/autotext/lang/ts/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit fa484950f67bce9a8d42bcdbb10c32b0bcb15e99 Author: Laurent BP AuthorDate: Sun Sep 15 17:58:38 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:53:53 2019 +0200 Improve FN AutoText for tn Translate names which appear in Navigator Change-Id: I9a21ca19b6b2cb519af617c75d80558c374671a2 Reviewed-on: https://gerrit.libreoffice.org/78957 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/tn/standard/FN/content.xml b/extras/source/autotext/lang/tn/standard/FN/content.xml index b41b40baf853..be222b5cdf1f 100644 --- a/extras/source/autotext/lang/tn/standard/FN/content.xml +++ b/extras/source/autotext/lang/tn/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit f5cc77687eac68316b362fe3a8fb7af5fed5d40a Author: Laurent BP AuthorDate: Sun Sep 15 17:55:39 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:53:30 2019 +0200 Improve FN AutoText for th Translate names which appear in Navigator Change-Id: I019d94749eaf058bf637fe0957bd158ffcc91313 Reviewed-on: https://gerrit.libreoffice.org/78956 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/th/standard/FN/content.xml b/extras/source/autotext/lang/th/standard/FN/content.xml index b41b40baf853..64c189cc7d52 100644 --- a/extras/source/autotext/lang/th/standard/FN/content.xml +++ b/extras/source/autotext/lang/th/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
