diff options
Diffstat (limited to 'sfx2/source/dialog/splitwin.cxx')
-rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 64 |
1 files changed, 24 insertions, 40 deletions
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 1e3b37e56e1e..85f5fc03de9b 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -1,31 +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 . + */ #ifdef SOLARIS #include <ctime> @@ -58,11 +48,11 @@ using namespace ::rtl; struct SfxDock_Impl { - sal_uInt16 nType; - SfxDockingWindow* pWin; // SplitWindow has this window - sal_Bool bNewLine; - sal_Bool bHide; // SplitWindow had this window - long nSize; + sal_uInt16 nType; + SfxDockingWindow* pWin; // SplitWindow has this window + sal_Bool bNewLine; + sal_Bool bHide; // SplitWindow had this window + long nSize; }; class SfxDockArr_Impl : public std::vector<SfxDock_Impl*> @@ -434,9 +424,8 @@ void SfxSplitWindow::Split() void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize) -/* [Description] - - To insert SfxDockingWindows can no position be passed. The SfxSplitWindow +/* + To insert SfxDockingWindows just pass no position. The SfxSplitWindow searches the last marked one to the passed SfxDockingWindow or appends a new one at the end. */ @@ -487,13 +476,13 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize if ( pDock->nType == pDockWin->GetType() ) { - DBG_ASSERT( !pFoundDock && !pDock->pWin, "Window does already exist!"); + DBG_ASSERT( !pFoundDock && !pDock->pWin, "Window already exists!"); pFoundDock = pDock; if ( !bNewLine ) break; else { - // A new line has been created but no window was fond there; + // A new line has been created but no window was found there; // continue searching for a window in this line in-order to set // bNewLine correctly. While doing so nline or nPos are not // to be changed! @@ -526,13 +515,8 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize //------------------------------------------------------------------------- void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSave) - -/* [Description] - - The docking window is no longer stored in the internal data. -*/ - { +// The docking window is no longer stored in the internal data. SfxDock_Impl *pDock=0; sal_uInt16 nCount = pDockArr->size(); sal_Bool bFound = sal_False; |