bin/get-bugzilla-attachments-by-mimetype | 6 -
comphelper/inc/comphelper/logging.hxx | 13 --
comphelper/source/misc/logging.cxx | 6 -
cppcanvas/Library_cppcanvas.mk | 1
cppcanvas/source/wrapper/basegfxfactory.cxx | 10 +
cppcanvas/source/wrapper/impltext.cxx | 96 -------------------
cppcanvas/source/wrapper/impltext.hxx | 73 --------------
cppcanvas/source/wrapper/vclfactory.cxx | 1
sc/source/filter/inc/stylesbuffer.hxx | 13 --
sc/source/filter/oox/addressconverter.cxx | 16 ---
sc/source/filter/oox/stylesbuffer.cxx | 91 ------------------
svtools/inc/svtools/svlbitm.hxx | 1
svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg |binary
svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg |binary
svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg |binary
svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg |binary
svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg |binary
svtools/qa/cppunit/filters-test.cxx | 4
svtools/source/contnr/svlbitm.cxx | 7 -
svtools/source/edit/texteng.cxx | 15 --
svtools/source/misc/embedhlp.cxx | 2
svtools/source/misc/templatefoldercache.cxx | 6 -
svtools/source/svrtf/svparser.cxx | 31 ------
svtools/source/uno/unoiface.cxx | 5
svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx | 4
svx/source/sdr/contact/viewcontactofpageobj.cxx | 6 -
svx/source/svdraw/svdibrow.cxx | 27 ++---
toolkit/source/awt/vclxdevice.cxx | 6 -
tools/source/fsys/tempfile.cxx | 6 -
unusedcode.easy | 4
30 files changed, 35 insertions(+), 415 deletions(-)
New commits:
commit 7a799fc6ada8d3e5ea2bd0b2617e3a8e7405997a
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Apr 18 13:01:29 2012 +0100
use stdout for errors like everything else
diff --git a/bin/get-bugzilla-attachments-by-mimetype
b/bin/get-bugzilla-attachments-by-mimetype
index c719fc3..cf79a79 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -162,7 +162,7 @@ def get_through_rss_query_url(url, mimetype, prefix,
suffix):
try:
get_bug_function(entry['id'], mimetype, prefix, suffix)
except:
- print >> sys.stderr, entry['id'], "failed:", sys.exc_info()[0]
+ print entry['id'], "failed:", sys.exc_info()[0]
pass
def get_through_rss_query(queryurl, mimetype, prefix, suffix):
commit 137e02c0adfacaf8c5fc08dd5cc445be7fdfa6e5
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Apr 18 10:28:00 2012 +0100
jpg parsing regression test
diff --git a/svtools/qa/cppunit/data/jpg/fail/.gitignore
b/svtools/qa/cppunit/data/jpg/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg
b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg
new file mode 100644
index 0000000..3d9481a
Binary files /dev/null and
b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg differ
diff --git a/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg
b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg
new file mode 100644
index 0000000..9d26db0
Binary files /dev/null and
b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg differ
diff --git a/svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg
b/svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg
new file mode 100644
index 0000000..33bbe9b
Binary files /dev/null and
b/svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg differ
diff --git a/svtools/qa/cppunit/data/jpg/indeterminate/.gitignore
b/svtools/qa/cppunit/data/jpg/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/svtools/qa/cppunit/data/jpg/pass/.gitignore
b/svtools/qa/cppunit/data/jpg/pass/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg
b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg
new file mode 100644
index 0000000..5eb27ff
Binary files /dev/null and
b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg differ
diff --git a/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg
b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg
new file mode 100644
index 0000000..4917f20
Binary files /dev/null and
b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg differ
diff --git a/svtools/qa/cppunit/filters-test.cxx
b/svtools/qa/cppunit/filters-test.cxx
index 296d96e..4168894 100644
--- a/svtools/qa/cppunit/filters-test.cxx
+++ b/svtools/qa/cppunit/filters-test.cxx
@@ -84,6 +84,10 @@ void SvtoolsFiltersTest::testCVEs()
testDir(rtl::OUString(),
getURLFromSrc("/svtools/qa/cppunit/data/png/"),
rtl::OUString());
+
+ testDir(rtl::OUString(),
+ getURLFromSrc("/svtools/qa/cppunit/data/jpg/"),
+ rtl::OUString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(SvtoolsFiltersTest);
commit abda3776191f04d1f3f3e9e4fc966455cc25d346
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Apr 18 09:05:31 2012 +0100
callcatcher: update list
diff --git a/comphelper/inc/comphelper/logging.hxx
b/comphelper/inc/comphelper/logging.hxx
index 5ad80ec..2b1d03e 100644
--- a/comphelper/inc/comphelper/logging.hxx
+++ b/comphelper/inc/comphelper/logging.hxx
@@ -107,19 +107,6 @@ namespace comphelper
public:
/** creates an <code>EventLogger</code> instance working with a
css.logging.XLogger
- instance given by name.
-
- @param _rxContext
- the component context to create services
- @param _rLoggerName
- the name of the logger to create. If empty, the office-wide
default logger will be used.
- */
- EventLogger(
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& _rxContext,
- const ::rtl::OUString& _rLoggerName = ::rtl::OUString()
- );
-
- /** creates an <code>EventLogger</code> instance working with a
css.logging.XLogger
instance given by ASCII name.
@param _rxContext
diff --git a/comphelper/source/misc/logging.cxx
b/comphelper/source/misc/logging.cxx
index 98a497c..a72d8c8 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -110,12 +110,6 @@ namespace comphelper
//= EventLogger
//====================================================================
//--------------------------------------------------------------------
- EventLogger::EventLogger( const Reference< XComponentContext >&
_rxContext, const ::rtl::OUString& _rLoggerName )
- :m_pImpl( new EventLogger_Impl( _rxContext, _rLoggerName ) )
- {
- }
-
- //--------------------------------------------------------------------
EventLogger::EventLogger( const Reference< XComponentContext >&
_rxContext, const sal_Char* _pAsciiLoggerName )
:m_pImpl( new EventLogger_Impl( _rxContext,
::rtl::OUString::createFromAscii( _pAsciiLoggerName ) ) )
{
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index 6be78e6..5257f04 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -275,9 +275,6 @@ public:
/** Imports a font style flag from a DXF record. */
void importDxfFlag( sal_Int32 nElement,
SequenceInputStream& rStrm );
- /** Sets the font attributes from the font block of a CFRULE record. */
- void importCfRule( BiffInputStream& rStrm );
-
/** Returns the font model structure. This function can be called before
finalizeImport() has been called. */
inline const FontModel& getModel() const { return maModel; }
@@ -461,8 +458,6 @@ struct BorderLineModel
/** Sets the passed BIFF line style. */
void setBiffStyle( sal_Int32 nLineStyle );
- /** Sets line style and line color from the passed BIFF data. */
- void setBiffData( sal_uInt8 nLineStyle, sal_uInt16
nLineColor );
};
// ----------------------------------------------------------------------------
@@ -524,9 +519,6 @@ public:
/** Imports a border from a DXF record from the passed stream. */
void importDxfBorder( sal_Int32 nElement,
SequenceInputStream& rStrm );
- /** Sets the border attributes from the border block of a CFRULE record. */
- void importCfRule( BiffInputStream& rStrm, sal_uInt32
nFlags );
-
/** Final processing after import of all style settings. */
void finalizeImport();
@@ -575,8 +567,6 @@ struct PatternFillModel
/** Sets the passed BIFF pattern identifier. */
void setBiffPattern( sal_Int32 nPattern );
- /** Sets the pattern and pattern colors from the passed BIFF data. */
- void setBiffData( sal_uInt16 nPatternColor, sal_uInt16
nFillColor, sal_uInt8 nPattern );
};
// ----------------------------------------------------------------------------
@@ -648,9 +638,6 @@ public:
/** Imports gradient stop settings from a DXF record. */
void importDxfStop( SequenceInputStream& rStrm );
- /** Sets the fill attributes from the fill block of a CFRULE record. */
- void importCfRule( BiffInputStream& rStrm, sal_uInt32
nFlags );
-
/** Final processing after import of all style settings. */
void finalizeImport();
diff --git a/sc/source/filter/oox/addressconverter.cxx
b/sc/source/filter/oox/addressconverter.cxx
index 9f1f6f1..52e74eb 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -281,22 +281,6 @@ bool AddressConverter::parseOoxRange2d(
return false;
}
-namespace {
-
-bool lclAppendUrlChar( OUStringBuffer& orUrl, sal_Unicode cChar, bool
bEncodeSpecial )
-{
- // #126855# encode special characters
- if( bEncodeSpecial ) switch( cChar )
- {
- case '#': orUrl.appendAscii( "%23" ); return true;
- case '%': orUrl.appendAscii( "%25" ); return true;
- }
- orUrl.append( cChar );
- return cChar >= ' ';
-}
-
-} // namespace
-
// ----------------------------------------------------------------------------
bool AddressConverter::checkCol( sal_Int32 nCol, bool bTrackOverflow )
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index 62d2508..1ac390a 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -881,49 +881,6 @@ void Font::importDxfFlag( sal_Int32 nElement,
SequenceInputStream& rStrm )
}
}
-void Font::importCfRule( BiffInputStream& rStrm )
-{
- OSL_ENSURE( mbDxf, "Font::importCfRule - missing conditional formatting
flag" );
-
- sal_Int32 nHeight, nColor;
- sal_uInt32 nStyle, nFontFlags1, nFontFlags2, nFontFlags3;
- sal_uInt16 nWeight, nEscapement;
- sal_uInt8 nUnderline;
-
- OSL_ENSURE( rStrm.getRemaining() >= 118, "Font::importCfRule - missing
record data" );
- sal_Int64 nRecPos = rStrm.tell();
- maModel.maName = rStrm.readUniStringBody( rStrm.readuInt8() );
- maUsedFlags.mbNameUsed = !maModel.maName.isEmpty();
- OSL_ENSURE( !rStrm.isEof() && (rStrm.tell() <= nRecPos + 64),
"Font::importCfRule - font name too long" );
- rStrm.seek( nRecPos + 64 );
- rStrm >> nHeight >> nStyle >> nWeight >> nEscapement >> nUnderline;
- rStrm.skip( 3 );
- rStrm >> nColor;
- rStrm.skip( 4 );
- rStrm >> nFontFlags1 >> nFontFlags2 >> nFontFlags3;
- rStrm.skip( 18 );
-
- if( (maUsedFlags.mbColorUsed = (0 <= nColor) && (nColor <= 0x7FFF)) ==
true )
- maModel.maColor.setIndexed( nColor );
- if( (maUsedFlags.mbHeightUsed = (0 < nHeight) && (nHeight <= 0x7FFF)) ==
true )
- maModel.setBiffHeight( static_cast< sal_uInt16 >( nHeight ) );
- if( (maUsedFlags.mbUnderlineUsed = !getFlag( nFontFlags3,
BIFF_CFRULE_FONT_UNDERL )) == true )
- maModel.setBiffUnderline( nUnderline );
- if( (maUsedFlags.mbEscapementUsed = !getFlag( nFontFlags2,
BIFF_CFRULE_FONT_ESCAPEM )) == true )
- maModel.setBiffEscapement( nEscapement );
- if( (maUsedFlags.mbWeightUsed = maUsedFlags.mbPostureUsed = !getFlag(
nFontFlags1, BIFF_CFRULE_FONT_STYLE )) == true )
- {
- maModel.setBiffWeight( nWeight );
- maModel.mbItalic = getFlag( nStyle, BIFF_CFRULE_FONT_STYLE );
- }
- if( (maUsedFlags.mbStrikeoutUsed = !getFlag( nFontFlags1,
BIFF_CFRULE_FONT_STRIKEOUT )) == true )
- maModel.mbStrikeout = getFlag( nStyle, BIFF_CFRULE_FONT_STRIKEOUT );
- if( (maUsedFlags.mbOutlineUsed = !getFlag( nFontFlags1,
BIFF_CFRULE_FONT_OUTLINE )) == true )
- maModel.mbOutline = getFlag( nStyle, BIFF_CFRULE_FONT_OUTLINE );
- if( (maUsedFlags.mbShadowUsed = !getFlag( nFontFlags1,
BIFF_CFRULE_FONT_SHADOW )) == true )
- maModel.mbShadow = getFlag( nStyle, BIFF_CFRULE_FONT_SHADOW );
-}
-
void Font::finalizeImport()
{
namespace cssawt = ::com::sun::star::awt;
@@ -1608,12 +1565,6 @@ void BorderLineModel::setBiffStyle( sal_Int32 nLineStyle
)
mnStyle = STATIC_ARRAY_SELECT( spnStyleIds, nLineStyle, XML_none );
}
-void BorderLineModel::setBiffData( sal_uInt8 nLineStyle, sal_uInt16 nLineColor
)
-{
- maColor.setIndexed( nLineColor );
- setBiffStyle( nLineStyle );
-}
-
// ----------------------------------------------------------------------------
BorderModel::BorderModel( bool bDxf ) :
@@ -1743,24 +1694,6 @@ void Border::importDxfBorder( sal_Int32 nElement,
SequenceInputStream& rStrm )
}
}
-void Border::importCfRule( BiffInputStream& rStrm, sal_uInt32 nFlags )
-{
- OSL_ENSURE( mbDxf, "Border::importCfRule - missing conditional formatting
flag" );
- OSL_ENSURE( getFlag( nFlags, BIFF_CFRULE_BORDERBLOCK ),
"Border::importCfRule - missing border block flag" );
- sal_uInt16 nStyle;
- sal_uInt32 nColor;
- rStrm >> nStyle >> nColor;
- rStrm.skip( 2 );
- maModel.maLeft.setBiffData( extractValue< sal_uInt8 >( nStyle, 0, 4 ),
extractValue< sal_uInt16 >( nColor, 0, 7 ) );
- maModel.maRight.setBiffData( extractValue< sal_uInt8 >( nStyle, 4, 4 ),
extractValue< sal_uInt16 >( nColor, 7, 7 ) );
- maModel.maTop.setBiffData( extractValue< sal_uInt8 >( nStyle, 8, 4 ),
extractValue< sal_uInt16 >( nColor, 16, 7 ) );
- maModel.maBottom.setBiffData( extractValue< sal_uInt8 >( nStyle, 12, 4 ),
extractValue< sal_uInt16 >( nColor, 23, 7 ) );
- maModel.maLeft.mbUsed = !getFlag( nFlags, BIFF_CFRULE_BORDER_LEFT );
- maModel.maRight.mbUsed = !getFlag( nFlags, BIFF_CFRULE_BORDER_RIGHT );
- maModel.maTop.mbUsed = !getFlag( nFlags, BIFF_CFRULE_BORDER_TOP );
- maModel.maBottom.mbUsed = !getFlag( nFlags, BIFF_CFRULE_BORDER_BOTTOM );
-}
-
void Border::finalizeImport()
{
maApiData.mbBorderUsed = maModel.maLeft.mbUsed || maModel.maRight.mbUsed
|| maModel.maTop.mbUsed || maModel.maBottom.mbUsed;
@@ -1924,14 +1857,6 @@ void PatternFillModel::setBiffPattern( sal_Int32
nPattern )
mnPattern = STATIC_ARRAY_SELECT( spnPatternIds, nPattern, XML_none );
}
-void PatternFillModel::setBiffData( sal_uInt16 nPatternColor, sal_uInt16
nFillColor, sal_uInt8 nPattern )
-{
- maPatternColor.setIndexed( nPatternColor );
- maFillColor.setIndexed( nFillColor );
- // patterns equal in all BIFFs
- setBiffPattern( nPattern );
-}
-
// ----------------------------------------------------------------------------
GradientFillModel::GradientFillModel() :
@@ -2124,22 +2049,6 @@ void Fill::importDxfStop( SequenceInputStream& rStrm )
mxGradientModel->readGradientStop( rStrm, true );
}
-void Fill::importCfRule( BiffInputStream& rStrm, sal_uInt32 nFlags )
-{
- OSL_ENSURE( mbDxf, "Fill::importCfRule - missing conditional formatting
flag" );
- OSL_ENSURE( getFlag( nFlags, BIFF_CFRULE_FILLBLOCK ), "Fill::importCfRule
- missing fill block flag" );
- mxPatternModel.reset( new PatternFillModel( mbDxf ) );
- sal_uInt32 nFillData;
- rStrm >> nFillData;
- mxPatternModel->setBiffData(
- extractValue< sal_uInt16 >( nFillData, 16, 7 ),
- extractValue< sal_uInt16 >( nFillData, 23, 7 ),
- extractValue< sal_uInt8 >( nFillData, 10, 6 ) );
- mxPatternModel->mbPattColorUsed = !getFlag( nFlags,
BIFF_CFRULE_FILL_PATTCOLOR );
- mxPatternModel->mbFillColorUsed = !getFlag( nFlags,
BIFF_CFRULE_FILL_FILLCOLOR );
- mxPatternModel->mbPatternUsed = !getFlag( nFlags,
BIFF_CFRULE_FILL_PATTERN );
-}
-
void Fill::finalizeImport()
{
const GraphicHelper& rGraphicHelper = getBaseFilter().getGraphicHelper();
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index 8e1957b..c001870 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -74,7 +74,6 @@ public:
SvLBoxButtonData( const Control*
pControlForSettings );
SvLBoxButtonData( const Control*
pControlForSettings, bool _bRadioBtn );
- SvLBoxButtonData();
~SvLBoxButtonData();
sal_uInt16 GetIndex( sal_uInt16 nItemState );
diff --git a/svtools/source/contnr/svlbitm.cxx
b/svtools/source/contnr/svlbitm.cxx
index 49310c2..a4cbfc0 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -77,13 +77,6 @@ SvLBoxButtonData::SvLBoxButtonData( const Control*
pControlForSettings, bool _bR
InitData( sal_True, _bRadioBtn, pControlForSettings );
}
-SvLBoxButtonData::SvLBoxButtonData()
-{
- DBG_CTOR(SvLBoxButtonData,0);
-
- InitData( sal_False, false );
-}
-
SvLBoxButtonData::~SvLBoxButtonData()
{
DBG_DTOR(SvLBoxButtonData,0);
diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
index ba7f940..71e5fc6 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
@@ -53,10 +53,6 @@ namespace sdr
// create graphical visualisation data
virtual drawinglayer::primitive2d::Primitive2DSequence
createViewIndependentPrimitive2DSequence() const;
-
- // Access to referenced page
- const SdrPage* GetReferencedPage() const;
-
public:
// basic constructor, used from SdrObject.
ViewContactOfPageObj(SdrPageObj& rPageObj);
diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx
b/svx/source/sdr/contact/viewcontactofpageobj.cxx
index 7b2c821..d586fac 100644
--- a/svx/source/sdr/contact/viewcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx
@@ -50,12 +50,6 @@ namespace sdr
return *pRetval;
}
- // Access to referenced page
- const SdrPage* ViewContactOfPageObj::GetReferencedPage() const
- {
- return GetPageObj().GetReferencedPage();
- }
-
ViewContactOfPageObj::ViewContactOfPageObj(SdrPageObj& rPageObj)
: ViewContactOfSdrObj(rPageObj)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index a2c8bce..e1daecd 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -130,7 +130,6 @@ SrchAttrItemList::Replace(SearchAttrItem const*, unsigned
short, unsigned short)
SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char
(*)(SearchAttrItem const&, void*), void*)
StgCache::Pos2Page(int)
SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
-SvLBoxButtonData::SvLBoxButtonData()
SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short)
SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
SvStringsISortDtor::Insert(String* const*, unsigned short)
@@ -702,7 +701,6 @@
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const
canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&,
basegfx::B2IRange const&, basegfx::B2IRange const&)
cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier>
const&)
cmis::Content::queryChildren(std::__debug::list<rtl::Reference<cmis::Content>,
std::allocator<rtl::Reference<cmis::Content> > >&)
-comphelper::EventLogger::EventLogger(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>
const&, rtl::OUString const&)
comphelper::OSelectionChangeListener::disposeAdapter()
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges>
const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString
const&) const
@@ -759,7 +757,6 @@ sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
sd::ViewShellBase::RegisterFactory(unsigned short)
sdr::animation::Scheduler::Reset(unsigned int)
-sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const
sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const
sfx2::TaskPaneWrapper::GetChildWindowId()
commit eaa97f9a66ec147afab9b44cabcb220d564d54ec
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Apr 18 09:05:05 2012 +0100
continue in the face of adversary
diff --git a/bin/get-bugzilla-attachments-by-mimetype
b/bin/get-bugzilla-attachments-by-mimetype
index 7c77957..c719fc3 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -159,7 +159,11 @@ def get_through_rss_query_url(url, mimetype, prefix,
suffix):
get_bug_function = get_novell_bug_via_xml if prefix == "novell" else
get_from_bug_url_via_xml
for entry in d['entries']:
- get_bug_function(entry['id'], mimetype, prefix, suffix)
+ try:
+ get_bug_function(entry['id'], mimetype, prefix, suffix)
+ except:
+ print >> sys.stderr, entry['id'], "failed:", sys.exc_info()[0]
+ pass
def get_through_rss_query(queryurl, mimetype, prefix, suffix):
url = queryurl +
'?query_format=advanced&field0-0-0=attachments.mimetype&type0-0-0=equals&value0-0-0='
+ escape(mimetype) + '&ctype=rss'
commit fc435133c36760f741eb62641fb6834faaf34032
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 17 23:52:07 2012 +0100
ImplText never instantiated
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index 367f322..aa768db 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -82,7 +82,6 @@ $(eval $(call gb_Library_add_exception_objects,cppcanvas,\
cppcanvas/source/wrapper/implpolypolygon \
cppcanvas/source/wrapper/implsprite \
cppcanvas/source/wrapper/implspritecanvas \
- cppcanvas/source/wrapper/impltext \
cppcanvas/source/wrapper/vclfactory \
))
diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx
b/cppcanvas/source/wrapper/basegfxfactory.cxx
index 28f9dcf..97d42f9 100644
--- a/cppcanvas/source/wrapper/basegfxfactory.cxx
+++ b/cppcanvas/source/wrapper/basegfxfactory.cxx
@@ -39,10 +39,16 @@
#include <cppcanvas/basegfxfactory.hxx>
+#include <com/sun/star/rendering/RenderState.hpp>
+#include <com/sun/star/rendering/StringContext.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
+#include <com/sun/star/rendering/XCanvasFont.hpp>
+
+#include <cppcanvas/text.hxx>
+#include <canvasgraphichelper.hxx>
+
#include "implpolypolygon.hxx"
#include "implbitmap.hxx"
-#include "impltext.hxx"
-
using namespace ::com::sun::star;
diff --git a/cppcanvas/source/wrapper/impltext.cxx
b/cppcanvas/source/wrapper/impltext.cxx
deleted file mode 100644
index 3be1b2f..0000000
--- a/cppcanvas/source/wrapper/impltext.cxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <impltext.hxx>
-#include <canvas/canvastools.hxx>
-
-#include <com/sun/star/rendering/TextDirection.hpp>
-#include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/StringContext.hpp>
-#include <rtl/ustring.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-
-
-using namespace ::com::sun::star;
-
-namespace cppcanvas
-{
- namespace internal
- {
-
- ImplText::ImplText( const CanvasSharedPtr& rParentCanvas,
- const ::rtl::OUString& rText ) :
- CanvasGraphicHelper( rParentCanvas ),
- mpFont(),
- maText(rText)
- {
- }
-
- ImplText::~ImplText()
- {
- }
-
- bool ImplText::draw() const
- {
- CanvasSharedPtr pCanvas( getCanvas() );
-
- OSL_ENSURE( pCanvas.get() != NULL &&
- pCanvas->getUNOCanvas().is(),
- "ImplBitmap::draw: invalid canvas" );
-
- rendering::StringContext aText;
- aText.Text = maText;
- aText.StartPosition = 0;
- aText.Length = maText.getLength();
-
- // TODO(P1): implement caching
- // TODO(F2): where to get current BiDi status?
- sal_Int8 nBidiOption =
rendering::TextDirection::WEAK_LEFT_TO_RIGHT;
- pCanvas->getUNOCanvas()->drawText( aText,
- mpFont->getUNOFont(),
- pCanvas->getViewState(),
- getRenderState(),
- nBidiOption );
-
- return true;
- }
-
- void ImplText::setFont( const FontSharedPtr& rFont )
- {
- mpFont = rFont;
- }
-
- FontSharedPtr ImplText::getFont()
- {
- return mpFont;
- }
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/impltext.hxx
b/cppcanvas/source/wrapper/impltext.hxx
deleted file mode 100644
index a45e7da..0000000
--- a/cppcanvas/source/wrapper/impltext.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CANVAS_IMPLTEXT_HXX
-#define _CANVAS_IMPLTEXT_HXX
-
-#include <com/sun/star/rendering/RenderState.hpp>
-#include <com/sun/star/rendering/StringContext.hpp>
-#include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XCanvasFont.hpp>
-
-#include <cppcanvas/text.hxx>
-#include <canvasgraphichelper.hxx>
-
-
-namespace cppcanvas
-{
- namespace internal
- {
-
- class ImplText : public virtual ::cppcanvas::Text, protected
CanvasGraphicHelper
- {
- public:
-
- ImplText( const CanvasSharedPtr& rParentCanvas,
- const ::rtl::OUString& rText );
-
- virtual ~ImplText();
-
- virtual bool draw() const;
-
- virtual void setFont( const FontSharedPtr& );
- virtual FontSharedPtr getFont();
-
- private:
- // default: disabled copy/assignment
- ImplText(const ImplText&);
- ImplText& operator= ( const ImplText& );
-
- FontSharedPtr mpFont;
- ::rtl::OUString maText;
- };
- }
-}
-
-#endif /* _CANVAS_IMPLTEXT_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx
b/cppcanvas/source/wrapper/vclfactory.cxx
index 7a01fa2..e404c31 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -42,7 +42,6 @@
#include <implpolypolygon.hxx>
#include <implbitmap.hxx>
#include <implrenderer.hxx>
-#include <impltext.hxx>
#include <implsprite.hxx>
using namespace ::com::sun::star;
diff --git a/unusedcode.easy b/unusedcode.easy
index 04647b4..a2c8bce 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -719,7 +719,6 @@ connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&,
unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
connectivity::toString(com::sun::star::uno::Any const&)
cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Reference<com::sun::star::rendering::XSpriteCanvas>
const&,
com::sun::star::uno::Reference<com::sun::star::rendering::XAnimatedSprite>
const&,
boost::shared_ptr<cppcanvas::internal::ImplSpriteCanvas::TransformationArbiter>
const&)
-cppcanvas::internal::ImplText::ImplText(boost::shared_ptr<cppcanvas::Canvas>
const&, rtl::OUString const&)
dbaui::getKeyColumns(com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess>
const&, int)
dbtools::DBTypeConversion::toINT64(com::sun::star::util::DateTime const&)
dbtools::SQLExceptionInfo::SQLExceptionInfo(com::sun::star::sdb::SQLErrorEvent
const&)
commit f0ae0d8403acc86d8f72fb12fc6d1ce82c080662
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 17 23:47:38 2012 +0100
UniString->rtl::OUString
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index bc6a47b..04b6d8d 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -217,26 +217,15 @@ void TextEngine::SetFont( const Font& rFont )
maFont.SetAlign( ALIGN_TOP );
mpRefDev->SetFont( maFont);
Size aTextSize;
- aTextSize.Width() = mpRefDev->GetTextWidth( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( " " ) ) );
+ aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString(" "));
aTextSize.Height() = mpRefDev->GetTextHeight();
if ( !aTextSize.Width() )
- aTextSize.Width() = mpRefDev->GetTextWidth(
String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "XXXX" ) ) );
+ aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString("XXXX"));
mnDefTab = (sal_uInt16)aTextSize.Width();
if ( !mnDefTab )
mnDefTab = 1;
mnCharHeight = (sal_uInt16)aTextSize.Height();
-/*
- // #93746# Doesn't work with CJK HalfWidth/FullWidth
- FontMetric aRealFont( mpRefDev->GetFontMetric() );
- if ( aRealFont.GetPitch() == PITCH_FIXED )
- {
- String aX100;
- aX100.Fill( 100, 'X' );
- mnFixCharWidth100 = (sal_uInt16)mpRefDev->GetTextWidth( aX100 );
- }
- else
-*/
mnFixCharWidth100 = 0;
FormatFullDoc();
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 2ca0474..1a7a701 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -599,7 +599,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const
Rectangle &rRect, const Stri
{
MapMode aMM( MAP_APPFONT );
Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, NULL );
- Font aFnt( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
"Helvetica" ) ), aAppFontSz );
+ Font aFnt( rtl::OUString("Helvetica"), aAppFontSz );
aFnt.SetTransparent( sal_True );
aFnt.SetColor( Color( COL_LIGHTRED ) );
aFnt.SetWeight( WEIGHT_BOLD );
diff --git a/svtools/source/misc/templatefoldercache.cxx
b/svtools/source/misc/templatefoldercache.cxx
index 1486fb2..da29646 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -480,7 +480,7 @@ namespace svt
sal_Bool implReadFolder( const ::rtl::Reference< TemplateContent >&
_rxRoot );
- static String getCacheFileName();
+ static rtl::OUString getCacheFileName();
static sal_Int32 getMagicNumber();
static void normalize( TemplateFolderContent& _rState );
@@ -523,9 +523,9 @@ namespace svt
}
//---------------------------------------------------------------------
- String TemplateFolderCacheImpl::getCacheFileName()
+ rtl::OUString TemplateFolderCacheImpl::getCacheFileName()
{
- return String::CreateFromAscii( ".templdir.cache" );
+ return rtl::OUString(".templdir.cache");
}
commit 2b3ec82a04adb327385fbc529f6e447baa3529ed
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 17 23:30:22 2012 +0100
hard-coded windows dumper path makes no sense for us anymore
diff --git a/svtools/source/svrtf/svparser.cxx
b/svtools/source/svrtf/svparser.cxx
index ff3ef7b..7c70608 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -59,10 +59,6 @@ struct SvParser_Impl
rtl_TextToUnicodeConverter hConv;
rtl_TextToUnicodeContext hContext;
-#ifdef DBG_UTIL
- SvFileStream aOut;
-#endif
-
SvParser_Impl() :
nSaveToken(0), hConv( 0 ), hContext( (rtl_TextToUnicodeContext)1 )
{
@@ -92,32 +88,10 @@ SvParser::SvParser( SvStream& rIn, sal_uInt8 nStackSize )
nTokenStackSize = 3;
pTokenStack = new TokenStackType[ nTokenStackSize ];
pTokenStackPos = pTokenStack;
-
-#ifdef DBG_UTIL
-
- // wenn die Datei schon existiert, dann Anhaengen:
- if( !pImplData )
- pImplData = new SvParser_Impl;
- pImplData->aOut.Open( String::CreateFromAscii( "\\parser.dmp" ),
- STREAM_STD_WRITE | STREAM_NOCREATE );
- if( pImplData->aOut.GetError() || !pImplData->aOut.IsOpen() )
- pImplData->aOut.Close();
- else
- {
- pImplData->aOut.Seek( STREAM_SEEK_TO_END );
- pImplData->aOut << "\x0c\n\n >>>>>>>>>>>>>>> Dump Start
<<<<<<<<<<<<<<<\n";
- }
-#endif
}
SvParser::~SvParser()
{
-#ifdef DBG_UTIL
- if( pImplData->aOut.IsOpen() )
- pImplData->aOut << "\n\n >>>>>>>>>>>>>>> Dump Ende <<<<<<<<<<<<<<<\n";
- pImplData->aOut.Close();
-#endif
-
if( pImplData && pImplData->hConv )
{
rtl_destroyTextToUnicodeContext( pImplData->hConv,
@@ -410,11 +384,6 @@ sal_Unicode SvParser::GetNextChar()
return sal_Unicode(EOF);
}
-#ifdef DBG_UTIL
- if( pImplData->aOut.IsOpen() )
- pImplData->aOut << rtl::OUStringToOString(rtl::OUString(c),
RTL_TEXTENCODING_MS_1251).getStr();
-#endif
-
if( c == '\n' )
{
IncLineNr();
commit 95372abb5297176e45a39b225482fda49d93435b
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 17 23:25:39 2012 +0100
string created but never used
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index e2faac8..fc48708 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -1998,11 +1998,6 @@ void SVTXCurrencyField::setProperty( const
::rtl::OUString& PropertyName, const
DoubleCurrencyField* pField = (DoubleCurrencyField*)GetFormattedField();
if ( pField )
{
-#ifdef DBG_UTIL
- String sAssertion( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( "SVTXCurrencyField::setProperty(" ) ) );
- sAssertion += String( PropertyName );
- sAssertion.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ") : invalid value
!" ) );
-#endif
sal_uInt16 nPropType = GetPropertyId( PropertyName );
switch (nPropType)
{
commit d5e20fe5a0ec78a9197c28f25fc5b7e62c18ef39
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 17 23:21:52 2012 +0100
this conversion is a no-op
diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx
index 7a69e2e..0a38cb6 100644
--- a/tools/source/fsys/tempfile.cxx
+++ b/tools/source/fsys/tempfile.cxx
@@ -169,11 +169,7 @@ String TempFile::CreateTempName( const String* pParent )
// get TempFile name with default naming scheme
CreateTempName_Impl( aName, sal_False );
- // convert to file URL
- rtl::OUString aTmp;
- if ( aName.Len() )
- aTmp = aName;
- return aTmp;
+ return aName;
}
TempFile::TempFile( const String* pParent, sal_Bool bDirectory )
commit d7cc97175512940c6066b285545e455b50113285
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 17 23:12:50 2012 +0100
after 11 years it's time to forget about that to-do
diff --git a/toolkit/source/awt/vclxdevice.cxx
b/toolkit/source/awt/vclxdevice.cxx
index 39c74b1..73adaa1 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -59,12 +59,6 @@ VCLXDevice::VCLXDevice()
VCLXDevice::~VCLXDevice()
{
-// Was thought for #88347#, but didn't help, because the interface will not be
released
-// But would be a good idea anyway, check after 6.0, it's a little bit
dangerous now
-// if( mpOutputDevice && IsCreatedWithToolkit() )
-// {
-// delete mpOutputDevice;
-// }
}
void VCLXDevice::DestroyOutputDevice()
commit 277ab34a566739a82babc544e5e35f0413ccd0dd
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Apr 17 21:08:00 2012 +0100
condition is always true
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index b21bc0b..f2dc1b9 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1024,23 +1024,18 @@ void _SdrItemBrowserControl::SetAttributes(const
SfxItemSet* pSet, const SfxItem
default: break;
} // switch
if (aEntry.bIsNum) aEntry.bCanNum = true;
- bool bGetPres = true;
- if (bGetPres) {
-
rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS,
- pPool->GetMetric(nWhich),
-
SFX_MAPUNIT_MM,aEntry.aValue);
- if (aEntry.bCanNum) {
- aEntry.aValue.InsertAscii(": ",0);
-
aEntry.aValue.Insert(UniString::CreateFromInt32(aEntry.nVal),0);
- }
- } else {
- if (aEntry.eItemType==ITEM_BOOL)
aEntry.aValue.AppendAscii(aEntry.nVal!=0 ? "True" : "False");
- else if (aEntry.bCanNum) aEntry.aValue =
UniString::CreateFromInt32(aEntry.nVal);
- else if (aEntry.eItemType==ITEM_STRING)
aEntry.aValue=((SfxStringItem&)rItem).GetValue();
- else if (aEntry.eItemType==ITEM_ENUM &&
nWhich!=EE_CHAR_WEIGHT)
aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((sal_Bool)aEntry.nVal);
- else aEntry.aValue = String("GPF", aTextEncoding);
+
+ rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS,
+ pPool->GetMetric(nWhich),
+ SFX_MAPUNIT_MM, aEntry.aValue);
+ if (aEntry.bCanNum)
+ {
+ aEntry.aValue.InsertAscii(": ",0);
+
aEntry.aValue.Insert(UniString::CreateFromInt32(aEntry.nVal),0);
}
- } else {
+ }
+ else
+ {
aEntry.aValue = String("InvalidItem", aTextEncoding);
}
ImpSetEntry(aEntry,nEntryNum);
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
