diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-01-31 00:39:18 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-01-31 09:48:39 +0100 |
commit | 28fe6c99552c3dfb533b1ddf63e524fc6f8b4ebd (patch) | |
tree | ab161ab3a1a54bd562a9156cb3c7526c89f3ba39 | |
parent | 6c59ac1eebc19429a201dec2df8a1e28c3ff98ce (diff) |
Remove double line spacing.
-rw-r--r-- | configmgr/qa/unit/test.cxx | 8 | ||||
-rw-r--r-- | configmgr/source/access.hxx | 8 | ||||
-rw-r--r-- | configmgr/source/childaccess.hxx | 6 | ||||
-rw-r--r-- | configmgr/source/node.hxx | 6 | ||||
-rw-r--r-- | configmgr/source/nodemap.hxx | 2 | ||||
-rw-r--r-- | configmgr/source/xmlreader.hxx | 7 | ||||
-rw-r--r-- | connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx | 7 | ||||
-rw-r--r-- | connectivity/source/inc/ado/Awrapado.hxx | 21 | ||||
-rw-r--r-- | embeddedobj/source/msole/olecomponent.hxx | 14 | ||||
-rw-r--r-- | framework/inc/dispatch/oxt_handler.hxx | 18 | ||||
-rw-r--r-- | framework/source/accelerators/acceleratorconfiguration.cxx | 11 | ||||
-rw-r--r-- | framework/source/helper/titlebarupdate.cxx | 24 | ||||
-rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 38 | ||||
-rw-r--r-- | shell/inc/internal/dbgmacros.hxx | 8 |
14 files changed, 0 insertions, 178 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index e3eb5a28bc68..fe8d29e9ef88 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -88,23 +88,15 @@ void normalize( class Test: public CppUnit::TestFixture { public: virtual void setUp(); - virtual void tearDown(); void testKeyFetch(); - void testKeySet(); - void testKeyReset(); - void testSetSetMemberName(); - void testReadCommands(); - void testThreads(); - void testRecursive(); - void testCrossThreads(); css::uno::Any getKey( diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index 8a05329683be..bf314f2f6aca 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -130,15 +130,12 @@ public: bool isValue(); void markChildAsModified(rtl::Reference< ChildAccess > const & child); - void releaseChild(rtl::OUString const & name); virtual Path getAbsolutePath() = 0; - virtual Path getRelativePath() = 0; virtual rtl::OUString getRelativePathRepresentation() = 0; - virtual rtl::Reference< Node > getNode() = 0; virtual bool isFinalized() = 0; @@ -155,9 +152,7 @@ protected: virtual ~Access(); virtual rtl::OUString getNameInternal() = 0; - virtual rtl::Reference< RootAccess > getRootAccess() = 0; - virtual rtl::Reference< Access > getParentAccess() = 0; virtual void addTypes(std::vector< com::sun::star::uno::Type > * types) @@ -167,7 +162,6 @@ protected: std::vector< rtl::OUString > * services) = 0; virtual void initDisposeBroadcaster(Broadcaster * broadcaster); - virtual void clearListeners() throw (); virtual com::sun::star::uno::Any SAL_CALL queryInterface( @@ -179,9 +173,7 @@ protected: void checkLocalizedPropertyAccess(); rtl::Reference< Node > getParentNode(); - rtl::Reference< ChildAccess > getChild(rtl::OUString const & name); - std::vector< rtl::Reference< ChildAccess > > getAllChildren(); void checkValue( diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx index 977d97e307dc..77fd5190aae8 100644 --- a/configmgr/source/childaccess.hxx +++ b/configmgr/source/childaccess.hxx @@ -77,11 +77,9 @@ public: rtl::Reference< Node > const & node); virtual Path getAbsolutePath(); - virtual Path getRelativePath(); virtual rtl::OUString getRelativePathRepresentation(); - virtual rtl::Reference< Node > getNode(); virtual bool isFinalized(); @@ -89,11 +87,9 @@ public: virtual rtl::OUString getNameInternal(); virtual rtl::Reference< RootAccess > getRootAccess(); - virtual rtl::Reference< Access > getParentAccess(); virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > @@ -119,9 +115,7 @@ public: void unbind() throw (); bool isInTransaction() const { return inTransaction_; } - void committed(); - void setNode(rtl::Reference< Node > const & node); void setProperty( diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx index 4f4aece82b8e..27eea9c4642e 100644 --- a/configmgr/source/node.hxx +++ b/configmgr/source/node.hxx @@ -50,30 +50,24 @@ public: virtual rtl::Reference< Node > clone(bool keepTemplateName) const = 0; virtual NodeMap & getMembers(); - virtual rtl::OUString getTemplateName() const; virtual void setMandatory(int layer); - virtual int getMandatory() const; void setLayer(int layer); - int getLayer() const; void setFinalized(int layer); - int getFinalized() const; rtl::Reference< Node > getMember(rtl::OUString const & name); protected: explicit Node(int layer); - Node(const Node & other); virtual ~Node(); - virtual void clear(); virtual rtl::Reference< Node > findMember(rtl::OUString const & name); diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx index c2454e8df282..5e9e501e9fc7 100644 --- a/configmgr/source/nodemap.hxx +++ b/configmgr/source/nodemap.hxx @@ -30,9 +30,7 @@ #define INCLUDED_CONFIGMGR_SOURCE_NODEMAP_HXX #include "sal/config.h" - #include <map> - #include "rtl/ref.hxx" namespace rtl { class OUString; } diff --git a/configmgr/source/xmlreader.hxx b/configmgr/source/xmlreader.hxx index 9bb07592b679..c5436fea81f7 100644 --- a/configmgr/source/xmlreader.hxx +++ b/configmgr/source/xmlreader.hxx @@ -80,17 +80,13 @@ public: private: inline char read() { return pos_ == end_ ? '\0' : *pos_++; } - inline char peek() { return pos_ == end_ ? '\0' : *pos_; } void normalizeLineEnds(Span const & text); void skipSpace(); - bool skipComment(); - void skipProcessingInstruction(); - void skipDocumentTypeDeclaration(); Span scanCdataSection(); @@ -105,15 +101,12 @@ private: char const * begin, char const * end, bool fullyNormalize); Result handleStartTag(Namespace * ns, Span * localName); - Result handleEndTag(); void handleElementEnd(); Result handleSkippedText(Span * data, Namespace * ns); - Result handleRawText(Span * text); - Result handleNormalizedText(Span * text); struct NamespaceData { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index 3daedc286d04..7fd63616841b 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx @@ -96,16 +96,13 @@ namespace connectivity #endif public: - NS_DECL_ISUPPORTS NS_DECL_NSIABDIRECTORYQUERYRESULTLISTENER MQueryHelper(); - virtual ~MQueryHelper(); void reset(); - void rewind(); MQueryHelperResultEntry* next( ); @@ -115,19 +112,15 @@ namespace connectivity const ErrorDescriptor& getError() const { return m_aError; } sal_Bool isError() const; - sal_Bool hasMore() const; - sal_Bool atEnd() const; sal_Bool queryComplete() const; sal_Bool waitForQueryComplete( ); - sal_Bool waitForRow( sal_Int32 rowNum ); sal_Int32 getResultCount() const; - sal_uInt32 getRealCount() const; sal_Int32 createNewCard(); //return Row count number sal_Bool resyncRow(sal_Int32 rowIndex); diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx index ad684d307ba4..b34fec336685 100644 --- a/connectivity/source/inc/ado/Awrapado.hxx +++ b/connectivity/source/inc/ado/Awrapado.hxx @@ -36,8 +36,6 @@ #include <ocidl.h> #include <adoint.h> #include "ado_post_sys_include.h" - - #include "ado/adoimp.hxx" #include "ado/Aolewrap.hxx" #include "ado/Aolevariant.hxx" @@ -75,53 +73,36 @@ namespace connectivity WpADOProperties get_Properties() const; rtl::OUString GetConnectionString() const; - sal_Bool PutConnectionString(const ::rtl::OUString &aCon) const; - sal_Int32 GetCommandTimeout() const; - void PutCommandTimeout(sal_Int32 nRet); - sal_Int32 GetConnectionTimeout() const ; - void PutConnectionTimeout(sal_Int32 nRet); sal_Bool Close( ) ; - sal_Bool Execute(const ::rtl::OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset); - sal_Bool BeginTrans(); - sal_Bool CommitTrans( ) ; - sal_Bool RollbackTrans( ); - sal_Bool Open(const ::rtl::OUString& ConnectionString, const ::rtl::OUString& UserID,const ::rtl::OUString& Password,long Options); - sal_Bool GetErrors(ADOErrors** pErrors); ::rtl::OUString GetDefaultDatabase() const; - sal_Bool PutDefaultDatabase(const ::rtl::OUString& _bstr); IsolationLevelEnum get_IsolationLevel() const ; - sal_Bool put_IsolationLevel(const IsolationLevelEnum& eNum) ; sal_Int32 get_Attributes() const; - sal_Bool put_Attributes(sal_Int32 nRet); CursorLocationEnum get_CursorLocation() const; - sal_Bool put_CursorLocation(const CursorLocationEnum &eNum) ; ConnectModeEnum get_Mode() const; - sal_Bool put_Mode(const ConnectModeEnum &eNum) ; ::rtl::OUString get_Provider() const; - sal_Bool put_Provider(const ::rtl::OUString& _bstr); sal_Int32 get_State() const; @@ -223,9 +204,7 @@ namespace connectivity ////////////////////////////////////////////////////////////////////// ::rtl::OUString GetDescription() const; - ::rtl::OUString GetSource() const ; - sal_Int32 GetNumber() const ; ::rtl::OUString GetSQLState() const ; sal_Int32 GetNativeError() const ; diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx index 9324f1cd2fe4..814127542e81 100644 --- a/embeddedobj/source/msole/olecomponent.hxx +++ b/embeddedobj/source/msole/olecomponent.hxx @@ -90,13 +90,10 @@ class OleComponent : public ::cppu::WeakImplHelper5< ::com::sun::star::util::XCl // such objects report the dirty state wrongly sometimes and do not allow to store them any time sal_Bool m_bWorkaroundActive; - sal_Bool InitializeObject_Impl(); void CreateNewIStorage_Impl(); - void RetrieveObjectDataFlavors_Impl(); - void Dispose(); @@ -118,32 +115,22 @@ public: // ==== Initialization ================================================== void LoadEmbeddedObject( const ::rtl::OUString& aTempURL ); - void CreateObjectFromClipboard(); - void CreateNewEmbeddedObject( const ::com::sun::star::uno::Sequence< sal_Int8 >& aSeqCLSID ); - void CreateObjectFromData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransfer ); - void CreateObjectFromFile( const ::rtl::OUString& aFileName ); - void CreateLinkFromFile( const ::rtl::OUString& aFileName ); - void InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent ); // ====================================================================== - void RunObject(); // switch OLE object to running state - void CloseObject(); // switch OLE object to loaded state ::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > GetVerbList(); void ExecuteVerb( sal_Int32 nVerbID ); - void SetHostName( const ::rtl::OUString& aContName, const ::rtl::OUString& aEmbDocName ); - void SetExtent( const ::com::sun::star::awt::Size& aVisAreaSize, sal_Int64 nAspect ); ::com::sun::star::awt::Size GetExtent( sal_Int64 nAspect ); @@ -155,7 +142,6 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > GetCLSID(); sal_Bool IsWorkaroundActive() { return m_bWorkaroundActive; } - sal_Bool IsDirty(); void StoreOwnTmpIfNecessary(); diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 446ed493c7e7..671af774107c 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -32,49 +32,31 @@ //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ - #include <threadhelp/threadhelpbase.hxx> - #include <threadhelp/resetableguard.hxx> - #include <macros/xinterface.hxx> - #include <macros/xtypeprovider.hxx> - #include <macros/xserviceinfo.hxx> - #include <macros/debug.hxx> - #include <macros/generic.hxx> - #include <general.h> - #include <stdtypes.h> //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ - #include <com/sun/star/lang/XTypeProvider.hpp> - #include <com/sun/star/lang/XMultiServiceFactory.hpp> - #include <com/sun/star/frame/XNotifyingDispatch.hpp> - #include <com/sun/star/frame/XStatusListener.hpp> - #include <com/sun/star/frame/XFrame.hpp> - #include <com/sun/star/document/XExtendedFilterDetection.hpp> - #include <com/sun/star/beans/PropertyValue.hpp> - #include <com/sun/star/util/URL.hpp> //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ - #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index cd99a2ddf2eb..d79c1383d20a 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -58,27 +58,16 @@ //_______________________________________________ // other includes #include <vcl/svapp.hxx> - #include <com/sun/star/container/XNamed.hpp> - #include <com/sun/star/container/XNameContainer.hpp> - #include <com/sun/star/awt/KeyEvent.hpp> - #include <com/sun/star/awt/KeyModifier.hpp> - #include <com/sun/star/lang/XSingleServiceFactory.hpp> - #include <com/sun/star/util/XChangesNotifier.hpp> - #include <comphelper/configurationhelper.hxx> - #include <unotools/configpathes.hxx> - #include <rtl/logfile.hxx> - #include <svtools/acceleratorexecute.hxx> - #include <stdio.h> //_______________________________________________ diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index a7e61256f988..149577336826 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -28,65 +28,41 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" - #include <helper/titlebarupdate.hxx> //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ - #include <pattern/window.hxx> - #include <threadhelp/writeguard.hxx> - #include <threadhelp/readguard.hxx> - #include <macros/generic.hxx> - #include <services.h> - #include <properties.h> //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ - #include <com/sun/star/awt/XWindow.hpp> - #include <com/sun/star/lang/XServiceInfo.hpp> - #include <com/sun/star/lang/IllegalArgumentException.hpp> - #include <com/sun/star/frame/XModuleManager.hpp> - #include <com/sun/star/container/XNameAccess.hpp> - #include <com/sun/star/beans/XPropertySet.hpp> - #include <com/sun/star/beans/XMaterialHolder.hpp> - #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> - #include <com/sun/star/beans/NamedValue.hpp> //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ - #include <comphelper/sequenceashashmap.hxx> - #include <unotools/configmgr.hxx> - #include <unotools/bootstrap.hxx> - #include <vcl/window.hxx> - #include <vcl/syswin.hxx> - #include <toolkit/unohlp.hxx> - #include <vcl/svapp.hxx> - #include <vcl/wrkwin.hxx> //_________________________________________________________________________________________________________________ diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 8d52b9295e1c..caab2c5ff952 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -30,7 +30,6 @@ #include "precompiled_sfx2.hxx" // include --------------------------------------------------------------- - #include <vcl/msgbox.hxx> #include <vcl/field.hxx> #include <svl/eitem.hxx> @@ -85,9 +84,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem nFlags ( pStyle->GetMask() ) /* [Beschreibung] - Konstruktor; initialisiert die ListBoxen mit den Vorlagen - */ { @@ -269,9 +266,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem SfxManageStyleSheetPage::~SfxManageStyleSheetPage() /* [Beschreibung] - Destruktor; Freigabe der Daten - */ { @@ -289,16 +284,13 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, const String& rNew ) /* [Beschreibung] - Nach der "Anderung eines Vorlagennamens die ListBox pBox aktualisieren [Parameter] - ListBox* pBox ListBox, deren Eintr"age aktualisiert werden sollen const String& rNew der neue Name - */ { @@ -319,7 +311,6 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, void SfxManageStyleSheetPage::SetDescriptionText_Impl() /* [Beschreibung] - Attributbeschreibung setzen. daf"ur die eingestellte Metrik besorgen. */ @@ -338,14 +329,11 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() switch ( eFieldUnit ) { case FUNIT_MM: eUnit = SFX_MAPUNIT_MM; break; - case FUNIT_CM: case FUNIT_M: case FUNIT_KM: eUnit = SFX_MAPUNIT_CM; break; - case FUNIT_POINT: case FUNIT_PICA: eUnit = SFX_MAPUNIT_POINT; break; - case FUNIT_INCH: case FUNIT_FOOT: case FUNIT_MILE: eUnit = SFX_MAPUNIT_INCH; break; @@ -361,9 +349,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit ) /* [Beschreibung] - StarView Handler; GetFocus-Handler des Edits mit dem Vorlagennamen. - */ { @@ -400,27 +386,20 @@ IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) /* [Beschreibung] - - Handler f"ur das Setzen der (modifizierten) Daten. Wird aus dem Ok des SfxTabDialog gerufen. [Parameter] - SfxItemSet &rAttrSet das Set, das die Daten entgegennimmt. - [R"uckgabewert] - BOOL TRUE: es hat eine "Anderung der Daten stattgefunden FALSE: es hat keine "Anderung der Daten stattgefunden [Querverweise] - <class SfxTabDialog> - */ { @@ -456,19 +435,13 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ ) /* [Beschreibung] - - Handler f"ur das Initialisieren der Seite mit den initialen Daten. [Parameter] - const SfxItemSet &rAttrSet das Set mit den Daten - [Querverweise] - <class SfxTabDialog> - */ { @@ -528,12 +501,9 @@ SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent, const SfxItemSet &rAttrSet ) /* [Beschreibung] - - Factory f"ur das Erzeugen der Seite [Querverweise] - <class SfxTabDialog> */ @@ -547,20 +517,16 @@ SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent, void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) /* [Beschreibung] - ActivatePage- Handler des SfxTabDialog; wird f"ur die Aktualisierung des beschreibenden Textes verwendet, da sich dieser durch "Anderungen der Daten anderer Seiten ge"andert haben kann. [Parameter] - const SfxItemSet& das Set f"ur den Datenaustausch; wird hier nicht verwendet. [Querverweise] - <SfxTabDialog::ActivatePage(const SfxItemSet &)> - */ { @@ -580,20 +546,16 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) /* [Beschreibung] - DeactivatePage- Handler des SfxTabDialog; die Daten werden an der Vorlage eingestellt, damit die richtige Vererbung f"ur die anderen Seiten des Dialoges vorliegt. Im Fehlerfall wird das Verlassen der Seite unterbunden. [Parameter] - SfxItemSet* das Set f"ur den Datenaustausch; wird hier nicht verwendet. [Querverweise] - <SfxTabDialog::DeactivatePage(SfxItemSet*)> - */ { diff --git a/shell/inc/internal/dbgmacros.hxx b/shell/inc/internal/dbgmacros.hxx index 464bf1952628..0fe72b4aceb2 100644 --- a/shell/inc/internal/dbgmacros.hxx +++ b/shell/inc/internal/dbgmacros.hxx @@ -32,21 +32,13 @@ void DbgAssert(bool condition, const char* message); #if OSL_DEBUG_LEVEL > 0 - #define PRE_CONDITION(x, msg) DbgAssert(x, msg) - #define POST_CONDITION(x, msg) DbgAssert(x, msg) - #define ENSURE(x ,msg) DbgAssert(x, msg) - #else // OSL_DEBUG_LEVEL == 0 - #define PRE_CONDITION(x, msg) ((void)0) - #define POST_CONDITION(x, msg) ((void)0) - #define ENSURE(x, msg) ((void)0) - #endif #endif |