[Libreoffice-commits] core.git: cui/source sw/source

[Jim Raykowski (via logerrit)]

 cui/source/inc/backgrnd.hxx |   17 +-
 cui/source/inc/cuitabarea.hxx   |1 
 cui/source/tabpages/backgrnd.cxx|  212 +---
 sw/source/uibase/shells/textsh1.cxx |1 
 4 files changed, 116 insertions(+), 115 deletions(-)

New commits:
commit 167fb166e4097c4a855c08a70cdf70c19d4d87ac
Author: Jim Raykowski 
AuthorDate: Tue Oct 17 17:21:33 2023 -0800
Commit: Jim Raykowski 
CommitDate: Fri Nov 3 03:18:38 2023 +0100

tdf#157801 Fix direct formatting is applied after pressing OK in the

Character properties dialog when the Highlighting tab Color page is
open and the color has not been changed

This is noticeable when character highlighting direct formatting is
already at paragraph level.

The expected result of opening the properties dialog, and immediately
pressing OK without changing anything (or alternatively, after
changing something there and then pressing Reset then OK), is no
changes in applied properties at all.

Inspiration for rework of the background tab page. With this patch
XATTR_FILL items need not be included in the InAttrs set, for
example, as part of this patch, the XATTR_FILLSTYLE, XATTR_FILLCOLOR
range is removed from the sw_CharDialog core set.

Change-Id: Ic2de53a29579c33820fc381d354a4afebe048a5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158100
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 450fbdaaa27f..3d50d69e95f4 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -37,23 +37,28 @@ class SvxBrushItem;
 
 class SvxBkgTabPage : public SvxAreaTabPage
 {
-static const WhichRangesContainer pPageRanges;
+static const WhichRangesContainer pBkgRanges;
 
 std::unique_ptr m_xTblLBox;
-boolbHighlighting   : 1;
-boolbCharBackColor  : 1;
-SfxItemSet maSet;
-std::unique_ptr m_pResetSet;
+bool m_bHighlighting = false;
+bool m_bCharBackColor = false;
+
+// m_aAttrSet is used to convert between SvxBrushItem and XFILL item 
attributes and also to
+// allow for cell, row, and table backgrounds to be set in one Table 
dialog opening.
+SfxItemSet m_aAttrSet;
 
 sal_Int32 m_nActPos = -1;
 
 DECL_LINK(TblDestinationHdl_Impl, weld::ComboBox&, void);
+
+void SetActiveTableDestinationBrushItem();
+
 public:
 SvxBkgTabPage(weld::Container* pPage, weld::DialogController* pController, 
const SfxItemSet& rInAttrs);
 virtual ~SvxBkgTabPage() override;
 
 // returns the area of the which-values
-static WhichRangesContainer GetRanges() { return pPageRanges; }
+static WhichRangesContainer GetRanges() { return pBkgRanges; }
 
 static std::unique_ptr Create( weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet* );
 virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 2fbfcd1435ac..0917fcb91dc8 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -253,7 +253,6 @@ protected:
 void SetOptimalSize(weld::DialogController* pController);
 
 void SelectFillType( weld::Toggleable& rButton, const SfxItemSet* _pSet = 
nullptr );
-SfxTabPage* GetFillTabPage() { return m_xFillTabPage.get(); }
 
 bool IsBtnClicked() const { return m_bBtnClicked; }
 
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 5706f98c310a..56bccfacdffe 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -36,7 +36,7 @@ using namespace css;
 #define TBL_DEST_ROW1
 #define TBL_DEST_TBL2
 
-const WhichRangesContainer SvxBkgTabPage::pPageRanges(svl::Items<
+const WhichRangesContainer SvxBkgTabPage::pBkgRanges(svl::Items<
 SID_ATTR_BRUSH, SID_ATTR_BRUSH,
 SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR
 >);
@@ -63,32 +63,13 @@ static sal_uInt16 lcl_GetTableDestSlot(sal_Int32 nTblDest)
 
 SvxBkgTabPage::SvxBkgTabPage(weld::Container* pPage, weld::DialogController* 
pController, const SfxItemSet& rInAttrs)
 : SvxAreaTabPage(pPage, pController, rInAttrs),
-bHighlighting(false),
-bCharBackColor(false),
-maSet(rInAttrs)
+m_aAttrSet(*rInAttrs.GetPool(),
+   rInAttrs.GetRanges().MergeRange(XATTR_FILL_FIRST, 
XATTR_FILL_LAST))
 {
 m_xBtnGradient->hide();
 m_xBtnHatch->hide();
 m_xBtnBitmap->hide();
 m_xBtnPattern->hide();
-
-SfxObjectShell* pDocSh = SfxObjectShell::Current();
-
-XColorListRef pColorTable;
-if ( pDocSh )
-if (auto pItem = pDocSh->GetItem( SID_COLOR_TABLE ))
-pColorTable = pItem->GetColorList();
-
-if ( !pColorTable.is() )
-pColorTable = XColorList::CreateStdColorList();
-
-XBitmapListRef pBitmapList;
-if ( pDocSh )
-if (auto pItem = pDocSh->GetItem( 

[Libreoffice-commits] core.git: cui/source sw/source vcl/inc vcl/jsdialog

[Skyler Grey (via logerrit)]

 cui/source/tabpages/numpages.cxx |6 +-
 sw/source/ui/misc/num.cxx|   11 +--
 vcl/inc/jsdialog/jsdialogbuilder.hxx |1 +
 vcl/jsdialog/enabled.cxx |1 +
 vcl/jsdialog/jsdialogbuilder.cxx |6 ++
 5 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 328d6aae9e2b7a73f6672800629230f5b46d15b1
Author: Skyler Grey 
AuthorDate: Wed Aug 2 08:31:56 2023 +
Commit: Caolán McNamara 
CommitDate: Sat Oct 14 14:30:17 2023 +0200

Re-enable Bullets and Numbering → Customize

- Revert change If0f7b953a40ca1d5f469087cb8f362a949c39b37
- Enable jsdialog for the customize page
- Fix numbering not being selected when switching level
- Fix start at field not having a default when changing level type to one 
that can use it
- Disable types that rely on supporting graphics in LOK as we cannot
  provide them

Change-Id: I2517289b553b8a3e9ed62c64b6514c6aab3702b6
Signed-off-by: Skyler Grey 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153806
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 6b9415005fee130e9d9b4b005a56975794a47934)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157957
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 45ee580f1667..d1cb79341281 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -1089,7 +1090,9 @@ 
SvxNumOptionsTabPage::SvxNumOptionsTabPage(weld::Container* pPage, weld::DialogC
 sal_uInt32 nCount = SvxNumberingTypeTable::Count();
 for (sal_uInt32 i = 0; i < nCount; ++i)
 {
-m_xFmtLB->append(OUString::number(SvxNumberingTypeTable::GetValue(i)), 
SvxNumberingTypeTable::GetString(i));
+int nValue = SvxNumberingTypeTable::GetValue(i);
+if (comphelper::LibreOfficeKit::isActive() && (nValue & 
SVX_NUM_BITMAP)) continue;
+m_xFmtLB->append(OUString::number(nValue), 
SvxNumberingTypeTable::GetString(i));
 }
 
 // Get advanced numbering types from the component.
@@ -1464,6 +1467,7 @@ void SvxNumOptionsTabPage::InitControls()
 else
 m_xBulColLB->SetNoSelection();
 }
+m_xStartED->set_value(1); // If this isn't set then changing the bullet 
type to a numbered type doesn't reset the start level
 switch(nBullet)
 {
 case SHOW_NUMBERING:
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 0764a61be710..91e075d26124 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -873,16 +873,7 @@ 
SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(weld::Window* pParent,
 AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET );
 AddTabPage("outlinenum", RID_SVXPAGE_PICK_NUM );
 AddTabPage("graphics", RID_SVXPAGE_PICK_BMP );
-
-if (comphelper::LibreOfficeKit::isActive())
-{
-RemoveTabPage("customize");
-}
-else
-{
-AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
-}
-
+AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
 AddTabPage("position", RID_SVXPAGE_NUM_POSITION );
 }
 
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 33f5bdcbe881..030638e06e75 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -619,6 +619,7 @@ public:
 virtual void set_entry_text_without_notify(const OUString& rText);
 virtual void set_entry_text(const OUString& rText) override;
 virtual void set_active(int pos) override;
+virtual void set_active_id(const OUString& rText) override;
 virtual bool changed_by_direct_pick() const override;
 
 void render_entry(int pos, int dpix, int dpiy);
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 78aa703a8b6e..c61be13c2b7c 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -53,6 +53,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"cui/ui/linetabpage.ui"
 || rUIFile == u"cui/ui/macroselectordialog.ui"
 || rUIFile == u"cui/ui/numberingformatpage.ui"
+|| rUIFile == u"cui/ui/numberingoptionspage.ui"
 || rUIFile == u"cui/ui/numberingpositionpage.ui"
 || rUIFile == u"cui/ui/optlingupage.ui"
 || rUIFile == u"cui/ui/pageformatpage.ui"
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index ec0c4fec1573..91e09663bef1 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1665,6 +1665,12 @@ void JSComboBox::set_active(int pos)
 sendUpdate();
 }
 
+void JSComboBox::set_active_id(const OUString& rStr)
+{
+sal_uInt16 nPos = find_id(rStr);
+set_active(nPos);
+}
+
 bool JSComboBox::changed_by_direct_pick() 

[Libreoffice-commits] core.git: cui/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/hldocntp.cxx |1 -
 sw/source/uibase/app/apphdl.cxx |4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 5be0f62621a5ef66438cf2dc660be8e524588c15
Author: Caolán McNamara 
AuthorDate: Sun Apr 23 20:49:33 2023 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 24 13:57:20 2023 +0200

tdf#147503 don't use SfxObjectShellLock for new xml forms document

because in the hidden case the document is unexpectedly closed on
leaving NewXForms

Change-Id: I00ea0b8de6c10ff141584cefe3768b7071138393
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150891
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 5160d934cce9..4bdb56ea0658 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -287,7 +287,6 @@ IMPL_STATIC_LINK(SvxHyperlinkNewDocTp, DispatchDocument, 
void*, p, void)
 {
 SfxStringItem aNewName( SID_FILE_NAME, 
xExecuteInfo->aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
 SfxUnoFrameItem aDocFrame( SID_FILLFRAME, 
pViewFrame->GetFrame().GetFrameInterface() );
-fprintf(stderr, "is there a frame int %p\n", 
pViewFrame->GetFrame().GetFrameInterface().get() );
 pViewFrame->GetDispatcher()->ExecuteList(
 SID_SAVEASDOC, SfxCallMode::SYNCHRON,
 {  }, {  });
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 086002ce712e..dcdb31ae8bc3 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -1119,11 +1119,11 @@ void NewXForms( SfxRequest& rReq )
 // copied & excerpted from SwModule::InsertLab(..)
 
 // create new document
-SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD) 
);
+SwDocShellRef xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD) );
 xDocSh->DoInitNew();
 
 // initialize XForms
-static_cast(  )->GetDoc()->initXForms( true );
+xDocSh->GetDoc()->initXForms(true);
 
 // load document into frame
 SfxViewFrame::DisplayNewDocument( *xDocSh, rReq );

[Libreoffice-commits] core.git: cui/source sw/source

[Aron Budea (via logerrit)]

 cui/source/options/treeopt.cxx  |8 
 sw/source/uibase/shells/textsh1.cxx |8 
 2 files changed, 16 insertions(+)

New commits:
commit 0a2b048482e079e4e83307ad00ba7704a4cc815e
Author: Aron Budea 
AuthorDate: Mon Jan 9 04:10:33 2023 +0100
Commit: Miklos Vajna 
CommitDate: Tue Jan 10 11:38:04 2023 +

Make DeepL translator experimental for now

Needs documentation.

Change-Id: If77436a37b5ec40f3eb08a32f0315c1696428c12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145184
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 805ddfc48317..8004c7f15a11 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1418,6 +1418,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< 
XFrame >& _xFrame )
 nPageId = 
static_cast(SID_LANGUAGE_OPTIONS_RES[i].second);
 if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) )
 continue;
+
+// Disable DeepL translation settings, if experimental mode is not 
enabled
+if( RID_SVXPAGE_DEEPL_OPTIONS == nPageId )
+{
+if( ! officecfg::Office::Common::Misc::ExperimentalMode::get() 
)
+continue;
+}
+
 if ( ( RID_SVXPAGE_JSEARCH_OPTIONS != nPageId || 
SvtCJKOptions::IsJapaneseFindEnabled() ) &&
  ( RID_SVXPAGE_ASIAN_LAYOUT != nPageId|| 
SvtCJKOptions::IsAsianTypographyEnabled() ) &&
  ( RID_SVXPAGE_OPTIONS_CTL != nPageId || 
aCTLLanguageOptions.IsCTLFontEnabled() ) )
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index df519ed9782b..3a5a706c901f 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -106,6 +106,8 @@
 #include 
 #include 
 #if !ENABLE_WASM_STRIP_EXTRA
+#include 
+#include 
 #include 
 #include 
 #endif // ENABLE_WASM_STRIP_EXTRA
@@ -2211,6 +2213,12 @@ void SwTextShell::GetState( SfxItemSet  )
 case SID_FM_TRANSLATE:
 {
 #if !ENABLE_WASM_STRIP_EXTRA
+if 
(!officecfg::Office::Common::Misc::ExperimentalMode::get()
+&& !comphelper::LibreOfficeKit::isActive())
+{
+rSet.Put(SfxVisibilityItem(nWhich, false));
+break;
+}
 const SvxDeeplOptions& rDeeplOptions = 
SvxDeeplOptions::Get();
 if (rDeeplOptions.getAPIUrl().isEmpty() || 
rDeeplOptions.getAuthKey().isEmpty())
 {

[Libreoffice-commits] core.git: cui/source sw/source

[Andrea Gelmini (via logerrit)]

 cui/source/dialogs/insdlg.cxx|1 -
 sw/source/core/frmedt/fecopy.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 428385fb870eefe5584dd9c59c0df077369759eb
Author: Andrea Gelmini 
AuthorDate: Fri Oct 29 14:25:58 2021 +0200
Commit: Julien Nabet 
CommitDate: Mon Nov 1 18:01:10 2021 +0100

Removed duplicated includes

Change-Id: I5414710ceee7a572173eae43c906e91e86b7a01f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124433
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 868d9a4f26fd..eddc80a83b09 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -46,7 +46,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index fff8c546317c..7a57c5f4e709 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -70,7 +70,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using namespace ::com::sun::star;
 

[Libreoffice-commits] core.git: cui/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/grfpage.cxx |1 +
 sw/source/ui/envelp/label1.cxx  |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 61f5add790fad40b1e3f7a3a45b96d52f784f69c
Author: Caolán McNamara 
AuthorDate: Mon Jan 18 20:12:45 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 20 10:08:31 2021 +0100

weld the dialog parent for best cleanup

Change-Id: I4e43a7e891077ab257419d57093383c07311bd5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109650
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 707c954703e2..ddc47de404c2 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -632,6 +632,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
 OUString sTemp;
 {
 std::unique_ptr 
xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/spinbox.ui"));
+std::unique_ptr 
xTopLevel(xBuilder->weld_dialog("SpinDialog"));
 std::unique_ptr 
xFld(xBuilder->weld_metric_spin_button("spin", FieldUnit::CM));
 SetFieldUnit( *xFld, eMetric );
 xFld->set_digits(m_xWidthMF->get_digits());
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 6dd5c5b1d4b7..54cc0ff0a61f 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -390,6 +390,7 @@ IMPL_LINK_NOARG(SwLabPage, TypeHdl, weld::ComboBox&, void)
 void SwLabPage::DisplayFormat()
 {
 std::unique_ptr 
xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/spinbox.ui"));
+std::unique_ptr 
xTopLevel(xBuilder->weld_dialog("SpinDialog"));
 std::unique_ptr 
xField(xBuilder->weld_metric_spin_button("spin", FieldUnit::CM));
 SetFieldUnit(*xField, ::GetDfltMetric(false));
 xField->set_digits(2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/options/fontsubs.cxx |8 
 sw/source/uibase/dialog/watermarkdialog.cxx |2 ++
 2 files changed, 10 insertions(+)

New commits:
commit d29a945f164b9b0a78578a99f85769130721e6bb
Author: Caolán McNamara 
AuthorDate: Mon Feb 3 11:55:13 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 3 17:10:17 2020 +0100

Related: tdf#130143 freeze/thaw around bulk insert

Change-Id: Iedb1229b56b5e7f1af1779b830cf324bcc8735e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87862
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 553cdb20cd52..5db165ccfa6a 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -183,6 +183,11 @@ void  SvxFontSubstTabPage::Reset( const SfxItemSet* )
 m_xCheckLB->freeze();
 m_xCheckLB->clear();
 
+m_xFont1CB->freeze();
+m_xFont1CB->clear();
+m_xFont2CB->freeze();
+m_xFont2CB->clear();
+
 FontList aFntLst(Application::GetDefaultDevice());
 sal_uInt16 nFontCount = aFntLst.GetFontNameCount();
 for (sal_uInt16 i = 0; i < nFontCount; ++i)
@@ -192,6 +197,9 @@ void  SvxFontSubstTabPage::Reset( const SfxItemSet* )
 m_xFont2CB->append_text(rFontMetric.GetFamilyName());
 }
 
+m_xFont2CB->thaw();
+m_xFont1CB->thaw();
+
 sal_Int32 nCount = m_xConfig->SubstitutionCount();
 if (nCount)
 m_xUseTableCB->set_active(m_xConfig->IsEnabled());
diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx 
b/sw/source/uibase/dialog/watermarkdialog.cxx
index 4609a66eca70..26589813ec18 100644
--- a/sw/source/uibase/dialog/watermarkdialog.cxx
+++ b/sw/source/uibase/dialog/watermarkdialog.cxx
@@ -54,12 +54,14 @@ void SwWatermarkDialog::InitFields()
 pFontList = xFontList.get();
 }
 
+m_xFont->freeze();
 sal_uInt16 nFontCount = pFontList->GetFontNameCount();
 for (sal_uInt16 i = 0; i < nFontCount; ++i)
 {
 const FontMetric& rFontMetric = pFontList->GetFontName(i);
 m_xFont->append_text(rFontMetric.GetFamilyName());
 }
+m_xFont->thaw();
 
 m_xOKButton->connect_clicked(LINK(this, SwWatermarkDialog, OKButtonHdl));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sw/source

[Jim Raykowski (via logerrit)]

 cui/source/factory/dlgfact.cxx |4 +++-
 cui/source/inc/backgrnd.hxx|5 +
 cui/source/tabpages/backgrnd.cxx   |7 +++
 sw/source/ui/frmdlg/pattern.cxx|9 +++--
 sw/source/uibase/app/appopt.cxx|4 +++-
 sw/source/uibase/shells/basesh.cxx |3 ++-
 6 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit 03facb4bb75e4283c91de6f081ee96137ca4346c
Author: Jim Raykowski 
AuthorDate: Fri Dec 7 17:41:54 2018 -0900
Commit: Mike Kaganski 
CommitDate: Thu Dec 12 16:58:05 2019 +0100

tdf#105225 New UNO and Writer Web background tab pages

Change-Id: Id3e7d1c24d086624f053085e3134792b95188c23
Reviewed-on: https://gerrit.libreoffice.org/64991
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 039f713d2279..63a7e2a089dd 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1424,6 +1424,7 @@ CreateTabPage 
AbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId
 {
 switch ( nId )
 {
+case RID_SW_TP_BACKGROUND :
 case RID_SVXPAGE_BKG :
 return SvxBkgTabPage::Create;
 case RID_SVXPAGE_TEXTANIMATION :
@@ -1468,7 +1469,6 @@ CreateTabPage 
AbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId
 return SvxTextAttrPage::Create;
 case RID_SVXPAGE_ALIGNMENT :
 return svx::AlignmentTabPage::Create;
-case RID_SW_TP_BACKGROUND :
 case RID_SVXPAGE_BACKGROUND :
 return SvxBackgroundTabPage::Create;
 case RID_SVXPAGE_BORDER :
@@ -1534,6 +1534,8 @@ GetTabPageRanges 
AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI
 case RID_SVXPAGE_ALIGNMENT :
 return svx::AlignmentTabPage::GetRanges;
 case RID_SW_TP_BACKGROUND :
+case RID_SVXPAGE_BKG:
+return SvxBkgTabPage::GetRanges;
 case RID_SVXPAGE_BACKGROUND :
 return SvxBackgroundTabPage::GetRanges;
 case RID_SVXPAGE_BORDER :
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 782e56d9f811..2392faae129d 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -153,6 +153,8 @@ private:
 
 class SvxBkgTabPage : public SvxAreaTabPage
 {
+static const sal_uInt16 pPageRanges[];
+
 std::unique_ptr m_xTblLBox;
 boolbHighlighting   : 1;
 boolbCharBackColor  : 1;
@@ -166,6 +168,9 @@ public:
 SvxBkgTabPage(weld::Container* pPage, weld::DialogController* pController, 
const SfxItemSet& rInAttrs);
 virtual ~SvxBkgTabPage() override;
 
+// returns the area of the which-values
+static const sal_uInt16* GetRanges() { return pPageRanges; }
+
 static std::unique_ptr Create( weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet* );
 virtual bool FillItemSet( SfxItemSet* ) override;
 virtual void ActivatePage( const SfxItemSet& ) override;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 17bc6e6b3411..18bcfc734689 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -63,6 +63,13 @@ const sal_uInt16 SvxBackgroundTabPage::pPageRanges[] =
 0
 };
 
+const sal_uInt16 SvxBkgTabPage::pPageRanges[] =
+{
+SID_ATTR_BRUSH, SID_ATTR_BRUSH,
+SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR,
+0
+};
+
 /// Returns the fill style of the currently selected entry.
 static drawing::FillStyle lcl_getFillStyle(const weld::ComboBox& rLbSelect)
 {
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 2fccc5172b32..9cc2e271d7a3 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -29,9 +29,14 @@ SwBackgroundDlg::SwBackgroundDlg(weld::Window* pParent, 
const SfxItemSet& rSet)
 {
 m_xDialog->set_title(SwResId(STR_FRMUI_PATTERN));
 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BACKGROUND );
+::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BKG );
 if ( fnCreatePage )
-SetTabPage((*fnCreatePage)(get_content_area(), this, ));
+{
+std::unique_ptr xRet = (*fnCreatePage)(get_content_area(), 
this, );
+xRet->PageCreated(rSet);
+xRet->ActivatePage(rSet);
+SetTabPage(std::move(xRet));
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index f071b85997fe..90c04f18ae59 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -101,6 +101,7 @@ std::unique_ptr SwModule::CreateItemSet( 
sal_uInt16 nId )
 GetPool(),
 svl::Items<
 RES_BACKGROUND, RES_BACKGROUND,
+XATTR_FILL_FIRST, XATTR_FILL_LAST,
 

[Libreoffice-commits] core.git: cui/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/grfpage.cxx |3 ++-
 sw/source/ui/envelp/label1.cxx  |3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 435023376b7f07c974fa348782cff058f60ceba3
Author: Caolán McNamara 
AuthorDate: Tue Sep 24 12:10:21 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 24 17:11:09 2019 +0200

use GetDefDialogParent as an arbitrary parent for temp widget

Change-Id: I7226481c7d501c88ac937760ba464b1b11260f7e
Reviewed-on: https://gerrit.libreoffice.org/79452
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1e19b0d0667f..7defa0a2b08e 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #define CM_1_TO_TWIP567
@@ -631,7 +632,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
 // display original size
 const FieldUnit eMetric = GetModuleFieldUnit( GetItemSet() );
 
-ScopedVclPtrInstance< MetricField > aFld(this, WB_HIDE);
+ScopedVclPtrInstance< MetricField > 
aFld(Application::GetDefDialogParent(), WB_HIDE);
 SetFieldUnit( *aFld, eMetric );
 aFld->SetDecimalDigits(m_xWidthMF->get_digits());
 aFld->SetMax( LONG_MAX - 1 );
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 9908ab6a8477..e1e42ba1ef64 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -393,7 +394,7 @@ IMPL_LINK_NOARG(SwLabPage, TypeHdl, weld::ComboBox&, void)
 
 void SwLabPage::DisplayFormat()
 {
-ScopedVclPtrInstance< MetricField > aField(this, WinBits(0));
+ScopedVclPtrInstance< MetricField > 
aField(Application::GetDefDialogParent(), WinBits(0));
 FieldUnit aMetric = ::GetDfltMetric(false);
 SetMetric(*aField, aMetric);
 aField->SetDecimalDigits(2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/customize/acccfg.cxx  |2 +-
 cui/source/customize/macropg.cxx |2 +-
 sw/source/ui/frmdlg/frmpage.cxx  |2 +-
 sw/source/ui/table/tabledlg.cxx  |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit db6b79556e727f946a4f15a2d54a9acf41443629
Author: Caolán McNamara 
AuthorDate: Mon Sep 23 11:01:27 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Sep 23 17:39:26 2019 +0200

set correct parent

Change-Id: I1fc03238a68bcc42e0e43f3305baeb4407791eca
Reviewed-on: https://gerrit.libreoffice.org/79409
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index e1d8b198572e..bdb6c470e4ab 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1445,7 +1445,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( 
StartFileDialogType nType, const
 bool bSave = nType == StartFileDialogType::SaveAs;
 short nDialogType = bSave ? 
ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION
   : 
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE;
-m_pFileDlg.reset(new sfx2::FileDialogHelper(nDialogType, 
FileDialogFlags::NONE, GetFrameWeld()));
+m_pFileDlg.reset(new sfx2::FileDialogHelper(nDialogType, 
FileDialogFlags::NONE, GetDialogFrameWeld()));
 
 m_pFileDlg->SetTitle( rTitle );
 m_pFileDlg->AddFilter( aFilterAllStr, FILEDIALOG_FILTER_ALL );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index b75e48a9709f..4a608f6c9883 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -451,7 +451,7 @@ void 
SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld::
 )
 )
 {
-AssignComponentDialog aAssignDlg(pThis->GetFrameWeld(), sEventURL);
+AssignComponentDialog aAssignDlg(pThis->GetDialogFrameWeld(), 
sEventURL);
 
 short ret = aAssignDlg.run();
 if( ret )
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index e012352f0c01..c721285499c3 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2512,7 +2512,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, weld::Button&, 
void)
 {
 m_xGrfDlg.reset(new FileDialogHelper(
 ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
-FileDialogFlags::Graphic, GetFrameWeld()));
+FileDialogFlags::Graphic, GetDialogFrameWeld()));
 m_xGrfDlg->SetTitle(m_xLinkFrame->get_label());
 }
 m_xGrfDlg->SetDisplayDirectory(m_xConnectED->get_text());
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index f56e3c26a64e..1871d74a4f9e 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -590,7 +590,7 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* 
_pSet )
 OUString sTableName = m_xNameED->get_text();
 if(sTableName.indexOf(' ') != -1)
 {
-std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(GetFrameWeld(),
+std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(GetDialogFrameWeld(),
   VclMessageType::Info, 
VclButtonsType::Ok,
   
SwResId(STR_WRONG_TABLENAME)));
 xInfoBox->run();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/customize/acccfg.cxx   |   12 
 cui/source/options/dbregister.cxx |8 +++-
 sw/source/ui/fldui/flddb.cxx  |2 +-
 sw/source/ui/fldui/flddinf.cxx|2 +-
 sw/source/ui/fldui/flddok.cxx |2 +-
 sw/source/ui/fldui/fldfunc.cxx|2 +-
 sw/source/ui/fldui/fldpage.hxx|2 +-
 sw/source/ui/fldui/fldref.cxx |2 +-
 sw/source/ui/fldui/fldvar.cxx |2 +-
 9 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit a00449bebdcfc491539867862da41133312fcd88
Author: Caolán McNamara 
AuthorDate: Mon Sep 23 12:10:27 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Sep 23 17:16:20 2019 +0200

replace LogicToPixel uses in SfxTabPages

Change-Id: Ic2ea87bd5bcb8ccee58818b638e70a561fc8f95b
Reviewed-on: https://gerrit.libreoffice.org/79410
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 1c738d700e12..e1d8b198572e 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -839,13 +839,17 @@ 
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(TabPageParent pParent, const
 , m_xSaveButton(m_xBuilder->weld_button("save"))
 , m_xResetButton(m_xBuilder->weld_button("reset"))
 {
-Size aSize(LogicToPixel(Size(174, 100), MapMode(MapUnit::MapAppFont)));
+Size aSize(m_xEntriesBox->get_approximate_digit_width() * 40,
+   m_xEntriesBox->get_height_rows(12));
 m_xEntriesBox->set_size_request(aSize.Width(), aSize.Height());
-aSize = LogicToPixel(Size(78 , 91), MapMode(MapUnit::MapAppFont));
+aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 19,
+ m_xEntriesBox->get_height_rows(10));
 m_xGroupLBox->set_size_request(aSize.Width(), aSize.Height());
-aSize = LogicToPixel(Size(88, 91), MapMode(MapUnit::MapAppFont));
+aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 21,
+ m_xEntriesBox->get_height_rows(10));
 m_xFunctionBox->set_size_request(aSize.Width(), aSize.Height());
-aSize = LogicToPixel(Size(80, 91), MapMode(MapUnit::MapAppFont));
+aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 20,
+ m_xEntriesBox->get_height_rows(10));
 m_xKeyBox->set_size_request(aSize.Width(), aSize.Height());
 
 // install handler functions
diff --git a/cui/source/options/dbregister.cxx 
b/cui/source/options/dbregister.cxx
index 782541622bbd..d02b0b118bc2 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -32,8 +32,6 @@
 #include "dbregisterednamesconfig.hxx"
 #include 
 
-#define TAB_WIDTH1  80
-
 #define COL_TYPE   0
 
 namespace svx
@@ -92,12 +90,12 @@ 
DbRegistrationOptionsPage::DbRegistrationOptionsPage(TabPageParent pParent, cons
 , m_xPathBox(m_xBuilder->weld_tree_view("pathctrl"))
 , m_xIter(m_xPathBox->make_iterator())
 {
-Size aControlSize(248, 147);
-aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
+Size aControlSize(m_xPathBox->get_approximate_digit_width() * 60,
+  m_xPathBox->get_height_rows(35));
 m_xPathBox->set_size_request(aControlSize.Width(), aControlSize.Height());
 
 std::vector aWidths;
-aWidths.push_back(LogicToPixel(Size(TAB_WIDTH1, 0), 
MapMode(MapUnit::MapAppFont)).Width());
+aWidths.push_back(m_xPathBox->get_approximate_digit_width() * 20);
 m_xPathBox->set_column_fixed_widths(aWidths);
 
 m_xNew->connect_clicked( LINK( this, DbRegistrationOptionsPage, NewHdl ) );
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index b8a1cff07158..37fc878eddc8 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -55,7 +55,7 @@ SwFieldDBPage::SwFieldDBPage(TabPageParent pParent, const 
SfxItemSet *const pCor
 m_xTypeLB->make_sorted();
 m_xFormatLB->make_sorted();
 
-auto nWidth = LogicToPixel(Size(FIELD_COLUMN_WIDTH, 0), 
MapMode(MapUnit::MapAppFont)).Width();
+auto nWidth = m_xTypeLB->get_approximate_digit_width() * 
FIELD_COLUMN_WIDTH;
 auto nHeight = m_xTypeLB->get_height_rows(14);
 m_xTypeLB->set_size_request(nWidth, nHeight);
 m_xDatabaseTLB->set_size_request(nWidth*2, nHeight);
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 1e4a70f9c5cb..bcdbbbfec664 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -65,7 +65,7 @@ SwFieldDokInfPage::SwFieldDokInfPage(TabPageParent pParent, 
const SfxItemSet *co
 m_xTypeTLB->make_sorted();
 FillFieldSelect(*m_xSelectionLB);
 
-auto nWidth = LogicToPixel(Size(FIELD_COLUMN_WIDTH, 0), 
MapMode(MapUnit::MapAppFont)).Width();
+auto nWidth = m_xTypeTLB->get_approximate_digit_width() * 
FIELD_COLUMN_WIDTH;
 auto nHeight = m_xTypeTLB->get_height_rows(20);
 m_xTypeTLB->set_size_request(nWidth, nHeight);
 

[Libreoffice-commits] core.git: cui/source sw/source

[Muhammet Kara (via logerrit)]

 cui/source/factory/dlgfact.cxx |5 +
 cui/source/factory/dlgfact.hxx |3 ++-
 sw/source/uibase/shells/basesh.cxx |   30 +-
 3 files changed, 24 insertions(+), 14 deletions(-)

New commits:
commit 4e3304892171a494101c4defc4d805599cf1fc7b
Author: Muhammet Kara 
AuthorDate: Wed Jul 10 22:08:01 2019 +0300
Commit: Muhammet Kara 
CommitDate: Thu Jul 11 07:14:31 2019 +0200

lokdialog: Convert the Paste Special dialog to async exec for sw

Change-Id: I0c75def6ea09bcb191a8023421b371b49205e712
Reviewed-on: https://gerrit.libreoffice.org/75378
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 19bd83ed5ad0..bd23fc1981d3 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -264,6 +264,11 @@ short AbstractPasteDialog_Impl::Execute()
 return m_xDlg->run();
 }
 
+bool AbstractPasteDialog_Impl::StartExecuteAsync(AsyncContext )
+{
+return SfxDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
+}
+
 short AbstractInsertObjectDialog_Impl::Execute()
 {
 return m_xDlg->run();
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index f0e343947aaf..0badc8fffd98 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -561,13 +561,14 @@ public:
 
 class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog
 {
-std::unique_ptr m_xDlg;
+std::shared_ptr m_xDlg;
 public:
 explicit AbstractPasteDialog_Impl(std::unique_ptr p)
 : m_xDlg(std::move(p))
 {
 }
 virtual short Execute() override;
+virtual bool StartExecuteAsync(AsyncContext ) override;
 public:
 virtual void Insert( SotClipboardFormatId nFormat, const OUString & 
rFormatName ) override;
 virtual void SetObjName( const SvGlobalName & rClass, const OUString & 
rObjName ) override;
diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index dc5e0c5be334..156c969797d1 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -374,34 +374,36 @@ void SwBaseShell::ExecClpbrd(SfxRequest )
 
 case SID_PASTE_SPECIAL:
 {
-TransferableDataHelper aDataHelper(
-TransferableDataHelper::CreateFromSystemClipboard( 
().GetEditWin()) );
-if( aDataHelper.GetXTransferable().is()
-&& SwTransferable::IsPaste( rSh, aDataHelper )
+std::shared_ptr aDataHelper;
+aDataHelper.reset(new 
TransferableDataHelper(TransferableDataHelper::CreateFromSystemClipboard( 
().GetEditWin(;
+
+if( aDataHelper->GetXTransferable().is()
+&& SwTransferable::IsPaste( rSh, *aDataHelper )
 && !rSh.CursorInsideInputField() )
 {
-// Temporary variables, because the shell could already be
-// destroyed after the paste.
-SwView* pView = 
-SotClipboardFormatId nFormatId = 
SotClipboardFormatId::NONE;
 rReq.Ignore();
 bIgnore = true;
-bool bRet = false;
 
 SvxAbstractDialogFactory* pFact = 
SvxAbstractDialogFactory::Create();
 VclPtr 
pDlg(pFact->CreatePasteDialog( rReq.GetFrameWeld() ));
 
 // Prepare the dialog
-SwTransferable::PrePasteSpecial(rSh, aDataHelper, pDlg);
-pDlg->PreGetFormat(aDataHelper);
+SwTransferable::PrePasteSpecial(rSh, *aDataHelper, pDlg);
+pDlg->PreGetFormat(*aDataHelper);
 
 
-if (pDlg->Execute() == RET_OK)
+pDlg->StartExecuteAsync([=, ](sal_Int32 nResult){
+if (nResult == RET_OK)
 {
+// Temporary variables, because the shell could 
already be
+// destroyed after the paste.
+SwView* pView = 
+bool bRet = false;
+SotClipboardFormatId nFormatId = 
SotClipboardFormatId::NONE;
 nFormatId = pDlg->GetFormatOnly();
 
 if( nFormatId != SotClipboardFormatId::NONE )
-bRet = SwTransferable::PasteFormat( rSh, 
aDataHelper, nFormatId );
+bRet = SwTransferable::PasteFormat( rSh, 
*aDataHelper, nFormatId );
 
 if (bRet)
 {
@@ -421,6 +423,8 @@ void SwBaseShell::ExecClpbrd(SfxRequest )
 }
 
 pDlg->disposeOnce();
+
+});
 }
 else
 return;
___
Libreoffice-commits mailing list

[Libreoffice-commits] core.git: cui/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/inc/insrc.hxx|1 -
 cui/source/inc/newtabledlg.hxx  |1 -
 sw/source/uibase/inc/bookmark.hxx   |   10 +++---
 sw/source/uibase/inc/changedb.hxx   |3 +--
 sw/source/uibase/inc/cnttab.hxx |1 -
 sw/source/uibase/inc/dbui.hxx   |4 
 sw/source/uibase/inc/inpdlg.hxx |1 -
 sw/source/uibase/inc/swuicnttab.hxx |   13 ++---
 sw/source/uibase/inc/swuiidxmrk.hxx |1 -
 sw/source/uibase/uiview/pview.cxx   |1 -
 10 files changed, 6 insertions(+), 30 deletions(-)

New commits:
commit eebc452a508bb865fbbebe69771564e1d8fcb32b
Author: Caolán McNamara 
AuthorDate: Fri May 31 14:36:17 2019 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 1 16:30:47 2019 +0200

drop some unneeded includes

Change-Id: I1c20dcdc2cab0ba42630d28387e789cbdef7ba62
Reviewed-on: https://gerrit.libreoffice.org/73271
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index b712c080ca9a..555b07700b7a 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -21,7 +21,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public 
weld::GenericDialogController
diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx
index 88b7f61c5ec9..cad953779b12 100644
--- a/cui/source/inc/newtabledlg.hxx
+++ b/cui/source/inc/newtabledlg.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_NEWTABLEDLG_HXX
 #define INCLUDED_CUI_SOURCE_INC_NEWTABLEDLG_HXX
 
-#include 
 #include 
 #include 
 
diff --git a/sw/source/uibase/inc/bookmark.hxx 
b/sw/source/uibase/inc/bookmark.hxx
index 3b32dc6d27de..8dcc15d53eda 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.hxx
@@ -19,16 +19,12 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BOOKMARK_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_BOOKMARK_HXX
 
-#include 
-#include 
-#include 
-
-#include 
-#include "condedit.hxx"
 #include 
+#include 
+#include 
 #include 
-
 #include 
+#include "condedit.hxx"
 
 class SwWrtShell;
 class SfxRequest;
diff --git a/sw/source/uibase/inc/changedb.hxx 
b/sw/source/uibase/inc/changedb.hxx
index ab41d4121573..a56144bd995d 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.hxx
@@ -19,8 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHANGEDB_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CHANGEDB_HXX
 
-#include 
-#include 
+#include 
 #include "dbtree.hxx"
 
 class SwFieldMgr;
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index 9a1c9104a49b..ac4c8b2f4eca 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CNTTAB_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CNTTAB_HXX
 
-#include 
 #include 
 
 #include 
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index a6261f880e17..22b219ac65ef 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.hxx
@@ -19,10 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DBUI_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_DBUI_HXX
 
-#include 
-
-#include 
-#include 
 #include 
 
 class SW_DLLPUBLIC PrintMonitor: public weld::GenericDialogController
diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx
index 7b6abeb50ee6..f1dfc725dc33 100644
--- a/sw/source/uibase/inc/inpdlg.hxx
+++ b/sw/source/uibase/inc/inpdlg.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INPDLG_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_INPDLG_HXX
 
-#include 
 #include 
 
 class SwInputField;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx 
b/sw/source/uibase/inc/swuicnttab.hxx
index 64526975d3cd..a1e82d4851b6 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -19,21 +19,12 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUICNTTAB_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICNTTAB_HXX
 
-#include 
-
-#include 
-
-#include 
-
-#include 
-
-#include 
-#include 
 #include 
+#include 
+#include 
 
 #include 
 #include "toxmgr.hxx"
-#include 
 #include "cnttab.hxx"
 #include 
 
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx 
b/sw/source/uibase/inc/swuiidxmrk.hxx
index 172190a3203a..d05819ccfde0 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/uibase/uiview/pview.cxx 
b/sw/source/uibase/uiview/pview.cxx
index 681557a9edc6..d3f97155548a 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: cui/source sw/source

[Libreoffice Gerrit user]

 cui/source/tabpages/bbdlg.cxx  |   10 +-
 sw/source/uibase/docvw/HeaderFooterWin.cxx |4 
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 5439b1e4d504c9afa71a707743d219222790d6ac
Author: Jim Raykowski 
AuthorDate: Sun Nov 25 17:23:42 2018 -0900
Commit: Jim Raykowski 
CommitDate: Sat Feb 2 05:05:06 2019 +0100

tdf#105225 New background tab page for header and footer Border

and Background dialog

Change-Id: I21979884b89a496ae36d5f1e48763680ae5da817
Reviewed-on: https://gerrit.libreoffice.org/64016
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index a17122b0f66b..c4f77b1e9aa5 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -46,7 +46,7 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window 
*pParent,
 }
 else
 {
-AddTabPage("background", SvxBackgroundTabPage::Create, nullptr );
+AddTabPage("background", SvxBkgTabPage::Create, nullptr );
 }
 }
 
@@ -54,11 +54,11 @@ void SvxBorderBackgroundDlg::PageCreated(const OString& 
rPageId, SfxTabPage& rTa
 {
 if (rPageId == "background")
 {
+SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 // allow switching between Color/graphic
-if(mbEnableBackgroundSelector)
-{
-static_cast< SvxBackgroundTabPage& >(rTabPage).ShowSelector();
-}
+if (mbEnableBackgroundSelector)
+aSet.Put(SfxUInt32Item(SID_FLAG_TYPE, 
static_cast(SvxBackgroundTabFlags::SHOW_SELECTOR)));
+rTabPage.PageCreated(aSet);
 }
 // inits for Area and Transparency TabPages
 // The selection attribute lists (XPropertyList derivates, e.g. XColorList 
for
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx 
b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index dd658ad3920c..2d1fca27f4f3 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -428,10 +429,13 @@ void SwHeaderFooterWin::ExecuteCommand(const OString& 
rIdent)
 *pPool,
 svl::Items<
 RES_BACKGROUND, RES_SHADOW,
+XATTR_FILL_FIRST, XATTR_FILL_LAST,
 SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{});
 
 aSet.Put( pHFFormat->GetAttrSet() );
 
+aSet.Put( pHFFormat->makeBackgroundBrushItem() );
+
 // Create a box info item... needed by the dialog
 SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
 const SfxPoolItem *pBoxInfo;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sw/source sw/uiconfig vcl/inc vcl/source

[Libreoffice Gerrit user]

 cui/source/inc/connect.hxx |2 
 cui/source/inc/measure.hxx |2 
 sw/source/ui/config/mailconfigpage.cxx |  119 +
 sw/source/ui/dbui/mmoutputtypepage.cxx |2 
 sw/source/uibase/dbui/mailmergehelper.cxx  |4 
 sw/source/uibase/inc/mailmergehelper.hxx   |6 -
 sw/uiconfig/swriter/ui/testmailsettings.ui |   94 +-
 vcl/inc/bitmaps.hlst   |1 
 vcl/source/window/builder.cxx  |   28 ++
 9 files changed, 161 insertions(+), 97 deletions(-)

New commits:
commit ccbd773136c8c6b8746b2e7b767b1aef3fb3babe
Author: Caolán McNamara 
AuthorDate: Fri Sep 28 19:13:38 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sun Sep 30 14:36:16 2018 +0200

weld SwTestAccountSettingsDialog

Change-Id: Idead8d63dc472403e15eb9adf3cb82467e4d6721
Reviewed-on: https://gerrit.libreoffice.org/61106
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 50caaf5b370c..70e54e6fd8f4 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -73,7 +73,7 @@ public:
 virtual void PageCreated(const SfxAllItemSet& aSet) override;
 };
 
-/* Derived from SfxSingleTabDialog, in order to be informed about
+/* Derived from SfxSingleTabDialogController, in order to be informed about
virtual methods by the control. */
 class SvxConnectionDialog : public SfxSingleTabDialogController
 {
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 6574babc86f3..90da75d46061 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -87,7 +87,7 @@ public:
 
 };
 
-/* Derived from SfxSingleTabDialog, in order to be able to be
+/* Derived from SfxSingleTabDialogController, in order to be able to be
informed about virtual methods by the control. */
 class SvxMeasureDialog : public SfxSingleTabDialogController
 {
diff --git a/sw/source/ui/config/mailconfigpage.cxx 
b/sw/source/ui/config/mailconfigpage.cxx
index b7752e853e7d..7d73d5e1c669 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -41,36 +41,33 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::mail;
 using namespace ::com::sun::star::beans;
 
-class SwTestAccountSettingsDialog : public SfxModalDialog
+class SwTestAccountSettingsDialog : public weld::GenericDialogController
 {
-VclPtr   m_pErrorsED;
-
-VclPtr m_pStopPB;
-
-VclPtr  m_pEstablish;
-VclPtr  m_pFind;
-VclPtr  m_pResult1;
-VclPtr  m_pResult2;
-VclPtr m_pImage1;
-VclPtr m_pImage2;
-
-Image   m_aCompletedImg;
-Image   m_aFailedImg;
+ImplSVEvent*m_pPostedEvent;
 OUStringm_sCompleted;
 OUStringm_sFailed;
 OUStringm_sErrorServer;
+boolm_bStop;
 
 VclPtr   m_pParent;
 
-boolm_bStop;
+std::unique_ptr m_xStopPB;
+std::unique_ptr m_xErrorsED;
+std::unique_ptr m_xEstablish;
+std::unique_ptr m_xFind;
+std::unique_ptr m_xResult1;
+std::unique_ptr m_xResult2;
+std::unique_ptr m_xImage1;
+std::unique_ptr m_xImage2;
+std::unique_ptr m_xImage3;
+std::unique_ptr m_xImage4;
 
 voidTest();
-DECL_LINK(StopHdl, Button*, void);
+DECL_LINK(StopHdl, weld::Button&, void);
 DECL_LINK(TestHdl, void*, void);
 public:
 explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent);
 virtual ~SwTestAccountSettingsDialog() override;
-virtual void dispose() override;
 };
 
 class SwAuthenticationSettingsDialog : public weld::GenericDialogController
@@ -216,7 +213,8 @@ IMPL_LINK_NOARG(SwMailConfigPage, AuthenticationHdl, 
Button*, void)
 
 IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, Button*, void)
 {
-ScopedVclPtrInstance(this)->Execute();
+SwTestAccountSettingsDialog aDlg(this);
+aDlg.run();
 }
 
 IMPL_LINK(SwMailConfigPage, SecureHdl, Button*, pBox, void)
@@ -228,61 +226,50 @@ IMPL_LINK(SwMailConfigPage, SecureHdl, Button*, pBox, 
void)
 }
 
 SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* 
pParent)
-: SfxModalDialog(pParent, "TestMailSettings", 
"modules/swriter/ui/testmailsettings.ui")
-, m_aCompletedImg(BitmapEx(RID_BMP_FORMULA_APPLY))
-, m_aFailedImg(BitmapEx(RID_BMP_FORMULA_CANCEL))
-, m_pParent(pParent)
+: GenericDialogController(pParent->GetFrameWeld(), 
"modules/swriter/ui/testmailsettings.ui", "TestMailSettings")
 , m_bStop(false)
+, m_pParent(pParent)
+, m_xStopPB(m_xBuilder->weld_button("stop"))
+, m_xErrorsED(m_xBuilder->weld_text_view("errors"))
+, m_xEstablish(m_xBuilder->weld_label("establish"))
+, m_xFind(m_xBuilder->weld_label("find"))
+, 

[Libreoffice-commits] core.git: cui/source sw/source

[Jim Raykowski]

 cui/source/inc/backgrnd.hxx |5 +++--
 cui/source/tabpages/backgrnd.cxx|   11 ---
 sw/source/ui/chrdlg/chardlg.cxx |2 +-
 sw/source/uibase/shells/textsh1.cxx |   12 
 4 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit cac80ccacf917e7e80f75c3574cc2a300f1d775a
Author: Jim Raykowski 
Date:   Fri Jan 26 17:31:35 2018 -0900

tdf#105225 A character highlighting tab page based on the area tab page

Change-Id: Icd76af14129ff742c77d7f19582c3cbc0520525e
Reviewed-on: https://gerrit.libreoffice.org/48737
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 88131fa61b80..e25b2043cbc5 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -26,6 +26,8 @@
 #include 
 #include 
 
+#include "cuitabarea.hxx"
+
 class BackgroundPreviewImpl;
 class SvxOpenGraphicDialog;
 struct SvxBackgroundTable_Impl;
@@ -139,11 +141,10 @@ private:
 DECL_LINK( TblDestinationHdl_Impl, ListBox&, void );
 };
 
-#include "cuitabarea.hxx"
-
 class SvxBkgTabPage : public SvxAreaTabPage
 {
 VclPtr m_pTblLBox;
+boolbHighlighting   : 1;
 public:
 using SvxAreaTabPage::DeactivatePage;
 
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 6ef959108360..448599bebb2f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -53,6 +53,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace css;
 
 // table background
@@ -1442,11 +1444,10 @@ void SvxBackgroundTabPage::PageCreated(const 
SfxAllItemSet& aSet)
 }
 }
 
-#include 
-
 SvxBkgTabPage::SvxBkgTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs 
) :
 SvxAreaTabPage( pParent, rInAttrs ),
-m_pTblLBox(nullptr)
+m_pTblLBox(nullptr),
+bHighlighting(false)
 {
 VclPtr pBtn;
 get(pBtn, "btngradient"); pBtn->Hide();
@@ -1516,6 +1517,8 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
 break;
 }
 }
+else if ( bHighlighting )
+nSlot = SID_ATTR_BRUSH_CHAR;
 
 sal_uInt16 nWhich = GetWhich(nSlot);
 
@@ -1568,6 +1571,8 @@ void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet)
 m_pTblLBox->SelectEntryPos(0);
 m_pTblLBox->Show();
 }
+else if (nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)
+bHighlighting = bool(nFlags & 
SvxBackgroundTabFlags::SHOW_HIGHLIGHTING);
 }
 SvxAreaTabPage::PageCreated( aSet );
 }
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index c0c70d3743cc..7f7007d732ab 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -76,7 +76,7 @@ SwCharDlg::SwCharDlg(vcl::Window* pParent, SwView& rVw, const 
SfxItemSet& rCoreS
 m_nCharPosId = AddTabPage("position", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_CHAR_POSITION ), nullptr );
 m_nCharTwoId = AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_CHAR_TWOLINES ), nullptr );
 m_nCharUrlId = AddTabPage("hyperlink", SwCharURLPage::Create, nullptr);
-m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BACKGROUND ), nullptr );
+m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BKG ), nullptr );
 m_nCharBrdId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( 
RID_SVXPAGE_BORDER ), nullptr );
 
 SvtCJKOptions aCJKOptions;
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index cac6f2f6363f..65f4b25ce6d2 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -120,6 +120,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 using namespace ::com::sun::star;
 using namespace com::sun::star::beans;
 using namespace ::com::sun::star::container;
@@ -138,6 +141,7 @@ void sw_CharDialog(SwWrtShell , bool bUseDialog, 
sal_uInt16 nSlot, const
 RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
 RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
 RES_BACKGROUND, RES_SHADOW,
+XATTR_FILLSTYLE, XATTR_FILLCOLOR,
 SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
 SID_HTML_MODE, SID_HTML_MODE,
 SID_ATTR_CHAR_WIDTH_FIT_TO_LINE, SID_ATTR_CHAR_WIDTH_FIT_TO_LINE,
@@ -174,6 +178,10 @@ void sw_CharDialog(SwWrtShell , bool bUseDialog, 
sal_uInt16 nSlot, const
 VclPtr pDlg;
 if ( bUseDialog && GetActiveView() )
 {
+sal_uInt16 nWhich = rWrtSh.GetView().GetPool().GetWhich( 
SID_ATTR_BRUSH_CHAR );
+SvxBrushItem aBrushItem(static_cast(pCoreSet->Get(nWhich)));
+setSvxBrushItemAsFillAttributesToTargetSet(aBrushItem, *pCoreSet);
+
 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");

[Libreoffice-commits] core.git: cui/source sw/source

[Andrea Gelmini]

 cui/source/dialogs/cuigaldlg.cxx|1 -
 sw/source/uibase/dochdl/gloshdl.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 2d780c983566d7d9aafb7e61d0138a3ce5f59d2a
Author: Andrea Gelmini 
Date:   Sun Feb 25 22:38:34 2018 +0100

Removed duplicated includes

Change-Id: Ib93cb76a3b667ca96e228d0b59da9f9849850081
Reviewed-on: https://gerrit.libreoffice.org/50330
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 7c64d613c1b6..c24ef1bc2567 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx 
b/sw/source/uibase/dochdl/gloshdl.cxx
index f964d1b546cc..d7da1c1abf56 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -48,7 +48,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sw/source

[Noel Grandin]

 cui/source/dialogs/SpellDialog.cxx   |5 +++--
 sw/source/ui/dbui/addresslistdialog.cxx  |4 ++--
 sw/source/ui/dbui/mmaddressblockpage.cxx |   10 ++
 3 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 5776d219db28b795acb952e9728cc9502403bcb8
Author: Noel Grandin 
Date:   Fri Jan 19 15:44:12 2018 +0200

more ScopedVclPtr for dialogs

Change-Id: I0f19a0c1e312843bee0ee5c9939831918ddc2da7
Reviewed-on: https://gerrit.libreoffice.org/48198
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index db126849cb4c..95e611a313cb 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -489,8 +489,9 @@ IMPL_LINK( SpellDialog, CheckGrammarHdl, Button*, pBox, 
void )
 void SpellDialog::StartSpellOptDlg_Impl()
 {
 SfxItemSet aSet( SfxGetpApp()->GetPool(), 
svl::Items{});
-VclPtr pDlg(
-VclPtr::Create(this, aSet, "SpellOptionsDialog", 
"cui/ui/spelloptionsdialog.ui"));
+ScopedVclPtr pDlg(
+VclPtr::Create(
+this, aSet, "SpellOptionsDialog", "cui/ui/spelloptionsdialog.ui"));
 VclPtr pPage = SvxLinguTabPage::Create( 
pDlg->get_content_area(),  );
 static_cast(pPage.get())->HideGroups( GROUP_MODULES );
 pDlg->SetTabPage( pPage );
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx 
b/sw/source/ui/dbui/addresslistdialog.cxx
index 77890e3b27fc..ef79ead501c6 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -357,8 +357,8 @@ IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl, Button*, 
void)
 IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void)
 {
 OUString sInputURL;
-VclPtr pDlg(
-VclPtr::Create(
+ScopedVclPtr pDlg(
+VclPtr::Create(
 pButton,
 sInputURL,
 m_pAddressPage->GetWizard()->GetConfigItem()));
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 68b6adde88f7..945e72c93382 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -218,8 +218,9 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, 
Button*, pButton, void)
 SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
 const sal_uInt16 nSel = m_pSettingsWIN->GetSelectedAddress();
 const uno::Sequence< OUString> aBlocks = rConfigItem.GetAddressBlocks();
-VclPtr pDlg(
-VclPtr::Create(pButton, 
m_pWizard->GetConfigItem(), aBlocks[nSel], true));
+ScopedVclPtr pDlg(
+VclPtr::Create(
+pButton, m_pWizard->GetConfigItem(), aBlocks[nSel], true));
 if(RET_OK == pDlg->Execute())
 {
 //preview update
@@ -447,8 +448,9 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, 
Button*, pButton, vo
 SwCustomizeAddressBlockDialog::DialogType nType = bCustomize ?
 SwCustomizeAddressBlockDialog::ADDRESSBLOCK_EDIT :
 SwCustomizeAddressBlockDialog::ADDRESSBLOCK_NEW;
-VclPtr pDlg(
-
VclPtr::Create(pButton,m_rConfig,nType));
+ScopedVclPtr pDlg(
+VclPtr::Create(
+pButton,m_rConfig,nType));
 if(bCustomize)
 {
 pDlg->SetAddress(m_aAddressBlocks[m_pPreview->GetSelectedAddress()]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sw/source

[Stephan Bergmann]

 cui/source/tabpages/backgrnd.cxx  |2 +-
 sw/source/filter/html/css1atr.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a8cfc979b43b75a94e155bd188283d1460c69584
Author: Stephan Bergmann 
Date:   Mon Oct 31 11:28:48 2016 +0100

SvxBrushItem::GetGraphicLink no longer returns a pointer

...since cfb4463d2afd36ca6d0fbb9e374bf5387fee84df "convert
include/editeng/brushitem.hxx from String to OUString", which boldly 
changed it
from returning a pointer to returning a reference, probably not even taking 
into
account that that broke the value set (from string+null to just string).

However, that change appears to have worked OK in practice, and there maybe
wasn't a need after all to distinguish a null value from an empty string.  
These
two places here were missed in the change, and happened to keep working, as 
they
picked the operator ==(sal_Unicode const *, OUString const &) overload, that
happens to treat a null first argument like an empty string.

Change-Id: If2d76951fa4bf6c7821321327ad653bd0a95a788

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 741928d..ce9948c 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -698,7 +698,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* 
rCoreSet )
 
 SvxGraphicPosition  eNewPos  = GetGraphicPosition_Impl();
 const bool  bIsLink  = m_pBtnLink->IsChecked();
-const bool  bWasLink = (nullptr != 
rOldItem.GetGraphicLink() );
+const bool  bWasLink = 
!rOldItem.GetGraphicLink().isEmpty();
 
 
 if ( !bIsLink && !bIsGraphicValid )
diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 47c8c7f..40b7a98 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2216,7 +2216,7 @@ static bool OutCSS1_FrameFormatBrush( SwHTMLWriter& rWrt,
 /// output brush of frame format, if its background color is not "no 
fill"/"auto fill"
 /// or it has a background graphic.
 if( rBrushItem.GetColor() != COL_TRANSPARENT ||
-nullptr != rBrushItem.GetGraphicLink() ||
+!rBrushItem.GetGraphicLink().isEmpty() ||
 0 != rBrushItem.GetGraphicPos() )
 {
 OutCSS1_SvxBrush( rWrt, rBrushItem, CSS1_BACKGROUND_FLY, nullptr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sw/source

[Harri Pitkänen]

 cui/source/tabpages/backgrnd.cxx |2 --
 sw/source/ui/table/tabledlg.cxx  |5 +
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 3791159628d26364c391330d9bfc67d081d291f9
Author: Harri Pitkänen hatap...@iki.fi
Date:   Sun Apr 12 13:21:24 2015 +0300

Remove checks for HTMLMODE_SOME_STYLES

HTMLMODE_SOME_STYLES is enabled if we are in HTML mode (it is
enabled for all HTML modes). These checks for conditionally disabling
some table background controls are not needed anymore.

Change-Id: I10fb73a67ac4bba250da4cea79ff6bae427a1613
Reviewed-on: https://gerrit.libreoffice.org/15264
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 7465f02..795b8b9 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1588,8 +1588,6 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, 
ListBox*, pBox )
 nWhich = pTableBck_Impl-nCellWhich;
 break;
 case TBL_DEST_ROW:
-if((nHtmlMode  HTMLMODE_ON)  !(nHtmlMode  
HTMLMODE_SOME_STYLES))
-m_pLbSelect-Disable();
 pActItem = pTableBck_Impl-pRowBrush;
 nWhich = pTableBck_Impl-nRowWhich;
 break;
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 0f49309..4f9f8a4 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1222,10 +1222,7 @@ void  SwTableTabDlg::PageCreated(sal_uInt16 nId, 
SfxTabPage rPage)
 SfxAllItemSet aSet(*(GetInputSetImpl()-GetPool()));
 if (nId == m_nBackgroundId)
 {
-sal_Int32 nFlagType = SVX_SHOW_TBLCTL;
-if(!( m_nHtmlMode  HTMLMODE_ON ) ||
-m_nHtmlMode  HTMLMODE_SOME_STYLES)
-nFlagType |= SVX_SHOW_SELECTOR;
+sal_Int32 nFlagType = SVX_SHOW_TBLCTL | SVX_SHOW_SELECTOR;
 aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
 rPage.PageCreated(aSet);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source sw/source

[László Németh]

 cui/source/dialogs/SpellDialog.cxx |3 ++
 sw/source/ui/lingu/olmenu.cxx  |   39 +
 2 files changed, 26 insertions(+), 16 deletions(-)

New commits:
commit 52d4203a312e9aecac9bffdc2afe93471b88a9dc
Author: László Németh nem...@numbertext.org
Date:   Fri Jan 24 12:15:54 2014 +0100

fdo#56954, fdo#73868 grammar checking UI fixes

Change-Id: I20577ba3bfbd12a89d34892a8f32d9c2b741f4dd

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index e11ed6b..323c0b7 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -621,6 +621,9 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton )
 {
 pSpellErrorDescription-xGrammarChecker-ignoreRule( 
pSpellErrorDescription-sRuleId,
 pSpellErrorDescription-aLocale );
+// refresh the layout (workaround to launch a dictionary event)
+aXDictionary-setActive(sal_False);
+aXDictionary-setActive(sal_True);
 }
 }
 catch( const uno::Exception )
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index d93b0f84..83d2813 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -88,6 +88,7 @@
 #include com/sun/star/linguistic2/SingleProofreadingError.hpp
 #include com/sun/star/linguistic2/XLanguageGuessing.hpp
 #include com/sun/star/linguistic2/XSpellChecker1.hpp
+#include com/sun/star/linguistic2/DictionaryEventFlags.hpp
 #include com/sun/star/uno/Any.hxx
 #include com/sun/star/system/SystemShellExecuteFlags.hpp
 #include com/sun/star/system/SystemShellExecute.hpp
@@ -564,7 +565,6 @@ m_aInfo16( SW_RES(IMG_INFO_16) )
 m_nGuessLangPara = m_nGuessLangWord;
 }
 
-EnableItem( MN_IGNORE_WORD, false );
 EnableItem( MN_ADD_TO_DIC, false );
 EnableItem( MN_ADD_TO_DIC_SINGLE, false );
 
@@ -740,26 +740,33 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
 else if (nId == MN_IGNORE_SELECTION)
 {
 SwPaM *pPaM = m_pSh-GetCrsr();
-if (pPaM) {
-if (m_bGrammarResults) {
-try
-{
-m_xGrammarResult.xProofreader-ignoreRule(
-m_xGrammarResult.aErrors[ m_nGrammarError 
].aRuleIdentifier,
-m_xGrammarResult.aLocale );
-}
-catch( const uno::Exception )
-{
-}
-}
+if (pPaM)
 m_pSh-IgnoreGrammarErrorAt( *pPaM );
-}
 }
 else if (nId == MN_IGNORE_WORD)
 {
 uno::Reference linguistic2::XDictionary  xDictionary( 
SvxGetIgnoreAllList(), uno::UNO_QUERY );
-linguistic::AddEntryToDic( xDictionary,
-m_xSpellAlt-getWord(), sal_False, OUString(), LANGUAGE_NONE );
+if (m_bGrammarResults) {
+try
+{
+m_xGrammarResult.xProofreader-ignoreRule(
+m_xGrammarResult.aErrors[ m_nGrammarError 
].aRuleIdentifier,
+m_xGrammarResult.aLocale );
+// refresh the layout of the actual paragraph (faster)
+SwPaM *pPaM = m_pSh-GetCrsr();
+if (pPaM)
+m_pSh-IgnoreGrammarErrorAt( *pPaM );
+// refresh the layout of all paragraphs (workaround to launch 
a dictionary event)
+xDictionary-setActive(sal_False);
+xDictionary-setActive(sal_True);
+}
+catch( const uno::Exception )
+{
+}
+} else {
+linguistic::AddEntryToDic( xDictionary,
+m_xSpellAlt-getWord(), sal_False, OUString(), 
LANGUAGE_NONE );
+}
 }
 else if ((MN_DICTIONARIES_START = nId  nId = MN_DICTIONARIES_END) || 
nId == MN_ADD_TO_DIC_SINGLE)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits