From 312aac710b123e443dd8217975b0b007e2873e7d Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Tue, 14 Jul 2026 20:26:41 +0200
Subject: [PATCH] Move SvtViewOptions from unotools to svtools

The SvtViewOptions class is used to store the state
of windows/dialogs.

So far, SvtViewOptions::SetWindowState and
SvtViewOptions::GetWindowState are string-based
and the callers are responsible for (de)serializing
the vcl::WindowData to/from string.

This will be changed to become the responsibility
of SvtViewOptions in an upcoming commit.

Since unotools is below vcl in the module
dependency chain, it cannot make use of vcl,
i.e. vcl::WindowData couldn't be used there.

Therefore, move SvtViewOptions from unotools
to svtools, which is above vcl in the module
dependencies.
(svtools/README.md summarizes the purpose of the
module as "Tools on the Top of VCL", which seems
an appropriate place for helper code to manage
the state/options for dialogs, tab pages,...)

Change-Id: If849224c35c7ac895659ddb7c17e6d17061d61a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208124
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 basctl/source/basicide/basidesh.cxx                     | 2 +-
 cui/source/customize/cfgutil.cxx                        | 2 +-
 cui/source/dialogs/MacroManagerDialog.cxx               | 2 +-
 cui/source/dialogs/hlmarkwn.cxx                         | 2 +-
 cui/source/options/optpath.cxx                          | 2 +-
 cui/source/options/treeopt.cxx                          | 2 +-
 fpicker/source/office/RemoteFilesDialog.hxx             | 4 +---
 fpicker/source/office/iodlg.cxx                         | 2 +-
 include/{unotools => svtools}/viewoptions.hxx           | 4 ++--
 reportdesign/source/ui/dlg/Formula.cxx                  | 2 +-
 reportdesign/source/ui/report/DesignView.cxx            | 2 +-
 reportdesign/source/ui/report/ReportController.cxx      | 2 +-
 sc/source/ui/condformat/condformatmgr.cxx               | 2 +-
 sc/source/ui/dbgui/scuiasciiopt.cxx                     | 4 ++--
 sc/source/ui/dbgui/sortdlg.cxx                          | 2 +-
 sd/source/ui/dlg/copydlg.cxx                            | 2 +-
 sfx2/inc/pch/precompiled_sfx.hxx                        | 2 +-
 sfx2/source/appl/childwin.cxx                           | 2 +-
 sfx2/source/appl/newhelp.cxx                            | 2 +-
 sfx2/source/dialog/basedlgs.cxx                         | 2 +-
 sfx2/source/dialog/filedlghelper.cxx                    | 2 +-
 sfx2/source/dialog/splitwin.cxx                         | 2 +-
 sfx2/source/dialog/srchdlg.cxx                          | 2 +-
 sfx2/source/dialog/tabdlg.cxx                           | 2 +-
 sfx2/source/doc/autoredactdialog.cxx                    | 2 +-
 sfx2/source/doc/new.cxx                                 | 2 +-
 sfx2/source/doc/templatedlg.cxx                         | 2 +-
 solenv/clang-format/excludelist                         | 4 ++--
 svtools/Library_svt.mk                                  | 1 +
 {unotools => svtools}/source/config/viewoptions.cxx     | 2 +-
 svx/inc/pch/precompiled_svx.hxx                         | 2 +-
 svx/source/form/datanavi.cxx                            | 2 +-
 svx/source/sidebar/line/LineWidthPopup.cxx              | 2 +-
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx     | 2 +-
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 2 +-
 svx/source/tbxctrls/tbxcolorupdate.cxx                  | 2 +-
 sw/inc/pch/precompiled_swui.hxx                         | 2 +-
 sw/source/ui/dialog/ascfldlg.cxx                        | 2 +-
 sw/source/ui/misc/bookmark.cxx                          | 2 +-
 sw/source/ui/misc/swmodalredlineacceptdlg.cxx           | 2 +-
 sw/source/uibase/inc/splittbl.hxx                       | 2 +-
 sw/source/uibase/sidebar/PageMarginControl.cxx          | 2 +-
 unotools/Library_utl.mk                                 | 1 -
 43 files changed, 45 insertions(+), 47 deletions(-)
 rename include/{unotools => svtools}/viewoptions.hxx (99%)
 rename {unotools => svtools}/source/config/viewoptions.cxx (99%)

diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 8d33f2cb962e..a6917a22752e 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -44,8 +44,8 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/srchitem.hxx>
+#include <svtools/viewoptions.hxx>
 #include <tools/debug.hxx>
-#include <unotools/viewoptions.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 
 #if defined(DISABLE_DYNLOADING) || ENABLE_MERGELIBS
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 449c84fa95a0..dbc465ee3492 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -46,6 +46,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <svtools/imagemgr.hxx>
+#include <svtools/viewoptions.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <dialmgr.hxx>
@@ -61,7 +62,6 @@
 
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/Context.hxx>
-#include <unotools/viewoptions.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/cui/source/dialogs/MacroManagerDialog.cxx b/cui/source/dialogs/MacroManagerDialog.cxx
index 311e674e65e2..b687bc908815 100644
--- a/cui/source/dialogs/MacroManagerDialog.cxx
+++ b/cui/source/dialogs/MacroManagerDialog.cxx
@@ -38,9 +38,9 @@
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svtools/dlgname.hxx>
+#include <svtools/viewoptions.hxx>
 #include <svx/passwd.hxx>
 #include <tools/debug.hxx>
-#include <unotools/viewoptions.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index fab44ec43e18..78ad020efd3a 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -20,7 +20,7 @@
 #include <dialmgr.hxx>
 #include <o3tl/any.hxx>
 #include <comphelper/propertyvalue.hxx>
-#include <unotools/viewoptions.hxx>
+#include <svtools/viewoptions.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/vclenum.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index f74d83bd0815..2ea4c64764b8 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -19,11 +19,11 @@
 
 #include <svx/svxdlg.hxx>
 #include <sfx2/filedlghelper.hxx>
+#include <svtools/viewoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/defaultoptions.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <unotools/viewoptions.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Label.hxx>
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index fbc9cadfaee3..78fae145809b 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -94,6 +94,7 @@
 #include <svl/intitem.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
+#include <svtools/viewoptions.hxx>
 #include <svx/databaseregistrationui.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/urlobj.hxx>
@@ -101,7 +102,6 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/optionsdlg.hxx>
-#include <unotools/viewoptions.hxx>
 #include <utility>
 #include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index 056ad7ba6da3..2fae68804a95 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -11,9 +11,7 @@
 
 #include "autocmpledit.hxx"
 #include <svtools/place.hxx>
-
-#include <unotools/viewoptions.hxx>
-
+#include <svtools/viewoptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Button.hxx>
 #include <vcl/weld/ToggleButton.hxx>
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index b008bc3a925b..808df6bf8f3c 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -41,9 +41,9 @@
 #include <vcl/weld/MessageDialog.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/viewoptions.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
+#include <svtools/viewoptions.hxx>
 
 #include <fpicker/strings.hrc>
 #include <svtools/helpids.h>
diff --git a/include/unotools/viewoptions.hxx b/include/svtools/viewoptions.hxx
similarity index 99%
rename from include/unotools/viewoptions.hxx
rename to include/svtools/viewoptions.hxx
index 7d41706ecf0a..49c4ec8a0580 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/svtools/viewoptions.hxx
@@ -18,10 +18,10 @@
  */
 #pragma once
 
-#include <unotools/unotoolsdllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
+#include <svtools/svtdllapi.h>
 
 namespace com::sun::star::beans { struct NamedValue; }
 namespace com::sun::star::container { class XNameAccess; }
@@ -91,7 +91,7 @@ enum class EViewType
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtViewOptions final
+class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtViewOptions final
 {
 
     //  public methods
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index a44f66bf4d46..c243be5a669d 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <unotools/viewoptions.hxx>
 #include <formula/formdata.hxx>
 #include <formula/funcutl.hxx>
 #include <formula/tokenarray.hxx>
 #include <formula/FormulaCompiler.hxx>
+#include <svtools/viewoptions.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/windowstate.hxx>
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 4fac73d6e049..f014c46335e7 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -20,7 +20,7 @@
 #include <DesignView.hxx>
 #include <ReportController.hxx>
 #include <svtools/acceleratorexecute.hxx>
-#include <unotools/viewoptions.hxx>
+#include <svtools/viewoptions.hxx>
 #include <RptDef.hxx>
 #include <UITools.hxx>
 #include <RptObject.hxx>
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 96eb03e01ebc..9a4778661f9b 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -123,8 +123,8 @@
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <svtools/cliplistener.hxx>
+#include <svtools/viewoptions.hxx>
 #include <unotools/syslocale.hxx>
-#include <unotools/viewoptions.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 #include <osl/mutex.hxx>
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index 9945d1b0ab76..2fd2f98f4584 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -13,7 +13,7 @@
 #include <document.hxx>
 #include <conditio.hxx>
 #include <o3tl/safeint.hxx>
-#include <unotools/viewoptions.hxx>
+#include <svtools/viewoptions.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/windowstate.hxx>
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 86412196d164..8a2c6bc98de9 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -43,9 +43,9 @@
 
 #include <unicode/ucsdet.h>
 #include <sfx2/objsh.hxx>
-#include <svx/txenctab.hxx>
 #include <unotools/filteroptions_settings.hxx>
-#include <unotools/viewoptions.hxx>
+#include <svx/txenctab.hxx>
+#include <svtools/viewoptions.hxx>
 #include <vcl/weld/Button.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Frame.hxx>
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 405b26e44e53..7577e6020969 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -22,8 +22,8 @@
 #include <scui_def.hxx>
 #include <tpsort.hxx>
 #include <sortdlg.hxx>
-#include <unotools/viewoptions.hxx>
 
+#include <svtools/viewoptions.hxx>
 #include <vcl/tabs.hrc>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/windowstate.hxx>
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 5432288d7022..a205e7da171f 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -25,8 +25,8 @@
 #include <svx/xcolit.hxx>
 #include <svl/intitem.hxx>
 
-#include <unotools/viewoptions.hxx>
 #include <svtools/unitconv.hxx>
+#include <svtools/viewoptions.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <o3tl/string_view.hxx>
 #include <vcl/weld/Builder.hxx>
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 14f589567ed5..643c55bf8dff 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -346,6 +346,7 @@
 #include <svtools/sfxecode.hxx>
 #include <svtools/soerr.hxx>
 #include <svtools/svtdllapi.h>
+#include <svtools/viewoptions.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/color.hxx>
 #include <tools/datetime.hxx>
@@ -387,7 +388,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/unotoolsdllapi.h>
 #include <unotools/useroptions.hxx>
-#include <unotools/viewoptions.hxx>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
 #include <appbaslib.hxx>
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index bc131e43c927..2c34ff8bc422 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <memory>
-#include <unotools/viewoptions.hxx>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
@@ -38,6 +37,7 @@
 #include <sfx2/module.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/dispatch.hxx>
+#include <svtools/viewoptions.hxx>
 #include <workwin.hxx>
 
 #include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 7203c70e8b2e..9d58a2d1fbcd 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -70,10 +70,10 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include <unotools/historyoptions.hxx>
-#include <unotools/viewoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/miscopt.hxx>
+#include <svtools/viewoptions.hxx>
 #include <utility>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index ba4163ef34ae..ff070dd2822b 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -19,7 +19,7 @@
 
 #include <vcl/help.hxx>
 #include <svl/eitem.hxx>
-#include <unotools/viewoptions.hxx>
+#include <svtools/viewoptions.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Button.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 85fa5de4e3fe..69d08279e103 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -78,8 +78,8 @@
 #include <vcl/dibtools.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <unotools/filteroptions_settings.hxx>
-#include <unotools/viewoptions.hxx>
 #include <svtools/helpids.h>
+#include <svtools/viewoptions.hxx>
 #include <comphelper/docpasswordrequest.hxx>
 #include <comphelper/docpasswordhelper.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 0dbb4bf1195d..8ccef19d826b 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -21,9 +21,9 @@
 #include <ctime>
 #endif
 
-#include <unotools/viewoptions.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <svtools/viewoptions.hxx>
 #include <tools/debug.hxx>
 
 #include <vcl/dialoghelper.hxx>
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index f8d354a30eb6..1b592b559ec4 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -21,8 +21,8 @@
 #include <srchdlg.hxx>
 #include <comphelper/string.hxx>
 
+#include <svtools/viewoptions.hxx>
 #include <tools/debug.hxx>
-#include <unotools/viewoptions.hxx>
 #include <o3tl/string_view.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <utility>
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index a5a762d6629b..20024cd35b8a 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -27,7 +27,7 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/viewsh.hxx>
-#include <unotools/viewoptions.hxx>
+#include <svtools/viewoptions.hxx>
 #include <utility>
 #include <vcl/vclenum.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sfx2/source/doc/autoredactdialog.cxx b/sfx2/source/doc/autoredactdialog.cxx
index dc1509367bcf..e495774bd67f 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -15,6 +15,7 @@
 #include <o3tl/deleter.hxx>
 #include <osl/file.hxx>
 #include <sal/log.hxx>
+#include <svtools/viewoptions.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
@@ -22,7 +23,6 @@
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
 #include <vcl/weld/weldutils.hxx>
-#include <unotools/viewoptions.hxx>
 #include <o3tl/string_view.hxx>
 
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 84554aade393..9a52db8feb63 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -26,6 +26,7 @@
 #include <svl/eitem.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
+#include <svtools/viewoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 
@@ -36,7 +37,6 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/docfile.hxx>
 #include <preview.hxx>
-#include <unotools/viewoptions.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Button.hxx>
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index c0a7b7e863b3..701c5866aff4 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/templatedlglocalview.hxx>
+#include <svtools/viewoptions.hxx>
 #include <templatecontaineritem.hxx>
 #include <templateviewitem.hxx>
 #include <sfx2/thumbnailviewitem.hxx>
@@ -32,7 +33,6 @@
 #include <tools/urlobj.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/viewoptions.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 0ca46f34b31e..77b057a32bcf 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -5497,6 +5497,7 @@ include/svtools/unoevent.hxx
 include/svtools/unoimap.hxx
 include/svtools/urlfilter.hxx
 include/svtools/valueset.hxx
+include/svtools/viewoptions.hxx
 include/svx/AccessibleControlShape.hxx
 include/svx/AccessibleGraphicShape.hxx
 include/svx/AccessibleOLEShape.hxx
@@ -5967,7 +5968,6 @@ include/unotools/transliterationwrapper.hxx
 include/unotools/ucbhelper.hxx
 include/unotools/ucbstreamhelper.hxx
 include/unotools/useroptions.hxx
-include/unotools/viewoptions.hxx
 include/unotools/wincodepage.hxx
 include/vbahelper/vbaaccesshelper.hxx
 include/vbahelper/vbaapplicationbase.hxx
@@ -10804,6 +10804,7 @@ svtools/source/config/miscopt.cxx
 svtools/source/config/optionsdrawinglayer.cxx
 svtools/source/config/printoptions.cxx
 svtools/source/config/test/test.cxx
+svtools/source/config/viewoptions.cxx
 svtools/source/control/accessibleruler.cxx
 svtools/source/control/accessibleruler.hxx
 svtools/source/control/accessibletabbar.cxx
@@ -13673,7 +13674,6 @@ unotools/source/config/searchopt.cxx
 unotools/source/config/securityoptions.cxx
 unotools/source/config/syslocaleoptions.cxx
 unotools/source/config/useroptions.cxx
-unotools/source/config/viewoptions.cxx
 unotools/source/i18n/calendarwrapper.cxx
 unotools/source/i18n/charclass.cxx
 unotools/source/i18n/collatorwrapper.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index a23b4f080d99..531b772da62a 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/config/optionsdrawinglayer \
     svtools/source/config/printoptions \
     svtools/source/contnr/querydelete \
+    svtools/source/config/viewoptions \
     svtools/source/control/accessibleruler \
     svtools/source/control/accessibletabbar \
     svtools/source/control/accessibletabbarbase \
diff --git a/unotools/source/config/viewoptions.cxx b/svtools/source/config/viewoptions.cxx
similarity index 99%
rename from unotools/source/config/viewoptions.cxx
rename to svtools/source/config/viewoptions.cxx
index a17d3c48df2d..0ba624d8b51b 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/svtools/source/config/viewoptions.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <unotools/viewoptions.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <svtools/viewoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <comphelper/configuration.hxx>
 #include <comphelper/configurationhelper.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 370822f53321..8ed461a6a70a 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -320,6 +320,7 @@
 #include <svtools/toolboxcontroller.hxx>
 #include <svtools/unitconv.hxx>
 #include <svtools/valueset.hxx>
+#include <svtools/viewoptions.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/UnitConversion.hxx>
 #include <tools/color.hxx>
@@ -349,7 +350,6 @@
 #include <unotools/resmgr.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/unotoolsdllapi.h>
-#include <unotools/viewoptions.hxx>
 #include <unotools/weakref.hxx>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 13d9368e2ca8..15d135bfa7d8 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -33,8 +33,8 @@
 #include <tools/mapunit.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <unotools/resmgr.hxx>
+#include <svtools/viewoptions.hxx>
 #include <svx/xmlexchg.hxx>
-#include <unotools/viewoptions.hxx>
 #include <sfx2/chalign.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 697f5e7c54ed..782b801c51f0 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -16,6 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+#include <svtools/viewoptions.hxx>
 #include <svx/sidebar/LineWidthPopup.hxx>
 #include <svx/sidebar/LinePropertyPanelBase.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -24,7 +25,6 @@
 #include <svx/xlnwtit.hxx>
 #include <tools/fldunit.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <unotools/viewoptions.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 55a3043e9a6e..0d7ee08c93e4 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -31,11 +31,11 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/weldutils.hxx>
+#include <svtools/viewoptions.hxx>
 #include <svx/dialcontrol.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/rectenum.hxx>
 #include <svx/sdangitm.hxx>
-#include <unotools/viewoptions.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <utility>
 #include <vcl/canvastools.hxx>
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 8d9b18e23e85..9e23464208fe 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -18,13 +18,13 @@
  */
 #include <sfx2/bindings.hxx>
 #include "TextCharacterSpacingControl.hxx"
-#include <unotools/viewoptions.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/kernitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <svtools/viewoptions.hxx>
 #include <tools/fldunit.hxx>
 #include <TextCharacterSpacingPopup.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index dc4093509c12..748f8cd54808 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -36,9 +36,9 @@
 #include <vcl/virdev.hxx>
 #include <vcl/settings.hxx>
 
+#include <svtools/viewoptions.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <unotools/viewoptions.hxx>
 #include <comphelper/string.hxx>
 #include <o3tl/string_view.hxx>
 
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 4bfc4b09a940..b24d92787f8b 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -473,6 +473,7 @@
 #include <svtools/toolbarmenu.hxx>
 #include <svtools/unitconv.hxx>
 #include <svtools/valueset.hxx>
+#include <svtools/viewoptions.hxx>
 #include <svx/Palette.hxx>
 #include <svx/XPropertyEntry.hxx>
 #include <svx/autoformathelper.hxx>
@@ -537,7 +538,6 @@
 #include <unotools/syslocale.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/unotoolsdllapi.h>
-#include <unotools/viewoptions.hxx>
 #include <unotools/weakref.hxx>
 #include <vbahelper/vbadllapi.h>
 #include <vbahelper/vbahelper.hxx>
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index f2436e95fe3e..a1871a765473 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -27,9 +27,9 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <vcl/rendercontext/GetDefaultFontFlags.hxx>
+#include <svtools/viewoptions.hxx>
 #include <unotools/fontdefs.hxx>
 #include <unotools/lingucfg.hxx>
-#include <unotools/viewoptions.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 6e78e24ff4b6..ec3162f54645 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -21,7 +21,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <sfx2/request.hxx>
 #include <svl/stritem.hxx>
-#include <unotools/viewoptions.hxx>
+#include <svtools/viewoptions.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weldutils.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 2668ae75f08c..55cac2c5162d 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <o3tl/deleter.hxx>
+#include <svtools/viewoptions.hxx>
 #include <svx/ctredlin.hxx>
-#include <unotools/viewoptions.hxx>
 #include <vcl/weld/Dialog.hxx>
 
 #include <redlndlg.hxx>
diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx
index 15a7d5d141b8..bc44f2c4f544 100644
--- a/sw/source/uibase/inc/splittbl.hxx
+++ b/sw/source/uibase/inc/splittbl.hxx
@@ -19,11 +19,11 @@
 
 #pragma once
 
+#include <svtools/viewoptions.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/RadioButton.hxx>
 #include <vcl/weld/Window.hxx>
 #include <tblenum.hxx>
-#include <unotools/viewoptions.hxx>
 
 class SwWrtShell;
 
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 1ef6e9a48384..7675dc2fcc6c 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -33,9 +33,9 @@
 #include <svl/itempool.hxx>
 #include <svl/intitem.hxx>
 #include <svtools/unitconv.hxx>
+#include <svtools/viewoptions.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/mapunit.hxx>
-#include <unotools/viewoptions.hxx>
 #include <vcl/weld/Builder.hxx>
 
 #include <swtypes.hxx>
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 9764cdc695bd..ccfa141a317d 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
     unotools/source/config/securityoptions \
     unotools/source/config/syslocaleoptions \
     unotools/source/config/useroptions \
-    unotools/source/config/viewoptions \
     unotools/source/i18n/calendarwrapper \
     unotools/source/i18n/caserotate \
     unotools/source/i18n/charclass \