[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source cui/uiconfig include/svx svx/source
cui/source/dialogs/cuicharmap.cxx|2 ++
cui/uiconfig/ui/specialcharacters.ui |4 +++-
include/svx/searchcharmap.hxx|1 +
svx/source/dialog/searchcharmap.cxx | 11 ---
4 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 15189c9cefccb1d7ed9026cfd62ca9745427d387
Author: Caolán McNamara
AuthorDate: Fri Mar 10 11:13:17 2023 +
Commit: Adolfo Jayme Barrientos
CommitDate: Sun Mar 12 18:51:40 2023 +
Resolves: tdf#154087 update scrollbar range when search criteria change
Change-Id: Iaf5f20c8952b15f3dcccb65277dadb171a705605
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148616
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 457b5238ccdd..c6994000e36d 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -885,6 +885,8 @@ IMPL_LINK_NOARG(SvxCharacterMap, SearchUpdateHdl,
weld::Entry&, void)
if(!sName.isEmpty() &&
sName.toAsciiLowerCase().indexOf(aKeyword.toAsciiLowerCase()) >= 0)
m_xSearchSet->AppendCharToList(sChar);
}
+
+m_xSearchSet->UpdateScrollRange();
}
else
{
diff --git a/cui/uiconfig/ui/specialcharacters.ui
b/cui/uiconfig/ui/specialcharacters.ui
index 7c04cbcc5b62..ff541b7e0e6b 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -1,5 +1,5 @@
-
+
@@ -855,6 +855,8 @@
True
True
True
+never
+always
in
diff --git a/include/svx/searchcharmap.hxx b/include/svx/searchcharmap.hxx
index 33d7432096d8..1af4ce5fe1a6 100644
--- a/include/svx/searchcharmap.hxx
+++ b/include/svx/searchcharmap.hxx
@@ -50,6 +50,7 @@ public:
virtual voidSelectIndex( int index, bool bFocus =
false ) override;
voidAppendCharToList(sal_UCS4 cChar);
voidClearPreviousData();
+voidUpdateScrollRange();
virtual sal_Int32 getMaxCharCount() const override;
diff --git a/svx/source/dialog/searchcharmap.cxx
b/svx/source/dialog/searchcharmap.cxx
index 034ebd317a5a..2d8eeaab8967 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -307,9 +307,7 @@ void SvxSearchCharSet::RecalculateFont(vcl::RenderContext&
rRenderContext)
nX = aSize.Width() / COLUMN_COUNT;
nY = aSize.Height() / ROW_COUNT;
-//scrollbar settings -- error
-int nLastRow = (nCount - 1 + COLUMN_COUNT) / COLUMN_COUNT;
-mxScrollArea->vadjustment_configure(mxScrollArea->vadjustment_get_value(),
0, nLastRow, 1, ROW_COUNT - 1, ROW_COUNT);
+UpdateScrollRange();
// rearrange CharSet element in sync with nX- and nY-multiples
Size aDrawSize(nX * COLUMN_COUNT, nY * ROW_COUNT);
@@ -319,6 +317,13 @@ void SvxSearchCharSet::RecalculateFont(vcl::RenderContext&
rRenderContext)
mbRecalculateFont = false;
}
+void SvxSearchCharSet::UpdateScrollRange()
+{
+//scrollbar settings
+int nLastRow = (nCount - 1 + COLUMN_COUNT) / COLUMN_COUNT;
+mxScrollArea->vadjustment_configure(mxScrollArea->vadjustment_get_value(),
0, nLastRow, 1, ROW_COUNT - 1, ROW_COUNT);
+}
+
void SvxSearchCharSet::SelectIndex(int nNewIndex, bool bFocus)
{
if (!mxFontCharMap.is())
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/options/optchart.cxx | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
New commits:
commit ffed1616ef4da1248ac64559064d014aa028467b
Author: Noel Grandin
AuthorDate: Wed Feb 15 11:30:01 2023 +0200
Commit: Christian Lohmaier
CommitDate: Wed Feb 15 16:08:08 2023 +
tdf#153172 Options > Charts > Default Colors no longer persistent
regression from
commit b95142c11e80c58b70dff68bfd7f3792657b9ee2
Author: Noel Grandin
Date: Mon Jun 20 19:17:00 2022 +0200
tdf#58134 Reset Button in Options Dialogs
Change-Id: Idef9880e29c322ae2d11641354baf8a241fc7fb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147049
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 9d6c5f13ff031c18d3c117e4de212e2550d24e8c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147062
Reviewed-by: Christian Lohmaier
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 9b1e6c9c92f2..af9b92322802 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -157,16 +157,7 @@ bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet*
rOutAttrs )
void SvxDefaultColorOptPage::Reset( const SfxItemSet* )
{
-if( m_SvxChartColorTableUniquePtr )
-{
-m_SvxChartColorTableUniquePtr->useDefault();
-
-FillBoxChartColorLB();
-
-m_xLbChartColors->grab_focus();
-m_xLbChartColors->select( 0 );
-m_xPBRemove->set_sensitive(true);
-}
+m_xLbChartColors->select( 0 );
}
void SvxDefaultColorOptPage::FillPaletteLB()
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/dialogs/SpellDialog.cxx |6 +-
cui/source/inc/SpellDialog.hxx |2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit e3f3229433c7b6bde77ea01ed3ab62b07f04609b
Author: Noel Grandin
AuthorDate: Thu Jan 26 10:12:15 2023 +0200
Commit: Xisco Fauli
CommitDate: Mon Jan 30 08:31:51 2023 +
fix online crash in SpellDialog
program/libmergedlo.so
EditEngine::GetUndoManager()
/opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:173
program/libcuilo.so
svx::SpellDialog::InitHdl(void*)
cui/source/dialogs/SpellDialog.cxx:2016
program/libmergedlo.so
ImplWindowFrameProc(vcl::Window*, SalEvent, void const*)
include/rtl/ref.hxx:128
program/libmergedlo.so
SvpSalInstance::ProcessEvent(SalUserEventList::SalUserEvent)
vcl/headless/svpinst.cxx:317
Change-Id: Icd79faea8b066e0725c5d96f5d9b64445578f3a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146091
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit f6de8eac453b11d5fcfd823ac926521a5e398f9d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146201
Reviewed-by: Michael Stahl
Reviewed-by: Noel Grandin
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 21f7f2b4da80..e233d354 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -161,6 +161,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow*
pChildWindow,
: SfxModelessDialogController (_pBindings, pChildWindow,
pParent, "cui/ui/spellingdialog.ui", "SpellingDialog")
, aDialogUndoLink(LINK (this, SpellDialog, DialogUndoHdl))
+, m_pInitHdlEvent(nullptr)
, bFocusLocked(true)
, rParent(*pChildWindow)
, pImpl( new SpellDialog_Impl )
@@ -219,11 +220,13 @@ SpellDialog::SpellDialog(SpellDialogChildWindow*
pChildWindow,
//InitHdl wants to use virtual methods, so it
//can't be called during the ctor, so init
//it on next event cycle post-ctor
-Application::PostUserEvent(LINK(this, SpellDialog, InitHdl));
+m_pInitHdlEvent = Application::PostUserEvent(LINK(this, SpellDialog,
InitHdl));
}
SpellDialog::~SpellDialog()
{
+if (m_pInitHdlEvent)
+Application::RemoveUserEvent(m_pInitHdlEvent);
if (pImpl)
{
// save possibly modified user-dictionaries
@@ -387,6 +390,7 @@ void
SpellDialog::SpellContinue_Impl(std::unique_ptr* pGua
*/
IMPL_LINK_NOARG( SpellDialog, InitHdl, void*, void)
{
+m_pInitHdlEvent = nullptr;
m_xDialog->freeze();
//show or hide AutoCorrect depending on the modules abilities
m_xAutoCorrPB->set_visible(rParent.HasAutoCorrection());
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 69f491fc6586..da5fee960c84 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -130,7 +130,7 @@ private:
OUStringm_sTitleSpellingGrammar;
Link aDialogUndoLink;
-
+ImplSVEvent * m_pInitHdlEvent;
boolbFocusLocked;
svx::SpellDialogChildWindow& rParent;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/dialogs/SpellDialog.cxx |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 9adcf14d9b2e9dffd47a26eae202da348675a5e4 Author: Rafael Lima AuthorDate: Wed Nov 2 18:54:24 2022 +0200 Commit: Caolán McNamara CommitDate: Mon Jan 2 19:03:52 2023 + tdf#116566 Make Spellcheck dialog respect dark background This patch makes the sentence in the spellcheck dialog respect the colors in the selected color scheme. More specifically, it uses the AutoSpellcheck color and the Font Color in the Edit Engine. Change-Id: I0f8e842417645250c9145d1e37d8cf52c290379e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142147 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 1de8308d40fad8e9281d2b491f8c5c919fda82f4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144910 diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 49e1415e744e..21f7f2b4da80 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1140,6 +1140,7 @@ void SentenceEditWindow_Impl::SetDrawingArea(weld::DrawingArea* pDrawingArea) OutputDevice& rDevice = pDrawingArea->get_ref_device(); rDevice.SetBackground(aBgColor); m_xEditView->SetBackgroundColor(aBgColor); +m_xEditEngine->SetBackgroundColor(aBgColor); } SentenceEditWindow_Impl::~SentenceEditWindow_Impl() @@ -1671,8 +1672,13 @@ void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_Int32 nStart, sal_Int32 nEnd, m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_WEIGHT_CJK); m_xEditEngine->RemoveAttribs(aAll, false, EE_CHAR_WEIGHT_CTL); +// tdf#116566 Use color defined in the current Color Scheme +Color aSpellErrorCollor = svtools::ColorConfig().GetColorValue(svtools::SPELL).nColor; + +// TODO: Create a new Color Scheme entry for grammar mistakes and use it below +// instead of using hardcoded COL_LIGHTBLUE SfxItemSet aSet(m_xEditEngine->GetEmptyItemSet()); -aSet.Put(SvxColorItem(bGrammarError ? COL_LIGHTBLUE : COL_LIGHTRED, EE_CHAR_COLOR)); +aSet.Put(SvxColorItem(bGrammarError ? COL_LIGHTBLUE : aSpellErrorCollor, EE_CHAR_COLOR)); aSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT)); aSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT_CJK)); aSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT_CTL));
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source desktop/source extensions/source include/svx scripting/source sc/source sd/source sfx2/source svx/source sw/source
cui/source/dialogs/SignSignatureLineDialog.cxx|8 +
cui/source/dialogs/srchxtra.cxx | 62 -
cui/source/dialogs/zoom.cxx |8 -
cui/source/tabpages/autocdlg.cxx |3
cui/source/tabpages/border.cxx|3
cui/source/tabpages/chardlg.cxx |7 -
cui/source/tabpages/numfmt.cxx|8 -
cui/source/tabpages/numpages.cxx | 15 +-
cui/source/tabpages/page.cxx |3
cui/source/tabpages/paragrph.cxx |6
desktop/source/lib/init.cxx |8 -
extensions/source/bibliography/general.cxx|3
include/svx/ClassificationDialog.hxx |4
sc/source/ui/attrdlg/attrdlg.cxx |2
sc/source/ui/drawfunc/drtxtob.cxx | 13 +-
sc/source/ui/styleui/styledlg.cxx |3
sc/source/ui/view/editsh.cxx |5
scripting/source/protocolhandler/scripthandler.cxx|3
sd/source/ui/animations/CustomAnimationDialog.cxx |3
sd/source/ui/app/sdmod2.cxx |5
sd/source/ui/sidebar/SlideBackground.cxx | 54 +---
sd/source/ui/view/drviews2.cxx| 34 +++--
sfx2/source/dialog/securitypage.cxx |8 -
svx/source/dialog/ClassificationDialog.cxx|7 -
svx/source/form/datanavi.cxx |2
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 75 ++--
svx/source/sidebar/nbdtmg.cxx |8 -
svx/source/tbxctrls/fillctrl.cxx | 27 ++--
svx/source/tbxctrls/linectrl.cxx |8 -
sw/source/core/edit/edfcol.cxx| 16 +-
sw/source/ui/dialog/docstdlg.cxx |4
sw/source/ui/fldui/fldedt.cxx |4
sw/source/uibase/app/docsh2.cxx | 50
sw/source/uibase/ribbar/workctrl.cxx |8 -
sw/source/uibase/shells/annotsh.cxx |5
sw/source/uibase/shells/drwtxtex.cxx |3
sw/source/uibase/sidebar/PageStylesPanel.cxx | 112 ++
sw/source/uibase/sidebar/StylePresetsPanel.cxx| 15 +-
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx | 20 +--
39 files changed, 348 insertions(+), 284 deletions(-)
New commits:
commit e833729c71eac567be73158d640c717588dbe0a2
Author: Caolán McNamara
AuthorDate: Fri Dec 16 12:11:38 2022 +
Commit: Xisco Fauli
CommitDate: Mon Dec 19 10:50:14 2022 +
check SfxObjectShell::Current()
SfxObjectShell::Current() can return null, it's based on the equally
vile SfxViewFrame::Current()
Change-Id: Ia5c7783680e9d8e5d3075078f16a2c15cb6f7a47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144355
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144457
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 1f1bd4551080..94306764b201 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -156,7 +156,7 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, chooseCertificate,
weld::Button&, void)
{
// Document needs to be saved before selecting a certificate
SfxObjectShell* pShell = SfxObjectShell::Current();
-if (!pShell->PrepareForSigning(m_xDialog.get()))
+if (!pShell || !pShell->PrepareForSigning(m_xDialog.get()))
return;
Reference xSignCertificate
@@ -193,6 +193,12 @@ void SignSignatureLineDialog::Apply()
}
SfxObjectShell* pShell = SfxObjectShell::Current();
+if (!pShell)
+{
+SAL_WARN("cui.dialogs", "No SfxObjectShell!");
+return;
+}
+
Reference xValidGraphic = getSignedGraphic(true);
Reference xInvalidGraphic = getSignedGraphic(false);
pShell->SignSignatureLine(m_xDialog.get(), m_aSignatureLineId,
m_xSelectedCertifate,
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index d857f77c42df..40c2e369ab6b 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -64,9 +64,7 @@ void SvxSearchFormatDialog::PageCreated(const OString& rId,
SfxTabPage& rPage)
if (rId == "font")
{
const FontList* pApm_pFontList = nullptr;
-SfxObjectShell* pSh = SfxObjectShell::Current();
-
-if ( pSh )
+if (SfxObjectShell* pSh = SfxObjectShell::Current())
{
const SvxFontListItem* pFLItem = static_cast(
pSh->GetItem( SID_ATTR_CHAR_FONTLIST ));
@@ -119,42 +117,44 @@
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source desktop/source
cui/source/customize/CustomNotebookbarGenerator.cxx | 13 -
desktop/source/lib/init.cxx | 12
2 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit a36bcfc15c8287b99702be064aae93e9632e9aa0
Author: Caolán McNamara
AuthorDate: Thu Dec 15 20:15:45 2022 +
Commit: Xisco Fauli
CommitDate: Fri Dec 16 08:24:02 2022 +
misc: check SfxViewFrame::Current()
these ones look potentially worth backporting
Change-Id: Ie01c0b598c3408f4766318267de8438e997dd1a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144261
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/cui/source/customize/CustomNotebookbarGenerator.cxx
b/cui/source/customize/CustomNotebookbarGenerator.cxx
index 9fb71562160a..bae85525ebd6 100644
--- a/cui/source/customize/CustomNotebookbarGenerator.cxx
+++ b/cui/source/customize/CustomNotebookbarGenerator.cxx
@@ -74,11 +74,14 @@ static OUString
lcl_getAppName(vcl::EnumContext::Application eApp)
static OUString getAppNameRegistryPath()
{
vcl::EnumContext::Application eApp = vcl::EnumContext::Application::Any;
-const Reference& xFrame
-= SfxViewFrame::Current()->GetFrame().GetFrameInterface();
-const Reference xModuleManager
-=
frame::ModuleManager::create(::comphelper::getProcessComponentContext());
-eApp =
vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(xFrame));
+
+if (SfxViewFrame* pViewFrame = SfxViewFrame::Current())
+{
+const Reference& xFrame =
pViewFrame->GetFrame().GetFrameInterface();
+const Reference xModuleManager
+=
frame::ModuleManager::create(::comphelper::getProcessComponentContext());
+eApp =
vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(xFrame));
+}
OUString sAppName(lcl_getAppName(eApp));
return "org.openoffice.Office.UI.ToolbarMode/Applications/" + sAppName;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 52fd35a23104..ee35a421a6c8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -761,6 +761,10 @@ void ExecuteMarginULChange(
// Main function which toggles page orientation of the Writer doc. Needed by
ToggleOrientation
void ExecuteOrientationChange()
{
+SfxViewFrame* pViewFrm = SfxViewFrame::Current();
+if (!pViewFrm)
+return;
+
std::unique_ptr pPageItem(new SvxPageItem(SID_ATTR_PAGE));
// 1mm in twips rounded
@@ -768,22 +772,22 @@ void ExecuteOrientationChange()
constexpr tools::Long MINBODY = o3tl::toTwips(1, o3tl::Length::mm);
css::uno::Reference< css::document::XUndoManager > mxUndoManager(
-getUndoManager(
SfxViewFrame::Current()->GetFrame().GetFrameInterface() ) );
+getUndoManager( pViewFrm->GetFrame().GetFrameInterface() ) );
if ( mxUndoManager.is() )
mxUndoManager->enterUndoContext( "" );
const SvxSizeItem* pSizeItem;
-
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_SIZE,
pSizeItem);
+pViewFrm->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_SIZE,
pSizeItem);
std::unique_ptr pPageSizeItem(pSizeItem->Clone());
const SvxLongLRSpaceItem* pLRSpaceItem;
-
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_LRSPACE,
pLRSpaceItem);
+pViewFrm->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_LRSPACE,
pLRSpaceItem);
std::unique_ptr
pPageLRMarginItem(pLRSpaceItem->Clone());
const SvxLongULSpaceItem* pULSpaceItem;
-
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_ULSPACE,
pULSpaceItem);
+pViewFrm->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_ULSPACE,
pULSpaceItem);
std::unique_ptr
pPageULMarginItem(pULSpaceItem->Clone());
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/dialogs/thesdlg.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 36651d2b51f7db243d975cc2bf3bb8975b2faa10 Author: Caolán McNamara AuthorDate: Mon Dec 12 16:58:46 2022 + Commit: Adolfo Jayme Barrientos CommitDate: Mon Dec 12 21:16:45 2022 + Resolves: tdf#139749 set initial focus to combobox Change-Id: Ib8fd0dd4a4b5d4c137794c4538e61bfbf33b9a1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144016 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 1d98480973ee..ea98a44a3c9e 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -315,6 +315,8 @@ SvxThesaurusDialog::SvxThesaurusDialog( // disable controls if service is missing if (!xThesaurus.is()) m_xDialog->set_sensitive(false); +else +m_xWordCB->grab_focus(); } SvxThesaurusDialog::~SvxThesaurusDialog()
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source cui/uiconfig
cui/source/dialogs/QrCodeGenDialog.cxx | 10 +++-
cui/source/inc/QrCodeGenDialog.hxx |2
cui/uiconfig/ui/qrcodegen.ui | 80 +++--
3 files changed, 56 insertions(+), 36 deletions(-)
New commits:
commit 11c2dae93e492442223922f621c5dafd30c99213
Author: Caolán McNamara
AuthorDate: Thu Dec 8 11:00:00 2022 +
Commit: Michael Stahl
CommitDate: Thu Dec 8 12:19:06 2022 +
Resolves: tdf#146395 allow newlines in QR Codes
Change-Id: Ib390d97866ab013770e4f1cbdfb529296d64c140
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143812
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index 3e7b48e7af86..e028d4d10e94 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -156,7 +156,7 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent,
Reference xModel
bool bEditExisting)
: GenericDialogController(pParent, "cui/ui/qrcodegen.ui",
"QrCodeGenDialog")
, m_xModel(std::move(xModel))
-, m_xEdittext(m_xBuilder->weld_entry("edit_text"))
+, m_xEdittext(m_xBuilder->weld_text_view("edit_text"))
, m_xECC{ m_xBuilder->weld_radio_button("button_low"),
m_xBuilder->weld_radio_button("button_medium"),
m_xBuilder->weld_radio_button("button_quartile"),
@@ -167,16 +167,22 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent,
Reference xModel
, mpParent(pParent)
#endif
{
+m_xEdittext->set_size_request(m_xEdittext->get_approximate_digit_width() *
28,
+ m_xEdittext->get_height_rows(6));
if (!bEditExisting)
{
+OUString sSelection;
// TODO: This only works in Writer doc. Should also work in shapes
Reference xSelections(m_xModel->getCurrentSelection(),
UNO_QUERY);
if (xSelections.is())
{
Reference xSelection(xSelections->getByIndex(0),
UNO_QUERY);
if (xSelection.is())
-m_xEdittext->set_text(xSelection->getString());
+sSelection = xSelection->getString();
}
+if (!sSelection.isEmpty())
+m_xEdittext->set_text(sSelection);
+m_xEdittext->select_region(0, -1);
return;
}
diff --git a/cui/source/inc/QrCodeGenDialog.hxx
b/cui/source/inc/QrCodeGenDialog.hxx
index 165bc6d75f4a..7404b95f62b2 100644
--- a/cui/source/inc/QrCodeGenDialog.hxx
+++ b/cui/source/inc/QrCodeGenDialog.hxx
@@ -30,7 +30,7 @@ protected:
void Apply();
private:
-std::unique_ptr m_xEdittext;
+std::unique_ptr m_xEdittext;
std::unique_ptr m_xECC[4];
std::unique_ptr m_xSpinBorder;
std::unique_ptr m_xComboType;
diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui
index 4f015dccfde3..7078e3aa44a5 100644
--- a/cui/uiconfig/ui/qrcodegen.ui
+++ b/cui/uiconfig/ui/qrcodegen.ui
@@ -1,5 +1,5 @@
-
+
@@ -8,9 +8,12 @@
1
10
+
+www.libreoffice.org
+
-False
-6
+False
+6
QR and Barcode
True
0
@@ -95,43 +98,27 @@
True
False
True
+True
0
none
-
+
True
False
6
+True
+True
6
12
-
-
-True
-True
-True
-True
-True
-www.libreoffice.org
-
-
-The text from which to generate the
code.
-
-
-
-
-1
-0
-
-
True
False
start
+start
URL/Text:
True
-edit_text
0
@@ -157,22 +144,22 @@
True
-False
+False
start
Type:
-True
-choose_type
+True
+choose_type
0
-0
-
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source cui/uiconfig
cui/source/tabpages/chardlg.cxx |5 - cui/uiconfig/ui/positionpage.ui |2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit cb566ac3e1439f2afe883aacc30da3d3cb6343ec Author: Samuel Mehrbrodt AuthorDate: Mon Nov 7 15:01:53 2022 +0100 Commit: Michael Stahl CommitDate: Thu Nov 10 11:12:39 2022 +0100 tdf#107405 Allow kerning less than -2 Fallout from 9a745d54a5c7470180f41494283983a3b8b84a51 Change-Id: Ied4d83eb614830718cf304e7010f17516e4a9429 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142388 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit 7f4f536ca9195c7d53463527f00897b65d062486) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142515 Reviewed-by: Michael Stahl diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 226fe846ee3d..0dcc60cb2deb 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2766,10 +2766,13 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) rCJKFont.SetFixKerning( static_cast(nKern) ); rCTLFont.SetFixKerning( static_cast(nKern) ); -//the attribute value must be displayed also if it's above the maximum allowed value +//the attribute value must be displayed also if it's above/below the maximum allowed value tools::Long nVal = static_cast(m_xKerningMF->get_max(FieldUnit::POINT)); if(nVal < nKerning) m_xKerningMF->set_max(nKerning, FieldUnit::POINT); +nVal = static_cast(m_xKerningMF->get_min(FieldUnit::POINT)); +if (nVal > nKerning) +m_xKerningMF->set_min(nKerning, FieldUnit::POINT); m_xKerningMF->set_value(nKerning, FieldUnit::POINT); } else diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui index 23d476bbe282..ad962316a73d 100644 --- a/cui/uiconfig/ui/positionpage.ui +++ b/cui/uiconfig/ui/positionpage.ui @@ -17,7 +17,7 @@ 10 --2 +-1000 1000 0.1 1
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/dialogs/colorpicker.cxx | 99 -
1 file changed, 56 insertions(+), 43 deletions(-)
New commits:
commit 1883d625b92e6c417bfb892364023063deb0fa7c
Author: Caolán McNamara
AuthorDate: Sun Oct 23 21:02:22 2022 +0100
Commit: Michael Stahl
CommitDate: Tue Oct 25 10:56:20 2022 +0200
Resolves: tdf#151711 don't use an intermediate Color to pass data around
just pass the desired value directly
Change-Id: Ib2a6d4c24a18e4a4d735d408e8179e3e204eff13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141687
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 83334df9cfc34a2f740fe30db0f3359105cede83)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141712
Reviewed-by: Michael Stahl
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index 3b9a81e3..341cf5bf09e7 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -201,6 +201,7 @@ class ColorFieldControl : public
weld::CustomWidgetController
public:
ColorFieldControl()
: meMode( DefaultMode )
+, mnBaseValue(USHRT_MAX)
, mdX( -1.0 )
, mdY( -1.0 )
, mbMouseCaptured(false)
@@ -230,7 +231,7 @@ public:
void UpdatePosition();
void Modify();
-void SetValues(Color aColor, ColorMode eMode, double x, double y);
+void SetValues(sal_uInt16 nBaseValue, ColorMode eMode, double x, double y);
double GetX() const { return mdX;}
double GetY() const { return mdY;}
@@ -238,7 +239,7 @@ public:
private:
ColorMode meMode;
-Color maColor;
+sal_uInt16 mnBaseValue;
double mdX;
double mdY;
bool mbMouseCaptured;
@@ -307,11 +308,6 @@ void ColorFieldControl::UpdateBitmap()
sal_uInt8* pRGB_Vert = maRGB_Vert.data();
sal_uInt16* pPercent_Vert = maPercent_Vert.data();
-Color aBitmapColor(maColor);
-
-sal_uInt16 nHue, nSat, nBri;
-maColor.RGBtoHSB(nHue, nSat, nBri);
-
// this has been unlooped for performance reason, please do not merge
back!
sal_uInt16 y = nHeight,x;
@@ -321,40 +317,43 @@ void ColorFieldControl::UpdateBitmap()
case HUE:
while (y--)
{
-nBri = pPercent_Vert[y];
+sal_uInt16 nBri = pPercent_Vert[y];
x = nWidth;
while (x--)
{
-nSat = pPercent_Horiz[x];
-mxBitmap->DrawPixel(Point(x,y), Color::HSBtoRGB(nHue,
nSat, nBri));
+sal_uInt16 nSat = pPercent_Horiz[x];
+mxBitmap->DrawPixel(Point(x,y),
Color::HSBtoRGB(mnBaseValue, nSat, nBri));
}
}
break;
case SATURATION:
while (y--)
{
-nBri = pPercent_Vert[y];
+sal_uInt16 nBri = pPercent_Vert[y];
x = nWidth;
while (x--)
{
-nHue = pGrad_Horiz[x];
-mxBitmap->DrawPixel(Point(x,y), Color::HSBtoRGB(nHue,
nSat, nBri));
+sal_uInt16 nHue = pGrad_Horiz[x];
+mxBitmap->DrawPixel(Point(x,y), Color::HSBtoRGB(nHue,
mnBaseValue, nBri));
}
}
break;
case BRIGHTNESS:
while (y--)
{
-nSat = pPercent_Vert[y];
+sal_uInt16 nSat = pPercent_Vert[y];
x = nWidth;
while (x--)
{
-nHue = pGrad_Horiz[x];
-mxBitmap->DrawPixel(Point(x,y), Color::HSBtoRGB(nHue,
nSat, nBri));
+sal_uInt16 nHue = pGrad_Horiz[x];
+mxBitmap->DrawPixel(Point(x,y), Color::HSBtoRGB(nHue,
nSat, mnBaseValue));
}
}
break;
case RED:
+{
+Color aBitmapColor;
+aBitmapColor.SetRed(mnBaseValue);
while (y--)
{
aBitmapColor.SetGreen(pRGB_Vert[y]);
@@ -366,7 +365,11 @@ void ColorFieldControl::UpdateBitmap()
}
}
break;
+}
case GREEN:
+{
+Color aBitmapColor;
+aBitmapColor.SetGreen(mnBaseValue);
while (y--)
{
aBitmapColor.SetRed(pRGB_Vert[y]);
@@ -378,7 +381,11 @@ void ColorFieldControl::UpdateBitmap()
}
}
break;
+}
case BLUE:
+{
+Color aBitmapColor;
+aBitmapColor.SetBlue(mnBaseValue);
while (y--)
{
aBitmapColor.SetGreen(pRGB_Vert[y]);
@@ -390,9 +397,12 @@ void ColorFieldControl::UpdateBitmap()
}
}
break;
+}
}
}
+constexpr int nCenterOffset = 5;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/options/optgdlg.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit 29885b7723d49a78b123a2f1a19aa54df4cef9fc
Author: Eike Rathke
AuthorDate: Sun Oct 23 19:13:15 2022 +0200
Commit: Michael Stahl
CommitDate: Mon Oct 24 12:10:57 2022 +0200
Related: tdf#147817 prevent date acceptance pattern with numeric ambiguity
i.e. matching input with numeric decinmal separator, like M.D
Change-Id: Ice977b3e92373829cd2f5df7c065d55bc49fc23e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141686
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit cdded98b23698e5e2a5cfffd5638e395098fcc4a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141707
Reviewed-by: Michael Stahl
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f1e3fcf4bf45..b9402dfb23be 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1719,6 +1719,18 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl,
weld::Entry&, rEd, void )
bool bY, bM, bD;
bY = bM = bD = false;
bool bSep = true;
+if (aPat.getLength() == 3)
+{
+// Disallow a pattern that would match a numeric input with
+// decimal separator, like M.D
+const LanguageType eLang =
m_xLocaleSettingLB->get_active_id();
+const LocaleDataWrapper aLocaleWrapper((
LanguageTag(eLang)));
+if (aPat[1] ==
aLocaleWrapper.getNumDecimalSep().toChar()
+ || aPat[1] ==
aLocaleWrapper.getNumDecimalSepAlt().toChar())
+{
+bValid = false;
+}
+}
for (sal_Int32 i = 0; i < aPat.getLength() && bValid; /*nop*/)
{
const sal_Int32 j = i;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/dialogs/cuicharmap.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 479ae2da64cb322e58834973743260550d6dfafc Author: Rafael Lima AuthorDate: Mon Oct 10 19:03:31 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Tue Oct 11 03:58:24 2022 +0200 Use correct color in cuicharmap.cxx While fixing bug tdf#151232 (commited as 3e4697c7675430f5e4e2221c951971caee0bdeb8) I used the wrong color in cuicharmap. This patch fixes this error. Change-Id: I1435489424c5a2e343ab009852e51267cbc8eb01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141175 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Jenkins (cherry picked from commit ebeb4ce43d04dbbd329f19210c0db86e2b1cf2a0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141178 diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 684186e25a6b..457b5238ccdd 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -1163,7 +1163,7 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang Color aTextCol = rRenderContext.GetTextColor(); Color aFillCol = rRenderContext.GetFillColor(); -Color aLineCol = rRenderContext.GetFillColor(); +Color aLineCol = rRenderContext.GetLineColor(); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const Color aWindowTextColor(rStyleSettings.GetDialogTextColor());
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/dialogs/tipofthedaydlg.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 8bc82b41a97461a6b03e7a678f563b5ad3b4d79d
Author: Noel Grandin
AuthorDate: Thu Oct 6 10:31:54 2022 +0200
Commit: Xisco Fauli
CommitDate: Thu Oct 6 16:38:19 2022 +0200
tdf#151352 crash closing form while the tip of the day dialog is displayed
Change-Id: I61826ab4d8873f82f7885e26a22d307e2d574e17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141001
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 81051d1fccffddf3e16d92bef0d0853a65afc8b8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140968
Reviewed-by: Xisco Fauli
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx
b/cui/source/dialogs/tipofthedaydlg.cxx
index 8e609122de50..2c35c3b4c686 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -91,7 +91,10 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
IMPL_LINK(TipOfTheDayDialog, Terminated, VclWindowEvent&, rEvent, void)
{
if (rEvent.GetId() == VclEventId::ObjectDying)
+{
+m_pParent = nullptr;
TipOfTheDayDialog::response(RET_OK);
+}
}
TipOfTheDayDialog::~TipOfTheDayDialog()
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/customize/acccfg.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 80657dca762151da47bec567c0a72786a6da61f9
Author: Caolán McNamara
AuthorDate: Wed Oct 5 16:41:20 2022 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Thu Oct 6 04:43:53 2022 +0200
Resolves: tdf#130529 reduce height of customize dialog
to fit in 768px height (with default UI font size)
Change-Id: I2359e39205e7c13335a7ed266dd367cf45e5dcb8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140965
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 2bfabb5178ea..080cab98164a 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -851,16 +851,16 @@
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage,
, m_xResetButton(m_xBuilder->weld_button("reset"))
{
Size aSize(m_xEntriesBox->get_approximate_digit_width() * 40,
- m_xEntriesBox->get_height_rows(12));
+ m_xEntriesBox->get_height_rows(10));
m_xEntriesBox->set_size_request(aSize.Width(), aSize.Height());
aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 19,
- m_xEntriesBox->get_height_rows(10));
+ m_xEntriesBox->get_height_rows(9));
m_xGroupLBox->set_size_request(aSize.Width(), aSize.Height());
aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 21,
- m_xEntriesBox->get_height_rows(10));
+ m_xEntriesBox->get_height_rows(9));
m_xFunctionBox->set_size_request(aSize.Width(), aSize.Height());
aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 20,
- m_xEntriesBox->get_height_rows(10));
+ m_xEntriesBox->get_height_rows(9));
m_xKeyBox->set_size_request(aSize.Width(), aSize.Height());
// install handler functions
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source sfx2/source svx/source
cui/source/dialogs/cuicharmap.cxx |4
sfx2/source/control/charwin.cxx |2 ++
svx/source/dialog/charmap.cxx | 16 +---
svx/source/dialog/searchcharmap.cxx | 16 +---
4 files changed, 24 insertions(+), 14 deletions(-)
New commits:
commit 19b650dd49620f699b695fb95679284be509ef2e
Author: Rafael Lima
AuthorDate: Fri Sep 30 19:05:10 2022 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Oct 5 06:54:53 2022 +0200
tdf#151232 Fix lines in Special Characters dialog in dark mode
This patch makes the lines in the Special Characters dialog visible in dark
mode. The Insert Symbols widget is also fixed with this patch.
Tested in gen, gtk3 and kf5.
Change-Id: Id1ee21557f2a0ea4ad8b60973d3de71e4d6d5d09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140759
Tested-by: Jenkins
Reviewed-by: V, Stuart Foote
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit be8a83767bed2a9107c5407ebb9fbc0d44772075)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140957
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 7effeb4462cf..684186e25a6b 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -1163,10 +1163,12 @@ void SvxShowText::Paint(vcl::RenderContext&
rRenderContext, const tools::Rectang
Color aTextCol = rRenderContext.GetTextColor();
Color aFillCol = rRenderContext.GetFillColor();
+Color aLineCol = rRenderContext.GetFillColor();
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
const Color aWindowTextColor(rStyleSettings.GetDialogTextColor());
const Color aWindowColor(rStyleSettings.GetWindowColor());
+const Color aShadowColor(rStyleSettings.GetShadowColor());
rRenderContext.SetTextColor(aWindowTextColor);
rRenderContext.SetFillColor(aWindowColor);
@@ -1237,10 +1239,12 @@ void SvxShowText::Paint(vcl::RenderContext&
rRenderContext, const tools::Rectang
}
}
+rRenderContext.SetLineColor(aShadowColor);
rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), aSize));
rRenderContext.DrawText(aPoint, aText);
rRenderContext.SetTextColor(aTextCol);
rRenderContext.SetFillColor(aFillCol);
+rRenderContext.SetLineColor(aLineCol);
if (bShrankFont)
rRenderContext.SetFont(aOrigFont);
}
diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index 6b7c8cd8b514..567f365e6b32 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -135,6 +135,7 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext,
const tools::Rectang
Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor());
Color aFillColor(rStyleSettings.GetWindowColor());
Color aTextColor(rStyleSettings.GetWindowTextColor());
+Color aShadowColor(rStyleSettings.GetShadowColor());
const OUString aText = GetText();
@@ -201,6 +202,7 @@ void SvxCharView::Paint(vcl::RenderContext& rRenderContext,
const tools::Rectang
else
{
rRenderContext.SetFillColor(aFillColor);
+rRenderContext.SetLineColor(aShadowColor);
rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), aSize));
rRenderContext.SetTextColor(aWindowTextColor);
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 6eb9745c8233..4d8dd07b5031 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -509,7 +509,16 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext&
rRenderContext, int n1,
Size aOutputSize(GetOutputSizePixel());
+const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
+const Color aWindowTextColor(rStyleSettings.GetFieldTextColor());
+Color aHighlightColor(rStyleSettings.GetHighlightColor());
+Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor());
+Color aFaceColor(rStyleSettings.GetFaceColor());
+Color aLightColor(rStyleSettings.GetLightColor());
+Color aShadowColor(rStyleSettings.GetShadowColor());
+
int i;
+rRenderContext.SetLineColor(aShadowColor);
for (i = 1; i < COLUMN_COUNT; ++i)
{
rRenderContext.DrawLine(Point(nX * i + m_nXGap, 0),
@@ -520,13 +529,6 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext&
rRenderContext, int n1,
rRenderContext.DrawLine(Point(0, nY * i + m_nYGap),
Point(aOutputSize.Width(), nY * i + m_nYGap));
}
-const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
-const Color aWindowTextColor(rStyleSettings.GetFieldTextColor());
-Color aHighlightColor(rStyleSettings.GetHighlightColor());
-Color aHighlightTextColor(rStyleSettings.GetHighlightTextColor());
-Color aFaceColor(rStyleSettings.GetFaceColor());
-Color
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source reportdesign/source
cui/source/tabpages/tparea.cxx |7 ++-
reportdesign/source/ui/report/ReportController.cxx | 44 ++---
2 files changed, 28 insertions(+), 23 deletions(-)
New commits:
commit 24b641a026d6f99d8f287aabc0a830f37b25888d
Author: Julien Nabet
AuthorDate: Sun Oct 2 19:51:01 2022 +0200
Commit: Xisco Fauli
CommitDate: Tue Oct 4 11:20:40 2022 +0200
tdf#151260: crash in SfxItemPool::SetDefaults
(reportdesign/ReportController)
+ deal with the case when there's no XATTR_FILLUSESLIDEBACKGROUND (like
here)
Change-Id: I2a480eea69aa88d45b3485d7f6d4448816e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140894
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 07aa8138db9bbaf222f2b7cea12a9f7d0a8192d7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140886
Reviewed-by: Xisco Fauli
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 119d6d154076..bbdb9733a02f 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -238,8 +238,11 @@ DeactivateRC SvxAreaTabPage::DeactivatePage( SfxItemSet*
_pSet )
{
XFillStyleItem aStyleItem( drawing::FillStyle_NONE );
_pSet->Put( aStyleItem );
-XFillUseSlideBackgroundItem aFillBgItem( false );
-_pSet->Put( aFillBgItem );
+if (_pSet->HasItem(XATTR_FILLUSESLIDEBACKGROUND))
+{
+XFillUseSlideBackgroundItem aFillBgItem( false );
+_pSet->Put( aFillBgItem );
+}
}
break;
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index 7f20a0040c6e..82edfba92403 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -150,7 +150,9 @@
#define RPTUI_ID_START XATTR_FILL_FIRST - 3
#define RPTUI_ID_ENDXATTR_FILL_FIRST - 2
#define RPTUI_ID_BRUSH TypedWhichId(XATTR_FILL_FIRST - 1)
-#define RPTUI_ID_METRIC XATTR_FILL_LAST + 1
+/// Note that we deliberately overlap an existing item id, so that we can have
contiguous item ids for
+/// the static defaults.
+#define RPTUI_ID_METRIC XATTR_FILL_LAST
using namespace ::com::sun::star;
using namespace uno;
@@ -2336,26 +2338,26 @@ void OReportController::openPageDialog(const
uno::Reference& _
{ SID_PAPER_START, true },
{ SID_PAPER_END,true },
{ SID_ATTR_BRUSH, true },
-{ XATTR_FILLSTYLE, true },
-{ XATTR_FILLCOLOR, true },
-{ XATTR_FILLGRADIENT, true },
-{ XATTR_FILLHATCH, true },
-{ XATTR_FILLBITMAP, true },
-{ XATTR_FILLTRANSPARENCE, true },
-{ XATTR_GRADIENTSTEPCOUNT, true },
-{ XATTR_FILLBMP_TILE, true },
-{ XATTR_FILLBMP_POS,true },
-{ XATTR_FILLBMP_SIZEX, true },
-{ XATTR_FILLBMP_SIZEY, true },
-{ XATTR_FILLFLOATTRANSPARENCE, true },
-{ XATTR_SECONDARYFILLCOLOR, true },
-{ XATTR_FILLBMP_SIZELOG,true },
-{ XATTR_FILLBMP_TILEOFFSETX,true },
-{ XATTR_FILLBMP_TILEOFFSETY,true },
-{ XATTR_FILLBMP_STRETCH,true },
-{ XATTR_FILLBMP_POSOFFSETX, true },
-{ XATTR_FILLBMP_POSOFFSETY, true },
-{ XATTR_FILLBACKGROUND, true },
+{ 0, true }, // XATTR_FILLSTYLE
+{ 0, true }, // XATTR_FILLCOLOR
+{ 0, true }, // XATTR_FILLGRADIENT
+{ 0, true }, // XATTR_FILLHATCH
+{ 0, true }, // XATTR_FILLBITMAP
+{ 0, true }, // XATTR_FILLTRANSPARENCE
+{ 0, true }, // XATTR_GRADIENTSTEPCOUNT
+{ 0, true }, // XATTR_FILLBMP_TILE
+{ 0,true }, // XATTR_FILLBMP_POS
+{ 0, true }, // XATTR_FILLBMP_SIZEX
+{ 0, true }, // XATTR_FILLBMP_SIZEY
+{ 0, true }, // XATTR_FILLFLOATTRANSPARENCE
+{ 0, true }, // XATTR_SECONDARYFILLCOLOR
+{ 0,true }, // XATTR_FILLBMP_SIZELOG
+{ 0,true }, // XATTR_FILLBMP_TILEOFFSETX
+{ 0,true }, // XATTR_FILLBMP_TILEOFFSETY
+{ 0,true }, // XATTR_FILLBMP_STRETCH
+{ 0, true }, // XATTR_FILLBMP_POSOFFSETX
+{ 0, true }, // XATTR_FILLBMP_POSOFFSETY
+{ 0, true }, // XATTR_FILLBACKGROUND
{ SID_ATTR_METRIC, true }
};
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/tabpages/numpages.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f171d9af9bb13ec037841d7c8aa11fcc628c303c Author: Xisco Fauli AuthorDate: Mon Oct 3 19:40:22 2022 +0200 Commit: Caolán McNamara CommitDate: Tue Oct 4 11:15:48 2022 +0200 cui: avoid divide by zero in SvxNumberingPreview::Paint Just check for pActNum->GetLevelCount() > 1 as done later for nYStep See https://crashreport.libreoffice.org/stats/signature/SvxNumberingPreview::Paint(OutputDevice%20&,tools::Rectangle%20const%20&) Change-Id: I0e9518dafe50b2b10a83487e9247e2fd46f9decd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140888 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 050e8c7c0ec8..57648fa612db 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2202,7 +2202,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool tools::Long nWidthRelation = 30; // chapter dialog // height per level -tools::Long nXStep = aSize.Width() / (3 * pActNum->GetLevelCount()); +tools::Long nXStep = aSize.Width() / (pActNum->GetLevelCount() > 1 ? 3 * pActNum->GetLevelCount() : 3); if (pActNum->GetLevelCount() < 10) nXStep /= 2; tools::Long nYStart = 4;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/dialogs/SpellDialog.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit ae1f8a426338770f0dd46c72553c405158415e65
Author: Miklos Vajna
AuthorDate: Wed Sep 28 09:09:03 2022 +0200
Commit: Caolán McNamara
CommitDate: Fri Sep 30 14:27:24 2022 +0200
cui: fix crash in SpellDialog::SpellContinue_Impl
Crashreport signature:
Fatal signal received: SIGSEGV code: 128 for address: 0x0
program/libcuilo.so
svx::SpellDialog::GetNextSentence_Impl(std::unique_ptr >*, bool, bool)
include/com/sun/star/uno/Reference.hxx:114
program/libcuilo.so
svx::SpellDialog::SpellContinue_Impl(std::unique_ptr >*, bool, bool)
cui/source/dialogs/SpellDialog.cxx:355
program/libcuilo.so
svx::SpellDialog::ChangeHdl(weld::Button&)
include/rtl/ustring.hxx:527
program/libmergedlo.so
Control::ImplCallEventListenersAndHandler(VclEventId,
std::function const&)
include/rtl/ref.hxx:208
program/libmergedlo.so
Button::Click()
/opt/rh/devtoolset-10/root/usr/include/c++/10/bits/std_function.h:244
Change-Id: I2c7267118213ea7d915a28d77badf93f8ff75683
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140586
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140689
Tested-by: Jenkins
(cherry picked from commit 9be24f694d42fc9cae55ed911e0dff7f729803f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140611
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 5fb079395eb9..49e1415e744e 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -352,6 +352,11 @@ void
SpellDialog::SpellContinue_Impl(std::unique_ptr* pGua
//then GetNextSentence() has to be called followed again by MarkNextError()
//MarkNextError is not initially called if the UndoEdit mode is active
bool bNextSentence = false;
+if (!m_xSentenceED)
+{
+return;
+}
+
if(!((!m_xSentenceED->IsUndoEditMode() && m_xSentenceED->MarkNextError(
bIgnoreCurrentError, xSpell )) ||
( bNextSentence = GetNextSentence_Impl(pGuard, bUseSavedSentence,
m_xSentenceED->IsUndoEditMode()) && m_xSentenceED->MarkNextError( false, xSpell
return;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/tabpages/tabstpge.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 67e5d8ff8d9bf029ab7480fa1f907696ca8ee2e9 Author: Michael Weghorn AuthorDate: Thu Sep 15 19:03:12 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Sat Sep 17 10:36:21 2022 +0200 tdf#136928 Use dialog text color for signs in "Tabs" dialog and use an explicit matching background of dialog color Since the font color is black even in dark themes like "Adwaita-Dark", using a dark style/theme would previously result in black signs on a dark background for the Qt-based VCL plugins (qt5/kf5/qt6). Change-Id: I470011c26861221310e898c8f63fceef5e1aca3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140029 Tested-by: Jenkins Reviewed-by: Michael Weghorn (cherry picked from commit 2deabc28166af2fc84e74f705b503a42e5394d54) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139982 Reviewed-by: Adolfo Jayme Barrientos diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 5a468f1dfffa..b3a1745c26f9 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -52,7 +52,11 @@ void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta Size aSize(GetOutputSizePixel()); aPoint.setX( aSize.Width() / 2 ); aPoint.setY( aSize.Height() / 2 ); -Ruler::DrawTab(rRenderContext, rRenderContext.GetSettings().GetStyleSettings().GetFontColor(), aPoint, nTabStyle); +const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); +rRenderContext.SetLineColor(rStyleSettings.GetShadowColor()); +rRenderContext.SetFillColor(rStyleSettings.GetDialogColor()); +rRenderContext.DrawRect(tools::Rectangle(Point(0,0), rRenderContext.GetOutputSize())); +Ruler::DrawTab(rRenderContext, rStyleSettings.GetDialogTextColor(), aPoint, nTabStyle); } SvxTabulatorTabPage::SvxTabulatorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/dialogs/SpellDialog.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit 61dae407d98d07a67e4eda63415cc8588e13c91d Author: Caolán McNamara AuthorDate: Mon Sep 12 15:26:51 2022 +0100 Commit: Caolán McNamara CommitDate: Wed Sep 14 00:18:10 2022 +0200 tdf#142631 use document background color in the spelling widget Change-Id: Ie33a0e305192697c18e20c3b6c1a554ccddf4284 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139668 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index a537e4060c99..5fb079395eb9 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -1128,6 +1129,12 @@ void SentenceEditWindow_Impl::SetDrawingArea(weld::DrawingArea* pDrawingArea) WeldEditView::SetDrawingArea(pDrawingArea); // tdf#132288 don't merge equal adjacent attributes m_xEditEngine->DisableAttributeExpanding(); + +// tdf#142631 use document background color in this widget +Color aBgColor = svtools::ColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; +OutputDevice& rDevice = pDrawingArea->get_ref_device(); +rDevice.SetBackground(aBgColor); +m_xEditView->SetBackgroundColor(aBgColor); } SentenceEditWindow_Impl::~SentenceEditWindow_Impl()
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/dialogs/hlmarkwn.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 588879ceafcb4bdbeef3cb8c1770265da3c8917e
Author: Caolán McNamara
AuthorDate: Tue Sep 6 13:09:37 2022 +0100
Commit: Xisco Fauli
CommitDate: Wed Sep 7 08:17:21 2022 +0200
cid#1500594 Explicit null dereferenced
since
commit 5480d9237af1cf25ac464bf49ba364a757fcf6f5
Date: Sun Jan 24 22:17:49 2021 -0900
tdf#114567 tdf#138934 Hyperlink-Target in Doc Headings expand/collapse
lets make a copy of the iterator
Change-Id: I855c58377871d7fb55ea676ebac48c0abc67e98c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139502
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 616d5e7122bc..ff7730db55c0 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -366,7 +366,7 @@ int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference<
container::XNameAccess >
// push if the inserted entry is a child
if (nOutlineLevel >
aHeadingsParentEntryStack.top().second)
aHeadingsParentEntryStack.push(
-std::pair(std::move(xEntry),
nOutlineLevel));
+
std::pair(mxLbTree->make_iterator(xEntry.get()), nOutlineLevel));
}
else
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/tabpages/numpages.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit e1d23e8f24c655f5e18592524b099cb150b3e609
Author: Julien Nabet
AuthorDate: Thu Jul 28 19:58:49 2022 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Jul 30 04:22:26 2022 +0200
tdf#150187: Crash in Presentation Styles - Background objects - Modify
Regression from e85b482df3fa01e5a2b549df63db96cc49f1ca78
(use SfxItemSet::GetItemIfSet in cui)
Change-Id: I74889f21f2bda248946269b0caf5ddc629002ae0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137580
Reviewed-by: Julien Nabet
(cherry picked from commit 740cdbb68b3357a5e3894f742c5804c5b8a21e02)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137533
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 215e59b38a58..050e8c7c0ec8 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -418,6 +418,12 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet )
{
nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
pItem = rSet->GetItemIfSet(nNumItemId, false);
+
+if( !pItem )
+{
+pItem = & rSet->Get( nNumItemId );
+}
+
}
pSaveNum.reset( new SvxNumRule(pItem->GetNumRule()) );
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/tabpages/measure.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 38bd5a2a8c967acaf3bc79ca4a1167b3cdbddd8d Author: Julien Nabet AuthorDate: Thu Jul 28 11:21:42 2022 +0200 Commit: Julien Nabet CommitDate: Thu Jul 28 13:54:01 2022 +0200 tdf#119246: Dimensions dialog has wrong values in several fields Regression from a8dd49b9fc59371ff8edb31082bbd4f1b6179b1c Convert dimension lines tab page to widget UI Min and max should be -1 and 1 (in mm). Change-Id: I936857f4c10bd2b6fec7b0e492c069b88cc071dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137553 Reviewed-by: Julien Nabet (cherry picked from commit 6cf1212e9ea67c5c898d6383ff15fdfe43fe963a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137523 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Jenkins diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 5a1188a05067..fe61ed53abff 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -110,11 +110,16 @@ SvxMeasurePage::SvxMeasurePage(weld::Container* pPage, weld::DialogController* p m_xTsbAutoPosH->connect_toggled(LINK(this, SvxMeasurePage, ClickAutoPosHdl_Impl)); Link aLink(LINK(this, SvxMeasurePage, ChangeAttrEditHdl_Impl)); +m_xMtrFldLineDist->set_range(-1, 1, FieldUnit::MM); m_xMtrFldLineDist->connect_value_changed(aLink); m_xMtrFldHelplineOverhang->connect_value_changed(aLink); +m_xMtrFldHelplineOverhang->set_range(-1, 1, FieldUnit::MM); m_xMtrFldHelplineDist->connect_value_changed(aLink); +m_xMtrFldHelplineDist->set_range(-1, 1, FieldUnit::MM); m_xMtrFldHelpline1Len->connect_value_changed(aLink); +m_xMtrFldHelpline1Len->set_range(-1, 1, FieldUnit::MM); m_xMtrFldHelpline2Len->connect_value_changed(aLink); +m_xMtrFldHelpline2Len->set_range(-1, 1, FieldUnit::MM); m_xMtrFldDecimalPlaces->connect_value_changed(LINK(this, SvxMeasurePage, ChangeAttrSpinHdl_Impl)); m_xTsbBelowRefEdge->connect_toggled(LINK(this, SvxMeasurePage, ChangeAttrClickHdl_Impl)); m_xTsbParallel->connect_toggled( LINK( this, SvxMeasurePage, ChangeAttrClickHdl_Impl));
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source
cui/source/inc/paragrph.hxx |2 ++
cui/source/tabpages/paragrph.cxx |8
2 files changed, 10 insertions(+)
New commits:
commit b78a78fe9c0c5d919dccd88cce557eb22974a9a7
Author: László Németh
AuthorDate: Fri Jun 24 12:17:17 2022 +0200
Commit: László Németh
CommitDate: Mon Jun 27 13:00:20 2022 +0200
tdf#149713 sw para dialog: gray out labels of the new options
Labels of the new hyphenation options "Hyphenation zone" and
"Minimum word length in characters" were always black, instead
of gray, when Hyphenation is disabled.
Follow-up to commit 7a1d4b7d1db93ca1f541856a8d00d621d50e7bd6
"tdf#149420 sw offapi xmloff: add hyphenation zone" and
commit 29359fc15c435cec17987fd6221ab6833d38746e
"tdf#149324 sw offapi xmloff: add option to not hyphenate short words".
Change-Id: Ic41c2fa0fa69385013b1e90568084956cc5d791d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136367
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 4a42999bfa13e580279067d87fe390ce53a664b1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136461
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Jenkins
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 3947c14d10c8..991641e3b06c 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -232,7 +232,9 @@ private:
std::unique_ptr m_xExtHyphenAfterBox;
std::unique_ptr m_xMaxHyphenLabel;
std::unique_ptr m_xMaxHyphenEdit;
+std::unique_ptr m_xMinWordLabel;
std::unique_ptr m_xMinWordLength;
+std::unique_ptr m_xHyphenZoneLabel;
std::unique_ptr m_xHyphenZone;
// pagebreak
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index b43c77cbd894..78a1cdd178aa 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1614,7 +1614,9 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet*
rSet )
m_xAfterText->set_sensitive(bEnable);
m_xMaxHyphenLabel->set_sensitive(bEnable);
m_xMaxHyphenEdit->set_sensitive(bEnable);
+m_xMinWordLabel->set_sensitive(bEnable);
m_xMinWordLength->set_sensitive(bEnable);
+m_xHyphenZoneLabel->set_sensitive(bEnable);
m_xHyphenZone->set_sensitive(bEnable);
switch (rSet->GetItemState(SID_ATTR_PARA_PAGENUM))
@@ -1931,7 +1933,9 @@
SvxExtParagraphTabPage::SvxExtParagraphTabPage(weld::Container* pPage, weld::Dia
, m_xExtHyphenAfterBox(m_xBuilder->weld_spin_button("spinLineBegin"))
, m_xMaxHyphenLabel(m_xBuilder->weld_label("labelMaxNum"))
, m_xMaxHyphenEdit(m_xBuilder->weld_spin_button("spinMaxNum"))
+, m_xMinWordLabel(m_xBuilder->weld_label("labelMinLen"))
, m_xMinWordLength(m_xBuilder->weld_spin_button("spinMinLen"))
+, m_xHyphenZoneLabel(m_xBuilder->weld_label("labelHyphenZone"))
, m_xHyphenZone(new
SvxRelativeField(m_xBuilder->weld_metric_spin_button("spinHyphenZone",
FieldUnit::CM)))
//Page break
, m_xPageBreakBox(m_xBuilder->weld_check_button("checkInsert"))
@@ -2001,7 +2005,9 @@
SvxExtParagraphTabPage::SvxExtParagraphTabPage(weld::Container* pPage, weld::Dia
m_xExtHyphenAfterBox->set_sensitive(false);
m_xMaxHyphenLabel->set_sensitive(false);
m_xMaxHyphenEdit->set_sensitive(false);
+m_xMinWordLabel->set_sensitive(false);
m_xMinWordLength->set_sensitive(false);
+m_xHyphenZoneLabel->set_sensitive(false);
m_xHyphenZone->set_sensitive(false);
m_xPageNumBox->set_sensitive(false);
m_xPagenumEdit->set_sensitive(false);
@@ -2136,7 +2142,9 @@ void SvxExtParagraphTabPage::HyphenClickHdl()
m_xExtHyphenAfterBox->set_sensitive(bEnable);
m_xMaxHyphenLabel->set_sensitive(bEnable);
m_xMaxHyphenEdit->set_sensitive(bEnable);
+m_xMinWordLabel->set_sensitive(bEnable);
m_xMinWordLength->set_sensitive(bEnable);
+m_xHyphenZoneLabel->set_sensitive(bEnable);
m_xHyphenZone->set_sensitive(bEnable);
m_xHyphenBox->set_state(bEnable ? TRISTATE_TRUE : TRISTATE_FALSE);
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source include/svtools svtools/source svtools/uiconfig
cui/source/options/optsave.cxx | 16 +---
include/svtools/restartdialog.hxx|3 +++
svtools/source/dialogs/restartdialog.cxx |3 +++
svtools/uiconfig/ui/restartdialog.ui | 19 +--
4 files changed, 36 insertions(+), 5 deletions(-)
New commits:
commit 5766b29e49aa8cf15dc7a7b97a4347d74ba735ce
Author: Tünde Tóth
AuthorDate: Tue May 31 16:11:03 2022 +0200
Commit: László Németh
CommitDate: Fri Jun 24 12:04:38 2022 +0200
tdf#149401 show "Restart LibreOffice" dialog changing AutoRecovery
Changing "Save Autorecovery... information every ... minutes"
option in Tools->Options...->Load/Save->General shows that
dialog window to warn about its work.
Change-Id: I91ae72ea1e52ec5c6d9286a43cd986386636076c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135221
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 98cb1a3110848f7c974414ec3a4d24b4715a2626)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136327
Tested-by: Jenkins
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 717fa623a668..43468715cd3a 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -25,6 +25,7 @@
#include
#include
#include "optsave.hxx"
+#include
#include
#include
#include
@@ -37,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -225,7 +227,7 @@ void SvxSaveTabPage::DetectHiddenControls()
bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet )
{
auto xChanges = comphelper::ConfigurationChanges::create();
-bool bModified = false;
+bool bModified = false, bRequestRestart = false;
if(m_xLoadUserSettingsCB->get_state_changed_from_saved())
officecfg::Office::Common::Load::UserDefinedSettings::set(m_xLoadUserSettingsCB->get_active(),
xChanges);
@@ -255,7 +257,7 @@ bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet )
{
rSet->Put( SfxBoolItem( SID_ATTR_AUTOSAVE,
m_xAutoSaveCB->get_active() ) );
-bModified = true;
+bModified = bRequestRestart = true;
}
if ( m_xWarnAlienFormatCB->get_state_changed_from_saved() )
{
@@ -268,7 +270,7 @@ bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet )
{
rSet->Put( SfxUInt16Item( SID_ATTR_AUTOSAVEMINUTE,
static_cast(m_xAutoSaveEdit->get_value()) ) );
-bModified = true;
+bModified = bRequestRestart = true;
}
if ( m_xUserAutoSaveCB->get_state_changed_from_saved() )
@@ -322,6 +324,14 @@ bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet )
aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::EFactory::WRITERGLOBAL,
pImpl->aDefaultArr[APP_WRITER_GLOBAL]);
xChanges->commit();
+
+if (bRequestRestart)
+{
+OfaTreeOptionsDialog*
pParentDlg(static_cast(GetDialogController()));
+if (pParentDlg)
+pParentDlg->SetNeedsRestart(svtools::RESTART_REASON_SAVE);
+}
+
return bModified;
}
diff --git a/include/svtools/restartdialog.hxx
b/include/svtools/restartdialog.hxx
index 95ca3ef4356d..001f322772a5 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -65,6 +65,9 @@ enum RestartReason {
// For restructuring the Form menu,
// %PRODUCTNAME must be restarted:
RESTART_REASON_MSCOMPATIBLE_FORMS_MENU,
+// For the modified save settings to take effect,
+// %PRODUCTNAME must be restarted:
+RESTART_REASON_SAVE,
// To apply changes, %PRODUCTNAME,
// %PRODUCTNAME must be restarted:
RESTART_REASON_UI_CHANGE,
diff --git a/svtools/source/dialogs/restartdialog.cxx
b/svtools/source/dialogs/restartdialog.cxx
index ba5c7d2a3304..30954f17638b 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -71,6 +71,9 @@ public:
case svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU:
reason_ = m_xBuilder->weld_widget("reason_mscompatible_formsmenu");
break;
+case svtools::RESTART_REASON_SAVE:
+reason_ = m_xBuilder->weld_widget("reason_save");
+break;
case svtools::RESTART_REASON_UI_CHANGE:
reason_ = m_xBuilder->weld_widget("reason_uichange");
break;
diff --git a/svtools/uiconfig/ui/restartdialog.ui
b/svtools/uiconfig/ui/restartdialog.ui
index c49218c03bc8..9772c1659ad7 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -273,6 +273,21 @@
13
+
+
+False
+True
+For the modified save settings to take
effect, %PRODUCTNAME must be restarted.
+True
+50
+0
+
+
+False
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source sc/source
cui/source/options/optchart.cxx | 11 ++-
cui/source/options/optinet2.cxx |6 ++
sc/source/ui/optdlg/tpcalc.cxx |3 ++-
3 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit 6b9837ebe40b44bdd6e5940b9a5a457cb350c546
Author: Noel Grandin
AuthorDate: Mon Jun 20 19:17:00 2022 +0200
Commit: Xisco Fauli
CommitDate: Tue Jun 21 10:07:15 2022 +0200
tdf#58134 Reset Button in Options Dialogs
fixed a couple of these.
Change-Id: Ibef29afee1d702af2812996093deb7204c74e32c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136195
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit b95142c11e80c58b70dff68bfd7f3792657b9ee2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136167
Reviewed-by: Xisco Fauli
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index af9b92322802..9b1e6c9c92f2 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -157,7 +157,16 @@ bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet*
rOutAttrs )
void SvxDefaultColorOptPage::Reset( const SfxItemSet* )
{
-m_xLbChartColors->select( 0 );
+if( m_SvxChartColorTableUniquePtr )
+{
+m_SvxChartColorTableUniquePtr->useDefault();
+
+FillBoxChartColorLB();
+
+m_xLbChartColors->grab_focus();
+m_xLbChartColors->select( 0 );
+m_xPBRemove->set_sensitive(true);
+}
}
void SvxDefaultColorOptPage::FillPaletteLB()
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 3ce4df88cb59..a3dd5826f6f3 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -204,6 +204,8 @@ void SvxProxyTabPage::ReadConfigData_Impl()
nIntValue = *x;
m_xHttpPortED->set_text( OUString::number( nIntValue ));
}
+else
+m_xHttpPortED->set_text( "" );
m_xHttpsProxyED->set_text(
officecfg::Inet::Settings::ooInetHTTPSProxyName::get() );
x = officecfg::Inet::Settings::ooInetHTTPSProxyPort::get();
@@ -212,6 +214,8 @@ void SvxProxyTabPage::ReadConfigData_Impl()
nIntValue = *x;
m_xHttpsPortED->set_text( OUString::number( nIntValue ));
}
+else
+m_xHttpsPortED->set_text( "" );
m_xFtpProxyED->set_text(
officecfg::Inet::Settings::ooInetFTPProxyName::get() );
x = officecfg::Inet::Settings::ooInetFTPProxyPort::get();
@@ -220,6 +224,8 @@ void SvxProxyTabPage::ReadConfigData_Impl()
nIntValue = *x;
m_xFtpPortED->set_text( OUString::number( nIntValue ));
}
+else
+m_xFtpPortED->set_text( "" );
m_xNoProxyForED->set_text( officecfg::Inet::Settings::ooInetNoProxy::get()
);
}
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 4974dcb3a519..ae767043f73b 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#undef SC_DLLIMPLEMENTATION
+#undef SC_DLLIMPLEMENTATION
#include
#include
@@ -143,6 +143,7 @@ void ScTpCalcOptions::Reset(const SfxItemSet* rCoreAttrs)
m_xFtPrec->set_sensitive(false);
m_xEdPrec->set_sensitive(false);
m_xBtnGeneralPrec->set_active(false);
+m_xEdPrec->set_value(0);
}
else
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/source svx/source
cui/source/tabpages/paragrph.cxx |3 +--
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |2 +-
svx/source/sidebar/paragraph/ParaSpacingWindow.cxx |2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit fee9ef889ac85c6758aef9fb2b8101424cf3c870
Author: Gabor Kelemen
AuthorDate: Sat Jun 18 19:45:02 2022 +0200
Commit: Caolán McNamara
CommitDate: Mon Jun 20 10:06:50 2022 +0200
tdf#68335 Increase default para spacing before/after to 56 cm
and fixed line spacing as well.
These may be set to 1584 pt in Word, but the UI incorrectly showed
even the correctly imported values as 10 cm.
Turns out this is only a UI limitation, so lift it for UX interop.
Save/reload already works fine to odt, docx, doc, rtf formats.
Change-Id: I69a772e860ad24a1b317dc041b0c55f0a9d461de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136102
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit a8b704e1367b61119b5747e32fda3088bd8d0a18)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136124
Reviewed-by: Caolán McNamara
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 0a0cb96487d8..b43c77cbd894 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -65,8 +65,7 @@ const WhichRangesContainer
SvxExtParagraphTabPage::pExtRanges(svl::Items<
SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP// 10065 - 10066
>);
-#define MAX_DURCH 5670 // 10 cm makes sense as maximum interline lead
-// according to BP
+#define MAX_DURCH 31680 // tdf#68335: 1584 pt for UX interoperability with
Word
#define FIX_DIST_DEF 283// standard fix distance 0,5 cm
namespace {
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 77962e065aeb..f4e2fd83bb52 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -38,7 +38,7 @@ using namespace css::uno;
namespace svx::sidebar {
#define DEFAULT_VALUE 0
-#define MAX_DURCH 5670
+#define MAX_DURCH 31680 // tdf#68335: 1584 pt for UX
interoperability with Word
#define MAX_SW 1709400
#define MAX_SC_SD 116220200
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index 917933018f9f..fa164dd024c6 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -28,7 +28,7 @@
using namespace svx;
#define DEFAULT_VALUE 0
-#define MAX_DURCH 5670
+#define MAX_DURCH 31680 // tdf#68335: 1584 pt for UX
interoperability with Word
#define MAX_SW 1709400
#define MAX_SC_SD 116220200
#define NEGA_MAXVALUE -1000
