[Libreoffice-commits] .: 8 commits - UnoControls/source UnoControls/util officecfg/Package_cppheader.mk officecfg/registry sw/source
Michael Stahl
mst at kemper.freedesktop.org
Sat Jan 21 13:17:58 PST 2012
UnoControls/source/base/makefile.mk | 46 ----
UnoControls/source/controls/makefile.mk | 49 ----
UnoControls/util/makefile.mk | 69 ------
officecfg/Package_cppheader.mk | 4
officecfg/registry/Makefile | 2
officecfg/registry/files.mk | 2
sw/source/core/frmedt/fecopy.cxx | 27 +-
sw/source/core/frmedt/fetab.cxx | 30 +-
sw/source/core/frmedt/fews.cxx | 7
sw/source/core/frmedt/tblsel.cxx | 97 ++++-----
sw/source/filter/ww8/rtfattributeoutput.cxx | 294 ++++++++++++++--------------
sw/source/filter/ww8/rtfexport.cxx | 72 +++---
sw/source/filter/ww8/rtfexportfilter.cxx | 2
sw/source/filter/ww8/rtfimportfilter.cxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 30 +-
sw/source/ui/dochdl/gloshdl.cxx | 7
sw/source/ui/inc/glosbib.hxx | 9
sw/source/ui/inc/glosdoc.hxx | 12 -
sw/source/ui/misc/glosbib.cxx | 184 +++++++----------
sw/source/ui/misc/glosdoc.cxx | 111 ++++------
sw/source/ui/misc/glossary.cxx | 6
sw/source/ui/uno/unoatxt.cxx | 6
sw/source/ui/utlui/gloslst.cxx | 10
23 files changed, 431 insertions(+), 647 deletions(-)
New commits:
commit 0231617f1a1aa8713d79d19140b5d526c8a56dc0
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Jan 21 22:12:50 2012 +0100
sw: tweak translation 60c8a970d
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 1fd978b..0bdd9ce 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -292,12 +292,11 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
{
sal_Bool bRet = sal_True;
- // The list should be copied, while new objects below
- // were selected
+ // The list should be copied, because below new objects will be selected
const SdrMarkList aMrkList( Imp()->GetDrawView()->GetMarkedObjectList() );
sal_uLong nMarkCount = aMrkList.GetMarkCount();
if( !pDestShell->Imp()->GetDrawView() )
- // should be generated
+ // should create it now
pDestShell->MakeDrawView();
else if( bSelectInsert )
pDestShell->Imp()->GetDrawView()->UnmarkAll();
@@ -322,7 +321,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
if( pDestDrwView->IsGroupEntered() )
{
// insert into the group, when it belongs to an entered group
- // or when the object is not coupled to a character
+ // or when the object is not anchored as a character
if( pSrcDrwView->IsGroupEntered() ||
(FLY_AS_CHAR != rAnchor.GetAnchorId()) )
@@ -470,14 +469,14 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
// Shift references
sal_Bool bCopyIsMove = pDoc->IsCopyIsMove();
if( bIsMove )
- // set a flag in Doc, therefore in TextNodes
+ // set a flag in Doc, handled in TextNodes
pDoc->SetCopyIsMove( sal_True );
RedlineMode_t eOldRedlMode = pDestShell->GetDoc()->GetRedlineMode();
pDestShell->GetDoc()->SetRedlineMode_intern( (RedlineMode_t)(eOldRedlMode | nsRedlineMode_t::REDLINE_DELETE_REDLINES));
- // Are there table formulas in the area, then display the table first
- // such that the table formula can calculate a new value first
+ // If there are table formulas in the area, then display the table first
+ // so that the table formula can calculate a new value first
// (individual boxes in the area are retrieved via the layout)
SwFieldType* pTblFldTyp = pDestShell->GetDoc()->GetSysFldType( RES_TABLEFLD );
@@ -699,8 +698,8 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
SwNodeIndex aIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
SwPaM aCpyPam( aIdx ); //DocStart
- // Are there table formulas in the area, then display the table first
- // such that the table formula can calculate a new value first
+ // If there are table formulas in the area, then display the table first
+ // so that the table formula can calculate a new value first
// (individual boxes in the area are retrieved via the layout)
SwFieldType* pTblFldTyp = GetDoc()->GetSysFldType( RES_TABLEFLD );
@@ -899,7 +898,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
else if( *aCpyPam.GetPoint() == *aCpyPam.GetMark() &&
pClpDoc->GetSpzFrmFmts()->Count() )
{
- // draw a DrawView this slow
+ // we need a DrawView
if( !Imp()->GetDrawView() )
MakeDrawView();
@@ -994,7 +993,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
if( pFlyFrm )
SelectFlyFrm( *pFlyFrm, sal_True );
// always pick the first FlyFrame only; the others
- // were via Fly in Fly copied to the clipboard
+ // were copied to the clipboard via Fly in Fly
break;
}
else
@@ -1036,7 +1035,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
pBoxNd->GetIndex() &&
aCpyPam.GetPoint()->nNode != aCpyPam.GetMark()->nNode )
{
- // Copy more as 1 node in the current box. But
+ // Copy more than 1 node in the current box. But
// then the BoxAttribute should be removed
GetDoc()->ClearBoxNumAttrs( rInsPos.nNode );
}
@@ -1275,8 +1274,8 @@ sal_Bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
else
{
// fix(23806): not the origial size, but the current one.
- // Otherwise it could occur the for vectorgraphics
- // many MB's are requested
+ // Otherwise it could happen that for vector graphics
+ // many MB's of memory are allocated.
const Size aSz( FindFlyFrm()->Prt().SSize() );
VirtualDevice aVirtDev( *GetWin() );
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 9fa393f..3d3a1ae 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -202,7 +202,7 @@ void SwFEShell::ParkCursorInTab()
#***********************************************************************/
sal_Bool SwFEShell::InsertRow( sal_uInt16 nCnt, sal_Bool bBehind )
{
- // check if Spoint/Mark of current cursor are in a table
+ // check if Point/Mark of current cursor are in a table
SwFrm *pFrm = GetCurrFrm();
if( !pFrm || !pFrm->IsInTab() )
return sal_False;
@@ -233,7 +233,7 @@ sal_Bool SwFEShell::InsertRow( sal_uInt16 nCnt, sal_Bool bBehind )
sal_Bool SwFEShell::InsertCol( sal_uInt16 nCnt, sal_Bool bBehind )
{
- // check if Spoint/Mark of current cursor are in a table
+ // check if Point/Mark of current cursor are in a table
SwFrm *pFrm = GetCurrFrm();
if( !pFrm || !pFrm->IsInTab() )
return sal_False;
@@ -295,7 +295,7 @@ sal_Bool SwFEShell::IsLastCellInRow() const
sal_Bool SwFEShell::DeleteCol()
{
- // check if Spoint/Mark of current cursor are in a table
+ // check if Point/Mark of current cursor are in a table
SwFrm *pFrm = GetCurrFrm();
if( !pFrm || !pFrm->IsInTab() )
return sal_False;
@@ -341,7 +341,7 @@ sal_Bool SwFEShell::DeleteCol()
sal_Bool SwFEShell::DeleteRow()
{
- // check if Spoint/Mark of current cursor are in a table
+ // check if Point/Mark of current cursor are in a table
SwFrm *pFrm = GetCurrFrm();
if( !pFrm || !pFrm->IsInTab() )
return sal_False;
@@ -365,11 +365,11 @@ sal_Bool SwFEShell::DeleteRow()
{
TblWait( aBoxes.size(), pFrm, *GetDoc()->GetDocShell() );
- // Delete crsr from the deletion area.
+ // Delete cursors from the deletion area.
// Then the cursor is:
- // - there is one line next to this
- // - there is one line previous to this
- // - otherwise always next
+ // 1. the following row, if there is another row after this
+ // 2. the preceding row, if there is another row before this
+ // 3. otherwise below the table
{
SwTableNode* pTblNd = ((SwCntntFrm*)pFrm)->GetNode()->FindTableNode();
@@ -430,7 +430,7 @@ sal_Bool SwFEShell::DeleteRow()
sal_uLong nIdx;
if( pNextBox ) // put cursor here
nIdx = pNextBox->GetSttIdx() + 1;
- else // otherwise behind the table
+ else // otherwise below the table
nIdx = pTblNd->EndOfSectionIndex() + 1;
SwNodeIndex aIdx( GetDoc()->GetNodes(), nIdx );
@@ -467,7 +467,7 @@ sal_Bool SwFEShell::DeleteRow()
sal_uInt16 SwFEShell::MergeTab()
{
- // check if Spoint/Mark of current cursor are in a table
+ // check if Point/Mark of current cursor are in a table
sal_uInt16 nRet = TBLMERGE_NOSELECTION;
if( IsTableMode() )
{
@@ -498,7 +498,7 @@ sal_uInt16 SwFEShell::MergeTab()
sal_Bool SwFEShell::SplitTab( sal_Bool bVert, sal_uInt16 nCnt, sal_Bool bSameHeight )
{
- // check if Spoint/Mark of current cursor are in a table
+ // check if Point/Mark of current cursor are in a table
SwFrm *pFrm = GetCurrFrm();
if( !pFrm || !pFrm->IsInTab() )
return sal_False;
@@ -549,7 +549,6 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const
const SwTabFrm *pTab = pBox->FindTabFrm();
if ( pLastCols )
{
- // assure few small things
sal_Bool bDel = sal_True;
if ( pColumnCacheLastTable == pTab->GetTable() )
{
@@ -627,7 +626,6 @@ void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const
const SwTabFrm *pTab = pBox->FindTabFrm();
if ( pLastRows )
{
- // assure few things
sal_Bool bDel = sal_True;
if ( pRowCacheLastTable == pTab->GetTable() )
{
@@ -1223,7 +1221,7 @@ void SwFEShell::AdjustCellWidth( sal_Bool bBalance )
sal_Bool SwFEShell::IsAdjustCellWidthAllowed( sal_Bool bBalance ) const
{
- // at least one line with content should be contained in the selection
+ // at least one row with content should be contained in the selection
SwFrm *pFrm = GetCurrFrm();
if( !pFrm || !pFrm->IsInTab() )
@@ -1266,7 +1264,7 @@ sal_Bool SwFEShell::IsAdjustCellWidthAllowed( sal_Bool bBalance ) const
return sal_False;
}
- // AutoFormat for the table/tables selections
+ // AutoFormat for the table/table selection
sal_Bool SwFEShell::SetTableAutoFmt( const SwTableAutoFmt& rNew )
{
SwTableNode *pTblNd = (SwTableNode*)IsCrsrInTbl();
@@ -1352,7 +1350,7 @@ sal_Bool SwFEShell::DeleteTblSel()
SET_CURR_SHELL( this );
StartAllAction();
- // search boxes via the layout
+ // search boxes via the layout
sal_Bool bRet;
SwSelBoxes aBoxes;
GetTblSelCrs( *this, aBoxes );
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index a71012f..560bb5e 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -457,8 +457,7 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const String &rTxt, const
const String& rCharacterStyle,
const sal_Bool bCpyBrd )
{
- // get CrsrPosition of NodeIndex, remaining stuff can
- // be done by the document self
+ // get node index of cursor position, SwDoc can do everything else itself
SwCntntFrm *pCnt = LTYPE_DRAW==eType ? 0 : GetCurrFrm( sal_False );
if( LTYPE_DRAW==eType || pCnt )
{
@@ -524,7 +523,7 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const String &rTxt, const
}
break;
default:
- OSL_ENSURE( !this, "Crsr both not in table nor in fly." );
+ OSL_ENSURE( !this, "Crsr neither in table nor in fly." );
}
if( nIdx )
@@ -557,7 +556,7 @@ sal_Bool SwFEShell::Sort(const SwSortOptions& rOpt)
if(IsTableMode())
{
// Sort table
- // check if SPoint/Mark of current Crsr are in one table
+ // check if Point/Mark of current Crsr are in one table
SwFrm *pFrm = GetCurrFrm( sal_False );
OSL_ENSURE( pFrm->FindTabFrm(), "Crsr not in table." );
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index deb7910..eb84e67 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -61,9 +61,9 @@
// see also swtable.cxx
#define COLFUZZY 20L
-// defines, determining how tables are merged:
+// macros, determining how table boxes are merged:
// - 1. remove empty lines, all boxes separated with blanks,
-// all empty lines separated with ParaBreak
+// all lines separated with ParaBreak
// - 2. remove all empty lines and remove all empty boxes at beginning and end,
// all boxes separated with Blank,
// all lines separated with ParaBreak
@@ -132,7 +132,7 @@ const SwLayoutFrm *lcl_FindCellFrm( const SwLayoutFrm *pLay )
const SwLayoutFrm *lcl_FindNextCellFrm( const SwLayoutFrm *pLay )
{
- // assure cell is left (areas)
+ // ensure we leave the cell (sections)
const SwLayoutFrm *pTmp = pLay;
do {
pTmp = pTmp->GetNextLayoutLeaf();
@@ -173,7 +173,7 @@ void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes )
void GetTblSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
const SwTblSearchType eSearchType )
{
- // get start- and endcell and request next.
+ // get start and end cell
if ( !rShell.IsTableMode() )
rShell.GetCrsr();
@@ -183,7 +183,7 @@ void GetTblSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
const SwTblSearchType eSearchType )
{
- // get start- and endcell and request next.
+ // get start and end cell
OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( sal_False ),
"Tabselection not on Cnt." );
@@ -287,7 +287,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
do {
bTblIsValid = sal_True;
- // First we search for tables and squares
+ // First, compute tables and rectangles
SwSelUnions aUnions;
::MakeSelUnions( aUnions, pStart, pEnd, eSearchType );
@@ -415,8 +415,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
SwDeletionChecker aDelCheck( pStart );
- // otherwise quickly "calculate" the table layout
- // and set it up again
+ // otherwise quickly "calculate" the table layout and start over
SwTabFrm *pTable = aUnions[0]->GetTable();
while( pTable )
{
@@ -497,7 +496,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
sal_uInt16 nRowCells = USHRT_MAX;
- // First we search for tables and squares
+ // First, compute tables and rectangles
SwSelUnions aUnions;
::MakeSelUnions( aUnions, pStart, pEnd, nsSwTblSearchType::TBLSEARCH_NO_UNION_CORRECT );
@@ -566,8 +565,8 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
{
// ok, rUnion is _not_ completely outside of rFrmRect
- // if not completely outside the union, then for Chart
- // it is an invalid selection
+ // if not completely inside the union, then
+ // for Chart it is an invalid selection
if( rUnion.Left() <= rFrmRect.Left() + nXFuzzy &&
rFrmRect.Left() <= nUnionRight &&
rUnion.Left() <= nFrmRight &&
@@ -601,7 +600,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
if( !bValidChartSel )
break;
- // all cells of the (part) table together. Now check of
+ // all cells of the (part) table together. Now check if
// they're all adjacent
size_t n, nCellCnt = 0;
long nYPos = LONG_MAX;
@@ -616,7 +615,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
// new row
if( n )
{
- if( USHRT_MAX == nRowCells ) // 1. row exchange
+ if( USHRT_MAX == nRowCells ) // 1. row change
nRowCells = nCellCnt;
else if( nRowCells != nCellCnt )
{
@@ -678,7 +677,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
if( bTblIsValid )
break;
- // otherwise quickly "calculate" table layout and set it up again
+ // otherwise quickly "calculate" table layout and start over
SwTabFrm *pTable = aUnions[0]->GetTable();
for( i = 0; i < aUnions.Count(); ++i )
{
@@ -695,7 +694,7 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
pGetCLines->DeleteAndDestroy( 0, pGetCLines->Count() );
} while( sal_True );
- OSL_ENSURE( nLoopMax, "table layout is still invalide!" );
+ OSL_ENSURE( nLoopMax, "table layout is still invalid!" );
if( !bValidChartSel && pGetCLines )
pGetCLines->DeleteAndDestroy( 0, pGetCLines->Count() );
@@ -742,16 +741,16 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
while( pSttCell && !pSttCell->IsCellFrm() )
pSttCell = pSttCell->GetUpper();
- // first we search for tables and squares
+ // First, compute tables and rectangles
SwSelUnions aUnions;
- // then we test for above and to the left
+ // by default, first test above and then to the left
::MakeSelUnions( aUnions, pStart, pEnd, nsSwTblSearchType::TBLSEARCH_COL );
sal_Bool bTstRow = sal_True, bFound = sal_False;
sal_uInt16 i;
- // 1. check if box above contains values/formulas
+ // 1. check if box above contains value/formula
for( i = 0; i < aUnions.Count(); ++i )
{
SwSelUnion *pUnion = aUnions[i];
@@ -780,7 +779,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
break;
// all boxes together, do not check the
- // row, if a formula of values was found
+ // row, if a formula or value was found
bTstRow = 0 == nWhichId || USHRT_MAX == nWhichId;
bFound = sal_True;
break;
@@ -849,7 +848,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
break;
// all boxes together, do not check the
- // row, if a formula of values was found
+ // row if a formula or value was found
bFound = 0 != nWhichId && USHRT_MAX != nWhichId;
bTstRow = sal_False;
break;
@@ -963,7 +962,6 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
{
rBoxes.clear();
- // first we check for tables and squares
OSL_ENSURE( rPam.GetCntntNode() && rPam.GetCntntNode( sal_False ),
"Tabselection not on Cnt." );
@@ -979,6 +977,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(),
&aPt )->GetUpper();
+ // First, compute tables and rectangles
SwSelUnions aUnions;
::MakeSelUnions( aUnions, pStart, pEnd );
if( !aUnions.Count() )
@@ -1178,11 +1177,11 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
if( 1 >= rBoxes.size() )
return;
- // now search all adjacent boxes and connect
- // their contents with blanks. All underneath will be tied
+ // now search all horizontally adjacent boxes and connect
+ // their contents with blanks. All vertically adjacent will be tied
// together as paragraphs
- // 1. Solution: map array and all on same Y-plane
+ // 1. Solution: map array and all on same Y-level
// are separated with blanks
// all others are separated with paragraphs
sal_Bool bCalcWidth = sal_True;
@@ -1202,7 +1201,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
for( n = 0; n < aPosArr.Count(); ++n )
{
const _CmpLPt& rPt = aPosArr[ n ];
- if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // same plane ?
+ if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // same Y level?
{
if( bEmptyLine && !IsEmptyBox( *rPt.pSelBox, aPam ))
bEmptyLine = sal_False;
@@ -1246,7 +1245,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
for( n = 0; n < aPosArr.Count(); ++n )
{
const _CmpLPt& rPt = aPosArr[ n ];
- if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // same plane ?
+ if( n && aPosArr[ n - 1 ].Y() == rPt.Y() ) // same Y level?
{
sal_Bool bEmptyBox = IsEmptyBox( *rPt.pSelBox, aPam );
if( bEmptyBox )
@@ -1341,7 +1340,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
const _CmpLPt& rPt = aPosArr[ n ];
if( bCalcWidth )
{
- if( nY == ( bVert ? rPt.X() : rPt.Y() ) ) // same plane ?
+ if( nY == ( bVert ? rPt.X() : rPt.Y() ) ) // same Y level?
nWidth += rPt.pSelBox->GetFrmFmt()->GetFrmSize().GetWidth();
else
bCalcWidth = sal_False; // one line ready
@@ -1367,12 +1366,12 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
lcl_InsTblBox( pTblNd, pDoc, pTmpBox, nInsPos );
(*ppMergeBox) = pInsLine->GetTabBoxes()[ nInsPos ];
- pInsLine->GetTabBoxes().Remove( nInsPos ); // deliver again
+ pInsLine->GetTabBoxes().Remove( nInsPos ); // remove again
(*ppMergeBox)->SetUpper( 0 );
(*ppMergeBox)->ClaimFrmFmt();
- // define the border: of the first box the upper-left of the
- // last box the lower-right corner:
+ // define the border: the upper/left side of the first box,
+ // the lower/right side of the last box:
if( pLastBox && pFirstBox )
{
SvxBoxItem aBox( pFirstBox->GetFrmFmt()->GetBox() );
@@ -1404,8 +1403,8 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
aPam.GetPoint()->nContent.Assign( pCNd, nL );
SwNodeIndex aSttNdIdx( *rPt.pSelBox->GetSttNd(), 1 );
- // one node should be kept in the box ( otherwise the
- // selection would be deleted during a move
+ // one node should be kept in the box (otherwise the
+ // section would be deleted during a move)
bool const bUndo(pDoc->GetIDocumentUndoRedo().DoesUndo());
if( pUndo )
{
@@ -1535,8 +1534,8 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes )
return eRet;
}
-// Determines tables and union-squares affected by a table selection
-// also for splitt tables
+// Determines tables affected by a table selection and union rectangles
+// of the selection (also for split tables)
SV_IMPL_PTRARR( SwSelUnions, SwSelUnion* );
SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish,
@@ -1782,7 +1781,7 @@ void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
if ( !pTmpLeaf || !pTmpTab->IsAnLower( pTmpLeaf ) )
{
pTmpTab = (const SwTabFrm*)pTmpTab->FindPrev();
- OSL_ENSURE( pTmpTab->IsTabFrm(), "Predecessor of Follow not in Master.");
+ OSL_ENSURE( pTmpTab->IsTabFrm(), "Predecessor of Follow not Master.");
rpEnd = pTmpTab->FindLastCntnt()->GetUpper();
while( !rpEnd->IsCellFrm() )
rpEnd = rpEnd->GetUpper();
@@ -1819,7 +1818,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
{
if ( !pTable->IsAnFollow( pEndTable ) )
{
- OSL_ENSURE( pEndTable->IsAnFollow( pTable ), "Tabchain linked." );
+ OSL_ENSURE( pEndTable->IsAnFollow( pTable ), "Tabchain in knots." );
bExchange = sal_True;
}
}
@@ -1847,7 +1846,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
}
// Beginning and end now nicely sorted, if required we
- // should transfer them
+ // should move them
if( nsSwTblSearchType::TBLSEARCH_ROW == ((~nsSwTblSearchType::TBLSEARCH_PROTECT ) & eSearchType ) )
::lcl_FindStartEndRow( pStart, pEnd, nsSwTblSearchType::TBLSEARCH_PROTECT & eSearchType );
else if( nsSwTblSearchType::TBLSEARCH_COL == ((~nsSwTblSearchType::TBLSEARCH_PROTECT ) & eSearchType ) )
@@ -1855,7 +1854,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
if ( !pEnd ) return; // Made code robust.
- // retrieve again, as they have been transferred
+ // retrieve again, as they have been moved
pTable = pStart->FindTabFrm();
pEndTable = pEnd->FindTabFrm();
@@ -1913,13 +1912,12 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
SwRect aUnion( aSt, Size( aDiff.X(), aDiff.Y() ) );
aUnion.Justify();
- // for
if( !(nsSwTblSearchType::TBLSEARCH_NO_UNION_CORRECT & eSearchType ))
{
- // Pity the union contains rounding errors, therefore
+ // Unfortunately the union contains rounding errors now, therefore
// erroneous results could occur during split/merge.
// To prevent these we will determine the first and last row
- // within the union and use their values for the new union
+ // within the union and use their values for a new union
const SwLayoutFrm* pRow = pTable->IsFollow() ?
pTable->GetFirstNonHeadlineRow() :
(const SwLayoutFrm*)pTable->Lower();
@@ -2006,7 +2004,7 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
sal_uInt16 nMinValue = nDiv * MINLAY;
- // Get start- and end cell and request next
+ // Get start and end cell
Point aPtPos, aMkPos;
const SwShellCrsr* pShCrsr = dynamic_cast<const SwShellCrsr*>(&rCrsr);
if( pShCrsr )
@@ -2024,7 +2022,7 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
SWRECTFN( pStart->GetUpper() )
- // first we search for tables and squares
+ // First, compute tables and rectangles
SwSelUnions aUnions;
::MakeSelUnions( aUnions, pStart, pEnd, eSearchType );
@@ -2072,11 +2070,8 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
}
// -------------------------------------------------------------------
-// Diese Klassen kopieren die aktuelle Tabellen-Selektion (rBoxes)
-// unter Beibehaltung der Tabellen-Struktur in eine eigene Struktur
-// neu: SS zum gezielten Loeschen/Retaurieren des Layouts.
// These Classes copy the current table selections (rBoxes),
-// retaining the table structure in a own structure
+// into a new structure, retaining the table structure
// new: SS for targeted erasing/restoring of the layout
void lcl_InsertRow( SwTableLine &rLine, SwLayoutFrm *pUpper, SwFrm *pSibling )
@@ -2284,7 +2279,7 @@ void _FndBox::DelFrms( SwTable &rTable )
else if ( pFollow )
::UnsetFollow( pFollow );
- // A TabellenFrm should always remain!
+ // A TableFrm should always remain!
if ( pPrev || pFollow )
{
// OD 26.08.2003 #i18103# - if table is in a section,
@@ -2443,9 +2438,9 @@ void _FndBox::MakeFrms( SwTable &rTable )
void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
const sal_Bool bBehind )
{
- // Create Frms for new inserted lines
+ // Create Frms for newly inserted lines
// bBehind == sal_True: before pLineBehind
- // == sal_False: afer pLineBefore
+ // == sal_False: after pLineBefore
const sal_uInt16 nBfPos = pLineBefore ?
rTable.GetTabLines().GetPos( (const SwTableLine*&)pLineBefore ) :
USHRT_MAX;
@@ -2454,7 +2449,7 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
USHRT_MAX;
//nNumber: how often did we insert
- //nCnt: how many nNumber were inserted
+ //nCnt: how many were inserted nNumber times
const sal_uInt16 nCnt =
((nBhPos != USHRT_MAX ? nBhPos : rTable.GetTabLines().Count()) -
commit a1e4a1120135eab16ba8d07e708f4860a3fe4cfc
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Jan 21 20:19:32 2012 +0100
SwGlossaries: some cleanup
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index b3e81a9..401ae6b 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -136,11 +136,12 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, sal_Bool bApi, sal_Bool bAlw
String sCurBase = aTemp.getBase();
aTemp.removeSegment();
const String sCurEntryPath = aTemp.GetMainURL(INetURLObject::NO_DECODE);
- const std::vector<String*> *pPathArr = rStatGlossaries.GetPathArray();
+ const std::vector<String> & rPathArr =
+ rStatGlossaries.GetPathArray();
sal_uInt16 nCurrentPath = USHRT_MAX;
- for( size_t nPath = 0; nPath < pPathArr->size(); nPath++ )
+ for (size_t nPath = 0; nPath < rPathArr.size(); ++nPath)
{
- if(sCurEntryPath == *(*pPathArr)[nPath])
+ if (sCurEntryPath == rPathArr[nPath])
{
nCurrentPath = static_cast<sal_uInt16>(nPath);
break;
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx
index b1c2705..423a058 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/ui/inc/glosbib.hxx
@@ -104,7 +104,7 @@ protected:
public:
SwGlossaryGroupDlg(Window * pParent,
- const std::vector<String*> *pPathArr,
+ std::vector<String> const& rPathArr,
SwGlossaryHdl *pGlosHdl);
~SwGlossaryGroupDlg();
diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx
index 114c9bc..f84ffae 100644
--- a/sw/source/ui/inc/glosdoc.hxx
+++ b/sw/source/ui/inc/glosdoc.hxx
@@ -61,12 +61,12 @@ class SW_DLLPUBLIC SwGlossaries
String m_aPath;
String m_sOldErrPath;
String m_sErrPath;
- std::vector<String*> m_aPathArr;
- std::vector<String*> *m_pGlosArr;
+ std::vector<String> m_PathArr;
+ std::vector<String> m_GlosArr;
sal_Bool m_bError;
SW_DLLPRIVATE SwTextBlocks* GetGlosDoc(const String &rName, sal_Bool bCreate = sal_True) const;
- SW_DLLPRIVATE std::vector<String*>* GetNameList();
+ SW_DLLPRIVATE std::vector<String> & GetNameList();
// implementation in unoatxt.cxx
SW_DLLPRIVATE void RemoveFileFromList( const String& rGroup );
@@ -121,8 +121,8 @@ public:
sal_Bool FindGroupName(String & rGroup);
SwTextBlocks* GetGroupDoc(const String &rName,
- sal_Bool bCreate = sal_False) const;
- SwTextBlocks* GetDefGroupDoc() const {return GetGroupDoc(GetDefName());}
+ sal_Bool bCreate = sal_False);
+ SwTextBlocks* GetDefGroupDoc() { return GetGroupDoc(GetDefName()); }
void PutGroupDoc(SwTextBlocks *pBlock);
static String GetDefName();
static String GetExtension();
@@ -137,7 +137,7 @@ public:
void UpdateGlosPath(sal_Bool bFull);
void ShowError();
inline sal_uLong IsGlosPathErr() { return m_bError; }
- const std::vector<String*>* GetPathArray() const { return &m_aPathArr; }
+ std::vector<String> const& GetPathArray() const { return m_PathArr; }
};
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 4d09b00..3b4d58f 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -59,7 +59,7 @@
#define RENAME_TOKEN_DELIM (sal_Unicode)1
SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
- const std::vector<String*> *pPathArr,
+ std::vector<String> const& rPathArr,
SwGlossaryHdl *pHdl) :
SvxStandardDialog(pParent, SW_RES(DLG_BIB_BASE)),
aBibFT( this, SW_RES(FT_BIB)),
@@ -96,9 +96,9 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
aPathLB.SetSelectHdl(LINK(this, SwGlossaryGroupDlg, ModifyHdl));
aRenamePB.SetClickHdl(LINK(this, SwGlossaryGroupDlg, RenameHdl));
- for( size_t i = 0; i < pPathArr->size(); i++ )
+ for (size_t i = 0; i < rPathArr.size(); ++i)
{
- String sPath(*(*pPathArr)[i]);
+ String sPath(rPathArr[i]);
INetURLObject aTempURL(sPath);
sPath = aTempURL.GetMainURL(INetURLObject::DECODE_WITH_CHARSET );
aPathLB.InsertEntry(sPath);
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index e84455d..f07fe52 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -114,7 +114,7 @@ String SwGlossaries::GetDefName()
------------------------------------------------------------------------*/
sal_uInt16 SwGlossaries::GetGroupCnt()
{
- return static_cast<sal_uInt16>(GetNameList()->size());
+ return static_cast<sal_uInt16>(GetNameList().size());
}
/*------------------------------------------------------------------------
@@ -143,7 +143,7 @@ sal_Bool SwGlossaries::FindGroupName(String & rGroup)
String sTemp( GetGroupName( i ));
sal_uInt16 nPath = (sal_uInt16)sTemp.GetToken(1, GLOS_DELIM).ToInt32();
- if( !SWUnoHelper::UCB_IsCaseSensitiveFileName( *m_aPathArr[nPath] )
+ if (!SWUnoHelper::UCB_IsCaseSensitiveFileName( m_PathArr[nPath] )
&& rSCmp.isEqual( rGroup, sTemp.GetToken( 0, GLOS_DELIM) ) )
{
rGroup = sTemp;
@@ -155,8 +155,9 @@ sal_Bool SwGlossaries::FindGroupName(String & rGroup)
String SwGlossaries::GetGroupName(sal_uInt16 nGroupId)
{
- OSL_ENSURE(static_cast<size_t>(nGroupId) < m_pGlosArr->size(), "Textbausteinarray ueberindiziert");
- return *(*m_pGlosArr)[nGroupId];
+ OSL_ENSURE(static_cast<size_t>(nGroupId) < m_GlosArr.size(),
+ "SwGlossaries::GetGroupName: index out of bounds");
+ return m_GlosArr[nGroupId];
}
String SwGlossaries::GetGroupTitle( const String& rGroupName )
@@ -178,20 +179,20 @@ String SwGlossaries::GetGroupTitle( const String& rGroupName )
Description: supplies the group rName's text block document
------------------------------------------------------------------------*/
SwTextBlocks* SwGlossaries::GetGroupDoc(const String &rName,
- sal_Bool bCreate) const
+ sal_Bool bCreate)
{
// insert to the list of text blocks if applicable
- if(bCreate && m_pGlosArr)
+ if(bCreate && !m_GlosArr.empty())
{
- std::vector<String*>::const_iterator it(m_pGlosArr->begin());
- for(; it != m_pGlosArr->end(); ++it)
+ std::vector<String>::const_iterator it(m_GlosArr.begin());
+ for (; it != m_GlosArr.end(); ++it)
{
- if(**it == rName)
+ if (*it == rName)
break;
}
- if( it == m_pGlosArr->end() )
+ if (it == m_GlosArr.end())
{ // block not in the list
- m_pGlosArr->push_back(new String(rName));
+ m_GlosArr.push_back(rName);
}
}
return GetGlosDoc( rName, bCreate );
@@ -212,16 +213,16 @@ void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) {
sal_Bool SwGlossaries::NewGroupDoc(String& rGroupName, const String& rTitle)
{
sal_uInt16 nNewPath = (sal_uInt16)rGroupName.GetToken(1, GLOS_DELIM).ToInt32();
- if( static_cast<size_t>(nNewPath) >= m_aPathArr.size() )
+ if (static_cast<size_t>(nNewPath) >= m_PathArr.size())
return sal_False;
- String sNewFilePath(*m_aPathArr[nNewPath]);
+ String sNewFilePath(m_PathArr[nNewPath]);
String sNewGroup = lcl_CheckFileName(sNewFilePath, rGroupName.GetToken(0, GLOS_DELIM));
sNewGroup += GLOS_DELIM;
sNewGroup += rGroupName.GetToken(1, GLOS_DELIM);
SwTextBlocks *pBlock = GetGlosDoc( sNewGroup );
if(pBlock)
{
- GetNameList()->push_back(new String(sNewGroup));
+ GetNameList().push_back(sNewGroup);
pBlock->SetName(rTitle);
PutGroupDoc(pBlock);
rGroupName = sNewGroup;
@@ -235,9 +236,9 @@ sal_Bool SwGlossaries::RenameGroupDoc(
{
sal_Bool bRet = sal_False;
sal_uInt16 nOldPath = (sal_uInt16)rOldGroup.GetToken(1, GLOS_DELIM).ToInt32();
- if( static_cast<size_t>(nOldPath) < m_aPathArr.size() )
+ if (static_cast<size_t>(nOldPath) < m_PathArr.size())
{
- String sOldFileURL(*m_aPathArr[nOldPath]);
+ String sOldFileURL(m_PathArr[nOldPath]);
sOldFileURL += INET_PATH_TOKEN;
sOldFileURL += rOldGroup.GetToken(0, GLOS_DELIM);
sOldFileURL += SwGlossaries::GetExtension();
@@ -246,9 +247,9 @@ sal_Bool SwGlossaries::RenameGroupDoc(
if(bExist)
{
sal_uInt16 nNewPath = (sal_uInt16)rNewGroup.GetToken(1, GLOS_DELIM).ToInt32();
- if( static_cast<size_t>(nNewPath) < m_aPathArr.size() )
+ if (static_cast<size_t>(nNewPath) < m_PathArr.size())
{
- String sNewFilePath(*m_aPathArr[nNewPath]);
+ String sNewFilePath(m_PathArr[nNewPath]);
String sNewFileName = lcl_CheckFileName(
sNewFilePath, rNewGroup.GetToken(0, GLOS_DELIM));
const sal_uInt16 nFileNameLen = sNewFileName.Len();
@@ -270,10 +271,14 @@ sal_Bool SwGlossaries::RenameGroupDoc(
rNewGroup = sNewFileName.Copy(0, nFileNameLen);
rNewGroup += GLOS_DELIM;
rNewGroup += String::CreateFromInt32(nNewPath);
- if(!m_pGlosArr)
+ if (m_GlosArr.empty())
+ {
GetNameList();
+ }
else
- m_pGlosArr->push_back(new String(rNewGroup));
+ {
+ m_GlosArr.push_back(rNewGroup);
+ }
sNewFilePath += INET_PATH_TOKEN;
sNewFilePath += sNewFileName ;
@@ -294,9 +299,9 @@ sal_Bool SwGlossaries::RenameGroupDoc(
sal_Bool SwGlossaries::DelGroupDoc(const String &rName)
{
sal_uInt16 nPath = (sal_uInt16)rName.GetToken(1, GLOS_DELIM).ToInt32();
- if( static_cast<size_t>(nPath) >= m_aPathArr.size() )
+ if (static_cast<size_t>(nPath) >= m_PathArr.size())
return sal_False;
- String sFileURL(*m_aPathArr[nPath]);
+ String sFileURL(m_PathArr[nPath]);
String aTmp( rName.GetToken(0, GLOS_DELIM));
String aName(aTmp);
aName += GLOS_DELIM;
@@ -316,16 +321,6 @@ sal_Bool SwGlossaries::DelGroupDoc(const String &rName)
SwGlossaries::~SwGlossaries()
{
- if( m_pGlosArr )
- {
- for(std::vector<String*>::const_iterator it(m_pGlosArr->begin()); it != m_pGlosArr->end(); ++it)
- delete *it;
- delete m_pGlosArr;
- }
-
- for(std::vector<String*>::const_iterator it(m_aPathArr.begin()); it != m_aPathArr.end(); ++it)
- delete *it;
-
InvalidateUNOOjects();
}
@@ -336,9 +331,9 @@ SwTextBlocks* SwGlossaries::GetGlosDoc( const String &rName, sal_Bool bCreate )
{
sal_uInt16 nPath = (sal_uInt16)rName.GetToken(1, GLOS_DELIM).ToInt32();
SwTextBlocks *pTmp = 0;
- if( static_cast<size_t>(nPath) < m_aPathArr.size() )
+ if (static_cast<size_t>(nPath) < m_PathArr.size())
{
- String sFileURL(*m_aPathArr[nPath]);
+ String sFileURL(m_PathArr[nPath]);
String aTmp( rName.GetToken(0, GLOS_DELIM));
aTmp += SwGlossaries::GetExtension();
sFileURL += INET_PATH_TOKEN;
@@ -369,17 +364,16 @@ SwTextBlocks* SwGlossaries::GetGlosDoc( const String &rName, sal_Bool bCreate )
/*------------------------------------------------------------------------
Description: access to the list of names; read in if applicable
------------------------------------------------------------------------*/
-std::vector<String*>* SwGlossaries::GetNameList()
+std::vector<String> & SwGlossaries::GetNameList()
{
- if( !m_pGlosArr )
+ if (m_GlosArr.empty())
{
- m_pGlosArr = new std::vector<String*>;
String sExt( SwGlossaries::GetExtension() );
- for( size_t i = 0; i < m_aPathArr.size(); ++i )
+ for (size_t i = 0; i < m_PathArr.size(); ++i)
{
std::vector<String*> aFiles;
- SWUnoHelper::UCB_GetFileListOfFolder( *m_aPathArr[i], aFiles, &sExt );
+ SWUnoHelper::UCB_GetFileListOfFolder(m_PathArr[i], aFiles, &sExt);
for( std::vector<String*>::const_iterator filesIt(aFiles.begin());
filesIt != aFiles.end(); ++filesIt)
{
@@ -387,26 +381,25 @@ std::vector<String*>* SwGlossaries::GetNameList()
String sName( pTitle->Copy( 0, pTitle->Len() - sExt.Len() ));
sName += GLOS_DELIM;
sName += String::CreateFromInt32( static_cast<sal_Int16>(i) );
- m_pGlosArr->push_back( new String(sName) );
+ m_GlosArr.push_back(sName);
// don't need any more these pointers
delete pTitle;
}
}
- if( m_pGlosArr->empty() )
+ if (m_GlosArr.empty())
{
// the standard block is inside of the path's first part
- String *pTmp = new String( SwGlossaries::GetDefName() );
- (*pTmp) += GLOS_DELIM;
- (*pTmp) += '0';
- m_pGlosArr->push_back( pTmp );
+ String tmp( SwGlossaries::GetDefName() );
+ tmp += GLOS_DELIM;
+ tmp += '0';
+ m_GlosArr.push_back( tmp );
}
}
- return m_pGlosArr;
+ return m_GlosArr;
}
-SwGlossaries::SwGlossaries() :
- m_pGlosArr(0)
+SwGlossaries::SwGlossaries()
{
UpdateGlosPath(sal_True);
}
@@ -435,9 +428,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
{
m_aPath = aNewPath;
- for(std::vector<String*>::const_iterator it(m_aPathArr.begin()); it != m_aPathArr.end(); ++it)
- delete *it;
- m_aPathArr.clear();
+ m_PathArr.clear();
sal_uInt16 nTokenCount = comphelper::string::getTokenCount(m_aPath, SVT_SEARCHPATH_DELIMITER);
std::vector<String*> aDirArr;
@@ -460,7 +451,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
m_sErrPath += String(aTemp.GetFull());
}
else
- m_aPathArr.push_back(new String(sPth));
+ m_PathArr.push_back(sPth);
}
for(std::vector<String*>::const_iterator it(aDirArr.begin()); it != aDirArr.end(); ++it)
delete *it;
@@ -479,11 +470,9 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
else
m_bError = sal_False;
- if(m_pGlosArr)
+ if (!m_GlosArr.empty())
{
- for(std::vector<String*>::const_iterator it(m_pGlosArr->begin()); it != m_pGlosArr->end(); ++it)
- delete *it;
- DELETEZ(m_pGlosArr);
+ m_GlosArr.clear();
GetNameList();
}
}
@@ -503,11 +492,12 @@ String SwGlossaries::GetExtension()
void SwGlossaries::RemoveFileFromList( const String& rGroup )
{
- if(m_pGlosArr)
+ if (!m_GlosArr.empty())
{
- for(std::vector<String*>::iterator it(m_pGlosArr->begin()); it != m_pGlosArr->end(); ++it)
+ for (std::vector<String>::iterator it(m_GlosArr.begin());
+ it != m_GlosArr.end(); ++it)
{
- if(**it == rGroup)
+ if (*it == rGroup)
{
rtl::OUString aUName = rGroup;
{
@@ -552,8 +542,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup )
}
}
- delete *it;
- m_pGlosArr->erase(it);
+ m_GlosArr.erase(it);
break;
}
}
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index c80a663..3ed816f 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -939,10 +939,10 @@ void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt )
if(!GetParent(pEntry))
{
GroupUserData* pData = (GroupUserData*)pEntry->GetUserData();
- const std::vector<String*>* pPathArr = ::GetGlossaries()->GetPathArray();
- if( !pPathArr->empty() )
+ const std::vector<String> & rPathArr = ::GetGlossaries()->GetPathArray();
+ if( !rPathArr.empty() )
{
- sMsg = (*(*pPathArr)[pData->nPathIdx]);
+ sMsg = rPathArr[pData->nPathIdx];
sMsg += INET_PATH_TOKEN;
sMsg += pData->sGroupName;
sMsg += SwGlossaries::GetExtension();
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 34a7fdc..8914d1d 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -1073,7 +1073,8 @@ void SwAutoTextEventDescriptor::replaceByName(
(nEvent == SW_EVENT_START_INS_GLOSSARY) ,
"Unknown event ID" );
- const SwGlossaries* pGlossaries = rAutoTextEntry.GetGlossaries();
+ SwGlossaries *const pGlossaries =
+ const_cast<SwGlossaries*>(rAutoTextEntry.GetGlossaries());
SwTextBlocks* pBlocks =
pGlossaries->GetGroupDoc( rAutoTextEntry.GetGroupName() );
OSL_ENSURE( NULL != pBlocks,
@@ -1111,7 +1112,8 @@ void SwAutoTextEventDescriptor::getByName(
(nEvent == SW_EVENT_START_INS_GLOSSARY) ,
"Unknown event ID" );
- const SwGlossaries* pGlossaries = rAutoTextEntry.GetGlossaries();
+ SwGlossaries *const pGlossaries =
+ const_cast<SwGlossaries*>(rAutoTextEntry.GetGlossaries());
SwTextBlocks* pBlocks =
pGlossaries->GetGroupDoc( rAutoTextEntry.GetGroupName() );
OSL_ENSURE( NULL != pBlocks,
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index 485406f..cc87045 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -270,7 +270,7 @@ void SwGlossaryList::Update()
ClearGroups();
}
SwGlossaries* pGlossaries = ::GetGlossaries();
- const std::vector<String*>* pPathArr = pGlossaries->GetPathArray();
+ const std::vector<String> & rPathArr = pGlossaries->GetPathArray();
String sExt( SwGlossaries::GetExtension() );
if(!bFilled)
{
@@ -279,13 +279,13 @@ void SwGlossaryList::Update()
{
String sGrpName = pGlossaries->GetGroupName(i);
sal_uInt16 nPath = (sal_uInt16)sGrpName.GetToken(1, GLOS_DELIM).ToInt32();
- if( static_cast<size_t>(nPath) < pPathArr->size() )
+ if( static_cast<size_t>(nPath) < rPathArr.size() )
{
AutoTextGroup* pGroup = new AutoTextGroup;
pGroup->sName = sGrpName;
FillGroup(pGroup, pGlossaries);
- String sName = *(*pPathArr)[nPath];
+ String sName = rPathArr[nPath];
sName += INET_PATH_TOKEN;
sName += pGroup->sName.GetToken(0, GLOS_DELIM);
sName += sExt;
@@ -301,13 +301,13 @@ void SwGlossaryList::Update()
}
else
{
- for( size_t nPath = 0; nPath < pPathArr->size(); nPath++ )
+ for( size_t nPath = 0; nPath < rPathArr.size(); nPath++ )
{
std::vector<String> aFoundGroupNames;
std::vector<String*> aFiles;
SvPtrarr aDateTimeArr( 16 );
- SWUnoHelper::UCB_GetFileListOfFolder( *(*pPathArr)[nPath], aFiles,
+ SWUnoHelper::UCB_GetFileListOfFolder( rPathArr[nPath], aFiles,
&sExt, &aDateTimeArr );
for( size_t nFiles = 0; nFiles < aFiles.size(); ++nFiles )
{
commit e2b3be6416df0c8913b2d6bb32c34fe162a0a019
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Jan 21 19:36:01 2012 +0100
officecfg: namespace prefix make variable FILES
diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk
index b90102b..2a3b01f 100644
--- a/officecfg/Package_cppheader.mk
+++ b/officecfg/Package_cppheader.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_CustomTarget_add_outdir_dependencies,officecfg/registry, \
$(eval $(call gb_CustomTarget_add_dependencies,officecfg/registry, \
officecfg/registry/cppheader.xsl \
- $(foreach i,$(FILES),officecfg/registry/schema/org/openoffice/$(i).xcs)))
+ $(foreach i,$(officecfg_FILES),officecfg/registry/schema/org/openoffice/$(i).xcs)))
-$(eval $(foreach i,$(FILES),$(call \
+$(eval $(foreach i,$(officecfg_FILES),$(call \
gb_Package_add_file,officecfg_cppheader,inc/officecfg/$(i).hxx,$(i).hxx)))
diff --git a/officecfg/registry/Makefile b/officecfg/registry/Makefile
index edb80b0..50d872c 100644
--- a/officecfg/registry/Makefile
+++ b/officecfg/registry/Makefile
@@ -33,7 +33,7 @@ include $(WFDIR)/files.mk
.DEFAULT_GOAL := all
.PHONY: all
-all: $(foreach i,$(FILES),$(i).hxx)
+all: $(foreach i,$(officecfg_FILES),$(i).hxx)
define my_target
$(if $(1),$(1)/$(if $(2),$(2)/))%.hxx: \
diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk
index f4c72d7..21a4a15 100644
--- a/officecfg/registry/files.mk
+++ b/officecfg/registry/files.mk
@@ -1,4 +1,4 @@
-FILES = \
+officecfg_FILES = \
FirstStartWizard \
Inet \
Interaction \
commit 5967ac28790c9936ba4251806538abc1d590bfdb
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Jan 21 19:23:33 2012 +0100
sw: rtf filters: use "sw.rtf" for logging
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 17fff9a..306eaa0 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -200,7 +200,7 @@ static OString OutBorderLine(RtfExport &rExport, const SvxBorderLine* pLine,
void RtfAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/*
You would have thought that
m_rExport.Strm() << (bIsRTL ? OOO_STRING_SVTOOLS_RTF_RTLCH : OOO_STRING_SVTOOLS_RTF_LTRCH); would be sufficent here ,
@@ -238,7 +238,7 @@ void RtfAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
void RtfAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
// Output table/table row/table cell starts if needed
if ( pTextNodeInfo.get() )
@@ -287,7 +287,7 @@ void RtfAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextN
void RtfAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
FinishTableRowCell( pTextNodeInfoInner );
@@ -317,14 +317,14 @@ void RtfAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTe
void RtfAttributeOutput::EmptyParagraph()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << m_rExport.sNewLine << OOO_STRING_SVTOOLS_RTF_PAR << ' ';
}
void RtfAttributeOutput::StartParagraphProperties( const SwTxtNode& rNode )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty");
// output page/section breaks
@@ -364,14 +364,14 @@ void RtfAttributeOutput::StartParagraphProperties( const SwTxtNode& rNode )
void RtfAttributeOutput::EndParagraphProperties()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(m_aStylesEnd.makeStringAndClear());
m_rExport.Strm() << m_aStyles.makeStringAndClear().getStr();
}
void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aRun.append('{');
@@ -383,7 +383,7 @@ void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData )
void RtfAttributeOutput::EndRun()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aRun.append(m_rExport.sNewLine);
m_aRun.append(m_aRunText.makeStringAndClear());
m_aRun.append('}');
@@ -391,20 +391,20 @@ void RtfAttributeOutput::EndRun()
void RtfAttributeOutput::StartRunProperties()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty");
}
void RtfAttributeOutput::EndRunProperties( const SwRedlineData* /*pRedlineData*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(m_aStylesEnd.makeStringAndClear());
m_aRun.append(m_aStyles.makeStringAndClear());
}
void RtfAttributeOutput::RunText( const String& rText, rtl_TextEncoding eCharSet )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
RawText( rText, 0, eCharSet );
}
@@ -420,23 +420,23 @@ OStringBuffer& RtfAttributeOutput::Styles()
void RtfAttributeOutput::RawText( const String& rText, bool /*bForceUnicode*/, rtl_TextEncoding eCharSet )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aRunText.append(m_rExport.OutString(rText, eCharSet));
}
void RtfAttributeOutput::StartRuby( const SwTxtNode& /*rNode*/, xub_StrLen /*nPos*/, const SwFmtRuby& /*rRuby*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::EndRuby()
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
bool RtfAttributeOutput::StartURL( const String& rUrl, const String& rTarget )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append('{');
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_FIELD);
@@ -467,7 +467,7 @@ bool RtfAttributeOutput::StartURL( const String& rUrl, const String& rTarget )
bool RtfAttributeOutput::EndURL()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
// close the fldrslt group
if (m_bHadFieldResult)
@@ -479,7 +479,7 @@ bool RtfAttributeOutput::EndURL()
void RtfAttributeOutput::FieldVanish( const String& /*rTxt*/, ww::eField /*eType*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::Redline( const SwRedlineData* pRedline )
@@ -487,7 +487,7 @@ void RtfAttributeOutput::Redline( const SwRedlineData* pRedline )
if (!pRedline)
return;
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if (pRedline->GetType() == nsRedlineType_t::REDLINE_INSERT)
{
@@ -509,12 +509,12 @@ void RtfAttributeOutput::Redline( const SwRedlineData* pRedline )
void RtfAttributeOutput::FormatDrop( const SwTxtNode& /*rNode*/, const SwFmtDrop& /*rSwFmtDrop*/, sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t /*pTextNodeInfoInner*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
OString *pStyle = m_rExport.GetStyle(nStyle);
OStringBuffer aStyle;
@@ -530,7 +530,7 @@ void RtfAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
void RtfAttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_INTBL);
if ( m_nTableDepth > 1 )
@@ -543,14 +543,14 @@ void RtfAttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t /*
void RtfAttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfo*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/* noop */
}
void RtfAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( !m_pTableWrt )
InitTableHelper( pTableTextNodeInfoInner );
@@ -631,7 +631,7 @@ void RtfAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
void RtfAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/*
* The function name is a bit misleading: given that we write borders
@@ -687,7 +687,7 @@ void RtfAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe
void RtfAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const SwWriteTableRows& aRows = m_pTableWrt->GetRows( );
SwWriteTableRow *pRow = aRows[ pTableTextNodeInfoInner->getRow( ) ];
@@ -708,7 +708,7 @@ void RtfAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
void RtfAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
const SwTableLine * pTabLine = pTabBox->GetUpper();
@@ -736,7 +736,7 @@ void RtfAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab
void RtfAttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
const SwTableLine * pTabLine = pTabBox->GetUpper();
@@ -750,7 +750,7 @@ void RtfAttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pT
void RtfAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const SwTable * pTable = pTableTextNodeInfoInner->getTable();
const SwFrmFmt * pFrmFmt = pTable->GetFrmFmt();
@@ -763,7 +763,7 @@ void RtfAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTable
void RtfAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const SwWriteTableRows& aRows = m_pTableWrt->GetRows( );
SwWriteTableRow *pRow = aRows[ pTableTextNodeInfoInner->getRow( ) ];
@@ -790,14 +790,14 @@ void RtfAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_
void RtfAttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t /*pNodeInfo*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/* noop */
}
void RtfAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
// This is called when the nested table ends in a cell, and there's no
// paragraph benhind that; so we must check for the ends of cell, rows,
@@ -808,7 +808,7 @@ void RtfAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer
void RtfAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const SwTable *pTable = pTableTextNodeInfoInner->getTable();
SwFrmFmt *pFmt = pTable->GetFrmFmt( );
@@ -838,12 +838,12 @@ void RtfAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t
void RtfAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/* noop, see EndTableRow() */
}
@@ -854,7 +854,7 @@ void RtfAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ )
void RtfAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
sal_uInt32 nPageSize = 0;
bool bRelBoxSize = false;
@@ -876,7 +876,7 @@ void RtfAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t
void RtfAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
// To trigger calling InitTableHelper()
delete m_pTableWrt, m_pTableWrt = NULL;
@@ -885,7 +885,7 @@ void RtfAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t /*pTa
void RtfAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner->getDepth();
- SAL_INFO("sw", OSL_THIS_FUNC << ", (depth is " << nCurrentDepth << ")");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", (depth is " << nCurrentDepth << ")");
TableDefinition(pTableTextNodeInfoInner);
@@ -914,14 +914,14 @@ void RtfAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pT
void RtfAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_bTableCellOpen = true;
}
void RtfAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
TableDefaultBorders(pTableTextNodeInfoInner);
TableBackgrounds(pTableTextNodeInfoInner);
@@ -930,7 +930,7 @@ void RtfAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Pointe
void RtfAttributeOutput::EndTableCell( )
{
- SAL_INFO("sw", OSL_THIS_FUNC << ", (depth is " << m_nTableDepth << ")");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", (depth is " << m_nTableDepth << ")");
if (!m_bWroteCellInfo)
{
@@ -950,7 +950,7 @@ void RtfAttributeOutput::EndTableCell( )
void RtfAttributeOutput::EndTableRow( )
{
- SAL_INFO("sw", OSL_THIS_FUNC << ", (depth is " << m_nTableDepth << ")");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", (depth is " << m_nTableDepth << ")");
if ( m_nTableDepth > 1 )
{
@@ -977,7 +977,7 @@ void RtfAttributeOutput::EndTableRow( )
void RtfAttributeOutput::EndTable()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( m_nTableDepth > 0 ) {
m_nTableDepth--;
@@ -994,7 +994,7 @@ void RtfAttributeOutput::EndTable()
void RtfAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool /*bForceEmptyParagraph*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( pInner.get() )
{
@@ -1020,7 +1020,7 @@ void RtfAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer
void RtfAttributeOutput::StartStyles()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << m_rExport.sNewLine << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL;
m_rExport.OutColorTable();
OSL_ENSURE(m_aStylesheet.getLength() == 0, "m_aStylesheet is not empty");
@@ -1031,7 +1031,7 @@ void RtfAttributeOutput::StartStyles()
void RtfAttributeOutput::EndStyles( sal_uInt16 /*nNumberOfStyles*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << '}';
m_rExport.Strm() << m_aStylesheet.makeStringAndClear().getStr();
m_rExport.Strm() << '}';
@@ -1039,7 +1039,7 @@ void RtfAttributeOutput::EndStyles( sal_uInt16 /*nNumberOfStyles*/ )
void RtfAttributeOutput::DefaultStyle( sal_uInt16 /*nStyle*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/* noop, the default style is always 0 in RTF */
}
@@ -1048,7 +1048,7 @@ void RtfAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 /*nWwId*/, sal_uInt16 nId,
bool /* bAutoUpdate */ )
{
- SAL_INFO("sw", OSL_THIS_FUNC << ", rName = '" << OUString(rName) << "'");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", rName = '" << OUString(rName) << "'");
m_aStylesheet.append('{');
if (bPapFmt)
@@ -1072,7 +1072,7 @@ void RtfAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
void RtfAttributeOutput::EndStyle()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(m_aStylesEnd.makeStringAndClear());
OString aStyles = m_aStyles.makeStringAndClear();
m_rExport.InsStyle(m_nStyleId, aStyles);
@@ -1085,19 +1085,19 @@ void RtfAttributeOutput::EndStyle()
void RtfAttributeOutput::StartStyleProperties( bool /*bParProp*/, sal_uInt16 /*nStyle*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/* noop */
}
void RtfAttributeOutput::EndStyleProperties( bool /*bParProp*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/* noop */
}
void RtfAttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt& /*rNFmt*/, const SwFmt& /*rFmt*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( nLvl >= WW8ListManager::nMaxLevel )
nLvl = WW8ListManager::nMaxLevel - 1;
@@ -1110,7 +1110,7 @@ void RtfAttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt& /*rNF
void RtfAttributeOutput::PageBreakBefore( bool bBreak )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if (bBreak)
{
@@ -1120,7 +1120,7 @@ void RtfAttributeOutput::PageBreakBefore( bool bBreak )
void RtfAttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
switch (nC)
{
@@ -1136,7 +1136,7 @@ void RtfAttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSection
void RtfAttributeOutput::StartSection()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECT OOO_STRING_SVTOOLS_RTF_SECTD);
if (!m_bBufferSectionBreaks)
@@ -1145,7 +1145,7 @@ void RtfAttributeOutput::StartSection()
void RtfAttributeOutput::EndSection()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/*
* noop, \sect must go to StartSection or Word won't notice multiple
@@ -1155,7 +1155,7 @@ void RtfAttributeOutput::EndSection()
void RtfAttributeOutput::SectionFormProtection( bool bProtected )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED);
m_aSectionBreaks.append((sal_Int32)!bProtected);
@@ -1163,7 +1163,7 @@ void RtfAttributeOutput::SectionFormProtection( bool bProtected )
void RtfAttributeOutput::SectionLineNumbering( sal_uLong /*nRestartNo*/, const SwLineNumberInfo& rLnNumInfo )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LINEMOD;
m_rExport.OutLong(rLnNumInfo.GetCountBy());
@@ -1175,7 +1175,7 @@ void RtfAttributeOutput::SectionLineNumbering( sal_uLong /*nRestartNo*/, const S
void RtfAttributeOutput::SectionTitlePage()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/*
* noop, handled in RtfExport::WriteHeaderFooter()
@@ -1184,7 +1184,7 @@ void RtfAttributeOutput::SectionTitlePage()
void RtfAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* /*pFirstPageFmt*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const SvxBoxItem& rBox = pFmt->GetBox();
const SvxBorderLine *pLine = rBox.GetTop();
@@ -1211,14 +1211,14 @@ void RtfAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFm
void RtfAttributeOutput::SectionBiDi( bool bBiDi )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << (bBiDi ? OOO_STRING_SVTOOLS_RTF_RTLSECT : OOO_STRING_SVTOOLS_RTF_LTRSECT);
}
void RtfAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, sal_uInt16 nPageRestartNumber )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if (nPageRestartNumber > 0)
{
@@ -1245,7 +1245,7 @@ void RtfAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, sal_uInt16 n
void RtfAttributeOutput::SectionType( sal_uInt8 nBreakCode )
{
- SAL_INFO("sw", OSL_THIS_FUNC << ", nBreakCode = " << nBreakCode);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", nBreakCode = " << nBreakCode);
/*
* break code: 0 No break, 1 New column
@@ -1267,7 +1267,7 @@ void RtfAttributeOutput::SectionType( sal_uInt8 nBreakCode )
void RtfAttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &/*rRule*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE;
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTID;
@@ -1279,7 +1279,7 @@ void RtfAttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &/
void RtfAttributeOutput::StartAbstractNumbering( sal_uInt16 nId )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LIST << OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID;
m_rExport.OutULong( nId );
@@ -1288,7 +1288,7 @@ void RtfAttributeOutput::StartAbstractNumbering( sal_uInt16 nId )
void RtfAttributeOutput::EndAbstractNumbering()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTID;
m_rExport.OutULong( m_nListId ) << '}' << m_rExport.sNewLine;
@@ -1307,7 +1307,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
sal_Int16 /*nListTabPos*/,
const String &rNumberingString )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << m_rExport.sNewLine;
if( nLevel > 8 ) // RTF knows only 9 levels
@@ -1396,7 +1396,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
void RtfAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField /*eType*/, const String& rFldCmd, sal_uInt8 /*nMode*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
// If there are no field instructions, don't export it as a field.
bool bHasInstructions = rFldCmd.Len() > 0;
@@ -1456,7 +1456,7 @@ void RtfAttributeOutput::WriteHeaderFooter_Impl( const SwFrmFmt& rFmt, bool bHea
void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& /*rNdTopLeft*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const SwNode *pNode = rFrame.GetContent();
const SwGrfNode *pGrfNode = pNode ? pNode->GetGrfNode() : 0;
@@ -1744,7 +1744,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
m_aRun.append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
}
else
- SAL_INFO("sw", OSL_THIS_FUNC << " unhandled form control: '" << xInfo->getImplementationName()<< "'");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << " unhandled form control: '" << xInfo->getImplementationName()<< "'");
m_aRun.append('}');
}
}
@@ -1765,14 +1765,14 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
}
break;
default:
- SAL_INFO("sw", OSL_THIS_FUNC << ": unknown type (" << (int)rFrame.GetWriterType() << ")");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << ": unknown type (" << (int)rFrame.GetWriterType() << ")");
break;
}
}
void RtfAttributeOutput::CharCaseMap( const SvxCaseMapItem& rCaseMap )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
switch ( rCaseMap.GetValue() )
{
@@ -1793,7 +1793,7 @@ void RtfAttributeOutput::CharCaseMap( const SvxCaseMapItem& rCaseMap )
void RtfAttributeOutput::CharColor( const SvxColorItem& rColor )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const Color aColor( rColor.GetValue() );
@@ -1803,7 +1803,7 @@ void RtfAttributeOutput::CharColor( const SvxColorItem& rColor )
void RtfAttributeOutput::CharContour( const SvxContourItem& rContour )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_OUTL);
if ( !rContour.GetValue() )
@@ -1812,7 +1812,7 @@ void RtfAttributeOutput::CharContour( const SvxContourItem& rContour )
void RtfAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
switch ( rCrossedOut.GetStrikeout() )
{
@@ -1835,7 +1835,7 @@ void RtfAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
void RtfAttributeOutput::CharEscapement( const SvxEscapementItem& rEsc )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const char * pUpDn;
@@ -1885,7 +1885,7 @@ void RtfAttributeOutput::CharEscapement( const SvxEscapementItem& rEsc )
void RtfAttributeOutput::CharFont( const SvxFontItem& rFont)
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LOCH);
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F);
@@ -1895,7 +1895,7 @@ void RtfAttributeOutput::CharFont( const SvxFontItem& rFont)
void RtfAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
switch ( rFontSize.Which() )
{
@@ -1916,7 +1916,7 @@ void RtfAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
void RtfAttributeOutput::CharKerning( const SvxKerningItem& rKerning )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
// in quater points then in twips
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_EXPND);
@@ -1927,7 +1927,7 @@ void RtfAttributeOutput::CharKerning( const SvxKerningItem& rKerning )
void RtfAttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
switch (rLanguage.Which())
{
@@ -1948,7 +1948,7 @@ void RtfAttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
void RtfAttributeOutput::CharPosture( const SvxPostureItem& rPosture )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I);
if ( rPosture.GetPosture() == ITALIC_NONE )
@@ -1957,7 +1957,7 @@ void RtfAttributeOutput::CharPosture( const SvxPostureItem& rPosture )
void RtfAttributeOutput::CharShadow( const SvxShadowedItem& rShadow )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SHAD);
if ( !rShadow.GetValue() )
@@ -1966,7 +1966,7 @@ void RtfAttributeOutput::CharShadow( const SvxShadowedItem& rShadow )
void RtfAttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const char* pStr = 0;
const SfxPoolItem* pItem = m_rExport.HasItem( RES_CHRATR_WORDLINEMODE );
@@ -2042,7 +2042,7 @@ void RtfAttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline )
void RtfAttributeOutput::CharWeight( const SvxWeightItem& rWeight )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B);
if ( rWeight.GetWeight() != WEIGHT_BOLD )
@@ -2051,7 +2051,7 @@ void RtfAttributeOutput::CharWeight( const SvxWeightItem& rWeight )
void RtfAttributeOutput::CharAutoKern( const SvxAutoKernItem& rAutoKern)
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KERNING);
m_aStyles.append((sal_Int32) (rAutoKern.GetValue() ? 1 : 0));
@@ -2059,7 +2059,7 @@ void RtfAttributeOutput::CharAutoKern( const SvxAutoKernItem& rAutoKern)
void RtfAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ANIMTEXT);
m_aStyles.append((sal_Int32) (rBlink.GetValue() ? 2 : 0));
@@ -2067,7 +2067,7 @@ void RtfAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
void RtfAttributeOutput::CharBackground( const SvxBrushItem& rBrush )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if( !rBrush.GetColor().GetTransparency() )
{
@@ -2078,7 +2078,7 @@ void RtfAttributeOutput::CharBackground( const SvxBrushItem& rBrush )
void RtfAttributeOutput::CharFontCJK( const SvxFontItem& rFont )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HICH);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF);
@@ -2087,21 +2087,21 @@ void RtfAttributeOutput::CharFontCJK( const SvxFontItem& rFont )
void RtfAttributeOutput::CharFontSizeCJK( const SvxFontHeightItem& rFontSize )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
CharFontSize( rFontSize );
}
void RtfAttributeOutput::CharLanguageCJK( const SvxLanguageItem& rLanguageItem )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
CharLanguage( rLanguageItem );
}
void RtfAttributeOutput::CharPostureCJK( const SvxPostureItem& rPosture )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I);
if ( rPosture.GetPosture() == ITALIC_NONE )
@@ -2110,7 +2110,7 @@ void RtfAttributeOutput::CharPostureCJK( const SvxPostureItem& rPosture )
void RtfAttributeOutput::CharWeightCJK( const SvxWeightItem& rWeight )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B);
if ( rWeight.GetWeight() != WEIGHT_BOLD )
@@ -2119,7 +2119,7 @@ void RtfAttributeOutput::CharWeightCJK( const SvxWeightItem& rWeight )
void RtfAttributeOutput::CharFontCTL( const SvxFontItem& rFont )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF);
@@ -2128,21 +2128,21 @@ void RtfAttributeOutput::CharFontCTL( const SvxFontItem& rFont )
void RtfAttributeOutput::CharFontSizeCTL( const SvxFontHeightItem& rFontSize )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
CharFontSize( rFontSize );
}
void RtfAttributeOutput::CharLanguageCTL( const SvxLanguageItem& rLanguageItem )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
CharLanguage( rLanguageItem );
}
void RtfAttributeOutput::CharPostureCTL( const SvxPostureItem& rPosture)
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AI);
if ( rPosture.GetPosture() == ITALIC_NONE )
@@ -2151,7 +2151,7 @@ void RtfAttributeOutput::CharPostureCTL( const SvxPostureItem& rPosture)
void RtfAttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AB);
if ( rWeight.GetWeight() != WEIGHT_BOLD )
@@ -2160,7 +2160,7 @@ void RtfAttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight )
void RtfAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HORZVERT);
m_aStyles.append((sal_Int32)(rRotate.IsFitToLine() ? 1 : 0));
@@ -2168,7 +2168,7 @@ void RtfAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
void RtfAttributeOutput::CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const sal_Char* pStr;
switch( rEmphasisMark.GetEmphasisMark())
@@ -2182,7 +2182,7 @@ void RtfAttributeOutput::CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisM
void RtfAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if( rTwoLines.GetValue() )
{
@@ -2208,7 +2208,7 @@ void RtfAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
void RtfAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHARSCALEX);
m_aStyles.append((sal_Int32)rScaleWidth.GetValue());
@@ -2216,7 +2216,7 @@ void RtfAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidt
void RtfAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const sal_Char* pStr;
switch (rRelief.GetValue())
@@ -2238,7 +2238,7 @@ void RtfAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
void RtfAttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_V);
if ( !rHidden.GetValue() )
@@ -2247,7 +2247,7 @@ void RtfAttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden )
void RtfAttributeOutput::TextINetFormat( const SwFmtINetFmt& rURL )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if( rURL.GetValue().Len() )
{
@@ -2268,7 +2268,7 @@ void RtfAttributeOutput::TextINetFormat( const SwFmtINetFmt& rURL )
void RtfAttributeOutput::TextCharFormat( const SwFmtCharFmt& rCharFmt )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
sal_uInt16 nStyle = m_rExport.GetId( *rCharFmt.GetCharFmt() );
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CS);
@@ -2288,7 +2288,7 @@ void RtfAttributeOutput::WriteTextFootnoteNumStr(const SwFmtFtn& rFootnote)
void RtfAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
{
- SAL_INFO("sw", OSL_THIS_FUNC << " start");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
m_aRun.append("{" OOO_STRING_SVTOOLS_RTF_SUPER " ");
WriteTextFootnoteNumStr(rFootnote);
@@ -2317,12 +2317,12 @@ void RtfAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
m_aRun.append("}");
m_aRun.append("}");
- SAL_INFO("sw", OSL_THIS_FUNC << " end");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
}
void RtfAttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SL);
m_aStyles.append((sal_Int32)nSpace);
@@ -2333,7 +2333,7 @@ void RtfAttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
void RtfAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
switch ( rAdjust.GetAdjust() )
{
@@ -2357,7 +2357,7 @@ void RtfAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
void RtfAttributeOutput::ParaSplit( const SvxFmtSplitItem& rSplit )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if( !rSplit.GetValue() )
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KEEP);
@@ -2365,7 +2365,7 @@ void RtfAttributeOutput::ParaSplit( const SvxFmtSplitItem& rSplit )
void RtfAttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if (rWidows.GetValue())
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_WIDCTLPAR);
@@ -2375,7 +2375,7 @@ void RtfAttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
void RtfAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
long nOffset = ((SvxLRSpaceItem&)m_rExport.GetItem( RES_LR_SPACE )).GetTxtLeft();
for( sal_uInt16 n = 0; n < rTabStop.Count(); n++ )
@@ -2429,7 +2429,7 @@ void RtfAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
void RtfAttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
sal_Int32 nFlags = rHyphenZone.IsHyphen() ? 1 : 0;
if( rHyphenZone.IsPageEnd() )
@@ -2449,7 +2449,7 @@ void RtfAttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone )
void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( USHRT_MAX == nNumId || 0 == nNumId || 0 == pTxtNd)
return;
@@ -2531,7 +2531,7 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL
void RtfAttributeOutput::ParaScriptSpace( const SfxBoolItem& rScriptSpace )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if (!rScriptSpace.GetValue( ))
return;
@@ -2548,7 +2548,7 @@ void RtfAttributeOutput::ParaScriptSpace( const SfxBoolItem& rScriptSpace )
void RtfAttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const char* pStr;
switch ( rAlign.GetValue() )
@@ -2565,12 +2565,12 @@ void RtfAttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
void RtfAttributeOutput::ParaSnapToGrid( const SvxParaGridItem& /*rGrid*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax )
{
@@ -2602,12 +2602,12 @@ void RtfAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
void RtfAttributeOutput::FormatPaperBin( const SvxPaperBinItem& )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( !m_rExport.bOutFlyFrmAttrs )
{
@@ -2650,7 +2650,7 @@ void RtfAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( !m_rExport.bOutFlyFrmAttrs )
{
@@ -2704,7 +2704,7 @@ void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
void RtfAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( m_rExport.bOutFlyFrmAttrs && !m_rExport.bRTFFlySyntax )
{
@@ -2720,7 +2720,7 @@ void RtfAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
void RtfAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax )
{
@@ -2758,7 +2758,7 @@ void RtfAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert
void RtfAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax )
{
@@ -2796,7 +2796,7 @@ void RtfAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori
void RtfAttributeOutput::FormatAnchor( const SwFmtAnchor& rAnchor )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( !m_rExport.bRTFFlySyntax )
{
@@ -2819,7 +2819,7 @@ void RtfAttributeOutput::FormatAnchor( const SwFmtAnchor& rAnchor )
void RtfAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if( !rBrush.GetColor().GetTransparency() )
{
@@ -2830,7 +2830,7 @@ void RtfAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
void RtfAttributeOutput::FormatBox( const SvxBoxItem& rBox )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
static sal_uInt16 aBorders[] = {
BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT };
@@ -2872,7 +2872,7 @@ void RtfAttributeOutput::FormatBox( const SvxBoxItem& rBox )
void RtfAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& rCol, bool bEven, SwTwips nPageSize )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_COLS;
m_rExport.OutLong( nCols );
@@ -2905,7 +2905,7 @@ void RtfAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& r
void RtfAttributeOutput::FormatKeep( const SvxFmtKeepItem& rItem )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if( rItem.GetValue() )
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KEEPN);
@@ -2913,12 +2913,12 @@ void RtfAttributeOutput::FormatKeep( const SvxFmtKeepItem& rItem )
void RtfAttributeOutput::FormatTextGrid( const SwTextGridItem& /*rGrid*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if ( !rNumbering.IsCount( ) )
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_NOLINE);
@@ -2926,7 +2926,7 @@ void RtfAttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering
void RtfAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDirection )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
if (!m_rExport.bOutPageDescs)
{
@@ -2939,29 +2939,29 @@ void RtfAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir
void RtfAttributeOutput::WriteExpand( const SwField* pFld )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
String sCmd;
m_rExport.OutputField(pFld, ww::eUNKNOWN, sCmd);
}
void RtfAttributeOutput::RefField( const SwField& /*rFld*/, const String& /*rRef*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::HiddenField( const SwField& /*rFld*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::SetField( const SwField& /*rFld*/, ww::eField /*eType*/, const String& /*rCmd*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::PostitField( const SwField* pFld )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
const SwPostItField& rPFld = *(SwPostItField*)pFld;
@@ -3001,12 +3001,12 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport &rExport )
m_bWroteCellInfo( false ),
m_bHadFieldResult( false )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
}
RtfAttributeOutput::~RtfAttributeOutput()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
}
MSWordExportBase& RtfAttributeOutput::GetExport()
@@ -3019,7 +3019,7 @@ MSWordExportBase& RtfAttributeOutput::GetExport()
/// Start the font.
void RtfAttributeOutput::StartFont( const String& rFamilyName ) const
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << OUStringToOString( OUString( rFamilyName ), m_rExport.eCurrentEncoding ).getStr();
}
@@ -3027,7 +3027,7 @@ void RtfAttributeOutput::StartFont( const String& rFamilyName ) const
/// End the font.
void RtfAttributeOutput::EndFont() const
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << ";}";
}
@@ -3035,7 +3035,7 @@ void RtfAttributeOutput::EndFont() const
/// Alternate name for the font.
void RtfAttributeOutput::FontAlternateName( const String& rName ) const
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_FALT << ' ';
m_rExport.Strm() << OUStringToOString( OUString( rName ), m_rExport.eCurrentEncoding ).getStr() << '}';
@@ -3044,7 +3044,7 @@ void RtfAttributeOutput::FontAlternateName( const String& rName ) const
/// Font charset.
void RtfAttributeOutput::FontCharset( sal_uInt8 nCharSet ) const
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_FCHARSET;
m_rExport.OutULong( nCharSet );
@@ -3054,7 +3054,7 @@ void RtfAttributeOutput::FontCharset( sal_uInt8 nCharSet ) const
/// Font family.
void RtfAttributeOutput::FontFamilyType( FontFamily eFamily, const wwFont &rFont ) const
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_F;
@@ -3085,7 +3085,7 @@ void RtfAttributeOutput::FontFamilyType( FontFamily eFamily, const wwFont &rFont
/// Font pitch.
void RtfAttributeOutput::FontPitchType( FontPitch ePitch ) const
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_FPRQ;
@@ -3260,7 +3260,7 @@ static OString ExportPICT( const SwFlyFrmFmt* pFlyFrmFmt, const Size &rOrig, con
void RtfAttributeOutput::FlyFrameOLEData( SwOLENode& rOLENode )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
uno::Reference < embed::XEmbeddedObject > xObj(const_cast<SwOLENode&>(rOLENode).GetOLEObj().GetOleRef());
sal_Int64 nAspect = rOLENode.GetAspect();
@@ -3303,7 +3303,7 @@ void RtfAttributeOutput::FlyFrameOLEData( SwOLENode& rOLENode )
void RtfAttributeOutput::FlyFrameOLE( const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
SvMemoryStream aStream;
const sal_uInt8* pGraphicAry = 0;
@@ -3343,7 +3343,7 @@ void RtfAttributeOutput::FlyFrameOLE( const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode&
void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode& rGrfNode)
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
SvMemoryStream aStream;
const sal_uInt8* pGraphicAry = 0;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 6a9679f..ecb21cb 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -140,7 +140,7 @@ bool RtfExport::CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich
void RtfExport::AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
std::vector< OUString > aStarts;
std::vector< OUString > aEnds;
@@ -168,7 +168,7 @@ void RtfExport::AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub
void RtfExport::AppendBookmark( const OUString& rName, bool /*bSkip*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
std::vector<OUString> aStarts;
std::vector<OUString> aEnds;
@@ -181,7 +181,7 @@ void RtfExport::AppendBookmark( const OUString& rName, bool /*bSkip*/ )
void RtfExport::WriteChar( sal_Unicode )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
/* WriteChar() has nothing to do for rtf. */
}
@@ -231,7 +231,7 @@ void RtfExport::BuildNumbering()
void RtfExport::WriteNumbering()
{
- SAL_INFO("sw", OSL_THIS_FUNC << " start");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
if ( !pUsedNumTbl )
return; // no numbering is used
@@ -244,12 +244,12 @@ void RtfExport::WriteNumbering()
NumberingDefinitions();
Strm() << '}';
- SAL_INFO("sw", OSL_THIS_FUNC << " end");
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end");
}
void RtfExport::WriteRevTab()
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
int nRevAuthors = pDoc->GetRedlineTbl().Count();
@@ -283,7 +283,7 @@ void RtfExport::WriteRevTab()
void RtfExport::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 /*nBreakCode*/ )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
// headers
if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_EVEN )
@@ -308,19 +308,19 @@ void RtfExport::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
void RtfExport::OutputField( const SwField* pFld, ww::eField eFldType, const String& rFldCmd, sal_uInt8 nMode )
{
- SAL_INFO("sw", OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", OSL_THIS_FUNC);
m_pAttrOutput->WriteField_Impl( pFld, eFldType, rFldCmd, nMode );
}
void RtfExport::WriteFormData( const ::sw::mark::IFieldmark& /*rFieldmark*/ )
{
- SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
+ SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list