diff options
-rw-r--r-- | formula/inc/formula/IFunctionDescription.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svx/sdr/overlay/overlaymanager.hxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/cuifmsearch.cxx | 8 | ||||
-rw-r--r-- | svx/source/dialog/textattr.cxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 4 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 6 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmctrler.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmshimp.cxx | 9 | ||||
-rw-r--r-- | svx/source/form/fmtools.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/overlay/overlaymanager.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/NeonPropFindRequest.cxx | 8 |
12 files changed, 42 insertions, 9 deletions
diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx index 0ab5fd441add..3db1e6d49a94 100644 --- a/formula/inc/formula/IFunctionDescription.hxx +++ b/formula/inc/formula/IFunctionDescription.hxx @@ -66,7 +66,7 @@ namespace formula virtual void fillLastRecentlyUsedFunctions(::std::vector< const IFunctionDescription*>& _rLastRUFunctions) const = 0; virtual const IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const = 0; - virtual const sal_Unicode getSingleToken(const EToken _eToken) const = 0; + virtual sal_Unicode getSingleToken(const EToken _eToken) const = 0; }; class SAL_NO_VTABLE IFunctionCategory diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/svx/inc/svx/sdr/overlay/overlaymanager.hxx index d2e4f8a8aba3..53cb15c5d72b 100644 --- a/svx/inc/svx/sdr/overlay/overlaymanager.hxx +++ b/svx/inc/svx/sdr/overlay/overlaymanager.hxx @@ -97,7 +97,7 @@ namespace sdr // return mfDiscreteOne to derivations, but also check for buffered local // ViewTransformation and evtl. correct mfDiscreteOne - const double getDiscreteOne() const; + double getDiscreteOne() const; public: OverlayManager(OutputDevice& rOutputDevice); diff --git a/svx/source/dialog/cuifmsearch.cxx b/svx/source/dialog/cuifmsearch.cxx index 33a022f5aba1..b0c80f8297ef 100644 --- a/svx/source/dialog/cuifmsearch.cxx +++ b/svx/source/dialog/cuifmsearch.cxx @@ -512,11 +512,15 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) // die beiden jeweils anderen Boxes disablen oder enablen CheckBox* pBoxes[] = { &m_cbWildCard, &m_cbRegular, &m_cbApprox }; for (sal_uInt32 i=0; i<sizeof(pBoxes)/sizeof(CheckBox*); ++i) + { if (pBoxes[i] != pBox) + { if (bChecked) pBoxes[i]->Disable(); else pBoxes[i]->Enable(); + } + } // an die Engine weiterreichen m_pSearchEngine->SetWildcard(m_cbWildCard.IsEnabled() ? m_cbWildCard.IsChecked() : sal_False); @@ -526,6 +530,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) // die Position-Listbox anpassen (ist bei Wildcard-Suche nicht erlaubt) if (pBox == &m_cbWildCard) + { if (bChecked) { m_ftPosition.Disable(); @@ -536,13 +541,16 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) m_ftPosition.Enable(); m_lbPosition.Enable(); } + } // und den Button fuer die Aehnlichkeitssuche if (pBox == &m_cbApprox) + { if (bChecked) m_pbApproxSettings.Enable(); else m_pbApproxSettings.Disable(); + } } else if (pBox == &m_aHalfFullFormsCJK) { diff --git a/svx/source/dialog/textattr.cxx b/svx/source/dialog/textattr.cxx index f8d54239d176..a7eb3069026a 100644 --- a/svx/source/dialog/textattr.cxx +++ b/svx/source/dialog/textattr.cxx @@ -500,10 +500,12 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) if(!bIsDisabled) { if( aTsbFullWidth.GetState() == STATE_CHECK ) + { if (IsTextDirectionLeftToRight()) eTHA = SDRTEXTHORZADJUST_BLOCK; else eTVA = SDRTEXTVERTADJUST_BLOCK; + } if ( rOutAttrs.GetItemState( SDRATTR_TEXT_VERTADJUST ) != SFX_ITEM_DONTCARE ) { diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 28b6c509dc12..cbb5cd5b48f2 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1109,6 +1109,7 @@ void FmGridControl::SetDesignMode(sal_Bool bMode) sal_Bool bOldMode = IsDesignMode(); DbGridControl::SetDesignMode(bMode); if (bOldMode != bMode) + { if (!bMode) { // selection aufheben @@ -1136,6 +1137,7 @@ void FmGridControl::SetDesignMode(sal_Bool bMode) } } } + } } //------------------------------------------------------------------------------ @@ -2043,6 +2045,7 @@ void FmGridControl::Select() Reference< XIndexAccess > xColumns(GetPeer()->getColumns(), UNO_QUERY); Reference< XSelectionSupplier > xSelSupplier(xColumns, UNO_QUERY); if (xSelSupplier.is()) + { if (nSelectedColumn != SAL_MAX_UINT16) { Reference< XPropertySet > xColumn; @@ -2053,6 +2056,7 @@ void FmGridControl::Select() { xSelSupplier->select(Any()); } + } } catch(Exception&) { diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 157f8deaf2b0..80983514ede5 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1940,10 +1940,12 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V { FmXGridCell* pXCell = pLoop->GetCell(); if (pXCell) + { if (bVoid) pXCell->SetTextLineColor(); else pXCell->SetTextLineColor(aTextLineColor); + } pLoop = rColumns.Next(); } @@ -2911,11 +2913,15 @@ IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot) Sequence<sal_uInt16>& aSupported = getSupportedGridSlots(); const sal_uInt16* pSlots = aSupported.getConstArray(); for (sal_uInt16 i=0; i<aSupported.getLength(); ++i) + { if (pSlots[i] == nSlot) + { if (!m_pDispatchers[i].is()) return -1; // nothing known about this slot else return m_pStateCache[i]; + } + } return -1; } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index b3b18632884c..96534551b354 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1323,6 +1323,7 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt) // the 'insert' option affects our empty row if (bInsertChanged) + { if (m_nOptions & OPT_INSERT) { // the insert option is to be set m_xEmptyRow = new DbGridRow(); @@ -1335,6 +1336,7 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt) GoToRowColumnId(GetCurRow() - 1, GetCurColumnId()); RowRemoved(GetRowCount(), 1, sal_True); } + } // the 'delete' options has no immediate consequences @@ -1729,10 +1731,12 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) for (nNewModelPos = 0; nNewModelPos < m_aColumns.Count(); ++nNewModelPos) { if (!m_aColumns.GetObject(nNewModelPos)->IsHidden()) + { if (!nNewViewPos) break; else --nNewViewPos; + } } DBG_ASSERT(nNewModelPos<m_aColumns.Count(), "DbGridControl::ColumnMoved : could not find the new model position !"); diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/fmctrler.cxx index eea5570389b0..8fbac309c736 100644 --- a/svx/source/form/fmctrler.cxx +++ b/svx/source/form/fmctrler.cxx @@ -163,7 +163,7 @@ class ColumnInfoCache public: ColumnInfoCache( const Reference< XColumnsSupplier >& _rxColSupplier ); - const size_t getColumnCount() const { return m_aColumns.size(); } + size_t getColumnCount() const { return m_aColumns.size(); } const ColumnInfo& getColumnInfo( size_t _pos ); bool controlsInitialized() const { return m_bControlsInitialized; } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 86188970beda..1ad30e5fd78f 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -431,6 +431,7 @@ sal_Bool isControlList(const SdrMarkList& rMarkList) // And this would be wrong :) // 03.02.00 - 72529 - FS if (!pAs3DObject) + { if (pObj->IsGroupObject()) { SdrObjListIter aIter(*pObj->GetSubList()); @@ -445,6 +446,7 @@ sal_Bool isControlList(const SdrMarkList& rMarkList) bHadAnyLeafs = sal_True; bControlList = FmFormInventor == pObj->GetObjInventor(); } + } } return bControlList && bHadAnyLeafs; @@ -2431,11 +2433,12 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn Reference< XPropertySet> xCursorSet(pfmscContextInfo->xCursor, UNO_QUERY); Reference< XResultSetUpdate> xUpdateCursor(pfmscContextInfo->xCursor, UNO_QUERY); if (xUpdateCursor.is() && xCursorSet.is() && xCursorSet.is()) + { if (::comphelper::getBOOL(xCursorSet->getPropertyValue(FM_PROP_ISNEW))) xUpdateCursor->moveToCurrentRow(); - else - if (::comphelper::getBOOL(xCursorSet->getPropertyValue(FM_PROP_ISMODIFIED))) - xUpdateCursor->cancelRowUpdates(); + else if (::comphelper::getBOOL(xCursorSet->getPropertyValue(FM_PROP_ISMODIFIED))) + xUpdateCursor->cancelRowUpdates(); + } return pfmscContextInfo->arrFields.size(); } diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index d3b83f7c7676..159efb1331a1 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -860,12 +860,14 @@ sal_Int16 GridView2ModelPos(const Reference< ::com::sun::star::container::XInd { rColumns->getByIndex(i) >>= xCur; if (!::comphelper::getBOOL(xCur->getPropertyValue(FM_PROP_HIDDEN))) + { // for every visible col : if nViewPos is greater zero, decrement it, else we // have found the model position if (!nViewPos) break; else --nViewPos; + } } if (i<rColumns->getCount()) return i; diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 4549e98995a1..8c682adfc166 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -121,7 +121,7 @@ namespace sdr } } - const double OverlayManager::getDiscreteOne() const + double OverlayManager::getDiscreteOne() const { if(getOutputDevice().GetViewTransformation() != maViewTransformation) { diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx index 87e96240e694..6171d3fa0bfc 100644 --- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx +++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx @@ -103,8 +103,12 @@ extern "C" int NPFR_propfind_iter( void* userdata, if ( aValue.getLength() ) { aValue = aValue.toAsciiLowerCase(); - if ( aValue.compareTo( - RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 ) + if ( + ( aValue.compareTo( + RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 ) || + ( aValue.compareTo( + RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 ) + ) { thePropertyValue.Value <<= OUString::createFromAscii( "collection" ); |