diff options
Diffstat (limited to 'sw/source/filter/html/htmlplug.cxx')
-rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index a154592959dc..e5bddbd5eb5e 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -78,53 +78,53 @@ using namespace com::sun::star; namespace { -static char const sHTML_O_Hidden_False[] = "FALSE"; +static char const sHTML_O_Hidden_False[] = "sal_False"; } -const ULONG HTML_FRMOPTS_EMBED_ALL = +const sal_uLong HTML_FRMOPTS_EMBED_ALL = HTML_FRMOPT_ALT | HTML_FRMOPT_SIZE | HTML_FRMOPT_NAME; -const ULONG HTML_FRMOPTS_EMBED_CNTNR = +const sal_uLong HTML_FRMOPTS_EMBED_CNTNR = HTML_FRMOPTS_EMBED_ALL | HTML_FRMOPT_ABSSIZE; -const ULONG HTML_FRMOPTS_EMBED = +const sal_uLong HTML_FRMOPTS_EMBED = HTML_FRMOPTS_EMBED_ALL | HTML_FRMOPT_ALIGN | HTML_FRMOPT_SPACE | HTML_FRMOPT_BRCLEAR | HTML_FRMOPT_NAME; -const ULONG HTML_FRMOPTS_HIDDEN_EMBED = +const sal_uLong HTML_FRMOPTS_HIDDEN_EMBED = HTML_FRMOPT_ALT | HTML_FRMOPT_NAME; -const ULONG HTML_FRMOPTS_APPLET_ALL = +const sal_uLong HTML_FRMOPTS_APPLET_ALL = HTML_FRMOPT_ALT | HTML_FRMOPT_SIZE; -const ULONG HTML_FRMOPTS_APPLET_CNTNR = +const sal_uLong HTML_FRMOPTS_APPLET_CNTNR = HTML_FRMOPTS_APPLET_ALL | HTML_FRMOPT_ABSSIZE; -const ULONG HTML_FRMOPTS_APPLET = +const sal_uLong HTML_FRMOPTS_APPLET = HTML_FRMOPTS_APPLET_ALL | HTML_FRMOPT_ALIGN | HTML_FRMOPT_SPACE | HTML_FRMOPT_BRCLEAR; -const ULONG HTML_FRMOPTS_IFRAME_ALL = +const sal_uLong HTML_FRMOPTS_IFRAME_ALL = HTML_FRMOPT_ALT | HTML_FRMOPT_SIZE; -const ULONG HTML_FRMOPTS_IFRAME_CNTNR = +const sal_uLong HTML_FRMOPTS_IFRAME_CNTNR = HTML_FRMOPTS_IFRAME_ALL | HTML_FRMOPT_ABSSIZE; -const ULONG HTML_FRMOPTS_IFRAME = +const sal_uLong HTML_FRMOPTS_IFRAME = HTML_FRMOPTS_IFRAME_ALL | HTML_FRMOPT_ALIGN | HTML_FRMOPT_SPACE | HTML_FRMOPT_BORDER | HTML_FRMOPT_BRCLEAR; -const ULONG HTML_FRMOPTS_OLE_CSS1 = +const sal_uLong HTML_FRMOPTS_OLE_CSS1 = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SPACE; @@ -132,13 +132,13 @@ const ULONG HTML_FRMOPTS_OLE_CSS1 = void SwHTMLParser::SetFixSize( const Size& rPixSize, const Size& rTwipDfltSize, - BOOL bPrcWidth, BOOL bPrcHeight, + sal_Bool bPrcWidth, sal_Bool bPrcHeight, SfxItemSet& /*rCSS1ItemSet*/, SvxCSS1PropertyInfo& rCSS1PropInfo, SfxItemSet& rFlyItemSet ) { // absolulte Groessenangaben in Twip umrechnen - BYTE nPrcWidth = 0, nPrcHeight = 0; + sal_uInt8 nPrcWidth = 0, nPrcHeight = 0; Size aTwipSz( bPrcWidth || USHRT_MAX==rPixSize.Width() ? 0 : rPixSize.Width(), bPrcHeight || USHRT_MAX==rPixSize.Height() ? 0 : rPixSize.Height() ); if( (aTwipSz.Width() || aTwipSz.Height()) && Application::GetDefaultDevice() ) @@ -151,7 +151,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, // die Breite bearbeiten if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.eWidthType ) { - nPrcWidth = (BYTE)rCSS1PropInfo.nWidth; + nPrcWidth = (sal_uInt8)rCSS1PropInfo.nWidth; aTwipSz.Width() = rTwipDfltSize.Width(); } else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.eWidthType ) @@ -160,7 +160,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, } else if( bPrcWidth && rPixSize.Width() ) { - nPrcWidth = (BYTE)rPixSize.Width(); + nPrcWidth = (sal_uInt8)rPixSize.Width(); if( nPrcWidth > 100 ) nPrcWidth = 100; @@ -178,7 +178,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, // Hoehe bearbeiten if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.eHeightType ) { - nPrcHeight = (BYTE)rCSS1PropInfo.nHeight; + nPrcHeight = (sal_uInt8)rCSS1PropInfo.nHeight; aTwipSz.Height() = rTwipDfltSize.Height(); } else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.eHeightType ) @@ -187,7 +187,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, } else if( bPrcHeight && rPixSize.Height() ) { - nPrcHeight = (BYTE)rPixSize.Height(); + nPrcHeight = (sal_uInt8)rPixSize.Height(); if( nPrcHeight > 100 ) nPrcHeight = 100; @@ -223,12 +223,12 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace, Application::GetDefaultDevice()->PixelToLogic( aTwipSpc, MapMode(MAP_TWIP) ); nLeftSpace = nRightSpace = aTwipSpc.Width(); - nUpperSpace = nLowerSpace = (USHORT)aTwipSpc.Height(); + nUpperSpace = nLowerSpace = (sal_uInt16)aTwipSpc.Height(); } // linken/rechten Rand setzen const SfxPoolItem *pItem; - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_LR_SPACE, TRUE, &pItem ) ) + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_LR_SPACE, sal_True, &pItem ) ) { // Ggf. den Erstzeilen-Einzug noch plaetten const SvxLRSpaceItem *pLRItem = (const SvxLRSpaceItem *)pItem; @@ -237,12 +237,12 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace, if( rCSS1PropInfo.bLeftMargin ) { nLeftSpace = aLRItem.GetLeft(); - rCSS1PropInfo.bLeftMargin = FALSE; + rCSS1PropInfo.bLeftMargin = sal_False; } if( rCSS1PropInfo.bRightMargin ) { nRightSpace = aLRItem.GetRight(); - rCSS1PropInfo.bRightMargin = FALSE; + rCSS1PropInfo.bRightMargin = sal_False; } rCSS1ItemSet.ClearItem( RES_LR_SPACE ); } @@ -266,19 +266,19 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace, } // oberen/unteren Rand setzen - if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_UL_SPACE, TRUE, &pItem ) ) + if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_UL_SPACE, sal_True, &pItem ) ) { // Ggf. den Erstzeilen-Einzug noch plaetten const SvxULSpaceItem *pULItem = (const SvxULSpaceItem *)pItem; if( rCSS1PropInfo.bTopMargin ) { nUpperSpace = pULItem->GetUpper(); - rCSS1PropInfo.bTopMargin = FALSE; + rCSS1PropInfo.bTopMargin = sal_False; } if( rCSS1PropInfo.bBottomMargin ) { nLowerSpace = pULItem->GetLower(); - rCSS1PropInfo.bBottomMargin = FALSE; + rCSS1PropInfo.bBottomMargin = sal_False; } rCSS1ItemSet.ClearItem( RES_UL_SPACE ); } @@ -309,7 +309,7 @@ void SwHTMLParser::InsertEmbed() String aURL, aType, aName, aAlt, aId, aStyle, aClass; Size aSize( USHRT_MAX, USHRT_MAX ); Size aSpace( USHRT_MAX, USHRT_MAX ); - BOOL bPrcWidth = FALSE, bPrcHeight = FALSE, bHidden = FALSE; + sal_Bool bPrcWidth = sal_False, bPrcHeight = sal_False, bHidden = sal_False; sal_Int16 eVertOri = text::VertOrientation::NONE; sal_Int16 eHoriOri = text::HoriOrientation::NONE; SvCommandList aCmdLst; @@ -318,8 +318,8 @@ void SwHTMLParser::InsertEmbed() // Die Optionen werden vorwaerts gelesen, weil die Plugins sie in // dieser Reihenfolge erwarten. Trotzdem darf immer nur der erste // Wert einer Option beruecksichtigt werden. - USHORT nArrLen = pHTMLOptions->Count(); - for( USHORT i=0; i<nArrLen; i++ ) + sal_uInt16 nArrLen = pHTMLOptions->Count(); + for( sal_uInt16 i=0; i<nArrLen; i++ ) { const HTMLOption *pOption = (*pHTMLOptions)[i]; switch( pOption->GetToken() ) @@ -405,7 +405,7 @@ void SwHTMLParser::InsertEmbed() // Size (0,0) wird in SetFrmSize auf (MINFLY, MINFLY) umgebogen aSize.Width() = 0; aSize.Height() = 0; aSpace.Width() = 0; aSpace.Height() = 0; - bPrcWidth = bPrcHeight = FALSE; + bPrcWidth = bPrcHeight = sal_False; } // die URL aufbereiten @@ -442,7 +442,7 @@ void SwHTMLParser::InsertEmbed() xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginCommands"), uno::makeAny( aProps ) ); // TODO/LATER: EnableSetModified?! - //pPlugin->EnableSetModified( TRUE ); + //pPlugin->EnableSetModified( sal_True ); } } @@ -516,7 +516,7 @@ void SwHTMLParser::NewObject() RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -675,7 +675,7 @@ void SwHTMLParser::InsertApplet() String aCodeBase, aCode, aName, aAlt, aId, aStyle, aClass; Size aSize( USHRT_MAX, USHRT_MAX ); Size aSpace( 0, 0 ); - BOOL bPrcWidth = FALSE, bPrcHeight = FALSE, bMayScript = FALSE; + sal_Bool bPrcWidth = sal_False, bPrcHeight = sal_False, bMayScript = sal_False; sal_Int16 eVertOri = text::VertOrientation::TOP; sal_Int16 eHoriOri = text::HoriOrientation::NONE; @@ -685,7 +685,7 @@ void SwHTMLParser::InsertApplet() pAppletImpl = new SwApplet_Impl( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -730,7 +730,7 @@ void SwHTMLParser::InsertApplet() aSpace.Height() = (long)pOption->GetNumber(); break; case HTML_O_MAYSCRIPT: - bMayScript = TRUE; + bMayScript = sal_True; break; } @@ -810,7 +810,7 @@ void SwHTMLParser::InsertParam() String aName, aValue; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -839,15 +839,15 @@ void SwHTMLParser::InsertFloatingFrame() String aAlt, aId, aStyle, aClass; Size aSize( USHRT_MAX, USHRT_MAX ); Size aSpace( 0, 0 ); - BOOL bPrcWidth = FALSE, bPrcHeight = FALSE; + sal_Bool bPrcWidth = sal_False, bPrcHeight = sal_False; sal_Int16 eVertOri = text::VertOrientation::TOP; sal_Int16 eHoriOri = text::HoriOrientation::NONE; const HTMLOptions *pHTMLOptions = GetOptions(); // Erstmal die Optionen f?r das Writer-Frame-Format holen - USHORT nArrLen = pHTMLOptions->Count(); - for ( USHORT i=0; i<nArrLen; i++ ) + sal_uInt16 nArrLen = pHTMLOptions->Count(); + for ( sal_uInt16 i=0; i<nArrLen; i++ ) { const HTMLOption *pOption = (*pHTMLOptions)[i]; switch( pOption->GetToken() ) @@ -895,7 +895,7 @@ void SwHTMLParser::InsertFloatingFrame() ::rtl::OUString aObjName; uno::Reference < embed::XEmbeddedObject > xObj = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence(), aObjName ); - //pFrame->EnableSetModified( FALSE ); + //pFrame->EnableSetModified( sal_False ); try { // TODO/MBA: testing @@ -938,7 +938,7 @@ void SwHTMLParser::InsertFloatingFrame() { } - //pFrame->EnableSetModified( TRUE ); + //pFrame->EnableSetModified( sal_True ); SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() ); SvxCSS1PropertyInfo aPropInfo; @@ -973,7 +973,7 @@ void SwHTMLParser::InsertFloatingFrame() // Ggf Frames anlegen und auto-geb. Rahmen registrieren RegisterFlyFrm( pFlyFmt ); - bInFloatingFrame = TRUE; + bInFloatingFrame = sal_True; } /* */ @@ -984,9 +984,9 @@ void SwHTMLParser::InsertFloatingFrame() #define SWHTML_OPTTYPE_PARAM 2 -static USHORT GetOptionType( const String& rName, BOOL bApplet ) +static sal_uInt16 GetOptionType( const String& rName, sal_Bool bApplet ) { - USHORT nType = bApplet ? SWHTML_OPTTYPE_PARAM : SWHTML_OPTTYPE_TAG; + sal_uInt16 nType = bApplet ? SWHTML_OPTTYPE_PARAM : SWHTML_OPTTYPE_TAG; switch( rName.GetChar(0) ) { @@ -1061,7 +1061,7 @@ static USHORT GetOptionType( const String& rName, BOOL bApplet ) } */ -USHORT SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode ) +sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode ) { SwOLEObj& rObj = ((SwOLENode*)rNode.GetOLENode())->GetOLEObj(); @@ -1084,16 +1084,16 @@ USHORT SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode ) } #endif - return static_cast< USHORT >(eType); + return static_cast< sal_uInt16 >(eType); } Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, - BOOL bInCntnr ) + sal_Bool bInCntnr ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt(); - ULONG nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1; + sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1; SwOLENode *pOLENd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetOLENode(); ASSERT( pOLENd, "OLE-Node erwartet" ); @@ -1107,7 +1107,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, return rWrt; uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); - BOOL bHiddenEmbed = FALSE; + sal_Bool bHiddenEmbed = sal_False; if( !xSet.is() ) { @@ -1116,11 +1116,11 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, } ByteString aEndTags; - ULONG nFrmOpts; + sal_uLong nFrmOpts; // wenn meoglich vor dem "Objekt" einen Zeilen-Umbruch ausgeben if( rHTMLWrt.bLFPossible ) - rHTMLWrt.OutNewLine( TRUE ); + rHTMLWrt.OutNewLine( sal_True ); if( rFrmFmt.GetName().Len() ) rHTMLWrt.OutImplicitMark( rFrmFmt.GetName(), @@ -1166,7 +1166,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // Das Plugin ist HIDDEN (sOut += ' ') += OOO_STRING_SW_HTML_O_Hidden; nFrmOpts = HTML_FRMOPTS_HIDDEN_EMBED; - bHiddenEmbed = TRUE; + bHiddenEmbed = sal_True; } else { @@ -1264,12 +1264,12 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, SvCommandList aCommands; aCommands.FillFromSequence( aProps ); SvULongs aParams; - ULONG i = aCommands.Count(); + sal_uLong i = aCommands.Count(); while( i > 0 ) { const SvCommand& rCommand = aCommands[ --i ]; const String& rName = rCommand.GetCommand(); - USHORT nType = SwApplet_Impl::GetOptionType( rName, TRUE ); + sal_uInt16 nType = SwApplet_Impl::GetOptionType( rName, sal_True ); if( SWHTML_OPTTYPE_TAG == nType ) { const String& rValue = rCommand.GetArgument(); @@ -1288,7 +1288,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, rHTMLWrt.IncIndentLevel(); // Inhalt von Applet einruecken - USHORT ii = aParams.Count(); + sal_uInt16 ii = aParams.Count(); while( ii > 0 ) { const SvCommand& rCommand = aCommands[ aParams[--ii] ]; @@ -1307,7 +1307,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, rHTMLWrt.DecIndentLevel(); // Inhalt von Applet einruecken if( aCommands.Count() ) rHTMLWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_applet, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_applet, sal_False ); } else if( aGlobName == SvGlobalName( SO3_PLUGIN_CLASSID ) ) @@ -1320,12 +1320,12 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, SvCommandList aCommands; aCommands.FillFromSequence( aProps ); - for( ULONG i=0; i<aCommands.Count(); i++ ) + for( sal_uLong i=0; i<aCommands.Count(); i++ ) { const SvCommand& rCommand = aCommands[ i ]; const String& rName = rCommand.GetCommand(); - if( SwApplet_Impl::GetOptionType( rName, FALSE ) == SWHTML_OPTTYPE_TAG ) + if( SwApplet_Impl::GetOptionType( rName, sal_False ) == SWHTML_OPTTYPE_TAG ) { const String& rValue = rCommand.GetArgument(); rWrt.Strm() << ' '; @@ -1342,7 +1342,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // ausgeben rHTMLWrt.Strm() << '>'; - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, sal_False ); } if( aEndTags.Len() ) @@ -1352,12 +1352,12 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, } Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt, - BOOL bInCntnr ) + sal_Bool bInCntnr ) { SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt; const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt(); - ULONG nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1; + sal_uLong nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1; SwOLENode *pOLENd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetOLENode(); ASSERT( pOLENd, "OLE-Node erwartet" ); @@ -1376,7 +1376,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt, if(pTempFileName) aGrfNm = *pTempFileName; - USHORT nErr = XOutBitmap::WriteGraphic( aGrf, aGrfNm, + sal_uInt16 nErr = XOutBitmap::WriteGraphic( aGrf, aGrfNm, String::CreateFromAscii("JPG"), (XOUTBMP_USE_GIF_IF_POSSIBLE | XOUTBMP_USE_NATIVE_IF_POSSIBLE) ); @@ -1388,7 +1388,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt, aGrfNm = URIHelper::SmartRel2Abs( INetURLObject(rWrt.GetBaseURL()), aGrfNm, URIHelper::GetMaybeFileHdl() ); - ULONG nFlags = bInCntnr ? HTML_FRMOPTS_GENIMG_CNTNR + sal_uLong nFlags = bInCntnr ? HTML_FRMOPTS_GENIMG_CNTNR : HTML_FRMOPTS_GENIMG; OutHTML_Image( rWrt, rFrmFmt, aGrfNm, pOLENd->GetTitle(), pOLENd->GetTwipSize(), |