diff options
| author | Andras Timar <andras.timar@collabora.com> | 2022-04-21 10:54:40 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-04-21 17:05:18 +0200 |
| commit | 74816141cc67080286ac4f7a8abfbd144ad7ce05 (patch) | |
| tree | db0c03a1b8f21228d99f873f6636096ed6298223 | |
| parent | Fix cypress test after InsertZWNBSP->InsertWJ (diff) | |
| download | online-74816141cc67080286ac4f7a8abfbd144ad7ce05.tar.gz online-74816141cc67080286ac4f7a8abfbd144ad7ce05.zip | |
We do not use tunneled sidebar any more
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: If3dc1dae35250c54d62e69396aea7df51873d4cb
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | coolkitconfig.xcu.in | 4 |
2 files changed, 0 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 8bed9b8976..0e82534ffb 100644 --- a/configure.ac +++ b/configure.ac @@ -333,10 +333,6 @@ AC_ARG_WITH([help-url], [Set the base URL of the online help. Default is https://help.collaboraoffice.com/help.html?]) [--without-help-url Help buttons of dialogs will be disabled, external help website will not be used.],,) -AC_ARG_WITH([core-icon-theme], - AS_HELP_STRING([--with-core-icon-theme=<theme>], - [Set the icon theme coming from core (tunneled sidebar, tunneled dialogs). The default is colibre.])) - AC_ARG_WITH([dictionaries], AS_HELP_STRING([--with-dictionaries=<language list>], [List of supported languages of Writing Aids (spell checker, grammar checker, thesaurus, hyphenation) @@ -1353,16 +1349,6 @@ else fi AC_SUBST(HELP_URL) -AC_MSG_CHECKING([for icon theme from core (tunneled sidebar, tunneled dialogs)]) -if test -n "$with_core_icon_theme" -a "$with_core_icon_theme" != "no"; then - ICON_THEME="$with_core_icon_theme" - AC_MSG_RESULT([custom: $ICON_THEME]) -else - ICON_THEME="colibre" - AC_MSG_RESULT([default: $ICON_THEME]) -fi -AC_SUBST(ICON_THEME) - AC_MSG_CHECKING([for allowed languages for Writing Aids]) if test -n "$with_dictionaries" -a "$with_dictionaries" != "no"; then ALLOWED_LANGUAGES="$with_dictionaries" diff --git a/coolkitconfig.xcu.in b/coolkitconfig.xcu.in index e6372f8e17..763b4c0ba3 100644 --- a/coolkitconfig.xcu.in +++ b/coolkitconfig.xcu.in @@ -25,10 +25,6 @@ <!-- Enable thumbnail generation by default (disabling saves CPU time) --> <item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="GenerateThumbnail" oor:op="fuse"><value>true</value></prop></item> -<!-- Set the theme and icon size for the sidebar --> -<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolStyle" oor:op="fuse"><value>@ICON_THEME@</value></prop></item> -<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SidebarIconSize" oor:op="fuse"><value>2</value></prop></item> - <!-- To show Hidden Characters and Hiddent Text/Paragraph fields --> <item oor:path="/org.openoffice.Office.Writer/Content/NonprintingCharacter"><prop oor:name="HiddenCharacter" oor:op="fuse"><value>false</value></prop></item> <item oor:path="/org.openoffice.Office.Writer/Content/NonprintingCharacter"><prop oor:name="HiddenText" oor:op="fuse"><value>false</value></prop></item> |