Skip to content

C
core
Kaydet (Commit) 87f0fa6b authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

sw: prefix members of SwHTMLParser 

Change-Id: I3d4b39a79c49f847c6814215593d86e8d992b38a
üst 0e93ef3e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 192 deletions
sw/source/filter/html/htmlbas.cxx
Dosyayı görüntüle @ 87f0fa6b
......@@ -60,13 +60,13 @@ static HTMLOutEvent aBodyEventTable[] =
void SwHTMLParser::NewScript()
{
ParseScriptOptions( aScriptType, sBaseURL, eScriptLang, aScriptURL,
aBasicLib, aBasicModule );
ParseScriptOptions( m_aScriptType, m_sBaseURL, m_eScriptLang, m_aScriptURL,
m_aBasicLib, m_aBasicModule );
if( !aScriptURL.isEmpty() )
if( !m_aScriptURL.isEmpty() )
{
// Den Inhalt des Script-Tags ignorieren
bIgnoreRawData = true;
m_bIgnoreRawData = true;
}
}
......@@ -75,7 +75,7 @@ void SwHTMLParser::EndScript()
bool bInsIntoBasic = false,
bInsSrcIntoField = false;
switch( eScriptLang )
switch( m_eScriptLang )
{
case HTML_SL_STARBASIC:
bInsIntoBasic = true;
......@@ -85,34 +85,34 @@ void SwHTMLParser::EndScript()
break;
}
bIgnoreRawData = false;
aScriptSource = convertLineEnd(aScriptSource, GetSystemLineEnd());
m_bIgnoreRawData = false;
m_aScriptSource = convertLineEnd(m_aScriptSource, GetSystemLineEnd());
// Ausser StarBasic und unbenutzem JavaScript jedes Script oder den
// Modulnamen in einem Feld merken merken
if( bInsSrcIntoField && !bIgnoreHTMLComments )
if( bInsSrcIntoField && !m_bIgnoreHTMLComments )
{
SwScriptFieldType *pType =
static_cast<SwScriptFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
static_cast<SwScriptFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_SCRIPTFLD ));
SwScriptField aField( pType, aScriptType,
!aScriptURL.isEmpty() ? aScriptURL : aScriptSource,
!aScriptURL.isEmpty() );
SwScriptField aField( pType, m_aScriptType,
!m_aScriptURL.isEmpty() ? m_aScriptURL : m_aScriptSource,
!m_aScriptURL.isEmpty() );
InsertAttr( SwFormatField( aField ) );
}
SwDocShell *pDocSh = pDoc->GetDocShell();
if( !aScriptSource.isEmpty() && pDocSh &&
SwDocShell *pDocSh = m_pDoc->GetDocShell();
if( !m_aScriptSource.isEmpty() && pDocSh &&
bInsIntoBasic && IsNewDoc() )
{
// Fuer JavaScript und StarBasic noch ein Basic-Modul anlegen
// Das Basic entfernt natuerlich weiterhin keine SGML-Kommentare
RemoveSGMLComment( aScriptSource, true );
RemoveSGMLComment( m_aScriptSource, true );
// get library name
OUString aLibName;
if( !aBasicLib.isEmpty() )
aLibName = aBasicLib;
if( !m_aBasicLib.isEmpty() )
aLibName = m_aBasicLib;
else
aLibName = "Standard";
......@@ -136,24 +136,24 @@ void SwHTMLParser::EndScript()
if ( xModLib.is() )
{
if( aBasicModule.isEmpty() )
if( m_aBasicModule.isEmpty() )
{
// create module name
bool bFound = true;
while( bFound )
{
aBasicModule = "Modul";
aBasicModule += OUString::number( (sal_Int32)(++nSBModuleCnt) );
bFound = xModLib->hasByName( aBasicModule );
m_aBasicModule = "Modul";
m_aBasicModule += OUString::number( (sal_Int32)(++m_nSBModuleCnt) );
bFound = xModLib->hasByName( m_aBasicModule );
}
}
// create module
OUString aModName( aBasicModule );
OUString aModName( m_aBasicModule );
if ( !xModLib->hasByName( aModName ) )
{
Any aElement;
aElement <<= OUString( aScriptSource );
aElement <<= OUString( m_aScriptSource );
xModLib->insertByName( aModName , aElement );
}
}
......@@ -172,63 +172,63 @@ void SwHTMLParser::EndScript()
}
}
aScriptSource.clear();
aScriptType.clear();
aScriptURL.clear();
m_aScriptSource.clear();
m_aScriptType.clear();
m_aScriptURL.clear();
aBasicLib.clear();
aBasicModule.clear();
m_aBasicLib.clear();
m_aBasicModule.clear();
}
void SwHTMLParser::AddScriptSource()
{
// Hier merken wir und nur ein par Strings
if( aToken.getLength() > 2 &&
(HTML_SL_STARBASIC==eScriptLang && aToken[ 0 ] == '\'') )
(HTML_SL_STARBASIC==m_eScriptLang && aToken[ 0 ] == '\'') )
{
sal_Int32 nPos = -1;
if( aBasicLib.isEmpty() )
if( m_aBasicLib.isEmpty() )
{
nPos = aToken.indexOf( OOO_STRING_SVTOOLS_HTML_SB_library );
if( nPos != -1 )
{
aBasicLib =
m_aBasicLib =
aToken.copy( nPos + sizeof(OOO_STRING_SVTOOLS_HTML_SB_library) - 1 );
aBasicLib = comphelper::string::strip(aBasicLib, ' ');
m_aBasicLib = comphelper::string::strip(m_aBasicLib, ' ');
}
}
if( aBasicModule.isEmpty() && nPos == -1 )
if( m_aBasicModule.isEmpty() && nPos == -1 )
{
nPos = aToken.indexOf( OOO_STRING_SVTOOLS_HTML_SB_module );
if( nPos != -1 )
{
aBasicModule =
m_aBasicModule =
aToken.copy( nPos + sizeof(OOO_STRING_SVTOOLS_HTML_SB_module) - 1 );
aBasicModule = comphelper::string::strip(aBasicModule, ' ');
m_aBasicModule = comphelper::string::strip(m_aBasicModule, ' ');
}
}
if( nPos == -1 )
{
if( !aScriptSource.isEmpty() )
aScriptSource += "\n";
aScriptSource += aToken;
if( !m_aScriptSource.isEmpty() )
m_aScriptSource += "\n";
m_aScriptSource += aToken;
}
}
else if( !aScriptSource.isEmpty() || !aToken.isEmpty() )
else if( !m_aScriptSource.isEmpty() || !aToken.isEmpty() )
{
// Leerzeilen am Anfang werden ignoriert
if( !aScriptSource.isEmpty() )
if( !m_aScriptSource.isEmpty() )
{
aScriptSource += "\n";
m_aScriptSource += "\n";
}
else
{
// Wir stehen hinter dem CR/LF der Zeile davor
nScriptStartLineNr = GetLineNr() - 1;
m_nScriptStartLineNr = GetLineNr() - 1;
}
aScriptSource += aToken;
m_aScriptSource += aToken;
}
}
......@@ -240,7 +240,7 @@ void SwHTMLParser::InsertBasicDocEvent( const OUString& aEvent, const OUString&
if( rName.isEmpty() )
return;
SwDocShell *pDocSh = pDoc->GetDocShell();
SwDocShell *pDocSh = m_pDoc->GetDocShell();
OSL_ENSURE( pDocSh, "Wo ist die DocShell?" );
if( !pDocSh )
return;
......
sw/source/filter/html/htmldrawreader.cxx
Dosyayı görüntüle @ 87f0fa6b
......@@ -81,9 +81,9 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
// always on top of text.
// but in invisible layer. <ConnectToLayout> will move the object
// to the visible layer.
pNewDrawObj->SetLayer( pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() );
pNewDrawObj->SetLayer( m_pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() );
SfxItemSet aFrmSet( pDoc->GetAttrPool(),
SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
if( !IsNewDoc() )
Reader::ResetFrameFormatAttrs( aFrmSet );
......@@ -159,7 +159,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
{
const SwStartNode *pFlySttNd =
pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
m_pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
if( pFlySttNd )
{
......@@ -196,11 +196,11 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
}
else if( FLY_AT_FLY != aAnchor.GetAnchorId() )
{
aAnchor.SetAnchor( pPam->GetPoint() );
aAnchor.SetAnchor( m_pPam->GetPoint() );
}
aFrmSet.Put( aAnchor );
pDoc->getIDocumentContentOperations().InsertDrawObj( *pPam, *pNewDrawObj, aFrmSet );
m_pDoc->getIDocumentContentOperations().InsertDrawObj( *m_pPam, *pNewDrawObj, aFrmSet );
}
static void PutEEPoolItem( SfxItemSet &rEEItemSet,
......@@ -251,8 +251,8 @@ static void PutEEPoolItem( SfxItemSet &rEEItemSet,
void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
{
OSL_ENSURE( !pMarquee, "Marquee in Marquee???" );
aContents.clear();
OSL_ENSURE( !m_pMarquee, "Marquee in Marquee???" );
m_aContents.clear();
OUString aId, aStyle, aClass;
......@@ -359,14 +359,14 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// Ein DrawTextobj anlegen
// #i52858# - method name changed
SwDrawModel* pModel = pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
SwDrawModel* pModel = m_pDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
SdrPage* pPg = pModel->GetPage( 0 );
pMarquee = SdrObjFactory::MakeNewObject( SdrInventor,
m_pMarquee = SdrObjFactory::MakeNewObject( SdrInventor,
OBJ_TEXT, pPg, pModel );
if( !pMarquee )
if( !m_pMarquee )
return;
pPg->InsertObject( pMarquee );
pPg->InsertObject( m_pMarquee );
if( !aId.isEmpty() )
InsertBookmark( aId );
......@@ -400,7 +400,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// die Default-Farbe (aus der Standard-Vorlage) setzen, damit ueberhaupt
// eine sinnvolle Farbe gesetzt ist.
const Color& rDfltColor =
pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
m_pCSS1Parser->GetTextCollFromPool( RES_POOLCOLL_STANDARD )
->GetColor().GetValue();
aItemSet.Put( SvxColorItem( rDfltColor, EE_CHAR_COLOR ) );
......@@ -418,7 +418,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
0
};
SwTextNode const*const pTextNd =
pPam->GetPoint()->nNode.GetNode().GetTextNode();
m_pPam->GetPoint()->nNode.GetNode().GetTextNode();
if( pTextNd )
{
const SfxItemSet& rItemSet = pTextNd->GetAnyFormatColl().GetAttrSet();
......@@ -431,7 +431,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
}
// die Attribute der Umgebung am Draw-Objekt setzen
_HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&aAttrTab);
_HTMLAttr** pHTMLAttributes = reinterpret_cast<_HTMLAttr**>(&m_aAttrTab);
for (auto nCnt = sizeof(_HTMLAttrTable) / sizeof(_HTMLAttr*); nCnt--; ++pHTMLAttributes)
{
_HTMLAttr *pAttr = *pHTMLAttributes;
......@@ -447,8 +447,8 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// Styles parsen (funktioniert hier nur fuer Attribute, die auch
// am Zeichen-Objekt gesetzt werden koennen)
SfxItemSet aStyleItemSet( pDoc->GetAttrPool(),
pCSS1Parser->GetWhichMap() );
SfxItemSet aStyleItemSet( m_pDoc->GetAttrPool(),
m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( HasStyleOptions( aStyle, aId, aClass ) &&
ParseStyleOptions( aStyle, aId, aClass, aStyleItemSet, aPropInfo ) )
......@@ -480,10 +480,10 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eHeightType )
aTwipSz.Height() = aPropInfo.nHeight;
bFixMarqueeWidth = false;
m_bFixMarqueeWidth = false;
if( !nWidth || bPrcWidth )
{
if( pTable )
if( m_pTable )
{
if( !pCurTable )
{
......@@ -491,7 +491,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// in einer Zelle. Da jetzt keine vernuenftige Zuordung
// zu einer Zelle moeglich ist, passen wir hir die
// Breite dem Inhalt der Laufschrift an.
bFixMarqueeWidth = true;
m_bFixMarqueeWidth = true;
}
else if( !nWidth )
{
......@@ -516,14 +516,14 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
aTwipSz.Height() = MINFLY;
aItemSet.Put( makeSdrTextMinFrameHeightItem( aTwipSz.Height() ) );
pMarquee->SetMergedItemSetAndBroadcast(aItemSet);
m_pMarquee->SetMergedItemSetAndBroadcast(aItemSet);
if( aTwipSz.Width() < MINFLY )
aTwipSz.Width() = MINFLY;
pMarquee->SetLogicRect( Rectangle( 0, 0, aTwipSz.Width(), aTwipSz.Height() ) );
m_pMarquee->SetLogicRect( Rectangle( 0, 0, aTwipSz.Width(), aTwipSz.Height() ) );
// und das Objekt in das Dok einfuegen
InsertDrawObject( pMarquee, aSpace, eVertOri, eHoriOri, aStyleItemSet,
InsertDrawObject( m_pMarquee, aSpace, eVertOri, eHoriOri, aStyleItemSet,
aPropInfo );
// Das Zeichen-Objekt der Tabelle bekanntmachen. Ist ein bisserl
......@@ -533,44 +533,44 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
// pTable kann uebrigens auch nicht verwendet werden, denn die
// Laufschrift kann sich auch mal in einer Sub-Tabelle befinden.
if( pCurTable && bPrcWidth)
RegisterDrawObjectToTable( pCurTable, pMarquee, (sal_uInt8)nWidth );
RegisterDrawObjectToTable( pCurTable, m_pMarquee, (sal_uInt8)nWidth );
}
void SwHTMLParser::EndMarquee()
{
OSL_ENSURE( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
OSL_ENSURE( m_pMarquee && OBJ_TEXT==m_pMarquee->GetObjIdentifier(),
"kein Marquee oder falscher Typ" );
if( bFixMarqueeWidth )
if( m_bFixMarqueeWidth )
{
// Da es keine fixe Hoehe gibt, das Text-Objekt erstmal breiter
// als den Text machen, damit nicht umgebrochen wird.
const Rectangle& rOldRect = pMarquee->GetLogicRect();
pMarquee->SetLogicRect( Rectangle( rOldRect.TopLeft(),
const Rectangle& rOldRect = m_pMarquee->GetLogicRect();
m_pMarquee->SetLogicRect( Rectangle( rOldRect.TopLeft(),
Size( USHRT_MAX, 240 ) ) );
}
// den gesammelten Text einfuegen
static_cast<SdrTextObj*>(pMarquee)->SetText( aContents );
pMarquee->SetMergedItemSetAndBroadcast( pMarquee->GetMergedItemSet() );
static_cast<SdrTextObj*>(m_pMarquee)->SetText( m_aContents );
m_pMarquee->SetMergedItemSetAndBroadcast( m_pMarquee->GetMergedItemSet() );
if( bFixMarqueeWidth )
if( m_bFixMarqueeWidth )
{
// die Groesse dem Text anpassen.
static_cast<SdrTextObj*>(pMarquee)->FitFrameToTextSize();
static_cast<SdrTextObj*>(m_pMarquee)->FitFrameToTextSize();
}
aContents.clear();
pMarquee = 0;
m_aContents.clear();
m_pMarquee = 0;
}
void SwHTMLParser::InsertMarqueeText()
{
OSL_ENSURE( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
OSL_ENSURE( m_pMarquee && OBJ_TEXT==m_pMarquee->GetObjIdentifier(),
"kein Marquee oder falscher Typ" );
// das akteulle Textstueck an den Text anhaengen
aContents += aToken;
m_aContents += aToken;
}
void SwHTMLParser::ResizeDrawObject( SdrObject* pObj, SwTwips nWidth )
......
sw/source/filter/html/htmlfld.cxx
Dosyayı görüntüle @ 87f0fa6b
......@@ -264,7 +264,7 @@ void SwHTMLParser::NewField()
{
SvtUserOptions aOpt;
const OUString& rUser = aOpt.GetFullName();
SwDocShell *pDocShell(pDoc->GetDocShell());
SwDocShell *pDocShell(m_pDoc->GetDocShell());
OSL_ENSURE(pDocShell, "no SwDocShell");
if (pDocShell) {
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
......@@ -284,7 +284,7 @@ void SwHTMLParser::NewField()
if( RES_DATEFLD==nType || RES_TIMEFLD==nType )
nWhich = RES_DATETIMEFLD;
SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetSysFieldType( nWhich );
SwFieldType* pType = m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( nWhich );
SwField *pNewField = 0;
bool bInsOnEndTag = false;
......@@ -347,7 +347,7 @@ void SwHTMLParser::NewField()
if( !aValue.isEmpty() )
nSub |= FIXEDFLD;
SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
SvNumberFormatter *pFormatter = m_pDoc->GetNumberFormatter();
if( pFormatOption )
{
const OUString& rFormat = pFormatOption->GetString();
......@@ -378,12 +378,12 @@ void SwHTMLParser::NewField()
{
sal_uInt16 nSub = 0;
SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter();
SvNumberFormatter *pFormatter = m_pDoc->GetNumberFormatter();
sal_uInt32 nNumFormat;
LanguageType eLang;
double dValue = GetTableDataOptionsValNum(
nNumFormat, eLang, aNumValue, aNumFormat,
*pDoc->GetNumberFormatter() );
*m_pDoc->GetNumberFormatter() );
short nFormatType = pFormatter->GetType( nNumFormat );
switch( nFormatType )
{
......@@ -456,7 +456,7 @@ void SwHTMLParser::NewField()
LanguageType eLang;
dValue = GetTableDataOptionsValNum(
nNumFormat, eLang, aNumValue, aNumFormat,
*pDoc->GetNumberFormatter() );
*m_pDoc->GetNumberFormatter() );
bFixed &= bHasNumValue;
}
else
......@@ -493,7 +493,7 @@ void SwHTMLParser::NewField()
if( pFormatOption )
pFormatOption->GetEnum( nFormat, aHTMLPageNumFieldFormatTable );
pNewField = new SwDocStatField(static_cast<SwDocStatFieldType*>(pType), nSub, nFormat);
bUpdateDocStat |= (DS_PAGE != nFormat);
m_bUpdateDocStat |= (DS_PAGE != nFormat);
}
}
break;
......@@ -520,77 +520,77 @@ void SwHTMLParser::NewField()
{
if (bInsOnEndTag)
{
pField = pNewField;
m_pField = pNewField;
}
else
{
pDoc->getIDocumentContentOperations().InsertPoolItem(*pPam, SwFormatField(*pNewField));
m_pDoc->getIDocumentContentOperations().InsertPoolItem(*m_pPam, SwFormatField(*pNewField));
delete pNewField;
}
bInField = true;
m_bInField = true;
}
}
void SwHTMLParser::EndField()
{
if( pField )
if( m_pField )
{
switch( pField->Which() )
switch( m_pField->Which() )
{
case RES_DOCINFOFLD:
OSL_ENSURE( static_cast<SwDocInfoField*>(pField)->IsFixed(),
OSL_ENSURE( static_cast<SwDocInfoField*>(m_pField)->IsFixed(),
"DokInfo-Feld haette nicht gemerkt werden muessen" );
static_cast<SwDocInfoField*>(pField)->SetExpansion( aContents );
static_cast<SwDocInfoField*>(m_pField)->SetExpansion( m_aContents );
break;
case RES_EXTUSERFLD:
OSL_ENSURE( static_cast<SwExtUserField*>(pField)->IsFixed(),
OSL_ENSURE( static_cast<SwExtUserField*>(m_pField)->IsFixed(),
"ExtUser-Feld haette nicht gemerkt werden muessen" );
static_cast<SwExtUserField*>(pField)->SetExpansion( aContents );
static_cast<SwExtUserField*>(m_pField)->SetExpansion( m_aContents );
break;
case RES_AUTHORFLD:
OSL_ENSURE( static_cast<SwAuthorField*>(pField)->IsFixed(),
OSL_ENSURE( static_cast<SwAuthorField*>(m_pField)->IsFixed(),
"Author-Feld haette nicht gemerkt werden muessen" );
static_cast<SwAuthorField*>(pField)->SetExpansion( aContents );
static_cast<SwAuthorField*>(m_pField)->SetExpansion( m_aContents );
break;
case RES_FILENAMEFLD:
OSL_ENSURE( static_cast<SwFileNameField*>(pField)->IsFixed(),
OSL_ENSURE( static_cast<SwFileNameField*>(m_pField)->IsFixed(),
"FileName-Feld haette nicht gemerkt werden muessen" );
static_cast<SwFileNameField*>(pField)->SetExpansion( aContents );
static_cast<SwFileNameField*>(m_pField)->SetExpansion( m_aContents );
break;
}
pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, SwFormatField(*pField) );
delete pField;
pField = 0;
m_pDoc->getIDocumentContentOperations().InsertPoolItem( *m_pPam, SwFormatField(*m_pField) );
delete m_pField;
m_pField = 0;
}
bInField = false;
aContents.clear();
m_bInField = false;
m_aContents.clear();
}
void SwHTMLParser::InsertFieldText()
{
if( pField )
if( m_pField )
{
// das aktuelle Textstueck an den Text anhaengen
aContents += aToken;
m_aContents += aToken;
}
}
void SwHTMLParser::InsertCommentText( const sal_Char *pTag )
{
bool bEmpty = aContents.isEmpty();
bool bEmpty = m_aContents.isEmpty();
if( !bEmpty )
aContents += "\n";
m_aContents += "\n";
aContents += aToken;
m_aContents += aToken;
if( bEmpty && pTag )
{
OUString aTmp( aContents );
aContents = "HTML: <" + OUString( *pTag ) + ">" + aTmp;
OUString aTmp( m_aContents );
m_aContents = "HTML: <" + OUString( *pTag ) + ">" + aTmp;
}
}
......@@ -607,18 +607,18 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
// MIB 24.06.97: Wenn ein PostIt nach einen Space eingefuegt
// werden soll, fuegen wir es vor dem Space ein. Dann gibt es
// weniger Probleme beim Formatieren (bug #40483#)
const sal_Int32 nPos = pPam->GetPoint()->nContent.GetIndex();
SwTextNode *pTextNd = pPam->GetNode().GetTextNode();
const sal_Int32 nPos = m_pPam->GetPoint()->nContent.GetIndex();
SwTextNode *pTextNd = m_pPam->GetNode().GetTextNode();
bool bMoveFwd = false;
if (nPos>0 && pTextNd && (' ' == pTextNd->GetText()[nPos-1]))
{
bMoveFwd = true;
sal_uLong nNodeIdx = pPam->GetPoint()->nNode.GetIndex();
const sal_Int32 nIdx = pPam->GetPoint()->nContent.GetIndex();
for( auto i = aSetAttrTab.size(); i > 0; )
sal_uLong nNodeIdx = m_pPam->GetPoint()->nNode.GetIndex();
const sal_Int32 nIdx = m_pPam->GetPoint()->nContent.GetIndex();
for( auto i = m_aSetAttrTab.size(); i > 0; )
{
_HTMLAttr *pAttr = aSetAttrTab[--i];
_HTMLAttr *pAttr = m_aSetAttrTab[--i];
if( pAttr->GetSttParaIdx() != nNodeIdx ||
pAttr->GetSttCnt() != nIdx )
break;
......@@ -632,16 +632,16 @@ void SwHTMLParser::InsertComment( const OUString& rComment, const sal_Char *pTag
}
if( bMoveFwd )
pPam->Move( fnMoveBackward );
m_pPam->Move( fnMoveBackward );
}
SwPostItField aPostItField(
static_cast<SwPostItFieldType*>(pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_POSTITFLD )),
aEmptyOUStr, aComment, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM ) );
InsertAttr( SwFormatField( aPostItField ) );
if( bMoveFwd )
pPam->Move( fnMoveForward );
m_pPam->Move( fnMoveForward );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/filter/html/htmlftn.cxx
Dosyayı görüntüle @ 87f0fa6b
......@@ -123,14 +123,14 @@ sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo,
void SwHTMLParser::FillEndNoteInfo( const OUString& rContent )
{
SwEndNoteInfo aInfo( pDoc->GetEndNoteInfo() );
SwEndNoteInfo aInfo( m_pDoc->GetEndNoteInfo() );
lcl_html_getEndNoteInfo( aInfo, rContent, true );
pDoc->SetEndNoteInfo( aInfo );
m_pDoc->SetEndNoteInfo( aInfo );
}
void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
{
SwFootnoteInfo aInfo( pDoc->GetFootnoteInfo() );
SwFootnoteInfo aInfo( m_pDoc->GetFootnoteInfo() );
sal_Int32 nStrPos = lcl_html_getEndNoteInfo( aInfo, rContent, false );
......@@ -177,80 +177,80 @@ void SwHTMLParser::FillFootNoteInfo( const OUString& rContent )
}
}
pDoc->SetFootnoteInfo( aInfo );
m_pDoc->SetFootnoteInfo( aInfo );
}
void SwHTMLParser::InsertFootEndNote( const OUString& rName, bool bEndNote,
bool bFixed )
{
if( !pFootEndNoteImpl )
pFootEndNoteImpl = new SwHTMLFootEndNote_Impl;
pFootEndNoteImpl->sName = rName;
if( pFootEndNoteImpl->sName.getLength() > 3 )
pFootEndNoteImpl->sName = pFootEndNoteImpl->sName.copy( 0, pFootEndNoteImpl->sName.getLength() - 3 );
pFootEndNoteImpl->sName = pFootEndNoteImpl->sName.toAsciiUpperCase();
pFootEndNoteImpl->bEndNote = bEndNote;
pFootEndNoteImpl->bFixed = bFixed;
pFootEndNoteImpl->sContent = aEmptyOUStr;
if( !m_pFootEndNoteImpl )
m_pFootEndNoteImpl = new SwHTMLFootEndNote_Impl;
m_pFootEndNoteImpl->sName = rName;
if( m_pFootEndNoteImpl->sName.getLength() > 3 )
m_pFootEndNoteImpl->sName = m_pFootEndNoteImpl->sName.copy( 0, m_pFootEndNoteImpl->sName.getLength() - 3 );
m_pFootEndNoteImpl->sName = m_pFootEndNoteImpl->sName.toAsciiUpperCase();
m_pFootEndNoteImpl->bEndNote = bEndNote;
m_pFootEndNoteImpl->bFixed = bFixed;
m_pFootEndNoteImpl->sContent = aEmptyOUStr;
}
void SwHTMLParser::FinishFootEndNote()
{
if( !pFootEndNoteImpl )
if( !m_pFootEndNoteImpl )
return;
SwFormatFootnote aFootnote( pFootEndNoteImpl->bEndNote );
if( pFootEndNoteImpl->bFixed )
aFootnote.SetNumStr( pFootEndNoteImpl->sContent );
SwFormatFootnote aFootnote( m_pFootEndNoteImpl->bEndNote );
if( m_pFootEndNoteImpl->bFixed )
aFootnote.SetNumStr( m_pFootEndNoteImpl->sContent );
pDoc->getIDocumentContentOperations().InsertPoolItem( *pPam, aFootnote );
m_pDoc->getIDocumentContentOperations().InsertPoolItem( *m_pPam, aFootnote );
SwTextFootnote * const pTextFootnote = static_cast<SwTextFootnote *>(
pPam->GetNode().GetTextNode()->GetTextAttrForCharAt(
pPam->GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_FTN ) );
m_pPam->GetNode().GetTextNode()->GetTextAttrForCharAt(
m_pPam->GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_FTN ) );
// In Kopf- und Fusszeilen duerfen keine Fussnoten eingefuegt werden.
if( pTextFootnote )
{
pFootEndNoteImpl->aTextFootnotes.push_back( pTextFootnote );
pFootEndNoteImpl->aNames.push_back(pFootEndNoteImpl->sName);
m_pFootEndNoteImpl->aTextFootnotes.push_back( pTextFootnote );
m_pFootEndNoteImpl->aNames.push_back(m_pFootEndNoteImpl->sName);
}
pFootEndNoteImpl->sName = aEmptyOUStr;
pFootEndNoteImpl->sContent = aEmptyOUStr;
pFootEndNoteImpl->bFixed = false;
m_pFootEndNoteImpl->sName = aEmptyOUStr;
m_pFootEndNoteImpl->sContent = aEmptyOUStr;
m_pFootEndNoteImpl->bFixed = false;
}
void SwHTMLParser::InsertFootEndNoteText()
{
if( pFootEndNoteImpl && pFootEndNoteImpl->bFixed )
pFootEndNoteImpl->sContent += aToken;
if( m_pFootEndNoteImpl && m_pFootEndNoteImpl->bFixed )
m_pFootEndNoteImpl->sContent += aToken;
}
void SwHTMLParser::DeleteFootEndNoteImpl()
{
delete pFootEndNoteImpl;
pFootEndNoteImpl = 0;
delete m_pFootEndNoteImpl;
m_pFootEndNoteImpl = 0;
}
SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const OUString& rName )
{
SwNodeIndex *pStartNodeIdx = 0;
if( pFootEndNoteImpl )
if( m_pFootEndNoteImpl )
{
OUString aName(rName.toAsciiUpperCase());
size_t nCount = pFootEndNoteImpl->aNames.size();
size_t nCount = m_pFootEndNoteImpl->aNames.size();
for(size_t i = 0; i < nCount; ++i)
{
if(pFootEndNoteImpl->aNames[i] == aName)
if(m_pFootEndNoteImpl->aNames[i] == aName)
{
pStartNodeIdx = pFootEndNoteImpl->aTextFootnotes[i]->GetStartNode();
pFootEndNoteImpl->aNames.erase(pFootEndNoteImpl->aNames.begin() + i);
pFootEndNoteImpl->aTextFootnotes.erase( pFootEndNoteImpl->aTextFootnotes.begin() + i );
if(pFootEndNoteImpl->aNames.empty())
pStartNodeIdx = m_pFootEndNoteImpl->aTextFootnotes[i]->GetStartNode();
m_pFootEndNoteImpl->aNames.erase(m_pFootEndNoteImpl->aNames.begin() + i);
m_pFootEndNoteImpl->aTextFootnotes.erase( m_pFootEndNoteImpl->aTextFootnotes.begin() + i );
if(m_pFootEndNoteImpl->aNames.empty())
{
delete pFootEndNoteImpl;
pFootEndNoteImpl = 0;
delete m_pFootEndNoteImpl;
m_pFootEndNoteImpl = 0;
}
break;
......
sw/source/filter/html/htmlnumreader.cxx
Dosyayı görüntüle @ 87f0fa6b
......@@ -57,8 +57,8 @@ void SwHTMLParser::NewNumBulList( int nToken )
SwHTMLNumRuleInfo& rInfo = GetNumInfo();
// Erstmal einen neuen Absatz aufmachen
bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 0;
if( pPam->GetPoint()->nContent.GetIndex() )
bool bSpace = (rInfo.GetDepth() + m_nDefListDeep) == 0;
if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
else if( bSpace )
AddParSpace();
......@@ -71,8 +71,8 @@ void SwHTMLParser::NewNumBulList( int nToken )
// ggf. ein Regelwerk anlegen
if( !rInfo.GetNumRule() )
{
sal_uInt16 nPos = pDoc->MakeNumRule( pDoc->GetUniqueNumRuleName() );
rInfo.SetNumRule( pDoc->GetNumRuleTable()[nPos] );
sal_uInt16 nPos = m_pDoc->MakeNumRule( m_pDoc->GetUniqueNumRuleName() );
rInfo.SetNumRule( m_pDoc->GetNumRuleTable()[nPos] );
}
// das Format anpassen, falls es fuer den Level noch nicht
......@@ -118,7 +118,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
}
aNumFormat.SetAbsLSpace( nAbsLSpace );
aNumFormat.SetFirstLineOffset( nFirstLineIndent );
aNumFormat.SetCharFormat( pCSS1Parser->GetCharFormatFromPool(nChrFormatPoolId) );
aNumFormat.SetCharFormat( m_pCSS1Parser->GetCharFormatFromPool(nChrFormatPoolId) );
bChangeNumFormat = true;
}
......@@ -199,7 +199,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
{
aBulletSrc = rOption.GetString();
if( !InternalImgToPrivateURL(aBulletSrc) )
aBulletSrc = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), aBulletSrc, Link<OUString *, bool>(), false );
aBulletSrc = URIHelper::SmartRel2Abs( INetURLObject( m_sBaseURL ), aBulletSrc, Link<OUString *, bool>(), false );
}
break;
case HTML_O_WIDTH:
......@@ -243,11 +243,11 @@ void SwHTMLParser::NewNumBulList( int nToken )
// Und noch die Grafik merken, um sie in den Absaetzen nicht
// einzufuegen
aBulletGrfs[nLevel] = aBulletSrc;
m_aBulletGrfs[nLevel] = aBulletSrc;
bChangeNumFormat = true;
}
else
aBulletGrfs[nLevel].clear();
m_aBulletGrfs[nLevel].clear();
// den aktuellen Absatz erst einmal nicht numerieren
{
......@@ -261,7 +261,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
// Styles parsen
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
......@@ -305,7 +305,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
if( bChangeNumFormat )
{
rInfo.GetNumRule()->Set( nLevel, aNumFormat );
pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
m_pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
bChangeNumFormat = false;
}
......@@ -318,7 +318,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
if( bChangeNumFormat )
{
rInfo.GetNumRule()->Set( nLevel, aNumFormat );
pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
m_pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
}
PushContext( pCntxt );
......@@ -335,17 +335,17 @@ void SwHTMLParser::EndNumBulList( int nToken )
// - der aktuelle nicht leer ist, also Text oder absatzgebundene Objekte
// enthaelt.
// - der aktuelle Absatz numeriert ist.
bool bAppend = pPam->GetPoint()->nContent.GetIndex() > 0;
bool bAppend = m_pPam->GetPoint()->nContent.GetIndex() > 0;
if( !bAppend )
{
SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
SwTextNode* pTextNode = m_pPam->GetNode().GetTextNode();
bAppend = (pTextNode && ! pTextNode->IsOutline() && pTextNode->IsCountedInList()) ||
HasCurrentParaFlys();
}
bool bSpace = (rInfo.GetDepth() + nDefListDeep) == 1;
bool bSpace = (rInfo.GetDepth() + m_nDefListDeep) == 1;
if( bAppend )
AppendTextNode( bSpace ? AM_SPACE : AM_NOSPACE, false );
else if( bSpace )
......@@ -394,12 +394,12 @@ void SwHTMLParser::EndNumBulList( int nToken )
}
}
if( bChanged )
pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
m_pDoc->ChgNumRuleFormats( *rInfo.GetNumRule() );
// Beim letzen Append wurde das NumRule-Item und das
// NodeNum-Objekt mit kopiert. Beides muessen wir noch
// loeschen. Das ResetAttr loescht das NodeNum-Objekt mit!
pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
m_pPam->GetNode().GetTextNode()->ResetAttr( RES_PARATR_NUMRULE );
rInfo.Clear();
}
......@@ -465,9 +465,9 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
}
// einen neuen Absatz aufmachen
if( pPam->GetPoint()->nContent.GetIndex() )
if( m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_NOSPACE, false );
bNoParSpace = false; // In <LI> wird kein Abstand eingefuegt!
m_bNoParSpace = false; // In <LI> wird kein Abstand eingefuegt!
const bool bCountedInList = nToken != HTML_LISTHEADER_ON;
......@@ -480,7 +480,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
}
else
{
aNumRuleName = pDoc->GetUniqueNumRuleName();
aNumRuleName = m_pDoc->GetUniqueNumRuleName();
SwNumRule aNumRule( aNumRuleName,
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
SwNumFormat aNumFormat( aNumRule.Get( 0 ) );
......@@ -491,22 +491,22 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
}
aNumFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aNumFormat.SetBulletChar( cBulletChar ); // das Bulletzeichen !!
aNumFormat.SetCharFormat( pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_BUL_LEVEL) );
aNumFormat.SetCharFormat( m_pCSS1Parser->GetCharFormatFromPool(RES_POOLCHR_BUL_LEVEL) );
aNumFormat.SetFirstLineOffset( HTML_NUMBUL_INDENT );
aNumRule.Set( 0, aNumFormat );
pDoc->MakeNumRule( aNumRuleName, &aNumRule );
m_pDoc->MakeNumRule( aNumRuleName, &aNumRule );
OSL_ENSURE( !nOpenParaToken,
OSL_ENSURE( !m_nOpenParaToken,
"Jetzt geht ein offenes Absatz-Element verloren" );
// Wir tun so, als ob wir in einem Absatz sind. Dann wird
// beim naechsten Absatz wenigstens die Numerierung
// weggeschmissen, die nach dem naechsten AppendTextNode uebernommen
// wird.
nOpenParaToken = static_cast< sal_uInt16 >(nToken);
m_nOpenParaToken = static_cast< sal_uInt16 >(nToken);
}
SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
SwTextNode* pTextNode = m_pPam->GetNode().GetTextNode();
static_cast<SwContentNode *>(pTextNode)->SetAttr( SwNumRuleItem(aNumRuleName) );
pTextNode->SetAttrListLevel(nLevel);
// #i57656# - <IsCounted()> state of text node has to be adjusted accordingly.
......@@ -531,7 +531,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
// Styles parsen
if( HasStyleOptions( aStyle, aId, aClass, &aLang, &aDir ) )
{
SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
SfxItemSet aItemSet( m_pDoc->GetAttrPool(), m_pCSS1Parser->GetWhichMap() );
SvxCSS1PropertyInfo aPropInfo;
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
......@@ -554,24 +554,24 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
bool /*bLastPara*/ )
{
// einen neuen Absatz aufmachen
if( !nToken && pPam->GetPoint()->nContent.GetIndex() )
if( !nToken && m_pPam->GetPoint()->nContent.GetIndex() )
AppendTextNode( AM_NOSPACE );
// Kontext zu dem Token suchen und vom Stack holen
_HTMLAttrContext *pCntxt = 0;
auto nPos = aContexts.size();
auto nPos = m_aContexts.size();
nToken &= ~1;
while( !pCntxt && nPos>nContextStMin )
while( !pCntxt && nPos>m_nContextStMin )
{
sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken();
sal_uInt16 nCntxtToken = m_aContexts[--nPos]->GetToken();
switch( nCntxtToken )
{
case HTML_LI_ON:
case HTML_LISTHEADER_ON:
if( !nToken || nToken == nCntxtToken )
{
pCntxt = aContexts[nPos];
aContexts.erase( aContexts.begin() + nPos );
pCntxt = m_aContexts[nPos];
m_aContexts.erase( m_aContexts.begin() + nPos );
}
break;
case HTML_ORDERLIST_ON:
......@@ -579,7 +579,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
case HTML_MENULIST_ON:
case HTML_DIRLIST_ON:
// keine LI/LH ausserhalb der aktuellen Liste betrachten
nPos = nContextStMin;
nPos = m_nContextStMin;
break;
}
}
......@@ -599,7 +599,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, bool bSetColl,
void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList )
{
SwTextNode* pTextNode = pPam->GetNode().GetTextNode();
SwTextNode* pTextNode = m_pPam->GetNode().GetTextNode();
OSL_ENSURE( pTextNode, "Kein Text-Node an PaM-Position" );
OSL_ENSURE( GetNumInfo().GetNumRule(), "Kein Numerierungs-Regel" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment