summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/app/docstyle.cxx4
-rw-r--r--sw/source/ui/app/swmodul1.cxx4
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx6
-rw-r--r--sw/source/ui/envelp/envlop1.cxx4
-rw-r--r--sw/source/ui/fldui/flddinf.cxx4
-rw-r--r--sw/source/ui/shells/annotsh.cxx17
-rw-r--r--sw/source/ui/shells/txtattr.cxx14
-rw-r--r--sw/source/ui/uiview/view2.cxx2
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx6
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx2
-rw-r--r--sw/source/ui/vba/vbapalette.cxx4
11 files changed, 29 insertions, 38 deletions
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 4a8458a4d2cb..0ee955e332c3 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -2543,7 +2543,9 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
? !(nId & USER_FMT)
// searched for used and found none
: bIsSearchUsed )
- continue;
+ {
+ continue;
+ }
if( rDoc.get(IDocumentSettingAccess::HTML_MODE) && !(nId & USER_FMT) &&
!( RES_POOLCHR_HTML_BEGIN <= nId &&
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 7815061c89f4..3c1388fba18e 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -293,13 +293,13 @@ void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb)
if(bWeb)
{
if(!pWebUsrPref)
- GetUsrPref(sal_True);
+ GetUsrPref(sal_True);
pPref = pWebUsrPref;
}
else
{
if(!pUsrPref)
- GetUsrPref(sal_False);
+ GetUsrPref(sal_False);
pPref = pUsrPref;
}
sal_Bool bOldApplyCharUnit = pPref->IsApplyCharUnit();
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 83b1cc9b278d..90c369cb0830 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -523,8 +523,7 @@ void SwPostItMgr::PreparePageContainer()
for (int i=0; i<lPageSize - lContainerSize;i++)
mPages.push_back( new SwPostItPageItem());
}
- else
- if (lContainerSize > lPageSize)
+ else if (lContainerSize > lPageSize)
{
for (int i=mPages.size()-1; i >= lPageSize;--i)
{
@@ -1470,8 +1469,7 @@ bool SwPostItMgr::ScrollbarHit(const unsigned long aPage,const Point &aPoint)
Scroll( -1*GetScrollSize(), aPage);
return true;
}
- else
- if (aRectTop.IsInside(aPoint))
+ else if (aRectTop.IsInside(aPoint))
{
if (aPoint.X() < long((aPointTop.X() + GetSidebarWidth()/3*2)))
Scroll(GetScrollSize(), aPage);
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index e1b7cae3d1dd..c4fc2ee52047 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -243,8 +243,8 @@ IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox *, pListBox )
}
else
sActDBName.SetToken(1, DB_DELIM, aTableLB.GetSelectEntry());
- pSh->GetNewDBMgr()->GetColumnNames(&aDBFieldLB, aDatabaseLB.GetSelectEntry(),
- aTableLB.GetSelectEntry());
+ pSh->GetNewDBMgr()->GetColumnNames(&aDBFieldLB, aDatabaseLB.GetSelectEntry(),
+ aTableLB.GetSelectEntry());
return 0;
}
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 6a6f35b1ebcb..34adbd421621 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -215,9 +215,7 @@ IMPL_LINK_NOARG(SwFldDokInfPage, TypeHdl)
pSelEntry = aTypeTLB.GetEntry(0);
aTypeTLB.Select(pSelEntry);
}
- else
-
- if (pOldEntry != pSelEntry)
+ else if (pOldEntry != pSelEntry)
FillSelectionLB((sal_uInt16)(sal_uLong)pSelEntry->GetUserData());
SubTypeHdl();
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 117a0d20b267..3ce6672b08b5 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -636,14 +636,11 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
if (nWhich==SID_ATTR_PARA_ADJUST_LEFT)
eAdjust = SVX_ADJUST_LEFT;
- else
- if (nWhich==SID_ATTR_PARA_ADJUST_RIGHT)
+ else if (nWhich==SID_ATTR_PARA_ADJUST_RIGHT)
eAdjust = SVX_ADJUST_RIGHT;
- else
- if (nWhich==SID_ATTR_PARA_ADJUST_CENTER)
+ else if (nWhich==SID_ATTR_PARA_ADJUST_CENTER)
eAdjust = SVX_ADJUST_CENTER;
- else
- if (nWhich==SID_ATTR_PARA_ADJUST_BLOCK)
+ else if (nWhich==SID_ATTR_PARA_ADJUST_BLOCK)
eAdjust = SVX_ADJUST_BLOCK;
if( !pAdjust )
@@ -669,11 +666,9 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
if (nWhich==SID_ATTR_PARA_LINESPACE_10)
nLSpace = 100;
- else
- if (nWhich==SID_ATTR_PARA_LINESPACE_15)
+ else if (nWhich==SID_ATTR_PARA_LINESPACE_15)
nLSpace = 150;
- else
- if (nWhich==SID_ATTR_PARA_LINESPACE_20)
+ else if (nWhich==SID_ATTR_PARA_LINESPACE_20)
nLSpace = 200;
if( !pLSpace )
@@ -884,7 +879,7 @@ void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet)
SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
if ( aDataHelper.HasFormat( SOT_FORMAT_RTF ) )
aFormats.AddClipbrdFormat( SOT_FORMAT_RTF );
- aFormats.AddClipbrdFormat( SOT_FORMAT_STRING );
+ aFormats.AddClipbrdFormat( SOT_FORMAT_STRING );
rSet.Put( aFormats );
}
else
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 6802fe54f3ed..d40c091d2c78 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -250,13 +250,13 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
aSize.SetHeight( lSize );
aAttrSet.Put( aSize );
}
- if( aAttrSet.Count() )
- {
- if( pColl )
- pColl->SetFmtAttr( aAttrSet );
- else
- rWrtSh.SetAttr( aAttrSet );
- }
+ if( aAttrSet.Count() )
+ {
+ if( pColl )
+ pColl->SetFmtAttr( aAttrSet );
+ else
+ rWrtSh.SetAttr( aAttrSet );
+ }
rReq.Done();
}
break;
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 4f568a847eb0..56ef147872f4 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -2060,7 +2060,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
SfxRequest aRequest(GetViewFrame(), SID_INSERTDOC);
aRequest.AppendItem(SfxStringItem(SID_INSERTDOC, pMedium->GetOrigURL()));
if(pMedium->GetFilter())
- aRequest.AppendItem(SfxStringItem(FN_PARAM_1, pMedium->GetFilter()->GetName()));
+ aRequest.AppendItem(SfxStringItem(FN_PARAM_1, pMedium->GetFilter()->GetName()));
aRequest.Done();
}
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index be2a5d6ea17d..729145ce88d9 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -1794,11 +1794,9 @@ Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( Runt
if (bTextDoc)
pArray[2] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.TextDocument" ) ) );
- else
- if (bWebDoc)
+ else if (bWebDoc)
pArray[2] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.WebDocument" ) ) );
- else
- if (bGlobalDoc)
+ else if (bGlobalDoc)
pArray[2] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.GlobalDocument" ) ) );
return aRet;
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 97b6fd4bbfc8..7ecd02ecfe87 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -702,7 +702,7 @@ protected:
virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName( aName ) )
- throw container::NoSuchElementException();
+ throw container::NoSuchElementException();
DocPropsByName::iterator it = mNamedDocProps.find( aName );
return uno::Any( it->second );
diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx
index c60861b7b2e1..380a2f20523f 100644
--- a/sw/source/ui/vba/vbapalette.cxx
+++ b/sw/source/ui/vba/vbapalette.cxx
@@ -64,8 +64,8 @@ public:
virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
- if ( Index < 0 || Index >= getCount() )
- throw lang::IndexOutOfBoundsException();
+ if ( Index < 0 || Index >= getCount() )
+ throw lang::IndexOutOfBoundsException();
return uno::makeAny( sal_Int32( ColorTable[ Index ] ) );
}
generated by cgit (git 2.34.1) at 2025-04-29 10:35:03 +0000