Author: hdu
Date: Thu Nov 28 12:57:57 2013
New Revision: 1546359
URL: http://svn.apache.org/r1546359
Log:
#i123768# minor whitespace fixes needed after comment-removal
Modified:
openoffice/trunk/main/editeng/source/editeng/impedit2.cxx
openoffice/trunk/main/sw/source/core/access/accfrmobjmap.cxx
openoffice/trunk/main/sw/source/core/access/accmap.cxx
openoffice/trunk/main/sw/source/core/access/accpara.cxx
openoffice/trunk/main/sw/source/core/access/accpara.hxx
openoffice/trunk/main/sw/source/ui/uiview/pview.cxx
openoffice/trunk/main/sw/source/ui/utlui/content.cxx
openoffice/trunk/main/vcl/source/control/morebtn.cxx
openoffice/trunk/main/winaccessibility/source/service/AccComponentEventListener.cxx
Modified: openoffice/trunk/main/editeng/source/editeng/impedit2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/editeng/impedit2.cxx?rev=1546359&r1=1546358&r2=1546359&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/editeng/impedit2.cxx (original)
+++ openoffice/trunk/main/editeng/source/editeng/impedit2.cxx Thu Nov 28
12:57:57 2013
@@ -136,7 +136,8 @@ ImpEditEngine::ImpEditEngine( EditEngine
bIsFormatting = sal_False;
bFormatted = sal_False;
bUpdate = sal_True;
- bUpdateForAcc = TRUE; bUseAutoColor = sal_True;
+ bUpdateForAcc = TRUE;
+ bUseAutoColor = sal_True;
bForceAutoColor = sal_False;
bAddExtLeading = sal_False;
bUndoEnabled = sal_True;
Modified: openoffice/trunk/main/sw/source/core/access/accfrmobjmap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accfrmobjmap.cxx?rev=1546359&r1=1546358&r2=1546359&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/accfrmobjmap.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accfrmobjmap.cxx Thu Nov 28
12:57:57 2013
@@ -163,87 +163,3 @@ SwAccessibleChildMap::SwAccessibleChildM
rFrm.GetDrawObjs() );
}
-/* MT: The two insert methods had been introduced in the IA2 CWS (OOO310m11),
but meanwhile we also have some in DEV300m80 (above)
- Not sure if they have something which needs to be update in above
methods.
- Also, since there is no SwFrmOrObjMap CTOR anymore, the updated code in
DEV300 might need some of the changes flagged with
-::std::pair< SwFrmOrObjMap::iterator, bool > SwFrmOrObjMap::insert(
- sal_uInt32 nOrd, Point nPos, const SwFrmOrObj& rLower )
-{
- SwFrmOrObjMapKey aKey( SwFrmOrObjMapKey::TEXT, nOrd, nPos );
- value_type aEntry( aKey, rLower );
- return _SwFrmOrObjMap::insert( aEntry );
-}
-
-::std::pair< SwFrmOrObjMap::iterator, bool > SwFrmOrObjMap::insert(
- const SdrObject *pObj, const SwFrmOrObj& rLower, const SwDoc
*pDoc , Point nPos)
-{
- if( !bLayerIdsValid )
- {
- nHellId = pDoc->GetHellId();
- nControlsId = pDoc->GetControlsId();
- bLayerIdsValid = sal_True;
- }
-
- SdrLayerID nLayer = pObj->GetLayer();
- SwFrmOrObjMapKey::LayerId eLayerId = (nHellId == nLayer)
- ? SwFrmOrObjMapKey::HELL
- : ((nControlsId == nLayer) ?
SwFrmOrObjMapKey::CONTROLS
-
: SwFrmOrObjMapKey::HEAVEN);
- SwFrmOrObjMapKey aKey( eLayerId, pObj->GetOrdNum(), nPos );
- value_type aEntry( aKey, rLower );
- return _SwFrmOrObjMap::insert( aEntry );
-}
-
-SwFrmOrObjMap::SwFrmOrObjMap(
- const SwRect& rVisArea, const SwFrm *pFrm ) :
- bLayerIdsValid( sal_False )
-{
- SwFrmOrObj aFrm( pFrm );
- sal_Bool bVisibleOnly = aFrm.IsVisibleChildrenOnly();
-
- sal_uInt32 nPos = 0;
- SwFrmOrObj aLower( pFrm->GetLower() );
- while( aLower.GetSwFrm() )
- {
- if( !bVisibleOnly || aLower.GetBox().IsOver( rVisArea ) )
- insert( nPos++, aLower.GetBounds().Pos(), aLower );
- aLower = aLower.GetSwFrm()->GetNext();
- }
-
- if( pFrm->IsPageFrm() )
- {
- ASSERT( bVisibleOnly, "page frame within tab frame???" );
- const SwPageFrm *pPgFrm =
- static_cast< const SwPageFrm * >( pFrm );
- const SwSortedObjs *pObjs = pPgFrm->GetSortedObjs();
- if( pObjs )
- {
- const SwDoc *pDoc = pPgFrm->GetFmt()->GetDoc();
- for( sal_uInt16 i=0; i<pObjs->Count(); i++ )
- {
- aLower = (*pObjs)[i]->GetDrawObj();
- if( aLower.GetBox().IsOver( rVisArea ) )
- insert( aLower.GetSdrObject(), aLower,
pDoc , aLower.GetBounds().Pos() );
- }
- }
- }
- else if( pFrm->IsTxtFrm() )
- {
- const SwDoc *pDoc = static_cast< const SwTxtFrm * >( pFrm
)->GetNode()
-
->GetDoc();
- const SwSortedObjs *pObjs = pFrm->GetDrawObjs();
- if( pObjs )
- {
- for( sal_uInt16 i=0; i<pObjs->Count(); i++ )
- {
- aLower = (*pObjs)[i]->GetDrawObj();
- if( aLower.IsBoundAsChar() &&
- (!bVisibleOnly ||
aLower.GetBox().IsOver( rVisArea )) )
- insert( aLower.GetSdrObject(), aLower,
pDoc , Point(aLower.GetAnchorPosition(),0) );
- }
- }
- }
-}
-
-*/
-
Modified: openoffice/trunk/main/sw/source/core/access/accmap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accmap.cxx?rev=1546359&r1=1546358&r2=1546359&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/accmap.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accmap.cxx Thu Nov 28 12:57:57
2013
@@ -1703,7 +1703,8 @@ SwAccessibleMap::SwAccessibleMap( ViewSh
mnFootnote( 1 ),
mnEndnote( 1 ),
mbShapeSelected( sal_False ),
- mpSeletedFrmMap(NULL){
+ mpSeletedFrmMap(NULL)
+{
pSh->GetLayout()->AddAccessibleShell();
}
@@ -1823,7 +1824,8 @@ SwAccessibleMap::~SwAccessibleMap()
mpEvents = 0;
}
mpVSh->GetLayout()->RemoveAccessibleShell();
- delete mpSeletedFrmMap;}
+ delete mpSeletedFrmMap;
+}
uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
sal_Bool bPagePreview )
@@ -2434,7 +2436,8 @@ void SwAccessibleMap::InvalidatePosOrSiz
{
::vos::ORef< SwAccessibleContext > xAccImpl;
::vos::ORef< SwAccessibleContext > xParentAccImpl;
- const SwFrm *pParent =NULL; {
+ const SwFrm *pParent =NULL;
+ {
vos::OGuard aGuard( maMutex );
if( mpFrmMap )
@@ -2456,7 +2459,7 @@ void SwAccessibleMap::InvalidatePosOrSiz
{
// Otherwise we look if the parent is
accessible.
// If not, there is nothing to do.
- pParent =
SwAccessibleFrame::GetParent( aFrmOrObj,
+ pParent = SwAccessibleFrame::GetParent(
aFrmOrObj,
GetShell()->IsPreView());
if( pParent )
Modified: openoffice/trunk/main/sw/source/core/access/accpara.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accpara.cxx?rev=1546359&r1=1546358&r2=1546359&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/accpara.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accpara.cxx Thu Nov 28 12:57:57
2013
@@ -1816,7 +1816,8 @@ uno::Sequence<PropertyValue> SwAccessibl
const ::rtl::OUString& rText = GetString();
- if( ! IsValidChar( nIndex, rText.getLength()+1 ) ) throw
lang::IndexOutOfBoundsException();
+ if( ! IsValidChar( nIndex, rText.getLength()+1 ) )
+ throw lang::IndexOutOfBoundsException();
bool bSupplementalMode = false;
uno::Sequence< ::rtl::OUString > aNames = aRequestedAttributes;
Modified: openoffice/trunk/main/sw/source/core/access/accpara.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accpara.hxx?rev=1546359&r1=1546358&r2=1546359&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/access/accpara.hxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accpara.hxx Thu Nov 28 12:57:57
2013
@@ -45,7 +45,8 @@ class SwTxtNode;
class SwPaM;
class SwAccessiblePortionData;
class SwAccessibleHyperTextData;
-class SwRedline;class SwXTextPortion;
+class SwRedline;
+class SwXTextPortion;
// --> OD 2010-02-19 #i108125#
class SwParaChangeTrackingInfo;
// <--
Modified: openoffice/trunk/main/sw/source/ui/uiview/pview.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/pview.cxx?rev=1546359&r1=1546358&r2=1546359&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/pview.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/pview.cxx Thu Nov 28 12:57:57 2013
@@ -1295,7 +1295,8 @@ void SwPagePreView::Init(const SwViewOpt
SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
SfxViewShell( pViewFrame, SWVIEWFLAGS ),
- pViewWin( new SwPagePreViewWin(&(GetViewFrame())->GetWindow(), *this )
), nNewPage(USHRT_MAX),
+ pViewWin( new SwPagePreViewWin(&(GetViewFrame())->GetWindow(), *this )
),
+ nNewPage(USHRT_MAX),
pHScrollbar(0),
pVScrollbar(0),
pPageUpBtn(0),
Modified: openoffice/trunk/main/sw/source/ui/utlui/content.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/utlui/content.cxx?rev=1546359&r1=1546358&r2=1546359&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/utlui/content.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/utlui/content.cxx Thu Nov 28 12:57:57
2013
@@ -897,7 +897,8 @@ SwContentTree::SwContentTree(Window* pPa
bIsOutlineMoveable(sal_True),
bViewHasChanged(sal_False),
bIsImageListInitialized(sal_False),
- bIsKeySpace(sal_False){
+ bIsKeySpace(sal_False)
+{
sal_uInt16 i;
SetHelpId(HID_NAVIGATOR_TREELIST);
Modified: openoffice/trunk/main/vcl/source/control/morebtn.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/control/morebtn.cxx?rev=1546359&r1=1546358&r2=1546359&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/control/morebtn.cxx (original)
+++ openoffice/trunk/main/vcl/source/control/morebtn.cxx Thu Nov 28 12:57:57
2013
@@ -153,9 +153,6 @@ void MoreButton::Click()
mbState = !mbState;
ShowState();
- // Hier den Click-Handler rufen, damit vorher die Controls initialisiert
- // werden koennen
- //PushButton::Click();
// Je nach Status die Fenster updaten
if ( mbState )
{
Modified:
openoffice/trunk/main/winaccessibility/source/service/AccComponentEventListener.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/winaccessibility/source/service/AccComponentEventListener.cxx?rev=1546359&r1=1546358&r2=1546359&view=diff
==============================================================================
---
openoffice/trunk/main/winaccessibility/source/service/AccComponentEventListener.cxx
(original)
+++
openoffice/trunk/main/winaccessibility/source/service/AccComponentEventListener.cxx
Thu Nov 28 12:57:57 2013
@@ -191,8 +191,9 @@ void AccComponentEventListener::setCompo
pAgent->UpdateState(pAccessible);
pAgent->DecreaseState( pAccessible, AccessibleStateType::DEFUNC);
// 8. label should have no FOCUSABLE state state, Firefox has
READONLY state, we can also have.
- if( getRole() != AccessibleRole::LABEL
- && getRole() != AccessibleRole::SCROLL_BAR)
pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSABLE);
+ if( getRole() != AccessibleRole::LABEL
+ && getRole() != AccessibleRole::SCROLL_BAR)
+ pAgent->IncreaseState( pAccessible,
AccessibleStateType::FOCUSABLE);
}
else
{
