core.git: sc/source
sc/source/core/data/patattr.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 98706cbfa6307de2f5a11ff0e5edb4120ad57bb8
Author: Heiko Tietze
AuthorDate: Mon Jul 22 14:38:20 2024 +0200
Commit: Heiko Tietze
CommitDate: Tue Jul 23 09:51:55 2024 +0200
Related tdf#159541 - Fix font color issue in Calc
Follow-up to I954c9e3f8502a5243c664ed0bf066fb4c4cb4ccc
Change-Id: Ib0a5b38739e7b5f73d1e5fbb57687b89b3e86233
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170851
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 0bf5cfc6ca41..d738507b2ffc 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -792,6 +792,13 @@ void ScPatternAttr::fillColor(model::ComplexColor&
rComplexColor, const SfxItemS
{
// pTextConfigColor can be used to avoid repeated lookup of the
configured color
aSysTextColor = *pTextConfigColor;
+if (SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR,
false).nColor == COL_AUTO)
+{
+if ( aBackColor.IsDark() && aSysTextColor.IsDark() )
+aSysTextColor = COL_WHITE;
+else
+aSysTextColor = COL_BLACK;
+}
}
else
{
core.git: editeng/source sc/source sw/source
editeng/source/editeng/impedit3.cxx |8
sc/source/core/data/patattr.cxx | 17 +
sw/source/core/txtnode/fntcache.cxx | 14 +-
3 files changed, 14 insertions(+), 25 deletions(-)
New commits:
commit 8534ad7b7b9aae2520d731cf748ff0aadfe2f0ed
Author: Heiko Tietze
AuthorDate: Thu Jul 4 14:31:09 2024 +0200
Commit: Heiko Tietze
CommitDate: Mon Jul 22 13:01:43 2024 +0200
Resolves tdf#159541 - Fix font color must not change depending on background
Change-Id: I954c9e3f8502a5243c664ed0bf066fb4c4cb4ccc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169991
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 66ecfb814774..944f3a1c14a9 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4958,13 +4958,13 @@ Color ImpEditEngine::GetAutoColor() const
}
else
{
-aColor = GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor;
+aColor = GetColorConfig().GetColorValue(svtools::FONTCOLOR,
false).nColor;
-if ( GetBackgroundColor() != COL_AUTO )
+if ( aColor == COL_AUTO )
{
-if ( GetBackgroundColor().IsDark() && aColor.IsDark() )
+if ( GetBackgroundColor().IsDark() )
aColor = COL_WHITE;
-else if ( GetBackgroundColor().IsBright() && aColor.IsBright() )
+else
aColor = COL_BLACK;
}
}
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index da278bd53c30..0bf5cfc6ca41 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -798,22 +798,7 @@ void ScPatternAttr::fillColor(model::ComplexColor&
rComplexColor, const SfxItemS
aSysTextColor =
SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor;
}
-// select the resulting color
-if ( aBackColor.IsDark() && aSysTextColor.IsDark() )
-{
-// use white instead of dark on dark
-aColor = COL_WHITE;
-}
-else if ( aBackColor.IsBright() && aSysTextColor.IsBright() )
-{
-// use black instead of bright on bright
-aColor = COL_BLACK;
-}
-else
-{
-// use aSysTextColor (black for ScAutoFontColorMode::Print, from
style settings otherwise)
-aColor = aSysTextColor;
-}
+aColor = aSysTextColor;
}
aComplexColor.setFinalColor(aColor);
rComplexColor = aComplexColor;
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 52a9e71dff1d..d52484432791 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -58,6 +58,7 @@
#include
#include
#include "justify.hxx"
+#include
using namespace ::com::sun::star;
@@ -2293,11 +2294,14 @@ bool SwDrawTextInfo::ApplyAutoColor( vcl::Font* pFont )
}
// change painting color depending of dark/bright background
-Color aTmpColor( nNewColor );
-if ( pCol->IsDark() && aTmpColor.IsDark() )
-nNewColor = COL_WHITE;
-else if ( pCol->IsBright() && aTmpColor.IsBright() )
-nNewColor = COL_BLACK;
+if (!pVSh->GetWin() || // ie. IsPrinting, see SwViewShell::GetWin()
+svtools::ColorConfig().GetColorValue(svtools::FONTCOLOR,
false).nColor == COL_AUTO) // GetFontColor() uses the smart flag
+{
+if ( pCol->IsDark() )
+nNewColor = COL_WHITE;
+else
+nNewColor = COL_BLACK;
+}
}
}
core.git: include/svx sc/qa svx/source
include/svx/strings.hrc| 10
sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py | 16 +++---
svx/source/tbxctrls/PaletteManager.cxx | 19 +
3 files changed, 36 insertions(+), 9 deletions(-)
New commits:
commit 5e45351c52584fb116d2cc54da969734e5effab9
Author: Heiko Tietze
AuthorDate: Fri Jul 12 09:03:38 2024 +0200
Commit: Heiko Tietze
CommitDate: Tue Jul 16 09:53:46 2024 +0200
Resolves tdf#105000 - Make shipped palette names translatable
Change-Id: Ifd062cf25c6e930da56571e01c21bd9d2ddf6ddd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170394
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index c9c1c88b..8b3a23870924 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -559,6 +559,14 @@
#define RID_SVXSTR_GRAFMODE_MONO
NC_("RID_SVXSTR_GRAFMODE_MONO", "Black/White")
#define RID_SVXSTR_GRAFMODE_WATERMARK
NC_("RID_SVXSTR_GRAFMODE_WATERMARK", "Watermark")
#define RID_SVXSTR_COLORBAR
NC_("RID_SVXSTR_COLORBAR", "Left click to apply as background color, right
click to set line color")
+// SOC color palettes
+#define RID_SVXSTR_COLOR_PALETTE_STANDARD
NC_("RID_SVXSTR_COLOR_PALETTE_STANDARD", "Standard")
+#define RID_SVXSTR_COLOR_PALETTE_TONAL
NC_("RID_SVXSTR_COLOR_PALETTE_TONAL", "Tonal")
+#define RID_SVXSTR_COLOR_PALETTE_HTML
NC_("RID_SVXSTR_COLOR_PALETTE_HTML", "HTML")
+#define RID_SVXSTR_COLOR_PALETTE_CHARTPALETTES
NC_("RID_SVXSTR_COLOR_PALETTE_CHARTPALETTES", "Chart Palettes")
+#define RID_SVXSTR_COLOR_PALETTE_COMPATIBILITY
NC_("RID_SVXSTR_COLOR_PALETTE_COMPATIBILITY", "Compatibility")
+#define RID_SVXSTR_COLOR_PALETTE_MATERIAL
NC_("RID_SVXSTR_COLOR_PALETTE_MATERIAL", "Material")
+#define RID_SVXSTR_COLOR_PALETTE_FREECOLOURHLC
NC_("RID_SVXSTR_COLOR_PALETTE_FREECOLOURHLC", "Freecolour HLC")
// Default colors
#define RID_SVXSTR_COLOR_DEFAULT_FONT
NC_("RID_SVXSTR_COLOR_DEFAULT_FONTCOLOR", "Dark Red 2")
#define RID_SVXSTR_COLOR_DEFAULT_FRAMELINE
NC_("RID_SVXSTR_COLOR_DEFAULT_FRAMELINE", "Blue")
@@ -1116,7 +1124,7 @@
// This is duplicated in GenericCommands.xcu in officecfg.
#define RID_SVXSTR_CHARFONTNAME
NC_("RID_SVXSTR_CHARFONTNAME", "Font Name")
#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE
NC_("RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE", "Font Name. The current font is not
available and will be substituted.")
-#define RID_SVXSTR_CUSTOM_PAL
NC_("RID_SVXSTR_CUSTOM_PAL", "custom")
+#define RID_SVXSTR_CUSTOM_PAL
NC_("RID_SVXSTR_CUSTOM_PAL", "Custom")
#define RID_SVXSTR_DOC_COLORS
NC_("RID_SVXSTR_DOC_COLORS", "Document colors")
#define RID_SVXSTR_THEME_COLORS
NC_("RID_SVXSTR_THEME_COLORS", "Theme colors")
#define RID_SVXSTR_DOC_COLOR_PREFIX
NC_("RID_SVXSTR_DOC_COLOR_PREFIX", "Document Color")
diff --git a/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py
b/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py
index dcd7c75c0f2a..1839545c7e88 100644
--- a/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py
+++ b/sc/qa/uitest/calc_tests/cellBackgroundColorSelector.py
@@ -36,7 +36,7 @@ class CalcCellBackgroundColorSelector(UITestCase):
color_selector = xColorpage.getChild("colorset")
# For chart-palettes colors
-select_by_text(xpaletteselector, "chart-palettes")
+select_by_text(xpaletteselector, "Chart Palettes")
# Select Color with id 2
color_selector.executeAction("CHOOSE",
mkPropertyValues({"POS": "2"}))
self.assertEqual(get_state_as_dict(color_selector)["CurrColorId"], "2")
@@ -54,7 +54,7 @@ class CalcCellBackgroundColorSelector(UITestCase):
self.assertEqual(get_state_as_dict(color_selector)["RGB"],
"(126,0,33)")
# For libreoffice colors
-select_by_text(xpaletteselector, "libreoffice")
+select_by_text(xpaletteselector, "LibreOffice")
# Select Color with id 6
color_selector.executeAction("CHOOSE",
mkPropertyValues({"POS": "6"}))
self.assertEqual(get_state_as_dict(color_selector)["CurrColorId"], "6")
@@ -72,7 +72,7 @@ class CalcCellBackgroundColorSelector(UITestCase):
self.assertEqual(get_state_as_dict(color_selector)["RGB"],
"(255,215,76)")
# For html colors
-select_by_text(xpaletteselector, "html")
+select_by_text(xpaletteselector, "HTML")
core.git: Branch 'feature/cib_contract49c' - officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 +++
sc/source/ui/view/cellsh3.cxx| 27 ++-
2 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit 4d62c692d9106c9c2fc0d3dc9efb1cd57a8a12d3
Author: Heiko Tietze
AuthorDate: Thu Jun 20 15:12:05 2024 +0200
Commit: Thorsten Behrens
CommitDate: Mon Jul 15 11:33:18 2024 +0200
Resolves tdf#161641 - Select data area before select all
Advanced option SelectRangeBeforeAll to restore original behavior
Change-Id: Iab4b4e61dffc1ecf2ffed01a994c9894c84ab74d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169276
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-by: Heiko Tietze
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index a8830ab1ba19..c5cc5d3f4d85 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -739,6 +739,13 @@
true
+
+
+ Disable to always select all
+ Select range before all
+
+true
+
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index e6c89b6a2b9c..ebe5368d57c7 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -49,6 +49,7 @@
#include
#include
#include
+#include
#include
@@ -658,7 +659,31 @@ void ScCellShell::Execute( SfxRequest& rReq )
case SID_SELECTALL:
{
-pTabViewShell->SelectAll();
+SCTAB nTab = GetViewData().GetTabNo();
+SCCOL nStartCol = GetViewData().GetCurX();
+SCROW nStartRow = GetViewData().GetCurY();
+SCCOL nEndCol = nStartCol;
+SCROW nEndRow = nStartRow;
+bool bCanMark = false;
+
+ScMarkData& rMarkdata = GetViewData().GetMarkData();
+const bool
bSelectFirst(officecfg::Office::Calc::Input::SelectRangeBeforeAll::get());
+
+if (bSelectFirst && !rMarkdata.IsMarked())
+{
+const ScDocument& rDoc = GetViewData().GetDocument();
+rDoc.GetDataArea( nTab, nStartCol, nStartRow, nEndCol,
nEndRow, true, false );
+bCanMark = nStartCol != nEndCol || nStartRow != nEndRow;
+}
+
+if (bCanMark)
+{
+const ScRange aRange(nStartCol, nStartRow, nTab, nEndCol,
nEndRow, nTab);
+pTabViewShell->MarkRange(aRange, false);
+}
+else
+pTabViewShell->SelectAll();
+
rReq.Done();
}
break;
core.git: Branch 'libreoffice-24-8' - svx/source
svx/source/dialog/srchdlg.cxx | 17 +
svx/source/inc/findtextfield.hxx |1 +
svx/source/tbxctrls/tbunosearchcontrollers.cxx |5 +
3 files changed, 23 insertions(+)
New commits:
commit 982c262b479a5326925c13dfb7fb258901c6f348
Author: Heiko Tietze
AuthorDate: Mon Jul 8 16:50:37 2024 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Jul 15 02:36:52 2024 +0200
Resolves tdf#161568 - Feedback for QFS in floating mode
As band-aid for the lack of proper toolbar resizing,
feedback is given via entry message type
Change-Id: Ic2b2a2aff93040f558775d63c18c21370fabcb39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170167
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit 4e606c5b38139c4424fe9334aed32515c7547418)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170119
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index bb66ecde8343..dcb7e7d87a7b 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -72,6 +72,8 @@
#include
#include
+#include
+
#include
#include
#include
@@ -576,6 +578,9 @@ void SvxSearchDialog::SetSearchLabel(const OUString& rStr)
m_xSearchBox->set_size_request(-1, aSize.Height());
m_xSearchBox->set_background(COL_TRANSPARENT);
}
+
+if (rStr == SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND))
+m_xSearchLB->set_entry_message_type(weld::EntryMessageType::Error);
}
void SvxSearchDialog::ApplyTransliterationFlags_Impl( TransliterationFlags
nSettings )
@@ -2373,6 +2378,18 @@ static void lcl_SetSearchLabelWindow(const OUString&
rStr, SfxViewFrame& rViewFr
pSearchLabel->set_label(rStr, LabelItemWindowType::Info);
pSearchLabel->SetOptimalSize();
}
+
+if (pToolBox->IsFloatingMode() && pToolBox->GetItemCommand(id) ==
".uno:FindText")
+{
+FindTextFieldControl* pFindText =
dynamic_cast(pToolBox->GetItemWindow(id));
+assert(pFindText);
+if (rStr == SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND))
+
pFindText->set_entry_message_type(weld::EntryMessageType::Error);
+else if (rStr == SvxResId(RID_SVXSTR_SEARCH_END) || rStr ==
SvxResId(RID_SVXSTR_SEARCH_START))
+
pFindText->set_entry_message_type(weld::EntryMessageType::Warning);
+else
+
pFindText->set_entry_message_type(weld::EntryMessageType::Normal);
+}
}
xLayoutManager->doLayout();
pToolBox->Resize();
diff --git a/svx/source/inc/findtextfield.hxx b/svx/source/inc/findtextfield.hxx
index 9d15a0d8b47d..2c79a529b3f4 100644
--- a/svx/source/inc/findtextfield.hxx
+++ b/svx/source/inc/findtextfield.hxx
@@ -47,6 +47,7 @@ public:
OUString get_text(int nIndex) const;
OUString get_active_text() const;
void append_text(const OUString& rText);
+void set_entry_message_type(weld::EntryMessageType eType);
private:
ImplSVEvent* m_nAsyncGetFocusId;
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index c2070618d69e..47031df35524 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -436,6 +436,11 @@ OUString FindTextFieldControl::get_active_text() const
return m_xWidget->get_active_text();
}
+void FindTextFieldControl::set_entry_message_type(weld::EntryMessageType eType)
+{
+m_xWidget->set_entry_message_type(eType);
+}
+
void FindTextFieldControl::append_text(const OUString& rText)
{
m_xWidget->append_text(rText);
core.git: Branch 'libreoffice-24-8' - sw/source
sw/source/core/text/txthyph.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2968bd73276e9bb62656a524926bf7fbd51a
Author: Heiko Tietze
AuthorDate: Tue Jul 9 12:53:03 2024 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Jul 13 20:13:28 2024 +0200
Resolves tdf#161421 - Draw soft hyphen in black on PDF export
Change-Id: I69a19a0919fd31f8ea2fee962e994d61873e51c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170227
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index bf8751d6cea5..8f419984323a 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -436,7 +436,8 @@ void SwSoftHyphPortion::Paint( const SwTextPaintInfo
) const
rInf.DrawViewOpt( *this, PortionType::SoftHyphen );
SwExpandPortion::Paint( rInf );
-if (rInf.GetOpt().IsViewMetaChars() && !rInf.GetOpt().IsPrinting())
+if (rInf.GetOpt().IsViewMetaChars() && !rInf.GetOpt().IsPrinting()
+&& !rInf.GetOpt().IsPDFExport())
{
OUString aMarker = u"-"_ustr;
SwTextPaintInfo aInf(rInf, );
core.git: Branch 'libreoffice-24-8' - sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui |1 + 1 file changed, 1 insertion(+) New commits: commit a000c62e5d26dfc8c7b563d2a6c99fcf21955e98 Author: Heiko Tietze AuthorDate: Wed Jul 10 19:40:00 2024 +0200 Commit: Xisco Fauli CommitDate: Thu Jul 11 15:49:38 2024 +0200 tdf#161987: Always show donate icon in startcenter Issue on gtk3 environment only Change-Id: I251cf91fd04ed455383e443b5479e199486f7aaf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170303 Reviewed-by: Heiko Tietze Reviewed-by: Xisco Fauli Tested-by: Jenkins diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 8e3126cf9761..657b1984006f 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -436,6 +436,7 @@ True none True +True False
core.git: sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui |1 + 1 file changed, 1 insertion(+) New commits: commit 3d4986cf3c94524a2cbb1a3313d7669ad369ea11 Author: Heiko Tietze AuthorDate: Wed Jul 10 19:40:00 2024 +0200 Commit: Heiko Tietze CommitDate: Thu Jul 11 15:26:24 2024 +0200 Always show donate icon in startcenter Issue on gtk3 environment only Change-Id: I251cf91fd04ed455383e443b5479e199486f7aaf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170325 Reviewed-by: Heiko Tietze Tested-by: Xisco Fauli Reviewed-by: Xisco Fauli diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 8e3126cf9761..657b1984006f 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -436,6 +436,7 @@ True none True +True False
core.git: sfx2/source
sfx2/source/dialog/backingwindow.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit dd4d32797c7c4cb915f1f81ad92abb195985afb5
Author: Heiko Tietze
AuthorDate: Wed Jul 10 17:39:17 2024 +0200
Commit: Heiko Tietze
CommitDate: Thu Jul 11 12:50:52 2024 +0200
Fix to temporary variable name
Change-Id: I87be9a7b5cd2627844ab7b5f0c838eddbeb01b05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170319
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index ee2e4459cf63..009c1acea6bc 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -196,9 +196,8 @@ BackingWindow::BackingWindow(vcl::Window* i_pParent)
// tdf#161796 make the extension button show the donation page
if (officecfg::Office::Common::Misc::ShowDonation::get())
{
-OUString test = SfxResId(STR_DONATE_BUTTON);
mxExtensionsButton->set_from_icon_name(BMP_DONATE); // icon first
needed on gtk3 to apply the label
-mxExtensionsButton->set_label(test);
+mxExtensionsButton->set_label(SfxResId(STR_DONATE_BUTTON));
}
mxDropTarget = mxAllRecentThumbnails->GetDropTarget();
core.git: sw/source
sw/source/core/text/txthyph.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a9e23d1dcd361d95e046ab2d521ee55df9a77747
Author: Heiko Tietze
AuthorDate: Tue Jul 9 12:53:03 2024 +0200
Commit: Heiko Tietze
CommitDate: Wed Jul 10 13:47:09 2024 +0200
Resolves tdf#161421 - Draw soft hyphen in black on PDF export
Change-Id: I69a19a0919fd31f8ea2fee962e994d61873e51c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170211
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index bf8751d6cea5..8f419984323a 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -436,7 +436,8 @@ void SwSoftHyphPortion::Paint( const SwTextPaintInfo
) const
rInf.DrawViewOpt( *this, PortionType::SoftHyphen );
SwExpandPortion::Paint( rInf );
-if (rInf.GetOpt().IsViewMetaChars() && !rInf.GetOpt().IsPrinting())
+if (rInf.GetOpt().IsViewMetaChars() && !rInf.GetOpt().IsPrinting()
+&& !rInf.GetOpt().IsPDFExport())
{
OUString aMarker = u"-"_ustr;
SwTextPaintInfo aInf(rInf, );
core.git: Branch 'libreoffice-24-2' - sw/inc
sw/inc/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e812e31b845ff6550fc12036e4fd3ddcb535ae5c
Author: Heiko Tietze
AuthorDate: Mon Jun 24 08:07:28 2024 +0200
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Thu Jun 27 00:46:48 2024 +0200
Fixes copy/paste error
follow-up to Iff407da8907b761236ebc2aa8877b9d6b8294e10
Change-Id: Icb5b3703809e5df80df5e269e6160c1c78dc186d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169364
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Justin Luth
(cherry picked from commit c13528abd69ea256cfde5ef1933c4e7f51219d33)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169551
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index ea322289e36a..e2a2f153ac8d 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -134,7 +134,7 @@
#define STR_POOLCOLL_BULLET_LEVEL5
NC_("STR_POOLCOLL_BULLET_LEVEL5", "List 5")
#define STR_POOLCOLL_BULLET_LEVEL5E
NC_("STR_POOLCOLL_BULLET_LEVEL5E", "List 5 End")
#define STR_POOLCOLL_BULLET_NONUM5
NC_("STR_POOLCOLL_BULLET_NONUM5", "List 5 Cont.")
-#define STR_POOLCOLL_HEADERFOOTER NC_("STR_POOLCOLL_HEADER",
"Header and Footer")
+#define STR_POOLCOLL_HEADERFOOTER
NC_("STR_POOLCOLL_HEADERFOOTER", "Header and Footer")
#define STR_POOLCOLL_HEADER NC_("STR_POOLCOLL_HEADER",
"Header")
#define STR_POOLCOLL_HEADERLNC_("STR_POOLCOLL_HEADERL",
"Header Left")
#define STR_POOLCOLL_HEADERRNC_("STR_POOLCOLL_HEADERR",
"Header Right")
core.git: Branch 'libreoffice-24-8' - sw/inc
sw/inc/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4e83c689efad85fc9657deca2c8e6aea2f618cdc
Author: Heiko Tietze
AuthorDate: Mon Jun 24 08:07:28 2024 +0200
Commit: Xisco Fauli
CommitDate: Wed Jun 26 17:46:40 2024 +0200
Fixes copy/paste error
follow-up to Iff407da8907b761236ebc2aa8877b9d6b8294e10
Change-Id: Icb5b3703809e5df80df5e269e6160c1c78dc186d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169364
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Justin Luth
(cherry picked from commit c13528abd69ea256cfde5ef1933c4e7f51219d33)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169498
Reviewed-by: Xisco Fauli
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 298b861eecf6..2d21be7daedc 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -134,7 +134,7 @@
#define STR_POOLCOLL_BULLET_LEVEL5
NC_("STR_POOLCOLL_BULLET_LEVEL5", "List 5")
#define STR_POOLCOLL_BULLET_LEVEL5E
NC_("STR_POOLCOLL_BULLET_LEVEL5E", "List 5 End")
#define STR_POOLCOLL_BULLET_NONUM5
NC_("STR_POOLCOLL_BULLET_NONUM5", "List 5 Cont.")
-#define STR_POOLCOLL_HEADERFOOTER NC_("STR_POOLCOLL_HEADER",
"Header and Footer")
+#define STR_POOLCOLL_HEADERFOOTER
NC_("STR_POOLCOLL_HEADERFOOTER", "Header and Footer")
#define STR_POOLCOLL_HEADER NC_("STR_POOLCOLL_HEADER",
"Header")
#define STR_POOLCOLL_HEADERLNC_("STR_POOLCOLL_HEADERL",
"Header Left")
#define STR_POOLCOLL_HEADERRNC_("STR_POOLCOLL_HEADERR",
"Header Right")
core.git: sw/inc
sw/inc/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c13528abd69ea256cfde5ef1933c4e7f51219d33
Author: Heiko Tietze
AuthorDate: Mon Jun 24 08:07:28 2024 +0200
Commit: Justin Luth
CommitDate: Tue Jun 25 14:08:11 2024 +0200
Fixes copy/paste error
follow-up to Iff407da8907b761236ebc2aa8877b9d6b8294e10
Change-Id: Icb5b3703809e5df80df5e269e6160c1c78dc186d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169364
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Justin Luth
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index b9e46f13d0c6..3a70a42cd0bd 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -134,7 +134,7 @@
#define STR_POOLCOLL_BULLET_LEVEL5
NC_("STR_POOLCOLL_BULLET_LEVEL5", "List 5")
#define STR_POOLCOLL_BULLET_LEVEL5E
NC_("STR_POOLCOLL_BULLET_LEVEL5E", "List 5 End")
#define STR_POOLCOLL_BULLET_NONUM5
NC_("STR_POOLCOLL_BULLET_NONUM5", "List 5 Cont.")
-#define STR_POOLCOLL_HEADERFOOTER NC_("STR_POOLCOLL_HEADER",
"Header and Footer")
+#define STR_POOLCOLL_HEADERFOOTER
NC_("STR_POOLCOLL_HEADERFOOTER", "Header and Footer")
#define STR_POOLCOLL_HEADER NC_("STR_POOLCOLL_HEADER",
"Header")
#define STR_POOLCOLL_HEADERLNC_("STR_POOLCOLL_HEADERL",
"Header Left")
#define STR_POOLCOLL_HEADERRNC_("STR_POOLCOLL_HEADERR",
"Header Right")
core.git: officecfg/registry sc/qa sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 +++
sc/qa/unit/uicalc/uicalc.cxx |2 +
sc/source/ui/view/cellsh3.cxx| 27 ++-
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit e932e2ab943a9941fcfc7073c9b6c11b982c2c4c
Author: Heiko Tietze
AuthorDate: Thu Jun 20 15:12:05 2024 +0200
Commit: Heiko Tietze
CommitDate: Tue Jun 25 09:15:25 2024 +0200
Resolves tdf#161641 - Select data area before select all
Advanced option SelectRangeBeforeAll to restore original behavior
Change-Id: Iab4b4e61dffc1ecf2ffed01a994c9894c84ab74d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169276
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-by: Heiko Tietze
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 7303d1bacd00..b9f74d9724fa 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -763,6 +763,13 @@
true
+
+
+ Disable to always select all
+ Select range before all
+
+true
+
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index 08a1eeb3848b..ae1edf38147e 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -2120,6 +2120,8 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf108654)
createScDoc("tdf108654.ods");
ScDocument* pDoc = getScDoc();
+dispatchCommand(mxComponent, u".uno:SelectAll"_ustr, {});
+// first .uno:SelectAll selects the range, second all (tdf#161641)
dispatchCommand(mxComponent, u".uno:SelectAll"_ustr, {});
dispatchCommand(mxComponent, u".uno:Copy"_ustr, {});
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index c62500c7e124..dfb7b4d5e92b 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -49,6 +49,7 @@
#include
#include
#include
+#include
#include
@@ -657,7 +658,31 @@ void ScCellShell::Execute( SfxRequest& rReq )
case SID_SELECTALL:
{
-pTabViewShell->SelectAll();
+SCTAB nTab = GetViewData().GetTabNo();
+SCCOL nStartCol = GetViewData().GetCurX();
+SCROW nStartRow = GetViewData().GetCurY();
+SCCOL nEndCol = nStartCol;
+SCROW nEndRow = nStartRow;
+bool bCanMark = false;
+
+ScMarkData& rMarkdata = GetViewData().GetMarkData();
+const bool
bSelectFirst(officecfg::Office::Calc::Input::SelectRangeBeforeAll::get());
+
+if (bSelectFirst && !rMarkdata.IsMarked())
+{
+const ScDocument& rDoc = GetViewData().GetDocument();
+rDoc.GetDataArea( nTab, nStartCol, nStartRow, nEndCol,
nEndRow, true, false );
+bCanMark = nStartCol != nEndCol || nStartRow != nEndRow;
+}
+
+if (bCanMark)
+{
+const ScRange aRange(nStartCol, nStartRow, nTab, nEndCol,
nEndRow, nTab);
+pTabViewShell->MarkRange(aRange, false);
+}
+else
+pTabViewShell->SelectAll();
+
rReq.Done();
}
break;
core.git: officecfg/registry sc/inc sc/sdi sc/source
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu|6 +++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 sc/inc/sc.hrc |1 sc/sdi/cellsh.sdi |1 sc/sdi/scalc.sdi | 17 ++ sc/source/ui/view/cellsh.cxx |1 sc/source/ui/view/cellsh1.cxx | 11 ++ sc/source/ui/view/tabview3.cxx|1 8 files changed, 46 insertions(+) New commits: commit ec5e0d0cd7074a912415761f779b00f8b7117fcf Author: Heiko Tietze AuthorDate: Thu Jun 20 12:56:33 2024 +0200 Commit: Heiko Tietze CommitDate: Thu Jun 20 15:15:56 2024 +0200 Resolves tdf#64028 - Command to retain source cell on cut .uno:CopyDelete copies the cell and deletes the content, assigned to shift+ctrl+X Misses to block the command while in edit mode, see tdf#161712 Change-Id: I479008b0484ef8ced86b709a0dc2bdbfa6c44cb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169266 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index d90357018cb0..4a3962141caf 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -1525,6 +1525,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for unicode key input .uno:JumpToPrevTable + + +L10N SHORTCUTS - NO TRANSLATE +.uno:CopyDelete + + diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index ad4508627230..e968764fd2c5 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -2515,6 +2515,14 @@ 1 + + + ~Cut but Keep Format + + + 1 + + diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 9ef248660d7e..57c80e62df2d 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -513,6 +513,7 @@ static_assert(SID_PREVIEW_END < SID_KEYFUNC_START, "calc slots ids trampling inf #define SID_ACCEPT_FORMULA (SID_KEYFUNC_START + 42) #define SID_START_FORMULA (SID_KEYFUNC_START + 43) +#define SID_COPYDELETE (SID_KEYFUNC_START + 44) #define SID_KEYFUNC_END (SID_KEYFUNC_START + 50) diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index ebba146f998d..6f27650509d3 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -171,6 +171,7 @@ interface CellSelection SID_FOCUS_INPUTLINE [ ExecMethod = ExecuteMove; StateMethod = GetStateCursor; ] SID_CUT [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] SID_COPY[ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] +SID_COPYDELETE [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] SID_PASTE [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] SID_PASTE_SPECIAL [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] SID_PASTE_UNFORMATTED [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 3591ca10f199..d532de343600 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -6700,3 +6700,20 @@ SfxVoidItem MoveKeepInsertMode FID_MOVE_KEEP_INSERT_MODE GroupId = SfxGroupId::Application; ] + +SfxVoidItem CopyDelete SID_COPYDELETE +() +[ +AutoUpdate = FALSE, +FastCall = FALSE, +ReadOnlyDoc = FALSE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; + +AccelConfig = TRUE, +MenuConfig = TRUE, +ToolBoxConfig = TRUE, +GroupId = SfxGroupId::Edit; +] \ No newline at end of file diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index b61a5618..351868f3e95f 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -233,6 +233,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) bDisable = false; break; case SID_CUT: // cut +case SID_COPYDELETE: bDisable = !bSimpleArea || GetObjectShell()->isContentExtractionLocked(); break; case FID_INS_CELL: // insert cells, just simple selection diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 50c5635a3b18..ed879ecb62f9 100644 --- a/sc/source/ui/view/cellsh1.cxx +++
core.git: vcl/source
vcl/source/outdev/textline.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit baf95a7e8e7312891aed73adb26de74e5bc9ad62
Author: Heiko Tietze
AuthorDate: Wed Jun 19 12:14:05 2024 +0200
Commit: Heiko Tietze
CommitDate: Thu Jun 20 09:11:46 2024 +0200
Resolves tdf#153223 - Suppress variable line height when skia is off
Change-Id: I9194c25bf2fc104574bd27e6b8683b63111e6ad8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169192
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 3155cb1a1681..fa9f481c201c 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1036,7 +1037,12 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos,
const Point& rEndPos, to
// #109280# make sure the waveline does not exceed the descent to avoid
paint problems
LogicalFontInstance* pFontInstance = mpFontInstance.get();
-if (nWaveHeight > pFontInstance->mxFontMetric->GetWavelineUnderlineSize())
+if (nWaveHeight > pFontInstance->mxFontMetric->GetWavelineUnderlineSize()
+// tdf#153223 polyline with lineheight >0 not drawn when skia is off
+#ifdef MACOSX
+|| !SkiaHelper::isVCLSkiaEnabled()
+#endif
+ )
{
nWaveHeight = pFontInstance->mxFontMetric->GetWavelineUnderlineSize();
// tdf#124848 hairline
core.git: Branch 'feature/cib_contract49c' - cui/uiconfig
cui/uiconfig/ui/pickbulletpage.ui| 59 +-- cui/uiconfig/ui/pickgraphicpage.ui | 135 +++ cui/uiconfig/ui/picknumberingpage.ui | 59 +-- cui/uiconfig/ui/pickoutlinepage.ui | 59 +-- 4 files changed, 118 insertions(+), 194 deletions(-) New commits: commit 70ddbaa961321cb1b6ffd7295c22c38032767462 Author: Heiko Tietze AuthorDate: Wed Mar 13 09:40:51 2024 +0100 Commit: Thorsten Behrens CommitDate: Fri Jun 7 22:12:46 2024 +0200 Resolves tdf#160167 - Remove pointless frames in bullet & numbering dialog Solves the issue that the "Selection" label is inappropriate Change-Id: I1bdaa6922796fcdceec0aac6902011aa21cd9aa3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164758 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit aacce8abe239ad679f5e9f9ce9bf2d27fb046d5d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168493 Tested-by: allotropia jenkins Reviewed-by: Thorsten Behrens diff --git a/cui/uiconfig/ui/pickbulletpage.ui b/cui/uiconfig/ui/pickbulletpage.ui index b9749dda540e..589874506853 100644 --- a/cui/uiconfig/ui/pickbulletpage.ui +++ b/cui/uiconfig/ui/pickbulletpage.ui @@ -1,58 +1,39 @@ - + - + True -False +True +6 +6 +6 +6 True True -6 -0 -none +never +never +in - + True -True -True -True -never -never -in -12 -6 +False - + True -False - - -True -True -GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK -True -True - - -Click the bullet style that you want to use. - - +True +GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK +True +True + + +Click the bullet style that you want to use. - - -True -False -Selection - - - - - Displays the different bullet styles that you can apply. diff --git a/cui/uiconfig/ui/pickgraphicpage.ui b/cui/uiconfig/ui/pickgraphicpage.ui index fd7b9922e950..ea7342844a14 100644 --- a/cui/uiconfig/ui/pickgraphicpage.ui +++ b/cui/uiconfig/ui/pickgraphicpage.ui @@ -1,104 +1,85 @@ - + - + + True -False +False +6 +6 +6 +6 True True -6 -0 -none +6 - - + True -False +True True True -6 -12 -6 +never +in - + True -True -True -True -never -in +False - + True -False - - -True -True -GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK -True -True - - -Click the graphics that you want to use as bullets. - - +True +GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK +True +True + + +Click the graphics that you want to use as bullets. - -1 -0 - - - - -False -True -The Gallery theme 'Bullets' is empty (no images). -True - - -0 -0 - - - - -Add and Resize -True -True -False -end - - -1 -2 - - - - - - - - - - + +1 +0 + + + + +False +True +The Gallery theme 'Bullets' is empty (no images). +True + + +0 +0 + -
core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 ++ 1 file changed, 6 insertions(+) New commits: commit 22cce3ece004a89e1ed9025437d96f150cc98857 Author: Heiko Tietze AuthorDate: Wed Jun 5 12:29:20 2024 +0200 Commit: Heiko Tietze CommitDate: Wed Jun 5 19:38:48 2024 +0200 Resolves tdf#161293 - Alt+9 shortcut for Find sidebar Change-Id: I5ab6916c7cf065f986117b12ebbb9a15b6c2147e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168469 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 73419dee1102..c5f32a4af1d8 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -6042,6 +6042,12 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for unicode key input .uno:SidebarDeck.A11yCheckDeck + + +L10N SHORTCUTS - NO TRANSLATE +.uno:SidebarDeck.FindDeck + + L10N SHORTCUTS - NO TRANSLATE
core.git: sc/inc sc/qa sc/uiconfig
sc/inc/scfuncs.hrc |2 +-
sc/qa/uitest/validity/tdf138134.py |4 ++--
sc/qa/uitest/validity/tdf150098.py |4 ++--
sc/qa/uitest/validity/validity.py |4 ++--
sc/uiconfig/scalc/ui/validationcriteriapage.ui |2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 199ffecd9586d3a8c3365bdbc979c93600f25899
Author: Heiko Tietze
AuthorDate: Tue Jun 4 09:48:21 2024 +0200
Commit: Heiko Tietze
CommitDate: Tue Jun 4 13:55:44 2024 +0200
Resolves tdf#161395 - Rename Whole Number to Integer
Change-Id: Id4cce115823781e5f2a4870d38d1f456cdf417a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168395
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc
index 9f8cce9b0090..7a129a046a11 100644
--- a/sc/inc/scfuncs.hrc
+++ b/sc/inc/scfuncs.hrc
@@ -4248,7 +4248,7 @@ const TranslateId SC_OPCODE_RANDARRAY_ARY[] =
NC_("SC_OPCODE_RANDARRAY", "Max"),
NC_("SC_OPCODE_RANDARRAY", "The upper limit of the generated numbers."),
NC_("SC_OPCODE_RANDARRAY", "Integers"),
-NC_("SC_OPCODE_RANDARRAY", "Return whole numbers (TRUE) or decimal values
(FALSE).")
+NC_("SC_OPCODE_RANDARRAY", "Return integer (TRUE) or decimal (FALSE)
values.")
};
// -=*# Resource for function UNIQUE #*=-
diff --git a/sc/qa/uitest/validity/tdf138134.py
b/sc/qa/uitest/validity/tdf138134.py
index b13da491eb40..5d5023a50519 100644
--- a/sc/qa/uitest/validity/tdf138134.py
+++ b/sc/qa/uitest/validity/tdf138134.py
@@ -25,7 +25,7 @@ class DetectiveCircle(UITestCase):
#Select the cells to be validated
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A3"}))
-#Apply Data > Validity ... > Whole Numbers
+#Apply Data > Validity ... > Integer
with
self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
xTabs = xDialog.getChild("tabcontrol")
select_pos(xTabs, "0")
@@ -34,7 +34,7 @@ class DetectiveCircle(UITestCase):
xdata = xDialog.getChild("data")
xmin = xDialog.getChild("min")
-select_by_text(xallow, "Whole Numbers")
+select_by_text(xallow, "Integer")
xallowempty.executeAction("CLICK", tuple())
select_by_text(xdata, "equal")
xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"5"}))
diff --git a/sc/qa/uitest/validity/tdf150098.py
b/sc/qa/uitest/validity/tdf150098.py
index 5d29a4afaadf..91384fc61ece 100644
--- a/sc/qa/uitest/validity/tdf150098.py
+++ b/sc/qa/uitest/validity/tdf150098.py
@@ -26,7 +26,7 @@ class EvaluateFormulaInputs(UITestCase):
#Select the cells to be validated
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A4"}))
-#Apply Data > Validity ... > Whole Numbers
+#Apply Data > Validity ... > Integer
with
self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
xTabs = xDialog.getChild("tabcontrol")
select_pos(xTabs, "0")
@@ -35,7 +35,7 @@ class EvaluateFormulaInputs(UITestCase):
xdata = xDialog.getChild("data")
xmin = xDialog.getChild("min")
-select_by_text(xallow, "Whole Numbers")
+select_by_text(xallow, "Integer")
xallowempty.executeAction("CLICK", tuple())
select_by_text(xdata, "equal")
xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"A3"}))
diff --git a/sc/qa/uitest/validity/validity.py
b/sc/qa/uitest/validity/validity.py
index 3112b7afb91e..158b3905eaba 100644
--- a/sc/qa/uitest/validity/validity.py
+++ b/sc/qa/uitest/validity/validity.py
@@ -29,7 +29,7 @@ class validity(UITestCase):
xmin = xDialog.getChild("min")
xmax = xDialog.getChild("max")
-select_by_text(xallow, "Whole Numbers")
+select_by_text(xallow, "Integer")
xallowempty.executeAction("CLICK", tuple())
select_by_text(xdata, "valid range")
xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"1"}))
@@ -42,7 +42,7 @@ class validity(UITestCase):
xmin = xDialog.getChild("min")
xmax = xDialog.getChild("max")
-self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"],
"Whole Numbers")
+self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"],
"Integer")
self.assertEqual(get_state_as_dict(xallowempty)["Selected"],
"false")
self.assertEqual(get_state_as_dict(xdata)["SelectEntryText"],
"valid range")
self.assertEqual(get_state_as_dict(xmin)["Text"], "1")
diff --git a/sc/uiconfig/scalc/ui/validationcriteriapage.ui
core.git: sc/source
sc/source/ui/view/hdrcont.cxx | 31 +--
sc/source/ui/view/tabview.cxx |2 +-
2 files changed, 14 insertions(+), 19 deletions(-)
New commits:
commit 0a0d3d1f8a34e0b8542c71fe9c3bd3b75d974e7c
Author: Heiko Tietze
AuthorDate: Wed May 29 17:36:08 2024 +0200
Commit: Heiko Tietze
CommitDate: Sat Jun 1 08:41:04 2024 +0200
Resolves tdf#152923 - Make column header outstanding from background
* Background color made darker/lighter depending on system settings
* Separator lines with less contrast (ShadowColor instead of
DarkShadowColor)
* Extra line for selection removed as it extends the actual header
* Todo: Vertical header starts at a few pixels distance to the edge
(patchset 4 fails)
Change-Id: If3c47b77ad0bca2db1c25ec46b488a2e338b8133
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168225
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index ec64067f2507..251f9f6f3cf7 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -321,7 +321,12 @@ void ScHeaderControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
if ( nLineEnd * nLayoutSign >= nInitScrPos * nLayoutSign )
{
-GetOutDev()->SetFillColor( rStyleSettings.GetFaceColor() );
+Color aFaceColor(rStyleSettings.GetFaceColor());
+if (bDark)
+aFaceColor.IncreaseLuminance(20);
+else
+aFaceColor.DecreaseLuminance(20);
+GetOutDev()->SetFillColor( aFaceColor );
if ( bVertical )
aFillRect = tools::Rectangle( 0, nInitScrPos, nBarSize-1, nLineEnd
);
else
@@ -374,26 +379,16 @@ void ScHeaderControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
}
}
-GetOutDev()->SetLineColor( rStyleSettings.GetDarkShadowColor() );
+GetOutDev()->SetLineColor( rStyleSettings.GetShadowColor() );
if (bVertical)
{
-tools::Long nDarkPos = bMirrored ? 0 : nBarSize-1;
-GetOutDev()->DrawLine( Point( nDarkPos, nPStart ), Point(
nDarkPos, nLineEnd ) );
+GetOutDev()->DrawLine( Point( 0, nPStart ), Point( 0, nLineEnd )
); //left
+GetOutDev()->DrawLine( Point( nBarSize-1, nPStart ), Point(
nBarSize-1, nLineEnd ) ); //right
}
else
-GetOutDev()->DrawLine( Point( nPStart, nBarSize-1 ), Point(
nLineEnd, nBarSize-1 ) );
-
-// line in different color for selection
-if ( nTransEnd * nLayoutSign >= nTransStart * nLayoutSign &&
!bHighContrast )
{
-GetOutDev()->SetLineColor(aSelLineColor);
-if (bVertical)
-{
-tools::Long nDarkPos = bMirrored ? 0 : nBarSize-1;
-GetOutDev()->DrawLine( Point( nDarkPos, nTransStart ), Point(
nDarkPos, nTransEnd ) );
-}
-else
-GetOutDev()->DrawLine( Point( nTransStart, nBarSize-1 ),
Point( nTransEnd, nBarSize-1 ) );
+GetOutDev()->DrawLine( Point( nPStart, nBarSize-1 ), Point(
nLineEnd, nBarSize-1 ) ); //bottom
+GetOutDev()->DrawLine( Point( nPStart, 0 ), Point( nLineEnd, 0 )
); //top
}
}
@@ -464,10 +459,10 @@ void ScHeaderControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
{
case SC_HDRPAINT_SEL_BOTTOM:
// same as non-selected for high contrast
-GetOutDev()->SetLineColor( bHighContrast ?
rStyleSettings.GetDarkShadowColor() : aSelLineColor );
+GetOutDev()->SetLineColor( bHighContrast ?
rStyleSettings.GetShadowColor() : aSelLineColor );
break;
case SC_HDRPAINT_BOTTOM:
-GetOutDev()->SetLineColor( rStyleSettings.GetDarkShadowColor()
);
+GetOutDev()->SetLineColor( rStyleSettings.GetShadowColor() );
break;
case SC_HDRPAINT_TEXT:
// DrawSelectionBackground is used only for high contrast on
light background
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 17e4d8859231..8eba950c48ce 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -101,7 +101,7 @@ void ScCornerButton::Paint(vcl::RenderContext&
rRenderContext, const tools::Rect
tools::Long nDarkX = bLayoutRTL ? 0 : nPosX;
// both buttons have the same look now - only dark right/bottom lines
-rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor());
+rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
rRenderContext.DrawLine(Point(0, nPosY), Point(nPosX, nPosY));
rRenderContext.DrawLine(Point(nDarkX, 0), Point(nDarkX, nPosY));
}
core.git: vcl/source
vcl/source/window/printdlg.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 0764a44e185d7b940f442cc054f5f1afd8c5cc64 Author: Heiko Tietze AuthorDate: Fri May 31 09:53:48 2024 +0200 Commit: Heiko Tietze CommitDate: Fri May 31 12:54:45 2024 +0200 Resolves tdf#161082 - Set focus on topmost item (Printer) Change-Id: Ib5b8f2587efaa683a28f1d8298eb9bcba2539705 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168280 Reviewed-by: Heiko Tietze Tested-by: Jenkins diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index f642641a0fc2..faa8d7179cb6 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -635,9 +635,8 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, std::shared_ptrgrab_focus(); -mxCopyCountField->select_region(0, -1); +// set initial focus to "Printer" +mxPrinters->grab_focus(); // setup sizes for N-Up Size aNupSize( maPController->getPrinter()->PixelToLogic(
core.git: sc/source
sc/source/ui/view/hdrcont.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 2269b418f7af598ff8194acb9929c8bd6c4baeb1
Author: Heiko Tietze
AuthorDate: Wed May 29 14:09:20 2024 +0200
Commit: Heiko Tietze
CommitDate: Fri May 31 08:17:18 2024 +0200
Resolves tdf#160324 - Larger hitarea for column header
Finalizes patch I6d527d2b0d0de3b48f123b626ebf0b6ce60299a5
Change-Id: Iff5cd4f6252e42cf8fad0aa2f37f70db0b8a15ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168210
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index bf97dbb01f95..ec64067f2507 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -628,9 +628,6 @@ void ScHeaderControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
SCCOLROW ScHeaderControl::GetMousePos(const Point& rPos, bool& rBorder) const
{
-// #define nHitArea 5
-const int nHitArea(
officecfg::Office::Common::Misc::ExperimentalMode::get() ? 5 : 2 );
-
boolbFound = false;
SCCOLROWnPos = GetPos();
SCCOLROWnHitNo = nPos;
@@ -654,7 +651,7 @@ SCCOLROW ScHeaderControl::GetMousePos(const Point& rPos,
bool& rBorder) const
nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //!
GetHiddenCount() ??
nDif = nMousePos - nScrPos;
-if (nDif >= -nHitArea && nDif <= +nHitArea)
+if (nDif >= -5 && nDif <= 5)
{
bFound = true;
nHitNo=nEntryNo-1;
core.git: include/sfx2 sfx2/source sfx2/uiconfig
include/sfx2/dinfdlg.hxx| 31 ++-
sfx2/source/dialog/dinfdlg.cxx | 130 -
sfx2/uiconfig/ui/descriptioninfopage.ui | 299
sfx2/uiconfig/ui/documentinfopage.ui| 78
sfx2/uiconfig/ui/linefragment.ui| 106 +--
5 files changed, 239 insertions(+), 405 deletions(-)
New commits:
commit 2164406a973fd40fcc56b8839a21854f6b50a53b
Author: Heiko Tietze
AuthorDate: Tue May 28 10:15:43 2024 +0200
Commit: Heiko Tietze
CommitDate: Wed May 29 08:59:02 2024 +0200
Resolves tdf#160937 - Improve dialog size for document properties
linefragment.ui and documentinfopage.ui modified to keep
the usual dialog dimension
Change-Id: I1777e4094e584d676a48855717827aaed413e251
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168139
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index d4743ed00ef5..c602a940c6f2 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -244,16 +244,31 @@ private:
std::unique_ptr m_xTitleEd;
std::unique_ptr m_xThemaEd;
std::unique_ptr m_xKeywordsEd;
-std::unique_ptr m_xContributorEd;
-std::unique_ptr m_xCoverageEd;
-std::unique_ptr m_xIdentifierEd;
-std::unique_ptr m_xPublisherEd;
-std::unique_ptr m_xRelationEd;
-std::unique_ptr m_xRightsEd;
-std::unique_ptr m_xSourceEd;
-std::unique_ptr m_xTypeEd;
+std::unique_ptr m_xMoreTypes;
+std::unique_ptr m_xMoreValue;
std::unique_ptr m_xCommentEd;
+DECL_LINK(MoreTypesHdl, weld::ComboBox&, void);
+DECL_LINK(MoreValueHdl, weld::Entry&, void);
+
+OUString m_sMoreValue_Contributor;
+OUString m_sMoreValue_Coverage;
+OUString m_sMoreValue_Identifier;
+OUString m_sMoreValue_Publisher;
+OUString m_sMoreValue_Relation;
+OUString m_sMoreValue_Rights;
+OUString m_sMoreValue_Source;
+OUString m_sMoreValue_Type;
+
+OUString m_sMoreValue_Contributor_Stored;
+OUString m_sMoreValue_Coverage_Stored;
+OUString m_sMoreValue_Identifier_Stored;
+OUString m_sMoreValue_Publisher_Stored;
+OUString m_sMoreValue_Relation_Stored;
+OUString m_sMoreValue_Rights_Stored;
+OUString m_sMoreValue_Source_Stored;
+OUString m_sMoreValue_Type_Stored;
+
virtual boolFillItemSet( SfxItemSet* ) override;
virtual voidReset( const SfxItemSet* ) override;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index b1e5dbd92916..80387eacd85e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -624,18 +624,14 @@ SfxDocumentDescPage::SfxDocumentDescPage(weld::Container*
pPage, weld::DialogCon
, m_xTitleEd(m_xBuilder->weld_entry(u"title"_ustr))
, m_xThemaEd(m_xBuilder->weld_entry(u"subject"_ustr))
, m_xKeywordsEd(m_xBuilder->weld_entry(u"keywords"_ustr))
-, m_xContributorEd(m_xBuilder->weld_entry(u"contributor"_ustr))
-, m_xCoverageEd(m_xBuilder->weld_entry(u"coverage"_ustr))
-, m_xIdentifierEd(m_xBuilder->weld_entry(u"identifier"_ustr))
-, m_xPublisherEd(m_xBuilder->weld_entry(u"publisher"_ustr))
-, m_xRelationEd(m_xBuilder->weld_entry(u"relation"_ustr))
-, m_xRightsEd(m_xBuilder->weld_entry(u"rights"_ustr))
-, m_xSourceEd(m_xBuilder->weld_entry(u"source"_ustr))
-, m_xTypeEd(m_xBuilder->weld_entry(u"type"_ustr))
+, m_xMoreTypes(m_xBuilder->weld_combo_box("cbMoreTypes"))
+, m_xMoreValue(m_xBuilder->weld_entry("edMoreValue"))
, m_xCommentEd(m_xBuilder->weld_text_view(u"comments"_ustr))
{
-m_xCommentEd->set_size_request(m_xKeywordsEd->get_preferred_size().Width(),
- m_xCommentEd->get_height_rows(16));
+m_xCommentEd->set_size_request(-1,
//m_xKeywordsEd->get_preferred_size().Width(),
+ m_xCommentEd->get_height_rows(8));
+m_xMoreTypes->connect_changed(LINK(this, SfxDocumentDescPage,
MoreTypesHdl));
+m_xMoreValue->connect_changed(LINK(this, SfxDocumentDescPage,
MoreValueHdl));
}
SfxDocumentDescPage::~SfxDocumentDescPage()
@@ -653,14 +649,16 @@ bool SfxDocumentDescPage::FillItemSet(SfxItemSet *rSet)
const bool bTitleMod = m_xTitleEd->get_value_changed_from_saved();
const bool bThemeMod = m_xThemaEd->get_value_changed_from_saved();
const bool bKeywordsMod = m_xKeywordsEd->get_value_changed_from_saved();
-const bool bContributorMod =
m_xContributorEd->get_value_changed_from_saved();
-const bool bCoverageMod = m_xCoverageEd->get_value_changed_from_saved();
-const bool bIdentifierMod =
m_xIdentifierEd->get_value_changed_from_saved();
-const bool bPublisherMod = m_xPublisherEd->get_value_changed_from_saved();
-const bool bRelationMod = m_xRelationEd->get_value_changed_from_saved();
-const bool bRightsMod = m_xRightsEd->get_value_changed_from_saved();
-const bool bSourceMod =
core.git: sw/source
sw/source/core/text/porexp.cxx | 53 +++-
sw/source/core/text/porrst.cxx |3 +-
sw/source/core/text/txthyph.cxx | 15 ++-
3 files changed, 42 insertions(+), 29 deletions(-)
New commits:
commit 1e9a5ee8671f9a48894849d3cba4d65afa181554
Author: Heiko Tietze
AuthorDate: Thu May 23 14:58:46 2024 +0200
Commit: Heiko Tietze
CommitDate: Fri May 24 16:30:31 2024 +0200
Resolves tdf161196 - Visibility of formatting marks
* Special indicators such as "°" for no-break space but also
"," for zero width space are hidden if non-printable chars
are disabled
* Special indicators use the same color (NON_PRINTING_CHARACTER_COLOR)
* Hard hyphen becomes blueish with non-printable chars on
* Hard blank as well as hard hyphen are controlled by Formatting Aids >
Non-breaking spaces; and both highlighting and indicator are hidden
with non-printable chars off
Change-Id: Ifa29371587ba44d825e04368c5f5c5bf7ed94c7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167987
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 0884db6fce76..377af4671f2b 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -213,35 +213,34 @@ void SwBlankPortion::Paint( const SwTextPaintInfo )
const
rInf.DrawViewOpt(*this, PortionType::Blank);
SwExpandPortion::Paint(rInf);
-if (m_cChar == CHAR_HARDBLANK)
+if (rInf.GetOpt().IsViewMetaChars() && rInf.GetOpt().IsHardBlank())
{
-if (rInf.GetOpt().IsBlank())
-{
-// Draw tilde or degree sign
-OUString aMarker =
(rInf.GetTextFrame()->GetDoc().getIDocumentSettingAccess()
+// Draw tilde or degree sign
+OUString aMarker = (m_cChar == CHAR_HARDBLANK ?
+
rInf.GetTextFrame()->GetDoc().getIDocumentSettingAccess()
.get(DocumentSettingId::USE_VARIABLE_WIDTH_NBSP)
- ? u"~"_ustr
- : u"°"_ustr);
-
-SwPosSize aMarkerSize(rInf.GetTextSize(aMarker));
-Point aPos(rInf.GetPos());
-
-std::shared_ptr pPortionRect = std::make_shared();
-rInf.CalcRect(*this, pPortionRect.get());
-aPos.AdjustX((pPortionRect->Width() / 2) - (aMarkerSize.Width() /
2));
-
-SwTextPaintInfo aInf(rInf, );
-aInf.SetPos(aPos);
-SwTextPortion aMarkerPor;
-aMarkerPor.Width(aMarkerSize.Width());
-aMarkerPor.Height(aMarkerSize.Height());
-aMarkerPor.SetAscent(GetAscent());
-
-Color colorBackup = aInf.GetFont()->GetColor();
-aInf.GetFont()->SetColor(NON_PRINTING_CHARACTER_COLOR);
-aInf.DrawText(aMarkerPor, TextFrameIndex(aMarker.getLength()),
true);
-aInf.GetFont()->SetColor(colorBackup);
-}
+? u"~"_ustr
+: u"°"_ustr
+: u"-"_ustr); //CHAR_HARDHYPHEN
+
+SwPosSize aMarkerSize(rInf.GetTextSize(aMarker));
+Point aPos(rInf.GetPos());
+
+std::shared_ptr pPortionRect = std::make_shared();
+rInf.CalcRect(*this, pPortionRect.get());
+aPos.AdjustX((pPortionRect->Width() / 2) - (aMarkerSize.Width() / 2));
+
+SwTextPaintInfo aInf(rInf, );
+aInf.SetPos(aPos);
+SwTextPortion aMarkerPor;
+aMarkerPor.Width(aMarkerSize.Width());
+aMarkerPor.Height(aMarkerSize.Height());
+aMarkerPor.SetAscent(GetAscent());
+
+Color colorBackup = aInf.GetFont()->GetColor();
+aInf.GetFont()->SetColor(NON_PRINTING_CHARACTER_COLOR);
+aInf.DrawText(aMarkerPor, TextFrameIndex(aMarker.getLength()), true);
+aInf.GetFont()->SetColor(colorBackup);
}
}
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index ff1e029ae141..8f0b89852450 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -677,7 +677,7 @@ bool SwHiddenTextPortion::Format( SwTextFormatInfo )
bool SwControlCharPortion::DoPaint(SwTextPaintInfo const& rTextPaintInfo,
OUString & rOutString, SwFont & rTmpFont, int &) const
{
-if (mcChar == CHAR_WJ || !rTextPaintInfo.GetOpt().IsFieldShadings())
+if (mcChar == CHAR_WJ || !rTextPaintInfo.GetOpt().IsViewMetaChars())
{
return false;
}
@@ -696,6 +696,7 @@ bool SwControlCharPortion::DoPaint(SwTextPaintInfo const&
rTextPaintInfo,
}
rTmpFont.SetEscapement( CHAR_ZWSP == mcChar ? DFLT_ESC_AUTO_SUB : -25 );
+rTmpFont.SetColor( NON_PRINTING_CHARACTER_COLOR );
const sal_uInt16 nProp = 40;
rTmpFont.SetProportion( nProp ); // a smaller font
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source include/sfx2 include/unotools officecfg/registry Repository.mk sfx2/sdi sfx2/source vcl/Module_vcl.mk vcl
Repository.mk |1
cui/Library_cui.mk |1
cui/UIConfig_cui.mk|1
cui/inc/whatsnew.hrc | 42 -
cui/source/dialogs/whatsnew.cxx| 172
cui/source/factory/dlgfact.cxx | 14
cui/source/factory/dlgfact.hxx |2
cui/source/inc/whatsnew.hxx| 79 ---
cui/uiconfig/ui/whatsnewdialog.ui | 131 --
dev/null |binary
include/sfx2/sfxdlg.hxx|2
include/sfx2/sfxsids.hrc |3
include/sfx2/strings.hrc |2
include/sfx2/viewfrm.hxx |1
include/unotools/VersionConfig.hxx |5
officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs |6
officecfg/registry/schema/org/openoffice/Setup.xcs |2
sfx2/sdi/appslots.sdi |4
sfx2/sdi/sfx.sdi | 16
sfx2/source/appl/appserv.cxx |9
sfx2/source/dialog/infobar.cxx |2
sfx2/source/view/viewfrm.cxx | 212
+-
vcl/Module_vcl.mk |1
vcl/Package_whatsnew.mk| 20
24 files changed, 124 insertions(+), 604 deletions(-)
New commits:
commit 1bd9747a126a3e82b6093c2b4af3b3a74774a3e9
Author: Heiko Tietze
AuthorDate: Wed May 22 13:18:27 2024 +0200
Commit: Heiko Tietze
CommitDate: Wed May 22 21:19:46 2024 +0200
tdf#161209 - Reverts WhatsNew/Welcome dialog
dd889b290304b73f96a9a8e6e0f144d3aa2ba7e1
Change-Id: Idf0594c546e4d9ca263272ed1534b27948e8e930
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167956
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/Repository.mk b/Repository.mk
index b86eb1bc5646..4a505655d209 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -925,7 +925,6 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE)
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
tipoftheday_images \
- whatsnew_images \
))
endif
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 3ee744e32d0f..e01e33ecb4ec 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/customize/SvxNotebookbarConfigPage \
cui/source/customize/CustomNotebookbarGenerator \
cui/source/dialogs/about \
-cui/source/dialogs/whatsnew \
$(call gb_Helper_optional,EXTENSIONS, \
cui/source/dialogs/AdditionsDialog) \
cui/source/dialogs/colorpicker \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 79ff7696a93a..10acd83c8c39 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -18,7 +18,6 @@ endif
ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE)
$(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/tipofthedaydialog \
- cui/uiconfig/ui/whatsnewdialog \
))
endif
diff --git a/cui/inc/whatsnew.hrc b/cui/inc/whatsnew.hrc
deleted file mode 100644
index e155a597bcf2..
--- a/cui/inc/whatsnew.hrc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#pragma once
-
-#define NC_(Context, String) TranslateId(Context, u8##String)
-
-#include
-#include
-#include
-#include
-
-/*
- * std:tuple consists of
- * image:
- * place new images at extra/source/whatsnew
- * do not forget to add the files to vcl/Package_whatsnew.mk
- * images are cut-off at 600x400px
-*/
-
-const std::tuple WELCOME_STRINGARRAY[] =
-{
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME is a powerful and free office
suite, used by millions of people around the world."), "LibreOffice.gif"},
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME uses the reliable and trustworthy
standard open document format."), "ODF.png"},
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME blends into every operation
system and provides full customization."), "Configurability.png"},
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME is open source: Your project,
your data, your freedom."),
core.git: sw/source sw/uiconfig
sw/source/ui/config/optpage.cxx | 57 -
sw/source/uibase/inc/optpage.hxx|5 -
sw/uiconfig/swriter/ui/optcomparison.ui | 85 +++-
3 files changed, 10 insertions(+), 137 deletions(-)
New commits:
commit 6ddb49bc32c534d196ff3913835aceb88cbc8dfc
Author: Heiko Tietze
AuthorDate: Tue May 21 10:00:44 2024 +0200
Commit: Heiko Tietze
CommitDate: Tue May 21 15:33:34 2024 +0200
Resolves tdf#160834 - Unclear meaning of "Ignore pieces of length"
Access in the UI removed
Find the options under ooO.Writer.Comparison.IgnoreLength and IgnorePieces
Change-Id: Ic76277ba6838bf5cf858089303f4882bc9a7c2de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167888
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 6ca432acc34e..089942b5eeb0 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -2577,10 +2577,6 @@
SwCompareOptionsTabPage::SwCompareOptionsTabPage(weld::Container* pPage, weld::D
, m_xCompareModeImg(m_xBuilder->weld_widget("lockcomparemode"))
, m_xRsidCB(m_xBuilder->weld_check_button("useRSID"))
, m_xRsidImg(m_xBuilder->weld_widget("lockuseRSID"))
-, m_xIgnoreCB(m_xBuilder->weld_check_button("ignore"))
-, m_xIgnoreImg(m_xBuilder->weld_widget("lockignore"))
-, m_xLenNF(m_xBuilder->weld_spin_button("ignorelen"))
-, m_xLenImg(m_xBuilder->weld_widget("lockignorelen"))
, m_xStoreRsidCB(m_xBuilder->weld_check_button("storeRSID"))
, m_xStoreRsidImg(m_xBuilder->weld_widget("lockstoreRSID"))
{
@@ -2588,8 +2584,6 @@
SwCompareOptionsTabPage::SwCompareOptionsTabPage(weld::Container* pPage, weld::D
m_xAutoRB->connect_toggled( aLnk );
m_xWordRB->connect_toggled( aLnk );
m_xCharRB->connect_toggled( aLnk );
-
-m_xIgnoreCB->connect_toggled( LINK( this, SwCompareOptionsTabPage,
IgnoreHdl) );
}
SwCompareOptionsTabPage::~SwCompareOptionsTabPage()
@@ -2612,14 +2606,6 @@ OUString SwCompareOptionsTabPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
-OUString checkButton[] = { "useRSID", "ignore", "storeRSID" };
-
-for (const auto& check : checkButton)
-{
-if (const auto& pString = m_xBuilder->weld_check_button(check))
-sAllStrings += pString->get_label() + " ";
-}
-
OUString radioButton[] = { "auto", "byword", "bycharacter" };
for (const auto& radio : radioButton)
@@ -2656,18 +2642,6 @@ bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* )
bRet = true;
}
-if( m_xIgnoreCB->get_state_changed_from_saved() )
-{
-pOpt->SetIgnorePieces( m_xIgnoreCB->get_active() );
-bRet = true;
-}
-
-if( m_xLenNF->get_value_changed_from_saved() )
-{
-pOpt->SetPieceLen( m_xLenNF->get_value() );
-bRet = true;
-}
-
if (m_xStoreRsidCB->get_state_changed_from_saved())
{
pOpt->SetStoreRsid(m_xStoreRsidCB->get_active());
@@ -2686,22 +2660,16 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* )
{
m_xAutoRB->set_active(true);
m_xRsidCB->set_sensitive(false);
-m_xIgnoreCB->set_sensitive(false);
-m_xLenNF->set_sensitive(false);
}
else if( eCmpMode == SwCompareMode::ByWord )
{
m_xWordRB->set_active(true);
m_xRsidCB->set_sensitive(true);
-m_xIgnoreCB->set_sensitive(true);
-m_xLenNF->set_sensitive(true);
}
else if( eCmpMode == SwCompareMode::ByChar)
{
m_xCharRB->set_active(true);
m_xRsidCB->set_sensitive(true);
-m_xIgnoreCB->set_sensitive(true);
-m_xLenNF->set_sensitive(true);
}
if (officecfg::Office::Writer::Comparison::Mode::isReadOnly())
@@ -2724,24 +2692,6 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* )
}
m_xRsidCB->save_state();
-m_xIgnoreCB->set_active( pOpt->IsIgnorePieces() );
-if (officecfg::Office::Writer::Comparison::IgnorePieces::isReadOnly())
-{
-m_xIgnoreCB->set_sensitive(false);
-m_xIgnoreImg->set_visible(true);
-}
-m_xIgnoreCB->save_state();
-
-m_xLenNF->set_sensitive( m_xIgnoreCB->get_active() && eCmpMode !=
SwCompareMode::Auto );
-
-m_xLenNF->set_value( pOpt->GetPieceLen() );
-if (officecfg::Office::Writer::Comparison::IgnoreLength::isReadOnly())
-{
-m_xLenNF->set_sensitive(false);
-m_xLenImg->set_visible(true);
-}
-m_xLenNF->save_value();
-
m_xStoreRsidCB->set_active(pOpt->IsStoreRsid());
m_xStoreRsidCB->set_sensitive(!officecfg::Office::Writer::Comparison::StoreRSID::isReadOnly());
m_xStoreRsidImg->set_visible(officecfg::Office::Writer::Comparison::StoreRSID::isReadOnly());
@@ -2755,13 +2705,6 @@ IMPL_LINK(SwCompareOptionsTabPage, ComparisonHdl,
weld::Toggleable&, rButton, vo
bool bChecked =
core.git: cui/source
cui/source/dialogs/whatsnew.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7fc7d3b9fe6eabeddf43fbf72a041854fda51b27
Author: Heiko Tietze
AuthorDate: Thu May 16 10:24:20 2024 +0200
Commit: Heiko Tietze
CommitDate: Thu May 16 12:49:47 2024 +0200
Related tdf#159573 - WhatsNew dialog: 1px glitch with Wayland
Change-Id: I6565fa32f4484e74abecc795c67e7afa13f7f55b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167734
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/cui/source/dialogs/whatsnew.cxx b/cui/source/dialogs/whatsnew.cxx
index 6092b7e4af50..5136c62f33ca 100644
--- a/cui/source/dialogs/whatsnew.cxx
+++ b/cui/source/dialogs/whatsnew.cxx
@@ -155,7 +155,7 @@ void WhatsNewProgress::Paint(vcl::RenderContext&
rRenderContext, const tools::Re
rRenderContext.Erase();
rRenderContext.SetAntialiasing(AntialiasingFlags::Enable);
-tools::Rectangle aRect(Point(0, 0), Size(PROGRESS_DOTSIZE,
PROGRESS_DOTSIZE));
+tools::Rectangle aRect(Point(1, 1), Size(PROGRESS_DOTSIZE,
PROGRESS_DOTSIZE));
for (sal_Int32 i = 0; i < m_nTotal; i++)
{
if (i == m_nCurrent)
core.git: sc/source
sc/source/ui/view/hdrcont.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit f1d69a84ac82034d7f98877780c549f06d93792d
Author: Heiko Tietze
AuthorDate: Fri May 3 11:16:40 2024 +0200
Commit: Heiko Tietze
CommitDate: Tue May 7 15:49:22 2024 +0200
Resolves tdf#160324 - Larger hit area for col/row resize actions
Tentative solution made optional depending on experimental settings
Change-Id: I6d527d2b0d0de3b48f123b626ebf0b6ce60299a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167041
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 98ebabb702c3..bf97dbb01f95 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#define SC_DRAG_MIN 2
@@ -627,6 +628,9 @@ void ScHeaderControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
SCCOLROW ScHeaderControl::GetMousePos(const Point& rPos, bool& rBorder) const
{
+// #define nHitArea 5
+const int nHitArea(
officecfg::Office::Common::Misc::ExperimentalMode::get() ? 5 : 2 );
+
boolbFound = false;
SCCOLROWnPos = GetPos();
SCCOLROWnHitNo = nPos;
@@ -650,7 +654,7 @@ SCCOLROW ScHeaderControl::GetMousePos(const Point& rPos,
bool& rBorder) const
nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //!
GetHiddenCount() ??
nDif = nMousePos - nScrPos;
-if (nDif >= -2 && nDif <= 2)
+if (nDif >= -nHitArea && nDif <= +nHitArea)
{
bFound = true;
nHitNo=nEntryNo-1;
core.git: officecfg/registry sc/inc sc/source sc/uiconfig
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 10 ++ sc/inc/ViewSettingsSequenceDefines.hxx | 35 +- sc/inc/unonames.hxx |1 sc/inc/viewopti.hxx |1 sc/source/core/data/postit.cxx |4 - sc/source/core/tool/viewopti.cxx | 21 -- sc/source/ui/inc/tpview.hxx |2 sc/source/ui/optdlg/tpview.cxx | 11 +++ sc/source/ui/unoobj/confuno.cxx |5 + sc/source/ui/unoobj/viewuno.cxx |4 + sc/source/ui/view/viewdata.cxx |4 + sc/uiconfig/scalc/ui/tpviewpage.ui | 52 +++ 12 files changed, 112 insertions(+), 38 deletions(-) New commits: commit a5d0114bbb40f5bffcb19d6e6b3a5bf43aab1446 Author: Heiko Tietze AuthorDate: Tue May 7 08:56:07 2024 +0200 Commit: Heiko Tietze CommitDate: Tue May 7 15:48:04 2024 +0200 Resolves tdf#156885 - Make comment authorship optional Change-Id: I3422c9e5606fa9eb9aa450f518af8426e598ab8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167260 Tested-by: Jenkins Reviewed-by: Balazs Varga Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index fb6edf076f17..7303d1bacd00 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -106,13 +106,21 @@ true - + If less than 1, the size of comment indicator is calculated dynamically; otherwise this value will be used. Comment indicator size 0 + + + +Indicates whether authorship metadata for comments on hover are shown. +Comment authorship + + true + diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx index 0c04aa594e68..1cb2b59eb9fc 100644 --- a/sc/inc/ViewSettingsSequenceDefines.hxx +++ b/sc/inc/ViewSettingsSequenceDefines.hxx @@ -24,7 +24,7 @@ // this are the defines for the position of the settings in the // ViewSettingsSequence -#define SC_VIEWSETTINGS_COUNT 26 +#define SC_VIEWSETTINGS_COUNT 27 #define SC_VIEW_ID 0 #define SC_TABLE_VIEWSETTINGS 1 @@ -36,22 +36,23 @@ #define SC_PAGE_BREAK_PREVIEW 7 #define SC_SHOWZERO 8 #define SC_SHOWNOTES9 -#define SC_SHOWFORMULASMARKS10 -#define SC_SHOWGRID 11 -#define SC_GRIDCOLOR12 -#define SC_SHOWPAGEBR 13 -#define SC_COLROWHDR14 -#define SC_SHEETTABS15 -#define SC_OUTLSYMB 16 -#define SC_VALUE_HIGHLIGHTING 17 -#define SC_SNAPTORASTER 18 -#define SC_RASTERVIS19 -#define SC_RASTERRESX 20 -#define SC_RASTERRESY 21 -#define SC_RASTERSUBX 22 -#define SC_RASTERSUBY 23 -#define SC_RASTERSYNC 24 -#define SC_FORMULA_BAR_HEIGHT 25 +#define SC_SHOWNOTEAUTHOR 10 +#define SC_SHOWFORMULASMARKS11 +#define SC_SHOWGRID 12 +#define SC_GRIDCOLOR13 +#define SC_SHOWPAGEBR 14 +#define SC_COLROWHDR15 +#define SC_SHEETTABS16 +#define SC_OUTLSYMB 17 +#define SC_VALUE_HIGHLIGHTING 18 +#define SC_SNAPTORASTER 19 +#define SC_RASTERVIS20 +#define SC_RASTERRESX 21 +#define SC_RASTERRESY 22 +#define SC_RASTERSUBX 23 +#define SC_RASTERSUBY 24 +#define SC_RASTERSYNC 25 +#define SC_FORMULA_BAR_HEIGHT 26 // this are the defines for the position of the settings in the // TableViewSettingsSequence diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 07c9c39ace30..13bb2600f471 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -561,6 +561,7 @@ inline constexpr OUString SC_UNO_SHOWFORM = u"ShowFormulas"_ustr; inline constexpr OUString SC_UNO_SHOWGRID = u"ShowGrid"_ustr; inline constexpr OUString SC_UNO_SHOWHELP = u"ShowHelpLines"_ustr; inline constexpr OUString SC_UNO_SHOWNOTES=
core.git: svtools/source
svtools/source/control/valueset.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit abccf22947294cfc2d9c4b727b7fd059bed55f0b
Author: Heiko Tietze
AuthorDate: Tue Apr 30 10:23:34 2024 +0200
Commit: Heiko Tietze
CommitDate: Mon May 6 16:26:13 2024 +0200
Resolves tdf#136917 - Focus rectangle barely visible on toolbar widgets
eg. Toggle Unordered List
Change-Id: I9298fcbcbf715402a59c7a8ccaa2cd341e7cda8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166916
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index 0127ea7a1901..58364b4aebfc 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1255,9 +1256,15 @@ void ValueSet::ImplDrawSelect(vcl::RenderContext&
rRenderContext,
if (bDrawSel)
{
rRenderContext.SetLineColor(aDoubleColor);
-tools::PolyPolygon aPolyPoly(1);
-aPolyPoly.Insert(tools::Polygon(aRect));
-rRenderContext.DrawTransparent(aPolyPoly, nTransparencePercent);
+aRect.AdjustLeft( -1 );
+aRect.AdjustTop( -1 );
+aRect.AdjustRight( -2 );
+aRect.AdjustBottom( -2 );
+
+const tools::Polygon aPoly(aRect);
+LineInfo aLineInfo;
+aLineInfo.SetWidth(3);
+rRenderContext.DrawPolyLine(aPoly, aLineInfo); // tdf#136917
}
}
else
@@ -1343,6 +1350,7 @@ void ValueSet::ImplDrawSelect(vcl::RenderContext&
rRenderContext,
rRenderContext.SetLineColor(aSingleColor);
else
rRenderContext.SetLineColor(COL_LIGHTGRAY);
+
rRenderContext.DrawRect(aFocusRect);
}
}
core.git: Branch 'libreoffice-24-2' - cui/uiconfig
cui/uiconfig/ui/optviewpage.ui |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 77be21b5bd0bd339b2e629f5ec5ee00887033781 Author: Heiko Tietze AuthorDate: Tue Apr 30 09:33:22 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Thu May 2 05:25:26 2024 +0200 Resolves tdf#141778 - Size issues on view options UI Change-Id: I08ab47d8f88a0bda16e15377921909f64219c4a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166894 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index ce89f11d4d2c..6ad847830136 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -1,5 +1,5 @@ - + @@ -27,7 +27,6 @@ True False -True 12
core.git: cui/uiconfig
cui/uiconfig/ui/optviewpage.ui |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 358b281a39c6599aa2054a9cf60aa6712e832150 Author: Heiko Tietze AuthorDate: Tue Apr 30 09:33:22 2024 +0200 Commit: Heiko Tietze CommitDate: Wed May 1 09:26:29 2024 +0200 Resolves tdf#141778 - Size issues on view options UI Change-Id: I08ab47d8f88a0bda16e15377921909f64219c4a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166885 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index ce89f11d4d2c..6ad847830136 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -1,5 +1,5 @@ - + @@ -27,7 +27,6 @@ True False -True 12
core.git: sc/source
sc/source/ui/view/gridwin.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 9e7d70230212ab95cda957a0fe51e37f7ca95021 Author: Heiko Tietze AuthorDate: Mon Apr 29 16:29:57 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Tue Apr 30 09:21:45 2024 +0200 Related tdf#143733 - Cell focus must not cover content This patch moves the cell focus rectangle outside the active cell, relative to the zoom factor Change-Id: I9df98125d5c0e571af841442d4db8f02d3c05487 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166870 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 1b7c16f1884b..2762929ccb9b 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -6589,11 +6589,15 @@ void ScGridWindow::UpdateCursorOverlay() tools::Long nSizeYPix; mrViewData.GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); +const double nAdjustBorder(mrViewData.GetZoomX() * 3); +aScrPos.AdjustX(-nAdjustBorder); +aScrPos.AdjustY(-nAdjustBorder); + if (bLayoutRTL) aScrPos.AdjustX( -(nSizeXPix - 2) ); // move instead of mirroring // show the cursor as 4 (thin) rectangles -tools::Rectangle aRect(aScrPos, Size(nSizeXPix - 1, nSizeYPix - 1)); +tools::Rectangle aRect(aScrPos, Size(nSizeXPix + 2*nAdjustBorder, nSizeYPix + 2*nAdjustBorder)); float fScaleFactor = GetDPIScaleFactor();
core.git: Branch 'libreoffice-24-2' - sc/uiconfig
sc/uiconfig/scalc/ui/conditionalentry.ui | 343 ++- 1 file changed, 160 insertions(+), 183 deletions(-) New commits: commit 32f7ef29615b25e91a73fe33632bb3b7ca506d04 Author: Heiko Tietze AuthorDate: Wed Apr 24 11:38:51 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Wed Apr 24 21:48:39 2024 +0200 Resolves tdf#159569 - Conditional Formatting dialog jumps with message string Some defined width solves the issue Change-Id: I1f92815e690828e283c275a58a71dd07613642fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166579 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit 9d29a2a6aad679129218ab4c5020c92bb3ce9cb3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166520 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui b/sc/uiconfig/scalc/ui/conditionalentry.ui index 1ff40d10460f..6e40f6cc6acc 100644 --- a/sc/uiconfig/scalc/ui/conditionalentry.ui +++ b/sc/uiconfig/scalc/ui/conditionalentry.ui @@ -1,216 +1,217 @@ - + True -True +True True -never -never -in +never +never +in True -False +False True - + True -False +False True -6 -6 -12 +6 +6 +12 - + True -False +False True -12 +12 True -False +False -0 -0 +0 +0 -10 +10 True -False +False True end -1 -0 +1 +0 -0 -0 +0 +0 - + True -False +False True -6 -12 -True +6 +12 +True -False -True +False +True Apply Style: -True -style +True +style 0 -0 -2 +0 +2 -False -True +False +True New Style... -1 -2 +1 +2 -False -True +100 +False +True Enter a value: 0 -0 -3 +0 +3 3 -True -True +True +True +True True -True -0 -4 +0 +4 -True -True +True +True +True True -True -1 -4 +1 +4 -True -True +True +True +
core.git: sw/qa sw/source sw/uiconfig
sw/qa/uitest/writer_tests2/formatCharacter.py | 47 -
sw/source/ui/chrdlg/chardlg.cxx | 211 --
sw/source/uibase/inc/chrdlg.hxx | 30 ---
sw/uiconfig/swriter/ui/characterproperties.ui | 30 ---
4 files changed, 3 insertions(+), 315 deletions(-)
New commits:
commit 63315d601296f7c188e920f73b12260d018807d0
Author: Heiko Tietze
AuthorDate: Tue Apr 23 17:20:47 2024 +0200
Commit: Heiko Tietze
CommitDate: Wed Apr 24 16:13:15 2024 +0200
Resolves tdf#132253 - Remove hyperlink tab from character dialog
Change-Id: Idb7fa74dbe196262cea64946452043f7de6fa20c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166553
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/qa/uitest/writer_tests2/formatCharacter.py
b/sw/qa/uitest/writer_tests2/formatCharacter.py
index 265f7b4df92e..724b8813029e 100644
--- a/sw/qa/uitest/writer_tests2/formatCharacter.py
+++ b/sw/qa/uitest/writer_tests2/formatCharacter.py
@@ -65,8 +65,6 @@ class formatCharacter(UITestCase):
xLangFontCTL = xDialog.getChild("cbCTLLanguage")
self.assertEqual(get_state_as_dict(xLangFontCTL)["Text"],
"[None]")
-
-
def test_format_character_tab_font_effects(self):
with self.ui_test.create_doc_in_start_center("writer"):
@@ -115,47 +113,6 @@ class formatCharacter(UITestCase):
self.assertEqual(get_state_as_dict(xEmphasis)["SelectEntryText"], "Dot")
self.assertEqual(get_state_as_dict(xPosition)["SelectEntryText"], "Below text")
-
-
- def test_format_character_tab_hyperlink(self):
-with self.ui_test.create_doc_in_start_center("writer") as document:
-
-with
self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "4")
-
-xURL = xDialog.getChild("urled")
-xURL.executeAction("TYPE",
mkPropertyValues({"TEXT":"libreoffice.org"}))
-xTexted = xDialog.getChild("texted")
-xTexted.executeAction("TYPE",
mkPropertyValues({"TEXT":"LibreOffice"}))
-xName = xDialog.getChild("nameed")
-xName.executeAction("TYPE",
mkPropertyValues({"TEXT":"hyperlink"}))
-
-xVisited = xDialog.getChild("visitedlb")
-select_by_text(xVisited, "Bullets")
-xUnVisited = xDialog.getChild("unvisitedlb")
-select_by_text(xUnVisited, "Bullets")
-
-
-self.xUITest.executeCommand(".uno:GoLeft")
-self.assertEqual(document.Text.String[0:11], "LibreOffice")
-
-with
self.ui_test.execute_dialog_through_command(".uno:FontDialog",
close_button="cancel") as xDialog:
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "4")
-xURL = xDialog.getChild("urled")
-xTexted = xDialog.getChild("texted")
-xName = xDialog.getChild("nameed")
-xVisited = xDialog.getChild("visitedlb")
-xUnVisited = xDialog.getChild("unvisitedlb")
-
-self.assertEqual(get_state_as_dict(xURL)["Text"],
"http://libreoffice.org/;)
-self.assertEqual(get_state_as_dict(xTexted)["Text"],
"LibreOffice")
-self.assertEqual(get_state_as_dict(xName)["Text"], "hyperlink")
-
self.assertEqual(get_state_as_dict(xVisited)["SelectEntryText"], "Bullets")
-
self.assertEqual(get_state_as_dict(xUnVisited)["SelectEntryText"], "Bullets")
-
-
def test_format_character_tab_asian_layout(self):
with self.ui_test.create_doc_in_start_center("writer"):
@@ -221,8 +178,6 @@ class formatCharacter(UITestCase):
self.assertEqual(get_state_as_dict(xFitToLine)["Selected"],
"true")
self.assertEqual(get_state_as_dict(xNoHyphenation)["Selected"], "true")
-
-
def test_format_character_tab_position_scalewidthsb(self):
with self.ui_test.create_doc_in_start_center("writer"):
@@ -240,6 +195,4 @@ class formatCharacter(UITestCase):
xScalewidth = xDialog.getChild("scalewidthsb")
self.assertEqual(get_state_as_dict(xScalewidth)["Text"],
"101%")
-
-
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 14833d719282..f57a78d735c9 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -17,37 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
-#include
-
-#include
-#include
-#include
#include
-#include
#include
-#include
-#include
#include
#include
#include
#include
-#include
-#include
-#include
#include
-#include
-#include
#include
#include
-#include
-#include
-#include
#include
-#include
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/conditionalentry.ui | 343 ++- 1 file changed, 160 insertions(+), 183 deletions(-) New commits: commit 9d29a2a6aad679129218ab4c5020c92bb3ce9cb3 Author: Heiko Tietze AuthorDate: Wed Apr 24 11:38:51 2024 +0200 Commit: Heiko Tietze CommitDate: Wed Apr 24 14:58:11 2024 +0200 Resolves tdf#159569 - Conditional Formatting dialog jumps with message string Some defined width solves the issue Change-Id: I1f92815e690828e283c275a58a71dd07613642fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166579 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui b/sc/uiconfig/scalc/ui/conditionalentry.ui index 1ff40d10460f..6e40f6cc6acc 100644 --- a/sc/uiconfig/scalc/ui/conditionalentry.ui +++ b/sc/uiconfig/scalc/ui/conditionalentry.ui @@ -1,216 +1,217 @@ - + True -True +True True -never -never -in +never +never +in True -False +False True - + True -False +False True -6 -6 -12 +6 +6 +12 - + True -False +False True -12 +12 True -False +False -0 -0 +0 +0 -10 +10 True -False +False True end -1 -0 +1 +0 -0 -0 +0 +0 - + True -False +False True -6 -12 -True +6 +12 +True -False -True +False +True Apply Style: -True -style +True +style 0 -0 -2 +0 +2 -False -True +False +True New Style... -1 -2 +1 +2 -False -True +100 +False +True Enter a value: 0 -0 -3 +0 +3 3 -True -True +True +True +True True -True -0 -4 +0 +4 -True -True +True +True +True True -True -1 -4 +1 +4 -True -True +True +True +True True -True -2 -4 +2 +4
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/characterproperties.ui | 272 -- 1 file changed, 50 insertions(+), 222 deletions(-) New commits: commit e60ded9773673c356a88fa02867cb3692ee74c87 Author: Heiko Tietze AuthorDate: Tue Apr 23 16:42:56 2024 +0200 Commit: Heiko Tietze CommitDate: Wed Apr 24 11:48:28 2024 +0200 Bump Glade version Change-Id: I53c7c6cab10663b50391a45c18e09dc3e81c87cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166546 Reviewed-by: Heiko Tietze Tested-by: Jenkins diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui b/sw/uiconfig/swriter/ui/characterproperties.ui index 1ba9823a1c74..414edb773b86 100644 --- a/sw/uiconfig/swriter/ui/characterproperties.ui +++ b/sw/uiconfig/swriter/ui/characterproperties.ui @@ -1,36 +1,33 @@ - + -False -False -6 +False +6 Character +False True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Reset True -True -True +True +True +Unsaved modifications to this tab are reverted. True -Unsaved modifications to this tab are reverted. Revert any changes made on the tab shown here to the settings that were present when this dialog was opened. @@ -45,12 +42,11 @@ -_Standard -False -True -True -True -True +_Standard +True +True +True +True False @@ -62,10 +58,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -78,8 +74,8 @@ _Cancel True -True -True +True +True True @@ -92,8 +88,8 @@ _Help True -True -True +True +True True @@ -107,47 +103,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -156,42 +128,18 @@ True -False +False Font -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -203,43 +151,19 @@ True -False +False Font Effects 1 -False +False True -False - - - - -
core.git: svx/uiconfig
svx/uiconfig/ui/themecoloreditdialog.ui |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 8f3a19ce3a2dea548f644a8925bfe0718424ac21 Author: Heiko Tietze AuthorDate: Tue Apr 23 15:45:20 2024 +0200 Commit: Heiko Tietze CommitDate: Tue Apr 23 17:22:12 2024 +0200 Resolves tdf#160050 - Overlapping controls in 'add themes' dialog Change-Id: I196ef4b445dcae5d6fc9891c8f9c0d0b2976d583 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166541 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/svx/uiconfig/ui/themecoloreditdialog.ui b/svx/uiconfig/ui/themecoloreditdialog.ui index 96276093a75a..ac0114ab4be1 100644 --- a/svx/uiconfig/ui/themecoloreditdialog.ui +++ b/svx/uiconfig/ui/themecoloreditdialog.ui @@ -3,13 +3,12 @@ -400 -300 False True True 6 Theme Color Edit +False True dialog
core.git: sw/source
sw/source/core/text/inftxt.cxx| 90 +++---
sw/source/uibase/uiview/view0.cxx |6 --
2 files changed, 47 insertions(+), 49 deletions(-)
New commits:
commit b79e0dd7fc8bc620420ed65edbc105eec3648b34
Author: Heiko Tietze
AuthorDate: Fri Apr 12 15:26:41 2024 +0200
Commit: Heiko Tietze
CommitDate: Sun Apr 21 12:40:23 2024 +0200
Resolves tdf#58434 - Show formatting marks independently from fields
Field Shading / .uno:Marks toggles now only fields, footnotes, tox etc.
and Tab, SoftHyphen, Blank, as well as ControlChar depends now on
Formatting Marks / .uno:ControlCodes. Field Shading also does not
toggle HardBlank and SoftHyphen, and what control character is shown
respect the options under Formatting Aids
Change-Id: I63c826e7fdc09ec95f17aee9735d4f5de9a1b897
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166033
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 18ad3d1144e0..b293f18f824a 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1407,54 +1407,56 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion
,
return;
bool bDraw = false;
-switch( nWhich )
-{
-case PortionType::Footnote:
-case PortionType::QuoVadis:
-case PortionType::Number:
-case PortionType::Field:
-case PortionType::Hidden:
-case PortionType::Tox:
-case PortionType::Ref:
-case PortionType::Meta:
-case PortionType::ContentControl:
-case PortionType::ControlChar:
-if ( !GetOpt().IsPagePreview()
- && !GetOpt().IsReadonly()
- && GetOpt().IsFieldShadings()
- && ( PortionType::Number != nWhich
- || m_pFrame->GetTextNodeForParaProps()->HasMarkedLabel()))
// #i27615#
-{
-bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
-bDraw &= GetOpt().IsHardBlank();
-}
-break;
-case PortionType::Bookmark:
-// no shading
-break;
-case PortionType::InputField:
-// input field shading also in read-only mode
-if ( !GetOpt().IsPagePreview()
- && GetOpt().IsFieldShadings() )
-{
-bDraw = true;
-}
-break;
-case PortionType::Tab:
-if ( GetOpt().IsTab() ) bDraw = true;
-break;
-case PortionType::SoftHyphen:
-if ( GetOpt().IsSoftHyph() )bDraw = true;
-break;
-case PortionType::Blank:
-if ( GetOpt().IsHardBlank())bDraw = true;
-break;
-default:
+if ( !GetOpt().IsPagePreview()
+ && !GetOpt().IsReadonly() )
+{
+switch( nWhich )
{
-OSL_ENSURE( false, "SwTextPaintInfo::DrawViewOpt: don't know how
to draw this" );
+case PortionType::Tab:
+if ( GetOpt().IsViewMetaChars() )
+bDraw = GetOpt().IsTab();
+break;
+case PortionType::SoftHyphen:
+if ( GetOpt().IsViewMetaChars() )
+bDraw = GetOpt().IsSoftHyph();
break;
+case PortionType::Blank:
+if ( GetOpt().IsViewMetaChars() )
+bDraw = GetOpt().IsHardBlank();
+break;
+case PortionType::ControlChar:
+if ( GetOpt().IsViewMetaChars() )
+bDraw = true;
+break;
+case PortionType::Bookmark:
+// no shading
+break;
+case PortionType::Footnote:
+case PortionType::QuoVadis:
+case PortionType::Number:
+case PortionType::Hidden:
+case PortionType::Tox:
+case PortionType::Ref:
+case PortionType::Meta:
+case PortionType::ContentControl:
+case PortionType::Field:
+case PortionType::InputField:
+// input field shading also in read-only mode
+if (GetOpt().IsFieldShadings()
+&& ( PortionType::Number != nWhich
+|| m_pFrame->GetTextNodeForParaProps()->HasMarkedLabel()))
// #i27615#
+{
+bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
+}
+break;
+default:
+{
+OSL_ENSURE( false, "SwTextPaintInfo::DrawViewOpt: don't know
how to draw this" );
+break;
+}
}
}
+
if ( bDraw )
DrawBackground( rPor, pColor );
}
diff --git a/sw/source/uibase/uiview/view0.cxx
b/sw/source/uibase/uiview/view0.cxx
index 70c9882e0d2e..488b32cc5fee 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -128,14 +128,10 @@ std::shared_ptr const &
SwView::GetMailMergeConfigItem()
static bool lcl_IsViewMarks( const SwViewOption& rVOpt )
{
-return rVOpt.IsHardBlank() &&
-rVOpt.IsSoftHyph() &&
-
core.git: Branch 'libreoffice-7-6' - sw/source
sw/source/ui/index/swuiidxmrk.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1bc57f8d02f7b9a2b4e5d16018ac06edce162688 Author: Heiko Tietze AuthorDate: Thu Apr 4 12:09:33 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Fri Apr 5 16:08:15 2024 +0200 Resolves tdf#154209 - Fixes resize issue in Index Entry dialog Change-Id: I83400b56d40f145c0e066c0c8b1783a1bae4cf28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165788 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit ebfa0d061fdbca6a25d3efcff72ab5ed184a51dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165724 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 140b4e48d0a0..3cca2d4011d2 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -440,6 +440,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, SyncSelectionHdl, weld::Button&, void) m_xApplyToAllCB->show(); m_xSearchCaseSensitiveCB->show(); m_xSearchCaseWordOnlyCB->show(); +m_xDialog->resize_to_request(); m_xApplyToAllCB->set_sensitive(!m_aOrgStr.isEmpty() && !(nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FLY_ANY ))); SearchTypeHdl(*m_xApplyToAllCB);
core.git: Branch 'libreoffice-24-2' - sw/source
sw/source/ui/index/swuiidxmrk.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit d3871c6ac05bb9553aed1cc951ba18efcb06082a Author: Heiko Tietze AuthorDate: Thu Apr 4 12:09:33 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Fri Apr 5 08:02:19 2024 +0200 Resolves tdf#154209 - Fixes resize issue in Index Entry dialog Change-Id: I83400b56d40f145c0e066c0c8b1783a1bae4cf28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165788 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit ebfa0d061fdbca6a25d3efcff72ab5ed184a51dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165722 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 8a6f74b86ee8..03d5733a87ad 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -441,6 +441,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, SyncSelectionHdl, weld::Button&, void) m_xApplyToAllCB->show(); m_xSearchCaseSensitiveCB->show(); m_xSearchCaseWordOnlyCB->show(); +m_xDialog->resize_to_request(); m_xApplyToAllCB->set_sensitive(!m_aOrgStr.isEmpty() && !(nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FLY_ANY ))); SearchTypeHdl(*m_xApplyToAllCB);
core.git: sw/source
sw/source/ui/index/swuiidxmrk.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ebfa0d061fdbca6a25d3efcff72ab5ed184a51dc Author: Heiko Tietze AuthorDate: Thu Apr 4 12:09:33 2024 +0200 Commit: Heiko Tietze CommitDate: Thu Apr 4 15:30:30 2024 +0200 Resolves tdf#154209 - Fixes resize issue in Index Entry dialog Change-Id: I83400b56d40f145c0e066c0c8b1783a1bae4cf28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165788 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 6b6e9f10536f..2ca5d673712b 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -441,6 +441,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, SyncSelectionHdl, weld::Button&, void) m_xApplyToAllCB->show(); m_xSearchCaseSensitiveCB->show(); m_xSearchCaseWordOnlyCB->show(); +m_xDialog->resize_to_request(); m_xApplyToAllCB->set_sensitive(!m_aOrgStr.isEmpty() && !(nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FLY_ANY ))); SearchTypeHdl(*m_xApplyToAllCB);
core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk desktop/source extras/source include/sfx2 include/unotools officecfg/registry Repository.mk sfx2/sdi sfx2/source vcl/Mo
Repository.mk |1 cui/Library_cui.mk |1 cui/UIConfig_cui.mk|1 cui/inc/whatsnew.hrc | 42 ++ cui/source/dialogs/whatsnew.cxx| 172 ++ cui/source/factory/dlgfact.cxx | 13 cui/source/factory/dlgfact.hxx |2 cui/source/inc/whatsnew.hxx| 75 cui/uiconfig/ui/whatsnewdialog.ui | 131 +++ desktop/source/app/app.cxx |2 extras/source/whatsnew/Community.png |binary extras/source/whatsnew/Configurability.png |binary extras/source/whatsnew/LibreOffice.gif |binary extras/source/whatsnew/ODF.png |binary extras/source/whatsnew/whatsnew1.png |binary include/sfx2/sfxdlg.hxx|2 include/sfx2/sfxsids.hrc |5 include/sfx2/strings.hrc |2 include/sfx2/viewfrm.hxx |1 include/unotools/VersionConfig.hxx | 24 - officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs |6 officecfg/registry/schema/org/openoffice/Setup.xcs |8 sfx2/sdi/appslots.sdi |4 sfx2/sdi/sfx.sdi | 16 sfx2/source/appl/appserv.cxx | 10 sfx2/source/dialog/infobar.cxx |2 sfx2/source/view/viewfrm.cxx | 43 +- vcl/Module_vcl.mk |1 vcl/Package_whatsnew.mk| 20 + 29 files changed, 533 insertions(+), 51 deletions(-) New commits: commit dd889b290304b73f96a9a8e6e0f144d3aa2ba7e1 Author: Heiko Tietze AuthorDate: Thu Feb 22 12:56:01 2024 +0100 Commit: Heiko Tietze CommitDate: Wed Mar 27 09:41:44 2024 +0100 Resolves tdf#159573 and tdf#137931 - WhatsNew or Welcome dialog To test the new dialog, change org.openoffice.Setup > Product > ooSetupLastVersion to some lesser value for the WhatsNew dialog or clear the entry for the Welcome version. Change-Id: Iec6de50edba0e5430e82f1db85e61d1e4501771d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163739 Reviewed-by: Michael Weghorn Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/Repository.mk b/Repository.mk index 5b60bd66cfcc..9317a29975df 100644 --- a/Repository.mk +++ b/Repository.mk @@ -925,6 +925,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE) $(eval $(call gb_Helper_register_packages_for_install,ooo,\ tipoftheday_images \ + whatsnew_images \ )) endif diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index e01e33ecb4ec..3ee744e32d0f 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -114,6 +114,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/customize/SvxNotebookbarConfigPage \ cui/source/customize/CustomNotebookbarGenerator \ cui/source/dialogs/about \ +cui/source/dialogs/whatsnew \ $(call gb_Helper_optional,EXTENSIONS, \ cui/source/dialogs/AdditionsDialog) \ cui/source/dialogs/colorpicker \ diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 10acd83c8c39..79ff7696a93a 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -18,6 +18,7 @@ endif ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE) $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/tipofthedaydialog \ + cui/uiconfig/ui/whatsnewdialog \ )) endif diff --git a/cui/inc/whatsnew.hrc b/cui/inc/whatsnew.hrc new file mode 100644 index ..e155a597bcf2 --- /dev/null +++ b/cui/inc/whatsnew.hrc @@ -0,0 +1,42 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#define NC_(Context, String) TranslateId(Context, u8##String) + +#include +#include +#include +#include + +/* + * std:tuple consists of + * image: + * place new images at extra/source/whatsnew + * do not forget to add the files to vcl/Package_whatsnew.mk + * images are cut-off at 600x400px +*/ + +const std::tuple WELCOME_STRINGARRAY[] =
core.git: include/vcl sfx2/source vcl/source vcl/unx
include/vcl/settings.hxx |9 +
sfx2/source/dialog/infobar.cxx| 12 +++
vcl/source/app/salvtables.cxx |8 +++--
vcl/source/app/settings.cxx | 53 +-
vcl/unx/gtk3/gtkinst.cxx |4 +-
vcl/unx/gtk3/salnativewidgets-gtk.cxx |5 ---
6 files changed, 75 insertions(+), 16 deletions(-)
New commits:
commit d7fd378b533c42f51d1d363f5da30b1fa1281f67
Author: Heiko Tietze
AuthorDate: Fri Mar 22 12:58:07 2024 +0100
Commit: Heiko Tietze
CommitDate: Sat Mar 23 08:02:18 2024 +0100
Harmonization of warning and error colors
* hard-coded colors from infobar moved to settings
* weld::LabelType::Warning and ::Error uses these colors
* gtk3 native configuration removed
Change-Id: Ia80584e9267b8385f7f6b25322f5a85a2570af68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165161
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 0787fe98b6cc..e21091385bc7 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -353,6 +353,15 @@ public:
voidSetWarningColor( const Color& rColor );
const Color&GetWarningColor() const;
+voidSetWarningTextColor( const Color& rColor );
+const Color&GetWarningTextColor() const;
+
+voidSetErrorColor( const Color& rColor );
+const Color&GetErrorColor() const;
+
+voidSetErrorTextColor( const Color& rColor );
+const Color&GetErrorTextColor() const;
+
voidSetHelpColor( const Color& rColor );
const Color&GetHelpColor() const;
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 38a510a2589c..26dfc0af26c0 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -44,6 +44,8 @@ void GetInfoBarColors(InfobarType ibType, BColor&
rBackgroundColor, BColor& rFor
{
rMessageColor = basegfx::BColor(0.0, 0.0, 0.0);
+const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
+
switch (ibType)
{
case InfobarType::INFO: // blue; #004785/0,71,133; #BDE5F8/189,229,248
@@ -55,17 +57,15 @@ void GetInfoBarColors(InfobarType ibType, BColor&
rBackgroundColor, BColor& rFor
rForegroundColor = basegfx::BColor(0.196, 0.333, 0.047);
break;
case InfobarType::WARNING: // orange; #704300/112,67,0;
#FEEFB3/254,239,179
-rBackgroundColor = basegfx::BColor(0.996, 0.937, 0.702);
-rForegroundColor = basegfx::BColor(0.439, 0.263, 0.0);
+rBackgroundColor = rSettings.GetWarningColor().getBColor();
+rForegroundColor = rSettings.GetWarningTextColor().getBColor();
break;
case InfobarType::DANGER: // red; #7A0006/122,0,6; #FFBABA/255,186,186
-rBackgroundColor = basegfx::BColor(1.0, 0.729, 0.729);
-rForegroundColor = basegfx::BColor(0.478, 0.0, 0.024);
+rBackgroundColor = rSettings.GetErrorColor().getBColor();
+rForegroundColor = rSettings.GetErrorTextColor().getBColor();
break;
}
-//remove this?
-const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
if (rSettings.GetHighContrastMode())
{
rBackgroundColor = rSettings.GetLightColor().getBColor();
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4469978be626..3f007783498d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5949,14 +5949,16 @@ void SalInstanceLabel::set_label_type(weld::LabelType
eType)
m_xLabel->SetControlBackground();
break;
case weld::LabelType::Warning:
-m_xLabel->SetControlForeground();
+m_xLabel->SetControlForeground(
+
m_xLabel->GetSettings().GetStyleSettings().GetWarningTextColor());
m_xLabel->SetControlBackground(
m_xLabel->GetSettings().GetStyleSettings().GetWarningColor());
break;
case weld::LabelType::Error:
-m_xLabel->SetControlForeground();
+m_xLabel->SetControlForeground(
+
m_xLabel->GetSettings().GetStyleSettings().GetErrorTextColor());
m_xLabel->SetControlBackground(
-
m_xLabel->GetSettings().GetStyleSettings().GetHighlightColor());
+m_xLabel->GetSettings().GetStyleSettings().GetErrorColor());
break;
case weld::LabelType::Title:
m_xLabel->SetControlForeground(
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8d04d9065ea6..6cf975f50d52 100644
--- a/vcl/source/app/settings.cxx
+++
core.git: sc/source
sc/source/ui/app/rfindlst.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 9c8b240e7cad6ef74e16ad83d45957737389aa90
Author: Heiko Tietze
AuthorDate: Thu Mar 21 11:50:40 2024 +0100
Commit: Heiko Tietze
CommitDate: Fri Mar 22 13:06:37 2024 +0100
Resolves tdf#160282 - Ranges references text colors for dark backgrounds
Change-Id: I3d3bb22302ad5016c962d606e80c2e9942301fbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165095
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index ba17bf006ea1..be521f65dea8 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -20,18 +20,25 @@
#include
#include
#include
+#include
+#include
#define SC_RANGECOLORS 8
const Color aColNames[SC_RANGECOLORS] =
{ COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN,
COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN };
+const Color aDarkColNames[SC_RANGECOLORS] =
+{ COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN,
+Color(0xb4c7dc), Color(0xffa6a6), Color(0xffb66c), Color(0xafd095) };
//light blue/red/orange/green 3
+static bool bIsDark;
ScRangeFindList::ScRangeFindList(OUString aName) :
aDocName(std::move( aName )),
bHidden( false ),
nIndexColor( 0 )
{
+bIsDark =
SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor.IsDark();
}
Color ScRangeFindList::Insert( const ScRangeFindData )
@@ -48,7 +55,8 @@ Color ScRangeFindList::Insert( const ScRangeFindData )
Color ScRangeFindList::GetColorName( const size_t nIndex )
{
-return aColNames[nIndex % SC_RANGECOLORS];
+return bIsDark ? aDarkColNames[nIndex % SC_RANGECOLORS]
+ : aColNames[nIndex % SC_RANGECOLORS];
}
Color ScRangeFindList::FindColor( const ScRange& rRef, const size_t nIndex )
core.git: cui/uiconfig
cui/uiconfig/ui/pickbulletpage.ui| 59 +-- cui/uiconfig/ui/pickgraphicpage.ui | 135 +++ cui/uiconfig/ui/picknumberingpage.ui | 59 +-- cui/uiconfig/ui/pickoutlinepage.ui | 59 +-- 4 files changed, 118 insertions(+), 194 deletions(-) New commits: commit aacce8abe239ad679f5e9f9ce9bf2d27fb046d5d Author: Heiko Tietze AuthorDate: Wed Mar 13 09:40:51 2024 +0100 Commit: Heiko Tietze CommitDate: Fri Mar 15 16:12:42 2024 +0100 Resolves tdf#160167 - Remove pointless frames in bullet & numbering dialog Solves the issue that the "Selection" label is inappropriate Change-Id: I1bdaa6922796fcdceec0aac6902011aa21cd9aa3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164758 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/pickbulletpage.ui b/cui/uiconfig/ui/pickbulletpage.ui index b9749dda540e..589874506853 100644 --- a/cui/uiconfig/ui/pickbulletpage.ui +++ b/cui/uiconfig/ui/pickbulletpage.ui @@ -1,58 +1,39 @@ - + - + True -False +True +6 +6 +6 +6 True True -6 -0 -none +never +never +in - + True -True -True -True -never -never -in -12 -6 +False - + True -False - - -True -True -GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK -True -True - - -Click the bullet style that you want to use. - - +True +GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK +True +True + + +Click the bullet style that you want to use. - - -True -False -Selection - - - - - Displays the different bullet styles that you can apply. diff --git a/cui/uiconfig/ui/pickgraphicpage.ui b/cui/uiconfig/ui/pickgraphicpage.ui index fd7b9922e950..ea7342844a14 100644 --- a/cui/uiconfig/ui/pickgraphicpage.ui +++ b/cui/uiconfig/ui/pickgraphicpage.ui @@ -1,104 +1,85 @@ - + - + + True -False +False +6 +6 +6 +6 True True -6 -0 -none +6 - - + True -False +True True True -6 -12 -6 +never +in - + True -True -True -True -never -in +False - + True -False - - -True -True -GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK -True -True - - -Click the graphics that you want to use as bullets. - - +True +GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK +True +True + + +Click the graphics that you want to use as bullets. - -1 -0 - - - - -False -True -The Gallery theme 'Bullets' is empty (no images). -True - - -0 -0 - - - - -Add and Resize -True -True -False -end - - -1 -2 - - - - - - - - - - + +1 +0 + + + + +False +True +The Gallery theme 'Bullets' is empty (no images). +True + + +0 +0 + - - + + +Add and Resize True -False -Selection - - - +True +False +end + +1 +2 +
core.git: sfx2/source
sfx2/source/dialog/infobar.cxx |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 06d8c1e9d8ba1d04914d1c48c94732cdb5c68846 Author: Heiko Tietze AuthorDate: Wed Mar 6 10:35:53 2024 +0100 Commit: Heiko Tietze CommitDate: Wed Mar 6 11:58:07 2024 +0100 Resolves tdf#159486 - Larger hitbox for close button on infobar Change-Id: I83582c0c1ec7dd5e8f82bdf327e68ce88122ad03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164450 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index ca848813f09e..38a510a2589c 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -103,9 +103,12 @@ void SfxInfoBarWindow::SetCloseButtonImage() aSize = Size(aSize.Width() * 1.5, aSize.Height() * 1.5); ScopedVclPtr xDevice(m_xCloseBtn->create_virtual_device()); -xDevice->SetOutputSizePixel(aSize); +xDevice->SetOutputSizePixel(Size(24, 24)); +xDevice->SetBackground(Color(m_aBackgroundColor)); +xDevice->Erase(); -Point aBtnPos(0, 0); +const int nPos = (24 - aSize.getWidth()) / 2; +Point aBtnPos(nPos, nPos); const ViewInformation2D aNewViewInfos; const std::unique_ptr pProcessor(
core.git: Branch 'libreoffice-7-6' - sfx2/source
sfx2/source/view/viewfrm.cxx | 173 ++-
1 file changed, 92 insertions(+), 81 deletions(-)
New commits:
commit 8f3fb27880d6374f531cb012fe3b53179ecd4313
Author: Heiko Tietze
AuthorDate: Wed Feb 28 10:30:48 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Feb 28 22:49:55 2024 +0100
Resolves tdf#131550 - Suppress Donate/Involve infobar if another is visible
Change-Id: I013f0a1f0aa020f10d6beb21940959508eba4547
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164082
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit 607740654f2264e13469e4da1d020448217d7222)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164115
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 4bfb58a724ec..e6f81d53e873 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1450,88 +1450,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
-#if !ENABLE_WASM_STRIP_PINGUSER
-bool bIsHeadlessOrUITest =
SfxApplication::IsHeadlessOrUITest(); //uitest.uicheck fails when the dialog is
open
-
-//what's new infobar
-if (utl::isProductVersionUpgraded(true) &&
!bIsHeadlessOrUITest)
-{
-VclPtr pInfoBar =
AppendInfoBar("whatsnew", "", SfxResId(STR_WHATSNEW_TEXT), InfobarType::INFO);
-if (pInfoBar)
-{
-weld::Button& rWhatsNewButton = pInfoBar->addButton();
-
rWhatsNewButton.set_label(SfxResId(STR_WHATSNEW_BUTTON));
-rWhatsNewButton.connect_clicked(LINK(this,
SfxViewFrame, WhatsNewHandler));
-}
-}
-
-// show tip-of-the-day dialog if it due, but not if there is
the impress modal template dialog
-// open where SdModule::ExecuteNewDocument will launch it
instead when that dialog is dismissed
-if (SfxApplication::IsTipOfTheDayDue() && !bIsHeadlessOrUITest
&& !IsInModalMode())
-{
-// tdf#127946 pass in argument for dialog parent
-SfxUnoFrameItem aDocFrame(SID_FILLFRAME,
GetFrame().GetFrameInterface());
-GetDispatcher()->ExecuteList(SID_TIPOFTHEDAY,
SfxCallMode::SLOT, {}, { });
-}
-
-// inform about the community involvement
-const auto t0 =
std::chrono::system_clock::now().time_since_epoch();
-const sal_Int64 nLastGetInvolvedShown =
officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
-const sal_Int64 nNow =
std::chrono::duration_cast(t0).count();
-const sal_Int64 nPeriodSec(60 * 60 * 24 * 180); // 180 days in
seconds
-bool bUpdateLastTimeGetInvolvedShown = false;
-
-if (nLastGetInvolvedShown == 0)
-bUpdateLastTimeGetInvolvedShown = true;
-else if (nPeriodSec < nNow && nLastGetInvolvedShown < (nNow +
nPeriodSec/2) - nPeriodSec) // 90d alternating with donation
-{
-bUpdateLastTimeGetInvolvedShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("getinvolved", "", SfxResId(STR_GET_INVOLVED_TEXT),
InfobarType::INFO);
-
-if (pInfoBar)
-{
-weld::Button& rGetInvolvedButton =
pInfoBar->addButton();
-
rGetInvolvedButton.set_label(SfxResId(STR_GET_INVOLVED_BUTTON));
-rGetInvolvedButton.connect_clicked(LINK(this,
SfxViewFrame, GetInvolvedHandler));
-}
-}
-
-if (bUpdateLastTimeGetInvolvedShown
-&&
!officecfg::Setup::Product::LastTimeGetInvolvedShown::isReadOnly())
-{
-std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Setup::Product::LastTimeGetInvolvedShown::set(nNow, batch);
-batch->commit();
-}
-
-// inform about donations
-const sal_Int64 nLastDonateShown =
officecfg::Setup::Product::LastTimeDonateShown::get();
-bool bUpdateLastTimeDonateShown = false;
-
-if (nLastDonateShown == 0)
-bUpdateLastTimeDonateShown = true;
-else if (nPeriodSec < nNow && nLastDonateShown < nNow -
nPeriodSec) // 90d alternating with getinvolved
-{
-bUpdateLastTimeDonateShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("donate", "", SfxResId(STR_DONATE_TEXT), InfobarType::INFO);
-if
core.git: Branch 'libreoffice-24-2' - sfx2/source
sfx2/source/view/viewfrm.cxx | 173 ++-
1 file changed, 92 insertions(+), 81 deletions(-)
New commits:
commit 9b0ec6639e7218b93551fc680b0929a73ac1fd90
Author: Heiko Tietze
AuthorDate: Wed Feb 28 10:30:48 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Feb 28 22:27:07 2024 +0100
Resolves tdf#131550 - Suppress Donate/Involve infobar if another is visible
Change-Id: I013f0a1f0aa020f10d6beb21940959508eba4547
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164082
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit 607740654f2264e13469e4da1d020448217d7222)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164114
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index c6b25637ccf3..b14ff206fa96 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1496,88 +1496,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
-#if !ENABLE_WASM_STRIP_PINGUSER
-bool bIsHeadlessOrUITest =
SfxApplication::IsHeadlessOrUITest(); //uitest.uicheck fails when the dialog is
open
-
-//what's new infobar
-if (utl::isProductVersionUpgraded(true) &&
!bIsHeadlessOrUITest)
-{
-VclPtr pInfoBar =
AppendInfoBar("whatsnew", "", SfxResId(STR_WHATSNEW_TEXT), InfobarType::INFO);
-if (pInfoBar)
-{
-weld::Button& rWhatsNewButton = pInfoBar->addButton();
-
rWhatsNewButton.set_label(SfxResId(STR_WHATSNEW_BUTTON));
-rWhatsNewButton.connect_clicked(LINK(this,
SfxViewFrame, WhatsNewHandler));
-}
-}
-
-// show tip-of-the-day dialog if it due, but not if there is
the impress modal template dialog
-// open where SdModule::ExecuteNewDocument will launch it
instead when that dialog is dismissed
-if (SfxApplication::IsTipOfTheDayDue() && !bIsHeadlessOrUITest
&& !IsInModalMode())
-{
-// tdf#127946 pass in argument for dialog parent
-SfxUnoFrameItem aDocFrame(SID_FILLFRAME,
GetFrame().GetFrameInterface());
-GetDispatcher()->ExecuteList(SID_TIPOFTHEDAY,
SfxCallMode::SLOT, {}, { });
-}
-
-// inform about the community involvement
-const auto t0 =
std::chrono::system_clock::now().time_since_epoch();
-const sal_Int64 nLastGetInvolvedShown =
officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
-const sal_Int64 nNow =
std::chrono::duration_cast(t0).count();
-const sal_Int64 nPeriodSec(60 * 60 * 24 * 180); // 180 days in
seconds
-bool bUpdateLastTimeGetInvolvedShown = false;
-
-if (nLastGetInvolvedShown == 0)
-bUpdateLastTimeGetInvolvedShown = true;
-else if (nPeriodSec < nNow && nLastGetInvolvedShown < (nNow +
nPeriodSec/2) - nPeriodSec) // 90d alternating with donation
-{
-bUpdateLastTimeGetInvolvedShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("getinvolved", "", SfxResId(STR_GET_INVOLVED_TEXT),
InfobarType::INFO);
-
-if (pInfoBar)
-{
-weld::Button& rGetInvolvedButton =
pInfoBar->addButton();
-
rGetInvolvedButton.set_label(SfxResId(STR_GET_INVOLVED_BUTTON));
-rGetInvolvedButton.connect_clicked(LINK(this,
SfxViewFrame, GetInvolvedHandler));
-}
-}
-
-if (bUpdateLastTimeGetInvolvedShown
-&&
!officecfg::Setup::Product::LastTimeGetInvolvedShown::isReadOnly())
-{
-std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Setup::Product::LastTimeGetInvolvedShown::set(nNow, batch);
-batch->commit();
-}
-
-// inform about donations
-const sal_Int64 nLastDonateShown =
officecfg::Setup::Product::LastTimeDonateShown::get();
-bool bUpdateLastTimeDonateShown = false;
-
-if (nLastDonateShown == 0)
-bUpdateLastTimeDonateShown = true;
-else if (nPeriodSec < nNow && nLastDonateShown < nNow -
nPeriodSec) // 90d alternating with getinvolved
-{
-bUpdateLastTimeDonateShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("donate", "", SfxResId(STR_DONATE_TEXT), InfobarType::INFO);
-if
core.git: 2 commits - officecfg/registry static/StaticLibrary_unoembind.mk udkapi/org udkapi/UnoApi_udkapi.mk unotest/InternalUnoApi_embindtest.mk unotest/Library_embindtest.mk unotest/Module_unotest.
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 +++ static/StaticLibrary_unoembind.mk |6 --- udkapi/UnoApi_udkapi.mk| 10 + udkapi/org/libreoffice/embindtest/Struct.idl | 20 ++ udkapi/org/libreoffice/embindtest/Test.idl | 16 udkapi/org/libreoffice/embindtest/XTest.idl|8 unotest/InternalUnoApi_embindtest.mk | 16 unotest/Library_embindtest.mk |4 -- unotest/Module_unotest.mk |1 9 files changed, 52 insertions(+), 35 deletions(-) New commits: commit 6158928209bd0f6bd532df9092f3a81ff615cdcc Author: Heiko Tietze AuthorDate: Tue Feb 27 08:32:06 2024 +0100 Commit: Heiko Tietze CommitDate: Wed Feb 28 07:52:23 2024 +0100 Resolves tdf#159863 - Default shortcut to access foot-/endnote area Change-Id: Ie95e94602a0dfd0c899f70d30d2c78e7063a4818 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164001 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 43b6523c7616..56eb20da6bd3 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -6196,6 +6196,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing .uno:ParaRightToLeft + + +L10N SHORTCUTS - NO TRANSLATE +.uno:JumpToFootnoteOrAnchor + + L10N SHORTCUTS - NO TRANSLATE commit 80e2c4e5b9ef1d299c6caa271c9f177a4d011937 Author: Stephan Bergmann AuthorDate: Tue Feb 27 16:29:18 2024 +0100 Commit: Stephan Bergmann CommitDate: Wed Feb 28 07:52:11 2024 +0100 Fold InternalUnoApi_embindtest into UnoApi_udkapi 80d3f33876a2ad4ce32d3c6183131984e8c6b5da "Library_embindtest should use comprehensive InternalUnoApi_embindtest" was an attempt at making type information about that library available at runtime. Which worked for cases where code directly called one of the types' cppu_detail_getUnoType function. But it would still fail for cases where code indirectly wants to obtain one of the types' information by type name---which is what upcoming code will do that changes the Embind'ing of UNO sequences. So InternalUnoApi_embindtest would need to become a UnoApi_embindtest whose instdir/program/types/embindtest.rdb would be available at runtime. But I'm too dumb to convince gbuild to create that new UnoApi_embindtest. So instead just tack the embindtest UNOIDL entities onto the existing UnoApi_udkapi for the EMSCRIPTEN-ENABLE_DBGUTIL case. (Which requires that the single embindtest.idl is split into individual per-entity files, sigh.) Change-Id: Ie189b17213ac5b2de7a61ac5f97a143fa097337f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164057 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/static/StaticLibrary_unoembind.mk b/static/StaticLibrary_unoembind.mk index 5d4438ef2f85..e2a2bfacd892 100644 --- a/static/StaticLibrary_unoembind.mk +++ b/static/StaticLibrary_unoembind.mk @@ -22,12 +22,6 @@ $(eval $(call gb_StaticLibrary_use_api,unoembind,\ udkapi \ )) -ifneq ($(ENABLE_DBGUTIL),) -$(eval $(call gb_StaticLibrary_use_internal_api,unoembind, \ -embindtest \ -)) -endif - $(call gb_StaticLibrary_get_target,unoembind): $(call gb_CustomTarget_get_target,static/unoembind) # vim: set noet sw=4 ts=4: diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index f18b9f758ddc..5f22026027ee 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -520,6 +520,16 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,com/sun/star/util,\ XVeto \ )) +ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE) +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,org/libreoffice/embindtest, \ +Struct \ +XTest \ +)) +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,org/libreoffice/embindtest, \ +Test \ +)) +endif + $(eval $(call gb_UnoApi_set_reference_rdbfile,udkapi,$(SRCDIR)/udkapi/type_reference/udkapi.idl)) # vim: set noet sw=4 ts=4: diff --git a/udkapi/org/libreoffice/embindtest/Struct.idl b/udkapi/org/libreoffice/embindtest/Struct.idl new file mode 100644 index ..6b9d36e40a1b --- /dev/null +++ b/udkapi/org/libreoffice/embindtest/Struct.idl @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v.
core.git: sw/source
sw/source/uibase/docvw/ShadowOverlayObject.cxx | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
New commits:
commit 215a7afd6042c35a45509cea3eae69254d676429
Author: Heiko Tietze
AuthorDate: Wed Feb 21 16:10:40 2024 +0100
Commit: Heiko Tietze
CommitDate: Wed Feb 21 20:03:19 2024 +0100
Resolves tdf#159535 - Less obtrusive shadow for comments
Change-Id: Ic4b55ebb52aaf03738184dcc0d3b8d57c9ee57a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163699
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
index fa905b97567b..ef2ed5dd8b6d 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
@@ -73,6 +73,8 @@ public:
drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecomposition(
const drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/)
const
{
+const Color aBgCol =
svtools::ColorConfig().GetColorValue(svtools::WRITERSECTIONBOUNDARIES).nColor;
+const Color aBgColInv = aBgCol.IsDark() ? COL_WHITE : COL_BLACK;
// get logic sizes in object coordinate system
basegfx::B2DRange aRange(maBasePosition);
drawinglayer::primitive2d::Primitive2DReference xRet;
@@ -80,7 +82,7 @@ drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecompo
{
case SS_NORMAL:
{
-aRange.expand(basegfx::B2DTuple(getSecondPosition().getX(),
getSecondPosition().getY() + (2.0 * getDiscreteUnit(;
+aRange.expand(basegfx::B2DTuple(getSecondPosition().getX(),
getSecondPosition().getY() + (1.0 * getDiscreteUnit(;
::drawinglayer::attribute::FillGradientAttribute
aFillGradientAttribute(
css::awt::GradientStyle_LINEAR,
@@ -88,10 +90,7 @@ drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecompo
0.5,
0.5,
M_PI,
-basegfx::BColorStops(
-basegfx::BColor(230.0/255.0,230.0/255.0,230.0/255.0),
-basegfx::BColor(180.0/255.0,180.0/255.0,180.0/255.0)));
-
+basegfx::BColorStops(aBgCol.getBColor(),
aBgColInv.getBColor()));
xRet =
new drawinglayer::primitive2d::FillGradientPrimitive2D(
aRange,
@@ -100,17 +99,14 @@ drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecompo
}
case SS_VIEW:
{
-aRange.expand(basegfx::B2DTuple(getSecondPosition().getX(),
getSecondPosition().getY() + (4.0 * getDiscreteUnit(;
+aRange.expand(basegfx::B2DTuple(getSecondPosition().getX(),
getSecondPosition().getY() + (2.0 * getDiscreteUnit(;
drawinglayer::attribute::FillGradientAttribute
aFillGradientAttribute(
css::awt::GradientStyle_LINEAR,
0.0,
0.5,
0.5,
M_PI,
-basegfx::BColorStops(
-basegfx::BColor(230.0/255.0,230.0/255.0,230.0/255.0),
-basegfx::BColor(180.0/255.0,180.0/255.0,180.0/255.0)));
-
+basegfx::BColorStops(aBgCol.getBColor(),
aBgColInv.getBColor()));
xRet =
new drawinglayer::primitive2d::FillGradientPrimitive2D(
aRange,
@@ -126,10 +122,7 @@ drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecompo
0.5,
0.5,
M_PI,
-basegfx::BColorStops(
-basegfx::BColor(230.0/255.0,230.0/255.0,230.0/255.0),
-basegfx::BColor(83.0/255.0,83.0/255.0,83.0/255.0)));
-
+basegfx::BColorStops(aBgCol.getBColor(),
aBgColInv.getBColor()));
xRet =
new drawinglayer::primitive2d::FillGradientPrimitive2D(
aRange,
core.git: cui/inc cui/source cui/uiconfig icon-themes/breeze_dark icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg icon-themes/sifr_dark icon-themes/su
cui/inc/bitmaps.hlst|2 cui/source/inc/numpages.hxx |6 cui/source/inc/swpossizetabpage.hxx |7 cui/source/inc/transfrm.hxx |7 cui/source/tabpages/numpages.cxx| 23 cui/source/tabpages/swpossizetabpage.cxx| 26 cui/source/tabpages/transfrm.cxx| 26 cui/uiconfig/ui/bulletandposition.ui| 100 ++- cui/uiconfig/ui/numberingoptionspage.ui | 606 +++- cui/uiconfig/ui/possizetabpage.ui | 110 ++- cui/uiconfig/ui/swpossizepage.ui| 368 ++-- icon-themes/breeze_dark/res/locked.png |binary icon-themes/breeze_dark/res/unlocked.png|binary icon-themes/colibre/res/locked.png |binary icon-themes/colibre/res/unlocked.png|binary icon-themes/colibre_dark/res/locked.png |binary icon-themes/colibre_dark/res/unlocked.png |binary icon-themes/colibre_dark_svg/res/unlocked.svg | 43 + icon-themes/colibre_svg/res/unlocked.svg|4 icon-themes/sifr_dark/res/locked.png|binary icon-themes/sifr_dark/res/unlocked.png |binary icon-themes/sukapura_dark/res/locked.png|binary icon-themes/sukapura_dark/res/unlocked.png |binary include/svx/dlgutil.hxx | 19 sd/inc/bitmaps.hlst |3 sd/source/ui/dlg/BulletAndPositionDlg.cxx | 25 sd/source/ui/inc/BulletAndPositionDlg.hxx |6 svx/inc/bitmaps.hlst|3 svx/source/dialog/dlgutil.cxx | 24 svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 29 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |7 svx/uiconfig/ui/sidebarpossize.ui | 128 +++- sw/inc/bitmaps.hlst |3 sw/source/ui/frmdlg/frmpage.cxx | 20 sw/source/uibase/inc/frmpage.hxx|9 sw/uiconfig/swriter/ui/frmtypepage.ui | 127 +++- 36 files changed, 1201 insertions(+), 530 deletions(-) New commits: commit fe4e750d32cb88a9ce7a7539af6c6883d4194220 Author: Heiko Tietze AuthorDate: Fri Dec 8 12:18:47 2023 +0100 Commit: Heiko Tietze CommitDate: Mon Feb 12 12:56:05 2024 +0100 Resolves tdf#158531 - Connector lines for Keep Ratio setting Icons taken from https://thenounproject.com/icon/lock-89649/ and https://thenounproject.com/icon/unlock-89647/ (licensed PD) Change-Id: I7efd25e83726ced7dee4f876cf4bb4c8f54408df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160460 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst index 6e0a1877588e..aab916827507 100644 --- a/cui/inc/bitmaps.hlst +++ b/cui/inc/bitmaps.hlst @@ -53,6 +53,8 @@ inline constexpr OUString RID_SVXBMP_TOPLOCK = u"svx/res/lo02.png"_ustr; inline constexpr OUString RID_SVXBMP_CELLLOCK = u"svx/res/lo03.png"_ustr; inline constexpr OUString RID_SVXBMP_LOCK = u"res/lock.png"_ustr; +inline constexpr OUString RID_SVXBMP_LOCKED = u"res/locked.png"_ustr; +inline constexpr OUString RID_SVXBMP_UNLOCKED = u"res/unlocked.png"_ustr; inline constexpr OUString RID_SVXBMP_THEME_NORMAL_BIG = u"svx/res/galnorl.png"_ustr; inline constexpr OUString RID_SVXBMP_THEME_READONLY_BIG = u"svx/res/galrdol.png"_ustr; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index ec7b72ac71fb..7c34d49fcc62 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -28,6 +28,7 @@ #include #include #include +#include #define MN_GALLERY_ENTRY 100 @@ -218,6 +219,8 @@ class SvxNumOptionsTabPage : public SfxTabPage TypedWhichId nNumItemId; MapUnit eCoreUnit; +SvxRatioConnector m_aRatioTop; +SvxRatioConnector m_aRatioBottom; SvxNumberingPreview m_aPreviewWIN; std::unique_ptr m_xGrid; std::unique_ptr m_xLevelLB; @@ -247,6 +250,9 @@ class SvxNumOptionsTabPage : public SfxTabPage std::unique_ptr m_xHeightFT; std::unique_ptr m_xHeightMF; std::unique_ptr m_xRatioCB; +std::unique_ptr m_xCbxScaleImg; +std::unique_ptr m_xImgRatioTop; +std::unique_ptr m_xImgRatioBottom; std::unique_ptr m_xOrientFT; std::unique_ptr m_xOrientLB; std::unique_ptr m_xAllLevelsFrame; diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index eb73196986bf..2e5a15fbebbb 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -21,6 +21,7 @@ #include #include #include +#include // SvxSwPosSizeTabPage - position and size page for Writer drawing objects struct FrmMap; @@ -55,10 +56,15 @@ class SvxSwPosSizeTabPage : public
core.git: sw/source
sw/source/core/doc/DocumentStylePoolManager.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 1dc0c8c8304ebbce0a2e05e89a3b5458d88f3630
Author: Heiko Tietze
AuthorDate: Tue Feb 6 16:09:32 2024 +0100
Commit: Heiko Tietze
CommitDate: Wed Feb 7 13:45:07 2024 +0100
Resolves tdf#159531 - Indentation and spacing for comments
Change-Id: I3ce9dd5d399ce9ff1427de0c97a1227dab996d9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163059
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 68d4e5c11855..96392c94b1c9 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1014,6 +1014,16 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
case RES_POOLCOLL_COMMENT: // Comment
{
SetAllScriptItem(aSet, SvxFontHeightItem(PT_10, 100,
RES_CHRATR_FONTSIZE));
+
+auto const aIndent(o3tl::convert(0.1, o3tl::Length::cm,
o3tl::Length::twip));
+SvxTextLeftMarginItem const leftMargin(aIndent,
RES_MARGIN_TEXTLEFT);
+SvxRightMarginItem const rightMargin(aIndent,
RES_MARGIN_RIGHT);
+aSet.Put(leftMargin);
+aSet.Put(rightMargin);
+
+auto const aSpacing(o3tl::convert(0.1, o3tl::Length::cm,
o3tl::Length::twip));
+SvxULSpaceItem topSpacing( aSpacing, 0, RES_UL_SPACE );
+aSet.Put(topSpacing);
}
break;
core.git: Branch 'libreoffice-24-2' - sw/source
sw/source/core/text/inftxt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2920c56159320965e81de99b11fb1ca5dd42c8d5
Author: Heiko Tietze
AuthorDate: Wed Jan 31 11:29:14 2024 +0100
Commit: Xisco Fauli
CommitDate: Wed Jan 31 21:00:44 2024 +0100
Resolves tdf#159328 - Fix field shading regression
Introduced by 4d7a98b582dc70bbffc78e6622969e218f108433
Change-Id: Ibcc057e47c62d53dfa9e6410230c4b231df8551c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162799
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit 788ebd183b095ffb7369c4d518acd14bad72ae82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162820
Reviewed-by: Xisco Fauli
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 3d9121ef1ec2..8eced32e8990 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1426,8 +1426,8 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion
,
|| m_pFrame->GetTextNodeForParaProps()->HasMarkedLabel()))
// #i27615#
{
bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
+bDraw &= GetOpt().IsHardBlank();
}
-bDraw &= GetOpt().IsHardBlank();
break;
case PortionType::Bookmark:
// no shading
core.git: sw/source
sw/source/core/text/inftxt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 788ebd183b095ffb7369c4d518acd14bad72ae82
Author: Heiko Tietze
AuthorDate: Wed Jan 31 11:29:14 2024 +0100
Commit: Heiko Tietze
CommitDate: Wed Jan 31 15:25:13 2024 +0100
Resolves tdf#159328 - Fix field shading regression
Introduced by 4d7a98b582dc70bbffc78e6622969e218f108433
Change-Id: Ibcc057e47c62d53dfa9e6410230c4b231df8551c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162799
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 3d9121ef1ec2..8eced32e8990 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1426,8 +1426,8 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion
,
|| m_pFrame->GetTextNodeForParaProps()->HasMarkedLabel()))
// #i27615#
{
bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
+bDraw &= GetOpt().IsHardBlank();
}
-bDraw &= GetOpt().IsHardBlank();
break;
case PortionType::Bookmark:
// no shading
core.git: svtools/source
svtools/source/config/colorcfg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 381ab9a1a38e4ea9238599e62acd430782a80547
Author: Heiko Tietze
AuthorDate: Fri Jan 26 09:05:12 2024 +0100
Commit: Heiko Tietze
CommitDate: Fri Jan 26 11:11:40 2024 +0100
Resolves tdf#159096 - Change color of comment indicators in Calc
COL_LIGHTMAGENT was preceived as too glossy and "Light Purple 3"
should also be closer to the Excel prototype
Change-Id: I451c0ba0628dbd3b1794e46de3ff1fef763a6f46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162593
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index dea9ca97db2f..4a4e94370bef 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -422,7 +422,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
{ COL_GRAY7,COL_GRAY7 }, // CALCPAGEBREAKAUTOMATIC
{ Color(0x2300dc), Color(0x2300DC) }, // CALCHIDDENCOLROW
{ COL_LIGHTRED, COL_LIGHTRED}, // CALCTEXTOVERFLOW
-{ COL_LIGHTMAGENTA, COL_LIGHTMAGENTA}, // CALCCOMMENT
+{ Color(0xbf819e), Color(0xbf819e) }, // CALCCOMMENT
{ COL_LIGHTBLUE,Color(0x355269) }, // CALCDETECTIVE
{ COL_LIGHTRED, Color(0xC9211E) }, // CALCDETECTIVEERROR
{ Color(0xef0fff), Color(0x0D23D5) }, // CALCREFERENCE
core.git: officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8
sc/source/ui/view/output.cxx | 26 ++-
2 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit bddae0d0dc4f64757100e00432ca40a6470d2c31
Author: Heiko Tietze
AuthorDate: Tue Jan 16 13:11:06 2024 +0100
Commit: Heiko Tietze
CommitDate: Wed Jan 17 08:50:24 2024 +0100
Resolves tdf#158958 and tdf#159124 - Improvements to Comments indicator
* Option to control the indicator size added
* Border color adopts the grid color
* Indicator moved to the very edge of the cell
* Default dynamic size reduced
Change-Id: Ia298edfa30061910344a1afa42b42840b9cdab77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162175
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d54b092eca66..de97c822c7c1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -105,6 +105,14 @@
true
+
+
+
+If less than 1, the size of comment indicator is calculated
dynamically; otherwise this value will be used.
+Comment indicator size
+
+ 0
+
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 58b6db5107d3..e650c6faf774 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2467,7 +2468,7 @@ void ScOutputData::DrawNoteMarks(vcl::RenderContext&
rRenderContext)
nInitPosX += nMirrorW - 1; // always in pixels
tools::Long nLayoutSign = bLayoutRTL ? -1 : 1;
-tools::Long nPosY = nScrY;
+tools::Long nPosY = nScrY - 1;
for (SCSIZE nArrY=1; nArrY+1ColHidden(nX, nTab) && mpDoc->GetNote(nX,
pRowInfo[nArrY].nRowNo, nTab)
&& (bIsMerged || (!pInfo->bHOverlapped &&
!pInfo->bVOverlapped)))
{
-
-const bool bIsDarkBackground =
SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor.IsDark();
-const Color aColor(static_cast(pInfo->maBackground.getItem())->GetColor());
-if ( aColor == COL_AUTO ? bIsDarkBackground :
aColor.IsDark() )
-rRenderContext.SetLineColor(COL_WHITE);
-else
-rRenderContext.SetLineColor(COL_BLACK);
+
rRenderContext.SetLineColor(SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCGRID).nColor);
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
if ( mbUseStyleColor &&
rStyleSettings.GetHighContrastMode() )
@@ -2506,7 +2501,7 @@ void ScOutputData::DrawNoteMarks(vcl::RenderContext&
rRenderContext)
else
rRenderContext.SetFillColor(
SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCCOMMENTS).nColor );
-tools::Long nMarkX = nPosX + (
pRowInfo[0].basicCellInfo(nX).nWidth - 2 ) * nLayoutSign;
+tools::Long nMarkX = nPosX + (
pRowInfo[0].basicCellInfo(nX).nWidth - 1) * nLayoutSign;
if ( bIsMerged || pInfo->bMerged )
{
// if merged, add widths of all cells
@@ -2517,11 +2512,14 @@ void ScOutputData::DrawNoteMarks(vcl::RenderContext&
rRenderContext)
++nNextX;
}
}
-// DPI/ZOOM 100/100 => 10, 100/50 => 7, 100/150 => 13
-// DPI/ZOOM 150/100 => 13, 150/50 => 8.5, 150/150 => 17.5
-const double fSize(rRenderContext.GetDPIScaleFactor() *
aZoomX * 6 + 4);
-// Make sure we have an integer size to draw a proper
triangle
-sal_Int16 nSize = static_cast(fSize);
+// DPI/ZOOM 100/100 => 6, 100/50 => 4.5, 100/150 => 7.5
+// DPI/ZOOM 150/100 => 7.5, 150/50 => 6, 150/150 => 9
+sal_Int16 nSize =
officecfg::Office::Calc::Content::Display::NoteIndicator::get();
+if (nSize < 1)
+{
+ const double fSize(rRenderContext.GetDPIScaleFactor() *
aZoomX * 3 + 3);
+ nSize = static_cast(fSize);
+}
Point aPoints[3];
aPoints[0] = Point(nMarkX, nPosY);
aPoints[0].setX( bLayoutRTL ? aPoints[0].X() + nSize :
aPoints[0].X() - nSize );
core.git: Branch 'libreoffice-24-2' - sfx2/source
sfx2/source/dialog/backingwindow.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a19137e28c86b9ff118f3cfdd52554e7c326357c
Author: Heiko Tietze
AuthorDate: Wed Jan 3 15:48:13 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Jan 5 13:38:22 2024 +0100
Resolves tdf#158810 - Hide recent actions while in template mode
Change-Id: I7291cc7a634a0507bb240bf417d346e7a50f3c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161587
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit fc03109024041ea00bb62e90975e9a20a3668101)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161635
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 846fa2ffb70e..9e30572d12d3 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -593,7 +593,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&,
rButton, void )
mxAllRecentThumbnails->GrabFocus();
mxRecentButton->set_active(true);
mxTemplateButton->set_active(false);
-mxActions->set_sensitive(true);
+mxActions->show();
}
else
{
@@ -604,7 +604,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&,
rButton, void )
mxLocalView->GrabFocus();
mxRecentButton->set_active(false);
mxTemplateButton->set_active(true);
-mxActions->set_sensitive(false);
+mxActions->hide();
}
applyFilter();
}
core.git: include/svx svx/source
include/svx/compressgraphicdialog.hxx |1 +
svx/source/dialog/compressgraphicdialog.cxx | 16 +++-
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 79018bac2ed73fbfaacf661ae1272086e3ddd342
Author: Heiko Tietze
AuthorDate: Thu Jan 4 14:45:13 2024 +0100
Commit: Heiko Tietze
CommitDate: Fri Jan 5 07:36:33 2024 +0100
Resolves tdf#158780 - Disable resolution controls initially
Change-Id: I80e620085868925643d4b7561cd7aeff2d9c930f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161620
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/svx/compressgraphicdialog.hxx
b/include/svx/compressgraphicdialog.hxx
index 088d0b6fd45e..d46220d17a1f 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -79,6 +79,7 @@ private:
DECL_DLLPRIVATE_LINK( OkayClickHdl, weld::Button&, void );
void Update();
+void UpdateSensitivity(const bool bSensitive);
void UpdateNewWidthMF();
void UpdateNewHeightMF();
void UpdateResolutionLB();
diff --git a/svx/source/dialog/compressgraphicdialog.cxx
b/svx/source/dialog/compressgraphicdialog.cxx
index 35899bec2f5f..df1d3a8c3db6 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -108,6 +108,8 @@ void CompressGraphicsDialog::recallParameter()
m_xQualitySlider->set_value( memp.QualityMF );
m_xInterpolationCombo->set_active( memp.InterpolationCombo );
+
+UpdateSensitivity(m_xReduceResolutionCB->get_active());
}
void CompressGraphicsDialog::Initialize()
@@ -207,6 +209,14 @@ void CompressGraphicsDialog::Update()
m_xFixedText6->set_label("??");
}
+void CompressGraphicsDialog::UpdateSensitivity(const bool bSensitive)
+{
+m_xMFNewWidth->set_sensitive(bSensitive);
+m_xMFNewHeight->set_sensitive(bSensitive);
+m_xResolutionLB->set_sensitive(bSensitive);
+m_xInterpolationCombo->set_sensitive(bSensitive);
+}
+
void CompressGraphicsDialog::UpdateNewWidthMF()
{
int nPixelX = static_cast( GetViewWidthInch() * m_dResolution );
@@ -353,11 +363,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog,
ToggleCompressionRB, weld::Toggleable&,
IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleReduceResolutionRB,
weld::Toggleable&, void )
{
-bool choice = m_xReduceResolutionCB->get_active();
-m_xMFNewWidth->set_sensitive(choice);
-m_xMFNewHeight->set_sensitive(choice);
-m_xResolutionLB->set_sensitive(choice);
-m_xInterpolationCombo->set_sensitive(choice);
+UpdateSensitivity(m_xReduceResolutionCB->get_active());
Update();
}
core.git: svx/source
svx/source/dialog/compressgraphicdialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a5a0bb0c6577c82f5e31f1a81e31381fdf6c0c2e
Author: Heiko Tietze
AuthorDate: Thu Jan 4 12:13:44 2024 +0100
Commit: Heiko Tietze
CommitDate: Thu Jan 4 14:00:21 2024 +0100
Resolves tdf#158780 - Enable "Reduce Resolution" by default
Change-Id: Ib60f8484ebf6b140c52c7d2b6f190eac9dd3ade1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161612
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svx/source/dialog/compressgraphicdialog.cxx
b/svx/source/dialog/compressgraphicdialog.cxx
index 8fcf479d889d..35899bec2f5f 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -45,7 +45,7 @@
namespace
{
struct memParam {
-bool ReduceResolutionCB = false;
+bool ReduceResolutionCB = true;
int MFNewWidth = 1;
int MFNewHeight = 1;
bool LosslessRB = true;
core.git: sfx2/source
sfx2/source/dialog/backingwindow.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fc03109024041ea00bb62e90975e9a20a3668101
Author: Heiko Tietze
AuthorDate: Wed Jan 3 15:48:13 2024 +0100
Commit: Heiko Tietze
CommitDate: Thu Jan 4 11:22:50 2024 +0100
Resolves tdf#158810 - Hide recent actions while in template mode
Change-Id: I7291cc7a634a0507bb240bf417d346e7a50f3c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161587
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 846fa2ffb70e..9e30572d12d3 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -593,7 +593,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&,
rButton, void )
mxAllRecentThumbnails->GrabFocus();
mxRecentButton->set_active(true);
mxTemplateButton->set_active(false);
-mxActions->set_sensitive(true);
+mxActions->show();
}
else
{
@@ -604,7 +604,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&,
rButton, void )
mxLocalView->GrabFocus();
mxRecentButton->set_active(false);
mxTemplateButton->set_active(true);
-mxActions->set_sensitive(false);
+mxActions->hide();
}
applyFilter();
}
[Libreoffice-commits] core.git: svx/source
svx/source/form/labelitemwindow.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 48ba98a51f029cd14b5d982dab36eb581d40fef3
Author: Heiko Tietze
AuthorDate: Wed Nov 29 14:29:57 2023 +0100
Commit: Heiko Tietze
CommitDate: Thu Nov 30 11:41:38 2023 +0100
Resolves tdf#158412 - Don't show chevron in quick find bar
Change-Id: I50f0bb7d8a406b77baccc626ca99b656d170ecf1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160093
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svx/source/form/labelitemwindow.cxx
b/svx/source/form/labelitemwindow.cxx
index 1ccbe6c5d156..c9afd1534acc 100644
--- a/svx/source/form/labelitemwindow.cxx
+++ b/svx/source/form/labelitemwindow.cxx
@@ -50,7 +50,8 @@ void LabelItemWindow::set_label(const OUString& rLabel, const
LabelItemWindowTyp
m_xLabel->set_font_color(Color(0x00, 0x47, 0x85));
m_xBox->set_background(Color(0xBD, 0xE5, 0xF8)); // same as
InfobarType::INFO
}
-m_xLabel->set_visible(!rLabel.isEmpty());
+m_xLabel->set_visible(
+true); // always show and not just if !rLabel.isEmpty() to not make
the chevron appear
}
OUString LabelItemWindow::get_label() const { return m_xLabel->get_label(); }
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/linetabpage.ui| 460 ++ cui/uiconfig/ui/possizetabpage.ui | 260 ++--- 2 files changed, 355 insertions(+), 365 deletions(-) New commits: commit fe946f86ad6586fa810cae5c0f246389a285e172 Author: Heiko Tietze AuthorDate: Wed Nov 29 15:25:06 2023 +0100 Commit: Heiko Tietze CommitDate: Thu Nov 30 11:40:59 2023 +0100 Bump Glade version Change-Id: If440010790e170fa1c88b8cbdef5f7eaa3efd686 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160108 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui index a7138e2ebd9b..2a2c1b2e15f5 100644 --- a/cui/uiconfig/ui/linetabpage.ui +++ b/cui/uiconfig/ui/linetabpage.ui @@ -1,36 +1,36 @@ - + 20 -0.05 -1 +0.05 +1 100 -5 -10 +5 +10 5 -0.1 -1 +0.10 +1 5 -0.1 -1 +0.10 +1 5 -0.1 -1 +0.10 +1 20 -0.05 -1 +0.05 +1 @@ -70,41 +70,41 @@ True -False +False True -False +False _No Symbol -True +True True -False +False _Automatic -True +True True -False +False _From file... -True +True True -False +False _Gallery -True +True True -False +False @@ -112,13 +112,13 @@ True -False +False _Symbols -True +True True -False +False @@ -126,45 +126,45 @@ True -False +False True True -6 +6 vertical 12 - + True -False -12 -24 +False +12 +24 True -False -0 -none +False +0 +none True -False -vertical -3 +False 12 6 +vertical +3 True -False +False 6 True -False +False _Style: -True -LB_LINE_STYLE +True +LB_LINE_STYLE 0 @@ -176,10 +176,10 @@ True -False +False liststore5 -0 -1 +0 +1 @@ -188,9 +188,6 @@ - -3 - @@ -209,15 +206,15 @@ True -False +False 6 True -False +False Colo_r: -True -LB_COLOR +True +LB_COLOR 0 @@ -229,11 +226,10 @@ True -True -False +True +False 0 -True - +True @@ -254,15 +250,15 @@ True -False +False 6 True -False
[Libreoffice-commits] core.git: svx/source svx/uiconfig
svx/source/dialog/srchdlg.cxx|1 +
svx/source/form/labelitemwindow.cxx |1 +
svx/uiconfig/ui/findreplacedialog.ui | 11 ++-
svx/uiconfig/ui/labelbox.ui |2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 5a622f1a29d249a512cc24f99d189f748623c678
Author: Heiko Tietze
AuthorDate: Tue Nov 28 11:10:58 2023 +0100
Commit: Heiko Tietze
CommitDate: Tue Nov 28 14:33:18 2023 +0100
Related tdf#156227 - Find/quickfind design
Themed icons look bad when drawn white on light blue;
using the same icon as on the infobar makes more sense
Change-Id: I6b4fd2bac7dce41b8196c702e0f0dc87712e2b8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160017
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index b5cf7bcf34fd..b1c87a6db7c8 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -344,6 +344,7 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
m_xSearchLabel->set_font_color(Color(0x00, 0x47, 0x85));
this->SetSearchLabel(""); // hide the message but keep the box height
+m_xSearchIcon->set_size_request(24, 24); // vcl/res/infobar.png is 32x32 -
too large here
m_xReplaceTmplLB->make_sorted();
m_xReplaceAttrText->hide();
diff --git a/svx/source/form/labelitemwindow.cxx
b/svx/source/form/labelitemwindow.cxx
index bdff03e060f2..1ccbe6c5d156 100644
--- a/svx/source/form/labelitemwindow.cxx
+++ b/svx/source/form/labelitemwindow.cxx
@@ -19,6 +19,7 @@ LabelItemWindow::LabelItemWindow(vcl::Window* pParent, const
OUString& rLabel)
m_xLabel->set_label(rLabel);
m_xImage->hide();
+m_xImage->set_size_request(24, 24); // vcl/res/infobar.png is 32x32 - too
large here
SetOptimalSize();
diff --git a/svx/uiconfig/ui/findreplacedialog.ui
b/svx/uiconfig/ui/findreplacedialog.ui
index 57a16e666a2f..e915a647f710 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -290,15 +290,16 @@
True
False
+center
6
3
3
3
-res/info.png
+vcl/res/infobox.png
-
-Search icon
-
+
+Search icon
+
@@ -323,7 +324,7 @@
0
- notification
+notification
diff --git a/svx/uiconfig/ui/labelbox.ui b/svx/uiconfig/ui/labelbox.ui
index f77cd5da7f4e..29210661b91c 100644
--- a/svx/uiconfig/ui/labelbox.ui
+++ b/svx/uiconfig/ui/labelbox.ui
@@ -15,7 +15,7 @@
6
3
3
-res/info.png
+vcl/res/infobox.png
False
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/swpossizepage.ui | 424 +++ 1 file changed, 212 insertions(+), 212 deletions(-) New commits: commit cb70626ccb63e09f3a4130fd115a29ac79d823f2 Author: Heiko Tietze AuthorDate: Thu Nov 23 17:21:50 2023 +0100 Commit: Heiko Tietze CommitDate: Fri Nov 24 17:06:31 2023 +0100 Bump Glade version Change-Id: Icea5b88e0e8281803a5deb09619476cccff3b39c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159866 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/swpossizepage.ui b/cui/uiconfig/ui/swpossizepage.ui index 17ab225bf276..399dc211c02d 100644 --- a/cui/uiconfig/ui/swpossizepage.ui +++ b/cui/uiconfig/ui/swpossizepage.ui @@ -1,78 +1,78 @@ - + 0.05 -99.99 -1 -10 +99.98 +1 +10 --99.99 -99.99 -1 -10 +-99.98 +99.98 +1 +10 --99.99 -99.99 -1 -10 +-99.98 +99.98 +1 +10 0.05 -99.99 -1 -10 +99.98 +1 +10 - + True -False +False True -6 -12 +6 +12 - + True -False +False True True -6 -12 +6 +12 True -False +False start True -0 -none +0 +none - + True -False -True -6 +False 12 6 +True +6 - + True -False -12 +False +12 True -True -True +True +True +True adjustment1 2 -True Enter the width that you want for the selected object. @@ -80,44 +80,44 @@ -1 -0 +1 +0 True -False +False _Width: -True -width +True +width 0 -0 -0 +0 +0 -0 -0 +0 +0 - + True -False -12 +False +12 True -True -True +True +True +True adjustment4 2 -True Enter the height that you want for the selected object. @@ -125,38 +125,38 @@ -1 -0 +1 +0 True -False +False H_eight: -True -height +True +height 0 -0 -0 +0 +0 -0 -1 +0 +1
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/thumbnailview.hxx |2 --
include/sfx2/thumbnailviewitem.hxx |2 --
sfx2/source/control/recentdocsview.cxx |4 +---
sfx2/source/control/templatedefaultview.cxx |4 +---
sfx2/source/control/templateviewitem.cxx|2 +-
sfx2/source/control/thumbnailview.cxx |4
sfx2/source/control/thumbnailviewitem.cxx |7 ++-
7 files changed, 5 insertions(+), 20 deletions(-)
New commits:
commit adfb0a34af196befc46527418f6e870d1f8f1889
Author: Heiko Tietze
AuthorDate: Tue Nov 14 11:35:43 2023 +0100
Commit: Heiko Tietze
CommitDate: Tue Nov 14 13:26:53 2023 +0100
Resolves tdf#158084 - Start Center hover color
Selected colors removed since hovering leads to selection
(or execution) and does not need a special color
Transparency for reccent documents and templates in start center
increased to make the difference to selected more clear
Change-Id: Iab52150cd5a93e2f6ff716921b2aa7d093018b3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159407
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index a51db9df048b..655aa3ba13e5 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -313,8 +313,6 @@ protected:
Color maTextColor; ///< Text color.
Color maHighlightColor; ///< Color of the highlight (background)
of the hovered item.
Color maHighlightTextColor; ///< Color of the text for the highlighted
item.
-Color maSelectHighlightColor; ///< Color of the highlight (background)
of the selected and hovered item.
-Color maSelectHighlightTextColor; ///< Color of the text of the selected
and hovered item.
double mfHighlightTransparence; ///< Transparence of the highlight.
Link maItemStateHdl;
diff --git a/include/sfx2/thumbnailviewitem.hxx
b/include/sfx2/thumbnailviewitem.hxx
index 9495b08054e3..22020c47728d 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -56,8 +56,6 @@ struct ThumbnailItemAttributes
basegfx::BColor aTextColor;
basegfx::BColor aHighlightColor;
basegfx::BColor aHighlightTextColor;
-basegfx::BColor aSelectHighlightColor;
-basegfx::BColor aSelectHighlightTextColor;
double fHighlightTransparence;
basegfx::B2DVector aFontSize;
drawinglayer::attribute::FontAttribute aFontAttr;
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index 055dc6962423..6df534788a32 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -80,10 +80,8 @@
RecentDocsView::RecentDocsView(std::unique_ptr xWindow, st
const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
maHighlightColor = rSettings.GetHighlightColor();
maHighlightTextColor = rSettings.GetHighlightTextColor();
-maSelectHighlightColor = rSettings.GetActiveColor();
-maSelectHighlightTextColor = rSettings.GetActiveTextColor();
-mfHighlightTransparence = 0.25;
+mfHighlightTransparence = 0.75;
UpdateColors();
}
diff --git a/sfx2/source/control/templatedefaultview.cxx
b/sfx2/source/control/templatedefaultview.cxx
index 34d40875d23c..909545e423ce 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -37,10 +37,8 @@
TemplateDefaultView::TemplateDefaultView(std::unique_ptr x
const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
maHighlightColor = rSettings.GetHighlightColor();
maHighlightTextColor = rSettings.GetHighlightTextColor();
-maSelectHighlightColor = rSettings.GetActiveColor();
-maSelectHighlightTextColor = rSettings.GetActiveTextColor();
-mfHighlightTransparence = 0.25;
+mfHighlightTransparence = 0.75;
UpdateColors();
}
diff --git a/sfx2/source/control/templateviewitem.cxx
b/sfx2/source/control/templateviewitem.cxx
index 28ff1f43133c..d28ad50f74cd 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -61,7 +61,7 @@ void
TemplateViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProces
// Draw background
if( mbSelected && mbHover)
-aFillColor = pAttrs->aSelectHighlightColor;
+aFillColor = pAttrs->aHighlightColor;
else if (mbSelected || mbHover)
{
aFillColor = pAttrs->aHighlightColor;
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 2d4e8bb57611..abb9f9799e34 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -253,8 +253,6 @@ void ThumbnailView::ImplInit()
maTextColor = rSettings.GetWindowTextColor();
maHighlightColor = rSettings.GetHighlightColor();
maHighlightTextColor =
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 14 - sfx2/source/control/recentdocsview.cxx |9 ++-- sfx2/source/control/templatedefaultview.cxx|9 ++-- 3 files changed, 14 insertions(+), 18 deletions(-) New commits: commit 285a3e8d8b77b44da3dcc767877f878fe0e0493e Author: Heiko Tietze AuthorDate: Fri Nov 10 10:12:39 2023 +0100 Commit: Heiko Tietze CommitDate: Mon Nov 13 10:40:30 2023 +0100 Resolves tdf#158084 - Use system colors in start center StartCenterThumbnailsHighlightColor and StartCenterThumbnailsHighlightTextColor removed in favor of StyleSettings.GetHighlightColor and .GetActiveColor Change-Id: I7005b17f6c48525c791f23ea99b7b68e7a67531b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159286 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 76aa4e6c02d9..c551044a350d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3400,20 +3400,6 @@ 15658734 - - - -Specifies the background color of the highlight of a thumbnail in the start center. - - 14540253 - - - - -Specifies the text color of the highlight of a thumbnail in the start center. - - 3355443 - diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index cc2e80de17e9..055dc6962423 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -76,8 +76,13 @@ RecentDocsView::RecentDocsView(std::unique_ptr xWindow, st maFillColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get()); maTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get()); -maHighlightColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get()); -maHighlightTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get()); + +const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); +maHighlightColor = rSettings.GetHighlightColor(); +maHighlightTextColor = rSettings.GetHighlightTextColor(); +maSelectHighlightColor = rSettings.GetActiveColor(); +maSelectHighlightTextColor = rSettings.GetActiveTextColor(); + mfHighlightTransparence = 0.25; UpdateColors(); diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx index 17ad2ba7cbda..34d40875d23c 100644 --- a/sfx2/source/control/templatedefaultview.cxx +++ b/sfx2/source/control/templatedefaultview.cxx @@ -33,8 +33,13 @@ TemplateDefaultView::TemplateDefaultView(std::unique_ptr x // startcenter specific settings maFillColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get()); maTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get()); -maHighlightColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get()); -maHighlightTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get()); + +const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); +maHighlightColor = rSettings.GetHighlightColor(); +maHighlightTextColor = rSettings.GetHighlightTextColor(); +maSelectHighlightColor = rSettings.GetActiveColor(); +maSelectHighlightTextColor = rSettings.GetActiveTextColor(); + mfHighlightTransparence = 0.25; UpdateColors();
[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig
include/svx/labelitemwindow.hxx | 11
include/svx/srchdlg.hxx |2
svx/source/dialog/srchdlg.cxx| 40 +++--
svx/source/form/labelitemwindow.cxx | 24 +-
svx/uiconfig/ui/findreplacedialog.ui | 80 +--
svx/uiconfig/ui/labelbox.ui | 29 ++--
6 files changed, 135 insertions(+), 51 deletions(-)
New commits:
commit 97d3d4f371f82704dba907975e6cfdaac456fe4d
Author: Heiko Tietze
AuthorDate: Fri Sep 15 14:23:50 2023 +0200
Commit: Heiko Tietze
CommitDate: Sat Oct 28 11:23:12 2023 +0200
Resolves tdf#156227 - More appealing feedback for find/quickfind
ErrorMessageType removed in favor of an infobar-like label
Accessibility notification added for the quickfind bar
Change-Id: Iec2498d04152392b3e181146005bdb0c9db8ec50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156943
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/svx/labelitemwindow.hxx b/include/svx/labelitemwindow.hxx
index 5271482b11ad..d9aeccbb7bfd 100644
--- a/include/svx/labelitemwindow.hxx
+++ b/include/svx/labelitemwindow.hxx
@@ -12,14 +12,23 @@
#include
#include
+enum class LabelItemWindowType
+{
+Text,
+Info,
+};
+
class SVXCORE_DLLPUBLIC LabelItemWindow final : public InterimItemWindow
{
private:
+std::unique_ptr m_xBox;
std::unique_ptr m_xLabel;
+std::unique_ptr m_xImage;
public:
LabelItemWindow(vcl::Window* pParent, const OUString& rLabel);
-void set_label(const OUString& rLabel);
+void set_label(const OUString& rLabel,
+ const LabelItemWindowType eType =
LabelItemWindowType::Text);
OUString get_label() const;
void SetOptimalSize();
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index f069af48c539..7223a51cd324 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -177,6 +177,8 @@ private:
std::unique_ptr m_xSearchTmplLB;
std::unique_ptr m_xSearchAttrText;
std::unique_ptr m_xSearchLabel;
+std::unique_ptr m_xSearchIcon;
+std::unique_ptr m_xSearchBox;
std::unique_ptr m_xReplaceFrame;
std::unique_ptr m_xReplaceLB;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index a17711bc46fb..b5cf7bcf34fd 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -285,6 +285,8 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
, m_xSearchTmplLB(m_xBuilder->weld_combo_box("searchlist"))
, m_xSearchAttrText(m_xBuilder->weld_label("searchdesc"))
, m_xSearchLabel(m_xBuilder->weld_label("searchlabel"))
+, m_xSearchIcon(m_xBuilder->weld_image("searchicon"))
+, m_xSearchBox(m_xBuilder->weld_box("searchbox"))
, m_xReplaceFrame(m_xBuilder->weld_frame("replaceframe"))
, m_xReplaceLB(m_xBuilder->weld_combo_box("replaceterm"))
, m_xReplaceTmplLB(m_xBuilder->weld_combo_box("replacelist"))
@@ -340,6 +342,9 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
m_xSearchTmplLB->make_sorted();
m_xSearchAttrText->hide();
+m_xSearchLabel->set_font_color(Color(0x00, 0x47, 0x85));
+this->SetSearchLabel(""); // hide the message but keep the box height
+
m_xReplaceTmplLB->make_sorted();
m_xReplaceAttrText->hide();
@@ -581,14 +586,18 @@ void SvxSearchDialog::SetSearchLabel(const OUString& rStr)
m_xSearchLabel->set_label(rStr);
if (!rStr.isEmpty())
{
-// hide/show to fire SHOWING state change event so search label text
-// is announced by screen reader
-m_xSearchLabel->hide();
m_xSearchLabel->show();
+m_xSearchIcon->show();
+m_xSearchBox->set_background(Color(0xBD, 0xE5, 0xF8)); // same as
InfobarType::INFO
+}
+else
+{
+const Size aSize = m_xSearchBox->get_preferred_size();
+m_xSearchLabel->hide();
+m_xSearchIcon->hide();
+m_xSearchBox->set_size_request(-1, aSize.Height());
+m_xSearchBox->set_background(COL_TRANSPARENT);
}
-
-if (rStr == SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND))
-m_xSearchLB->set_entry_message_type(weld::EntryMessageType::Error);
}
void SvxSearchDialog::ApplyTransliterationFlags_Impl( TransliterationFlags
nSettings )
@@ -2360,8 +2369,6 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
static void lcl_SetSearchLabelWindow(const OUString& rStr, SfxViewFrame&
rViewFrame)
{
-bool bNotFound = rStr == SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND);
-
css::uno::Reference< css::beans::XPropertySet > xPropSet(
rViewFrame.GetFrame().GetFrameInterface(),
css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
@@ -2380,21 +2387,8 @@ static void lcl_SetSearchLabelWindow(const OUString&
rStr, SfxViewFrame& rViewFr
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/inc sw/qa sw/source
sw/inc/flddat.hxx |2 +-
sw/qa/uibase/shells/shells.cxx|6 --
sw/source/ui/fldui/flddok.cxx |4 ++--
sw/source/uibase/fldui/fldmgr.cxx |6 +++---
4 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit d6347033f95a4c3d4837f954a6560b83ec2a421d
Author: Heiko Tietze
AuthorDate: Tue Oct 17 11:15:58 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue Oct 24 09:18:00 2023 +0200
Revert "Resolves tdf#139141 - Make variable date/time field the default"
This reverts commit e37f06f534ac864f9fe8cd20b07a85c36e697d41.
and ui test from Ia1a2387e137f8a672a24056b13234d4275a77ca4
Reason for revert: tdf#157337; macros rely on fix field values
Change-Id: I7a638330aac9b71432556454c0104479fcd05b4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158041
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
(cherry picked from commit fa569930a0968cdeba4441e19a68e7d78aa25cb4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158282
Tested-by: Jenkins
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 6c452072e926..39c00f68a235 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -30,8 +30,8 @@ namespace tools { class Time; }
enum SwDateSubFormat
{
-DATE_VAR,
DATE_FIX,
+DATE_VAR
};
class SAL_DLLPUBLIC_RTTI SwDateTimeFieldType final : public SwValueFieldType
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index c962f4a5d65e..6543f8f4fcb7 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -1049,7 +1049,9 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertTextFormFieldEndnote)
// Then this was empty: the fieldmark was inserted before the note anchor,
not in the note body.
CPPUNIT_ASSERT_EQUAL(OUString("result"), aActual);
}
-
+/*
+// Disabled because tdf#139141 was reverted and the default time field inserts
a fix value again
+// Should be reactivated once a new UNO command is added for variable time
fields
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateSelectedField)
{
// Given an empty doc:
@@ -1077,7 +1079,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateSelectedField)
// Check that the selected field has changed:
CPPUNIT_ASSERT(aTimeFieldAfter != aTimeFieldBefore);
}
-
+*/
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index f669fa7b92b2..a195ed026ec0 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -241,9 +241,9 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, weld::TreeView&,
void)
case SwFieldTypesEnum::Date:
case SwFieldTypesEnum::Time:
m_xSelectionLB->append(sId, aLst[i]);
-if
(static_cast(GetCurField())->IsFixed() && i)
+if
(static_cast(GetCurField())->IsFixed() && !i)
m_xSelectionLB->select_id(sId);
-if
(!static_cast(GetCurField())->IsFixed() && !i)
+if
(!static_cast(GetCurField())->IsFixed() && i)
m_xSelectionLB->select_id(sId);
break;
case SwFieldTypesEnum::ExtendedUser:
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index 143c981a6131..636e2b99058a 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -159,14 +159,14 @@ const TranslateId FMT_AUTHOR_ARY[] =
const TranslateId FLD_DATE_ARY[] =
{
+FLD_DATE_FIX,
FLD_DATE_STD,
-FLD_DATE_FIX
};
const TranslateId FLD_TIME_ARY[] =
{
-FLD_TIME_STD,
-FLD_TIME_FIX
+FLD_TIME_FIX,
+FLD_TIME_STD
};
const TranslateId FMT_NUM_ARY[] =
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/flddat.hxx |2 +-
sw/qa/uibase/shells/shells.cxx|6 --
sw/source/ui/fldui/flddok.cxx |4 ++--
sw/source/uibase/fldui/fldmgr.cxx |6 +++---
4 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit fa569930a0968cdeba4441e19a68e7d78aa25cb4
Author: Heiko Tietze
AuthorDate: Tue Oct 17 11:15:58 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon Oct 23 15:42:38 2023 +0200
Revert "Resolves tdf#139141 - Make variable date/time field the default"
This reverts commit e37f06f534ac864f9fe8cd20b07a85c36e697d41.
and ui test from Ia1a2387e137f8a672a24056b13234d4275a77ca4
Reason for revert: tdf#157337; macros rely on fix field values
Change-Id: I7a638330aac9b71432556454c0104479fcd05b4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158041
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 6c452072e926..39c00f68a235 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -30,8 +30,8 @@ namespace tools { class Time; }
enum SwDateSubFormat
{
-DATE_VAR,
DATE_FIX,
+DATE_VAR
};
class SAL_DLLPUBLIC_RTTI SwDateTimeFieldType final : public SwValueFieldType
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index f8d7f99de023..88f90e909698 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -1049,7 +1049,9 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertTextFormFieldEndnote)
// Then this was empty: the fieldmark was inserted before the note anchor,
not in the note body.
CPPUNIT_ASSERT_EQUAL(OUString("result"), aActual);
}
-
+/*
+// Disabled because tdf#139141 was reverted and the default time field inserts
a fix value again
+// Should be reactivated once a new UNO command is added for variable time
fields
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateSelectedField)
{
// Given an empty doc:
@@ -1077,7 +1079,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateSelectedField)
// Check that the selected field has changed:
CPPUNIT_ASSERT(aTimeFieldAfter != aTimeFieldBefore);
}
-
+*/
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index f669fa7b92b2..a195ed026ec0 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -241,9 +241,9 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, weld::TreeView&,
void)
case SwFieldTypesEnum::Date:
case SwFieldTypesEnum::Time:
m_xSelectionLB->append(sId, aLst[i]);
-if
(static_cast(GetCurField())->IsFixed() && i)
+if
(static_cast(GetCurField())->IsFixed() && !i)
m_xSelectionLB->select_id(sId);
-if
(!static_cast(GetCurField())->IsFixed() && !i)
+if
(!static_cast(GetCurField())->IsFixed() && i)
m_xSelectionLB->select_id(sId);
break;
case SwFieldTypesEnum::ExtendedUser:
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index c61c9c26cba5..3b69fb63739d 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -161,14 +161,14 @@ const TranslateId FMT_AUTHOR_ARY[] =
const TranslateId FLD_DATE_ARY[] =
{
+FLD_DATE_FIX,
FLD_DATE_STD,
-FLD_DATE_FIX
};
const TranslateId FLD_TIME_ARY[] =
{
-FLD_TIME_STD,
-FLD_TIME_FIX
+FLD_TIME_FIX,
+FLD_TIME_STD
};
const TranslateId FMT_NUM_ARY[] =
[Libreoffice-commits] core.git: 2 commits - include/tools sd/qa sd/source
include/tools/color.hxx |7 +--
sd/qa/unit/data/xml/tdf92001_0.xml |2 +-
sd/source/ui/table/tablefunction.cxx |8 +---
3 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 8ff7d75c1929876743b01d9651ea30928673433f
Author: Heiko Tietze
AuthorDate: Mon Oct 16 12:37:00 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon Oct 16 15:35:23 2023 +0200
Revert "Resolves tdf#156685 - "Object without fill" style for tables"
This reverts commit 86eb7ad2b4488dcd29c21ae3fc525056b681e199.
Reason for revert: More generic solution in
I1ca8cfe539a662100f6c581fd633ab1ebd5c6bfb
Change-Id: Ie2769a90f776602e38fc2795e08d591f9ae8d618
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158035
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sd/source/ui/table/tablefunction.cxx
b/sd/source/ui/table/tablefunction.cxx
index b28f89c896e2..67196e864b39 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -44,8 +44,6 @@
#include
#include
#include
-#include
-#include
#include
@@ -149,11 +147,7 @@ static void InsertTableImpl(const DrawViewShell* pShell,
aRect,
nColumns,
nRows);
-//tables must not use default background tango sky blue tdf#156685
-SfxStyleSheet* pStyleSheet = static_cast(
-pShell->GetDoc()->GetStyleSheetPool()->Find(
-SdResId(STR_POOLSHEET_OBJWITHOUTFILL), SfxStyleFamily::Para));
-pObj->NbcSetStyleSheet( pStyleSheet, true );
+pObj->NbcSetStyleSheet( pShell->GetDoc()->GetDefaultStyleSheet(), true );
apply_table_style( pObj.get(), pShell->GetDoc(), sTableStyle );
SdrPageView* pPV = pView->GetSdrPageView();
commit f07d47fff571c4446988715f3c21362b9eed4265
Author: Heiko Tietze
AuthorDate: Mon Oct 16 11:34:56 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon Oct 16 15:35:10 2023 +0200
Related tdf#156182 - Keep legacy contrast for default background
Band aid for follow-up issues, eg. tdf#157706, tdf#157706...
Change-Id: I1ca8cfe539a662100f6c581fd633ab1ebd5c6bfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158024
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index c3bbb5bf0e2b..8ab35445893f 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -311,8 +311,11 @@ public:
*/
bool IsDark() const
{
-// tdf#156182
-return GetLuminance() <= 156;
+// tdf#156182, and band aid for follow-up issues
+if (mValue == 0x729fcf) // COL_DEFAULT_SHAPE_FILLING
+return GetLuminance() <= 62;
+else
+return GetLuminance() <= 156;
}
/** Comparison with luminance thresholds.
diff --git a/sd/qa/unit/data/xml/tdf92001_0.xml
b/sd/qa/unit/data/xml/tdf92001_0.xml
index 234f751a9c23..d67952eb1fe5 100644
--- a/sd/qa/unit/data/xml/tdf92001_0.xml
+++ b/sd/qa/unit/data/xml/tdf92001_0.xml
@@ -1,6 +1,6 @@
-
+
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.cxx | 10 ++
filter/source/pdf/impdialog.hxx |3 ++-
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 07a06e40400f3713619cb456d62d4bb952e85436
Author: Heiko Tietze
AuthorDate: Fri Jul 21 11:47:45 2023 +0200
Commit: Heiko Tietze
CommitDate: Thu Oct 5 13:10:15 2023 +0200
Resolves tdf#156337 - Keep warning label enabled on PDF security tab
Change-Id: Ifea77294825b987e4277e146cc34af120e38c8c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154712
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index a036d432e3c3..c7149b0ca534 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -936,7 +936,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage,
TogglePDFVersionOrUniversalAccessibilityHa
// set the security page status (and its controls as well)
ImpPDFTabSecurityPage* pSecPage = mpParent ? mpParent->getSecurityPage() :
nullptr;
if (pSecPage)
-pSecPage->ImplPDFASecurityControl(!bIsPDFA);
+pSecPage->ImplPDFASecurityControl();
mxCbTaggedPDF->set_sensitive(
!bIsPDFA && !bIsPDFUA && !IsReadOnlyProperty("UseTaggedPDF"));
@@ -1315,6 +1315,7 @@
ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(weld::Container* pPage, weld::Dialo
, mxCbEnableCopy(m_xBuilder->weld_check_button("enablecopy"))
, mxCbEnableAccessibility(m_xBuilder->weld_check_button("enablea11y"))
, mxPasswordTitle(m_xBuilder->weld_label("setpasswordstitle"))
+, mxPermissionTitle(m_xBuilder->weld_label("label2"))
{
msStrSetPwd = mxPasswordTitle->get_label();
mxPbSetPwd->connect_clicked(LINK(this, ImpPDFTabSecurityPage,
ClickmaPbSetPwdHdl));
@@ -1411,7 +1412,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const
ImpPDFTabDialog* pParent
ImpPDFTabGeneralPage* pGeneralPage = pParent->getGeneralPage();
if (pGeneralPage)
-ImplPDFASecurityControl(!pGeneralPage->IsPdfaSelected());
+ImplPDFASecurityControl();
}
IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, weld::Button&, void)
@@ -1479,6 +1480,8 @@ void ImpPDFTabSecurityPage::enablePermissionControls()
{
mxCbEnableAccessibility->set_active(true);
}
+mxPermissionTitle->set_sensitive(!bIsPDFASel);
+mxPbSetPwd->set_sensitive(!bIsPDFASel);
mxCbEnableAccessibility->set_sensitive(!bIsPDFUASel);
if (bIsPDFASel)
{
@@ -1532,9 +1535,8 @@ void ImpPDFTabSecurityPage::enablePermissionControls()
// This tab page is under control of the PDF/A-1a checkbox:
// TODO: implement a method to do it.
-void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity )
+void ImpPDFTabSecurityPage::ImplPDFASecurityControl()
{
-m_xContainer->set_sensitive(bEnableSecurity);
// after enable, check the status of control as if the dialog was
initialized
enablePermissionControls();
}
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 7a8985ebc807..8cbfc0af987f 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -355,6 +355,7 @@ class ImpPDFTabSecurityPage : public SfxTabPage
std::unique_ptr mxCbEnableCopy;
std::unique_ptr mxCbEnableAccessibility;
std::unique_ptr mxPasswordTitle;
+std::unique_ptr mxPermissionTitle;
std::shared_ptr< SfxPasswordDialog > mpPasswordDialog;
std::shared_ptr< weld::MessageDialog > mpUnsupportedMsgDialog;
@@ -371,7 +372,7 @@ public:
voidGetFilterConfigItem( ImpPDFTabDialog*
paParent);
voidSetFilterConfigItem( const ImpPDFTabDialog*
paParent );
-voidImplPDFASecurityControl( bool bEnableSecurity
);
+voidImplPDFASecurityControl();
boolhasPassword() const { return
mbHaveOwnerPassword || mbHaveUserPassword; }
};
[Libreoffice-commits] core.git: sd/source
sd/source/ui/table/tablefunction.cxx |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 86eb7ad2b4488dcd29c21ae3fc525056b681e199 Author: Heiko Tietze AuthorDate: Wed Oct 4 18:51:21 2023 +0200 Commit: Heiko Tietze CommitDate: Thu Oct 5 09:36:13 2023 +0200 Resolves tdf#156685 - "Object without fill" style for tables The "Default Drawing Style" uses Tango Sky Blue for the background, which is treated as dark since commit Ia5e405fc05613726b5011174c8d00ca204eb31b2. This ends up in unreadable white font color on white backgrounds for tables. The new style "Object without fill" has a clear background. Change-Id: I6b2f701e4a8cce6200fd2a5e86037e9a36b32833 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157568 Tested-by: Heiko Tietze Reviewed-by: Heiko Tietze diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 67196e864b39..b28f89c896e2 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -44,6 +44,8 @@ #include #include #include +#include +#include #include @@ -147,7 +149,11 @@ static void InsertTableImpl(const DrawViewShell* pShell, aRect, nColumns, nRows); -pObj->NbcSetStyleSheet( pShell->GetDoc()->GetDefaultStyleSheet(), true ); +//tables must not use default background tango sky blue tdf#156685 +SfxStyleSheet* pStyleSheet = static_cast( +pShell->GetDoc()->GetStyleSheetPool()->Find( +SdResId(STR_POOLSHEET_OBJWITHOUTFILL), SfxStyleFamily::Para)); +pObj->NbcSetStyleSheet( pStyleSheet, true ); apply_table_style( pObj.get(), pShell->GetDoc(), sTableStyle ); SdrPageView* pPV = pView->GetSdrPageView();
[Libreoffice-commits] core.git: cui/uiconfig sw/source
cui/uiconfig/ui/querysetinsmodedialog.ui |3 +-- sw/source/uibase/wrtsh/select.cxx|2 +- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 5a9c035486a1b2d0796656e33a659718d0b21c09 Author: Heiko Tietze AuthorDate: Fri Sep 29 11:53:37 2023 +0200 Commit: Heiko Tietze CommitDate: Fri Sep 29 13:18:53 2023 +0200 Related tdf#155561 - Query logic inverted "Don't ask again" was working like "Show this dialog" or "Ask for confirmation" before Decided against a renaming since we use the "Do not again" text on other places and it is more common in this type of confirmation dialog than the positive (and checked) form Change-Id: I705376d11bc662b157d38bf7a89fb8db13819e6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157404 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/querysetinsmodedialog.ui b/cui/uiconfig/ui/querysetinsmodedialog.ui index a21659afae5e..76162dc2 100644 --- a/cui/uiconfig/ui/querysetinsmodedialog.ui +++ b/cui/uiconfig/ui/querysetinsmodedialog.ui @@ -23,12 +23,11 @@ end -Don't show again +Do not show again True True False True -True True diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index ebec0dbfed2a..fe369d0f2091 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -697,7 +697,7 @@ void SwWrtShell::SetInsMode( bool bOn ) std::shared_ptr xChanges( comphelper::ConfigurationChanges::create()); - officecfg::Office::Common::Misc::QuerySetInsMode::set(xCheckBox->get_active(), xChanges); + officecfg::Office::Common::Misc::QuerySetInsMode::set(!xCheckBox->get_active(), xChanges); xChanges->commit(); if ( nResult == static_cast(RET_NO) )
[Libreoffice-commits] core.git: cui/uiconfig cui/UIConfig_cui.mk icon-themes/colibre officecfg/registry solenv/sanitizers sw/inc sw/source
cui/UIConfig_cui.mk|1 cui/uiconfig/ui/querysetinsmodedialog.ui | 157 + icon-themes/colibre/res/queryinsmode.png |binary officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 solenv/sanitizers/ui/cui.false |1 sw/inc/bitmaps.hlst|2 sw/source/uibase/wrtsh/select.cxx | 25 ++ 7 files changed, 193 insertions(+) New commits: commit a52bc9b5d6f86b6919931db21d83834d6c14e955 Author: Heiko Tietze AuthorDate: Fri Jun 23 14:57:54 2023 +0200 Commit: Heiko Tietze CommitDate: Wed Sep 27 17:04:57 2023 +0200 Resolves tdf#155561 - Notification for the overwrite mode Dialog shown when it's enabled for the first time Introduces the registry variable QuerySetInsMode Adds an eye-catching image under res/queryinsmode.png Change-Id: I0131177fb54238d48a671bc9ceb88283f796a526 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153505 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index a863e155dd04..b9863422c64a 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -192,6 +192,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/querynosavefiledialog \ cui/uiconfig/ui/querysavelistdialog \ cui/uiconfig/ui/queryupdategalleryfilelistdialog \ + cui/uiconfig/ui/querysetinsmodedialog \ cui/uiconfig/ui/recordnumberdialog \ cui/uiconfig/ui/rotationtabpage \ cui/uiconfig/ui/scriptorganizer \ diff --git a/cui/uiconfig/ui/querysetinsmodedialog.ui b/cui/uiconfig/ui/querysetinsmodedialog.ui new file mode 100644 index ..a21659afae5e --- /dev/null +++ b/cui/uiconfig/ui/querysetinsmodedialog.ui @@ -0,0 +1,157 @@ + + + + + +False +Confirm overwrite mode +False +dialog + + +False +12 +12 +12 +12 +vertical + + +False +12 +True +end + + +Don't show again +True +True +False +True +True +True + + +True +True +0 +True + + + + +No +True +True +True + + +True +True +1 + + + + +Yes +True +True +True + + +True +True +2 + + + + +False +True +end +1 + + + + + +True +False +12 +12 + + +True +False +False +You are switching to the overwrite mode +0 + + + + + + +1 +0 + + + + +True +False +False +The overwrite mode allows to type over text. It is indicated by a block cursor and at the statusbar. Press Insert again to switch back. +True +word-char +40 +0 + + +1 +1 + + + + +True +False +start +Do you want to continue? +True +0 + + +1 +2 + + + + +True +False + + +0 +1 +2 + + + + + + + +False +True +0 + + + + + + btnNo + btnYes + + + diff --git a/icon-themes/colibre/res/queryinsmode.png b/icon-themes/colibre/res/queryinsmode.png new file mode 100644 index ..029c7570a7bf Binary files /dev/null and b/icon-themes/colibre/res/queryinsmode.png differ diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/imagetabpage.ui | 176 1 file changed, 88 insertions(+), 88 deletions(-) New commits: commit 3575abbab1994aa1e0ccd8774a7d7fafb22d79e0 Author: Heiko Tietze AuthorDate: Sat Sep 23 14:24:58 2023 +0300 Commit: Heiko Tietze CommitDate: Tue Sep 26 07:57:02 2023 +0200 Resolves tdf#154019 - Better label in Area dialog more informative Change-Id: Iaa20a88f42e056c6fa005df9854ae0b83d6ce662 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157184 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/imagetabpage.ui b/cui/uiconfig/ui/imagetabpage.ui index f4574f298560..f83ea9a5df74 100644 --- a/cui/uiconfig/ui/imagetabpage.ui +++ b/cui/uiconfig/ui/imagetabpage.ui @@ -1,49 +1,49 @@ - + 100 -1 -10 +1 +10 True -False +False True True -6 +6 6 True -False -0 -none +False +0 +none True -False -vertical -6 +False 12 6 +vertical +6 True -True +True True -never -never -in +never +never +in True -False +False True -True +True GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK True @@ -61,8 +61,8 @@ Add / Import True -True -True +True +True Locate the image that you want to import, and then click Open. The image is added to the end of the list of available images. @@ -80,7 +80,7 @@ True -False +False Image 0 @@ -98,35 +98,35 @@ True -False +False True True -0 -none +0 +none True -False +False start +12 +6 True True vertical 6 -12 -6 True -False +False vertical 3 True -False +False Style: -True -imagestyle +True +imagestyle 0 @@ -138,7 +138,7 @@ True -False +False Custom position/size Tiled @@ -161,13 +161,13 @@ True -False +False vertical 3 True -False +False Size: 0 @@ -180,15 +180,15 @@ True -False +False 6 True -False +False Width: -True -width +True +width False @@ -199,9 +199,9 @@ True -True -True +True True +True False @@ -219,15 +219,15 @@ True -False +False 6 True -False +
[Libreoffice-commits] core.git: sfx2/sdi
sfx2/sdi/sfx.sdi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 90c97ccfd8c0324fffec8852935e71e1f0670d76 Author: Heiko Tietze AuthorDate: Sat Sep 23 14:57:43 2023 +0300 Commit: Heiko Tietze CommitDate: Sun Sep 24 19:58:58 2023 +0200 Resolves tdf#136216 - Hide uno:AdditionsDialog from customization Change-Id: I0948a85cf222a44534473ee465087213734536b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157185 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 669934693c0f..5660596a3b3d 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -5840,9 +5840,9 @@ SfxVoidItem AdditionsDialog SID_ADDITIONS_DIALOG RecordAbsolute = FALSE, RecordPerSet; -AccelConfig = TRUE, -MenuConfig = TRUE, -ToolBoxConfig = TRUE, +AccelConfig = FALSE, +MenuConfig = FALSE, +ToolBoxConfig = FALSE, GroupId = SfxGroupId::Application; ]
[Libreoffice-commits] core.git: cui/uiconfig officecfg/registry
cui/uiconfig/ui/cuiimapdlg.ui|2 +- cui/uiconfig/ui/objecttitledescdialog.ui |4 ++-- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit a5ece3a525466198c91633af3b9e0d6edfe9802f Author: Heiko Tietze AuthorDate: Sat Sep 23 14:14:47 2023 +0300 Commit: Heiko Tietze CommitDate: Sun Sep 24 18:51:32 2023 +0200 Resolves tdf#155044 - Rename "Description" to "Alt Text" Change-Id: Idc6602c6dfc7c6c8703fb8fc643665d7149486a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157183 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/cuiimapdlg.ui b/cui/uiconfig/ui/cuiimapdlg.ui index 5618564cb5c3..870839b8c82a 100644 --- a/cui/uiconfig/ui/cuiimapdlg.ui +++ b/cui/uiconfig/ui/cuiimapdlg.ui @@ -242,7 +242,7 @@ True False True -_Text Alternative: +Alt _Text: Enter a short description of essential features of the image map for persons who do not see the image. True textentry diff --git a/cui/uiconfig/ui/objecttitledescdialog.ui b/cui/uiconfig/ui/objecttitledescdialog.ui index e2cc8f1330ba..bcb121dc7797 100644 --- a/cui/uiconfig/ui/objecttitledescdialog.ui +++ b/cui/uiconfig/ui/objecttitledescdialog.ui @@ -12,7 +12,7 @@ False 6 -Description +Alt Text True 0 0 @@ -90,7 +90,7 @@ True False Give a short description of non-text content for users who do not see this object. -_Text Alternative: +Text: True object_title_entry 0 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index d21f7ebd7a07..b31c153d6dc5 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -7252,7 +7252,7 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 - Description... + Alt Text... Add descriptions of non-text content (for accessibility)
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/config/optcomp.cxx | 45 ---
sw/source/uibase/inc/optcomp.hxx|4 -
sw/uiconfig/swriter/ui/optcompatpage.ui | 124
3 files changed, 1 insertion(+), 172 deletions(-)
New commits:
commit 1d4cd39262fb71f72311e33ac2bdb7d925be5d98
Author: Heiko Tietze
AuthorDate: Thu Sep 14 10:48:46 2023 +0200
Commit: Heiko Tietze
CommitDate: Thu Sep 14 12:39:12 2023 +0200
Related tdf#157006 - Remove global compatibility options
Clean-up the UI in favor of the advanced options
Change-Id: I11ffa643fc577e7eee41f42bd3e16fb290202f76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156911
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 7d6ecaf24e4d..8620ac451919 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -50,17 +50,12 @@
SwCompatibilityOptPage::SwCompatibilityOptPage(weld::Container* pPage, weld::Dia
, m_pWrtShell(nullptr)
, m_pImpl(new SwCompatibilityOptPage_Impl)
, m_nSavedOptions(0)
-, m_bSavedMSFormsMenuOption(false)
, m_xMain(m_xBuilder->weld_frame("compatframe"))
-, m_xGlobalOptionsFrame(m_xBuilder->weld_frame("globalcompatframe"))
, m_xFormattingLB(m_xBuilder->weld_combo_box("format"))
-, m_xGlobalOptionsLB(m_xBuilder->weld_combo_box("globaloptions"))
, m_xOptionsLB(m_xBuilder->weld_tree_view("options"))
-, m_xGlobalOptionsCLB(m_xBuilder->weld_tree_view("globaloptioncheckbox"))
, m_xDefaultPB(m_xBuilder->weld_button("default"))
{
m_xOptionsLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
-m_xGlobalOptionsCLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
int nPos = 0;
for (int i = static_cast(SvtCompatibilityEntry::Index::Module) + 1;
@@ -80,21 +75,6 @@
SwCompatibilityOptPage::SwCompatibilityOptPage(weld::Container* pPage, weld::Dia
m_xFormattingLB->clear();
-// Set MSOCompatibleFormsMenu entry attributes
-const bool bReadOnly =
officecfg::Office::Compatibility::View::MSCompatibleFormsMenu::isReadOnly();
-m_xGlobalOptionsCLB->set_sensitive(!bReadOnly);
-
-m_xGlobalOptionsCLB->append();
-const bool bChecked =
officecfg::Office::Compatibility::View::MSCompatibleFormsMenu::get();
-m_xGlobalOptionsCLB->set_toggle(0, bChecked ? TRISTATE_TRUE :
TRISTATE_FALSE);
-m_xGlobalOptionsCLB->set_text(0, m_xGlobalOptionsLB->get_text(0), 0);
-
-m_xGlobalOptionsLB->clear();
-
-// tdf#125799, we let only the doc options grow/shrink but give this one
more than its bare
-// min request height because there's only one row in it and that looks
somewhat abrupt
-m_xGlobalOptionsCLB->set_size_request(-1,
m_xGlobalOptionsCLB->get_preferred_size().Height() * 2);
-
InitControls( rSet );
// set handler
@@ -196,7 +176,6 @@ void SwCompatibilityOptPage::InitControls( const
SfxItemSet& rSet )
else
{
m_xMain->set_sensitive(false);
-m_xGlobalOptionsFrame->set_sensitive(false);
}
const OUString& rText = m_xMain->get_label();
m_xMain->set_label(rText.replaceAll("%DOCNAME", sDocTitle));
@@ -472,27 +451,6 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* )
if ( bModified )
WriteOptions();
-bool bNewMSFormsMenuOption = m_xGlobalOptionsCLB->get_toggle(0);
-if (m_bSavedMSFormsMenuOption != bNewMSFormsMenuOption)
-{
-std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Office::Compatibility::View::MSCompatibleFormsMenu::set(bNewMSFormsMenuOption,
batch);
-batch->commit();
-
-m_bSavedMSFormsMenuOption = bNewMSFormsMenuOption;
-bModified = true;
-
-// Show a message about that the option needs a restart to be applied
-{
-SolarMutexGuard aGuard;
-if
(svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
- GetFrameWeld(),
svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU))
-{
-GetDialogController()->response(RET_OK);
-}
-}
-}
-
return bModified;
}
@@ -503,9 +461,6 @@ void SwCompatibilityOptPage::Reset( const SfxItemSet* )
sal_uInt32 nOptions = GetDocumentOptions();
SetCurrentOptions( nOptions );
m_nSavedOptions = nOptions;
-
-m_bSavedMSFormsMenuOption =
officecfg::Office::Compatibility::View::MSCompatibleFormsMenu::get();
-m_xGlobalOptionsCLB->set_toggle(0, m_bSavedMSFormsMenuOption ?
TRISTATE_TRUE : TRISTATE_FALSE);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx
index c98f17f0a3cd..d4ebbcb6b58e 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.hxx
@@ -40,15 +40,11 @@ private:
std::unique_ptr m_pImpl;
[Libreoffice-commits] core.git: extras/source filter/source include/svx oox/source svx/inc
extras/source/palettes/standard.sod |2 +-
filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl |4 ++--
include/svx/strings.hrc |2 +-
oox/source/drawingml/lineproperties.cxx |2 +-
svx/inc/strings.hxx |2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit df982f67ced630fc417540941392459dee8ab7eb
Author: Heiko Tietze
AuthorDate: Fri Aug 25 09:48:37 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Aug 25 11:12:02 2023 +0200
Resolves tdf#155926 - Rename "Line Style 9"
Sparse dash
Change-Id: Ia676358ea0de4437dd2e5f210b26a4e97f8d8758
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156090
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/extras/source/palettes/standard.sod
b/extras/source/palettes/standard.sod
index 7b68ea06cf9c..e664ff565168 100644
--- a/extras/source/palettes/standard.sod
+++ b/extras/source/palettes/standard.sod
@@ -28,7 +28,7 @@
-
+
diff --git a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
index 95d0d6b9d271..dbd1f5460c57 100644
--- a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
+++ b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
@@ -522,7 +522,7 @@
-
+
@@ -6779,7 +6779,7 @@
-
+
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 80066b3d33f3..d0a7390045ae 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -920,7 +920,7 @@
#define RID_SVXSTR_DASH12
NC_("RID_SVXSTR_DASH12", "Fine Dashed")
#define RID_SVXSTR_DASH13
NC_("RID_SVXSTR_DASH13", "Fine Dashed")
#define RID_SVXSTR_DASH14
NC_("RID_SVXSTR_DASH14", "Dashed")
-#define RID_SVXSTR_DASH15
NC_("RID_SVXSTR_DASH15", "Line Style 9")
+#define RID_SVXSTR_DASH15
NC_("RID_SVXSTR_DASH15", "Sparse Dash")
#define RID_SVXSTR_DASH16
NC_("RID_SVXSTR_DASH16", "3 Dashes 3 Dots")
#define RID_SVXSTR_DASH17
NC_("RID_SVXSTR_DASH17", "Ultrafine 2 Dots 3 Dashes")
#define RID_SVXSTR_DASH18
NC_("RID_SVXSTR_DASH18", "2 Dots 1 Dash")
diff --git a/oox/source/drawingml/lineproperties.cxx
b/oox/source/drawingml/lineproperties.cxx
index 5d818a26c613..d52bf07498ee 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -130,7 +130,7 @@ void lclRecoverStandardDashStyles(LineDash& orLineDash,
sal_Int32 nLineWidth)
// Use same ersatz for hairline as in export.
double fWidthHelp = nLineWidth == 0 ? 26.95/100.0 : nLineWidth / 100.0;
// start with (var) cases, because they have no rounding problems
-// "Fine Dashed", "Line Style 9" and "Dashed (var)" need no recover
+// "Fine Dashed", "Sparse Dash" and "Dashed (var)" need no recover
if (nDots == 3 && nDotLen == 197 & == 3 && nDashLen == 100 &&
nDistance == 100)
{ // "3 Dashes 3 Dots (var)"
orLineDash.DashLen = 0;
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 17302aa13ae0..a9bd9eb0dc4a 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -331,7 +331,7 @@ inline constexpr OUStringLiteral RID_SVXSTR_DASH11_DEF
= u
inline constexpr OUStringLiteral RID_SVXSTR_DASH12_DEF =
u"Fine Dashed";
inline constexpr OUStringLiteral RID_SVXSTR_DASH13_DEF =
u"Fine Dashed (var)";
inline constexpr OUStringLiteral RID_SVXSTR_DASH14_DEF =
u"Dashed (var)";
-inline constexpr OUStringLiteral RID_SVXSTR_DASH15_DEF =
u"Line Style 9";
+inline constexpr OUStringLiteral RID_SVXSTR_DASH15_DEF =
u"Sparse Dash";
inline constexpr OUStringLiteral RID_SVXSTR_DASH16_DEF =
u"3 Dashes 3 Dots (var)";
inline constexpr OUStringLiteral RID_SVXSTR_DASH17_DEF =
u"Ultrafine 2 Dots 3 Dashes";
inline constexpr OUStringLiteral RID_SVXSTR_DASH18_DEF =
u"2 Dots 1 Dash";
[Libreoffice-commits] core.git: sfx2/sdi
sfx2/sdi/sfx.sdi |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05f7ab11bec87b706f598ae4e81d1f20cd4f1312 Author: Heiko Tietze AuthorDate: Thu Aug 24 14:35:05 2023 +0200 Commit: Heiko Tietze CommitDate: Fri Aug 25 11:10:05 2023 +0200 Resolves tdf#156404 - No hotkey to apply cloned formatting Block customization for FormatPaintBrush as it allows modifier keys and has a multi-step workflow The patch has no effect yet because of tdf#147411 Change-Id: I4f5e423f483c490a994af4708552442f7716fc2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156052 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 6541b39e47cd..669934693c0f 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4636,7 +4636,7 @@ SfxBoolItem FormatPaintbrush SID_FORMATPAINTBRUSH ( SfxBoolItem PersistentCopy S RecordAbsolute = FALSE, RecordPerSet; - AccelConfig = TRUE, + AccelConfig = FALSE, MenuConfig = TRUE, ToolBoxConfig = TRUE, GroupId = SfxGroupId::Edit;
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabvwsh3.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 27fa859bb85ba7ac5b8cb22db5ae85750c7effba Author: Heiko Tietze AuthorDate: Thu Jul 27 11:08:35 2023 +0200 Commit: Heiko Tietze CommitDate: Fri Aug 18 09:21:23 2023 +0200 Resolves tdf#156357 - Submit Show Formula to document Change-Id: Ic893e573b2409342d61877313a3b60e83bb13690 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154984 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 7395325f775c..255dbed88508 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -721,6 +721,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScViewOptions aSetOpts = rOpts; aSetOpts.SetOption( VOPT_FORMULAS, bFormulaMode ); rViewData.SetOptions( aSetOpts ); +ScDocument& rDoc = rViewData.GetDocument(); +rDoc.SetViewOptions(aSetOpts); rViewData.GetDocShell()->PostPaintGridAll();
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/inftxt.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4d7a98b582dc70bbffc78e6622969e218f108433
Author: Heiko Tietze
AuthorDate: Fri Jul 28 14:38:44 2023 +0200
Commit: Heiko Tietze
CommitDate: Sun Jul 30 10:52:51 2023 +0200
Related tdf#58434 - Treat ZWSP and WJ as hard space
U+200B ZERO WIDTH SPACE and U+2060 WORD JOINER are not highlighted
anymore if Formatting Aids > Non-breaking spaces is off
Change-Id: Id35fb725bbfa14683ceb31d2043848a66328b364
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155019
Tested-by: Heiko Tietze
Reviewed-by: خالد حسني
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 715780f65269..7544868bc2ee 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1494,6 +1494,7 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion
,
{
bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
}
+bDraw &= GetOpt().IsHardBlank();
break;
case PortionType::Bookmark:
// no shading
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/medialine.ui | 133 + svx/uiconfig/ui/mediawindow.ui | 119 +++- 2 files changed, 133 insertions(+), 119 deletions(-) New commits: commit 1fb3584d61441d864c14ff3376d2fa485edf400b Author: Heiko Tietze AuthorDate: Fri Jul 28 12:39:22 2023 +0200 Commit: Heiko Tietze CommitDate: Fri Jul 28 16:03:25 2023 +0200 Resolves tdf#156504 - Strings in media player made translatable Change-Id: I2798d0becf7075bd0f484b4e96b44fa29c551415 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155013 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/svx/uiconfig/ui/medialine.ui b/svx/uiconfig/ui/medialine.ui index 2e86fe853065..cfbef49e1e41 100644 --- a/svx/uiconfig/ui/medialine.ui +++ b/svx/uiconfig/ui/medialine.ui @@ -1,40 +1,41 @@ - + 100 -1 -10 +1 +10 100 -1 -10 +1 +10 True -False +False True -False +False True 12 True -True +True center -icons -False +icons +False -True -Open -True -avmedia/res/av02048.png +False +True +Open +True +avmedia/res/av02048.png False @@ -43,10 +44,11 @@ -True -Apply -True -avmedia/res/av02053.png +False +True +Apply +True +avmedia/res/av02053.png False @@ -55,8 +57,8 @@ -False -True +False +True False @@ -66,9 +68,10 @@ True -Play -True -avmedia/res/av02049.png +False +Play +True +avmedia/res/av02049.png False @@ -78,9 +81,10 @@ True -Pause -True -avmedia/res/av02050.png +False +Pause +True +avmedia/res/av02050.png False @@ -90,9 +94,10 @@ True -Stop -True -avmedia/res/av02051.png +False +Stop +True +avmedia/res/av02051.png False @@ -102,7 +107,7 @@ True -False +False False @@ -112,9 +117,10 @@ True -Repeat -True -avmedia/res/av02052.png +False +Repeat +True +avmedia/res/av02052.png False @@ -131,26 +137,26 @@ True -True -icons -False +True +icons +False True -False +False True -False +False -128 +128 True -True +True True adjustment1 2 -False +False False @@ -161,10 +167,10 @@ True -True +True False -True 0.5 +True False @@ -190,15 +196,16 @@ True -True -icons -False +True +icons +False
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/docstat.hxx |1
sw/source/core/doc/docstat.cxx |2
sw/source/ui/dialog/wordcountdialog.cxx |5
sw/source/uibase/inc/wordcountdialog.hxx |1
sw/source/uibase/uiview/view2.cxx|5
sw/uiconfig/swriter/ui/wordcount.ui | 192 +--
6 files changed, 122 insertions(+), 84 deletions(-)
New commits:
commit 90e3af16c12f94f487ff7516048a239db1d2ff7d
Author: Heiko Tietze
AuthorDate: Tue Jul 18 15:02:58 2023 +0200
Commit: Heiko Tietze
CommitDate: Wed Jul 26 10:37:35 2023 +0200
Resolves tdf#95329 - Number of comments in word count dialog
Change-Id: I29ca811065cce83f9c8630f79a2b78c2c3fe0da1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154581
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx
index fd53d80bfcbf..84476db5c065 100644
--- a/sw/inc/docstat.hxx
+++ b/sw/inc/docstat.hxx
@@ -36,6 +36,7 @@ struct SW_DLLPUBLIC SwDocStat
sal_uLong nAsianWord;
sal_uLong nChar;
sal_uLong nCharExcludingSpaces;
+sal_uLong nComments;
boolbModified;
SwDocStat();
diff --git a/sw/source/core/doc/docstat.cxx b/sw/source/core/doc/docstat.cxx
index c34e8d094ba2..959c61833dd6 100644
--- a/sw/source/core/doc/docstat.cxx
+++ b/sw/source/core/doc/docstat.cxx
@@ -30,6 +30,7 @@ SwDocStat::SwDocStat() :
nAsianWord(0),
nChar(0),
nCharExcludingSpaces(0),
+nComments(0),
bModified(true)
{}
@@ -45,6 +46,7 @@ void SwDocStat::Reset()
nAsianWord = 0;
nChar = 0;
nCharExcludingSpaces = 0;
+nComments = 0;
bModified = true;
}
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx
b/sw/source/ui/dialog/wordcountdialog.cxx
index a96e1c50b3be..b0b92a6ae1a7 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#define IS_MOBILE_PHONE (comphelper::LibreOfficeKit::isActive() &&
SfxViewShell::Current() && SfxViewShell::Current()->isLOKMobilePhone())
@@ -64,6 +65,7 @@ void SwWordCountFloatDlg::SetValues(const SwDocStat&
rCurrent, const SwDocStat&
setValue(*m_xDocCharacterFT, rDoc.nChar, rLocaleData);
setValue(*m_xDocCharacterExcludingSpacesFT, rDoc.nCharExcludingSpaces,
rLocaleData);
setValue(*m_xDocCjkcharsFT, rDoc.nAsianWord, rLocaleData);
+setValue(*m_xDocComments, rCurrent.nComments, rLocaleData);
if (m_xStandardizedPagesLabelFT->get_visible())
{
@@ -120,6 +122,7 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings*
_pBindings,
, m_xCjkcharsLabelFT2(m_xBuilder->weld_label("cjkcharsft2"))
, m_xStandardizedPagesLabelFT(m_xBuilder->weld_label("standardizedpages"))
,
m_xStandardizedPagesLabelFT2(m_xBuilder->weld_label("standardizedpages2"))
+, m_xDocComments(m_xBuilder->weld_label("docComments"))
{
showCJK(SvtCJKOptions::IsAnyEnabled());
showStandardizedPages(officecfg::Office::Writer::WordCount::ShowStandardizedPageCount::get());
@@ -143,6 +146,8 @@ void SwWordCountFloatDlg::UpdateCounts()
aDocStat = rSh.GetUpdatedDocStat();
rSh.EndAction();
}
+SwPostItMgr* pPostItMgr = rSh.GetPostItMgr();
+aCurrCnt.nComments = pPostItMgr->end() - pPostItMgr->begin();
SetValues(aCurrCnt, aDocStat);
}
}
diff --git a/sw/source/uibase/inc/wordcountdialog.hxx
b/sw/source/uibase/inc/wordcountdialog.hxx
index c5b23f0c5307..ffa0b6478dcc 100644
--- a/sw/source/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/uibase/inc/wordcountdialog.hxx
@@ -43,6 +43,7 @@ class SwWordCountFloatDlg final : public
SfxModelessDialogController
std::unique_ptr m_xCjkcharsLabelFT2;
std::unique_ptr m_xStandardizedPagesLabelFT;
std::unique_ptr m_xStandardizedPagesLabelFT2;
+std::unique_ptr m_xDocComments;
public:
SwWordCountFloatDlg(SfxBindings* pBindings,
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 2903bbf19c03..0fb4f0e22a2b 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1875,9 +1875,12 @@ void SwView::StateStatusLine(SfxItemSet )
OUString aWordCount(SwResId(pResId));
aWordCount = aWordCount.replaceAll("$1", aWordArg);
aWordCount = aWordCount.replaceAll("$2", aCharArg);
-
rSet.Put( SfxStringItem( FN_STAT_WORDCOUNT, aWordCount ) );
+SwPostItMgr* pPostItMgr = rShell.GetPostItMgr();
+if (pPostItMgr)
+selectionStats.nComments = pPostItMgr->end() -
pPostItMgr->begin();
+
SwWordCountWrapper *pWrdCnt =
static_cast(GetViewFrame().GetChildWindow(SwWordCountWrapper::GetChildWindowId()));
if (pWrdCnt)
pWrdCnt->SetCounts(selectionStats, documentStats);
diff --git
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 56ce1aa9239637a10f747c00ba93e96bb2e613ab Author: Heiko Tietze AuthorDate: Mon Jul 24 17:33:55 2023 +0200 Commit: Heiko Tietze CommitDate: Tue Jul 25 14:51:14 2023 +0200 Resolves tdf#58434 - No field shading for soft hyphen and non-breaking spaces Change-Id: I27123b013aa8fc876ddb06e1dd96f4ac50d6ebbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154847 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 0f684bb2eea9..5ac39808f1d0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1144,7 +1144,7 @@ Specifies whether optional hyphens are shown on the screen. Optional hyphens - true + false @@ -1160,7 +1160,7 @@ Specifies whether protected spaces are shown on the screen. Protected Spaces - true + false
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 +++
sc/source/ui/view/cellsh4.cxx| 12
2 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit c7de706f5f4b32babdad1cf2ced4e79c802df46a
Author: Heiko Tietze
AuthorDate: Mon Jul 17 16:03:41 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Jul 21 14:51:01 2023 +0200
Resolves tdf#112876 - Make use of scroll lock configurable
Change-Id: I8e2f238e59601fcc1d92fc0593c3d20e75396cc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154528
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
(cherry picked from commit 4adc868328e958a4a9cead3731bd3468497c97c8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154696
Reviewed-by: Heiko Tietze
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d282ca681fa0..0cb348ea087e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -690,6 +690,13 @@
true
+
+
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+
+true
+
Specifies the functions last used.
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 13d6993634dd..e44dbe599dba 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
void ScCellShell::ExecuteCursor( SfxRequest& rReq )
@@ -121,10 +122,13 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
// If ScrollLock key is active, cell cursor stays on the current cell while
// scrolling the grid.
bool bScrollLock = false;
-KeyIndicatorState eState = pFrameWin->GetIndicatorState();
-if (eState & KeyIndicatorState::SCROLLLOCK)
-bScrollLock = true;
-
+// tdf#112876 - allow to disable for special keyboards
+if (officecfg::Office::Calc::Input::UseScrollLock::get())
+{
+KeyIndicatorState eState = pFrameWin->GetIndicatorState();
+if (eState & KeyIndicatorState::SCROLLLOCK)
+bScrollLock = true;
+}
//OS: once for all should do, however!
pTabViewShell->ExecuteInputDirect();
switch ( nSlotId )
[Libreoffice-commits] core.git: officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 +++
sc/source/ui/view/cellsh4.cxx| 12
2 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 4adc868328e958a4a9cead3731bd3468497c97c8
Author: Heiko Tietze
AuthorDate: Mon Jul 17 16:03:41 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue Jul 18 15:05:34 2023 +0200
Resolves tdf#112876 - Make use of scroll lock configurable
Change-Id: I8e2f238e59601fcc1d92fc0593c3d20e75396cc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154528
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d861f56e81d7..eff7ac7aa80a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -690,6 +690,13 @@
true
+
+
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+
+true
+
Specifies the functions last used.
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 13d6993634dd..e44dbe599dba 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
void ScCellShell::ExecuteCursor( SfxRequest& rReq )
@@ -121,10 +122,13 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
// If ScrollLock key is active, cell cursor stays on the current cell while
// scrolling the grid.
bool bScrollLock = false;
-KeyIndicatorState eState = pFrameWin->GetIndicatorState();
-if (eState & KeyIndicatorState::SCROLLLOCK)
-bScrollLock = true;
-
+// tdf#112876 - allow to disable for special keyboards
+if (officecfg::Office::Calc::Input::UseScrollLock::get())
+{
+KeyIndicatorState eState = pFrameWin->GetIndicatorState();
+if (eState & KeyIndicatorState::SCROLLLOCK)
+bScrollLock = true;
+}
//OS: once for all should do, however!
pTabViewShell->ExecuteInputDirect();
switch ( nSlotId )
[Libreoffice-commits] core.git: include/tools sd/qa
include/tools/color.hxx|4 ++--
sd/qa/unit/data/xml/tdf92001_0.xml |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ddb483509113e469b771320fea52f1b089574021
Author: Heiko Tietze
AuthorDate: Wed Jul 12 12:52:39 2023 +0200
Commit: Heiko Tietze
CommitDate: Sat Jul 15 08:33:55 2023 +0200
Resolves tdf#156182 - Automatic text color unreadable with darker cells
Change-Id: Ia5e405fc05613726b5011174c8d00ca204eb31b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154352
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 296d6064c40a..41826ec2335f 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -311,8 +311,8 @@ public:
*/
bool IsDark() const
{
-// 62 is the number that means it also triggers on Ubuntu in dark mode
-return GetLuminance() <= 62;
+// tdf#156182
+return GetLuminance() <= 156;
}
/** Comparison with luminance thresholds.
diff --git a/sd/qa/unit/data/xml/tdf92001_0.xml
b/sd/qa/unit/data/xml/tdf92001_0.xml
index d67952eb1fe5..234f751a9c23 100644
--- a/sd/qa/unit/data/xml/tdf92001_0.xml
+++ b/sd/qa/unit/data/xml/tdf92001_0.xml
@@ -1,6 +1,6 @@
-
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/uiconfig
sw/uiconfig/swriter/menubar/menubar.xml |1 + 1 file changed, 1 insertion(+) New commits: commit c2b5ef0ea307203131fa2718984dd7b96e61e4d9 Author: Heiko Tietze AuthorDate: Tue Jun 27 13:28:38 2023 +0200 Commit: Heiko Tietze CommitDate: Wed Jun 28 10:11:29 2023 +0200 Related tdf#106556 - Spotlight DF on the main menu Added to the Format menu Change-Id: I9b601aa4b55e9ce5a78fd8306d72baee71fd357f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153661 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 20a0593ac499..bc9b8751b016 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -426,6 +426,7 @@ +
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/menubar/menubar.xml |1 + 1 file changed, 1 insertion(+) New commits: commit f1b0aca6bf520626d3c9a1fac67cd2de2c10c78c Author: Heiko Tietze AuthorDate: Tue Jun 27 13:28:38 2023 +0200 Commit: Heiko Tietze CommitDate: Wed Jun 28 10:11:18 2023 +0200 Related tdf#106556 - Spotlight DF on the main menu Added to the Format menu Change-Id: I9b601aa4b55e9ce5a78fd8306d72baee71fd357f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153641 Reviewed-by: Vernon, Stuart Foote Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 20a0593ac499..bc9b8751b016 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -426,6 +426,7 @@ +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - vcl/uiconfig
vcl/uiconfig/ui/printdialog.ui | 148 + 1 file changed, 64 insertions(+), 84 deletions(-) New commits: commit 0e4603d80764772d848684152779824c9ef24b74 Author: Heiko Tietze AuthorDate: Fri Jun 23 11:42:35 2023 +0200 Commit: Heiko Tietze CommitDate: Mon Jun 26 14:44:26 2023 +0200 Resolves tdf#147514 - Number of copies on top of the print dialog Swapped with Odd/Even pages option to keep the dialog small Number of copies is assume to be the more relevant function Simple "More" renamed to give some clue of the options Change-Id: I8d1bd3455d5b8d57f47ac97c1a310fd47a4a5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153495 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit bea05a79c8ed565909e341a24b298d8deab7e042) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153595 diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 9d941db942a2..6f0aa80d05fd 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -1,5 +1,5 @@ - + @@ -609,14 +609,13 @@ - + True False start -Include: +_Number of copies: True -evenoddbox -0 +1 0 @@ -624,19 +623,19 @@ - + True -False -True -0 - - Odd and Even Pages - Odd Pages - Even Pages - +True +start +center +True +1 +True +adjustment2 +1 - -Select the subset of pages to print. + +Enter the number of copies that you want to print. @@ -661,7 +660,8 @@ True False -2 +6 +3 6 @@ -674,7 +674,7 @@ 0 -0 +1 @@ -684,7 +684,7 @@ 1 -0 +1 @@ -699,7 +699,7 @@ 0 -
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - extras/source include/svx svx/inc
extras/source/palettes/standard.sog |4 +++-
include/svx/strings.hrc | 22 +++---
svx/inc/strings.hxx | 22 +++---
3 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit ae1474e5086517c50e28cba890ed147061c04b9b
Author: Heiko Tietze
AuthorDate: Fri Jun 16 09:03:11 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon Jun 26 10:52:41 2023 +0200
MCGR: Some exemplary multi-color gradients
* "Rainbow, Sunrise, Sunset" added
* "Preset, Spotted Grey, Teal To Blue" removed
to keep items inside scrolled window
Change-Id: I3be6c8596accc769df92a8610260ed38a6c29602
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153166
Tested-by: Jenkins
Reviewed-by: Regina Henschel
Reviewed-by: Heiko Tietze
(cherry picked from commit b5b3d73e0fb47726fef1342c0944148e673ed1a6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153514
diff --git a/extras/source/palettes/standard.sog
b/extras/source/palettes/standard.sog
index 036faa856de4..32f9d37e9411 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1 +1,3 @@
-http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;>
+
+
+http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 249d01060a39..eb8ca335f91c 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -783,17 +783,17 @@
#define RID_SVXSTR_GRDT71
NC_("RID_SVXSTR_GRDT71", "Pastel Dream")
#define RID_SVXSTR_GRDT72
NC_("RID_SVXSTR_GRDT72", "Blue Touch")
#define RID_SVXSTR_GRDT73
NC_("RID_SVXSTR_GRDT73", "Blank with Gray")
-#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "Spotted Gray")
-#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "London Mist")
-#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Teal to Blue")
-#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Midnight")
-#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Deep Ocean")
-#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Submarine")
-#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Green Grass")
-#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Neon Light")
-#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Sunshine")
-#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Present")
-#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Mahogany")
+#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "London Mist")
+#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "Submarine")
+#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Midnight")
+#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Deep Ocean")
+#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Mahogany")
+#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Green Grass")
+#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Neon Light")
+#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Sunshine")
+#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Rainbow")
+#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Sunrise")
+#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Sunset")
// /gradients
#define RID_SVXSTR_HATCH0
NC_("RID_SVXSTR_HATCH0", "Black 0 Degrees")
#define RID_SVXSTR_HATCH1
NC_("RID_SVXSTR_HATCH1", "Black 90 Degrees")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 1c917bee9318..17302aa13ae0 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -192,17 +192,17 @@ inline constexpr OUStringLiteral RID_SVXSTR_GRDT70_DEF
= u
inline constexpr OUStringLiteral RID_SVXSTR_GRDT71_DEF =
u"Pastel Dream";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT72_DEF =
u"Blue Touch";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT73_DEF =
u"Blank with Gray";
[Libreoffice-commits] core.git: vcl/uiconfig
vcl/uiconfig/ui/printdialog.ui | 148 + 1 file changed, 64 insertions(+), 84 deletions(-) New commits: commit bea05a79c8ed565909e341a24b298d8deab7e042 Author: Heiko Tietze AuthorDate: Fri Jun 23 11:42:35 2023 +0200 Commit: Heiko Tietze CommitDate: Sun Jun 25 09:08:49 2023 +0200 Resolves tdf#147514 - Number of copies on top of the print dialog Swapped with Odd/Even pages option to keep the dialog small Number of copies is assume to be the more relevant function Simple "More" renamed to give some clue of the options Change-Id: I8d1bd3455d5b8d57f47ac97c1a310fd47a4a5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153495 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 9d941db942a2..6f0aa80d05fd 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -1,5 +1,5 @@ - + @@ -609,14 +609,13 @@ - + True False start -Include: +_Number of copies: True -evenoddbox -0 +1 0 @@ -624,19 +623,19 @@ - + True -False -True -0 - - Odd and Even Pages - Odd Pages - Even Pages - +True +start +center +True +1 +True +adjustment2 +1 - -Select the subset of pages to print. + +Enter the number of copies that you want to print. @@ -661,7 +660,8 @@ True False -2 +6 +3 6 @@ -674,7 +674,7 @@ 0 -0 +1 @@ -684,7 +684,7 @@ 1 -0 +1 @@ -699,7 +699,7 @@ 0 -1 +2
[Libreoffice-commits] core.git: extras/source include/svx svx/inc
extras/source/palettes/standard.sog |4 +++-
include/svx/strings.hrc | 22 +++---
svx/inc/strings.hxx | 22 +++---
3 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit d0a9d04d2287da456317c5a59af3ccbe3b98b977
Author: Heiko Tietze
AuthorDate: Fri Jun 16 09:03:11 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Jun 23 11:23:35 2023 +0200
MCGR: Some exemplary multi-color gradients
* "Rainbow, Sunrise, Sunset" added
* "Preset, Spotted Grey, Teal To Blue" removed
to keep items inside scrolled window
Change-Id: I3be6c8596accc769df92a8610260ed38a6c29602
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153166
Tested-by: Jenkins
Reviewed-by: Regina Henschel
Reviewed-by: Heiko Tietze
diff --git a/extras/source/palettes/standard.sog
b/extras/source/palettes/standard.sog
index 036faa856de4..32f9d37e9411 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1 +1,3 @@
-http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;>
+
+
+http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 249d01060a39..eb8ca335f91c 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -783,17 +783,17 @@
#define RID_SVXSTR_GRDT71
NC_("RID_SVXSTR_GRDT71", "Pastel Dream")
#define RID_SVXSTR_GRDT72
NC_("RID_SVXSTR_GRDT72", "Blue Touch")
#define RID_SVXSTR_GRDT73
NC_("RID_SVXSTR_GRDT73", "Blank with Gray")
-#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "Spotted Gray")
-#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "London Mist")
-#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Teal to Blue")
-#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Midnight")
-#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Deep Ocean")
-#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Submarine")
-#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Green Grass")
-#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Neon Light")
-#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Sunshine")
-#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Present")
-#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Mahogany")
+#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "London Mist")
+#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "Submarine")
+#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Midnight")
+#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Deep Ocean")
+#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Mahogany")
+#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Green Grass")
+#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Neon Light")
+#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Sunshine")
+#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Rainbow")
+#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Sunrise")
+#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Sunset")
// /gradients
#define RID_SVXSTR_HATCH0
NC_("RID_SVXSTR_HATCH0", "Black 0 Degrees")
#define RID_SVXSTR_HATCH1
NC_("RID_SVXSTR_HATCH1", "Black 90 Degrees")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 1c917bee9318..17302aa13ae0 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -192,17 +192,17 @@ inline constexpr OUStringLiteral RID_SVXSTR_GRDT70_DEF
= u
inline constexpr OUStringLiteral RID_SVXSTR_GRDT71_DEF =
u"Pastel Dream";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT72_DEF =
u"Blue Touch";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT73_DEF =
u"Blank with Gray";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT74_DEF =
u"Spotted Gray";
-inline constexpr OUStringLiteral
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - officecfg/registry sw/inc sw/source
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 25 +
sw/inc/viewopt.hxx | 10 +
sw/source/ui/config/optpage.cxx|1
sw/source/uibase/config/cfgitems.cxx |6 ++-
sw/source/uibase/config/usrpref.cxx| 21 --
sw/source/uibase/config/viewopt.cxx| 23 +++
sw/source/uibase/frmdlg/frmmgr.cxx |4 +-
sw/source/uibase/inc/cfgitems.hxx |1
sw/source/uibase/inc/optpage.hxx |2 +
9 files changed, 86 insertions(+), 7 deletions(-)
New commits:
commit cbcfada382a5a9aa33d55e996e7865487f5b769e
Author: Heiko Tietze
AuthorDate: Tue Dec 1 12:21:10 2020 +0100
Commit: Gabor Kelemen
CommitDate: Sun Jun 11 23:17:54 2023 +0200
Resolves tdf#99646 - Make default type of anchoring optional
Option introduced at Tools > Options > Writer > Formatting Aids
Change-Id: I8d890f84107647821c39669114b991c301727788
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106970
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152794
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 0c25de006f9e..88ac40f5057d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1079,6 +1079,31 @@
true
+
+
+
+Specifies the anchor of newly inserted images.
+Default Anchor
+
+
+
+
+FLY_TO_PARA
+
+
+
+
+FLY_TO_CHAR
+
+
+
+
+FLY_AS_CHAR
+
+
+
+ 1
+
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 11d2914ed028..3a2148c7911c 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -25,6 +25,7 @@
#include
#include
+#include
#include
#include "swdllapi.h"
@@ -169,6 +170,7 @@ class SW_DLLPUBLIC SwViewOption
boolmbHideWhitespaceMode : 1; // Hide header, footer, and
pagebreak.
boolm_bShowPlaceHolderFields : 1; // Only used in printing!
mutable boolm_bIdle;
+sal_Int32 m_nDefaultAnchor; // GetDefaultAnchorType() to convert
int to RndStdIds
// Scale
sal_uInt16 m_nZoom; // In percent.
@@ -649,6 +651,14 @@ public:
static void SetDocBoundaries(bool bSet)
{SetAppearanceFlag(ViewOptFlags::DocBoundaries, bSet);}
static void ApplyColorConfigValues(const svtools::ColorConfig&
rConfig);
+
+// get/set default anchor (0..2); use GetDefaultAnchorType() to convert
into RndStdIds::FLY_*
+sal_Int32 GetDefaultAnchor() const
+{ return m_nDefaultAnchor; }
+void SetDefaultAnchor( const sal_Int32 aFlag )
+{ m_nDefaultAnchor = aFlag; }
+
+RndStdIds GetDefaultAnchorType();
};
inline bool SwViewOption::operator==( const SwViewOption ) const
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 88b6740e8a9a..98359cc2ae05 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1218,6 +1218,7 @@
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
, m_xFillSpaceRB(m_xBuilder->weld_radio_button("fillspace"))
, m_xCursorProtFrame(m_xBuilder->weld_frame("crsrprotframe"))
, m_xCursorInProtCB(m_xBuilder->weld_check_button("cursorinprot"))
+, m_xDefaultAnchorType(m_xBuilder->weld_combo_box("cxDefaultAnchor"))
, m_xMathBaselineAlignmentCB(m_xBuilder->weld_check_button("mathbaseline"))
{
const SfxPoolItem* pItem = nullptr;
diff --git a/sw/source/uibase/config/cfgitems.cxx
b/sw/source/uibase/config/cfgitems.cxx
index efbbdf4154b4..a5e8718aa718 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -41,6 +41,7 @@ SwDocDisplayItem::SwDocDisplayItem() :
bCharHiddenText =
bBookmarks =
bManualBreak= true;
+m_xDefaultAnchor = 1; //FLY_TO_CHAR
};
// Item for the Settings dialog, page document view
@@ -55,6 +56,7 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt
) :
bCharHiddenText = rVOpt.IsShowHiddenChar(true);
bBookmarks = rVOpt.IsShowBookmarks(true);
bManualBreak= rVOpt.IsLineBreak(true);
+m_xDefaultAnchor= rVOpt.GetDefaultAnchor();
}
SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const
@@ -75,7
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/recentdocsviewitem.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit f8036f2f5238adf227d0ffa646e503f0446bb37b
Author: Heiko Tietze
AuthorDate: Wed May 24 12:05:45 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Jun 2 16:07:39 2023 +0200
Resolves tdf#155200 - Don't scale overlay images in start center
Thumbnails don't change their size so overlay must not too
Change-Id: I83ff2bb60ec619686b583180ebabe194c4a77b23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152193
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sfx2/source/control/recentdocsviewitem.cxx
b/sfx2/source/control/recentdocsviewitem.cxx
index 5c7c6ccfd507..9af2c114988f 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -213,6 +213,7 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView
, const OUStri
aThumbnail = TemplateLocalView::scaleImg(aThumbnail, nThumbnailSize,
nThumbnailSize);
BitmapEx aModule = getModuleOverlay(rURL);
+aModule.Scale(Size(48,48)); //tdf#155200: Thumbnails don't change
their size so overlay must not too
if (!aModule.IsEmpty())
{
const Size aSize(aThumbnail.GetSizePixel());
[Libreoffice-commits] core.git: include/svtools
include/svtools/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 57d5c01ac1bcce56591b4eae96d1e679ef7197d4
Author: Heiko Tietze
AuthorDate: Tue May 30 10:52:30 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue May 30 13:53:15 2023 +0200
Resolves tdf#140091 - Tooltip to add sheets should be more informative
Change-Id: I03ae5d11b80472839e2654ff43eb391b5396f026
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152383
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index c77d3f6cfe7d..645b19b86567 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -187,7 +187,7 @@
#define STR_TABBAR_HINT_MOVELEFT_SHEETS
NC_("STR_TABBAR_HINT_MOVELEFT_SHEETS", "Scroll to previous sheet")
#define STR_TABBAR_HINT_MOVERIGHT_SHEETS
NC_("STR_TABBAR_HINT_MOVERIGHT_SHEETS", "Scroll to next sheet")
#define STR_TABBAR_HINT_MOVETOEND_SHEETS
NC_("STR_TABBAR_HINT_MOVETOEND_SHEETS", "Scroll to last sheet")
-#define STR_TABBAR_HINT_ADDTAB_SHEETS
NC_("STR_TABBAR_HINT_ADDTAB_SHEETS", "Add sheet")
+#define STR_TABBAR_HINT_ADDTAB_SHEETS
NC_("STR_TABBAR_HINT_ADDTAB_SHEETS", "Add new sheet (right click to see all
non-hidden sheets)")
#define STR_SVT_ACC_RULER_HORZ_NAME
NC_("STR_SVT_ACC_RULER_HORZ_NAME", "Horizontal Ruler")
#define STR_SVT_ACC_RULER_VERT_NAME
NC_("STR_SVT_ACC_RULER_VERT_NAME", "Vertical Ruler")
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdpage.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit ca10ae200aac01e6b238567fa637cdc293f70f7a
Author: Heiko Tietze
AuthorDate: Fri May 26 10:17:53 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri May 26 13:05:07 2023 +0200
Suppress variable not used warning
Change-Id: Ie154c9ad2d187adf735590da2e23420572dd5de4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152294
Reviewed-by: Stephan Bergmann
Tested-by: Jenkins
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 55d3e7f5aa6b..175f58b2ad7a 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -139,7 +139,9 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
mbObjOrdNumsDirty = false;
mbRectsDirty = false;
+#ifdef DBG_UTIL
size_t nCloneErrCnt(0);
+#endif
const size_t nCount(rSrcList.GetObjCount());
if(nullptr == getSdrObjectFromSdrObjList() && nullptr ==
getSdrPageFromSdrObjList())
@@ -162,10 +164,12 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
NbcInsertObject(pDO.get(), SAL_MAX_SIZE);
aCloneList.AddPair(pSO, pDO.get());
}
+#ifdef DBG_UTIL
else
{
nCloneErrCnt++;
}
+#endif
}
// Wires up the connections
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/hdrcont.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 306093f8f82a646a2a82ebfc57fbef70af2d30a7
Author: Heiko Tietze
AuthorDate: Fri May 26 11:20:06 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri May 26 13:04:48 2023 +0200
Related tdf#145080 - Less obtrusive col/row header color on macOS
Change-Id: I4821643148afa205d94fe2f6178091c2acfb5bc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152299
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index d6e9b5dbeb3f..c6688ea11562 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -361,7 +361,14 @@ void ScHeaderControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
{
// background for selection
GetOutDev()->SetLineColor();
-GetOutDev()->SetFillColor( rStyleSettings.GetAccentColor() );
+Color aColor( rStyleSettings.GetAccentColor() );
+// merging the highlightcolor (which is used if accent does not exist) with
the background
+// fails in many cases such as Breeze Dark (highlight is too close to
background) and
+// Breeze Light (font color is white and not readable anymore)
+#ifdef MACOSX
+aColor.Merge( rStyleSettings.GetFaceColor(), 80 );
+#endif
+GetOutDev()->SetFillColor( aColor );
GetOutDev()->DrawRect( aFillRect );
}
}
