summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--formula/source/ui/dlg/funcutl.cxx8
-rw-r--r--framework/source/classes/actiontriggerseparatorpropertyset.cxx2
-rw-r--r--framework/source/helper/titlehelper.cxx8
-rw-r--r--sfx2/source/appl/workwin.cxx2
-rw-r--r--svx/source/dialog/SpellDialog.cxx4
-rw-r--r--svx/source/dialog/hangulhanja.cxx4
-rw-r--r--svx/source/dialog/swpossizetabpage.cxx8
-rw-r--r--svx/source/form/fmctrler.cxx2
-rw-r--r--svx/uiconfig/layout/layout.mk2
9 files changed, 23 insertions, 17 deletions
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index fe1c427ab5..4d12751105 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -724,8 +724,8 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd )
EditBox::EditBox( Window* pParent,WinBits nWinStyle)
:Control(pParent,nWinStyle|WB_DIALOGCONTROL)
{
- pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | nWinStyle & WB_TABSTOP|
- WB_NOBORDER | WB_NOHIDESELECTION |WB_IGNORETAB);
+ pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | (nWinStyle & WB_TABSTOP) |
+ WB_NOBORDER | WB_NOHIDESELECTION | WB_IGNORETAB);
pMEdit->Show();
aOldSel=pMEdit->GetSelection();
@@ -751,7 +751,7 @@ EditBox::EditBox( Window* pParent, const ResId& rResId )
WinBits nStyle=GetStyle();
SetStyle( nStyle| WB_DIALOGCONTROL);
- pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | nStyle & WB_TABSTOP|
+ pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | (nStyle & WB_TABSTOP) |
WB_NOBORDER | WB_NOHIDESELECTION | WB_IGNORETAB);
pMEdit->Show();
aOldSel=pMEdit->GetSelection();
@@ -861,7 +861,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt )
{
const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
USHORT nKey=aKeyCode.GetCode();
- if(nKey==KEY_RETURN && !aKeyCode.IsShift() || nKey==KEY_TAB)
+ if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB )
{
nResult=GetParent()->Notify(rNEvt);
}
diff --git a/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/classes/actiontriggerseparatorpropertyset.cxx
index 3dfd08f3ec..49936d55ee 100644
--- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/classes/actiontriggerseparatorpropertyset.cxx
@@ -324,7 +324,7 @@ throw( IllegalArgumentException )
sal_Bool bReturn = sal_False;
// Get new value from any.
// IllegalArgumentException() can be thrown!
- sal_Int16 aValue ;
+ sal_Int16 aValue = 0;
convertPropertyValue( aValue, aNewValue );
// If value change ...
diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/helper/titlehelper.cxx
index 1f043e3a19..4c83be7f6c 100644
--- a/framework/source/helper/titlehelper.cxx
+++ b/framework/source/helper/titlehelper.cxx
@@ -220,9 +220,13 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent)
aLock.clear ();
// <- SYNCHRONIZED
- if (aEvent.Source != xOwner
- || aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged") && !xOwner.is())
+ if (
+ aEvent.Source != xOwner ||
+ (aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged") && !xOwner.is())
+ )
+ {
return;
+ }
impl_updateTitle ();
}
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d6bfb67c4b..03f39c8a8c 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1595,7 +1595,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
if ( pCW->pCli )
{
// Fenster ist direktes Child
- if ( bAllChildsVisible && ( IsDockingAllowed() && bInternalDockingAllowed || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
+ if ( bAllChildsVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
pCW->pCli->nVisible |= CHILD_NOT_HIDDEN;
}
else if ( pCW->bCreate && IsDockingAllowed() && bInternalDockingAllowed )
diff --git a/svx/source/dialog/SpellDialog.cxx b/svx/source/dialog/SpellDialog.cxx
index b8976071f3..bead9b97bf 100644
--- a/svx/source/dialog/SpellDialog.cxx
+++ b/svx/source/dialog/SpellDialog.cxx
@@ -1488,8 +1488,8 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
}
}
//Here we have to determine if the error found is the one currently active
- bool bIsErrorActive = pErrorAttr && pErrorAttr->GetStart() == m_nErrorStart ||
- pErrorAttrLeft && pErrorAttrLeft->GetStart() == m_nErrorStart;
+ bool bIsErrorActive = (pErrorAttr && pErrorAttr->GetStart() == m_nErrorStart) ||
+ (pErrorAttrLeft && pErrorAttrLeft->GetStart() == m_nErrorStart);
DBG_ASSERT(nSelectionType != INVALID, "selection type not set!");
diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx
index c66d42f033..cb7ef22f73 100644
--- a/svx/source/dialog/hangulhanja.cxx
+++ b/svx/source/dialog/hangulhanja.cxx
@@ -313,8 +313,8 @@ namespace svx
// determine conversion type
if (m_nSourceLang == LANGUAGE_KOREAN && m_nTargetLang == LANGUAGE_KOREAN)
m_eConvType = HHC::eConvHangulHanja;
- else if (m_nSourceLang == LANGUAGE_CHINESE_TRADITIONAL && m_nTargetLang == LANGUAGE_CHINESE_SIMPLIFIED ||
- m_nSourceLang == LANGUAGE_CHINESE_SIMPLIFIED && m_nTargetLang == LANGUAGE_CHINESE_TRADITIONAL)
+ else if ( (m_nSourceLang == LANGUAGE_CHINESE_TRADITIONAL && m_nTargetLang == LANGUAGE_CHINESE_SIMPLIFIED) ||
+ (m_nSourceLang == LANGUAGE_CHINESE_SIMPLIFIED && m_nTargetLang == LANGUAGE_CHINESE_TRADITIONAL) )
m_eConvType = HHC::eConvSimplifiedTraditional;
else
{
diff --git a/svx/source/dialog/swpossizetabpage.cxx b/svx/source/dialog/swpossizetabpage.cxx
index 338ca71988..b3aecc4405 100644
--- a/svx/source/dialog/swpossizetabpage.cxx
+++ b/svx/source/dialog/swpossizetabpage.cxx
@@ -751,9 +751,11 @@ BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
short nRel = GetRelation(m_pHMap, m_aHoriToLB);
const long nHoriByPos =
static_cast<long>(m_aHoriByMF.Denormalize(m_aHoriByMF.GetValue(FUNIT_TWIP)));
- if(nAlign != rHoriOrient.GetValue()||
- nRel != rHoriRelation.GetValue()||
- m_aHoriByMF.IsEnabled() && nHoriByPos != rHoriPosition.GetValue())
+ if (
+ nAlign != rHoriOrient.GetValue() ||
+ nRel != rHoriRelation.GetValue() ||
+ (m_aHoriByMF.IsEnabled() && nHoriByPos != rHoriPosition.GetValue())
+ )
{
rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_ORIENT, nAlign));
rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_RELATION, nRel));
diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/fmctrler.cxx
index 1187a5e598..af7f7bc3b9 100644
--- a/svx/source/form/fmctrler.cxx
+++ b/svx/source/form/fmctrler.cxx
@@ -1912,7 +1912,7 @@ void FmXFormController::setControlLock(const Reference< XControl > & xControl)
// a.) wenn der ganze Datensatz gesperrt ist
// b.) wenn das zugehoerige Feld gespeert ist
Reference< XBoundControl > xBound(xControl, UNO_QUERY);
- if (xBound.is() && ((bLocked && bLocked != xBound->getLock() ||
+ if (xBound.is() && (( (bLocked && bLocked != xBound->getLock()) ||
!bLocked))) // beim entlocken immer einzelne Felder ueberprüfen
{
// gibt es eine Datenquelle
diff --git a/svx/uiconfig/layout/layout.mk b/svx/uiconfig/layout/layout.mk
index f6bea876d8..8daa1c5e8f 100644
--- a/svx/uiconfig/layout/layout.mk
+++ b/svx/uiconfig/layout/layout.mk
@@ -1,7 +1,7 @@
# TODO: move to solenv/inc
# copies: sw/uiconfig/layout svx/uiconfig/layout
-TRALAY=tralay
+TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
XML_DEST=$(DLLDEST)
XML_LANGS=$(alllangiso)
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 20:45:35 +0000