summaryrefslogtreecommitdiff
path: root/sw/source/core/attr/calbck.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/attr/calbck.cxx')
-rw-r--r--sw/source/core/attr/calbck.cxx45
1 files changed, 18 insertions, 27 deletions
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 7b31f0b25adb..23226cb67b56 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
*
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
#include <frame.hxx>
#include <hintids.hxx> // contains RES_.. IDs
@@ -140,7 +131,7 @@ SwModify::~SwModify()
while ( p )
{
p->pRegisteredIn = 0;
- p = aIter++;
+ p = ++aIter;
}
}
else
@@ -219,7 +210,7 @@ bool SwModify::GetInfo( SfxPoolItem& rInfo ) const
if( pLast )
{
while( ( bRet = pLast->GetInfo( rInfo ) ) &&
- 0 != ( pLast = aIter++ ) )
+ 0 != ( pLast = ++aIter ) )
;
}
}
@@ -353,7 +344,7 @@ void SwModify::CallSwClientNotify( const SfxHint& rHint ) const
while( pClient )
{
pClient->SwClientNotify( *this, rHint );
- pClient = aIter++;
+ pClient = ++aIter;
}
}
@@ -443,7 +434,7 @@ SwClientIter::~SwClientIter()
}
}
-SwClient* SwClientIter::operator++(int)
+SwClient* SwClientIter::operator++()
{
if( pDelNext == pAct )
{