core.git: sc/sdi sc/source
sc/sdi/cellsh.sdi|2 +-
sc/source/ui/view/cellsh.cxx |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 0d3bb65620de64709d45c6e9b5591381a7da8dcf
Author: Oliver Specht
AuthorDate: Wed May 22 16:30:21 2024 +0200
Commit: Balazs Varga
CommitDate: Fri May 31 08:10:34 2024 +0200
tdf#159695 Disable Data Validation in protected sheets
While the menu entry Data/Validity was disabled the context
menu entry Data Validation was still enabled. This is fixed now.
Change-Id: Ifa183f79ed85e5c46e73b4fa3e282c48e9de6c89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167964
Reviewed-by: Balazs Varga
Tested-by: Jenkins
Tested-by: Gabor Kelemen
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 7370d142607e..ebba146f998d 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -61,7 +61,7 @@ interface CellSelection
SID_SUBTOTALS [ ExecMethod = ExecuteDB; StateMethod =
GetDBState; ]
SID_PIVOT_TABLE [ ExecMethod = ExecuteDB; StateMethod =
GetDBState; ]
FID_VALIDATION [ ExecMethod = ExecuteDB; StateMethod =
GetBlockState; ]
-FID_CURRENTVALIDATION [ ExecMethod = ExecuteDB; StateMethod = GetState; ]
+FID_CURRENTVALIDATION [ ExecMethod = ExecuteDB; StateMethod =
GetBlockState; ]
SID_TEXT_TO_COLUMNS [ ExecMethod = ExecuteDB; StateMethod =
GetDBState; ]
// } database operations
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index f1a1f97ef4d6..d907daf51ac2 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -315,6 +315,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
bNeedEdit = false;
break;
+case FID_CURRENTVALIDATION:
case FID_VALIDATION:
{
if ( pDocShell && pDocShell->IsDocShared() )
core.git: Branch 'feature/cib_contract49c' - sw/uiconfig
sw/uiconfig/swriter/ui/fldvarpage.ui |2 ++ 1 file changed, 2 insertions(+) New commits: commit 1fe05d5ed9824aca1a2af79570e69e36aff1cfce Author: Oliver Specht AuthorDate: Tue May 28 11:46:54 2024 +0200 Commit: Thorsten Behrens CommitDate: Tue May 28 22:10:55 2024 +0200 Set minimal size to variable field page To see the increased height of the name and value fields the edit field dialog needs a appropriate minimum size Change-Id: Ic6c4a01bd969247f770f023ec5c368fed5322550 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168147 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui index 9cfb4ce2bf8d..94782577de46 100644 --- a/sw/uiconfig/swriter/ui/fldvarpage.ui +++ b/sw/uiconfig/swriter/ui/fldvarpage.ui @@ -46,6 +46,8 @@ +600 +300 True False True
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/fldvarpage.ui |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6084962f93efc005b6827edceae12d3170f17ccd Author: Oliver Specht AuthorDate: Tue May 28 11:46:54 2024 +0200 Commit: Thorsten Behrens CommitDate: Tue May 28 22:08:50 2024 +0200 Set minimal size to variable field page To see the increased height of the name and value fields the edit field dialog needs a appropriate minimum size Change-Id: Ic6c4a01bd969247f770f023ec5c368fed5322550 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168147 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui index 9cfb4ce2bf8d..94782577de46 100644 --- a/sw/uiconfig/swriter/ui/fldvarpage.ui +++ b/sw/uiconfig/swriter/ui/fldvarpage.ui @@ -46,6 +46,8 @@ +600 +300 True False True
core.git: filter/source include/filter sw/inc sw/qa sw/source
filter/source/msfilter/escherex.cxx |1
include/filter/msfilter/escherex.hxx|3
sw/inc/IDocumentDrawModelAccess.hxx |1
sw/inc/IDocumentSettingAccess.hxx |2
sw/qa/extras/layout/layout2.cxx | 18 ++---
sw/qa/extras/ooxmlexport/ooxmlexport19.cxx |2
sw/source/core/doc/DocumentDrawModelManager.cxx | 13 +++-
sw/source/core/doc/DocumentSettingManager.cxx | 13 +++-
sw/source/core/doc/notxtfrm.cxx |2
sw/source/core/inc/DocumentDrawModelManager.hxx |3
sw/source/core/inc/DocumentSettingManager.hxx |1
sw/source/core/inc/cellfrm.hxx |2
sw/source/core/inc/flyfrm.hxx |4 -
sw/source/core/inc/frame.hxx| 10 ++-
sw/source/core/inc/layfrm.hxx |2
sw/source/core/inc/notxtfrm.hxx |2
sw/source/core/inc/rootfrm.hxx |2
sw/source/core/inc/tabfrm.hxx |2
sw/source/core/inc/txtfrm.hxx |2
sw/source/core/layout/fly.cxx | 26 ++--
sw/source/core/layout/paintfrm.cxx | 74 +++-
sw/source/core/layout/unusedf.cxx |2
sw/source/core/text/frmpaint.cxx|2
sw/source/core/unocore/unodraw.cxx |7 +-
sw/source/core/unocore/unoframe.cxx | 10 ++-
sw/source/filter/ww8/docxsdrexport.cxx | 11 +--
sw/source/filter/ww8/wrtw8esh.cxx |2
sw/source/uibase/uno/SwXDocumentSettings.cxx| 16 +
sw/source/writerfilter/dmapper/DomainMapper.cxx |2
sw/source/writerfilter/filter/WriterFilter.cxx |2
30 files changed, 186 insertions(+), 53 deletions(-)
New commits:
commit b860aea9d6f8ac46f6d2575ead25337495ec9a88
Author: Oliver Specht
AuthorDate: Wed Mar 13 13:04:18 2024 +0100
Commit: Thorsten Behrens
CommitDate: Tue May 28 00:45:20 2024 +0200
tdf#160198 Compatibility in background shapes/pictures
Paint Word background shapes/pictures (wrapped through) above
header and footer if the anchor is in the document body.
Change-Id: Ic32ba8d64f82c64e502788007e49a9dce4c4c76f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164802
Tested-by: Gabor Kelemen
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 319be56e6269..17543714ca29 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4867,6 +4867,7 @@ EscherEx::EscherEx(std::shared_ptr
xGlobal, SvStream* pOutStrm,
, mnCountOfs(0)
, mnGroupLevel(0)
, mnHellLayerId(SDRLAYER_NOTFOUND)
+, mnHeaderFooterHellLayerId(SDRLAYER_NOTFOUND)
, mbEscherSpgr(false)
, mbEscherDg(false)
, mbOOXML(bOOXML)
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index b8845ae240a5..196dc7918f6e 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1062,6 +1062,7 @@ class MSFILTER_DLLPUBLIC EscherEx : public
EscherPersistTable
sal_uInt32 mnGroupLevel;
SdrLayerID mnHellLayerId;
+SdrLayerID mnHeaderFooterHellLayerId;
boolmbEscherSpgr;
boolmbEscherDg;
@@ -1211,6 +1212,8 @@ public:
void SetHellLayerId( SdrLayerID nId ) { mnHellLayerId = nId; }
SdrLayerID GetHellLayerId() const { return mnHellLayerId; }
+void SetHeaderFooterHellLayerId( SdrLayerID nId ) {
mnHeaderFooterHellLayerId = nId; }
+SdrLayerID GetHeaderFooterHellLayerId() const { return
mnHeaderFooterHellLayerId; }
private:
EscherEx( const EscherEx& ) = delete;
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx
b/sw/inc/IDocumentDrawModelAccess.hxx
index 3c1113cfe882..3a40da7881ec 100644
--- a/sw/inc/IDocumentDrawModelAccess.hxx
+++ b/sw/inc/IDocumentDrawModelAccess.hxx
@@ -37,6 +37,7 @@ public:
virtual SwDrawModel* GetOrCreateDrawModel() = 0;
virtual SdrLayerID GetHeavenId() const = 0;
virtual SdrLayerID GetHellId() const = 0;
+virtual SdrLayerID GetHeaderFooterHellId() const = 0;
virtual SdrLayerID GetControlsId() const = 0;
virtual SdrLayerID GetInvisibleHeavenId() const = 0;
virtual SdrLayerID GetInvisibleHellId() const = 0;
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index 264860b854c4..39bcd7efcbeb 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -133,6 +133,8 @@ enum class DocumentSettingId
DROP_CAP_PUNCTUATION,
// render NBSP as standard-space-width (prettier when justified)
USE_VARIABLE_WIDTH_NBSP,
+// overlap background
core.git: sw/source
sw/source/core/frmedt/tblsel.cxx | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit f60126a6bfae5dad4a11afcc94ddf4a58c5ce8ab
Author: Oliver Specht
AuthorDate: Thu Apr 18 16:04:49 2024 +0200
Commit: Michael Stahl
CommitDate: Fri May 10 11:05:36 2024 +0200
tdf#159027: Fix calculation in tables with merged cells
Calculation in tables with merged cells over multiple pages is fixed.
It's more a workaround than a fix as it skips an empty SwRowFrame
returned from SwTabFrame::GetFirstNonHeadlineRow()
Change-Id: If11838da9769e0f6b0e54da8f422b4884684e30f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166254
Tested-by: Gabor Kelemen
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 669762ffacc3..74ec7fe7a106 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -1878,9 +1878,18 @@ void MakeSelUnions( SwSelUnions& rUnions, const
SwLayoutFrame *pStart,
// erroneous results could occur during split/merge.
// To prevent these we will determine the first and last row
// within the union and use their values for a new union
-const SwLayoutFrame* pRow = pTable->IsFollow() ?
- pTable->GetFirstNonHeadlineRow() :
- static_cast(pTable->Lower());
+const SwLayoutFrame* pRow = nullptr;
+if (pTable->IsFollow())
+{
+SwRowFrame* pRowFrame = pTable->GetFirstNonHeadlineRow();
+//tdf#159027: follow returns a frame without height if
+// merged cells are invoved
+if (pRowFrame->getFrameArea().IsEmpty())
+pRowFrame = static_cast(pRowFrame->GetNext());
+pRow = pRowFrame;
+}
+else
+pRow = static_cast(pTable->Lower());
while ( pRow && !pRow->getFrameArea().Overlaps( aUnion ) )
pRow = static_cast(pRow->GetNext());
core.git: Branch 'feature/cib_contract49c' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 246c7ff132ff63c607da91c9b8ee7987f31559f8 Author: Oliver Specht AuthorDate: Mon Feb 19 11:11:56 2024 +0100 Commit: Thorsten Behrens CommitDate: Thu May 9 22:27:44 2024 +0200 tdf#159254 fix import of printer tray in docx Change-Id: I9f3835800c921dbc90ef09a8dfa3001bed74d2d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163589 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 344a36cf9520..879b8e35740a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -706,10 +706,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->SetPageMarginTwip( PAGE_MAR_GUTTER, nIntValue ); break; case NS_ooxml::LN_CT_PaperSource_first: -m_pImpl->SetPaperSource(PAPER_SOURCE_FIRST, nIntValue); +m_pImpl->SetPaperSource(PAPER_SOURCE_FIRST, sStringValue.toInt32()); break; case NS_ooxml::LN_CT_PaperSource_other: -m_pImpl->SetPaperSource(PAPER_SOURCE_OTHER, nIntValue); +m_pImpl->SetPaperSource(PAPER_SOURCE_OTHER, sStringValue.toInt32()); break; case NS_ooxml::LN_CT_Language_val: //90314 case NS_ooxml::LN_CT_Language_eastAsia: //90315
core.git: 2 commits - editeng/qa editeng/source sw/inc sw/source sw/uiconfig
editeng/qa/unit/core-test.cxx|4 ++--
editeng/source/editeng/impedit2.cxx |3 ++-
editeng/source/editeng/impedit4.cxx |2 +-
sw/inc/crsrsh.hxx|1 +
sw/source/core/crsr/crstrvl1.cxx |5 +
sw/source/core/crsr/swcrsr.cxx |2 +-
sw/source/uibase/inc/wrtsh.hxx |2 +-
sw/source/uibase/shells/textsh.cxx | 14 --
sw/source/uibase/wrtsh/select.cxx|4 ++--
sw/uiconfig/swriter/ui/fldvarpage.ui | 22 --
10 files changed, 35 insertions(+), 24 deletions(-)
New commits:
commit 04dd541becd9232555e4d6d1e41462359f253993
Author: Oliver Specht
AuthorDate: Tue May 7 14:33:10 2024 +0200
Commit: Thorsten Behrens
CommitDate: Wed May 8 10:25:23 2024 +0200
Design change in variable page of the field dialog in Writer
Improves the commit 8e86df886f84fe69f13cfc367a5dd843e6ea917c
Change-Id: I69bc7a8ddcc9593e1e0deb26311c31032f3f9ae8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167285
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui
b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 9fd8c8f8a306..9cfb4ce2bf8d 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -59,6 +59,8 @@
True
False
+False
+True
6
6
@@ -195,9 +197,9 @@
-1
+0
1
-2
+3
@@ -205,7 +207,6 @@
True
False
True
-True
0
none
@@ -227,6 +228,9 @@
False
0
False
+
+
+
@@ -262,7 +266,6 @@
0
0
-2
@@ -270,7 +273,6 @@
True
False
True
-True
0
none
@@ -292,6 +294,9 @@
False
0
False
+
+
+
@@ -334,7 +339,6 @@
True
False
True
-True
0
none
@@ -364,6 +368,9 @@
False
0
False
+
+
+
@@ -406,6 +413,9 @@
False
0
False
+
+
+
commit de8eaca887762568e158024ad5bdbfb21526b734
Author: Oliver Specht
AuthorDate: Tue Apr 30 13:52:09 2024 +0200
Commit: Thorsten Behrens
CommitDate: Wed May 8 10:25:08 2024 +0200
Case Rotation in Impress and Writer improved
Word boundaries at the end of the paragraph are now correctly detected.
Sentence case is not applied without multi word selection in Writer anymore.
Change-Id: If6e2eeaa1ecca215d583e8f33364db466bf7c57d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166928
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index b69f58df9e8f..e40d5f0bf4c9 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -1896,8 +1896,8 @@ void Test::testTransliterate()
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(u""_ustr, editEng.GetText(esel));
CPPUNIT_ASSERT_EQUAL(u"Mary Jones met joe Smith. Time Passed."_ustr,
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
-CPPUNIT_ASSERT_EQUAL(u"Mary Jones met joe Smith. Time Passed."_ustr,
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
-CPPUNIT_ASSERT_EQUAL(u"Mary Jones met joe Smith. Time Passed."_ustr,
lcl_translitTest(editEng, sText2, esel, TF::UPPERCASE_LOWERCASE));
+CPPUNIT_ASSERT_EQUAL(u"Mary Jones met joe SMITH. Time Passed."_ustr,
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
+CPPUNIT_ASSERT_EQUAL(u"Mary Jones met joe smith. Time Passed."_ustr,
lcl_translitTest(editEng, sText2, esel, TF::UPPERCASE_LOWERCASE));
/* No selection tests. Cursor between the 'm' and 'e' in 'met'. */
selStart = 12;
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 1f5a97053ba7..4e56da97f706 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1586,7 +1586,8 @@ EditSelection ImpEditEngine::SelectWord( const
EditSelection& rCurSel, sal_Int16
if ( nType == i18n::WordType::ANY_WORD )
{
i18n::Boundary aBoundary =
core.git: include/svx include/vcl svx/source
include/svx/sidebar/AreaPropertyPanelBase.hxx |3 ++-
include/vcl/EnumContext.hxx |2 ++
svx/source/sidebar/area/AreaPropertyPanel.cxx | 11 +++
svx/source/sidebar/area/AreaPropertyPanel.hxx |2 ++
4 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 5e5e5832df6ed11bc664ef33ae833d2501b516c4
Author: Oliver Specht
AuthorDate: Thu May 2 08:39:14 2024 +0200
Commit: Thorsten Behrens
CommitDate: Tue May 7 19:13:20 2024 +0200
Sidebar: Direct update of FillStyle
FillStyle is directly updated to prevent deferred resize
when additional controls are created.
Change-Id: I48ed987971cf6c711af31d552e8d64fa9982a416
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165993
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx
b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 92e2d2c39289..eca8220a0812 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -102,7 +102,6 @@ public:
private:
void Initialize();
-virtual void HandleContextChange(const vcl::EnumContext& rContext)
override;
protected:
const css::uno::Reference& mxFrame;
@@ -177,6 +176,8 @@ protected:
// MCGR: Preserve ColorStops until we have a UI to edit these
basegfx::BColorStops createColorStops();
+
+virtual void HandleContextChange(const vcl::EnumContext& rContext)
override;
};
} // end of namespace svx::sidebar
diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx
index f852fea96068..790d938bd6e9 100644
--- a/include/vcl/EnumContext.hxx
+++ b/include/vcl/EnumContext.hxx
@@ -129,6 +129,8 @@ public:
sal_Int32 GetCombinedContext_DI() const;
Application GetApplication() const;
+Context GetContext() const {return meContext;}
+
SAL_DLLPRIVATE Application GetApplication_DI() const;
bool operator == (const EnumContext& rOther) const;
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx
b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 951028d61f32..1a5c02909c02 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -154,6 +154,17 @@ void AreaPropertyPanel::setFillStyleAndBitmap(const
XFillStyleItem* pStyleItem,
: std::initializer_list{ });
}
+void AreaPropertyPanel::HandleContextChange(const vcl::EnumContext& rContext)
+{
+AreaPropertyPanelBase::HandleContextChange(rContext);
+if (rContext.GetContext() != vcl::EnumContext::Context::Default)
+{
+std::unique_ptr pFillState;
+SfxItemState eState = mpBindings->QueryState( SID_ATTR_FILL_STYLE,
pFillState );
+NotifyItemUpdate(SID_ATTR_FILL_STYLE, eState, pFillState.get());
+}
+}
+
} // end of namespace svx::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx
b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index 6c398e6ac077..dc5b9d0194d2 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -83,6 +83,8 @@ private:
::sfx2::sidebar::ControllerItem maFillUseSlideBackgroundController;
SfxBindings* mpBindings;
+virtual void HandleContextChange(const vcl::EnumContext& rContext)
override;
+
};
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/fldvarpage.ui | 645 +++ 1 file changed, 291 insertions(+), 354 deletions(-) New commits: commit 8e86df886f84fe69f13cfc367a5dd843e6ea917c Author: Oliver Specht AuthorDate: Wed Apr 10 17:11:10 2024 +0200 Commit: Thorsten Behrens CommitDate: Thu Apr 18 08:56:12 2024 +0200 tdf#160621 Redesign name and value fields in variabe fields dialog page The space available in the bottom of the dialog page is now used to make the input fields longer Change-Id: If936decbcc44ff356095fc291ff8306084c248ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165952 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: Thorsten Behrens diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui index 4c6be9736980..9fd8c8f8a306 100644 --- a/sw/uiconfig/swriter/ui/fldvarpage.ui +++ b/sw/uiconfig/swriter/ui/fldvarpage.ui @@ -55,162 +55,273 @@ 12 True - + + True False -True -True -vertical -12 +6 +6 + + +True +False +start +Na_me: +True +name +0 + + +0 +0 + + + + +True +True +True +True + + +Type the name of the user-defined field to create. + + + + +1 +0 +2 + + - + True False +start +start +_Value: +True +value +0 + + +0 +1 + + + + +True +True True True -0 -none +in - + True True -6 True True -in - - -True -True -True -True -liststore1 -False -False -0 -False - - - - - - - - -0 - - - - - - -Lists the available field types. To add a field to your document, click a field type, click a field in the Select list, and then click Insert. - - + + +Enter the contents to add to a user-defined field. - - + + +1 +1 +2 + + + + + +True +False +end +6 + + True -False -_Type -True -0 - - - +True +True +Apply +center +image2 +True + + +Adds the user-defined field to the Select list. + + + + +0 +0 + + + + +True +True +True +Delete +center +image1 +True + + +Removes the user-defined field from the select list. You can only remove fields that are not used in the current document. + + + +1 +0 + -False -True -0 +3 +1 + + + -0 -0 +1 +1 +2 - + True False True True -vertical -12 +0 +none
core.git: Branch 'feature/cib_contract49' - desktop/qa include/sfx2 sc/qa sfx2/source
desktop/qa/desktop_lib/test_desktop_lib.cxx |5 +
include/sfx2/sidebar/SidebarController.hxx |3
sc/qa/uitest/calc_tests/printRange.py | 95
sc/qa/uitest/manual_tests/calc.py |8 +-
sfx2/source/sidebar/SidebarController.cxx | 24 +--
5 files changed, 30 insertions(+), 105 deletions(-)
New commits:
commit 6cac6107d644c73a0c0fb913401039fc416487e9
Author: Oliver Specht
AuthorDate: Wed Apr 10 12:36:00 2024 +0200
Commit: Thorsten Behrens
CommitDate: Wed Apr 17 02:21:17 2024 +0200
Bundle sidebar updates via Timer
When a selection changes (text/table/shape) the framework
notifies the sidebar about each step which results in three
visible updates. This is reduced into one now.
Disable Calc printRange.py ui test for the moment, inducing
timer-based issues not affecting functionality.
Change-Id: I48ed987971cf6c711af31d552e8d64fa9982a416
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index b698cc5976b7..019fcc76ada4 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -66,6 +66,7 @@
#include
#include
#include
+#include
#if USE_TLS_NSS
#include
@@ -3280,7 +3281,9 @@ void DesktopLOKTest::testControlState()
{
LibLODocument_Impl* pDocument = loadDoc("search.ods");
pDocument->pClass->postUnoCommand(pDocument, ".uno:StarShapes", nullptr,
false);
+Scheduler::ProcessEventsToIdle();
lcl_initializeSidebar();
+std::this_thread::sleep_for(std::chrono::milliseconds(300));
Scheduler::ProcessEventsToIdle();
boost::property_tree::ptree aState;
@@ -3294,7 +3297,9 @@ void DesktopLOKTest::testMetricField()
{
LibLODocument_Impl* pDocument = loadDoc("search.ods");
pDocument->pClass->postUnoCommand(pDocument, ".uno:StarShapes", nullptr,
false);
+Scheduler::ProcessEventsToIdle();
SfxChildWindow* pSideBar = lcl_initializeSidebar();
+std::this_thread::sleep_for(std::chrono::milliseconds(300));
Scheduler::ProcessEventsToIdle();
vcl::Window* pWin = pSideBar->GetWindow();
diff --git a/include/sfx2/sidebar/SidebarController.hxx
b/include/sfx2/sidebar/SidebarController.hxx
index 06e092bceec8..3f7b79aa2041 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -226,6 +226,9 @@ private:
*/
VclPtr mpCloseIndicator;
+Timer maChangeEventTimer;
+
+DECL_DLLPRIVATE_LINK(TimeoutHdl, Timer*, void);
DECL_DLLPRIVATE_LINK(WindowEventHandler, VclWindowEvent&, void);
/** Make maRequestedContext the current context.
*/
diff --git a/sc/qa/uitest/calc_tests/printRange.py
b/sc/qa/uitest/calc_tests/printRange.py
deleted file mode 100644
index b2253055c129..
--- a/sc/qa/uitest/calc_tests/printRange.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- 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_state_as_dict
-from libreoffice.uno.propertyvalue import mkPropertyValues
-
-class printRange(UITestCase):
-def test_printRange(self):
-with self.ui_test.create_doc_in_start_center("calc"):
-xCalcDoc = self.xUITest.getTopFocusWindow()
-gridwin = xCalcDoc.getChild("grid_window")
-
-gridwin.executeAction("SELECT", mkPropertyValues({"RANGE":
"A1:F20"}))
-#Set print range
-self.xUITest.executeCommand(".uno:DefinePrintArea")
-# Print Range dialog
-with
self.ui_test.execute_modeless_dialog_through_command(".uno:EditPrintArea") as
xDialog:
-xlbprintarea = xDialog.getChild("lbprintarea")
-xedprintarea = xDialog.getChild("edprintarea")
-#verify range
-
self.assertEqual(get_state_as_dict(xlbprintarea)["SelectEntryText"], "-
selection -")
-self.assertEqual(get_state_as_dict(xedprintarea)["Text"],
"$A$1:$F$20")
-#set Row
-xedrepeatrow = xDialog.getChild("edrepeatrow")
-xedrepeatrow.executeAction("TYPE",
mkPropertyValues({"TEXT":"$1"}))
-#set Column
-xedrepeatcol = xDialog.getChild("edrepeatcol")
-xedrepeatcol.executeAction("TYPE",
mkPropertyValues({"TEXT":"$A"}))
-# Click Ok
-
-#Verify Print Range dialog
-with
self.ui_test.execute_modeless_dialog_through_command(".uno:EditPrintArea",
close_button="cancel") as xDialog:
-xedprintarea = xDialog.getChild("edprintarea")
-xedrepeatrow =
core.git: Branch 'feature/cib_contract49' - 3 commits - drawinglayer/source include/drawinglayer svx/source sw/uiconfig
drawinglayer/source/geometry/viewinformation2d.cxx| 21 drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx |3 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx| 14 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 11 include/drawinglayer/geometry/viewinformation2d.hxx |3 include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx | 23 svx/source/sdr/contact/objectcontactofpageview.cxx|2 svx/source/sdr/primitive2d/sdrattributecreator.cxx| 53 sw/uiconfig/swriter/ui/fldvarpage.ui | 647 -- 9 files changed, 362 insertions(+), 415 deletions(-) New commits: commit f9aa7d95ac68c39166342aff91a5777a565f2c1d Author: Oliver Specht AuthorDate: Wed Apr 10 17:11:10 2024 +0200 Commit: Thorsten Behrens CommitDate: Tue Apr 16 22:17:15 2024 +0200 tdf#160621 Redesign name and value fields in variabe fields dialog page The space available in the bottom of the dialog page is now used to make the input fields longer Change-Id: If936decbcc44ff356095fc291ff8306084c248ef diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui index 4c6be9736980..9fd8c8f8a306 100644 --- a/sw/uiconfig/swriter/ui/fldvarpage.ui +++ b/sw/uiconfig/swriter/ui/fldvarpage.ui @@ -55,162 +55,273 @@ 12 True - + + True False -True -True -vertical -12 +6 +6 + + +True +False +start +Na_me: +True +name +0 + + +0 +0 + + + + +True +True +True +True + + +Type the name of the user-defined field to create. + + + + +1 +0 +2 + + - + True False +start +start +_Value: +True +value +0 + + +0 +1 + + + + +True +True True True -0 -none +in - + True True -6 True True -in - - -True -True -True -True -liststore1 -False -False -0 -False - - - - - - - - -0 - - - - - - -Lists the available field types. To add a field to your document, click a field type, click a field in the Select list, and then click Insert. - - + + +Enter the contents to add to a user-defined field. - - + + +1 +1 +2 + + + + + +True +False +end +6 + + True -False -_Type -True -0 - - - +True +True +Apply +center +image2 +True + + +Adds the user-defined field to the Select list. + + + + +0 +0 + + + + +True +True +True +Delete +center +image1 +True + + +Removes the user-defined field from the select list. You can only remove fields that are not used in the current document. + + + +1 +0 +
core.git: Branch 'feature/cib_contract49' - 2 commits - sd/source sw/qa sw/source
sd/source/ui/view/drviewse.cxx | 10 --
sw/qa/extras/uiwriter/uiwriter6.cxx |8
sw/qa/extras/uiwriter/uiwriter8.cxx |9 -
sw/source/uibase/inc/wrtsh.hxx |3 +++
sw/source/uibase/shells/textsh.cxx | 19 ---
sw/source/uibase/wrtsh/wrtsh4.cxx | 17 +
6 files changed, 44 insertions(+), 22 deletions(-)
New commits:
commit 5de5a5bde5024b5cdf8cfc1aa342c387f0cb1565
Author: Oliver Specht
AuthorDate: Thu Apr 11 08:56:17 2024 +0200
Commit: Thorsten Behrens
CommitDate: Mon Apr 15 19:11:12 2024 +0200
Improve case rotation in sentence case
Rotating case (Shift+F3) applies sentence case only
if multiple words are already selected or selects
sentence if SENTENCE_CASE is going to be applied.
Change-Id: I9e8536d7744a344d7ad54150783e91e843e0e81e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165986
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx
b/sw/qa/extras/uiwriter/uiwriter6.cxx
index bb51b96d8137..c0804bc91bac 100644
--- a/sw/qa/extras/uiwriter/uiwriter6.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter6.cxx
@@ -721,10 +721,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf157988)
dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
-CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Integer
sodalesSODALES"));
-
-dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
-
CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Integer sodales
tincidunt"));
dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
@@ -743,10 +739,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf157988)
dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
-CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Integer
sodalesSODALES"));
-
-dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
-
CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Integer sodales
tincidunt"));
dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx
b/sw/qa/extras/uiwriter/uiwriter8.cxx
index a928bea1695d..9caed95c578b 100644
--- a/sw/qa/extras/uiwriter/uiwriter8.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter8.cxx
@@ -837,15 +837,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf116315)
pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_SHIFT | KEY_F3);
Scheduler::ProcessEventsToIdle();
-// Sentence Case
-// Without the fix in place, this test would have failed with
-// - Expected: This is a Test
-// - Actual : This is a TEST
-CPPUNIT_ASSERT_EQUAL(OUString("This is a Test"),
getParagraph(1)->getString());
-
-pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_SHIFT | KEY_F3);
-Scheduler::ProcessEventsToIdle();
-
// Upper Case
CPPUNIT_ASSERT_EQUAL(OUString("This is a TEST"),
getParagraph(1)->getString());
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index a055c0cb4b8a..c1365979b5a6 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -237,6 +237,8 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
{ SimpleMove( ::BwdPara_, false/*bSelect*/ ); }
void FwdSentence( bool bSelect = false )
{ SimpleMove( ::FwdSentence_, bSelect ); }
+void EndSentence( bool bSelect = false )
+{ SimpleMove( ::EndSentence_, bSelect ); }
void BwdSentence( bool bSelect = false )
{ SimpleMove( ::BwdSentence_, bSelect ); }
@@ -588,6 +590,7 @@ private:
SAL_DLLPRIVATE bool NxtWrdForDelete();
SAL_DLLPRIVATE bool PrvWrdForDelete();
SAL_DLLPRIVATE bool FwdSentence_();
+SAL_DLLPRIVATE bool EndSentence_();
SAL_DLLPRIVATE bool BwdSentence_();
bool FwdPara_();
SAL_DLLPRIVATE bool BwdPara_();
diff --git a/sw/source/uibase/shells/textsh.cxx
b/sw/source/uibase/shells/textsh.cxx
index b3e32caab9d2..3e1b28fd5300 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -864,20 +864,33 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest
const & rReq )
{
if( rReq.GetSlot() == SID_TRANSLITERATE_ROTATE_CASE )
{
+TransliterationFlags transFlags = m_aRotateCase.getNextMode();
+bool bSentenceCase = TransliterationFlags::SENTENCE_CASE == transFlags;
SwWrtShell& rSh = GetShell();
if (rSh.HasSelection())
{
-rSh.TransliterateText(m_aRotateCase.getNextMode());
+if (bSentenceCase)
+{
+OUString aSelection = rSh.GetSelText().trim();
+if (aSelection.getLength() <= 2 || (aSelection.indexOf(' ') <
0 && aSelection.indexOf('') < 0))
+transFlags = m_aRotateCase.getNextMode();
+}
+
core.git: sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter6.cxx |8
sw/qa/extras/uiwriter/uiwriter8.cxx |9 -
sw/source/uibase/inc/wrtsh.hxx |3 +++
sw/source/uibase/shells/textsh.cxx | 19 ---
sw/source/uibase/wrtsh/wrtsh4.cxx | 17 +
5 files changed, 36 insertions(+), 20 deletions(-)
New commits:
commit b1170251fbca5b6b243902cf10695ab4c4c5642b
Author: Oliver Specht
AuthorDate: Thu Apr 11 08:56:17 2024 +0200
Commit: Thorsten Behrens
CommitDate: Mon Apr 15 19:05:14 2024 +0200
Improve case rotation in sentence case
Rotating case (Shift+F3) applies sentence case only
if multiple words are already selected or selects
sentence if SENTENCE_CASE is going to be applied.
Change-Id: I9e8536d7744a344d7ad54150783e91e843e0e81e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165986
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx
b/sw/qa/extras/uiwriter/uiwriter6.cxx
index dbc115356cca..e4303419a599 100644
--- a/sw/qa/extras/uiwriter/uiwriter6.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter6.cxx
@@ -742,10 +742,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf157988)
dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
-CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Integer
sodalesSODALES"));
-
-dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
-
CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Integer sodales
tincidunt"));
dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
@@ -764,10 +760,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf157988)
dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
-CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Integer
sodalesSODALES"));
-
-dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
-
CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("Integer sodales
tincidunt"));
dispatchCommand(mxComponent, ".uno:ChangeCaseRotateCase", {});
diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx
b/sw/qa/extras/uiwriter/uiwriter8.cxx
index ff06611b46fd..ab820a9dfc79 100644
--- a/sw/qa/extras/uiwriter/uiwriter8.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter8.cxx
@@ -856,15 +856,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf116315)
pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_SHIFT | KEY_F3);
Scheduler::ProcessEventsToIdle();
-// Sentence Case
-// Without the fix in place, this test would have failed with
-// - Expected: This is a Test
-// - Actual : This is a TEST
-CPPUNIT_ASSERT_EQUAL(OUString("This is a Test"),
getParagraph(1)->getString());
-
-pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_SHIFT | KEY_F3);
-Scheduler::ProcessEventsToIdle();
-
// Upper Case
CPPUNIT_ASSERT_EQUAL(OUString("This is a TEST"),
getParagraph(1)->getString());
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 8b8c85753e96..e1727bfc9fdf 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -239,6 +239,8 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
{ SimpleMove( ::BwdPara_, false/*bSelect*/ ); }
void FwdSentence( bool bSelect = false )
{ SimpleMove( ::FwdSentence_, bSelect ); }
+void EndSentence( bool bSelect = false )
+{ SimpleMove( ::EndSentence_, bSelect ); }
void BwdSentence( bool bSelect = false )
{ SimpleMove( ::BwdSentence_, bSelect ); }
@@ -590,6 +592,7 @@ private:
bool NxtWrdForDelete();
bool PrvWrdForDelete();
bool FwdSentence_();
+bool EndSentence_();
bool BwdSentence_();
SW_DLLPUBLIC bool FwdPara_();
bool BwdPara_();
diff --git a/sw/source/uibase/shells/textsh.cxx
b/sw/source/uibase/shells/textsh.cxx
index 1b1fb47fd1f3..93020de3bad2 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -878,20 +878,33 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest
const & rReq )
{
if( rReq.GetSlot() == SID_TRANSLITERATE_ROTATE_CASE )
{
+TransliterationFlags transFlags = m_aRotateCase.getNextMode();
+bool bSentenceCase = TransliterationFlags::SENTENCE_CASE == transFlags;
SwWrtShell& rSh = GetShell();
if (rSh.HasSelection())
{
-rSh.TransliterateText(m_aRotateCase.getNextMode());
+if (bSentenceCase)
+{
+OUString aSelection = rSh.GetSelText().trim();
+if (aSelection.getLength() <= 2 || (aSelection.indexOf(' ') <
0 && aSelection.indexOf('') < 0))
+transFlags = m_aRotateCase.getNextMode();
+}
+rSh.TransliterateText(transFlags);
}
else
{
+if (bSentenceCase)
+{
+if
core.git: sd/source
sd/source/ui/view/drviewse.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 6f99187ec29e8716e1fb9ffa18b1830048608fbc
Author: Oliver Specht
AuthorDate: Mon Apr 15 11:40:12 2024 +0200
Commit: Thorsten Behrens
CommitDate: Mon Apr 15 19:01:24 2024 +0200
Case rotation in Impress: skip sentence case
Sentence case does not make sense if a selection contains less than two
words.
Rotation then skkips to the next case mode.
Change-Id: I79d6560c494b716a53bfed654027f6f37dc6c362
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166115
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index da0dbedd1195..a49ce83b15e3 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1474,8 +1474,14 @@ void DrawViewShell::FuSupportRotate(SfxRequest const
)
if (!pOLV)
return;
-
-pOLV->TransliterateText( m_aRotateCase.getNextMode() );
+TransliterationFlags transFlags = m_aRotateCase.getNextMode();
+if (TransliterationFlags::SENTENCE_CASE == transFlags)
+{
+OUString SelectedText = pOLV->GetSelected().trim();
+if (SelectedText.getLength() <= 2 || (SelectedText.indexOf(' ') < 0 &&
SelectedText.indexOf(' ') < 0))
+transFlags = m_aRotateCase.getNextMode();
+}
+pOLV->TransliterateText( transFlags );
}
void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText,
core.git: Branch 'libreoffice-24-2' - 2 commits - editeng/source sw/inc sw/source
editeng/source/editeng/impedit4.cxx |5
sw/inc/usrfld.hxx |2 -
sw/source/filter/ww8/ww8par.cxx | 43 +---
sw/source/filter/ww8/ww8par5.cxx| 30 -
sw/source/uibase/shells/textsh.cxx |9 +--
5 files changed, 62 insertions(+), 27 deletions(-)
New commits:
commit 2ae662ed5e2a92ae8c1a2e6b61dcc9b67f94419f
Author: Oliver Specht
AuthorDate: Thu Mar 21 12:10:40 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Apr 4 21:45:41 2024 +0200
tdf#160301 import DOCVARIABLE fields as user fields
DOCVARIBLE fields in *.doc files are imported as user fields.
Change-Id: Ib723d8a586ca644e0b158f839caef33b2b6225a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165096
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
(cherry picked from commit ad4b72a0eacf6bb6887236ea3a3807b1264de822)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165721
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index 28d582c4c5ac..f7371ef52c6e 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -102,7 +102,7 @@ inline void SwUserFieldType::SetType(sal_uInt16 nSub)
* Tracks the number format and the language, conversion between the float and
* string representation is independent from the system locale.
*/
-class SwUserField final : public SwValueField
+class SW_DLLPUBLIC SwUserField final : public SwValueField
{
sal_uInt16 m_nSubType;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 10ccaa487816..976a68b88a69 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
@@ -4808,27 +4809,35 @@ void SwWW8ImplReader::ReadDocVars()
aDocVarStrings, , );
if (m_bVer67)return;
-uno::Reference xDPS(
-m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
-uno::Reference xDocProps(
-xDPS->getDocumentProperties());
-OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
-uno::Reference xUserDefinedProps =
-xDocProps->getUserDefinedProperties();
-OSL_ENSURE(xUserDefinedProps.is(), "UserDefinedProperties is null");
-
-for(size_t i=0; i
xFieldsSupplier(m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
+uno::Reference
xTextFactory(m_pDocShell->GetModel(), uno::UNO_QUERY);
+uno::Reference< container::XNameAccess > xFieldMasterAccess =
xFieldsSupplier->getTextFieldMasters();
+for(size_t i = 0; i < aDocVarStrings.size(); i++)
{
const OUString = aDocVarStrings[i];
uno::Any aValue;
-aValue <<= rName;
-try {
-xUserDefinedProps->addProperty( rName,
-beans::PropertyAttribute::REMOVABLE,
-aValue );
-} catch (const uno::Exception &) {
-// ignore
+if (aDocValueStrings.size() > i)
+{
+OUString value = aDocValueStrings[i];
+value = value.replaceAll("
", "
");
+value = value.replaceAll(" ", "
");
+aValue <<= value;
+}
+
+uno::Reference< beans::XPropertySet > xMaster;
+OUString sFieldMasterService("com.sun.star.text.FieldMaster.User." +
rName);
+
+// Find or create Field Master
+if (xFieldMasterAccess->hasByName(sFieldMasterService))
+{
+xMaster.set(xFieldMasterAccess->getByName(sFieldMasterService),
uno::UNO_QUERY_THROW);
+}
+else
+{
+
xMaster.set(xTextFactory->createInstance("com.sun.star.text.FieldMaster.User"),
uno::UNO_QUERY_THROW);
+xMaster->setPropertyValue("Name", uno::Any(rName));
}
+xMaster->setPropertyValue("Content", aValue);
}
}
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index c87c33dde0e1..6750fa21ae76 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1831,12 +1832,29 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc*
pF, OUString& rStr )
aData = aData.replaceAll("\"", "");
}
-const auto pType(static_cast(
-
m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::DocInfo)));
-SwDocInfoField aField(pType, nSub|nReg, aData, GetFieldResult(pF),
nFormat);
-if (bDateTime)
-ForceFieldLanguage(aField, nLang);
-m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM,
SwFormatField(aField));
+bool bDone = false;
+if (DI_CUSTOM == nSub)
+{
+const auto pType(static_cast(
+m_rDoc.getIDocumentFieldsAccess().GetFieldType(SwFieldIds::User,
aData, false)));
+if (pType)
+{
+SwUserField aField(pType, 0, nFormat);
+if (bDateTime)
+
core.git: Branch 'libreoffice-24-2' - editeng/qa editeng/source
editeng/qa/unit/core-test.cxx | 15 +--
editeng/source/editeng/impedit.hxx |2 +-
editeng/source/editeng/impedit2.cxx |4 ++--
editeng/source/editeng/impedit4.cxx |6 +-
4 files changed, 9 insertions(+), 18 deletions(-)
New commits:
commit f97dcfaee43f5b8c2eba4c7c3c2d0b786af38bc1
Author: Oliver Specht
AuthorDate: Thu Mar 7 17:06:54 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Apr 4 21:44:45 2024 +0200
tdf#63259 Cycle case should work on end of words
Now words are selected if the cursor is positioned at the end of
the word. SENTENCE_CASE does not force sentence selection anymore.
Change-Id: I672352b2c18bb695004fd4eb0f20ae5fd7a0ac53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164546
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165799
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 8d2a6c11d4fc..df9fb6c8ca26 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -1863,14 +1863,15 @@ void Test::testTransliterate()
int selStart = 12;
int selEnd = 12;
ESelection esel(0, selStart, 0, selEnd);
+ESelection eSentenSel(0, 0, 0, 25);
/* DocumentContentOperationsManager checks if the cursor is inside of a
word before transliterating,
* but Edit Engine has no such check. Therefore, behavior is different
between these two when the
* cursor is on a word boundary. */
-/* No selection tests. Cursor between the ' ' and 'm' before 'met'. */
+/* No selection tests. Cursor between the ' ' and 'm' before 'met' -
except in SENTENCE_CASE where the complete sentence is selected.*/
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::SENTENCE_CASE));
+CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, eSentenSel, TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones MET joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::UPPERCASE_LOWERCASE));
@@ -1880,9 +1881,8 @@ void Test::testTransliterate()
selEnd = 14;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::SENTENCE_CASE));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
+CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
+CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones MET joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::UPPERCASE_LOWERCASE));
/* No selection tests. Cursor between the 'h' and the '.' after 'Smith'. */
@@ -1890,7 +1890,6 @@ void Test::testTransliterate()
selEnd = 24;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::UPPERCASE_LOWERCASE));
@@ -1900,7 +1899,6 @@ void Test::testTransliterate()
selEnd = 12;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones MET joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel,
core.git: Branch 'feature/cib_contract49' - 3 commits - editeng/source sw/inc sw/Library_sw.mk sw/source sw/uiconfig
editeng/source/editeng/impedit4.cxx |5 +
sw/Library_sw.mk |1
sw/inc/usrfld.hxx|2
sw/source/filter/ww8/ww8par.cxx | 43 ++
sw/source/filter/ww8/ww8par5.cxx | 30 +--
sw/source/ui/fldui/flddb.cxx |2
sw/source/ui/fldui/flddb.hxx |2
sw/source/ui/fldui/fldfunc.cxx |6 -
sw/source/ui/fldui/fldfunc.hxx |6 -
sw/source/ui/fldui/fldvar.cxx|6 -
sw/source/ui/fldui/fldvar.hxx|2
sw/source/ui/inc/bookmark.hxx| 66 ++-
sw/source/ui/inc/condedit.hxx| 122 +
sw/source/ui/inc/regionsw.hxx| 146 ++-
sw/source/uibase/docvw/edtwin.cxx|1
sw/source/uibase/inc/condedit.hxx| 75 -
sw/source/uibase/shells/textsh.cxx |9 +-
sw/source/uibase/utlui/condedit.cxx | 84
sw/uiconfig/swriter/ui/fldvarpage.ui | 34 +---
19 files changed, 338 insertions(+), 304 deletions(-)
New commits:
commit 1fd0b11e559599afe7399e05e540a95cc75804db
Author: Oliver Specht
AuthorDate: Thu Mar 21 12:10:40 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Apr 4 19:51:09 2024 +0200
tdf#160301 import DOCVARIABLE fields as user fields
DOCVARIBLE fields in *.doc files are imported as user fields.
Change-Id: Ib723d8a586ca644e0b158f839caef33b2b6225a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165096
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index 28d582c4c5ac..f7371ef52c6e 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -102,7 +102,7 @@ inline void SwUserFieldType::SetType(sal_uInt16 nSub)
* Tracks the number format and the language, conversion between the float and
* string representation is independent from the system locale.
*/
-class SwUserField final : public SwValueField
+class SW_DLLPUBLIC SwUserField final : public SwValueField
{
sal_uInt16 m_nSubType;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index abd7cf4c0345..efac5960f8ee 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
@@ -4808,27 +4809,35 @@ void SwWW8ImplReader::ReadDocVars()
aDocVarStrings, , );
if (m_bVer67)return;
-uno::Reference xDPS(
-m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
-uno::Reference xDocProps(
-xDPS->getDocumentProperties());
-OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
-uno::Reference xUserDefinedProps =
-xDocProps->getUserDefinedProperties();
-OSL_ENSURE(xUserDefinedProps.is(), "UserDefinedProperties is null");
-
-for(size_t i=0; i
xFieldsSupplier(m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
+uno::Reference
xTextFactory(m_pDocShell->GetModel(), uno::UNO_QUERY);
+uno::Reference< container::XNameAccess > xFieldMasterAccess =
xFieldsSupplier->getTextFieldMasters();
+for(size_t i = 0; i < aDocVarStrings.size(); i++)
{
const OUString = aDocVarStrings[i];
uno::Any aValue;
-aValue <<= rName;
-try {
-xUserDefinedProps->addProperty( rName,
-beans::PropertyAttribute::REMOVABLE,
-aValue );
-} catch (const uno::Exception &) {
-// ignore
+if (aDocValueStrings.size() > i)
+{
+OUString value = aDocValueStrings[i];
+value = value.replaceAll("
", "
");
+value = value.replaceAll(" ", "
");
+aValue <<= value;
+}
+
+uno::Reference< beans::XPropertySet > xMaster;
+OUString sFieldMasterService("com.sun.star.text.FieldMaster.User." +
rName);
+
+// Find or create Field Master
+if (xFieldMasterAccess->hasByName(sFieldMasterService))
+{
+xMaster.set(xFieldMasterAccess->getByName(sFieldMasterService),
uno::UNO_QUERY_THROW);
+}
+else
+{
+
xMaster.set(xTextFactory->createInstance("com.sun.star.text.FieldMaster.User"),
uno::UNO_QUERY_THROW);
+xMaster->setPropertyValue("Name", uno::Any(rName));
}
+xMaster->setPropertyValue("Content", aValue);
}
}
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a5f1d6892fbb..9853bbe8db58 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1834,12 +1835,29 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc*
pF, OUString& rStr )
aData = aData.replaceAll("\"", "");
}
-const auto pType(static_cast(
-
core.git: sw/inc sw/source
sw/inc/usrfld.hxx|2 -
sw/source/filter/ww8/ww8par.cxx | 43 +++
sw/source/filter/ww8/ww8par5.cxx | 30 +--
3 files changed, 51 insertions(+), 24 deletions(-)
New commits:
commit ad4b72a0eacf6bb6887236ea3a3807b1264de822
Author: Oliver Specht
AuthorDate: Thu Mar 21 12:10:40 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Apr 4 19:47:54 2024 +0200
tdf#160301 import DOCVARIABLE fields as user fields
DOCVARIBLE fields in *.doc files are imported as user fields.
Change-Id: Ib723d8a586ca644e0b158f839caef33b2b6225a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165096
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index 28d582c4c5ac..f7371ef52c6e 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -102,7 +102,7 @@ inline void SwUserFieldType::SetType(sal_uInt16 nSub)
* Tracks the number format and the language, conversion between the float and
* string representation is independent from the system locale.
*/
-class SwUserField final : public SwValueField
+class SW_DLLPUBLIC SwUserField final : public SwValueField
{
sal_uInt16 m_nSubType;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b51239d436ac..77f4f2e76be2 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
@@ -4806,27 +4807,35 @@ void SwWW8ImplReader::ReadDocVars()
aDocVarStrings, , );
if (m_bVer67)return;
-uno::Reference xDPS(
-m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
-uno::Reference xDocProps(
-xDPS->getDocumentProperties());
-OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
-uno::Reference xUserDefinedProps =
-xDocProps->getUserDefinedProperties();
-OSL_ENSURE(xUserDefinedProps.is(), "UserDefinedProperties is null");
-
-for(size_t i=0; i
xFieldsSupplier(m_pDocShell->GetModel(), uno::UNO_QUERY_THROW);
+uno::Reference
xTextFactory(m_pDocShell->GetModel(), uno::UNO_QUERY);
+uno::Reference< container::XNameAccess > xFieldMasterAccess =
xFieldsSupplier->getTextFieldMasters();
+for(size_t i = 0; i < aDocVarStrings.size(); i++)
{
const OUString = aDocVarStrings[i];
uno::Any aValue;
-aValue <<= rName;
-try {
-xUserDefinedProps->addProperty( rName,
-beans::PropertyAttribute::REMOVABLE,
-aValue );
-} catch (const uno::Exception &) {
-// ignore
+if (aDocValueStrings.size() > i)
+{
+OUString value = aDocValueStrings[i];
+value = value.replaceAll("
", "
");
+value = value.replaceAll(" ", "
");
+aValue <<= value;
+}
+
+uno::Reference< beans::XPropertySet > xMaster;
+OUString sFieldMasterService("com.sun.star.text.FieldMaster.User." +
rName);
+
+// Find or create Field Master
+if (xFieldMasterAccess->hasByName(sFieldMasterService))
+{
+xMaster.set(xFieldMasterAccess->getByName(sFieldMasterService),
uno::UNO_QUERY_THROW);
+}
+else
+{
+
xMaster.set(xTextFactory->createInstance("com.sun.star.text.FieldMaster.User"),
uno::UNO_QUERY_THROW);
+xMaster->setPropertyValue("Name", uno::Any(rName));
}
+xMaster->setPropertyValue("Content", aValue);
}
}
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a5b9f881065e..47cb7e788223 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1830,12 +1831,29 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc*
pF, OUString& rStr )
aData = aData.replaceAll("\"", "");
}
-const auto pType(static_cast(
-
m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::DocInfo)));
-SwDocInfoField aField(pType, nSub|nReg, aData, GetFieldResult(pF),
nFormat);
-if (bDateTime)
-ForceFieldLanguage(aField, nLang);
-m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM,
SwFormatField(aField));
+bool bDone = false;
+if (DI_CUSTOM == nSub)
+{
+const auto pType(static_cast(
+m_rDoc.getIDocumentFieldsAccess().GetFieldType(SwFieldIds::User,
aData, false)));
+if (pType)
+{
+SwUserField aField(pType, 0, nFormat);
+if (bDateTime)
+ForceFieldLanguage(aField, nLang);
+m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM,
SwFormatField(aField));
+bDone = true;
+}
+}
+if (!bDone)
+{
+const auto
core.git: editeng/source sw/source
editeng/source/editeng/impedit4.cxx |5 +
sw/source/uibase/shells/textsh.cxx |9 ++---
2 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit ec5898cb245c68cf116a22b3714408e4a96ee15d
Author: Oliver Specht
AuthorDate: Tue Mar 19 09:19:38 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Apr 4 17:27:02 2024 +0200
tdf#63259 cycle case on sentences
Cycle case will be applied to the sentence if the cursor is at
a sentence end. Writer now also keeps the word/sentence selection
after case change.
Change-Id: I9dd561775ac612689526bcb118533ba81b5722be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165018
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index b7e322b68ccd..b7d4be999016 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2711,6 +2711,11 @@ EditSelection ImpEditEngine::TransliterateText( const
EditSelection& rSelection,
if ( !aSel.HasRange() )
{
aSel = SelectWord( aSel,
css::i18n::WordType::ANYWORD_IGNOREWHITESPACES, true, true );
+if (!aSel.HasRange() && aSel.Min().GetIndex() > 0 &&
+
OUString(".!?").indexOf(aSel.Min().GetNode()->GetChar(aSel.Min().GetIndex() -
1)) > -1 )
+{
+aSel = SelectSentence(aSel);
+}
}
// tdf#107176: if there's still no range, just return aSel
diff --git a/sw/source/uibase/shells/textsh.cxx
b/sw/source/uibase/shells/textsh.cxx
index 5c4713736081..1b1fb47fd1f3 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -885,10 +885,13 @@ void SwTextShell::ExecRotateTransliteration( SfxRequest
const & rReq )
}
else
{
-rSh.Push(); // save cur cursor
-if ((rSh.IsEndWrd() || rSh.IsStartWord() || rSh.IsInWord()) &&
rSh.SelWrd())
+if (rSh.IsEndSentence())
+{
+rSh.BwdSentence(true);
+rSh.TransliterateText(m_aRotateCase.getNextMode());
+}
+else if ((rSh.IsEndWrd() || rSh.IsStartWord() || rSh.IsInWord())
&& rSh.SelWrd())
rSh.TransliterateText(m_aRotateCase.getNextMode());
-rSh.Pop(SwCursorShell::PopMode::DeleteCurrent);
}
}
}
core.git: sw/Library_sw.mk sw/source sw/uiconfig
sw/Library_sw.mk |1
sw/source/ui/fldui/flddb.cxx |2
sw/source/ui/fldui/flddb.hxx |2
sw/source/ui/fldui/fldfunc.cxx |6 -
sw/source/ui/fldui/fldfunc.hxx |6 -
sw/source/ui/fldui/fldvar.cxx|6 -
sw/source/ui/fldui/fldvar.hxx|2
sw/source/ui/inc/bookmark.hxx| 68 ++--
sw/source/ui/inc/condedit.hxx| 122 +
sw/source/ui/inc/regionsw.hxx| 146 ++-
sw/source/uibase/docvw/edtwin.cxx|1
sw/source/uibase/inc/condedit.hxx| 75 -
sw/source/uibase/utlui/condedit.cxx | 84
sw/uiconfig/swriter/ui/fldvarpage.ui | 34 +---
14 files changed, 277 insertions(+), 278 deletions(-)
New commits:
commit 29750e249530eec0b3e00ceb75e668ad22b21cae
Author: Oliver Specht
AuthorDate: Wed Apr 3 14:57:29 2024 +0200
Commit: Thorsten Behrens
CommitDate: Thu Apr 4 17:24:54 2024 +0200
improve usability of variable fields
The value field of the Variables page of the field dialog is changed
into a scrollable field to enhance usability in combination with longer
values of variable or user fields
Change-Id: Ib268cf22ff54604214fb090c3c93b7d145a9c9a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165750
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 239e58ffc6a3..c8cc2e96814a 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -777,7 +777,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/uibase/utlui/AccessibilityStatusBarControl \
sw/source/uibase/utlui/attrdesc \
sw/source/uibase/utlui/bookctrl \
-sw/source/uibase/utlui/condedit \
sw/source/uibase/utlui/content \
sw/source/uibase/utlui/glbltree \
sw/source/uibase/utlui/gloslst \
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 0c0210eedaac..d9e101a31b53 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -38,7 +38,7 @@ SwFieldDBPage::SwFieldDBPage(weld::Container* pPage,
weld::DialogController* pCo
, m_xDatabaseTLB(new SwDBTreeList(m_xBuilder->weld_tree_view("select")))
, m_xAddDBPB(m_xBuilder->weld_button("browse"))
, m_xCondition(m_xBuilder->weld_widget("condgroup"))
-, m_xConditionED(new ConditionEdit(m_xBuilder->weld_entry("condition")))
+, m_xConditionED(new
ConditionEdit(m_xBuilder->weld_entry("condition")))
, m_xValue(m_xBuilder->weld_widget("recgroup"))
, m_xValueED(m_xBuilder->weld_entry("recnumber"))
, m_xDBFormatRB(m_xBuilder->weld_radio_button("fromdatabasecb"))
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 9fb967b9a5ae..eefa801dab5a 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -37,7 +37,7 @@ class SwFieldDBPage : public SwFieldPage
std::unique_ptr m_xDatabaseTLB;
std::unique_ptr m_xAddDBPB;
std::unique_ptr m_xCondition;
-std::unique_ptr m_xConditionED;
+std::unique_ptr> m_xConditionED;
std::unique_ptr m_xValue;
std::unique_ptr m_xValueED;
std::unique_ptr m_xDBFormatRB;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 6447c375e5b4..ce29dd991d3b 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -42,14 +42,14 @@ SwFieldFuncPage::SwFieldFuncPage(weld::Container* pPage,
weld::DialogController*
, m_xFormat(m_xBuilder->weld_widget("formatframe"))
, m_xFormatLB(m_xBuilder->weld_tree_view("format"))
, m_xNameFT(m_xBuilder->weld_label("nameft"))
-, m_xNameED(new ConditionEdit(m_xBuilder->weld_entry("condFunction")))
+, m_xNameED(new
ConditionEdit(m_xBuilder->weld_entry("condFunction")))
, m_xValueGroup(m_xBuilder->weld_widget("valuegroup"))
, m_xValueFT(m_xBuilder->weld_label("valueft"))
, m_xValueED(m_xBuilder->weld_entry("value"))
, m_xCond1FT(m_xBuilder->weld_label("cond1ft"))
-, m_xCond1ED(new ConditionEdit(m_xBuilder->weld_entry("cond1")))
+, m_xCond1ED(new
ConditionEdit(m_xBuilder->weld_entry("cond1")))
, m_xCond2FT(m_xBuilder->weld_label("cond2ft"))
-, m_xCond2ED(new ConditionEdit(m_xBuilder->weld_entry("cond2")))
+, m_xCond2ED(new
ConditionEdit(m_xBuilder->weld_entry("cond2")))
, m_xMacroBT(m_xBuilder->weld_button("macro"))
, m_xListGroup(m_xBuilder->weld_widget("listgroup"))
, m_xListItemED(m_xBuilder->weld_entry("item"))
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 9fef98d256af..3f2ebef355e4 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -37,14 +37,14 @@ class SwFieldFuncPage : public SwFieldPage
std::unique_ptr m_xFormat;
std::unique_ptr m_xFormatLB;
std::unique_ptr m_xNameFT;
-std::unique_ptr m_xNameED;
+
core.git: svx/source
svx/source/gallery2/galbrws1.cxx | 25 -
svx/source/inc/galbrws1.hxx |1 +
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 203b6a00cf5b716cb580d2bd4e9a6071cec23574
Author: Oliver Specht
AuthorDate: Tue Mar 19 13:16:07 2024 +0100
Commit: Gabor Kelemen
CommitDate: Mon Mar 25 16:59:06 2024 +0100
tdf#160264 Fixed crash in gallery
Local gallery themes need an additional listener to prevent deleting
the global theme.
Change-Id: If6cfcb5a3eeffdc087b089f2151c45b2cff87bbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165029
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index c68c2d8ba83e..443d9be4adec 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -256,7 +256,7 @@ void GalleryBrowser1::ImplFillExchangeData( const
GalleryTheme* pThm, ExchangeDa
void GalleryBrowser1::ImplGetExecuteVector(std::vector& o_aExec)
{
-GalleryTheme* pTheme = mpGallery->AcquireTheme(
GetSelectedTheme(), *this );
+GalleryTheme* pTheme = mpGallery->AcquireTheme(
GetSelectedTheme(), maLocalListner );
if( !pTheme )
return;
@@ -288,14 +288,14 @@ void
GalleryBrowser1::ImplGetExecuteVector(std::vector& o_aExec)
o_aExec.emplace_back("properties");
-mpGallery->ReleaseTheme( pTheme, *this );
+mpGallery->ReleaseTheme( pTheme, maLocalListner );
}
void GalleryBrowser1::ImplGalleryThemeProperties( std::u16string_view
rThemeName, bool bCreateNew )
{
DBG_ASSERT(!mpThemePropsDlgItemSet, "mpThemePropsDlgItemSet already set!");
mpThemePropsDlgItemSet.reset(new SfxItemSet( SfxGetpApp()->GetPool() ));
-GalleryTheme* pTheme = mpGallery->AcquireTheme( rThemeName, *this );
+GalleryTheme* pTheme = mpGallery->AcquireTheme( rThemeName,
maLocalListner );
ImplFillExchangeData( pTheme, *mpExchangeData );
@@ -345,7 +345,7 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties(bool
bCreateNew, sal_Int32 n
}
OUString aThemeName( mpExchangeData->pTheme->GetName() );
-mpGallery->ReleaseTheme( mpExchangeData->pTheme, *this );
+mpGallery->ReleaseTheme( mpExchangeData->pTheme, maLocalListner );
if ( bCreateNew && ( nRet != RET_OK ) )
{
@@ -367,13 +367,13 @@ void GalleryBrowser1::ImplExecute(std::u16string_view
rIdent)
{
if (rIdent == u"update")
{
-GalleryTheme* pTheme = mpGallery->AcquireTheme(
GetSelectedTheme(), *this );
+GalleryTheme* pTheme = mpGallery->AcquireTheme(
GetSelectedTheme(), maLocalListner );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
ScopedVclPtr
aActualizeProgress(pFact->CreateActualizeProgressDialog(mxThemes.get(),
pTheme));
aActualizeProgress->Execute();
-mpGallery->ReleaseTheme( pTheme, *this );
+mpGallery->ReleaseTheme( pTheme, maLocalListner );
}
else if (rIdent == u"delete")
{
@@ -384,7 +384,7 @@ void GalleryBrowser1::ImplExecute(std::u16string_view
rIdent)
}
else if (rIdent == u"rename")
{
-GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(),
*this );
+GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(),
maLocalListner );
const OUString aOldName( pTheme->GetName() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -407,11 +407,11 @@ void GalleryBrowser1::ImplExecute(std::u16string_view
rIdent)
mpGallery->RenameTheme( aOldName, aName );
}
}
-mpGallery->ReleaseTheme( pTheme, *this );
+mpGallery->ReleaseTheme( pTheme, maLocalListner );
}
else if (rIdent == u"assign")
{
-GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(),
*this );
+GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(),
maLocalListner );
if (pTheme && !pTheme->IsReadOnly())
{
@@ -422,7 +422,7 @@ void GalleryBrowser1::ImplExecute(std::u16string_view
rIdent)
pTheme->SetId( aDlg->GetId(), true );
}
-mpGallery->ReleaseTheme( pTheme, *this );
+mpGallery->ReleaseTheme( pTheme, maLocalListner );
}
else if (rIdent == u"properties")
{
@@ -1500,13 +1500,12 @@ IMPL_LINK(GalleryBrowser1, SelectTbxHdl,
weld::Toggleable&, rBox, void)
void GalleryBrowser1::FillThemeEntries()
{
-SfxListener aListener;
for (size_t i = 0, nCount = mpGallery->GetThemeCount(); i < nCount;
++i)
{
const GalleryThemeEntry* pThemeInfo = mpGallery->GetThemeInfo( i );
OUString aThemeName = pThemeInfo->GetThemeName();
//sal_uInt32 nId = pThemeInfo->GetId();
-GalleryTheme* pTheme =
core.git: Branch 'libreoffice-24-2-2' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |3 ---
writerfilter/source/dmapper/PropertyIds.cxx |1 -
writerfilter/source/dmapper/PropertyIds.hxx |1 -
3 files changed, 5 deletions(-)
New commits:
commit 67e35d0159d30829c7672f3d4d33de2e85cd6626
Author: Oliver Specht
AuthorDate: Wed Mar 20 16:25:17 2024 +0100
Commit: Christian Lohmaier
CommitDate: Fri Mar 22 19:42:17 2024 +0100
Revert "tdf#159730 add compatibility option in RTF import"
This reverts commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58.
Reason for revert: The compatibility option is the wrong approach. This
results in wrong line calculation as seen in tdf#159730#c6.
The problem that really needs to be fixed is the 9pt attribute of the
hidden line breaks in the first paragraph that are used to calculate the height
of the first paragraph.
Only the 1pt font attribute of the remaining visible space should define
the line height.
Change-Id: I6e0a1a499adaf2df9f68afbcfd6afcd6677e8f76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165006
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 44e4ada23dfc8655ec7ddccfd027f02d22684d60)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165119
Reviewed-by: Xisco Fauli
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index bbeafa942de4..7e4eeda7d3d9 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,9 +129,6 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
m_pImpl->SetDocumentSettingsProperty(
getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING),
uno::Any(true));
-m_pImpl->SetDocumentSettingsProperty(
-getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION),
-uno::Any(true));
// Don't load the default style definitions to avoid weird mix
m_pImpl->SetDocumentSettingsProperty("StylesNoDefault",
uno::Any(true));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 8a83ca0bb064..b8b4efc06222 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -384,7 +384,6 @@ namespace
{ PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
{ PROP_DECORATIVE, u"Decorative"},
{ PROP_PAPER_TRAY, u"PrinterPaperTray"},
-{ PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION,
u"IgnoreTabsAndBlanksForLineCalculation"},
});
} // end anonymous ns
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index bb2fb833516c..b39fcd24fa49 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -383,7 +383,6 @@ enum PropertyIds
,PROP_RTL_GUTTER
,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
,PROP_PARA_CONNECT_BORDERS
-,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION
};
//Returns the UNO string equivalent to eId.
core.git: Branch 'libreoffice-24-2' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |3 ---
writerfilter/source/dmapper/PropertyIds.cxx |1 -
writerfilter/source/dmapper/PropertyIds.hxx |1 -
3 files changed, 5 deletions(-)
New commits:
commit 9b8f6f881185831ec77f1c692c8726fd1459a746
Author: Oliver Specht
AuthorDate: Wed Mar 20 16:25:17 2024 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 22 10:05:50 2024 +0100
Revert "tdf#159730 add compatibility option in RTF import"
This reverts commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58.
Reason for revert: The compatibility option is the wrong approach. This
results in wrong line calculation as seen in tdf#159730#c6.
The problem that really needs to be fixed is the 9pt attribute of the
hidden line breaks in the first paragraph that are used to calculate the height
of the first paragraph.
Only the 1pt font attribute of the remaining visible space should define
the line height.
Change-Id: I6e0a1a499adaf2df9f68afbcfd6afcd6677e8f76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165006
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 44e4ada23dfc8655ec7ddccfd027f02d22684d60)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165118
Reviewed-by: Xisco Fauli
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index bbeafa942de4..7e4eeda7d3d9 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,9 +129,6 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
m_pImpl->SetDocumentSettingsProperty(
getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING),
uno::Any(true));
-m_pImpl->SetDocumentSettingsProperty(
-getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION),
-uno::Any(true));
// Don't load the default style definitions to avoid weird mix
m_pImpl->SetDocumentSettingsProperty("StylesNoDefault",
uno::Any(true));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 8a83ca0bb064..b8b4efc06222 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -384,7 +384,6 @@ namespace
{ PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
{ PROP_DECORATIVE, u"Decorative"},
{ PROP_PAPER_TRAY, u"PrinterPaperTray"},
-{ PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION,
u"IgnoreTabsAndBlanksForLineCalculation"},
});
} // end anonymous ns
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index bb2fb833516c..b39fcd24fa49 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -383,7 +383,6 @@ enum PropertyIds
,PROP_RTL_GUTTER
,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
,PROP_PARA_CONNECT_BORDERS
-,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION
};
//Returns the UNO string equivalent to eId.
core.git: Branch 'libreoffice-7-6' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |3 ---
writerfilter/source/dmapper/PropertyIds.cxx |1 -
writerfilter/source/dmapper/PropertyIds.hxx |1 -
3 files changed, 5 deletions(-)
New commits:
commit fad1f551ebc2db9c13e2f1f8f6c748b1ac45793b
Author: Oliver Specht
AuthorDate: Wed Mar 20 16:25:17 2024 +0100
Commit: Xisco Fauli
CommitDate: Thu Mar 21 21:21:05 2024 +0100
Revert "tdf#159730 add compatibility option in RTF import"
This reverts commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58.
Reason for revert: The compatibility option is the wrong approach. This
results in wrong line calculation as seen in tdf#159730#c6.
The problem that really needs to be fixed is the 9pt attribute of the
hidden line breaks in the first paragraph that are used to calculate the height
of the first paragraph.
Only the 1pt font attribute of the remaining visible space should define
the line height.
Change-Id: I6e0a1a499adaf2df9f68afbcfd6afcd6677e8f76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165006
Tested-by: Jenkins
Reviewed-by: Michael Stahl
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165104
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index ecd6ad6b242a..c4001cf0fe61 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,9 +129,6 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
m_pImpl->SetDocumentSettingsProperty(
getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING),
uno::Any(true));
-m_pImpl->SetDocumentSettingsProperty(
-getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION),
-uno::Any(true));
// Don't load the default style definitions to avoid weird mix
m_pImpl->SetDocumentSettingsProperty("StylesNoDefault",
uno::Any(true));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 4069a9ac7fe5..11ef07230fad 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -378,7 +378,6 @@ namespace
{ PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF, u"CursorNotIgnoreTables"},
{ PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
{ PROP_DECORATIVE, u"Decorative"},
-{ PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION,
u"IgnoreTabsAndBlanksForLineCalculation"},
});
} // end anonymous ns
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index 25099a684dcd..6708c6dfbf35 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -377,7 +377,6 @@ enum PropertyIds
,PROP_RTL_GUTTER
,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
,PROP_PARA_CONNECT_BORDERS
-,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION
};
//Returns the UNO string equivalent to eId.
core.git: Branch 'libreoffice-7-6-6' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |3 ---
writerfilter/source/dmapper/PropertyIds.cxx |1 -
writerfilter/source/dmapper/PropertyIds.hxx |1 -
3 files changed, 5 deletions(-)
New commits:
commit b4c354aa8ba941071ef5fe848eb8eb7ccacd8380
Author: Oliver Specht
AuthorDate: Wed Mar 20 16:25:17 2024 +0100
Commit: Christian Lohmaier
CommitDate: Thu Mar 21 18:13:34 2024 +0100
Revert "tdf#159730 add compatibility option in RTF import"
This reverts commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58.
Reason for revert: The compatibility option is the wrong approach. This
results in wrong line calculation as seen in tdf#159730#c6.
The problem that really needs to be fixed is the 9pt attribute of the
hidden line breaks in the first paragraph that are used to calculate the height
of the first paragraph.
Only the 1pt font attribute of the remaining visible space should define
the line height.
Change-Id: I6e0a1a499adaf2df9f68afbcfd6afcd6677e8f76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165006
Tested-by: Jenkins
Reviewed-by: Michael Stahl
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165120
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index ecd6ad6b242a..c4001cf0fe61 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,9 +129,6 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
m_pImpl->SetDocumentSettingsProperty(
getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING),
uno::Any(true));
-m_pImpl->SetDocumentSettingsProperty(
-getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION),
-uno::Any(true));
// Don't load the default style definitions to avoid weird mix
m_pImpl->SetDocumentSettingsProperty("StylesNoDefault",
uno::Any(true));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 4069a9ac7fe5..11ef07230fad 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -378,7 +378,6 @@ namespace
{ PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF, u"CursorNotIgnoreTables"},
{ PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
{ PROP_DECORATIVE, u"Decorative"},
-{ PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION,
u"IgnoreTabsAndBlanksForLineCalculation"},
});
} // end anonymous ns
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index 25099a684dcd..6708c6dfbf35 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -377,7 +377,6 @@ enum PropertyIds
,PROP_RTL_GUTTER
,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
,PROP_PARA_CONNECT_BORDERS
-,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION
};
//Returns the UNO string equivalent to eId.
core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |3 ---
writerfilter/source/dmapper/PropertyIds.cxx |1 -
writerfilter/source/dmapper/PropertyIds.hxx |1 -
3 files changed, 5 deletions(-)
New commits:
commit 44e4ada23dfc8655ec7ddccfd027f02d22684d60
Author: Oliver Specht
AuthorDate: Wed Mar 20 16:25:17 2024 +0100
Commit: Michael Stahl
CommitDate: Thu Mar 21 15:41:19 2024 +0100
Revert "tdf#159730 add compatibility option in RTF import"
This reverts commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58.
Reason for revert: The compatibility option is the wrong approach. This
results in wrong line calculation as seen in tdf#159730#c6.
The problem that really needs to be fixed is the 9pt attribute of the
hidden line breaks in the first paragraph that are used to calculate the height
of the first paragraph.
Only the 1pt font attribute of the remaining visible space should define
the line height.
Change-Id: I6e0a1a499adaf2df9f68afbcfd6afcd6677e8f76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165006
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 3548ece176ed..22a2a17045c0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -131,9 +131,6 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
m_pImpl->SetDocumentSettingsProperty(
getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING),
uno::Any(true));
-m_pImpl->SetDocumentSettingsProperty(
-getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION),
-uno::Any(true));
// Don't load the default style definitions to avoid weird mix
m_pImpl->SetDocumentSettingsProperty("StylesNoDefault",
uno::Any(true));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 8a83ca0bb064..b8b4efc06222 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -384,7 +384,6 @@ namespace
{ PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
{ PROP_DECORATIVE, u"Decorative"},
{ PROP_PAPER_TRAY, u"PrinterPaperTray"},
-{ PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION,
u"IgnoreTabsAndBlanksForLineCalculation"},
});
} // end anonymous ns
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index bb2fb833516c..b39fcd24fa49 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -383,7 +383,6 @@ enum PropertyIds
,PROP_RTL_GUTTER
,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
,PROP_PARA_CONNECT_BORDERS
-,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION
};
//Returns the UNO string equivalent to eId.
core.git: include/editeng include/svl include/svx sd/source svx/source writerfilter/source
include/editeng/unoprnms.hxx|2 ++
include/svl/solar.hrc |2 +-
include/svx/unoshprp.hxx|4 +++-
sd/source/ui/inc/unoprnms.hxx |2 +-
sd/source/ui/unoidl/unoobj.cxx |2 +-
svx/source/unodraw/unoshap2.cxx | 23 +++
writerfilter/source/rtftok/rtfsdrimport.cxx |4
7 files changed, 35 insertions(+), 4 deletions(-)
New commits:
commit aba13d6b4b2d586b356e7b98a23a7796e30c37ec
Author: Oliver Specht
AuthorDate: Wed Mar 13 07:35:09 2024 +0100
Commit: Thorsten Behrens
CommitDate: Wed Mar 13 22:11:40 2024 +0100
tdf#152878 switch off replacment image in picture frame
RTF documents may contain shapes of the type "Picture frame"
({\sn shapeType}{\sv 75}) that are imported as SdrGraphObj
This change prevents the display of a replacement picture
if there is no picture set.
Change-Id: Ia3a576ddcb2a3bbffae859102d274d4ecd214f6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164755
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 7f742f549833..947cfb0d1ca3 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -370,4 +370,6 @@ inline constexpr OUString UNO_NAME_GRAPHIC_TRANSPARENCY =
u"Transparency"_ustr;
inline constexpr OUString UNO_NAME_GRAPHIC_COLOR_MODE =
u"GraphicColorMode"_ustr;
inline constexpr OUString UNO_NAME_GRAPHIC_GRAPHICCROP = u"GraphicCrop"_ustr;
+inline constexpr OUString UNO_NAME_OBJ_ISEMPTYPRESOBJ =
u"IsEmptyPresentationObject"_ustr;
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc
index f1ec1a456829..a3a0ecd0ac0d 100644
--- a/include/svl/solar.hrc
+++ b/include/svl/solar.hrc
@@ -23,7 +23,7 @@
// defines --
#define OWN_ATTR_VALUE_START3900
-#define OWN_ATTR_VALUE_END 4008
+#define OWN_ATTR_VALUE_END 4009
#define RID_LIB_START 1
#define RID_LIB_END 1
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 0bf49b7a3e8c..9244f719a684 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -197,7 +197,8 @@
#define OWN_ATTR_TEXTCOLUMNS(OWN_ATTR_VALUE_START+106)
#define OWN_ATTR_HYPERLINK (OWN_ATTR_VALUE_START+107)
#define OWN_ATTR_MISC_OBJ_DECORATIVE(OWN_ATTR_VALUE_START+108)
-// ATTENTION: current maximum is OWN_ATTR_VALUE_START+108 svx; when adding
values, update
+#define OWN_ATTR_OBJ_ISEMPTYPRESOBJ (OWN_ATTR_VALUE_START+109)
+// ATTENTION: current maximum is OWN_ATTR_VALUE_START+109 svx; when adding
values, update
// OWN_ATTR_VALUE_END in include/svl/solar.hrc accordingly
// #FontWork#
@@ -477,6 +478,7 @@
{ UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT,
OWN_ATTR_SIGNATURELINE_CAN_ADD_COMMENT, cppu::UnoType::get(), 0, 0}, \
{ UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE,
OWN_ATTR_SIGNATURELINE_UNSIGNED_IMAGE,
cppu::UnoType::get(), 0, 0}, \
{ UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED,
OWN_ATTR_SIGNATURELINE_IS_SIGNED , cppu::UnoType::get(), 0, 0}, \
+{ UNO_NAME_OBJ_ISEMPTYPRESOBJ,OWN_ATTR_OBJ_ISEMPTYPRESOBJ ,
cppu::UnoType::get(), 0, 0}, \
{ UNO_NAME_GRAPHOBJ_QRCODE, OWN_ATTR_QRCODE,
cppu::UnoType::get(), 0, 0},
#define SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
diff --git a/sd/source/ui/inc/unoprnms.hxx b/sd/source/ui/inc/unoprnms.hxx
index 1d3a9055257b..9753c1a2871a 100644
--- a/sd/source/ui/inc/unoprnms.hxx
+++ b/sd/source/ui/inc/unoprnms.hxx
@@ -44,7 +44,7 @@
#define UNO_NAME_OBJ_DIMHIDE"DimHide"
#define UNO_NAME_OBJ_DIMPREV"DimPrevious"
#define UNO_NAME_OBJ_EFFECT "Effect"
-#define UNO_NAME_OBJ_ISEMPTYPRESOBJ "IsEmptyPresentationObject"
+#define UNO_NAME_OBJ_ISEMPTYPRESOBJ_SD "IsEmptyPresentationObject"
#define UNO_NAME_OBJ_ISPRESOBJ "IsPresentationObject"
#define UNO_NAME_OBJ_CLICKACTION"OnClick"
#define UNO_NAME_OBJ_PLAYFULL "PlayFull"
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 1822bafe9155..07415ce3304e 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -112,7 +112,7 @@ using ::com::sun::star::drawing::XShape;
{ u"" UNO_NAME_OBJ_DIMHIDE ""_ustr, WID_DIMHIDE,
cppu::UnoType::get(),0, 0},\
{ u"" UNO_NAME_OBJ_DIMPREV ""_ustr, WID_DIMPREV,
cppu::UnoType::get(),0, 0},\
{ u"" UNO_NAME_OBJ_EFFECT ""_ustr, WID_EFFECT,
cppu::UnoType::get(), 0, 0},\
-{ u"" UNO_NAME_OBJ_ISEMPTYPRESOBJ
core.git: Branch 'feature/cib_contract49' - editeng/qa editeng/source
editeng/qa/unit/core-test.cxx | 21 +
editeng/source/editeng/impedit.hxx |2 +-
editeng/source/editeng/impedit2.cxx |4 ++--
editeng/source/editeng/impedit4.cxx |6 +-
4 files changed, 9 insertions(+), 24 deletions(-)
New commits:
commit d512a1dcc0aed6796ad698800d1d9eb416503881
Author: Oliver Specht
AuthorDate: Thu Mar 7 17:06:54 2024 +0100
Commit: Thorsten Behrens
CommitDate: Tue Mar 12 17:08:17 2024 +0100
tdf#63259 Cycle case should work on end of words
Now words are selected if the cursor is positioned at the end of
the word. SENTENCE_CASE does not force sentence selection anymore.
Change-Id: I672352b2c18bb695004fd4eb0f20ae5fd7a0ac53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164546
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164712
Tested-by: Thorsten Behrens
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 6fe616b1a034..9e988d429dad 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -1992,15 +1992,16 @@ void Test::testTransliterate()
int selStart = 12;
int selEnd = 12;
ESelection esel(0, selStart, 0, selEnd);
+ESelection eSentenceSel(0, 0, 0, 25);
/* DocumentContentOperationsManager checks if the cursor is inside of a
word before transliterating,
* but Edit Engine has no such check. Therefore, behavior is different
between these two when the
* cursor is on a word boundary. */
-/* No selection tests. Cursor between the ' ' and 'm' before 'met'. */
+/* No selection tests. Cursor between the ' ' and 'm' before 'met' -
except in SENTENCE_CASE where the complete sentence is selected.*/
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
- lcl_translitTest(editEng, sText2, esel,
TF::SENTENCE_CASE));
+ lcl_translitTest(editEng, sText2, eSentenceSel,
TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel,
TF::TITLE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones MET joe Smith. Time Passed."),
@@ -2013,11 +2014,9 @@ void Test::testTransliterate()
selEnd = 14;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
- lcl_translitTest(editEng, sText2, esel,
TF::SENTENCE_CASE));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
+CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel,
TF::TITLE_CASE));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
+CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones MET joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel,
TF::LOWERCASE_UPPERCASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel,
TF::UPPERCASE_LOWERCASE));
@@ -2027,8 +2026,6 @@ void Test::testTransliterate()
selEnd = 24;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
- lcl_translitTest(editEng, sText2, esel,
TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel,
TF::TITLE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
@@ -2041,8 +2038,6 @@ void Test::testTransliterate()
selEnd = 12;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
- lcl_translitTest(editEng, sText2, esel,
TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel,
TF::TITLE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones MET joe Smith. Time Passed."),
@@ -2055,8 +2050,6 @@ void Test::testTransliterate()
selEnd = 14;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString("met"), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
- lcl_translitTest(editEng, sText2, esel,
TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
core.git: editeng/qa editeng/source
editeng/qa/unit/core-test.cxx | 15 +--
editeng/source/editeng/impedit.hxx |2 +-
editeng/source/editeng/impedit2.cxx |4 ++--
editeng/source/editeng/impedit4.cxx |6 +-
4 files changed, 9 insertions(+), 18 deletions(-)
New commits:
commit 51964bb719848277094afe22d144d2814e1cce46
Author: Oliver Specht
AuthorDate: Thu Mar 7 17:06:54 2024 +0100
Commit: Thorsten Behrens
CommitDate: Tue Mar 12 10:32:10 2024 +0100
tdf#63259 Cycle case should work on end of words
Now words are selected if the cursor is positioned at the end of
the word. SENTENCE_CASE does not force sentence selection anymore.
Change-Id: I672352b2c18bb695004fd4eb0f20ae5fd7a0ac53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164546
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 220043e58348..14ce66ef55a3 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -1868,14 +1868,15 @@ void Test::testTransliterate()
int selStart = 12;
int selEnd = 12;
ESelection esel(0, selStart, 0, selEnd);
+ESelection eSentenSel(0, 0, 0, 25);
/* DocumentContentOperationsManager checks if the cursor is inside of a
word before transliterating,
* but Edit Engine has no such check. Therefore, behavior is different
between these two when the
* cursor is on a word boundary. */
-/* No selection tests. Cursor between the ' ' and 'm' before 'met'. */
+/* No selection tests. Cursor between the ' ' and 'm' before 'met' -
except in SENTENCE_CASE where the complete sentence is selected.*/
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::SENTENCE_CASE));
+CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, eSentenSel, TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones MET joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::UPPERCASE_LOWERCASE));
@@ -1885,9 +1886,8 @@ void Test::testTransliterate()
selEnd = 14;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::SENTENCE_CASE));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
+CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
+CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones MET joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::UPPERCASE_LOWERCASE));
/* No selection tests. Cursor between the 'h' and the '.' after 'Smith'. */
@@ -1895,7 +1895,6 @@ void Test::testTransliterate()
selEnd = 24;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::UPPERCASE_LOWERCASE));
@@ -1905,7 +1904,6 @@ void Test::testTransliterate()
selEnd = 12;
esel = ESelection(0, selStart, 0, selEnd);
CPPUNIT_ASSERT_EQUAL(OUString(""), editEng.GetText(esel));
-CPPUNIT_ASSERT_EQUAL(OUString("Mary jones met joe smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::SENTENCE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones Met joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::TITLE_CASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones MET joe Smith. Time Passed."),
lcl_translitTest(editEng, sText2, esel, TF::LOWERCASE_UPPERCASE));
CPPUNIT_ASSERT_EQUAL(OUString("Mary Jones
core.git: include/svx svx/inc svx/Library_svxcore.mk svx/source svx/uiconfig
include/svx/galctrl.hxx| 10
svx/Library_svxcore.mk |1
svx/inc/GalleryControl.hxx |4
svx/inc/galbrws2.hxx | 185
svx/source/gallery2/GalleryControl.cxx |8
svx/source/gallery2/galbrws1.cxx | 1318 -
svx/source/gallery2/galbrws1.hxx | 91 --
svx/source/gallery2/galbrws2.cxx | 1243 ---
svx/source/gallery2/galctrl.cxx| 10
svx/source/inc/galbrws1.hxx| 250 ++
svx/uiconfig/ui/sidebargallery.ui | 27
11 files changed, 1594 insertions(+), 1553 deletions(-)
New commits:
commit 09c6204b6309321aa25c542f918fde9f5f3f7fe2
Author: Oliver Specht
AuthorDate: Thu Feb 29 17:15:23 2024 +0100
Commit: Gabor Kelemen
CommitDate: Mon Mar 11 14:39:18 2024 +0100
tdf#81880 Search the Gallery
Adds a search field to the gallery to search for icons titles.
Wildcards '*' and '?' are supported
Change-Id: I7a8ed2addef3031b77c21889cf72b964ca26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164167
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 61fd62927a2d..4e35d5aaae3d 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -28,7 +28,7 @@
class GalleryDragDrop;
class GalleryTheme;
-class GalleryBrowser2;
+class GalleryBrowser1;
class INetURLObject;
class GalleryPreview final : public weld::CustomWidgetController
@@ -39,7 +39,7 @@ private:
std::unique_ptr mxScrolledWindow;
GraphicObject aGraphicObj;
tools::Rectangle aPreviewRect;
-GalleryBrowser2* mpParent;
+GalleryBrowser1* mpParent;
GalleryTheme* mpTheme;
bool ImplGetGraphicCenterRect( const Graphic& rGraphic,
tools::Rectangle& rResultRect ) const;
@@ -53,7 +53,7 @@ private:
public:
-GalleryPreview(GalleryBrowser2* pParent,
std::unique_ptr xScrolledWindow);
+GalleryPreview(GalleryBrowser1* pParent,
std::unique_ptr xScrolledWindow);
void SetTheme(GalleryTheme* pTheme) { mpTheme = pTheme; }
virtual ~GalleryPreview() override;
@@ -90,7 +90,7 @@ class GalleryIconView final : public ValueSet
private:
std::unique_ptr mxDragDropTargetHelper;
-GalleryBrowser2*mpParent;
+GalleryBrowser1*mpParent;
GalleryTheme* mpTheme;
// ValueSet
@@ -105,7 +105,7 @@ private:
public:
-GalleryIconView(GalleryBrowser2* pParent,
std::unique_ptr xScrolledWindow);
+GalleryIconView(GalleryBrowser1* pParent,
std::unique_ptr xScrolledWindow);
void SetTheme(GalleryTheme* pTheme) { mpTheme = pTheme; }
virtual ~GalleryIconView() override;
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 2363f5023bfd..40fad5ea6b4f 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -195,7 +195,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/form/xfm_addcondition \
svx/source/gallery2/codec \
svx/source/gallery2/galbrws1 \
-svx/source/gallery2/galbrws2 \
svx/source/gallery2/galctrl \
svx/source/gallery2/galexpl \
svx/source/gallery2/galini \
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index d5835fb5759b..3b33c034a5b2 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -27,7 +27,7 @@ class SfxBindings;
class Gallery;
class GalleryBrowser1;
-class GalleryBrowser2;
+//class GalleryBrowser2;
class FmFormModel;
class Splitter;
@@ -42,7 +42,7 @@ public:
private:
Gallery* mpGallery;
std::unique_ptr mxBrowser1;
-std::unique_ptr mxBrowser2;
+//std::unique_ptr mxBrowser2;
};
} // end of namespace svx::sidebar
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
deleted file mode 100644
index d5ca8a50a041..
--- a/svx/inc/galbrws2.hxx
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_INC_GALBRWS2_HXX
-#define INCLUDED_SVX_INC_GALBRWS2_HXX
-
-#include
-#include
-#include
core.git: sd/source svx/source
sd/source/ui/func/fuformatpaintbrush.cxx |7 ++-
svx/source/svdraw/svdedxv.cxx|4 +++-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit dbb05dc818afb08b3e05ac62bd92389a5cf90fa7
Author: Oliver Specht
AuthorDate: Thu Mar 7 12:47:22 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Mar 7 21:48:37 2024 +0100
tdf#159726 Improve Clone formatting
Paragraph attributes and lists are copied if there is no source
selection or the source selection includes at least a full paragraph.
They are only applied to an empty or a paragraph selection.
As in tdf#160069 requested the clone formatting function is only enabled
in text edit mode.
Change-Id: I789402a7928837bb85ec941fd6f958d12585ac40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164533
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index 930e75233f32..89eecc13f989 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -45,6 +45,9 @@ bool ShouldPasteParaFormatPerSelection(const OutlinerView*
pOLV)
if(!pOLV)
return true;
+if(!pOLV->GetEditView().HasSelection())
+return true;
+
if(!pOLV->GetEditView().IsSelectionWithinSinglePara())
return false;
@@ -286,7 +289,9 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats,
bool bNoParagraphForma
if( rMarkList.GetMarkCount() == 1 )
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-if( pObj &&
SdrObjEditView::SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier())
)
+const OutlinerView* pOLV =
rDrawViewShell.GetDrawView()->GetTextEditOutlinerView();
+if( pObj && pOLV &&
+
SdrObjEditView::SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier())
)
return;
}
rSet.DisableItem( SID_FORMATPAINTBRUSH );
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index fb130a16a212..c0e1b715ea31 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2896,7 +2896,9 @@ sal_Int32
SdrObjEditView::TakeFormatPaintBrush(std::shared_ptr& rFor
OutlinerView* pOLV = GetTextEditOutlinerView();
-bool isParaSelection = pOLV ? pOLV->GetEditView().IsSelectionFullPara() :
false;
+bool isParaSelection
+= pOLV ? !pOLV->GetEditView().HasSelection() ||
pOLV->GetEditView().IsSelectionFullPara()
+ : false;
rFormatSet = std::make_shared(GetModel().GetItemPool(),
GetFormatRangeImpl(pOLV !=
nullptr, isParaSelection));
if (pOLV)
core.git: sw/qa
sw/qa/uitest/data/tdf146356.odt |binary
sw/qa/uitest/writer_tests8/tdf146356.py | 24
2 files changed, 24 insertions(+)
New commits:
commit bfb6904d8c0b054409faf8469752b033d7c2955a
Author: Oliver Specht
AuthorDate: Wed Mar 6 16:29:33 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Mar 7 21:44:35 2024 +0100
test of tdf#146356
Inserts a paragraph in front of a protected table of contents
and inserts text into the new paragraph
Change-Id: I951fa2bea63dc2b5721876268aa27a8df579b210
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164480
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/uitest/data/tdf146356.odt b/sw/qa/uitest/data/tdf146356.odt
new file mode 100755
index ..a143986a1423
Binary files /dev/null and b/sw/qa/uitest/data/tdf146356.odt differ
diff --git a/sw/qa/uitest/writer_tests8/tdf146356.py
b/sw/qa/uitest/writer_tests8/tdf146356.py
new file mode 100755
index ..9fd9631d4794
--- /dev/null
+++ b/sw/qa/uitest/writer_tests8/tdf146356.py
@@ -0,0 +1,24 @@
+# -*- 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_state_as_dict, get_url_for_data_file
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from libreoffice.linguistic.linguservice import get_lingu_service_manager
+from com.sun.star.lang import Locale
+import time
+
+# insert paragraph in front of a protected table of contents
+# and insert text into this new paragraph
+class tdf146356(UITestCase):
+def test_tdf146356_insert_para_before_TOX(self):
+with self.ui_test.load_file(get_url_for_data_file("tdf146356.odt")) as
writer_doc:
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"ALT+RETURN"}))
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"TEXT": "Some
text"}))
core.git: sd/source
sd/source/ui/func/fuformatpaintbrush.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit bea5341c22b40f690059933550e721cdcfb466aa
Author: Oliver Specht
AuthorDate: Tue Mar 5 15:42:18 2024 +0100
Commit: Thorsten Behrens
CommitDate: Wed Mar 6 21:21:39 2024 +0100
Improve clone formatting
Follow-up to 178d8a38e133aebd4cff1af2d2c49aec60468c92
Makes sure that without selection at target position only
character attributes are copied
Change-Id: I677b1ef29855fb2cf4c42a7b821678ecdd37c7f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164430
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx
b/sd/source/ui/func/fuformatpaintbrush.cxx
index 9bbd30939d53..930e75233f32 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -40,17 +40,13 @@
namespace
{
// Paragraph properties are pasted if the selection contains a whole paragraph
-// or there was no selection at all (i.e. just a left click)
bool ShouldPasteParaFormatPerSelection(const OutlinerView* pOLV)
{
if(!pOLV)
return true;
-if(!pOLV->GetEditView().HasSelection())
-return true;
-
if(!pOLV->GetEditView().IsSelectionWithinSinglePara())
-return true;
+return false;
return pOLV->GetEditView().IsSelectionFullPara();
}
core.git: Branch 'libreoffice-24-2' - sw/source xmloff/source
sw/source/core/doc/doctxm.cxx |2
sw/source/core/edit/edsect.cxx | 147 ++--
xmloff/source/text/XMLSectionExport.cxx |6 +
3 files changed, 93 insertions(+), 62 deletions(-)
New commits:
commit 51f872cbc1291123401cf22f27a7185801660e4a
Author: Oliver Specht
AuthorDate: Tue Feb 27 16:43:56 2024 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 1 15:28:26 2024 +0100
tdf#146356 insert new paragraph before table of contents
Alt+Enter inserts the new paragraph before the content section
of a table of contents.
At the same time protected indexes now also have the header
protected.
Change-Id: Iff267691d96796158c1593c4269b76226840c952
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164050
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Michael Stahl
(cherry picked from commit aebdc79dbc5bf059ee0921a00d2795e526a52c42)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164128
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index f03687d810e4..d29223050b6a 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1057,7 +1057,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
SwSectionFormat* pSectFormat = rDoc.MakeSectionFormat();
rDoc.GetNodes().InsertTextSection(
*pHeadNd, *pSectFormat, headerData, nullptr, (),
true, false);
-
+pSectFormat->GetSection()->SetProtect(SwTOXBase::IsProtected());
if (pUndo)
{
pUndo->TitleSectionInserted(*pSectFormat);
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index a7e652aea9de..04ed95fa42cb 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -308,89 +308,114 @@ static const SwNode* lcl_SpecialInsertNode(const
SwPosition* pCurrentPos)
// pInnermostNode contains the section/table before/after which we should
// insert our empty paragraph, or it will be NULL if none is found.
const SwNode* pInnermostNode = nullptr;
+const SwSection* pSection = nullptr;
{
const SwNode* pTableNode = rCurrentNode.FindTableNode();
const SwNode* pSectionNode = rCurrentNode.FindSectionNode();
// find the table/section which is close
if( pTableNode == nullptr )
+{
pInnermostNode = pSectionNode;
+pSection = _cast(pSectionNode)->GetSection();
+}
else if ( pSectionNode == nullptr )
pInnermostNode = pTableNode;
else
{
// compare and choose the larger one
-pInnermostNode =
-( pSectionNode->GetIndex() > pTableNode->GetIndex() )
-? pSectionNode : pTableNode;
+if (pSectionNode->GetIndex() > pTableNode->GetIndex())
+{
+pInnermostNode = pSectionNode;
+pSection = _cast(pSectionNode)->GetSection();
+}
+else
+pInnermostNode = pTableNode;
}
}
-
-// The previous version had a check to skip empty read-only sections. Those
-// shouldn't occur, so we only need to check whether our pInnermostNode is
-// inside a protected area.
-
-// Now, pInnermostNode is NULL or the innermost section or table node.
-if( (pInnermostNode != nullptr) && !pInnermostNode->IsProtect() )
+bool bIsProtected = pInnermostNode->IsProtect();
+if(pInnermostNode != nullptr)
{
-OSL_ENSURE( pInnermostNode->IsTableNode() ||
-pInnermostNode->IsSectionNode(), "wrong node found" );
-OSL_ENSURE( ( pInnermostNode->GetIndex() <= rCurrentNode.GetIndex() )&&
-( pInnermostNode->EndOfSectionNode()->GetIndex() >=
- rCurrentNode.GetIndex() ), "wrong node found" );
-
-// we now need to find the possible start/end positions
-
-// we found a start if
-// - we're at or just before a start node
-// - there are only start nodes between the current and pInnermostNode
-SwNodeIndex aBegin( pCurrentPos->GetNode() );
-if( rCurrentNode.IsContentNode() &&
-(pCurrentPos->GetContentIndex() == 0))
---aBegin;
-while( (aBegin != pInnermostNode->GetIndex()) &&
- aBegin.GetNode().IsStartNode() )
---aBegin;
-bool bStart = ( aBegin == pInnermostNode->GetIndex() );
-
-// we found an end if
-// - we're at or just before an end node
-// - there are only end nodes between the current node and
-// pInnermostNode's end node or
-// - there are only end nodes between the last table cell merged with
-// the current cell and pInnermostNode's end node
-SwNodeIndex aEnd( pCurrentPos->GetNode() );
-if( rCurrentNode.IsContentNode() &&
-(
core.git: sw/source xmloff/source
sw/source/core/doc/doctxm.cxx |2
sw/source/core/edit/edsect.cxx | 147 ++--
xmloff/source/text/XMLSectionExport.cxx |6 +
3 files changed, 93 insertions(+), 62 deletions(-)
New commits:
commit aebdc79dbc5bf059ee0921a00d2795e526a52c42
Author: Oliver Specht
AuthorDate: Tue Feb 27 16:43:56 2024 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 1 11:22:16 2024 +0100
tdf#146356 insert new paragraph before table of contents
Alt+Enter inserts the new paragraph before the content section
of a table of contents.
At the same time protected indexes now also have the header
protected.
Change-Id: Iff267691d96796158c1593c4269b76226840c952
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164050
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 8acfafbe6dea..da790cc3dd7b 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1059,7 +1059,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
SwSectionFormat* pSectFormat = rDoc.MakeSectionFormat();
rDoc.GetNodes().InsertTextSection(
*pHeadNd, *pSectFormat, headerData, nullptr, (),
true, false);
-
+pSectFormat->GetSection()->SetProtect(SwTOXBase::IsProtected());
if (pUndo)
{
pUndo->TitleSectionInserted(*pSectFormat);
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index a7e652aea9de..04ed95fa42cb 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -308,89 +308,114 @@ static const SwNode* lcl_SpecialInsertNode(const
SwPosition* pCurrentPos)
// pInnermostNode contains the section/table before/after which we should
// insert our empty paragraph, or it will be NULL if none is found.
const SwNode* pInnermostNode = nullptr;
+const SwSection* pSection = nullptr;
{
const SwNode* pTableNode = rCurrentNode.FindTableNode();
const SwNode* pSectionNode = rCurrentNode.FindSectionNode();
// find the table/section which is close
if( pTableNode == nullptr )
+{
pInnermostNode = pSectionNode;
+pSection = _cast(pSectionNode)->GetSection();
+}
else if ( pSectionNode == nullptr )
pInnermostNode = pTableNode;
else
{
// compare and choose the larger one
-pInnermostNode =
-( pSectionNode->GetIndex() > pTableNode->GetIndex() )
-? pSectionNode : pTableNode;
+if (pSectionNode->GetIndex() > pTableNode->GetIndex())
+{
+pInnermostNode = pSectionNode;
+pSection = _cast(pSectionNode)->GetSection();
+}
+else
+pInnermostNode = pTableNode;
}
}
-
-// The previous version had a check to skip empty read-only sections. Those
-// shouldn't occur, so we only need to check whether our pInnermostNode is
-// inside a protected area.
-
-// Now, pInnermostNode is NULL or the innermost section or table node.
-if( (pInnermostNode != nullptr) && !pInnermostNode->IsProtect() )
+bool bIsProtected = pInnermostNode->IsProtect();
+if(pInnermostNode != nullptr)
{
-OSL_ENSURE( pInnermostNode->IsTableNode() ||
-pInnermostNode->IsSectionNode(), "wrong node found" );
-OSL_ENSURE( ( pInnermostNode->GetIndex() <= rCurrentNode.GetIndex() )&&
-( pInnermostNode->EndOfSectionNode()->GetIndex() >=
- rCurrentNode.GetIndex() ), "wrong node found" );
-
-// we now need to find the possible start/end positions
-
-// we found a start if
-// - we're at or just before a start node
-// - there are only start nodes between the current and pInnermostNode
-SwNodeIndex aBegin( pCurrentPos->GetNode() );
-if( rCurrentNode.IsContentNode() &&
-(pCurrentPos->GetContentIndex() == 0))
---aBegin;
-while( (aBegin != pInnermostNode->GetIndex()) &&
- aBegin.GetNode().IsStartNode() )
---aBegin;
-bool bStart = ( aBegin == pInnermostNode->GetIndex() );
-
-// we found an end if
-// - we're at or just before an end node
-// - there are only end nodes between the current node and
-// pInnermostNode's end node or
-// - there are only end nodes between the last table cell merged with
-// the current cell and pInnermostNode's end node
-SwNodeIndex aEnd( pCurrentPos->GetNode() );
-if( rCurrentNode.IsContentNode() &&
-( pCurrentPos->GetContentIndex() ==
- rCurrentNode.GetContentNode()->Len() ) )
+//special case - ToxSection
+// - in this case the inner
core.git: sw/qa
sw/qa/uitest/data/tdf159797.odt |binary
sw/qa/uitest/writer_tests8/tdf159797.py | 29 +
2 files changed, 29 insertions(+)
New commits:
commit 173a79365b110cf70f628a602a22049562a477f5
Author: Oliver Specht
AuthorDate: Wed Feb 28 11:49:59 2024 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 1 11:07:29 2024 +0100
Unit test to tdf159797
checks replacement of dash to endash after sentence
Change-Id: I61843825faaf212eb5560797f1b6a2fdad5efce9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164086
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/uitest/data/tdf159797.odt b/sw/qa/uitest/data/tdf159797.odt
new file mode 100755
index ..437b6fc0cf7a
Binary files /dev/null and b/sw/qa/uitest/data/tdf159797.odt differ
diff --git a/sw/qa/uitest/writer_tests8/tdf159797.py
b/sw/qa/uitest/writer_tests8/tdf159797.py
new file mode 100644
index ..a29a1f517890
--- /dev/null
+++ b/sw/qa/uitest/writer_tests8/tdf159797.py
@@ -0,0 +1,29 @@
+# -*- 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
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from com.sun.star.text.TextContentAnchorType import AT_PAGE, AT_PARAGRAPH
+
+class tdf159797(UITestCase):
+
+def test_tdf159797(self):
+
+with self.ui_test.load_file(get_url_for_data_file("tdf159797.odt")) as
document:
+
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+xWriterEdit.executeAction("CLICK", mkPropertyValues({"START_POS":
"26", "END_POS": "26"}))
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"TEXT": " "}))
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"0", "END_POS": "31"}))
+windowState = xWriterEdit.getState();
+self.assertEqual(windowState[14].Value, "This is a sentence.
\u2013 Here")
+
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
core.git: Branch 'libreoffice-24-2' - include/vcl sw/source vcl/inc vcl/osx vcl/source vcl/unx vcl/win
include/vcl/print.hxx|1 +
sw/source/filter/ww8/docxattributeoutput.cxx | 12 ++--
sw/source/filter/ww8/rtfattributeoutput.cxx | 11 +--
vcl/inc/osx/salprn.h |2 ++
vcl/inc/salprn.hxx |2 ++
vcl/inc/unx/genprn.h |2 ++
vcl/inc/win/salprn.h |2 ++
vcl/osx/salprn.cxx |5 +
vcl/source/gdi/print.cxx |8
vcl/unx/generic/print/genprnpsp.cxx |5 +
vcl/win/gdi/salprn.cxx | 16
11 files changed, 62 insertions(+), 4 deletions(-)
New commits:
commit e3fed54f866ac6880c9977d800aa455d3d37de5d
Author: Oliver Specht
AuthorDate: Tue Feb 20 13:25:41 2024 +0100
Commit: Michael Stahl
CommitDate: Fri Feb 23 14:49:48 2024 +0100
tdf#159793 Save printer paper tray in RTF and DOCX
Saves the paper tray id as w:paperSrc w:first and w:other in docx
and infsxn and insxn in RTF
Change-Id: I79004f54aba3b6609d7921afacf815726f7f2678
Change-Id: Ie3c11fffa6a133250b7db69b4e845bccaa8e2280
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163654
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 8b191a6566065438417665af32fa30f8346ad4df)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163831
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index e23cf8d0af1b..e7c88f56bdd8 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -228,6 +228,7 @@ public:
boolSetPaperBin( sal_uInt16 nPaperBin );
sal_uInt16 GetPaperBin() const;
sal_uInt16 GetPaperBinBySourceIndex(sal_uInt16
nPaperSource) const;
+sal_uInt16 GetSourceIndexByPaperBin(sal_uInt16 nPaperBin)
const;
voidSetPaper( Paper ePaper );
boolSetPaperSizeUser( const Size& rSize );
/** @return The paper format of the printer's current "jobsetup". Note
that if PAPER_USER the actual size can be anything. */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index fe78cb16b420..28da6d28838d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -161,6 +161,8 @@
#include
#include
#include
+#include
+#include
using ::editeng::SvxBorderLine;
@@ -9136,9 +9138,15 @@ void DocxAttributeOutput::FormatFrameSize( const
SwFormatFrameSize& rSize )
}
}
-void DocxAttributeOutput::FormatPaperBin( const SvxPaperBinItem& )
+void DocxAttributeOutput::FormatPaperBin(const SvxPaperBinItem& rPaperBin)
{
-SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::FormatPaperBin()" );
+sal_Int8 nPaperBin = rPaperBin.GetValue();
+rtl::Reference attrList =
FastSerializerHelper::createAttrList( );
+SfxPrinter* pPrinter =
m_rExport.m_rDoc.getIDocumentDeviceAccess().getPrinter(true);
+sal_Int16 nPaperSource = pPrinter->GetSourceIndexByPaperBin(nPaperBin);
+attrList->add( FSNS( XML_w, XML_first ), OString::number(nPaperSource) );
+attrList->add( FSNS( XML_w, XML_other ), OString::number(nPaperSource) );
+m_pSerializer->singleElementNS( XML_w, XML_paperSrc, attrList );
}
void DocxAttributeOutput::FormatFirstLineIndent(SvxFirstLineIndentItem const&
rFirstLine)
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 2d68556e8a23..8635022bad24 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -94,6 +94,8 @@
#include
#include
#include "rtfexport.hxx"
+#include
+#include
using namespace ::com::sun::star;
using namespace sw::util;
@@ -3324,9 +3326,14 @@ void RtfAttributeOutput::FormatFrameSize(const
SwFormatFrameSize& rSize)
}
}
-void RtfAttributeOutput::FormatPaperBin(const SvxPaperBinItem& /*rItem*/)
+void RtfAttributeOutput::FormatPaperBin(const SvxPaperBinItem& rItem)
{
-SAL_INFO("sw.rtf", "TODO: " << __func__);
+SfxPrinter* pPrinter =
m_rExport.m_rDoc.getIDocumentDeviceAccess().getPrinter(true);
+sal_Int16 nPaperSource =
pPrinter->GetSourceIndexByPaperBin(rItem.GetValue());
+m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_BINFSXN);
+m_aSectionBreaks.append(static_cast(nPaperSource));
+m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_BINSXN);
+m_aSectionBreaks.append(static_cast(nPaperSource));
}
void RtfAttributeOutput::FormatFirstLineIndent(SvxFirstLineIndentItem const&
rFirstLine)
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 9c26e171db23..cd262795178e 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -84,6 +84,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter
virtual OUStringGetPaperBinName( const
core.git: include/vcl sw/source vcl/inc vcl/osx vcl/source vcl/unx vcl/win
include/vcl/print.hxx|1 +
sw/source/filter/ww8/docxattributeoutput.cxx | 12 ++--
sw/source/filter/ww8/rtfattributeoutput.cxx | 11 +--
vcl/inc/osx/salprn.h |2 ++
vcl/inc/salprn.hxx |2 ++
vcl/inc/unx/genprn.h |2 ++
vcl/inc/win/salprn.h |2 ++
vcl/osx/salprn.cxx |5 +
vcl/source/gdi/print.cxx |8
vcl/unx/generic/print/genprnpsp.cxx |5 +
vcl/win/gdi/salprn.cxx | 16
11 files changed, 62 insertions(+), 4 deletions(-)
New commits:
commit 8b191a6566065438417665af32fa30f8346ad4df
Author: Oliver Specht
AuthorDate: Tue Feb 20 13:25:41 2024 +0100
Commit: Michael Stahl
CommitDate: Fri Feb 23 12:11:42 2024 +0100
tdf#159793 Save printer paper tray in RTF and DOCX
Saves the paper tray id as w:paperSrc w:first and w:other in docx
and infsxn and insxn in RTF
Change-Id: I79004f54aba3b6609d7921afacf815726f7f2678
Change-Id: Ie3c11fffa6a133250b7db69b4e845bccaa8e2280
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163654
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 870ed5d915a1..3da922afa884 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -234,6 +234,7 @@ public:
boolSetPaperBin( sal_uInt16 nPaperBin );
sal_uInt16 GetPaperBin() const;
sal_uInt16 GetPaperBinBySourceIndex(sal_uInt16
nPaperSource) const;
+sal_uInt16 GetSourceIndexByPaperBin(sal_uInt16 nPaperBin)
const;
voidSetPaper( Paper ePaper );
boolSetPaperSizeUser( const Size& rSize );
/** @return The paper format of the printer's current "jobsetup". Note
that if PAPER_USER the actual size can be anything. */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 8f4c8fb3dcb7..4f3152b6bc2e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -161,6 +161,8 @@
#include
#include
#include
+#include
+#include
using ::editeng::SvxBorderLine;
@@ -9138,9 +9140,15 @@ void DocxAttributeOutput::FormatFrameSize( const
SwFormatFrameSize& rSize )
}
}
-void DocxAttributeOutput::FormatPaperBin( const SvxPaperBinItem& )
+void DocxAttributeOutput::FormatPaperBin(const SvxPaperBinItem& rPaperBin)
{
-SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::FormatPaperBin()" );
+sal_Int8 nPaperBin = rPaperBin.GetValue();
+rtl::Reference attrList =
FastSerializerHelper::createAttrList( );
+SfxPrinter* pPrinter =
m_rExport.m_rDoc.getIDocumentDeviceAccess().getPrinter(true);
+sal_Int16 nPaperSource = pPrinter->GetSourceIndexByPaperBin(nPaperBin);
+attrList->add( FSNS( XML_w, XML_first ), OString::number(nPaperSource) );
+attrList->add( FSNS( XML_w, XML_other ), OString::number(nPaperSource) );
+m_pSerializer->singleElementNS( XML_w, XML_paperSrc, attrList );
}
void DocxAttributeOutput::FormatFirstLineIndent(SvxFirstLineIndentItem const&
rFirstLine)
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index cdf6d5ce9bd1..b3fbec75a8f5 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -94,6 +94,8 @@
#include
#include
#include "rtfexport.hxx"
+#include
+#include
using namespace ::com::sun::star;
using namespace sw::util;
@@ -3328,9 +3330,14 @@ void RtfAttributeOutput::FormatFrameSize(const
SwFormatFrameSize& rSize)
}
}
-void RtfAttributeOutput::FormatPaperBin(const SvxPaperBinItem& /*rItem*/)
+void RtfAttributeOutput::FormatPaperBin(const SvxPaperBinItem& rItem)
{
-SAL_INFO("sw.rtf", "TODO: " << __func__);
+SfxPrinter* pPrinter =
m_rExport.m_rDoc.getIDocumentDeviceAccess().getPrinter(true);
+sal_Int16 nPaperSource =
pPrinter->GetSourceIndexByPaperBin(rItem.GetValue());
+m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_BINFSXN);
+m_aSectionBreaks.append(static_cast(nPaperSource));
+m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_BINSXN);
+m_aSectionBreaks.append(static_cast(nPaperSource));
}
void RtfAttributeOutput::FormatFirstLineIndent(SvxFirstLineIndentItem const&
rFirstLine)
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 9c26e171db23..cd262795178e 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -84,6 +84,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter
virtual OUStringGetPaperBinName( const ImplJobSetup*
i_pSetupData, sal_uInt16 i_nPaperBin ) override;
virtual sal_uInt16 GetPaperBinBySourceIndex(const ImplJobSetup*
core.git: Branch 'feature/cib_contract49' - editeng/qa editeng/source sd/source
editeng/qa/unit/core-test.cxx | 1915 ++--
editeng/source/editeng/impedit2.cxx | 65 -
sd/source/ui/view/sdview3.cxx | 65 -
3 files changed, 1257 insertions(+), 788 deletions(-)
New commits:
commit f273d7cbabfa37a409d79f4afef089563d915a93
Author: Oliver Specht
AuthorDate: Thu Feb 1 11:06:02 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Feb 22 11:31:58 2024 +0100
prefer simple HTML format over RTF while pasting clipboard content
This changes applies to draw text, only
JUnit test is included
Change-Id: I00387f3932c0aa54099c9bc7390ad86b4398b417
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 075703266c18..c270c0c46493 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -35,12 +35,13 @@
#include
#include
+#include
#include
using namespace com::sun::star;
-namespace {
-
+namespace
+{
class Test : public test::BootstrapFixture
{
public:
@@ -68,6 +69,18 @@ public:
/// Test Copy/Paste using Legacy Format
void testCopyPaste();
+/// Test Paste using HTML
+void testHTMLPaste();
+
+/// Test Paste using an HTML fragment
+void testHTMLFragmentPaste();
+
+/// Test Paste using an RTF
+void testRTFPaste();
+
+/// Test Paste preference HTML/
+void testRTFHTMLPaste();
+
/// Test Copy/Paste with selective selection over multiple paragraphs
void testMultiParaSelCopyPaste();
@@ -103,7 +116,7 @@ public:
void testSingleLine();
-DECL_STATIC_LINK( Test, CalcFieldValueHdl, EditFieldInfo*, void );
+DECL_STATIC_LINK(Test, CalcFieldValueHdl, EditFieldInfo*, void);
CPPUNIT_TEST_SUITE(Test);
#if HAVE_MORE_FONTS
@@ -114,6 +127,10 @@ public:
CPPUNIT_TEST(testAutocorrect);
CPPUNIT_TEST(testHyperlinkCopyPaste);
CPPUNIT_TEST(testCopyPaste);
+CPPUNIT_TEST(testHTMLPaste);
+CPPUNIT_TEST(testHTMLFragmentPaste);
+CPPUNIT_TEST(testRTFPaste);
+CPPUNIT_TEST(testRTFHTMLPaste);
CPPUNIT_TEST(testMultiParaSelCopyPaste);
CPPUNIT_TEST(testTabsCopyPaste);
CPPUNIT_TEST(testHyperlinkSearch);
@@ -157,12 +174,12 @@ void Test::testLineSpacing()
// Create EditEngine's instance
EditEngine aEditEngine(mpItemPool.get());
-if(aEditEngine.GetRefDevice()->GetDPIY() != 96
+if (aEditEngine.GetRefDevice()->GetDPIY() != 96
|| aEditEngine.GetRefDevice()->GetDPIScaleFactor() != 1.0)
return;
// Get EditDoc for current EditEngine's instance
-EditDoc = aEditEngine.GetEditDoc();
+EditDoc& rDoc = aEditEngine.GetEditDoc();
// Initially no text should be there
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rDoc.GetTextLen());
@@ -181,8 +198,7 @@ void Test::testLineSpacing()
// Select all paragraphs
ESelection aSelection(0, 0, 0, aTextLen);
-auto doTest = [&](sal_uInt16 nSpace, sal_uInt16 nExpMaxAscent, sal_uInt32
nExpLineHeight)
-{
+auto doTest = [&](sal_uInt16 nSpace, sal_uInt16 nExpMaxAscent, sal_uInt32
nExpLineHeight) {
std::unique_ptr pSet(new
SfxItemSet(aEditEngine.GetEmptyItemSet()));
SvxLineSpacingItem aLineSpacing(LINE_SPACE_DEFAULT_HEIGHT,
EE_PARA_SBL);
aLineSpacing.SetPropLineSpace(nSpace);
@@ -239,7 +255,7 @@ void Test::testConstruction()
bool includes(const uno::Sequence& rSeq, std::u16string_view rVal)
{
-for (OUString const & s : rSeq)
+for (OUString const& s : rSeq)
if (s == rVal)
return true;
@@ -290,7 +306,8 @@ void Test::testUnoTextFields()
{
// FILE
-rtl::Reference xField(new
SvxUnoTextField(text::textfield::Type::DOCINFO_TITLE));
+rtl::Reference xField(
+new SvxUnoTextField(text::textfield::Type::DOCINFO_TITLE));
uno::Sequence aSvcs = xField->getSupportedServiceNames();
bool bGood = includes(aSvcs,
u"com.sun.star.text.textfield.docinfo.Title");
CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood);
@@ -306,7 +323,8 @@ void Test::testUnoTextFields()
{
// EXTENDED TIME
-rtl::Reference xField(new
SvxUnoTextField(text::textfield::Type::EXTENDED_TIME));
+rtl::Reference xField(
+new SvxUnoTextField(text::textfield::Type::EXTENDED_TIME));
uno::Sequence aSvcs = xField->getSupportedServiceNames();
bool bGood = includes(aSvcs, u"com.sun.star.text.textfield.DateTime");
CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood);
@@ -314,7 +332,8 @@ void Test::testUnoTextFields()
{
// EXTENDED FILE
-rtl::Reference xField(new
SvxUnoTextField(text::textfield::Type::EXTENDED_FILE));
+rtl::Reference xField(
+new SvxUnoTextField(text::textfield::Type::EXTENDED_FILE));
uno::Sequence aSvcs = xField->getSupportedServiceNames();
bool bGood = includes(aSvcs, u"com.sun.star.text.textfield.FileName");
core.git: Branch 'libreoffice-24-2' - editeng/source
editeng/source/misc/svxacorr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9d0b8f692737e63614594d5f2c545d6e81b69fbb
Author: Oliver Specht
AuthorDate: Tue Feb 20 15:38:36 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Feb 21 20:50:29 2024 +0100
tdf#159797 replace dash also between sentences
Autocorrection replaces " - " with " " also after
dot, question mark and exclamation mark.
Change-Id: Iad4b6c6073ab90b0c86514b8683dd2a07197f59d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163659
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 95017739a05c4f515fc42caebfd1e01e8a9ba160)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163625
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index ff2c4518aadd..676959d43dbe 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -614,7 +614,7 @@ bool SvxAutoCorrect::FnChgToEnEmDash(
sImplEndSkipChars,(cCh = rTxt[ --n ])); )
;
// found: "[A-z0-9][] -
[][A-z0-9]
-if( rCC.isLetterNumeric( OUString(cCh) ))
+if (rCC.isLetterNumeric(OUString(cCh)) ||
lcl_IsInArr(u".!?", cCh))
{
rDoc.Delete( nTmpPos, nTmpPos + nLen );
rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? sEmDash :
sEnDash );
core.git: editeng/source
editeng/source/misc/svxacorr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 95017739a05c4f515fc42caebfd1e01e8a9ba160
Author: Oliver Specht
AuthorDate: Tue Feb 20 15:38:36 2024 +0100
Commit: Thorsten Behrens
CommitDate: Wed Feb 21 15:03:42 2024 +0100
tdf#159797 replace dash also between sentences
Autocorrection replaces " - " with " " also after
dot, question mark and exclamation mark.
Change-Id: Iad4b6c6073ab90b0c86514b8683dd2a07197f59d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163659
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 30c598594f5d..a33d4f77ab67 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -614,7 +614,7 @@ bool SvxAutoCorrect::FnChgToEnEmDash(
sImplEndSkipChars,(cCh = rTxt[ --n ])); )
;
// found: "[A-z0-9][] -
[][A-z0-9]
-if( rCC.isLetterNumeric( OUString(cCh) ))
+if (rCC.isLetterNumeric(OUString(cCh)) ||
lcl_IsInArr(u".!?", cCh))
{
rDoc.Delete( nTmpPos, nTmpPos + nLen );
rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? sEmDash :
sEnDash );
core.git: Branch 'libreoffice-7-6' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |3 +++
writerfilter/source/dmapper/PropertyIds.cxx |1 +
writerfilter/source/dmapper/PropertyIds.hxx |1 +
3 files changed, 5 insertions(+)
New commits:
commit 6dbe242fd16aada3e1f507e35334c6d416e00994
Author: Oliver Specht
AuthorDate: Thu Feb 15 10:27:03 2024 +0100
Commit: Michael Stahl
CommitDate: Tue Feb 20 18:42:35 2024 +0100
tdf#159730 add compatibility option in RTF import
Set IgnoreTabsAndBlanksForLineCalculation in RTF import to improve
formatting.
Change-Id: If0129f748c48400f1dd882672b5779f62e685ecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163429
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163655
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c4001cf0fe61..ecd6ad6b242a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,6 +129,9 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
m_pImpl->SetDocumentSettingsProperty(
getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING),
uno::Any(true));
+m_pImpl->SetDocumentSettingsProperty(
+getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION),
+uno::Any(true));
// Don't load the default style definitions to avoid weird mix
m_pImpl->SetDocumentSettingsProperty("StylesNoDefault",
uno::Any(true));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 11ef07230fad..4069a9ac7fe5 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -378,6 +378,7 @@ namespace
{ PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF, u"CursorNotIgnoreTables"},
{ PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
{ PROP_DECORATIVE, u"Decorative"},
+{ PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION,
u"IgnoreTabsAndBlanksForLineCalculation"},
});
} // end anonymous ns
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index 6708c6dfbf35..25099a684dcd 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -377,6 +377,7 @@ enum PropertyIds
,PROP_RTL_GUTTER
,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
,PROP_PARA_CONNECT_BORDERS
+,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION
};
//Returns the UNO string equivalent to eId.
core.git: svx/source
svx/source/svdraw/svdedxv.cxx | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 178d8a38e133aebd4cff1af2d2c49aec60468c92
Author: Oliver Specht
AuthorDate: Mon Feb 19 09:52:46 2024 +0100
Commit: Thorsten Behrens
CommitDate: Tue Feb 20 16:49:37 2024 +0100
Make Clone Formatting in Impress similar to PP
In Powerpoint paragraph attributes are only applied from and to
fully/multiple selected paragraphs.
Change-Id: I7c1f3afb6c0d6fd9b3f8acf34cb5f5b3dcaf22d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163583
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index dbcc73a63cf1..f3f5d4818f20 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2780,7 +2780,7 @@ bool SdrObjEditView::SupportsFormatPaintbrush(SdrInventor
nObjectInventor,
}
}
-static const WhichRangesContainer& GetFormatRangeImpl(bool bTextOnly)
+static const WhichRangesContainer& GetFormatRangeImpl(bool bTextOnly, bool
withParagraphAttr = true)
{
static const WhichRangesContainer gFull(
svl::Items);
static const WhichRangesContainer gTextOnly(
+svl::Items);
+
+static const WhichRangesContainer gParaTextOnly(
svl::Items);
-return bTextOnly ? gTextOnly : gFull;
+return bTextOnly ? withParagraphAttr ? gParaTextOnly : gTextOnly : gFull;
}
sal_Int32 SdrObjEditView::TakeFormatPaintBrush(std::shared_ptr&
rFormatSet)
@@ -2806,12 +2809,14 @@ sal_Int32
SdrObjEditView::TakeFormatPaintBrush(std::shared_ptr& rFor
OutlinerView* pOLV = GetTextEditOutlinerView();
+bool isParaSelection = pOLV ? pOLV->GetEditView().IsSelectionFullPara() :
false;
rFormatSet = std::make_shared(GetModel().GetItemPool(),
- GetFormatRangeImpl(pOLV !=
nullptr));
+ GetFormatRangeImpl(pOLV !=
nullptr, isParaSelection));
if (pOLV)
{
rFormatSet->Put(pOLV->GetAttribs());
-nDepth = pOLV->GetDepth();
+if (isParaSelection)
+nDepth = pOLV->GetDepth();
}
else
{
@@ -2979,10 +2984,11 @@ void SdrObjEditView::ApplyFormatPaintBrush(SfxItemSet&
rFormatSet, sal_Int16 nDe
const EditEngine& rEditEngine = pOutliner->GetEditEngine();
ESelection aSel(pOLV->GetSelection());
+bool fullParaSelection
+= aSel.nEndPara != aSel.nStartPara ||
pOLV->GetEditView().IsSelectionFullPara();
if (!aSel.HasRange())
pOLV->SetSelection(rEditEngine.GetWord(aSel,
css::i18n::WordType::DICTIONARY_WORD));
-
-const bool bRemoveParaAttribs = !bNoParagraphFormats;
+const bool bRemoveParaAttribs = !bNoParagraphFormats &&
!fullParaSelection;
pOLV->RemoveAttribsKeepLanguages(bRemoveParaAttribs);
SfxItemSet aSet(pOLV->GetAttribs());
SfxItemSet aPaintSet(CreatePaintSet(GetFormatRangeImpl(true),
*aSet.GetPool(),
core.git: Branch 'libreoffice-24-2' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |3 +++
writerfilter/source/dmapper/PropertyIds.cxx |1 +
writerfilter/source/dmapper/PropertyIds.hxx |1 +
3 files changed, 5 insertions(+)
New commits:
commit 02ecd57a8364b4ca049c59a978c3b16c0389a6cd
Author: Oliver Specht
AuthorDate: Thu Feb 15 10:27:03 2024 +0100
Commit: Michael Stahl
CommitDate: Tue Feb 20 14:30:28 2024 +0100
tdf#159730 add compatibility option in RTF import
Set IgnoreTabsAndBlanksForLineCalculation in RTF import to improve
formatting.
Change-Id: If0129f748c48400f1dd882672b5779f62e685ecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163429
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163614
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 7e4eeda7d3d9..bbeafa942de4 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,6 +129,9 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
m_pImpl->SetDocumentSettingsProperty(
getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING),
uno::Any(true));
+m_pImpl->SetDocumentSettingsProperty(
+getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION),
+uno::Any(true));
// Don't load the default style definitions to avoid weird mix
m_pImpl->SetDocumentSettingsProperty("StylesNoDefault",
uno::Any(true));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index b8b4efc06222..8a83ca0bb064 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -384,6 +384,7 @@ namespace
{ PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
{ PROP_DECORATIVE, u"Decorative"},
{ PROP_PAPER_TRAY, u"PrinterPaperTray"},
+{ PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION,
u"IgnoreTabsAndBlanksForLineCalculation"},
});
} // end anonymous ns
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index b39fcd24fa49..bb2fb833516c 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -383,6 +383,7 @@ enum PropertyIds
,PROP_RTL_GUTTER
,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
,PROP_PARA_CONNECT_BORDERS
+,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION
};
//Returns the UNO string equivalent to eId.
core.git: 2 commits - helpcontent2 sw/qa
helpcontent2 |2 +-
sw/qa/uitest/writer_tests4/spellDialog.py |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c7ef4b2757a5219e12a9b6a5c68b3512026d1ade
Author: Oliver Specht
AuthorDate: Mon Feb 19 13:40:11 2024 +0100
Commit: Thorsten Behrens
CommitDate: Mon Feb 19 18:07:14 2024 +0100
Fix for test related to tdf#157992
KEYCODE is 'RIGHT' not 'KEY_RIGHT'
Change-Id: I908f11db40737d9c188a9f4464f71ac0c67b40dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163595
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/uitest/writer_tests4/spellDialog.py
b/sw/qa/uitest/writer_tests4/spellDialog.py
index 801141b75987..91be3cc3a948 100644
--- a/sw/qa/uitest/writer_tests4/spellDialog.py
+++ b/sw/qa/uitest/writer_tests4/spellDialog.py
@@ -190,7 +190,7 @@ frog, dogg, catt"""
with self.ui_test.load_file(get_url_for_data_file("tdf157992.odt")) as
document:
with
self.ui_test.execute_modeless_dialog_through_command(".uno:SpellingAndGrammarDialog",
close_button="") as xDialog:
sentence = xDialog.getChild('sentence')
-sentence.executeAction('TYPE',
mkPropertyValues({'KEYCODE':'KEY_RIGHT'}))
+sentence.executeAction('TYPE',
mkPropertyValues({'KEYCODE':'RIGHT'}))
sentence.executeAction('TYPE',
mkPropertyValues({'KEYCODE':'DELETE'}))
sentence.executeAction('TYPE',
mkPropertyValues({'KEYCODE':'DELETE'}))
sentence.executeAction('TYPE', mkPropertyValues({'TEXT':'oo'}))
commit 57000eb225476bcd456853230386cbf6e2ed5520
Author: Alain Romedenne
AuthorDate: Mon Feb 19 18:07:13 2024 +0100
Commit: Gerrit Code Review
CommitDate: Mon Feb 19 18:07:13 2024 +0100
Update git submodules
* Update helpcontent2 from branch 'master'
to d4aff35aba0b2db8179b57b523a94762f55b993a
- Python Shell script update for macOS
- Eases the identification of embedded Python with Basic
- Launching Python console with Python remains to be improved
Change-Id: I4b581770166701a664d0b5209ccbe8362282
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163172
Tested-by: Jenkins
Reviewed-by: Alain Romedenne
diff --git a/helpcontent2 b/helpcontent2
index 9e658568356d..d4aff35aba0b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9e658568356d855b70e021116dac60fb26f7d06f
+Subproject commit d4aff35aba0b2db8179b57b523a94762f55b993a
core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit feb08063c47e303bcf399ac90354fbcca1262997 Author: Oliver Specht AuthorDate: Mon Feb 19 11:11:56 2024 +0100 Commit: Thorsten Behrens CommitDate: Mon Feb 19 18:05:45 2024 +0100 tdf#159254 fix import of printer tray in docx Change-Id: I9f3835800c921dbc90ef09a8dfa3001bed74d2d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163589 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 5c75e998ff2b..946befddd2f9 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -708,10 +708,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->SetPageMarginTwip( PAGE_MAR_GUTTER, nIntValue ); break; case NS_ooxml::LN_CT_PaperSource_first: -m_pImpl->SetPaperSource(PAPER_SOURCE_FIRST, nIntValue); +m_pImpl->SetPaperSource(PAPER_SOURCE_FIRST, sStringValue.toInt32()); break; case NS_ooxml::LN_CT_PaperSource_other: -m_pImpl->SetPaperSource(PAPER_SOURCE_OTHER, nIntValue); +m_pImpl->SetPaperSource(PAPER_SOURCE_OTHER, sStringValue.toInt32()); break; case NS_ooxml::LN_CT_Language_val: //90314 case NS_ooxml::LN_CT_Language_eastAsia: //90315
core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |3 +++
writerfilter/source/dmapper/PropertyIds.cxx |1 +
writerfilter/source/dmapper/PropertyIds.hxx |1 +
3 files changed, 5 insertions(+)
New commits:
commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58
Author: Oliver Specht
AuthorDate: Thu Feb 15 10:27:03 2024 +0100
Commit: Michael Stahl
CommitDate: Fri Feb 16 14:22:04 2024 +0100
tdf#159730 add compatibility option in RTF import
Set IgnoreTabsAndBlanksForLineCalculation in RTF import to improve
formatting.
Change-Id: If0129f748c48400f1dd882672b5779f62e685ecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163429
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 0764a03b908d..5c75e998ff2b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,6 +129,9 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
m_pImpl->SetDocumentSettingsProperty(
getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING),
uno::Any(true));
+m_pImpl->SetDocumentSettingsProperty(
+getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION),
+uno::Any(true));
// Don't load the default style definitions to avoid weird mix
m_pImpl->SetDocumentSettingsProperty("StylesNoDefault",
uno::Any(true));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index b8b4efc06222..8a83ca0bb064 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -384,6 +384,7 @@ namespace
{ PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
{ PROP_DECORATIVE, u"Decorative"},
{ PROP_PAPER_TRAY, u"PrinterPaperTray"},
+{ PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION,
u"IgnoreTabsAndBlanksForLineCalculation"},
});
} // end anonymous ns
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index b39fcd24fa49..bb2fb833516c 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -383,6 +383,7 @@ enum PropertyIds
,PROP_RTL_GUTTER
,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF
,PROP_PARA_CONNECT_BORDERS
+,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION
};
//Returns the UNO string equivalent to eId.
core.git: Branch 'libreoffice-7-6' - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf158044.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport21.cxx| 32
sw/qa/extras/ooxmlimport/data/tdf154370.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 77 ++
sw/source/filter/ww8/wrtw8nds.cxx | 152 +---
sw/source/filter/ww8/wrtww8.hxx |2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 160 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |4
8 files changed, 401 insertions(+), 26 deletions(-)
New commits:
commit 660f366a78ffcad429458acc429e0579d1af5495
Author: Oliver Specht
AuthorDate: Tue Dec 5 13:28:36 2023 +0100
Commit: Thorsten Behrens
CommitDate: Fri Feb 16 01:27:06 2024 +0100
tdf#158044 writerfilter: handle toggle properties in import/export
DOCX has some odd properties (bold, italic, shadowed, hidden ...),
which switch on/off if they are applied multiple times, e.g. with
paragraph and character styles. To fix that, a hard attribute has to
switch off the attribute in that occasion on import and on export a
hard attribute switches it on in Word.
Includes partial fix for tdf#154370.
Change-Id: Ie4c317cf9b7d02efd89b9d6a9996143585d7e937
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160343
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 9e127010a86b3521c803ac86c0b5f58dc8e2966b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161018
(cherry picked from commit b6c4dd27acdd08fa63f8d75dd09212828e28844f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163452
diff --git a/sw/qa/extras/ooxmlexport/data/tdf158044.odt
b/sw/qa/extras/ooxmlexport/data/tdf158044.odt
new file mode 100755
index ..ca17b6625674
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf158044.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
index a6df0bff9300..a9d01670aab6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
@@ -44,6 +44,38 @@ DECLARE_OOXMLEXPORT_TEST(testTdf153909_followTextFlow,
"tdf153909_followTextFlow
CPPUNIT_ASSERT(nTableTop > nRectBottom);
}
+CPPUNIT_TEST_FIXTURE(Test, testtdf158044)
+{
+loadAndSave("tdf158044.odt");
+// write hard attributes to prevent multiple toggle attributes from
vanishing
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:rStyle[1]", "val",
+"BoldItalicCapsEmbossedStrike");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:b[1]");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:bCs[1]");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:i[1]");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:iCs[1]");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:strike[1]");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:emboss[1]");
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r[4]/w:rPr[1]/w:rStyle[1]", "val",
+"SmallcapsImprint");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r[4]/w:rPr[1]/w:imprint[1]");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r[4]/w:rPr[1]/w:smallCaps[1]");
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[4]/w:r[2]/w:rPr[1]/w:rStyle[1]", "val", "AllCaps");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[4]/w:r[2]/w:rPr[1]/w:caps[1]");
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[6]/w:r[2]/w:rPr[1]/w:rStyle[1]", "val", "Hidden");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[6]/w:r[2]/w:rPr[1]/w:vanish[1]");
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[8]/w:r[4]/w:rPr[1]/w:rStyle[1]", "val",
+"OutlineShadow");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[8]/w:r[4]/w:rPr[1]/w:outline[1]");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[8]/w:r[4]/w:rPr[1]/w:shadow[1]");
+}
+
CPPUNIT_TEST_FIXTURE(Test, testTdf159207_footerFramePrBorder)
{
loadFromFile(u"tdf159207_footerFramePrBorder.docx"); // re-imports as
editeng Frame/Shape
diff --git a/sw/qa/extras/ooxmlimport/data/tdf154370.docx
b/sw/qa/extras/ooxmlimport/data/tdf154370.docx
new file mode 100755
index ..ba72724593b2
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf154370.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 6edd873dc7ed..956d6dd3464c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -1194,6 +1194,83 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf141969)
CPPUNIT_ASSERT_EQUAL(8.0f, getProperty(xRun, "CharHeight"));
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf154370)
+{
+
core.git: sw/qa
sw/qa/uitest/data/tdf157992.odt |binary
sw/qa/uitest/writer_tests4/spellDialog.py | 20
2 files changed, 20 insertions(+)
New commits:
commit fb72dc2474e644b66f8de6557210a2f6dedcfcc3
Author: Oliver Specht
AuthorDate: Wed Feb 14 09:04:09 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Feb 15 22:29:25 2024 +0100
tdf#157992: add test to make sure footnotes don't get deleted
This tests calls the SpellDialog with a paragraph containing a
footnote. Prior to the fix of tdf#157992 the footnote had been deleted
when the spelling error has been manually fixed.
Change-Id: Ib57d49d8fad153c96daa1b1f6554abebd272a7f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163351
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/uitest/data/tdf157992.odt b/sw/qa/uitest/data/tdf157992.odt
new file mode 100755
index ..4a2668263339
Binary files /dev/null and b/sw/qa/uitest/data/tdf157992.odt differ
diff --git a/sw/qa/uitest/writer_tests4/spellDialog.py
b/sw/qa/uitest/writer_tests4/spellDialog.py
index 5fbffe93b1ca..801141b75987 100644
--- a/sw/qa/uitest/writer_tests4/spellDialog.py
+++ b/sw/qa/uitest/writer_tests4/spellDialog.py
@@ -13,6 +13,7 @@ from uitest.uihelper.common import get_state_as_dict,
get_url_for_data_file
from uitest.uihelper.common import type_text
from libreoffice.linguistic.linguservice import get_spellchecker
+from libreoffice.uno.propertyvalue import mkPropertyValues
from com.sun.star.lang import Locale
class SpellingAndGrammarDialog(UITestCase):
@@ -181,4 +182,23 @@ frog, dogg, catt"""
# This was False (lost comment)
self.assertEqual(True, has_comment)
+def test_tdf157992(self):
+supported_locale = self.is_supported_locale("en", "US")
+if not supported_locale:
+self.skipTest("no dictionary support for en_US available")
+
+with self.ui_test.load_file(get_url_for_data_file("tdf157992.odt")) as
document:
+with
self.ui_test.execute_modeless_dialog_through_command(".uno:SpellingAndGrammarDialog",
close_button="") as xDialog:
+sentence = xDialog.getChild('sentence')
+sentence.executeAction('TYPE',
mkPropertyValues({'KEYCODE':'KEY_RIGHT'}))
+sentence.executeAction('TYPE',
mkPropertyValues({'KEYCODE':'DELETE'}))
+sentence.executeAction('TYPE',
mkPropertyValues({'KEYCODE':'DELETE'}))
+sentence.executeAction('TYPE', mkPropertyValues({'TEXT':'oo'}))
+change = xDialog.getChild('change')
+with self.ui_test.execute_blocking_action(
+change.executeAction, args=('CLICK', ()),
close_button="ok"):
+footnotes = document.getFootnotes()
+self.assertTrue(len(footnotes) == 1)
+
+
# vim: set shiftwidth=4 softtabstop=4 expandtab:
core.git: Branch 'libreoffice-24-2' - sw/source
sw/source/uibase/shells/textsh.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit f5c3296eca92e8dd6b3bdf7410dd5a636a197d10
Author: Oliver Specht
AuthorDate: Thu Jan 18 15:48:04 2024 +0100
Commit: Thorsten Behrens
CommitDate: Wed Feb 14 09:26:09 2024 +0100
tdf#63259 rotate case also at start/end of a word
Rotate either rotates the selection or the word the cursor is directly
before,
inside or directly after
Change-Id: Ia21e3120d2b00978b9f4ce06738b42e90d2ada62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162256
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 3d01c4ee56e0435815977b1717c84b1a2c233bfc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163338
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/uibase/shells/textsh.cxx
b/sw/source/uibase/shells/textsh.cxx
index 0924935b3d7e..97de98540151 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -877,7 +877,20 @@ void SwTextShell::ExecTransliteration( SfxRequest const &
rReq )
void SwTextShell::ExecRotateTransliteration( SfxRequest const & rReq )
{
if( rReq.GetSlot() == SID_TRANSLITERATE_ROTATE_CASE )
-GetShell().TransliterateText( m_aRotateCase.getNextMode() );
+{
+SwWrtShell& rSh = GetShell();
+if (rSh.HasSelection())
+{
+rSh.TransliterateText(m_aRotateCase.getNextMode());
+}
+else
+{
+rSh.Push(); // save cur cursor
+if ((rSh.IsEndWrd() || rSh.IsStartWord() || rSh.IsInWord()) &&
rSh.SelWrd())
+rSh.TransliterateText(m_aRotateCase.getNextMode());
+rSh.Pop(SwCursorShell::PopMode::DeleteCurrent);
+}
+}
}
SwTextShell::SwTextShell(SwView &_rView) :
core.git: sw/source
sw/source/uibase/shells/textsh.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 125fc2ce861c82592b261f2992c893b414396e56
Author: Oliver Specht
AuthorDate: Thu Jan 18 15:48:04 2024 +0100
Commit: Thorsten Behrens
CommitDate: Wed Feb 14 00:52:53 2024 +0100
tdf#63259 rotate case also at start/end of a word
Rotate either rotates the selection or the word the cursor is directly
before,
inside or directly after
Change-Id: Ia21e3120d2b00978b9f4ce06738b42e90d2ada62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162256
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/uibase/shells/textsh.cxx
b/sw/source/uibase/shells/textsh.cxx
index c2d1d44068d9..c743ee3ffed7 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -877,7 +877,20 @@ void SwTextShell::ExecTransliteration( SfxRequest const &
rReq )
void SwTextShell::ExecRotateTransliteration( SfxRequest const & rReq )
{
if( rReq.GetSlot() == SID_TRANSLITERATE_ROTATE_CASE )
-GetShell().TransliterateText( m_aRotateCase.getNextMode() );
+{
+SwWrtShell& rSh = GetShell();
+if (rSh.HasSelection())
+{
+rSh.TransliterateText(m_aRotateCase.getNextMode());
+}
+else
+{
+rSh.Push(); // save cur cursor
+if ((rSh.IsEndWrd() || rSh.IsStartWord() || rSh.IsInWord()) &&
rSh.SelWrd())
+rSh.TransliterateText(m_aRotateCase.getNextMode());
+rSh.Pop(SwCursorShell::PopMode::DeleteCurrent);
+}
+}
}
SwTextShell::SwTextShell(SwView &_rView) :
core.git: 2 commits - configure.ac include/svx sw/inc sw/sdi sw/source sw/uiconfig
configure.ac|2
include/svx/relfld.hxx |1
sw/inc/cmdid.h |5
sw/inc/strings.hrc |7 +
sw/sdi/_tabsh.sdi | 20 +++
sw/sdi/swriter.sdi | 50 +
sw/source/uibase/shells/tabsh.cxx | 144 +++
sw/source/uibase/sidebar/TableEditPanel.cxx | 147 +++-
sw/source/uibase/sidebar/TableEditPanel.hxx | 11 ++
sw/uiconfig/swriter/ui/sidebartableedit.ui | 115 +
10 files changed, 493 insertions(+), 9 deletions(-)
New commits:
commit 828d2637fd3120bfd342b41548caf9c55fc0f603
Author: Oliver Specht
AuthorDate: Tue Jan 30 17:07:46 2024 +0100
Commit: Gabor Kelemen
CommitDate: Mon Feb 12 18:17:18 2024 +0100
tdf#159662 Add table alignment and left/right spacing to sidebar in Writer
Change-Id: I12d898f21ca8c7d581aaa1c587c5b6434a35f516
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162769
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 8bc4c05580ec..85cec451cb94 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -46,6 +46,7 @@ public:
voidEnableNegativeMode() {bNegativeEnabled = true;}
void set_sensitive(bool sensitive) {
m_xSpinButton->set_sensitive(sensitive); }
+bool get_sensitive() const { return m_xSpinButton->get_sensitive(); }
void set_value(int nValue, FieldUnit eValueUnit) {
m_xSpinButton->set_value(nValue, eValueUnit); }
int get_value(FieldUnit eDestUnit) const { return
m_xSpinButton->get_value(eDestUnit); }
int get_min(FieldUnit eValueUnit) const { return
m_xSpinButton->get_min(eValueUnit); }
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 4773f173d603..e8521380c62c 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -520,7 +520,10 @@ class SwUINumRuleItem;
#define FN_FORMAT_APPLY_DEFAULT (FN_FORMAT2 + 157)
#define FN_FORMAT_APPLY_TEXTBODY(FN_FORMAT2 + 158)
#define FN_REMOVE_DIRECT_CHAR_FORMATS (FN_FORMAT2 + 159)
-//free (160)
+#define SID_ATTR_TABLE_ALIGNMENT(FN_FORMAT2 + 160)
+#define SID_ATTR_TABLE_LEFT_SPACE (FN_FORMAT2 + 161)
+#define SID_ATTR_TABLE_RIGHT_SPACE (FN_FORMAT2 + 162)
+//free (163 except 194 already used above)
// Region: Extras
#define FN_LINE_NUMBERING_DLG (FN_EXTRA + 2 ) /* */
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 8f3eadcab6d8..b3e9a9370bfc 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1492,6 +1492,13 @@
#define STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP
NC_("STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP", "Render non-breaking spaces (NBSP)
as standard-space-width (off for fixed size)")
#define STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER
NC_("STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER", "Do not add an extra space after
number in footnotes / endnotes with hanging first line")
+#define STR_TABLE_PANEL_ALIGN_AUTO
NC_("sidebartableedit|alignautolabel", "Automatic")
+#define STR_TABLE_PANEL_ALIGN_LEFT
NC_("sidebartableedit|alignleftlabel", "Left")
+#define STR_TABLE_PANEL_ALIGN_FROM_LEFT
NC_("sidebartableedit|alignfromleftlabel", "From left")
+#define STR_TABLE_PANEL_ALIGN_RIGHT
NC_("sidebartableedit|alignrightlabel", "Right")
+#define STR_TABLE_PANEL_ALIGN_CENTER
NC_("sidebartableedit|aligncenterlabel", "Center")
+#define STR_TABLE_PANEL_ALIGN_MANUAL
NC_("sidebartableedit|alignmanuallabel", "Manual")
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index e4b6b9a2dd6c..7596d2c29bda 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -446,5 +446,25 @@ interface BaseTextTable
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
+
+SID_ATTR_TABLE_ALIGNMENT
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
+SID_ATTR_TABLE_LEFT_SPACE
+[
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
+SID_ATTR_TABLE_RIGHT_SPACE
+[
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
}
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 861d5ccec21a..16d939a8903d 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -8693,6 +8693,56 @@ SfxUInt32Item TableColumWidth SID_ATTR_TABLE_COLUMN_WIDTH
GroupId = SfxGroupId::Table;
]
+SfxUInt32Item TableAlignment SID_ATTR_TABLE_ALIGNMENT
+(SfxInt32Item TableLeftSpace SID_ATTR_TABLE_LEFT_SPACE, SfxInt32Item
TableRightSpace SID_ATTR_TABLE_RIGHT_SPACE)
+[
+AutoUpdate = TRUE,
+FastCall = FALSE,
+ReadOnlyDoc =
core.git: Branch 'libreoffice-24-2' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d37be1f9581a8a02c10c7bd88e83c74e2b46bc75
Author: Oliver Specht
AuthorDate: Wed Jan 31 16:41:34 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Feb 9 08:36:08 2024 +0100
tdf#159478 read field comment in default encoding
If a symbol font is applied inside a field the command string
was wrongly converted as symbol text. This is fixed by using a
default RTL_TEXTENCODING_MS_1252 encoding.
Change-Id: I11326ef3c79d6d74c720a2b4ac4987ee6716d912
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162844
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163120
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2c851b95a2fb..48124554481d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3805,9 +3805,11 @@ void RTFDocumentImpl::checkUnicode(bool bUnicode, bool
bHex)
if (bHex && !m_aHexBuffer.isEmpty())
{
rtl_TextEncoding nEncoding = m_aStates.top().getCurrentEncoding();
-if ((m_aStates.top().getDestination() == Destination::FONTENTRY
- || m_aStates.top().getDestination() ==
Destination::FIELDINSTRUCTION)
-&& m_aStates.top().getCurrentEncoding() == RTL_TEXTENCODING_SYMBOL)
+if (nEncoding == RTL_TEXTENCODING_SYMBOL
+&& (m_aStates.top().getDestination() == Destination::FONTENTRY
+|| (m_aStates.size() > 1
+&& m_aStates[m_aStates.size() - 2].getDestination()
+ == Destination::FIELDINSTRUCTION)))
nEncoding = RTL_TEXTENCODING_MS_1252;
OUString aString = OStringToOUString(m_aHexBuffer, nEncoding);
m_aHexBuffer.setLength(0);
core.git: Branch 'libreoffice-24-2' - cui/source
cui/source/dialogs/cuicharmap.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit e4ef509f3fea0c99708c111d731365b3225575d2
Author: Oliver Specht
AuthorDate: Mon Feb 5 14:26:48 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Feb 9 01:37:57 2024 +0100
tdf#159572 select font according to recent settings
selection of a recently inserted special character applies the
stored font to make sure the character is not inserted wit a
font that doesn't contain the symbol
Change-Id: Id61bfac3a2ff22dbdae8a5b83f000d3f0c3e992b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163004
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163128
Reviewed-by: Thorsten Behrens
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 03d1e8c90b53..0d0b809b0e7f 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -523,6 +523,7 @@ IMPL_LINK(SvxCharacterMap, CharClickHdl, SvxCharView*,
rView, void)
{
rView->GrabFocus();
+SetCharFont(rView->GetFont());
m_aShowChar.SetText( rView->GetText() );
m_aShowChar.SetFont(rView->GetFont());
m_aShowChar.Invalidate();
core.git: editeng/source include/editeng include/svx sd/source svx/source
editeng/source/outliner/outlvw.cxx| 18 ++
include/editeng/outliner.hxx |2 ++
include/svx/sdr/table/tablecontroller.hxx |2 +-
include/svx/selectioncontroller.hxx |2 +-
include/svx/svdedxv.hxx |8
sd/source/ui/func/fuformatpaintbrush.cxx |7 ---
sd/source/ui/inc/fuformatpaintbrush.hxx |1 +
svx/source/svdraw/selectioncontroller.cxx |4 +++-
svx/source/svdraw/svdedxv.cxx | 29 -
svx/source/table/tablecontroller.cxx |5 +++--
10 files changed, 57 insertions(+), 21 deletions(-)
New commits:
commit bbe1f37645cf864c7c974d36cf2fe3a73d0c085f
Author: Oliver Specht
AuthorDate: Tue Feb 6 14:08:12 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Feb 9 00:05:39 2024 +0100
Clone Formatting in Impress: Include list attribute
Copies list type and list level from source to target paragraph(s).
Also switches off lists, if source is not in a list.
Change-Id: I260f1d7d9936476f16c355a3a09204b3fb4592d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163054
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/editeng/source/outliner/outlvw.cxx
b/editeng/source/outliner/outlvw.cxx
index 8daeee025c9b..e3e28207d11e 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -384,6 +384,24 @@ void OutlinerView::Select( Paragraph const * pParagraph,
bool bSelect )
pEditView->SetSelection( aSel );
}
+void OutlinerView::SetDepth(sal_Int32 nParagraph, sal_Int16 nDepth)
+{
+Paragraph* pParagraph = pOwner->GetParagraph(nParagraph);
+pOwner->SetDepth(pParagraph, nDepth);
+}
+
+sal_Int16 OutlinerView::GetDepth() const
+{
+ESelection aESelection = GetSelection();
+aESelection.Adjust();
+sal_Int16 nDepth = pOwner->GetDepth(aESelection.nStartPara);
+for (sal_Int32 nPara = aESelection.nStartPara + 1; nPara <=
aESelection.nEndPara; ++nPara)
+{
+if (nDepth != pOwner->GetDepth(nPara))
+return -2;
+}
+return nDepth;
+}
void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
{
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 35860b762037..23158264d54b 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -243,6 +243,8 @@ public:
voidSelectRange( sal_Int32 nFirst, sal_Int32 nCount );
voidSetAttribs( const SfxItemSet& );
voidIndent( short nDiff );
+sal_Int16 GetDepth() const;
+voidSetDepth(sal_Int32 nParagraph, sal_Int16 nDepth);
voidAdjustDepth( short nDX ); // Later replace with Indent!
voidAdjustHeight( tools::Long nDY );
diff --git a/include/svx/sdr/table/tablecontroller.hxx
b/include/svx/sdr/table/tablecontroller.hxx
index 91b9ca7ce7b2..ecbd7642b478 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -67,7 +67,7 @@ public:
SVX_DLLPRIVATE virtual bool GetStyleSheet( SfxStyleSheet* )
const override;
SVX_DLLPRIVATE virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet,
bool bDontRemoveHardAttr ) override;
-SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet,
bool bNoCharacterFormats, bool bNoParagraphFormats ) override;
+SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet,
sal_Int16 nDepth, bool bNoCharacterFormats, bool bNoParagraphFormats ) override;
// slots
SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs =
nullptr );
diff --git a/include/svx/selectioncontroller.hxx
b/include/svx/selectioncontroller.hxx
index 97adb57542c5..7794f3567f1e 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -70,7 +70,7 @@ public:
if bNoCharacterFormats is true, no character attributes are changed.
if bNoParagraphFormats is true, no paragraph attributes are changed.
*/
-virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool
bNoCharacterFormats, bool bNoParagraphFormats );
+virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, sal_Int16
nDepth, bool bNoCharacterFormats, bool bNoParagraphFormats );
/// This is a table object, and one or more of its cells are selected.
virtual bool hasSelectedCells() const;
/// Allows adjusting the point or mark of the selection to a document
coordinate.
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index ff3fcbd19b79..8ad7f048b682 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -301,17 +301,17 @@ public:
/** returns true if the shape identified by its inventor and identifier
supports format paint brush operation */
static bool SupportsFormatPaintbrush( SdrInventor nObjectInventor,
SdrObjKind nObjectIdentifier );
-/** returns a format paint brush
core.git: Branch 'libreoffice-24-2' - 2 commits - sw/source
sw/source/core/frmedt/fetab.cxx |4 ++--
sw/source/core/table/swnewtable.cxx |9 -
sw/source/core/text/porrst.cxx | 12
3 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 49f63872d7149778efdd1add6f9eb0b7ca254089
Author: Oliver Specht
AuthorDate: Mon Feb 5 09:41:05 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Feb 9 00:02:19 2024 +0100
tdf#159560 paragraph break should be shown as pilcrow sign
When non-printing characters are switched on at the end of the paragraph
a pilcrow sign is shown. This is displayed using the font at the end of
the character. If a symbol font is used that would result in a random symbol
instead of the pilcrow sign (0x00b6). This is fixed here.
Change-Id: I0d4ae9f439d2e34ca774d4e2cb188e94290808a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162983
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
Tested-by: Gabor Kelemen
(cherry picked from commit 297b47a7e0c191be22f90ab799b4b8bb8bdbaf59)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163142
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 029adca75336..a4a0d3c713d3 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
@@ -47,6 +48,7 @@
#include
#include
#include
+#include
#include
#include
@@ -74,6 +76,16 @@ void SwTmpEndPortion::Paint( const SwTextPaintInfo )
const
SwFont aFont(*pOldFnt);
+const SwDoc& rDoc = rInf.GetTextFrame()->GetDoc();
+if (aFont.IsSymbol(rDoc.getIDocumentLayoutAccess().GetCurrentViewShell()))
+{
+const SvxFontItem& rFontItem = rDoc.GetDefault(RES_CHRATR_FONT);
+aFont.SetName( rFontItem.GetFamilyName(), SwFontScript::Latin );
+aFont.SetStyleName( rFontItem.GetStyleName(), SwFontScript::Latin );
+aFont.SetFamily( rFontItem.GetFamily(), SwFontScript::Latin );
+aFont.SetPitch( rFontItem.GetPitch(), SwFontScript::Latin );
+aFont.SetCharSet( rFontItem.GetCharSet(), SwFontScript::Latin );
+}
// Paint strikeout/underline based on redline color and settings
// (with an extra pilcrow in the background, because there is
// no SetStrikeoutColor(), also SetUnderColor() doesn't work()).
commit 0b4032eedf5db37201c9ef9c007f4669fb204d6d
Author: Oliver Specht
AuthorDate: Wed Jan 24 14:14:20 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Feb 9 00:02:06 2024 +0100
tdf#43848 fix selection in table with split/merged cells
extends the selection of table cells to reach a more
rectangular selection area
Additionally tdf#155670 is taken care of by not showing the
row selection cursor if row selection is not supported
Change-Id: If31aa1030c91d81bc889d8aaa668e96c5328f03f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162508
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit aacf6f0e6059a3b24451da2782e0a0a420e89679)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163143
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 79f5eb6b5e58..33b9c9327b6d 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2116,8 +2116,8 @@ SwTab SwFEShell::WhichMouseTabCol( const Point )
const
{
while( pFrame && pFrame->Lower() && pFrame->Lower()->IsRowFrame() )
pFrame = static_cast(static_cast(pFrame->Lower())->Lower());
-if( pFrame && pFrame->GetTabBox()->GetSttNd() &&
-pFrame->GetTabBox()->GetSttNd()->IsInProtectSect() )
+if( pFrame && ((pFrame->GetTabBox()->GetSttNd() &&
+pFrame->GetTabBox()->GetSttNd()->IsInProtectSect()) ||
(pFrame->GetTabBox()->getRowSpan() < 0)))
pFrame = nullptr;
}
diff --git a/sw/source/core/table/swnewtable.cxx
b/sw/source/core/table/swnewtable.cxx
index 3cc2e3670711..785ef79d3b4d 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -1739,7 +1739,11 @@ void SwTable::CreateSelection( const SwNode* pStartNd,
const SwNode* pEndNd,
rBoxes.insert( pBox );
if( nFound )
{
-nBottom = nRow;
+//if box is hiding cells bottom needs to be moved
+if (pBox->getRowSpan() > 1)
+nBottom = std::max(nBottom, size_t(nRow +
pBox->getRowSpan() - 1));
+else
+nBottom = std::max(nRow, nBottom);
lcl_CheckMinMax( nLowerMin, nLowerMax, *pLine, nCol, true
);
++nFound;
break;
@@ -1747,6 +1751,9 @@ void SwTable::CreateSelection( const SwNode* pStartNd,
const SwNode* pEndNd,
core.git: Branch 'libreoffice-24-2' - include/vcl sw/inc sw/source vcl/inc vcl/osx vcl/source vcl/unx vcl/win writerfilter/source
include/vcl/print.hxx |1
sw/inc/unoprnms.hxx |1
sw/source/core/unocore/unomap1.cxx|1
sw/source/core/unocore/unostyle.cxx | 28 ++
vcl/inc/osx/salprn.h |2 +
vcl/inc/salprn.hxx|3 ++
vcl/inc/unx/genprn.h |2 +
vcl/inc/win/salprn.h |3 ++
vcl/osx/salprn.cxx|5 +++
vcl/source/gdi/print.cxx |8 ++
vcl/unx/generic/print/genprnpsp.cxx |5 +++
vcl/win/gdi/salprn.cxx| 19 ++
writerfilter/source/dmapper/DomainMapper.cxx | 17 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 ++
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 22 +
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
writerfilter/source/dmapper/PropertyMap.cxx | 24 ++
writerfilter/source/dmapper/PropertyMap.hxx |7 -
writerfilter/source/ooxml/model.xml |4 +++
writerfilter/source/rtftok/rtfdispatchvalue.cxx | 12 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx|5 +++
22 files changed, 167 insertions(+), 12 deletions(-)
New commits:
commit c40fc3bc88f92baed2bc14a7667383078c77915d
Author: Oliver Specht
AuthorDate: Thu Jan 18 08:48:10 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Feb 8 23:21:08 2024 +0100
tdf#159254 import paper bin/paper source from rtf/docx files
Imports infsxn and insxn from RTF and
w:paperSrc from docx files and applies paper tray to the page style
if the printer supports the imported tray value.
Works only on Windows.
Change-Id: Ie1170c58f7114f0dbf6bdd2721d4e077886cbe16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162236
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163119
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index d6ce7728f9a6..e23cf8d0af1b 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -227,6 +227,7 @@ public:
boolSetPaperBin( sal_uInt16 nPaperBin );
sal_uInt16 GetPaperBin() const;
+sal_uInt16 GetPaperBinBySourceIndex(sal_uInt16
nPaperSource) const;
voidSetPaper( Paper ePaper );
boolSetPaperSizeUser( const Size& rSize );
/** @return The paper format of the printer's current "jobsetup". Note
that if PAPER_USER the actual size can be anything. */
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 2c98a87dba5a..fdbc3c8f36eb 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -205,6 +205,7 @@ inline constexpr OUString UNO_NAME_POSITION_PROTECTED =
u"PositionProtected"_ust
inline constexpr OUString UNO_NAME_ALTERNATIVE_TEXT = u"AlternativeText"_ustr;
inline constexpr OUString UNO_NAME_PRIMARY_KEY = u"PrimaryKey"_ustr;
inline constexpr OUString UNO_NAME_PRINTER_PAPER_TRAY =
u"PrinterPaperTray"_ustr;
+inline constexpr OUString UNO_NAME_PRINTER_PAPER_TRAY_INDEX =
u"PrinterPaperTrayIndex"_ustr;
inline constexpr OUString UNO_NAME_RELATIVE_WIDTH = u"RelativeWidth"_ustr;
inline constexpr OUString UNO_NAME_RELATIVE_WIDTH_RELATION =
u"RelativeWidthRelation"_ustr;
inline constexpr OUString UNO_NAME_RELATIVE_HEIGHT = u"RelativeHeight"_ustr;
diff --git a/sw/source/core/unocore/unomap1.cxx
b/sw/source/core/unocore/unomap1.cxx
index ee4422a22e9d..12db464a874b 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -537,6 +537,7 @@ std::span
SwUnoPropertyMapProvider::GetPageStyleP
{ UNO_NAME_NUMBERING_TYPE, SID_ATTR_PAGE,
cppu::UnoType::get(), PROPERTY_NONE , MID_PAGE_NUMTYPE
},
{ UNO_NAME_PAGE_STYLE_LAYOUT, SID_ATTR_PAGE,
cppu::UnoType::get(),PROPERTY_NONE
,MID_PAGE_LAYOUT },
{ UNO_NAME_PRINTER_PAPER_TRAY, RES_PAPER_BIN,
cppu::UnoType::get(),PROPERTY_NONE , 0 },
+{ UNO_NAME_PRINTER_PAPER_TRAY_INDEX, RES_PAPER_BIN,
cppu::UnoType::get(),PROPERTY_NONE , 0 },
// { UNO_NAME_REGISTER_MODE_ACTIVE, SID_SWREGISTER_MODE,
cppu::UnoType::get(), PROPERTY_NONE , 0 },
{ UNO_NAME_REGISTER_PARAGRAPH_STYLE, SID_SWREGISTER_COLLECTION,
cppu::UnoType::get(),PROPERTY_NONE , 0 },
{ UNO_NAME_SIZE, SID_ATTR_PAGE_SIZE,
cppu::UnoType::get(), PROPERTY_NONE,
MID_SIZE_SIZE|CONVERT_TWIPS},
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index
core.git: svx/source
svx/source/dialog/cuicharmap.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit cbcf22eb8748d59857b29a8792377a10fc6c42b2
Author: Oliver Specht
AuthorDate: Mon Feb 5 14:26:48 2024 +0100
Commit: Gabor Kelemen
CommitDate: Thu Feb 8 18:48:13 2024 +0100
tdf#159572 select font according to recent settings
selection of a recently inserted special character applies the
stored font to make sure the character is not inserted wit a
font that doesn't contain the symbol
Change-Id: Id61bfac3a2ff22dbdae8a5b83f000d3f0c3e992b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163004
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/svx/source/dialog/cuicharmap.cxx b/svx/source/dialog/cuicharmap.cxx
index 0d73c0d1b6dd..430bf250fdcd 100644
--- a/svx/source/dialog/cuicharmap.cxx
+++ b/svx/source/dialog/cuicharmap.cxx
@@ -523,6 +523,7 @@ IMPL_LINK(SvxCharacterMap, CharClickHdl, SvxCharView*,
rView, void)
{
rView->GrabFocus();
+SetCharFont(rView->GetFont());
m_aShowChar.SetText( rView->GetText() );
m_aShowChar.SetFont(rView->GetFont());
m_aShowChar.Invalidate();
core.git: sw/source
sw/source/core/frmedt/fetab.cxx |4 ++--
sw/source/core/table/swnewtable.cxx |9 -
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 8affaf465a2b4c092518406a495796b06a642b1d
Author: Oliver Specht
AuthorDate: Wed Jan 24 14:14:20 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Feb 8 15:31:39 2024 +0100
tdf#43848 fix selection in table with split/merged cells
extends the selection of table cells to reach a more
rectangular selection area
Additionally tdf#155670 is taken care of by not showing the
row selection cursor if row selection is not supported
Change-Id: If31aa1030c91d81bc889d8aaa668e96c5328f03f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162508
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 79f5eb6b5e58..33b9c9327b6d 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -2116,8 +2116,8 @@ SwTab SwFEShell::WhichMouseTabCol( const Point )
const
{
while( pFrame && pFrame->Lower() && pFrame->Lower()->IsRowFrame() )
pFrame = static_cast(static_cast(pFrame->Lower())->Lower());
-if( pFrame && pFrame->GetTabBox()->GetSttNd() &&
-pFrame->GetTabBox()->GetSttNd()->IsInProtectSect() )
+if( pFrame && ((pFrame->GetTabBox()->GetSttNd() &&
+pFrame->GetTabBox()->GetSttNd()->IsInProtectSect()) ||
(pFrame->GetTabBox()->getRowSpan() < 0)))
pFrame = nullptr;
}
diff --git a/sw/source/core/table/swnewtable.cxx
b/sw/source/core/table/swnewtable.cxx
index ac057a7ae938..a8b7e0e0d233 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -1739,7 +1739,11 @@ void SwTable::CreateSelection( const SwNode* pStartNd,
const SwNode* pEndNd,
rBoxes.insert( pBox );
if( nFound )
{
-nBottom = nRow;
+//if box is hiding cells bottom needs to be moved
+if (pBox->getRowSpan() > 1)
+nBottom = std::max(nBottom, size_t(nRow +
pBox->getRowSpan() - 1));
+else
+nBottom = std::max(nRow, nBottom);
lcl_CheckMinMax( nLowerMin, nLowerMax, *pLine, nCol, true
);
++nFound;
break;
@@ -1747,6 +1751,9 @@ void SwTable::CreateSelection( const SwNode* pStartNd,
const SwNode* pEndNd,
else
{
nTop = nRow;
+//if box is hiding cells bottom needs to be moved
+if (pBox->getRowSpan() > 1)
+nBottom = nRow + pBox->getRowSpan() - 1;
lcl_CheckMinMax( nUpperMin, nUpperMax, *pLine, nCol, true
);
++nFound;
// If start and end node are identical, we're nearly
done...
core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 6eda6afc90eda8f0a424a5e91a2b00f063c5
Author: Oliver Specht
AuthorDate: Wed Jan 31 16:41:34 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Feb 8 15:19:47 2024 +0100
tdf#159478 read field comment in default encoding
If a symbol font is applied inside a field the command string
was wrongly converted as symbol text. This is fixed by using a
default RTL_TEXTENCODING_MS_1252 encoding.
Change-Id: I11326ef3c79d6d74c720a2b4ac4987ee6716d912
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162844
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4db4a6352cce..188cec25b95a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3807,9 +3807,11 @@ void RTFDocumentImpl::checkUnicode(bool bUnicode, bool
bHex)
if (bHex && !m_aHexBuffer.isEmpty())
{
rtl_TextEncoding nEncoding = m_aStates.top().getCurrentEncoding();
-if ((m_aStates.top().getDestination() == Destination::FONTENTRY
- || m_aStates.top().getDestination() ==
Destination::FIELDINSTRUCTION)
-&& m_aStates.top().getCurrentEncoding() == RTL_TEXTENCODING_SYMBOL)
+if (nEncoding == RTL_TEXTENCODING_SYMBOL
+&& (m_aStates.top().getDestination() == Destination::FONTENTRY
+|| (m_aStates.size() > 1
+&& m_aStates[m_aStates.size() - 2].getDestination()
+ == Destination::FIELDINSTRUCTION)))
nEncoding = RTL_TEXTENCODING_MS_1252;
OUString aString = OStringToOUString(m_aHexBuffer, nEncoding);
m_aHexBuffer.setLength(0);
core.git: sw/source
sw/source/core/text/porrst.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit d1320c634817e4edb0d76da26178f323c6c675f2
Author: Oliver Specht
AuthorDate: Mon Feb 5 09:41:05 2024 +0100
Commit: Thorsten Behrens
CommitDate: Thu Feb 8 15:17:34 2024 +0100
tdf#159560 paragraph break should be shown as pilcrow sign
When non-printing characters are switched on at the end of the paragraph
a pilcrow sign is shown. This is displayed using the font at the end of
the character. If a symbol font is used that would result in a random symbol
instead of the pilcrow sign (0x00b6). This is fixed here.
Change-Id: I0d4ae9f439d2e34ca774d4e2cb188e94290808a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162983
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
Tested-by: Gabor Kelemen
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index b9d4e5ab3fcb..ff1e029ae141 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
@@ -47,6 +48,7 @@
#include
#include
#include
+#include
#include
#include
@@ -74,6 +76,16 @@ void SwTmpEndPortion::Paint( const SwTextPaintInfo )
const
SwFont aFont(*pOldFnt);
+const SwDoc& rDoc = rInf.GetTextFrame()->GetDoc();
+if (aFont.IsSymbol(rDoc.getIDocumentLayoutAccess().GetCurrentViewShell()))
+{
+const SvxFontItem& rFontItem = rDoc.GetDefault(RES_CHRATR_FONT);
+aFont.SetName( rFontItem.GetFamilyName(), SwFontScript::Latin );
+aFont.SetStyleName( rFontItem.GetStyleName(), SwFontScript::Latin );
+aFont.SetFamily( rFontItem.GetFamily(), SwFontScript::Latin );
+aFont.SetPitch( rFontItem.GetPitch(), SwFontScript::Latin );
+aFont.SetCharSet( rFontItem.GetCharSet(), SwFontScript::Latin );
+}
// Paint strikeout/underline based on redline color and settings
// (with an extra pilcrow in the background, because there is
// no SetStrikeoutColor(), also SetUnderColor() doesn't work()).
core.git: sw/source
sw/source/uibase/uiview/formatclipboard.cxx | 31 ++--
1 file changed, 20 insertions(+), 11 deletions(-)
New commits:
commit a5e2f4a8419a09d3a7d4118328824a5ea7ed2d6b
Author: Oliver Specht
AuthorDate: Tue Jan 23 16:51:14 2024 +0100
Commit: Thorsten Behrens
CommitDate: Mon Jan 29 12:05:04 2024 +0100
tdf#159342 switch off lists in clone formatting
When paragraph attributes are cloned
then lists are not only switched on but also switched off
depending on the list state at the source paragraph
Change-Id: I4299f4d75d61dd0def0fe6212f58bcce68f13dbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162470
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx
b/sw/source/uibase/uiview/formatclipboard.cxx
index e722c04e9046..9dfcb06ba030 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -483,19 +483,28 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell,
SfxStyleSheetBasePool* pPo
}
}
-// if there is a named paragraph format recorded and the user
wants to apply it
-if(!m_aParaStyle.isEmpty() && !bNoParagraphFormats )
+if (!bNoParagraphFormats)
{
-// look for the named paragraph format in the pool
-SwDocStyleSheet* pStyle =
static_cast(pPool->Find(m_aParaStyle, SfxStyleFamily::Para));
-if( pStyle )
+const SwNumRule* pNumRule
+= rWrtShell.GetNumRuleAtCurrCursorPos();
+if (pNumRule && !pNumRule->IsOutlineRule())
{
-// store the attributes from this style in aItemVector in
order
-// not to apply them as automatic formatting attributes
later in the code
-lcl_AppendSetItems( aItemVector,
pStyle->GetCollection()->GetAttrSet());
-
-// apply the named format
-rWrtShell.SetTextFormatColl( pStyle->GetCollection() );
+rWrtShell.NumOrBulletOff();
+}
+// if there is a named paragraph format recorded and the user
wants to apply it
+if(!m_aParaStyle.isEmpty())
+{
+// look for the named paragraph format in the pool
+SwDocStyleSheet* pStyle =
static_cast(pPool->Find(m_aParaStyle, SfxStyleFamily::Para));
+if( pStyle )
+{
+// store the attributes from this style in aItemVector
in order
+// not to apply them as automatic formatting
attributes later in the code
+lcl_AppendSetItems( aItemVector,
pStyle->GetCollection()->GetAttrSet());
+
+// apply the named format
+rWrtShell.SetTextFormatColl( pStyle->GetCollection() );
+}
}
}
}
core.git: Branch 'libreoffice-24-2' - sc/qa sc/source
sc/qa/uitest/calc_tests8/navigator.py | 27 +++
sc/source/ui/navipi/navipi.cxx|1 +
2 files changed, 28 insertions(+)
New commits:
commit 118e6cc0921849216e1fc3eb8d2f7dbb53463b26
Author: Oliver Specht
AuthorDate: Tue Dec 12 15:51:42 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Jan 28 20:58:05 2024 +0100
tdf#158652 notify navigator on insert/edit/delete comment
links changes of the drawing engine to comments as it was
done before with pictures, shapes and OLE objects
ui unit test included
Change-Id: I4fde3a82b80e73758fb3da94ed2553453d09e9ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160624
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 0097f8595791f4bbf499ebd423f4f80ec8e38dbe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162381
Reviewed-by: Caolán McNamara
diff --git a/sc/qa/uitest/calc_tests8/navigator.py
b/sc/qa/uitest/calc_tests8/navigator.py
index ec8fa2ae9a2e..9c1769dcf49d 100644
--- a/sc/qa/uitest/calc_tests8/navigator.py
+++ b/sc/qa/uitest/calc_tests8/navigator.py
@@ -10,6 +10,7 @@
from uitest.framework import UITestCase
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+from uitest.uihelper.calc import enter_text_to_cell
class navigator(UITestCase):
@@ -181,4 +182,30 @@ class navigator(UITestCase):
self.xUITest.executeCommand(".uno:Sidebar")
+
+def test_tdf158652(self):
+with self.ui_test.create_doc_in_start_center("calc"):
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xGridWin = xCalcDoc.getChild("grid_window")
+
+self.xUITest.executeCommand(".uno:Sidebar")
+
+xGridWin.executeAction("SIDEBAR", mkPropertyValues({"PANEL":
"ScNavigatorPanel"}))
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xNavigatorPanel = xCalcDoc.getChild("NavigatorPanel")
+xContentBox = xNavigatorPanel.getChild('contentbox')
+enter_text_to_cell(xGridWin, "A1", "1")
+
+commentText = mkPropertyValues({"Text":"CommentText"})
+self.xUITest.executeCommandWithParameters(".uno:InsertAnnotation",
commentText)
+xComments = xContentBox.getChild("6")
+self.assertEqual(len(xComments.getChildren()), 1)
+
+self.xUITest.executeCommand(".uno:DeleteNote")
+xComments = xContentBox.getChild("6")
+self.assertEqual(len(xComments.getChildren()), 0)
+
+self.xUITest.executeCommand(".uno:Sidebar")
+
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 5fc6fee82122..ae95220eeffb 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -540,6 +540,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const
SfxHint& rHint )
m_xLbEntries->Refresh( ScContentId::GRAPHIC );
m_xLbEntries->Refresh( ScContentId::OLEOBJECT );
m_xLbEntries->Refresh( ScContentId::DRAWING );
+m_xLbEntries->Refresh( ScContentId::NOTE );
break;
case SfxHintId::ScAreaLinksChanged:
core.git: Branch 'libreoffice-24-2-0' - sw/qa writerfilter/source
sw/qa/extras/rtfexport/data/tdf158830.rtf | 237
sw/qa/extras/rtfexport/data/tdf158978.rtf | 350 ++
sw/qa/extras/rtfexport/data/tdf158982.rtf | 281
sw/qa/extras/rtfexport/rtfexport8.cxx | 45 +++
writerfilter/source/rtftok/rtfsprm.cxx|2
5 files changed, 914 insertions(+), 1 deletion(-)
New commits:
commit ebee4f6a811ff5e9b0d9d4ae21e349ae3b0cdfdd
Author: Oliver Specht
AuthorDate: Tue Jan 9 11:39:58 2024 +0100
Commit: Christian Lohmaier
CommitDate: Thu Jan 25 14:27:18 2024 +0100
tdf#158830 fixes regression introduces with tdf#158044
Removing paragraph attributes equal to style attributes now works also
for paragraphs within tables.
This fixes also the regressions documented in tdf#158978 and tdf#158982
Change-Id: I9f430e23fd33cff4d6ec1d1954969666f0080574
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161824
Tested-by: Jenkins
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
(cherry picked from commit 204d50a07501bf8445a8a0526f68987373834318)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162109
(cherry picked from commit ad172c0fe26212dccfabe11e534ac53b82816ec9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162133
Reviewed-by: Ilmari Lauhakangas
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/sw/qa/extras/rtfexport/data/tdf158830.rtf
b/sw/qa/extras/rtfexport/data/tdf158830.rtf
new file mode 100755
index ..f6408a63b4c6
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf158830.rtf
@@ -0,0 +1,237 @@
+{
tf1deflang1025nsinsicpg1250\uc1deff1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1038\deflangfe1038
hemelang1035hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman
charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New
Roman};}
+{ 1 bidi swiss charset0 prq2{\*\panose 020b0604020202020204}Arial{\* alt
Helvetica};}{ 1 bidi swiss charset0 prq2{\*\panose
020b0604020202020204}Arial{\* alt Helvetica};}
+{ 39 bidi swiss charset0 prq2{\*\panose 020f0502020204030204}Calibri;}{ 40
bidi swiss charset0 prq2{\*\panose }Tahoma;}{ 42 bidi
roman charset0 prq2{\*\panose 02040503050406030204}Cambria;}
+{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbmajor 31501 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himajor 31502 bidi roman charset0 prq2{\*\panose
02040503050406030204}Cambria;}{ bimajor 31503 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ lominor 31504 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbminor 31505 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himinor 31506 bidi swiss charset0 prq2{\*\panose
020f0502020204030204}Calibri;}{ biminor 31507 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ 359 bidi roman charset238 prq2 Times New Roman CE{\* alt Times New
Roman};}{ 360 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Times New
Roman};}
+{ 362 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times New
Roman};}{ 363 bidi roman charset162 prq2 Times New Roman Tur{\* alt Times New
Roman};}
+{ 364 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Times New
Roman};}{ 365 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Times
New Roman};}
+{ 366 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Times New
Roman};}{ 367 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt
Times New Roman};}{ 369 bidi swiss charset238 prq2 Arial CE{\* alt Helvetica};}
+{ 370 bidi swiss charset204 prq2 Arial Cyr{\* alt Helvetica};}{ 372 bidi
swiss charset161 prq2 Arial Greek{\* alt Helvetica};}{ 373 bidi swiss
charset162 prq2 Arial Tur{\* alt Helvetica};}
+{ 374 bidi swiss charset177 prq2 Arial (Hebrew){\* alt Helvetica};}{ 375 bidi
swiss charset178 prq2 Arial (Arabic){\* alt Helvetica};}{ 376 bidi swiss
charset186 prq2 Arial Baltic{\* alt Helvetica};}
+{ 377 bidi swiss charset163 prq2 Arial (Vietnamese){\* alt Helvetica};}{ 369
bidi swiss charset238 prq2 Arial CE{\* alt Helvetica};}{ 370 bidi swiss
charset204 prq2 Arial Cyr{\* alt Helvetica};}
+{ 372 bidi swiss charset161 prq2 Arial Greek{\* alt Helvetica};}{ 373 bidi
swiss charset162 prq2 Arial Tur{\* alt Helvetica};}{ 374 bidi swiss charset177
prq2 Arial (Hebrew){\* alt Helvetica};}
+{ 375 bidi swiss charset178 prq2 Arial (Arabic){\* alt Helvetica};}{ 376 bidi
swiss charset186 prq2 Arial Baltic{\* alt Helvetica};}{ 377 bidi swiss
charset163 prq2 Arial (Vietnamese){\* alt
core.git: Branch 'distro/collabora/co-23.05' - editeng/source include/editeng sc/source sd/source sw/source
editeng/source/editeng/editeng.cxx |4 ++--
editeng/source/editeng/editview.cxx |4 ++--
editeng/source/editeng/impedit.cxx |4 ++--
editeng/source/editeng/impedit.hxx |4 ++--
editeng/source/editeng/impedit2.cxx | 32 +---
editeng/source/outliner/outlvw.cxx |8
include/editeng/editeng.hxx |4 +++-
include/editeng/editview.hxx |3 ++-
include/editeng/outliner.hxx |5 +++--
sc/source/ui/drawfunc/drtxtob1.cxx |3 ++-
sd/source/ui/func/fuinsert.cxx |1 +
sd/source/ui/view/sdview3.cxx| 30 ++
sw/source/uibase/shells/drwtxtex.cxx |3 ++-
13 files changed, 84 insertions(+), 21 deletions(-)
New commits:
commit 2f2231d35a925daf8a54041e09846529add9e434
Author: Oliver Specht
AuthorDate: Mon Oct 30 13:26:49 2023 +0100
Commit: Miklos Vajna
CommitDate: Thu Jan 25 11:48:10 2024 +0100
tdf#157363 add HTML format when pasting into draw text
adds HTML to paste(special) in draw text in impress/draw/calc/writer
(cherry picked from commit 87be89ac27023f48f68a873b37df31aa0453d6fa)
Conflicts:
include/editeng/editeng.hxx
Change-Id: Iaede82e1b3d48be362b70bd631e7f912b02b9822
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162554
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 2b4ac3f5259e..f3ebd8c4f806 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -849,9 +849,9 @@ EditSelection EditEngine::InsertText(const EditTextObject&
rTextObject, const Ed
EditSelection EditEngine::InsertText(
uno::Reference const & rxDataObj,
-const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial)
+const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial,
SotClipboardFormatId format)
{
-return pImpEditEngine->PasteText(rxDataObj, rBaseURL, rPaM, bUseSpecial);
+return pImpEditEngine->PasteText(rxDataObj, rBaseURL, rPaM, bUseSpecial,
format);
}
EditPaM EditEngine::EndOfWord(const EditPaM& rPaM)
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index e439dde999f5..f10bffc6b1fc 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -682,10 +682,10 @@ void EditView::Paste()
pImpEditView->Paste( aClipBoard );
}
-void EditView::PasteSpecial()
+void EditView::PasteSpecial(SotClipboardFormatId format)
{
Reference
aClipBoard(GetClipboard());
-pImpEditView->Paste(aClipBoard, true );
+pImpEditView->Paste(aClipBoard, true, format );
}
Point EditView::GetWindowPosTopLeft( sal_Int32 nParagraph )
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 8beba4660b84..fad83a42e236 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1946,7 +1946,7 @@ void ImpEditView::CutCopy( css::uno::Reference<
css::datatransfer::clipboard::XC
}
}
-void ImpEditView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial )
+void ImpEditView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial, SotClipboardFormatId format)
{
if ( !rxClipboard.is() )
return;
@@ -2006,7 +2006,7 @@ void ImpEditView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XCli
// paragraphs. Collect and broadcast when done instead.
aSel = pEditEngine->InsertText(
xDataObj, OUString(), aSel.Min(),
-bUseSpecial &&
pEditEngine->GetInternalEditStatus().AllowPasteSpecial());
+bUseSpecial &&
pEditEngine->GetInternalEditStatus().AllowPasteSpecial(), format);
}
aPasteOrDropInfos.nEndPara = pEditEngine->GetEditDoc().GetPos(
aSel.Max().GetNode() );
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 002eb1e04c2a..1de7e8f0a9c9 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -378,7 +378,7 @@ public:
boolCommand(const CommandEvent& rCEvt);
voidCutCopy( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool bCut );
-voidPaste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial = false );
+voidPaste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial = false, SotClipboardFormatId format = SotClipboardFormatId::NONE);
voidSetVisDocStartPos( const Point& rPos ) { aVisDocStartPos =
rPos; }
@@ -648,7 +648,7 @@ private:
std::unique_ptr
CreateTextObject(EditSelection
core.git: include/vcl sw/inc sw/source vcl/inc vcl/osx vcl/source vcl/unx vcl/win writerfilter/source
include/vcl/print.hxx |1
sw/inc/unoprnms.hxx |1
sw/source/core/unocore/unomap1.cxx|1
sw/source/core/unocore/unostyle.cxx | 28 ++
vcl/inc/osx/salprn.h |2 +
vcl/inc/salprn.hxx|3 ++
vcl/inc/unx/genprn.h |2 +
vcl/inc/win/salprn.h |3 ++
vcl/osx/salprn.cxx|5 +++
vcl/source/gdi/print.cxx |8 ++
vcl/unx/generic/print/genprnpsp.cxx |5 +++
vcl/win/gdi/salprn.cxx| 19 ++
writerfilter/source/dmapper/DomainMapper.cxx | 17 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 ++
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 22 +
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
writerfilter/source/dmapper/PropertyMap.cxx | 24 ++
writerfilter/source/dmapper/PropertyMap.hxx |7 -
writerfilter/source/ooxml/model.xml |4 +++
writerfilter/source/rtftok/rtfdispatchvalue.cxx | 12 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx|5 +++
22 files changed, 167 insertions(+), 12 deletions(-)
New commits:
commit e6f75eb50bc5d1ebccda0c0f80a7b353d991106e
Author: Oliver Specht
AuthorDate: Thu Jan 18 08:48:10 2024 +0100
Commit: Thorsten Behrens
CommitDate: Fri Jan 19 23:33:03 2024 +0100
tdf#159254 import paper bin/paper source from rtf/docx files
Imports infsxn and insxn from RTF and
w:paperSrc from docx files and applies paper tray to the page style
if the printer supports the imported tray value.
Works only on Windows.
Change-Id: Ie1170c58f7114f0dbf6bdd2721d4e077886cbe16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162236
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index d6ce7728f9a6..e23cf8d0af1b 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -227,6 +227,7 @@ public:
boolSetPaperBin( sal_uInt16 nPaperBin );
sal_uInt16 GetPaperBin() const;
+sal_uInt16 GetPaperBinBySourceIndex(sal_uInt16
nPaperSource) const;
voidSetPaper( Paper ePaper );
boolSetPaperSizeUser( const Size& rSize );
/** @return The paper format of the printer's current "jobsetup". Note
that if PAPER_USER the actual size can be anything. */
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 396e8e3d7e29..a6a2cf373e87 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -205,6 +205,7 @@ inline constexpr OUString UNO_NAME_POSITION_PROTECTED =
u"PositionProtected"_ust
inline constexpr OUString UNO_NAME_ALTERNATIVE_TEXT = u"AlternativeText"_ustr;
inline constexpr OUString UNO_NAME_PRIMARY_KEY = u"PrimaryKey"_ustr;
inline constexpr OUString UNO_NAME_PRINTER_PAPER_TRAY =
u"PrinterPaperTray"_ustr;
+inline constexpr OUString UNO_NAME_PRINTER_PAPER_TRAY_INDEX =
u"PrinterPaperTrayIndex"_ustr;
inline constexpr OUString UNO_NAME_RELATIVE_WIDTH = u"RelativeWidth"_ustr;
inline constexpr OUString UNO_NAME_RELATIVE_WIDTH_RELATION =
u"RelativeWidthRelation"_ustr;
inline constexpr OUString UNO_NAME_RELATIVE_HEIGHT = u"RelativeHeight"_ustr;
diff --git a/sw/source/core/unocore/unomap1.cxx
b/sw/source/core/unocore/unomap1.cxx
index ee4422a22e9d..12db464a874b 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -537,6 +537,7 @@ std::span
SwUnoPropertyMapProvider::GetPageStyleP
{ UNO_NAME_NUMBERING_TYPE, SID_ATTR_PAGE,
cppu::UnoType::get(), PROPERTY_NONE , MID_PAGE_NUMTYPE
},
{ UNO_NAME_PAGE_STYLE_LAYOUT, SID_ATTR_PAGE,
cppu::UnoType::get(),PROPERTY_NONE
,MID_PAGE_LAYOUT },
{ UNO_NAME_PRINTER_PAPER_TRAY, RES_PAPER_BIN,
cppu::UnoType::get(),PROPERTY_NONE , 0 },
+{ UNO_NAME_PRINTER_PAPER_TRAY_INDEX, RES_PAPER_BIN,
cppu::UnoType::get(),PROPERTY_NONE , 0 },
// { UNO_NAME_REGISTER_MODE_ACTIVE, SID_SWREGISTER_MODE,
cppu::UnoType::get(), PROPERTY_NONE , 0 },
{ UNO_NAME_REGISTER_PARAGRAPH_STYLE, SID_SWREGISTER_COLLECTION,
cppu::UnoType::get(),PROPERTY_NONE , 0 },
{ UNO_NAME_SIZE, SID_ATTR_PAGE_SIZE,
cppu::UnoType::get(), PROPERTY_NONE,
MID_SIZE_SIZE|CONVERT_TWIPS},
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index c4fa8a3f4668..a68424c221a3 100644
---
core.git: sw/inc sw/qa sw/source
sw/inc/crsrsh.hxx |2 -
sw/qa/uitest/data/tdf150037.docx|binary
sw/qa/uitest/data/tdf150037.odt |binary
sw/qa/uitest/writer_tests8/tdf150037.py | 44
sw/source/core/crsr/crbm.cxx|9 --
sw/source/core/inc/swfont.hxx |2 +
sw/source/core/txtnode/fntcache.cxx |9 --
sw/source/uibase/docvw/edtwin.cxx |6 +++-
sw/source/uibase/inc/edtwin.hxx |2 +
sw/source/uibase/inc/wrtsh.hxx |2 -
sw/source/uibase/uitest/uiobject.cxx| 37 ++
sw/source/uibase/wrtsh/wrtsh3.cxx |4 +-
12 files changed, 106 insertions(+), 11 deletions(-)
New commits:
commit 96323a10d3a55d212c350886e2a1344c0cd2ba95
Author: Oliver Specht
AuthorDate: Wed Dec 20 07:15:53 2023 +0100
Commit: Thorsten Behrens
CommitDate: Wed Jan 17 22:24:25 2024 +0100
tdf#150037 Writer: text fieldmark behaviour changed
A mouse click selects the fieldmark to be able to overwrite the field
with the next text input. Additionally the EN SPACE (0x2002) character
is visualized by the DEGREE symbol when 'View/Formatting Marks' is
active.
Word's FORMTEXT ist usually filled with EN SPACE.
Change-Id: I82446473d31bc5ea101bd1b94a50a855351d88b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161044
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index db0667002ee2..5823a49a1599 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -593,7 +593,7 @@ public:
::sw::mark::IFieldmark* GetCurrentFieldmark();
sw::mark::IFieldmark* GetFieldmarkAfter(bool bLoop);
sw::mark::IFieldmark* GetFieldmarkBefore(bool bLoop);
-bool GotoFieldmark( const ::sw::mark::IFieldmark* const pMark );
+bool GotoFieldmark( const ::sw::mark::IFieldmark* const pMark, bool
completeSelection = false );
// update Cursr, i.e. reset it into content should only be called when the
// cursor was set to a random position e.g. when deleting frames
diff --git a/sw/qa/uitest/data/tdf150037.docx b/sw/qa/uitest/data/tdf150037.docx
new file mode 100755
index ..4fcb18efd724
Binary files /dev/null and b/sw/qa/uitest/data/tdf150037.docx differ
diff --git a/sw/qa/uitest/data/tdf150037.odt b/sw/qa/uitest/data/tdf150037.odt
new file mode 100755
index ..15d75a694b0a
Binary files /dev/null and b/sw/qa/uitest/data/tdf150037.odt differ
diff --git a/sw/qa/uitest/writer_tests8/tdf150037.py
b/sw/qa/uitest/writer_tests8/tdf150037.py
new file mode 100644
index ..39ea5eda7dec
--- /dev/null
+++ b/sw/qa/uitest/writer_tests8/tdf150037.py
@@ -0,0 +1,44 @@
+# -*- 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
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from com.sun.star.text.TextContentAnchorType import AT_PAGE, AT_PARAGRAPH
+
+class tdf150037(UITestCase):
+
+def test_tdf150037(self):
+
+with self.ui_test.load_file(get_url_for_data_file("tdf150037.docx"))
as document:
+
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+xWriterEdit.executeAction("CLICK", mkPropertyValues({"START_POS":
"14", "END_POS": "14"}))
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"TEXT":
"Replacement"}))
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"0", "END_POS": "22"}))
+windowState = xWriterEdit.getState();
+self.assertEqual(windowState[14].Value, "Fieldmark: Replacement")
+
+def test_tdf150037_protected(self):
+
+with self.ui_test.load_file(get_url_for_data_file("tdf150037.odt")) as
document:
+
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE":
"DOWN"}))
+xWriterEdit.executeAction("CLICK", mkPropertyValues({"START_POS":
"14", "END_POS": "14"}))
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"TEXT":
"Replacement"}))
+xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS":
"0", "END_POS": "23"}))
+windowState = xWriterEdit.getState();
+self.assertEqual(windowState[14].Value, "Fieldmark: Replacement")
+
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index e296bd50e8fe..fbc2ab28e1da 100644
---
core.git: Branch 'libreoffice-24-2' - sw/qa writerfilter/source
sw/qa/extras/rtfexport/data/tdf158830.rtf | 237
sw/qa/extras/rtfexport/data/tdf158978.rtf | 350 ++
sw/qa/extras/rtfexport/data/tdf158982.rtf | 281
sw/qa/extras/rtfexport/rtfexport8.cxx | 45 +++
writerfilter/source/rtftok/rtfsprm.cxx|2
5 files changed, 914 insertions(+), 1 deletion(-)
New commits:
commit b65a2bc14c1553846bd0f4910951a0a964b3cde5
Author: Oliver Specht
AuthorDate: Tue Jan 9 11:39:58 2024 +0100
Commit: Xisco Fauli
CommitDate: Mon Jan 15 21:40:14 2024 +0100
tdf#158830 fixes regression introduces with tdf#158044
Removing paragraph attributes equal to style attributes now works also
for paragraphs within tables.
This fixes also the regressions documented in tdf#158978 and tdf#158982
Change-Id: I9f430e23fd33cff4d6ec1d1954969666f0080574
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161824
Tested-by: Jenkins
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
(cherry picked from commit 204d50a07501bf8445a8a0526f68987373834318)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162109
diff --git a/sw/qa/extras/rtfexport/data/tdf158830.rtf
b/sw/qa/extras/rtfexport/data/tdf158830.rtf
new file mode 100755
index ..f6408a63b4c6
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf158830.rtf
@@ -0,0 +1,237 @@
+{
tf1deflang1025nsinsicpg1250\uc1deff1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1038\deflangfe1038
hemelang1035hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman
charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New
Roman};}
+{ 1 bidi swiss charset0 prq2{\*\panose 020b0604020202020204}Arial{\* alt
Helvetica};}{ 1 bidi swiss charset0 prq2{\*\panose
020b0604020202020204}Arial{\* alt Helvetica};}
+{ 39 bidi swiss charset0 prq2{\*\panose 020f0502020204030204}Calibri;}{ 40
bidi swiss charset0 prq2{\*\panose }Tahoma;}{ 42 bidi
roman charset0 prq2{\*\panose 02040503050406030204}Cambria;}
+{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbmajor 31501 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himajor 31502 bidi roman charset0 prq2{\*\panose
02040503050406030204}Cambria;}{ bimajor 31503 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ lominor 31504 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbminor 31505 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himinor 31506 bidi swiss charset0 prq2{\*\panose
020f0502020204030204}Calibri;}{ biminor 31507 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ 359 bidi roman charset238 prq2 Times New Roman CE{\* alt Times New
Roman};}{ 360 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Times New
Roman};}
+{ 362 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times New
Roman};}{ 363 bidi roman charset162 prq2 Times New Roman Tur{\* alt Times New
Roman};}
+{ 364 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Times New
Roman};}{ 365 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Times
New Roman};}
+{ 366 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Times New
Roman};}{ 367 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt
Times New Roman};}{ 369 bidi swiss charset238 prq2 Arial CE{\* alt Helvetica};}
+{ 370 bidi swiss charset204 prq2 Arial Cyr{\* alt Helvetica};}{ 372 bidi
swiss charset161 prq2 Arial Greek{\* alt Helvetica};}{ 373 bidi swiss
charset162 prq2 Arial Tur{\* alt Helvetica};}
+{ 374 bidi swiss charset177 prq2 Arial (Hebrew){\* alt Helvetica};}{ 375 bidi
swiss charset178 prq2 Arial (Arabic){\* alt Helvetica};}{ 376 bidi swiss
charset186 prq2 Arial Baltic{\* alt Helvetica};}
+{ 377 bidi swiss charset163 prq2 Arial (Vietnamese){\* alt Helvetica};}{ 369
bidi swiss charset238 prq2 Arial CE{\* alt Helvetica};}{ 370 bidi swiss
charset204 prq2 Arial Cyr{\* alt Helvetica};}
+{ 372 bidi swiss charset161 prq2 Arial Greek{\* alt Helvetica};}{ 373 bidi
swiss charset162 prq2 Arial Tur{\* alt Helvetica};}{ 374 bidi swiss charset177
prq2 Arial (Hebrew){\* alt Helvetica};}
+{ 375 bidi swiss charset178 prq2 Arial (Arabic){\* alt Helvetica};}{ 376 bidi
swiss charset186 prq2 Arial Baltic{\* alt Helvetica};}{ 377 bidi swiss
charset163 prq2 Arial (Vietnamese){\* alt Helvetica};}
+{ 749 bidi swiss charset238 prq2 Calibri CE;}{ 750 bidi swiss charset204
prq2 Calibri Cyr;}{ 752 bidi swiss charset161 prq2 Calibri Greek;}{ 753 bidi
swiss charset162 prq2 Calibri Tur;}
+{ 754 bidi swiss charset177 prq2 Calibri
core.git: sw/qa writerfilter/source
sw/qa/extras/rtfexport/data/tdf158830.rtf | 237
sw/qa/extras/rtfexport/data/tdf158978.rtf | 350 ++
sw/qa/extras/rtfexport/data/tdf158982.rtf | 281
sw/qa/extras/rtfexport/rtfexport8.cxx | 45 +++
writerfilter/source/rtftok/rtfsprm.cxx|2
5 files changed, 914 insertions(+), 1 deletion(-)
New commits:
commit 70386cd81f8c6e14014cf3cd50ecd6a987c12985
Author: Oliver Specht
AuthorDate: Tue Jan 9 11:39:58 2024 +0100
Commit: Gabor Kelemen
CommitDate: Mon Jan 15 18:09:04 2024 +0100
tdf#158830 fixes regression introduces with tdf#158044
Removing paragraph attributes equal to style attributes now works also
for paragraphs within tables.
This fixes also the regressions documented in tdf#158978 and tdf#158982
Change-Id: I9f430e23fd33cff4d6ec1d1954969666f0080574
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161824
Tested-by: Jenkins
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/rtfexport/data/tdf158830.rtf
b/sw/qa/extras/rtfexport/data/tdf158830.rtf
new file mode 100755
index ..f6408a63b4c6
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf158830.rtf
@@ -0,0 +1,237 @@
+{
tf1deflang1025nsinsicpg1250\uc1deff1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1038\deflangfe1038
hemelang1035hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman
charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New
Roman};}
+{ 1 bidi swiss charset0 prq2{\*\panose 020b0604020202020204}Arial{\* alt
Helvetica};}{ 1 bidi swiss charset0 prq2{\*\panose
020b0604020202020204}Arial{\* alt Helvetica};}
+{ 39 bidi swiss charset0 prq2{\*\panose 020f0502020204030204}Calibri;}{ 40
bidi swiss charset0 prq2{\*\panose }Tahoma;}{ 42 bidi
roman charset0 prq2{\*\panose 02040503050406030204}Cambria;}
+{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbmajor 31501 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himajor 31502 bidi roman charset0 prq2{\*\panose
02040503050406030204}Cambria;}{ bimajor 31503 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ lominor 31504 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbminor 31505 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himinor 31506 bidi swiss charset0 prq2{\*\panose
020f0502020204030204}Calibri;}{ biminor 31507 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ 359 bidi roman charset238 prq2 Times New Roman CE{\* alt Times New
Roman};}{ 360 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Times New
Roman};}
+{ 362 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times New
Roman};}{ 363 bidi roman charset162 prq2 Times New Roman Tur{\* alt Times New
Roman};}
+{ 364 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Times New
Roman};}{ 365 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Times
New Roman};}
+{ 366 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Times New
Roman};}{ 367 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt
Times New Roman};}{ 369 bidi swiss charset238 prq2 Arial CE{\* alt Helvetica};}
+{ 370 bidi swiss charset204 prq2 Arial Cyr{\* alt Helvetica};}{ 372 bidi
swiss charset161 prq2 Arial Greek{\* alt Helvetica};}{ 373 bidi swiss
charset162 prq2 Arial Tur{\* alt Helvetica};}
+{ 374 bidi swiss charset177 prq2 Arial (Hebrew){\* alt Helvetica};}{ 375 bidi
swiss charset178 prq2 Arial (Arabic){\* alt Helvetica};}{ 376 bidi swiss
charset186 prq2 Arial Baltic{\* alt Helvetica};}
+{ 377 bidi swiss charset163 prq2 Arial (Vietnamese){\* alt Helvetica};}{ 369
bidi swiss charset238 prq2 Arial CE{\* alt Helvetica};}{ 370 bidi swiss
charset204 prq2 Arial Cyr{\* alt Helvetica};}
+{ 372 bidi swiss charset161 prq2 Arial Greek{\* alt Helvetica};}{ 373 bidi
swiss charset162 prq2 Arial Tur{\* alt Helvetica};}{ 374 bidi swiss charset177
prq2 Arial (Hebrew){\* alt Helvetica};}
+{ 375 bidi swiss charset178 prq2 Arial (Arabic){\* alt Helvetica};}{ 376 bidi
swiss charset186 prq2 Arial Baltic{\* alt Helvetica};}{ 377 bidi swiss
charset163 prq2 Arial (Vietnamese){\* alt Helvetica};}
+{ 749 bidi swiss charset238 prq2 Calibri CE;}{ 750 bidi swiss charset204
prq2 Calibri Cyr;}{ 752 bidi swiss charset161 prq2 Calibri Greek;}{ 753 bidi
swiss charset162 prq2 Calibri Tur;}
+{ 754 bidi swiss charset177 prq2 Calibri (Hebrew);}{ 755 bidi swiss
charset178 prq2 Calibri (Arabic);}{ 756 bidi swiss charset186 prq2 Calibri
Baltic;}{ 757 bidi swiss charset163
core.git: Branch 'libreoffice-24-2' - sw/source
sw/source/core/text/inftxt.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit dcfb786e5dee09a2ee28df9a4c64e08fef6180f9
Author: Oliver Specht
AuthorDate: Thu Dec 21 13:59:03 2023 +0100
Commit: Michael Stahl
CommitDate: Tue Jan 9 15:17:56 2024 +0100
tdf#98321 Checkbox: size like Word
Display checkboxes imported from docx/rtf in the same size as Word.
Additionally apply font highlighting if available.
Change-Id: Ifea4aebf8c39b6cdd750f3c90e121da0c4131d4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161124
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
(cherry picked from commit bece5f05a33ac7ac723b46d455d104930a3b0839)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161312
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 5e5d5718102f..3d9121ef1ec2 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1112,12 +1112,15 @@ void SwTextPaintInfo::DrawCheckBox(const
SwFieldFormCheckboxPortion , bool
{
OutputDevice* pOut = const_cast(GetOut());
pOut->Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR );
-pOut->SetFillColor( GetOpt().GetFieldShadingsColor() );
+if( m_pFnt->GetHighlightColor() != COL_TRANSPARENT )
+pOut->SetFillColor(m_pFnt->GetHighlightColor());
+else
+pOut->SetFillColor(GetOpt().GetFieldShadingsColor());
pOut->SetLineColor();
pOut->DrawRect( aIntersect.SVRect() );
pOut->Pop();
}
-const int delta=10;
+const int delta = 25;
tools::Rectangle r(aIntersect.Left()+delta, aIntersect.Top()+delta,
aIntersect.Right()-delta, aIntersect.Bottom()-delta);
m_pOut->Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR );
m_pOut->SetLineColor( Color(0, 0, 0));
core.git: sw/source
sw/source/core/text/inftxt.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit bece5f05a33ac7ac723b46d455d104930a3b0839
Author: Oliver Specht
AuthorDate: Thu Dec 21 13:59:03 2023 +0100
Commit: Thorsten Behrens
CommitDate: Fri Dec 22 22:23:34 2023 +0100
tdf#98321 Checkbox: size like Word
Display checkboxes imported from docx/rtf in the same size as Word.
Additionally apply font highlighting if available.
Change-Id: Ifea4aebf8c39b6cdd750f3c90e121da0c4131d4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161124
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 129234c8a4cf..c005ad75b7bf 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1112,12 +1112,15 @@ void SwTextPaintInfo::DrawCheckBox(const
SwFieldFormCheckboxPortion , bool
{
OutputDevice* pOut = const_cast(GetOut());
pOut->Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR );
-pOut->SetFillColor( GetOpt().GetFieldShadingsColor() );
+if( m_pFnt->GetHighlightColor() != COL_TRANSPARENT )
+pOut->SetFillColor(m_pFnt->GetHighlightColor());
+else
+pOut->SetFillColor(GetOpt().GetFieldShadingsColor());
pOut->SetLineColor();
pOut->DrawRect( aIntersect.SVRect() );
pOut->Pop();
}
-const int delta=10;
+const int delta = 25;
tools::Rectangle r(aIntersect.Left()+delta, aIntersect.Top()+delta,
aIntersect.Right()-delta, aIntersect.Bottom()-delta);
m_pOut->Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR );
m_pOut->SetLineColor( Color(0, 0, 0));
core.git: sc/qa sc/source
sc/qa/uitest/calc_tests8/navigator.py | 27 +++
sc/source/ui/navipi/navipi.cxx|1 +
2 files changed, 28 insertions(+)
New commits:
commit 0097f8595791f4bbf499ebd423f4f80ec8e38dbe
Author: Oliver Specht
AuthorDate: Tue Dec 12 15:51:42 2023 +0100
Commit: Thorsten Behrens
CommitDate: Fri Dec 22 09:59:04 2023 +0100
tdf#158652 notify navigator on insert/edit/delete comment
links changes of the drawing engine to comments as it was
done before with pictures, shapes and OLE objects
ui unit test included
Change-Id: I4fde3a82b80e73758fb3da94ed2553453d09e9ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160624
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sc/qa/uitest/calc_tests8/navigator.py
b/sc/qa/uitest/calc_tests8/navigator.py
index ec8fa2ae9a2e..9c1769dcf49d 100644
--- a/sc/qa/uitest/calc_tests8/navigator.py
+++ b/sc/qa/uitest/calc_tests8/navigator.py
@@ -10,6 +10,7 @@
from uitest.framework import UITestCase
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+from uitest.uihelper.calc import enter_text_to_cell
class navigator(UITestCase):
@@ -181,4 +182,30 @@ class navigator(UITestCase):
self.xUITest.executeCommand(".uno:Sidebar")
+
+def test_tdf158652(self):
+with self.ui_test.create_doc_in_start_center("calc"):
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xGridWin = xCalcDoc.getChild("grid_window")
+
+self.xUITest.executeCommand(".uno:Sidebar")
+
+xGridWin.executeAction("SIDEBAR", mkPropertyValues({"PANEL":
"ScNavigatorPanel"}))
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xNavigatorPanel = xCalcDoc.getChild("NavigatorPanel")
+xContentBox = xNavigatorPanel.getChild('contentbox')
+enter_text_to_cell(xGridWin, "A1", "1")
+
+commentText = mkPropertyValues({"Text":"CommentText"})
+self.xUITest.executeCommandWithParameters(".uno:InsertAnnotation",
commentText)
+xComments = xContentBox.getChild("6")
+self.assertEqual(len(xComments.getChildren()), 1)
+
+self.xUITest.executeCommand(".uno:DeleteNote")
+xComments = xContentBox.getChild("6")
+self.assertEqual(len(xComments.getChildren()), 0)
+
+self.xUITest.executeCommand(".uno:Sidebar")
+
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 5fc6fee82122..ae95220eeffb 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -540,6 +540,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const
SfxHint& rHint )
m_xLbEntries->Refresh( ScContentId::GRAPHIC );
m_xLbEntries->Refresh( ScContentId::OLEOBJECT );
m_xLbEntries->Refresh( ScContentId::DRAWING );
+m_xLbEntries->Refresh( ScContentId::NOTE );
break;
case SfxHintId::ScAreaLinksChanged:
core.git: Branch 'libreoffice-24-2' - 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf158044.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport20.cxx| 34 ++
sw/qa/extras/ooxmlimport/data/tdf154370.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 77 +
sw/qa/extras/rtfexport/data/tdf158762.rtf | 335 ++
sw/qa/extras/rtfexport/rtfexport7.cxx | 11
sw/source/filter/ww8/wrtw8nds.cxx | 152 -
sw/source/filter/ww8/wrtww8.hxx |2
writerfilter/source/dmapper/DomainMapper.cxx |1
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 160 ++
writerfilter/source/dmapper/DomainMapper_Impl.hxx |4
11 files changed, 750 insertions(+), 26 deletions(-)
New commits:
commit feb5b8b559bd46f2bdc9dfd85125d28cdd05dd37
Author: Oliver Specht
AuthorDate: Tue Dec 19 07:38:02 2023 +0100
Commit: Thorsten Behrens
CommitDate: Thu Dec 21 16:02:59 2023 +0100
tdf#158762 RTF writerfilter: fix list import
While importing the properties NumberingRules and NumberingStyleName
interfere with each other. Avoid overwriting NumberingRules with an
invalid NumberingStyleName.
Regression from 588ff9a228f4894142264c68392ed1e9800a4d7d
Change-Id: I706ea514da43faae0fdb9a2c0d4f5b1928ef55f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160967
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit fad76223d1cff3746a5d2e4ce56b93ecd1c80f61)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161092
diff --git a/sw/qa/extras/rtfexport/data/tdf158762.rtf
b/sw/qa/extras/rtfexport/data/tdf158762.rtf
new file mode 100755
index ..2953c2acf29a
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf158762.rtf
@@ -0,0 +1,335 @@
+{
tf1deflang1025nsinsicpg1252\uc1deff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang3079\deflangfe3079
hemelang3079hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman
charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New
Roman};}
+{ 34 bidi roman charset0 prq2{\*\panose 02040503050406030204}Cambria Math;}{
40 bidi swiss charset0 prq2{\*\panose }Tahoma{\* alt Times
New Roman};}
+{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbmajor 31501 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himajor 31502 bidi roman charset0 prq2{\*\panose
02040503050406030204}Cambria;}{ bimajor 31503 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ lominor 31504 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbminor 31505 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himinor 31506 bidi swiss charset0 prq2{\*\panose
020f0502020204030204}Calibri;}{ biminor 31507 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ 43 bidi roman charset238 prq2 Times New Roman CE{\* alt Times New Roman};}{
44 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Times New Roman};}{
46 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times New Roman};}
+{ 47 bidi roman charset162 prq2 Times New Roman Tur{\* alt Times New
Roman};}{ 48 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Times
New Roman};}
+{ 49 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Times New
Roman};}{ 50 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Times
New Roman};}
+{ 51 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Times New
Roman};}{ 383 bidi roman charset238 prq2 Cambria Math CE;}{ 384 bidi roman
charset204 prq2 Cambria Math Cyr;}
+{ 386 bidi roman charset161 prq2 Cambria Math Greek;}{ 387 bidi roman
charset162 prq2 Cambria Math Tur;}{ 390 bidi roman charset186 prq2 Cambria
Math Baltic;}{ 391 bidi roman charset163 prq2 Cambria Math (Vietnamese);}
+{ 443 bidi swiss charset238 prq2 Tahoma CE{\* alt Times New Roman};}{ 444
bidi swiss charset204 prq2 Tahoma Cyr{\* alt Times New Roman};}{ 446 bidi
swiss charset161 prq2 Tahoma Greek{\* alt Times New Roman};}
+{ 447 bidi swiss charset162 prq2 Tahoma Tur{\* alt Times New Roman};}{ 448
bidi swiss charset177 prq2 Tahoma (Hebrew){\* alt Times New Roman};}{ 449 bidi
swiss charset178 prq2 Tahoma (Arabic){\* alt Times New Roman};}
+{ 450 bidi swiss charset186 prq2 Tahoma Baltic{\* alt Times New Roman};}{ 451
bidi swiss charset163 prq2 Tahoma (Vietnamese){\* alt Times New Roman};}{ 452
bidi swiss charset222 prq2 Tahoma (Thai){\* alt Times New Roman};}
+{ lomajor 31508 bidi roman charset238 prq2 Times New Roman CE{\* alt Times
New Roman};}{ lomajor 31509 bidi roman charset204 prq2 Times New Roman Cyr{\*
alt Times New Roman};}
+{ lomajor 31511 bidi roman
core.git: sw/qa writerfilter/source
sw/qa/extras/rtfexport/data/tdf158762.rtf| 335 +++
sw/qa/extras/rtfexport/rtfexport7.cxx| 11
writerfilter/source/dmapper/DomainMapper.cxx |1
3 files changed, 347 insertions(+)
New commits:
commit fad76223d1cff3746a5d2e4ce56b93ecd1c80f61
Author: Oliver Specht
AuthorDate: Tue Dec 19 07:38:02 2023 +0100
Commit: Thorsten Behrens
CommitDate: Wed Dec 20 22:08:17 2023 +0100
tdf#158762 RTF writerfilter: fix list import
While importing the properties NumberingRules and NumberingStyleName
interfere with each other. Avoid overwriting NumberingRules with an
invalid NumberingStyleName.
Regression from 588ff9a228f4894142264c68392ed1e9800a4d7d
Change-Id: I706ea514da43faae0fdb9a2c0d4f5b1928ef55f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160967
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/rtfexport/data/tdf158762.rtf
b/sw/qa/extras/rtfexport/data/tdf158762.rtf
new file mode 100755
index ..2953c2acf29a
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf158762.rtf
@@ -0,0 +1,335 @@
+{
tf1deflang1025nsinsicpg1252\uc1deff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang3079\deflangfe3079
hemelang3079hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman
charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New
Roman};}
+{ 34 bidi roman charset0 prq2{\*\panose 02040503050406030204}Cambria Math;}{
40 bidi swiss charset0 prq2{\*\panose }Tahoma{\* alt Times
New Roman};}
+{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbmajor 31501 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himajor 31502 bidi roman charset0 prq2{\*\panose
02040503050406030204}Cambria;}{ bimajor 31503 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ lominor 31504 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times
New Roman{\* alt Times New Roman};}{ dbminor 31505 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ himinor 31506 bidi swiss charset0 prq2{\*\panose
020f0502020204030204}Calibri;}{ biminor 31507 bidi roman charset0
prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Times New Roman};}
+{ 43 bidi roman charset238 prq2 Times New Roman CE{\* alt Times New Roman};}{
44 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Times New Roman};}{
46 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times New Roman};}
+{ 47 bidi roman charset162 prq2 Times New Roman Tur{\* alt Times New
Roman};}{ 48 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Times
New Roman};}
+{ 49 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Times New
Roman};}{ 50 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Times
New Roman};}
+{ 51 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Times New
Roman};}{ 383 bidi roman charset238 prq2 Cambria Math CE;}{ 384 bidi roman
charset204 prq2 Cambria Math Cyr;}
+{ 386 bidi roman charset161 prq2 Cambria Math Greek;}{ 387 bidi roman
charset162 prq2 Cambria Math Tur;}{ 390 bidi roman charset186 prq2 Cambria
Math Baltic;}{ 391 bidi roman charset163 prq2 Cambria Math (Vietnamese);}
+{ 443 bidi swiss charset238 prq2 Tahoma CE{\* alt Times New Roman};}{ 444
bidi swiss charset204 prq2 Tahoma Cyr{\* alt Times New Roman};}{ 446 bidi
swiss charset161 prq2 Tahoma Greek{\* alt Times New Roman};}
+{ 447 bidi swiss charset162 prq2 Tahoma Tur{\* alt Times New Roman};}{ 448
bidi swiss charset177 prq2 Tahoma (Hebrew){\* alt Times New Roman};}{ 449 bidi
swiss charset178 prq2 Tahoma (Arabic){\* alt Times New Roman};}
+{ 450 bidi swiss charset186 prq2 Tahoma Baltic{\* alt Times New Roman};}{ 451
bidi swiss charset163 prq2 Tahoma (Vietnamese){\* alt Times New Roman};}{ 452
bidi swiss charset222 prq2 Tahoma (Thai){\* alt Times New Roman};}
+{ lomajor 31508 bidi roman charset238 prq2 Times New Roman CE{\* alt Times
New Roman};}{ lomajor 31509 bidi roman charset204 prq2 Times New Roman Cyr{\*
alt Times New Roman};}
+{ lomajor 31511 bidi roman charset161 prq2 Times New Roman Greek{\* alt Times
New Roman};}{ lomajor 31512 bidi roman charset162 prq2 Times New Roman Tur{\*
alt Times New Roman};}
+{ lomajor 31513 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt
Times New Roman};}{ lomajor 31514 bidi roman charset178 prq2 Times New Roman
(Arabic){\* alt Times New Roman};}
+{ lomajor 31515 bidi roman charset186 prq2 Times New Roman Baltic{\* alt
Times New Roman};}{ lomajor 31516 bidi roman charset163 prq2 Times New Roman
(Vietnamese){\* alt Times New Roman};}
+{ dbmajor 31518 bidi roman charset238 prq2 Times New Roman CE{\* alt Times
New Roman};}{ dbmajor 31519 bidi roman
core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf158044.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport20.cxx| 34
sw/qa/extras/ooxmlimport/data/tdf154370.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 77 ++
sw/source/filter/ww8/wrtw8nds.cxx | 152 +---
sw/source/filter/ww8/wrtww8.hxx |2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 160 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |4
8 files changed, 403 insertions(+), 26 deletions(-)
New commits:
commit 9e127010a86b3521c803ac86c0b5f58dc8e2966b
Author: Oliver Specht
AuthorDate: Tue Dec 5 13:28:36 2023 +0100
Commit: Thorsten Behrens
CommitDate: Tue Dec 19 20:53:12 2023 +0100
tdf#158044 writerfilter: handle toggle properties in import/export
DOCX has some odd properties (bold, italic, shadowed, hidden ...),
which switch on/off if they are applied multiple times, e.g. with
paragraph and character styles. To fix that, a hard attribute has to
switch off the attribute in that occasion on import and on export a
hard attribute switches it on in Word.
Includes partial fix for tdf#154370.
Change-Id: Ie4c317cf9b7d02efd89b9d6a9996143585d7e937
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160343
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/ooxmlexport/data/tdf158044.odt
b/sw/qa/extras/ooxmlexport/data/tdf158044.odt
new file mode 100755
index ..ca17b6625674
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf158044.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx
index fb780b983bb2..191497cce760 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx
@@ -1006,6 +1006,40 @@ CPPUNIT_TEST_FIXTURE(Test, testSvgExtensionsSupport)
assertXPath(pXmlDocContent, aPath + "/a:extLst/a:ext/asvg:svgBlip"_ostr,
"embed"_ostr, "rId3");
}
+CPPUNIT_TEST_FIXTURE(Test, testtdf158044)
+{
+loadAndSave("tdf158044.odt");
+// write hard attributes to prevent multiple toggle attributes from
vanishing
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:rStyle[1]"_ostr, "val"_ostr,
+"BoldItalicCapsEmbossedStrike");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:b[1]"_ostr);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:bCs[1]"_ostr);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:i[1]"_ostr);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:iCs[1]"_ostr);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:strike[1]"_ostr);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r[2]/w:rPr[1]/w:emboss[1]"_ostr);
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r[4]/w:rPr[1]/w:rStyle[1]"_ostr, "val"_ostr,
+"SmallcapsImprint");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r[4]/w:rPr[1]/w:imprint[1]"_ostr);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r[4]/w:rPr[1]/w:smallCaps[1]"_ostr);
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[4]/w:r[2]/w:rPr[1]/w:rStyle[1]"_ostr, "val"_ostr,
+"AllCaps");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[4]/w:r[2]/w:rPr[1]/w:caps[1]"_ostr);
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[6]/w:r[2]/w:rPr[1]/w:rStyle[1]"_ostr, "val"_ostr,
+"Hidden");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[6]/w:r[2]/w:rPr[1]/w:vanish[1]"_ostr);
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[8]/w:r[4]/w:rPr[1]/w:rStyle[1]"_ostr, "val"_ostr,
+"OutlineShadow");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[8]/w:r[4]/w:rPr[1]/w:outline[1]"_ostr);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[8]/w:r[4]/w:rPr[1]/w:shadow[1]"_ostr);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlimport/data/tdf154370.docx
b/sw/qa/extras/ooxmlimport/data/tdf154370.docx
new file mode 100755
index ..ba72724593b2
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf154370.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 553fbebbc6e3..0c29484d765e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -1188,6 +1188,83 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf141969)
CPPUNIT_ASSERT_EQUAL(8.0f, getProperty(xRun, "CharHeight"));
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf154370)
+{
+// Import a file with pargraph and character styles containing toggle
properties applied to the end of
+// the paragraphs. Should result in hard attributes resetting
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/txtfld.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5de53775531a358c6775d265a3a19699c96a8139
Author: Oliver Specht
AuthorDate: Wed Nov 22 12:05:14 2023 +0100
Commit: Thorsten Behrens
CommitDate: Wed Dec 6 15:24:57 2023 +0100
tdf#154369 don't apply default items to numbering symbols
default attributes from the CharFmt should no be applied to the
numbering symbol
Change-Id: Ifa2d2ace575b888a43fa948f3b71605cfe20f129
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159817
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 2cffd26eeef7..84f32e30971f 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -351,7 +351,8 @@ static void
checkApplyParagraphMarkFormatToNumbering(SwFont* pNumFnt, SwTextForm
{
if (!SwTextNode::IsIgnoredCharFormatForNumbering(nWhich,
/*bIsCharStyle=*/true)
&& !pCleanedSet->HasItem(nWhich)
-&& !(pFormat && pFormat->HasItem(nWhich)) )
+&& !(pFormat && pFormat->HasItem(nWhich))
+&& rStyleAttrs.GetItemState(nWhich) > SfxItemState::DEFAULT)
{
// Copy from parent sets only allowed items which will not
overwrite
// values explicitly defined in current set (pCleanedSet) or
in pFormat
[Libreoffice-commits] core.git: sc/source sd/source sw/source
sc/source/ui/drawfunc/drtxtob.cxx|4 +++- sd/source/ui/view/drviews7.cxx |1 + sw/source/uibase/shells/drwtxtex.cxx |7 +-- 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit c47100e478301085ffb1e71bed41b9e5c39377fd Author: Oliver Specht AuthorDate: Tue Nov 21 17:32:23 2023 +0100 Commit: Thorsten Behrens CommitDate: Fri Nov 24 15:55:50 2023 +0100 tdf#158294 HTML simple format also added to paste special toolbox adds the format HTML simple to the paste special toolbox controller in impress and with draw text selection in calc and writer Change-Id: Ibdca5d3cd5ab4640320cff3b03b30f6575e8fec8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159791 Tested-by: Jenkins Tested-by: Gabor Kelemen Reviewed-by: Thorsten Behrens diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 78bafa27f63e..189ae2793a10 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -183,7 +183,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest ) if (nFormat == SotClipboardFormatId::STRING) pOutView->Paste(); else -pOutView->PasteSpecial(); +pOutView->PasteSpecial(nFormat); } } break; @@ -532,6 +532,8 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) aFormats.AddClipbrdFormat( SotClipboardFormatId::RTF ); if ( aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ) ) aFormats.AddClipbrdFormat( SotClipboardFormatId::RICHTEXT ); +if (aDataHelper.HasFormat(SotClipboardFormatId::HTML_SIMPLE)) + aFormats.AddClipbrdFormat(SotClipboardFormatId::HTML_SIMPLE); rSet.Put( aFormats ); } diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index a238ec7fd04b..845bc956ed1b 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -153,6 +153,7 @@ static ::std::unique_ptr GetSupportedClipboardFormats ( case SotClipboardFormatId::NETSCAPE_BOOKMARK: case SotClipboardFormatId::STRING: case SotClipboardFormatId::HTML: +case SotClipboardFormatId::HTML_SIMPLE: case SotClipboardFormatId::RTF: case SotClipboardFormatId::RICHTEXT: case SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT: diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 3d7eecab6f07..a94016747ee8 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -1113,7 +1113,7 @@ void SwDrawTextShell::ExecClpbrd(SfxRequest const ) if (nFormat == SotClipboardFormatId::STRING) pOLV->Paste(); else -pOLV->PasteSpecial(); +pOLV->PasteSpecial(nFormat); } break; @@ -1138,7 +1138,8 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet ) TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( ().GetEditWin() ) ); const bool bPaste = aDataHelper.HasFormat( SotClipboardFormatId::STRING ) || aDataHelper.HasFormat( SotClipboardFormatId::RTF ) || -aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ); +aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ) || +aDataHelper.HasFormat( SotClipboardFormatId::HTML_SIMPLE); SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); @@ -1171,6 +1172,8 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet ) aFormats.AddClipbrdFormat( SotClipboardFormatId::RTF ); if ( aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ) ) aFormats.AddClipbrdFormat( SotClipboardFormatId::RICHTEXT ); +if (aDataHelper.HasFormat(SotClipboardFormatId::HTML_SIMPLE)) + aFormats.AddClipbrdFormat(SotClipboardFormatId::HTML_SIMPLE); rSet.Put( aFormats ); }
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/sdview3.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 418af212a7f506784d88f5a7a7800140f4f9dd30
Author: Oliver Specht
AuthorDate: Mon Nov 20 11:09:45 2023 +0100
Commit: Thorsten Behrens
CommitDate: Fri Nov 24 15:55:34 2023 +0100
tdf#157363 remove HTML prefix always
when pasting simple HTML the prefix has to removed also if content is pasted
without an active drawing object
Change-Id: I038771c3d0338f16b74bd45275f4637eab00cfdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159738
Tested-by: Jenkins
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 3656f6481242..ddd0ad28ece5 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1504,6 +1504,7 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
OutlinerView* pOLV = GetTextEditOutlinerView();
MSE40HTMLClipFormatObj aMSE40HTMLClipFormatObj;
+SvStream* pHtmlStream = aMSE40HTMLClipFormatObj.IsValid(*xStm);
if (pOLV)
{
@@ -1513,7 +1514,6 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
if (aRect.Contains(aPos) || (!bDrag && IsTextEdit()))
{
// mba: clipboard always must contain absolute URLs
(could be from alien source)
-SvStream* pHtmlStream =
aMSE40HTMLClipFormatObj.IsValid(*xStm);
pOLV->Read(*pHtmlStream, EETextFormat::Html,
mpDocSh->GetHeaderAttributes());
bReturn = true;
}
@@ -1521,7 +1521,7 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
if (!bReturn)
// mba: clipboard always must contain absolute URLs (could
be from alien source)
-bReturn = SdrView::Paste(*xStm, EETextFormat::Html,
maDropPos, pPage, nPasteOptions);
+bReturn = SdrView::Paste(*pHtmlStream, EETextFormat::Html,
maDropPos, pPage, nPasteOptions);
}
}
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - cui/source
cui/source/dialogs/SpellDialog.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5deeb28a32146b0de887a4eb6fb3e23cb2f4549b
Author: Oliver Specht
AuthorDate: Wed Nov 15 16:49:58 2023 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Nov 18 10:04:38 2023 +0100
tdf#157992 update error position after modifying input
a manual fix in the text changes the start/end position of the error
that needs to be updateed to find the correct error text when applying the
change
Change-Id: I91b0801d5a08ee9e2508493cce03b8112c48a542
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159449
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit 7a4a5de2d932b6edfc53b6742029e266c52fa127)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159456
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 1da34447f779..0a50fbfb8cd7 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1504,6 +1504,8 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent&
rKeyEvt)
//start position
if (!IsUndoEditMode() && bIsErrorActive)
{
+aAttribList.clear();
+m_xEditEngine->GetCharAttribs(0, aAttribList);
const EECharAttrib* pFontColor = FindCharAttrib(nCursor,
EE_CHAR_COLOR, aAttribList);
const EECharAttrib* pErrorAttrib = FindCharAttrib(m_nErrorStart,
EE_CHAR_GRABBAG, aAttribList);
if (pFontColor && pErrorAttrib)
@@ -1968,7 +1970,6 @@ svx::SpellPortions
SentenceEditWindow_Impl::CreateSpellPortions() const
aPortion1.eLanguage = eLang;
aPortion1.sText = m_xEditEngine->GetText(ESelection(0, nStart,
0, aStart->nPosition));
-
bool bIsIgnoreError = m_aIgnoreErrorsAt.find( nStart ) !=
m_aIgnoreErrorsAt.end();
if( bIsIgnoreError )
{
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/SpellDialog.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7a4a5de2d932b6edfc53b6742029e266c52fa127
Author: Oliver Specht
AuthorDate: Wed Nov 15 16:49:58 2023 +0100
Commit: Caolán McNamara
CommitDate: Wed Nov 15 22:19:59 2023 +0100
tdf#157992 update error position after modifying input
a manual fix in the text changes the start/end position of the error
that needs to be updateed to find the correct error text when applying the
change
Change-Id: I91b0801d5a08ee9e2508493cce03b8112c48a542
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159449
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 80e1301dcaf8..3ad9c2b196b0 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1571,6 +1571,8 @@ bool SentenceEditWindow_Impl::KeyInput(const KeyEvent&
rKeyEvt)
//start position
if (!IsUndoEditMode() && bIsErrorActive)
{
+aAttribList.clear();
+m_xEditEngine->GetCharAttribs(0, aAttribList);
const EECharAttrib* pFontColor = FindCharAttrib(nCursor,
EE_CHAR_COLOR, aAttribList);
const EECharAttrib* pErrorAttrib = FindCharAttrib(m_nErrorStart,
EE_CHAR_GRABBAG, aAttribList);
if (pFontColor && pErrorAttrib)
@@ -2035,7 +2037,6 @@ svx::SpellPortions
SentenceEditWindow_Impl::CreateSpellPortions() const
aPortion1.eLanguage = eLang;
aPortion1.sText = m_xEditEngine->GetText(ESelection(0, nStart,
0, aStart->nPosition));
-
bool bIsIgnoreError = m_aIgnoreErrorsAt.find( nStart ) !=
m_aIgnoreErrorsAt.end();
if( bIsIgnoreError )
{
[Libreoffice-commits] core.git: Branch 'feature/cib_contract49b' - sd/source
sd/source/ui/view/sdview3.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 52c0ed891630c8eebf5fd19eb7ee7c8d1070f9ae
Author: Oliver Specht
AuthorDate: Mon Nov 13 11:01:39 2023 +0100
Commit: Thorsten Behrens
CommitDate: Mon Nov 13 13:18:41 2023 +0100
tdf#157363 remove pre text when pasting simple HTML
appends to https://gerrit.libreoffice.org/c/core/+/158659
handling of pre text didn't make it into sd code
Change-Id: Ie396b487f451e163b9e59b585c988f9b1b5b669e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159361
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 3f04c25d5900..e92a0ddfea4a 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1502,6 +1503,7 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
xStm->Seek(0);
OutlinerView* pOLV = GetTextEditOutlinerView();
+MSE40HTMLClipFormatObj aMSE40HTMLClipFormatObj;
if (pOLV)
{
@@ -1511,7 +1513,8 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
if (aRect.Contains(aPos) || (!bDrag && IsTextEdit()))
{
// mba: clipboard always must contain absolute URLs
(could be from alien source)
-pOLV->Read(*xStm, EETextFormat::Html,
mpDocSh->GetHeaderAttributes());
+SvStream* pHtmlStream =
aMSE40HTMLClipFormatObj.IsValid(*xStm);
+pOLV->Read(*pHtmlStream, EETextFormat::Html,
mpDocSh->GetHeaderAttributes());
bReturn = true;
}
}
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/sdview3.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 5ed0646dffab1563337ef4c1ae34a4ebfa69bdbe
Author: Oliver Specht
AuthorDate: Mon Nov 13 11:01:39 2023 +0100
Commit: Thorsten Behrens
CommitDate: Mon Nov 13 13:17:01 2023 +0100
tdf#157363 remove pre text when pasting simple HTML
appends to https://gerrit.libreoffice.org/c/core/+/158659
handling of pre text didn't make it into sd code
Change-Id: Ie396b487f451e163b9e59b585c988f9b1b5b669e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159361
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 3288fed35114..3656f6481242 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1502,6 +1503,7 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
xStm->Seek(0);
OutlinerView* pOLV = GetTextEditOutlinerView();
+MSE40HTMLClipFormatObj aMSE40HTMLClipFormatObj;
if (pOLV)
{
@@ -1511,7 +1513,8 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
if (aRect.Contains(aPos) || (!bDrag && IsTextEdit()))
{
// mba: clipboard always must contain absolute URLs
(could be from alien source)
-pOLV->Read(*xStm, EETextFormat::Html,
mpDocSh->GetHeaderAttributes());
+SvStream* pHtmlStream =
aMSE40HTMLClipFormatObj.IsValid(*xStm);
+pOLV->Read(*pHtmlStream, EETextFormat::Html,
mpDocSh->GetHeaderAttributes());
bReturn = true;
}
}
[Libreoffice-commits] core.git: Branch 'feature/cib_contract49b' - editeng/source include/editeng sc/source sd/source sw/source
editeng/source/editeng/editeng.cxx |4 ++--
editeng/source/editeng/editview.cxx |4 ++--
editeng/source/editeng/impedit.cxx |4 ++--
editeng/source/editeng/impedit.hxx |4 ++--
editeng/source/editeng/impedit2.cxx | 32 +---
editeng/source/outliner/outlvw.cxx |8
include/editeng/editeng.hxx |4 +++-
include/editeng/editview.hxx |3 ++-
include/editeng/outliner.hxx |5 +++--
sc/source/ui/drawfunc/drtxtob1.cxx |3 ++-
sd/source/ui/func/fuinsert.cxx |1 +
sd/source/ui/view/sdview3.cxx| 30 ++
sw/source/uibase/shells/drwtxtex.cxx |3 ++-
13 files changed, 84 insertions(+), 21 deletions(-)
New commits:
commit f08803d9fb3a65800d053d35da5243e0fbae4674
Author: Oliver Specht
AuthorDate: Mon Oct 30 13:26:49 2023 +0100
Commit: Thorsten Behrens
CommitDate: Sun Nov 12 21:17:09 2023 +0100
tdf#157363 add HTML format when pasting into draw text
adds HTML to paste(special) in draw text in impress/draw/calc/writer
Change-Id: Iaede82e1b3d48be362b70bd631e7f912b02b9822
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158659
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index c766328fd667..acca942ab12f 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -849,9 +849,9 @@ EditSelection EditEngine::InsertText(const EditTextObject&
rTextObject, const Ed
EditSelection EditEngine::InsertText(
uno::Reference const & rxDataObj,
-const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial)
+const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial,
SotClipboardFormatId format)
{
-return pImpEditEngine->PasteText(rxDataObj, rBaseURL, rPaM, bUseSpecial);
+return pImpEditEngine->PasteText(rxDataObj, rBaseURL, rPaM, bUseSpecial,
format);
}
EditPaM EditEngine::EndOfWord(const EditPaM& rPaM)
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index f6c90309747c..0e3985c49459 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -675,10 +675,10 @@ void EditView::Paste()
pImpEditView->Paste( aClipBoard );
}
-void EditView::PasteSpecial()
+void EditView::PasteSpecial(SotClipboardFormatId format)
{
Reference
aClipBoard(GetClipboard());
-pImpEditView->Paste(aClipBoard, true );
+pImpEditView->Paste(aClipBoard, true, format );
}
Point EditView::GetWindowPosTopLeft( sal_Int32 nParagraph )
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 2e5e778d0cbd..92af0e24b848 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1944,7 +1944,7 @@ void ImpEditView::CutCopy( css::uno::Reference<
css::datatransfer::clipboard::XC
}
}
-void ImpEditView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial )
+void ImpEditView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial, SotClipboardFormatId format)
{
if ( !rxClipboard.is() )
return;
@@ -2004,7 +2004,7 @@ void ImpEditView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XCli
// paragraphs. Collect and broadcast when done instead.
aSel = pEditEngine->InsertText(
xDataObj, OUString(), aSel.Min(),
-bUseSpecial &&
pEditEngine->GetInternalEditStatus().AllowPasteSpecial());
+bUseSpecial &&
pEditEngine->GetInternalEditStatus().AllowPasteSpecial(), format);
}
aPasteOrDropInfos.nEndPara = pEditEngine->GetEditDoc().GetPos(
aSel.Max().GetNode() );
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 6db82ab2392a..5ff09c67257a 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -373,7 +373,7 @@ public:
boolCommand(const CommandEvent& rCEvt);
voidCutCopy( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool bCut );
-voidPaste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial = false );
+voidPaste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial = false, SotClipboardFormatId format = SotClipboardFormatId::NONE);
voidSetVisDocStartPos( const Point& rPos ) { aVisDocStartPos =
rPos; }
@@ -640,7 +640,7 @@ private:
std::unique_ptr
CreateTextObject(EditSelection aSelection,
SfxItemPool*, bool bAllowBigObjects = false, sal_Int32 nBigObjStart = 0);
EditSelection InsertTextObject( const
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/tdf158044.rtf | 20 +
sw/qa/extras/rtfimport/rtfimport.cxx | 54 +++
writerfilter/source/dmapper/DomainMapper.cxx | 89 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |1
writerfilter/source/rtftok/rtfsprm.cxx |9 +-
5 files changed, 170 insertions(+), 3 deletions(-)
New commits:
commit d06bb71d19c29eaecdf499cb5e160f2ce08b58de
Author: Oliver Specht
AuthorDate: Thu Nov 2 16:34:50 2023 +0100
Commit: Thorsten Behrens
CommitDate: Sat Nov 11 20:54:24 2023 +0100
tdf#158044 handling of paragraph attributes in RTF import
style attributes need to be repeated at the paragraph
if not repeated then defaults have to be applied
This includes:
Fix Windows 64-bit build using VS 2022
Change-Id: Id976fe515287a4aa12d7ff8ca0ca09c31c65309f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159316
and
Make the unit test linear and more explicit
Change-Id: Ic28d059ed41f88c9264743034a5ce5397fff0b2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159317
Change-Id: I4ee567e8006c240c046b7e7bb75eae92e5563776
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158839
Tested-by: Jenkins
Co-authored-by: Mike Kaganski
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159328
diff --git a/sw/qa/extras/rtfimport/data/tdf158044.rtf
b/sw/qa/extras/rtfimport/data/tdf158044.rtf
new file mode 100755
index ..65e687f25d39
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf158044.rtf
@@ -0,0 +1,20 @@
+{\rtf1\ansi
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;
+\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;
+\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}
+
+{\stylesheet
+{\fs24\sa3200 Normal;}
+{\s97\tx1701\tx2835 StyleTabstops;}
+{\s98\cbpat6 StyleRed;}
+{\s99\qc SyleCentered;}
+}
+
+
+{\s97 Paragraph without tabstops\par}
+{\s98 Pargraph without color \par}
+{\s99 Paragraph without center\par}
+{\s97\tx1701\tx2835 Paragraph with tabstops\par}
+{\s98\cbpat6 Pargraph with color \par}
+{\s99\qc Paragraph with center\par}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 4ae5e90043f4..7dd9aa43877f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1716,6 +1716,60 @@ CPPUNIT_TEST_FIXTURE(Test, testParaStyleBottomMargin)
getProperty(xPara,
"ParaLineSpacing").Height);
}
+CPPUNIT_TEST_FIXTURE(Test, test158044Tdf)
+{
+createSwDoc("tdf158044.rtf");
+
+{
+auto xPara(getParagraph(1));
+auto tabStops = getProperty>(xPara,
"ParaTabStops");
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), tabStops.getLength());
+}
+
+{
+auto xPara(getParagraph(2));
+auto fillColor = getProperty(xPara, "FillColor");
+auto fillStyle = getProperty(xPara, "FillStyle");
+
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, fillStyle);
+CPPUNIT_ASSERT_EQUAL(Color(0xff), fillColor);
+}
+
+{
+auto xPara(getParagraph(3));
+auto adjust = getProperty(xPara, "ParaAdjust");
+
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), adjust);
+}
+
+{
+auto xPara(getParagraph(4));
+auto tabStops = getProperty>(xPara,
"ParaTabStops");
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), tabStops.getLength());
+}
+
+{
+auto xPara(getParagraph(5));
+auto fillColor = getProperty(xPara, "FillColor");
+auto fillStyle = getProperty(xPara, "FillStyle");
+auto tabStops = getProperty>(xPara,
"ParaTabStops");
+
+CPPUNIT_ASSERT_LESS(sal_Int32(2), tabStops.getLength());
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, fillStyle);
+CPPUNIT_ASSERT_EQUAL(Color(0xff), fillColor);
+}
+
+{
+auto xPara(getParagraph(6));
+auto fillStyle = getProperty(xPara, "FillStyle");
+auto tabStops = getProperty>(xPara,
"ParaTabStops");
+
+CPPUNIT_ASSERT_LESS(sal_Int32(2), tabStops.getLength());
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, fillStyle);
+}
+}
// tests should only be added to rtfIMPORT *if* they fail round-tripping in
rtfEXPORT
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 148bb98eaf42..adf956653071 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -3843,6 +3844,35 @@
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/tdf158044.rtf | 20 +
sw/qa/extras/rtfimport/rtfimport.cxx | 47 +
writerfilter/source/dmapper/DomainMapper.cxx | 89 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |1
writerfilter/source/rtftok/rtfsprm.cxx |9 +-
5 files changed, 163 insertions(+), 3 deletions(-)
New commits:
commit fce18155052821756466ea043c638f4ed72f41d6
Author: Oliver Specht
AuthorDate: Thu Nov 2 16:34:50 2023 +0100
Commit: Thorsten Behrens
CommitDate: Fri Nov 10 22:29:40 2023 +0100
tdf#158044 handling of paragraph attributes in RTF import
style attributes need to be repeated at the paragraph
if not repeated then defaults have to be applied
Change-Id: I4ee567e8006c240c046b7e7bb75eae92e5563776
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158839
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/rtfimport/data/tdf158044.rtf
b/sw/qa/extras/rtfimport/data/tdf158044.rtf
new file mode 100755
index ..65e687f25d39
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf158044.rtf
@@ -0,0 +1,20 @@
+{\rtf1\ansi
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;
+\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;
+\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}
+
+{\stylesheet
+{\fs24\sa3200 Normal;}
+{\s97\tx1701\tx2835 StyleTabstops;}
+{\s98\cbpat6 StyleRed;}
+{\s99\qc SyleCentered;}
+}
+
+
+{\s97 Paragraph without tabstops\par}
+{\s98 Pargraph without color \par}
+{\s99 Paragraph without center\par}
+{\s97\tx1701\tx2835 Paragraph with tabstops\par}
+{\s98\cbpat6 Pargraph with color \par}
+{\s99\qc Paragraph with center\par}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 78409762e827..b1b00cf2b1b4 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1712,6 +1712,53 @@ CPPUNIT_TEST_FIXTURE(Test, testParaStyleBottomMargin)
getProperty(xPara,
"ParaLineSpacing").Height);
}
+CPPUNIT_TEST_FIXTURE(Test, test158044Tdf)
+{
+createSwDoc("tdf158044.rtf");
+
+uno::Reference xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+uno::Reference xParaEnum =
xParaEnumAccess->createEnumeration();
+int paraIndex = 0;
+while (xParaEnum->hasMoreElements())
+{
+uno::Reference
xPropertySet(xParaEnum->nextElement(), uno::UNO_QUERY);
+sal_Int16 adjust = getProperty(xPropertySet, "ParaAdjust");
+Color fillColor = getProperty(xPropertySet, "FillColor");
+drawing::FillStyle fillStyle =
getProperty(xPropertySet, "FillStyle");
+uno::Sequence tabStops
+= getProperty>(xPropertySet,
"ParaTabStops");
+switch (paraIndex)
+{
+case 0:
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), tabStops.getLength());
+break;
+case 1:
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, fillStyle);
+CPPUNIT_ASSERT(0xff == fillColor);
+break;
+case 2:
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), adjust);
+break;
+case 3:
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), tabStops.getLength());
+break;
+case 4:
+CPPUNIT_ASSERT(tabStops.getLength() < 2);
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, fillStyle);
+CPPUNIT_ASSERT(0xff == fillColor);
+break;
+case 5:
+CPPUNIT_ASSERT(tabStops.getLength() < 2);
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, fillStyle);
+break;
+default:
+break;
+}
+++paraIndex;
+}
+}
// tests should only be added to rtfIMPORT *if* they fail round-tripping in
rtfEXPORT
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index f015b79520bf..a2399e44bf37 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -3845,6 +3846,35 @@ void DomainMapper::lcl_endCharacterGroup()
m_pImpl->PopProperties(CONTEXT_CHARACTER);
}
+//copied from rtfsprm
+/// Is it problematic to deduplicate this SPRM?
+static bool isSPRMDeduplicateDenylist(PropertyIds nId, PropertyMapPtr pContext)
+{
+switch
[Libreoffice-commits] core.git: editeng/source include/editeng sc/source sd/source sw/source
editeng/source/editeng/editeng.cxx |4 ++--
editeng/source/editeng/editview.cxx |4 ++--
editeng/source/editeng/impedit.cxx |4 ++--
editeng/source/editeng/impedit.hxx |4 ++--
editeng/source/editeng/impedit2.cxx | 32 +---
editeng/source/outliner/outlvw.cxx |8
include/editeng/editeng.hxx |4 +++-
include/editeng/editview.hxx |3 ++-
include/editeng/outliner.hxx |5 +++--
sc/source/ui/drawfunc/drtxtob1.cxx |3 ++-
sd/source/ui/func/fuinsert.cxx |1 +
sd/source/ui/view/sdview3.cxx| 30 ++
sw/source/uibase/shells/drwtxtex.cxx |3 ++-
13 files changed, 84 insertions(+), 21 deletions(-)
New commits:
commit 87be89ac27023f48f68a873b37df31aa0453d6fa
Author: Oliver Specht
AuthorDate: Mon Oct 30 13:26:49 2023 +0100
Commit: Thorsten Behrens
CommitDate: Fri Nov 10 09:52:28 2023 +0100
tdf#157363 add HTML format when pasting into draw text
adds HTML to paste(special) in draw text in impress/draw/calc/writer
Change-Id: Iaede82e1b3d48be362b70bd631e7f912b02b9822
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158659
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 6cb28954aedc..728609cd94e2 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -849,9 +849,9 @@ EditSelection EditEngine::InsertText(const EditTextObject&
rTextObject, const Ed
EditSelection EditEngine::InsertText(
uno::Reference const & rxDataObj,
-const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial)
+const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial,
SotClipboardFormatId format)
{
-return pImpEditEngine->PasteText(rxDataObj, rBaseURL, rPaM, bUseSpecial);
+return pImpEditEngine->PasteText(rxDataObj, rBaseURL, rPaM, bUseSpecial,
format);
}
EditPaM EditEngine::EndOfWord(const EditPaM& rPaM)
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index a50dc9ebc6fe..d73cb24ef452 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -685,10 +685,10 @@ void EditView::Paste()
pImpEditView->Paste( aClipBoard );
}
-void EditView::PasteSpecial()
+void EditView::PasteSpecial(SotClipboardFormatId format)
{
Reference
aClipBoard(GetClipboard());
-pImpEditView->Paste(aClipBoard, true );
+pImpEditView->Paste(aClipBoard, true, format );
}
Point EditView::GetWindowPosTopLeft( sal_Int32 nParagraph )
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 8813376dacdd..393a208703b4 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1946,7 +1946,7 @@ void ImpEditView::CutCopy( css::uno::Reference<
css::datatransfer::clipboard::XC
}
}
-void ImpEditView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial )
+void ImpEditView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial, SotClipboardFormatId format)
{
if ( !rxClipboard.is() )
return;
@@ -2006,7 +2006,7 @@ void ImpEditView::Paste( css::uno::Reference<
css::datatransfer::clipboard::XCli
// paragraphs. Collect and broadcast when done instead.
aSel = pEditEngine->InsertText(
xDataObj, OUString(), aSel.Min(),
-bUseSpecial &&
pEditEngine->GetInternalEditStatus().AllowPasteSpecial());
+bUseSpecial &&
pEditEngine->GetInternalEditStatus().AllowPasteSpecial(), format);
}
aPasteOrDropInfos.nEndPara = pEditEngine->GetEditDoc().GetPos(
aSel.Max().GetNode() );
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index df7a11c97dcb..6fcb58dc 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -377,7 +377,7 @@ public:
boolCommand(const CommandEvent& rCEvt);
voidCutCopy( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool bCut );
-voidPaste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial = false );
+voidPaste( css::uno::Reference<
css::datatransfer::clipboard::XClipboard > const & rxClipboard, bool
bUseSpecial = false, SotClipboardFormatId format = SotClipboardFormatId::NONE);
voidSetVisDocStartPos( const Point& rPos ) { aVisDocStartPos =
rPos; }
@@ -644,7 +644,7 @@ private:
std::unique_ptr
CreateTextObject(EditSelection aSelection,
SfxItemPool*, bool bAllowBigObjects = false, sal_Int32 nBigObjStart = 0);
EditSelection InsertTextObject( const
