[Libreoffice-commits] .: 19 commits - automation/source cppcanvas/source drawinglayer/source editeng/inc editeng/source filter/source reportdesign/source sal/inc sfx2/source slideshow/source solenv/inc svx/inc svx/source sw/inc sw/source unusedcode.easy vcl/generic vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 1 02:27:50 PDT 2011
automation/source/testtool/objtest.cxx | 6 -
automation/source/testtool/objtest.hxx | 1
cppcanvas/source/mtfrenderer/implrenderer.cxx | 18 ++--
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 4
editeng/inc/editeng/editview.hxx | 4
editeng/source/editeng/editdbg.cxx | 2
editeng/source/editeng/editdoc.hxx | 3
editeng/source/editeng/editview.cxx | 16 ---
filter/source/flash/swfdialog.cxx | 4
filter/source/flash/swfwriter1.cxx | 36 +-------
filter/source/graphicfilter/eos2met/eos2met.cxx | 15 +--
filter/source/graphicfilter/eps/eps.cxx | 48 +++++------
filter/source/graphicfilter/ieps/ieps.cxx | 2
filter/source/pdf/pdfexport.cxx | 3
filter/source/svg/svgwriter.cxx | 14 +--
reportdesign/source/ui/dlg/Formula.cxx | 2
sal/inc/rtl/string.hxx | 51 +++++++++++
sfx2/source/bastyp/fltfnc.cxx | 4
sfx2/source/dialog/basedlgs.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 2
slideshow/source/engine/shapes/drawshape.cxx | 10 --
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 16 +--
slideshow/source/engine/shapes/gdimtftools.cxx | 14 +--
solenv/inc/libs.mk | 2
svx/inc/svx/svdcrtv.hxx | 1
svx/inc/svx/svdedxv.hxx | 12 --
svx/inc/svx/svdetc.hxx | 6 -
svx/inc/svx/svdxcgv.hxx | 12 --
svx/source/svdraw/svdcrtv.cxx | 4
svx/source/svdraw/svdedxv.cxx | 69 ----------------
svx/source/svdraw/svdetc.cxx | 11 --
svx/source/svdraw/svdfmtf.cxx | 4
svx/source/svdraw/svdxcgv.cxx | 67 ---------------
svx/source/xml/xmlgrhlp.cxx | 3
sw/inc/swabstdlg.hxx | 8 -
sw/inc/swtypes.hxx | 1
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/ui/config/optpage.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 8 -
sw/source/ui/dialog/swdlgfact.hxx | 8 -
sw/source/ui/inc/wrtsh.hxx | 4
sw/source/ui/index/cntex.cxx | 2
sw/source/ui/wrtsh/wrtsh2.cxx | 10 +-
unusedcode.easy | 19 ----
vcl/generic/print/psputil.cxx | 8 -
vcl/generic/print/psputil.hxx | 1
vcl/inc/vcl/image.hxx | 1
vcl/inc/vcl/metaact.hxx | 8 -
vcl/source/gdi/gdimtf.cxx | 18 ++--
vcl/source/gdi/image.cxx | 17 ---
vcl/source/gdi/metaact.cxx | 17 ++-
vcl/source/gdi/pdfwriter_impl2.cxx | 8 -
53 files changed, 194 insertions(+), 418 deletions(-)
New commits:
commit 8be381cf6662e97579c804ec022da085d370829c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 31 22:47:04 2011 +0000
catch by const ref
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 63add66..2d34778 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -988,7 +988,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
{
aResult = xTypeCFG->getByName( sType );
}
- catch( ::com::sun::star::container::NoSuchElementException& )
+ catch (const ::com::sun::star::container::NoSuchElementException&)
{
aResult = ::com::sun::star::uno::Any();
}
@@ -1156,7 +1156,7 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
}
}
}
- catch( ::com::sun::star::uno::Exception& )
+ catch(const ::com::sun::star::uno::Exception&)
{
DBG_ASSERT( sal_False, "SfxFilterContainer::ReadFilter()\nException detected. Possible not all filters could be cached.\n" );
}
commit d01ee468d84a32a83747fb0afdc267e5fd2288c8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 31 15:26:27 2011 +0000
wrong lib name for old-style makefile.mks
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 91161f1..17d4825 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -308,7 +308,7 @@ PYUNOLIB=-lpyuno
LPSOLVELIB=-llpsolve55
SOFFICELIB=-lsofficeapp
UNOPKGAPPLIB=-lunopkgapp
-TESTLIB=-lunotest
+TESTLIB=-ltest
UNOTESTLIB=-lunotest
XMLREADERLIB=-lxmlreader
commit 3c95b2c39ae635f3fb9a4f06d41188d5139ff411
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 31 15:20:53 2011 +0000
drop GetImageIds
diff --git a/unusedcode.easy b/unusedcode.easy
index cecf145..fddda51 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -212,7 +212,6 @@ IconChoiceDialog::RemoveResetButton()
IconChoiceDialog::RemoveTabPage(unsigned short)
ImageButton::ImageButton(unsigned short)
ImageList::Clear()
-ImageList::GetImageIds(std::__debug::vector<unsigned short, std::allocator<unsigned short> >&) const
ImageList::RemoveImage(rtl::OUString const&)
ImageList::ReplaceImage(rtl::OUString const&, rtl::OUString const&)
ImageList::ReplaceImage(unsigned short, Image const&)
diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx
index 301af44..3c96eea 100644
--- a/vcl/inc/vcl/image.hxx
+++ b/vcl/inc/vcl/image.hxx
@@ -148,7 +148,6 @@ public:
sal_uInt16 GetImagePos( const ::rtl::OUString& rImageName ) const;
sal_uInt16 GetImageId( sal_uInt16 nPos ) const;
- void GetImageIds( ::std::vector< sal_uInt16 >& rIds ) const;
::rtl::OUString GetImageName( sal_uInt16 nPos ) const;
void GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const;
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index f587bc2..ad7f84d 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -824,23 +824,6 @@ sal_uInt16 ImageList::GetImageId( sal_uInt16 nPos ) const
// -----------------------------------------------------------------------
-void ImageList::GetImageIds( ::std::vector< sal_uInt16 >& rIds ) const
-{
- RTL_LOGFILE_CONTEXT( aLog, "vcl: ImageList::GetImageIds" );
-
- DBG_CHKTHIS( ImageList, NULL );
-
- rIds = ::std::vector< sal_uInt16 >();
-
- if( mpImplData )
- {
- for( sal_uInt32 i = 0; i < mpImplData->maImages.size(); i++ )
- rIds.push_back( mpImplData->maImages[i]->mnId );
- }
-}
-
-// -----------------------------------------------------------------------
-
::rtl::OUString ImageList::GetImageName( sal_uInt16 nPos ) const
{
DBG_CHKTHIS( ImageList, NULL );
commit 91220fc0ebffacd6cbcc2fdbede48ea37009e2a0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 31 10:58:21 2011 +0000
callcatcher: unused Drop code
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 9346ac7..31f0824 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -148,10 +148,6 @@ public:
sal_Bool MouseMove( const MouseEvent& rMouseEvent );
void Command( const CommandEvent& rCEvt );
- sal_Bool Drop( const DropEvent& rEvt );
- sal_Bool QueryDrop( DropEvent& rEvt );
- ESelection GetDropPos();
-
void Cut();
void Copy();
void Paste();
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index b0df9d0..919e40f 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -746,22 +746,6 @@ void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::d
PIMPEE->FormatAndUpdate( this );
}
-sal_Bool EditView::Drop( const DropEvent& )
-{
- return sal_False;
-}
-
-ESelection EditView::GetDropPos()
-{
- OSL_FAIL( "GetDropPos - Why?!" );
- return ESelection();
-}
-
-sal_Bool EditView::QueryDrop( DropEvent& )
-{
- return sal_False;
-}
-
void EditView::SetEditEngineUpdateMode( sal_Bool bUpdate )
{
DBG_CHKTHIS( EditView, 0 );
diff --git a/unusedcode.easy b/unusedcode.easy
index 8b5c2e2..cecf145 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -138,11 +138,8 @@ EditEngine::SetBigTextObjectStart(unsigned short)
EditEngine::SetGroupChars(String const&)
EditEngine::SetText(unsigned short, EditTextObject const&)
EditEngine::StopSelectionMode()
-EditView::Drop(DropEvent const&)
-EditView::GetDropPos()
EditView::GetSelectionMode() const
EditView::MatchGroup()
-EditView::QueryDrop(DropEvent&)
EditView::SetCursor(Cursor const&)
EditView::SetParaAttribs(SfxItemSet const&, unsigned short)
EditView::SetPointer(Pointer const&)
commit e547f8ca4cb0c91a65b263b655c23a2f4ae65d8b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 31 10:51:52 2011 +0000
strip out some more unused automation
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index dd1ceab..6659f66 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -128,12 +128,6 @@ DBG_CTOR(ControlItem,0);
pData->aUId = aUIdP;
}
-ControlItem::ControlItem( ControlData *pDataP )
-{
-DBG_CTOR(ControlItem,0);
- pData = pDataP;
-}
-
ControlSon::~ControlSon()
{
if (pSons)
diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx
index f4aa1b0..afcb6b9 100644
--- a/automation/source/testtool/objtest.hxx
+++ b/automation/source/testtool/objtest.hxx
@@ -120,7 +120,6 @@ public:
ControlItem( const char *Name, rtl::OString aUIdP );
ControlItem( const String &Name, rtl::OString aUIdP );
- ControlItem( ControlData *pDataP );
virtual ~ControlItem() {
DBG_DTOR(ControlItem,0);
delete pData;
diff --git a/unusedcode.easy b/unusedcode.easy
index b09d11b..8b5c2e2 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -84,7 +84,6 @@ CommunicationLinkList::Insert(CommunicationLink const**, unsigned short)
CommunicationLinkList::Insert(CommunicationLinkList const*, unsigned short, unsigned short)
CommunicationLinkList::Remove(CommunicationLink const*&, unsigned short)
Control::GetLineCount() const
-ControlItem::ControlItem(ControlData*)
CurrencyBox::CurrencyBox(Window*, ResId const&)
CurrencyBox::GetValue(unsigned short) const
CurrencyBox::GetValuePos(long) const
commit ace697180bf5eafee062209eef0abab455349160
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 30 21:43:00 2011 +0000
ByteString->rtl::OString
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 8d87430..fffe2eb 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -492,11 +492,12 @@ void METWriter::WriteChrSets()
*pMET << (sal_uInt8)0x03 << (sal_uInt8)0x52;
*pMET << (sal_uInt8)0x24 << (sal_uInt8)0x02 << (sal_uInt8)0x08 << (sal_uInt8)0x00;
- ByteString n(pCS->aName, gsl_getSystemTextEncoding());
+ rtl::OString n(rtl::OUStringToOString(pCS->aName,
+ osl_getThreadTextEncoding()));
for (i=0; i<32; i++)
{
if ( i == 0 || c != 0 )
- c = n.GetChar( i );
+ c = n[i];
*pMET << c;
}
}
@@ -1384,14 +1385,14 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier,
void METWriter::METChrStr( Point aPt, String aUniStr )
{
- sal_uInt16 nLen,i;
- ByteString aStr( aUniStr, gsl_getSystemTextEncoding() );
- nLen = aStr.Len();
+ rtl::OString aStr(rtl::OUStringToOString(aUniStr,
+ osl_getThreadTextEncoding()));
+ sal_uInt16 nLen = aStr.getLength();
WillWriteOrder( 11 + nLen );
*pMET << (sal_uInt8)0xc3 << (sal_uInt8)( 9 + nLen );
WritePoint(aPt);
- for ( i = 0; i < nLen; i++ )
- *pMET << aStr.GetChar( i );
+ for (sal_uInt16 i = 0; i < nLen; ++i)
+ *pMET << aStr[i];
*pMET << (sal_uInt8)0;
}
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index a7e03e6..369c50f 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -225,7 +225,7 @@ private:
void ImplText( const String& rUniString, const Point& rPos, const sal_Int32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev );
void ImplSetAttrForText( const Point & rPoint );
void ImplWriteCharacter( sal_Char );
- void ImplWriteString( const ByteString&, VirtualDevice& rVDev, const sal_Int32* pDXArry = NULL, sal_Bool bStretch = sal_False );
+ void ImplWriteString( const rtl::OString&, VirtualDevice& rVDev, const sal_Int32* pDXArry = NULL, sal_Bool bStretch = sal_False );
void ImplDefineFont( const char*, const char* );
void ImplClosePathDraw( sal_uLong nMode = PS_RET );
@@ -1274,11 +1274,11 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
{
SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ );
sal_Bool bSkipSequence = sal_False;
- ByteString sSeqEnd;
+ rtl::OString sSeqEnd;
if( pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM( "XPATHSTROKE_SEQ_BEGIN" )) )
{
- sSeqEnd = ByteString( "XPATHSTROKE_SEQ_END" );
+ sSeqEnd = rtl::OString(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END"));
SvtGraphicStroke aStroke;
aMemStm >> aStroke;
@@ -1314,7 +1314,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
}
else if (pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")))
{
- sSeqEnd = ByteString( "XPATHFILL_SEQ_END" );
+ sSeqEnd = rtl::OString(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END"));
SvtGraphicFill aFill;
aMemStm >> aFill;
switch( aFill.getFillType() )
@@ -1425,8 +1425,8 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
pMA = rMtf.GetAction( nCurAction );
if ( pMA->GetType() == META_COMMENT_ACTION )
{
- ByteString sComment( ((MetaCommentAction*)pMA)->GetComment() );
- if ( sComment.Equals( sSeqEnd ) )
+ rtl::OString sComment( ((MetaCommentAction*)pMA)->GetComment() );
+ if ( sComment.equals( sSeqEnd ) )
break;
}
}
@@ -2042,32 +2042,31 @@ void PSWriter::ImplWriteCharacter( sal_Char nChar )
//---------------------------------------------------------------------------------
-void PSWriter::ImplWriteString( const ByteString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, sal_Bool bStretch )
+void PSWriter::ImplWriteString( const rtl::OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, sal_Bool bStretch )
{
- sal_uInt16 nLen = rString.Len();
+ sal_Int32 nLen = rString.getLength();
if ( nLen )
{
- sal_uInt16 i;
if ( pDXArry )
{
double nx = 0;
- for( i = 0; i < nLen; i++ )
+ for (sal_Int32 i = 0; i < nLen; ++i)
{
if ( i > 0 )
nx = pDXArry[ i - 1 ];
- ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( rString.GetChar( i ) ) );
+ ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( rString[i] ) );
ImplWriteDouble( nx );
ImplWriteLine( "(", PS_NONE );
- ImplWriteCharacter( rString.GetChar( i ) );
+ ImplWriteCharacter( rString[i] );
ImplWriteLine( ") bs" );
}
}
else
{
ImplWriteByte( '(', PS_NONE );
- for ( i = 0; i < nLen; i++ )
- ImplWriteCharacter( rString.GetChar( i ) );
+ for (sal_Int32 i = 0; i < nLen; ++i)
+ ImplWriteCharacter( rString[i] );
ImplWriteLine( ") sw" );
}
}
@@ -2128,7 +2127,8 @@ void PSWriter::ImplText( const String& rUniString, const Point& rPos, const sal_
if ( mnTextMode == 2 ) // forcing output one complete text packet, by
pDXArry = NULL; // ignoring the kerning array
ImplSetAttrForText( rPos );
- ByteString aStr( rUniString, maFont.GetCharSet() );
+ rtl::OString aStr(rtl::OUStringToOString(rUniString,
+ maFont.GetCharSet()));
ImplWriteString( aStr, rVDev, pDXArry, nWidth != 0 );
if ( maFont.GetOrientation() )
ImplWriteLine( "gr" );
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 4ecb415..9a1e6e5 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -380,7 +380,7 @@ static bool RenderAsPNG(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
void CreateMtfReplacementAction( GDIMetaFile& rMtf, SvStream& rStrm, sal_uInt32 nOrigPos, sal_uInt32 nPSSize,
sal_uInt32 nPosWMF, sal_uInt32 nSizeWMF, sal_uInt32 nPosTIFF, sal_uInt32 nSizeTIFF )
{
- ByteString aComment( (const sal_Char*)"EPSReplacementGraphic" );
+ rtl::OString aComment(RTL_CONSTASCII_STRINGPARAM("EPSReplacementGraphic"));
if ( nSizeWMF || nSizeTIFF )
{
SvMemoryStream aReplacement( nSizeWMF + nSizeTIFF + 28 );
commit 4d01a82f370b695b585d59393a461643c1b17001
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 30 21:33:09 2011 +0000
intermediate String objects are completely unnecessary here
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index c26f3eb..a7e03e6 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -306,10 +306,9 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
// try to get the dialog selection
if ( pFilterConfigItem )
{
- ByteString aResMgrName( "eps" );
ResMgr* pResMgr;
- pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
+ pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILocale() );
if( pResMgr )
{
@@ -454,9 +453,8 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
if ( mbStatus && mnLevelWarning && pFilterConfigItem )
{
- ByteString aResMgrName( "eps" );
ResMgr* pResMgr;
- pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
+ pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILocale() );
if( pResMgr )
{
InfoBox aInfoBox( NULL, String( ResId( KEY_VERSION_CHECK, *pResMgr ) ) );
commit c5e280b4144d3ed642404079f464a42829be3f80
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 30 21:32:28 2011 +0000
intermediate String objects are completely unnecessary here
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index 6520341..d86bfe2 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -101,9 +101,7 @@ Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMul
SWFDialog::SWFDialog( const Reference< XMultiServiceFactory > &rxMSF ) :
OGenericUnoDialog( rxMSF )
{
- ByteString aResMgrName( "flash" );
-
- mpResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
+ mpResMgr = ResMgr::CreateResMgr( "flash", Application::GetSettings().GetUILocale() );
}
// -----------------------------------------------------------------------------
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 9e1d4ef..302909f 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -886,8 +886,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
if ( mxStatusIndicator.is() )
{
- ByteString aResMgrName( "pdffilter" );
- ResMgr* pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
+ ResMgr* pResMgr = ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILocale() );
if ( pResMgr )
{
sal_Int32 nTotalPageCount = aRangeEnum.size();
commit 9cb9ddbfb7d1baa4a3ac259354079c6e88429e69
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 30 21:30:31 2011 +0000
callcatcher: remove unused appendStr
diff --git a/unusedcode.easy b/unusedcode.easy
index 747291b..b09d11b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2561,7 +2561,6 @@ psp::PrinterGfx::SetFallbackFont(int)
psp::PrinterJob::GetDocumentHeader()
psp::PrinterJob::GetDocumentTrailer()
psp::PrinterJob::GetErrorCode()
-psp::appendStr(char const*, char*, int)
pyuno::Runtime::finalize()
pyuno::importToGlobal(_object*, _object*, _object*)
rptui::OFieldExpressionControl::LinkStubAsynchActivate(void*, void*)
diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx
index 2664bac..7f60cdb 100644
--- a/vcl/generic/print/psputil.cxx
+++ b/vcl/generic/print/psputil.cxx
@@ -142,14 +142,6 @@ appendStr (const sal_Char* pSrc, sal_Char* pDst)
return nBytes;
}
-sal_Int32
-appendStr (const sal_Char* pSrc, sal_Char* pDst, sal_Int32 nBytes)
-{
- strncpy (pDst, pSrc, nBytes);
- pDst [nBytes] = '\0';
- return nBytes;
-}
-
/*
* copy strings to file
*/
diff --git a/vcl/generic/print/psputil.hxx b/vcl/generic/print/psputil.hxx
index 2aaffda..718e46d 100644
--- a/vcl/generic/print/psputil.hxx
+++ b/vcl/generic/print/psputil.hxx
@@ -49,7 +49,6 @@ sal_Int32 getHexValueOf (sal_Int32 nValue, sal_Char* pBuffer);
sal_Int32 getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer);
sal_Int32 getValueOf (sal_Int32 nValue, sal_Char* pBuffer);
sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst);
-sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst, sal_Int32 nBytes);
sal_Bool WritePS (osl::File* pFile, const sal_Char* pString);
sal_Bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength);
commit 76e37b7f798a211a9a3f3110f30d65a2c93dba4b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 30 21:20:45 2011 +0000
adapt naming scheme
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 32456e4..1ddfc69 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -516,7 +516,7 @@ namespace cppcanvas
++io_rCurrActionIndex;
if( pCurrAct->GetType() == META_COMMENT_ACTION &&
- static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseAscii(
+ static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCase(
pCommentString) )
{
// requested comment found, done
@@ -551,7 +551,7 @@ namespace cppcanvas
}
if( pCurrAct->GetType() == META_COMMENT_ACTION &&
- static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseAscii(
+ static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCase(
pCommentString) )
{
// delimiting end comment found, done
@@ -1686,7 +1686,7 @@ namespace cppcanvas
MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct);
// Handle gradients
- if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
+ if (pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
{
MetaGradientExAction* pGradAction = NULL;
bool bDone( false );
@@ -1702,7 +1702,7 @@ namespace cppcanvas
// skip broken-down rendering, output gradient when sequence is ended
case META_COMMENT_ACTION:
- if( static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) )
+ if( static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) )
{
bDone = true;
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 685c4fc..967e1e7 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -3107,7 +3107,7 @@ namespace
// and makes the code less dependent from those Metafile Add-Ons
const MetaCommentAction* pA = (const MetaCommentAction*)pAction;
- if (pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
+ if (pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
{
// XGRAD_SEQ_BEGIN, XGRAD_SEQ_END should be supported since the
// pure recorded paint of the gradients uses the XOR paint functionality
@@ -3127,7 +3127,7 @@ namespace
}
else if(META_COMMENT_ACTION == pAction->GetType())
{
- if (((const MetaCommentAction*)pAction)->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")))
+ if (((const MetaCommentAction*)pAction)->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")))
{
bDone = true;
}
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 027e21a..4a4abf9 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1658,7 +1658,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
const sal_uInt8* pData = pA->GetData();
String aSkipComment;
- if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
+ if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
{
const MetaGradientExAction* pGradAction = NULL;
sal_Bool bDone = sal_False;
@@ -1670,7 +1670,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
if( pAction->GetType() == META_GRADIENTEX_ACTION )
pGradAction = (const MetaGradientExAction*) pAction;
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
{
bDone = sal_True;
}
@@ -1679,7 +1679,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
if( pGradAction )
Impl_writeGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient());
}
- else if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) &&
+ else if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) &&
pData )
{
@@ -1703,14 +1703,14 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
pAction = rMtf.GetAction( i );
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
{
bDone = sal_True;
}
}
}
}
- else if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) &&
+ else if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) &&
pData )
{
@@ -1734,7 +1734,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
pAction = rMtf.GetAction( i );
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) )
{
bDone = sal_True;
}
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index aad4876..c26f3eb 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -1244,7 +1244,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
case META_COMMENT_ACTION:
{
const MetaCommentAction* pA = (const MetaCommentAction*) pMA;
- if ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
+ if ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
{
const MetaGradientExAction* pGradAction = NULL;
while( ++nCurAction < nCount )
@@ -1253,7 +1253,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
if( pAction->GetType() == META_GRADIENTEX_ACTION )
pGradAction = (const MetaGradientExAction*) pAction;
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
{
break;
}
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 1e6d115..f69fe60 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1627,7 +1627,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
const MetaCommentAction* pA = (const MetaCommentAction*) pAction;
String aSkipComment;
- if( ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) &&
+ if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) &&
( nWriteFlags & SVGWRITER_WRITE_FILL ) )
{
const MetaGradientExAction* pGradAction = NULL;
@@ -1641,7 +1641,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
pGradAction = (const MetaGradientExAction*) pAction;
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().
- equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
+ equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
{
bDone = sal_True;
}
@@ -1650,7 +1650,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( pGradAction )
ImplWriteGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), nWriteFlags );
}
- else if( ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) ) &&
+ else if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) ) &&
( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
pA->GetDataSize() )
{
@@ -1697,7 +1697,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().
- equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
+ equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
{
bSkip = sal_False;
}
@@ -1725,13 +1725,13 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().
- equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
+ equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
{
bSkip = sal_False;
}
}
}
- else if( ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) ) &&
+ else if( ( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) ) &&
( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
pA->GetDataSize() )
{
@@ -1781,7 +1781,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().
- equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) )
+ equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) )
{
bSkip = sal_False;
}
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 23fee9d..ee41011 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -414,10 +414,9 @@ public:
@return sal_True if the strings are equal;
sal_False, otherwise.
*/
- sal_Bool equalsIgnoreAsciiCaseAscii( const sal_Char * asciiStr ) const SAL_THROW(())
+ sal_Bool equalsIgnoreAsciiCase( const sal_Char * asciiStr ) const SAL_THROW(())
{
- return rtl_str_compareIgnoreAsciiCase_WithLength( pData->buffer, pData->length,
- asciiStr, rtl_str_getLength(asciiStr) ) == 0;
+ return rtl_str_compareIgnoreAsciiCase( pData->buffer, asciiStr ) == 0;
}
/**
@@ -439,7 +438,7 @@ public:
@return sal_True if the strings are equal;
sal_False, otherwise.
*/
- sal_Bool equalsIgnoreAsciiCaseAsciiL( const sal_Char * asciiStr, sal_Int32 asciiStrLength ) const SAL_THROW(())
+ sal_Bool equalsIgnoreAsciiCaseL( const sal_Char * asciiStr, sal_Int32 asciiStrLength ) const SAL_THROW(())
{
if ( pData->length != asciiStrLength )
return sal_False;
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index d3b9a2f..153ffb2 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -1090,7 +1090,7 @@ namespace slideshow
MetaCommentAction * pAct =
static_cast<MetaCommentAction *>(pCurrAct);
// skip comment if not a special XTEXT comment
- if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN") ) &&
// e.g. date field doesn't have data!
// currently assuming that only url field, this is
@@ -1116,7 +1116,7 @@ namespace slideshow
pAct->GetDataSize() / sizeof(sal_Unicode) )
) );
}
- else if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ else if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END")) &&
// pending end is expected:
!maHyperlinkIndices.empty() &&
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index b474c05..919280b 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -91,14 +91,14 @@ namespace slideshow
MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct);
// skip comment if not a special XTEXT comment
- if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT")) )
+ if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT")) )
{
// fill classification vector with NOOPs,
// then insert corresponding classes at
// the given index
maActionClassVector.resize( nActionIndex+1, CLASS_NOOP );
- if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")) )
+ if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")) )
{
// special, because can happen
// in-between of portions - set
@@ -112,7 +112,7 @@ namespace slideshow
maActionClassVector[ nIndex ] = CLASS_CHARACTER_CELL_END;
}
- else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW")) )
{
// special, because can happen
// in-between of portions - set
@@ -126,7 +126,7 @@ namespace slideshow
maActionClassVector[ nIndex ] = CLASS_WORD_END;
}
- else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOS" )) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOS" )) )
{
// special, because can happen
// in-between of portions - set
@@ -140,19 +140,19 @@ namespace slideshow
maActionClassVector[ nIndex ] = CLASS_SENTENCE_END;
}
- else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL")) )
{
maActionClassVector[ nActionIndex ] = CLASS_LINE_END;
}
- else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP")) )
{
maActionClassVector[ nActionIndex ] = CLASS_PARAGRAPH_END;
}
- else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END")) )
{
maActionClassVector[ nActionIndex ] = CLASS_SHAPE_END;
}
- else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN")) )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN")) )
{
maActionClassVector[ nActionIndex ] = CLASS_SHAPE_START;
}
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index ab85873..77d8a08 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -481,10 +481,10 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
MetaCommentAction * pAct =
static_cast<MetaCommentAction *>(pCurrAct);
// skip comment if not a special XTEXT comment
- if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("XTEXT") ))
{
- if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("XTEXT_SCROLLRECT") ))
{
o_rScrollRect = ::vcl::unotools::b2DRectangleFromRectangle(
@@ -493,7 +493,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
bScrollRectSet = true;
}
- else if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ else if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTRECT")) )
{
o_rPaintRect = ::vcl::unotools::b2DRectangleFromRectangle(
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 9fe3753..c3a3fa2 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -956,7 +956,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
{
ByteString aSkipComment;
- if (rAct.GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
+ if (rAct.GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
{
MetaGradientExAction* pAct = (MetaGradientExAction*) pMtf->NextAction();
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 50ae862..852e7ff 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -523,7 +523,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
const MetaCommentAction* pA = (const MetaCommentAction*) pAction;
String aSkipComment;
- if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
+ if( pA->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
{
const MetaGradientExAction* pGradAction = NULL;
sal_Bool bDone = sal_False;
@@ -535,7 +535,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
if( pAction->GetType() == META_GRADIENTEX_ACTION )
pGradAction = (const MetaGradientExAction*) pAction;
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END"))) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END"))) )
{
bDone = sal_True;
}
commit fef11229e6231814a9d5aa9227b17fbac4878731
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 30 12:03:49 2011 +0000
ByteString->rtl::OString
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 58e56fe..a181532 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -559,7 +559,7 @@ void SwXMLTextBlocks::GeneratePackageName ( const String& rShort, String& rPacka
rPackageName = rShort;
xub_StrLen nPos = 0;
sal_Unicode pDelims[] = { '!', '/', ':', '.', '\\', 0 };
- ByteString sByte ( rPackageName, RTL_TEXTENCODING_UTF7);
+ rtl::OString sByte(rtl::OUStringToOString(rPackageName, RTL_TEXTENCODING_UTF7));
rPackageName = String (sByte, RTL_TEXTENCODING_ASCII_US);
while( STRING_NOTFOUND != ( nPos = rPackageName.SearchChar( pDelims, nPos )))
{
commit 120d1614d3267d9f2844391c72024b61f97348e4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 30 07:56:10 2011 +0000
can go behind appropiate ifdef
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 80193d0..764ecea 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -487,6 +487,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
InfoBox(0, String( RTL_CONSTASCII_USTRINGPARAM( "D:\\DEBUG.LOG !" ) ) ).Execute();
}
+#if OSL_DEBUG_LEVEL > 2
sal_Bool ParaPortion::DbgCheckTextPortions()
{
// check, if Portion length ok:
@@ -495,6 +496,7 @@ sal_Bool ParaPortion::DbgCheckTextPortions()
nXLen = nXLen + aTextPortionList[nPortion]->GetLen();
return nXLen == pNode->Len() ? sal_True : sal_False;
}
+#endif
sal_Bool CheckOrderedList( CharAttribArray& rAttribs, sal_Bool bStart )
{
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index a51d071..a8e29bc 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -627,8 +627,9 @@ public:
short GetInvalidDiff() const { return nInvalidDiff; }
void CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine );
-
+#if OSL_DEBUG_LEVEL > 2
sal_Bool DbgCheckTextPortions();
+#endif
};
typedef ParaPortion* ParaPortionPtr;
diff --git a/unusedcode.easy b/unusedcode.easy
index 13cbb9d..747291b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -342,9 +342,9 @@ OutputDevice::PixelToLogic(basegfx::B2DPolyPolygon const&) const
OutputDevice::PixelToLogic(basegfx::B2DPolygon const&) const
PageSpan::getMarginLeft() const
PageSpan::getMarginRight() const
-ParaPortion::DbgCheckTextPortions()
ParaPortionList::DbgCheck(EditDoc&)
ParagraphObj::ParagraphObj(ParagraphObj&)
+ParagraphStyleManager::get(WPXString const&) const
PathDialog::SetPath(Edit const&)
PatternBox::GetString(unsigned short) const
PatternBox::GetStringPos(String const&) const
@@ -743,6 +743,7 @@ SotFactory::TestInvariant()
SotObject::RemoveOwnerLock()
SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
SourceTreeIterator::EndExecute()
+SpanStyleManager::get(WPXString const&) const
SpinButton::SpinButton(Window*, ResId const&)
SplitWindow::CalcWindowSizePixel(Size const&, WindowAlign, long, unsigned char)
SplitWindow::GetItemWindow(unsigned short) const
commit 4847ef98f6a9448c3c4a52eacd8dd540e59fea4e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 30 07:50:19 2011 +0000
drop unused GetViewCenter
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index 90074da..30fe9df 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -111,9 +111,6 @@ public:
*/
static Graphic GetObjGraphic( const SdrModel* pModel, const SdrObject* pObj );
- // Bestimmung des View-Mittelpunktes, z.B. zum Pasten
- Point GetViewCenter(const OutputDevice* pOut=NULL) const;
-
// Bei allen Paste-Methoden werden die neuen Draw-Objekte markiert.
// Wird der Parameter bAddMark auf sal_True gesetzt, so werden die neuen
// DrawObjekte zu einer bereits bestehenden Selektion "hinzumarkiert".
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 89b48c6..301958f 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -72,26 +72,6 @@ SdrExchangeView::SdrExchangeView(SdrModel* pModel1, OutputDevice* pOut):
{
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-Point SdrExchangeView::GetViewCenter(const OutputDevice* pOut) const
-{
- Point aCenter;
- if (pOut==NULL)
- {
- pOut = GetFirstOutputDevice();
- }
- if (pOut!=NULL) {
- Point aOfs=pOut->GetMapMode().GetOrigin();
- Size aOutSiz=pOut->GetOutputSize();
- aOutSiz.Width()/=2;
- aOutSiz.Height()/=2;
- aCenter.X()=aOutSiz.Width() -aOfs.X();
- aCenter.Y()=aOutSiz.Height()-aOfs.Y();
- }
- return aCenter;
-}
-
sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
{
sal_Bool bRet(sal_False);
commit 4403ef6fa8c680fa230ead3a338fb8343e644461
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 29 09:24:16 2011 +0100
ByteString->rtl::OString
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index ebb5238..027e21a 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1658,7 +1658,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
const sal_uInt8* pData = pA->GetData();
String aSkipComment;
- if( pA->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL )
+ if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
{
const MetaGradientExAction* pGradAction = NULL;
sal_Bool bDone = sal_False;
@@ -1670,7 +1670,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
if( pAction->GetType() == META_GRADIENTEX_ACTION )
pGradAction = (const MetaGradientExAction*) pAction;
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
{
bDone = sal_True;
}
@@ -1679,7 +1679,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
if( pGradAction )
Impl_writeGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient());
}
- else if( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_BEGIN" ) == COMPARE_EQUAL &&
+ else if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) &&
pData )
{
@@ -1703,14 +1703,14 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
pAction = rMtf.GetAction( i );
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_END" ) == COMPARE_EQUAL ) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
{
bDone = sal_True;
}
}
}
}
- else if( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHSTROKE_SEQ_BEGIN" ) == COMPARE_EQUAL &&
+ else if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) &&
pData )
{
@@ -1734,37 +1734,13 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
pAction = rMtf.GetAction( i );
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XPATHSTROKE_SEQ_END" ) == COMPARE_EQUAL ) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) )
{
bDone = sal_True;
}
}
}
}
-#if 0
- else if( pA->GetComment().CompareIgnoreCaseToAscii( "FIELD_SEQ_BEGIN;PageField" ) == COMPARE_EQUAL )
- {
- bool bDone = sal_False;
-
- while( !bDone && ( ++i < nCount ) )
- {
- pAction = rMtf.GetAction( i );
-
- if( pAction->GetType() == META_TEXTARRAY_ACTION )
- {
- const MetaTextArrayAction* pA = (const MetaTextArrayAction*) pAction;
- Rectangle aRect( pA->GetPoint(), Size( 100, 100 ) );
- Impl_writePageField( aRect );
- }
-
- if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "FIELD_SEQ_END" ) == COMPARE_EQUAL ) )
- {
- bDone = sal_True;
- }
- }
- }
-#endif
}
break;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index e385a4a..aad4876 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -1244,7 +1244,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
case META_COMMENT_ACTION:
{
const MetaCommentAction* pA = (const MetaCommentAction*) pMA;
- if ( pA->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL )
+ if ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
{
const MetaGradientExAction* pGradAction = NULL;
while( ++nCurAction < nCount )
@@ -1253,7 +1253,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
if( pAction->GetType() == META_GRADIENTEX_ACTION )
pGradAction = (const MetaGradientExAction*) pAction;
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
{
break;
}
@@ -1261,7 +1261,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
if( pGradAction )
ImplWriteGradient( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), rVDev );
}
- else if ( pA->GetComment().Equals( "XPATHFILL_SEQ_END" ) )
+ else if ( pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) )
{
if ( aFillPath.Count() )
{
@@ -1278,7 +1278,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
sal_Bool bSkipSequence = sal_False;
ByteString sSeqEnd;
- if( pA->GetComment().Equals( "XPATHSTROKE_SEQ_BEGIN" ) )
+ if( pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM( "XPATHSTROKE_SEQ_BEGIN" )) )
{
sSeqEnd = ByteString( "XPATHSTROKE_SEQ_END" );
SvtGraphicStroke aStroke;
@@ -1314,7 +1314,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
ImplPolyLine( aPath );
}
}
- else if( pA->GetComment().Equals( "XPATHFILL_SEQ_BEGIN" ) )
+ else if (pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")))
{
sSeqEnd = ByteString( "XPATHFILL_SEQ_END" );
SvtGraphicFill aFill;
@@ -1386,7 +1386,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
break;
case META_COMMENT_ACTION :
{
- if (((const MetaCommentAction*)pAction)->GetComment().Equals( "XPATHFILL_SEQ_END" ))
+ if (((const MetaCommentAction*)pAction)->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")))
bOk = sal_False;
}
break;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 66ca7bd..1e6d115 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1627,7 +1627,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
const MetaCommentAction* pA = (const MetaCommentAction*) pAction;
String aSkipComment;
- if( ( pA->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL ) &&
+ if( ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) ) &&
( nWriteFlags & SVGWRITER_WRITE_FILL ) )
{
const MetaGradientExAction* pGradAction = NULL;
@@ -1641,7 +1641,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
pGradAction = (const MetaGradientExAction*) pAction;
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().
- CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
+ equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) ) )
{
bDone = sal_True;
}
@@ -1650,7 +1650,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( pGradAction )
ImplWriteGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), nWriteFlags );
}
- else if( ( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_BEGIN" ) == COMPARE_EQUAL ) &&
+ else if( ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) ) &&
( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
pA->GetDataSize() )
{
@@ -1697,7 +1697,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().
- CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_END" ) == COMPARE_EQUAL ) )
+ equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
{
bSkip = sal_False;
}
@@ -1725,13 +1725,13 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().
- CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_END" ) == COMPARE_EQUAL ) )
+ equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) ) )
{
bSkip = sal_False;
}
}
}
- else if( ( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHSTROKE_SEQ_BEGIN" ) == COMPARE_EQUAL ) &&
+ else if( ( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) ) &&
( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
pA->GetDataSize() )
{
@@ -1781,7 +1781,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().
- CompareIgnoreCaseToAscii( "XPATHSTROKE_SEQ_END" ) == COMPARE_EQUAL ) )
+ equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END")) ) )
{
bSkip = sal_False;
}
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index e2492a4..d3b9a2f 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -1090,9 +1090,8 @@ namespace slideshow
MetaCommentAction * pAct =
static_cast<MetaCommentAction *>(pCurrAct);
// skip comment if not a special XTEXT comment
- if (pAct->GetComment().CompareIgnoreCaseToAscii(
- RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN") ) ==
- COMPARE_EQUAL &&
+ if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN") ) &&
// e.g. date field doesn't have data!
// currently assuming that only url field, this is
// somehow fragile! xxx todo if possible
@@ -1117,9 +1116,8 @@ namespace slideshow
pAct->GetDataSize() / sizeof(sal_Unicode) )
) );
}
- else if (pAct->GetComment().CompareIgnoreCaseToAscii(
- RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END")) ==
- COMPARE_EQUAL &&
+ else if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END")) &&
// pending end is expected:
!maHyperlinkIndices.empty() &&
maHyperlinkIndices.back().second == -1)
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index bfe36dc..b474c05 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -91,14 +91,14 @@ namespace slideshow
MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct);
// skip comment if not a special XTEXT comment
- if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT", 5 ) == COMPARE_EQUAL )
+ if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT")) )
{
// fill classification vector with NOOPs,
// then insert corresponding classes at
// the given index
maActionClassVector.resize( nActionIndex+1, CLASS_NOOP );
- if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOC" ) == COMPARE_EQUAL )
+ if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")) )
{
// special, because can happen
// in-between of portions - set
@@ -112,7 +112,7 @@ namespace slideshow
maActionClassVector[ nIndex ] = CLASS_CHARACTER_CELL_END;
}
- else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOW" ) == COMPARE_EQUAL )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW")) )
{
// special, because can happen
// in-between of portions - set
@@ -126,7 +126,7 @@ namespace slideshow
maActionClassVector[ nIndex ] = CLASS_WORD_END;
}
- else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOS" ) == COMPARE_EQUAL )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOS" )) )
{
// special, because can happen
// in-between of portions - set
@@ -140,19 +140,19 @@ namespace slideshow
maActionClassVector[ nIndex ] = CLASS_SENTENCE_END;
}
- else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOL" ) == COMPARE_EQUAL )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL")) )
{
maActionClassVector[ nActionIndex ] = CLASS_LINE_END;
}
- else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_EOP" ) == COMPARE_EQUAL )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP")) )
{
maActionClassVector[ nActionIndex ] = CLASS_PARAGRAPH_END;
}
- else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_PAINTSHAPE_END" ) == COMPARE_EQUAL )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END")) )
{
maActionClassVector[ nActionIndex ] = CLASS_SHAPE_END;
}
- else if( pAct->GetComment().CompareIgnoreCaseToAscii( "XTEXT_PAINTSHAPE_BEGIN" ) == COMPARE_EQUAL )
+ else if( pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN")) )
{
maActionClassVector[ nActionIndex ] = CLASS_SHAPE_START;
}
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index aed2764..ab85873 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -481,19 +481,21 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
MetaCommentAction * pAct =
static_cast<MetaCommentAction *>(pCurrAct);
// skip comment if not a special XTEXT comment
- if (pAct->GetComment().CompareIgnoreCaseToAscii(
- RTL_CONSTASCII_STRINGPARAM("XTEXT") ) == COMPARE_EQUAL)
+ if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("XTEXT") ))
{
- if (pAct->GetComment().CompareIgnoreCaseToAscii(
- "XTEXT_SCROLLRECT" ) == COMPARE_EQUAL) {
+ if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("XTEXT_SCROLLRECT") ))
+ {
o_rScrollRect = ::vcl::unotools::b2DRectangleFromRectangle(
*reinterpret_cast<Rectangle const *>(
pAct->GetData() ) );
bScrollRectSet = true;
}
- else if (pAct->GetComment().CompareIgnoreCaseToAscii(
- "XTEXT_PAINTRECT" ) == COMPARE_EQUAL) {
+ else if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTRECT")) )
+ {
o_rPaintRect = ::vcl::unotools::b2DRectangleFromRectangle(
*reinterpret_cast<Rectangle const *>(
pAct->GetData() ) );
commit 6a73e43b718cc22a6cec0b2fada8bb6ada3893bf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 29 08:25:10 2011 +0100
MetaCommentAction now using rtl::OString
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index e2e0c59..685c4fc 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -3107,7 +3107,7 @@ namespace
// and makes the code less dependent from those Metafile Add-Ons
const MetaCommentAction* pA = (const MetaCommentAction*)pAction;
- if(COMPARE_EQUAL == pA->GetComment().CompareIgnoreCaseToAscii("XGRAD_SEQ_BEGIN"))
+ if (pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
{
// XGRAD_SEQ_BEGIN, XGRAD_SEQ_END should be supported since the
// pure recorded paint of the gradients uses the XOR paint functionality
@@ -3127,7 +3127,7 @@ namespace
}
else if(META_COMMENT_ACTION == pAction->GetType())
{
- if(COMPARE_EQUAL == ((const MetaCommentAction*)pAction)->GetComment().CompareIgnoreCaseToAscii("XGRAD_SEQ_END"))
+ if (((const MetaCommentAction*)pAction)->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")))
{
bDone = true;
}
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 0be5e68..9fe3753 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -956,7 +956,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
{
ByteString aSkipComment;
- if( rAct.GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL )
+ if (rAct.GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
{
MetaGradientExAction* pAct = (MetaGradientExAction*) pMtf->NextAction();
@@ -1019,7 +1019,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
while( pSkipAct
&& ((pSkipAct->GetType() != META_COMMENT_ACTION )
- || (((MetaCommentAction*)pSkipAct)->GetComment().CompareIgnoreCaseToAscii(aSkipComment.GetBuffer()) != COMPARE_EQUAL)))
+ || !(((MetaCommentAction*)pSkipAct)->GetComment().equalsIgnoreAsciiCase(aSkipComment))))
{
pSkipAct = pMtf->NextAction();
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 9c47a21..f7330dc 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -72,13 +72,12 @@ using ::com::sun::star::lang::XMultiServiceFactory;
const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf )
{
- static ByteString aComment( (const sal_Char*)"EPSReplacementGraphic" );
const MetaCommentAction* pComment = NULL;
if ( ( rMtf.GetActionSize() >= 2 )
&& ( rMtf.FirstAction()->GetType() == META_EPS_ACTION )
&& ( ((const MetaAction*)rMtf.GetAction( 1 ))->GetType() == META_COMMENT_ACTION )
- && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment() == aComment ) )
+ && ( ((const MetaCommentAction*)rMtf.GetAction( 1 ))->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EPSReplacementGraphic")) ) )
pComment = (const MetaCommentAction*)rMtf.GetAction( 1 );
return pComment;
commit 67cf9cbeebaa258cb790e71b559586fd3299017b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 28 23:07:15 2011 +0100
add and use an OString::equalsIgnoreAsciiCaseAscii equivalent to OUString one
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 065aae4..32456e4 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -516,8 +516,8 @@ namespace cppcanvas
++io_rCurrActionIndex;
if( pCurrAct->GetType() == META_COMMENT_ACTION &&
- static_cast<MetaCommentAction*>(pCurrAct)->GetComment().CompareIgnoreCaseToAscii(
- pCommentString ) == COMPARE_EQUAL )
+ static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseAscii(
+ pCommentString) )
{
// requested comment found, done
return;
@@ -551,8 +551,8 @@ namespace cppcanvas
}
if( pCurrAct->GetType() == META_COMMENT_ACTION &&
- static_cast<MetaCommentAction*>(pCurrAct)->GetComment().CompareIgnoreCaseToAscii(
- pCommentString ) == COMPARE_EQUAL )
+ static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseAscii(
+ pCommentString) )
{
// delimiting end comment found, done
bRet = false; // not yet found
@@ -1686,7 +1686,7 @@ namespace cppcanvas
MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct);
// Handle gradients
- if ( pAct->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL )
+ if (pAct->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
{
MetaGradientExAction* pGradAction = NULL;
bool bDone( false );
@@ -1702,7 +1702,7 @@ namespace cppcanvas
// skip broken-down rendering, output gradient when sequence is ended
case META_COMMENT_ACTION:
- if( static_cast<MetaCommentAction*>(pCurrAct)->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL )
+ if( static_cast<MetaCommentAction*>(pCurrAct)->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) )
{
bDone = true;
@@ -1723,7 +1723,7 @@ namespace cppcanvas
// XPATHSTROKE_SEQ_BEGIN comment
// Handle drawing layer fills
- else if( pAct->GetComment().Equals( "XPATHFILL_SEQ_BEGIN" ) )
+ else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
{
const sal_uInt8* pData = pAct->GetData();
if ( pData )
@@ -1839,7 +1839,7 @@ namespace cppcanvas
}
}
// Handle drawing layer fills
- else if( pAct->GetComment().Equals( "EMF_PLUS" ) ) {
+ else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS")) ) {
static int count = -1, limit = 0x7fffffff;
if (count == -1) {
count = 0;
@@ -1852,7 +1852,7 @@ namespace cppcanvas
if (count < limit)
processEMFPlus( pAct, rFactoryParms, getState( rStates ), rCanvas );
count ++;
- } else if( pAct->GetComment().Equals( "EMF_PLUS_HEADER_INFO" ) ) {
+ } else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS_HEADER_INFO")) ) {
EMFP_DEBUG (printf ("EMF+ passed to canvas mtf renderer - header info, size: %u\n", (unsigned int)pAct->GetDataSize ()));
SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), STREAM_READ);
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 7555464..23fee9d 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -407,6 +407,30 @@ public:
Since this method is optimized for performance, the ASCII character
values are not converted in any way. The caller has to make sure that
all ASCII characters are in the allowed range between 0 and
+ 127. The ASCII string must be NULL-terminated.
+ This function can't be used for language specific comparison.
+
+ @param asciiStr the 8-Bit ASCII character string to be compared.
+ @return sal_True if the strings are equal;
+ sal_False, otherwise.
+ */
+ sal_Bool equalsIgnoreAsciiCaseAscii( const sal_Char * asciiStr ) const SAL_THROW(())
+ {
+ return rtl_str_compareIgnoreAsciiCase_WithLength( pData->buffer, pData->length,
+ asciiStr, rtl_str_getLength(asciiStr) ) == 0;
+ }
+
+ /**
+ Perform a ASCII lowercase comparison of two strings.
+
+ The result is true if and only if second string
+ represents the same sequence of characters as the first string,
+ ignoring the case.
+ Character values between 65 and 90 (ASCII A-Z) are interpreted as
+ values between 97 and 122 (ASCII a-z).
+ Since this method is optimized for performance, the ASCII character
+ values are not converted in any way. The caller has to make sure that
+ all ASCII characters are in the allowed range between 0 and
127. The ASCII string must be greater or equal in length as asciiStrLength.
This function can't be used for language specific comparison.
commit 489272ce9e0d655a833fa7add2ed8cfb87349edb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 28 22:37:01 2011 +0100
add and use an OString::equalsIgnoreAsciiCaseAsciiL equivalent to OUString one
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 22de6dd..7555464 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -397,6 +397,34 @@ public:
}
/**
+ Perform a ASCII lowercase comparison of two strings.
+
+ The result is true if and only if second string
+ represents the same sequence of characters as the first string,
+ ignoring the case.
+ Character values between 65 and 90 (ASCII A-Z) are interpreted as
+ values between 97 and 122 (ASCII a-z).
+ Since this method is optimized for performance, the ASCII character
+ values are not converted in any way. The caller has to make sure that
+ all ASCII characters are in the allowed range between 0 and
+ 127. The ASCII string must be greater or equal in length as asciiStrLength.
+ This function can't be used for language specific comparison.
+
+ @param asciiStr the 8-Bit ASCII character string to be compared.
+ @param asciiStrLength the length of the ascii string
+ @return sal_True if the strings are equal;
+ sal_False, otherwise.
+ */
+ sal_Bool equalsIgnoreAsciiCaseAsciiL( const sal_Char * asciiStr, sal_Int32 asciiStrLength ) const SAL_THROW(())
+ {
+ if ( pData->length != asciiStrLength )
+ return sal_False;
+
+ return rtl_str_compareIgnoreAsciiCase_WithLength( pData->buffer, pData->length,
+ asciiStr, asciiStrLength ) == 0;
+ }
+
+ /**
Match against a substring appearing in this string.
The result is true if and only if the second string appears as a substring
diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx
index 87bc75f..64800fd 100644
--- a/vcl/inc/vcl/metaact.hxx
+++ b/vcl/inc/vcl/metaact.hxx
@@ -1489,10 +1489,10 @@ class VCL_DLLPUBLIC MetaCommentAction : public MetaAction
{
private:
- ByteString maComment;
+ rtl::OString maComment;
sal_Int32 mnValue;
sal_uInt32 mnDataSize;
- sal_uInt8* mpData;
+ sal_uInt8* mpData;
SAL_DLLPRIVATE void ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize );
virtual sal_Bool Compare( const MetaAction& ) const;
@@ -1503,7 +1503,7 @@ protected:
public:
MetaCommentAction( sal_Int32 nValue = 0L );
MetaCommentAction( const MetaCommentAction& rAct );
- MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL );
+ MetaCommentAction( const rtl::OString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL );
MetaCommentAction( const sal_uInt8* pData, sal_uInt32 nDataSize );
virtual void Move( long nHorzMove, long nVertMove );
@@ -1514,7 +1514,7 @@ public:
virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData );
virtual void Read( SvStream& rIStm, ImplMetaReadData* pData );
- const ByteString& GetComment() const { return maComment; }
+ const rtl::OString& GetComment() const { return maComment; }
sal_Int32 GetValue() const { return mnValue; }
sal_uInt32 GetDataSize() const { return mnDataSize; }
const sal_uInt8* GetData() const { return mpData; }
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index fffde04..7ab555d 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -556,7 +556,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos )
{
MetaCommentAction* pCommentAct = static_cast<MetaCommentAction*>(pAction);
if( pAction->GetType() == META_COMMENT_ACTION &&
- pCommentAct->GetComment().Equals("DELEGATE_PLUGGABLE_RENDERER") )
+ pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("DELEGATE_PLUGGABLE_RENDERER")) )
{
ImplDelegate2PluggableRenderer(pCommentAct, pOut);
}
@@ -658,7 +658,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, OutputDevice* pOut )
{
- OSL_ASSERT( pAct->GetComment().Equals("DELEGATE_PLUGGABLE_RENDERER") );
+ OSL_ASSERT( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("DELEGATE_PLUGGABLE_RENDERER")) );
// read payload - string of service name, followed by raw render input
const sal_uInt8* pData = pAct->GetData();
@@ -1534,7 +1534,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
case( META_COMMENT_ACTION ):
{
MetaCommentAction* pCommentAct = (MetaCommentAction*) pAction;
- if( pCommentAct->GetComment().Equals( "XGRAD_SEQ_BEGIN" ) )
+ if( pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
{
int nBeginComments( 1 );
pAction = NextAction();
@@ -1555,7 +1555,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
else if( META_COMMENT_ACTION == nType)
{
MetaCommentAction* pAct = (MetaCommentAction*) pAction;
- if( pAct->GetComment().Equals( "XGRAD_SEQ_END" ) )
+ if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END")) )
{
// handle nested blocks
--nBeginComments;
@@ -1564,7 +1564,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
if( !nBeginComments )
break;
}
- else if( pAct->GetComment().Equals( "XGRAD_SEQ_BEGIN" ) )
+ else if( pAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")) )
{
// handle nested blocks
++nBeginComments;
@@ -1577,8 +1577,8 @@ void GDIMetaFile::Rotate( long nAngle10 )
}
else
{
- sal_Bool bPathStroke = pCommentAct->GetComment().Equals( "XPATHSTROKE_SEQ_BEGIN" );
- if ( bPathStroke || pCommentAct->GetComment().Equals( "XPATHFILL_SEQ_BEGIN" ) )
+ sal_Bool bPathStroke = pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN"));
+ if ( bPathStroke || pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
{
if ( pCommentAct->GetDataSize() )
{
@@ -1608,8 +1608,8 @@ void GDIMetaFile::Rotate( long nAngle10 )
}
}
}
- else if ( pCommentAct->GetComment().Equals( "XPATHSTROKE_SEQ_END" )
- || pCommentAct->GetComment().Equals( "XPATHFILL_SEQ_END" ) )
+ else if ( pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END"))
+ || pCommentAct->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END")) )
{
pAction->Execute( &aMapVDev );
pAction->Duplicate();
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 99e56ec..03c5390 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -4019,7 +4019,7 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) :
// ------------------------------------------------------------------------
-MetaCommentAction::MetaCommentAction( const ByteString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) :
+MetaCommentAction::MetaCommentAction( const rtl::OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) :
MetaAction ( META_COMMENT_ACTION ),
maComment ( rComment ),
mnValue ( nValue )
@@ -4086,8 +4086,8 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
{
if ( mnDataSize && mpData )
{
- sal_Bool bPathStroke = maComment.Equals( "XPATHSTROKE_SEQ_BEGIN" );
- if ( bPathStroke || maComment.Equals( "XPATHFILL_SEQ_BEGIN" ) )
+ sal_Bool bPathStroke = maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN"));
+ if ( bPathStroke || maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
{
SvMemoryStream aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
SvMemoryStream aDest;
@@ -4129,8 +4129,8 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
{
if ( mnDataSize && mpData )
{
- sal_Bool bPathStroke = maComment.Equals( "XPATHSTROKE_SEQ_BEGIN" );
- if ( bPathStroke || maComment.Equals( "XPATHFILL_SEQ_BEGIN" ) )
+ sal_Bool bPathStroke = maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN"));
+ if ( bPathStroke || maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
{
SvMemoryStream aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
SvMemoryStream aDest;
@@ -4156,7 +4156,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
}
delete[] mpData;
ImplInitDynamicData( static_cast<const sal_uInt8*>( aDest.GetData() ), aDest.Tell() );
- } else if( maComment.Equals( "EMF_PLUS_HEADER_INFO" ) ) {
+ } else if( maComment.equalsL(RTL_CONSTASCII_STRINGPARAM("EMF_PLUS_HEADER_INFO")) ){
SvMemoryStream aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
SvMemoryStream aDest;
@@ -4213,7 +4213,10 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
COMPAT( rIStm );
- rIStm >> maComment >> mnValue >> mnDataSize;
+ ByteString sTmp;
+ rIStm >> sTmp;
+ maComment = sTmp;
+ rIStm >> mnValue >> mnDataSize;
if( mpData )
delete[] mpData;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index f7a1ad5..50ae862 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -523,7 +523,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
const MetaCommentAction* pA = (const MetaCommentAction*) pAction;
String aSkipComment;
- if( pA->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL )
+ if( pA->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN")))
{
const MetaGradientExAction* pGradAction = NULL;
sal_Bool bDone = sal_False;
@@ -535,7 +535,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
if( pAction->GetType() == META_GRADIENTEX_ACTION )
pGradAction = (const MetaGradientExAction*) pAction;
else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
- ( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
+ ( ( (const MetaCommentAction*) pAction )->GetComment().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_END"))) )
{
bDone = sal_True;
}
@@ -559,7 +559,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
sal_Bool bSkipSequence = sal_False;
rtl::OString sSeqEnd;
- if( pA->GetComment().Equals( "XPATHSTROKE_SEQ_BEGIN" ) )
+ if( pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_BEGIN")) )
{
sSeqEnd = rtl::OString(RTL_CONSTASCII_STRINGPARAM("XPATHSTROKE_SEQ_END"));
SvtGraphicStroke aStroke;
@@ -644,7 +644,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
}
}
}
- else if ( pA->GetComment().Equals( "XPATHFILL_SEQ_BEGIN" ) )
+ else if ( pA->GetComment().equalsL(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_BEGIN")) )
{
sSeqEnd = rtl::OString(RTL_CONSTASCII_STRINGPARAM("XPATHFILL_SEQ_END"));
SvtGraphicFill aFill;
commit 9dc14818d588c13d7cea9814c8227a438c7a30de
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 28 22:04:16 2011 +0100
callcatcher: various unused methods
diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx
index 3e2993b..b72b0be 100644
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/svx/inc/svx/svdcrtv.hxx
@@ -87,7 +87,6 @@ protected:
private:
SVX_DLLPRIVATE void ImpClearVars();
SVX_DLLPRIVATE void ImpMakeCreateAttr();
- SVX_DLLPRIVATE void ImpDelCreateAttr();
protected:
sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index 742473f..a383a37 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -195,11 +195,6 @@ public:
virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False);
virtual bool IsTextEdit() const;
- // sal_True=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert
- // ansonsten handelt es sich um ein beschriftetes Zeichenobjekt, an dem
- // der Text ja bekanntlich hor. und vert. zentriert wird.
- sal_Bool IsTextEditFrame() const;
-
// Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der
// des Objektbereichs oder der OutlinerView liegt.
sal_Bool IsTextEditHit(const Point& rHit, short nTol) const;
@@ -213,10 +208,6 @@ public:
// MouseButtonUp liefert diese Methode immer TRUE.
sal_Bool IsTextEditInSelectionMode() const;
- // Folgende Methode addiert einen passenden Offset zum MouseEvent
- // um diesen an den Outliner weiterzureichen.
- void AddTextEditOfs(MouseEvent& rMEvt) const;
-
// Wer das z.Zt. im TextEdit befindliche Objekt braucht:
SdrObject* GetTextEditObject() const { return mxTextEditObj.get(); }
@@ -240,9 +231,6 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
- sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT);
- sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT);
- sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT);
// #97766# make virtual to change implementation e.g. for SdOutlineView
virtual sal_uInt16 GetScriptType() const;
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index da0d140..9100b5b 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -106,12 +106,6 @@ public:
// Default MapFraction ist 1/1.
static void SetMapFraction(const Fraction& rMap) { GetDefaults().aMapFraction=rMap; }
static Fraction GetMapFraction() { return GetDefaults().aMapFraction; }
- // Der Aufruf der folgenden Methode veranlasst die Engine
- // ihre sprachabhaengigen Resourcen neu zu initiallisieren.
- // Bereits bestehende Undotexte, etc. bleiben jedoch in der
- // sprache erhalten, in der sie erzeugt wurden.
- static void LanguageHasChanged();
-
// Einen Outliner mit den engineglobalen
// Defaulteinstellungen auf dem Heap erzeugen.
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index f76d5c9..90074da 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -57,7 +57,6 @@ protected:
void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst);
void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions);
sal_Bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
- Point GetPastePos(SdrObjList* pLst, OutputDevice* pOut=NULL);
// liefert True, wenn rPt geaendert wurde
sal_Bool ImpLimitToWorkArea(Point& rPt) const;
@@ -132,16 +131,8 @@ public:
// View angezeigt wird.
// Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und
// SDRINSERT_ADDMARK (siehe svdedtv.hxx).
- sal_Bool Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); }
- sal_Bool Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list