[Libreoffice-commits] .: 9 commits - automation/source cui/source dbaccess/source editeng/source filter/source forms/source lotuswordpro/source sc/source sd/Library_sdfilt.mk sd/source sfx2/source svtools/source svx/source sw/source tools/inc tools/source unotools/inc unotools/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Aug 12 03:51:42 PDT 2011
automation/source/testtool/objtest.cxx | 4 -
cui/source/options/optfltr.cxx | 47 ++++++++---------
dbaccess/source/ui/browser/exsrcbrw.cxx | 7 +-
editeng/source/editeng/editdbg.cxx | 2
filter/source/msfilter/escherex.cxx | 4 -
forms/source/component/DatabaseForm.cxx | 4 -
lotuswordpro/source/filter/lwpfootnote.cxx | 10 ---
lotuswordpro/source/filter/lwpfootnote.hxx | 1
lotuswordpro/source/filter/lwpfoundry.cxx | 24 --------
lotuswordpro/source/filter/lwpfoundry.hxx | 1
lotuswordpro/source/filter/lwpmarker.cxx | 5 -
lotuswordpro/source/filter/lwpmarker.hxx | 1
lotuswordpro/source/filter/lwpobjfactory.cxx | 9 ---
lotuswordpro/source/filter/lwppara.cxx | 17 ------
lotuswordpro/source/filter/lwppara.hxx | 5 -
lotuswordpro/source/filter/lwppara1.cxx | 13 ----
lotuswordpro/source/filter/lwptable.cxx | 48 -----------------
lotuswordpro/source/filter/lwptable.hxx | 46 ----------------
lotuswordpro/source/filter/lwpuidoc.cxx | 5 -
lotuswordpro/source/filter/lwpuidoc.hxx | 1
lotuswordpro/source/filter/lwpverdocument.cxx | 5 -
lotuswordpro/source/filter/lwpverdocument.hxx | 1
sc/source/filter/excel/excimp8.cxx | 8 +-
sc/source/filter/excel/expop2.cxx | 10 +--
sc/source/filter/excel/xestring.cxx | 4 -
sc/source/filter/excel/xiescher.cxx | 16 ++---
sc/source/filter/xcl97/xcl97rec.cxx | 21 +++----
sd/Library_sdfilt.mk | 12 ----
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/filter/ppt/pptin.cxx | 25 ++++-----
sd/source/filter/sdpptwrp.cxx | 29 ++++------
sfx2/source/dialog/alienwarn.cxx | 16 +----
sfx2/source/dialog/alienwarn.hrc | 2
sfx2/source/dialog/alienwarn.src | 4 -
svtools/source/graphic/grfcache.cxx | 11 ----
svtools/source/graphic/grfcache.hxx | 1
svx/source/dialog/docrecovery.cxx | 11 ----
svx/source/dialog/frmsel.cxx | 5 -
svx/source/inc/docrecovery.hxx | 8 --
svx/source/inc/frmselimpl.hxx | 1
sw/source/filter/ww8/wrtww8.cxx | 12 ++--
sw/source/filter/ww8/ww8par.cxx | 32 +++++------
sw/source/filter/ww8/ww8par3.cxx | 12 ++--
sw/source/filter/ww8/ww8par5.cxx | 4 -
sw/source/ui/app/docsh.cxx | 6 +-
tools/inc/tools/string.hxx | 15 ++---
tools/source/inet/inetmime.cxx | 16 ++---
tools/source/string/strcvt.cxx | 56 --------------------
unotools/inc/unotools/fltrcfg.hxx | 5 -
unotools/source/config/fltrcfg.cxx | 17 ++++--
unusedcode.easy | 71 --------------------------
51 files changed, 150 insertions(+), 542 deletions(-)
New commits:
commit 5891d6e3141ab74876c282a1d3e7dfd7de4a924b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 12 11:50:38 2011 +0100
update list, ditch newbies
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index 6229d44..6ab8c21 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -347,11 +347,6 @@ OUString LwpBookMark::GetName()
return OUString(A2OUSTR(""));
}
-sal_Bool LwpBookMark::IsRightName(OUString sName)
-{
- return sName.equals(GetName());
-}
-
LwpFieldMark::LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
: LwpStoryMarker(objHdr,pStrm)
, m_nExtra(0)
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index 3b78bca..276d28f 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -184,7 +184,6 @@ protected:
public:
sal_Bool IsRightMarker(LwpObjectID objMarker);
OUString GetName();
- sal_Bool IsRightName(OUString sName);
private:
enum { BKMK_NOTESFX = 0x0001,
BKMK_OLDNOTESFX = 0x0002
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 82ef6e3..e4e996e 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -820,17 +820,6 @@ void GraphicCache::SetCacheTimeout( sal_uLong nTimeoutSeconds )
// -----------------------------------------------------------------------------
-void GraphicCache::ClearDisplayCache()
-{
- for( void* pObj = maDisplayCache.First(); pObj; pObj = maDisplayCache.Next() )
- delete (GraphicDisplayCacheEntry*) pObj;
-
- maDisplayCache.Clear();
- mnUsedDisplaySize = 0UL;
-}
-
-// -----------------------------------------------------------------------------
-
sal_Bool GraphicCache::IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr ) const
{
diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx
index cfa946f..62b4ee3 100644
--- a/svtools/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.hxx
@@ -91,7 +91,6 @@ public:
void SetCacheTimeout( sal_uLong nTimeoutSeconds );
sal_uLong GetCacheTimeout() const { return mnReleaseTimeoutSeconds; }
- void ClearDisplayCache();
sal_Bool IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr ) const;
sal_Bool IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz,
diff --git a/unusedcode.easy b/unusedcode.easy
index 1ebf4e0..81b2b6d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -292,12 +292,6 @@ GraphicConverter::ImplConvert(unsigned long, void*, unsigned long, void**, unsig
GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const
GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const
GraphicHelper::getDeviceInfo() const
-GraphicManager::ClearCache()
-GraphicManager::GetCacheTimeout() const
-GraphicManager::GetFreeCacheSize() const
-GraphicManager::GetMaxCacheSize() const
-GraphicManager::GetMaxObjCacheSize() const
-GraphicManager::GetUsedCacheSize() const
GraphicObject::GetChecksum() const
GraphicObject::GetSwapStreamHdl() const
GraphicObject::GraphicObject(Graphic const&, String const&, GraphicManager const*)
@@ -1466,30 +1460,6 @@ SvtModuleOptions::GetFactoryWindowAttributes(SvtModuleOptions::EFactory) const
SvtModuleOptions::GetFeatures() const
SvtModuleOptions::GetModuleName(SvtModuleOptions::EFactory) const
SvtModuleOptions::SetFactoryWindowAttributes(SvtModuleOptions::EFactory, rtl::OUString const&)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperBottomMargin(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperHeight(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperLeftMargin(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperRightMargin(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperTopMargin(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperWidth(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetOverlayBuffer(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_Calc(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_DrawImpress(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_Writer(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetPaintBuffer(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetPaintBuffer_Calc(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetPaintBuffer_DrawImpress(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetPaintBuffer_Writer(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetQuadratic3DRenderLimit(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetQuadraticFormControlRenderLimit(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetRenderDecoratedTextDirect(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetRenderSimpleTextDirect(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetSelectionMaximumLuminancePercent(unsigned short)
-SvtOptionsDrawinglayer_Impl::SetSnapHorVerLinesToDiscrete(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetSolidDragCreate(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetStripeColorA(Color)
-SvtOptionsDrawinglayer_Impl::SetStripeColorB(Color)
-SvtOptionsDrawinglayer_Impl::SetStripeLength(unsigned short)
SvtPathOptions::GetPath(SvtPathOptions::Pathes) const
SvtPathOptions::IsPathReadonly(SvtPathOptions::Pathes) const
SvtPathOptions::SetPath(SvtPathOptions::Pathes, String const&)
@@ -2465,6 +2435,7 @@ binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const*, unsigned short)
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccessArr const*, unsigned short, unsigned short)
binfilter::SdrUnoControlAccessArr::Remove(binfilter::SdrUnoControlAccess* const&, unsigned short)
+binfilter::SfxConfigManagerImExport_Impl::Export(SotStorage*, SotStorage*)
binfilter::SfxDocumentInfo::SavePropertySet(binfilter::SvStorage*) const
binfilter::SfxHintPoster::LinkStubDoEvent_Impl(void*, void*)
binfilter::SfxItemModifyArr_Impl::Insert(binfilter::SfxItemModifyArr_Impl const*, unsigned short, unsigned short, unsigned short)
@@ -2520,7 +2491,6 @@ binfilter::SvBytes::Replace(unsigned char const*, unsigned short, unsigned short
binfilter::SvBytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
binfilter::SvDataPipe_Impl::addMark(unsigned int)
binfilter::SvDataPipe_Impl::removeMark(unsigned int)
-binfilter::SvFactory::GetSvClass(int, SvGlobalName const&)
binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMapEntry_Impl* const&, unsigned short&)
binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMapEntry_Impl* const*, unsigned short)
binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMap_Impl const*, unsigned short, unsigned short)
@@ -2602,7 +2572,6 @@ binfilter::Sw3Bytes::Replace(unsigned char const*, unsigned short, unsigned shor
binfilter::Sw3Bytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
binfilter::Sw3IoImp::ExportTxtAttrs(binfilter::Sw3ExportTxtAttrs const*, unsigned short, unsigned short)
binfilter::Sw3IoImp::ExportTxtNode(binfilter::SwTxtNode const&, unsigned short, unsigned short, unsigned short, binfilter::SwInsHardBlankSoftHyph&)
-binfilter::Sw3IoImp::FindFlyFrm(unsigned long)
binfilter::Sw3Marks::GetPos(binfilter::Sw3Mark const*) const
binfilter::Sw3Marks::Insert(binfilter::Sw3Mark*)
binfilter::Sw3Marks::Remove(binfilter::Sw3Mark*)
@@ -2644,16 +2613,10 @@ binfilter::SwOLELRUCache::Remove(binfilter::SwOLEObj&)
binfilter::SwOutlineNodes::Insert(binfilter::SwNode* const&, unsigned short&)
binfilter::SwOutlineNodes::Insert(binfilter::SwNode* const*, unsigned short)
binfilter::SwOutlineNodes::Insert(binfilter::SwOutlineNodes const*, unsigned short, unsigned short)
-binfilter::SwPosFlyFrm::SwPosFlyFrm(binfilter::SwNodeIndex const&, binfilter::SwFrmFmt const*, unsigned short)
-binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const&)
-binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const&, unsigned short&)
-binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const*, unsigned short)
-binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrms const*, unsigned short, unsigned short)
-binfilter::SwPosFlyFrms::Remove(binfilter::SwPosFlyFrm* const&, unsigned short)
-binfilter::SwPosFlyFrms::Remove(unsigned short, unsigned short)
binfilter::SwRects::Replace(binfilter::SwRect const&, unsigned short)
binfilter::SwRects::Replace(binfilter::SwRect const*, unsigned short, unsigned short)
binfilter::SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SwRect const&, void*), void*)
+binfilter::SwRootFrm::SwRootFrm(binfilter::SwFrmFmt*, binfilter::ViewShell*)
binfilter::SwRubyList::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SwSelBoxes::Insert(binfilter::SwTableBox* const&, unsigned short&)
binfilter::SwSelBoxes::Remove(binfilter::SwTableBox* const&, unsigned short)
commit 55d2e9992a75a8434aff3983e7ef93b37ea91032
Author: Josh Heidenreich <josh.sickmate at gmail.com>
Date: Fri Aug 12 10:30:53 2011 +0100
This one changes the button text and dialog header.
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index c9e95bd..4dfb052 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -165,21 +165,13 @@ void SfxAlienWarningDialog::InitSize()
// recalculate the size and position of the buttons
m_aMoreInfoBtn.Hide();
nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() );
- long nTemp = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() );
- if ( nTemp > nTxtW )
- nTxtW = nTemp;
nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
- Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT );
- Point aPos = m_aKeepCurrentBtn.GetPosPixel();
- aPos.X() = ( aNewSize.Width() - (2*nTxtW) - a3Size.Width() ) / 2;
- long nDefX = m_aWarningOnBox.GetPosPixel().X();
- if ( nDefX < aPos.X() )
- aPos.X() = nDefX;
aNewSize = m_aKeepCurrentBtn.GetSizePixel();
aNewSize.Width() = nTxtW;
- m_aKeepCurrentBtn.SetPosSizePixel( aPos, aNewSize );
- aPos.X() += nTxtW + a3Size.Width();
- m_aSaveODFBtn.SetPosSizePixel( aPos, aNewSize );
+ m_aKeepCurrentBtn.SetSizePixel( aNewSize );
+ Point aPos = m_aSaveODFBtn.GetPosPixel();
+ aPos.X() = AW_COL_3 + nTxtW;
+ m_aSaveODFBtn.SetPosPixel( aPos );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/alienwarn.hrc b/sfx2/source/dialog/alienwarn.hrc
index 9183daf..2b5ac2b 100755
--- a/sfx2/source/dialog/alienwarn.hrc
+++ b/sfx2/source/dialog/alienwarn.hrc
@@ -42,7 +42,7 @@
// --------- general metrics ---------
#define SYMBOL_EDGE 20
-#define DIALOG_WIDTH 270
+#define DIALOG_WIDTH 250
#define INFO_TEXT_LINES 11
#define AW_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
diff --git a/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src
index f4f77b4..0ba3f59 100644
--- a/sfx2/source/dialog/alienwarn.src
+++ b/sfx2/source/dialog/alienwarn.src
@@ -38,7 +38,7 @@ ModalDialog RID_DLG_ALIEN_WARNING
Moveable = TRUE;
SVLook = TRUE;
- Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION";
+ Text = "Save";
FixedImage FI_QUERY
{
@@ -65,7 +65,7 @@ ModalDialog RID_DLG_ALIEN_WARNING
{
Pos = MAP_APPFONT( AW_COL_3, AW_ROW_2 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
- Text [ en-US ] = "Use Default ~ODF Format";
+ Text [ en-US ] = "Use ~ODF Format";
};
HelpButton PB_MOREINFO
{
commit 58ee09b87b11a6a6b56a06f772214e8835810bd3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 12 10:17:16 2011 +0100
ByteString, shrink api
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 5fb34f0..78a2928 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -445,8 +445,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d
if (i >= 0)
{
sPath = sPath.copy(0, i);
- ByteString bsPath( sPath.getStr(), sPath.getLength(),
- RTL_TEXTENCODING_UTF8 );
+ ByteString bsPath( rtl::OUStringToOString(sPath,
+ RTL_TEXTENCODING_UTF8) );
aConf.SetGroup( "OOoProgramDir" );
String aOPD;
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 898f78c..a77874d 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -40,6 +40,7 @@
#include "dbustrings.hrc"
#include "dbu_reghelper.hxx"
#include <tools/diagnose_ex.h>
+#include <rtl/strbuf.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
@@ -211,11 +212,9 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
if (xNewColProperties->hasPropertyByName(pControlProps->Name))
xNewCol->setPropertyValue(pControlProps->Name, pControlProps->Value);
}
- catch(Exception&)
+ catch (const Exception&)
{
- OSL_FAIL(( ByteString("SbaExternalSourceBrowser::dispatch : could not set a column property (")
- += ByteString(pControlProps->Name.getStr(), (sal_uInt16)pControlProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US)
- += ByteString(")!")).GetBuffer());
+ OSL_FAIL(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("SbaExternalSourceBrowser::dispatch : could not set a column property (")).append(rtl::OUStringToOString(pControlProps->Name, RTL_TEXTENCODING_ASCII_US)).append(RTL_CONSTASCII_STRINGPARAM(")!")).getStr());
}
}
}
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 9ac1019..c09e9f6 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2189,9 +2189,9 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
aArgs.getArray()[0].Value <<= aReferer;
// build a sequence from the to-be-submitted string
- ByteString a8BitData(aData.getStr(), (sal_uInt16)aData.getLength(), _eEncoding);
+ rtl::OString a8BitData(rtl::OUStringToOString(aData, _eEncoding));
// always ANSI #58641
- Sequence< sal_Int8 > aPostData((sal_Int8*)a8BitData.GetBuffer(), a8BitData.Len());
+ Sequence< sal_Int8 > aPostData((const sal_Int8*)a8BitData.getStr(), a8BitData.getLength());
Reference< XInputStream > xPostData = new SequenceInputStream(aPostData);
aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") );
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index 74117e6..8647c21 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -177,8 +177,8 @@ void XclExpString::AppendByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc )
}
else
{
- ByteString aByteStr( &cChar, 1, eTextEnc ); // length may be >1
- BuildAppend( aByteStr.GetBuffer(), aByteStr.Len() );
+ rtl::OString aByteStr( &cChar, 1, eTextEnc ); // length may be >1
+ BuildAppend( aByteStr.getStr(), aByteStr.getLength() );
}
}
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 296dc29..1141cd3 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -167,6 +167,12 @@ private:
ByteString( const int* pDummy ); // not implemented: to prevent ByteString( NULL )
ByteString(int); // not implemented; to detect misuses
// of ByteString(sal_Char);
+ ByteString( const UniString& rUniStr, xub_StrLen nPos, xub_StrLen nLen,
+ rtl_TextEncoding eTextEncoding,
+ sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
+ ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen,
+ rtl_TextEncoding eTextEncoding,
+ sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
void Assign(int); // not implemented; to detect misuses of
// Assign(sal_Char)
void operator =(int); // not implemented; to detect misuses
@@ -186,9 +192,6 @@ public:
ByteString( const UniString& rUniStr,
rtl_TextEncoding eTextEncoding,
sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
- ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen,
- rtl_TextEncoding eTextEncoding,
- sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
~ByteString();
operator rtl::OString () const
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index d1178f2..d8531bf 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -1118,8 +1118,8 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin,
}
if (p == pAttributeBegin)
break;
- ByteString aAttribute = ByteString(
- pAttributeBegin, static_cast< xub_StrLen >(p - pAttributeBegin),
+ ByteString aAttribute = rtl::OString(
+ pAttributeBegin, p - pAttributeBegin,
RTL_TEXTENCODING_ASCII_US);
if (bDowncaseAttribute)
aAttribute.ToLowerAscii();
@@ -1170,9 +1170,9 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin,
break;
if (pParameters)
{
- aCharset = ByteString(
+ aCharset = rtl::OString(
pCharsetBegin,
- static_cast< xub_StrLen >(p - pCharsetBegin),
+ p - pCharsetBegin,
RTL_TEXTENCODING_ASCII_US);
if (bDowncaseCharset)
aCharset.ToLowerAscii();
@@ -1205,9 +1205,9 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin,
break;
if (pParameters)
{
- aLanguage = ByteString(
+ aLanguage = rtl::OString(
pLanguageBegin,
- static_cast< xub_StrLen >(p - pLanguageBegin),
+ p - pLanguageBegin,
RTL_TEXTENCODING_ASCII_US);
if (bDowncaseLanguage)
aLanguage.ToLowerAscii();
@@ -1301,8 +1301,8 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin,
if (p == pTokenBegin)
break;
if (pParameters)
- aValue = ByteString(
- pTokenBegin, static_cast< xub_StrLen >(p - pTokenBegin),
+ aValue = rtl::OString(
+ pTokenBegin, p - pTokenBegin,
RTL_TEXTENCODING_UTF8);
}
diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index 210636f..58717bc 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.cxx
@@ -55,23 +55,6 @@ ByteString::ByteString( const UniString& rUniStr, rtl_TextEncoding eTextEncoding
eTextEncoding, nCvtFlags );
}
-// -----------------------------------------------------------------------
-
-ByteString::ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen,
- rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
-{
- DBG_CTOR( ByteString, DbgCheckByteString );
- DBG_ASSERT( pUniStr, "ByteString::ByteString() - pUniStr is NULL" );
-
- if ( nLen == STRING_LEN )
- nLen = ImplStringLen( pUniStr );
-
- mpData = NULL;
- rtl_uString2String( (rtl_String **)(&mpData),
- pUniStr, nLen,
- eTextEncoding, nCvtFlags );
-}
-
// =======================================================================
static sal_uChar aImplByteTab[256] =
commit 7bd0fb7d7c0926575d8a7ec5ea2e4a7867f9f8dd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 12 09:44:45 2011 +0100
Related: rhbz#730225 avoid segv in ld, this was set to -O0 around 2000
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 9dd3f29..d4f8c35 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt))
$(eval $(call gb_Library_add_exception_objects,sdfilt,\
sd/source/filter/eppt/eppt \
+ sd/source/filter/eppt/epptso \
sd/source/filter/eppt/escherex \
sd/source/filter/eppt/pptexanimations \
sd/source/filter/eppt/pptexsoundcollection \
@@ -95,15 +96,4 @@ $(eval $(call gb_Library_add_exception_objects,sdfilt,\
sd/source/filter/ppt/propread \
))
-ifeq ($(strip $(COM)),GCC)
-$(eval $(call gb_Library_add_cxxobjects,sdfilt,\
- sd/source/filter/eppt/epptso \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,sdfilt,\
- sd/source/filter/eppt/epptso \
-))
-endif
-
# vim: set noet sw=4 ts=4:
commit a09a5142bc17cce62bc13fdeb4674feba39217d8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 23:20:31 2011 +0100
reduce ByteString api
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index ac7eb92..1f00e90 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -413,7 +413,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
{
EditLine* pLine = pPPortion->GetLines().GetObject( nLine );
- ByteString aLine( *(pPPortion->GetNode()), pLine->GetStart(), pLine->GetEnd() - pLine->GetStart(), RTL_TEXTENCODING_ASCII_US );
+ ByteString aLine( pPPortion->GetNode()->Copy(pLine->GetStart(), pLine->GetEnd() - pLine->GetStart()), RTL_TEXTENCODING_ASCII_US );
fprintf( fp, "\nLine %i\t>%s<", nLine, aLine.GetBuffer() );
}
// then the internal data ...
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 2bd758e..6ad0a26 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1199,7 +1199,7 @@ sal_Bool EscherPropertyContainer::CreateEmbeddedBitmapProperties(
nIndex = nIndex + aVndUrl.Len();
if( aBmpUrl.Len() > nIndex )
{
- ByteString aUniqueId( aBmpUrl, nIndex, aBmpUrl.Len() - nIndex, RTL_TEXTENCODING_UTF8 );
+ ByteString aUniqueId( aBmpUrl.Copy(nIndex, aBmpUrl.Len() - nIndex), RTL_TEXTENCODING_UTF8 );
bRetValue = ImplCreateEmbeddedBmp( aUniqueId );
if( bRetValue )
{
@@ -1368,7 +1368,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
{
nIndex = nIndex + aVndUrl.Len();
if ( aGraphicUrl.Len() > nIndex )
- aUniqueId = ByteString( aGraphicUrl, nIndex, aGraphicUrl.Len() - nIndex, RTL_TEXTENCODING_UTF8 );
+ aUniqueId = ByteString( aGraphicUrl.Copy(nIndex, aGraphicUrl.Len() - nIndex), RTL_TEXTENCODING_UTF8 );
}
else
{
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 8b0b761..bf6499c 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -905,7 +905,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
nIndex++;
if ( aGraphicURL.Len() > nIndex )
{
- ByteString aUniqueId( aGraphicURL, nIndex, aGraphicURL.Len() - nIndex, RTL_TEXTENCODING_UTF8 );
+ ByteString aUniqueId( aGraphicURL.Copy(nIndex, aGraphicURL.Len() - nIndex), RTL_TEXTENCODING_UTF8 );
if ( aUniqueId.Len() )
{
nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize );
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index a1428a6..296dc29 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -186,9 +186,6 @@ public:
ByteString( const UniString& rUniStr,
rtl_TextEncoding eTextEncoding,
sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
- ByteString( const UniString& rUniStr, xub_StrLen nPos, xub_StrLen nLen,
- rtl_TextEncoding eTextEncoding,
- sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen,
rtl_TextEncoding eTextEncoding,
sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index 22bb517..210636f 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.cxx
@@ -57,31 +57,6 @@ ByteString::ByteString( const UniString& rUniStr, rtl_TextEncoding eTextEncoding
// -----------------------------------------------------------------------
-ByteString::ByteString( const UniString& rUniStr, xub_StrLen nPos, xub_StrLen nLen,
- rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
-{
- DBG_CTOR( ByteString, DbgCheckByteString );
- DBG_CHKOBJ( &rUniStr, UniString, DbgCheckUniString );
-
- // Stringlaenge ermitteln
- if ( nPos > rUniStr.mpData->mnLen )
- nLen = 0;
- else
- {
- // Laenge korrigieren, wenn noetig
- sal_Int32 nMaxLen = rUniStr.mpData->mnLen-nPos;
- if ( nLen > nMaxLen )
- nLen = static_cast< xub_StrLen >(nMaxLen);
- }
-
- mpData = NULL;
- rtl_uString2String( (rtl_String **)(&mpData),
- rUniStr.mpData->maStr+nPos, nLen,
- eTextEncoding, nCvtFlags );
-}
-
-// -----------------------------------------------------------------------
-
ByteString::ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen,
rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
{
commit 2e3f7cc4125cbd4245030122eeb9608af3b7997b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 23:13:46 2011 +0100
callcatcher: unused code
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index 761af3c..686c7d3 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -217,16 +217,6 @@ LwpCellLayout* LwpFootnote::GetCellLayout()
}
return NULL;
}
-/**
- * @descr Get endnote supertable layout which contains current endnote content, not used now
- */
-LwpEnSuperTableLayout* LwpFootnote::GetEnSuperTableLayout()
-{
- LwpDocument* pDivision = GetFootnoteTableDivision();
- if(pDivision)
- return static_cast<LwpEnSuperTableLayout*>(pDivision->GetEnSuperTableLayout());
- return NULL;
-}
/**
* @descr Get division which footnote table contains current footnote content, copy from lwp source code
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx
index 680cc71..054b126 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -142,7 +142,6 @@ public:
sal_uInt16 GetType(){ return m_nType;}
private:
LwpCellLayout* GetCellLayout();
- LwpEnSuperTableLayout* GetEnSuperTableLayout();
LwpDocument* GetFootnoteTableDivision();
LwpDocument* GetEndnoteDivision(LwpDocument* pPossible);
LwpEnSuperTableLayout* FindFootnoteTableLayout();
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx
index 364550f..30380c6 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -253,30 +253,6 @@ LwpBookMark* LwpFoundry::GetBookMark(LwpObjectID objMarker)
return NULL;
}
-sal_Bool LwpFoundry::FindBookMarkByName(OUString sName)
-{
- LwpDLVListHeadHolder* pHeadHolder= static_cast
- <LwpDLVListHeadHolder*>(m_BookMarkHead.obj());
- LwpObjectID* pObjID = pHeadHolder->GetHeadID();
- LwpBookMark* pBookMark;
- if (pObjID)
- pBookMark = static_cast<LwpBookMark*>(pObjID->obj());
- else
- return sal_False;
-
- while (pBookMark)
- {
- if (pBookMark->IsRightName(sName))
- return sal_True;
- pObjID = pBookMark->GetNext();
- if (pObjID)
- pBookMark = static_cast<LwpBookMark*>(pObjID->obj());
- else
- return sal_False;
- }
- return sal_False;
-}
-
/**
* @descr: Get next content
*
diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx
index 8e5741c..c16f7ab 100644
--- a/lotuswordpro/source/filter/lwpfoundry.hxx
+++ b/lotuswordpro/source/filter/lwpfoundry.hxx
@@ -286,7 +286,6 @@ private:
public:
inline LwpStyleManager* GetStyleManager() { return m_pStyleMgr;}
LwpBookMark* GetBookMark(LwpObjectID objMarker);
- sal_Bool FindBookMarkByName(OUString sName);
LwpDropcapMgr* GetDropcapMgr(){return m_pDropcapMgr;}
LwpContent* EnumContents(LwpContent* pContent);
LwpSection* EnumSections(LwpSection* pSection);
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index ef0cc20..a14e193 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -494,15 +494,6 @@ LwpObject* LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObjectHeader &objH
newObj = new LwpTableHeading(objHdr, m_pSvStream);
break;
}
- /* some member variables can't be read until now
- case VO_TABLEHINT:
- {
- newObj = new LwpTableHint(objHdr, m_pSvStream);
- break;
- }
- */
- // end table
- //add by
case VO_CHBLKMARKER:
{
newObj = new LwpCHBlkMarker(objHdr, m_pSvStream);
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index d3324dd..6c185b8 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -907,23 +907,6 @@ void LwpPara::AddBreakAfter(XFContentContainer* pCont)
}
}
-LwpVirtualLayout* LwpPara::GetLayoutWithMyStory()
-{
- LwpStory* pMyStory = NULL;
- if (!m_Story.IsNull())
- {
- pMyStory = dynamic_cast<LwpStory*>(m_Story.obj(VO_STORY));
- if (!pMyStory)
- {
- return NULL;
- }
-
- return pMyStory->GetLayout(NULL);
- }
-
- return NULL;
-}
-
LwpBulletStyleMgr* LwpPara::GetBulletStyleMgr()
{
if (m_pFoundry)
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index 7540a6f..9bdac99 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -201,16 +201,11 @@ public:
void FindLayouts();// for register pagelayout, add by , 02/20/2005
void RegisterTabStyle(XFParaStyle* pXFParaStyle);
- // add by 04/13/2005
- LwpVirtualLayout* GetLayoutWithMyStory();
LwpBulletStyleMgr* GetBulletStyleMgr();
sal_uInt32 GetOrdinal(){ return m_nOrdinal;}
sal_Bool operator <(LwpPara& Other);
sal_Bool ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout);
-// rtl::OUString RegisterBulletStyle();
- // end add
- sal_Bool IsNumberRight();
sal_Bool IsInCell();
void SetAllText(OUString sText);
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index b9656ce..1992967 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -644,19 +644,6 @@ sal_Bool LwpPara::ComparePagePosition(LwpVirtualLayout * pPreLayout, LwpVirtualL
}
/**
- * @short check paragraph alignment
- */
-sal_Bool LwpPara::IsNumberRight()
-{
- LwpParaStyle* pStyle = dynamic_cast<LwpParaStyle*>(m_ParaStyle.obj());
- if (pStyle)
- {
- return pStyle->IsNumberRight();
- }
- else
- return sal_False;
-}
-/**
* @short check paragraph in cell or not
*/
sal_Bool LwpPara::IsInCell()
diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx
index 9e6c54b..a8d328c 100644
--- a/lotuswordpro/source/filter/lwptable.cxx
+++ b/lotuswordpro/source/filter/lwptable.cxx
@@ -159,54 +159,6 @@ void LwpTableHeading::Parse(IXFStream* /*pOutputStream*/)
}
/*****************************************************************************/
- LwpTableHint::LwpTableHint(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpObject(objHdr, pStrm)
-{}
-
-LwpTableHint::~LwpTableHint()
-{}
-
-void LwpTableHint::Read()
-{
- cListNext.ReadIndexed(m_pObjStrm);
- if (LwpFileHeader::m_nFileRevision < 0x0006)
- m_pObjStrm->SkipExtra();
-
- // not implemented yet
- //lbool Problem;
- // ?Problem = cStart.QuickReadNonEmbedded(m_pObjStrm);
-
- cLayout.ReadIndexed(m_pObjStrm);
- cContent.ReadIndexed(m_pObjStrm);
- cFlags = m_pObjStrm->QuickReaduInt8();
- cParent.ReadIndexed(m_pObjStrm);
- //cNumberHint.QuickRead (m_pObjStrm);
- cLineNumber = m_pObjStrm->QuickReaduInt32();
- cPageHint.ReadIndexed (m_pObjStrm);
-
- m_pObjStrm->SkipExtra ();
-
- //CContentHint(pFile, pLoader);
-
- cRow = m_pObjStrm->QuickReaduInt16();
- cCellHint.Read (m_pObjStrm);
- cRowContinued = (sal_Bool)m_pObjStrm->QuickReaduInt16();
-
- cTable.ReadIndexed(m_pObjStrm);
- //if (!cTable.PointerTest())
- // cTable = NullObjPtr;
-
- //cCellNumberHint.QuickRead (m_pObjStrm);
- LwpObjectID cList;
- cList.ReadIndexed(m_pObjStrm);
-
- m_pObjStrm->SkipExtra();
-}
-
-void LwpTableHint::Parse(IXFStream* /*pOutputStream*/)
-{
-}
-
- /*****************************************************************************/
LwpParallelColumns::LwpParallelColumns(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpTable(objHdr, pStrm)
{
}
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index d045646..43e750c 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -153,52 +153,6 @@ protected:
/**
* @brief
- *
- */
-class LwpTableHint : public LwpObject
-{
-public:
- LwpTableHint(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- virtual ~LwpTableHint();
-
- virtual void Parse(IXFStream* pOutputStream);
-protected:
- void Read();
- sal_uInt16 cRow;
- LwpContentHintHead cCellHint;
- sal_Bool cRowContinued;
- LwpObjectID cTable;
- //CCellNumberHintHead cCellNumberHint;
-
- LwpObjectID cListNext;
-
- LwpFribPtr cStart;
- LwpObjectID cLayout; // if the layout is complex then we
- // store the parent not the left or
- // right
- LwpObjectID cContent;
- sal_uInt8 cFlags;
- LwpObjectID cParent;
- //CNumberHintHead cNumberHint;
- sal_uInt32 cLineNumber;
- LwpObjectID cPageHint; // the page hint we belong to
-
- // cFlags
- enum
- {
- HF_INVALID = 0x01, // hint should not be used to start flowing
- HF_LASTPAGE = 0x02, // content ends with this hint
- HF_REGISTERED = 0x04, // the hint has been registered with a
- // paragraph
- HF_DIDBULLET = 0x08, // We flowed bullet text right before
- // the end of this stream
- HF_PROBLEMPARA = 0x10 // This hint's paragraph changed from disk
- };
-
-
-};
-/**
- * @brief
* VO_TABLEHEADING object
*/
class LwpTableHeading : public LwpTable
diff --git a/lotuswordpro/source/filter/lwpuidoc.cxx b/lotuswordpro/source/filter/lwpuidoc.cxx
index 5d5b2f8..fbd96e1 100644
--- a/lotuswordpro/source/filter/lwpuidoc.cxx
+++ b/lotuswordpro/source/filter/lwpuidoc.cxx
@@ -64,11 +64,6 @@
#include "lwpuidoc.hxx"
-LwpUIDocument::LwpUIDocument()
- : m_nFlags(DOC_LOCKED)
-{}
-
-
LwpUIDocument::LwpUIDocument(LwpObjectStream *pStrm)
: m_nFlags(DOC_LOCKED)
{
diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx
index 45ff59b..5815f21 100644
--- a/lotuswordpro/source/filter/lwpuidoc.hxx
+++ b/lotuswordpro/source/filter/lwpuidoc.hxx
@@ -127,7 +127,6 @@ public:
class LwpUIDocument
{
public:
- LwpUIDocument();
LwpUIDocument(LwpObjectStream *pStrm);
~LwpUIDocument();
private:
diff --git a/lotuswordpro/source/filter/lwpverdocument.cxx b/lotuswordpro/source/filter/lwpverdocument.cxx
index debc1e3..5b76c6b 100644
--- a/lotuswordpro/source/filter/lwpverdocument.cxx
+++ b/lotuswordpro/source/filter/lwpverdocument.cxx
@@ -104,9 +104,4 @@ void LwpVerDocument::RegisterStyle()
pXFStyleManager->AddStyle(pDefault);
}
-sal_uInt32 LwpVerDocument::GetTabSpacing()
-{
- return m_nTabSpacing;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpverdocument.hxx b/lotuswordpro/source/filter/lwpverdocument.hxx
index b0e9078..a1b6cf0 100644
--- a/lotuswordpro/source/filter/lwpverdocument.hxx
+++ b/lotuswordpro/source/filter/lwpverdocument.hxx
@@ -78,7 +78,6 @@ public:
~LwpVerDocument(){}
void Read();
virtual void RegisterStyle();
- sal_uInt32 GetTabSpacing();
private:
sal_uInt32 m_nTabSpacing;
};
diff --git a/unusedcode.easy b/unusedcode.easy
index 0544e92..1ebf4e0 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -436,8 +436,6 @@ LwpDocData::SkipExtra(LwpSvStream*)
LwpDocument::GetMaxNumberOfPages()
LwpDocument::ParseMasterDoc(IXFStream*)
LwpFootnote::FindFootnoteTable()
-LwpFootnote::GetEnSuperTableLayout()
-LwpFoundry::FindBookMarkByName(rtl::OUString)
LwpFribTable::Parse(IXFStream*)
LwpGraphicObject::GetRectIn100thMM()
LwpGraphicObject::GetRectInCM()
@@ -452,8 +450,6 @@ LwpObject::LwpObject()
LwpObjectID::GetBuffer(char*)
LwpObjectID::ReadCompressed(LwpSvStream*, LwpObjectID&)
LwpObjectStream::QuickReadInt8(bool*)
-LwpPara::GetLayoutWithMyStory()
-LwpPara::IsNumberRight()
LwpPara::OverrideTab(LwpTabOverride*, LwpTabOverride*, XFParaStyle*)
LwpPlacableLayout::GetRelativeDistance()
LwpPlacableLayout::GetRelativeFromWhere()
@@ -463,9 +459,6 @@ LwpRowHeadingLayout::GetRowLayout()
LwpSortOption::Skip(LwpObjectStream*)
LwpStory::XFConvertFrame(XFContentContainer*)
LwpSuperTableLayout::ParseFrame(XFFrame*)
-LwpTableHint::LwpTableHint(LwpObjectHeader&, LwpSvStream*)
-LwpUIDocument::LwpUIDocument()
-LwpVerDocument::GetTabSpacing()
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
@@ -2369,15 +2362,10 @@ binfilter::B3dEntityBucketMemArr::Insert(binfilter::B3dEntityBucketMemArr const*
binfilter::B3dEntityBucketMemArr::Replace(char const*&, unsigned short)
binfilter::B3dEntityBucketMemArr::Replace(char const**, unsigned short, unsigned short)
binfilter::B3dEntityBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
-binfilter::BasicErrorManager::GetFirstError()
-binfilter::BasicErrorManager::GetNextError()
-binfilter::BasicManager::ClearErrors()
-binfilter::BasicManager::HasErrors()
binfilter::CharPosArray::Insert(binfilter::CharPosArray const*, unsigned short, unsigned short, unsigned short)
binfilter::CharPosArray::Replace(int const&, unsigned short)
binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short)
binfilter::CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
-binfilter::ContainerSorter::DoSort(unsigned long, unsigned long) const
binfilter::DbgName_CntBoolItem()
binfilter::DbgName_CntEnumItem()
binfilter::DbgName_SfxEnumItemInterface()
@@ -2395,14 +2383,12 @@ binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const&, unsigned s
binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const*, unsigned short, unsigned short)
binfilter::EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::EECharAttrib const&, void*), void*)
binfilter::EditEngine::IsModified() const
-binfilter::FmFormPageImpl::write(com::sun::star::uno::Reference<com::sun::star::io::XObjectOutputStream> const&) const
binfilter::GeometryIndexValueBucketMemArr::Insert(binfilter::GeometryIndexValueBucketMemArr const*, unsigned short, unsigned short, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::Replace(char const*&, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::Replace(char const**, unsigned short, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
binfilter::GetLangName(unsigned short)
binfilter::GetPortionName(unsigned short)
-binfilter::GetPrepName(binfilter::PrepareHint)
binfilter::ImpSvtData::~ImpSvtData()
binfilter::InsCapOptArr::Insert(binfilter::InsCapOptArr const*, unsigned short, unsigned short)
binfilter::InsCapOptArr::Insert(binfilter::InsCaptionOpt* const&, unsigned short&)
@@ -2446,9 +2432,6 @@ binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormats_Imp
binfilter::ScConditionalFormats_Impl::Remove(binfilter::ScConditionalFormat* const&, unsigned short)
binfilter::ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
binfilter::ScDBData::IsBeyond(unsigned short) const
-binfilter::ScDocument::GetWeightedCount() const
-binfilter::ScDocument::SetConditionalUsed(unsigned long)
-binfilter::ScDocument::SetValidationUsed(unsigned long)
binfilter::ScFieldChangerEditEngine::ConvertFields()
binfilter::ScFieldChangerEditEngine::ScFieldChangerEditEngine(binfilter::SfxItemPool*, unsigned char)
binfilter::ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream&, unsigned int)
@@ -2458,8 +2441,6 @@ binfilter::ScMyDelAction::~ScMyDelAction()
binfilter::ScMyMoveAction::~ScMyMoveAction()
binfilter::ScRangeData::IsBeyond(unsigned short) const
binfilter::ScRangeFindList::~ScRangeFindList()
-binfilter::ScStyleSheetPool::SetForceStdName(String const*)
-binfilter::ScTokenArray::ExportRecalcMode40() const
binfilter::ScValidationDataList::ResetUsed()
binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const&, unsigned short&)
binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const*, unsigned short)
@@ -2471,7 +2452,6 @@ binfilter::ScViewData::WriteUserData(String&)
binfilter::ScXMLImportWrapper::Export(unsigned char)
binfilter::ScXMLImportWrapper::Import(unsigned char)
binfilter::ScXMLImportWrapper::ScXMLImportWrapper(binfilter::ScDocument&, binfilter::SfxMedium*, binfilter::SvStorage*)
-binfilter::SchXMLWrapper::Export()
binfilter::SchXMLWrapper::SchXMLWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, binfilter::SvStorage&, unsigned char)
binfilter::ScriptTypePosInfos::Insert(binfilter::ScriptTypePosInfos const*, unsigned short, unsigned short, unsigned short)
binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const&, unsigned short)
@@ -2485,7 +2465,6 @@ binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const*, unsigned short)
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccessArr const*, unsigned short, unsigned short)
binfilter::SdrUnoControlAccessArr::Remove(binfilter::SdrUnoControlAccess* const&, unsigned short)
-binfilter::SfxConfigManagerImExport_Impl::Export(SotStorage*, SotStorage*)
binfilter::SfxDocumentInfo::SavePropertySet(binfilter::SvStorage*) const
binfilter::SfxHintPoster::LinkStubDoEvent_Impl(void*, void*)
binfilter::SfxItemModifyArr_Impl::Insert(binfilter::SfxItemModifyArr_Impl const*, unsigned short, unsigned short, unsigned short)
@@ -2513,7 +2492,6 @@ binfilter::ShellResource::~ShellResource()
binfilter::SmFntFmtListEntryArr::Insert(binfilter::SmFntFmtListEntryArr const*, unsigned short, unsigned short, unsigned short)
binfilter::SmFntFmtListEntryArr::Remove(unsigned short, unsigned short)
binfilter::SmFntFmtListEntryArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SmFntFmtListEntry const&, void*), void*)
-binfilter::SmXMLWrapper::WriteThroughComponent(binfilter::SvStorage*, com::sun::star::uno::Reference<com::sun::star::lang::XComponent>, char const*, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>&, char const*, unsigned char)
binfilter::SoDll::~SoDll()
binfilter::SortedPositions::Insert(binfilter::SortedPositions const*, unsigned short, unsigned short)
binfilter::SortedPositions::Insert(unsigned int const&, unsigned short&)
@@ -2666,10 +2644,6 @@ binfilter::SwOLELRUCache::Remove(binfilter::SwOLEObj&)
binfilter::SwOutlineNodes::Insert(binfilter::SwNode* const&, unsigned short&)
binfilter::SwOutlineNodes::Insert(binfilter::SwNode* const*, unsigned short)
binfilter::SwOutlineNodes::Insert(binfilter::SwOutlineNodes const*, unsigned short, unsigned short)
-binfilter::SwPageIter::GetPageDesc() const
-binfilter::SwPageIter::GetPosition(binfilter::SwPosition&) const
-binfilter::SwPageIter::NextPage()
-binfilter::SwPageIter::SwPageIter(binfilter::SwDoc const&, binfilter::SwPosition const&)
binfilter::SwPosFlyFrm::SwPosFlyFrm(binfilter::SwNodeIndex const&, binfilter::SwFrmFmt const*, unsigned short)
binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const&)
binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const&, unsigned short&)
@@ -2699,7 +2673,6 @@ binfilter::SwTableSortBoxes::Insert(binfilter::SwTableBox* const&, unsigned shor
binfilter::SwTableSortBoxes::Insert(binfilter::SwTableBox* const*, unsigned short)
binfilter::SwTableSortBoxes::Insert(binfilter::SwTableSortBoxes const*, unsigned short, unsigned short)
binfilter::SwTblBoxFormula::GetTableBox()
-binfilter::SwViewImp::Init(binfilter::SwViewOption const*)
binfilter::SwXBookmarkPortionArr::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortionArr const*, unsigned short, unsigned short)
binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortion_Impl* const&, unsigned short&)
@@ -2726,7 +2699,6 @@ binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const*&, unsigned short&)
binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const**, unsigned short)
binfilter::SwpHtStart::Insert(binfilter::SwpHtStart const*, unsigned short, unsigned short)
binfilter::SwpHtStart::Remove(binfilter::SwTxtAttr const*&, unsigned short)
-binfilter::ViewShell::Init(binfilter::SwViewOption const*)
binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTab const*, unsigned short, unsigned short)
binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTabEntry* const&, unsigned short&)
binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTabEntry* const*, unsigned short)
@@ -2805,7 +2777,6 @@ binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const&, unsigned short)
binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const*, unsigned short, unsigned short)
binfilter::_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::_ZSortFly const&, void*), void*)
binfilter::bf_OfficeWrapper::impl_createInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-binfilter::frm::OErrorBroadcaster::onError(com::sun::star::sdbc::SQLException const&, rtl::OUString const&)
cairocanvas::CanvasHelper::flush() const
cairocanvas::CanvasHelper::getPalette()
cairocanvas::SpriteDeviceHelper::getSurface()
commit 9c0f8fed9eaabbc3d1143b095b3f4ae374d8952a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 22:01:35 2011 +0100
callcatcher: some unused code
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 14ffb92..ba1f9d8 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -674,12 +674,6 @@ PluginProgress::~PluginProgress()
}
//===============================================
-Window* PluginProgress::getPlugWindow()
-{
- return m_pPlugProgressWindow;
-}
-
-//===============================================
void SAL_CALL PluginProgress::dispose()
throw(css::uno::RuntimeException)
{
@@ -1417,11 +1411,6 @@ IMPL_LINK( RecoveryDialog, CancelButtonHdl, void*, EMPTYARG )
}
//===============================================
-void RecoveryDialog::impl_refreshDocList()
-{
-}
-
-//===============================================
String RecoveryDialog::impl_getStatusString( const TURLInfo& rInfo ) const
{
String sStatus;
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 9dfefa3..a582d0a 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -199,11 +199,6 @@ bool FrameBorder::ContainsClickPoint( const Point& rPos ) const
return Region( maClickArea ).IsInside( rPos );
}
-void FrameBorder::MergeClickAreaToPolyPolygon( PolyPolygon& rPPoly ) const
-{
- lclPolyPolyUnion( rPPoly, maClickArea );
-}
-
Rectangle FrameBorder::GetClickBoundRect() const
{
return maClickArea.GetBoundRect();
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index b2a15ee..040eed7 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -369,10 +369,6 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat
/** @short TODO */
virtual ~PluginProgress();
- //---------------------------------------
- /** @short TODO */
- Window* getPlugWindow();
-
//-------------------------------------------
// uno interface
public:
@@ -718,10 +714,6 @@ class RecoveryDialog : public IExtendedTabPage
//---------------------------------------
/** @short TODO */
- void impl_refreshDocList();
-
- //---------------------------------------
- /** @short TODO */
String impl_getStatusString( const TURLInfo& rInfo ) const;
};
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index fd36b53..d38184c 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -72,7 +72,6 @@ public:
inline void ClearClickArea() { maClickArea.Clear(); }
void AddClickRect( const Rectangle& rRect );
bool ContainsClickPoint( const Point& rPos ) const;
- void MergeClickAreaToPolyPolygon( PolyPolygon& rPPoly ) const;
Rectangle GetClickBoundRect() const;
void SetKeyboardNeighbors(
diff --git a/unusedcode.easy b/unusedcode.easy
index f2bc2ef..0544e92 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -3815,12 +3815,9 @@ svx::DialControl::DialControl(Window*, Size const&, long)
svx::DialControl::GetLinkedField() const
svx::DialControl::GetModifyHdl() const
svx::DialControl::SetModifyHdl(Link const&)
-svx::DocRecovery::PluginProgress::getPlugWindow()
-svx::DocRecovery::RecoveryDialog::impl_refreshDocList()
svx::FontWorkGalleryDialog::changeText(SdrTextObj*)
svx::FormControllerHelper::moveLeft() const
svx::FormControllerHelper::moveRight() const
-svx::FrameBorder::MergeClickAreaToPolyPolygon(PolyPolygon&) const
svx::FrameDirectionListBox::FrameDirectionListBox(Window*, long)
svx::NamespaceMap_createInstance(unsigned short*, SfxItemPool*, SfxItemPool*)
svx::OComponentTransferable::extractComponentDescriptor(TransferableDataHelper const&, unsigned char, rtl::OUString&, com::sun::star::uno::Reference<com::sun::star::ucb::XContent>&)
commit 3bc03cd0c10a74d929f21e84772416c9ee300c70
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 21:52:01 2011 +0100
SvtFilterOptions::Get can never be NULL, return ref and don't leak
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index d9ccea2..b5f3383 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -92,56 +92,55 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
{
- SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+ SvtFilterOptions& rOpt = SvtFilterOptions::Get();
sal_Bool bFlag;
if( aWBasicCodeCB.GetSavedValue() != (bFlag = aWBasicCodeCB.IsChecked()))
- pOpt->SetLoadWordBasicCode( bFlag );
+ rOpt.SetLoadWordBasicCode( bFlag );
if( aWBasicWbctblCB.GetSavedValue() != (bFlag = aWBasicWbctblCB.IsChecked()))
- pOpt->SetLoadWordBasicExecutable( bFlag );
+ rOpt.SetLoadWordBasicExecutable( bFlag );
if( aWBasicStgCB.GetSavedValue() != (bFlag = aWBasicStgCB.IsChecked()))
- pOpt->SetLoadWordBasicStorage( bFlag );
+ rOpt.SetLoadWordBasicStorage( bFlag );
if( aEBasicCodeCB.GetSavedValue() != (bFlag = aEBasicCodeCB.IsChecked()))
- pOpt->SetLoadExcelBasicCode( bFlag );
+ rOpt.SetLoadExcelBasicCode( bFlag );
if( aEBasicExectblCB.GetSavedValue() != (bFlag = aEBasicExectblCB.IsChecked()))
- pOpt->SetLoadExcelBasicExecutable( bFlag );
+ rOpt.SetLoadExcelBasicExecutable( bFlag );
if( aEBasicStgCB.GetSavedValue() != (bFlag = aEBasicStgCB.IsChecked()))
- pOpt->SetLoadExcelBasicStorage( bFlag );
+ rOpt.SetLoadExcelBasicStorage( bFlag );
if( aPBasicCodeCB.GetSavedValue() != (bFlag = aPBasicCodeCB.IsChecked()))
- pOpt->SetLoadPPointBasicCode( bFlag );
+ rOpt.SetLoadPPointBasicCode( bFlag );
if( aPBasicStgCB.GetSavedValue() != (bFlag = aPBasicStgCB.IsChecked()))
- pOpt->SetLoadPPointBasicStorage( bFlag );
+ rOpt.SetLoadPPointBasicStorage( bFlag );
return sal_False;
}
void OfaMSFilterTabPage::Reset( const SfxItemSet& )
{
- SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+ const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
- aWBasicCodeCB.Check( pOpt->IsLoadWordBasicCode() );
+ aWBasicCodeCB.Check( rOpt.IsLoadWordBasicCode() );
aWBasicCodeCB.SaveValue();
- aWBasicWbctblCB.Check( pOpt->IsLoadWordBasicExecutable() );
+ aWBasicWbctblCB.Check( rOpt.IsLoadWordBasicExecutable() );
aWBasicWbctblCB.SaveValue();
- aWBasicStgCB.Check( pOpt->IsLoadWordBasicStorage() );
+ aWBasicStgCB.Check( rOpt.IsLoadWordBasicStorage() );
aWBasicStgCB.SaveValue();
LoadWordBasicCheckHdl_Impl( &aWBasicCodeCB );
- aEBasicCodeCB.Check( pOpt->IsLoadExcelBasicCode() );
+ aEBasicCodeCB.Check( rOpt.IsLoadExcelBasicCode() );
aEBasicCodeCB.SaveValue();
- aEBasicExectblCB.Check( pOpt->IsLoadExcelBasicExecutable() );
+ aEBasicExectblCB.Check( rOpt.IsLoadExcelBasicExecutable() );
aEBasicExectblCB.SaveValue();
- aEBasicStgCB.Check( pOpt->IsLoadExcelBasicStorage() );
+ aEBasicStgCB.Check( rOpt.IsLoadExcelBasicStorage() );
aEBasicStgCB.SaveValue();
LoadExcelBasicCheckHdl_Impl( &aEBasicCodeCB );
- aPBasicCodeCB.Check( pOpt->IsLoadPPointBasicCode() );
+ aPBasicCodeCB.Check( rOpt.IsLoadPPointBasicCode() );
aPBasicCodeCB.SaveValue();
- aPBasicStgCB.Check( pOpt->IsLoadPPointBasicStorage() );
+ aPBasicStgCB.Check( rOpt.IsLoadPPointBasicStorage() );
aPBasicStgCB.SaveValue();
-
}
OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
@@ -186,7 +185,7 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
{
- SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+ SvtFilterOptions& rOpt = SvtFilterOptions::Get();
static struct ChkCBoxEntries{
MSFltrPg2_CheckBoxEntries eType;
@@ -227,8 +226,8 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
bCheck = SV_BUTTON_CHECKED ==
pCheckButtonData->ConvertToButtonState( nButtonFlags );
- if( bCheck != (pOpt->*pArr->FnIs)() )
- (pOpt->*pArr->FnSet)( bCheck );
+ if( bCheck != (rOpt.*pArr->FnIs)() )
+ (rOpt.*pArr->FnSet)( bCheck );
}
}
}
@@ -238,7 +237,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
{
- SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+ SvtFilterOptions& rOpt = SvtFilterOptions::Get();
aCheckLB.SetUpdateMode(sal_False);
aCheckLB.Clear();
@@ -281,7 +280,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol ));
if( pItem && ((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON )
{
- if( (pOpt->*pArr->FnIs)() )
+ if( (rOpt.*pArr->FnIs)() )
pItem->SetStateChecked();
else
pItem->SetStateUnchecked();
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 801cdc5..6ede078 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -328,12 +328,12 @@ void ImportExcel8::ReadBasic( void )
{
SfxObjectShell* pShell = GetDocShell();
SotStorageRef xRootStrg = GetRootStorage();
- SvtFilterOptions* pFilterOpt = SvtFilterOptions::Get();
+ const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get();
if( pShell && xRootStrg.Is() ) try
{
- bool bLoadCode = pFilterOpt->IsLoadExcelBasicCode();
- bool bLoadExecutable = pFilterOpt->IsLoadExcelBasicExecutable();
- bool bLoadStrg = pFilterOpt->IsLoadExcelBasicStorage();
+ bool bLoadCode = rFilterOpt.IsLoadExcelBasicCode();
+ bool bLoadExecutable = rFilterOpt.IsLoadExcelBasicExecutable();
+ bool bLoadStrg = rFilterOpt.IsLoadExcelBasicStorage();
// #FIXME need to get rid of this, we can also do this from within oox
// via the "ooo.vba.VBAGlobals" service
if( bLoadCode || bLoadStrg )
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index 553ab2e..f0f4e26 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -88,11 +88,9 @@ FltError ExportBiff5::Write()
bool bWriteBasicStrg = false;
if( GetBiff() == EXC_BIFF8 )
{
- if( SvtFilterOptions* pFilterOpt = SvtFilterOptions::Get() )
- {
- bWriteBasicCode = pFilterOpt->IsLoadExcelBasicCode();
- bWriteBasicStrg = pFilterOpt->IsLoadExcelBasicStorage();
- }
+ const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get();
+ bWriteBasicCode = rFilterOpt.IsLoadExcelBasicCode();
+ bWriteBasicStrg = rFilterOpt.IsLoadExcelBasicStorage();
}
if( pDocShell && xRootStrg.Is() && bWriteBasicStrg )
@@ -116,7 +114,7 @@ FltError ExportBiff5::Write()
pDocShell->GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps
= xDPS->getDocumentProperties();
- if ( SvtFilterOptions::Get()->IsEnableCalcPreview() )
+ if ( SvtFilterOptions::Get().IsEnableCalcPreview() )
{
::boost::shared_ptr<GDIMetaFile> pMetaFile =
pDocShell->GetPreviewMetaFile (false);
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index bc186e0..396c171 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3161,15 +3161,13 @@ XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffS
maFormCtrlHelper( GetMedium().GetInputStream(), lcl_getUnoCtx(), GetDocShell()->GetModel() ),
mnOleImpFlags( 0 )
{
- if( SvtFilterOptions* pFilterOpt = SvtFilterOptions::Get() )
- {
- if( pFilterOpt->IsMathType2Math() )
- mnOleImpFlags |= OLE_MATHTYPE_2_STARMATH;
- if( pFilterOpt->IsWinWord2Writer() )
- mnOleImpFlags |= OLE_WINWORD_2_STARWRITER;
- if( pFilterOpt->IsPowerPoint2Impress() )
- mnOleImpFlags |= OLE_POWERPOINT_2_STARIMPRESS;
- }
+ const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get();
+ if( rFilterOpt.IsMathType2Math() )
+ mnOleImpFlags |= OLE_MATHTYPE_2_STARMATH;
+ if( rFilterOpt.IsWinWord2Writer() )
+ mnOleImpFlags |= OLE_WINWORD_2_STARWRITER;
+ if( rFilterOpt.IsPowerPoint2Impress() )
+ mnOleImpFlags |= OLE_POWERPOINT_2_STARIMPRESS;
// try to open the 'Ctls' storage stream containing OCX control properties
mxCtlsStrm = OpenStream( EXC_STREAM_CTLS );
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 17b9946..00f0b63 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -853,21 +853,18 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
// set version to "old" version, because it must be
// saved in MS notation.
sal_uInt32 nFl = 0;
- SvtFilterOptions* pFltOpts = SvtFilterOptions::Get();
- if( pFltOpts )
- {
- if( pFltOpts->IsMath2MathType() )
- nFl |= OLE_STARMATH_2_MATHTYPE;
+ const SvtFilterOptions& rFltOpts = SvtFilterOptions::Get();
+ if( rFltOpts.IsMath2MathType() )
+ nFl |= OLE_STARMATH_2_MATHTYPE;
- if( pFltOpts->IsWriter2WinWord() )
- nFl |= OLE_STARWRITER_2_WINWORD;
+ if( rFltOpts.IsWriter2WinWord() )
+ nFl |= OLE_STARWRITER_2_WINWORD;
- if( pFltOpts->IsCalc2Excel() )
- nFl |= OLE_STARCALC_2_EXCEL;
+ if( rFltOpts.IsCalc2Excel() )
+ nFl |= OLE_STARCALC_2_EXCEL;
- if( pFltOpts->IsImpress2PowerPoint() )
- nFl |= OLE_STARIMPRESS_2_POWERPOINT;
- }
+ if( rFltOpts.IsImpress2PowerPoint() )
+ nFl |= OLE_STARIMPRESS_2_POWERPOINT;
SvxMSExportOLEObjects aOLEExpFilt( nFl );
aOLEExpFilt.ExportOLEObject( xObj, *xOleStg );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index c2a7ea4..bae84f0 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -217,20 +217,17 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage
}
sal_uInt32 nSvxMSDffOLEConvFlags2 = 0;
- SvtFilterOptions* pBasOpt = SvtFilterOptions::Get();
- if ( pBasOpt )
- {
- if ( pBasOpt->IsLoadPPointBasicCode() )
- mnFilterOptions |= 1;
- if ( pBasOpt->IsMathType2Math() )
- nSvxMSDffOLEConvFlags2 |= OLE_MATHTYPE_2_STARMATH;
- if ( pBasOpt->IsWinWord2Writer() )
- nSvxMSDffOLEConvFlags2 |= OLE_WINWORD_2_STARWRITER;
- if ( pBasOpt->IsExcel2Calc() )
- nSvxMSDffOLEConvFlags2 |= OLE_EXCEL_2_STARCALC;
- if ( pBasOpt->IsPowerPoint2Impress() )
- nSvxMSDffOLEConvFlags2 |= OLE_POWERPOINT_2_STARIMPRESS;
- }
+ const SvtFilterOptions& rBasOpt = SvtFilterOptions::Get();
+ if ( rBasOpt.IsLoadPPointBasicCode() )
+ mnFilterOptions |= 1;
+ if ( rBasOpt.IsMathType2Math() )
+ nSvxMSDffOLEConvFlags2 |= OLE_MATHTYPE_2_STARMATH;
+ if ( rBasOpt.IsWinWord2Writer() )
+ nSvxMSDffOLEConvFlags2 |= OLE_WINWORD_2_STARWRITER;
+ if ( rBasOpt.IsExcel2Calc() )
+ nSvxMSDffOLEConvFlags2 |= OLE_EXCEL_2_STARCALC;
+ if ( rBasOpt.IsPowerPoint2Impress() )
+ nSvxMSDffOLEConvFlags2 |= OLE_POWERPOINT_2_STARIMPRESS;
InitSvxMSDffManager( nDggContainerOfs, pStData, nSvxMSDffOLEConvFlags2 );
SetSvxMSDffSettings( SVXMSDFF_SETTINGS_CROP_BITMAPS
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index c87de89..62ddab2 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -149,20 +149,17 @@ sal_Bool SdPPTFilter::Export()
if( PPTExport && xStorRef.Is() )
{
sal_uInt32 nCnvrtFlags = 0;
- SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get();
- if ( pFilterOptions )
- {
- if ( pFilterOptions->IsMath2MathType() )
- nCnvrtFlags |= OLE_STARMATH_2_MATHTYPE;
- if ( pFilterOptions->IsWriter2WinWord() )
- nCnvrtFlags |= OLE_STARWRITER_2_WINWORD;
- if ( pFilterOptions->IsCalc2Excel() )
- nCnvrtFlags |= OLE_STARCALC_2_EXCEL;
- if ( pFilterOptions->IsImpress2PowerPoint() )
- nCnvrtFlags |= OLE_STARIMPRESS_2_POWERPOINT;
- if ( pFilterOptions->IsEnablePPTPreview() )
- nCnvrtFlags |= 0x8000;
- }
+ const SvtFilterOptions& rFilterOptions = SvtFilterOptions::Get();
+ if ( rFilterOptions.IsMath2MathType() )
+ nCnvrtFlags |= OLE_STARMATH_2_MATHTYPE;
+ if ( rFilterOptions.IsWriter2WinWord() )
+ nCnvrtFlags |= OLE_STARWRITER_2_WINWORD;
+ if ( rFilterOptions.IsCalc2Excel() )
+ nCnvrtFlags |= OLE_STARCALC_2_EXCEL;
+ if ( rFilterOptions.IsImpress2PowerPoint() )
+ nCnvrtFlags |= OLE_STARIMPRESS_2_POWERPOINT;
+ if ( rFilterOptions.IsEnablePPTPreview() )
+ nCnvrtFlags |= 0x8000;
mrDocument.SetSwapGraphicsMode( SDR_SWAPGRAPHICSMODE_TEMP );
@@ -180,8 +177,8 @@ sal_Bool SdPPTFilter::Export()
void SdPPTFilter::PreSaveBasic()
{
- SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get();
- if( pFilterOptions && pFilterOptions->IsLoadPPointBasicStorage() )
+ const SvtFilterOptions& rFilterOptions = SvtFilterOptions::Get();
+ if( rFilterOptions.IsLoadPPointBasicStorage() )
{
::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() );
if( pLibrary )
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 8a4f4b8..9dac885 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2907,14 +2907,14 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
if ( !pOLEExp )
{
sal_uInt32 nSvxMSDffOLEConvFlags = 0;
- const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- if ( pOpt->IsMath2MathType() )
+ const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
+ if ( rOpt.IsMath2MathType() )
nSvxMSDffOLEConvFlags |= OLE_STARMATH_2_MATHTYPE;
- if ( pOpt->IsWriter2WinWord() )
+ if ( rOpt.IsWriter2WinWord() )
nSvxMSDffOLEConvFlags |= OLE_STARWRITER_2_WINWORD;
- if ( pOpt->IsCalc2Excel() )
+ if ( rOpt.IsCalc2Excel() )
nSvxMSDffOLEConvFlags |= OLE_STARCALC_2_EXCEL;
- if ( pOpt->IsImpress2PowerPoint() )
+ if ( rOpt.IsImpress2PowerPoint() )
nSvxMSDffOLEConvFlags |= OLE_STARIMPRESS_2_POWERPOINT;
pOLEExp = new SvxMSExportOLEObjects( nSvxMSDffOLEConvFlags );
@@ -3276,7 +3276,7 @@ void WW8Export::PrepareStorage()
if (xDocProps.is())
{
- if ( SvtFilterOptions::Get()->IsEnableWordPreview() )
+ if ( SvtFilterOptions::Get().IsEnableWordPreview() )
{
::boost::shared_ptr<GDIMetaFile> pMetaFile =
pDocShell->GetPreviewMetaFile (sal_False);
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2ce7503..663d80b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -349,17 +349,15 @@ SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr )
sal_uInt32 SwMSDffManager::GetFilterFlags()
{
sal_uInt32 nFlags(0);
- if (const SvtFilterOptions* pOpt = SvtFilterOptions::Get())
- {
- if (pOpt->IsMathType2Math())
- nFlags |= OLE_MATHTYPE_2_STARMATH;
- if (pOpt->IsExcel2Calc())
- nFlags |= OLE_EXCEL_2_STARCALC;
- if (pOpt->IsPowerPoint2Impress())
- nFlags |= OLE_POWERPOINT_2_STARIMPRESS;
- if (pOpt->IsWinWord2Writer())
- nFlags |= OLE_WINWORD_2_STARWRITER;
- }
+ const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
+ if (rOpt.IsMathType2Math())
+ nFlags |= OLE_MATHTYPE_2_STARMATH;
+ if (rOpt.IsExcel2Calc())
+ nFlags |= OLE_EXCEL_2_STARCALC;
+ if (rOpt.IsPowerPoint2Impress())
+ nFlags |= OLE_POWERPOINT_2_STARIMPRESS;
+ if (rOpt.IsWinWord2Writer())
+ nFlags |= OLE_WINWORD_2_STARWRITER;
return nFlags;
}
@@ -1643,11 +1641,9 @@ void SwWW8ImplReader::ImportDop()
mpDocShell->SetModifyPasswordHash(pWDop->lKeyProtDoc);
- const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
- if (bUseEnhFields) {
- rDoc.set(IDocumentSettingAccess::PROTECT_FORM, pWDop->fProtEnabled );
- }
+ const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
+ if (rOpt.IsUseEnhancedFields())
+ rDoc.set(IDocumentSettingAccess::PROTECT_FORM, pWDop->fProtEnabled );
maTracer.LeaveEnvironment(sw::log::eDocumentProperties);
}
@@ -3897,8 +3893,8 @@ bool wwSectionManager::IsNewDoc() const
void wwSectionManager::InsertSegments()
{
- const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
+ const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
+ sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
mySegIter aEnd = maSegments.end();
mySegIter aStart = maSegments.begin();
for (mySegIter aIter = aStart; aIter != aEnd; ++aIter)
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 1f3be72..cd278c5 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -133,8 +133,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr )
text.
*/
- const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
+ const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
+ sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
if (!bUseEnhFields) {
aFormula.sDefault = GetFieldResult(pF);
@@ -188,8 +188,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr )
if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1)))
ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_CHECKBOX);
- const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
+ const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
+ sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
if (!bUseEnhFields) {
pFormImpl->InsertFormula(aFormula);
@@ -245,8 +245,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr)
if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1)))
ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_DROPDOWN);
- const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
+ const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
+ sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
if (!bUseEnhFields)
{
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 0b654ae..9c87f1a 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -677,8 +677,8 @@ sal_uInt16 SwWW8ImplReader::End_Field()
if (!pF || !pF->EndPosIsFieldEnd())
return nRet;
- const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
+ const SvtFilterOptions &rOpt = SvtFilterOptions::Get();
+ sal_Bool bUseEnhFields = rOpt.IsUseEnhancedFields();
OSL_ENSURE(!maFieldStack.empty(), "Empty field stack\n");
if (!maFieldStack.empty())
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index cd1b81d..0b3bec5 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -345,7 +345,7 @@ sal_Bool SwDocShell::Save()
{
if( pDoc->ContainsMSVBasic() )
{
- if( SvtFilterOptions::Get()->IsLoadWordBasicStorage() )
+ if( SvtFilterOptions::Get().IsLoadWordBasicStorage() )
nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) (*this) );
pDoc->SetContainsMSVBasic( sal_False );
}
@@ -465,7 +465,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
if( pDoc->ContainsMSVBasic() )
{
- if( SvtFilterOptions::Get()->IsLoadWordBasicStorage() )
+ if( SvtFilterOptions::Get().IsLoadWordBasicStorage() )
nVBWarning = GetSaveWarningOfMSVBAStorage( (SfxObjectShell&) *this );
pDoc->SetContainsMSVBasic( sal_False );
}
@@ -559,7 +559,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
if( pDoc->ContainsMSVBasic() )
{
sal_Bool bSave = pFlt->GetUserData().EqualsAscii( "CWW8" )
- && SvtFilterOptions::Get()->IsLoadWordBasicStorage();
+ && SvtFilterOptions::Get().IsLoadWordBasicStorage();
if ( bSave )
{
diff --git a/unotools/inc/unotools/fltrcfg.hxx b/unotools/inc/unotools/fltrcfg.hxx
index e601804..cd581e6 100644
--- a/unotools/inc/unotools/fltrcfg.hxx
+++ b/unotools/inc/unotools/fltrcfg.hxx
@@ -93,12 +93,9 @@ public:
sal_Bool IsEnableCalcPreview() const;
sal_Bool IsEnableWordPreview() const;
- static SvtFilterOptions* Get();
+ static SvtFilterOptions& Get();
};
#endif
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 805a38f..5434ea5 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -65,8 +65,6 @@ using ::rtl::OUString;
#define FILTERCFG_USE_ENHANCED_FIELDS 0x100000
#define FILTERCFG_WORD_WBCTBL 0x200000
-static SvtFilterOptions* pOptions=0;
-
class SvtAppFilterOptions_Impl : public utl::ConfigItem
{
sal_Bool bLoadVBA;
@@ -321,6 +319,7 @@ SvtFilterOptions::SvtFilterOptions() :
EnableNotification(GetPropertyNames());
Load();
}
+
// -----------------------------------------------------------------------
SvtFilterOptions::~SvtFilterOptions()
{
@@ -621,11 +620,17 @@ void SvtFilterOptions::SetImpress2PowerPoint( sal_Bool bFlag )
SetModified();
}
-SvtFilterOptions* SvtFilterOptions::Get()
+namespace
+{
+ class theFilterOptions
+ : public rtl::Static<SvtFilterOptions, theFilterOptions>
+ {
+ };
+}
+
+SvtFilterOptions& SvtFilterOptions::Get()
{
- if ( !pOptions )
- pOptions = new SvtFilterOptions;
- return pOptions;
+ return theFilterOptions::get();
}
// -----------------------------------------------------------------------
commit fd0e548c4a1528499e95ff169866ed153d08bf54
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 21:20:54 2011 +0100
shrink api further
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 72f7489..a1428a6 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -189,9 +189,6 @@ public:
ByteString( const UniString& rUniStr, xub_StrLen nPos, xub_StrLen nLen,
rtl_TextEncoding eTextEncoding,
sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
- ByteString( const sal_Unicode* pUniStr,
- rtl_TextEncoding eTextEncoding,
- sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen,
rtl_TextEncoding eTextEncoding,
sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS );
diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index 1345a87..22bb517 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.cxx
@@ -82,20 +82,6 @@ ByteString::ByteString( const UniString& rUniStr, xub_StrLen nPos, xub_StrLen nL
// -----------------------------------------------------------------------
-ByteString::ByteString( const sal_Unicode* pUniStr,
- rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
-{
- DBG_CTOR( ByteString, DbgCheckByteString );
- DBG_ASSERT( pUniStr, "ByteString::ByteString() - pUniStr is NULL" );
-
- mpData = NULL;
- rtl_uString2String( (rtl_String **)(&mpData),
- pUniStr, ImplStringLen( pUniStr ),
- eTextEncoding, nCvtFlags );
-}
-
-// -----------------------------------------------------------------------
-
ByteString::ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen,
rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags )
{
More information about the Libreoffice-commits
mailing list