[Libreoffice-commits] .: 5 commits - svx/inc svx/source sw/source tools/inc tools/source unusedcode.easy xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Sep 14 01:54:51 PDT 2011
svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx | 4
svx/source/sdr/overlay/overlayanimatedbitmapex.cxx | 64 ---------
sw/source/filter/html/htmlfldw.cxx | 26 ++-
sw/source/filter/html/htmlfly.cxx | 4
sw/source/filter/html/wrthtml.cxx | 138 ++++++++++----------
sw/source/filter/html/wrthtml.hxx | 2
sw/source/filter/ww1/w1class.cxx | 14 +-
tools/inc/tools/string.hxx | 2
tools/source/string/strcvt.cxx | 14 --
unusedcode.easy | 5
xmloff/inc/xmloff/xmlexp.hxx | 8 -
xmloff/source/core/xmlexp.cxx | 2
12 files changed, 97 insertions(+), 186 deletions(-)
New commits:
commit 79dc19fcbdb1e6aa9a8958a8b3d1fbf0451646cf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 14 00:32:14 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 0a4638d..10f4c0b 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -458,8 +458,9 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
rWrt.Strm() << '/';
// TODO: HTML-Tags are written without entitities, that for, characters
// not contained in the destination encoding are lost!
- ByteString sTmp( rTxt, ((SwHTMLWriter&)rWrt).eDestEnc );
- rWrt.Strm() << sTmp.GetBuffer() << '>';
+ rtl::OString sTmp(rtl::OUStringToOString(rTxt,
+ ((SwHTMLWriter&)rWrt).eDestEnc));
+ rWrt.Strm() << sTmp.getStr() << '>';
}
else if( RES_POSTITFLD == pFldTyp->Which() )
{
@@ -480,8 +481,9 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
sComment.ConvertLineEnd( GetSystemLineEnd() );
// TODO: HTML-Tags are written without entitities, that for,
// characters not contained in the destination encoding are lost!
- ByteString sTmp( sComment, ((SwHTMLWriter&)rWrt).eDestEnc );
- rWrt.Strm() << sTmp.GetBuffer();
+ rtl::OString sTmp(rtl::OUStringToOString(sComment,
+ ((SwHTMLWriter&)rWrt).eDestEnc));
+ rWrt.Strm() << sTmp.getStr();
bWritten = sal_True;
}
else if( rComment.Len() >= 7 &&
@@ -496,8 +498,9 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
// TODO: HTML-Tags are written without entitities, that for,
// characters not contained in the destination encoding are
// lost!
- ByteString sTmp( sComment, ((SwHTMLWriter&)rWrt).eDestEnc );
- rWrt.Strm() << sTmp.GetBuffer();
+ rtl::OString sTmp(rtl::OUStringToOString(sComment,
+ ((SwHTMLWriter&)rWrt).eDestEnc));
+ rWrt.Strm() << sTmp.getStr();
bWritten = sal_True;
}
@@ -505,15 +508,14 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
if( !bWritten )
{
- ByteString sOut( '<' );
-
String sComment( rComment );
sComment.ConvertLineEnd( GetSystemLineEnd() );
+ rtl::OStringBuffer sOut;
// TODO: ???
- (((sOut += OOO_STRING_SVTOOLS_HTML_comment) += ' ')
- += ByteString( sComment, ((SwHTMLWriter&)rWrt).eDestEnc ))
- += " -->";
- rWrt.Strm() << sOut.GetBuffer();
+ sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_comment)
+ .append(' ').append(rtl::OUStringToOString(sComment,
+ ((SwHTMLWriter&)rWrt).eDestEnc)).append(" -->");
+ rWrt.Strm() << sOut.getStr();
}
}
else if( RES_SCRIPTFLD == pFldTyp->Which() )
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index b3dade8..8907a74 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -955,8 +955,8 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
if( rHTMLWrt.bLFPossible )
{
rHTMLWrt.OutNewLine( sal_True );
- rHTMLWrt.GetIndentString( aIndMap );
- rHTMLWrt.GetIndentString( aIndArea, 1 );
+ aIndMap = rHTMLWrt.GetIndentString();
+ aIndArea = rHTMLWrt.GetIndentString(1);
#if defined(UNX)
aLF[0] = SwHTMLWriter::sNewLine;
pLF = aLF;
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index f21a823..9817e8f 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -178,8 +178,8 @@ sal_uLong SwHTMLWriter::WriteStream()
const sal_Char *pHelpHack = getenv( "HelpEx" );
if( pHelpHack )
{
- ByteString aTmp( pHelpHack );
- if( aTmp.EqualsIgnoreCaseAscii( "Hilfe" ) )
+ rtl::OString aTmp(pHelpHack);
+ if (aTmp.equalsIgnoreAsciiCase("Hilfe"))
nHTMLMode |= HTMLMODE_NO_BR_AT_PAREND;
}
@@ -269,7 +269,7 @@ sal_uLong SwHTMLWriter::WriteStream()
GetNumInfo().Clear();
pNextNumRuleInfo = 0;
- ByteString aStartTags;
+ rtl::OString aStartTags;
// Tabellen und Bereiche am Doc.-Anfang beachten
{
@@ -305,13 +305,12 @@ sal_uLong SwHTMLWriter::WriteStream()
pSNd->GetSection().GetSectionName(),
aName, eDestEnc, &aNonConvertableCharacters );
- ByteString sOut( '<' );
- (((((((sOut += OOO_STRING_SVTOOLS_HTML_division)
- += ' ') += OOO_STRING_SVTOOLS_HTML_O_id) += "=\"")
- += aName) += '\"')
- += '>') += aStartTags;
-
- aStartTags = sOut;
+ rtl::OStringBuffer sOut;
+ sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division)
+ .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id)
+ .append("=\"").append(aName).append('\"').append('>')
+ .append(aStartTags);
+ aStartTags = sOut.makeStringAndClear();
}
// FindSectionNode() an einem SectionNode liefert den selben!
pSNd = pSNd->StartOfSectionNode()->FindSectionNode();
@@ -335,8 +334,8 @@ sal_uLong SwHTMLWriter::WriteStream()
// Formulare, die nur HiddenControls enthalten ausgeben.
OutHiddenForms();
- if( aStartTags.Len() )
- Strm() << aStartTags.GetBuffer();
+ if( !aStartTags.isEmpty() )
+ Strm() << aStartTags.getStr();
const SfxPoolItem *pItem;
const SfxItemSet& rPageItemSet = pCurrPageDesc->GetMaster().GetAttrSet();
@@ -850,9 +849,9 @@ static void OutBodyColor( const sal_Char *pTag, const SwFmt *pFmt,
if( pColorItem )
{
- ByteString sOut( ' ' );
- (sOut += pTag) += '=';
- rHWrt.Strm() << sOut.GetBuffer();
+ rtl::OStringBuffer sOut;
+ sOut.append(' ').append(pTag).append('=');
+ rHWrt.Strm() << sOut.makeStringAndClear().getStr();
Color aColor( pColorItem->GetValue() );
if( COL_AUTO == aColor.GetColor() )
aColor.SetColor( COL_BLACK );
@@ -906,11 +905,12 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs()
const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
{
- ByteString sOut( OOO_STRING_SVTOOLS_HTML_doctype );
- (sOut += ' ') +=
- (HTML_CFG_HTML32==nExportMode ? OOO_STRING_SVTOOLS_HTML_doctype32
- : OOO_STRING_SVTOOLS_HTML_doctype40);
- HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.GetBuffer() );
+ rtl::OStringBuffer sOut;
+ sOut.append(OOO_STRING_SVTOOLS_HTML_doctype).append(' ')
+ .append(HTML_CFG_HTML32==nExportMode ?
+ OOO_STRING_SVTOOLS_HTML_doctype32 :
+ OOO_STRING_SVTOOLS_HTML_doctype40);
+ HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.makeStringAndClear().getStr() );
// baue den Vorspann
OutNewLine();
@@ -922,12 +922,12 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
IncIndentLevel(); // Inhalt von <HEAD> einruecken
// DokumentInfo
- ByteString sIndent;
- GetIndentString( sIndent );
+ rtl::OString sIndent = GetIndentString();
using namespace ::com::sun::star;
uno::Reference<document::XDocumentProperties> xDocProps;
SwDocShell *pDocShell(pDoc->GetDocShell());
- if (pDocShell) {
+ if (pDocShell)
+ {
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
pDocShell->GetModel(), uno::UNO_QUERY_THROW);
xDocProps.set(xDPS->getDocumentProperties());
@@ -935,7 +935,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
// xDocProps may be null here (when copying)
SfxFrameHTMLWriter::Out_DocInfo( Strm(), GetBaseURL(), xDocProps,
- sIndent.GetBuffer(), eDestEnc,
+ sIndent.getStr(), eDestEnc,
&aNonConvertableCharacters );
// Kommentare und Meta-Tags des ersten Absatzes
@@ -945,31 +945,31 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
const SwPageDesc *pPageDesc = 0;
- // In Nicht-HTML-Dokumenten wird die erste gesetzte Seitenvorlage
- // exportiert und wenn keine gesetzt ist die Standard-Vorlage
- sal_uLong nNodeIdx = pCurPam->GetPoint()->nNode.GetIndex();
+ // In Nicht-HTML-Dokumenten wird die erste gesetzte Seitenvorlage
+ // exportiert und wenn keine gesetzt ist die Standard-Vorlage
+ sal_uLong nNodeIdx = pCurPam->GetPoint()->nNode.GetIndex();
- while( nNodeIdx < pDoc->GetNodes().Count() )
+ while( nNodeIdx < pDoc->GetNodes().Count() )
+ {
+ SwNode *pNd = pDoc->GetNodes()[ nNodeIdx ];
+ if( pNd->IsCntntNode() )
{
- SwNode *pNd = pDoc->GetNodes()[ nNodeIdx ];
- if( pNd->IsCntntNode() )
- {
- pPageDesc = ((const SwFmtPageDesc &)pNd->GetCntntNode()
- ->GetAttr(RES_PAGEDESC)).GetPageDesc();
- break;
- }
- else if( pNd->IsTableNode() )
- {
- pPageDesc = pNd->GetTableNode()->GetTable().GetFrmFmt()
- ->GetPageDesc().GetPageDesc();
- break;
- }
-
- nNodeIdx++;
+ pPageDesc = ((const SwFmtPageDesc &)pNd->GetCntntNode()
+ ->GetAttr(RES_PAGEDESC)).GetPageDesc();
+ break;
+ }
+ else if( pNd->IsTableNode() )
+ {
+ pPageDesc = pNd->GetTableNode()->GetTable().GetFrmFmt()
+ ->GetPageDesc().GetPageDesc();
+ break;
}
- if( !pPageDesc )
- pPageDesc = &const_cast<const SwDoc *>(pDoc)->GetPageDesc( 0 );
+ nNodeIdx++;
+ }
+
+ if( !pPageDesc )
+ pPageDesc = &const_cast<const SwDoc *>(pDoc)->GetPageDesc( 0 );
// und nun ... das Style-Sheet!!!
if( bCfgOutStyles )
@@ -987,10 +987,8 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
// der Body wird nicht eingerueckt, weil sonst alles eingerueckt waere!
OutNewLine();
- sOut = '<';
- sOut += OOO_STRING_SVTOOLS_HTML_body;
- Strm() << sOut.GetBuffer();
- sOut.Erase();
+ sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_body);
+ Strm() << sOut.makeStringAndClear().getStr();
// language
OutLanguage( eLang );
@@ -1031,9 +1029,10 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
void SwHTMLWriter::OutAnchor( const String& rName )
{
- ByteString sOut( '<' );
- (((sOut += OOO_STRING_SVTOOLS_HTML_anchor) += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\"";
- Strm() << sOut.GetBuffer();
+ rtl::OStringBuffer sOut;
+ sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ')
+ .append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
+ Strm() << sOut.makeStringAndClear().getStr();
HTMLOutFuncs::Out_String( Strm(), rName, eDestEnc, &aNonConvertableCharacters ) << "\">";
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False );
}
@@ -1134,9 +1133,9 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem,
/// only checking, if transparency is not set.
if( rBackColor.GetColor() != COL_TRANSPARENT )
{
- ByteString sOut( ' ' );
- (sOut += OOO_STRING_SVTOOLS_HTML_O_bgcolor) += '=';
- Strm() << sOut.GetBuffer();
+ rtl::OStringBuffer sOut;
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append('=');
+ Strm() << sOut.makeStringAndClear().getStr();
HTMLOutFuncs::Out_Color( Strm(), rBackColor, eDestEnc);
}
@@ -1183,10 +1182,11 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem,
if( pLink )
{
- ByteString sOut( ' ' );
String s( URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), *pLink));
- (sOut += OOO_STRING_SVTOOLS_HTML_O_background) += "=\"";
- Strm() << sOut.GetBuffer();
+ rtl::OStringBuffer sOut;
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_background)
+ .append("=\"");
+ Strm() << sOut.makeStringAndClear();
HTMLOutFuncs::Out_String( Strm(), s, eDestEnc, &aNonConvertableCharacters ) << '\"';
}
}
@@ -1224,9 +1224,10 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang )
{
if( LANGUAGE_DONTKNOW != nLang )
{
- ByteString sOut( ' ' );
- (sOut += OOO_STRING_SVTOOLS_HTML_O_lang) += "=\"";
- Strm() << sOut.GetBuffer();
+ rtl::OStringBuffer sOut;
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_lang)
+ .append("=\"");
+ Strm() << sOut.makeStringAndClear().getStr();
HTMLOutFuncs::Out_String( Strm(), MsLangId::convertLanguageToIsoString(nLang),
eDestEnc, &aNonConvertableCharacters ) << '"';
}
@@ -1272,23 +1273,28 @@ void SwHTMLWriter::OutDirection( sal_uInt16 nDir )
}
if( pValue != 0 )
{
- ByteString sOut( ' ' );
- (((sOut += OOO_STRING_SVTOOLS_HTML_O_dir) += "=\"") += pValue) += '\"';
- Strm() << sOut.GetBuffer();
+ rtl::OStringBuffer sOut;
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_dir)
+ .append("=\"").append(pValue).append('\"');
+ Strm() << sOut.makeStringAndClear().getStr();
}
}
-void SwHTMLWriter::GetIndentString( ByteString& rStr, sal_uInt16 nIncLvl )
+rtl::OString SwHTMLWriter::GetIndentString(sal_uInt16 nIncLvl)
{
+ rtl::OString sRet;
+
// etwas umstaendlich, aber wir haben nur einen Indent-String!
sal_uInt16 nLevel = nIndentLvl + nIncLvl;
if( nLevel && nLevel <= MAX_INDENT_LEVEL)
{
sIndentTabs[nLevel] = 0;
- rStr = sIndentTabs;
+ sRet = sIndentTabs;
sIndentTabs[nLevel] = '\t';
}
+
+ return sRet;
}
void SwHTMLWriter::OutNewLine( sal_Bool bCheck )
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 9e7fe5e..b96b24e 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -421,7 +421,7 @@ public:
void IncIndentLevel() { nIndentLvl++; }
void DecIndentLevel() { if ( nIndentLvl ) nIndentLvl--; }
- void GetIndentString( ByteString& rStr, sal_uInt16 nIncLvl=0 );
+ rtl::OString GetIndentString(sal_uInt16 nIncLvl = 0);
xub_StrLen GetLineLen() { return (xub_StrLen)(Strm().Tell()-nLastLFPos); }
void OutNewLine( sal_Bool bCheck=sal_False );
commit 98ae11bcd4b24c5616a4aefd4b865fcbe87814ef
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 13 23:40:59 2011 +0100
pointless foo
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index c1bb9c0..b5199f2 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -133,10 +133,8 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6<
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > mxAttrList; // and an interface of it
::rtl::OUString msOrigFileName; // the original URL
- ::rtl::OUString msPicturesPath;
::rtl::OUString msGraphicObjectProtocol;
::rtl::OUString msEmbeddedObjectProtocol;
- ::rtl::OUString msObjectsPath;
::rtl::OUString msFilterName;
SvXMLNamespaceMap *mpNamespaceMap; // the namepspace map
SvXMLUnitConverter *mpUnitConv; // the unit converter
@@ -417,12 +415,6 @@ public:
// Get original ::com::sun::star::util::URL.
const ::rtl::OUString& GetOrigFileName() const { return msOrigFileName; }
- // Get the relative path for embedded pictures
- const ::rtl::OUString& GetPicturesPath() const { return msPicturesPath; }
-
- // Get the relative path for embedded objects
- const ::rtl::OUString& GetObjectsPath() const { return msObjectsPath; }
-
// Get (const) namespace map.
const SvXMLNamespaceMap& GetNamespaceMap() const { return *mpNamespaceMap; }
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 7b03fad..2777f61 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -422,8 +422,6 @@ void SvXMLExport::_InitCtor()
mxAttrList = (xml::sax::XAttributeList*)mpAttrList;
- msPicturesPath = OUString( RTL_CONSTASCII_USTRINGPARAM( "#Pictures/" ) );
- msObjectsPath = OUString( RTL_CONSTASCII_USTRINGPARAM( "#./" ) );
msGraphicObjectProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) );
msEmbeddedObjectProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ) );
commit 33aa32322199fd1616af459b405ea3b9a8b3016e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 13 23:40:34 2011 +0100
callcatcher: remove unused code
diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 9c49d70..608bf80 100644
--- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -78,15 +78,11 @@ namespace sdr
const BitmapEx& getBitmapEx1() const { return maBitmapEx1; }
const BitmapEx& getBitmapEx2() const { return maBitmapEx2; }
- void setBitmapEx1(const BitmapEx& rNew);
- void setBitmapEx2(const BitmapEx& rNew);
sal_uInt16 getCenterX1() const { return mnCenterX1; }
sal_uInt16 getCenterY1() const { return mnCenterY1; }
sal_uInt16 getCenterX2() const { return mnCenterX2; }
sal_uInt16 getCenterY2() const { return mnCenterY2; }
- void setCenterXY1(sal_uInt16 nNewX, sal_uInt16 nNewY);
- void setCenterXY2(sal_uInt16 nNewX, sal_uInt16 nNewY);
// #i53216# added CursorBlinkTime (in ms)
sal_uInt32 getBlinkTime() const { return mnBlinkTime; }
diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index 0b285d9..5a5877b 100644
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
@@ -108,70 +108,6 @@ namespace sdr
{
}
- void OverlayAnimatedBitmapEx::setBitmapEx1(const BitmapEx& rNew)
- {
- if(rNew != maBitmapEx1)
- {
- // remember new Bitmap
- maBitmapEx1 = rNew;
-
- // register change (after change)
- objectChange();
- }
- }
-
- void OverlayAnimatedBitmapEx::setBitmapEx2(const BitmapEx& rNew)
- {
- if(rNew != maBitmapEx2)
- {
- // remember new Bitmap
- maBitmapEx2 = rNew;
-
- // register change (after change)
- objectChange();
- }
- }
-
- void OverlayAnimatedBitmapEx::setCenterXY1(sal_uInt16 nNewX, sal_uInt16 nNewY)
- {
- if(nNewX != mnCenterX1 || nNewY != mnCenterY1)
- {
- // remember new values
- if(nNewX != mnCenterX1)
- {
- mnCenterX1 = nNewX;
- }
-
- if(nNewY != mnCenterY1)
- {
- mnCenterY1 = nNewY;
- }
-
- // register change (after change)
- objectChange();
- }
- }
-
- void OverlayAnimatedBitmapEx::setCenterXY2(sal_uInt16 nNewX, sal_uInt16 nNewY)
- {
- if(nNewX != mnCenterX2 || nNewY != mnCenterY2)
- {
- // remember new values
- if(nNewX != mnCenterX2)
- {
- mnCenterX2 = nNewX;
- }
-
- if(nNewY != mnCenterY2)
- {
- mnCenterY2 = nNewY;
- }
-
- // register change (after change)
- objectChange();
- }
- }
-
void OverlayAnimatedBitmapEx::Trigger(sal_uInt32 nTime)
{
if(getOverlayManager())
diff --git a/unusedcode.easy b/unusedcode.easy
index e330daa..d5d44bc 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -4,7 +4,6 @@
BasicPrinter::BasicPrinter()
BitmapPalette::IsGreyPalette() const
BufferNode::childAt(int) const
-ByteString::ImplStringConvert(unsigned short, unsigned short, unsigned char)
CAT::Inverse() const
CAT::makeChromaticAdaptationTag() const
CIccCmm::FromInternalEncoding(icColorSpaceSignature, unsigned char*, float const*)
@@ -2872,10 +2871,6 @@ sdr::animation::Scheduler::Reset(unsigned int)
sdr::contact::ViewContactOfE3d::impCreateFallbackLineAttribute(basegfx::BColor const&) const
sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const
-sdr::overlay::OverlayAnimatedBitmapEx::setBitmapEx1(BitmapEx const&)
-sdr::overlay::OverlayAnimatedBitmapEx::setBitmapEx2(BitmapEx const&)
-sdr::overlay::OverlayAnimatedBitmapEx::setCenterXY1(unsigned short, unsigned short)
-sdr::overlay::OverlayAnimatedBitmapEx::setCenterXY2(unsigned short, unsigned short)
sdr::overlay::OverlayBitmapEx::setBitmapEx(BitmapEx const&)
sdr::overlay::OverlayBitmapEx::setCenterXY(unsigned short, unsigned short)
sdr::overlay::OverlayHatchRect::setSecondPosition(basegfx::B2DPoint const&)
commit 4a3db11077e18d58dc79af5178f5b8dbb2ebe160
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 13 23:31:03 2011 +0100
ImplUpdateStringFromUniString is now dangling
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 40bf4e4..bb674a6 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -159,8 +159,6 @@ private:
TOOLS_DLLPRIVATE inline void ImplCopyData();
TOOLS_DLLPRIVATE inline char * ImplCopyStringData(char *);
- TOOLS_DLLPRIVATE void ImplUpdateStringFromUniString(
- sal_Unicode const *, sal_Size, rtl_TextEncoding, sal_uInt32);
ByteString( const int* pDummy ); // not implemented: to prevent ByteString( NULL )
ByteString(int); // not implemented; to detect misuses
diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index b22685d..f66fd14 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.cxx
@@ -28,20 +28,6 @@
// no include "precompiled_tools.hxx" because this is included in other cxx files.
-// -----------------------------------------------------------------------
-
-void ByteString::ImplUpdateStringFromUniString(
- const sal_Unicode* pUniStr, sal_Size nUniLen,
- rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
-{
- ByteStringData* pNewStringData = NULL;
- rtl_uString2String( (rtl_String **)(&pNewStringData),
- pUniStr, nUniLen,
- eTextEncoding, nCvtFlags );
- STRING_RELEASE((STRING_TYPE *)mpData);
- mpData = pNewStringData;
-}
-
// =======================================================================
ByteString::ByteString( const UniString& rUniStr, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
commit 1cd1e4a3c69c135dd068f0c9c0971a2a0c8ce300
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 13 21:28:44 2011 +0100
use read_uInt8s_AsOString here
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 1648b90..2e826e3 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -81,13 +81,15 @@ sal_Unicode Ww1PlainText::operator [] ( sal_uLong ulOffset )
String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const
{
- String sRet;
- ByteString aStr;
OSL_ENSURE(ulOffset+nLen<Count(), "Ww1PlainText");
- if( rFib.GetStream().Seek(ulFilePos+ulOffset) == ulFilePos+ulOffset &&
- rFib.GetStream().Read( aStr.AllocBuffer( static_cast< xub_StrLen >(nLen) ), nLen ) == nLen )
- sRet = String( aStr, RTL_TEXTENCODING_MS_1252 );
- return sRet;
+
+ sal_Size nPos = ulFilePos+ulOffset;
+
+ bool bSeekOk = rFib.GetStream().Seek(nPos) == nPos;
+ rtl::OString a8BitStr = bSeekOk ?
+ read_uInt8s_AsOString(rFib.GetStream(), nLen) :
+ rtl::OString();
+ return rtl::OStringToOUString(a8BitStr, RTL_TEXTENCODING_MS_1252);
}
///////////////////////////////////////////////////////////////// Style
More information about the Libreoffice-commits
mailing list