[Libreoffice-commits] core.git: cui/source sw/inc sw/source
cui/source/tabpages/themepage.cxx |4 -
sw/inc/view.hxx |4 -
sw/source/uibase/inc/SwXFilterOptions.hxx |8 +--
sw/source/uibase/inc/condedit.hxx | 10 ++--
sw/source/uibase/inc/unomod.hxx | 12 ++---
sw/source/uibase/uiview/viewmdi.cxx | 38 +++
sw/source/uibase/uiview/viewstat.cxx |2
sw/source/uibase/uno/SwXFilterOptions.cxx | 22 -
sw/source/uibase/uno/unomod.cxx | 72 +++---
sw/source/uibase/utlui/condedit.cxx |4 -
10 files changed, 88 insertions(+), 88 deletions(-)
New commits:
commit 2f0c26dc83448a934af5383f9f6b7a607c334744
Author: Miklos Vajna
AuthorDate: Mon Feb 14 08:23:54 2022 +0100
Commit: Miklos Vajna
CommitDate: Mon Feb 14 09:48:55 2022 +0100
sw: prefix members of ConditionEdit, SwView, SwXFilterOptions and ...
... SwXViewSettings
See tdf#94879 for motivation.
Change-Id: I68f647d13edf156cfc471a54f247ac686cd6cd06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129893
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/cui/source/tabpages/themepage.cxx
b/cui/source/tabpages/themepage.cxx
index b175ae8754c3..8d92376fc1d3 100644
--- a/cui/source/tabpages/themepage.cxx
+++ b/cui/source/tabpages/themepage.cxx
@@ -9,6 +9,8 @@
#include
+#include
+
#include
#include
@@ -19,8 +21,6 @@
#include
#include
-#include
-
using namespace com::sun::star;
const WhichRangesContainer
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index a3070642aa16..422da7fe3ea6 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -163,8 +163,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
// search & replace
static SvxSearchItem *s_pSrchItem;
-static sal_uInt16 m_nMoveType; // for buttons below the scrollbar
(viewmdi)
-static sal_Int32m_nActMark; // current jump mark for unknown mark
+static sal_uInt16 s_nMoveType; // for buttons below the scrollbar
(viewmdi)
+static sal_Int32s_nActMark; // current jump mark for unknown mark
static bool s_bExtra;
static bool s_bFound;
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx
b/sw/source/uibase/inc/SwXFilterOptions.hxx
index ce1f991465ba..2ca1aabe68ce 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -38,11 +38,11 @@ class SwXFilterOptions final : public
::cppu::WeakImplHelper<
css::lang::XInitialization,
css::lang::XServiceInfo >
{
-OUString sFilterOptions;
+OUString m_sFilterOptions;
-css::uno::Reference< css::io::XInputStream > xInputStream;
-css::uno::Reference< css::lang::XComponent > xModel;
-css::uno::Reference< css::awt::XWindow > xDialogParent;
+css::uno::Reference< css::io::XInputStream > m_xInputStream;
+css::uno::Reference< css::lang::XComponent > m_xModel;
+css::uno::Reference< css::awt::XWindow > m_xDialogParent;
public:
SwXFilterOptions();
diff --git a/sw/source/uibase/inc/condedit.hxx
b/sw/source/uibase/inc/condedit.hxx
index 0b8e31473a43..ec11b8872939 100644
--- a/sw/source/uibase/inc/condedit.hxx
+++ b/sw/source/uibase/inc/condedit.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC ConditionEdit
{
std::unique_ptr m_xControl;
ConditionEditDropTarget m_aDropTargetHelper;
-bool bBrackets, bEnableDrop;
+bool m_bBrackets, m_bEnableDrop;
public:
ConditionEdit(std::unique_ptr xControl);
@@ -64,10 +64,10 @@ public:
OString get_buildable_name() const { return
m_xControl->get_buildable_name(); }
void set_buildable_name(const OString& rId) {
m_xControl->set_buildable_name(rId); }
-void ShowBrackets(bool bShow) { bBrackets = bShow; }
-bool GetBrackets() const { return bBrackets; }
-void SetDropEnable(bool bFlag) { bEnableDrop = bFlag; }
-bool GetDropEnable() const { return bEnableDrop; }
+void ShowBrackets(bool bShow) { m_bBrackets = bShow; }
+bool GetBrackets() const { return m_bBrackets; }
+void SetDropEnable(bool bFlag) { m_bEnableDrop = bFlag; }
+bool GetDropEnable() const { return m_bEnableDrop; }
};
#endif
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 1a11b5a40762..7b4032947c5c 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -100,14 +100,14 @@ class SwXViewSettings final : public
comphelper::ChainablePropertySet
{
friend class SwXDocumentSettings;
-SwView* pView;
+SwView* m_pView;
std::unique_ptr mpViewOption;
const SwViewOption* mpConstViewOption;
-boolbObjectValid:1, mbApplyZoom;
+boolm_bObjectValid:1, mbApplyZoom;
-FieldUnit eHRulerUnit;
+FieldUnit
[Libreoffice-commits] core.git: cui/source sw/inc sw/source
cui/source/dialogs/hlmarkwn.cxx | 48 +-
cui/source/inc/hlmarkwn.hxx |2 -
sw/inc/unotxdoc.hxx |5 +++
sw/source/uibase/uno/unotxdoc.cxx | 47 +++--
4 files changed, 81 insertions(+), 21 deletions(-)
New commits:
commit 5480d9237af1cf25ac464bf49ba364a757fcf6f5
Author: Jim Raykowski
AuthorDate: Sun Jan 24 22:17:49 2021 -0900
Commit: Jim Raykowski
CommitDate: Tue Mar 2 22:49:03 2021 +0100
tdf#114567 tdf#138934 Hyperlink-Target in Doc Headings expand/collapse
Provides parent child expand/collapse for Headings in the Hyperlink-
Target in Document dialog target treeview
Change-Id: I8cc57b4cbf3830cec76d64a0ef587e199c39e360
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109930
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 8996c0e6790c..cdc1039cab18 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -283,6 +283,9 @@ bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString&
aURL)
// Fill Tree-Control
int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< container::XNameAccess
>& xLinks, const weld::TreeIter* pParentEntry )
{
+// used to create the Headings outline parent children tree view relation
+std::stack, const sal_Int32>>
aHeadingsParentEntryStack;
+
int nEntries=0;
const uno::Sequence< OUString > aNames( xLinks->getElementNames() );
const sal_Int32 nLinks = aNames.getLength();
@@ -331,7 +334,50 @@ int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference<
container::XNameAccess >
OUString
sId(OUString::number(reinterpret_cast(pData)));
std::unique_ptr
xEntry(mxLbTree->make_iterator());
-mxLbTree->insert(pParentEntry, -1, , ,
nullptr, nullptr, false, xEntry.get());
+if (pParentEntry)
+{
+OUString sContentType = mxLbTree->get_text(*pParentEntry);
+if (sContentType == "Headings")
+{
+if (aHeadingsParentEntryStack.empty())
+aHeadingsParentEntryStack.push(
+
std::pair(mxLbTree->make_iterator(pParentEntry), -1));
+
+// get the headings name to display
+aAny = xTarget->getPropertyValue("ActualOutlineName");
+OUString sActualOutlineName;
+aAny >>= sActualOutlineName;
+
+// get the headings outline level
+aAny = xTarget->getPropertyValue("OutlineLevel");
+sal_Int32 nOutlineLevel;
+aAny >>= nOutlineLevel;
+
+// pop until the top of stack entry has an outline
level less than
+// the to be inserted heading outline level
+while (nOutlineLevel <=
aHeadingsParentEntryStack.top().second)
+aHeadingsParentEntryStack.pop();
+
+
mxLbTree->insert(aHeadingsParentEntryStack.top().first.get(), -1,
+ , , nullptr,
nullptr, false,
+ xEntry.get());
+
+// push if the inserted entry is a child
+if (nOutlineLevel >
aHeadingsParentEntryStack.top().second)
+aHeadingsParentEntryStack.push(
+std::pair(std::move(xEntry),
nOutlineLevel));
+}
+else
+{
+mxLbTree->insert(pParentEntry, -1, ,
, nullptr,
+ nullptr, false, xEntry.get());
+}
+}
+else
+{
+mxLbTree->insert(pParentEntry, -1, , ,
nullptr, nullptr,
+ false, xEntry.get());
+}
try
{
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 9552bc10097c..d88dddab208d 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -30,8 +30,6 @@ class SvxHyperlinkTabPageBase;
class SvxHlinkDlgMarkWnd : public weld::GenericDialogController
{
private:
-friend class SvxHlmarkTreeLBox;
-
SvxHyperlinkTabPageBase* mpParent;
sal_uInt16 mnError;
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index df6309d7125e..4dbb35b01ec8 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -558,9 +558,12 @@ class SwXOutlineTarget final : public cppu::WeakImplHelper
{
const SfxItemPropertySet* m_pPropSet;
OUStringm_sOutlineText;
+OUString
[Libreoffice-commits] core.git: cui/source sw/inc sw/source
cui/source/tabpages/backgrnd.cxx |4 +++-
sw/inc/swabstdlg.hxx |2 +-
sw/source/ui/dialog/swdlgfact.cxx |5 ++---
sw/source/ui/dialog/swdlgfact.hxx |2 +-
sw/source/ui/frmdlg/pattern.cxx| 10 +-
sw/source/uibase/inc/pattern.hxx |7 ++-
sw/source/uibase/shells/basesh.cxx | 16
7 files changed, 22 insertions(+), 24 deletions(-)
New commits:
commit 11a229c0094979b4980d8e3be8a8a7db60d01be7
Author: Caolán McNamara
AuthorDate: Thu Sep 20 11:31:05 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Sep 20 16:47:25 2018 +0200
weld SwBackgroundDlg
Change-Id: Ia470058b1bb42d0a9bd6a40e8af4c5aac33df3a8
Reviewed-on: https://gerrit.libreoffice.org/60811
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index c3c9a61850fd..4052f988d2f1 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -176,7 +176,9 @@ BackgroundPreviewImpl::BackgroundPreviewImpl()
void BackgroundPreviewImpl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
CustomWidgetController::SetDrawingArea(pDrawingArea);
-aDrawRect = tools::Rectangle(Point(0,0), GetOutputSizePixel());
+Size aSize(pDrawingArea->get_ref_device().LogicToPixel(Size(300, 77)));
+pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
+aDrawRect = tools::Rectangle(Point(0,0), aSize);
Invalidate(aDrawRect);
}
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c6e587b391fc..63e966bbd723 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -362,7 +362,7 @@ public:
virtual VclPtr CreateNumFormatDialog( vcl::Window*
pParent,
const SfxItemSet& rAttr) = 0;
virtual VclPtr CreateSwDropCapsDialog(weld::Window*
pParent, const SfxItemSet& rSet) = 0;
-virtual VclPtr CreateSwBackgroundDialog(vcl::Window*
pParent, const SfxItemSet& rSet) = 0;
+virtual VclPtr CreateSwBackgroundDialog(weld::Window*
pParent, const SfxItemSet& rSet) = 0;
virtual VclPtr
CreateSwWordCountDialog(SfxBindings* pBindings,
SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo)
= 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 7374679ae9fa..973e46ab8fd7 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -764,11 +764,10 @@ VclPtr
SwAbstractDialogFactory_Impl::CreateSwDropCapsDialog(w
return
VclPtr::Create(o3tl::make_unique(pParent,
rSet));
}
-VclPtr
SwAbstractDialogFactory_Impl::CreateSwBackgroundDialog( vcl::Window* pParent,
+VclPtr
SwAbstractDialogFactory_Impl::CreateSwBackgroundDialog(weld::Window* pParent,
const
SfxItemSet& rSet)
{
-VclPtr pDlg = VclPtr::Create( pParent,
rSet );
-return VclPtr::Create( pDlg );
+return
VclPtr::Create(o3tl::make_unique(pParent,
rSet));
}
VclPtr SwAbstractDialogFactory_Impl::CreateNumFormatDialog(
vcl::Window* pParent,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 8a8044f96645..ba2412c50a70 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -575,7 +575,7 @@ public:
virtual VclPtr CreateNumFormatDialog(vcl::Window*
pParent, const SfxItemSet& rAttr) override;
virtual VclPtr CreateSwDropCapsDialog(weld::Window*
pParent, const SfxItemSet& rSet) override;
-virtual VclPtr CreateSwBackgroundDialog(vcl::Window*
pParent, const SfxItemSet& rSet) override;
+virtual VclPtr CreateSwBackgroundDialog(weld::Window*
pParent, const SfxItemSet& rSet) override;
virtual VclPtr
CreateSwWordCountDialog(SfxBindings* pBindings,
SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo)
override;
virtual VclPtr CreateSwInsertAbstractDlg()
override;
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 332601519f7e..390166828dd4 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -23,18 +23,18 @@
#include
#include
-SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet)
-: SfxSingleTabDialog(pParent, rSet)
+SwBackgroundDlg::SwBackgroundDlg(weld::Window* pParent, const SfxItemSet& rSet)
+: SfxSingleTabDialogController(pParent, rSet)
{
-SetText(SwResId(STR_FRMUI_PATTERN));
+m_xDialog->set_title(SwResId(STR_FRMUI_PATTERN));
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BACKGROUND );
if ( fnCreatePage )
{
-SetTabPage((*fnCreatePage)(get_content_area(), ));
+TabPageParent pPageParent(get_content_area(), this);
+
