[ooo-build-commit] .: 3 commits - svtools/inc svtools/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Aug 26 07:25:33 PDT 2010
svtools/inc/svtools/miscopt.hxx | 10 ++
svtools/source/config/miscopt.cxx | 144 +++++++++++++++++++++++++++++++++++++-
2 files changed, 152 insertions(+), 2 deletions(-)
New commits:
commit a14c3ed9ab507d03bc2625c63b17c976ecf8c2d9
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Aug 25 23:26:50 2010 +0200
ui-desktop-integration.diff: Disable UI [toolbars, menus] customization.
diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index 1f51b8d..9a299c4 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -114,6 +114,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
void SetTryODMADialog( sal_Bool bSet );
sal_Bool IsTryUseODMADialogReadOnly() const;
+ sal_Bool DisableUICustomization() const;
+
sal_Bool IsPluginsEnabled() const;
void SetPluginsEnabled( sal_Bool bEnable );
sal_Bool IsPluginsEnabledReadOnly() const;
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index cb7885a..b8a358f 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -82,8 +82,10 @@ using namespace ::com::sun::star;
#define PROPERTYHANDLE_TRYODMADIALOG 6
#define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog")
#define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
+#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization")
+#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 8
-#define PROPERTYCOUNT 8
+#define PROPERTYCOUNT 9
#define VCL_TOOLBOX_STYLE_FLAT ((USHORT)0x0004) // from <vcl/toolbox.hxx>
@@ -116,6 +118,7 @@ class SvtMiscOptions_Impl : public ConfigItem
sal_Bool m_bIsUseSystemPrintDialogRO;
sal_Bool m_bShowLinkWarningDialog;
sal_Bool m_bIsShowLinkWarningDialogRO;
+ sal_Bool m_bDisableUICustomization;
//-------------------------------------------------------------------------------------------------------------
// public methods
@@ -193,6 +196,9 @@ class SvtMiscOptions_Impl : public ConfigItem
inline sal_Bool IsTryUseODMADialogReadOnly() const
{ return m_bIsTryODMADialogRO; }
+ inline sal_Bool DisableUICustomization() const
+ { return m_bDisableUICustomization; }
+
inline sal_Bool IsPluginsEnabled() const
{ return m_bPluginsEnabled; }
@@ -405,6 +411,13 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
m_bIsSymbolsStyleRO = seqRO[nProperty];
break;
}
+
+ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
+ {
+ if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
+ DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
+ break;
+ }
}
}
@@ -520,6 +533,11 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
}
}
break;
+ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : {
+ if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
+ DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
+ }
+ break;
}
}
}
@@ -683,6 +701,12 @@ void SvtMiscOptions_Impl::Commit()
seqValues[nProperty] <<= m_bShowLinkWarningDialog;
break;
}
+
+ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
+ {
+ seqValues[nProperty] <<= m_bDisableUICustomization;
+ break;
+ }
}
}
// Set properties in configuration.
@@ -704,7 +728,8 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
PROPERTYNAME_SYMBOLSTYLE,
PROPERTYNAME_USESYSTEMPRINTDIALOG,
PROPERTYNAME_TRYODMADIALOG,
- PROPERTYNAME_SHOWLINKWARNINGDIALOG
+ PROPERTYNAME_SHOWLINKWARNINGDIALOG,
+ PROPERTYNAME_DISABLEUICUSTOMIZATION
};
// Initialize return sequence with these list ...
@@ -865,6 +890,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolsStyleReadOnly() const
return m_pDataContainer->IsGetSymbolsStyleReadOnly();
}
+sal_Bool SvtMiscOptions::DisableUICustomization() const
+{
+ return m_pDataContainer->DisableUICustomization();
+}
+
sal_Int16 SvtMiscOptions::GetToolboxStyle() const
{
return m_pDataContainer->GetToolboxStyle();
commit f69f6612f30392043e22cae227abadcf4ffa3d03
Author: Thorsten Behrens <thb at openoffice.org>
Date: Wed Aug 25 23:02:22 2010 +0200
linkwarn-svtools-miscopts-bits.diff: Link warning dialog.
n#348149
diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index c810068..1f51b8d 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -140,6 +140,10 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
sal_Bool UseSystemPrintDialog() const;
void SetUseSystemPrintDialog( sal_Bool bSet );
+ sal_Bool ShowLinkWarningDialog() const;
+ void SetShowLinkWarningDialog( sal_Bool bSet );
+ sal_Bool IsShowLinkWarningDialogReadOnly() const;
+
//-------------------------------------------------------------------------------------------------------------
// private methods
//-------------------------------------------------------------------------------------------------------------
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 10b2574..cb7885a 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -80,8 +80,10 @@ using namespace ::com::sun::star;
#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG 5
#define PROPERTYNAME_TRYODMADIALOG ASCII_STR("TryODMADialog")
#define PROPERTYHANDLE_TRYODMADIALOG 6
+#define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog")
+#define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
-#define PROPERTYCOUNT 7
+#define PROPERTYCOUNT 8
#define VCL_TOOLBOX_STYLE_FLAT ((USHORT)0x0004) // from <vcl/toolbox.hxx>
@@ -112,6 +114,8 @@ class SvtMiscOptions_Impl : public ConfigItem
sal_Bool m_bIsToolboxStyleRO;
sal_Bool m_bUseSystemPrintDialog;
sal_Bool m_bIsUseSystemPrintDialogRO;
+ sal_Bool m_bShowLinkWarningDialog;
+ sal_Bool m_bIsShowLinkWarningDialogRO;
//-------------------------------------------------------------------------------------------------------------
// public methods
@@ -237,6 +241,15 @@ class SvtMiscOptions_Impl : public ConfigItem
inline sal_Bool IsUseSystemPrintDialogReadOnly() const
{ return m_bIsUseSystemPrintDialogRO; }
+ inline sal_Bool ShowLinkWarningDialog() const
+ { return m_bShowLinkWarningDialog; }
+
+ void SetShowLinkWarningDialog( sal_Bool bSet )
+ { m_bShowLinkWarningDialog = bSet; SetModified(); }
+
+ sal_Bool IsShowLinkWarningDialogReadOnly() const
+ { return m_bIsShowLinkWarningDialogRO; }
+
void AddListenerLink( const Link& rLink );
void RemoveListenerLink( const Link& rLink );
void CallListeners();
@@ -286,6 +299,8 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
, m_bIsToolboxStyleRO( sal_False )
, m_bUseSystemPrintDialog( sal_False )
, m_bIsUseSystemPrintDialogRO( sal_False )
+ , m_bShowLinkWarningDialog( sal_True )
+ , m_bIsShowLinkWarningDialogRO( sal_False )
{
// Use our static list of configuration keys to get his values.
@@ -368,6 +383,16 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
break;
}
+ case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG :
+ {
+ if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
+ {
+ DBG_ERROR("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" );
+ }
+ m_bIsShowLinkWarningDialogRO = seqRO[nProperty];
+ break;
+ }
+
case PROPERTYHANDLE_SYMBOLSTYLE :
{
::rtl::OUString aSymbolsStyle;
@@ -478,6 +503,13 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
}
}
break;
+ case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG : {
+ if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
+ {
+ DBG_ERROR("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" );
+ }
+ }
+ break;
case PROPERTYHANDLE_SYMBOLSTYLE : {
::rtl::OUString aSymbolsStyle;
if( seqValues[nProperty] >>= aSymbolsStyle )
@@ -644,6 +676,13 @@ void SvtMiscOptions_Impl::Commit()
seqValues[nProperty] <<= m_bUseSystemPrintDialog;
break;
}
+
+ case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG :
+ {
+ if ( !m_bIsShowLinkWarningDialogRO )
+ seqValues[nProperty] <<= m_bShowLinkWarningDialog;
+ break;
+ }
}
}
// Set properties in configuration.
@@ -664,7 +703,8 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
PROPERTYNAME_USESYSTEMFILEDIALOG,
PROPERTYNAME_SYMBOLSTYLE,
PROPERTYNAME_USESYSTEMPRINTDIALOG,
- PROPERTYNAME_TRYODMADIALOG
+ PROPERTYNAME_TRYODMADIALOG,
+ PROPERTYNAME_SHOWLINKWARNINGDIALOG
};
// Initialize return sequence with these list ...
@@ -850,6 +890,21 @@ void SvtMiscOptions::SetUseSystemPrintDialog( sal_Bool bEnable )
m_pDataContainer->SetUseSystemPrintDialog( bEnable );
}
+sal_Bool SvtMiscOptions::ShowLinkWarningDialog() const
+{
+ return m_pDataContainer->ShowLinkWarningDialog();
+}
+
+void SvtMiscOptions::SetShowLinkWarningDialog( sal_Bool bSet )
+{
+ m_pDataContainer->SetShowLinkWarningDialog( bSet );
+}
+
+sal_Bool SvtMiscOptions::IsShowLinkWarningDialogReadOnly() const
+{
+ return m_pDataContainer->IsShowLinkWarningDialogReadOnly();
+}
+
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
commit 6a58927a5a56d552631fa113d1887341041d3d7f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 25 22:28:04 2010 +0200
novell-win32-odma.diff: ODMA dialog implementation.
i#6885, i#32741
diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index 7ce78e1..c810068 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -110,6 +110,10 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
void SetUseSystemFileDialog( sal_Bool bSet );
sal_Bool IsUseSystemFileDialogReadOnly() const;
+ sal_Bool TryODMADialog() const;
+ void SetTryODMADialog( sal_Bool bSet );
+ sal_Bool IsTryUseODMADialogReadOnly() const;
+
sal_Bool IsPluginsEnabled() const;
void SetPluginsEnabled( sal_Bool bEnable );
sal_Bool IsPluginsEnabledReadOnly() const;
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 128fb4a..10b2574 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -78,8 +78,10 @@ using namespace ::com::sun::star;
#define PROPERTYHANDLE_SYMBOLSTYLE 4
#define PROPERTYNAME_USESYSTEMPRINTDIALOG ASCII_STR("UseSystemPrintDialog")
#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG 5
+#define PROPERTYNAME_TRYODMADIALOG ASCII_STR("TryODMADialog")
+#define PROPERTYHANDLE_TRYODMADIALOG 6
-#define PROPERTYCOUNT 6
+#define PROPERTYCOUNT 7
#define VCL_TOOLBOX_STYLE_FLAT ((USHORT)0x0004) // from <vcl/toolbox.hxx>
@@ -99,6 +101,8 @@ class SvtMiscOptions_Impl : public ConfigItem
LinkList aList;
sal_Bool m_bUseSystemFileDialog;
sal_Bool m_bIsUseSystemFileDialogRO;
+ sal_Bool m_bTryODMADialog;
+ sal_Bool m_bIsTryODMADialogRO;
sal_Bool m_bPluginsEnabled;
sal_Bool m_bIsPluginsEnabledRO;
sal_Int16 m_nSymbolsSize;
@@ -176,6 +180,15 @@ class SvtMiscOptions_Impl : public ConfigItem
inline sal_Bool IsUseSystemFileDialogReadOnly() const
{ return m_bIsUseSystemFileDialogRO; }
+ inline sal_Bool TryODMADialog() const
+ { return m_bTryODMADialog; }
+
+ inline void SetTryODMADialog( sal_Bool bSet )
+ { m_bTryODMADialog = bSet; SetModified(); }
+
+ inline sal_Bool IsTryUseODMADialogReadOnly() const
+ { return m_bIsTryODMADialogRO; }
+
inline sal_Bool IsPluginsEnabled() const
{ return m_bPluginsEnabled; }
@@ -262,6 +275,8 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
, m_bUseSystemFileDialog( sal_False )
, m_bIsUseSystemFileDialogRO( sal_False )
+ , m_bTryODMADialog( sal_False )
+ , m_bIsTryODMADialogRO( sal_False )
, m_bPluginsEnabled( sal_False )
, m_bIsPluginsEnabledRO( sal_False )
, m_nSymbolsSize( 0 )
@@ -343,6 +358,16 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
break;
}
+ case PROPERTYHANDLE_TRYODMADIALOG :
+ {
+ if( !(seqValues[nProperty] >>= m_bTryODMADialog) )
+ {
+ DBG_ERROR("Wrong type of \"Misc\\TryODMADialog\"!" );
+ }
+ m_bIsTryODMADialogRO = seqRO[nProperty];
+ break;
+ }
+
case PROPERTYHANDLE_SYMBOLSTYLE :
{
::rtl::OUString aSymbolsStyle;
@@ -446,6 +471,13 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
}
}
break;
+ case PROPERTYHANDLE_TRYODMADIALOG : {
+ if( !(seqValues[nProperty] >>= m_bTryODMADialog) )
+ {
+ DBG_ERROR("Wrong type of \"Misc\\TryODMADialog\"!" );
+ }
+ }
+ break;
case PROPERTYHANDLE_SYMBOLSTYLE : {
::rtl::OUString aSymbolsStyle;
if( seqValues[nProperty] >>= aSymbolsStyle )
@@ -592,6 +624,13 @@ void SvtMiscOptions_Impl::Commit()
break;
}
+ case PROPERTYHANDLE_TRYODMADIALOG :
+ {
+ if ( !m_bIsTryODMADialogRO )
+ seqValues[nProperty] <<= m_bTryODMADialog;
+ break;
+ }
+
case PROPERTYHANDLE_SYMBOLSTYLE :
{
if ( !m_bIsSymbolsStyleRO )
@@ -624,7 +663,8 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
PROPERTYNAME_TOOLBOXSTYLE,
PROPERTYNAME_USESYSTEMFILEDIALOG,
PROPERTYNAME_SYMBOLSTYLE,
- PROPERTYNAME_USESYSTEMPRINTDIALOG
+ PROPERTYNAME_USESYSTEMPRINTDIALOG,
+ PROPERTYNAME_TRYODMADIALOG
};
// Initialize return sequence with these list ...
@@ -692,6 +732,21 @@ sal_Bool SvtMiscOptions::IsUseSystemFileDialogReadOnly() const
return m_pDataContainer->IsUseSystemFileDialogReadOnly();
}
+sal_Bool SvtMiscOptions::TryODMADialog() const
+{
+ return m_pDataContainer->TryODMADialog();
+}
+
+void SvtMiscOptions::SetTryODMADialog( sal_Bool bEnable )
+{
+ m_pDataContainer->SetTryODMADialog( bEnable );
+}
+
+sal_Bool SvtMiscOptions::IsTryUseODMADialogReadOnly() const
+{
+ return m_pDataContainer->IsTryUseODMADialogReadOnly();
+}
+
sal_Bool SvtMiscOptions::IsPluginsEnabled() const
{
return m_pDataContainer->IsPluginsEnabled();
More information about the ooo-build-commit
mailing list