diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2011-03-09 14:56:21 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2011-03-09 14:56:21 +0100 |
commit | 35fbb45086c389f91c0d6ff410d814f7567c1ceb (patch) | |
tree | 9bfe461d6912cf164f18784b06903d826cf470ee | |
parent | install high-resolution icons (diff) | |
download | core-35fbb45086c389f91c0d6ff410d814f7567c1ceb.tar.gz core-35fbb45086c389f91c0d6ff410d814f7567c1ceb.zip |
Revert idle whitespace changes
Reverting all hunks that solely change whitespace, prior to
performing the m101 merge from OOo.
-rw-r--r-- | basic/source/classes/sb.cxx | 2 | ||||
-rw-r--r-- | basic/source/comp/codegen.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxint.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/mozab/makefile.mk | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/mozab/makefile_mozab.mk | 2 | ||||
-rw-r--r-- | connectivity/workben/iniParser/makefile.mk | 2 | ||||
-rw-r--r-- | connectivity/workben/testmoz/makefile.mk | 6 | ||||
-rw-r--r-- | desktop/source/app/app.cxx | 4 | ||||
-rw-r--r-- | desktop/util/makefile.mk | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editattr.hxx | 34 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 2 | ||||
-rw-r--r-- | framework/source/dispatch/windowcommanddispatch.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/bindings.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/_contdlg.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/filtnav.cxx | 2 |
18 files changed, 37 insertions, 37 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 5e53bfb49e1b..83c9cc15265a 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -80,7 +80,7 @@ SbxObject* StarBASIC::getVBAGlobals( ) if ( GetUNOConstant("ThisComponent", aThisDoc) ) { Reference< XMultiServiceFactory > xDocFac( aThisDoc, UNO_QUERY ); - if ( xDocFac.is() ) + if ( xDocFac.is() ) { try { diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index 19c822553fac..b6791156dbf3 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -244,7 +244,7 @@ void SbiCodeGen::Save() if( nPass == 1 ) aPropName = aPropName.Copy( aIfaceName.Len() + 1 ); SbProcedureProperty* pProcedureProperty = NULL; - OSL_TRACE("*** getProcedureProperty for thing %s", + OSL_TRACE("*** getProcedureProperty for thing %s", rtl::OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() ); pProcedureProperty = rMod.GetProcedureProperty( aPropName, ePropType ); } diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx index ec25f07a21fe..285295c05f45 100644 --- a/basic/source/sbx/sbxint.cxx +++ b/basic/source/sbx/sbxint.cxx @@ -157,7 +157,7 @@ start: else nRes = (INT16) ImpRound( dVal ); break; - } + } case SbxLPSTR: case SbxSTRING: case SbxBYREF | SbxSTRING: diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index 0a06f0013412..5ebc146e8e50 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -82,7 +82,7 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs SLOFILES=\ $(SLO)$/MDriver.obj \ $(SLO)$/MServices.obj - + # --- MOZAB BASE Library ----------------------------------- SHL1VERSIONMAP=$(SOLARENV)/src/component.map diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk index b7ce6abc7199..c984f121a23c 100644 --- a/connectivity/source/drivers/mozab/makefile_mozab.mk +++ b/connectivity/source/drivers/mozab/makefile_mozab.mk @@ -56,7 +56,7 @@ MOZINC = . \ -I$(MOZ_INC)$/uconv \ -I$(MOZ_INC)$/xpcom_obsolete \ -I$(MOZ_INC)$/content - + .IF "$(GUI)" == "WNT" CDEFS += \ -DMOZILLA_CLIENT \ diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk index 68fc0f30359a..d9ee3d0deda5 100644 --- a/connectivity/workben/iniParser/makefile.mk +++ b/connectivity/workben/iniParser/makefile.mk @@ -56,6 +56,6 @@ APP1OBJS= $(OBJFILES) APP1STDLIBS = $(APPSTDLIBS) # --- Targets ------------------------------------------------------ - + .INCLUDE : target.mk diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk index f3135738b32c..7d906a2be412 100644 --- a/connectivity/workben/testmoz/makefile.mk +++ b/connectivity/workben/testmoz/makefile.mk @@ -57,14 +57,14 @@ APP1OBJS= $(OBJFILES) APP1STDLIBS = $(APPSTDLIBS) - + APP2TARGET = mozThread APP2OBJS = $(OBJ)$/initUNO.obj \ $(OBJ)$/mozthread.obj - + APP2STDLIBS = $(APPSTDLIBS) # --- Targets ------------------------------------------------------ - + .INCLUDE : target.mk diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 996fc6cf36ef..6651bd6349c4 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -323,9 +323,9 @@ CommandLineArgs* Desktop::GetCommandLineArgs() { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pArgs ) - { + { pArgs = new CommandLineArgs; - } + } } return pArgs; diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 0d36c14612b0..df2fe688b9fa 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -200,7 +200,7 @@ ALLTAR : $(BIN)$/soffice_oo$(EXECPOST) .IF "$(LINK_SO)"=="TRUE" $(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN) $(COPY) $< $@ - + ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST) .ENDIF # "$(LINK_SO)"=="TRUE" diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index bc4692b7ed80..a84a7a7f2f18 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -180,7 +180,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribWeight // ------------------------------------------------------------------------- class EditCharAttribWeight : public EditCharAttrib @@ -190,7 +190,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribItalic // ------------------------------------------------------------------------- class EditCharAttribItalic : public EditCharAttrib @@ -201,7 +201,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribShadow // ------------------------------------------------------------------------- class EditCharAttribShadow : public EditCharAttrib @@ -212,7 +212,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribEscapement // ------------------------------------------------------------------------- class EditCharAttribEscapement : public EditCharAttrib @@ -223,7 +223,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribOutline // ------------------------------------------------------------------------- class EditCharAttribOutline : public EditCharAttrib @@ -234,7 +234,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribStrikeout // ------------------------------------------------------------------------- class EditCharAttribStrikeout : public EditCharAttrib @@ -245,7 +245,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribUnderline // ------------------------------------------------------------------------- class EditCharAttribUnderline : public EditCharAttrib @@ -289,7 +289,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribFontHeight // ------------------------------------------------------------------------- class EditCharAttribFontHeight : public EditCharAttrib @@ -300,7 +300,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribFontWidth // ------------------------------------------------------------------------- class EditCharAttribFontWidth : public EditCharAttrib @@ -311,7 +311,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribColor // ------------------------------------------------------------------------- class EditCharAttribColor : public EditCharAttrib @@ -322,7 +322,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribLanguage // ------------------------------------------------------------------------- class EditCharAttribLanguage : public EditCharAttrib @@ -333,7 +333,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribTab // ------------------------------------------------------------------------- class EditCharAttribTab : public EditCharAttrib @@ -344,7 +344,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribLineBreak // ------------------------------------------------------------------------- class EditCharAttribLineBreak : public EditCharAttrib @@ -355,7 +355,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribField // ------------------------------------------------------------------------- class EditCharAttribField: public EditCharAttrib @@ -390,7 +390,7 @@ public: } }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribPairKerning // ------------------------------------------------------------------------- class EditCharAttribPairKerning : public EditCharAttrib @@ -401,7 +401,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribKerning // ------------------------------------------------------------------------- class EditCharAttribKerning : public EditCharAttrib @@ -412,7 +412,7 @@ public: virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ); }; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class EditCharAttribWordLineMode // ------------------------------------------------------------------------- class EditCharAttribWordLineMode: public EditCharAttrib diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index caf52d2c7cc8..291af06787a5 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -113,7 +113,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); static SfxItemPool* pGlobalPool=0; -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- // EditEngine // ---------------------------------------------------------------------- EditEngine::EditEngine( SfxItemPool* pItemPool ) diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index a65d339b73bb..ca64a2cc278d 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -73,7 +73,7 @@ inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiff rPoint = pOutDev->PixelToLogic( rPoint ); } -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- // class ImpEditView // ---------------------------------------------------------------------- ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) : diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 11ae1a119beb..e3b0de909f4d 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -214,7 +214,7 @@ public: EditView* GetView() { return pView; } }; -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- // class ImpEditView // ---------------------------------------------------------------------- class ImpEditView : public vcl::unohelper::DragAndDropClient diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 459496fd300e..32361382b0a4 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -154,7 +154,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) return 0L; const int nCommand = pData->GetDialogId(); - ::rtl::OUString sCommand; + ::rtl::OUString sCommand; switch (nCommand) { diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index ccc5c4ee2813..ec9f357abc47 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1706,7 +1706,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) // iterate through the bound functions sal_Bool bJobDone = sal_False; while ( !bJobDone ) - { + { SfxStateCache* pCache = (*pImp->pCaches)[pImp->nMsgPos]; DBG_ASSERT( pCache, "invalid SfxStateCache-position in job queue" ); sal_Bool bWasDirty = pCache->IsControllerDirty(); diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 0ae8a30d15a4..d530757e23bb 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -191,7 +191,7 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId, SfxVirtualMenu* pOwnParent, Menu& rMenu, BOOL bWithHelp, SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ): pItems(0), - pImageControl(0), + pImageControl(0), pBindings(&rBindings), pResMgr(0), pAutoDeactivate(0), diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 0d5778101824..7397d644f115 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -940,7 +940,7 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt ) IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG ) { - SvtMiscOptions aMiscOptions; + SvtMiscOptions aMiscOptions; aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); return 0L; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9768ba66cecf..d3ca72ed3eb6 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1216,7 +1216,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl if (pEntry) { if (!IsExpanded(pEntry)) - Expand(pEntry); + Expand(pEntry); Select(pEntry, sal_True); } } |