[Libreoffice-commits] .: 10 commits - drawinglayer/inc drawinglayer/source filter/inc filter/source package/inc package/source sc/source sd/source svl/inc svl/source svtools/source sw/inc sw/source tools/inc tools/source unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Feb 28 02:57:43 PST 2012
drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx | 79 ++++------
drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx | 41 -----
drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx | 76 ---------
filter/inc/filter/msfilter/msdffimp.hxx | 1
filter/source/config/cache/typedetection.cxx | 13 -
filter/source/msfilter/msdffimp.cxx | 9 -
filter/source/msfilter/svdfppt.cxx | 9 -
package/inc/ZipPackageStream.hxx | 1
package/source/zippackage/ZipPackageStream.cxx | 6
sc/source/core/data/stlsheet.cxx | 12 -
sd/source/core/stlsheet.cxx | 12 -
svl/inc/svl/style.hxx | 20 +-
svl/source/items/style.cxx | 55 ++----
svtools/source/control/scriptedtext.cxx | 7
svtools/source/filter/wmf/winwmf.cxx | 5
sw/inc/charfmt.hxx | 2
sw/inc/docstyle.hxx | 2
sw/source/filter/ww8/ww8par.cxx | 15 +
sw/source/ui/app/docstyle.cxx | 18 +-
tools/inc/tools/pstm.hxx | 4
tools/inc/tools/stream.hxx | 6
tools/source/ref/pstm.cxx | 17 --
tools/source/stream/stream.cxx | 2
unusedcode.easy | 7
vcl/inc/vcl/button.hxx | 1
vcl/source/control/button.cxx | 6
26 files changed, 115 insertions(+), 311 deletions(-)
New commits:
commit 9ddf39c39152bf4f42bc0bcc2ad03f7fc0c02029
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 28 10:15:17 2012 +0000
fix windows build
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index a8bde29..82d322a 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -641,7 +641,9 @@ private:
sal_Bool LockRange( sal_Size nByteOffset, sal_Size nBytes );
sal_Bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
sal_Bool LockFile();
-
+#ifdef WNT
+ sal_Bool UnlockFile();
+#endif
protected:
virtual sal_Size GetData( void* pData, sal_Size nSize );
commit f7aaf5c42ebe980a86abc799bffc7d504c9a1be4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 28 06:48:43 2012 +0000
convert some low hanging fruit
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index f40029d..4b564d7 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwCharFmt : public SwFmt
SwCharFmt *pDerivedFrom )
: SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
{}
- SwCharFmt( SwAttrPool& rPool, const String &rFmtName,
+ SwCharFmt( SwAttrPool& rPool, const rtl::OUString &rFmtName,
SwCharFmt *pDerivedFrom )
: SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
{}
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 0f2456b..a8bde29 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -407,7 +407,7 @@ public:
sal_Bool ReadUniStringLine( String& rStr );
/// Read a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE,
/// otherwise read a 16bit length prefixed sequence of bytes and convert from eSrcCharSet
- String ReadUniOrByteString(rtl_TextEncoding eSrcCharSet);
+ rtl::OUString ReadUniOrByteString(rtl_TextEncoding eSrcCharSet);
/// Write a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE,
/// otherwise convert to eSrcCharSet and write a 16bit length prefixed sequence of bytes
SvStream& WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet );
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index b1c939a..ab3703b 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1379,7 +1379,7 @@ SvStream& SvStream::operator<< ( SvStream& rStream )
// -----------------------------------------------------------------------
-String SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet )
+rtl::OUString SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet )
{
// read UTF-16 string directly from stream ?
if (eSrcCharSet == RTL_TEXTENCODING_UNICODE)
commit 34d71c5a08639f6255704be0d4a7df2b6cf6c13f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 22:38:11 2012 +0000
callcatcher: remove newly unused methods and update list
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 34183c5..c8edec0 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -641,7 +641,6 @@ public:
void Scale(sal_Int32& rVal) const;
void Scale(Point& rPos) const;
void Scale(Size& rSiz) const;
- void Scale(Polygon& rPoly) const;
void ScaleEmu(sal_Int32& rVal) const;
sal_uInt32 ScalePt( sal_uInt32 nPt ) const;
sal_Int32 ScalePoint( sal_Int32 nVal ) const;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 713a99d..af17c92 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3265,15 +3265,6 @@ void SvxMSDffManager::Scale( Size& rSiz ) const
}
}
-void SvxMSDffManager::Scale( Polygon& rPoly ) const
-{
- if ( !bNeedMap )
- return;
- sal_uInt16 nPointAnz = rPoly.GetSize();
- for ( sal_uInt16 nPointNum = 0; nPointNum < nPointAnz; nPointNum++ )
- Scale( rPoly[ nPointNum ] );
-}
-
void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const
{
rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv );
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index cb165af..a3dc3c0 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -94,7 +94,6 @@ public:
void SetFromManifest( sal_Bool bValue ) { m_bFromManifest = bValue; }
::rtl::Reference< EncryptionData > GetEncryptionData( bool bWinEncoding = false );
- void SetBaseEncryptionData( const ::rtl::Reference< BaseEncryptionData >& xData );
::com::sun::star::uno::Sequence< sal_Int8 > GetEncryptionKey( bool bWinEncoding = false );
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index b5c0731..483759e 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -228,12 +228,6 @@ sal_Int32 ZipPackageStream::GetBlockSize() const
}
//--------------------------------------------------------------------------
-void ZipPackageStream::SetBaseEncryptionData( const ::rtl::Reference< BaseEncryptionData >& xData )
-{
- m_xBaseEncryptionData = xData;
-}
-
-//--------------------------------------------------------------------------
uno::Sequence< sal_Int8 > ZipPackageStream::GetEncryptionKey( bool bUseWinEncoding )
{
uno::Sequence< sal_Int8 > aResult;
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 9338c11..b3da148 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -93,8 +93,6 @@ public:
const OUString& _rText,
const uno::Reference< i18n::XBreakIterator >& _xBreakIter );
- /** Returns the previously set text. */
- const OUString& GetText() const;
/** Returns a size struct containing the width and height of the text in the current output device. */
const Size& GetTextSize() const;
@@ -279,11 +277,6 @@ void SvtScriptedTextHelper_Impl::SetText( const OUString& _rText, const uno::Ref
CalculateBreaks( _xBreakIter );
}
-const OUString& SvtScriptedTextHelper_Impl::GetText() const
-{
- return maText;
-}
-
const Size& SvtScriptedTextHelper_Impl::GetTextSize() const
{
return maTextSize;
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index 125875c..6f1e8e9 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -202,10 +202,6 @@ class TOOLS_DLLPUBLIC SvPersistStream : public SvStream
virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos );
virtual void FlushData();
protected:
- sal_uIntPtr GetCurMaxIndex( const SvPersistUIdx & ) const;
- sal_uIntPtr GetCurMaxIndex() const
- { return GetCurMaxIndex( aPUIdx ); }
-
void WriteObj( sal_uInt8 nHdr, SvPersistBase * pObj );
sal_uInt32 ReadObj( SvPersistBase * & rpObj,
sal_Bool bRegister );
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index 4956a6a..4c95a6f 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -311,23 +311,6 @@ void SvPersistStream::FlushData()
}
/*************************************************************************
-|* SvPersistStream::GetCurMaxIndex()
-*************************************************************************/
-sal_uIntPtr SvPersistStream::GetCurMaxIndex( const SvPersistUIdx & rIdx ) const
-{
- // const bekomme ich nicht den hoechsten Index
- SvPersistUIdx * p = (SvPersistUIdx *)&rIdx;
- // alten merken
- sal_uIntPtr nCurIdx = p->GetCurIndex();
- p->Last();
- // Bereiche nicht ueberschneiden, deshalb nur groessere Indexe
- sal_uIntPtr nMaxIdx = p->GetCurIndex();
- // wieder herstellen
- p->Seek( nCurIdx );
- return nMaxIdx;
-}
-
-/*************************************************************************
|* SvPersistStream::GetIndex()
*************************************************************************/
sal_uIntPtr SvPersistStream::GetIndex( SvPersistBase * pObj ) const
diff --git a/unusedcode.easy b/unusedcode.easy
index e6668ad..b7e4e92 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,4 @@
(anonymous namespace)::writeU8(WPXBinaryData&, int)
-Button::ImplGetSymbolAlign() const
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsigned short)
CharPosArray::Replace(int const&, unsigned short)
@@ -466,13 +465,7 @@ 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>&)
-XclExpFontBuffer::Insert(ScPatternAttr const&, short, XclExpColorType, bool)
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
-XclExpString::SetFormats(std::__debug::vector<XclFormatRun, std::allocator<XclFormatRun> > const&)
-XclTokenArray::XclTokenArray(std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, bool)
-XclTokenArrayIterator::Init()
-XclXFBase::HasUsedFlags() const
-ZipPackageStream::SetBaseEncryptionData(rtl::Reference<BaseEncryptionData> const&)
_CpyTabFrms::Insert(_CpyTabFrm const&, unsigned short&)
_CpyTabFrms::Insert(_CpyTabFrm const*, unsigned short)
_CpyTabFrms::Insert(_CpyTabFrms const*, unsigned short, unsigned short)
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 2cda341..89d4d8e 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -65,7 +65,6 @@ public:
SAL_DLLPRIVATE void ImplSetFocusRect( const Rectangle &rFocusRect );
SAL_DLLPRIVATE const Rectangle& ImplGetFocusRect() const;
SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign );
- SAL_DLLPRIVATE SymbolAlign ImplGetSymbolAlign() const;
SAL_DLLPRIVATE void ImplSetSmallSymbol( sal_Bool bSmall = sal_True );
SAL_DLLPRIVATE const Rectangle& ImplGetSymbolRect() const;
SAL_DLLPRIVATE void ImplSetSymbolRect(const Rectangle&);
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 2b2f383..fd8d002 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -589,12 +589,6 @@ void Button::ImplSetSymbolAlign( SymbolAlign eAlign )
}
// -----------------------------------------------------------------------
-SymbolAlign Button::ImplGetSymbolAlign() const
-{
- return mpButtonData->meSymbolAlign;
-}
-
-// -----------------------------------------------------------------------
void Button::ImplSetSmallSymbol( sal_Bool bSmall )
{
mpButtonData->mbSmallSymbol = bSmall;
commit 0ad02521c11369777931ce92eea799a409979cba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 22:37:21 2012 +0000
use read_uInt16s_ToOUString instead of hand-crafted loop
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 930de77..50ce3e7 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2390,14 +2390,9 @@ sal_Bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStre
sal_uInt32 i = rContentHd.nRecLen >> 1;
if ( i > n )
{
- String aPre, aSuf;
- sal_Unicode *pTmp = aPre.AllocBuffer( n );
- while ( n-- )
- rSt >> *pTmp++;
+ String aPre = read_uInt16s_ToOUString(rSt, n);
n = (sal_uInt16)( i - 6 );
- pTmp = aSuf.AllocBuffer( n );
- while ( n-- )
- rSt >> *pTmp++;
+ String aSuf = read_uInt16s_ToOUString(rSt, n);
sal_Int32 nV = aSuf.ToInt32();
if ( ( nV == nVersion ) && ( aPre == String( RTL_CONSTASCII_USTRINGPARAM( "___PPT" ) ) ) )
{
commit a18457b29aafc130148dce3fb586c59d6e1f798d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 22:32:52 2012 +0000
use read_uInt16s_ToOUString instead of hand-crafted loop
diff --git a/svtools/source/filter/wmf/winwmf.cxx b/svtools/source/filter/wmf/winwmf.cxx
index 214dd57..43cf34b 100644
--- a/svtools/source/filter/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
@@ -918,9 +918,8 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
if ( ( static_cast< sal_uInt64 >( nStringLen ) * sizeof( sal_Unicode ) ) < ( nEscLen - aMemoryStream.Tell() ) )
{
- sal_Unicode* pBuf = aString.AllocBuffer( (xub_StrLen)nStringLen );
- for (sal_uInt32 i = 0; i < nStringLen; i++ )
- aMemoryStream >> pBuf[ i ];
+
+ aString = read_uInt16s_ToOUString(aMemoryStream, nStringLen);
aMemoryStream >> nDXCount;
if ( ( static_cast< sal_uInt64 >( nDXCount ) * sizeof( sal_Int32 ) ) >= ( nEscLen - aMemoryStream.Tell() ) )
nDXCount = 0;
commit f7db5b2d5f9fa03b4bf5d9275998735ddf65743b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 21:01:27 2012 +0000
replace AllocBuffer in ww8 filter
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 89dd406..84d3752 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -46,6 +46,7 @@
#include <svtools/sfxecode.hxx>
#include <comphelper/docpasswordrequest.hxx>
+#include <comphelper/string.hxx>
#include <hintids.hxx>
#include <editeng/tstpitem.hxx>
@@ -2628,10 +2629,9 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs)
const CharSet eSrcCJKCharSet = bVer67 ? GetCurrentCJKCharSet() :
RTL_TEXTENCODING_MS_1252;
- // (re)alloc UniString data
- String sPlainCharsBuf;
-
- sal_Unicode* pBuffer = sPlainCharsBuf.AllocBuffer(nStrLen);
+ // allocate UniString data
+ rtl_uString *pStr = comphelper::string::rtl_uString_alloc(nStrLen);
+ sal_Unicode* pBuffer = pStr->buffer;
sal_Unicode* pWork = pBuffer;
sal_Char* p8Bits = NULL;
@@ -2666,7 +2666,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs)
if (pStrm->GetError())
{
rPos = WW8_CP_MAX-10; // -> eof or other error
- sPlainCharsBuf.ReleaseBufferAccess( 0 );
+ rtl_freeMemory(pStr);
delete [] p8Bits;
return true;
}
@@ -2714,9 +2714,10 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs)
if (m_bRegardHindiDigits && bBidi && LangUsesHindiNumbers(nCTLLang))
*pBuffer = TranslateToHindiNumbers(*pBuffer);
- sPlainCharsBuf.ReleaseBufferAccess( nEndUsed );
+ pStr->buffer[nEndUsed] = 0;
+ pStr->length = nEndUsed;
- emulateMSWordAddTextToParagraph(sPlainCharsBuf);
+ emulateMSWordAddTextToParagraph(rtl::OUString(pStr, SAL_NO_ACQUIRE));
rPos += nL2;
if (!maApos.back()) //a para end in apo doesn't count
bWasParaEnd = false; //kein CR
commit f1857d76cb4d770fe6e0055bb14fa16e081e93f4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 16:18:34 2012 +0000
SfxStyleSheet needs a default ctor
due to use of ImplInheritanceHelper2 SfxStyleSheet needs a default ctor, though
its never called. rearrange things a little so we can have an empty ctor
without pulling in a bunch of code which is never executed
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index fa669c6..b2d1e4b 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -119,10 +119,10 @@ sal_Bool ScStyleSheet::SetParent( const String& rParentName )
{
sal_Bool bResult = false;
String aEffName = rParentName;
- SfxStyleSheetBase* pStyle = rPool.Find( aEffName, nFamily );
+ SfxStyleSheetBase* pStyle = pPool->Find( aEffName, nFamily );
if (!pStyle)
{
- SfxStyleSheetIterator* pIter = rPool.CreateIterator( nFamily, SFXSTYLEBIT_ALL );
+ SfxStyleSheetIterator* pIter = pPool->CreateIterator( nFamily, SFXSTYLEBIT_ALL );
pStyle = pIter->First();
if (pStyle)
aEffName = pStyle->GetName();
@@ -275,7 +275,7 @@ sal_Bool ScStyleSheet::IsUsed() const
{
// Always query the document to let it decide if a rescan is necessary,
// and store the state.
- ScDocument* pDoc = ((ScStyleSheetPool&)rPool).GetDocument();
+ ScDocument* pDoc = ((ScStyleSheetPool*)pPool)->GetDocument();
if ( pDoc && pDoc->IsStyleSheetUsed( *this, sal_True ) )
eUsage = USED;
else
@@ -303,7 +303,7 @@ void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint )
const String& ScStyleSheet::GetName() const
{
const String& rBase = SfxStyleSheet::GetName();
- const String* pForceStdName = ((ScStyleSheetPool&)rPool).GetForceStdName();
+ const String* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName();
if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
return *pForceStdName;
else
@@ -313,7 +313,7 @@ const String& ScStyleSheet::GetName() const
const String& ScStyleSheet::GetParent() const
{
const String& rBase = SfxStyleSheet::GetParent();
- const String* pForceStdName = ((ScStyleSheetPool&)rPool).GetForceStdName();
+ const String* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName();
if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
return *pForceStdName;
else
@@ -323,7 +323,7 @@ const String& ScStyleSheet::GetParent() const
const String& ScStyleSheet::GetFollow() const
{
const String& rBase = SfxStyleSheet::GetFollow();
- const String* pForceStdName = ((ScStyleSheetPool&)rPool).GetForceStdName();
+ const String* pForceStdName = ((ScStyleSheetPool*)pPool)->GetForceStdName();
if ( pForceStdName && rBase == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
return *pForceStdName;
else
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 373b8d1..d88e2e0 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -209,7 +209,7 @@ sal_Bool SdStyleSheet::SetParent(const String& rParentName)
{
if( rParentName.Len() )
{
- SfxStyleSheetBase* pStyle = rPool.Find(rParentName, nFamily);
+ SfxStyleSheetBase* pStyle = pPool->Find(rParentName, nFamily);
if (pStyle)
{
bResult = sal_True;
@@ -402,7 +402,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
String aRealStyle;
String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
SdStyleSheet* pRealStyle = NULL;
- SdDrawDocument* pDoc = ((SdStyleSheetPool&) rPool).GetDoc();
+ SdDrawDocument* pDoc = ((SdStyleSheetPool*)pPool)->GetDoc();
::sd::DrawViewShell* pDrawViewShell = 0;
@@ -433,7 +433,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
{
// Noch keine Seite vorhanden
// Dieses kann beim Aktualisieren vonDokumentvorlagen vorkommen
- SfxStyleSheetIterator aIter(&rPool, SD_STYLE_FAMILY_MASTERPAGE);
+ SfxStyleSheetIterator aIter(pPool, SD_STYLE_FAMILY_MASTERPAGE);
SfxStyleSheetBase* pSheet = aIter.First();
if( pSheet )
aRealStyle = pSheet->GetName();
@@ -479,12 +479,12 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
}
aRealStyle += aInternalName;
- pRealStyle = static_cast< SdStyleSheet* >( rPool.Find(aRealStyle, SD_STYLE_FAMILY_MASTERPAGE) );
+ pRealStyle = static_cast< SdStyleSheet* >( pPool->Find(aRealStyle, SD_STYLE_FAMILY_MASTERPAGE) );
#ifdef DBG_UTIL
if( !pRealStyle )
{
- SfxStyleSheetIterator aIter(&rPool, SD_STYLE_FAMILY_MASTERPAGE);
+ SfxStyleSheetIterator aIter(pPool, SD_STYLE_FAMILY_MASTERPAGE);
if( aIter.Count() > 0 )
// StyleSheet not found, but pool already loaded
DBG_ASSERT(pRealStyle, "Internal StyleSheet not found");
@@ -540,7 +540,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
}
}
- pPseudoStyle = static_cast<SdStyleSheet*>(rPool.Find(aStyleName, SD_STYLE_FAMILY_PSEUDO));
+ pPseudoStyle = static_cast<SdStyleSheet*>(pPool->Find(aStyleName, SD_STYLE_FAMILY_PSEUDO));
DBG_ASSERT(pPseudoStyle, "PseudoStyleSheet nicht gefunden");
return pPseudoStyle;
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 3cc136a..64f28a5 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -87,7 +87,7 @@ private:
SVL_DLLPRIVATE static SfxStyleSheetBasePool& implGetStaticPool();
protected:
- SfxStyleSheetBasePool& rPool; // zugehoeriger Pool
+ SfxStyleSheetBasePool* pPool; // zugehoeriger Pool
SfxStyleFamily nFamily; // Familie
UniString aName, aParent, aFollow;
@@ -100,12 +100,7 @@ protected:
sal_Bool bMySet; // sal_True: Set loeschen im dtor
- SfxStyleSheetBase() // do not use!
- : comphelper::OWeakTypeObject()
- , rPool( implGetStaticPool() )
- {
- }
- SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool&, SfxStyleFamily eFam, sal_uInt16 mask );
+ SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask );
SfxStyleSheetBase( const SfxStyleSheetBase& );
virtual ~SfxStyleSheetBase();
virtual void Load( SvStream&, sal_uInt16 );
@@ -140,7 +135,7 @@ public:
virtual UniString GetDescription();
virtual UniString GetDescription( SfxMapUnit eMetric );
- SfxStyleSheetBasePool& GetPool() { return rPool; }
+ SfxStyleSheetBasePool& GetPool() { return *pPool; }
SfxStyleFamily GetFamily() const { return nFamily; }
sal_uInt16 GetMask() const { return nMask; }
void SetMask( sal_uInt16 mask) { nMask = mask; }
@@ -289,7 +284,12 @@ public:
virtual sal_Bool SetParent( const UniString& );
protected:
- SfxStyleSheet() {} // do not use! needed by MSVC
+ SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2
+ : SfxStyleSheetBase(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dummy")),
+ NULL, SFX_STYLE_FAMILY_ALL, 0)
+ {
+ assert(false);
+ }
virtual ~SfxStyleSheet();
};
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 2b38080..120a09a 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -109,8 +109,8 @@ class SfxStyleSheetBasePool_Impl
// Konstruktoren
-SfxStyleSheetBase::SfxStyleSheetBase( const XubString& rName, SfxStyleSheetBasePool& r, SfxStyleFamily eFam, sal_uInt16 mask )
- : rPool( r )
+SfxStyleSheetBase::SfxStyleSheetBase( const XubString& rName, SfxStyleSheetBasePool* p, SfxStyleFamily eFam, sal_uInt16 mask )
+ : pPool( p )
, nFamily( eFam )
, aName( rName )
, aParent()
@@ -127,7 +127,7 @@ SfxStyleSheetBase::SfxStyleSheetBase( const XubString& rName, SfxStyleSheetBaseP
SfxStyleSheetBase::SfxStyleSheetBase( const SfxStyleSheetBase& r )
: comphelper::OWeakTypeObject()
- , rPool( r.rPool )
+ , pPool( r.pPool )
, nFamily( r.nFamily )
, aName( r.aName )
, aParent( r.aParent )
@@ -146,19 +146,6 @@ SfxStyleSheetBase::SfxStyleSheetBase( const SfxStyleSheetBase& r )
pSet = NULL;
}
-SfxStyleSheetBasePool& SfxStyleSheetBase::implGetStaticPool()
-{
- static SfxStyleSheetBasePool* pSheetPool = 0;
- static SfxItemPool* pBasePool = 0;
- if( !pSheetPool )
- {
- UniString aName;
- pBasePool = new SfxItemPool( aName, 0, 0, 0 );
- pSheetPool = new SfxStyleSheetBasePool(*pBasePool);
- }
- return *pSheetPool;
-}
-
SfxStyleSheetBase::~SfxStyleSheetBase()
{
#ifdef DBG_UTIL
@@ -191,22 +178,22 @@ sal_Bool SfxStyleSheetBase::SetName( const XubString& rName )
if( aName != rName )
{
String aOldName = aName;
- SfxStyleSheetBase *pOther = rPool.Find( rName, nFamily ) ;
+ SfxStyleSheetBase *pOther = pPool->Find( rName, nFamily ) ;
if ( pOther && pOther != this )
return sal_False;
- SfxStyleFamily eTmpFam=rPool.GetSearchFamily();
- sal_uInt16 nTmpMask=rPool.GetSearchMask();
+ SfxStyleFamily eTmpFam = pPool->GetSearchFamily();
+ sal_uInt16 nTmpMask = pPool->GetSearchMask();
- rPool.SetSearchMask(nFamily);
+ pPool->SetSearchMask(nFamily);
if ( aName.Len() )
- rPool.ChangeParent( aName, rName, sal_False );
+ pPool->ChangeParent( aName, rName, sal_False );
if ( aFollow.Equals( aName ) )
aFollow = rName;
aName = rName;
- rPool.SetSearchMask(eTmpFam, nTmpMask);
- rPool.Broadcast( SfxStyleSheetHintExtended(
+ pPool->SetSearchMask(eTmpFam, nTmpMask);
+ pPool->Broadcast( SfxStyleSheetHintExtended(
SFX_STYLESHEET_MODIFIED, aOldName, *this ) );
}
return sal_True;
@@ -243,7 +230,7 @@ sal_Bool SfxStyleSheetBase::SetParent( const XubString& rName )
if( aParent != rName )
{
- SfxStyleSheetBase* pIter = rPool.Find(rName, nFamily);
+ SfxStyleSheetBase* pIter = pPool->Find(rName, nFamily);
if( rName.Len() && !pIter )
{
OSL_FAIL( "StyleSheet-Parent nicht gefunden" );
@@ -255,11 +242,11 @@ sal_Bool SfxStyleSheetBase::SetParent( const XubString& rName )
{
if(pIter->GetName() == aName)
return sal_False;
- pIter = rPool.Find(pIter->GetParent(), nFamily);
+ pIter = pPool->Find(pIter->GetParent(), nFamily);
}
aParent = rName;
}
- rPool.Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
+ pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
return sal_True;
}
@@ -274,14 +261,14 @@ sal_Bool SfxStyleSheetBase::SetFollow( const XubString& rName )
{
if( aFollow != rName )
{
- if( !rPool.Find( rName, nFamily ) )
+ if( !pPool->Find( rName, nFamily ) )
{
OSL_FAIL( "StyleSheet-Follow nicht gefunden" );
return sal_False;
}
aFollow = rName;
}
- rPool.Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
+ pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
return sal_True;
}
@@ -291,7 +278,7 @@ SfxItemSet& SfxStyleSheetBase::GetItemSet()
{
if( !pSet )
{
- pSet = new SfxItemSet( rPool.GetPool() );
+ pSet = new SfxItemSet( pPool->GetPool() );
bMySet = sal_True;
}
return *pSet;
@@ -362,7 +349,7 @@ XubString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric )
XubString aItemPresentation;
if ( !IsInvalidItem( pItem ) &&
- rPool.GetPool().GetPresentation(
+ pPool->GetPool().GetPresentation(
*pItem, SFX_ITEM_PRESENTATION_COMPLETE,
eMetric, aItemPresentation, &aIntlWrapper ) )
{
@@ -647,7 +634,7 @@ SfxStyleSheetBase* SfxStyleSheetBasePool::Create
sal_uInt16 mask
)
{
- return new SfxStyleSheetBase( rName, *this, eFam, mask );
+ return new SfxStyleSheetBase( rName, this, eFam, mask );
}
SfxStyleSheetBase* SfxStyleSheetBasePool::Create( const SfxStyleSheetBase& r )
@@ -869,7 +856,7 @@ SfxStyleSheet::SfxStyleSheet(const XubString &rName,
const SfxStyleSheetBasePool& r_Pool,
SfxStyleFamily eFam,
sal_uInt16 mask ):
- SfxStyleSheetBase(rName, const_cast< SfxStyleSheetBasePool& >( r_Pool ), eFam, mask)
+ SfxStyleSheetBase(rName, const_cast< SfxStyleSheetBasePool* >( &r_Pool ), eFam, mask)
{}
SfxStyleSheet::SfxStyleSheet(const SfxStyleSheet& rStyle) :
@@ -893,14 +880,14 @@ sal_Bool SfxStyleSheet::SetParent( const XubString& rName )
// aus der Benachrichtigungskette des alten
// Parents gfs. austragen
if(aOldParent.Len()) {
- SfxStyleSheet *pParent = (SfxStyleSheet *)rPool.Find(aOldParent, nFamily, 0xffff);
+ SfxStyleSheet *pParent = (SfxStyleSheet *)pPool->Find(aOldParent, nFamily, 0xffff);
if(pParent)
EndListening(*pParent);
}
// in die Benachrichtigungskette des neuen
// Parents eintragen
if(aParent.Len()) {
- SfxStyleSheet *pParent = (SfxStyleSheet *)rPool.Find(aParent, nFamily, 0xffff);
+ SfxStyleSheet *pParent = (SfxStyleSheet *)pPool->Find(aParent, nFamily, 0xffff);
if(pParent)
StartListening(*pParent);
}
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 1ad7631..7a32215 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -93,7 +93,7 @@ protected:
public:
SwDocStyleSheet( SwDoc& rDoc,
const String& rName,
- SwDocStyleSheetPool& rPool,
+ SwDocStyleSheetPool* pPool,
SfxStyleFamily eFam,
sal_uInt16 nMask);
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 0cbf32e..810021d 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -386,7 +386,7 @@ void SwPoolFmtList::Erase()
SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument,
const String& rName,
- SwDocStyleSheetPool& _rPool,
+ SwDocStyleSheetPool* _rPool,
SfxStyleFamily eFam,
sal_uInt16 _nMask) :
@@ -612,7 +612,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
{
String aItemPresentation;
if ( !IsInvalidItem( pItem ) &&
- rPool.GetPool().GetPresentation(
+ pPool->GetPool().GetPresentation(
*pItem, SFX_ITEM_PRESENTATION_COMPLETE,
eUnit, aItemPresentation, &aIntlWrapper ) )
{
@@ -660,7 +660,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
{
String aItemPresentation;
if ( !IsInvalidItem( pItem ) &&
- rPool.GetPool().GetPresentation(
+ pPool->GetPool().GetPresentation(
*pItem, SFX_ITEM_PRESENTATION_COMPLETE,
eUnit, aItemPresentation, &aIntlWrapper ) )
{
@@ -868,8 +868,8 @@ sal_Bool SwDocStyleSheet::SetName( const String& rStr)
if( bChg )
{
- rPool.First(); // internal list has to be updated
- rPool.Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
+ pPool->First(); // internal list has to be updated
+ pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
SwEditShell* pSh = rDoc.GetEditShell();
if( pSh )
pSh->CallChgLnk();
@@ -924,7 +924,7 @@ sal_Bool SwDocStyleSheet::SetParent( const String& rStr)
if( bRet )
{
aParent = rStr;
- rPool.Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED,
+ pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED,
*this ) );
}
}
@@ -2019,7 +2019,7 @@ void SwDocStyleSheet::SetHelpId( const String& r, sal_uLong nId )
SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, sal_Bool bOrg )
: SfxStyleSheetBasePool( rDocument.GetAttrPool() )
-, mxStyleSheet( new SwDocStyleSheet( rDocument, aEmptyStr, *this, SFX_STYLE_FAMILY_CHAR, 0 ) )
+, mxStyleSheet( new SwDocStyleSheet( rDocument, aEmptyStr, this, SFX_STYLE_FAMILY_CHAR, 0 ) )
, rDoc( rDocument )
{
bOrganizer = bOrg;
@@ -2378,8 +2378,8 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const String& rName,
SwStyleSheetIterator::SwStyleSheetIterator( SwDocStyleSheetPool* pBase,
SfxStyleFamily eFam, sal_uInt16 n )
: SfxStyleSheetIterator( pBase, eFam, n ),
- mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, *pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ),
- mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, *pBase, SFX_STYLE_FAMILY_CHAR, 0 ) )
+ mxIterSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) ),
+ mxStyleSheet( new SwDocStyleSheet( pBase->GetDoc(), aEmptyStr, pBase, SFX_STYLE_FAMILY_CHAR, 0 ) )
{
bFirstCalled = sal_False;
nLastPos = 0;
commit cb5bd5a1aea6bb26efa664f5757136915a59f254
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 16:13:32 2012 +0000
PolyPolygonStrokeArrowPrimitive2D cannot be instantiated
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index 7862ae2..f222fb4 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
@@ -66,46 +66,45 @@
#define PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 22)
#define PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 23)
#define PRIMITIVE2D_ID_POLYPOLYGONSTROKEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 24)
-#define PRIMITIVE2D_ID_POLYPOLYGONSTROKEARROWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 25)
-#define PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 26)
-#define PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 27)
-#define PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 28)
-#define PRIMITIVE2D_ID_POLYPOLYGONBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 29)
-#define PRIMITIVE2D_ID_SCENEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 30)
-#define PRIMITIVE2D_ID_SHADOWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 31)
-#define PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 32)
-#define PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 33)
-#define PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 34)
-#define PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 35)
-#define PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 36)
-#define PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 37)
-#define PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 38)
-#define PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 39)
-#define PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 40)
-#define PRIMITIVE2D_ID_TEXTHIERARCHYEDITPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 41)
-#define PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 42)
-#define PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 43)
-#define PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 44)
-#define PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 45)
-#define PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 46)
-#define PRIMITIVE2D_ID_EXECUTEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 47)
-#define PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 48)
-#define PRIMITIVE2D_ID_CHARTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 49)
-#define PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 50)
-#define PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 51)
-#define PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 52)
-#define PRIMITIVE2D_ID_HITTESTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 53)
-#define PRIMITIVE2D_ID_INVERTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 54)
-#define PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 55)
-#define PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 56)
-#define PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 57)
-#define PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 58)
-#define PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 59)
-#define PRIMITIVE2D_ID_EPSPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 60)
-#define PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 61)
-#define PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 62)
-#define PRIMITIVE2D_ID_CLIPPEDBORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 63)
-#define PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 64)
+#define PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 25)
+#define PRIMITIVE2D_ID_POLYPOLYGONGRADIENTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 26)
+#define PRIMITIVE2D_ID_POLYPOLYGONHATCHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 27)
+#define PRIMITIVE2D_ID_POLYPOLYGONBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 28)
+#define PRIMITIVE2D_ID_SCENEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 29)
+#define PRIMITIVE2D_ID_SHADOWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 30)
+#define PRIMITIVE2D_ID_TEXTSIMPLEPORTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 31)
+#define PRIMITIVE2D_ID_TEXTDECORATEDPORTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 32)
+#define PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 33)
+#define PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 34)
+#define PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 35)
+#define PRIMITIVE2D_ID_TEXTHIERARCHYFIELDPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 36)
+#define PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 37)
+#define PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 38)
+#define PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 39)
+#define PRIMITIVE2D_ID_TEXTHIERARCHYEDITPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 40)
+#define PRIMITIVE2D_ID_POLYGONWAVEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 41)
+#define PRIMITIVE2D_ID_WRONGSPELLPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 42)
+#define PRIMITIVE2D_ID_TEXTEFFECTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 43)
+#define PRIMITIVE2D_ID_TEXTHIERARCHYBULLETPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 44)
+#define PRIMITIVE2D_ID_POLYPOLYGONHAIRLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 45)
+#define PRIMITIVE2D_ID_EXECUTEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 46)
+#define PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 47)
+#define PRIMITIVE2D_ID_CHARTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 48)
+#define PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 49)
+#define PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 50)
+#define PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 51)
+#define PRIMITIVE2D_ID_HITTESTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 52)
+#define PRIMITIVE2D_ID_INVERTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 53)
+#define PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 54)
+#define PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 55)
+#define PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 56)
+#define PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 57)
+#define PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 58)
+#define PRIMITIVE2D_ID_EPSPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 59)
+#define PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 60)
+#define PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 61)
+#define PRIMITIVE2D_ID_CLIPPEDBORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 62)
+#define PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 63)
//////////////////////////////////////////////////////////////////////////////
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index bc292ed..f25a625 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -202,47 +202,6 @@ namespace drawinglayer
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
-// PolyPolygonStrokeArrowPrimitive2D class
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
- /** PolyPolygonStrokePrimitive2D class
-
- This primitive defines a multi-PolygonStrokeArrowPrimitive2D and is
- just for convenience. The definition is not different from the single
- defined PolygonStrokeArrowPrimitive2Ds.
- */
- class DRAWINGLAYER_DLLPUBLIC PolyPolygonStrokeArrowPrimitive2D : public PolyPolygonStrokePrimitive2D
- {
- private:
- /// geometric definitions for line start and end
- attribute::LineStartEndAttribute maStart;
- attribute::LineStartEndAttribute maEnd;
-
- protected:
- /// local decomposition.
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
-
- public:
- /// data read access
- const attribute::LineStartEndAttribute& getStart() const { return maStart; }
- const attribute::LineStartEndAttribute& getEnd() const { return maEnd; }
-
- /// compare operator
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
-
- /// get range
- virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const;
-
- /// provide unique ID
- DeclPrimitrive2DIDBlock()
- };
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-//////////////////////////////////////////////////////////////////////////////
// PolyPolygonColorPrimitive2D class
namespace drawinglayer
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index 73ec529..56ca47f 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -260,82 +260,6 @@ namespace drawinglayer
{
namespace primitive2d
{
- Primitive2DSequence PolyPolygonStrokeArrowPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
- {
- const basegfx::B2DPolyPolygon aPolyPolygon(getB2DPolyPolygon());
- const sal_uInt32 nCount(aPolyPolygon.count());
-
- if(nCount)
- {
- Primitive2DSequence aRetval(nCount);
-
- for(sal_uInt32 a(0L); a < nCount; a++)
- {
- const basegfx::B2DPolygon aPolygon(aPolyPolygon.getB2DPolygon(a));
-
- if(aPolygon.isClosed())
- {
- // no need for PolygonStrokeArrowPrimitive2D when polygon is closed
- aRetval[a] = Primitive2DReference(
- new PolygonStrokePrimitive2D(aPolygon, getLineAttribute(), getStrokeAttribute()));
- }
- else
- {
- aRetval[a] = Primitive2DReference(
- new PolygonStrokeArrowPrimitive2D(aPolygon, getLineAttribute(),
- getStrokeAttribute(), getStart(), getEnd()));
- }
- }
-
- return aRetval;
- }
- else
- {
- return Primitive2DSequence();
- }
- }
-
- bool PolyPolygonStrokeArrowPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
- {
- if(PolyPolygonStrokePrimitive2D::operator==(rPrimitive))
- {
- const PolyPolygonStrokeArrowPrimitive2D& rCompare = (PolyPolygonStrokeArrowPrimitive2D&)rPrimitive;
-
- return (getStart() == rCompare.getStart()
- && getEnd() == rCompare.getEnd());
- }
-
- return false;
- }
-
- basegfx::B2DRange PolyPolygonStrokeArrowPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
- {
- basegfx::B2DRange aRetval;
-
- if(getStart().isActive() || getEnd().isActive())
- {
- // use decomposition when line start/end is used
- return BufferedDecompositionPrimitive2D::getB2DRange(rViewInformation);
- }
- else
- {
- // get range from parent
- return PolyPolygonStrokePrimitive2D::getB2DRange(rViewInformation);
- }
- }
-
- // provide unique ID
- ImplPrimitrive2DIDBlock(PolyPolygonStrokeArrowPrimitive2D, PRIMITIVE2D_ID_POLYPOLYGONSTROKEARROWPRIMITIVE2D)
-
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-//////////////////////////////////////////////////////////////////////////////
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
PolyPolygonColorPrimitive2D::PolyPolygonColorPrimitive2D(
const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::BColor& rBColor)
commit e6bc67afc2f812dc5c61fad644c9b6f3f501a738
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 14:33:17 2012 +0000
WaE: unused variable
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index af907bc..397de51 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -949,8 +949,6 @@ namespace
return ::rtl::OUString();
}
-
-
void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescriptor)
{
// try to seek to 0 ...
@@ -965,15 +963,16 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript
{
xSeek->seek(0);
}
- catch(const css::uno::RuntimeException& exRun)
- { throw; }
+ catch(const css::uno::RuntimeException&)
+ {
+ throw;
+ }
catch(const css::uno::Exception&)
- {}
+ {
+ }
}
}
-
-
::rtl::OUString TypeDetection::impl_askDetectService(const ::rtl::OUString& sDetectService,
::comphelper::MediaDescriptor& rDescriptor )
{
commit 76c7fa90a817350d2cfc0467890a9237f736258c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 14:02:17 2012 +0000
remove dangling legacy binary-compatible between-milestons temp hack nonsense
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 5fe0d0b..3cc136a 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -80,8 +80,6 @@ SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) from:
SfxStyleSheetBasePool::Clear()
*/
-#define VIRTUAL510 virtual
-
class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject
{
private:
More information about the Libreoffice-commits
mailing list