[Libreoffice-commits] core.git: cui/source sc/source sd/source sfx2/source starmath/source svx/source sw/source
cui/source/options/connpooloptions.cxx | 10 +++
cui/source/options/dbregister.cxx |5 +
cui/source/options/fontsubs.cxx | 10 +++
cui/source/options/optaccessibility.cxx | 10 +++
cui/source/options/optasian.cxx | 10 +++
cui/source/options/optbasic.cxx | 10 +++
cui/source/options/optchart.cxx | 10 +++
cui/source/options/optcolor.cxx |5 +
cui/source/options/optctl.cxx | 15 -
cui/source/options/optdeepl.cxx |8 ++-
cui/source/options/optfltr.cxx | 20 ++-
cui/source/options/optgdlg.cxx | 33 ++--
cui/source/options/optgenrl.cxx |5 +
cui/source/options/opthtml.cxx | 10 +++
cui/source/options/optinet2.cxx | 28 --
cui/source/options/optjava.cxx | 15 -
cui/source/options/optjsearch.cxx | 10 +++
cui/source/options/optlanguagetool.cxx | 13 +++--
cui/source/options/optlingu.cxx |5 +
cui/source/options/optopencl.cxx|5 +
cui/source/options/optpath.cxx |4 +
cui/source/options/optsave.cxx | 10 +++
cui/source/options/optupdt.cxx | 15 -
cui/source/options/personalization.cxx |8 ++-
cui/source/tabpages/tparea.cxx |5 +
sc/source/ui/optdlg/opredlin.cxx|5 +
sc/source/ui/optdlg/tpcalc.cxx | 15 -
sc/source/ui/optdlg/tpcompatibility.cxx |5 +
sc/source/ui/optdlg/tpdefaults.cxx |5 +
sc/source/ui/optdlg/tpformula.cxx | 15 -
sc/source/ui/optdlg/tpprint.cxx | 10 +++
sc/source/ui/optdlg/tpusrlst.cxx| 10 +++
sc/source/ui/optdlg/tpview.cxx | 25 +++--
sd/source/ui/dlg/prntopts.cxx | 15 -
sd/source/ui/dlg/tpoption.cxx | 20 ++-
sfx2/source/dialog/printopt.cxx | 15 -
starmath/source/dialog.cxx | 15 -
svx/source/dialog/optgrid.cxx | 10 +++
sw/source/ui/config/mailconfigpage.cxx | 15 -
sw/source/ui/config/optcomp.cxx |5 +
sw/source/ui/config/optload.cxx | 23 ++--
sw/source/ui/config/optpage.cxx | 83 +---
42 files changed, 452 insertions(+), 118 deletions(-)
New commits:
commit 0eb05b47a6d89fdfc533515483584fc739962b65
Author: Bayram Çiçek
AuthorDate: Wed Sep 20 14:37:08 2023 +0300
Commit: Andreas Heinisch
CommitDate: Mon Sep 25 11:05:25 2023 +0200
tdf#49895: search in Options: check if label exists (related to tdf#157266)
- since ids in ui files can be changed or removed,
we have to check if they are exits or not, to prevent
any crash or misbehavior.
- Proper solution will be iterating over the
widget ids and collecting their strings without
based on a list of identifiers.
Change-Id: I2088af6842ad0acd00838a37295dc2e6140096f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157103
Reviewed-by: Andreas Heinisch
Tested-by: Andreas Heinisch
diff --git a/cui/source/options/connpooloptions.cxx
b/cui/source/options/connpooloptions.cxx
index b13561898ab0..00101bed4fb6 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -165,12 +165,18 @@ namespace offapp
OUString labels[] = { "label1", "driverslabel", "driverlabel",
"timeoutlabel", "driver" };
for (const auto& label : labels)
-sAllStrings += m_xBuilder->weld_label(label)->get_label() + " ";
+{
+if (const auto& pString = m_xBuilder->weld_label(label))
+sAllStrings += pString->get_label() + " ";
+}
OUString checkButton[] = { "connectionpooling", "enablepooling" };
for (const auto& check : checkButton)
-sAllStrings += m_xBuilder->weld_check_button(check)->get_label() +
" ";
+{
+if (const auto& pString = m_xBuilder->weld_check_button(check))
+sAllStrings += pString->get_label() + " ";
+}
return sAllStrings.replaceAll("_", "");
}
diff --git a/cui/source/options/dbregister.cxx
b/cui/source/options/dbregister.cxx
index d1c8abb4d102..8386cc546595 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -133,7 +133,10 @@ std::unique_ptr
DbRegistrationOptionsPage::Create( weld::Container*
OUString DbRegistrationOptionsPage::GetAllStrings()
{
-OUString sAllStrings = m_xBuilder->weld_label("label1")->get_label() + " ";
+OUString sAllStrings;
+
+if (const auto& pString = m_xBuilder->weld_label("label1"))
+sAllStrings += pString->get_label() + " ";
return sAllStrings.replaceAll("_", "");
}
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index b2fb0604dcf8..eaf00e2364dd 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -146,12 +146,18 @@ OUString SvxFontSub
[Libreoffice-commits] core.git: cui/source sc/source sd/source svx/source sw/source
cui/source/dialogs/cuicharmap.cxx |2 -
cui/source/dialogs/postdlg.cxx | 30 ++---
cui/source/options/optlingu.cxx|7 ++--
cui/source/tabpages/backgrnd.cxx | 10 ++-
cui/source/tabpages/chardlg.cxx|9 ++
cui/source/tabpages/grfpage.cxx|2 -
cui/source/tabpages/numfmt.cxx | 11 +++
cui/source/tabpages/paragrph.cxx | 16 ---
sc/source/ui/drawfunc/drtxtob.cxx |2 -
sc/source/ui/view/cellsh1.cxx |2 -
sc/source/ui/view/editsh.cxx |2 -
sd/source/ui/dlg/tpoption.cxx | 13 -
sd/source/ui/func/fubullet.cxx |2 -
sd/source/ui/view/drtxtob1.cxx |2 -
sd/source/ui/view/drviews3.cxx | 12
sd/source/ui/view/drviews7.cxx |2 -
svx/source/dialog/optgrid.cxx |6 +---
svx/source/sidebar/paragraph/ParaSpacingWindow.cxx |6 +---
sw/source/uibase/shells/annotsh.cxx|2 -
sw/source/uibase/shells/drwtxtsh.cxx |2 -
sw/source/uibase/shells/textsh.cxx |2 -
21 files changed, 58 insertions(+), 84 deletions(-)
New commits:
commit 0e0175629fd0c6a99bb286f155e7a4855b8473d6
Author: Noel Grandin
AuthorDate: Fri Jan 28 09:52:17 2022 +0200
Commit: Noel Grandin
CommitDate: Sat Jan 29 14:07:09 2022 +0100
no need to call GetWhich on these SID_ values
none of them are remapped (via the SfxItemfo stuff in the pool)
Change-Id: Iefd38f1aac55e6059e2c57d102efb508bd1572b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129090
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 2a2129a6d162..0cba92656090 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -657,7 +657,7 @@ void SvxCharacterMap::insertCharToDoc(const OUString&
sGlyph)
m_xOutputSet->Put( SvxFontItem( aFont.GetFamilyType(),
aFont.GetFamilyName(),
aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(),
pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
m_xOutputSet->Put( SfxStringItem( SID_FONT_NAME, aFont.GetFamilyName()
) );
-m_xOutputSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), cChar
) );
+m_xOutputSet->Put( SfxInt32Item( SID_ATTR_CHAR, cChar ) );
}
}
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 6bd7766b04c2..1bcb6b7a0156 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -52,30 +52,24 @@ SvxPostItDialog::SvxPostItDialog(weld::Widget* pParent,
const SfxItemSet& rCoreS
m_xOKBtn->connect_clicked( LINK( this, SvxPostItDialog, OKHdl ) );
bool bNew = true;
-sal_uInt16 nWhich = 0;
m_xPrevBtn->set_visible(bPrevNext);
m_xNextBtn->set_visible(bPrevNext);
-nWhich = m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR );
OUString aAuthorStr, aDateStr;
-if (m_rSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT)
+if (m_rSet.GetItemState( SID_ATTR_POSTIT_AUTHOR ) >= SfxItemState::DEFAULT)
{
bNew = false;
-const SvxPostItAuthorItem& rAuthor =
-static_cast(m_rSet.Get(nWhich));
+const SvxPostItAuthorItem& rAuthor =
m_rSet.Get(SID_ATTR_POSTIT_AUTHOR);
aAuthorStr = rAuthor.GetValue();
}
else
aAuthorStr = SvtUserOptions().GetID();
-nWhich = m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE );
-
-if (m_rSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT)
+if (m_rSet.GetItemState( SID_ATTR_POSTIT_DATE ) >= SfxItemState::DEFAULT)
{
-const SvxPostItDateItem& rDate =
-static_cast(m_rSet.Get( nWhich ));
+const SvxPostItDateItem& rDate = m_rSet.Get( SID_ATTR_POSTIT_DATE );
aDateStr = rDate.GetValue();
}
else
@@ -84,13 +78,10 @@ SvxPostItDialog::SvxPostItDialog(weld::Widget* pParent,
const SfxItemSet& rCoreS
aDateStr = rLocaleWrapper.getDate( Date( Date::SYSTEM ) );
}
-nWhich = m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT );
-
OUString aTextStr;
-if (m_rSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT)
+if (m_rSet.GetItemState( SID_ATTR_POSTIT_TEXT ) >= SfxItemState::DEFAULT)
{
-const SvxPostItTextItem& rText =
-static_cast(m_rSet.Get( nWhich ));
+const SvxPostItTextItem& rText = m_rSet.Get( SID_ATTR_POSTIT_TEXT );
aTextStr = rText.GetValue();
}
@@ -162,12 +153,9 @@ IMPL_LINK_NOARG(SvxPostItDialog, OKHdl, weld::Button&,
void)
{
const LocaleDataWrapper& rLocaleWrapper(
Application::GetSettings().GetLocaleDataWrapper() );
m_xOutS
[Libreoffice-commits] core.git: cui/source sc/source sd/source
cui/source/dialogs/hldocntp.cxx |2 +- cui/source/dialogs/hldoctp.cxx |4 ++-- cui/source/dialogs/hlmailtp.cxx |2 +- cui/source/dialogs/hltpbase.cxx |2 +- cui/source/tabpages/align.cxx |6 +++--- cui/source/tabpages/border.cxx |4 ++-- sc/source/ui/cctrl/checklistmenu.cxx|2 +- sd/source/ui/animations/SlideTransitionPane.cxx |2 +- sd/source/ui/dlg/inspagob.cxx |2 +- 9 files changed, 13 insertions(+), 13 deletions(-) New commits: commit 1500ec88195466d119d73bdf7b85e8f5526e81fc Author: Caolán McNamara AuthorDate: Thu Jan 24 11:47:54 2019 + Commit: Caolán McNamara CommitDate: Thu Jan 24 17:49:50 2019 +0100 tdf#122904: missing images in the format->paragraph->border valuesets since... commit 41b8b8c5ede634774851b438a4c823962c14b611 Date: Fri Jan 18 11:06:53 2019 +0200 use Image(OUString) instead of Image(Bitmap(OUString)) Change-Id: I05c2f8fb8190e9dde12e69de0d875b7bcc1ea617 Reviewed-on: https://gerrit.libreoffice.org/66861 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 4246bfec636f..b60de28efffb 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -111,7 +111,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDia get(m_pCbbPath, "path"); m_pCbbPath->SetSmartProtocol(INetProtocol::File); get(m_pBtCreate, "create"); -m_pBtCreate->SetModeImage(Image(RID_SVXBMP_NEWDOC)); +m_pBtCreate->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_NEWDOC)); get(m_pLbDocTypes, "types"); m_pLbDocTypes->set_height_request(m_pLbDocTypes->GetTextHeight() * 5); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 968c420211c2..17597ab9dd27 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -42,11 +42,11 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p get(m_pCbbPath, "path"); m_pCbbPath->SetSmartProtocol(INetProtocol::File); get(m_pBtFileopen, "fileopen"); -m_pBtFileopen->SetModeImage(Image(RID_SVXBMP_FILEOPEN)); +m_pBtFileopen->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_FILEOPEN)); get(m_pEdTarget, "target"); get(m_pFtFullURL, "url"); get(m_pBtBrowse, "browse"); -m_pBtBrowse->SetModeImage(Image(RID_SVXBMP_TARGET)); +m_pBtBrowse->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_TARGET)); // Disable display of bitmap names. m_pBtBrowse->EnableTextDisplay (false); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index b56f34ff41c9..89809a3b394a 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -42,7 +42,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* get(m_pCbbReceiver, "receiver"); m_pCbbReceiver->SetSmartProtocol(INetProtocol::Mailto); get(m_pBtAdrBook, "adressbook"); -m_pBtAdrBook->SetModeImage(Image(RID_SVXBMP_ADRESSBOOK)); +m_pBtAdrBook->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_ADRESSBOOK)); get(m_pFtSubject, "subject_label"); get(m_pEdSubject, "subject"); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 0becb6f69590..be8bae72b516 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -176,7 +176,7 @@ void SvxHyperlinkTabPageBase::InitStdControls () get(mpEdIndication, "indication"); get(mpEdText, "name"); get(mpBtScript, "script"); -mpBtScript->SetModeImage(Image(RID_SVXBMP_SCRIPT)); +mpBtScript->SetModeImage(Image(StockImage::Yes, RID_SVXBMP_SCRIPT)); mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) ); mpBtScript->EnableTextDisplay (false); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 0b230fc4cd05..a3ed47d518a4 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -596,9 +596,9 @@ void AlignmentTabPage::InitVsRefEgde() // remember selection - is deleted in call to ValueSet::Clear() sal_uInt16 nSel = m_aVsRefEdge.GetSelectedItemId(); -Image aBottomLock(RID_SVXBMP_BOTTOMLOCK); -Image aTopLock(RID_SVXBMP_TOPLOCK); -Image aCellLock(RID_SVXBMP_CELLLOCK); +Image aBottomLock(StockImage::Yes, RID_SVXBMP_BOTTOMLOCK); +Image aTopLock(StockImage::Yes, RID_SVXBMP_TOPLOCK); +Image aCellLock(StockImage::Yes, RID_SVXBMP_CELLLOCK); m_aVsRefEdge.Clear(); m_aVsRefEdge.SetStyle(m_aVsRefEdge.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index aa48782017c9..74be36
[Libreoffice-commits] core.git: cui/source sc/source sd/source
cui/source/dialogs/cuihyperdlg.cxx | 19 ---
cui/source/dialogs/hldocntp.cxx |4 +---
cui/source/dialogs/hldoctp.cxx |8 ++--
cui/source/dialogs/hlmailtp.cxx |4 +---
cui/source/dialogs/hltpbase.cxx |4 +---
cui/source/inc/border.hxx |4 ++--
cui/source/tabpages/align.cxx | 19 ++-
cui/source/tabpages/border.cxx | 13 ++---
sc/source/ui/cctrl/checklistmenu.cxx|7 ++-
sd/source/ui/animations/SlideTransitionPane.cxx |4 ++--
sd/source/ui/dlg/inspagob.cxx |4 +---
11 files changed, 24 insertions(+), 66 deletions(-)
New commits:
commit 41b8b8c5ede634774851b438a4c823962c14b611
Author: Noel Grandin
AuthorDate: Fri Jan 18 11:06:53 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Jan 18 11:49:17 2019 +0100
use Image(OUString) instead of Image(Bitmap(OUString))
which benefits LOOL since we can delay creating the image until
we know the dpi setting of the display we are going to write to.
Change-Id: I4c16fd221f7ec3693e37bacf3fdf7026a8c2e8bc
Reviewed-on: https://gerrit.libreoffice.org/66574
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/dialogs/cuihyperdlg.cxx
b/cui/source/dialogs/cuihyperdlg.cxx
index 9612b8195bd6..26a6e4f027c4 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -89,33 +89,22 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent,
SfxBindings* pBindings)
{
mbGrabFocus = true;
// insert pages
-std::vector imgVector;
OUString aStrTitle;
SvxIconChoiceCtrlEntry *pEntry;
-imgVector.emplace_back(StockImage::Yes, RID_SVXBMP_HLINETTP);
-imgVector.emplace_back(StockImage::Yes, RID_SVXBMP_HLMAILTP);
-imgVector.emplace_back(StockImage::Yes, RID_SVXBMP_HLDOCTP);
-imgVector.emplace_back(StockImage::Yes, RID_SVXBMP_HLDOCNTP);
-for(Image &aImage : imgVector )
-{
-BitmapEx aBitmap = aImage.GetBitmapEx();
-
aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality);
-aImage = Image(aBitmap);
-}
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP );
-pEntry = AddTabPage ( HyperLinkPageType::Internet, aStrTitle,
imgVector[0], SvxHyperlinkInternetTp::Create );
+pEntry = AddTabPage ( HyperLinkPageType::Internet, aStrTitle,
Image(StockImage::Yes, RID_SVXBMP_HLINETTP), SvxHyperlinkInternetTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP );
-pEntry = AddTabPage ( HyperLinkPageType::Mail, aStrTitle, imgVector[1],
SvxHyperlinkMailTp::Create );
+pEntry = AddTabPage ( HyperLinkPageType::Mail, aStrTitle,
Image(StockImage::Yes, RID_SVXBMP_HLMAILTP), SvxHyperlinkMailTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
if (!comphelper::LibreOfficeKit::isActive())
{
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP );
-pEntry = AddTabPage ( HyperLinkPageType::Document, aStrTitle,
imgVector[2], SvxHyperlinkDocTp::Create );
+pEntry = AddTabPage ( HyperLinkPageType::Document, aStrTitle,
Image(StockImage::Yes, RID_SVXBMP_HLDOCTP), SvxHyperlinkDocTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP )
);
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP );
-pEntry = AddTabPage ( HyperLinkPageType::NewDocument, aStrTitle,
imgVector[3], SvxHyperlinkNewDocTp::Create );
+pEntry = AddTabPage ( HyperLinkPageType::NewDocument, aStrTitle,
Image(StockImage::Yes, RID_SVXBMP_HLDOCNTP), SvxHyperlinkNewDocTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP
) );
}
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 96a2fcac3ed8..4246bfec636f 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -111,9 +111,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window
*pParent, IconChoiceDia
get(m_pCbbPath, "path");
m_pCbbPath->SetSmartProtocol(INetProtocol::File);
get(m_pBtCreate, "create");
-BitmapEx aBitmap(RID_SVXBMP_NEWDOC);
-
aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality
);
-m_pBtCreate->SetModeImage(Image(aBitmap));
+m_pBtCreate->SetModeImage(Image(RID_SVXBMP_NEWDOC));
get(m_pLbDocTypes, "types");
m_pLbDocTypes->set_height_request(m_pLbDocTypes->GetTextHeight() * 5);
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 9c3033b693c7..968c420211c2 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -42,15 +42,11 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window
*pParent,
[Libreoffice-commits] core.git: cui/source sc/source sd/source sw/source
cui/source/inc/backgrnd.hxx |4 ++
cui/source/inc/cuitabarea.hxx |2 -
cui/source/tabpages/backgrnd.cxx| 68 ++--
sc/source/ui/attrdlg/attrdlg.cxx|4 ++
sc/source/ui/docshell/docsh4.cxx|3 +
sc/source/ui/styleui/styledlg.cxx |8 +++-
sc/source/ui/view/formatsh.cxx |3 +
sc/source/ui/view/tabvwsha.cxx |4 --
sd/source/ui/dlg/dlgchar.cxx|2 -
sd/source/ui/dlg/prltempl.cxx |2 -
sd/source/ui/dlg/tabtempl.cxx |2 -
sd/source/ui/func/fuchar.cxx|2 -
sw/source/ui/dialog/uiregionsw.cxx |4 --
sw/source/ui/fmtui/tmpdlg.cxx |8 ++--
sw/source/uibase/shells/tabsh.cxx |4 --
sw/source/uibase/shells/textsh1.cxx | 11 -
16 files changed, 86 insertions(+), 45 deletions(-)
New commits:
commit 0dfb0f09f5582a33d16c5ad8659fab198d530b31
Author: Jim Raykowski
AuthorDate: Fri Jul 6 01:42:20 2018 -0800
Commit: Samuel Mehrbrodt
CommitDate: Mon Nov 5 08:45:18 2018 +0100
tdf#105225 new background tab page
This patch allows the new background/highlighting tab page and derived
from area tab page to work correctly in the same tab dialog. It also
provides a cleaner way to use the new background tab page by setting
brush item as fill attributes to target set in the background tab page
created method.
Previously if the new background tab page and the area tab page were
used in the same tab page dialog one would affect the other due to the
same use of pool fill items. This patch makes a local copy of the
attribute item set passed and then passes that set along to the parent
class area tab page on each activation/deactivation.
Tab page dialogs that use both the background and area tab pages are:
Writer Paragraph Styles, Impress Presentations Styles and Drawing/
Graphics Styles, and Draw Drawing/Graphics Styles.
All new background tab page merged patches have been reworked in this
patch and remaining old background tab pages, with the exception of
Report Design, have been replaced by the new tab page.
Change-Id: I47f9ae10a0fd967729ff6e83c1a312aa49e1d13c
Reviewed-on: https://gerrit.libreoffice.org/57102
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index dd0b61788e51..8f02659118b6 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -158,7 +158,10 @@ class SvxBkgTabPage : public SvxAreaTabPage
{
std::unique_ptr m_xTblLBox;
boolbHighlighting : 1;
+boolbCharBackColor : 1;
+SfxItemSet maSet;
public:
+using SvxAreaTabPage::ActivatePage;
using SvxAreaTabPage::DeactivatePage;
SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
@@ -167,6 +170,7 @@ public:
static VclPtr Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
+virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
virtual void PageCreated( const SfxAllItemSet& aSet ) override;
};
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index b16a7063e9b1..19c52a601f25 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -215,7 +215,6 @@ public:
class SvxAreaTabPage : public SfxTabPage
{
-using TabPage::ActivatePage;
static const sal_uInt16 pAreaRanges[];
private:
ScopedVclPtr m_pFillTabPage;
@@ -264,6 +263,7 @@ private:
DeactivateRC DeactivatePage_Impl( SfxItemSet* pSet );
public:
+using TabPage::ActivatePage;
using TabPage::DeactivatePage;
SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 00b60945d36b..b41680e22c81 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1346,8 +1346,10 @@ void SvxBackgroundTabPage::PageCreated(const
SfxAllItemSet& aSet)
}
SvxBkgTabPage::SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-: SvxAreaTabPage(pParent, rInAttrs)
-, bHighlighting(false)
+: SvxAreaTabPage(pParent, rInAttrs),
+bHighlighting(false),
+bCharBackColor(false),
+maSet(rInAttrs)
{
m_xBtnGradient->hide();
m_xBtnHatch->hide();
@@ -1389,9 +1391,14 @@ void SvxBkgTabPage::dispose()
SvxAreaTabPage::dispose();
}
+void SvxBkgTabPage::ActivatePage( const SfxItemSet& )
+{
+SvxAreaTabPage::ActivatePage( maSet );
+}
+
DeactivateRC SvxBkgTabPage::DeactivatePage( SfxItemSet* _pSet )
{
-if ( DeactivateRC::KeepPage == SvxAreaTabPage::DeactivatePage( _pSet ) )
+if ( DeactivateRC::KeepPage == SvxAreaTabPage::DeactivatePage( &maSet ) )
return DeactivateRC::KeepPage;
if ( _pSet )
@@ -1420,26 +
[Libreoffice-commits] core.git: cui/source sc/source sd/source svx/source sw/source
cui/source/dialogs/hyphen.cxx |1 - cui/source/dialogs/srchxtra.cxx |1 - cui/source/dialogs/thesdlg.cxx|1 - cui/source/tabpages/chardlg.cxx |1 - cui/source/tabpages/measure.cxx |1 - cui/source/tabpages/numpages.cxx |1 - sc/source/core/data/docpool.cxx |1 - sc/source/ui/cctrl/tbzoomsliderctrl.cxx |2 -- sd/source/core/drawdoc2.cxx |1 - sd/source/ui/animations/CustomAnimationDialog.cxx |1 - sd/source/ui/docshell/docshel3.cxx|1 - sd/source/ui/func/fuconcs.cxx |1 - sd/source/ui/slidesorter/controller/SlsClipboard.cxx |1 - svx/source/accessibility/AccessibleShape.cxx |2 -- svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |2 -- svx/source/dialog/ClassificationDialog.cxx|2 -- svx/source/dialog/_contdlg.cxx|2 -- svx/source/dialog/checklbx.cxx|2 -- svx/source/dialog/connctrl.cxx|1 - svx/source/dialog/contwnd.cxx |1 - svx/source/dialog/ctredlin.cxx|2 -- svx/source/dialog/databaseregistrationui.cxx |1 - svx/source/dialog/dialcontrol.cxx |2 -- svx/source/dialog/fntctrl.cxx |1 - svx/source/dialog/fontwork.cxx|2 -- svx/source/dialog/frmsel.cxx |2 -- svx/source/dialog/grfflt.cxx |2 -- svx/source/dialog/hdft.cxx|2 -- svx/source/dialog/imapwnd.cxx |2 -- svx/source/dialog/measctrl.cxx|1 - svx/source/dialog/optgrid.cxx |2 -- svx/source/dialog/rlrcitem.cxx|2 -- svx/source/dialog/rubydialog.cxx |2 -- svx/source/dialog/rulritem.cxx|1 - svx/source/dialog/searchcharmap.cxx |4 svx/source/form/fmobj.cxx |1 - svx/source/form/fmobjfac.cxx |1 - svx/source/form/fmpage.cxx|2 -- svx/source/form/fmshell.cxx |2 -- svx/source/form/fmsrcimp.cxx |1 - svx/source/form/fmtextcontroldialogs.cxx |2 -- svx/source/form/fmtextcontrolshell.cxx|1 - svx/source/gallery2/GalleryControl.cxx|1 - svx/source/gallery2/galobj.cxx|1 - svx/source/gallery2/galtheme.cxx |1 - svx/source/items/svxerr.cxx |1 - svx/source/sdr/contact/viewcontactofgraphic.cxx |2 -- svx/source/sdr/contact/viewcontactofsdrpage.cxx |2 -- svx/source/sidebar/area/AreaPropertyPanel.cxx |2 -- svx/source/sidebar/area/AreaPropertyPanelBase.cxx |2 -- svx/source/sidebar/line/LinePropertyPanel.cxx |2 -- svx/source/sidebar/paragraph/ParaPropertyPanel.cxx|2 -- svx/source/sidebar/possize/PosSizePropertyPanel.cxx |2 -- svx/source/sidebar/shadow/ShadowPropertyPanel.cxx |2 -- svx/source/sidebar/text/TextCharacterSpacingControl.cxx |2 -- svx/source/sidebar/text/TextUnderlineControl.cxx |2 -- svx/source/sidebar/tools/ValueSetWithTextControl.cxx |2 -- svx/source/stbctrls/pszctrl.cxx |2 -- svx/source/stbctrls/selctrl.cxx |2 -- svx/source/svdraw/svdhdl.cxx |2 -- svx/source/svdraw/svdmrkv1.cxx|1 - svx/source/svdraw/svdotxdr.cxx|1 - svx/source/table/tablelayouter.cxx|2 -- svx/source/tbxctrls/SvxColorChildWindow.cxx |2 -- svx/source/tbxctrls/SvxPresetListBox.cxx |2 -- svx/source/tbxctrls/fillctrl.cxx |2 -- svx/source/tbxctrls/itemwin.cxx |2 -- svx/source/tbxctrls/tbxdrctl.cxx |2 -- svx/source/tbxctrls/verttexttbxctrl.cxx |2 -- svx/source/unodraw/unoshap4.cxx |2 -- svx/source/unodraw/unoshape.cxx |3 --- svx/source/xoutdev/xtabbtmp.cxx |2 -- sw/source/core/doc/tblafmt.cxx
[Libreoffice-commits] core.git: cui/source sc/source sd/source
cui/source/customize/cfg.cxx | 11 +- cui/source/customize/selector.cxx |6 - cui/source/dialogs/about.cxx |4 --- cui/source/dialogs/cuigaldlg.cxx |2 - cui/source/dialogs/hangulhanjadlg.cxx |1 cui/source/dialogs/hlinettp.cxx|1 cui/source/dialogs/hlmarkwn.cxx|1 cui/source/dialogs/iconcdlg.cxx|1 cui/source/dialogs/scriptdlg.cxx |2 - cui/source/inc/selector.hxx|1 cui/source/options/optpath.cxx |2 - cui/source/tabpages/tparea.cxx |3 -- sc/source/core/data/dpcache.cxx|2 - sc/source/core/tool/rangeseq.cxx |1 sc/source/core/tool/rangeutl.cxx |1 sc/source/filter/excel/excimp8.cxx |2 - sc/source/filter/starcalc/scflt.cxx|2 - sc/source/filter/xml/XMLExportDataPilot.cxx|1 sc/source/filter/xml/xmlexprt.cxx |1 sc/source/filter/xml/xmlstyli.cxx |2 - sc/source/ui/cctrl/cbuttonw.cxx|1 sc/source/ui/dbgui/consdlg.cxx |2 - sc/source/ui/dbgui/dbnamdlg.cxx|1 sc/source/ui/dbgui/tpsort.cxx |1 sc/source/ui/drawfunc/chartsh.cxx |1 sc/source/ui/formdlg/dwfunctr.cxx |1 sc/source/ui/miscdlgs/acredlin.cxx |2 - sc/source/ui/miscdlgs/crnrdlg.cxx |1 sc/source/ui/miscdlgs/highred.cxx |1 sc/source/ui/unoobj/afmtuno.cxx|2 - sc/source/ui/unoobj/chart2uno.cxx |2 - sc/source/ui/unoobj/docuno.cxx |1 sc/source/ui/unoobj/styleuno.cxx |1 sc/source/ui/vba/vbarange.cxx |1 sc/source/ui/view/drawvie3.cxx |1 sc/source/ui/view/preview.cxx |1 sc/source/ui/view/tabvwshf.cxx |2 - sc/source/ui/view/viewdata.cxx |2 - sd/source/core/CustomAnimationEffect.cxx |1 sd/source/core/sdpage.cxx |3 -- sd/source/core/stlpool.cxx |2 - sd/source/filter/eppt/epptso.cxx |2 - sd/source/ui/dlg/animobjs.cxx |2 - sd/source/ui/dlg/dlgass.cxx|1 sd/source/ui/dlg/sdpreslt.cxx |1 sd/source/ui/func/fusldlg.cxx |1 sd/source/ui/func/futext.cxx |1 sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx |2 - sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx |1 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx |4 --- sd/source/ui/toolpanel/controls/MasterPageObserver.cxx |2 - sd/source/ui/unoidl/sddetect.cxx |1 sd/source/ui/unoidl/unolayer.cxx |1 sd/source/ui/unoidl/unomodel.cxx |1 sd/source/ui/view/DocumentRenderer.cxx |2 - sd/source/ui/view/ViewShellImplementation.cxx |1 sd/source/ui/view/ViewShellManager.cxx |1 sd/source/ui/view/sdview2.cxx |1 sd/source/ui/view/viewoverlaymanager.cxx |1 59 files changed, 3 insertions(+), 100 deletions(-) New commits: commit 305bf19e390aebdf2d20ea052a92f782e8d1185c Author: Thomas Arnhold Date: Sun Feb 24 18:39:08 2013 +0100 loplugin: unused variables And some fallout. Change-Id: I8dfc12f3566e72d79d4f9930284c92577aa485a1 diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index dd01214..abe67f6 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -590,9 +590,6 @@ ConvertSvxConfigEntry( static const OUString aDescriptorLabel( ITEM_DESCRIPTOR_LABEL ); -static const OUString aDescriptorContainer( -ITEM_DESCRIPTOR_CONTAINER ); - uno::
