core.git: offapi/com officecfg/registry sw/inc sw/source sw/uiconfig
offapi/com/sun/star/text/MailMerge.idl|2 officecfg/registry/schema/org/openoffice/Office/Writer.xcs| 15 -- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs |8 - sw/inc/modcfg.hxx |4 sw/inc/printdata.hxx |6 - sw/inc/unoprnms.hxx |1 sw/source/core/unocore/unomap.cxx |1 sw/source/core/view/printdata.cxx |1 sw/source/filter/xml/xmlimp.cxx |1 sw/source/ui/config/optpage.cxx |1 sw/source/ui/envelp/mailmrge.cxx | 11 -- sw/source/uibase/config/modcfg.cxx| 52 - sw/source/uibase/config/prtopt.cxx| 53 -- sw/source/uibase/inc/unomailmerge.hxx |1 sw/source/uibase/uno/unomailmerge.cxx | 12 -- sw/source/uibase/uno/unomod.cxx | 10 - sw/source/uibase/uno/unotxdoc.cxx |1 sw/uiconfig/swriter/ui/mailmerge.ui | 15 -- 18 files changed, 52 insertions(+), 143 deletions(-) New commits: commit c9d5bf3fe0e6b59f30107c42eac3d4603bf8f2b6 Author: Samuel Mehrbrodt AuthorDate: Thu Dec 14 10:21:31 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Dec 18 07:48:05 2023 +0100 [API CHANGE] tdf#158041 Remove unused SinglePrintJobs config option from sw This is handled by the print dialog directly Change-Id: Ieb4221d97444216f332501da9a3aba7dc6b8500a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160762 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/offapi/com/sun/star/text/MailMerge.idl b/offapi/com/sun/star/text/MailMerge.idl index 843cb44104cf..68809e081407 100644 --- a/offapi/com/sun/star/text/MailMerge.idl +++ b/offapi/com/sun/star/text/MailMerge.idl @@ -181,6 +181,8 @@ published service MailMerge /** determines whether single print jobs will be generated per output document. This property is only evaluated for printer output. + +@deprecated since 24.8, use ::com::sun::star::view::PrintOptions::SinglePrintJobs instead. */ [property] boolean SinglePrintJobs; diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 2bd5995a1e5d..b014281aed9d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1868,14 +1868,6 @@ Contains other output settings. - - - -Controls the print output to avoid problems with duplex printing and odd page numbers. -Create single print jobs - - false - @@ -5662,13 +5654,6 @@ Specifies the settings for form letter output to printer. - - - -Prints each form letter individually with the selected printer (true). - - false - Determines whether printing a document that contains database fields triggers a 'do you want to call mailmerge' query diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index 4ecee7fa61e3..32b2c52e3ae7 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -610,14 +610,6 @@ Contains output-specific settings. - - - -Controls the print output. -Create single print jobs - - false - diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 16862c5536c7..abfea9159e29 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -180,7 +180,6 @@ class SAL_DLLPUBLIC_RTTI SwMiscConfig final : public utl::ConfigItem boolm_bShowIndexPreview; // Index/ShowPreview boolm_bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink boolm_bNumAlignSize; // Numbering/Graphic/KeepRatio -boolm_bSinglePrintJob;// FormLetter/PrintOutput/SinglePrintJobs boolm_bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation boolm_bIsPasswordFromColumn; // FormLetter/FileOutput/FilePassword/Generation boolm_bAskForMailMergeInPrint;// Ask if documents containing fields should be 'mailmerged' @@ -325,9 +324,6 @@ public: void
[Libreoffice-commits] core.git: offapi/com officecfg/registry sw/inc sw/source sw/uiconfig
offapi/com/sun/star/text/ViewSettings.idl |6
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8
sw/inc/viewopt.hxx |8
sw/source/core/doc/DocumentContentOperationsManager.cxx| 32 ---
sw/source/core/edit/ednumber.cxx | 48
sw/source/core/txtnode/ndtxt.cxx |2
sw/source/ui/config/optpage.cxx| 24 +-
sw/source/uibase/app/appopt.cxx| 63 ++
sw/source/uibase/config/cfgitems.cxx |4
sw/source/uibase/config/usrpref.cxx| 17 +
sw/source/uibase/config/viewopt.cxx|5
sw/source/uibase/docvw/FrameControlsManager.cxx| 35 ++-
sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx | 53 +
sw/source/uibase/docvw/edtwin.cxx | 80 ++--
sw/source/uibase/inc/cfgitems.hxx |1
sw/source/uibase/inc/edtwin.hxx|2
sw/source/uibase/inc/optpage.hxx |3
sw/source/uibase/inc/wrtsh.hxx |6
sw/source/uibase/uiview/view0.cxx | 37 +++
sw/source/uibase/uno/unomod.cxx|3
sw/source/uibase/utlui/content.cxx | 77 +++-
sw/source/uibase/wrtsh/wrtsh1.cxx | 67 --
sw/uiconfig/swriter/ui/viewoptionspage.ui | 125 +++--
23 files changed, 470 insertions(+), 236 deletions(-)
New commits:
commit c405bae468d887ec77dd3830b7678fcedc2debfd
Author: Jim Raykowski
AuthorDate: Sat Dec 5 20:57:15 2020 -0900
Commit: Jim Raykowski
CommitDate: Thu Dec 24 07:12:59 2020 +0100
tdf#138136 tdf#38093 add option to treat sub outline levels as content
Also included in this patch:
- Modifications to make all outline content visible during move
operations.
- Removal of code intended to redraw buttons when layout is changed that
seems not to work as intended.
- Function IsOutlineContentFolded changed to IsOutlineContentVisible
- Change of delay before button is shown to half of what it was.
Change-Id: I0dde555ccd0693ca382c1f15326edfdc2fc44a93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107815
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/offapi/com/sun/star/text/ViewSettings.idl
b/offapi/com/sun/star/text/ViewSettings.idl
index 8261ca1dc50f..4439b7fc9709 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -296,6 +296,12 @@ published service ViewSettings
*/
[optional, property] boolean ShowChangesInMargin;
+/** If this property is `TRUE`, sub outline levels are treated as content
in
+outline content visibility actions.
+
+@since LibreOffice 7.2
+*/
+[optional, property] boolean TreatSubOutlineLevelsAsContent;
};
}; }; }; };
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index c99841d3cbde..1d54ace2d950 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1079,6 +1079,14 @@
false
+
+
+
+Enables the writer outline content visibility feature to
treat sub outline levels as content.
+Treat sub outline levels as content
+
+ false
+
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index ebfab960d226..996aec4848c2 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -61,6 +61,7 @@ enum class ViewOptFlags1 : sal_uInt64 {
Synchronize = 0x0100,
GridVisible = 0x0200,
OnlineSpell = 0x0400,
+TreatSubOutlineLevelsAsContent = 0x0800,
ShowInlineTooltips = 0x1000, //tooltips on tracked changes
ViewMetachars = 0x2000,
Pageback = 0x4000,
@@ -68,7 +69,7 @@ enum class ViewOptFlags1 : sal_uInt64 {
ShowChangesInMargin = 0x1 //tracked deletions in margin
};
namespace o3tl {
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
enum class ViewOptCoreFlags2 {
@@ -306,6 +307,11 @@ public:
void SetShowOutlineContentVisibilityButton(bool b)
{ SetCoreOption(b, ViewOptFlags1::ShowOutlineContentVisibilityButton);
}
+bool IsTreatSubOutlineLevelsAsContent() const;
+void SetTreatSubOutlineLevelsAsContent(bool b)
+{ SetCoreOption(b, ViewOptFlags1::TreatSubOutlineLevelsAsContent); }
+
+
bool IsShowHiddenChar(bool bHard = false) const
{ return !m_bReadonly
[Libreoffice-commits] core.git: offapi/com officecfg/registry sw/inc sw/source sw/uiconfig
offapi/com/sun/star/text/ViewSettings.idl |6 +
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 ++
sw/inc/viewopt.hxx | 17 +++-
sw/source/core/text/inftxt.cxx |2
sw/source/core/text/porrst.cxx |2
sw/source/ui/config/optpage.cxx|4 +
sw/source/uibase/app/appopt.cxx|1
sw/source/uibase/config/cfgitems.cxx |4 +
sw/source/uibase/config/usrpref.cxx| 47 +++--
sw/source/uibase/inc/cfgitems.hxx |1
sw/source/uibase/inc/optpage.hxx |1
sw/source/uibase/uiview/pview.cxx |1
sw/source/uibase/uiview/view0.cxx |2
sw/source/uibase/uno/unomod.cxx|4 +
sw/source/uibase/uno/unotxdoc.cxx |1
sw/uiconfig/swriter/ui/optformataidspage.ui| 28 +++
16 files changed, 104 insertions(+), 25 deletions(-)
New commits:
commit 04405edc3fac32938b8940bc767656ea6c7820f9
Author: Michael Stahl
AuthorDate: Fri Jan 31 16:19:21 2020 +0100
Commit: Michael Stahl
CommitDate: Fri Jan 31 17:23:19 2020 +0100
tdf#45589 offapi,officecfg,sw: add option to toggle bookmark display
Create specific option to toggle display of the bookmark positions
instead of relying on generic IsViewMetaChars().
Add a Bookmarks checkbox to Writer->Formatting Aids page in Options.
Add property ShowBookmarks to com::sun::star::text::ViewSettings.
Add config setting:
org/openoffice/Office/Writer/Content/NonprintingCharacter/Bookmarks
Change-Id: I998ecdc16d8e4a5baeeb1bbcff0bf5f1f5636692
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87774
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/offapi/com/sun/star/text/ViewSettings.idl
b/offapi/com/sun/star/text/ViewSettings.idl
index 5de3bf8d6dd5..b0afa27c46e8 100644
--- a/offapi/com/sun/star/text/ViewSettings.idl
+++ b/offapi/com/sun/star/text/ViewSettings.idl
@@ -278,6 +278,12 @@ published service ViewSettings
*/
[optional, property] boolean UseHeaderFooterMenu;
+/** If this property is `TRUE`, bookmark positions are displayed.
+
+@since LibreOffice 7.0
+ */
+[optional, property] boolean ShowBookmarks;
+
};
}; }; }; };
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index e76bbeef495b..316e2e3aff86 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1172,6 +1172,14 @@
false
+
+
+
+Specifies whether bookmark positions are displayed on the
screen.
+Bookmarks
+
+ true
+
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index c727452685c7..11d2914ed028 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -34,7 +34,7 @@ class OutputDevice;
class SwDocShell;
namespace svtools{ class ColorConfig;}
-enum class ViewOptFlags1 {
+enum class ViewOptFlags1 : sal_uInt32 {
UseHeaderFooterMenu = 0x0001,
Tab = 0x0002,
Blank = 0x0004,
@@ -44,6 +44,7 @@ enum class ViewOptFlags1 {
Pagebreak = 0x0040,
Columnbreak = 0x0080,
SoftHyph = 0x0100,
+Bookmarks = 0x0200,
Ref = 0x0400,
FieldName = 0x0800,
Postits = 0x4000,
@@ -60,10 +61,10 @@ enum class ViewOptFlags1 {
OnlineSpell = 0x0400,
ShowInlineTooltips = 0x1000, //tooltips on tracked changes
ViewMetachars = 0x2000,
-Pageback = 0x4000
+Pageback = 0x4000,
};
namespace o3tl {
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
enum class ViewOptCoreFlags2 {
@@ -232,6 +233,16 @@ public:
void SetParagraph( bool b )
{ SetCoreOption(b, ViewOptFlags1::Paragraph); }
+void SetShowBookmarks(bool const b)
+{
+SetCoreOption(b, ViewOptFlags1::Bookmarks);
+}
+bool IsShowBookmarks(bool const bHard = false) const
+{
+return !m_bReadonly && (m_nCoreOptions & ViewOptFlags1::Bookmarks)
+&& (bHard || (m_nCoreOptions & ViewOptFlags1::ViewMetachars));
+}
+
bool IsLineBreak(bool bHard = false) const
{ return !m_bReadonly && (m_nCoreOptions &
ViewOptFlags1::Linebreak) &&
((m_nCoreOptions &
ViewOptFlags1::ViewMetachars)||bHard); }
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
