diff options
47 files changed, 221 insertions, 108 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index ec86eb39ea2e..d7dd09749419 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1015,10 +1015,12 @@ void StarBASIC::ActivateObject( const String* pName, BOOL bActivate ) { SbxObject* p = (SbxObject*) SbxObject::Find( *pName, SbxCLASS_OBJECT ); if( p ) + { if( bActivate ) p->SetFlag( SBX_EXTSEARCH ); else p->ResetFlag( SBX_EXTSEARCH ); + } } else { diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx index 8dfefd03ecdc..c18501c98e40 100644 --- a/basic/source/comp/exprgen.cxx +++ b/basic/source/comp/exprgen.cxx @@ -133,7 +133,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode ) SbiProcDef* pProc = aVar.pDef->GetProcDef(); if ( pGen->GetParser()->bClassModule ) eOp = _FIND_CM; - else if ( aVar.pDef->IsStatic() || pProc && pProc->IsStatic() ) + else if ( aVar.pDef->IsStatic() || (pProc && pProc->IsStatic()) ) { eOp = _FIND_STATIC; } diff --git a/configmgr/source/localbe/localdataimportsvc.cxx b/configmgr/source/localbe/localdataimportsvc.cxx index fb228ecdde67..2c207b11fc1a 100644 --- a/configmgr/source/localbe/localdataimportsvc.cxx +++ b/configmgr/source/localbe/localdataimportsvc.cxx @@ -217,7 +217,7 @@ namespace } if (aImporterService.getLength() == 0) { - if (use_truncate && truncate || use_overwrite && !overwrite) + if ( (use_truncate && truncate) || (use_overwrite && !overwrite) ) aImporterService = OUSTRING("com.sun.star.configuration.backend.CopyImporter"); else aImporterService = OUSTRING("com.sun.star.configuration.backend.MergeImporter"); diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 72ff002af54a..ca47adac2e49 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.cxx @@ -157,11 +157,13 @@ namespace dbtools for ( i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i ) { if ( m_aFilterComponents[ i ].getLength() ) + { if ( nOnlyNonEmpty != -1 ) // it's the second non-empty component break; else nOnlyNonEmpty = i; + } } if ( nOnlyNonEmpty == -1 ) { diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 0438e6243990..8d33935168b6 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -93,7 +93,7 @@ uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< || aMedDescr[nInd].Name.equalsAscii( "ViewId" ) || aMedDescr[nInd].Name.equalsAscii( "MacroExecutionMode" ) || aMedDescr[nInd].Name.equalsAscii( "UpdateDocMode" ) - || aMedDescr[nInd].Name.equalsAscii( "DocumentBaseURL" ) && bCanUseDocumentBaseURL ) + || (aMedDescr[nInd].Name.equalsAscii( "DocumentBaseURL" ) && bCanUseDocumentBaseURL) ) { aResult.realloc( ++nResLen ); aResult[nResLen-1] = aMedDescr[nInd]; diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 980840c54b42..f1dadb28bac4 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -154,6 +154,7 @@ Interceptor::dispatch( { osl::MutexGuard aGuard(m_aMutex); if( m_pDocHolder ) + { if(URL.Complete == m_aInterceptedURL[0]) m_pDocHolder->GetEmbedObject()->SaveObject_Impl(); else if(URL.Complete == m_aInterceptedURL[2] || @@ -194,6 +195,7 @@ Interceptor::dispatch( if ( xDispatch.is() ) xDispatch->dispatch( URL, aNewArgs ); } + } } void SAL_CALL diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index f620fb4ee886..c81466faa25c 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -323,11 +323,15 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io if ( xInStream->readBytes( aReadSeq, 1 ) != 1 ) return sal_False; - if ( aReadSeq[0] >= '0' && aReadSeq[0] <= '9' - || aReadSeq[0] >= 'a' && aReadSeq[0] <= 'z' - || aReadSeq[0] >= 'A' && aReadSeq[0] <= 'Z' - || aReadSeq[0] == '.' ) + if ( + (aReadSeq[0] >= '0' && aReadSeq[0] <= '9') || + (aReadSeq[0] >= 'a' && aReadSeq[0] <= 'z') || + (aReadSeq[0] >= 'A' && aReadSeq[0] <= 'Z') || + aReadSeq[0] == '.' + ) + { aFileSuffix += ::rtl::OUString::valueOf( (sal_Unicode) aReadSeq[0] ); + } } while( aReadSeq[0] ); diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx index 3ed92ff8d718..b6b9d2bb36ab 100644 --- a/fpicker/source/unx/gnome/SalGtkPicker.cxx +++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx @@ -104,12 +104,6 @@ rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL) return sURL; } -gboolean rundialog(RunDialog *pDialog) -{ - pDialog->run(); - return false; -} - gboolean canceldialog(RunDialog *pDialog) { pDialog->cancel(); diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index 2401983e1831..b3efb84b9684 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -433,9 +433,10 @@ BOOL IPRSpellCache::CheckWord( const String& rWord, INT16 nLang, BOOL bAllLang ) { if ( pRun->GetPrev() ) { // Wenn wir noch nicht erster sind, werden wir es jetzt: - if ( ( pRun->GetFound() <= nInputValue ) && - ( ++nInputPos > IPR_CACHE_MAXINPUT ) - || ( pInput == pRun ) && NULL == ( pInput = pRun->GetFollow() ) ) + if ( + ((pRun->GetFound() <= nInputValue) && (++nInputPos > IPR_CACHE_MAXINPUT)) || + ((pInput == pRun) && NULL == (pInput = pRun->GetFollow())) + ) { // Wenn die Input-Stelle am Maximum anlangt, erhoehen ++nInputValue; // wir den InputValue und gehen wieder diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index 799968957c47..75d2db533708 100644 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -81,7 +81,9 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): if dbg: print >> sys.stderr, connectiontype if connectiontype == 'Ssl': + self.server.ehlo() self.server.starttls() + self.server.ehlo() user = xAuthenticator.getUserName() password = xAuthenticator.getPassword() diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 4982d78d9124..a9243c6a8587 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -63,10 +63,11 @@ #include <tools/urlobj.hxx> #include <osl/security.hxx> #include <osl/file.hxx> -#include <unotools/bootstrap.hxx> +#include <rtl/bootstrap.hxx> #include <tools/link.hxx> #ifdef UNX // need symlink #include <unistd.h> +#include <errno.h> #endif #include "sfxresid.hxx" @@ -83,6 +84,12 @@ using namespace ::vos; using namespace ::rtl; using namespace ::sfx2; +#ifdef ENABLE_QUICKSTART_APPLET +# if !defined(WIN32) && !defined(QUARTZ) +extern "C" { static void SAL_CALL thisModule() {} } +# endif +#endif + class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener > { public: @@ -142,7 +149,7 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule, oslGenericFunction pTmpInit = NULL; oslGenericFunction pTmpDeInit = NULL; - if ( pPlugin->load( OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) ) + if ( pPlugin->loadRelative( &thisModule, OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) ) { pTmpInit = pPlugin->getFunctionSymbol( OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_init_sys_tray" ) ) ); @@ -297,10 +304,12 @@ void ShutdownIcon::FromTemplate() Reference < ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY ); Reference < ::com::sun::star::frame::XDispatch > xDisp; if ( xProv.is() ) + { if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL ) xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); else xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_blank"), 0 ); + } if ( xDisp.is() ) { Sequence<PropertyValue> aArgs(1); @@ -826,18 +835,21 @@ void ShutdownIcon::SetAutostart( bool bActivate ) #else // UNX getDotAutostart( true ); - OUString aPath; - ::utl::Bootstrap::locateBaseInstallation(aPath); + OUString aPath( RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/share/xdg/qstart.desktop" ) ); + Bootstrap::expandMacros( aPath ); OUString aDesktopFile; ::osl::File::getSystemPathFromFileURL( aPath, aDesktopFile ); - aDesktopFile += OUString( RTL_CONSTASCII_USTRINGPARAM( "/share/xdg/qstart.desktop" ) ); OString aDesktopFileUnx = OUStringToOString( aDesktopFile, osl_getThreadTextEncoding() ); OString aShortcutUnx = OUStringToOString( aShortcut, osl_getThreadTextEncoding() ); - symlink( aDesktopFileUnx, aShortcutUnx ); + if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST)) + { + unlink(aShortcutUnx); + symlink(aDesktopFileUnx, aShortcutUnx); + } ShutdownIcon *pIcon = ShutdownIcon::createInstance(); if( pIcon ) diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 344b7d93da75..228eecfb6ce5 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -2084,7 +2084,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) // modifying the SfxObjectInterface-stack without SfxBindings => nothing to do SfxViewFrame* pFrame = pDispatcher->GetFrame(); - if ( pFrame && pFrame->GetObjectShell()->IsInModalMode() || pSfxApp->IsDowning() || !pImp->pCaches->Count() ) + if ( (pFrame && pFrame->GetObjectShell()->IsInModalMode()) || pSfxApp->IsDowning() || !pImp->pCaches->Count() ) { DBG_PROFSTOP(SfxBindingsNextJob_Impl0); return sal_True; diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 3f8186acfa93..1c893d7f32f2 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -884,7 +884,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ) for (sal_uInt16 n=0; n<pImp->aChildWins.Count();) { SfxChildWindow *pWin = pWorkWin->GetChildWindow_Impl( (sal_uInt16) ( pImp->aChildWins[n] & 0xFFFF ) ); - if (!pWin || pWin && pWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT) + if (!pWin || (pWin && pWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT)) pImp->aChildWins.Remove(n); else n++; @@ -1824,7 +1824,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, // bQuiet : own shells aren't considered for UI and SlotServer // bNoUI: own Shells aren't considered fors UI - if ( pImp->bQuiet || pImp->bNoUI || pImp->pFrame && pImp->pFrame->GetObjectShell()->IsPreview() ) + if ( pImp->bQuiet || pImp->bNoUI || (pImp->pFrame && pImp->pFrame->GetObjectShell()->IsPreview()) ) return nHelpId; sal_uInt32 nStatBarId=0; diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index cb69b79f7022..64aa1a7d9d26 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -671,9 +671,13 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException ) { ::vos::OGuard aGuard( Application::GetSolarMutex() ); - if ( pDispatch && - ( aURL.Protocol.equalsAsciiL( ".uno:", 5 ) && aURL.Path == aDispatchURL.Path || - aURL.Protocol.equalsAsciiL( "slot:", 5 ) && aURL.Path.toInt32() == GetId() ) ) + if ( + pDispatch && + ( + (aURL.Protocol.equalsAsciiL( ".uno:", 5 ) && aURL.Path == aDispatchURL.Path) || + (aURL.Protocol.equalsAsciiL( "slot:", 5 ) && aURL.Path.toInt32() == GetId()) + ) + ) { /* if ( !IsBound() && pBindings ) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 0e14820396f3..ce62ccc99232 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -157,7 +157,7 @@ BOOL SfxDockingWindow::PrepareToggleFloatingMode() if (!pImp->bConstructed) return TRUE; - if ( Application::IsInModalMode() && IsFloatingMode() || !pMgr ) + if ( (Application::IsInModalMode() && IsFloatingMode()) || !pMgr ) return FALSE; if ( pImp->bDockingPrevented ) @@ -719,9 +719,13 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo) if ( GetAlignment() != SFX_ALIGN_NOALIGNMENT ) { // check if SfxWorkWindow is able to allow docking at its border - if ( !pWorkWin->IsDockingAllowed() || !pWorkWin->IsInternalDockingAllowed() || ( GetFloatStyle() & WB_STANDALONE ) - && Application::IsInModalMode() ) + if ( + !pWorkWin->IsDockingAllowed() || + !pWorkWin->IsInternalDockingAllowed() || + ( (GetFloatStyle() & WB_STANDALONE) && Application::IsInModalMode()) ) + { SetAlignment( SFX_ALIGN_NOALIGNMENT ); + } } // detect floating mode diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index f3d474679341..f30fef23dbd0 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -637,7 +637,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize USHORT nL=0, nP=0; GetWindowPos( pD->pWin, nL, nP ); - if ( nL == nLine && nP == nPos || nL > nLine ) + if ( (nL == nLine && nP == nPos) || nL > nLine ) { DBG_ASSERT( nL == nLine || bNewLine || nPos > 0, "Falsche Parameter!" ); if ( nL == nLine && nPos == 0 && !bNewLine ) diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 737e78bf86e5..01d0de93cd9c 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1396,10 +1396,12 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem) SfxControllerItem *pCItem=pBoundItems[n]; BOOL bChecked = pItem && pItem->GetValue(); if( pCItem->IsBound() == bChecked ) + { if( !bChecked ) pCItem->ReBind(); else pCItem->UnBind(); + } } pBindings->LeaveRegistrations(); } @@ -1573,9 +1575,13 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint { SfxViewFrame *pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); SfxObjectShell *pDocShell = pViewFrame->GetObjectShell(); - if( bUpdate && ( - !IsCheckedItem(SID_STYLE_WATERCAN) || pDocShell - && pDocShell->GetStyleSheetPool() != pStyleSheetPool) ) + if ( + bUpdate && + ( + !IsCheckedItem(SID_STYLE_WATERCAN) || + (pDocShell && pDocShell->GetStyleSheetPool() != pStyleSheetPool) + ) + ) { bUpdate = FALSE; Update_Impl(); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 3764ed7258af..c59f48582524 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -515,7 +515,7 @@ Reference < XContent > SfxMedium::GetContent() const { SvtSaveOptions aOpt; sal_Bool bIsRemote = IsRemote(); - if( bIsRemote && !aOpt.IsSaveRelINet() || !bRemote && !aOpt.IsSaveRelFSys() ) + if( (bIsRemote && !aOpt.IsSaveRelINet()) || (!bRemote && !aOpt.IsSaveRelFSys()) ) return ::rtl::OUString(); } @@ -1134,7 +1134,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading ) // or the document has been opened for editing explicitly SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, FALSE ); - if ( !bLoading || pReadOnlyItem && !pReadOnlyItem->GetValue() ) + if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) ) SetError( ERRCODE_IO_ACCESSDENIED ); else GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); @@ -1826,8 +1826,8 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& aInsertArg.Data = xInStream; SFX_ITEMSET_ARG( &aTargetSet, pRename, SfxBoolItem, SID_RENAME, sal_False ); SFX_ITEMSET_ARG( &aTargetSet, pOverWrite, SfxBoolItem, SID_OVERWRITE, sal_False ); - if ( pOverWrite && !pOverWrite->GetValue() // argument says: never overwrite - || pRename && pRename->GetValue() ) // argument says: rename file + if ( (pOverWrite && !pOverWrite->GetValue()) // argument says: never overwrite + || (pRename && pRename->GetValue()) ) // argument says: rename file aInsertArg.ReplaceExisting = sal_False; else aInsertArg.ReplaceExisting = sal_True; // default is overwrite existing files diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 6f717e6874ec..9ea841d363a8 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -2139,7 +2139,7 @@ String SfxObjectShell::UpdateTitle( SfxMedium* pMed, USHORT nDocViewNumber ) aTitle += String( SfxResId(STR_REPAIREDDOCUMENT) ); } - if ( IsReadOnlyUI() || pMed && pMed->IsReadOnly() ) + if ( IsReadOnlyUI() || (pMed && pMed->IsReadOnly()) ) aTitle += String( SfxResId(STR_READONLY) ); else if ( IsDocShared() ) aTitle += String( SfxResId(STR_SHARED) ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 9f487a70064b..40b944aae1e2 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1215,8 +1215,10 @@ sal_Bool SfxObjectShell::SaveTo_Impl // preserve only if the same filter has been used bTryToPreservScriptSignature = pMedium->GetFilter() && pFilter && pMedium->GetFilter()->GetFilterName() == pFilter->GetFilterName(); - bNoPreserveForOasis = ( aODFVersion.equals( ODFVER_012_TEXT ) && nVersion == SvtSaveOptions::ODFVER_011 - || !aODFVersion.getLength() && nVersion == SvtSaveOptions::ODFVER_012 ); + bNoPreserveForOasis = ( + (aODFVersion.equals( ODFVER_012_TEXT ) && nVersion == SvtSaveOptions::ODFVER_011) || + (!aODFVersion.getLength() && nVersion == SvtSaveOptions::ODFVER_012) + ); } } @@ -1226,7 +1228,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl { SFX_ITEMSET_ARG( pMedSet, pSaveToItem, SfxBoolItem, SID_SAVETO, sal_False ); bCopyTo = GetCreateMode() == SFX_CREATE_MODE_EMBEDDED || - pSaveToItem && pSaveToItem->GetValue(); + (pSaveToItem && pSaveToItem->GetValue()); } // use UCB for case sensitive/insensitive file name comparison @@ -2622,7 +2624,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl const SfxFilter* pFilter = GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ); if ( !pFilter || !pFilter->CanExport() - || !bSaveTo && !pFilter->CanImport() ) + || (!bSaveTo && !pFilter->CanImport()) ) { SetError( ERRCODE_IO_INVALIDPARAMETER ); return sal_False; @@ -2786,7 +2788,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl // check if a "SaveTo" is wanted, no "SaveAs" SFX_ITEMSET_ARG( pParams, pSaveToItem, SfxBoolItem, SID_SAVETO, sal_False ); - sal_Bool bCopyTo = GetCreateMode() == SFX_CREATE_MODE_EMBEDDED || pSaveToItem && pSaveToItem->GetValue(); + sal_Bool bCopyTo = GetCreateMode() == SFX_CREATE_MODE_EMBEDDED || (pSaveToItem && pSaveToItem->GetValue()); // distinguish between "Save" and "SaveAs" pImp->bIsSaving = sal_False; diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx index 58ccc554f482..628c4a5dc55b 100644 --- a/sfx2/source/doc/objuno.cxx +++ b/sfx2/source/doc/objuno.cxx @@ -136,7 +136,7 @@ inline USHORT DaysInMonth( USHORT nMonth, USHORT nYear ) return aDaysInMonth[nMonth-1]; else { - if ( ((nYear % 4) == 0) && ((nYear % 100) != 0) || + if ( (((nYear % 4) == 0) && ((nYear % 100) != 0)) || ((nYear % 400) == 0) ) return aDaysInMonth[nMonth-1] + 1; else diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index f6402af7b5c0..a0c67b47d057 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -540,7 +540,7 @@ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell* if ( aLibrary.compareToAscii("document") != 0 ) { - if ( !aLibrary.getLength() || pDoc && ( String(aLibrary) == pDoc->GetTitle( SFX_TITLE_APINAME ) || String(aLibrary) == pDoc->GetTitle() ) ) + if ( !aLibrary.getLength() || (pDoc && ( String(aLibrary) == pDoc->GetTitle( SFX_TITLE_APINAME ) || String(aLibrary) == pDoc->GetTitle() )) ) aLibrary = String::CreateFromAscii("document"); else aLibrary = String::CreateFromAscii("application"); diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index b48a77a5238a..340df5ecd475 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -868,8 +868,16 @@ sal_Bool SfxInPlaceClient::IsObjectUIActive() const sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const { try { - return ( m_pImp->m_xObject.is() && ( m_pImp->m_xObject->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE ) || - m_pImp->m_xObject.is() && ( m_pImp->m_xObject->getCurrentState() == embed::EmbedStates::UI_ACTIVE ) ); + return( + ( + m_pImp->m_xObject.is() && + (m_pImp->m_xObject->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE) + ) || + ( + m_pImp->m_xObject.is() && + (m_pImp->m_xObject->getCurrentState() == embed::EmbedStates::UI_ACTIVE) + ) + ); } catch( uno::Exception& ) {} diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index 5715ad60af5b..71d991759566 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -312,9 +312,11 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx ) aFilePath, ( STREAM_READ | STREAM_SHARE_DENYWRITE ), FALSE, 0 ); const SfxFilter* pFilter = NULL; pMed->UseInteractionHandler(TRUE); - if( pSfxApp->GetFilterMatcher().GuessFilter( *pMed, &pFilter, SFX_FILTER_TEMPLATE, 0 ) || - pFilter && !pFilter->IsOwnFormat() || - pFilter && !pFilter->UsesStorage() ) + if ( + pSfxApp->GetFilterMatcher().GuessFilter(*pMed, &pFilter, SFX_FILTER_TEMPLATE, 0) || + (pFilter && !pFilter->IsOwnFormat()) || + (pFilter && !pFilter->UsesStorage()) + ) { pSfxApp->LoadTemplate( pEntry->aDocShell, aFilePath ); pEntry->bOwnFormat = FALSE; diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index ac63cd920adb..12e7cead9e94 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2619,8 +2619,13 @@ void SfxViewFrame::ExecView_Impl while ( pFrame ) { SfxViewFrame *pView = pFrame->GetCurrentViewFrame(); - if ( nActFrame == nFrame || pView && - aName.CompareIgnoreCaseToAscii( pView->SfxShell::GetName() ) == COMPARE_EQUAL ) + if ( + nActFrame == nFrame || + ( + pView && + aName.CompareIgnoreCaseToAscii( pView->SfxShell::GetName() ) == COMPARE_EQUAL + ) + ) { pRet = pView; break; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index d9e407415cc0..cff2a78709e7 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1759,7 +1759,7 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan // object in client is currently not active // check if the object wants to be activated always or when it becomes at least partially visible // TODO/LATER: maybe we should use the scaled area instead of the ObjArea?! - if ( bAlwaysActive || bActiveWhenVisible && rVisArea.IsOver( pIPClient->GetObjArea() ) ) + if ( bAlwaysActive || (bActiveWhenVisible && rVisArea.IsOver(pIPClient->GetObjArea())) ) { try { diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx index b4c2f625384e..41e55f7dbdec 100644 --- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx +++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx @@ -78,9 +78,9 @@ namespace sdr virtual void zoomHasChanged(); // data read access - const double getDiscreteWidth() const { return mfDiscreteWidth; } - const double getHatchRotation() const { return mfHatchRotation; } - const double getRotation() const { return mfRotation; } + double getDiscreteWidth() const { return mfDiscreteWidth; } + double getHatchRotation() const { return mfHatchRotation; } + double getRotation() const { return mfRotation; } }; } // end of namespace overlay } // end of namespace sdr diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 9e16392de891..3b9c341c5113 100755 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -415,10 +415,12 @@ uno::Reference<XAccessibleStateSet> SAL_CALL { // Merge current FOCUSED state from edit engine. if (mpText != NULL) + { if (mpText->HaveFocus()) pStateSet->AddState (AccessibleStateType::FOCUSED); else pStateSet->RemoveState (AccessibleStateType::FOCUSED); + } // Create a copy of the state set that may be modified by the // caller without affecting the current state set. diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 7fcb23c6d496..7f2c0f52b45c 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -550,7 +550,13 @@ public: */ inline bool operator == (const ChildDescriptor& aDescriptor) { - return (this == &aDescriptor || (mxShape.get() == aDescriptor.mxShape.get() ) && ( mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get())); + return ( + this == &aDescriptor || + ( + (mxShape.get() == aDescriptor.mxShape.get() ) && + (mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get()) + ) + ); } /** The ordering defined by this operator is only used in order to be able diff --git a/svx/source/dialog/border.cxx b/svx/source/dialog/border.cxx index 8dfd0a85adc2..b2ed7bc9ef02 100644 --- a/svx/source/dialog/border.cxx +++ b/svx/source/dialog/border.cxx @@ -739,16 +739,18 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { SvxBoxInfoItem* pOldBoxInfoItem = (SvxBoxInfoItem*)GetOldItem( rCoreAttrs, SID_ATTR_BORDER_INNER ); - if(!pOldBoxItem || - aLeftMF .GetText() != aLeftMF .GetSavedValue() || - aRightMF .GetText() != aRightMF .GetSavedValue() || - aTopMF .GetText() != aTopMF .GetSavedValue() || - aBottomMF.GetText() != aBottomMF.GetSavedValue() || - nMinValue == aLeftMF .GetValue() || - nMinValue == aRightMF .GetValue() || - nMinValue == aTopMF .GetValue() || - nMinValue == aBottomMF.GetValue() || - pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) + if ( + !pOldBoxItem || + aLeftMF .GetText() != aLeftMF .GetSavedValue() || + aRightMF .GetText() != aRightMF .GetSavedValue() || + aTopMF .GetText() != aTopMF .GetSavedValue() || + aBottomMF.GetText() != aBottomMF.GetSavedValue() || + nMinValue == aLeftMF .GetValue() || + nMinValue == aRightMF .GetValue() || + nMinValue == aTopMF .GetValue() || + nMinValue == aBottomMF.GetValue() || + (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) + ) { aBoxItem.SetDistance( (USHORT)GetCoreValue( aLeftMF, eCoreUnit ), BOX_LINE_LEFT ); aBoxItem.SetDistance( (USHORT)GetCoreValue( aRightMF, eCoreUnit ), BOX_LINE_RIGHT ); diff --git a/svx/source/dialog/page.cxx b/svx/source/dialog/page.cxx index ceef751a5ea6..140a7cb646ab 100644 --- a/svx/source/dialog/page.cxx +++ b/svx/source/dialog/page.cxx @@ -1137,8 +1137,10 @@ IMPL_LINK( SvxPageDescPage, PaperSizeModify_Impl, Edit *, EMPTYARG ) IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) { - if ( !bLandscape && pBtn == &aLandscapeBtn || - bLandscape && pBtn == &aPortraitBtn ) + if ( + (!bLandscape && pBtn == &aLandscapeBtn) || + (bLandscape && pBtn == &aPortraitBtn) + ) { bLandscape = aLandscapeBtn.IsChecked(); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 666665440267..c957290d55c4 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -494,7 +494,7 @@ void SvxRubyDialog::Update() sal_Bool bTmp = *(sal_Bool*)pProps[nProp].Value.getValue(); if(!nRuby) nPosition = bTmp ? 0 : 1; - else if(!nPosition && !bTmp || nPosition == 1 && bTmp ) + else if( (!nPosition && !bTmp) || (nPosition == 1 && bTmp) ) nPosition = -2; } if(bCharStyleEqual && @@ -520,7 +520,7 @@ void SvxRubyDialog::Update() aAdjustLB.SetNoSelection(); if(nPosition > -1) aPositionLB.SelectEntryPos(nPosition ? 1 : 0); - if(!nLen || bCharStyleEqual && !sCharStyleName.getLength()) + if(!nLen || (bCharStyleEqual && !sCharStyleName.getLength())) sCharStyleName = C2U(cRubies); if(sCharStyleName.getLength()) { diff --git a/svx/source/editeng/eehtml.cxx b/svx/source/editeng/eehtml.cxx index c84ce0359c93..dca9773f5120 100644 --- a/svx/source/editeng/eehtml.cxx +++ b/svx/source/editeng/eehtml.cxx @@ -646,7 +646,7 @@ void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel ) aItems.Put( aHeightItem ); // Absatzabstaende, wenn Heading: - if ( !nHLevel || ( nHLevel >= 1 ) && ( nHLevel <= 6 ) ) + if ( !nHLevel || ((nHLevel >= 1) && (nHLevel <= 6)) ) { SvxULSpaceItem aULSpaceItem( EE_PARA_ULSPACE ); aULSpaceItem.SetUpper( (USHORT)OutputDevice::LogicToLogic( 42, MAP_10TH_MM, eUnit ) ); diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 42bc91c53a15..878b94af1189 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -750,10 +750,12 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r // script events Reference< XEventAttacherManager > xManager( _rxContainer, UNO_QUERY ); if ( xManager.is() ) + { if ( _bStartListening ) m_pScriptingEnv->registerEventAttacherManager( xManager ); else m_pScriptingEnv->revokeEventAttacherManager( xManager ); + } // also handle all children of this element sal_uInt32 nCount = _rxContainer->getCount(); @@ -771,10 +773,12 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r Reference< XContainer > xSimpleContainer( _rxContainer, UNO_QUERY ); OSL_ENSURE( xSimpleContainer.is(), "FmXUndoEnvironment::switchListening: how are we expected to be notified of changes in the container?" ); if ( xSimpleContainer.is() ) + { if ( _bStartListening ) xSimpleContainer->addContainerListener( this ); else xSimpleContainer->removeContainerListener( this ); + } } catch( const Exception& ) { @@ -793,18 +797,22 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje { Reference< XPropertySet > xProps( _rxObject, UNO_QUERY ); if ( xProps.is() ) + { if ( _bStartListening ) xProps->addPropertyChangeListener( ::rtl::OUString(), this ); else xProps->removePropertyChangeListener( ::rtl::OUString(), this ); + } } Reference< XModifyBroadcaster > xBroadcaster( _rxObject, UNO_QUERY ); if ( xBroadcaster.is() ) + { if ( _bStartListening ) xBroadcaster->addModifyListener( this ); else xBroadcaster->removeModifyListener( this ); + } } catch( const Exception& ) { diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index df19e2466333..f4218c176d83 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -988,8 +988,8 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n sal_Bool bInsFlag=sal_False; if ( pNumEntry->HasNewCurrency() ) bInsFlag = sal_True; // merge locale formats into currency selection - else if(!bTmpBanking && aNewFormNInfo.Search(rSymbol)!=STRING_NOTFOUND|| - bTmpBanking && aNewFormNInfo.Search(rBankSymbol)!=STRING_NOTFOUND) + else if( (!bTmpBanking && aNewFormNInfo.Search(rSymbol)!=STRING_NOTFOUND) || + (bTmpBanking && aNewFormNInfo.Search(rBankSymbol)!=STRING_NOTFOUND) ) { bInsFlag=sal_True; } diff --git a/svx/source/items/numitem.cxx b/svx/source/items/numitem.cxx index a1b2721200e8..18a9d18fb559 100644 --- a/svx/source/items/numitem.cxx +++ b/svx/source/items/numitem.cxx @@ -446,14 +446,22 @@ BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const sCharStyleName != rFormat.sCharStyleName ) return FALSE; - if(pGraphicBrush && !rFormat.pGraphicBrush || - !pGraphicBrush && rFormat.pGraphicBrush || - pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush ) + if ( + (pGraphicBrush && !rFormat.pGraphicBrush) || + (!pGraphicBrush && rFormat.pGraphicBrush) || + (pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush) + ) + { return FALSE; - if(pBulletFont && !rFormat.pBulletFont || - !pBulletFont && rFormat.pBulletFont || - pBulletFont && *pBulletFont != *rFormat.pBulletFont) + } + if ( + (pBulletFont && !rFormat.pBulletFont) || + (!pBulletFont && rFormat.pBulletFont) || + (pBulletFont && *pBulletFont != *rFormat.pBulletFont) + ) + { return FALSE; + } return TRUE; } /* -----------------28.10.98 09:53------------------- @@ -467,7 +475,7 @@ void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem, delete pGraphicBrush; pGraphicBrush = 0; } - else if(!pGraphicBrush || pGraphicBrush && !(*pBrushItem == *pGraphicBrush)) + else if ( !pGraphicBrush || (pGraphicBrush && !(*pBrushItem == *pGraphicBrush)) ) { delete pGraphicBrush; pGraphicBrush = (SvxBrushItem*)pBrushItem->Clone(); @@ -947,11 +955,15 @@ int SvxNumRule::operator==( const SvxNumRule& rCopy) const return FALSE; for(USHORT i = 0; i < nLevelCount; i++) { - if( aFmtsSet[i] != rCopy.aFmtsSet[i] || - !aFmts[i] && rCopy.aFmts[i] || - aFmts[i] && !rCopy.aFmts[i] || - aFmts[i] && *aFmts[i] != *rCopy.aFmts[i] ) + if ( + (aFmtsSet[i] != rCopy.aFmtsSet[i]) || + (!aFmts[i] && rCopy.aFmts[i]) || + (aFmts[i] && !rCopy.aFmts[i]) || + (aFmts[i] && *aFmts[i] != *rCopy.aFmts[i]) + ) + { return FALSE; + } } return TRUE; } diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx index dd7f46d0f3d7..428b3767eaf4 100644 --- a/svx/source/outliner/outlvw.cxx +++ b/svx/source/outliner/outlvw.cxx @@ -1391,11 +1391,14 @@ void OutlinerView::StartTextConversion( INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc ) { DBG_CHKTHIS(OutlinerView,0); - if (LANGUAGE_KOREAN == nSrcLang && LANGUAGE_KOREAN == nDestLang || - LANGUAGE_CHINESE_SIMPLIFIED == nSrcLang && LANGUAGE_CHINESE_TRADITIONAL == nDestLang || - LANGUAGE_CHINESE_TRADITIONAL == nSrcLang && LANGUAGE_CHINESE_SIMPLIFIED == nDestLang - ) + if ( + (LANGUAGE_KOREAN == nSrcLang && LANGUAGE_KOREAN == nDestLang) || + (LANGUAGE_CHINESE_SIMPLIFIED == nSrcLang && LANGUAGE_CHINESE_TRADITIONAL == nDestLang) || + (LANGUAGE_CHINESE_TRADITIONAL == nSrcLang && LANGUAGE_CHINESE_SIMPLIFIED == nDestLang) + ) + { pEditView->StartTextConversion( nSrcLang, nDestLang, pDestFont, nOptions, bIsInteractive, bMultipleDoc ); + } else { DBG_ERROR( "unexpected language" ); diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt index f1bd7dfa0d6f..084867e07f06 100644 --- a/ucb/source/inc/regexpmap.tpt +++ b/ucb/source/inc/regexpmap.tpt @@ -418,7 +418,9 @@ bool RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue, typename List< Val >::iterator aEnd(rTheList.end()); for (typename List< Val >::iterator aIt(rTheList.begin()); aIt != aEnd; ++aIt) + { if (aIt->m_aRegexp == aRegexp) + { if (bOverwrite) { rTheList.erase(aIt); @@ -426,6 +428,8 @@ bool RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue, } else return false; + } + } rTheList.push_back(Entry< Val >(aRegexp, rValue)); } @@ -472,6 +476,7 @@ template< typename Val > void RegexpMap< Val >::erase(iterator const & rPos) { if (rPos.m_pImpl->getMap() == m_pImpl) + { if (rPos.m_pImpl->getList() == -1) { if (m_pImpl->m_pDefault) @@ -483,6 +488,7 @@ void RegexpMap< Val >::erase(iterator const & rPos) else m_pImpl->m_aList[rPos.m_pImpl->getList()]. erase(rPos.m_pImpl->getIndex()); + } } //============================================================================ diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index f2bafa1f3b4e..d035cf523aff 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -158,6 +158,7 @@ bool Regexp::matches(rtl::OUString const & rString, } if (bMatches) + { if (m_bTranslation) { if (pTranslation) @@ -178,6 +179,7 @@ bool Regexp::matches(rtl::OUString const & rString, if (pTranslated) *pTranslated = false; } + } } return bMatches; @@ -188,7 +190,7 @@ namespace unnamed_ucb_regexp { inline bool isAlpha(sal_Unicode c) { - return c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z'; + return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'); } inline bool isDigit(sal_Unicode c) @@ -447,7 +449,7 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp) if (!matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("[^/?#]"))) throw lang::IllegalArgumentException(); - if (p == pEnd || *p != '*' && *p != '+') + if (p == pEnd || (*p != '*' && *p != '+')) throw lang::IllegalArgumentException(); bool bEmptyDomain = *p++ == '*'; diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx index ba66a6b8fa52..2b281e73319d 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -349,7 +349,7 @@ sal_Bool FTPDirectoryParser::parseDOS ( case STATE_2_SIZE_LWS: if (*p == 'd' || *p == 'D') eState = STATE_2_D; - else if (*p >= 'a' && *p <= 'z' || *p >= 'A' && *p <= 'Z') + else if ((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z')) eState = STATE_2_ATTRIB; else if (*p >= '0' && *p <= '9') { @@ -603,10 +603,12 @@ sal_Bool FTPDirectoryParser::parseVMS ( ++p; if (*p != '.' || p == pFileName || p - pFileName > 39) + { if (aFirstLineName.getLength()) continue; else return sal_False; + } // Parse <filetype ";"> part: const sal_Char *pFileType = ++p; @@ -617,10 +619,12 @@ sal_Bool FTPDirectoryParser::parseVMS ( ++p; if (*p != ';' || p == pFileName || p - pFileName > 39) + { if (aFirstLineName.getLength()) continue; else return sal_False; + } ++p; // Set entry's name and mode (ISDIR flag): @@ -640,10 +644,12 @@ sal_Bool FTPDirectoryParser::parseVMS ( // Skip <version> part: if (*p < '1' || *p > '9') + { if (aFirstLineName.getLength()) continue; else return sal_False; + } ++p; while (*p >= '0' && *p <= '9') ++p; @@ -658,10 +664,12 @@ sal_Bool FTPDirectoryParser::parseVMS ( if (*p) { if (!bLWS) + { if (aFirstLineName.getLength()) continue; else return sal_False; + } } else { @@ -740,10 +748,10 @@ sal_Bool FTPDirectoryParser::parseVMS ( // Parse <month "-"> part and set entry date's month: sal_Char const * pMonth = p; sal_Int32 const monthLen = 3; - for (int i = 0; i < monthLen; ++i) { - if (!(*p >= 'A' && *p <= 'Z' || *p >= 'a' && *p <= 'z')) { + for (int i = 0; i < monthLen; ++i) + { + if (!((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z'))) return sal_False; - } ++p; } if (rtl_str_compareIgnoreAsciiCase_WithLength( diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 77718a82da9b..8d5aa9c1fbd6 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -163,6 +163,8 @@ extern "C" void * SAL_CALL component_getFactory( const sal_Char *pImplName, (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; + g_type_init(); + if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) ) xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr ); diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 2ba94c78a8ac..033a29d9335f 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -274,6 +274,7 @@ void SAL_CALL CommandEnvironment_Impl::handle( setPassword(aRec.UserList[0].Passwords[0].getStr()); } if (aRec.UserList[0].Passwords.getLength() > 1) + { if (rRequest.HasRealm) { if (xSupplyAuthentication->canSetRealm()) @@ -285,6 +286,7 @@ void SAL_CALL CommandEnvironment_Impl::handle( xSupplyAuthentication-> setAccount(aRec.UserList[0].Passwords[1]. getStr()); + } xSupplyAuthentication->select(); return; } @@ -310,6 +312,7 @@ void SAL_CALL CommandEnvironment_Impl::handle( setPassword(aRec.UserList[0].Passwords[0]. getStr()); if (aRec.UserList[0].Passwords.getLength() > 1) + { if (rRequest.HasRealm) { if (xSupplyAuthentication->canSetRealm()) @@ -321,6 +324,7 @@ void SAL_CALL CommandEnvironment_Impl::handle( xSupplyAuthentication-> setAccount(aRec.UserList[0].Passwords[1]. getStr()); + } xSupplyAuthentication->select(); return; } diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index aad5487d3276..62aab955150f 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1937,6 +1937,7 @@ UUIInteractionHelper::handleAuthenticationRequest( aRec.UserList[0].Passwords[0].getStr()); } if (aRec.UserList[0].Passwords.getLength() > 1) + { if (rRequest.HasRealm) { if (xSupplyAuthentication->canSetRealm()) @@ -1948,6 +1949,7 @@ UUIInteractionHelper::handleAuthenticationRequest( xSupplyAuthentication-> setAccount(aRec.UserList[0].Passwords[1]. getStr()); + } xSupplyAuthentication->select(); return; } @@ -1974,6 +1976,7 @@ UUIInteractionHelper::handleAuthenticationRequest( setPassword(aRec.UserList[0].Passwords[0]. getStr()); if (aRec.UserList[0].Passwords.getLength() > 1) + { if (rRequest.HasRealm) { if (xSupplyAuthentication->canSetRealm()) @@ -1985,6 +1988,7 @@ UUIInteractionHelper::handleAuthenticationRequest( xSupplyAuthentication-> setAccount(aRec.UserList[0].Passwords[1]. getStr()); + } xSupplyAuthentication->select(); return; } diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx b/xmloff/inc/xmloff/PageMasterStyleMap.hxx index d9cc4c6e61b2..4a89e828680a 100644 --- a/xmloff/inc/xmloff/PageMasterStyleMap.hxx +++ b/xmloff/inc/xmloff/PageMasterStyleMap.hxx @@ -78,14 +78,14 @@ #define CTF_PM_PADDINGRIGHT (XML_PM_CTF_START + 0x000F) #define CTF_PM_TEXTCOLUMNS (XML_PM_CTF_START + 0x0010) #define CTF_PM_REGISTER_STYLE (XML_PM_CTF_START + 0x0011) -#define CTF_PM_PRINT_ANNOTATIONS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0012) -#define CTF_PM_PRINT_CHARTS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0013) -#define CTF_PM_PRINT_DRAWING (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0014) -#define CTF_PM_PRINT_FORMULAS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0015) -#define CTF_PM_PRINT_GRID (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0016) -#define CTF_PM_PRINT_HEADERS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0017) -#define CTF_PM_PRINT_OBJECTS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0018) -#define CTF_PM_PRINT_ZEROVALUES (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0019) +#define CTF_PM_PRINT_ANNOTATIONS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0012)) +#define CTF_PM_PRINT_CHARTS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0013)) +#define CTF_PM_PRINT_DRAWING (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0014)) +#define CTF_PM_PRINT_FORMULAS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0015)) +#define CTF_PM_PRINT_GRID (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0016)) +#define CTF_PM_PRINT_HEADERS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0017)) +#define CTF_PM_PRINT_OBJECTS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0018)) +#define CTF_PM_PRINT_ZEROVALUES (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0019)) #define CTF_PM_PAGEUSAGE (XML_PM_CTF_START + 0x0031) #define CTF_PM_GRAPHICPOSITION (XML_PM_CTF_START + 0x0032) diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index d9efb5bec28a..ce69e1a9723c 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -716,7 +716,7 @@ void SdXMLNumberFormatImportContext::EndElement() sal_Int16 nIndex2 = nIndex + 1; if( compareStyle( aSdXMLFixedTimeFormats[nTimeFormat], nIndex2 ) ) { - mnKey = nFormat + 2 | ((nTimeFormat + 2) << 4); + mnKey = (nFormat + 2) | ((nTimeFormat + 2) << 4); break; } } diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index d28218615bac..6bb0db20749e 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -1829,8 +1829,8 @@ namespace xmloff m_xMeAsContainer); else if ( token::IsXMLToken(_rLocalName, token::XML_CONNECTION_RESOURCE) ) return new OXMLDataSourceImport(GetImport(), _nPrefix, _rLocalName, _rxAttrList,m_xElement); - else if( token::IsXMLToken(_rLocalName, token::XML_EVENT_LISTENERS) && - (XML_NAMESPACE_OFFICE == _nPrefix) || + else if( (token::IsXMLToken(_rLocalName, token::XML_EVENT_LISTENERS) && + (XML_NAMESPACE_OFFICE == _nPrefix)) || token::IsXMLToken( _rLocalName, token::XML_PROPERTIES) ) return OElementImport::CreateChildContext( _nPrefix, _rLocalName, _rxAttrList ); diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index a8184c55e8bf..0d89369300dd 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -48,6 +48,7 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( { // maybe it's a sub control if (_rLocalName == m_sWrapperElementName) + { if (m_xMeAsContainer.is()) return implCreateControlWrapper(_nPrefix, _rLocalName); else @@ -55,6 +56,7 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( OSL_ENSURE(sal_False, "OContainerImport::CreateChildContext: don't have an element!"); return NULL; } + } return BASE::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); } |