[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - svtools/source
svtools/source/control/tabbar.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit f02c2912e50df357125c93eaaadfc96f02a05db0
Author: Caolán McNamara
AuthorDate: Mon Feb 20 15:54:22 2023 +
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Feb 21 07:49:35 2023 +
Resolves: tdf#153763 first/last buttons in tabbar not responding
Change-Id: Id6e70eca7c2d523643d9e38e8c7402879464bf5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147291
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index 3e4e2d94cedb..a9579dfb94f8 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -881,13 +881,16 @@ void TabBar::ImplShowPage( sal_uInt16 nPos )
IMPL_LINK( TabBar, ImplClickHdl, weld::Button&, rBtn, void )
{
-if ((GetPointerState().mnState & (MOUSE_LEFT | MOUSE_MIDDLE |
MOUSE_RIGHT)) == 0)
+if (&rBtn != mpImpl->mxButtonBox->m_xFirstButton.get() && &rBtn !=
mpImpl->mxButtonBox->m_xLastButton.get())
{
-// like tdf#149482 if we didn't see a mouse up, but find that the
mouse is no
-// longer pressed at this point, then bail
-mpImpl->mxButtonBox->m_xPrevRepeater->Stop();
-mpImpl->mxButtonBox->m_xNextRepeater->Stop();
-return;
+if ((GetPointerState().mnState & (MOUSE_LEFT | MOUSE_MIDDLE |
MOUSE_RIGHT)) == 0)
+{
+// like tdf#149482 if we didn't see a mouse up, but find that the
mouse is no
+// longer pressed at this point, then bail
+mpImpl->mxButtonBox->m_xPrevRepeater->Stop();
+mpImpl->mxButtonBox->m_xNextRepeater->Stop();
+return;
+}
}
EndEditMode();
[Libreoffice-commits] core.git: officecfg/registry sw/inc sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
sw/inc/strings.hrc |2 +-
sw/uiconfig/swriter/ui/navigatorcontextmenu.ui |2 +-
sw/uiconfig/swriter/ui/navigatorpanel.ui|4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 3ae7bd3345e2f356b52ba7b8160dbcbdc4967e89
Author: Seth Chaiklin
AuthorDate: Fri Feb 17 20:48:02 2023 +
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Feb 21 07:48:39 2023 +
tdf#153485 align command names to show headings by outline level
There are three different places where a command can be given
to select the maximum allowed outline level for a displayed heading
in Navigator. This patch changes all these command labels to be
identical, so that users can recognize them as identical.
"Outline Level" -> "Show to Outline Level" in Navigator context menu
"Heading Levels Shown" -> "Show to Outline Level" in Navigator panel
"Show Outline Content to Level" -> "Show to Outline Level" in
.uno:OutlineLevelsShown and its popup dialog box.
Change-Id: I7b1eac8067251a0e2faf38f2747dcfcf1993cebb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147247
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 33755db9f601..ed1d92c685c9 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -419,7 +419,7 @@
- Show Outline Content up to Level...
+ Show Up to Outline Level...
1
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 476df842a9f1..454df50b1284 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -682,7 +682,7 @@
#define STR_OUTLINE_CONTENT_VISIBILITY_TOGGLE
NC_("STR_OUTLINE_CONTENT_VISIBILITY_TOGGLE", "Toggle")
#define STR_OUTLINE_CONTENT_VISIBILITY_SHOW_ALL
NC_("STR_OUTLINE_CONTENT_VISIBILITY_SHOW_ALL", "Unfold All")
#define STR_OUTLINE_CONTENT_VISIBILITY_HIDE_ALL
NC_("STR_OUTLINE_CONTENT_VISIBILITY_HIDE_ALL", "Fold All")
-#define STR_OUTLINE_LEVELS_SHOWN_TITLE
NC_("STR_OUTLINE_LEVELS_SHOWN_TITLE", "Show Outline Content to Level")
+#define STR_OUTLINE_LEVELS_SHOWN_TITLE
NC_("STR_OUTLINE_LEVELS_SHOWN_TITLE", "Show Up to Outline Level")
#define STR_OUTLINE_LEVELS_SHOWN_SPIN_LABEL
NC_("STR_OUTLINE_LEVELS_SHOWN_SPIN_LABEL", "Level (1–10):")
#define STR_OUTLINE_LEVELS_SHOWN_HELP_LABEL
NC_("STR_OUTLINE_LEVELS_SHOWN_HELP_LABEL", "Enter maximum outline level allowed
for a displayed heading.")
diff --git a/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
b/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
index 519104ba5fdb..9ef3a5bbc6d3 100644
--- a/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
+++ b/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
@@ -438,7 +438,7 @@
True
False
-Outline Level
+Show Up to Outline
Level
True
diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui
b/sw/uiconfig/swriter/ui/navigatorpanel.ui
index f38518649c9a..7c3fd820e2d3 100644
--- a/sw/uiconfig/swriter/ui/navigatorpanel.ui
+++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui
@@ -513,11 +513,11 @@
True
-Heading Levels Shown
+Show Up to Outline
Level
sw/res/sc20236.png
-Click this
icon, and then choose the number of heading outline levels that you want to
view in the Navigator window.
+Use this
option to control what headings in the document structure are displayed in the
Navigator window. Click the icon, and choose an outline level number. Any
heading with an outline number less than or equal to the selected number will
be displayed.
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/captionoptions.ui |9 + sw/uiconfig/swriter/ui/optcaptionpage.ui |8 2 files changed, 9 insertions(+), 8 deletions(-) New commits: commit 0fa6932e26ca197cb1134c1edf8e026536f87ec8 Author: Seth Chaiklin AuthorDate: Sun Feb 19 23:09:47 2023 + Commit: Adolfo Jayme Barrientos CommitDate: Tue Feb 21 07:48:15 2023 + tdf#153243 change "Numbering by Chapter" and "Outline Level" labels Changes are made both for Insert - Caption - Caption Options and AutoCaption. "Chapter" was incorrect, because the option uses the number of the immediately prior heading. Now the label is "Heading Number Prefix" (because the number is always prepended to the caption number). Also, the label "Outline Level" is renamed "Up to level" because its function is to specify how many levels in the heading number are displayed. There is a tooltip and extended tip for "Up to level" that makes it clear that outline levels are involved. Change-Id: I1ca8c881c8ce07870efc226b075fc8ba7f27b7e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147280 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/uiconfig/swriter/ui/captionoptions.ui b/sw/uiconfig/swriter/ui/captionoptions.ui index fbe32fede7b7..83c3e8689066 100644 --- a/sw/uiconfig/swriter/ui/captionoptions.ui +++ b/sw/uiconfig/swriter/ui/captionoptions.ui @@ -102,10 +102,11 @@ True False True -Specify the maximum outline level of the immediately prior heading number to include in the caption number. +Select the number of outline levels of the immediately prior heading number to prepend to the caption number. -Specify the maximum outline level of the immediately prior heading number to include in the caption number. For numbers to appear, the selected heading must have numbering applied. +Specify the number of outline levels of the immediately prior heading number to prepend to the caption number. For example, select “2” to use the first two numbers in the heading. If [None] is selected, then no heading number is prepended. +. @@ -136,7 +137,7 @@ True False -_Outline level: +_Up to level: True level 1 @@ -166,7 +167,7 @@ True False -Numbering by Chapter +Heading Number Prefix diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui b/sw/uiconfig/swriter/ui/optcaptionpage.ui index 0ad93bc4d888..b285d850b573 100644 --- a/sw/uiconfig/swriter/ui/optcaptionpage.ui +++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui @@ -256,7 +256,7 @@ True False -Outline level: +Up to level: True level 0 @@ -306,13 +306,13 @@ False center True -Specify the maximum outline level of the immediately prior heading to prepend to the caption number. +Specify the number of outline levels of the immediately prior heading number to prepend to the caption number. If [None] is selected, then no heading number is prepended. None -Use this option to specify the outline level of the heading number that should be prepended to the caption number. The first immediately prior heading with an outline level no greater than the specified number here is used to supply the numbering that is prepended. +Specify the number of outline levels of the immediately prior heading number to prepend to the caption number. For example, select “2” to use the first two numbers in the heading. If [None] is selected, then no heading numbered is prepended. @@ -327,7 +327,7 @@ True False -Numbering by Chapter +Heading Number Prefix
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/porglue.hxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 0bcce236059ae68c6dcc7bce8ceaec5d39c28f1c
Author: Miklos Vajna
AuthorDate: Mon Feb 20 20:40:19 2023 +0100
Commit: Miklos Vajna
CommitDate: Tue Feb 21 07:03:35 2023 +
sw: document SwGluePortion
This is typically subclassed, but there is a single case for footnotes
where created as-is.
Change-Id: I36649d6fa25761a76469dd0c328b54c156be4f64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147348
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index d46962d454bb..aaaeec339f31 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -24,6 +24,9 @@
class SwRect;
class SwLineLayout;
+/// A glue portion is either a base class for other portions that want to have
a certain width to
+/// push text out (e.g. tab portions) or used to align SwQuoVadisPortion
instances on the right for
+/// footnotes.
class SwGluePortion : public SwLinePortion
{
private:
[Libreoffice-commits] core.git: basic/source include/basic
basic/source/sbx/sbxexec.cxx | 16 +---
include/basic/sbmod.hxx |3 ++-
include/basic/sbxobj.hxx |5 ++---
3 files changed, 9 insertions(+), 15 deletions(-)
New commits:
commit 527741d528ef347b28917976efffd366c62341b1
Author: Mike Kaganski
AuthorDate: Tue Feb 21 08:00:26 2023 +0300
Commit: Mike Kaganski
CommitDate: Tue Feb 21 05:52:59 2023 +
Related: tdf#153752 Use virtual method to avoid dynamic casts
Change-Id: I97c09d82699621d5a43a525b5f2cf75ff5d131c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147353
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index de711944d36c..af7d12c00651 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -19,7 +19,6 @@
#include
-#include
#include
#include
#include
@@ -350,7 +349,7 @@ SbxVariable* SbxObject::Execute( const OUString& rTxt )
{
SetError( ERRCODE_BASIC_SYNTAX ); break;
}
-pVar = Assign( this, this, &p, IsModuleCompatible() );
+pVar = Assign( this, this, &p, IsOptionCompatible() );
if( !pVar.is() )
{
break;
@@ -373,7 +372,7 @@ SbxVariable* SbxObject::FindQualified( const OUString&
rName, SbxClassType t )
{
return nullptr;
}
-pVar = QualifiedName( this, this, &p, t, IsModuleCompatible() );
+pVar = QualifiedName( this, this, &p, t, IsOptionCompatible() );
p = SkipWhitespace( p );
if( *p )
{
@@ -382,15 +381,10 @@ SbxVariable* SbxObject::FindQualified( const OUString&
rName, SbxClassType t )
return pVar.get();
}
-bool SbxObject::IsModuleCompatible() const
+bool SbxObject::IsOptionCompatible() const
{
-const SbxObject* pObj = this;
-while (pObj)
-{
-if (auto pMod = dynamic_cast(pObj))
-return pMod->IsCompatible();
-pObj = pObj->GetParent();
-}
+if (const SbxObject* pObj = GetParent())
+return pObj->IsOptionCompatible();
return false;
}
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index fac7f9e50121..7ca52276d012 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -94,6 +94,8 @@ protected:
SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint&
rHint ) override;
SAL_DLLPRIVATE void handleProcedureProperties( SfxBroadcaster& rBC, const
SfxHint& rHint );
virtual ~SbModule() override;
+bool IsOptionCompatible() const override { return mbCompat; }
+
public:
SBX_DECL_PERSIST_NODATA(SBXID_BASICMOD,2);
SbModule( const OUString&, bool bVBASupport = false );
@@ -123,7 +125,6 @@ public:
SAL_DLLPRIVATE bool HasExeCode();
bool IsVBASupport() const { return mbVBASupport; }
SAL_DLLPRIVATE void SetVBASupport( bool bSupport );
-bool IsCompatible() const { return mbCompat; }
sal_Int32 GetModuleType() const { return mnType; }
void SetModuleType( sal_Int32 nType ) { mnType = nType; }
bool isProxyModule() const { return bIsProxyModule; }
diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index 34c117d33853..33ffc98c77d9 100644
--- a/include/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
@@ -41,6 +41,8 @@ protected:
virtual bool StoreData( SvStream& ) const override;
virtual ~SbxObject() override;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
+virtual bool IsOptionCompatible() const; // Module's Option Compatible
+
public:
SBX_DECL_PERSIST_NODATA(SBXID_OBJECT,1);
SbxObject( const OUString& rClassname );
@@ -78,9 +80,6 @@ public:
SbxArray* GetObjects() { return pObjs.get(); }
// Debugging
void Dump( SvStream&, bool bDumpAll );
-
-private:
-bool IsModuleCompatible() const; // Module's Option Compatible
};
#endif // INCLUDED_BASIC_SBXOBJ_HXX
[Libreoffice-commits] core.git: basic/source include/basic include/unotest sc/qa sc/source unotest/source
basic/source/classes/sb.cxx |2
basic/source/classes/sbxmod.cxx | 28 +
basic/source/comp/parser.cxx |6 +-
basic/source/runtime/runtime.cxx |2
basic/source/runtime/stdobj.cxx |2
basic/source/sbx/sbxexec.cxx | 66 +-
include/basic/sbmod.hxx | 10 ++-
include/basic/sbxobj.hxx |3 +
include/unotest/macros_test.hxx |3 -
sc/qa/extras/testdocuments/ForEachInSelection.ods |binary
sc/qa/extras/vba-macro-test.cxx | 31 ++
sc/source/core/tool/interpr4.cxx |2
unotest/source/cpp/macros_test.cxx|9 +--
13 files changed, 110 insertions(+), 54 deletions(-)
New commits:
commit ccd0ef98f76011f108f8ea1d282b96386dba0a6a
Author: Mike Kaganski
AuthorDate: Mon Feb 20 16:16:40 2023 +0300
Commit: Mike Kaganski
CommitDate: Tue Feb 21 04:30:34 2023 +
tdf#153752: SbxObject::Execute: extra characters in Option Compatible mode
Change-Id: Ib3e4bd9eb9a249123a686f2434ded7b529fb050f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147345
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index f1ab6dd1da0c..0296e2238ca1 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -744,7 +744,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule*
pClassModule )
}
}
SetModuleType( ModuleType::CLASS );
-mbVBACompat = pClassModule->mbVBACompat;
+mbVBASupport = pClassModule->mbVBASupport;
}
SbClassModuleObject::~SbClassModuleObject()
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index f38e729185db..aaad6cd9bb41 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -416,9 +416,9 @@ static bool getDefaultVBAMode( StarBASIC* pb )
// A Basic module has set EXTSEARCH, so that the elements, that the module
contains,
// could be found from other module.
-SbModule::SbModule( const OUString& rName, bool bVBACompat )
+SbModule::SbModule( const OUString& rName, bool bVBASupport )
: SbxObject( "StarBASICModule" ),
- pBreaks(nullptr), mbVBACompat( bVBACompat ), bIsProxyModule( false )
+ pBreaks(nullptr), mbVBASupport(bVBASupport), mbCompat(bVBASupport),
bIsProxyModule(false)
{
SetName( rName );
SetFlag( SbxFlagBits::ExtSearch | SbxFlagBits::GlobalSearch );
@@ -802,11 +802,11 @@ void SbModule::Notify( SfxBroadcaster& rBC, const
SfxHint& rHint )
void SbModule::SetSource32( const OUString& r )
{
// Default basic mode to library container mode, but... allow Option
VBASupport 0/1 override
-SetVBACompat( getDefaultVBAMode( static_cast< StarBASIC*>( GetParent() ) )
);
+SetVBASupport( getDefaultVBAMode( static_cast< StarBASIC*>( GetParent() )
) );
aOUSource = r;
StartDefinitions();
SbiTokenizer aTok( r );
-aTok.SetCompatible( IsVBACompat() );
+aTok.SetCompatible( IsVBASupport() );
while( !aTok.IsEof() )
{
@@ -837,12 +837,13 @@ void SbModule::SetSource32( const OUString& r )
eCurTok = aTok.Next();
if( eCurTok == COMPATIBLE )
{
+mbCompat = true;
aTok.SetCompatible( true );
}
else if ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() ==
NUMBER ) )
{
bool bIsVBA = ( aTok.GetDbl()== 1 );
-SetVBACompat( bIsVBA );
+SetVBASupport( bIsVBA );
aTok.SetCompatible( bIsVBA );
}
}
@@ -974,15 +975,16 @@ static void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
}
-void SbModule::SetVBACompat( bool bCompat )
+void SbModule::SetVBASupport( bool bSupport )
{
-if( mbVBACompat == bCompat )
+if( mbVBASupport == bSupport )
return;
-mbVBACompat = bCompat;
+mbVBASupport = bSupport;
// initialize VBA document API
-if( mbVBACompat ) try
+if( mbVBASupport ) try
{
+mbCompat = true;
StarBASIC* pBasic = static_cast< StarBASIC* >( GetParent() );
uno::Reference< lang::XMultiServiceFactory > xFactory(
getDocumentModel( pBasic ), uno::UNO_QUERY_THROW );
xFactory->createInstance( "ooo.vba.VBAGlobals" );
@@ -1067,7 +1069,7 @@ namespace
// Run a Basic-subprogram
void SbModule::Run( SbMethod* pMeth )
{
-SAL_INFO("basic","About to run " << pMeth->GetName() << ", vba compatmode
is " << mbVBACompat );
+SAL_INFO("basic","About to run " << pMeth->GetName() << ", vba compatmode
is " << mbVBASupport );
static sal_uInt16 nMaxCallLevel = 0;
@@ -1088,7 +1090,7 @@
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a022fcbc8bf256eb04319aa3ecfc4a3c1b5 Author: Seth Chaiklin AuthorDate: Tue Feb 21 01:10:07 2023 + Commit: Gerrit Code Review CommitDate: Tue Feb 21 01:10:07 2023 + Update git submodules * Update helpcontent2 from branch 'master' to e75f5c367876eb7c983ea5e94eda777c4e0f247b - tdf#152605 update "chapter heading" to "numbered heading" Change-Id: I9afe6af9e039e2e40f9d19558fffd5caa1eeb645 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147281 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/helpcontent2 b/helpcontent2 index 336d8e277daa..e75f5c367876 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 336d8e277daa429fe5c271d7e5169e179dd4aaf9 +Subproject commit e75f5c367876eb7c983ea5e94eda777c4e0f247b
[Libreoffice-commits] help.git: source/text
source/text/shared/02/0605.xhp | 11 +-- source/text/shared/02/0606.xhp | 11 +-- source/text/swriter/02/0607.xhp |5 - source/text/swriter/02/0608.xhp |5 - source/text/swriter/02/0612.xhp |5 - source/text/swriter/02/0613.xhp |5 - 6 files changed, 34 insertions(+), 8 deletions(-) New commits: commit e75f5c367876eb7c983ea5e94eda777c4e0f247b Author: Seth Chaiklin AuthorDate: Sun Feb 19 23:13:05 2023 + Commit: Seth Chaiklin CommitDate: Tue Feb 21 01:10:07 2023 + tdf#152605 update "chapter heading" to "numbered heading" Change-Id: I9afe6af9e039e2e40f9d19558fffd5caa1eeb645 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147281 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/source/text/shared/02/0605.xhp b/source/text/shared/02/0605.xhp index 51089004b3..07b9085d47 100644 --- a/source/text/shared/02/0605.xhp +++ b/source/text/shared/02/0605.xhp @@ -32,9 +32,9 @@ Demote Outline Level -Moves a chapter heading where the cursor is located, or selected chapter headings, down one outline level. Moves a list paragraph where the cursor is located, or selected list paragraphs, down one list level.UFI: need two files for numbering and outline, also for 0606.xhp +Moves a numbered heading where the cursor is located, or selected headings, down one outline level. Moves a list paragraph where the cursor is located, or selected list paragraphs, down one list level.UFI: need two files for numbering and outline, also for 0606.xhp -The Demote Outline Level icon is on the Bullets and Numbering bar, which appears when the cursor is positioned on a numbered chapter heading or a list paragraph. +The Demote Outline Level icon is on the Bullets and Numbering bar, which appears when the cursor is positioned on a numbered heading or a list paragraph. The Demote icon is on the Outline bar, which appears when working in the outline view. This function can also be called by pressing Alt+Shift+Right Arrow. @@ -48,5 +48,12 @@ + + + + + + + diff --git a/source/text/shared/02/0606.xhp b/source/text/shared/02/0606.xhp index 9977ec7956..f4803fd293 100644 --- a/source/text/shared/02/0606.xhp +++ b/source/text/shared/02/0606.xhp @@ -32,9 +32,9 @@ Promote Outline Level -Moves a chapter heading where the cursor is located, or selected chapter headings, up one outline level. Moves a list paragraph where the cursor is located, or selected list paragraphs, up one list level. +Moves a numbered heading where the cursor is located, or selected headings, up one outline level. Moves a list paragraph where the cursor is located, or selected list paragraphs, up one list level. -The Promote Outline Level icon is on the Bullets and Numbering bar, which appears when the cursor is positioned on a numbered chapter heading or a list paragraph.The Promote icon is on the Outline bar, which appears when working in the outline view. This function can also be called by pressing Alt+Shift+Left Arrow. +The Promote Outline Level icon is on the Bullets and Numbering bar, which appears when the cursor is positioned on a numbered heading or a list paragraph.The Promote icon is on the Outline bar, which appears when working in the outline view. This function can also be called by pressing Alt+Shift+Left Arrow. @@ -47,5 +47,12 @@ + + + + + + + diff --git a/source/text/swriter/02/0607.xhp b/source/text/swriter/02/0607.xhp index 58123dbd09..0df1d9f9b3 100644 --- a/source/text/swriter/02/0607.xhp +++ b/source/text/swriter/02/0607.xhp @@ -32,7 +32,7 @@ i66535, was Shift down with Subpoints Demote Outline Level with Subpoints -Demotes the list of a list paragraph where the cursor is located and its subpoints to the next list level. Multiple list paragraphs can be selected. Demotes the outline level of a chapter heading where the cursor is located and all its subheadings to the next outline level. This command is active only when the cursor is positioned in a list paragraph or a chapter heading. +Demotes the list of a list paragraph where the cursor is located and its subpoints to the next list level. Multiple list paragraphs can be selected. Demotes the outline level of a numbered heading where the cursor is located and all its subheadings to the next outline level. This command is active only when the cursor is positioned in a list paragraph or a numbered heading. @@ -47,5 +47,8 @@ + + + diff --git a/source/text/swriter/02/0608.xhp b/source/text/swriter/02/0608.xhp index 01f174dd37..549cfaab4a 100644 --- a/source/text/swriter/02/0608.xhp +++ b/source/text/swriter/02/0608.xhp @@ -32,7 +32,7 @@ i66535, was Shift up with Subpoints Promote Outline Level With Subpoints -Promotes the list level of a list paragraph where the cursor is located
[Libreoffice-commits] core.git: sw/inc sw/qa sw/uiconfig
sw/inc/strings.hrc| 10 +-
sw/qa/uitest/fieldDialog/tdf143483.py | 16
sw/uiconfig/swriter/ui/flddocumentpage.ui |6 +++---
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 842ed5e6b02939ca57db90f08ce5877836ae45ed
Author: Seth Chaiklin
AuthorDate: Sun Feb 19 10:47:57 2023 +
Commit: Seth Chaiklin
CommitDate: Tue Feb 21 00:22:24 2023 +
tdf#153560 "chapter" -> "heading" for Type and Format and adjust "level"
label
* also change "name" to "contents" for Format
* change "Outline Level" to "Up to level" and add colon, because it
is a buddy control. The new label gives a better indication of the
function of the control.
* update tooltip and extended tip for the "Up to level" option.
Needed to modify unit test: sw/qa/uitest/fieldDialog/tdf143483.py
Change-Id: Idafd693fe4ce161d4fa069da59a78a6111be8e8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147276
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 7e41e6b08cae..476df842a9f1 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -908,7 +908,7 @@
#define STR_TIMEFLD NC_("STR_TIMEFLD", "Time")
#define STR_FILENAMEFLD NC_("STR_FILENAMEFLD", "File
name")
#define STR_DBNAMEFLD NC_("STR_DBNAMEFLD", "Database
Name")
-#define STR_CHAPTERFLD NC_("STR_CHAPTERFLD",
"Chapter")
+#define STR_CHAPTERFLD NC_("STR_CHAPTERFLD",
"~Heading")
#define STR_PAGENUMBERFLD NC_("STR_PAGENUMBERFLD", "Page
number")
#define STR_DOCSTATFLD NC_("STR_DOCSTATFLD",
"Statistics")
#define STR_AUTHORFLD NC_("STR_AUTHORFLD", "Author")
@@ -1003,10 +1003,10 @@
/*
Description: format chapter
*/
-#define FMT_CHAPTER_NAMENC_("FMT_CHAPTER_NAME",
"Chapter name")
-#define FMT_CHAPTER_NO NC_("FMT_CHAPTER_NO", "Chapter
number")
-#define FMT_CHAPTER_NO_NOSEPARATOR
NC_("FMT_CHAPTER_NO_NOSEPARATOR", "Chapter number without separator")
-#define FMT_CHAPTER_NAMENO NC_("FMT_CHAPTER_NAMENO",
"Chapter number and name")
+#define FMT_CHAPTER_NAMENC_("FMT_CHAPTER_NAME",
"Heading contents")
+#define FMT_CHAPTER_NO NC_("FMT_CHAPTER_NO", "Heading
number")
+#define FMT_CHAPTER_NO_NOSEPARATOR
NC_("FMT_CHAPTER_NO_NOSEPARATOR", "Heading number without separator")
+#define FMT_CHAPTER_NAMENO NC_("FMT_CHAPTER_NAMENO",
"Heading number and contents")
/*
Description: formats
*/
diff --git a/sw/qa/uitest/fieldDialog/tdf143483.py
b/sw/qa/uitest/fieldDialog/tdf143483.py
index 357c283badbf..03eeceb7954a 100644
--- a/sw/qa/uitest/fieldDialog/tdf143483.py
+++ b/sw/qa/uitest/fieldDialog/tdf143483.py
@@ -21,26 +21,26 @@ class Tdf143483(UITestCase):
with
self.ui_test.execute_dialog_through_command(".uno:FieldDialog") as xDialog:
xDoc = xDialog.getChild("type-doc")
-self.assertEqual("Chapter",
get_state_as_dict(xDoc)['SelectEntryText'])
+self.assertEqual("Heading",
get_state_as_dict(xDoc)['SelectEntryText'])
xFormat = xDialog.getChild("format-doc")
-self.assertEqual("Chapter name",
get_state_as_dict(xFormat)['SelectEntryText'])
+self.assertEqual("Heading contents",
get_state_as_dict(xFormat)['SelectEntryText'])
xNext = xDialog.getChild("next")
xNext.executeAction("CLICK", tuple())
-self.assertEqual("Chapter",
get_state_as_dict(xDoc)['SelectEntryText'])
-self.assertEqual("Chapter number",
get_state_as_dict(xFormat)['SelectEntryText'])
+self.assertEqual("Heading",
get_state_as_dict(xDoc)['SelectEntryText'])
+self.assertEqual("Heading number",
get_state_as_dict(xFormat)['SelectEntryText'])
xNext.executeAction("CLICK", tuple())
-self.assertEqual("Chapter",
get_state_as_dict(xDoc)['SelectEntryText'])
-self.assertEqual("Chapter number and name",
get_state_as_dict(xFormat)['SelectEntryText'])
+self.assertEqual("Heading",
get_state_as_dict(xDoc)['SelectEntryText'])
+self.assertEqual("Heading number and contents",
get_state_as_dict(xFormat)['SelectEntryText'])
xNext.executeAction("CLICK", tuple())
-
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/outlinenumbering.ui | 50 ++--- 1 file changed, 45 insertions(+), 5 deletions(-) New commits: commit 74dc2ac66f0130bcd77cf1bbe417b22865beb067 Author: Seth Chaiklin AuthorDate: Sun Feb 19 03:17:45 2023 + Commit: Seth Chaiklin CommitDate: Mon Feb 20 21:44:44 2023 + tdf#153549 update extended tips for load/save numbering formats There was only an extended tip for the first item in the dropdown list, so extended tips were added to the 8 other items in the list. Change-Id: I29188637068ca683da0272b798d665cf5f8f22aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147275 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/sw/uiconfig/swriter/ui/outlinenumbering.ui b/sw/uiconfig/swriter/ui/outlinenumbering.ui index 99df7dcaaeef..228c762b32a1 100644 --- a/sw/uiconfig/swriter/ui/outlinenumbering.ui +++ b/sw/uiconfig/swriter/ui/outlinenumbering.ui @@ -13,7 +13,7 @@ True -Select the predefined numbering scheme that you want to assign to the selected outline level. +Select this predefined numbering format to be the numbering format for this document. It will overwrite the current settings. @@ -24,6 +24,11 @@ False Untitled 2 True + + +Select this predefined numbering format to be the numbering format for this document. It will overwrite the current settings. + + @@ -32,6 +37,11 @@ False Untitled 3 True + + +Select this predefined numbering format to be the numbering format for this document. It will overwrite the current settings. + + @@ -40,6 +50,11 @@ False Untitled 4 True + + +Select this predefined numbering format to be the numbering format for this document. It will overwrite the current settings. + + @@ -48,6 +63,11 @@ False Untitled 5 True + + +Select this predefined numbering format to be the numbering format for this document. It will overwrite the current settings. + + @@ -56,6 +76,11 @@ False Untitled 6 True + + +Select this predefined numbering format to be the numbering format for this document. It will overwrite the current settings. + + @@ -64,6 +89,11 @@ False Untitled 7 True + + +Select this predefined numbering format to be the numbering format for this document. It will overwrite the current settings. + + @@ -72,6 +102,11 @@ False Untitled 8 True + + +Select this predefined numbering format to be the numbering format for this document. It will overwrite the current settings. + + @@ -80,6 +115,11 @@ False Untitled 9 True + + +Select this predefined numbering format to be the numbering format for this document. It will overwrite the current settings. + + @@ -96,21 +136,21 @@ True -Opens a dialog where you can save the current settings for the selected chapter and outline level. You can then load these settings from another document. +Opens a dialog box where you enter a name to identify the current settings. The name you enter will appear in the dropdown list when the Load/Save button is clicked, both in the current and in other documents. Click on the name to load the saved settings into a document. -Click a numbering scheme in the list, and then enter a name for the scheme. The numbers correspond to the outline level that the styles are assigned to. +Click a numbering scheme in the list, and then enter a name for the scheme. The numbers correspond to the outline level of the styles. False 6 -Chapter Numbering +Heading Numbering False True 0 @@ -331,7 +371,7 @@ -Use this dialog to specify the numbering scheme for headings in the current document. For each outline level, you can assign a paragraph style and a numbering scheme. Use “1-10” to apply the same setting for all outline levels. +Use this dialog to specify the numbering format for headings in the current document. For each outline level, you can assign a paragraph style and a numbering scheme. Use “1-10” to apply the same setting for all
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/tools/gradienttools.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 71a67048f5eafcf668d1ee6d70c66c04cb323b0f
Author: Andrea Gelmini
AuthorDate: Mon Feb 20 12:02:30 2023 +0100
Commit: Julien Nabet
CommitDate: Mon Feb 20 21:16:07 2023 +
Fix typo
Change-Id: I0247eec84ea4c7dc5386bd8bcb9792601758e8c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147317
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/basegfx/source/tools/gradienttools.cxx
b/basegfx/source/tools/gradienttools.cxx
index 5af4397eb3cd..b2635b3f09cc 100644
--- a/basegfx/source/tools/gradienttools.cxx
+++ b/basegfx/source/tools/gradienttools.cxx
@@ -464,7 +464,7 @@ namespace basegfx
// MCGR: Similar to getRectangularGradientAlpha (please
// see there) we need to use aspect ratio here. Due to
// initEllipticalGradientInfo using M_SQRT2 to make this
-// gradient look 'nicer' this correciton seems not 100%
+// gradient look 'nicer' this correction seems not 100%
// correct, but is close enough for now
if(fAspectRatio > 1.0)
{
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/tools/gradienttools.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 389c6267974a90b9b0e1eaf2a7434ca4aea38f76 Author: Andrea Gelmini AuthorDate: Mon Feb 20 12:03:31 2023 +0100 Commit: Julien Nabet CommitDate: Mon Feb 20 21:15:45 2023 + Fix typo Change-Id: I34f84c957ba9480a1e8aa17a394e139a7f736050 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147318 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/basegfx/source/tools/gradienttools.cxx b/basegfx/source/tools/gradienttools.cxx index b3bb18f918da..5af4397eb3cd 100644 --- a/basegfx/source/tools/gradienttools.cxx +++ b/basegfx/source/tools/gradienttools.cxx @@ -530,7 +530,7 @@ namespace basegfx return 0.0; } -// MCGR: Visualiations using the texturing method for +// MCGR: Visualizations using the texturing method for // displaying gradients (getBackTextureTransform is // involved) show wrong results for GradientElliptical // and GradientRect, this can be best seen when using
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/index/cnttab.cxx |2 --
sw/source/uibase/inc/swuicnttab.hxx|1 -
sw/uiconfig/swriter/ui/tocindexpage.ui | 20 +++-
3 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit abb42c396d84df49b511b8f3c73783dc56982c14
Author: Samuel Mehrbrodt
AuthorDate: Mon Feb 20 15:06:48 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 20 21:15:07 2023 +
Related tdf#153090 Move dropdown next to checkbox
Avoid extra row just for the dropdown
Change-Id: Ic75fec82875576a644ab09e1d6a4af8bed48dba5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147332
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index c7ad5f036a2d..1b21652bcb0b 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -782,7 +782,6 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container*
pPage, weld::DialogContr
, m_xDisplayTypeFT(m_xBuilder->weld_label("displayft"))
, m_xDisplayTypeLB(m_xBuilder->weld_combo_box("display"))
, m_xParaStyleCB(m_xBuilder->weld_check_button("useparastyle"))
-, m_xParaStyleFT(m_xBuilder->weld_label("parastyleft"))
, m_xParaStyleLB(m_xBuilder->weld_combo_box("parastyle"))
, m_xTOXMarksCB(m_xBuilder->weld_check_button("indexmarks"))
, m_xIdxOptionsFrame(m_xBuilder->weld_widget("optionsframe"))
@@ -1325,7 +1324,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,
weld::ComboBox&, rBox, void)
m_xDisplayTypeFT->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
m_xDisplayTypeLB->set_visible( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
m_xParaStyleCB->set_visible(0 != (nType &
(TO_ILLUSTRATION|TO_TABLE|TO_OBJECT)));
-m_xParaStyleFT->set_visible(0 != (nType &
(TO_ILLUSTRATION|TO_TABLE|TO_OBJECT)));
m_xParaStyleLB->set_visible(0 != (nType &
(TO_ILLUSTRATION|TO_TABLE|TO_OBJECT)));
m_xAuthorityFrame->set_visible( 0 != (nType & TO_AUTHORITIES) );
diff --git a/sw/source/uibase/inc/swuicnttab.hxx
b/sw/source/uibase/inc/swuicnttab.hxx
index 455800e71307..644810b8c96d 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -162,7 +162,6 @@ class SwTOXSelectTabPage final : public SfxTabPage
std::unique_ptr m_xDisplayTypeFT;
std::unique_ptr m_xDisplayTypeLB;
std::unique_ptr m_xParaStyleCB;
-std::unique_ptr m_xParaStyleFT;
std::unique_ptr m_xParaStyleLB;
//all but illustration and table
diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui
b/sw/uiconfig/swriter/ui/tocindexpage.ui
index bc06f72f22bb..5568deb0d6c6 100644
--- a/sw/uiconfig/swriter/ui/tocindexpage.ui
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -1237,7 +1237,7 @@
-
+
True
False
@@ -1263,27 +1263,13 @@
0
0
-2
-
-
-
-
-True
-False
-Paragraph style:
-True
-display
-0
-
-
-0
-1
True
False
+True
Select the
paragraph style for which you want to create index entries.
@@ -1292,7 +1278,7 @@
1
-1
+0
[Libreoffice-commits] core.git: sc/qa
0 files changed New commits: commit 23bad2bbd3add5eed49f09ebb3bc32b2cae8d8ba Author: Andrea Gelmini AuthorDate: Sun Feb 19 10:02:36 2023 +0100 Commit: Julien Nabet CommitDate: Mon Feb 20 21:14:45 2023 + Remove executable bits on csv file Change-Id: Id589b7e361e1c34b5e4ec4cdc7ff55d6493787e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147272 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/sc/qa/unit/data/csv/testTdf82254-csv-bom.csv b/sc/qa/unit/data/csv/testTdf82254-csv-bom.csv old mode 100755 new mode 100644
[Libreoffice-commits] core.git: sc/qa
0 files changed New commits: commit 58e392cb149f7e3760bd421ec663133e82f3764b Author: Andrea Gelmini AuthorDate: Mon Feb 20 18:07:01 2023 +0100 Commit: Julien Nabet CommitDate: Mon Feb 20 21:14:21 2023 + Remove exec bits on xls file Change-Id: I2082eb3d09ce5f85432807124a80d591e33574d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147344 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sc/qa/extras/testdocuments/BGR-RGBTest.xls b/sc/qa/extras/testdocuments/BGR-RGBTest.xls old mode 100755 new mode 100644
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/index/cnttab.cxx |2
sw/source/uibase/inc/swuicnttab.hxx|1
sw/uiconfig/swriter/ui/tocindexpage.ui | 328 +++--
3 files changed, 159 insertions(+), 172 deletions(-)
New commits:
commit 13047e72b7f074519f81e7542a0ed572376d4df2
Author: Samuel Mehrbrodt
AuthorDate: Mon Feb 20 15:00:21 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 20 21:09:05 2023 +
tdf#153090 Fix widget display in non-gtk backends
Two problems:
* Two GtkFrames at the same position -> reorder
* LO expects GtkFrame to have a label -> Remove GtkFrame
Change-Id: Ice16c51facedaf449507a338e821b92ff28e44ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147331
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 43ffeb3ba279..c7ad5f036a2d 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -784,7 +784,6 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container*
pPage, weld::DialogContr
, m_xParaStyleCB(m_xBuilder->weld_check_button("useparastyle"))
, m_xParaStyleFT(m_xBuilder->weld_label("parastyleft"))
, m_xParaStyleLB(m_xBuilder->weld_combo_box("parastyle"))
-, m_xParaStyleFrame(m_xBuilder->weld_widget("parastyleframe"))
, m_xTOXMarksCB(m_xBuilder->weld_check_button("indexmarks"))
, m_xIdxOptionsFrame(m_xBuilder->weld_widget("optionsframe"))
, m_xCollectSameCB(m_xBuilder->weld_check_button("combinesame"))
@@ -1328,7 +1327,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,
weld::ComboBox&, rBox, void)
m_xParaStyleCB->set_visible(0 != (nType &
(TO_ILLUSTRATION|TO_TABLE|TO_OBJECT)));
m_xParaStyleFT->set_visible(0 != (nType &
(TO_ILLUSTRATION|TO_TABLE|TO_OBJECT)));
m_xParaStyleLB->set_visible(0 != (nType &
(TO_ILLUSTRATION|TO_TABLE|TO_OBJECT)));
-m_xParaStyleFrame->set_visible(0 != (nType &
(TO_ILLUSTRATION|TO_TABLE|TO_OBJECT)));
m_xAuthorityFrame->set_visible( 0 != (nType & TO_AUTHORITIES) );
diff --git a/sw/source/uibase/inc/swuicnttab.hxx
b/sw/source/uibase/inc/swuicnttab.hxx
index 906d26ceb9bc..455800e71307 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -164,7 +164,6 @@ class SwTOXSelectTabPage final : public SfxTabPage
std::unique_ptr m_xParaStyleCB;
std::unique_ptr m_xParaStyleFT;
std::unique_ptr m_xParaStyleLB;
-std::unique_ptr m_xParaStyleFrame;
//all but illustration and table
std::unique_ptr m_xTOXMarksCB;
diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui
b/sw/uiconfig/swriter/ui/tocindexpage.ui
index 40c2716028b8..bc06f72f22bb 100644
--- a/sw/uiconfig/swriter/ui/tocindexpage.ui
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -59,7 +59,7 @@
True
6
-
+
True
False
@@ -814,174 +814,6 @@
3
-
-
-False
-True
-True
-True
-0
-none
-
-
-
-True
-False
-12
-True
-6
-12
-
-
-Create from additional paragraph
style
-True
-True
-False
-True
-True
-True
-
-
-Include
paragraphs that have the selected style applied in the index.
-
-
-
-
-0
-0
-2
-
-
-
-
-True
-False
-Paragraph style:
-True
-display
-0
-
-
-0
-1
-
-
-
-
-True
-False
-
-
-Select the
paragraph style for which you want to create index entries.
-
-
-
-
-1
-1
-
-
-
-
-
-
-0
-4
-
-
-
-
-False
-True
-True
-0
-none
-
-
-
-True
-False
-12
-6
-True
-True
-
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/tocindexpage.ui | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 8630cbed84ac6418f85289649ed511269f8ccf4f Author: Samuel Mehrbrodt AuthorDate: Mon Feb 20 14:09:26 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 20 21:08:12 2023 + Save with Glade 3.40.0 Change-Id: I40c2c3b1329a098f832f2fc286e6370be39f2a5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147330 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui index c7a5f12786a8..40c2716028b8 100644 --- a/sw/uiconfig/swriter/ui/tocindexpage.ui +++ b/sw/uiconfig/swriter/ui/tocindexpage.ui @@ -1,5 +1,5 @@ - + @@ -282,10 +282,10 @@ True True +Enter the number of outline levels to include in the index. True True adjustment1 -Enter the number of outline levels to include in the index. Enter the number of outline levels to include in the index. All headings are included that have an outline level less than or equal to the specified value. @@ -351,10 +351,10 @@ True False True +Creates the index from all paragraphs that have an outline level equal to or greater than “1”. True True True -Creates the index from all paragraphs that have an outline level equal to or greater than “1”. Creates the index from all paragraphs that have an outline level equal to or greater than “1”. @@ -501,9 +501,9 @@ True True False +Include selected paragraph styles with outline level “Text Body” in the index. True True -Include selected paragraph styles with outline level “Text Body” in the index. Includes the paragraph styles that you specify in the Assign Styles dialog as index entries. To select the paragraph styles that you want to include in the index, click the Assign Styles (...) button to the right of this box. @@ -827,8 +827,8 @@ True False -True 12 +True 6 12
[Libreoffice-commits] core.git: include/vcl svtools/source vcl/source
include/vcl/wizardmachine.hxx |3 +++
svtools/source/uno/wizard/wizardshell.cxx | 10 ++
svtools/source/uno/wizard/wizardshell.hxx |3 +++
vcl/source/control/roadmapwizard.cxx | 16
vcl/source/control/wizardmachine.cxx | 12 +++-
5 files changed, 35 insertions(+), 9 deletions(-)
New commits:
commit cdf7b51229f2353376fb4e9de309fb9ee5580b3a
Author: Caolán McNamara
AuthorDate: Mon Feb 20 13:15:44 2023 +
Commit: Caolán McNamara
CommitDate: Mon Feb 20 21:01:26 2023 +
tdf#132110 page ids might not be state ids
Change-Id: I9f8946acbcf593e9adf6d31631b82cdafcd3f472
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147327
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index 04698f387011..a29b03a38062 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -302,6 +302,9 @@ namespace vcl
*/
void
getStateHistory(std::vector& out_rHistory);
+virtual OString getPageIdentForState(WizardTypes::WizardState
nState) const;
+virtual WizardTypes::WizardState getStateFromPageIdent(const OString&
rIdent) const;
+
public:
class AccessGuard
{
diff --git a/svtools/source/uno/wizard/wizardshell.cxx
b/svtools/source/uno/wizard/wizardshell.cxx
index 93113d4fd739..4b93f09eadbe 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -83,6 +83,16 @@ namespace svt::uno
return WizardShell_Base::run();
}
+OString WizardShell::getPageIdentForState(WizardState nState) const
+{
+return OString::number(impl_stateToPageId(nState));
+}
+
+WizardState WizardShell::getStateFromPageIdent(const OString& rIdent) const
+{
+return impl_pageIdToState(rIdent.toInt32());
+}
+
sal_Int16 WizardShell::convertCommitReasonToTravelType( const
CommitPageReason i_eReason )
{
switch ( i_eReason )
diff --git a/svtools/source/uno/wizard/wizardshell.hxx
b/svtools/source/uno/wizard/wizardshell.hxx
index a563ab9547a7..90e7269a18b2 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -106,6 +106,9 @@ namespace svt::uno
PWizardPageController impl_getController(BuilderPage* i_pPage) const;
+virtual OString getPageIdentForState(WizardState nState) const
override;
+virtual WizardState getStateFromPageIdent(const OString& rIdent) const
override;
+
// prevent outside access to some base class members
using WizardShell_Base::skip;
using WizardShell_Base::skipUntil;
diff --git a/vcl/source/control/roadmapwizard.cxx
b/vcl/source/control/roadmapwizard.cxx
index fe4c53b92e02..49c28de9bfe9 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -470,7 +470,7 @@ namespace vcl
GetOrCreatePage(nState);
}
-OString sIdent(OString::number(nState));
+OString sIdent(getPageIdentForState(nState));
m_xAssistant->set_page_index(sIdent, nItemIndex);
m_xAssistant->set_page_title(sIdent, getStateDisplayName(nState));
@@ -639,9 +639,9 @@ namespace vcl
IMPL_LINK(RoadmapWizardMachine, OnRoadmapItemSelected, const OString&,
rCurItemId, bool)
{
-int nCurItemId = rCurItemId.toInt32();
+WizardTypes::WizardState nSelectedState =
getStateFromPageIdent(rCurItemId);
-if ( nCurItemId == getCurrentState() )
+if (nSelectedState == getCurrentState())
// nothing to do
return false;
@@ -651,7 +651,7 @@ namespace vcl
WizardTravelSuspension aTravelGuard( *this );
sal_Int32 nCurrentIndex = m_pImpl->getStateIndexInPath(
getCurrentState(), m_pImpl->nActivePath );
-sal_Int32 nNewIndex = m_pImpl->getStateIndexInPath( nCurItemId,
m_pImpl->nActivePath );
+sal_Int32 nNewIndex = m_pImpl->getStateIndexInPath(
nSelectedState, m_pImpl->nActivePath );
DBG_ASSERT( ( nCurrentIndex != -1 ) && ( nNewIndex != -1 ),
"RoadmapWizard::OnRoadmapItemSelected: something's wrong here!" );
@@ -663,8 +663,8 @@ namespace vcl
bool bResult = true;
if ( nNewIndex > nCurrentIndex )
{
-bResult = skipUntil(
static_cast(nCurItemId) );
-WizardTypes::WizardState nTemp =
static_cast(nCurItemId);
+bResult = skipUntil(nSelectedState);
+WizardTypes::WizardState nTemp = nSelectedState;
while( nTemp )
{
if( m_pImpl->aDisabledStates.find( --nTemp ) !=
m_pImpl->aDisabledStates.end() )
@@ -672,7 +672,7 @@ namespace vcl
}
}
else
-bResult = skipBackwardUntil(
static_cast(nCurItemId) );
+
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/tabbar.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 816b3607dd9676a343e8ee544b615e75393566d3
Author: Caolán McNamara
AuthorDate: Mon Feb 20 15:54:22 2023 +
Commit: Caolán McNamara
CommitDate: Mon Feb 20 21:01:11 2023 +
Resolves: tdf#153763 first/last buttons in tabbar not responding
Change-Id: Id6e70eca7c2d523643d9e38e8c7402879464bf5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147343
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index a0995eef4910..ddadf400761d 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -884,13 +884,16 @@ void TabBar::ImplShowPage( sal_uInt16 nPos )
IMPL_LINK( TabBar, ImplClickHdl, weld::Button&, rBtn, void )
{
-if ((GetPointerState().mnState & (MOUSE_LEFT | MOUSE_MIDDLE |
MOUSE_RIGHT)) == 0)
+if (&rBtn != mpImpl->mxButtonBox->m_xFirstButton.get() && &rBtn !=
mpImpl->mxButtonBox->m_xLastButton.get())
{
-// like tdf#149482 if we didn't see a mouse up, but find that the
mouse is no
-// longer pressed at this point, then bail
-mpImpl->mxButtonBox->m_xPrevRepeater->Stop();
-mpImpl->mxButtonBox->m_xNextRepeater->Stop();
-return;
+if ((GetPointerState().mnState & (MOUSE_LEFT | MOUSE_MIDDLE |
MOUSE_RIGHT)) == 0)
+{
+// like tdf#149482 if we didn't see a mouse up, but find that the
mouse is no
+// longer pressed at this point, then bail
+mpImpl->mxButtonBox->m_xPrevRepeater->Stop();
+mpImpl->mxButtonBox->m_xNextRepeater->Stop();
+return;
+}
}
EndEditMode();
[Libreoffice-commits] core.git: vcl/source
vcl/source/fontsubset/sft.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 961089cba5123ce535fe859044ff4e93c257391a
Author: Caolán McNamara
AuthorDate: Mon Feb 20 19:50:35 2023 +
Commit: Caolán McNamara
CommitDate: Mon Feb 20 21:00:52 2023 +
cid#1521192 Argument cannot be negative
Change-Id: Ifd1b8c3391ed3576dfa61311c8bd46d1b284771e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147349
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 9b9e4dfcb5b1..6644946699a4 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1082,7 +1082,8 @@ int CountTTCFonts(const char* fname)
if (sscanf(fname, "/:FD:/%d%n", &nFD, &n) == 1 && fname[n] == '\0')
{
lseek(nFD, 0, SEEK_SET);
-fd = fdopen(dup(nFD), "rb");
+int nDupFd = dup(nFD);
+fd = nDupFd != -1 ? fdopen(nDupFd, "rb") : nullptr;
}
else
#endif
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/porlay.cxx |2 +-
sw/source/core/text/txtfrm.cxx | 21 +
2 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit b1814b7cc851c4346f6cfa81c5be74c46f42e90f
Author: Michael Stahl
AuthorDate: Mon Feb 20 20:06:57 2023 +0100
Commit: Michael Stahl
CommitDate: Mon Feb 20 20:40:27 2023 +
tdf#114973 sw: don't allow every body SwTextFrame to be hidden
Check this in SwTextFrame::IsHiddenNow() for the first one in the body.
Also fix a bad entry in SwScriptInfo::m_HiddenChg that is then possible
because it wasn't called on empty frames before.
Change-Id: If57f8d1a30229cfbf97225b386365ae384c5083c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147347
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 7115c90e7bca..3b00fac71031 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1272,7 +1272,7 @@ void SwScriptInfo::InitScriptInfo(const SwTextNode& rNode,
{
const Range& rRange = aHiddenMulti.GetRange( i );
const sal_Int32 nStart = rRange.Min();
-const sal_Int32 nEnd = rRange.Max() + 1;
+const sal_Int32 nEnd = rRange.Max() + (rText.isEmpty() ? 0 : 1);
m_HiddenChg.push_back( TextFrameIndex(nStart) );
m_HiddenChg.push_back( TextFrameIndex(nEnd) );
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index aa371cd3df63..5906c9c9d1f3 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1432,6 +1432,27 @@ bool SwTextFrame::IsHiddenNow() const
( bHiddenCharsHidePara &&
!pVsh->GetViewOptions()->IsShowHiddenChar() ) )
{
+// in order to put the cursor in the body text, one paragraph must
+// be visible - check this for the 1st body paragraph
+if (IsInDocBody() && FindPrevCnt() == nullptr)
+{
+bool isAllHidden(true);
+for (SwContentFrame const* pNext = FindNextCnt(true);
+pNext != nullptr; pNext = pNext->FindNextCnt(true))
+{
+if (!pNext->IsTextFrame()
+|| !static_cast(pNext)->IsHiddenNow())
+{
+isAllHidden = false;
+break;
+}
+}
+if (isAllHidden)
+{
+SAL_INFO("sw.core", "unhiding one body paragraph");
+return false;
+}
+}
return true;
}
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7d01a83fc166e171a1ab8b142eac76ece73ce565 Author: Olivier Hallot AuthorDate: Mon Feb 20 17:39:50 2023 -0300 Commit: Gerrit Code Review CommitDate: Mon Feb 20 20:39:50 2023 + Update git submodules * Update helpcontent2 from branch 'libreoffice-7-5' to 7a321cf864aa31914f3fc31caf2e541091a125bb - tdf#149286 Missing Help links for Customize toolbars Change-Id: I702b2ab1759decee9c283e2f2abb09b1a282ab52 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147065 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 17e29a631823..7a321cf864aa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 17e29a631823bfc2a61d6eeb7571c6c0612f608c +Subproject commit 7a321cf864aa31914f3fc31caf2e541091a125bb
[Libreoffice-commits] help.git: Branch 'libreoffice-7-5' - source/text
source/text/shared/01/06140400.xhp |2 ++ 1 file changed, 2 insertions(+) New commits: commit 7a321cf864aa31914f3fc31caf2e541091a125bb Author: Olivier Hallot AuthorDate: Wed Feb 15 10:35:12 2023 -0300 Commit: Adolfo Jayme Barrientos CommitDate: Mon Feb 20 20:39:49 2023 + tdf#149286 Missing Help links for Customize toolbars Change-Id: I702b2ab1759decee9c283e2f2abb09b1a282ab52 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147065 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/01/06140400.xhp b/source/text/shared/01/06140400.xhp index da763afc20..6a6e2f8d5d 100644 --- a/source/text/shared/01/06140400.xhp +++ b/source/text/shared/01/06140400.xhp @@ -41,8 +41,10 @@ Displays the results of the combination of the search string and category of the desired function. Description The text box contains a short description of the selected command. + Scope Select the location where the toolbar is to be attached. If attached to a %PRODUCTNAME module, the toolbar is available for all files opened in that module. If attached to the file, the toolbar will be available only when that file is opened and active. + Target Select the toolbar where the customization is to be applied. The current set of functions is displayed in the box below. Add
[Libreoffice-commits] help.git: source/text
source/text/shared/guide/convertfilters.xhp | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 336d8e277daa429fe5c271d7e5169e179dd4aaf9 Author: Olivier Hallot AuthorDate: Mon Feb 20 11:03:03 2023 -0300 Commit: Adolfo Jayme Barrientos CommitDate: Mon Feb 20 19:54:29 2023 + tdf#137883 Rename docx filter to be less confusing - Help part After https://git.libreoffice.org/core/+/ed0476b0625c4361df5ff040a6661a9634588cea Change-Id: Id4b098e97ef0491c46fb735544c26cec40a09c76 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147329 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/guide/convertfilters.xhp b/source/text/shared/guide/convertfilters.xhp index 85f4519575..918a4cbff6 100644 --- a/source/text/shared/guide/convertfilters.xhp +++ b/source/text/shared/guide/convertfilters.xhp @@ -401,7 +401,7 @@ -Word 2007–365 +Word 2007 "MS Word 2007 XML" @@ -412,7 +412,7 @@ -Word 2007–365 Template +Word 2007 Template "MS Word 2007 XML Template" @@ -423,7 +423,7 @@ -Word 2007–365 VBA +Word 2007 VBA "MS Word 2007 XML VBA" @@ -434,7 +434,7 @@ -Office Open XML Text (Transitional) +Word 2010-365 Document "Office Open XML Text" @@ -445,7 +445,7 @@ -Office Open XML Text Template (Transitional) +Word 2010-365 Template "Office Open XML Text Template"
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0452b8d6b793ac22308bc4e67e5bd54a54656568 Author: Olivier Hallot AuthorDate: Mon Feb 20 16:54:30 2023 -0300 Commit: Gerrit Code Review CommitDate: Mon Feb 20 19:54:30 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 336d8e277daa429fe5c271d7e5169e179dd4aaf9 - tdf#137883 Rename docx filter to be less confusing - Help part After https://git.libreoffice.org/core/+/ed0476b0625c4361df5ff040a6661a9634588cea Change-Id: Id4b098e97ef0491c46fb735544c26cec40a09c76 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147329 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 1a82dd1e5fd7..336d8e277daa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1a82dd1e5fd73e2cfa8331f79f69fd8761720b9e +Subproject commit 336d8e277daa429fe5c271d7e5169e179dd4aaf9
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source
sc/source/ui/view/gridwin4.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 146b95e138ff38aee755f4954f3305c48e2c3963
Author: Xisco Fauli
AuthorDate: Fri Feb 17 12:44:03 2023 +0100
Commit: Caolán McNamara
CommitDate: Mon Feb 20 19:44:58 2023 +
sc: fix divide by zero in ScGridWindow::DrawPagePreview
Seen in
https://crashreport.libreoffice.org/stats/signature/ScGridWindow::DrawPagePreview(short,long,short,long,OutputDevice%20&)
Change-Id: Iff64d0fe84c7d53b18db38598709ac47475a6715
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147236
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 42cc0781d26b..6f305576b3bb 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1992,13 +1992,16 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW
nY1, SCCOL nX2, SCROW nY2,
// find right font size for DrawText
aFont.SetFontSize( Size( 0,100 ) );
rRenderContext.SetFont( aFont );
-Size aSize100(rRenderContext.GetTextWidth(
aThisPageStr ), rRenderContext.GetTextHeight() );
-// 40% of width or 60% of height
-tools::Long nSizeX = 40 * ( aPageEnd.X() -
aPageStart.X() ) / aSize100.Width();
-tools::Long nSizeY = 60 * ( aPageEnd.Y() -
aPageStart.Y() ) / aSize100.Height();
-aFont.SetFontSize( Size(
0,std::min(nSizeX,nSizeY) ) );
-rRenderContext.SetFont( aFont );
+Size aSize100(rRenderContext.GetTextWidth(
aThisPageStr ), rRenderContext.GetTextHeight() );
+if (aSize100.Width() && aSize100.Height())
+{
+// 40% of width or 60% of height
+tools::Long nSizeX = 40 * ( aPageEnd.X() -
aPageStart.X() ) / aSize100.Width();
+tools::Long nSizeY = 60 * ( aPageEnd.Y() -
aPageStart.Y() ) / aSize100.Height();
+aFont.SetFontSize( Size(
0,std::min(nSizeX,nSizeY) ) );
+rRenderContext.SetFont( aFont );
+}
// centered output with DrawText
Size aTextSize(rRenderContext.GetTextWidth(
aThisPageStr ), rRenderContext.GetTextHeight() );
[Libreoffice-commits] core.git: external/cppunit
external/cppunit/UnpackedTarball_cppunit.mk |1 + external/cppunit/clang.patch.0 | 11 +++ 2 files changed, 12 insertions(+) New commits: commit 9a23239b710e44754e4a28643420c9ba91552645 Author: Stephan Bergmann AuthorDate: Fri Feb 17 17:18:50 2023 +0100 Commit: Stephan Bergmann CommitDate: Mon Feb 20 19:25:25 2023 + external/cppunit: Don't mis-apply GCC < 4.6 workaround for Clang ...which happens to define __GNUC__=4, __GNUC_MINOR__=2 Change-Id: I128547d0bd375ffec9deb6abd744eeb2667ba666 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147257 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk index 4275c692e85e..d6304a96762e 100644 --- a/external/cppunit/UnpackedTarball_cppunit.mk +++ b/external/cppunit/UnpackedTarball_cppunit.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ external/cppunit/windows-arm64.patch.1 \ external/cppunit/propagate-exceptions.patch.0 \ external/cppunit/sprintf.patch.0 \ + external/cppunit/clang.patch.0 \ )) ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ diff --git a/external/cppunit/clang.patch.0 b/external/cppunit/clang.patch.0 new file mode 100644 index ..7a520f27616d --- /dev/null +++ b/external/cppunit/clang.patch.0 @@ -0,0 +1,11 @@ +--- include/cppunit/TestAssert.h include/cppunit/TestAssert.h +@@ -11,7 +11,7 @@ + + // Work around "passing 'T' chooses 'int' over 'unsigned int'" warnings when T + // is an enum type: +-#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)) ++#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)) && !defined __clang__ + #pragma GCC system_header + #endif +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bd0a5bc4296b49da817151654b3fcc850403c614 Author: Eike Rathke AuthorDate: Mon Feb 20 19:46:44 2023 +0100 Commit: Gerrit Code Review CommitDate: Mon Feb 20 18:46:44 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 1a82dd1e5fd73e2cfa8331f79f69fd8761720b9e - Correct --convert-to example, OutputFileExtension is mandatory Change-Id: Ibcb0ac148c60e53cf539529b911a4b47c0dc4202 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147346 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index 2b4ec3df2220..1a82dd1e5fd7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2b4ec3df2220ce3cb5e112a202c034a32ba16bab +Subproject commit 1a82dd1e5fd73e2cfa8331f79f69fd8761720b9e
[Libreoffice-commits] help.git: source/text
source/text/shared/guide/csv_params.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a82dd1e5fd73e2cfa8331f79f69fd8761720b9e Author: Eike Rathke AuthorDate: Mon Feb 20 19:45:16 2023 +0100 Commit: Eike Rathke CommitDate: Mon Feb 20 18:46:43 2023 + Correct --convert-to example, OutputFileExtension is mandatory Change-Id: Ibcb0ac148c60e53cf539529b911a4b47c0dc4202 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147346 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/source/text/shared/guide/csv_params.xhp b/source/text/shared/guide/csv_params.xhp index c9f2c9cf92..9deb1252d0 100644 --- a/source/text/shared/guide/csv_params.xhp +++ b/source/text/shared/guide/csv_params.xhp @@ -31,7 +31,7 @@ Import from UTF-8, Language German, Comma separated, Text delimiter ", Quoted field as text. CSV file has columns formatted as date, number, number, number: soffice --infilter="Text - txt - csv (StarCalc):44,34,76,1,1/5/2/1/3/1/4/1,1031,true,true" test.csv Export to Windows-1252, Field delimiter : comma, Text delimiter : quote, Save cell contents as shown: -soffice --convert-to "Text - txt - csv (StarCalc):44,34,ANSI,1,,0,false,true,true" --outdir=/home/user test.ods +soffice --convert-to "csv:Text - txt - csv (StarCalc):44,34,ANSI,1,,0,false,true,true" --outdir=/home/user test.ods
[Libreoffice-commits] core.git: svtools/inc
svtools/inc/framestatuslistener.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit f80d489af599e72632a65d3e6213ec2959341ba0
Author: Noel Grandin
AuthorDate: Mon Feb 20 16:03:45 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 20 18:35:55 2023 +
BaseMutex in FrameStatusListener is unused
Change-Id: I8b71d56eee9603db0cc7132994cff51ec79b5981
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147342
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svtools/inc/framestatuslistener.hxx
b/svtools/inc/framestatuslistener.hxx
index 045b3874f143..9588572430ae 100644
--- a/svtools/inc/framestatuslistener.hxx
+++ b/svtools/inc/framestatuslistener.hxx
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
#include
@@ -37,7 +36,6 @@ namespace svt
class FrameStatusListener : public css::frame::XStatusListener,
public css::frame::XFrameActionListener,
public css::lang::XComponent,
-public ::cppu::BaseMutex,
public ::cppu::OWeakObject
{
public:
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sw/uiconfig
sw/uiconfig/swform/popupmenu/anchor.xml |1 + sw/uiconfig/swreport/popupmenu/anchor.xml |1 + sw/uiconfig/swriter/popupmenu/anchor.xml |1 + sw/uiconfig/swxform/popupmenu/anchor.xml |1 + 4 files changed, 4 insertions(+) New commits: commit ed8c80f01af00b7f68d79a9cd2a60b69ab5bd497 Author: Aron Budea AuthorDate: Mon Feb 20 15:40:38 2023 +0100 Commit: Aron Budea CommitDate: Mon Feb 20 17:56:19 2023 + [cp] Revert "tdf#135836 remove "to page" from shape/image contextmenu" This reverts commit 09c24681a3414092fde50ec0f617c9f7c79e8a61. Change-Id: I18e4efcf9bff48be436102260b0d18aa0d7307cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147334 Tested-by: Jenkins CollaboraOffice Reviewed-by: Aron Budea diff --git a/sw/uiconfig/swform/popupmenu/anchor.xml b/sw/uiconfig/swform/popupmenu/anchor.xml index a6bccfdd6feb..e87252b599f4 100644 --- a/sw/uiconfig/swform/popupmenu/anchor.xml +++ b/sw/uiconfig/swform/popupmenu/anchor.xml @@ -8,6 +8,7 @@ * --> http://openoffice.org/2001/menu";> + diff --git a/sw/uiconfig/swreport/popupmenu/anchor.xml b/sw/uiconfig/swreport/popupmenu/anchor.xml index a6bccfdd6feb..e87252b599f4 100644 --- a/sw/uiconfig/swreport/popupmenu/anchor.xml +++ b/sw/uiconfig/swreport/popupmenu/anchor.xml @@ -8,6 +8,7 @@ * --> http://openoffice.org/2001/menu";> + diff --git a/sw/uiconfig/swriter/popupmenu/anchor.xml b/sw/uiconfig/swriter/popupmenu/anchor.xml index a6bccfdd6feb..e87252b599f4 100644 --- a/sw/uiconfig/swriter/popupmenu/anchor.xml +++ b/sw/uiconfig/swriter/popupmenu/anchor.xml @@ -8,6 +8,7 @@ * --> http://openoffice.org/2001/menu";> + diff --git a/sw/uiconfig/swxform/popupmenu/anchor.xml b/sw/uiconfig/swxform/popupmenu/anchor.xml index a6bccfdd6feb..e87252b599f4 100644 --- a/sw/uiconfig/swxform/popupmenu/anchor.xml +++ b/sw/uiconfig/swxform/popupmenu/anchor.xml @@ -8,6 +8,7 @@ * --> http://openoffice.org/2001/menu";> +
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/officeinstdir/officeinstallationdirectories.cxx |2 +-
comphelper/source/officeinstdir/officeinstallationdirectories.hxx |5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 7d359bd6720d7867564dbc408e892843ec178945
Author: Noel Grandin
AuthorDate: Mon Feb 20 15:55:18 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 20 17:54:49 2023 +
osl::Mutex->std::mutex in OfficeInstallationDirectories
Change-Id: Ic5209df42786451b58d20f58d4d8e88c0f22b07e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147341
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 4cb3eb5e3702..582bdc125f78 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -211,7 +211,7 @@ void OfficeInstallationDirectories::initDirs()
if ( m_xOfficeBrandDir)
return;
-osl::MutexGuard aGuard( m_aMutex );
+std::unique_lock aGuard( m_aMutex );
if ( m_xOfficeBrandDir )
return;
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index cc0881c236fd..09ded59b9a53 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -20,11 +20,11 @@
#pragma once
#include
-#include
#include
#include
+#include
#include
namespace com::sun::star::uno { class XComponentContext; }
@@ -37,7 +37,7 @@ typedef cppu::WeakImplHelper<
css::util::XOfficeInstallationDirectories,
css::lang::XServiceInfo > UnoImplBase;
-class OfficeInstallationDirectories : public cppu::BaseMutex, public
UnoImplBase
+class OfficeInstallationDirectories : public UnoImplBase
{
public:
explicit OfficeInstallationDirectories(
@@ -65,6 +65,7 @@ public:
private:
void initDirs();
+std::mutex m_aMutex;
css::uno::Reference< css::uno::XComponentContext >m_xCtx;
std::optional m_xOfficeBrandDir;
std::optional m_xUserDir;
[Libreoffice-commits] core.git: include/oox
include/oox/core/filterbase.hxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit a9c147e20a90ab91376ea8f2d086d89197b38a75
Author: Noel Grandin
AuthorDate: Mon Feb 20 15:45:49 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 20 17:53:07 2023 +
BaseMutex in oox::core::FilterBase is unused
Change-Id: Ie101a45c435ce10136761dd210d927a4b271507c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147339
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 4ef7018d5fda..eec0d6a19cef 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -30,7 +30,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -94,7 +93,7 @@ typedef ::cppu::WeakImplHelper<
css::document::XFilter >
FilterBase_BASE;
-class OOX_DLLPUBLIC FilterBase : public FilterBase_BASE, public
::cppu::BaseMutex
+class OOX_DLLPUBLIC FilterBase : public FilterBase_BASE
{
public:
/// @throws css::uno::RuntimeException
[Libreoffice-commits] core.git: include/ucbhelper ucbhelper/source
include/ucbhelper/fd_inputstream.hxx |8 +++-
ucbhelper/source/provider/fd_inputstream.cxx | 10 +-
2 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit b4a5e6f025973b5a4ba8210168569fc1a5a34254
Author: Noel Grandin
AuthorDate: Mon Feb 20 15:49:41 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 20 17:45:49 2023 +
osl::Mutex->std::mutex in ucbhelper::FdInputStream
Change-Id: I10482c3a5f9848f45463837d5d8982476b3910a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147340
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/ucbhelper/fd_inputstream.hxx
b/include/ucbhelper/fd_inputstream.hxx
index ebef7dae7869..5035ecd906dd 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -24,9 +24,8 @@
#include
#include
#include
-#include
-
#include
+#include
namespace ucbhelper
{
@@ -37,9 +36,7 @@ namespace ucbhelper
/** Implements a seekable InputStream
* working on a buffer.
*/
-class UCBHELPER_DLLPUBLIC FdInputStream final
-: protected cppu::BaseMutex,
- public FdInputStream_Base
+class UCBHELPER_DLLPUBLIC FdInputStream final : public FdInputStream_Base
{
public:
@@ -83,6 +80,7 @@ namespace ucbhelper
getLength() override;
private:
+std::mutex m_aMutex;
oslFileHandle m_tmpfl;
sal_uInt64 m_nLength;
};
diff --git a/ucbhelper/source/provider/fd_inputstream.cxx
b/ucbhelper/source/provider/fd_inputstream.cxx
index 795c2dcaea7c..05f3357b7157 100644
--- a/ucbhelper/source/provider/fd_inputstream.cxx
+++ b/ucbhelper/source/provider/fd_inputstream.cxx
@@ -57,7 +57,7 @@ namespace ucbhelper
sal_Int32 SAL_CALL FdInputStream::readBytes(Sequence< sal_Int8 >& aData,
sal_Int32 nBytesToRead)
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
sal_uInt64 nBeforePos( 0 );
sal_uInt64 nBytesRequested( nBytesToRead );
@@ -87,7 +87,7 @@ namespace ucbhelper
void SAL_CALL FdInputStream::skipBytes(sal_Int32 nBytesToSkip)
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
if(!m_tmpfl)
throw IOException();
@@ -104,7 +104,7 @@ namespace ucbhelper
void SAL_CALL FdInputStream::closeInput()
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
if(m_tmpfl)
{
osl_closeFile(m_tmpfl);
@@ -115,7 +115,7 @@ namespace ucbhelper
void SAL_CALL FdInputStream::seek(sal_Int64 location)
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
if(!m_tmpfl)
throw IOException();
@@ -127,7 +127,7 @@ namespace ucbhelper
sal_Int64 SAL_CALL
FdInputStream::getPosition()
{
-osl::MutexGuard aGuard(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
if(!m_tmpfl)
throw IOException();
[Libreoffice-commits] core.git: filter/source
filter/source/config/cache/filtercache.cxx | 224 +
filter/source/config/cache/filtercache.hxx | 41 +++--
2 files changed, 126 insertions(+), 139 deletions(-)
New commits:
commit 15405dc68b2e88b53585578567da13e3e99962db
Author: Noel Grandin
AuthorDate: Mon Feb 20 15:43:41 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 20 17:40:10 2023 +
osl::Mutex->std::mutex in FilterCache
Change-Id: I5cdfe5397235eef276fdf77a4bf83bebdc96438b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147338
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index 5a2a59875953..aa0eff534cb4 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -119,7 +119,7 @@ FilterCache::~FilterCache()
std::unique_ptr FilterCache::clone() const
{
// SAFE -> --
-osl::MutexGuard aLock(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
auto pClone = std::make_unique();
@@ -151,7 +151,7 @@ std::unique_ptr FilterCache::clone() const
void FilterCache::takeOver(const FilterCache& rClone)
{
// SAFE -> --
-osl::MutexGuard aLock(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
// a)
// Don't copy the configuration access points here!
@@ -192,14 +192,14 @@ void FilterCache::takeOver(const FilterCache& rClone)
// Because we can't be sure, that changed filters on one clone
// and changed types of another clone work together.
// But here we can check against the later changes...
-impl_validateAndOptimize();
+impl_validateAndOptimize(aGuard);
// <- SAFE --
}
void FilterCache::load(EFillState eRequired)
{
// SAFE -> --
-osl::MutexGuard aLock(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
// check if required fill state is already reached ...
// There is nothing to do then.
@@ -217,28 +217,28 @@ void FilterCache::load(EFillState eRequired)
//office document with a minimal set of values.
if (m_eFillState == E_CONTAINS_NOTHING)
{
-impl_getDirectCFGValue(CFGDIRECTKEY_OFFICELOCALE) >>= m_sActLocale;
+impl_getDirectCFGValue(aGuard, CFGDIRECTKEY_OFFICELOCALE) >>=
m_sActLocale;
if (m_sActLocale.isEmpty())
{
m_sActLocale = DEFAULT_OFFICELOCALE;
}
// Support the old configuration support. Read it only one times
during office runtime!
-impl_readOldFormat();
+impl_readOldFormat(aGuard);
}
// b) If the required fill state was not reached
//but std values was already loaded ...
//we must load some further missing items.
-impl_load(eRequired);
+impl_load(aGuard, eRequired);
// <- SAFE
}
bool FilterCache::isFillState(FilterCache::EFillState eState) const
{
// SAFE ->
-osl::MutexGuard aLock(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
return ((m_eFillState & eState) == eState);
// <- SAFE
}
@@ -249,12 +249,12 @@ std::vector
FilterCache::getMatchingItemsByProps( EItemType eTyp
o3tl::span< const
css::beans::NamedValue > lEProps) const
{
// SAFE ->
-osl::MutexGuard aLock(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
// search for right list
// An exception is thrown - "eType" is unknown.
// => rList will be valid everytimes next line is reached.
-const CacheItemList& rList = impl_getItemList(eType);
+const CacheItemList& rList = impl_getItemList(aGuard, eType);
std::vector lKeys;
lKeys.reserve(rList.size());
@@ -280,12 +280,12 @@ std::vector
FilterCache::getMatchingItemsByProps( EItemType eTyp
bool FilterCache::hasItems(EItemType eType) const
{
// SAFE ->
-osl::MutexGuard aLock(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
// search for right list
// An exception is thrown - "eType" is unknown.
// => rList will be valid everytimes next line is reached.
-const CacheItemList& rList = impl_getItemList(eType);
+const CacheItemList& rList = impl_getItemList(aGuard, eType);
return !rList.empty();
// <- SAFE
@@ -295,12 +295,17 @@ bool FilterCache::hasItems(EItemType eType) const
std::vector FilterCache::getItemNames(EItemType eType) const
{
// SAFE ->
-osl::MutexGuard aLock(m_aMutex);
+std::unique_lock aGuard(m_aMutex);
+return getItemNames(aGuard, eType);
+// <- SAFE
+}
+std::vector FilterCache::getItemNames(std::unique_lock&
rGuard, EItemType eType) const
+{
// search for right list
// An exception is thrown - "eType" is unknown.
// => rList will be valid everytimes next line is reached.
-const CacheItemList& rList = impl_getItemList(eType);
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - 2 commits - vcl/inc vcl/qt5 vcl/source
vcl/inc/listbox.hxx|1 -
vcl/qt5/QtGraphics_Controls.cxx|4 +++-
vcl/source/control/imp_listbox.cxx | 36 ++--
vcl/source/control/listbox.cxx | 14 ++
4 files changed, 27 insertions(+), 28 deletions(-)
New commits:
commit fd7cb42f7d17d03e4fac6d8c5f1d6c7c49a36fc6
Author: Michael Weghorn
AuthorDate: Tue Feb 14 16:16:30 2023 +0100
Commit: Caolán McNamara
CommitDate: Mon Feb 20 17:22:11 2023 +
tdf#153520 vcl: Align listbox invalidation with mouseover check
Before
commit 4cb11d8a6682fecd661b926a417ae7f26f76e7db
Date: Fri Oct 7 16:40:23 2022 +0100
Related: tdf#98067 do RollOver for Edit as well as SpinButton
, the check whether the mouse is over a control
was only checking the control's child windows.
The above commit introduced a check for the control's
window as well in `ImplSmallBorderWindowView::DrawWindow`.
When moving the mouse inside or outside a `ListBox` control,
the invalidation of the corresponding border window happened
when the mouse cursor would enter or leave the `ListBox`'s
`ImplWin` child (in `ImplWin::PreNotify`).
The `ImplWin` only covers a part of the `ListBox` area. As
a consequence, when moving the mouse out of the `ImplWin`
area, the mouse would still be over the parent `ListBox` area,
so the `ControlState::ROLLOVER` state would still be set
in `ImplSmallBorderWindowView::DrawWindow` from the above
commit on.
Since there was no additional invalidation when the mouse
moved out of the `ListBox` area, the `ROLLOVER` state would
remain set even when the mouse left the `ListBox` area as well.
Move the invalidation from `ImplWin` to `ListBox` so
this gets processed when the mouse cursor actually enters or
leaves the `ListBox`, not just the `ImplWin` child.
Also align the mouse over check in
`ImplWin::ImplDraw` with the one in
`ImplSmallBorderWindowView::DrawWindow` again.
(Take the parent into account there as well.)
Change-Id: I8974e370819719489e3d9f091d96b3353888d26b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147018
Tested-by: Jenkins
Reviewed-by: Rafael Lima
(cherry picked from commit d5ace6bf0f1e48ee02e5eb22ce0f9f8953517f60)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147285
Reviewed-by: Michael Weghorn
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 8aa23e90cff8..e9bd4f53b843 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -559,7 +559,6 @@ public:
virtual voidResize() override;
virtual voidGetFocus() override;
virtual voidLoseFocus() override;
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
sal_Int32 GetItemPos() const { return mnItemPos; }
voidSetItemPos( sal_Int32 n ) { mnItemPos = n; }
diff --git a/vcl/source/control/imp_listbox.cxx
b/vcl/source/control/imp_listbox.cxx
index 531244925062..e7375a8d8da4 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2537,25 +2537,6 @@ void ImplWin::FillLayoutData() const
pThis->ImplDraw(*pThis->GetOutDev(), true);
}
-bool ImplWin::PreNotify( NotifyEvent& rNEvt )
-{
-if( rNEvt.GetType() == NotifyEventType::MOUSEMOVE )
-{
-const MouseEvent* pMouseEvt = rNEvt.GetMouseEvent();
-if( pMouseEvt && (pMouseEvt->IsEnterWindow() ||
pMouseEvt->IsLeaveWindow()) )
-{
-// trigger redraw as mouse over state has changed
-if ( IsNativeControlSupported(ControlType::Listbox,
ControlPart::Entire)
-&& ! IsNativeControlSupported(ControlType::Listbox,
ControlPart::ButtonDown) )
-{
-GetParent()->GetWindow( GetWindowType::Border )->Invalidate(
InvalidateFlags::NoErase );
-}
-}
-}
-
-return Control::PreNotify(rNEvt);
-}
-
void ImplWin::ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout)
{
const StyleSettings& rStyleSettings =
rRenderContext.GetSettings().GetStyleSettings();
@@ -2591,14 +2572,17 @@ void ImplWin::ImplDraw(vcl::RenderContext&
rRenderContext, bool bLayout)
Point aPoint( -nLeft, -nTop );
tools::Rectangle aCtrlRegion( aPoint - GetPosPixel(),
pWin->GetSizePixel() );
-bool bMouseOver = false;
-vcl::Window *pChild = pWin->GetWindow( GetWindowType::FirstChild );
-while( pChild )
+bool bMouseOver = pWin->IsMouseOver();
+if (!bMouseOver)
{
-bMouseOver = pChild->IsMouseOver();
-if (bMouseOver)
-break;
-pChild = pChild->GetWindow( GetWindowType::Next );
+vcl::Window *pChild = pWin->GetWindow(
GetWindowType::FirstChild );
+while(
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-6' - basic/source sc/qa
basic/source/runtime/runtime.cxx | 10 +
sc/qa/extras/testdocuments/ForEachInSelection.ods |binary
sc/qa/extras/vba-macro-test.cxx | 39 ++
3 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit ef029c7eb79f6d696e6afeb07456cae3fceaf51e
Author: Mike Kaganski
AuthorDate: Sun Feb 19 13:26:48 2023 +0300
Commit: Caolán McNamara
CommitDate: Mon Feb 20 17:04:45 2023 +
tdf#153724: make sure to retrieve the variable value before checking the
type
Commit 5760c94b8847164f9a7a181f031c7c86643944af tried to avoid all cases
which could set an error in SbiRuntime::PushForEach. To do that, it checked
the type of xObjVar before trying to get an object from it, which otherwise
could set an error.
But the type of the contained value can be not known until it is retrieved
(which can happen inside SbxValue::Get in a call to SbxValue::Broadcast with
SfxHintId::BasicDataWanted). This happens e.g. when the container passed to
'for each' is a call to some special function, like VBA's 'Selection'. Then
SbxValue::GetFullType would return SbxEMPTY prior to SbxValue::Get.
Let's make sure to call SbxValue::Get first (asking for a Variant, to avoid
errors on type mismatch), and only then, check the actual result data type.
Change-Id: Iaa697f38285505e50504ae09f9307fbd29e09a53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147273
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147298
Reviewed-by: Xisco Fauli
(cherry picked from commit acd44070a5fae1bbeec063acc8a68463d914529d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147284
Reviewed-by: Eike Rathke
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 52efd4aea837..729bf652a21e 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1170,7 +1170,15 @@ void SbiRuntime::PushForEach()
pForStk = p;
SbxVariableRef xObjVar = PopVar();
-SbxBase* pObj = xObjVar && xObjVar->GetFullType() == SbxOBJECT ?
xObjVar->GetObject() : nullptr;
+SbxBase* pObj(nullptr);
+if (xObjVar)
+{
+SbxValues v(SbxVARIANT);
+// Here it may retrieve the value, and change the type from SbxEMPTY
to SbxOBJECT
+xObjVar->Get(v);
+if (v.eType == SbxOBJECT)
+pObj = v.pObj;
+}
if (SbxDimArray* pArray = dynamic_cast(pObj))
{
diff --git a/sc/qa/extras/testdocuments/ForEachInSelection.ods
b/sc/qa/extras/testdocuments/ForEachInSelection.ods
new file mode 100644
index ..7996c86eb953
Binary files /dev/null and b/sc/qa/extras/testdocuments/ForEachInSelection.ods
differ
diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx
index 261ee3943a0a..15dfe9c874c0 100644
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -55,6 +55,7 @@ public:
void testTdf131562();
void testTdf107902();
void testTdf90278();
+void testForEachInSelection();
CPPUNIT_TEST_SUITE(VBAMacroTest);
CPPUNIT_TEST(testSimpleCopyAndPaste);
@@ -72,6 +73,7 @@ public:
CPPUNIT_TEST(testTdf131562);
CPPUNIT_TEST(testTdf107902);
CPPUNIT_TEST(testTdf90278);
+CPPUNIT_TEST(testForEachInSelection);
CPPUNIT_TEST_SUITE_END();
private:
@@ -760,6 +762,43 @@ void VBAMacroTest::testTdf90278()
xCloseable->close(true);
}
+void VBAMacroTest::testForEachInSelection()
+{
+OUString aFileName;
+createFileURL(u"ForEachInSelection.ods", aFileName);
+mxComponent = loadFromDesktop(aFileName,
"com.sun.star.sheet.SpreadsheetDocument");
+
+SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(mxComponent);
+
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+ScDocShell* pDocSh = static_cast(pFoundShell);
+ScDocument& rDoc = pDocSh->GetDocument();
+
+uno::Any aRet;
+uno::Sequence aOutParamIndex;
+uno::Sequence aOutParam;
+uno::Sequence aParams;
+
+CPPUNIT_ASSERT_EQUAL(OUString("foo"), rDoc.GetString(ScAddress(0, 0, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("bar"), rDoc.GetString(ScAddress(0, 1, 0)));
+CPPUNIT_ASSERT_EQUAL(OUString("baz"), rDoc.GetString(ScAddress(0, 2, 0)));
+
+// tdf#153724: without the fix, this would fail with
+// assertion failed
+// - Expression: false
+// - Unexpected dialog: Error: BASIC runtime error.
+// '13'
+// Data type mismatch.
+SfxObjectShell::CallXScript(mxComponent,
+
"vnd.sun.Star.script:Standard.Module1.TestForEachInSelection?"
+"language=Basic&location=document",
+aParams, aRet, aOutParamIndex, aOutParam);
+
+CPPUNIT_ASSERT_EQUAL(OUString("oof
[Libreoffice-commits] core.git: include/vbahelper sc/qa sc/source sw/source vbahelper/source
include/vbahelper/vbafontbase.hxx |8 ++-
sc/qa/extras/testdocuments/BGR-RGBTest.xls |binary
sc/qa/extras/vba-macro-test.cxx|2 +
sc/source/ui/vba/vbafont.cxx |2 -
sw/source/ui/vba/vbafont.cxx | 11 +-
sw/source/ui/vba/vbafont.hxx |1
vbahelper/source/vbahelper/vbafontbase.cxx | 30 ++---
7 files changed, 35 insertions(+), 19 deletions(-)
New commits:
commit 0548269ca03f093c41f6292e783cc6c77328808e
Author: Hannah Meeks
AuthorDate: Fri Dec 23 21:54:01 2022 +
Commit: Mike Kaganski
CommitDate: Mon Feb 20 16:55:31 2023 +
VBA: Remove conversions in writer from OORGBTOXLRGB (XLRGB is actually BGR!)
Enum to store if document is Writer or Calc because font colors are treated
differently depending on this:
In writer the colors come in as RGB but in calc they are in BGR and both
palettes
are in RBG so we only need this conversion for calc.
Includes testdoc for calc - to show this still works
Change-Id: I79d9d585dbfc527c0781543ce1f1095c4db190b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144788
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/vbahelper/vbafontbase.hxx
b/include/vbahelper/vbafontbase.hxx
index 732a67bc1d1e..d388715c93ba 100644
--- a/include/vbahelper/vbafontbase.hxx
+++ b/include/vbahelper/vbafontbase.hxx
@@ -44,9 +44,13 @@ typedef InheritedHelperInterfaceWeakImpl< ov::XFontBase >
VbaFontBase_BASE;
class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE
{
+public:
+enum Component { WORD, EXCEL };
+
protected:
css::uno::Reference< css::beans::XPropertySet > mxFont;
css::uno::Reference< css::container::XIndexAccess > mxPalette;
+Component meWhich;
bool mbFormControl;
public:
@@ -79,7 +83,9 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::container::XIndexAccess >& xPalette,
const css::uno::Reference< css::beans::XPropertySet >& xPropertySet,
-bool bFormControl = false );
+Component eWhich,
+bool bFormControl = false);
+
virtual ~VbaFontBase() override;// {}
// Attributes
diff --git a/sc/qa/extras/testdocuments/BGR-RGBTest.xls
b/sc/qa/extras/testdocuments/BGR-RGBTest.xls
new file mode 100755
index ..e2bf43fb0e92
Binary files /dev/null and b/sc/qa/extras/testdocuments/BGR-RGBTest.xls differ
diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx
index 04e4efece2cf..2464996d2812 100644
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -466,6 +466,8 @@ void VBAMacroTest::testVba()
{ OUString("vba_findFunction."),
OUString(
"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
},
+{ OUString("BGR-RGBTest."),
+
OUString("vnd.sun.Star.script:VBAProject.Module1.test?language=Basic&location=document")
}
};
OUString sTempDir;
OUString sTempDirURL;
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index 99afd919bea7..db49f013499c 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -37,7 +37,7 @@ ScVbaFont::ScVbaFont(
const ScVbaPalette& dPalette,
const uno::Reference< beans::XPropertySet >& xPropertySet,
ScCellRangeObj* pRangeObj, bool bFormControl ) :
-ScVbaFont_BASE( xParent, xContext, dPalette.getPalette(), xPropertySet,
bFormControl ),
+ScVbaFont_BASE( xParent, xContext, dPalette.getPalette(), xPropertySet,
Component::EXCEL, bFormControl ),
mpRangeObj( pRangeObj )
{
}
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index de37a6c74e18..91a31ec66470 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -111,7 +111,8 @@ public:
}
-SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const
uno::Reference< uno::XComponentContext >& xContext, const uno::Reference<
container::XIndexAccess >& xPalette, uno::Reference< css::beans::XPropertySet >
const & xPropertySet ) : SwVbaFont_BASE( xParent, xContext, xPalette,
xPropertySet )
+SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const
uno::Reference< uno::XComponentContext >& xContext, const uno::Reference<
container::XIndexAccess >& xPalette, uno::Reference< css::beans::XPropertySet >
const & xPropertySet )
+: SwVbaFont_BASE( xParent, xContext, xPalette, xPropertySet,
Component::WORD )
{
}
@@ -141,14 +142,6 @@ SwVbaFont::getServiceImplName()
return "SwVbaFont";
}
-void SAL_CALL
-SwVbaFont::setColorIndex( const uno::Any& _colorindex )
-{
-sal_Int32 nIndex = 0;
-_colorindex >>= nIndex;
-return setColor( mxPalette->getByIndex( nIndex ) );
-}
-
uno::Any SAL_CALL
SwVbaFont::getCo
[Libreoffice-commits] core.git: cui/qa
cui/qa/uitest/dialogs/macroselectordlg.py | 29 ++---
1 file changed, 18 insertions(+), 11 deletions(-)
New commits:
commit 9ba251fb3e7d3b76c8ce730e4b3a3a7859bc119b
Author: Xisco Fauli
AuthorDate: Mon Feb 20 16:00:03 2023 +0100
Commit: Xisco Fauli
CommitDate: Mon Feb 20 16:16:13 2023 +
cui: rework uitest to work with --without-java
Change-Id: I6ed187f515b47b7e54ed85c08ee9523f1b777575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147335
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/cui/qa/uitest/dialogs/macroselectordlg.py
b/cui/qa/uitest/dialogs/macroselectordlg.py
index cb0d1928ba46..96ba11a2d888 100644
--- a/cui/qa/uitest/dialogs/macroselectordlg.py
+++ b/cui/qa/uitest/dialogs/macroselectordlg.py
@@ -9,29 +9,36 @@ from uitest.uihelper.common import get_state_as_dict
class tdf145978(UITestCase):
def test_tdf145978(self):
-with self.ui_test.execute_dialog_through_command(".uno:RunMacro",
close_button="") as xDialog:
+with self.ui_test.execute_dialog_through_command(".uno:RunMacro") as
xDialog:
xCategoriesTree = xDialog.getChild("categories")
xCategoriesTreeEntry = xCategoriesTree.getChild('1') #Application
Macros
xCategoriesTreeEntry.executeAction("EXPAND", tuple())
-xCategoriesTreeEntry = xCategoriesTreeEntry.getChild('8')
#HelloWorld
-xCategoriesTreeEntry.executeAction("SELECT", tuple())
-aCategoriesTreeEntryText =
get_state_as_dict(xCategoriesTreeEntry)["Text"]
+xSubCategoriesTreeEntry = None
+for i in xCategoriesTreeEntry.getChildren():
+xChild = xCategoriesTreeEntry.getChild(i)
+if get_state_as_dict(xChild)["Text"] == "HelloWorld":
+xSubCategoriesTreeEntry = xChild
+break
+
+xSubCategoriesTreeEntry.executeAction("SELECT", tuple())
xCommandsTree = xDialog.getChild("commands")
-xCommandsTreeEntry = xCommandsTree.getChild('2') #HelloWorld Python
-xCommandsTreeEntry.executeAction("SELECT", tuple())
-aCommandsTreeEntryText =
get_state_as_dict(xCommandsTreeEntry)["Text"]
+xCommandsTreeEntry = None
+for i in xCommandsTree.getChildren():
+xChild = xCommandsTree.getChild(i)
+if get_state_as_dict(xChild)["Text"] == "HelloWorldPython":
+xCommandsTreeEntry = xChild
+break
-xOKBtn = xDialog.getChild("ok")
-self.ui_test.close_dialog_through_button(xOKBtn)
+xCommandsTreeEntry.executeAction("SELECT", tuple())
#Verify the dialog reloads with previous run macro selected
with self.ui_test.execute_dialog_through_command(".uno:RunMacro") as
xDialog:
xTree = xDialog.getChild("categories")
-self.assertEqual(get_state_as_dict(xTree)["SelectEntryText"],
aCategoriesTreeEntryText)
+self.assertEqual("HelloWorld",
get_state_as_dict(xTree)["SelectEntryText"])
xTree = xDialog.getChild("commands")
-self.assertEqual(get_state_as_dict(xTree)["SelectEntryText"],
aCommandsTreeEntryText)
+self.assertEqual("HelloWorldPython",
get_state_as_dict(xTree)["SelectEntryText"])
# vim: set shiftwidth=4 softtabstop=4 expandtab:
[Libreoffice-commits] core.git: external/cppunit
external/cppunit/UnpackedTarball_cppunit.mk |1 +
external/cppunit/sprintf.patch.0| 11 +++
2 files changed, 12 insertions(+)
New commits:
commit bd8a213c8ceccf66ab296ef0aea0fa4c451047e5
Author: Stephan Bergmann
AuthorDate: Mon Feb 20 15:04:17 2023 +0100
Commit: Stephan Bergmann
CommitDate: Mon Feb 20 16:09:24 2023 +
external/cppunit: Use snprintf instead of sprintf
...to avoid
> workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:115:8:
error: 'sprintf' is deprecated: This function is provided for compatibility
reasons only. Due to security concerns inherent in the design of sprintf(3),
it is highly recommended that you use snprintf(3) instead.
[-Werror,-Wdeprecated-declarations]
>sprintf(buffer, "%.*g", precision, x);
>^
>
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/include/stdio.h:188:1:
note: 'sprintf' has been explicitly marked deprecated here
> __deprecated_msg("This function is provided for compatibility reasons
only. Due to security concerns inherent in the design of sprintf(3), it is
highly recommended that you use snprintf(3) instead.")
> ^
>
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/include/sys/cdefs.h:215:48:
note: expanded from macro '__deprecated_msg'
> #define __deprecated_msg(_msg)
__attribute__((__deprecated__(_msg)))
> ^
on macOS after the upcoming
"Don't mis-apply GCC < 4.6 workaround for Clang"
Change-Id: I213de1d112cb56fba220006842e611c56ccc7331
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147333
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk
b/external/cppunit/UnpackedTarball_cppunit.mk
index f6575bb8b969..4275c692e85e 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/order.patch.0 \
external/cppunit/windows-arm64.patch.1 \
external/cppunit/propagate-exceptions.patch.0 \
+ external/cppunit/sprintf.patch.0 \
))
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
diff --git a/external/cppunit/sprintf.patch.0 b/external/cppunit/sprintf.patch.0
new file mode 100644
index ..daa4881f3384
--- /dev/null
+++ b/external/cppunit/sprintf.patch.0
@@ -0,0 +1,11 @@
+--- include/cppunit/TestAssert.h
include/cppunit/TestAssert.h
+@@ -112,7 +122,7 @@
+ #if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version
with visual studio 2005 to avoid warning.
+sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x);
+ #else
+- sprintf(buffer, "%.*g", precision, x);
++ snprintf(buffer, sizeof(buffer), "%.*g", precision, x);
+ #endif
+return buffer;
+ }
[Libreoffice-commits] core.git: 2 commits - sd/source vcl/inc vcl/unx
sd/source/ui/unoidl/unocpres.cxx | 13 -
sd/source/ui/unoidl/unocpres.hxx |6 +++---
vcl/inc/unx/gtk/gtkdata.hxx |2 +-
vcl/unx/gtk3/gtkdata.cxx |6 +++---
4 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit 00867a1833899d70581d4e35b0feb4b8fc66e5b7
Author: Noel Grandin
AuthorDate: Mon Feb 20 13:11:36 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 20 13:50:57 2023 +
osl::Mutex->std::mutex in SdXCustomPresentation
Change-Id: I114c2b4be39eb9a40871b7f4eb073a548191a876
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147322
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 13a634f289b4..fa329df6f74b 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -43,14 +43,12 @@ uno::Reference< uno::XInterface > createUnoCustomShow(
SdCustomShow* pShow )
SdXCustomPresentation::SdXCustomPresentation() noexcept
: mpSdCustomShow(nullptr), mpModel(nullptr),
-aDisposeListeners( aDisposeContainerMutex ),
bDisposing( false )
{
}
SdXCustomPresentation::SdXCustomPresentation( SdCustomShow* pShow) noexcept
: mpSdCustomShow(pShow), mpModel(nullptr),
-aDisposeListeners( aDisposeContainerMutex ),
bDisposing( false )
{
}
@@ -233,9 +231,10 @@ void SAL_CALL SdXCustomPresentation::dispose()
uno::Reference< uno::XInterface > xSource(
static_cast(this) );
+std::unique_lock aGuard2(aDisposeContainerMutex);
lang::EventObject aEvt;
aEvt.Source = xSource;
-aDisposeListeners.disposeAndClear(aEvt);
+aDisposeListeners.disposeAndClear(aGuard2, aEvt);
mpSdCustomShow = nullptr;
}
@@ -245,13 +244,17 @@ void SAL_CALL SdXCustomPresentation::addEventListener(
const uno::Reference< lan
if( bDisposing )
throw lang::DisposedException();
-aDisposeListeners.addInterface(xListener);
+std::unique_lock aGuard(aDisposeContainerMutex);
+aDisposeListeners.addInterface(aGuard, xListener);
}
void SAL_CALL SdXCustomPresentation::removeEventListener( const
uno::Reference< lang::XEventListener >& aListener )
{
if( !bDisposing )
-aDisposeListeners.removeInterface(aListener);
+{
+std::unique_lock aGuard(aDisposeContainerMutex);
+aDisposeListeners.removeInterface(aGuard, aListener);
+}
}
/*===*
diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx
index fba0f5fa5002..e74dbe0e4436 100644
--- a/sd/source/ui/unoidl/unocpres.hxx
+++ b/sd/source/ui/unoidl/unocpres.hxx
@@ -22,7 +22,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -46,8 +46,8 @@ private:
SdXImpressDocument* mpModel;
// for xComponent
-::osl::Mutex aDisposeContainerMutex;
-::comphelper::OInterfaceContainerHelper3
aDisposeListeners;
+std::mutex aDisposeContainerMutex;
+::comphelper::OInterfaceContainerHelper4
aDisposeListeners;
bool bDisposing;
public:
commit 227ea92266c03adb5faba869c64fa316ebff89f6
Author: Noel Grandin
AuthorDate: Mon Feb 20 13:26:59 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 20 13:50:46 2023 +
tdf#153756 Unable to open form wizard (GTK3)
Revert "osl::Mutex->std::mutex in GtkSalData"
This reverts commit acf37c3a0b54a46de29bafd27ec9b0618bd2d84a.
Change-Id: Ifb03dfcab966cdc69fea8c6fc2ba15eedb57d8f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147323
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 39cb7907ae7f..3a1a9094d3ec 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -278,7 +278,7 @@ public:
class GtkSalData final : public GenericUnixSalData
{
GSource*m_pUserEvent;
-std::mutex m_aDispatchMutex;
+osl::Mutex m_aDispatchMutex;
osl::Condition m_aDispatchCondition;
std::exception_ptr m_aException;
diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx
index 1fb5c1edfe1f..cc8535ff2ad2 100644
--- a/vcl/unx/gtk3/gtkdata.cxx
+++ b/vcl/unx/gtk3/gtkdata.cxx
@@ -358,7 +358,7 @@ GtkSalData::~GtkSalData()
// up anyway before the condition they're waiting on gets destroyed.
m_aDispatchCondition.set();
-std::unique_lock g( m_aDispatchMutex );
+osl::MutexGuard g( m_aDispatchMutex );
if (m_pUserEvent)
{
g_source_destroy (m_pUserEvent);
@@ -389,7 +389,7 @@ bool GtkSalData::Yield( bool bWait, bool
bHandleAllCurrentEvents )
{
// release YieldMutex (and re-acquire at block end)
SolarMutexReleaser aReleaser;
-if( m_aDispatchMutex.try_lock() )
+if( m_aDispatchMutex.tryToAcquire() )
bDispatchThread = true;
else if( ! bWait )
{
@@ -423,7 +423,
[Libreoffice-commits] core.git: extensions/source
extensions/source/update/check/updatecheck.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 97ceff5bb949063f118835d67334aedf6d57420c
Author: Caolán McNamara
AuthorDate: Mon Feb 20 11:03:41 2023 +
Commit: Caolán McNamara
CommitDate: Mon Feb 20 12:51:34 2023 +
cid#1521188 Uninitialized scalar variable
Change-Id: I926bfa8167bbc94643587400825364f46db43063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147319
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/extensions/source/update/check/updatecheck.cxx
b/extensions/source/update/check/updatecheck.cxx
index dd4aa29ce312..46a4d8dbeb61 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -650,8 +650,7 @@ DownloadThread::run()
if( ! m_aDownload.start(m_aURL, aLocalFile, aDownloadDest ) )
{
// retry every 15s unless the dialog is not visible
-TimeValue tv;
-tv.Seconds = 15;
+TimeValue tv(15, 0);
if( ! UpdateCheck::get()->isDialogShowing() )
{
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/accmap.hxx| 13 ++---
sw/source/core/access/accmap.cxx | 17 +
2 files changed, 11 insertions(+), 19 deletions(-)
New commits:
commit c1131cdab3eb21a14822409c05697a91b4beda3e
Author: Noel Grandin
AuthorDate: Mon Feb 20 11:46:41 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 20 12:28:40 2023 +
tdf#153754 "Insert" - "Chart" in Writer hangs
Revert "osl::Mutex->std::mutex in SwAccessibleMap"
This reverts commit 2442fc19400e0e82b0375d3772a2e0b34a511600.
We have a recursive call stack that does not look easy to fix
#7 0x7fffc2214c18 in
std::unique_lock::unique_lock(std::mutex&) (this=0x7fff1c28,
__m=...)
at
/usr/lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/unique_lock.h:69
#8 0x7fffc22b6c06 in
SwAccessibleMap::AppendEvent(SwAccessibleEvent_Impl const&)
(this=0x5b7e3aa0, rEvent=...) at sw/source/core/access/accmap.cxx:980
#9 0x7fffc22b7f8c in
SwAccessibleMap::InvalidateCursorPosition(com::sun::star::uno::Reference
const&)
(this=0x5b7e3aa0, rAcc=uno::Reference to (SwAccessibleParagraph *)
0x5b7cff00) at sw/source/core/access/accmap.cxx:1117
#10 0x7fffc22bd595 in SwAccessibleMap::GetContext(SwFrame const*,
bool) (this=0x5b7e3aa0, pFrame=0x5b6e68a0, bCreate=true)
at sw/source/core/access/accmap.cxx:1924
#11 0x7fffc22bd83f in SwAccessibleMap::GetContextImpl(SwFrame const*,
bool) (this=0x5b7e3aa0, pFrame=0x5b6e68a0, bCreate=true)
at sw/source/core/access/accmap.cxx:1935
#12 0x7fffc228c8e8 in
SwAccessibleContext::InvalidateChildPosOrSize(sw::access::SwAccessibleChild
const&, SwRect const&)
(this=0x5b7e0630, rChildFrameOrObj=..., rOldFrame=SwRect = {...})
at sw/source/core/access/acccontext.cxx:1227
#13 0x7fffc22b5540 in
SwAccessibleMap::FireEvent(SwAccessibleEvent_Impl const&) (this=0x5b7e3aa0,
rEvent=...) at sw/source/core/access/accmap.cxx:936
#14 0x7fffc22b8216 in SwAccessibleMap::FireEvents()
(this=0x5b7e3aa0) at sw/source/core/access/accmap.cxx:3019
Change-Id: If058cecf7bc7503d0767526c07c0ca2840b3638a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147314
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index df5f697841e2..0090d7837876 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -20,17 +20,17 @@
#define INCLUDED_SW_INC_ACCMAP_HXX
#include
-#include
-#include
-#include
#include
+#include
#include
#include
+
#include
+#include
-#include
-#include
#include
+#include
+#include
class SwAccessibleParagraph;
class SwViewShell;
@@ -90,7 +90,7 @@ class SwAccessibleMap final : public
::accessibility::IAccessibleViewForwarder,
, public std::enable_shared_from_this
{
mutable ::osl::Mutex maMutex;
-std::mutex maEventMutex;
+::osl::Mutex maEventMutex;
std::unique_ptr mpFrameMap;
std::unique_ptr mpShapeMap;
SwShapeList_Impl mvShapes;
@@ -115,7 +115,6 @@ class SwAccessibleMap final : public
::accessibility::IAccessibleViewForwarder,
void FireEvent( const SwAccessibleEvent_Impl& rEvent );
-void AppendEvent( std::unique_lock& rGuard, const
SwAccessibleEvent_Impl& rEvent );
void AppendEvent( const SwAccessibleEvent_Impl& rEvent );
void InvalidateCursorPosition( const
css::uno::Reference& rAcc );
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index a22a0219bd81..46c0dbaf0714 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -977,14 +977,7 @@ void SwAccessibleMap::FireEvent( const
SwAccessibleEvent_Impl& rEvent )
void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
{
-std::unique_lock aGuard(maEventMutex);
-AppendEvent(aGuard, rEvent);
-}
-
-void SwAccessibleMap::AppendEvent( std::unique_lock& rGuard, const
SwAccessibleEvent_Impl& rEvent )
-{
-assert(rGuard.mutex() == &maEventMutex);
-(void)rGuard;
+osl::MutexGuard aGuard( maEventMutex );
if( !mpEvents )
mpEvents.reset(new SwAccessibleEventList_Impl);
@@ -1709,7 +1702,7 @@ SwAccessibleMap::~SwAccessibleMap()
mpPreview.reset();
{
-std::unique_lock aGuard( maEventMutex );
+osl::MutexGuard aGuard( maEventMutex );
assert(!mpEvents);
assert(!mpEventMap);
mpEventMap.reset();
@@ -2254,7 +2247,7 @@ void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
// remove events stored for the frame
{
-std::unique_lock aGuard( maEventMutex );
+osl::MutexGuard aGuard( maEventMutex );
if( mpEvents )
{
SwAccessibleEventMap_Impl::iterator aIter =
@@ -2263,7 +2256,7 @@ void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
{
SwAccessibleEvent_Im
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source
sc/source/ui/inc/tabview.hxx |2 ++
sc/source/ui/view/tabview2.cxx |9 +
2 files changed, 11 insertions(+)
New commits:
commit cf10e88a7b0d6fb0f2e2ebe3d7079a405f86b379
Author: Szymon Kłos
AuthorDate: Fri Feb 17 10:47:53 2023 +0100
Commit: Szymon Kłos
CommitDate: Mon Feb 20 12:20:55 2023 +
lok: setup LOK notifier for invalid range error
Change-Id: I63fc6fcdec873a9d0c8d54dd6a6f3783f2c15251
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147200
Reviewed-by: Henry Castro
Tested-by: Jenkins CollaboraOffice
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 0bdc143d3e62..3bacff297714 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -252,6 +252,8 @@ private:
voidPaintRangeFinderEntry (const ScRangeFindData* pData, SCTAB
nTab);
+DECL_STATIC_LINK(ScTabView, InstallLOKNotifierHdl, void*,
vcl::ILibreOfficeKitNotifier*);
+
protected:
voidUpdateHeaderWidth( const ScVSplitPos* pWhich = nullptr,
const SCROW* pPosY = nullptr );
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 1c2cbd1389e6..226023b2914e 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -1443,6 +1443,11 @@ void ScTabView::MakeDrawLayer()
}
}
+IMPL_STATIC_LINK_NOARG(ScTabView, InstallLOKNotifierHdl, void*,
vcl::ILibreOfficeKitNotifier*)
+{
+return GetpApp();
+}
+
void ScTabView::ErrorMessage(TranslateId pGlobStrId)
{
if ( SC_MOD()->IsInExecuteDrop() )
@@ -1468,6 +1473,10 @@ void ScTabView::ErrorMessage(TranslateId pGlobStrId)
m_xMessageBox.reset(Application::CreateMessageDialog(pParent,
VclMessageType::Info,
VclButtonsType::Ok,
ScResId(pGlobStrId)));
+
+if (comphelper::LibreOfficeKit::isActive())
+m_xMessageBox->SetInstallLOKNotifierHdl(LINK(this, ScTabView,
InstallLOKNotifierHdl));
+
weld::Window* pGrabOnClose = bFocus ? pParent : nullptr;
m_xMessageBox->runAsync(m_xMessageBox, [this, pGrabOnClose](sal_Int32
/*nResult*/) {
m_xMessageBox.reset();
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 690733f6a78e9f5b2e3fbb6761257cf24014 Author: Olivier Hallot AuthorDate: Mon Feb 20 09:15:03 2023 -0300 Commit: Gerrit Code Review CommitDate: Mon Feb 20 12:15:03 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 2b4ec3df2220ce3cb5e112a202c034a32ba16bab - Add entry for Calc Moving cells in Contents tree Change-Id: Iacd170fd94a19fd90879cecf8c88db5ce25ffade Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147294 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b72f41bed5b9..2b4ec3df2220 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b72f41bed5b9bdffebaa85e23503a39027eba97d +Subproject commit 2b4ec3df2220ce3cb5e112a202c034a32ba16bab
[Libreoffice-commits] help.git: source/auxiliary
source/auxiliary/scalc.tree |1 + 1 file changed, 1 insertion(+) New commits: commit 2b4ec3df2220ce3cb5e112a202c034a32ba16bab Author: Olivier Hallot AuthorDate: Sun Feb 19 08:36:34 2023 -0300 Commit: Olivier Hallot CommitDate: Mon Feb 20 12:15:03 2023 + Add entry for Calc Moving cells in Contents tree Change-Id: Iacd170fd94a19fd90879cecf8c88db5ce25ffade Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147294 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree index 04b1a7ba15..310c08 100644 --- a/source/auxiliary/scalc.tree +++ b/source/auxiliary/scalc.tree @@ -173,6 +173,7 @@ Copying to Multiple Sheets Only Copy Visible Cells Selecting Multiple Cells + Moving Cells Calculating With Formulas
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a44380768059e4efe7b29f5b57b54a20540faa0c Author: Michael Stahl AuthorDate: Fri Feb 17 13:19:39 2023 +0100 Commit: Michael Stahl CommitDate: Mon Feb 20 12:08:10 2023 + tdf#137883 officecfg: ModuleDependendFilterOrder move Word 2010 ... ... filter above Word 2007 one, and also move RTF above binary DOC WW8 formats while at it. Change-Id: Ia7a303ace7a9d5782348c90b0ccd95a47ffd7ac7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147211 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu index fdb62f1ab95e..5dcce7b1e688 100644 --- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu +++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu @@ -46,7 +46,7 @@ -writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;OpenDocument Text Flat XML;UOF text;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;Rich Text Format;T602Document;Text;Text (encoded);WordPerfect;Office Open XML Text;Office Open XML Text Template +writer8;writer8_template;StarOffice XML (Writer);writer_StarOffice_XML_Writer_Template;OpenDocument Text Flat XML;UOF text;Office Open XML Text;Office Open XML Text Template;MS Word 2007 XML;MS Word 2007 XML Template;MS Word 2003 XML;Rich Text Format;MS Word 97;MS Word 97 Vorlage;MS Word 95;MS Word 95 Vorlage;MS WinWord 6.0;MS WinWord 5;MS_Works;AportisDoc Palm DB;DocBook File;writer_MIZI_Hwp_97;HTML (StarWriter);LotusWordPro;PocketWord File;T602Document;Text;Text (encoded);WordPerfect
[Libreoffice-commits] core.git: 2 commits - filter/source sw/qa sw/source
filter/source/config/fragments/filters/MS_Word_2007_XML.xcu | 3 ++- filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu | 3 ++- filter/source/config/fragments/filters/MS_Word_2007_XML_VBA.xcu | 3 ++- filter/source/config/fragments/filters/OOXML_Text.xcu | 4 ++-- filter/source/config/fragments/filters/OOXML_Text_Template.xcu| 4 ++-- filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu | 2 +- filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu | 2 +- filter/source/config/fragments/types/writer_MS_Word_2007_XML_VBA.xcu | 2 +- filter/source/config/fragments/types/writer_OOXML.xcu | 2 +- filter/source/config/fragments/types/writer_OOXML_Template.xcu| 2 +- sw/qa/uitest/writer_tests3/save_readonly_with_password.py | 2 +- sw/qa/uitest/writer_tests7/tdf131936.py | 2 +- sw/source/filter/ww8/docxexport.cxx | 6 -- 13 files changed, 21 insertions(+), 16 deletions(-) New commits: commit ed0476b0625c4361df5ff040a6661a9634588cea Author: Michael Stahl AuthorDate: Fri Feb 17 12:25:30 2023 +0100 Commit: Michael Stahl CommitDate: Mon Feb 20 12:07:54 2023 + tdf#137883 filter: rename DOCX filters to be less confusing Rename misleading "Word 2007–365" filter which corresponds to the sightly incompatible first pre-ISO version of OOXML (ECMA-376 1st edition) and is actually very specifically for Word 2007. Stop confusing users with standardese like "Office Open XML Text Document (Transitional)" and instead use the name of the application that the format is intended for, "Word 2010-365". Hopefully users will now pick the latter filter over the former. Also, the OOXML_Text_Template.xcu was missing EXPORT flag so didn't show up in Save dialog. Also, the OOXML_Text.xcu was missing SUPPORTSSIGNING flag which vmiklos said was by accident. Change-Id: I3aa88ac0fee51c906f11e75558a5d6de4f36a402 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147210 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu index c4e6f828cc77..91c7e02d226f 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu @@ -21,8 +21,9 @@ com.sun.star.comp.Writer.WriterFilter OXML -Word 2007–365 +Word 2007 + 0 writer_MS_Word_2007 diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu index cd81c9943032..ab1823a70316 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu @@ -20,7 +20,8 @@ com.sun.star.comp.Writer.WriterFilter OXML -Word 2007–365 Template +Word 2007 Template + 0 writer_MS_Word_2007_Template diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_VBA.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_VBA.xcu index 0f1bdb7239e4..87b561b025f7 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_VBA.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_VBA.xcu @@ -10,7 +10,8 @@ com.sun.star.comp.Writer.WriterFilter OXML -Word 2007–365 VBA +Word 2007 VBA + 0 writer_MS_Word_2007_VBA diff --git a/filter/source/config/fragments/filters/OOXML_Text.xcu b/filter/source/config/fragments/filters/OOXML_Text.xcu index ebaab6406fd6..be5089123828 100644 --- a/filter/source/config/fragments/filters/OOXML_Text.xcu +++ b/filter/source/config/fragments/filters/OOXML_Text.xcu @@ -16,12 +16,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT ALIEN 3RDPARTYFILTER ENCRYPTION PASSWORDTOMODIFY +IMPORT EXPORT ALIEN 3RDPARTYFILTER ENCRYPTION PASSWORDTOMODIFY SUPPORTSSIGNING com.sun.star.comp.Writer.WriterFilter -Office Open XML Text (Transitional) +Word 2010-365 Document 1 diff --git a/filter/source/config/fragments/filters/OOXML_Text_Template.xcu b/filter/source/config/fragments/filters/OOXML_Text_Template.xcu index 88fbf7047140..abd511768ea6 100644 --- a/filter/source/config/fragments/filters/OOXML_Text_Template.xcu +++ b/filter/source/config/fragments/filters/OOXML_Text_Template.xcu @@ -16,
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/qa sw/source
sw/qa/uitest/data/tdf132714.odt |binary
sw/qa/uitest/writer_tests7/tdf132714.py | 23 +++
sw/source/core/unocore/unochart.cxx |6 ++
3 files changed, 29 insertions(+)
New commits:
commit 8c62a74561649ee06a4949931ae85559fa6ded5d
Author: László Németh
AuthorDate: Fri Feb 17 16:23:12 2023 +0100
Commit: Michael Stahl
CommitDate: Mon Feb 20 11:50:01 2023 +
tdf#132714 sw: fix crash at table row deletion associated to a chart
Using the table toolbar, deletion of the row of a text table
resulted crashing in ActualizeSelection(), if the text table
is associated to a chart, and the deleted row was the first
data row of the chart. Fix this by emptying the outdated table
selection cache m_SelectedBoxes in GetCellRangeName().
Note: since commit eea37aa26932d06ed8e93d001862bf45175c4446
"tdf#122995 Trigger Chart refresh directly in UpdateCharts for SW",
the crash occurred immediately, i.e. without double clicking on
the chart after the row deletion.
Note: uitest needed to get the crash, not uiwriter.
Change-Id: I78d126f245839ec1d8a8cc01257fe96d94ac0a21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147224
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 5b9855acc7fa6d1e4a5f53ff0bc47e1dd4729827)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147250
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/uitest/data/tdf132714.odt b/sw/qa/uitest/data/tdf132714.odt
new file mode 100644
index ..e1a4a2c5ad51
Binary files /dev/null and b/sw/qa/uitest/data/tdf132714.odt differ
diff --git a/sw/qa/uitest/writer_tests7/tdf132714.py
b/sw/qa/uitest/writer_tests7/tdf132714.py
new file mode 100644
index ..971db5f97ad3
--- /dev/null
+++ b/sw/qa/uitest/writer_tests7/tdf132714.py
@@ -0,0 +1,23 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_url_for_data_file
+
+class tdf132714(UITestCase):
+def test_tdf132714(self):
+with self.ui_test.load_file(get_url_for_data_file("tdf132714.odt")) as
document:
+
+# delete second row (first data row) in the associated text table
of the chart
+self.xUITest.executeCommand(".uno:GoDown")
+self.xUITest.executeCommand(".uno:GoDown")
+self.xUITest.executeCommand(".uno:GoDown")
+# Without the fix in place, at this point crash occurs.
+self.xUITest.executeCommand(".uno:DeleteRows")
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/core/unocore/unochart.cxx
b/sw/source/core/unocore/unochart.cxx
index 03886d20bc5d..87dbbcce50a7 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -205,6 +205,12 @@ static OUString GetCellRangeName( const SwFrameFormat
&rTableFormat, SwUnoCursor
SwUnoTableCursor* pUnoTableCursor =
dynamic_cast(&rTableCursor);
if (!pUnoTableCursor)
return OUString();
+
+// tdf#132714 empty outdated selection cache to avoid crashing in
ActualizeSelection()
+size_t nCount = pUnoTableCursor->GetSelectedBoxesCount();
+while (nCount--)
+pUnoTableCursor->DeleteBox(nCount);
+
pUnoTableCursor->MakeBoxSels();
const SwStartNode* pStart;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - external/openssl
external/openssl/UnpackedTarball_openssl.mk |1
external/openssl/openssl-no-_umul128-on-aarch64.patch.1 | 58
2 files changed, 59 insertions(+)
New commits:
commit b22446cc1788c1861ea5a8cc5b227f983ea71f8f
Author: Christian Lohmaier
AuthorDate: Sun Feb 12 19:36:25 2023 +0100
Commit: Michael Stahl
CommitDate: Mon Feb 20 11:35:05 2023 +
fix openssl build on aarch64 - _umul128 is not available on non x64
adding upstream patch that uses __umulh as a fallback
Change-Id: Ib95de30d3f7208c38421df0c63eb1ceafccd9354
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146839
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
(cherry picked from commit 821f4d6f0987450233e4f63e01f89484ec737258)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147228
Reviewed-by: Michael Stahl
diff --git a/external/openssl/UnpackedTarball_openssl.mk
b/external/openssl/UnpackedTarball_openssl.mk
index c52b427a866e..82b4f593bd61 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl
$(eval $(call gb_UnpackedTarball_add_patches,openssl,\
external/openssl/openssl-no-multilib.patch.0 \
external/openssl/configurable-z-option.patch.0 \
+ external/openssl/openssl-no-_umul128-on-aarch64.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/openssl/openssl-no-_umul128-on-aarch64.patch.1
b/external/openssl/openssl-no-_umul128-on-aarch64.patch.1
new file mode 100644
index ..c7ca53bc574c
--- /dev/null
+++ b/external/openssl/openssl-no-_umul128-on-aarch64.patch.1
@@ -0,0 +1,58 @@
+From 98f9a401c3964c7ff0e6ca048685e28a2a6401d4 Mon Sep 17 00:00:00 2001
+From: Hubert Kario
+Date: Wed, 8 Feb 2023 14:13:24 +0100
+Subject: [PATCH] rsa: add msvc intrinsic for non x64 platforms
+
+_umul128() is x86_64 (x64) only, while __umulh() works everywhere, but
+doesn't generate optimal code on x64
+
+Reviewed-by: Dmitry Belyavskiy
+Reviewed-by: Paul Dale
+Reviewed-by: Tomas Mraz
+(Merged from https://github.com/openssl/openssl/pull/20244)
+
+(cherry picked from commit 075652f224479dad2e64b92e791b296177af8705)
+---
+ crypto/bn/rsa_sup_mul.c | 24 +++-
+ 1 file changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/bn/rsa_sup_mul.c b/crypto/bn/rsa_sup_mul.c
+index 0e0d02e1946e..3b57161b4589 100644
+--- a/crypto/bn/rsa_sup_mul.c
b/crypto/bn/rsa_sup_mul.c
+@@ -110,12 +110,34 @@ static ossl_inline void _mul_limb(limb_t *hi, limb_t
*lo, limb_t a, limb_t b)
+ *lo = (limb_t)t;
+ }
+ #elif (BN_BYTES == 8) && (defined _MSC_VER)
+-/* https://learn.microsoft.com/en-us/cpp/intrinsics/umul128?view=msvc-170 */
++# if defined(_M_X64)
++/*
++ * on x86_64 (x64) we can use the _umul128 intrinsic to get one `mul`
++ * instruction to get both high and low 64 bits of the multiplication.
++ * https://learn.microsoft.com/en-us/cpp/intrinsics/umul128?view=msvc-140
++ */
++#include
+ #pragma intrinsic(_umul128)
+ static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b)
+ {
+ *lo = _umul128(a, b, hi);
+ }
++# elif defined(_M_ARM64) || defined (_M_IA64)
++/*
++ * We can't use the __umulh() on x86_64 as then msvc generates two `mul`
++ * instructions; so use this more portable intrinsic on platforms that
++ * don't support _umul128 (like aarch64 (ARM64) or ia64)
++ * https://learn.microsoft.com/en-us/cpp/intrinsics/umulh?view=msvc-140
++ */
++#include
++static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b)
++{
++*lo = a * b;
++*hi = __umulh(a, b);
++}
++# else
++# error Only x64, ARM64 and IA64 supported.
++# endif /* defined(_M_X64) */
+ #else
+ /*
+ * if the compiler doesn't have either a 128bit data type nor a "return
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - starmath/source
starmath/source/cursor.cxx |4 ++--
starmath/source/dialog.cxx |7 +--
starmath/source/document.cxx |8 +++-
3 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit c0181b2f26b784d8317f51a77a9dfade16913ad1
Author: Xisco Fauli
AuthorDate: Fri Feb 17 15:50:29 2023 +0100
Commit: Michael Stahl
CommitDate: Mon Feb 20 11:25:56 2023 +
check SmGetActiveView()
it might be null
See
https://crashreport.libreoffice.org/stats/signature/SmPrintOptionsTabPage::~SmPrintOptionsTabPage()
Change-Id: I7bc17da230784e6e3fc9c0b33848423ac113ab29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147221
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit a7fd1e067eb2af0ef329719c4c7dbb32cc5926b2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147246
(cherry picked from commit b905b793be520b9fdece8d12614566be82ce3c92)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147312
Reviewed-by: Michael Stahl
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 52621d360c80..d5479ab42765 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1315,8 +1315,8 @@ void SmCursor::EndEdit(){
}
void SmCursor::RequestRepaint(){
-SmViewShell *pViewSh = SmGetActiveView();
-if( pViewSh ) {
+if (SmViewShell *pViewSh = SmGetActiveView())
+{
if ( SfxObjectCreateMode::EMBEDDED == mpDocShell->GetCreateMode() )
mpDocShell->Repaint();
else
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 043739cf5c0d..19992b341c36 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -181,7 +181,8 @@
SmPrintOptionsTabPage::SmPrintOptionsTabPage(weld::Container* pPage, weld::Dialo
SmPrintOptionsTabPage::~SmPrintOptionsTabPage()
{
-SmGetActiveView()->GetEditWindow()->UpdateStatus();
+if (SmViewShell *pViewSh = SmGetActiveView())
+pViewSh->GetEditWindow()->UpdateStatus();
}
bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
@@ -204,7 +205,9 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
rSet->Put(SfxBoolItem(SID_AUTO_CLOSE_BRACKETS,
m_xAutoCloseBrackets->get_active()));
rSet->Put(SfxUInt16Item(SID_SMEDITWINDOWZOOM,
sal::static_int_cast(m_xSmZoom->get_value(FieldUnit::PERCENT;
-SmGetActiveView()->GetEditWindow()->UpdateStatus();
+if (SmViewShell *pViewSh = SmGetActiveView())
+pViewSh->GetEditWindow()->UpdateStatus();
+
return true;
}
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 23034ede3e3c..59353879d4e4 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -159,7 +159,7 @@ void SmDocShell::SetText(const OUString& rBuffer)
Parse();
SmViewShell *pViewSh = SmGetActiveView();
-if( pViewSh )
+if (pViewSh)
{
pViewSh->GetViewFrame()->GetBindings().Invalidate(SID_TEXT);
if ( SfxObjectCreateMode::EMBEDDED == GetCreateMode() )
@@ -256,8 +256,7 @@ void SmDocShell::ArrangeFormula()
// if necessary get another OutputDevice for which we format
if (!pOutDev)
{
-SmViewShell *pView = SmGetActiveView();
-if (pView)
+if (SmViewShell *pView = SmGetActiveView())
pOutDev =
&pView->GetGraphicWidget().GetDrawingArea()->get_ref_device();
else
{
@@ -542,8 +541,7 @@ void SmDocShell::Repaint()
Size aVisSize = GetSize();
SetVisAreaSize(aVisSize);
-SmViewShell* pViewSh = SmGetActiveView();
-if (pViewSh)
+if (SmViewShell* pViewSh = SmGetActiveView())
pViewSh->GetGraphicWidget().Invalidate();
if (bIsEnabled)
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - basic/source include/vcl sfx2/source vcl/inc vcl/jsdialog vcl/source vcl/unx
basic/source/runtime/methods.cxx |2 +-
include/vcl/svapp.hxx| 11 ---
include/vcl/weld.hxx |2 ++
sfx2/source/appl/app.cxx |3 ++-
vcl/inc/jsdialog/jsdialogbuilder.hxx |9 -
vcl/inc/salvtables.hxx |2 ++
vcl/jsdialog/jsdialogbuilder.cxx | 20 ++--
vcl/source/app/salvtables.cxx|5 +
vcl/source/app/svapp.cxx |1 +
vcl/source/window/builder.cxx|5 +++--
vcl/source/window/dialog.cxx |3 ++-
vcl/unx/gtk3/gtkinst.cxx |6 ++
12 files changed, 58 insertions(+), 11 deletions(-)
New commits:
commit 92d80c58f1a8b1e24376ece06958f0b7f37f9513
Author: Marco Cecchetti
AuthorDate: Wed Feb 15 23:52:53 2023 +0100
Commit: Marco Cecchetti
CommitDate: Mon Feb 20 11:07:32 2023 +
lok: macro: VBA message dialogs was causing assertion failure
Get VBA MsgBox and VBA Runtime Script Error dialogs to be displayed
correctly without causing an assertion failure.
Provided a solution that allows VBA MsgBox to be executed in a
not-async way so that the VBA script is paused until the message box
is closed.
Change-Id: Ica7d0d343a0ea4b6a163c1c43572f18a5779a0ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147227
Tested-by: Marco Cecchetti
Reviewed-by: Marco Cecchetti
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 9cc839a1e154..e5a3bf3b2e21 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4403,7 +4403,7 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool)
}
std::unique_ptr
xBox(Application::CreateMessageDialog(pParent,
-eType, VclButtonsType::NONE, aMsg));
+eType, VclButtonsType::NONE, aMsg, GetpApp()));
switch (nStyle)
{
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index c51bd9356531..eacf9e779b5e 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -58,8 +58,12 @@ class DataChangedEvent;
class Accelerator;
class Help;
class OutputDevice;
-namespace vcl { class Window; }
-namespace vcl { class KeyCode; }
+namespace vcl {
+class KeyCode;
+class ILibreOfficeKitNotifier;
+class Window;
+}
+
class NotifyEvent;
class KeyEvent;
class MouseEvent;
@@ -1348,7 +1352,8 @@ public:
static std::unique_ptr CreateInterimBuilder(vcl::Window*
pParent, const OUString &rUIFile, bool bAllowCycleFocusOut, sal_uInt64
nLOKWindowId = 0);
static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent,
VclMessageType eMessageType,
-VclButtonsType
eButtonType, const OUString& rPrimaryMessage);
+VclButtonsType
eButtonType, const OUString& rPrimaryMessage,
+const
ILibreOfficeKitNotifier* pNotifier = nullptr);
static weld::Window* GetFrameWeld(const
css::uno::Reference& rWindow);
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index c9273bf4743b..e352c2e357f7 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -565,6 +565,8 @@ public:
// render the widget to an output device
virtual VclPtr screenshot() = 0;
+
+virtual const vcl::ILibreOfficeKitNotifier* GetLOKNotifier() = 0;
};
class VCL_DLLPUBLIC WaitObject
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index f225315d6ecd..41a637a5d913 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -413,7 +413,8 @@ IMPL_STATIC_LINK( SfxApplication, GlobalBasicErrorHdl_Impl,
StarBASIC*, pStarBas
pViewFrame ? pViewFrame->GetFrameWeld() : nullptr,
VclMessageType::Error,
VclButtonsType::Ok,
- aError));
+ aError,
+ GetpApp()));
xBox->runAsync(xBox, [](sal_Int32 /*nResult*/) {});
}
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 5192e37a1a2f..c99b3c19f4f0 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -41,6 +41,11 @@ class VclMultiLineEdit;
class SvTabListBox;
class IconView;
+namespace vcl
+{
+class ILibreOfficeKitNotifier;
+}
+
typedef std::map WidgetMap;
namespace jsdialog
@@ -301,7 +306,8 @@ public:
static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent,
VclMessageType
eMessageType,
VclButtonsType eButtonType,
-const OUString&
rPrimaryMessage);
+const OUString&
rPrimaryMessage,
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - include/sfx2 include/vcl sc/source sd/source sfx2/source svx/source sw/source vcl/Library_vcl.mk vcl/source
include/sfx2/LokControlHandler.hxx | 71 ---
include/sfx2/viewsh.hxx |4
include/vcl/DocWindow.hxx| 29 ++
include/vcl/IDialogRenderable.hxx|6 +
include/vcl/ctrl.hxx |3
include/vcl/svapp.hxx|2
include/vcl/window.hxx |2
sc/source/ui/inc/gridwin.hxx |3
sc/source/ui/view/gridwin.cxx|2
sd/source/ui/inc/Window.hxx |4
sd/source/ui/unoidl/unomodel.cxx | 28 +
sd/source/ui/view/sdwindow.cxx |2
sfx2/source/view/viewsh.cxx |5 +
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx |8 +
svx/source/svdraw/svdpntv.cxx|3
sw/source/uibase/docvw/edtwin.cxx|2
sw/source/uibase/inc/edtwin.hxx |4
sw/source/uibase/uno/unotxdoc.cxx| 21
vcl/Library_vcl.mk |1
vcl/source/app/svapp.cxx |3
vcl/source/control/ctrl.cxx | 31 ++
vcl/source/window/DocWindow.cxx | 40
vcl/source/window/mouse.cxx | 24 -
23 files changed, 246 insertions(+), 52 deletions(-)
New commits:
commit 2ec7bfe51d75da4d06586c47ddae383bfb972a93
Author: Marco Cecchetti
AuthorDate: Sun Feb 5 17:47:34 2023 +0100
Commit: Marco Cecchetti
CommitDate: Mon Feb 20 11:06:50 2023 +
lok: form controls: rendering and mouse event forwarding
What we got
- Most controls rendered on Writer and Impress (on Calc already
implemented by Tomaž Vajngerl)
- Text labels rendered correctly
- Mouse events forwarded to controls
- Control state changed on click for Writer and Calc
- Control invalidation for all apps
- Fixed broken LOK_CALLBACK_MOUSE_POINTER msg
- Correct pointer style when mouse is hovering over a control
Need to be improved
- in impress click method for a control is not executed even if the
mouse event is forwarded correctly
- avoid not needed control invalidations (as the one occurring on
document autosaving)
Change-Id: I4d5012af7f90a2c726b6b6b5b068e2be1ed5568a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146569
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147226
Tested-by: Marco Cecchetti
Reviewed-by: Marco Cecchetti
diff --git a/include/sfx2/LokControlHandler.hxx
b/include/sfx2/LokControlHandler.hxx
index c422afc979cc..753585ac65c0 100644
--- a/include/sfx2/LokControlHandler.hxx
+++ b/include/sfx2/LokControlHandler.hxx
@@ -9,12 +9,13 @@
#pragma once
+#include
+#include
#include
-#include
#include
-#include
+#include
#include
-#include
+#include
#include
#include
#include
@@ -22,14 +23,22 @@
#include
#include
#include
+#include
+
+#include
+
+#include
class LokControlHandler
{
public:
static bool postMouseEvent(const SdrPage* pPage, const SdrView* pDrawView,
- vcl::Window const& rMainWindow, int nType,
Point aPointHmm,
+ vcl::DocWindow& rMainWindow, int nType, Point
aPointHmm,
int nCount, int nButtons, int nModifier)
{
+static std::optional eDocPointerStyle;
+
+o3tl::Length eControlUnitLength =
MapToO3tlLength(rMainWindow.GetMapMode().GetMapUnit());
SdrObjListIter aIterator(pPage, SdrIterMode::Flat);
while (aIterator.IsMore())
{
@@ -37,7 +46,10 @@ public:
SdrUnoObj* pUnoObect = dynamic_cast(pObject);
if (pUnoObect)
{
-tools::Rectangle aControlRectHMM = pUnoObect->GetLogicRect();
+tools::Rectangle aControlRect = pUnoObect->GetLogicRect();
+tools::Rectangle aControlRectHMM = o3tl::convert(
+aControlRect, eControlUnitLength, o3tl::Length::mm100);
+
if (aControlRectHMM.Contains(aPointHmm))
{
css::uno::Reference xControl
@@ -55,6 +67,19 @@ public:
VclPtr pWindow =
VCLUnoHelper::GetWindow(xWindowPeer);
if (pWindow)
{
+tools::Rectangle aControlRectPx = o3tl::convert(
+aControlRectHMM, o3tl::Length::mm100,
o3tl::Length::px);
+// used by Control::LogicInvalidate
+pWindow->SetPosPixel(aControlRectPx.To
[Libreoffice-commits] core.git: distro-configs/LibreOfficeCoverity.conf
distro-configs/LibreOfficeCoverity.conf |2 ++ 1 file changed, 2 insertions(+) New commits: commit 97e2e73e87479a742b798f362eda4baafb89497c Author: Caolán McNamara AuthorDate: Mon Feb 20 10:59:04 2023 + Commit: Caolán McNamara CommitDate: Mon Feb 20 11:07:05 2023 + with-system-libs doesn't seem to mean that anymore for harfbuzz since: commit d552b4a549d614a03aa9328e017dec27bd3ff41e Date: Tue Sep 20 16:07:14 2022 +0300 Enable opening of downloaded fonts only in ForKit in Online which silently disabled that from working for harfbuzz and graphite, but just for Linux. Change-Id: I13a67e3ad53a8d4c1833df19dd9f96b0b7366774 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147316 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf index 5b301570b8fc..25e5c5d1af87 100644 --- a/distro-configs/LibreOfficeCoverity.conf +++ b/distro-configs/LibreOfficeCoverity.conf @@ -9,6 +9,8 @@ --enable-gstreamer-1-0 --enable-option-checking=fatal --with-system-libs +--with-system-graphite +--with-system-harfbuzz --with-system-headers --without-system-cppunit --without-system-libfixmath
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - basic/source include/vcl sfx2/source vcl/inc vcl/jsdialog vcl/source vcl/unx
basic/source/runtime/methods.cxx |2 +-
include/vcl/svapp.hxx| 11 ---
include/vcl/weld.hxx |2 ++
sfx2/source/appl/app.cxx |3 ++-
vcl/inc/jsdialog/jsdialogbuilder.hxx |9 -
vcl/inc/salvtables.hxx |2 ++
vcl/jsdialog/jsdialogbuilder.cxx | 20 ++--
vcl/source/app/salvtables.cxx|5 +
vcl/source/app/svapp.cxx |1 +
vcl/source/window/builder.cxx|5 +++--
vcl/source/window/dialog.cxx |3 ++-
vcl/unx/gtk3/gtkinst.cxx |6 ++
12 files changed, 58 insertions(+), 11 deletions(-)
New commits:
commit c3c5a58606081e503e211919a7a089e26f1cd850
Author: Marco Cecchetti
AuthorDate: Wed Feb 15 23:52:53 2023 +0100
Commit: Marco Cecchetti
CommitDate: Mon Feb 20 10:24:04 2023 +
lok: macro: VBA message dialogs was causing assertion failure
Get VBA MsgBox and VBA Runtime Script Error dialogs to be displayed
correctly without causing an assertion failure.
Provided a solution that allows VBA MsgBox to be executed in a
not-async way so that the VBA script is paused until the message box
is closed.
Change-Id: Ica7d0d343a0ea4b6a163c1c43572f18a5779a0ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147243
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 851584b6db79..718385dedb6d 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4456,7 +4456,7 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool)
}
std::unique_ptr
xBox(Application::CreateMessageDialog(pParent,
-eType, VclButtonsType::NONE, aMsg));
+eType, VclButtonsType::NONE, aMsg, GetpApp()));
switch (nStyle)
{
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 2ca0b06fb50f..440a5f4849d3 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -58,8 +58,12 @@ class DataChangedEvent;
class Accelerator;
class Help;
class OutputDevice;
-namespace vcl { class Window; }
-namespace vcl { class KeyCode; }
+namespace vcl {
+class KeyCode;
+class ILibreOfficeKitNotifier;
+class Window;
+}
+
class NotifyEvent;
class KeyEvent;
class MouseEvent;
@@ -1329,7 +1333,8 @@ public:
static std::unique_ptr CreateInterimBuilder(vcl::Window*
pParent, const OUString &rUIFile, bool bAllowCycleFocusOut, sal_uInt64
nLOKWindowId = 0);
static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent,
VclMessageType eMessageType,
-VclButtonsType
eButtonType, const OUString& rPrimaryMessage);
+VclButtonsType
eButtonType, const OUString& rPrimaryMessage,
+const
ILibreOfficeKitNotifier* pNotifier = nullptr);
static weld::Window* GetFrameWeld(const
css::uno::Reference& rWindow);
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index ddcba84d8b71..5fdaa414df4b 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -557,6 +557,8 @@ public:
// render the widget to an output device
virtual VclPtr screenshot() = 0;
+
+virtual const vcl::ILibreOfficeKitNotifier* GetLOKNotifier() = 0;
};
class VCL_DLLPUBLIC WaitObject
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index aabdd2e83cce..293deabad99d 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -424,7 +424,8 @@ IMPL_STATIC_LINK( SfxApplication, GlobalBasicErrorHdl_Impl,
StarBASIC*, pStarBas
pViewFrame->GetFrameWeld(),
VclMessageType::Error,
VclButtonsType::Ok,
- aError));
+ aError,
+ GetpApp()));
xBox->runAsync(xBox, [](sal_Int32 /*nResult*/) {});
}
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index e57f22b8e212..ba5f91f8b889 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -40,6 +40,11 @@ class VclMultiLineEdit;
class SvTabListBox;
class IconView;
+namespace vcl
+{
+class ILibreOfficeKitNotifier;
+}
+
typedef std::map WidgetMap;
namespace jsdialog
@@ -301,7 +306,8 @@ public:
static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent,
VclMessageType
eMessageType,
VclButtonsType eButtonType,
-const OUString&
rPrimaryMessage);
+const OUString&
rPrimaryMessage,
+
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
53 new defect(s) introduced to LibreOffice found with Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 20 of 53 defect(s)
** CID 1521198: Insecure data handling (TAINTED_SCALAR)
/vcl/unx/generic/fontmanager/fontmanager.cxx: 254 in
psp::PrintFontManager::analyzeFontFile(int, const rtl::OString &, const char *)
const()
*** CID 1521198: Insecure data handling (TAINTED_SCALAR)
/vcl/unx/generic/fontmanager/fontmanager.cxx: 254 in
psp::PrintFontManager::analyzeFontFile(int, const rtl::OString &, const char *)
const()
248
//https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy03K-2F9QL4mGS3H4UobiiNRB-2FzSYkBMAms3MjYB2IGSzKfAuqY0cYzepBSORwrEJCkA-3D-3DLZs8_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJifoBxogASetu34-2BU0UHBVuWY-2Bpxt9kEe94w0WJq2L7hWs1oVzVC92iVO8uClhrZftTsQVs-2BQ5miwAAMJvvndQgstSLBC86wZ32d6JypjiqmurtqACdlK-2BO4-2FeC41jmrQvBwT2pKGl7noBIWB37OAeGfxSzIToOMRfendVKu-2FYGxQ-3D
249 const int nMaxFontsPossible = fileSize / 528;
250 if (nLength > nMaxFontsPossible)
251 nLength = nMaxFontsPossible;
252 }
253
>>> CID 1521198: Insecure data handling (TAINTED_SCALAR)
>>> Using tainted variable "nLength" as a loop boundary.
254 for( int i = 0; i < nLength; i++ )
255 {
256 PrintFont aFont;
257 aFont.m_nDirectory = nDirID;
258 aFont.m_aFontFile = rFontFile;
259 aFont.m_nCollectionEntry = i;
** CID 1521197: Memory - corruptions (OVERRUN)
*** CID 1521197: Memory - corruptions (OVERRUN)
/workdir/UnpackedTarball/harfbuzz/src/hb-aat-layout-morx-table.hh: 911 in
AAT::ChainSubtable::dispatch(T1*, T2
&&...) const()
905 {
906 unsigned int subtable_type = get_type ();
907 TRACE_DISPATCH (this, subtable_type);
908 switch (subtable_type) {
909 case Rearrangement: return_trace (c->dispatch
(u.rearrangement, std::forward (ds)...));
910 case Contextual:return_trace (c->dispatch
(u.contextual, std::forward (ds)...));
>>> CID 1521197: Memory - corruptions (OVERRUN)
>>> Overrunning struct type _ZN3AAT16LigatureSubtableINS_13ObsoleteTypesEEE
>>> of 14 bytes by passing it to a function which accesses it at byte offset 27.
911 case Ligature: return_trace (c->dispatch (u.ligature,
std::forward (ds)...));
912 case Noncontextual: return_trace (c->dispatch
(u.noncontextual, std::forward (ds)...));
913 case Insertion: return_trace (c->dispatch (u.insertion,
std::forward (ds)...));
914 default:return_trace (c->default_return_value
());
915 }
916 }
** CID 1521196:(USE_AFTER_FREE)
/vcl/unx/generic/glyphs/freetype_glyphcache.cxx: 328 in
FreetypeFontFace::GetHbFace() const()
/vcl/unx/generic/glyphs/freetype_glyphcache.cxx: 328 in
FreetypeFontFace::GetHbFace() const()
*** CID 1521196:(USE_AFTER_FREE)
/vcl/unx/generic/glyphs/freetype_glyphcache.cxx: 328 in
FreetypeFontFace::GetHbFace() const()
322 if (!mpHbFace)
323 {
324 auto* pFileName =
mpFreetypeFontInfo->GetFontFileName().getStr();
325 auto nIndex = mpFreetypeFontInfo->GetFontFaceIndex();
326 hb_blob_t* pHbBlob = hb_blob_create_from_file(pFileName);
327 mpHbFace = hb_face_create(pHbBlob, nIndex);
>>> CID 1521196:(USE_AFTER_FREE)
>>> Passing freed pointer "pHbBlob" as an argument to "hb_blob_destroy".
328 hb_blob_destroy(pHbBlob);
329 }
330 return mpHbFace;
331 }
332
333 hb_blob_t* FreetypeFontFace::GetHbTable(hb_tag_t nTag) const
/vcl/unx/generic/glyphs/freetype_glyphcache.cxx: 328 in
FreetypeFontFace::GetHbFace() const()
322 if (!mpHbFace)
323 {
324 auto* pFileName =
mpFreetypeFontInfo->GetFontFileName().getStr();
325 auto nIndex = mpFreetypeFontInfo->GetFontFaceIndex();
326 hb_blob_t* pHbBlob = hb_blob_create_from_file(pFileName);
327 mpHbFace = hb_face_create(pHbBlob, nIndex);
>>> CID 1521196:(USE_AFTER_FREE)
>>> Calling "hb_blob_destroy" frees pointer "pHbBlob" which has already
>>> been freed.
328 hb_blob_destroy(pHbBlob);
329 }
330 return mpHbFace;
331 }
332
333 hb_blob_t* FreetypeFontFace::GetHbTable(hb_tag_t nTag) const
** CID 15
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 14844d835cc5d6dfde499a0b1074aea5dcff4fc7 Author: Seth Chaiklin AuthorDate: Mon Feb 20 10:04:01 2023 + Commit: Gerrit Code Review CommitDate: Mon Feb 20 10:04:01 2023 + Update git submodules * Update helpcontent2 from branch 'master' to b72f41bed5b9bdffebaa85e23503a39027eba97d - remove unnecessary sentence Change-Id: I5168f58bfb24832a74e347a996bfa3f6d375a318 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147282 Reviewed-by: Seth Chaiklin Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b8e13d56e2b4..b72f41bed5b9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b8e13d56e2b4bce9e04778c8b0f5b42353ff9e98 +Subproject commit b72f41bed5b9bdffebaa85e23503a39027eba97d
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/0307.xhp |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit b72f41bed5b9bdffebaa85e23503a39027eba97d Author: Seth Chaiklin AuthorDate: Mon Feb 20 00:57:09 2023 + Commit: Olivier Hallot CommitDate: Mon Feb 20 10:04:01 2023 + remove unnecessary sentence Change-Id: I5168f58bfb24832a74e347a996bfa3f6d375a318 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/147282 Reviewed-by: Seth Chaiklin Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/0307.xhp b/source/text/sbasic/shared/0307.xhp index dd12886223..2d67e3c983 100644 --- a/source/text/sbasic/shared/0307.xhp +++ b/source/text/sbasic/shared/0307.xhp @@ -1,6 +1,5 @@ - - + - Mathematical Operators @@ -35,7 +33,6 @@ Mathematical Operators The following mathematical operators are supported in $[officename] Basic. - This chapter provides a short overview of all of the arithmetical operators that you may need for calculations within a program.
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 6 ++ 1 file changed, 6 insertions(+) New commits: commit 123f415b83470eef15a839dfedacd2b7b57f9531 Author: Gabor Kelemen AuthorDate: Thu Feb 16 23:09:22 2023 +0100 Commit: Thorsten Behrens CommitDate: Mon Feb 20 09:32:54 2023 + tdf#96039 Add extra labels to help recognize View menus items when searching in the Customize - Keyboard tab Change-Id: I53346bb4be3009a6d6f6251b70ad7ed93824b403 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147176 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 69766003998b..5b873aac0fcb 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -791,6 +791,9 @@ + Sli~de Sorter View + + Sli~de Sorter @@ -1896,6 +1899,9 @@ + ~Normal View + + ~Normal
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/tools/gradienttools.cxx | 102 -
1 file changed, 100 insertions(+), 2 deletions(-)
New commits:
commit ac824594c577ab4880177b3411a25297b1d08074
Author: Armin Le Grand (allotropia)
AuthorDate: Fri Feb 17 14:05:59 2023 +0100
Commit: Armin Le Grand
CommitDate: Mon Feb 20 09:18:18 2023 +
MCGR: Correct GradientElliptical & GradientRect
The visualizations when using the texturing methods
modifyBColor/get*GradientAlpha were both not correct
since they did not apply the aspect ratio.
I corrected both where GradientRect is correct, but
GradientElliptical is close and may have small
divergencies.
Change-Id: I6bcc07ec7cd4cdeb7863b51b20db3a7dd5afc41c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147218
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
diff --git a/basegfx/source/tools/gradienttools.cxx
b/basegfx/source/tools/gradienttools.cxx
index 3f2480c82e84..b3bb18f918da 100644
--- a/basegfx/source/tools/gradienttools.cxx
+++ b/basegfx/source/tools/gradienttools.cxx
@@ -451,7 +451,38 @@ namespace basegfx
double getEllipticalGradientAlpha(const B2DPoint& rUV, const
ODFGradientInfo& rGradInfo)
{
-return getRadialGradientAlpha(rUV, rGradInfo); // only matrix
setup differs
+const B2DPoint aCoor(rGradInfo.getBackTextureTransform() * rUV);
+
+if(aCoor.getX() < -1.0 || aCoor.getX() > 1.0 || aCoor.getY() <
-1.0 || aCoor.getY() > 1.0)
+{
+return 0.0;
+}
+
+double fAspectRatio(rGradInfo.getAspectRatio());
+double t(1.0);
+
+// MCGR: Similar to getRectangularGradientAlpha (please
+// see there) we need to use aspect ratio here. Due to
+// initEllipticalGradientInfo using M_SQRT2 to make this
+// gradient look 'nicer' this correciton seems not 100%
+// correct, but is close enough for now
+if(fAspectRatio > 1.0)
+{
+t = 1.0 - std::hypot(aCoor.getX() / fAspectRatio,
aCoor.getY());
+}
+else if(fAspectRatio > 0.0)
+{
+t = 1.0 - std::hypot(aCoor.getX(), aCoor.getY() *
fAspectRatio);
+}
+
+const sal_uInt32 nSteps(rGradInfo.getRequestedSteps());
+
+if(nSteps && t < 1.0)
+{
+return floor(t * nSteps) / double(nSteps - 1);
+}
+
+return t;
}
double getSquareGradientAlpha(const B2DPoint& rUV, const
ODFGradientInfo& rGradInfo)
@@ -484,7 +515,74 @@ namespace basegfx
double getRectangularGradientAlpha(const B2DPoint& rUV, const
ODFGradientInfo& rGradInfo)
{
-return getSquareGradientAlpha(rUV, rGradInfo); // only matrix
setup differs
+const B2DPoint aCoor(rGradInfo.getBackTextureTransform() * rUV);
+double fAbsX(fabs(aCoor.getX()));
+
+if(fAbsX >= 1.0)
+{
+return 0.0;
+}
+
+double fAbsY(fabs(aCoor.getY()));
+
+if(fAbsY >= 1.0)
+{
+return 0.0;
+}
+
+// MCGR: Visualiations using the texturing method for
+// displaying gradients (getBackTextureTransform is
+// involved) show wrong results for GradientElliptical
+// and GradientRect, this can be best seen when using
+// less steps, e.g. just four. This thus has influence
+// on cppcanvas (slideshow) and 3D textures, so needs
+// to be corrected.
+// Missing is to use the aspect ratio of the object
+// in this [-1, -1, 1, 1] unified coordinate space
+// after getBackTextureTransform is applied. Optically
+// in the larger direction of the texturing the color
+// step distances are too big *because* we are in that
+// unit range now.
+// To correct that, a kind of 'limo stretching' needs to
+// be applied, adding space around the center
+// proportional to the aspect ratio, so the intuitive
+// idea would be to do
+//
+// fAbsX' = ((fAspectRatio - 1) + fAbsX) / fAspectRatio
+//
+// which scales from the center. This does not work, and
+// after some thoughts it's clear why: It's not the
+// position that needs to be moved (this cannot be
+// changed), but the position *before* that scale has
+// to be determined to get the correct, shifted color
+// for the already 'new' position. Thus, turn around
+// the expression as
+//
+// fAbsX' * fAspectRatio = fAspectRatio - 1 + fAbsX
+// fAbsX' * fAspectRatio - fAspectRatio + 1 = fAbsX
+// fAbsX = (fAbsX' - 1) *
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - starmath/source
starmath/source/cursor.cxx |7 ---
starmath/source/dialog.cxx |7 +--
starmath/source/document.cxx |8 +++-
3 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit b905b793be520b9fdece8d12614566be82ce3c92
Author: Xisco Fauli
AuthorDate: Fri Feb 17 15:50:29 2023 +0100
Commit: Xisco Fauli
CommitDate: Mon Feb 20 09:03:43 2023 +
check SmGetActiveView()
it might be null
See
https://crashreport.libreoffice.org/stats/signature/SmPrintOptionsTabPage::~SmPrintOptionsTabPage()
Change-Id: I7bc17da230784e6e3fc9c0b33848423ac113ab29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147221
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit a7fd1e067eb2af0ef329719c4c7dbb32cc5926b2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147246
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index c7c27616b3f9..e8623517bcd7 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1330,9 +1330,10 @@ void SmCursor::EndEdit(){
mpDocShell->GetEditEngine().QuickFormatDoc();
}
-void SmCursor::RequestRepaint(){
-SmViewShell *pViewSh = SmGetActiveView();
-if( pViewSh ) {
+void SmCursor::RequestRepaint()
+{
+if (SmViewShell *pViewSh = SmGetActiveView())
+{
if (comphelper::LibreOfficeKit::isActive())
{
pViewSh->SendCaretToLOK();
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 2aedbae19d05..e7450727ad61 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -181,7 +181,8 @@
SmPrintOptionsTabPage::SmPrintOptionsTabPage(weld::Container* pPage, weld::Dialo
SmPrintOptionsTabPage::~SmPrintOptionsTabPage()
{
-SmGetActiveView()->GetEditWindow()->UpdateStatus();
+if (SmViewShell *pViewSh = SmGetActiveView())
+pViewSh->GetEditWindow()->UpdateStatus();
}
bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
@@ -204,7 +205,9 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
rSet->Put(SfxBoolItem(SID_AUTO_CLOSE_BRACKETS,
m_xAutoCloseBrackets->get_active()));
rSet->Put(SfxUInt16Item(SID_SMEDITWINDOWZOOM,
sal::static_int_cast(m_xSmZoom->get_value(FieldUnit::PERCENT;
-SmGetActiveView()->GetEditWindow()->UpdateStatus();
+if (SmViewShell *pViewSh = SmGetActiveView())
+pViewSh->GetEditWindow()->UpdateStatus();
+
return true;
}
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index e7c5dee90c4d..0593d26c268c 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -150,7 +150,7 @@ void SmDocShell::SetText(const OUString& rBuffer)
Parse();
SmViewShell *pViewSh = SmGetActiveView();
-if( pViewSh )
+if (pViewSh)
{
pViewSh->GetViewFrame()->GetBindings().Invalidate(SID_TEXT);
if ( SfxObjectCreateMode::EMBEDDED == GetCreateMode() )
@@ -247,8 +247,7 @@ void SmDocShell::ArrangeFormula()
// if necessary get another OutputDevice for which we format
if (!pOutDev)
{
-SmViewShell *pView = SmGetActiveView();
-if (pView)
+if (SmViewShell *pView = SmGetActiveView())
pOutDev =
&pView->GetGraphicWidget().GetDrawingArea()->get_ref_device();
else
{
@@ -533,8 +532,7 @@ void SmDocShell::Repaint()
Size aVisSize = GetSize();
SetVisAreaSize(aVisSize);
-SmViewShell* pViewSh = SmGetActiveView();
-if (pViewSh)
+if (SmViewShell* pViewSh = SmGetActiveView())
pViewSh->GetGraphicWidget().Invalidate();
if (bIsEnabled)
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/layout/data/floattable-3pages.docx |binary
sw/qa/core/layout/flycnt.cxx | 67
+-
sw/source/core/layout/anchoredobject.cxx | 20 ++
sw/source/core/layout/flycnt.cxx | 17 +-
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 23 ++-
sw/source/core/text/frmform.cxx|8 +
sw/source/core/text/itratr.cxx | 15 ++
7 files changed, 130 insertions(+), 20 deletions(-)
New commits:
commit 7c9acfe5baef275f07c185c6fedf8b6d62d88637
Author: Miklos Vajna
AuthorDate: Mon Feb 20 08:15:41 2023 +0100
Commit: Miklos Vajna
CommitDate: Mon Feb 20 08:09:20 2023 +
sw floattable: fix handling of multiple splits, i.e. table over 3 or more
pages
- fix SwAnchoredObject::FindAnchorCharFrame() and
SwToContentAnchoredObjectPosition::CalcPosition() to not assume that the
precede of a follow fly is the master fly, which is not true when the
table
is split to 3 pages. In this case we have a master, then a normal follow
and finally a last follow
- fix SwFrame::GetNextFlyLeaf() to split the right anchor, which may be
a follow text frame now, and register the new fly in master text
frame, not at the split position
- improve SwTextFrame::HasNonLastSplitFlyDrawObj() to look at flys in
the master, but only consider the ones which will be positioned
relative to the current anchor. Previously this was easier, as a
"non-last split fly" happened to be always a master text frame, but
now we han have split flys which are neither a master nor a last follow
- finally improve SwTextFrame::MakePos(), because the anchor on the 2nd
page is calculated after the 2nd fly is positioned, so it was only
positioned inside the 2nd page, but not at the correct position
Change-Id: Ibecaf5fcf0b8c56c5109461a16dcca058231b660
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147308
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/core/layout/data/floattable-3pages.docx
b/sw/qa/core/layout/data/floattable-3pages.docx
new file mode 100644
index ..d6cbdafc1945
Binary files /dev/null and b/sw/qa/core/layout/data/floattable-3pages.docx
differ
diff --git a/sw/qa/core/layout/flycnt.cxx b/sw/qa/core/layout/flycnt.cxx
index a41fb17ef54d..4b083914b74d 100644
--- a/sw/qa/core/layout/flycnt.cxx
+++ b/sw/qa/core/layout/flycnt.cxx
@@ -93,7 +93,7 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyWithTable)
CPPUNIT_ASSERT(!pPage1Anchor->HasPara());
}
-CPPUNIT_TEST_FIXTURE(Test, testSplitFlyVertoffset)
+CPPUNIT_TEST_FIXTURE(Test, testSplitFlyVertOffset)
{
// Given a document with a floattable, split on 2 pages and a positive
vertical offset:
std::shared_ptr pChanges(
@@ -145,6 +145,71 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyVertoffset)
// i.e. the fly frame on the 2nd page was also shifted down in Writer, but
not in Word.
CPPUNIT_ASSERT_EQUAL(static_cast(0), nPage2FlyTop -
nPage2AnchorTop);
}
+
+CPPUNIT_TEST_FIXTURE(Test, testSplitFly3Pages)
+{
+// Given a document with a floattable, split on 3 pages:
+std::shared_ptr pChanges(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Writer::Filter::Import::DOCX::ImportFloatingTableAsSplitFly::set(true,
+
pChanges);
+pChanges->commit();
+comphelper::ScopeGuard g([pChanges] {
+
officecfg::Office::Writer::Filter::Import::DOCX::ImportFloatingTableAsSplitFly::set(
+false, pChanges);
+pChanges->commit();
+});
+createSwDoc("floattable-3pages.docx");
+
+// When laying out that document:
+calcLayout();
+
+// Then make sure that row 1, 2 & 3 go to page 1, 2 & 3, while the table
is floating:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = dynamic_cast(pLayout->Lower());
+CPPUNIT_ASSERT(pPage1);
+const SwSortedObjs& rPage1Objs = *pPage1->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPage1Objs.size());
+auto pPage1Fly = dynamic_cast(rPage1Objs[0]);
+CPPUNIT_ASSERT(pPage1Fly);
+auto pPage1Anchor =
dynamic_cast(pPage1->FindLastBodyContent());
+CPPUNIT_ASSERT(pPage1Anchor);
+SwTwips nPage1AnchorTop = pPage1Anchor->getFrameArea().Top();
+SwTwips nPage1FlyTop = pPage1Fly->getFrameArea().Top();
+// The vert offset should be there on the first page:
+CPPUNIT_ASSERT_EQUAL(static_cast(1135), nPage1FlyTop -
nPage1AnchorTop);
+// Second page:
+auto pPage2 = dynamic_cast(pPage1->GetNext());
+CPPUNIT_ASSERT(pPage2);
+const SwSortedObjs& rPage2Objs = *pPage2->GetSortedObjs();
+// Without
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/CommentReply.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx|2 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ce668dc9278380848e0861f681b98e1c86eb23ff
Author: Paris Oplopoios
AuthorDate: Wed Feb 15 03:23:07 2023 +0200
Commit: Miklos Vajna
CommitDate: Mon Feb 20 08:01:57 2023 +
Fix issue where comment replies would not get a para id on roundtrip
Also adjusted the test file to account for this
Change-Id: I34f1d9d3a77f91396dd733785eb5b7853289508a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147034
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit f2428c21c635b142b27adf020518d9b13b3baf0e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147071
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/CommentReply.docx
b/sw/qa/extras/ooxmlexport/data/CommentReply.docx
index 4a78d84d55e6..e3a648aa4326 100644
Binary files a/sw/qa/extras/ooxmlexport/data/CommentReply.docx and
b/sw/qa/extras/ooxmlexport/data/CommentReply.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 30ef1735c73f..99c0b2c9ffe7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -885,6 +885,8 @@ CPPUNIT_TEST_FIXTURE(Test, testCommentReply)
loadAndSave("CommentReply.docx");
xmlDocUniquePtr pXmlComm = parseExport("word/comments.xml");
xmlDocUniquePtr pXmlCommExt = parseExport("word/commentsExtended.xml");
+CPPUNIT_ASSERT(pXmlComm);
+CPPUNIT_ASSERT(pXmlCommExt);
OUString sParentId = getXPath(pXmlComm, "/w:comments/w:comment[1]/w:p[1]",
"paraId");
OUString sChildId = getXPath(pXmlComm, "/w:comments/w:comment[2]/w:p[1]",
"paraId");
OUString sChildIdEx = getXPath(pXmlCommExt,
"/w15:commentsEx/w15:commentEx", "paraId");
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 89208dbbfc78..d0a11cd47988 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2690,8 +2690,8 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
{
m_bAnnotationResolved = item->second.bDone;
m_sAnnotationParent = item->second.sParaIdParent;
-m_sAnnotationImportedParaId = sParaId;
}
+m_sAnnotationImportedParaId = sParaId;
}
}
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 10
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 76 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |4
writerfilter/source/dmapper/FontTable.cxx | 22
writerfilter/source/dmapper/FontTable.hxx | 10
writerfilter/source/dmapper/GraphicImport.cxx | 660 +++---
writerfilter/source/dmapper/NumberingManager.cxx | 12
writerfilter/source/dmapper/PropertyMap.cxx |2
writerfilter/source/dmapper/StyleSheetTable.cxx | 232 +++
writerfilter/source/dmapper/StyleSheetTable.hxx | 30 -
10 files changed, 529 insertions(+), 529 deletions(-)
New commits:
commit 9d280061b094918b049278fb70b1ad99fef7dc84
Author: Miklos Vajna
AuthorDate: Mon Feb 20 08:13:50 2023 +0100
Commit: Miklos Vajna
CommitDate: Mon Feb 20 08:00:32 2023 +
writerfilter: prefix members of DomainMapper_Impl, EmbeddedFontHandler, ...
... GraphicImport_Impl and StyleSheetEntry
See tdf#94879 for motivation.
Change-Id: I83639c40fb8c32c1d205a9b53d24409f9a5a5a15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147307
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 8718f65b3bee..242a0d655e39 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1735,7 +1735,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
if ( IsStyleSheetImport() )
{
const StyleSheetEntryPtr pCurrStyle =
GetStyleSheetTable()->GetCurrentEntry();
-if ( pCurrStyle && pCurrStyle->nStyleTypeCode ==
STYLE_TYPE_CHAR )
+if ( pCurrStyle && pCurrStyle->m_nStyleTypeCode ==
STYLE_TYPE_CHAR )
break;
}
@@ -2459,7 +2459,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
// First check if the style exists in the document.
StyleSheetEntryPtr pEntry = m_pImpl->GetStyleSheetTable(
)->FindStyleSheetByConvertedStyleName( sConvertedName );
-bool bExists = pEntry && ( pEntry->nStyleTypeCode ==
STYLE_TYPE_CHAR );
+bool bExists = pEntry && ( pEntry->m_nStyleTypeCode ==
STYLE_TYPE_CHAR );
// Add the property if the style exists, but do not add it
elements in TOC:
// they will receive later another style references from TOC
if ( bExists && m_pImpl->GetTopContext() && !m_pImpl->IsInTOC())
@@ -3143,9 +3143,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
if( !sStyleName.isEmpty() && GetStyleSheetTable() )
pStyle =
GetStyleSheetTable()->FindStyleSheetByConvertedStyleName( sStyleName );
-if( pStyle && pStyle->pProperties
-&& pStyle->pProperties->isSet(PROP_BREAK_TYPE)
-&&
pStyle->pProperties->getProperty(PROP_BREAK_TYPE)->second == aBreakType )
+if( pStyle && pStyle->m_pProperties
+&& pStyle->m_pProperties->isSet(PROP_BREAK_TYPE)
+&&
pStyle->m_pProperties->getProperty(PROP_BREAK_TYPE)->second == aBreakType )
{
pParagraphProps->Insert(PROP_BREAK_TYPE, aBreakType);
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 128e97b522d1..efc83477f818 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -133,7 +133,7 @@ static void lcl_linenumberingHeaderFooter( const
uno::ReferenceGetStyleSheetTable()->FindStyleSheetByISTD( rname );
if (!pEntry)
return;
-const StyleSheetPropertyMap* pStyleSheetProperties =
pEntry->pProperties.get();
+const StyleSheetPropertyMap* pStyleSheetProperties =
pEntry->m_pProperties.get();
if ( !pStyleSheetProperties )
return;
sal_Int32 nListId = pStyleSheetProperties->props().GetListId();
@@ -199,13 +199,13 @@ static uno::Any
lcl_GetPropertyFromParaStyleSheetNoNum(PropertyIds eId, StyleShe
{
while (pEntry)
{
-if (pEntry->pProperties)
+if (pEntry->m_pProperties)
{
std::optional aProperty =
-pEntry->pProperties->getProperty(eId);
+pEntry->m_pProperties->getProperty(eId);
if (aProperty)
{
-if (pEntry->pProperties->props().GetListId())
+if (pEntry->m_pProperties->props().GetListId())
// It is a paragraph style with list. Paragraph list
styles are not taken into account
return uno::Any();
else
@@ -214,8 +214,8 @@ static uno::Any
lcl_GetPropertyFrom
