summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx4
-rw-r--r--offapi/com/sun/star/security/XDocumentDigitalSignatures.idl7
-rw-r--r--offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl6
-rw-r--r--svtools/source/config/menuoptions.cxx8
-rw-r--r--svtools/source/config/miscopt.cxx4
-rw-r--r--svtools/source/config/slidesorterbaropt.cxx4
-rw-r--r--svtools/source/config/toolpanelopt.cxx4
-rw-r--r--unotools/source/config/cmdoptions.cxx6
-rw-r--r--unotools/source/config/compatibility.cxx4
-rw-r--r--unotools/source/config/dynamicmenuoptions.cxx4
-rw-r--r--unotools/source/config/extendedsecurityoptions.cxx8
-rw-r--r--unotools/source/config/fontoptions.cxx6
-rw-r--r--unotools/source/config/moduleoptions.cxx6
-rw-r--r--unotools/source/config/securityoptions.cxx16
14 files changed, 43 insertions, 44 deletions
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index aa21aac96871..acf4a0a7e2c3 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -171,8 +171,8 @@ class AddonsOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
- PropertyChangeListener if the sub tree broadcasts changes. You must update your
+ @descr This method is called from the ConfigManager before application ends or from the
+ PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@seealso baseclass ConfigItem
diff --git a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
index 5ee5b9e44106..e725624e9e19 100644
--- a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
@@ -119,18 +119,17 @@ interface XDocumentDigitalSignatures : com::sun::star::uno::XInterface
void showCertificate( [in] com::sun::star::security::XCertificate Certificate );
- /** manages trusted sources (Authors and paths )
+ /** manages trusted sources (Authors and paths )
*/
-
void manageTrustedSources();
boolean isAuthorTrusted( [in] com::sun::star::security::XCertificate Author );
boolean isLocationTrusted( [in] string Location );
- // These method should raise confirmation dialog, so it can not used from bad macros...
+ // These methods should raise a confirmation dialog, so they can not be misused from bad macros.
void addAuthorToTrustedSources( [in] com::sun::star::security::XCertificate Author );
void addLocationToTrustedSources( [in] string Location );
- /** This method shows CertificateChooser dialog, used by document and PDF signing
+ /** This method shows the CertificateChooser dialog, used by document and PDF signing
@since LibreOffice 5.3
*/
diff --git a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
index cfc6948d54e4..7227a4e9ad4d 100644
--- a/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module xml { module crypto {
interface XSecurityEnvironment : com::sun::star::uno::XInterface
{
/**
- * Get personal certificate from the environment
+ * Get personal certificates from the environment
*/
sequence< com::sun::star::security::XCertificate > getPersonalCertificates() raises( com::sun::star::uno::SecurityException ) ;
@@ -45,7 +45,7 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface
com::sun::star::security::XCertificate getCertificate( [in] string issuerName, [in] sequence< byte > serialNumber ) raises( com::sun::star::uno::SecurityException ) ;
/**
- * build certificate path from a certain certificate
+ * Build certificate path from a certain certificate
*/
sequence< com::sun::star::security::XCertificate > buildCertificatePath( [in] com::sun::star::security::XCertificate beginCert ) raises( com::sun::star::uno::SecurityException ) ;
@@ -95,7 +95,7 @@ interface XSecurityEnvironment : com::sun::star::uno::XInterface
long getCertificateCharacters( [in] com::sun::star::security::XCertificate xCertificate ) raises( com::sun::star::uno::SecurityException ) ;
/**
- * Get the Environment detail infos
+ * Get the Environment detail information
*/
string getSecurityEnvironmentInformation ( );
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index e4b9fc05e880..d00632515ab1 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -82,8 +82,8 @@ class SvtMenuOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
- PropertyChangeListener if the sub tree broadcasts changes. You must update your
+ @descr This method is called from the ConfigManager before application ends or from the
+ PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@seealso baseclass ConfigItem
@@ -98,7 +98,7 @@ class SvtMenuOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short access method to get internal values
@descr These methods give us a chance to regulate access to our internal values.
- It's not used in the moment - but it's possible for the future!
+ It's not used at the moment - but it's possible for the future!
*//*-*****************************************************************************************************/
bool IsEntryHidingEnabled() const
@@ -132,7 +132,7 @@ class SvtMenuOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short return list of fix key names of our configuration management which represent our module tree
- @descr These methods return a static const list of key names. We need it to get needed values from our
+ @descr This method returns a static const list of key names. We need it to get needed values from our
configuration management.
@return A list of needed configuration keys is returned.
*//*-*****************************************************************************************************/
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 9abf5820f8af..e0cc26f1eb1f 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -105,8 +105,8 @@ public:
/*-****************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
- PropertyChangeListener if the sub tree broadcasts changes. You must update your
+ @descr This method is called from the ConfigManager before the application ends or from the
+ PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@seealso baseclass ConfigItem
diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx
index fa694c0c73af..3e496a0b89cb 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -59,7 +59,7 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem
/** called for notify of configmanager
- These method is called from the ConfigManager before application ends or from the
+ This method is called from the ConfigManager before the application ends or from the
PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@@ -87,7 +87,7 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem
/** return list of key names of our configuration management which represent our module tree
- These methods return a static const list of key names. We need it to get needed values from our
+ This method returns a static const list of key names. We need it to get needed values from
configuration management.
\return A list of needed configuration keys is returned.
diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx
index 82b3ca70b11b..fac60192acb1 100644
--- a/svtools/source/config/toolpanelopt.cxx
+++ b/svtools/source/config/toolpanelopt.cxx
@@ -63,7 +63,7 @@ class SvtToolPanelOptions_Impl : public ConfigItem
/** called for notify of configmanager
- These method is called from the ConfigManager before application ends or from the
+ This method is called from the ConfigManager before the application ends or from the
PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@@ -91,7 +91,7 @@ class SvtToolPanelOptions_Impl : public ConfigItem
/** return list of key names of our configuration management which represent our module tree
- These methods return a static const list of key names. We need it to get needed values from our
+ This methods returns a static const list of key names. We need it to get needed values from our
configuration management.
\return A list of needed configuration keys is returned.
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index d6a37d041a0f..91b62a5dfd01 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -96,7 +96,7 @@ class SvtCommandOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
+ @descr This method is called from the ConfigManager before the application ends or from the
PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@@ -123,9 +123,9 @@ class SvtCommandOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short return list of key names of our configuration management which represent our module tree
- @descr These methods return the current list of key names! We need it to get needed values from our
+ @descr This method returns the current list of key names! We need it to get needed values from our
configuration management and support dynamical menu item lists!
- @param "nDisabledCount" , returns count of menu entries for "new"
+ @param "nDisabledCount", returns count of menu entries for "new"
@return A list of configuration key names is returned.
*//*-*****************************************************************************************************/
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 8dcb39b89599..f5767900c8f2 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -124,8 +124,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
- PropertyChangeListener if the sub tree broadcasts changes. You must update your
+ @descr This method is called from the ConfigManager before the application ends or from the
+ PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@seealso baseclass ConfigItem
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 9b88fdf56ead..fefc9202b979 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -159,7 +159,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
+ @descr This method is called from the ConfigManager before the application ends or from the
PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@@ -184,7 +184,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short return list of key names of our configuration management which represent our module tree
- @descr These methods return the current list of key names! We need it to get needed values from our
+ @descr This method returns the current list of key names! We need it to get needed values from our
configuration management and support dynamical menu item lists!
@param "nNewCount" , returns count of menu entries for "new"
@param "nWizardCount" , returns count of menu entries for "wizard"
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index 3c8911e3e32b..1e3b8236a7b9 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -61,8 +61,8 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
- PropertyChangeListener if the sub tree broadcasts changes. You must update your
+ @descr This method is called from the ConfigManager before the application ends or from the
+ PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@seealso baseclass ConfigItem
@@ -79,7 +79,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short return list of key names of our configuration management which represent our module tree
- @descr These methods return a static const list of key names. We need it to get needed values from our
+ @descr This method returns a static const list of key names. We need it to get needed values from our
configuration management.
@return A list of needed configuration keys is returned.
*//*-*****************************************************************************************************/
@@ -88,7 +88,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short Fills the hash map with all extensions known to be secure
- @descr These methods fills the given hash map object with all extensions known to be secure.
+ @descr This method fills the given hash map object with all extensions known to be secure.
@param aHashMap
A hash map to be filled with secure extension strings.
*//*-*****************************************************************************************************/
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index e373d733ab97..fef4ddedb4f6 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -52,8 +52,8 @@ class SvtFontOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
- PropertyChangeListener if the sub tree broadcasts changes. You must update your
+ @descr This method is called from the ConfigManager before the application ends or from the
+ PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@seealso baseclass ConfigItem
@@ -80,7 +80,7 @@ class SvtFontOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short return list of key names of our configuration management which represent our module tree
- @descr These methods return a static const list of key names. We need it to get needed values from our
+ @descr This method returns a static const list of key names. We need it to get needed values from our
configuration management.
@return A list of needed configuration keys is returned.
*//*-*****************************************************************************************************/
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 026c2528df8a..525523ca7924 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -319,12 +319,12 @@ SvtModuleOptions_Impl::~SvtModuleOptions_Impl()
/*-************************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
+ @descr This method is called from the ConfigManager before application ends or from the
PropertyChangeListener if the sub tree broadcasts changes. You must update our
internal values.
@attention We are registered for pure set node names only. So we can use our internal method "impl_Read()" to
- update our info list. Because - these method expand given name list to full qualified property list
+ update our info list. Because - this method expand given name list to full qualified property list
and use it to read the values. These values are filled into our internal member list m_lFactories
at right position.
@@ -340,7 +340,7 @@ void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< OUString >& )
/*-****************************************************************************************************
@short write changes to configuration
- @descr These method writes the changed values into the sub tree
+ @descr This method writes the changed values into the sub tree
and should always called in our destructor to guarantee consistency of config data.
@attention We clear complete set in configuration first and write it completely new! So we don't must
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index aa204f11eafa..43cbebedee44 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -116,8 +116,8 @@ class SvtSecurityOptions_Impl : public ConfigItem
/*-****************************************************************************************************
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
- PropertyChangeListener if the sub tree broadcasts changes. You must update your
+ @descr This method is called from the ConfigManager before application ends or from the
+ PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@seealso baseclass ConfigItem
@@ -145,18 +145,18 @@ class SvtSecurityOptions_Impl : public ConfigItem
void SetOption ( SvtSecurityOptions::EOption eOption, bool bValue );
bool IsOptionEnabled ( SvtSecurityOptions::EOption eOption ) const;
- /*-****************************************************************************************************
- @short return list of key names of our configuration management which represent our module tree
- @descr These methods return a static const list of key names. We need it to get needed values from our
- configuration management.
- @return A list of needed configuration keys is returned.
- *//*-*****************************************************************************************************/
void SetProperty( sal_Int32 nHandle, const Any& rValue, bool bReadOnly );
void LoadAuthors();
static sal_Int32 GetHandle( const OUString& rPropertyName );
bool GetOption( SvtSecurityOptions::EOption eOption, bool*& rpValue, bool*& rpRO );
+ /*-****************************************************************************************************
+ @short return list of key names of our configuration management which represent our module tree
+ @descr This method returns a static const list of key names. We need it to get needed values from our
+ configuration management.
+ @return A list of needed configuration keys is returned.
+ *//*-*****************************************************************************************************/
static Sequence< OUString > GetPropertyNames();
Sequence< OUString > m_seqSecureURLs;