Files
libreoffice/sw/source/uibase/table/swtablerep.cxx
Takeshi Abe 0980095619 Replace boost::scoped_array<T> with std::unique_ptr<T[]>
This may reduce some degree of dependency on boost.
Done by running a script like:

git grep -l '#include  *.boost/scoped_array.hpp.' \
 | xargs sed -i -e 's@#include  *.boost/scoped_array.hpp.@#include <memory>@'
git grep -l '\(boost::\)\?scoped_array<\([^<>]*\)>' \
 | xargs sed -i -e 's/\(boost::\)\?scoped_array<\([^<>]*\)>/std::unique_ptr<\2[]>/'

... and then killing duplicate or unnecessary includes,
while changing manually
m_xOutlineStylesCandidates in xmloff/source/text/txtimp.cxx,
extensions/source/ole/unoconversionutilities.hxx, and
extensions/source/ole/oleobjw.cxx.

Change-Id: I3955ed3ad99b94499a7bd0e6e3a09078771f9bfd
Reviewed-on: https://gerrit.libreoffice.org/16289
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-06-17 15:50:45 +00:00

182 lines
5.4 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* 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/.
*
* This file incorporates work covered by the following license notice:
*
* 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 <hintids.hxx>
#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
#include <editeng/keepitem.hxx>
#include <editeng/formatbreakitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <svl/ctloptions.hxx>
#include <swmodule.hxx>
#include <fmtornt.hxx>
#include <fmtpdsc.hxx>
#include <fmtlsplt.hxx>
#include <svtools/htmlcfg.hxx>
#include <fmtrowsplt.hxx>
#include <sfx2/htmlmode.hxx>
#include <docsh.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
#include <viewopt.hxx>
#include <uitool.hxx>
#include <frmatr.hxx>
#include <tablepg.hxx>
#include <tablemgr.hxx>
#include <pagedesc.hxx>
#include <poolfmt.hxx>
#include <SwStyleNameMapper.hxx>
#include <cmdid.h>
#include <table.hrc>
#include "swtablerep.hxx"
#include <memory>
SwTableRep::SwTableRep( const SwTabCols& rTabCol )
:
nTableWidth(0),
nSpace(0),
nLeftSpace(0),
nRightSpace(0),
nAlign(0),
nWidthPercent(0),
bLineSelected(false),
bWidthChanged(false),
bColsChanged(false)
{
nAllCols = nColCount = rTabCol.Count();
pTColumns = new TColumn[ nColCount + 1 ];
SwTwips nStart = 0,
nEnd;
for( sal_uInt16 i = 0; i < nAllCols; ++i )
{
nEnd = rTabCol[ i ] - rTabCol.GetLeft();
pTColumns[ i ].nWidth = nEnd - nStart;
pTColumns[ i ].bVisible = !rTabCol.IsHidden(i);
if(!pTColumns[ i ].bVisible)
nColCount --;
nStart = nEnd;
}
pTColumns[ nAllCols ].nWidth = rTabCol.GetRight() - rTabCol.GetLeft() - nStart;
pTColumns[ nAllCols ].bVisible = true;
nColCount++;
nAllCols++;
}
SwTableRep::~SwTableRep()
{
delete[] pTColumns;
}
bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
{
long nOldLeft = rTabCols.GetLeft(),
nOldRight = rTabCols.GetRight();
bool bSingleLine = false;
for ( size_t i = 0; i < rTabCols.Count(); ++i )
if(!pTColumns[i].bVisible)
{
bSingleLine = true;
break;
}
SwTwips nPos = 0;
const SwTwips nLeft = GetLeftSpace();
rTabCols.SetLeft(nLeft);
if(bSingleLine)
{
// The invisible separators are taken from the old TabCols,
// the visible coming from pTColumns.
std::unique_ptr<TColumn[]> pOldTColumns(new TColumn[nAllCols + 1]);
SwTwips nStart = 0;
for ( sal_uInt16 i = 0; i < nAllCols - 1; ++i )
{
const SwTwips nEnd = rTabCols[i] - rTabCols.GetLeft();
pOldTColumns[i].nWidth = nEnd - nStart;
pOldTColumns[i].bVisible = !rTabCols.IsHidden(i);
nStart = nEnd;
}
pOldTColumns[nAllCols - 1].nWidth = rTabCols.GetRight() - rTabCols.GetLeft() - nStart;
pOldTColumns[nAllCols - 1].bVisible = true;
sal_uInt16 nOldPos = 0;
sal_uInt16 nNewPos = 0;
SwTwips nOld = 0;
SwTwips nNew = 0;
bool bOld = false;
bool bFirst = true;
for ( sal_uInt16 i = 0; i < nAllCols - 1; ++i )
{
while((bFirst || bOld ) && nOldPos < nAllCols )
{
nOld += pOldTColumns[nOldPos].nWidth;
nOldPos++;
if(!pOldTColumns[nOldPos - 1].bVisible)
break;
}
while((bFirst || !bOld ) && nNewPos < nAllCols )
{
nNew += pTColumns[nNewPos].nWidth;
nNewPos++;
if(pOldTColumns[nNewPos - 1].bVisible)
break;
}
bFirst = false;
// They have to be inserted sorted.
bOld = nOld < nNew;
nPos = bOld ? nOld : nNew;
rTabCols[i] = nPos + nLeft;
rTabCols.SetHidden( i, bOld );
}
rTabCols.SetRight(nLeft + nTableWidth);
}
else
{
for ( sal_uInt16 i = 0; i < nAllCols - 1; ++i )
{
nPos += pTColumns[i].nWidth;
rTabCols[i] = nPos + rTabCols.GetLeft();
rTabCols.SetHidden( i, !pTColumns[i].bVisible );
rTabCols.SetRight(nLeft + pTColumns[nAllCols - 1].nWidth + nPos);
}
}
// intercept rounding errors
if(std::abs(nOldLeft - rTabCols.GetLeft()) < 3)
rTabCols.SetLeft(nOldLeft);
if(std::abs(nOldRight - rTabCols.GetRight()) < 3)
rTabCols.SetRight(nOldRight);
if(GetRightSpace() >= 0 &&
rTabCols.GetRight() > rTabCols.GetRightMax())
rTabCols.SetRight(rTabCols.GetRightMax());
return bSingleLine;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */