[Libreoffice-commits] core.git: cui/source include/unotools sfx2/source unotools/source
cui/source/options/optsave.cxx |4 +-
include/unotools/saveopt.hxx |4 --
sfx2/source/appl/appcfg.cxx|9 +++--
unotools/source/config/saveopt.cxx | 59 +++--
4 files changed, 14 insertions(+), 62 deletions(-)
New commits:
commit d5b9283985633fdb423269cab961bba2acc3539e
Author: Noel Grandin
AuthorDate: Fri Jul 23 20:39:57 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Jul 25 08:37:08 2021 +0200
use officecfg to retrieve AutoSaveTime
Change-Id: I003be64cc46d6e781ab03d83bae0a3114ab6d56e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119460
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 51a1a77b177d..40ea7c7502db 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -445,8 +445,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
m_xWarnAlienFormatCB->set_active(aSaveOpt.IsWarnAlienFormat());
m_xWarnAlienFormatCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::WarnAlienFormat));
-m_xAutoSaveEdit->set_value(aSaveOpt.GetAutoSaveTime());
-
m_xAutoSaveEdit->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::AutoSaveTime));
+
m_xAutoSaveEdit->set_value(officecfg::Office::Common::Save::Document::AutoSaveTimeIntervall::get());
+
m_xAutoSaveEdit->set_sensitive(!officecfg::Office::Common::Save::Document::AutoSaveTimeIntervall::isReadOnly());
// save relatively
m_xRelativeFsysCB->set_active(officecfg::Office::Common::Save::URL::FileSystem::get());
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index c0bec6866287..ebc484d52d40 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -31,7 +31,6 @@ public:
enum class EOption
{
-AutoSaveTime,
UseUserData,
Backup,
WarnAlienFormat,
@@ -82,9 +81,6 @@ public:
SvtSaveOptions();
virtual ~SvtSaveOptions() override;
-voidSetAutoSaveTime( sal_Int32 n );
-sal_Int32 GetAutoSaveTime() const;
-
voidSetUseUserData( bool b );
boolIsUseUserData() const;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 4a71912fae0e..4a5913bbe4b7 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -179,8 +179,9 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_AUTOSAVEMINUTE :
{
bRet = true;
-if
(!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::AutoSaveTime))
-if (!rSet.Put( SfxUInt16Item( rPool.GetWhich(
SID_ATTR_AUTOSAVEMINUTE ),
static_cast(aSaveOptions.GetAutoSaveTime()
+if
(!officecfg::Office::Common::Save::Document::AutoSaveTimeIntervall::isReadOnly())
+if (!rSet.Put( SfxUInt16Item( rPool.GetWhich(
SID_ATTR_AUTOSAVEMINUTE ),
+
officecfg::Office::Common::Save::Document::AutoSaveTimeIntervall::get() )))
bRet = false;
}
break;
@@ -476,7 +477,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
if ( SfxItemState::SET ==
rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEMINUTE), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxUInt16Item *>( pItem ) != nullptr,
"UInt16Item expected");
-aSaveOptions.SetAutoSaveTime(static_cast(pItem)->GetValue());
+officecfg::Office::Common::Save::Document::AutoSaveTimeIntervall::set(
+static_cast(pItem)->GetValue(),
+batch);
}
// UserAutoSave
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index a8ffe9d01c23..47534ecdcf1e 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -67,8 +67,7 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
SvtSaveOptions::ODFDefaultVersion eODFDefaultVersion;
-boolbROAutoSaveTime,
-bROUseUserData,
+boolbROUseUserData,
bROBackup,
bROWarnAlienFormat,
bROLoadDocPrinter,
@@ -81,7 +80,6 @@ public:
virtual voidNotify( const css::uno::Sequence< OUString >&
aPropertyNames ) override;
-sal_Int32 GetAutoSaveTime() const { return
nAutoSaveTime; }
boolIsUseUserData() const { return
bUseUserData; }
boolIsBackup() const{ return
bBackup; }
boolIsWarnAlienFormat()
[Libreoffice-commits] core.git: cui/source desktop/source include/svtools include/unotools svtools/source unotools/source
cui/source/options/fontsubs.cxx | 24 -
cui/source/options/fontsubs.hxx |1
desktop/source/app/app.cxx|2
include/svtools/fontsubstconfig.hxx | 33 --
include/unotools/configitem.hxx | 35 ++
include/unotools/configmgr.hxx|4
svtools/source/config/fontsubstconfig.cxx | 160 ---
unotools/source/config/configitem.cxx | 434 ++
unotools/source/config/configmgr.cxx | 13
9 files changed, 404 insertions(+), 302 deletions(-)
New commits:
commit 84f4f7f99f92c0ecec0dd9d754fdfa8c652a7ec0
Author: Noel Grandin
AuthorDate: Sat Jul 24 19:01:52 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Jul 25 08:23:54 2021 +0200
simplify SvFontSubst
in the process, needed to expose some functionality in ConfigManager
and ConfigItem, to avoid repeating code
Change-Id: Ic0256a010070a79cd649dfd11267bec2f77e5221
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119470
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index c438061bea90..05e540a44221 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -34,7 +34,6 @@
SvxFontSubstTabPage::SvxFontSubstTabPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet)
: SfxTabPage(pPage, pController, "cui/ui/optfontspage.ui", "OptFontsPage",
&rSet)
-, m_xConfig(new SvtFontSubstConfig)
, m_xUseTableCB(m_xBuilder->weld_check_button("usetable"))
, m_xFont1CB(m_xBuilder->weld_combo_box("font1"))
, m_xFont2CB(m_xBuilder->weld_combo_box("font2"))
@@ -146,23 +145,21 @@ std::unique_ptr SvxFontSubstTabPage::Create(
weld::Container* pPage,
bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
{
-m_xConfig->ClearSubstitutions();// remove all entries
+std::vector aNewFontSubs;
-m_xConfig->Enable(m_xUseTableCB->get_active());
-
-m_xCheckLB->all_foreach([this](weld::TreeIter& rIter) {
+m_xCheckLB->all_foreach([this, &aNewFontSubs](weld::TreeIter& rIter) {
SubstitutionStruct aAdd;
aAdd.sFont = m_xCheckLB->get_text(rIter, 2);
aAdd.sReplaceBy = m_xCheckLB->get_text(rIter, 3);
aAdd.bReplaceAlways = m_xCheckLB->get_toggle(rIter, 0);
aAdd.bReplaceOnScreenOnly = m_xCheckLB->get_toggle(rIter, 1);
-m_xConfig->AddSubstitution(aAdd);
+aNewFontSubs.push_back(aAdd);
return false;
});
-if(m_xConfig->IsModified())
-m_xConfig->Commit();
-m_xConfig->Apply();
+svtools::SetFontSubstitutions(m_xUseTableCB->get_active(), aNewFontSubs);
+svtools::ApplyFontSubstitutionsToVcl();
+
std::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
if (m_xFontHeightLB->get_value_changed_from_saved())
@@ -206,15 +203,14 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* )
m_xFont2CB->thaw();
m_xFont1CB->thaw();
-sal_Int32 nCount = m_xConfig->SubstitutionCount();
-if (nCount)
-m_xUseTableCB->set_active(m_xConfig->IsEnabled());
+m_xUseTableCB->set_active(svtools::IsFontSubstitutionsEnabled());
+std::vector aFontSubs =
svtools::GetFontSubstitutions();
std::unique_ptr xIter(m_xCheckLB->make_iterator());
-for (sal_Int32 i = 0; i < nCount; ++i)
+for (sal_Int32 i = 0; i < static_cast(aFontSubs.size()); ++i)
{
m_xCheckLB->append(xIter.get());
-const SubstitutionStruct* pSubs = m_xConfig->GetSubstitution(i);
+const SubstitutionStruct* pSubs = &aFontSubs[i];
m_xCheckLB->set_toggle(*xIter, pSubs->bReplaceAlways ? TRISTATE_TRUE :
TRISTATE_FALSE, 0);
m_xCheckLB->set_toggle(*xIter, pSubs->bReplaceOnScreenOnly ?
TRISTATE_TRUE : TRISTATE_FALSE, 1);
m_xCheckLB->set_text(*xIter, pSubs->sFont, 2);
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 600af4cf4fa1..dc55d9434ba9 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -26,7 +26,6 @@ class SvtFontSubstConfig;
class SvxFontSubstTabPage : public SfxTabPage
{
OUStringm_sAutomatic;
-std::unique_ptr m_xConfig;
std::unique_ptr m_xUseTableCB;
std::unique_ptr m_xFont1CB;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 86bec9a11c51..dec1fbe150c5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1528,7 +1528,7 @@ int Desktop::Main()
SetSplashScreenProgress(55);
-SvtFontSubstConfig().Apply();
+svtools::ApplyFontSubstitutionsToVcl();
SvtTabAppearanceCfg aAppearanceCfg;
SvtTabAppearanceCfg::SetInitialized();
diff --git a/include/svtools/fontsubstconfig.hxx
b/include/svtools/fontsubstconfig.hxx
index 8399203dfb8f..06097cf3b78b 100644
--- a/include/svtools/fontsubstconfig.h
[Libreoffice-commits] core.git: cui/source include/unotools sfx2/source unotools/source
cui/source/options/optsave.cxx |5 +++--
include/unotools/saveopt.hxx |6 +-
sfx2/source/appl/appcfg.cxx| 10 +++---
unotools/source/config/saveopt.cxx | 32
4 files changed, 11 insertions(+), 42 deletions(-)
New commits:
commit e192e1542a84b26cb0685860b84339019021de96
Author: Noel Grandin
AuthorDate: Fri Jul 23 21:03:27 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Jul 25 08:22:59 2021 +0200
use officecfg to retrieve UserAutoSave
Change-Id: I11f45c43bed9ea9a380026d84a91f48629dffac7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119461
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index b13f88b10ab3..51a1a77b177d 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
@@ -438,8 +439,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
m_xAutoSaveCB->set_active(officecfg::Office::Common::Save::Document::AutoSave::get());
m_xAutoSaveCB->set_sensitive(!officecfg::Office::Common::Save::Document::AutoSave::isReadOnly());
-m_xUserAutoSaveCB->set_active(aSaveOpt.IsUserAutoSave());
-
m_xUserAutoSaveCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::UserAutoSave));
+
m_xUserAutoSaveCB->set_active(officecfg::Office::Recovery::AutoSave::UserAutoSaveEnabled::get());
+
m_xUserAutoSaveCB->set_sensitive(!officecfg::Office::Recovery::AutoSave::UserAutoSaveEnabled::isReadOnly());
m_xWarnAlienFormatCB->set_active(aSaveOpt.IsWarnAlienFormat());
m_xWarnAlienFormatCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::WarnAlienFormat));
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 5a8abe03a22f..c0bec6866287 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -36,8 +36,7 @@ public:
Backup,
WarnAlienFormat,
LoadDocPrinter,
-OdfDefaultVersion,
-UserAutoSave,
+OdfDefaultVersion
};
/** Keep enum values sorted that a less or greater compare maps to older
@@ -92,9 +91,6 @@ public:
voidSetBackup( bool b );
boolIsBackup() const;
-voidSetUserAutoSave( bool b );
-boolIsUserAutoSave() const;
-
voidSetLoadUserSettings(bool b);
boolIsLoadUserSettings() const;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 7f2767107c94..4a71912fae0e 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -37,6 +37,7 @@
#include
#include
+#include
#include
#include
#include
@@ -186,8 +187,9 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_USERAUTOSAVE :
{
bRet = true;
-if
(!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::UserAutoSave))
-if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_USERAUTOSAVE ), aSaveOptions.IsUserAutoSave(
+if
(!officecfg::Office::Recovery::AutoSave::UserAutoSaveEnabled::isReadOnly())
+if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_USERAUTOSAVE ),
+
officecfg::Office::Recovery::AutoSave::UserAutoSaveEnabled::get() )))
bRet = false;
}
break;
@@ -481,7 +483,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
if ( SfxItemState::SET ==
rSet.GetItemState(rPool.GetWhich(SID_ATTR_USERAUTOSAVE), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr,
"BoolItem expected");
-aSaveOptions.SetUserAutoSave( static_cast(pItem)->GetValue() );
+officecfg::Office::Recovery::AutoSave::UserAutoSaveEnabled::set(
+static_cast(pItem)->GetValue(),
+batch);
}
// DocInfo
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index f1ccc712e810..a8ffe9d01c23 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -62,7 +62,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
boolbUseUserData,
bBackup,
bAutoSave,
-bUserAutoSave,
bWarnAlienFormat,
bLoadDocPrinter;
@@ -71,7 +70,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
boolbROAutoSaveTime,
bROUseUserData,
[Libreoffice-commits] core.git: cui/source include/unotools sd/source sfx2/source unotools/source
cui/source/options/optsave.cxx |4 +-
include/unotools/saveopt.hxx |4 --
sd/source/ui/slideshow/slideshowimpl.cxx |5 +--
sfx2/source/appl/appcfg.cxx |9 +++--
unotools/source/config/saveopt.cxx | 48 +--
5 files changed, 13 insertions(+), 57 deletions(-)
New commits:
commit 6f07012a344101f2afbf9c96dc7857127f39a25f
Author: Noel Grandin
AuthorDate: Fri Jul 23 20:05:19 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 24 22:52:27 2021 +0200
use officecfg to retrieve AutoSave
Change-Id: I613ca68123cfd316cd4e6384f743aa6756d9291d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119459
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index b0a58b4743f6..b13f88b10ab3 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -435,8 +435,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
m_xBackupCB->set_active(aSaveOpt.IsBackup());
m_xBackupCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::Backup));
-m_xAutoSaveCB->set_active(aSaveOpt.IsAutoSave());
-
m_xAutoSaveCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::AutoSave));
+
m_xAutoSaveCB->set_active(officecfg::Office::Common::Save::Document::AutoSave::get());
+
m_xAutoSaveCB->set_sensitive(!officecfg::Office::Common::Save::Document::AutoSave::isReadOnly());
m_xUserAutoSaveCB->set_active(aSaveOpt.IsUserAutoSave());
m_xUserAutoSaveCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::UserAutoSave));
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index d50b8115885c..5a8abe03a22f 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -34,7 +34,6 @@ public:
AutoSaveTime,
UseUserData,
Backup,
-AutoSave,
WarnAlienFormat,
LoadDocPrinter,
OdfDefaultVersion,
@@ -93,9 +92,6 @@ public:
voidSetBackup( bool b );
boolIsBackup() const;
-voidSetAutoSave( bool b );
-boolIsAutoSave() const;
-
voidSetUserAutoSave( bool b );
boolIsUserAutoSave() const;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8751a7c6f212..dc3b3bef239a 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -531,10 +532,8 @@ SlideshowImpl::SlideshowImpl( const Reference<
XPresentation2 >& xPresentation,
maInputFreezeTimer.SetInvokeHandler( LINK( this, SlideshowImpl,
ReadyForNextInputHdl ) );
maInputFreezeTimer.SetTimeout( 20 );
-SvtSaveOptions aOptions;
-
// no autosave during show
-if( aOptions.IsAutoSave() )
+if( officecfg::Office::Common::Save::Document::AutoSave::get() )
mbAutoSaveWasOn = true;
Application::AddEventListener( LINK( this, SlideshowImpl, EventListenerHdl
) );
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index fc4280e8df4b..7f2767107c94 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -160,8 +160,9 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_AUTOSAVE :
{
bRet = true;
-if
(!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::AutoSave))
-if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_AUTOSAVE ), aSaveOptions.IsAutoSave(
+if
(!officecfg::Office::Common::Save::Document::AutoSave::isReadOnly())
+if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_AUTOSAVE ),
+
officecfg::Office::Common::Save::Document::AutoSave::get() )))
bRet = false;
}
break;
@@ -455,7 +456,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
if ( SfxItemState::SET ==
rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVE), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr,
"BoolItem expected");
-aSaveOptions.SetAutoSave( static_cast(pItem)->GetValue() );
+officecfg::Office::Common::Save::Document::AutoSave::set(
+static_cast(pItem)->GetValue(),
+batch);
}
// AutoSave-Prompt
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index 5bb82488695a..f1ccc712e810 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -71,7 +71,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
[Libreoffice-commits] core.git: include/unotools sfx2/source unotools/source
include/unotools/saveopt.hxx |4 ---
sfx2/source/appl/appcfg.cxx|9 --
unotools/source/config/saveopt.cxx | 48 ++---
3 files changed, 9 insertions(+), 52 deletions(-)
New commits:
commit d904a21d5516ce2786f634d0bcc555c4b345e95d
Author: Noel Grandin
AuthorDate: Fri Jul 23 19:32:25 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 24 22:09:52 2021 +0200
use officecfg to retrieve AutoSavePrompt
Change-Id: I918e31064064664df7364d7c3093d3cefdb4067a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119458
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index b268d8397d59..d50b8115885c 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -35,7 +35,6 @@ public:
UseUserData,
Backup,
AutoSave,
-AutoSavePrompt,
WarnAlienFormat,
LoadDocPrinter,
OdfDefaultVersion,
@@ -97,9 +96,6 @@ public:
voidSetAutoSave( bool b );
boolIsAutoSave() const;
-voidSetAutoSavePrompt( bool b );
-boolIsAutoSavePrompt() const;
-
voidSetUserAutoSave( bool b );
boolIsUserAutoSave() const;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 00742402585c..fc4280e8df4b 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -168,8 +168,9 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_AUTOSAVEPROMPT :
{
bRet = true;
-if
(!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::AutoSavePrompt))
-if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_AUTOSAVEPROMPT ), aSaveOptions.IsAutoSavePrompt(
+if
(!officecfg::Office::Common::Save::Document::AutoSavePrompt::isReadOnly())
+if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_AUTOSAVEPROMPT ),
+
officecfg::Office::Common::Save::Document::AutoSavePrompt::get(
bRet = false;
}
break;
@@ -461,7 +462,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
if ( SfxItemState::SET ==
rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEPROMPT), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr,
"BoolItem expected");
-aSaveOptions.SetAutoSavePrompt(static_cast(pItem)->GetValue());
+officecfg::Office::Common::Save::Document::AutoSavePrompt::set(
+static_cast(pItem)->GetValue(),
+batch);
}
// AutoSave-Time
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index 1d3f7253952a..5bb82488695a 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -62,7 +62,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
boolbUseUserData,
bBackup,
bAutoSave,
-bAutoSavePrompt,
bUserAutoSave,
bWarnAlienFormat,
bLoadDocPrinter;
@@ -73,7 +72,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
bROUseUserData,
bROBackup,
bROAutoSave,
-bROAutoSavePrompt,
bROUserAutoSave,
bROWarnAlienFormat,
bROLoadDocPrinter,
@@ -90,7 +88,6 @@ public:
boolIsUseUserData() const { return
bUseUserData; }
boolIsBackup() const{ return
bBackup; }
boolIsAutoSave() const { return
bAutoSave; }
-boolIsAutoSavePrompt() const{ return
bAutoSavePrompt; }
boolIsUserAutoSave() const { return
bUserAutoSave; }
boolIsWarnAlienFormat() const { return
bWarnAlienFormat; }
boolIsLoadDocPrinter() const{ return
bLoadDocPrinter; }
@@ -102,7 +99,6 @@ public:
voidSetUseUserData( bool b );
voidSetBackup( bool b );
voidSetAutoSave( bool b );
-voidSetAutoSavePrompt( bool b );
voidSetUserAutoSave( bool b );
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86aa626bb1c211cd21232adeebf174189078e0ca Author: Ilmari Lauhakangas AuthorDate: Sat Jul 24 23:05:43 2021 +0300 Commit: Gerrit Code Review CommitDate: Sat Jul 24 22:05:43 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 36052eea4f7977303088774c3299a7c721ca2608 - tdf#95394 Help: Bitmap -> Image Change-Id: I6faefd33fe3cded67bae3a2b7d4dc7ef790271cf Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119469 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 65c742c48713..36052eea4f79 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 65c742c487136afeb38c6d5352ba35a1d88194c4 +Subproject commit 36052eea4f7977303088774c3299a7c721ca2608 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0001.xhp |2 source/text/shared/00/00040502.xhp |8 +-- source/text/shared/01/05210100.xhp |4 - source/text/shared/01/05210500.xhp | 58 +-- source/text/shared/guide/chart_barformat.xhp |4 - source/text/simpress/guide/background.xhp| 12 ++--- 6 files changed, 44 insertions(+), 44 deletions(-) New commits: commit 36052eea4f7977303088774c3299a7c721ca2608 Author: Ilmari Lauhakangas AuthorDate: Sat Jul 24 18:54:22 2021 +0300 Commit: Olivier Hallot CommitDate: Sat Jul 24 22:05:43 2021 +0200 tdf#95394 Help: Bitmap -> Image Change-Id: I6faefd33fe3cded67bae3a2b7d4dc7ef790271cf Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119469 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0001.xhp b/source/text/shared/00/0001.xhp index 64aa29e11..7f397d6d7 100644 --- a/source/text/shared/00/0001.xhp +++ b/source/text/shared/00/0001.xhp @@ -83,7 +83,7 @@ - + diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp index 236ee11f8..5b5afd6f1 100644 --- a/source/text/shared/00/00040502.xhp +++ b/source/text/shared/00/00040502.xhp @@ -166,8 +166,8 @@ - Hatch tab. -Choose Format - Text Box and Shape - -Object - Area - Bitmaps tab. +Choose Format - Text Box and Shape - +Object - Area - Image tab. Choose Format - Text Box and Shape - Text Attributes Object - Text - Text. Choose Format - Text Box and Shape - Text Attributes @@ -483,10 +483,10 @@ - + Choose Shape - Group - Enter Group. - + Choose Format - Group - Enter Group. diff --git a/source/text/shared/01/05210100.xhp b/source/text/shared/01/05210100.xhp index ef528f797..9ba99f6b5 100644 --- a/source/text/shared/01/05210100.xhp +++ b/source/text/shared/01/05210100.xhp @@ -45,7 +45,7 @@ Set the fill options for the selected drawing object or document element. This is not only for drawing objects, but pages, paragraphs and others too. Need better wording -You can add custom colors, gradients, hatchings, two color patterns and bitmap patterns to the default lists for later use. +You can add custom colors, gradients, hatchings, two color patterns and image patterns to the default lists for later use. @@ -64,7 +64,7 @@ Fills the object with a gradient selected on this page. - + diff --git a/source/text/shared/01/05210500.xhp b/source/text/shared/01/05210500.xhp index 07a581105..a172ff358 100644 --- a/source/text/shared/01/05210500.xhp +++ b/source/text/shared/01/05210500.xhp @@ -22,50 +22,50 @@ -Bitmap +Image /text/shared/01/05210500.xhp - + -bitmaps; areas -areas; bitmap +images; areas +areas; image - - -Bitmap -Select a bitmap that you want to use as a fill image, or add your own bitmap pattern. + + +Image +Select an image that you want to use as a fill image, or add your own image pattern. - + -Bitmap -Lists the available bitmaps. You can also import bitmaps. -To rename a bitmap, select the bitmap, right-click and choose Rename. To delete a bitmap, select the bitmap, right-click and choose Delete. - +Image +Lists the available images. You can also import images. +To rename an image, select the image, right-click and choose Rename. To delete an image, select the image, right-click and choose Delete. + Add/Import -Locate the bitmap that you want to import, and then click Open. The bitmap is added to the end of the list of available bitmaps. +Locate the image that you want to import, and then click Open. the image is added to the end of the list of available images. -Imported bitmaps are saved in your user profile and can be used in other documents. +Imported images are saved in your user profile and can be used in other documents. Options - + Style -Tiled: Fill the area with the bitmap as tiles. +Tiled: Fill the area with the image as tiles. Stretched: Stretch the image to fit the object area. -Custom position/size: Set a custom size and position of the bitmap in the object area. +Custom position/size: Set a custom size and position of the image in the object area. - - - + + + Size Size of the tiles and the custom size. @@ -79,22 +79,22 @@ Scale: Mark to turn the height and width settings relative to original size. - + Position -Select the anchoring position of the bitmap image inside the object area. - - +Select the anchoring position of the image inside the object area. + + Tiling Position -X-Offset: Set the horizontal bitmap offset value with respect to the anchoring position. +X-Offset: Set t
license statement
Hello, All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Best, Huilin Tang ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source include/unotools sfx2/source unotools/source
cui/source/options/optsave.cxx |4 +--
include/unotools/saveopt.hxx |4 ---
sfx2/source/appl/appcfg.cxx|9 --
sfx2/source/doc/guisaveas.cxx |3 --
unotools/source/config/saveopt.cxx | 48 ++---
5 files changed, 12 insertions(+), 56 deletions(-)
New commits:
commit 966cc80a8f45816f727d4af036c2b58fb7d82d22
Author: Noel Grandin
AuthorDate: Fri Jul 23 18:49:40 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 24 21:00:51 2021 +0200
use officecfg to retrieve DocInfoSave
Change-Id: I0a9e8b21b0c5937567273155cd5b5f773fe26b8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119457
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 317d6c625b1e..b0a58b4743f6 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -429,8 +429,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
pImpl->bInitialized = true;
}
-m_xDocInfoCB->set_active(aSaveOpt.IsDocInfoSave());
-
m_xDocInfoCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::DocInfSave));
+
m_xDocInfoCB->set_active(officecfg::Office::Common::Save::Document::EditProperty::get());
+
m_xDocInfoCB->set_sensitive(!officecfg::Office::Common::Save::Document::EditProperty::isReadOnly());
m_xBackupCB->set_active(aSaveOpt.IsBackup());
m_xBackupCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::Backup));
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 4a7c21cac08a..b268d8397d59 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -36,7 +36,6 @@ public:
Backup,
AutoSave,
AutoSavePrompt,
-DocInfSave,
WarnAlienFormat,
LoadDocPrinter,
OdfDefaultVersion,
@@ -104,9 +103,6 @@ public:
voidSetUserAutoSave( bool b );
boolIsUserAutoSave() const;
-voidSetDocInfoSave(bool b);
-boolIsDocInfoSave() const;
-
voidSetLoadUserSettings(bool b);
boolIsLoadUserSettings() const;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 68faf7d0e75f..00742402585c 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -192,8 +192,9 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_DOCINFO :
{
bRet = true;
-if
(!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::DocInfSave))
-if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_DOCINFO ), aSaveOptions.IsDocInfoSave(
+if
(!officecfg::Office::Common::Save::Document::EditProperty::isReadOnly())
+if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_DOCINFO ),
+
officecfg::Office::Common::Save::Document::EditProperty::get(
bRet = false;
}
break;
@@ -481,7 +482,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
if ( SfxItemState::SET ==
rSet.GetItemState(rPool.GetWhich(SID_ATTR_DOCINFO), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr,
"BoolItem expected");
-aSaveOptions.SetDocInfoSave(static_cast(pItem)->GetValue());
+officecfg::Office::Common::Save::Document::EditProperty::set(
+static_cast(pItem)->GetValue(),
+batch);
}
// Mark open Documents
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 9f1aeba44f02..d3640a43773a 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1633,12 +1633,11 @@ bool SfxStoringHelper::GUIStoreModel( const
uno::Reference< frame::XModel >& xMo
aArgsSequence = aModelData.GetMediaDescr().getAsConstPropertyValueList();
// store the document and handle it's docinfo
-SvtSaveOptions aOptions;
DocumentSettingsGuard aSettingsGuard( aModelData.GetModel(),
aModelData.IsRecommendReadOnly(), nStoreMode & EXPORT_REQUESTED );
OSL_ENSURE( aModelData.GetMediaDescr().find( OUString( "Password" ) ) ==
aModelData.GetMediaDescr().end(), "The Password property of MediaDescriptor
should not be used here!" );
-if ( aOptions.IsDocInfoSave()
+if ( officecfg::Office::Common::Save::Document::EditProperty::get()
&& ( !aModelData.GetStorable()->hasLocation()
|| INetURLObject( aModelData.GetStorable()->getLocation() ) != aURL
) )
{
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index 55979f50e982..1d3f7253952a 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/
[Libreoffice-commits] core.git: oox/README.md
oox/README.md |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit d8beefc5d351d636842d07ef3c36c4bb2f6799a6 Author: Julien Nabet AuthorDate: Sat Jul 24 17:35:01 2021 +0200 Commit: Julien Nabet CommitDate: Sat Jul 24 20:09:27 2021 +0200 tdf#143528 Use triple backquotes+xml to markdown xml part in oox/README.md Change-Id: Iee9fb4beb898f9c9fb7e95433b7aa5ff2b614742 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119468 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/oox/README.md b/oox/README.md index a522b583cdcb..e3bae26f0a03 100644 --- a/oox/README.md +++ b/oox/README.md @@ -25,7 +25,7 @@ example of drawingml preset: example of drawingml custom shape (equal to star5 preset): - +```xml http://schemas.openxmlformats.org/drawingml/2006/main";> @@ -119,6 +119,7 @@ example of drawingml custom shape (equal to star5 preset): +``` we needed to extend our custom shapes for missing features and so 5 new segment commands were added. `G` command for arcto drawingml record ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/edit/edtox.cxx|2 +-
sw/source/core/inc/rootfrm.hxx |2 +-
sw/source/core/layout/layact.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9d340a32104c01b15d901e6328641223c74d55dd
Author: Andrea Gelmini
AuthorDate: Fri Jul 23 07:38:14 2021 +0200
Commit: Julien Nabet
CommitDate: Sat Jul 24 19:35:41 2021 +0200
Fix typo
Change-Id: Ia9f0965a26defed4d68cb4fdce82ca860d36bd29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119398
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index b03dc5088f8c..ebd201fd7efb 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -173,7 +173,7 @@ void SwEditShell::UpdateTableOf(const SwTOXBase& rTOX,
const SfxItemSet* pSet)
rTOXSect.SetPosAtStartEnd(*GetCursor()->GetPoint());
// start formatting
-// tdf#139426 ..but allow supression of AssertFlyPages
+// tdf#139426 ...but allow suppression of AssertFlyPages
GetLayout()->SetTableUpdateInProgress(true);
CalcLayout();
GetLayout()->SetTableUpdateInProgress(false);
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 00fd1522d291..6e79b4aa941d 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -114,7 +114,7 @@ class SW_DLLPUBLIC SwRootFrame final : public SwLayoutFrame
boolmbBrowseWidthValid :1; // Is mnBrowseWidth valid?
boolmbTurboAllowed :1;
boolmbAssertFlyPages :1; // Insert more Pages for Flys if needed?
-boolmbTableUpdateInProgress : 1; // tdf#139426 to allow supression of
AssertFlyPages during TableUpdate
+boolmbTableUpdateInProgress : 1; // tdf#139426 to allow suppression of
AssertFlyPages during TableUpdate
boolmbIsVirtPageNum :1; // Do we have a virtual pagenumber?
boolmbIsNewLayout:1; // Layout loaded or newly created
boolmbCallbackActionEnabled:1; // No Action in Notification desired
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 0d381ac00314..95a48df5efda 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -657,7 +657,7 @@ void SwLayAction::InternalAction(OutputDevice*
pRenderContext)
if ((bTakeShortcut || !pPage) && !IsInterrupt() &&
(m_pRoot->IsSuperfluous() || m_pRoot->IsAssertFlyPages()) )
{
-// tdf#139426 allow supression of AssertFlyPages
+// tdf#139426 allow suppression of AssertFlyPages
if ( m_pRoot->IsAssertFlyPages() &&
!m_pRoot->IsTableUpdateInProgress())
{
m_pRoot->AssertFlyPages();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/GraphicImport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5c3128f5e65a1c1c2dd41b6d45fc59012c9d3f91
Author: Andrea Gelmini
AuthorDate: Sat Jul 24 09:53:12 2021 +0200
Commit: Julien Nabet
CommitDate: Sat Jul 24 19:35:05 2021 +0200
Fix typo
Change-Id: I3b564e59f980cb6011d6a6ab5ddd143ee2a28d27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119453
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 80ffbcaff85c..55a4eb6e1ec8 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -881,7 +881,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
sal_Int32 nOOXAngle(0);
aInteropGrabBag.getValue("mso-rotation-angle") >>=
nOOXAngle; // 1/6 deg
// tdf#143455: A diagram is imported as group, but has
no valid object list
-// and contour wrap is different to Word. As
workaround diagramms are excluded
+// and contour wrap is different to Word. As
workaround diagrams are excluded
// here in various places.
const bool bIsDiagram =
oox::drawingml::DrawingML::IsDiagram(m_xShape);
const bool bIsGroupOrLine =
(xServiceInfo->supportsService("com.sun.star.drawing.GroupShape")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbffbafe12ae2e2b3151c969496c16f7db7bca7b Author: Andrea Gelmini AuthorDate: Sat Jul 24 19:34:45 2021 +0200 Commit: Gerrit Code Review CommitDate: Sat Jul 24 19:34:45 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 65c742c487136afeb38c6d5352ba35a1d88194c4 - Fix typo Change-Id: I6edfb252552d59aef329e071e41aa609b6339cc7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119452 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/helpcontent2 b/helpcontent2 index 6797558a82f8..65c742c48713 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6797558a82f83a50b469f38897ffe3b04218cb45 +Subproject commit 65c742c487136afeb38c6d5352ba35a1d88194c4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_textstream.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 65c742c487136afeb38c6d5352ba35a1d88194c4 Author: Andrea Gelmini AuthorDate: Sat Jul 24 09:52:27 2021 +0200 Commit: Julien Nabet CommitDate: Sat Jul 24 19:34:45 2021 +0200 Fix typo Change-Id: I6edfb252552d59aef329e071e41aa609b6339cc7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119452 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/source/text/sbasic/shared/03/sf_textstream.xhp b/source/text/sbasic/shared/03/sf_textstream.xhp index 9b2f6004c..2b7153b99 100644 --- a/source/text/sbasic/shared/03/sf_textstream.xhp +++ b/source/text/sbasic/shared/03/sf_textstream.xhp @@ -334,7 +334,7 @@ line: The line to write, may be empty. - The examples below in Basic and Python create a text file in CSV format in which each line containes a value and its square untill lastValue is reached. + The examples below in Basic and Python create a text file in CSV format in which each line contains a value and its square until lastValue is reached. Sub SquaredValuesFile(lastValue as Integer) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/unotools sfx2/source unotools/source
include/unotools/saveopt.hxx |4 ---
sfx2/source/appl/appcfg.cxx|9 +--
unotools/source/config/saveopt.cxx | 44 -
3 files changed, 7 insertions(+), 50 deletions(-)
New commits:
commit 8690061b7d2d7c50ba96b40af4c4549fd9378b80
Author: Noel Grandin
AuthorDate: Fri Jul 23 16:06:24 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 24 19:32:09 2021 +0200
use officecfg to retrieve SaveWorkingSet
Change-Id: I9f4e4c2caffa828670ddedb1c6fc324e28162b9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119456
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 1420269f2fbf..4a7c21cac08a 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -37,7 +37,6 @@ public:
AutoSave,
AutoSavePrompt,
DocInfSave,
-SaveWorkingSet,
WarnAlienFormat,
LoadDocPrinter,
OdfDefaultVersion,
@@ -108,9 +107,6 @@ public:
voidSetDocInfoSave(bool b);
boolIsDocInfoSave() const;
-voidSetSaveWorkingSet( bool b );
-boolIsSaveWorkingSet() const;
-
voidSetLoadUserSettings(bool b);
boolIsLoadUserSettings() const;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index ae9b8c7a86fc..68faf7d0e75f 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -200,8 +200,9 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_ATTR_WORKINGSET :
{
bRet = true;
-if
(!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::SaveWorkingSet))
-if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_WORKINGSET ), aSaveOptions.IsSaveWorkingSet(
+if
(!officecfg::Office::Common::Save::WorkingSet::isReadOnly())
+if (!rSet.Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_WORKINGSET ),
+
officecfg::Office::Common::Save::WorkingSet::get(
bRet = false;
}
break;
@@ -487,7 +488,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
if ( SfxItemState::SET ==
rSet.GetItemState(rPool.GetWhich(SID_ATTR_WORKINGSET), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr,
"BoolItem expected");
-aSaveOptions.SetSaveWorkingSet(static_cast(pItem)->GetValue());
+officecfg::Office::Common::Save::WorkingSet::set(
+static_cast(pItem)->GetValue(),
+batch);
}
// Save window settings
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index 5fac07ddc4e1..55979f50e982 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -65,7 +65,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
bAutoSavePrompt,
bUserAutoSave,
bDocInfSave,
-bSaveWorkingSet,
bWarnAlienFormat,
bLoadDocPrinter;
@@ -78,7 +77,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
bROAutoSavePrompt,
bROUserAutoSave,
bRODocInfSave,
-bROSaveWorkingSet,
bROWarnAlienFormat,
bROLoadDocPrinter,
bROODFDefaultVersion;
@@ -97,7 +95,6 @@ public:
boolIsAutoSavePrompt() const{ return
bAutoSavePrompt; }
boolIsUserAutoSave() const { return
bUserAutoSave; }
boolIsDocInfoSave() const { return
bDocInfSave; }
-boolIsSaveWorkingSet() const{ return
bSaveWorkingSet; }
boolIsWarnAlienFormat() const { return
bWarnAlienFormat; }
boolIsLoadDocPrinter() const{ return
bLoadDocPrinter; }
@@ -111,7 +108,6 @@ public:
voidSetAutoSavePrompt( bool b );
voidSetUserAutoSave( bool b );
voidSetDocInfoSave( bool b );
-voidSetSaveWorkingSet( bool b );
voidSetWarnAlienFormat( bool _bDoPP );
voidSetLoadDocPrinter( bool bNew );
voidSetODFDefault
[Libreoffice-commits] core.git: cui/source include/unotools sc/source sfx2/source sw/source unotools/source
cui/source/options/optsave.cxx |4 +--
include/unotools/saveopt.hxx |4 ---
sc/source/filter/excel/xeroot.cxx |4 ++-
sfx2/source/appl/appcfg.cxx|9 ---
sfx2/source/doc/docfile.cxx|3 --
sw/source/filter/ww8/wrtw8esh.cxx |5 ++--
unotools/source/config/saveopt.cxx | 46 +
7 files changed, 17 insertions(+), 58 deletions(-)
New commits:
commit 10277e2be5b132ea52a64ed987c23050ac74d18c
Author: Noel Grandin
AuthorDate: Fri Jul 23 15:38:33 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 24 18:04:26 2021 +0200
use officecfg to retrieve SaveRelInet
Change-Id: Ife062fabdfc95253c71388ca9594b1530bc40783
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119455
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index f9055cd94b2f..317d6c625b1e 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -451,8 +451,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
m_xRelativeFsysCB->set_active(officecfg::Office::Common::Save::URL::FileSystem::get());
m_xRelativeFsysCB->set_sensitive(!officecfg::Office::Common::Save::URL::FileSystem::isReadOnly());
-m_xRelativeInetCB->set_active(aSaveOpt.IsSaveRelINet());
-
m_xRelativeInetCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::SaveRelInet));
+
m_xRelativeInetCB->set_active(officecfg::Office::Common::Save::URL::Internet::get());
+
m_xRelativeInetCB->set_sensitive(!officecfg::Office::Common::Save::URL::Internet::isReadOnly());
sal_Int32 nDefaultVersion = aSaveOpt.GetODFDefaultVersion();
m_xODFVersionLB->set_active_id(OUString::number(nDefaultVersion));
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 774fa6fe62ff..1420269f2fbf 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -38,7 +38,6 @@ public:
AutoSavePrompt,
DocInfSave,
SaveWorkingSet,
-SaveRelInet,
WarnAlienFormat,
LoadDocPrinter,
OdfDefaultVersion,
@@ -112,9 +111,6 @@ public:
voidSetSaveWorkingSet( bool b );
boolIsSaveWorkingSet() const;
-voidSetSaveRelINet( bool b );
-boolIsSaveRelINet() const;
-
voidSetLoadUserSettings(bool b);
boolIsLoadUserSettings() const;
diff --git a/sc/source/filter/excel/xeroot.cxx
b/sc/source/filter/excel/xeroot.cxx
index 3bfca778f159..88fbe1297c9f 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -59,7 +59,9 @@ XclExpRootData::XclExpRootData( XclBiff eBiff, SfxMedium&
rMedium,
XclRootData( eBiff, rMedium, xRootStrg, rDoc, eTextEnc, true )
{
SvtSaveOptions aSaveOpt;
-mbRelUrl = mrMedium.IsRemote() ? aSaveOpt.IsSaveRelINet() :
officecfg::Office::Common::Save::URL::FileSystem::get();
+mbRelUrl = mrMedium.IsRemote()
+? officecfg::Office::Common::Save::URL::Internet::get()
+: officecfg::Office::Common::Save::URL::FileSystem::get();
maStringBuf.setLength(0);
}
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index c540a6059e76..ae9b8c7a86fc 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -257,8 +257,9 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
case SID_SAVEREL_INET :
{
bRet = true;
-if
(!aSaveOptions.IsReadOnly(SvtSaveOptions::EOption::SaveRelInet))
-if (!rSet.Put( SfxBoolItem ( rPool.GetWhich(
SID_SAVEREL_INET ), aSaveOptions.IsSaveRelINet() )))
+if
(!officecfg::Office::Common::Save::URL::Internet::isReadOnly())
+if (!rSet.Put( SfxBoolItem ( rPool.GetWhich(
SID_SAVEREL_INET ),
+
officecfg::Office::Common::Save::URL::Internet::get() )))
bRet = false;
}
break;
@@ -527,7 +528,9 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
if ( SfxItemState::SET ==
rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_INET), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr,
"BoolItem expected");
-aSaveOptions.SetSaveRelINet(static_cast(pItem)->GetValue());
+officecfg::Office::Common::Save::URL::Internet::set(
+static_cast(pItem)->GetValue(),
+batch);
}
// SaveRelFSys
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 9497d3a144b0..c8d1ab4bcc63 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -640,9 +640,8 @@ OUString SfxMedium::GetBaseURL( bool bForSaving )
if (
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uno/unodefaults.hxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit c5dcf48789d705d1b842e45d7c22cb38e477307c Author: Huilin AuthorDate: Fri Jul 23 16:09:15 2021 -0700 Commit: Ilmari Lauhakangas CommitDate: Sat Jul 24 17:13:54 2021 +0200 tdf#143148: Use pragma once instead of include guards Change-Id: I5ac5ac09474b9e05b17a9c5b191ab2808eca2660 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119431 Reviewed-by: Ilmari Lauhakangas Tested-by: Ilmari Lauhakangas diff --git a/sw/source/uibase/uno/unodefaults.hxx b/sw/source/uibase/uno/unodefaults.hxx old mode 100644 new mode 100755 index 91d7c8f2faa9..5c14c1726008 --- a/sw/source/uibase/uno/unodefaults.hxx +++ b/sw/source/uibase/uno/unodefaults.hxx @@ -16,8 +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 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_UNO_UNODEFAULTS_HXX -#define INCLUDED_SW_SOURCE_UIBASE_UNO_UNODEFAULTS_HXX +#pragma once #include @@ -34,6 +33,4 @@ public: virtual SfxItemPool* getModelPool(bool bReadOnly) noexcept override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20c2d7deaab20deb6970cab563d4c7d88fefa53f
Author: Ilmari Lauhakangas
AuthorDate: Sat Jul 24 18:01:59 2021 +0300
Commit: Ilmari Lauhakangas
CommitDate: Sat Jul 24 17:08:32 2021 +0200
tdf#95394 ToTD: Bitmap -> Image
Change-Id: Ifc0ae0719b30086febf9a203d70a55da837135f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119467
Tested-by: Ilmari Lauhakangas
Reviewed-by: Ilmari Lauhakangas
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 081afe453860..d5d5c7f62a8e 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -86,7 +86,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To repeat a table heading when a table
spans over a page, use Table ▸ Table Properties ▸ Text Flow ▸ Repeat
heading."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To quickly insert or delete rows, select
the desired number of rows (or columns) and press %MOD1+ to add or %MOD1- to
delete."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To repeat rows/columns on every pages use
Format ▸ Print Ranges ▸ Edit."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Insert images and photos into shapes in
Draw and Impress. Right-click on a shape, choose Area ▸ Bitmap ▸ Add/Import,
and use Options to adjust appearance."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Insert images and photos into shapes in
Draw and Impress. Right-click on a shape, choose Area ▸ Image ▸ Add/Import, and
use Options to adjust appearance."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to insert the date in a spreadsheet
cell? Type %MOD1+; or Shift+%MOD1+; to insert the time."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Insert your metadata in your document with
Insert ▸ Fields ▸ More Fields… ▸ Document or DocInformation."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Get help from the community via the Ask
portal."), "https://ask.libreoffice.org";, ""},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source dbaccess/source include/unotools reportdesign/source sc/source sfx2/source sw/CppunitTest_sw_ooxmllinks.mk sw/qa sw/source unotools/source
cui/source/options/optsave.cxx |5 +
dbaccess/source/core/dataaccess/databasedocument.cxx |5 -
include/unotools/saveopt.hxx |4 -
reportdesign/source/core/api/ReportDefinition.cxx|3 -
sc/source/filter/excel/xeroot.cxx|3 -
sfx2/source/appl/appcfg.cxx |9 ++-
sfx2/source/doc/docfile.cxx |3 -
sw/CppunitTest_sw_ooxmllinks.mk |4 +
sw/qa/extras/ooxmlexport/ooxmllinks.cxx | 29 ++-
sw/source/filter/ww8/wrtw8esh.cxx|3 -
sw/source/filter/ww8/wrtw8nds.cxx|3 -
unotools/source/config/saveopt.cxx | 48 +--
12 files changed, 34 insertions(+), 85 deletions(-)
New commits:
commit 095e3ac51eaae12da641018e889d79e3ae029038
Author: Noel Grandin
AuthorDate: Fri Jul 23 15:09:51 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 24 16:52:52 2021 +0200
use officecfg to retrieve SaveRelFSys
Change-Id: If4e943153080e1c8fea02e712038dd6dee92c5a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119454
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index cb67147bdbf1..f9055cd94b2f 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -24,6 +24,7 @@
#include
#include
#include "optsave.hxx"
+#include
#include
#include
#include
@@ -447,8 +448,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
m_xAutoSaveEdit->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::AutoSaveTime));
// save relatively
-m_xRelativeFsysCB->set_active(aSaveOpt.IsSaveRelFSys());
-
m_xRelativeFsysCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::SaveRelFsys));
+
m_xRelativeFsysCB->set_active(officecfg::Office::Common::Save::URL::FileSystem::get());
+
m_xRelativeFsysCB->set_sensitive(!officecfg::Office::Common::Save::URL::FileSystem::isReadOnly());
m_xRelativeInetCB->set_active(aSaveOpt.IsSaveRelINet());
m_xRelativeInetCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::SaveRelInet));
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index b0b6e50afd54..c8a75c1e725d 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1618,9 +1618,8 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
-SvtSaveOptions aSaveOpt;
xInfoSet->setPropertyValue("UsePrettyPrinting",
uno::makeAny(officecfg::Office::Common::Save::Document::PrettyPrinting::get()));
-if ( aSaveOpt.IsSaveRelFSys() )
+if ( officecfg::Office::Common::Save::URL::FileSystem::get() )
{
OUString sBaseURI = _rMediaDescriptor.getOrDefault("BaseURI",
OUString());
if (sBaseURI.isEmpty())
@@ -1654,7 +1653,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
OUString aVersion;
SvtSaveOptions::ODFSaneDefaultVersion const nDefVersion =
-aSaveOpt.GetODFSaneDefaultVersion();
+SvtSaveOptions().GetODFSaneDefaultVersion();
// older versions can not have this property set,
// it exists only starting from ODF1.2
if (nDefVersion >= SvtSaveOptions::ODFSVER_013)
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index cfaa51389db3..774fa6fe62ff 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -39,7 +39,6 @@ public:
DocInfSave,
SaveWorkingSet,
SaveRelInet,
-SaveRelFsys,
WarnAlienFormat,
LoadDocPrinter,
OdfDefaultVersion,
@@ -116,9 +115,6 @@ public:
voidSetSaveRelINet( bool b );
boolIsSaveRelINet() const;
-voidSetSaveRelFSys( bool b );
-boolIsSaveRelFSys() const;
-
voidSetLoadUserSettings(bool b);
boolIsLoadUserSettings() const;
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 3884d06198f9..ebd735a8f296 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1318,9 +1318,8 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
};
uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
-SvtSaveOptions aSaveOpt;
xInfoSet->setPropertyValue("Use
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/RemoteServer.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 4e511cc7dfbf14b6176ce352db8125c16eefeebf Author: Andrzej Hunt AuthorDate: Sat Jul 24 14:23:10 2021 +0200 Commit: Andrzej Hunt CommitDate: Sat Jul 24 16:05:19 2021 +0200 sdremote: remove useless comment It's been there since the beginning, but doesn't help us much: e4239e041468 (Initial checkin of remote control., 2012-07-09) Change-Id: I57425001cd0b9d0d035916405bd6d94329964b4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119466 Tested-by: Jenkins Reviewed-by: Andrzej Hunt diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index d5dba8c092f0..e676087899d9 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -8,7 +8,6 @@ */ #pragma once -// SERVER #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/truetype/symbol/OpenSymbol2.sfd |108834 ++ 1 file changed, 108834 insertions(+) New commits: commit 2d9ca45e0e785fde968328cb44d40cd3dc113941 Author: dante AuthorDate: Thu Nov 12 20:15:54 2020 +0100 Commit: Noel Grandin CommitDate: Sat Jul 24 15:21:11 2021 +0200 Addition of OpenSymbol2 Remaining lines have been uploaded via amend. The other day was discussed in the IRC chat if OpenSymbol was actually removable. The actual problem with open symbol is that there are too many characters missing characters and it supposes a ballast for starmath. This responds to: Bug tdf#134214 Some of the problems caused by this are WON'T FIX: mathhbb, fractur, setp tdf#49990 and much more. However replacing the font was actually impossible. If changed the layouts old documents may break. For that reason the new font had to support what already was implemented in a way it won't change the layout: the old symbols had to be conservated. Result: we are creating a new font, containing opensymbol just for personal use of starmath module. For now the changes with opensymbol are: - Reencoded as ISO 10466-1 ( unicode32 full ) with fontforge. - Added quadruple integral with fontforge. - Do not use it outside starmath. Changes will be made in private chars area. IT MAY BREAK. In order to complete it, characters from anothers fonts will be added. For now the best option is libertinus math. This font final name might end beeing something like LO Libertinus math. I have already contacted the maintainer in order to get permission and waiting for answer. In case of no will look for other fonts. The other option would be to make opensymbol2 a subproduct of libertinus because: 2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. Change-Id: Ia33a0181b0d28b65680d8df9ffa3d0c37078df18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105769 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/extras/source/truetype/symbol/OpenSymbol2.sfd b/extras/source/truetype/symbol/OpenSymbol2.sfd new file mode 100644 index ..667a79f1f081 --- /dev/null +++ b/extras/source/truetype/symbol/OpenSymbol2.sfd @@ -0,0 +1,108834 @@ +SplineFontDB: 3.2 +FontName: OpenSymbol2 +FullName: OpenSymbol2 +FamilyName: OpenSymbol2 +Weight: Book +Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, eight, nine, question, underscore, copyright, registered, uni2215, angle, therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi Abe +Version: 102.11 +ItalicAngle: 0 +UnderlinePosition: -143 +UnderlineWidth: 20 +Ascent: 1638 +Descent: 410 +InvalidEm: 0 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +XUID: [1021 161 2043615882 15846768] +FSType: 8 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1144938807 +ModificationTime: 1605182946 +PfmFamily: 81 +TTFWeight: 400 +TTFWidth: 5 +LineGap: 307 +VLineGap: 0 +Panose: 5 1 0 0 0 0 0 0 0 0 +OS2TypoAscent: 1420 +OS2TypoAOffset: 0 +OS2TypoDescent: -442 +OS2TypoDOffset: 0 +OS2TypoLinegap: 307 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 1420 +HheadAOffset: 0 +HheadDescent: -442 +HheadDOffset: 0 +OS2SubXSize: 409 +OS2SubYSize: 409 +OS2SubXOff: 0 +OS2SubYOff: 409 +OS2SupXSize: 409 +OS2SupYSize: 409 +OS2SupXOff: 0 +OS2SupYOff: 409 +OS2StrikeYSize: 102 +OS2StrikeYPos: 530 +OS2Vendor: 'PfEd' +OS2UnicodeRanges: 80af.1001ecea.0200. +MarkAttachClasses: 1 +DEI: 91125 +TtTable: prep +PUSHW_1 + 511 +SCANCTRL +PUSHB_1 + 1 +SCANTYPE +SVTCA[y-axis] +MPPEM +PUSHB_1 + 8 +LT +IF +PUSHB_2 + 1 + 1 +INSTCTRL +EIF +PUSHB_2 + 70 + 6 +CALL +IF +POP +PUSHB_1 + 16 +EIF +MPPEM +PUSHB_1 + 20 +GT +IF +POP +PUSHB_1 + 128 +EIF +SCVTCI +PUSHB_1 + 6 +CALL +NOT +IF +EIF +PUSHB_1 + 20 +CALL +EndTTInstrs +TtTable: fpgm +PUSHB_1 + 0 +FDEF +PUSHB_1 + 0 +SZP0 +MPPEM +PUSHB_1 + 42 +LT +IF +PUSHB_1 + 74 +SROUND +EIF +PUSHB_1 + 0 +SWAP +MIAP[rnd] +RTG +PUSHB_1 + 6 +CALL +IF +RTDG +EIF +MPPEM +PUSHB_1 + 42 +LT +IF +RDTG +EIF +DUP +MDRP[rp0,rnd,grey] +PUSHB_1 + 1 +SZP0 +MDAP[no-rnd] +RTG +ENDF +PUSHB_1 + 1 +FDEF +DUP +MDRP[rp0,min,white] +PUSHB_1 + 12 +CALL +ENDF +PUSHB_1 + 2 +FDEF +MPPEM +GT +IF +RCVT +SWAP +EIF +POP +ENDF +PUSHB_1 + 3 +FDEF +ROUND[Black] +RTG +DUP +PUS
[Libreoffice-commits] core.git: cui/source
cui/source/options/optsave.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4e89b710c05cd1774072575330623cb5c6b2650f Author: Noel Grandin AuthorDate: Sat Jul 24 13:39:40 2021 +0200 Commit: Noel Grandin CommitDate: Sat Jul 24 15:18:34 2021 +0200 fix incorrect read-only check in save options ever since commit 14171010959a4ebf0f6373b6e7f20d1f0741d5a4 Date: Sat Nov 26 17:00:43 2016 +0100 respect read-only config items in Options - Load/Save - General dialog Change-Id: Ib830fbee23a06e8788c9916f8d5a923139540e8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119465 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 9ad1c1f5a4c5..cb67147bdbf1 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include @@ -363,7 +364,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* ) SvtSaveOptions aSaveOpt; m_xLoadUserSettingsCB->set_active(aSaveOpt.IsLoadUserSettings()); m_xLoadUserSettingsCB->save_state(); - m_xLoadUserSettingsCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::UseUserData)); + m_xLoadUserSettingsCB->set_sensitive(!officecfg::Office::Common::Load::UserDefinedSettings::isReadOnly()); m_xLoadDocPrinterCB->set_active( aSaveOpt.IsLoadDocumentPrinter() ); m_xLoadDocPrinterCB->save_state(); m_xLoadDocPrinterCB->set_sensitive(!aSaveOpt.IsReadOnly(SvtSaveOptions::EOption::LoadDocPrinter)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source include/svtools sfx2/source svtools/source
cui/source/options/optgdlg.cxx|8 ++--
include/svtools/helpopt.hxx |2 --
sfx2/source/appl/sfxhelp.cxx | 14 --
svtools/source/config/helpopt.cxx | 25 ++---
4 files changed, 16 insertions(+), 33 deletions(-)
New commits:
commit cde00e11db2f273f4027780a4f66e40ec7c598e1
Author: Noel Grandin
AuthorDate: Fri Jul 23 12:28:46 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 24 13:17:39 2021 +0200
use officecfg to retrieve offlinehelppopup
Change-Id: I2441dc1c508ceb4805a98b7e45863bbda4af0b18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119415
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 04d2683c921e..9194219d2056 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -219,7 +219,11 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
SvtHelpOptions aHelpOptions;
if ( m_xPopUpNoHelpCB->get_state_changed_from_saved() )
-aHelpOptions.SetOfflineHelpPopUp( m_xPopUpNoHelpCB->get_active() );
+{
+auto xChanges = comphelper::ConfigurationChanges::create();
+
officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::set(m_xPopUpNoHelpCB->get_active(),
xChanges);
+xChanges->commit();
+}
if ( m_xExtHelpCB->get_state_changed_from_saved() )
aHelpOptions.SetExtendedHelp( m_xExtHelpCB->get_active() );
@@ -286,7 +290,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
SvtHelpOptions aHelpOptions;
m_xExtHelpCB->set_active( aHelpOptions.IsHelpTips() &&
aHelpOptions.IsExtendedHelp() );
m_xExtHelpCB->save_state();
-m_xPopUpNoHelpCB->set_active( aHelpOptions.IsOfflineHelpPopUp() );
+m_xPopUpNoHelpCB->set_active(
officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::get() );
m_xPopUpNoHelpCB->save_state();
m_xShowTipOfTheDay->set_active(
officecfg::Office::Common::Misc::ShowTipOfTheDay::get() );
m_xShowTipOfTheDay->save_state();
diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx
index 8d1479609e0c..803fce3ff0f0 100644
--- a/include/svtools/helpopt.hxx
+++ b/include/svtools/helpopt.hxx
@@ -38,8 +38,6 @@ public:
boolIsExtendedHelp() const;
voidSetHelpTips( bool b );
boolIsHelpTips() const;
-voidSetOfflineHelpPopUp(bool b);
-boolIsOfflineHelpPopUp() const;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index e96c3f7f4a0d..df0543b15a21 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -1136,8 +1136,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow)
if ( !impl_hasHelpInstalled() )
{
-SvtHelpOptions aHelpOptions;
-bool bShowOfflineHelpPopUp = aHelpOptions.IsOfflineHelpPopUp();
+bool bShowOfflineHelpPopUp =
officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::get();
pWindow = GetBestParent(pWindow);
@@ -1150,7 +1149,9 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow)
HelpManualMessage aQueryBox(pWeldWindow);
short OnlineHelpBox = aQueryBox.run();
bShowOfflineHelpPopUp = OnlineHelpBox != RET_OK;
-
aHelpOptions.SetOfflineHelpPopUp(aQueryBox.GetOfflineHelpPopUp());
+auto xChanges = comphelper::ConfigurationChanges::create();
+
officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::set(aQueryBox.GetOfflineHelpPopUp(),
xChanges);
+xChanges->commit();
aBusy.decBusy();
}
if(!bShowOfflineHelpPopUp)
@@ -1292,8 +1293,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL,
weld::Widget* pWidget, const OUSt
if ( !impl_hasHelpInstalled() )
{
-SvtHelpOptions aHelpOptions;
-bool bShowOfflineHelpPopUp = aHelpOptions.IsOfflineHelpPopUp();
+bool bShowOfflineHelpPopUp =
officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::get();
TopLevelWindowLocker aBusy;
@@ -1303,7 +1303,9 @@ bool SfxHelp::Start_Impl(const OUString& rURL,
weld::Widget* pWidget, const OUSt
HelpManualMessage aQueryBox(pWidget);
short OnlineHelpBox = aQueryBox.run();
bShowOfflineHelpPopUp = OnlineHelpBox != RET_OK;
-
aHelpOptions.SetOfflineHelpPopUp(aQueryBox.GetOfflineHelpPopUp());
+auto xChanges = comphelper::ConfigurationChanges::create();
+
officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::set(aQueryBox.GetOfflineHelpPopUp(),
xChanges);
+xChanges->commit();
aBusy.decBusy();
}
[Libreoffice-commits] core.git: chart2/source dbaccess/source include/unotools reportdesign/Library_rpt.mk reportdesign/Library_rptxml.mk reportdesign/source sc/source sd/source sfx2/source starmath/s
chart2/source/model/filter/XMLFilter.cxx|4
dbaccess/source/core/dataaccess/databasedocument.cxx|3
include/unotools/saveopt.hxx|4
reportdesign/Library_rpt.mk |4
reportdesign/Library_rptxml.mk |4
reportdesign/source/core/api/ReportDefinition.cxx |3
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx |4
sc/source/filter/xml/xmlwrap.cxx|4
sd/source/filter/xml/sdxmlwrp.cxx |4
sfx2/source/appl/appcfg.cxx |9 +
starmath/source/mathml/mathmlexport.cxx |5 -
sw/source/filter/xml/wrtxml.cxx |4
unotools/source/config/saveopt.cxx | 55 +---
13 files changed, 37 insertions(+), 70 deletions(-)
New commits:
commit e271fce82e16359394fdeb818c2ec25a07532a8d
Author: Noel Grandin
AuthorDate: Fri Jul 23 14:30:42 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jul 24 09:57:08 2021 +0200
use officecfg to retrieve PrettyPrinting
Change-Id: Ia815acdb8050316293e23801d3ed5bfbeb3ab386
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119417
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index 784882739ac0..5838647bc510 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
#include
@@ -590,8 +591,7 @@ ErrCode XMLFilter::impl_Export(
uno::Reference< beans::XPropertySet > xInfoSet =
comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
-SvtSaveOptions aSaveOpt;
-bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
+bool bUsePrettyPrinting(
officecfg::Office::Common::Save::Document::PrettyPrinting::get() );
xInfoSet->setPropertyValue( "UsePrettyPrinting", uno::Any(
bUsePrettyPrinting ) );
if( ! bOasis )
xInfoSet->setPropertyValue( "ExportTableNumberList", uno::Any(
true ));
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 603a0622b2ba..b0b6e50afd54 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -26,6 +26,7 @@
#include
#include
+#include
#include
#include
#include
@@ -1618,7 +1619,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
SvtSaveOptions aSaveOpt;
-xInfoSet->setPropertyValue("UsePrettyPrinting",
uno::makeAny(aSaveOpt.IsPrettyPrinting()));
+xInfoSet->setPropertyValue("UsePrettyPrinting",
uno::makeAny(officecfg::Office::Common::Save::Document::PrettyPrinting::get()));
if ( aSaveOpt.IsSaveRelFSys() )
{
OUString sBaseURI = _rMediaDescriptor.getOrDefault("BaseURI",
OUString());
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index e8b6aed4e448..cfaa51389db3 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -40,7 +40,6 @@ public:
SaveWorkingSet,
SaveRelInet,
SaveRelFsys,
-DoPrettyPrinting,
WarnAlienFormat,
LoadDocPrinter,
OdfDefaultVersion,
@@ -123,9 +122,6 @@ public:
voidSetLoadUserSettings(bool b);
boolIsLoadUserSettings() const;
-voidSetPrettyPrinting( bool _bEnable );
-boolIsPrettyPrinting( ) const;
-
voidSetWarnAlienFormat( bool _bEnable );
boolIsWarnAlienFormat( ) const;
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index fb846e09ee8a..c3f63a678881 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -26,6 +26,10 @@ $(eval $(call
gb_Library_set_precompiled_header,rpt,reportdesign/inc/pch/precomp
$(eval $(call gb_Library_use_sdk_api,rpt))
+$(eval $(call gb_Library_use_custom_headers,rpt,\
+officecfg/registry \
+))
+
$(eval $(call gb_Library_use_libraries,rpt,\
comphelper \
cppu \
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index dff99605f0bc..5a1707c2af4c 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -21,6 +21,10 @@ $(eval $(call
gb_Library_set_precompiled_header,rptxml,reportdesign/inc/pch/prec
$(eval $(call gb_Library_use_sdk_api,rptxml))
+$(eval $(call gb_Library_use_custom_header
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |4
sd/source/ui/remotecontrol/BufferedStreamSocket.hxx |5 -
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 2855f12072023930a15ea852e40d05de4a6be164
Author: Andrzej Hunt
AuthorDate: Sat Jul 17 09:42:47 2021 +0200
Commit: Andrzej Hunt
CommitDate: Sat Jul 24 09:51:36 2021 +0200
sdremote: close BufferedStreamSocket on destruction
This follows the pattern in osl::Socket which also cleans up on
destruction if necessary.
By closing on destruction we can avoid leaking the underlying socket or
filedescriptor in the numerous scenarios where we throw away the socket
without bothering to call close(). This isn't a big deal in normal
usage - we don't use many sockets in the first place - but you can
quickly run out of filedescriptors when running sufficiently complex
tests.
We also need to make BufferedStreamSocket final to avoid triggering
loplugin:fragiledestructor - BufferedStreamSocket probably should
have been final anyway, so there's no reason not to do so.
Change-Id: I90c271df4b598a6c2b326fde13543e6b27d7a110
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119093
Tested-by: Jenkins
Reviewed-by: Andrzej Hunt
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index b3a9cc154e37..58adb13ca7bf 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -47,6 +47,10 @@ BufferedStreamSocket::BufferedStreamSocket( int aSocket ):
{
}
+BufferedStreamSocket::~BufferedStreamSocket() {
+close();
+}
+
void BufferedStreamSocket::getPeerAddr(osl::SocketAddr& rAddr)
{
assert ( !usingCSocket );
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
index 08a81cf002f6..6abf7ec1bf8d 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.hxx
@@ -25,7 +25,7 @@ namespace sd
* returned to being a StreamSocket wrapper if/when Bluetooth is
* integrated into osl Sockets.
*/
-class BufferedStreamSocket :
+class BufferedStreamSocket final :
public IBluetoothSocket,
private ::osl::StreamSocket
{
@@ -40,6 +40,9 @@ namespace sd
*/
explicit BufferedStreamSocket( int aSocket );
BufferedStreamSocket( const BufferedStreamSocket &aSocket );
+
+~BufferedStreamSocket();
+
/**
* Blocks until a line is read.
* Returns whatever the last call of recv returned, i.e. 0 or less
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
