Hi,
lines already striked out in the list.
Christina
>From c81b66bcbbb4179d64815ecdcc744267c8e999af Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <chrrossman...@web.de>
Date: Sun, 30 Jan 2011 22:23:57 +0100
Subject: [PATCH] Easy hacks: removed double line spacing
---
.../source/config/svt_extendedsecurityoptions.cxx | 16 ---------
.../bf_svtools/source/config/svt_moduleoptions.cxx | 21 +-----------
.../source/config/svt_securityoptions.cxx | 34 +++++++-------------
.../bf_svtools/source/config/svt_viewoptions.cxx | 11 ------
.../filter/source/bf_migrate/bf_migratefilter.cxx | 13 +-------
5 files changed, 15 insertions(+), 80 deletions(-)
diff --git a/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx b/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
index d0f40f0..54ff579 100644
--- a/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
@@ -34,27 +34,16 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/extendedsecurityoptions.hxx>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/configitem.hxx>
-
#include <tools/debug.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <com/sun/star/uno/Sequence.hxx>
-
#include <tools/urlobj.hxx>
-
#include <tools/wldcrd.hxx>
-
#include <rtl/ustrbuf.hxx>
-
#include <bf_svtools/pathoptions.hxx>
-
#include <hash_map>
-
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
@@ -75,14 +64,10 @@ namespace binfilter
//_________________________________________________________________________________________________________________
#define ROOTNODE_SECURITY OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Security"))
-
#define SECURE_EXTENSIONS_SET OUString(RTL_CONSTASCII_USTRINGPARAM("SecureExtensions"))
#define EXTENSION_PROPNAME OUString(RTL_CONSTASCII_USTRINGPARAM("/Extension"))
-
#define PROPERTYNAME_HYPERLINKS_OPEN OUString(RTL_CONSTASCII_USTRINGPARAM("Hyperlinks/Open"))
-
#define PROPERTYHANDLE_HYPERLINKS_OPEN 0
-
#define PROPERTYCOUNT 1
//_________________________________________________________________________________________________________________
@@ -201,7 +186,6 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
private:
OUString m_aSecureExtensionsSetName;
OUString m_aExtensionPropName;
-
SvtExtendedSecurityOptions::OpenHyperlinkMode m_eOpenHyperlinkMode;
sal_Bool m_bROOpenHyperlinkMode;
ExtensionHashMap m_aExtensionHashMap;
diff --git a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
index 9fbcf51..1b450c2 100644
--- a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
@@ -28,42 +28,26 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-//_________________________________________________________________________________________________________________
+//_______________________________________________________________________
// includes
-//_________________________________________________________________________________________________________________
+//_______________________________________________________________________
#include <bf_svtools/moduleoptions.hxx>
-
#include <comphelper/sequenceashashmap.hxx>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/configitem.hxx>
-
#include <unotools/processfactory.hxx>
-
#include <osl/diagnose.h>
-
#include <rtl/ustrbuf.hxx>
-
#include <rtl/logfile.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <com/sun/star/uno/Sequence.hxx>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <com/sun/star/container/XNameAccess.hpp>
-
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
#include <com/sun/star/lang/XServiceInfo.hpp>
-
#include <com/sun/star/document/XTypeDetection.hpp>
-
#include <com/sun/star/util/XStringSubstitution.hpp>
-
#include "itemholder1.hxx"
//_________________________________________________________________________________________________________________
@@ -76,7 +60,6 @@ namespace css = ::com::sun::star;
namespace binfilter
{
-
//_________________________________________________________________________________________________________________
// const
//_________________________________________________________________________________________________________________
diff --git a/binfilter/bf_svtools/source/config/svt_securityoptions.cxx b/binfilter/bf_svtools/source/config/svt_securityoptions.cxx
index 478c7b5..7dc325e 100644
--- a/binfilter/bf_svtools/source/config/svt_securityoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_securityoptions.cxx
@@ -33,25 +33,15 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/securityoptions.hxx>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/configitem.hxx>
-
#include <tools/debug.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <com/sun/star/uno/Sequence.hxx>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <tools/urlobj.hxx>
-
#include <tools/wldcrd.hxx>
-
#include <bf_svtools/pathoptions.hxx>
-
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
@@ -76,7 +66,7 @@ namespace binfilter
#define DEFAULT_SECLEVEL 3
#define DEFAULT_TRUSTEDAUTHORS Sequence< SvtSecurityOptions::Certificate >()
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define DEFAULT_STAROFFICEBASIC eALWAYS_EXECUTE
#define CSTR_SECUREURL "SecureURL"
@@ -109,22 +99,22 @@ namespace binfilter
#define PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SERIALNUMBER))
#define PROPERTYNAME_TRUSTEDAUTHOR_RAWDATA OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_RAWDATA))
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define PROPERTYNAME_STAROFFICEBASIC OUString(RTL_CONSTASCII_USTRINGPARAM("OfficeBasic" ))
#define PROPERTYNAME_EXECUTEPLUGINS OUString(RTL_CONSTASCII_USTRINGPARAM("ExecutePlugins" ))
#define PROPERTYNAME_WARNINGENABLED OUString(RTL_CONSTASCII_USTRINGPARAM("Warning" ))
#define PROPERTYNAME_CONFIRMATIONENABLED OUString(RTL_CONSTASCII_USTRINGPARAM("Confirmation" ))
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define PROPERTYHANDLE_SECUREURL 0
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define PROPERTYHANDLE_STAROFFICEBASIC 1
#define PROPERTYHANDLE_EXECUTEPLUGINS 2
#define PROPERTYHANDLE_WARNINGENABLED 3
#define PROPERTYHANDLE_CONFIRMATIONENABLED 4
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define PROPERTYHANDLE_DOCWARN_SAVEORSEND 5
#define PROPERTYHANDLE_DOCWARN_SIGNING 6
@@ -250,7 +240,7 @@ private:
sal_Bool m_bRODisableMacros;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
EBasicSecurityMode m_eBasicMode;
sal_Bool m_bExecutePlugins;
sal_Bool m_bWarning;
@@ -290,7 +280,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
,m_bROTrustedAuthors ( CFG_READONLY_DEFAULT )
,m_bRODisableMacros ( sal_True ) // currently is not intended to be changed
- // xmlsec05 depricated
+ // xmlsec05 deprecated
, m_eBasicMode ( DEFAULT_STAROFFICEBASIC )
, m_bExecutePlugins ( sal_True )
, m_bWarning ( sal_True )
@@ -299,7 +289,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
, m_bROWarning ( CFG_READONLY_DEFAULT )
, m_bROExecutePlugins ( CFG_READONLY_DEFAULT )
, m_bROBasicMode ( CFG_READONLY_DEFAULT )
- // xmlsec05 depricated
+ // xmlsec05 deprecated
{
Sequence< OUString > seqNames = GetPropertyNames ( );
@@ -522,7 +512,7 @@ sal_Int32 SvtSecurityOptions_Impl::GetHandle( const OUString& rName )
else if( rName.compareToAscii( CSTR_MACRO_DISABLE ) == 0 )
nHandle = PROPERTYHANDLE_MACRO_DISABLE;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
else if( rName == PROPERTYNAME_STAROFFICEBASIC )
nHandle = PROPERTYHANDLE_STAROFFICEBASIC;
else if( rName == PROPERTYNAME_EXECUTEPLUGINS )
@@ -531,7 +521,7 @@ sal_Int32 SvtSecurityOptions_Impl::GetHandle( const OUString& rName )
nHandle = PROPERTYHANDLE_WARNINGENABLED;
else if( rName == PROPERTYNAME_CONFIRMATIONENABLED )
nHandle = PROPERTYHANDLE_CONFIRMATIONENABLED;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
else
nHandle = PROPERTYHANDLE_INVALID;
@@ -699,7 +689,7 @@ void SvtSecurityOptions_Impl::Commit()
break;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
case PROPERTYHANDLE_STAROFFICEBASIC:
{
bDone = !m_bROBasicMode;
@@ -728,7 +718,7 @@ void SvtSecurityOptions_Impl::Commit()
lValues[ nRealCount ] <<= m_bConfirmation;
}
break;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
default:
diff --git a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
index 4088950..eb11c10 100644
--- a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
@@ -33,27 +33,16 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/viewoptions.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <hash_map>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <com/sun/star/container/XNameContainer.hpp>
-
#include <com/sun/star/container/XNameAccess.hpp>
-
#include <com/sun/star/beans/XPropertySet.hpp>
-
#include <rtl/ustrbuf.hxx>
-
#include <unotools/configpathes.hxx>
-
#include <comphelper/configurationhelper.hxx>
-
#include <unotools/processfactory.hxx>
-
#include <itemholder1.hxx>
namespace binfilter
diff --git a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
index c201c03..e59f6a4 100644
--- a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
+++ b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
@@ -27,27 +27,16 @@
************************************************************************/
#include <bf_migratefilter.hxx>
-
#include <com/sun/star/util/XCloseable.hpp>
-
#include <com/sun/star/xml/sax/XParser.hpp>
-
#include <com/sun/star/frame/XStorable.hpp>
-
#include <com/sun/star/frame/XLoadable.hpp>
-
#include <com/sun/star/io/XSeekable.hpp>
-
#include <legacysmgr/legacy_binfilters_smgr.hxx>
-
#include <com/sun/star/task/XInteractionHandler.hpp>
-
#include <bf_sfx2/app.hxx>
-
#include <bf_sfx2/fcontnr.hxx>
-
#include <bf_sfx2/docfac.hxx>
-
#include <bf_so3/staticbaseurl.hxx>
namespace binfilter {
@@ -891,7 +880,7 @@ Sequence< OUString > SAL_CALL bf_MigrateFilter::getSupportedServiceNames()
return bf_MigrateFilter_getSupportedServiceNames();
}
-// eof
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
1.7.0.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
