[Libreoffice-commits] .: 7 commits - bin/get-bugzilla-attachments-by-mimetype cui/source editeng/inc editeng/source lotuswordpro/qa sc/qa sc/source sdext/source sfx2/source svtools/inc svtools/qa svtools/source sw/source unusedcode.easy vcl/inc vcl/source xmloff/inc xmloff/Library_xo.mk xmloff/Package_inc.mk xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Mar 7 03:09:07 PST 2012
bin/get-bugzilla-attachments-by-mimetype | 2
cui/source/inc/cuitabarea.hxx | 10 +--
cui/source/tabpages/tparea.cxx | 47 ++++++---------
dev/null |binary
editeng/inc/editeng/unotext.hxx | 3 -
editeng/source/uno/unotext.cxx | 27 ---------
lotuswordpro/qa/cppunit/data/pass/fdo36036-1.lwp |binary
sc/qa/unit/data/slk/pass/CVE-2011-1276-1.slk |binary
sc/source/filter/excel/xltracer.cxx | 5 +
sc/source/filter/xml/xmltabi.cxx | 1
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 6 +-
sdext/source/pdfimport/pdfparse/pdfparse.cxx | 10 +--
sfx2/source/doc/oleprops.cxx | 11 ---
svtools/inc/svtools/xwindowitem.hxx | 2
svtools/qa/cppunit/data/emf/pass/CVE-2008-2245-1.emf |binary
svtools/source/misc/xwindowitem.cxx | 19 ------
sw/source/filter/ww8/wrtww8.cxx | 6 --
sw/source/filter/ww8/wrtww8.hxx | 6 +-
sw/source/filter/ww8/wrtww8gr.cxx | 19 +-----
sw/source/filter/ww8/ww8par.hxx | 27 ---------
sw/source/filter/ww8/ww8par4.cxx | 2
unusedcode.easy | 20 ------
vcl/inc/vcl/strhelper.hxx | 1
vcl/source/helper/strhelper.cxx | 51 -----------------
xmloff/Library_xo.mk | 1
xmloff/Package_inc.mk | 1
xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx | 1
xmloff/inc/xmloff/formsimp.hxx | 51 -----------------
xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx | 4 -
xmloff/source/draw/sdpropls.cxx | 11 ---
xmloff/source/draw/sdpropls.hxx | 7 --
xmloff/source/draw/ximppage.cxx | 1
xmloff/source/forms/formsimp.cxx | 57 -------------------
xmloff/source/text/txtimp.cxx | 1
34 files changed, 45 insertions(+), 365 deletions(-)
New commits:
commit 6220ed4e6e04d555dc28ada02f46f88ed9ee3daf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 7 11:05:50 2012 +0000
callcatcher: update list
diff --git a/lotuswordpro/qa/cppunit/data/pass/A14.lwp b/lotuswordpro/qa/cppunit/data/pass/A14.lwp
deleted file mode 100644
index 7cc05ce..0000000
Binary files a/lotuswordpro/qa/cppunit/data/pass/A14.lwp and /dev/null differ
diff --git a/lotuswordpro/qa/cppunit/data/pass/fdo36036-1.lwp b/lotuswordpro/qa/cppunit/data/pass/fdo36036-1.lwp
new file mode 100644
index 0000000..7cc05ce
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/pass/fdo36036-1.lwp differ
diff --git a/unusedcode.easy b/unusedcode.easy
index fbdf2a4..80eff11 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -982,8 +982,6 @@ oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange
oox::xls::CellBlock::isBefore(oox::ValueRange const&) const
oox::xls::CellBlock::isExpandable(oox::ValueRange const&) const
oox::xls::CellBlock::startNextRow()
-pdfi::createOdfEmitter(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&)
-psp::GetCommandLineTokenCount(rtl::OString const&)
psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&)
diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx
index fa8258d..49b29ef 100644
--- a/vcl/inc/vcl/strhelper.hxx
+++ b/vcl/inc/vcl/strhelper.hxx
@@ -44,7 +44,6 @@ namespace psp
// contents
VCL_DLLPUBLIC int GetCommandLineTokenCount(const rtl::OUString&);
- VCL_DLLPUBLIC int GetCommandLineTokenCount(const rtl::OString&);
// returns number of tokens (zero if empty or whitespace only)
VCL_DLLPUBLIC String WhitespaceToSpace( const String&, sal_Bool bProtect = sal_True );
diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index 14b61a5..0515fab 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -271,57 +271,6 @@ int GetCommandLineTokenCount(const rtl::OUString& rLine)
return nTokenCount;
}
-int GetCommandLineTokenCount(const rtl::OString& rLine)
-{
- if (rLine.isEmpty())
- return 0;
-
- int nTokenCount = 0;
- const char *pRun = rLine.getStr();
-
-
- while( *pRun )
- {
- while( *pRun && isSpace( *pRun ) )
- pRun++;
- if( ! *pRun )
- break;
- while( *pRun && ! isSpace( *pRun ) )
- {
- if( *pRun == '\\' )
- {
- // escapement
- pRun++;
- if( *pRun )
- pRun++;
- }
- else if( *pRun == '`' )
- {
- do pRun++; while( *pRun && *pRun != '`' );
- if( *pRun )
- pRun++;
- }
- else if( *pRun == '\'' )
- {
- do pRun++; while( *pRun && *pRun != '\'' );
- if( *pRun )
- pRun++;
- }
- else if( *pRun == '"' )
- {
- do pRun++; while( *pRun && *pRun != '"' );
- if( *pRun )
- pRun++;
- }
- else
- pRun++;
- }
- nTokenCount++;
- }
-
- return nTokenCount;
-}
-
String WhitespaceToSpace( const String& rLine, sal_Bool bProtect )
{
int nLen = rLine.Len();
commit 9656a1549512ddc2b1a69d4e5bb6c791dede1534
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 7 11:04:02 2012 +0000
WaE: various higher debug level compile time warnings
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 1283d10..742407d 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1423,9 +1423,9 @@ PDFFileImplData* PDFFile::impl_getData() const
PDFNumber* pNum = dynamic_cast<PDFNumber*>(p_ent->second);
if( pNum )
m_pData->m_nPEntry = static_cast<sal_uInt32>(static_cast<sal_Int32>(pNum->m_fValue));
- #if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "p entry is %p\n", (void*)m_pData->m_nPEntry );
- #endif
+ #if OSL_DEBUG_LEVEL > 1
+ fprintf( stderr, "p entry is %" SAL_PRIxUINT32 "\n", m_pData->m_nPEntry );
+ #endif
}
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "Encryption dict: sec handler: %s, version = %d, revision = %d, key length = %d\n",
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 32dc0ef..1b350af 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -652,20 +652,20 @@ PDFEntry* PDFReader::read( const char* pFileName )
aGrammar,
boost::spirit::space_p );
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "parseinfo: stop at offset = %d, hit = %s, full = %s, length = %d\n",
+ fprintf( stderr, "parseinfo: stop at offset = %ld, hit = %s, full = %s, length = %lu\n",
aInfo.stop - file_start,
aInfo.hit ? "true" : "false",
aInfo.full ? "true" : "false",
- (int)aInfo.length );
+ aInfo.length );
#endif
}
catch( const parser_error< const char*, file_iterator<> >& rError )
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "parse error: %s at buffer pos %u\nobject stack:\n",
+ fprintf( stderr, "parse error: %s at buffer pos %lu\nobject stack:\n",
rError.descriptor, rError.where - file_start );
- unsigned int nElem = aGrammar.m_aObjectStack.size();
- for( unsigned int i = 0; i < nElem; i++ )
+ size_t nElem = aGrammar.m_aObjectStack.size();
+ for( size_t i = 0; i < nElem; ++i )
{
fprintf( stderr, " %s\n", typeid( *(aGrammar.m_aObjectStack[i]) ).name() );
}
commit cf0373b42e558ee17b47bb985e7d5a2b0f17939a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 7 09:22:34 2012 +0000
attachmentid should be stable across mime-type changes
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 4410498..3e9381f 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -80,8 +80,8 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
f = open(download, 'w')
f.write(base64.b64decode(node.firstChild.nodeValue))
f.close()
- attachmentid += 1
break
+ attachmentid += 1
def get_through_rpc_query(rpcurl, showurl, mimetype, prefix, suffix):
try:
commit ac7a11255afc531ce2ca4958277c27d6d29e7c3c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 6 23:09:35 2012 +0000
We just want to know if this ole object is already exported or not
So it's merely the knowledge of having exported this object already that we
need to know in order to elide re-exporting it.
This code is still 64bit unsafe, as the nPictureId has to be a unique
32bit value for each object, so using the pointer as the key is
horribly dubious, but this should be the same as the original code.
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 048a547..b24985e 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2849,9 +2849,6 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
pOLEExp = new SvxMSExportOLEObjects( nSvxMSDffOLEConvFlags );
}
- if ( !pOleMap)
- pOleMap = new WW8OleMaps;
-
if ( !pOCXExp && pDoc->GetDocShell() )
pOCXExp = new SwMSConvertControls( pDoc->GetDocShell(), pCurPam );
@@ -3266,7 +3263,7 @@ sal_uLong SwWW8Writer::Write( SwPaM& rPaM, SfxMedium& rMed,
MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam )
: aMainStg(sMainStream), pISet(0), pUsedNumTbl(0), mpTopNodeOfHdFtPage(0),
- pBmpPal(0), pOLEExp(0), pOCXExp(0), pOleMap(0),
+ pBmpPal(0), pOLEExp(0), pOCXExp(0),
mpTableInfo(new ww8::WW8TableInfo()), nUniqueList(0),
mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0),
pStyles( NULL ),
@@ -3284,7 +3281,6 @@ MSWordExportBase::~MSWordExportBase()
delete pBmpPal;
delete pOLEExp;
delete pOCXExp;
- delete pOleMap;
}
WW8Export::WW8Export( SwWW8Writer *pWriter,
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a1827bf..f466fcc 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -117,7 +117,7 @@ class WW8_WrtBookmarks;
class WW8_WrtRedlineAuthor;
class SvxMSExportOLEObjects;
class SwMSConvertControls;
-class WW8OleMaps;
+typedef std::set<sal_uInt32> WW8OleSet;
class SvStorageRef;
struct WW8_PdAttrDesc;
class SvxBrushItem;
@@ -461,7 +461,7 @@ public:
boost::shared_ptr<NfKeywordTable> pKeyMap;
SvxMSExportOLEObjects* pOLEExp;
SwMSConvertControls* pOCXExp;
- WW8OleMaps* pOleMap;
+ WW8OleSet m_aOleSet; // To remember all already exported ole objects
ww8::WW8TableInfo::Pointer_t mpTableInfo;
sal_uInt16 nCharFmtStart;
@@ -968,7 +968,7 @@ public:
SvxMSExportOLEObjects& GetOLEExp() { return *pOLEExp; }
SwMSConvertControls& GetOCXExp() { return *pOCXExp; }
- WW8OleMaps& GetOLEMap() { return *pOleMap; }
+ WW8OleSet& GetOLESet() { return m_aOleSet; }
void ExportDopTypography(WW8DopTypography &rTypo);
sal_uInt16 AddRedlineAuthor( sal_uInt16 nId );
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 6524abc..f8614f9 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -241,22 +241,11 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
uno::Reference < embed::XEmbeddedObject > xObj(const_cast<SwOLENode&>(rOLENode).GetOLEObj().GetOleRef());
if( xObj.is() )
{
- embed::XEmbeddedObject *pObj = xObj.get();
+ const embed::XEmbeddedObject *pObj = xObj.get();
sal_uInt32 nPictureId = (sal_uInt32)(sal_uIntPtr)pObj;
+ //.second is false when element already existed
+ bool bIsNotDuplicate = GetOLESet().insert(nPictureId).second;
Set_UInt32(pDataAdr, nPictureId);
-
- WW8OleMap *pMap = new WW8OleMap(nPictureId);
- bool bDuplicate = false;
- WW8OleMaps &rOleMap = GetOLEMap();
- sal_uInt16 nPos;
- if ( rOleMap.Seek_Entry(pMap, &nPos) )
- {
- bDuplicate = true;
- delete pMap;
- }
- else if( 0 == rOleMap.Insert( pMap) )
- delete pMap;
-
String sStorageName( '_' );
sStorageName += String::CreateFromInt32( nPictureId );
SvStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName,
@@ -267,7 +256,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
If this object storage has been written already don't
waste time rewriting it
*/
- if (!bDuplicate)
+ if (bIsNotDuplicate)
{
sal_Int64 nAspect = rOLENode.GetAspect();
svt::EmbeddedObjectRef aObjRef( xObj, nAspect );
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index a19b50c..0c7001c 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -143,12 +143,7 @@ namespace com{namespace sun {namespace star{
struct WW8LFOInfo;
typedef WW8LFOInfo* WW8LFOInfo_Ptr;
-// Redlining: match WinWord author ids to StarWriter author ids
-struct WW8OleMap;
-typedef WW8OleMap* WW8OleMap_Ptr;
-
SV_DECL_PTRARR_DEL(WW8LFOInfos,WW8LFOInfo_Ptr,16)
-SV_DECL_PTRARR_SORT_DEL(WW8OleMaps, WW8OleMap_Ptr,16)
class WW8Reader : public StgReader
{
@@ -161,28 +156,6 @@ public:
virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const;
};
-struct WW8OleMap
-{
- sal_uInt32 mnWWid;
- String msStorageName;
-
- WW8OleMap(sal_uInt32 nWWid)
- : mnWWid(nWWid) {}
-
- WW8OleMap(sal_uInt32 nWWid, String sStorageName)
- : mnWWid(nWWid), msStorageName(sStorageName) {}
-
- bool operator==(const WW8OleMap & rEntry) const
- {
- return (mnWWid == rEntry.mnWWid);
- }
- bool operator<(const WW8OleMap & rEntry) const
- {
- return (mnWWid < rEntry.mnWWid);
- }
-};
-
-
class SwWW8ImplReader;
struct WW8LSTInfo;
class WW8ListManager
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 0447a73..6b44d82 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -72,8 +72,6 @@ struct OLE_MFP
using namespace ::com::sun::star;
-SV_IMPL_OP_PTRARR_SORT(WW8OleMaps, WW8OleMap_Ptr)
-
static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
{
// Skalierungsfaktoren holen:
diff --git a/unusedcode.easy b/unusedcode.easy
index b80fef4..fbdf2a4 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -371,11 +371,6 @@ WPXPropertyList::Iter::last()
WPXPropertyListVector::Iter::last()
WPXString::Iter::last()
WPXSubDocument::WPXSubDocument()
-WW8OleMaps::Insert(WW8OleMap* const&, unsigned short&)
-WW8OleMaps::Insert(WW8OleMap* const*, unsigned short)
-WW8OleMaps::Insert(WW8OleMaps const*, unsigned short, unsigned short)
-WW8OleMaps::Remove(WW8OleMap* const&, unsigned short)
-WW8OleMaps::Remove(unsigned short, unsigned short)
WinMtfOutput::DrawLine(Point const&, Point const&)
WinMtfOutput::GetTextLayoutMode() const
WinMtfOutput::SetFont(Font const&)
commit bbc6d8506d0bb1035c7c6d1755a0655612b54e69
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 6 22:43:13 2012 +0000
remove various unused methods and source files
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 2db3bd2..127771b 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -423,15 +423,12 @@ protected:
public:
SvxUnoTextBase( ) throw();
SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw();
- SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw();
SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > xParent ) throw();
SvxUnoTextBase( const SvxUnoTextBase& rText ) throw();
virtual ~SvxUnoTextBase() throw();
UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextBase )
- ESelection InsertField( const SvxFieldItem& rField ) throw();
-
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > createTextCursorBySelection( const ESelection& rSel );
// ::com::sun::star::text::XSimpleText
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 947a93e..469e2d7 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1581,14 +1581,6 @@ SvxUnoTextBase::SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw()
{
}
-SvxUnoTextBase::SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw()
-: SvxUnoTextBase_Base( pSource, _pSet )
-{
- ESelection aSelection;
- ::GetSelection( aSelection, GetEditSource()->GetTextForwarder() );
- SetSelection( aSelection );
-}
-
SvxUnoTextBase::SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, uno::Reference < text::XText > xParent ) throw()
: SvxUnoTextBase_Base( pSource, _pSet )
{
@@ -1608,25 +1600,6 @@ SvxUnoTextBase::~SvxUnoTextBase() throw()
{
}
-// Internal
-ESelection SvxUnoTextBase::InsertField( const SvxFieldItem& rField ) throw()
-{
- SvxTextForwarder* pForwarder = GetEditSource() ? GetEditSource()->GetTextForwarder() : NULL;
- if( pForwarder )
- {
- pForwarder->QuickInsertField( rField, GetSelection() );
- GetEditSource()->UpdateData();
-
- // Adapt selection
- //! It would be easier if the EditEngine would return the selection
- //! on QuickInsertText...
- CollapseToStart();
- GoRight( 1, sal_True ); // Field is always 1 character
- }
-
- return GetSelection(); // Selection with the field
-}
-
uno::Reference< text::XTextCursor > SvxUnoTextBase::createTextCursorBySelection( const ESelection& rSel )
{
SvxUnoTextCursor* pCursor = new SvxUnoTextCursor( *this );
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index a5ff146..7add17f 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -51,7 +51,6 @@
#include <xmloff/xmltkmap.hxx>
#include <xmloff/nmspmap.hxx>
-#include <xmloff/formsimp.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/XMLEventsImportContext.hxx>
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 9c111a0..cab4f0a 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -146,9 +146,6 @@ public:
explicit SfxOleStringPropertyBase(
sal_Int32 nPropId, sal_Int32 nPropType,
rtl_TextEncoding eTextEnc );
- explicit SfxOleStringPropertyBase(
- sal_Int32 nPropId, sal_Int32 nPropType,
- rtl_TextEncoding eTextEnc, const String& rValue );
inline const String& GetValue() const { return maValue; }
inline void SetValue( const String& rValue ) { maValue = rValue; }
@@ -529,14 +526,6 @@ SfxOleStringPropertyBase::SfxOleStringPropertyBase(
{
}
-SfxOleStringPropertyBase::SfxOleStringPropertyBase(
- sal_Int32 nPropId, sal_Int32 nPropType, rtl_TextEncoding eTextEnc, const String& rValue ) :
- SfxOlePropertyBase( nPropId, nPropType ),
- SfxOleStringHelper( eTextEnc ),
- maValue( rValue )
-{
-}
-
// ----------------------------------------------------------------------------
SfxOleString8Property::SfxOleString8Property(
diff --git a/svtools/inc/svtools/xwindowitem.hxx b/svtools/inc/svtools/xwindowitem.hxx
index ed4a4c6..4d2ec12 100644
--- a/svtools/inc/svtools/xwindowitem.hxx
+++ b/svtools/inc/svtools/xwindowitem.hxx
@@ -50,8 +50,6 @@ class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem
public:
TYPEINFO();
XWindowItem();
- explicit XWindowItem( sal_uInt16 nWhich, Window * pWin );
- XWindowItem( sal_uInt16 nWhich, com::sun::star::uno::Reference< com::sun::star::awt::XWindow > & rxWin );
XWindowItem( const XWindowItem &rItem );
~XWindowItem();
diff --git a/svtools/qa/cppunit/data/emf/pass/CVE-2008-2245-1.emf b/svtools/qa/cppunit/data/emf/pass/CVE-2008-2245-1.emf
new file mode 100644
index 0000000..746e85e
Binary files /dev/null and b/svtools/qa/cppunit/data/emf/pass/CVE-2008-2245-1.emf differ
diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx
index d6f3797..4796263 100644
--- a/svtools/source/misc/xwindowitem.cxx
+++ b/svtools/source/misc/xwindowitem.cxx
@@ -45,25 +45,6 @@ XWindowItem::XWindowItem() :
}
-XWindowItem::XWindowItem( sal_uInt16 nWhichId, Window * pWin ) :
- SfxPoolItem( nWhichId )
-{
- if (pWin)
- {
- m_xWin = uno::Reference< awt::XWindow >( pWin->GetComponentInterface(), uno::UNO_QUERY );
- // the assertion can't possibly fails since VCLXWindow implements XWindow...
- DBG_ASSERT( m_xWin.is(), "failed to get XWindow" );
- }
-}
-
-
-XWindowItem::XWindowItem( sal_uInt16 nWhichId, uno::Reference< awt::XWindow > & rxWin ) :
- SfxPoolItem( nWhichId ),
- m_xWin( rxWin )
-{
-}
-
-
XWindowItem::XWindowItem( const XWindowItem &rItem ) :
SfxPoolItem( Which() ),
m_xWin( rItem.m_xWin )
diff --git a/unusedcode.easy b/unusedcode.easy
index e9157ed..b80fef4 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -133,7 +133,6 @@ SfxFoundCacheArr_Impl::Remove(unsigned short, unsigned short)
SfxMedium::GetHdl()
SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
-SfxOleStringPropertyBase::SfxOleStringPropertyBase(int, int, unsigned short, String const&)
SfxPartChildWnd_Impl::GetChildWindowId()
SfxPopupWindow::LinkStubDelete(void*, void*)
SfxRecordingFloatWrapper_Impl::GetChildWindowId()
@@ -198,11 +197,6 @@ SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short)
SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short)
SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short)
SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short)
-SvxAreaTabPage::LinkStubClickBitmapHdl_Impl(void*, void*)
-SvxAreaTabPage::LinkStubClickColorHdl_Impl(void*, void*)
-SvxAreaTabPage::LinkStubClickGradientHdl_Impl(void*, void*)
-SvxAreaTabPage::LinkStubClickHatchingHdl_Impl(void*, void*)
-SvxAreaTabPage::LinkStubClickInvisibleHdl_Impl(void*, void*)
SvxAutocorrWordList::Insert(SvxAutocorrWord* const&, unsigned short&)
SvxAutocorrWordList::Insert(SvxAutocorrWord* const*, unsigned short)
SvxAutocorrWordList::Insert(SvxAutocorrWordList const*, unsigned short, unsigned short)
@@ -226,8 +220,6 @@ SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short)
SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*)
-SvxUnoTextBase::InsertField(SvxFieldItem const&)
-SvxUnoTextBase::SvxUnoTextBase(SvxEditSource const*, SvxItemPropertySet const*)
SvxUnoTextContent::SvxUnoTextContent()
SwAttrIter::Dump(SvStream&) const
SwBlinkList::Insert(SwBlinkList const*, unsigned short, unsigned short)
@@ -391,7 +383,6 @@ Window::PostUserEvent(unsigned long&, unsigned long, void*)
X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
XMLElement::Equals(rtl::OUString)
-XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter()
XMLErrors::AddRecord(int, com::sun::star::uno::Sequence<rtl::OUString> const&)
XMLErrors::AddRecord(int, com::sun::star::uno::Sequence<rtl::OUString> const&, rtl::OUString const&)
XMLFamilyDataList_Impl::GetPos(XMLFamilyData_Impl const*) const
@@ -400,8 +391,6 @@ XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLFontAutoStylePool_Impl::GetPos(XMLFontAutoStylePoolEntry_Impl const*) const
XMLFontAutoStylePool_Impl::Remove(XMLFontAutoStylePoolEntry_Impl*)
-XMLFormsContext::XMLFormsContext(SvXMLImport&, unsigned short, rtl::OUString const&)
-XMLPagePropertySetMapper::XMLPagePropertySetMapper(UniReference<XMLPropertyHandlerFactory> const&)
XMLParentNode::AddChild(XMLChildNode*, unsigned long)
XMLParentNode::GetChildElement(XMLElement*)
XMLParentNode::RemoveChild(XMLElement*)
@@ -417,8 +406,6 @@ XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*) const
XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
XMLVisAreaContext::XMLVisAreaContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, Rectangle&, short)
-XWindowItem::XWindowItem(unsigned short, Window*)
-XWindowItem::XWindowItem(unsigned short, com::sun::star::uno::Reference<com::sun::star::awt::XWindow>&)
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
_CpyTabFrms::Insert(_CpyTabFrm const&, unsigned short&)
_CpyTabFrms::Insert(_CpyTabFrm const*, unsigned short)
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 558b5f3..a5ed58f 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -171,7 +171,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/forms/formevents \
xmloff/source/forms/formlayerexport \
xmloff/source/forms/formlayerimport \
- xmloff/source/forms/formsimp \
xmloff/source/forms/gridcolumnproptranslator \
xmloff/source/forms/layerexport \
xmloff/source/forms/layerimport \
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk
index b53ea7e..fc7f921 100644
--- a/xmloff/Package_inc.mk
+++ b/xmloff/Package_inc.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/dllapi.h,xmloff/dllapi.h
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/families.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx))
diff --git a/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
index 2c9af8b..53d332f 100644
--- a/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
+++ b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
@@ -45,7 +45,6 @@ class XMLEmbeddedObjectExportFilter : public ::cppu::WeakImplHelper3<
::com::sun::star::xml::sax::XExtendedDocumentHandler > xExtHandler;
public:
- XMLEmbeddedObjectExportFilter() throw();
XMLEmbeddedObjectExportFilter( const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > & rHandler ) throw();
virtual ~XMLEmbeddedObjectExportFilter () throw();
diff --git a/xmloff/inc/xmloff/formsimp.hxx b/xmloff/inc/xmloff/formsimp.hxx
deleted file mode 100644
index 3fadb71..0000000
--- a/xmloff/inc/xmloff/formsimp.hxx
+++ /dev/null
@@ -1,51 +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 _XMLOFF_FORMSIMP_HXX
-#define _XMLOFF_FORMSIMP_HXX
-
-#include <xmloff/xmlictxt.hxx>
-
-//////////////////////////////////////////////////////////////////////////////
-// presentations:animations
-
-class XMLFormsContext : public SvXMLImportContext
-{
-public:
- TYPEINFO();
-
- XMLFormsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName);
- virtual ~XMLFormsContext();
-
- virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
-};
-
-#endif // _XMLOFF_ANIMIMP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index 00f10ec..b2dc065 100644
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -34,10 +34,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter() throw()
-{
-}
-
XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter(
const Reference< XDocumentHandler > & rHandler ) throw() :
xHandler( rHandler ),
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 7c68585..82f5476 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1572,17 +1572,6 @@ void XMLShapeExportPropertyMapper::handleElementItem(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
-XMLPagePropertySetMapper::XMLPagePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef)
-: XMLPropertySetMapper( aXMLSDPresPageProps, rFactoryRef )
-{
-}
-
-XMLPagePropertySetMapper::~XMLPagePropertySetMapper()
-{
-}
-
// ----------------------------------------
XMLPageExportPropertyMapper::XMLPageExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) :
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 4718782..e851156 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -297,13 +297,6 @@ public:
sal_uInt32 nIdx = 0 ) const;
};
-class XMLPagePropertySetMapper : public XMLPropertySetMapper
-{
-public:
- XMLPagePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef);
- ~XMLPagePropertySetMapper();
-};
-
class XMLPageExportPropertyMapper : public SvXMLExportPropertyMapper
{
private:
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 79d0acc..09fbb03 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -40,7 +40,6 @@
#include "ximpshap.hxx"
#include "animimp.hxx"
#include "XMLStringBufferImportContext.hxx"
-#include <xmloff/formsimp.hxx>
#include <xmloff/xmlictxt.hxx>
#include "ximpstyl.hxx"
#include <xmloff/prstylei.hxx>
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
deleted file mode 100644
index fa4f7ab..0000000
--- a/xmloff/source/forms/formsimp.cxx
+++ /dev/null
@@ -1,57 +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 <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <xmloff/xmlimp.hxx>
-#include "xmloff/xmlnmspe.hxx"
-#include <xmloff/nmspmap.hxx>
-
-#include <xmloff/formsimp.hxx>
-
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
-
-TYPEINIT1( XMLFormsContext, SvXMLImportContext );
-
-XMLFormsContext::XMLFormsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName )
-: SvXMLImportContext(rImport, nPrfx, rLocalName)
-{
-}
-
-XMLFormsContext::~XMLFormsContext()
-{
-}
-
-SvXMLImportContext * XMLFormsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
-{
- return GetImport().GetFormImport()->createContext( nPrefix, rLocalName, xAttrList );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 7d210ca..57c0ccf 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -85,7 +85,6 @@
#include "XMLAutoMarkFileContext.hxx"
#include "XMLCalculationSettingsContext.hxx"
-#include <xmloff/formsimp.hxx>
#include "XMLNumberStylesImport.hxx"
// XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#)
#include <com/sun/star/beans/XPropertyState.hpp>
commit 04f067623f342be50c31db8aafb29f1bb8e3959f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 6 22:42:29 2012 +0000
These methods don't need to be implemented as Links
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 5c1d3dd..a3c2214 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -263,20 +263,20 @@ private:
#ifdef _SVX_TPAREA_CXX
DECL_LINK(SelectDialogTypeHdl_Impl, void *);
- DECL_LINK( ClickInvisibleHdl_Impl, void * );
- DECL_LINK( ClickColorHdl_Impl, void * );
DECL_LINK( ModifyColorHdl_Impl, void * );
DECL_LINK( ModifyHatchBckgrdColorHdl_Impl, void * );
- DECL_LINK( ClickGradientHdl_Impl, void * );
DECL_LINK( ModifyGradientHdl_Impl, void * );
- DECL_LINK( ClickHatchingHdl_Impl, void * );
DECL_LINK( ModifyHatchingHdl_Impl, void * );
DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * );
- DECL_LINK( ClickBitmapHdl_Impl, void * );
DECL_LINK( ModifyBitmapHdl_Impl, void * );
DECL_LINK( ModifyStepCountHdl_Impl, void * );
DECL_LINK( ModifyTileHdl_Impl, void * );
DECL_LINK( ClickScaleHdl_Impl, void * );
+ void ClickInvisibleHdl_Impl();
+ void ClickHatchingHdl_Impl();
+ void ClickGradientHdl_Impl();
+ void ClickColorHdl_Impl();
+ void ClickBitmapHdl_Impl();
#endif
public:
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index c27af19..214496a 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -912,26 +912,26 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
case PT_GRADIENT:
aTypeLB.SelectEntryPos( XFILL_GRADIENT );
aLbGradient.SelectEntryPos( _nPos );
- ClickGradientHdl_Impl( this );
+ ClickGradientHdl_Impl();
break;
case PT_HATCH:
aTypeLB.SelectEntryPos( XFILL_HATCH );
aLbHatching.SelectEntryPos( _nPos );
- ClickHatchingHdl_Impl( this );
+ ClickHatchingHdl_Impl();
break;
case PT_BITMAP:
aTypeLB.SelectEntryPos( XFILL_BITMAP );
aLbBitmap.SelectEntryPos( _nPos );
- ClickBitmapHdl_Impl( this );
+ ClickBitmapHdl_Impl();
break;
case PT_COLOR:
aTypeLB.SelectEntryPos( XFILL_SOLID );
aLbColor.SelectEntryPos( _nPos );
aLbHatchBckgrdColor.SelectEntryPos( _nPos );
- ClickColorHdl_Impl( this );
+ ClickColorHdl_Impl();
break;
}
}
@@ -1444,7 +1444,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
switch( eXFS )
{
case XFILL_NONE:
- ClickInvisibleHdl_Impl( this );
+ ClickInvisibleHdl_Impl();
break;
case XFILL_SOLID:
@@ -1456,7 +1456,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
aLbColor.SelectEntry( aColorItem.GetColorValue() );
aLbHatchBckgrdColor.SelectEntry( aColorItem.GetColorValue() );
}
- ClickColorHdl_Impl( this );
+ ClickColorHdl_Impl();
break;
@@ -1470,7 +1470,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
aLbGradient.SelectEntryByList( pGradientList, aString, aGradient );
}
- ClickGradientHdl_Impl( this );
+ ClickGradientHdl_Impl();
break;
case XFILL_HATCH:
@@ -1479,7 +1479,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
aLbHatching.SelectEntry( ( ( const XFillHatchItem& )
rAttrs.Get( XATTR_FILLHATCH ) ).GetName() );
}
- ClickHatchingHdl_Impl( this );
+ ClickHatchingHdl_Impl();
if ( SFX_ITEM_DONTCARE != rAttrs.GetItemState ( XATTR_FILLBACKGROUND ) )
{
@@ -1506,7 +1506,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
String aString( aBitmapItem.GetName() );
aLbBitmap.SelectEntry( aString );
}
- ClickBitmapHdl_Impl( this );
+ ClickBitmapHdl_Impl();
}
break;
@@ -1717,7 +1717,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
// Erst hier, damit Tile und Stretch mit beruecksichtigt wird
if( aTypeLB.GetSelectEntryPos() == XFILL_BITMAP )
- ClickBitmapHdl_Impl( NULL );
+ ClickBitmapHdl_Impl();
// Werte sichern
aTypeLB.SaveValue();
@@ -1758,17 +1758,17 @@ IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl)
{
switch( (XFillStyle)aTypeLB.GetSelectEntryPos() )
{
- case XFILL_NONE: ClickInvisibleHdl_Impl( this ); break;
- case XFILL_SOLID: ClickColorHdl_Impl( this ); break;
- case XFILL_GRADIENT: ClickGradientHdl_Impl( this ); break;
- case XFILL_HATCH: ClickHatchingHdl_Impl( this ); break;
- case XFILL_BITMAP: ClickBitmapHdl_Impl( this ); break;
+ case XFILL_NONE: ClickInvisibleHdl_Impl(); break;
+ case XFILL_SOLID: ClickColorHdl_Impl(); break;
+ case XFILL_GRADIENT: ClickGradientHdl_Impl(); break;
+ case XFILL_HATCH: ClickHatchingHdl_Impl(); break;
+ case XFILL_BITMAP: ClickBitmapHdl_Impl(); break;
}
return 0;
}
-IMPL_LINK_NOARG(SvxAreaTabPage, ClickInvisibleHdl_Impl)
+void SvxAreaTabPage::ClickInvisibleHdl_Impl()
{
aTsbTile.Hide();
aTsbStretch.Hide();
@@ -1811,13 +1811,11 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickInvisibleHdl_Impl)
aCtlXRectPreview.Invalidate();
aCtlBitmapPreview.Invalidate();
-
- return( 0L );
}
//------------------------------------------------------------------------
-IMPL_LINK_NOARG(SvxAreaTabPage, ClickColorHdl_Impl)
+void SvxAreaTabPage::ClickColorHdl_Impl()
{
aTsbTile.Hide();
aTsbStretch.Hide();
@@ -1872,7 +1870,6 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickColorHdl_Impl)
aString += String(aURL.getBase());
ModifyColorHdl_Impl( this );
- return( 0L );
}
//------------------------------------------------------------------------
@@ -1905,7 +1902,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl)
}
//------------------------------------------------------------------------
-IMPL_LINK_NOARG(SvxAreaTabPage, ClickGradientHdl_Impl)
+void SvxAreaTabPage::ClickGradientHdl_Impl()
{
aTsbTile.Hide();
aTsbStretch.Hide();
@@ -1963,7 +1960,6 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickGradientHdl_Impl)
ModifyGradientHdl_Impl( this );
ModifyStepCountHdl_Impl( &aTsbStepCount );
- return( 0L );
}
//------------------------------------------------------------------------
@@ -1997,7 +1993,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl)
//------------------------------------------------------------------------
-IMPL_LINK_NOARG(SvxAreaTabPage, ClickHatchingHdl_Impl)
+void SvxAreaTabPage::ClickHatchingHdl_Impl()
{
aLbColor.Hide();
aLbGradient.Hide();
@@ -2056,8 +2052,6 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickHatchingHdl_Impl)
ModifyHatchingHdl_Impl( this );
ModifyHatchBckgrdColorHdl_Impl( this );
ToggleHatchBckgrdColorHdl_Impl( this );
-
- return( 0L );
}
//------------------------------------------------------------------------
@@ -2141,7 +2135,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl)
//------------------------------------------------------------------------
-IMPL_LINK_NOARG(SvxAreaTabPage, ClickBitmapHdl_Impl)
+void SvxAreaTabPage::ClickBitmapHdl_Impl()
{
aLbColor.Hide();
aLbGradient.Hide();
@@ -2216,7 +2210,6 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickBitmapHdl_Impl)
ModifyBitmapHdl_Impl( this );
ModifyTileHdl_Impl( &aTsbOriginal );
- return( 0L );
}
//------------------------------------------------------------------------
commit 88aabebed1ded59d0a4b84c92c6fc6ccbdd96728
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 6 21:50:07 2012 +0000
Conditional jump or move depends on uninitialised value
diff --git a/sc/qa/unit/data/slk/pass/CVE-2011-1276-1.slk b/sc/qa/unit/data/slk/pass/CVE-2011-1276-1.slk
new file mode 100644
index 0000000..061e609
Binary files /dev/null and b/sc/qa/unit/data/slk/pass/CVE-2011-1276-1.slk differ
diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx
index 8600d80..083d4c7 100644
--- a/sc/source/filter/excel/xltracer.cxx
+++ b/sc/source/filter/excel/xltracer.cxx
@@ -36,8 +36,9 @@ using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::PropertyValue;
-XclTracer::XclTracer( const String& rDocUrl ) :
- maFirstTimes(eTraceLength,true)
+XclTracer::XclTracer( const String& rDocUrl )
+ : mbEnabled(false)
+ , maFirstTimes(eTraceLength,true)
{
Sequence< PropertyValue > aConfigData( 1 );
aConfigData[ 0 ].Name = CREATE_OUSTRING( "DocumentURL" );
More information about the Libreoffice-commits
mailing list