[Libreoffice-commits] .: 3 commits - sfx2/source sw/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Oct 27 14:04:01 PDT 2011
sfx2/source/appl/appreg.cxx | 1 +
sw/source/filter/html/htmldraw.cxx | 7 +++----
sw/source/filter/html/htmlfly.cxx | 36 +++++++++++++++++-------------------
sw/source/filter/html/htmlforw.cxx | 8 ++++----
sw/source/filter/html/htmlplug.cxx | 8 +++-----
sw/source/filter/html/wrthtml.hxx | 4 ++--
unusedcode.easy | 7 ++++---
7 files changed, 34 insertions(+), 37 deletions(-)
New commits:
commit 3852a6f54880af8ed9161227baa555580c7d4517
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 27 22:02:37 2011 +0100
ByteString->rtl::OString
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index 0c757e0..ca3695b 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -837,11 +837,10 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
rWrt.Strm() << sOut.makeStringAndClear().getStr();
// und nun noch ALIGN, HSPACE und VSPACE
- ByteString aEndTags;
sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
nFrmFlags |= HTML_FRMOPTS_MARQUEE_CSS1;
- rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, aEndTags, nFrmFlags );
+ rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmFlags );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject );
@@ -859,8 +858,8 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, sal_False );
- if( aEndTags.Len() )
- rWrt.Strm() << aEndTags.GetBuffer();
+ if( aEndTags.getLength() )
+ rWrt.Strm() << aEndTags.getStr();
return rWrt;
}
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index c4e81e7..0ef3d6c 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -542,11 +542,12 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
}
-void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
+rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
const String& rAlternateTxt,
- ByteString &rEndTags,
- sal_uInt32 nFrmOpts )
+ sal_uInt32 nFrmOpts,
+ const rtl::OString &rEndTags )
{
+ rtl::OString sRetEndTags;
rtl::OStringBuffer sOut;
const SfxPoolItem* pItem;
const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
@@ -820,9 +821,10 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_linebreak).
append(' ').append(OOO_STRING_SVTOOLS_HTML_O_clear).
append('=').append(pStr).append('>').append(rEndTags);
- rEndTags = sOut.makeStringAndClear().getStr();
+ sRetEndTags = sOut.makeStringAndClear();
}
}
+ return sRetEndTags;
}
@@ -995,7 +997,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
// Attribute die ausserhelb der Grafik geschreiben werden muessen sammeln
rtl::OStringBuffer sOut;
- ByteString aEndTags;
+ rtl::OString aEndTags;
// implizite Sprungmarke -> <A NAME=...></A>...<IMG ...>
if( pMarkType && rFrmFmt.GetName().Len() )
@@ -1168,7 +1170,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
}
// ALT, ALIGN, WIDTH, HEIGHT, HSPACE, VSPACE
- rHTMLWrt.OutFrmFmtOptions( rFrmFmt, rAlternateTxt, aEndTags, nFrmOpts );
+ aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, rAlternateTxt, nFrmOpts, aEndTags );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) )
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts );
@@ -1195,8 +1197,8 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
rHTMLWrt.Strm() << '>';
- if( aEndTags.Len() )
- rWrt.Strm() << aEndTags.GetBuffer();
+ if( aEndTags.getLength() )
+ rWrt.Strm() << aEndTags.getStr();
if( rHTMLWrt.aINetFmts.Count() )
{
@@ -1437,8 +1439,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
: HTML_FRMOPTS_MULTICOL;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
nFrmFlags |= HTML_FRMOPTS_MULTICOL_CSS1;
- ByteString aEndTags;
- rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, aEndTags, nFrmFlags );
+ rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, nFrmFlags );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
@@ -1486,13 +1487,11 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt )
rWrt.Strm() << sOut.makeStringAndClear().getStr();
// ALIGN, WIDTH, HEIGHT
- ByteString aEndTags;
- rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, aEndTags,
- HTML_FRMOPTS_SPACER );
+ rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, HTML_FRMOPTS_SPACER );
rWrt.Strm() << '>';
- if( aEndTags.Len() )
- rWrt.Strm() << aEndTags.GetBuffer();
+ if( aEndTags.getLength() )
+ rWrt.Strm() << aEndTags.getStr();
return rWrt;
}
@@ -1522,11 +1521,10 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
sOut.append('<').append(pStr);
rWrt.Strm() << sOut.makeStringAndClear().getStr();
- ByteString aEndTags;
sal_uLong nFrmFlags = HTML_FRMOPTS_DIV;
if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) )
nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
- rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, aEndTags, nFrmFlags );
+ rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyStr, nFrmFlags );
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags );
rWrt.Strm() << '>';
@@ -1557,8 +1555,8 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
rHTMLWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, sal_False );
- if( aEndTags.Len() )
- rWrt.Strm() << aEndTags.GetBuffer();
+ if( aEndTags.getLength() )
+ rWrt.Strm() << aEndTags.getStr();
return rWrt;
}
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index b307704..872a2de 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -1114,9 +1114,9 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
? HTML_FRMOPTS_IMG_CONTROL_CSS1
: HTML_FRMOPTS_CONTROL_CSS1);
}
- ByteString aEndTags;
+ rtl::OString aEndTags;
if( nFrmOpts != 0 )
- rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, aEndTags, nFrmOpts );
+ aEndTags = rHTMLWrt.OutFrmFmtOptions( rFmt, aEmptyStr, nFrmOpts );
if( rHTMLWrt.bCfgOutStyles )
{
@@ -1363,8 +1363,8 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
}
- if( aEndTags.Len() )
- rWrt.Strm() << aEndTags.GetBuffer();
+ if( aEndTags.getLength() )
+ rWrt.Strm() << aEndTags.getStr();
// Controls sind nicht absatz-gebunden, deshalb kein LF mehr ausgeben!
rHTMLWrt.bLFPossible = sal_False;
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 280d2ad..8890c0b 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1017,7 +1017,6 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
return rWrt;
}
- ByteString aEndTags;
sal_uLong nFrmOpts;
// wenn meoglich vor dem "Objekt" einen Zeilen-Umbruch ausgeben
@@ -1154,8 +1153,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
nFrmOpts |= HTML_FRMOPTS_OLE_CSS1;
- rHTMLWrt.OutFrmFmtOptions( rFrmFmt, pOLENd->GetTitle(),
- aEndTags, nFrmOpts );
+ rtl::OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, pOLENd->GetTitle(), nFrmOpts );
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts );
@@ -1255,8 +1253,8 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, sal_False );
}
- if( aEndTags.Len() )
- rWrt.Strm() << aEndTags.GetBuffer();
+ if( aEndTags.getLength() )
+ rWrt.Strm() << aEndTags.getStr();
return rWrt;
}
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index b96b24e..537aab8 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -408,8 +408,8 @@ public:
// ALT/ALIGN/WIDTH/HEIGHT/HSPACE/VSPACE-Optionen des aktuellen
// Frame-Formats ausgeben und ggf. ein <BR CLEAR=...> vorne an
// rEndTags anhaengen
- void OutFrmFmtOptions( const SwFrmFmt& rFrmFmt, const String& rAltTxt,
- ByteString &rEndTags, sal_uInt32 nFrmOpts );
+ rtl::OString OutFrmFmtOptions( const SwFrmFmt& rFrmFmt, const String& rAltTxt,
+ sal_uInt32 nFrmOpts, const rtl::OString& rEndTags = rtl::OString() );
void OutCSS1_TableFrmFmtOptions( const SwFrmFmt& rFrmFmt );
void OutCSS1_SectionFmtOptions( const SwFrmFmt& rFrmFmt );
void OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt, sal_uInt32 nFrmOpts,
commit 5107c0afb109b9d73dfa744deb828f251ea6370c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 27 22:01:05 2011 +0100
include mnuitem.hxx to build with --enable-dbgutil
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 564317d..fa83c1e 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -48,6 +48,7 @@
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objface.hxx>
+#include <sfx2/mnuitem.hxx>
//===================================================================
commit 6368d19094790f2bdd1af3542388b62a7789adea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 27 21:38:49 2011 +0100
update unused code list
diff --git a/unusedcode.easy b/unusedcode.easy
index b153d42..5ceda59 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -170,6 +170,7 @@ FmPropBrwMgr::GetChildWindowId()
FmXFilterCell::getImplementation(com::sun::star::uno::Reference<com::sun::star::awt::XControl> const&)
FmXFormShell::clearFilter()
FontCharMap::GetLastChar() const
+FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
FontSizeBox::GetValue(unsigned short, FieldUnit) const
FontSizeBox::SetUserValue(long, FieldUnit)
FontStyleBox::FontStyleBox(Window*, long)
@@ -201,7 +202,6 @@ GraphicReader::IsPreviewModeEnabled() const
GroupTable::SkipCurrentGroup()
GtkSalFrame::popIgnoreDamage()
GtkSalFrame::pushIgnoreDamage()
-GtkSalFrame::signalDraw(_GtkWidget*, _cairo*, void*)
HTMLControls::Insert(HTMLControl const*&, unsigned short&)
HTMLControls::Insert(HTMLControl const**, unsigned short)
HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
@@ -228,7 +228,6 @@ ImplBorderWindow::ImplBorderWindow(Window*, long, unsigned short, com::sun::star
ImplBorderWindow::SetHelpButton(unsigned char)
ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale&) const
ImplEntryList::IsEntrySelected(String const&) const
-ImplFontSelectData::ImplFontSelectData(ImplFontData const&, Size const&, float, int, bool)
ImplImageList::GetImageCount() const
ImplListBox::GetEntryFlags(unsigned short) const
ImplRegionBand::IsInside(long, long)
@@ -676,7 +675,6 @@ SfxControllerItem::UpdateSlot()
SfxDateTimeItem::SfxDateTimeItem(unsigned short)
SfxDockingWrapper::GetChildWindowId()
SfxFilterPtrArr::DeleteAndDestroy(unsigned short, unsigned short)
-SfxFlagItem::SetFlag(unsigned char, int)
SfxFoundCacheArr_Impl::Insert(SfxFoundCacheArr_Impl const*, unsigned short, unsigned short)
SfxFoundCacheArr_Impl::Insert(SfxFoundCache_Impl const*&, unsigned short&)
SfxFoundCacheArr_Impl::Insert(SfxFoundCache_Impl const**, unsigned short)
@@ -1458,6 +1456,9 @@ _ZSortFlys::Remove(_ZSortFly const&, unsigned short)
_ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short)
_ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short)
_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*)
+avmedia::priv::MediaWindowBaseImpl::getStopTime() const
+avmedia::priv::MediaWindowBaseImpl::setRate(double)
+avmedia::priv::MediaWindowBaseImpl::setStopTime(double)
basebmp::BitmapDevice::getPaletteEntryCount() const
basebmp::BitmapDevice::getPixelData(basegfx::B2IPoint const&)
basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&)
More information about the Libreoffice-commits
mailing list