[Libreoffice-commits] .: 7 commits - editeng/inc editeng/source i18nutil/inc i18nutil/source lotuswordpro/source RepositoryFixes.mk sc/source sd/source sfx2/inc sfx2/source smoketestdoc/data svl/inc svl/source sw/source tools/inc tools/source unusedcode.easy vcl/inc vcl/source xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Aug 23 02:36:26 PDT 2011
RepositoryFixes.mk | 5
editeng/inc/editeng/editeng.hxx | 1
editeng/source/editeng/editeng.cxx | 6 -
i18nutil/inc/i18nutil/x_rtl_ustring.h | 25 +---
i18nutil/source/utility/widthfolding.cxx | 3
lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 17 ---
lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 7 -
lotuswordpro/source/filter/lwpcelllayout.cxx | 23 ----
lotuswordpro/source/filter/lwpcelllayout.hxx | 4
lotuswordpro/source/filter/lwpcharborderoverride.cxx | 50 --------
lotuswordpro/source/filter/lwpcharborderoverride.hxx | 2
lotuswordpro/source/filter/lwpdllist.cxx | 5
lotuswordpro/source/filter/lwpdllist.hxx | 1
lotuswordpro/source/filter/lwpdocdata.cxx | 19 ---
lotuswordpro/source/filter/lwpdocdata.hxx | 7 -
lotuswordpro/source/filter/lwptblformula.cxx | 48 ++------
lotuswordpro/source/filter/lwptblformula.hxx | 16 +-
sc/source/filter/inc/lotattr.hxx | 5
sc/source/filter/lotus/lotattr.cxx | 8 -
sd/source/ui/animations/CustomAnimationDialog.cxx | 4
sfx2/inc/macro.hxx | 1
sfx2/inc/sfx2/docfile.hxx | 1
sfx2/inc/sfx2/frame.hxx | 2
sfx2/inc/sfx2/frmdescr.hxx | 3
sfx2/inc/sfx2/frmhtmlw.hxx | 3
sfx2/inc/sfx2/objsh.hxx | 1
sfx2/inc/sfx2/unoctitm.hxx | 2
sfx2/source/appl/sfxpicklist.cxx | 10 -
sfx2/source/bastyp/frmhtmlw.cxx | 14 --
sfx2/source/control/macro.cxx | 30 -----
sfx2/source/control/unoctitm.cxx | 12 --
sfx2/source/doc/docfile.cxx | 6 -
sfx2/source/doc/frmdescr.cxx | 15 --
sfx2/source/doc/objmisc.cxx | 43 -------
sfx2/source/inc/sfxpicklist.hxx | 1
sfx2/source/view/frame.cxx | 22 ---
sfx2/source/view/frame2.cxx | 11 -
smoketestdoc/data/Global.xml | 15 +-
svl/inc/svl/style.hxx | 3
svl/source/items/style.cxx | 106 -------------------
sw/source/ui/utlui/attrdesc.cxx | 10 -
tools/inc/tools/string.hxx | 4
tools/source/inet/inetstrm.cxx | 8 -
tools/source/stream/stream.cxx | 12 +-
tools/source/stream/strmunx.cxx | 10 +
tools/source/string/tstring.cxx | 9 -
tools/source/string/tustring.cxx | 20 ---
unusedcode.easy | 34 ++----
vcl/inc/impgraph.hxx | 1
vcl/source/gdi/impgraph.cxx | 8 -
xmloff/inc/xmloff/VisAreaContext.hxx | 5
xmloff/source/style/VisAreaContext.cxx | 10 -
52 files changed, 83 insertions(+), 605 deletions(-)
New commits:
commit 0d1ff2bfc439ff59dd6cec0a6cb6495f4ef2cc54
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 23 10:01:48 2011 +0100
generate list
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index babe164..6f48a66 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -473,7 +473,6 @@ public:
static Font CreateFontFromItemSet( const SfxItemSet& rItemSet );
static Font CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType );
static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet );
- static void ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace );
static sal_Bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
static sal_Bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 800a60d..c28248a 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2754,12 +2754,6 @@ sal_Bool EditEngine::IsSimpleCharInput( const KeyEvent& rKeyEvent )
return sal_False;
}
-// should be moved to the Outliner...
-void EditEngine::ImportBulletItem( SvxNumBulletItem& /*rNumBullet*/, sal_uInt16 /*nLevel*/,
- const SvxBulletItem* /*pOldBullet*/, const SvxLRSpaceItem* /*pOldLRSpace*/ )
-{
-}
-
sal_Bool EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable )
{
sal_Bool bValidData = sal_False;
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index fc08a76..d4391bc 100644
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/sfx2/inc/sfx2/unoctitm.hxx
@@ -195,7 +195,6 @@ public:
void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer* pServ );
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
void setMasterSlaveCommand( sal_Bool bSet );
- sal_Bool isMasterSlaveCommand() const;
void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 752c825..4c93ccf 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -517,11 +517,6 @@ void SfxDispatchController_Impl::setMasterSlaveCommand( sal_Bool bSet )
bMasterSlave = bSet;
}
-sal_Bool SfxDispatchController_Impl::isMasterSlaveCommand() const
-{
- return bMasterSlave;
-}
-
void SfxDispatchController_Impl::UnBindController()
{
pDispatch = NULL;
diff --git a/unusedcode.easy b/unusedcode.easy
index 413b9ea..f833309 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -134,16 +134,28 @@ EditEngine::CursorLeft(ESelection const&, unsigned short) const
EditEngine::CursorRight(ESelection const&, unsigned short) const
EditEngine::EnableIdleFormatter(unsigned char)
EditEngine::EnablePasteSpecial(unsigned char)
+EditEngine::EndSpelling()
+EditEngine::GetAsianCompressionMode() const
EditEngine::GetAvailableSearchOptions()
+EditEngine::GetBigTextObjectStart() const
+EditEngine::GetDefTab() const
+EditEngine::GetFirstLineOffset(unsigned short)
+EditEngine::GetForbiddenCharsTable() const
EditEngine::GetGroupChars() const
-EditEngine::ImportBulletItem(SvxNumBulletItem&, unsigned short, SvxBulletItem const*, SvxLRSpaceItem const*)
+EditEngine::GetHyphenator() const
+EditEngine::GetPolygon()
+EditEngine::IsAddExtLeading() const
+EditEngine::IsAutoColorEnabled() const
EditEngine::IsFirstWordCapitalization() const
+EditEngine::IsFixedCellHeight() const
EditEngine::IsIdleFormatterEnabled() const
+EditEngine::IsKernAsianPunctuation() const
EditEngine::IsParagraphVisible(unsigned short)
EditEngine::IsPasteSpecialEnabled() const
EditEngine::RegisterClipboardFormatName()
EditEngine::SelectSentence(ESelection const&) const
EditEngine::SetActiveView(EditView*)
+EditEngine::SetBigTextObjectStart(unsigned short)
EditEngine::SetGroupChars(String const&)
EditEngine::SetText(unsigned short, EditTextObject const&)
EditEngine::StopSelectionMode()
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 592f6a7..e7eb642 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -142,7 +142,6 @@ private:
Link ImplGetAnimationNotifyHdl() const;
sal_uLong ImplGetAnimationLoopCount() const;
- void ImplResetAnimationLoopCount();
private:
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 2ce2452..e184644 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -920,14 +920,6 @@ sal_uLong ImpGraphic::ImplGetAnimationLoopCount() const
// ------------------------------------------------------------------------
-void ImpGraphic::ImplResetAnimationLoopCount()
-{
- if( mpAnimation )
- mpAnimation->ResetLoopCount();
-}
-
-// ------------------------------------------------------------------------
-
GraphicReader* ImpGraphic::ImplGetContext()
{
return mpContext;
diff --git a/xmloff/inc/xmloff/VisAreaContext.hxx b/xmloff/inc/xmloff/VisAreaContext.hxx
index cdb04a9..62f9d4b 100644
--- a/xmloff/inc/xmloff/VisAreaContext.hxx
+++ b/xmloff/inc/xmloff/VisAreaContext.hxx
@@ -47,11 +47,6 @@ public:
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
Rectangle& rRect, const MapUnit aMapUnit);
- XMLVisAreaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
- ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit);
-
virtual ~XMLVisAreaContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx
index 727d092..c804256 100644
--- a/xmloff/source/style/VisAreaContext.cxx
+++ b/xmloff/source/style/VisAreaContext.cxx
@@ -62,16 +62,6 @@ XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
rRect.setHeight( rAwtRect.Height );
}
-XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList,
- ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
-{
- process( xAttrList, rRect, nMeasureUnit );
-}
-
XMLVisAreaContext::~XMLVisAreaContext()
{
}
commit 79a2a32edef3663306c670337897e056989d2cb1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 23 09:29:33 2011 +0100
fix windows xmlsecurity link
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 40a9f83..5cb8d4b 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -114,8 +114,9 @@ gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xmlsec1-mscrypto:ixmlsec1-mscrypto%,xmlsec-mscrypto:libxmlsec-mscrypto%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xmlsec1:ixmlsec1%,xmlsec:libxmlsec%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xmlsec1:ixmlsec1%,xmlsec1:libxmlsec%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xmlsec1-mscrypto:ixmlsec1-mscrypto%,xmlsec1-mscrypto:libxmlsec-mscrypto%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xmlsec1-nss:ixmlsec1-nss%,xmlsec1-nss:libxmlsec-nss%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
commit 7ba337359eaf76b73dfa7828e9efe8850257f9ce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 23 01:18:54 2011 +0100
merge these similar methods together
diff --git a/i18nutil/inc/i18nutil/x_rtl_ustring.h b/i18nutil/inc/i18nutil/x_rtl_ustring.h
index 6b644af..848cc9e 100644
--- a/i18nutil/inc/i18nutil/x_rtl_ustring.h
+++ b/i18nutil/inc/i18nutil/x_rtl_ustring.h
@@ -28,30 +28,23 @@
#ifndef INCLUDED_I18NUTIL_X_RTL_USTRING_H
#define INCLUDED_I18NUTIL_X_RTL_USTRING_H
-#ifndef _RTL_STRING_HXX_
#include <rtl/strbuf.hxx>
-#endif
#include <rtl/memory.h>
#include <rtl/alloc.h>
#include "i18nutildllapi.h"
/**
- * Allocates a new <code>rtl_uString</code> which can hold nLen + 1 characters.
- * The reference count is 0. The characters of room is not cleared.
- * This method is similar to rtl_uString_new_WithLength in rtl/ustring.h, but
- * can allocate a new string more efficiently. You need to "acquire" by such as
- * OUString( rtl_uString * value ) if you intend to use it for a while.
- * @param [output] newStr
- * @param [input] nLen
+ * Allocates a new <code>rtl_uString</code> with capacity of nLen + 1
+ * characters.
+ *
+ * The reference count is 0. The characters of the capacity are not cleared,
+ * unlike the similar method of rtl_uString_new_WithLength in rtl/ustring.h, so
+ * is more efficient for allocating a new string. You need to "acquire" by such
+ * as OUString( rtl_uString * value ) if you intend to use it for a while.
+ * @param nLen
+ * @return newStr
*/
-I18NUTIL_DLLPUBLIC inline void SAL_CALL x_rtl_uString_new_WithLength( rtl_uString ** newStr, sal_Int32 nLen, sal_Int32 _refCount = 0 )
-{
- *newStr = (rtl_uString*) rtl_allocateMemory ( sizeof(rtl_uString) + sizeof(sal_Unicode) * nLen);
- (*newStr)->refCount = _refCount;
- (*newStr)->length = nLen;
-}
-
I18NUTIL_DLLPUBLIC inline rtl_uString * SAL_CALL x_rtl_uString_new_WithLength( sal_Int32 nLen, sal_Int32 _refCount = 0 )
{
rtl_uString *newStr = (rtl_uString*) rtl_allocateMemory ( sizeof(rtl_uString) + sizeof(sal_Unicode) * nLen);
diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx
index 1152d9e..ed636b2 100644
--- a/i18nutil/source/utility/widthfolding.cxx
+++ b/i18nutil/source/utility/widthfolding.cxx
@@ -55,8 +55,7 @@ OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr, s
{
// Create a string buffer which can hold nCount * 2 + 1 characters.
// Its size may become double of nCount.
- rtl_uString * newStr;
- x_rtl_uString_new_WithLength( &newStr, nCount * 2 ); // defined in x_rtl_ustring.h The reference count is 0 now.
+ rtl_uString * newStr = x_rtl_uString_new_WithLength(nCount * 2 ); // defined in x_rtl_ustring.h The reference count is 0 now.
sal_Int32 *p = NULL;
sal_Int32 position = 0;
commit 050b80a6fc9b6f0c550c5ca20fa3c93e9552c13a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 23 00:38:42 2011 +0100
ditch deprecated api
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 89c3f84..23c207b 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -68,7 +68,7 @@
#include "lwptblformula.hxx"
#include "lwptablelayout.hxx"
-
+#include <rtl/ustrbuf.hxx>
#include <boost/scoped_array.hpp>
//////////////////////////////////////////////////////////////////
@@ -442,16 +442,9 @@ LwpFormulaConst::LwpFormulaConst(double dVal)
m_dVal = dVal;
}
-/**
-*
-* @date 03/26/2005
-* @param
-* @param
-* @return sal_Bool.
-*/
-String LwpFormulaConst::ToString(LwpTableLayout* /*pCellsMap*/)
+rtl::OUString LwpFormulaConst::ToString(LwpTableLayout* /*pCellsMap*/)
{
- return String::CreateFromDouble(m_dVal);
+ return rtl::OUString::valueOf(m_dVal);
}
/**
@@ -486,14 +479,8 @@ LwpFormulaCellAddr::LwpFormulaCellAddr(sal_Int16 aCol, sal_Int16 aRow)
* @param
* @return String
*/
-String LwpFormulaCellAddr::ToString(LwpTableLayout* pCellsMap)
+rtl::OUString LwpFormulaCellAddr::ToString(LwpTableLayout* pCellsMap)
{
-// String aCellAddr;
-// aCellAddr.AppendAscii("<");//<
-// aCellAddr+=m_aCol;
-// aCellAddr+=m_aRow;
-// aCellAddr.AppendAscii(">");//>
-
String aCellAddr;
aCellAddr.AppendAscii("<");//<
@@ -528,17 +515,8 @@ LwpFormulaCellRangeAddr::LwpFormulaCellRangeAddr(sal_Int16 aStartCol,
* @param
* @return String.
*/
-String LwpFormulaCellRangeAddr::ToString(LwpTableLayout* pCellsMap)
+rtl::OUString LwpFormulaCellRangeAddr::ToString(LwpTableLayout* pCellsMap)
{
-// String aCellAddr;
-// aCellAddr.AppendAscii("<");//<
-// aCellAddr+=m_aStartCol;
-// aCellAddr+=m_aStartRow;
-// aCellAddr.AppendAscii(":");
-// aCellAddr+=m_aEndCol;
-// aCellAddr+=m_aEndRow;
-// aCellAddr.AppendAscii(">");//>
-
String aCellAddr;
aCellAddr.AppendAscii("<");//<
@@ -605,11 +583,11 @@ void LwpFormulaFunc::AddArg(LwpFormulaArg* pArg)
*/
String LwpFormulaFunc::ToArgString(LwpTableLayout* pCellsMap)
{
- String aFormula;
- aFormula.AppendAscii("(");
- aFormula+=ToString(pCellsMap);
- aFormula.AppendAscii(")");
- return aFormula;
+ rtl::OUStringBuffer aFormula;
+ aFormula.append(static_cast<sal_Unicode>('('));
+ aFormula.append(ToString(pCellsMap));
+ aFormula.append(static_cast<sal_Unicode>(')'));
+ return aFormula.makeStringAndClear();
}
/**
* Convert the function to a formula string.
@@ -618,7 +596,7 @@ String LwpFormulaFunc::ToArgString(LwpTableLayout* pCellsMap)
* @param
* @return sal_Bool.
*/
-String LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap)
+rtl::OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap)
{
String aFormula;
@@ -654,7 +632,7 @@ String LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap)
* @param
* @return sal_Bool.
*/
-String LwpFormulaOp::ToString(LwpTableLayout* pCellsMap)
+rtl::OUString LwpFormulaOp::ToString(LwpTableLayout* pCellsMap)
{
String aFormula;
if (2==m_aArgs.size())
@@ -687,7 +665,7 @@ String LwpFormulaOp::ToString(LwpTableLayout* pCellsMap)
* @param
* @return sal_Bool.
*/
-String LwpFormulaUnaryOp::ToString(LwpTableLayout* pCellsMap)
+rtl::OUString LwpFormulaUnaryOp::ToString(LwpTableLayout* pCellsMap)
{
String aFormula;
if (1==m_aArgs.size())
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index 7901e83..648b926 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -109,7 +109,7 @@ class LwpTableLayout;
class LwpFormulaArg
{
public:
- virtual String ToString(LwpTableLayout* pCellsMap)=0;
+ virtual rtl::OUString ToString(LwpTableLayout* pCellsMap)=0;
virtual String ToArgString(LwpTableLayout* pCellsMap){ return ToString(pCellsMap);}
};
@@ -124,7 +124,7 @@ class LwpFormulaConst:public LwpFormulaArg
{
public:
LwpFormulaConst( double dVal);
- virtual String ToString(LwpTableLayout* pCellsMap);
+ virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
private:
double m_dVal;
};
@@ -133,7 +133,7 @@ class LwpFormulaText:public LwpFormulaArg
{
public:
LwpFormulaText( String aText);
- virtual String ToString(LwpTableLayout* /*pCellsMap*/){return m_aText;}
+ virtual rtl::OUString ToString(LwpTableLayout* /*pCellsMap*/){return m_aText;}
private:
String m_aText;
};
@@ -146,7 +146,7 @@ public:
sal_Int16 GetCol(){return m_aCol;}
sal_Int16 GetRow(){return m_aRow;}
- virtual String ToString(LwpTableLayout* pCellsMap);
+ virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
private:
sal_Int16 m_aCol;
sal_Int16 m_aRow;
@@ -157,7 +157,7 @@ class LwpFormulaCellRangeAddr:public LwpFormulaArg
public:
LwpFormulaCellRangeAddr(sal_Int16 aStartCol, sal_Int16 aStartRow, sal_Int16 aEndCol, sal_Int16 aEndRow);
- virtual String ToString(LwpTableLayout* pCellsMap);
+ virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
private:
sal_Int16 m_aStartCol;
sal_Int16 m_aStartRow;
@@ -173,7 +173,7 @@ public:
void AddArg(LwpFormulaArg* pArg);
- virtual String ToString(LwpTableLayout* pCellsMap);
+ virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
String ToArgString(LwpTableLayout* pCellsMap);
protected:
@@ -185,14 +185,14 @@ class LwpFormulaOp : public LwpFormulaFunc
{
public:
LwpFormulaOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
- String ToString(LwpTableLayout* pCellsMap);
+ virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
};
class LwpFormulaUnaryOp : public LwpFormulaFunc
{
public:
LwpFormulaUnaryOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;}
- String ToString(LwpTableLayout* pCellsMap);
+ virtual rtl::OUString ToString(LwpTableLayout* pCellsMap);
};
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index b75eaf2..a10db78 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1947,7 +1947,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
if( nPos != LISTBOX_ENTRY_NOTFOUND )
mpCBDuration->SelectEntryPos( nPos );
else
- mpCBDuration->SetText( String::CreateFromDouble( fDuration ) );
+ mpCBDuration->SetText(rtl::OUString::valueOf(fDuration));
}
}
@@ -1978,7 +1978,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
if( nPos != LISTBOX_ENTRY_NOTFOUND )
mpCBRepeat->SelectEntryPos( nPos );
else
- mpCBRepeat->SetText( String::CreateFromDouble( fRepeat ) );
+ mpCBRepeat->SetText(rtl::OUString::valueOf(fRepeat));
}
else if( aRepeatCount.getValueType() == ::getCppuType((const Timing*)0) )
{
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 79b59b8..e8eb645 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -36,6 +36,7 @@
#include <svtools/grfmgr.hxx>
#include <unotools/intlwrapper.hxx>
#include <comphelper/processfactory.hxx>
+#include <rtl/ustrbuf.hxx>
#include <fmtanchr.hxx>
#include <fmtfsize.hxx>
#include <fmtinfmt.hxx>
@@ -1204,22 +1205,21 @@ SfxItemPresentation SwGammaGrf::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/,
String &rText, const IntlWrapper* /*pIntl*/) const
{
+ rtl::OUStringBuffer aText;
switch( ePres )
{
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
- rText = SW_RESSTR( STR_GAMMA );
- else if( rText.Len() )
- rText.Erase();
- ( rText += UniString::CreateFromDouble( GetValue() )) += '%';
+ aText.append(SW_RESSTR(STR_GAMMA));
+ aText.append(GetValue()).append(static_cast<sal_Unicode>('%'));
break;
default:
ePres = SFX_ITEM_PRESENTATION_NONE;
- rText.Erase();
break;
}
+ rText = aText.makeStringAndClear();
return ePres;
}
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index ae4d8a9..fc03584 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -199,8 +199,6 @@ public:
return rtl::OString (reinterpret_cast<rtl_String*>(mpData));
}
- sal_Int32 ToInt32() const;
-
ByteString& Assign( const ByteString& rStr );
ByteString& Assign( const rtl::OString& rStr );
ByteString& Assign( const sal_Char* pCharStr );
@@ -446,8 +444,6 @@ public:
static UniString CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
static UniString CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 );
- static UniString CreateFromFloat( float f );
- static UniString CreateFromDouble( double d );
static const UniString& EmptyString();
sal_Int32 ToInt32() const;
sal_Int64 ToInt64() const;
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index 7a04ea2..6243889 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -1609,13 +1609,13 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize)
if (pMsg->GetMultipartBoundary().Len() == 0)
{
// Determine boundary.
- ByteString aType (
- pMsg->GetContentType(), RTL_TEXTENCODING_ASCII_US);
- ByteString aLowerType (aType);
+ rtl::OString aType(rtl::OUStringToOString(
+ pMsg->GetContentType(), RTL_TEXTENCODING_ASCII_US));
+ ByteString aLowerType(aType);
aLowerType.ToLowerAscii();
sal_uInt16 nPos = aLowerType.Search ("boundary=");
- ByteString aBoundary (aType.Copy (nPos + 9));
+ ByteString aBoundary(aType.copy(nPos + 9));
aBoundary.EraseLeadingAndTrailingChars (' ');
aBoundary.EraseLeadingAndTrailingChars ('"');
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index db7820e..a1f5539 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -896,8 +896,8 @@ sal_Bool SvStream::WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding
return WriteUnicodeText( rStr );
else
{
- ByteString aStr( rStr, eDestCharSet );
- Write( aStr.GetBuffer(), aStr.Len() );
+ rtl::OString aStr(rtl::OUStringToOString(rStr, eDestCharSet));
+ Write(aStr.getStr(), aStr.getLength());
return nError == SVSTREAM_OK;
}
}
@@ -910,7 +910,7 @@ sal_Bool SvStream::WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding
sal_Bool SvStream::WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet )
{
- return WriteLine( ByteString( rStr, eDestCharSet ) );
+ return WriteLine(rtl::OUStringToOString(rStr, eDestCharSet));
}
sal_Bool SvStream::WriteLine( const ByteString& rStr )
@@ -947,8 +947,8 @@ sal_Bool SvStream::WriteUniOrByteChar( sal_Unicode ch, rtl_TextEncoding eDestCha
*this << ch;
else
{
- ByteString aStr( ch, eDestCharSet );
- Write( aStr.GetBuffer(), aStr.Len() );
+ rtl::OString aStr(&ch, 1, eDestCharSet);
+ Write(aStr.getStr(), aStr.getLength());
}
return nError == SVSTREAM_OK;
}
@@ -1583,7 +1583,7 @@ SvStream& SvStream::WriteByteString( const UniString& rStr, rtl_TextEncoding eDe
return *this;
}
- return WriteByteString(ByteString( rStr, eDestCharSet ));
+ return WriteByteString(rtl::OUStringToOString(rStr, eDestCharSet));
}
// -----------------------------------------------------------------------
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 5c74122..04d45a3 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -736,12 +736,14 @@ void SvFileStream::Close()
{
InternalStreamLock::UnlockFile( 0, 0, this );
- if ( IsOpen() )
+ if ( IsOpen() )
{
#ifdef DBG_UTIL
- ByteString aTraceStr( "SvFileStream::Close(): " );
- aTraceStr += ByteString(aFilename, osl_getThreadTextEncoding());
- OSL_TRACE( "%s", aTraceStr.GetBuffer() );
+ rtl::OStringBuffer aTraceStr(
+ RTL_CONSTASCII_STRINGPARAM("SvFileStream::Close(): "));
+ aTraceStr.append(rtl::OUStringToOString(aFilename,
+ osl_getThreadTextEncoding()));
+ OSL_TRACE("%s", aTraceStr.getStr());
#endif
Flush();
diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx
index e0872ee..833e0d4 100644
--- a/tools/source/string/tstring.cxx
+++ b/tools/source/string/tstring.cxx
@@ -90,15 +90,6 @@ xub_StrLen ImplStringLen( const sal_Unicode* pStr )
// -----------------------------------------------------------------------
-sal_Int32 ByteString::ToInt32() const
-{
- DBG_CHKTHIS( ByteString, DbgCheckByteString );
-
- return atoi( mpData->maStr );
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool ByteString::IsLowerAscii() const
{
DBG_CHKTHIS( ByteString, DbgCheckByteString );
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index c7ab316..877b6d8 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -93,26 +93,6 @@ UniString UniString::CreateFromInt64( sal_Int64 n, sal_Int16 nRadix )
// -----------------------------------------------------------------------
-UniString UniString::CreateFromFloat( float f )
-{
- sal_Unicode aBuf[RTL_USTR_MAX_VALUEOFFLOAT];
- BOOST_STATIC_ASSERT(RTL_USTR_MAX_VALUEOFFLOAT <= STRING_MAXLEN);
- return UniString(
- aBuf, static_cast< xub_StrLen >(rtl_ustr_valueOfFloat( aBuf, f )) );
-}
-
-// -----------------------------------------------------------------------
-
-UniString UniString::CreateFromDouble( double d )
-{
- sal_Unicode aBuf[RTL_USTR_MAX_VALUEOFDOUBLE];
- BOOST_STATIC_ASSERT(RTL_USTR_MAX_VALUEOFDOUBLE <= STRING_MAXLEN);
- return UniString(
- aBuf, static_cast< xub_StrLen >(rtl_ustr_valueOfDouble( aBuf, d )) );
-}
-
-// -----------------------------------------------------------------------
-
namespace { struct Empty : public rtl::Static< const UniString, Empty> {}; }
const UniString& UniString::EmptyString()
{
commit af6ce167af13f896e1786ef7d3c2d194aaf1c3dd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 22 22:38:02 2011 +0100
fix this up
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
index 874f127..f285ef5 100644
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestdoc/data/Global.xml
@@ -120,6 +120,7 @@ Dim gDlgState as Integer
Sub SetGlobalDoc
gOutputDoc = ThisComponent
+ oBinFilterComp = createUnoService( "com.sun.star.comp.office.BF_MigrateFilter" )
end Sub
Sub ClearStatus
@@ -147,8 +148,6 @@ Sub Main
gCurrentDocTest = frmTestClosure
gCurrentTestCase = cLogfileFailed
- oBinFilterComp = createUnoService( "com.sun.star.comp.office.BF_MigrateFilter" )
-
DeleteAllSavedFiles()
DeleteAllLogFiles()
SetupWorkPath()
@@ -536,7 +535,7 @@ Sub SetGlobalOptionsDialog ()
REM create dialog control
gOptionsDialog = CreateUnoDialog( oInputStreamProvider )
- if not isNull(oBinFilterComp) then
+ if isNull(oBinFilterComp) then
oControl = gOptionsDialog.getControl("cbOpen50Test")
oControl.Model.setPropertyValue("Enabled", FALSE)
end If
commit 0ea3ef86a189197b4b8f8a4a7180b9070b94741f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 22 22:27:32 2011 +0100
better test for this that doesn't depend on env
diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
index ce8807e..874f127 100644
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestdoc/data/Global.xml
@@ -114,6 +114,8 @@ Global bMakeSaveOpen8Test as boolean
global sExtensionURL as string
+global oBinFilterComp as Object
+
Dim gDlgState as Integer
Sub SetGlobalDoc
@@ -145,6 +147,8 @@ Sub Main
gCurrentDocTest = frmTestClosure
gCurrentTestCase = cLogfileFailed
+ oBinFilterComp = createUnoService( "com.sun.star.comp.office.BF_MigrateFilter" )
+
DeleteAllSavedFiles()
DeleteAllLogFiles()
SetupWorkPath()
@@ -532,10 +536,10 @@ Sub SetGlobalOptionsDialog ()
REM create dialog control
gOptionsDialog = CreateUnoDialog( oInputStreamProvider )
- if Environ("WITH_BINFILTER") <> "YES" then
+ if not isNull(oBinFilterComp) then
oControl = gOptionsDialog.getControl("cbOpen50Test")
oControl.Model.setPropertyValue("Enabled", FALSE)
- End If
+ end If
end Sub
@@ -593,11 +597,11 @@ Sub GetOptions
gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)))
gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutputDoc)))
gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc)))
- if Environ("WITH_BINFILTER") = "YES" then
+ if not isNull(oBinFilterComp) then
gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)))
else
gOptionsDialog.getControl("cbOpen50Test").setState(0)
- End If
+ end If
gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)))
gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)))
End Sub
@@ -615,7 +619,7 @@ Sub ReadOptions
bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutputDoc)
bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutputDoc)
bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutputDoc)
- if Environ("WITH_BINFILTER") = "YES" then
+ if not isNull(oBinFilterComp) then
bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)
else
bMakeOpen50Test = false
@@ -643,7 +647,7 @@ Sub SetDefaultOptions
End If
bMakeSaveOpenXMLTest = true
REM Disable StarOffice 5.0 tests in case binfilter has not been included
- if Environ("WITH_BINFILTER") = "YES" then
+ if not isNull(oBinFilterComp) then
bMakeOpen50Test = true
else
bMakeOpen50Test = false
commit 43f8cba7d238e6db25e05edd0d9713dcc42fc861
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 22 21:51:44 2011 +0100
callcatcher: yet more unused code
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 13b8579..0292186 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -313,21 +313,4 @@ XFContentContainer* LwpBulletStyleMgr::AddBulletList(
return InnerItem;
}
-rtl::OUString LwpBulletStyleMgr::GetSectionName(LwpPara* pPara)
-{
- LwpObjectID* pStoryID = pPara->GetStoryID();
- if (pStoryID->IsNull())
- {
- return rtl::OUString();
- }
-
- LwpStory* pStory = dynamic_cast<LwpStory*>(pStoryID->obj(VO_STORY));
- if (!pStory)
- {
- return rtl::OUString();
- }
-
- return pStory->GetSectionName();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index 4809f0d..a2caa32 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -102,19 +102,12 @@ public:
inline LwpNumberingOverride* GetCurrentNumOver();
private:
- rtl::OUString GetSectionName(LwpPara* pPara);
-
-private:
-// std::vector <XFListStyle*> m_aBulletStyleList;
typedef std::pair<boost::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair;
std::vector <rtl::OUString> m_vStyleNameList;
std::vector <OverridePair> m_vIDsPairList;
rtl::OUString m_aCurrentStyleName;
LwpFoundry* m_pFoundry;
XFList* m_pBulletList;
-// UChar32 m_nCurrentChar;
-// rtl::OUString m_strCurrentFontName;
-// rtl::OUString m_strCurrentNumberingName;
sal_Bool m_bContinue;
sal_Bool m_bIsBulletSkipped;
LwpObjectID m_aCurrentNumberingID;
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 03895d0..8112069 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -638,28 +638,7 @@ void LwpCellLayout::Read()
pStrm->SkipExtra();
}
}
-/**
- * @short Get leader char
- * @param none
- * @return char ascii, if none, return 0
- */
-sal_uInt8 LwpCellLayout::GetLeaderChar()
-{
- switch(cType)
- {
- case LDT_NONE:
- return 0;
- case LDT_DOTS:
- return '.';
- case LDT_DASHES:
- return '-';
- case LDT_UNDERSCORES:
- return '_';
- default:
- assert(sal_False);
- }
- return 0;
-}
+
/**
* Apply protect attribute to cell of table
* @date 04/04/2005
diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx
index 78c6229..587e135 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.hxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.hxx
@@ -103,18 +103,14 @@ public:
LwpTableLayout * GetTableLayout();
virtual void SetCellMap(void);
double GetActualWidth();
- sal_uInt8 GetLeaderChar();
OUString GetNumfmtName(){return m_NumfmtName;}
protected:
void Read();
-// LwpTableLayout * GetTableLayout();
LwpTable * GetTable();
void ApplyPadding(XFCellStyle* pCellStyle);
void ApplyBorders(XFCellStyle* pCellStyle);
- // add by , 06/03/2005
void ApplyPatternFill(XFCellStyle* pCellStyle);
void ApplyBackGround(XFCellStyle* pCellStyle);
- // end add
void ApplyBackColor(XFCellStyle* pCellStyle);
void ApplyWatermark(XFCellStyle* pCellStyle);
void ApplyProtect(XFCell * pCell, LwpObjectID aTableID);
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.cxx b/lotuswordpro/source/filter/lwpcharborderoverride.cxx
index baf8df5..9e63be2 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.cxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.cxx
@@ -118,54 +118,4 @@ void LwpCharacterBorderOverride::Read(LwpObjectStream* pStrm)
pStrm->SkipExtra();
}
-void LwpCharacterBorderOverride::Override(LwpCharacterBorderOverride* pOther)
-{
- if (m_nApply & PBO_STUFF)
- {
- if (this->IsBorderStuffOverridden())
- {
- pOther->OverrideBorderStuff(m_pBorderStuff);
- }
- else
- {
- pOther->RevertBorderStuff();
- }
- }
-
- if (m_nApply & PBO_MARGINS)
- {
- if (this->IsMarginsOverridden())
- {
- pOther->OverrideMargins(m_pMargins);
- }
- else
- {
- pOther->RevertMargins();
- }
- }
-
- if (m_nApply & PBO_ABOVE)
- {
- if (this->IsAboveWidthOverridden())
- {
- pOther->OverrideAboveWidth(m_nAboveWidth);
- }
- else
- {
- pOther->RevertAboveWidth();
- }
- }
-
- if (m_nApply & PBO_BELOW)
- {
- if (this->IsBelowWidthOverridden())
- {
- pOther->OverrideBelowWidth(m_nBelowWidth);
- }
- else
- {
- pOther->RevertBelowWidth();
- }
- }
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.hxx b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
index 7908620..4e08e43 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.hxx
@@ -80,8 +80,6 @@ public:
void Read(LwpObjectStream* pStrm);
- void Override(LwpCharacterBorderOverride* pOther);
-
inline LwpBorderStuff* GetBorderStuff();
inline LwpMargins* GetMargins();
inline sal_Int32 GetAboveWidth() const;
diff --git a/lotuswordpro/source/filter/lwpdllist.cxx b/lotuswordpro/source/filter/lwpdllist.cxx
index ee4edd4..abf4d66 100644
--- a/lotuswordpro/source/filter/lwpdllist.cxx
+++ b/lotuswordpro/source/filter/lwpdllist.cxx
@@ -64,11 +64,6 @@
#include "lwpdllist.hxx"
-LwpDLList::LwpDLList(LwpDLList* Next, LwpDLList* Previous)
-{
- insert(Next, Previous);
-}
-
LwpDLList::LwpDLList(void)
{
m_pNext = m_pPrevious = NULL;
diff --git a/lotuswordpro/source/filter/lwpdllist.hxx b/lotuswordpro/source/filter/lwpdllist.hxx
index f16918a..f250bd8 100644
--- a/lotuswordpro/source/filter/lwpdllist.hxx
+++ b/lotuswordpro/source/filter/lwpdllist.hxx
@@ -68,7 +68,6 @@
class LwpDLList
{
public:
- LwpDLList(LwpDLList*,LwpDLList*);
LwpDLList(void);
virtual ~LwpDLList();
void insert(LwpDLList*, LwpDLList*);
diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx
index c69e1f0..2f2526c 100644
--- a/lotuswordpro/source/filter/lwpdocdata.cxx
+++ b/lotuswordpro/source/filter/lwpdocdata.cxx
@@ -69,24 +69,7 @@ LwpDocData::LwpDocData(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
LwpDocData::~LwpDocData()
{
}
-void LwpDocData::SkipExtra(LwpSvStream* pStream)
-{
- sal_uInt16 extra;
- pStream->Read(&extra,2);
- while(extra != 0)
- {
- pStream->SeekRel(extra);
- pStream->Read(&extra,2);
- }
-}
-void LwpDocData::SkipAtomHandler(LwpSvStream* pStream)
-{
- sal_uInt16 disksize;
- sal_uInt16 len;
- pStream->Read(&disksize,2);
- pStream->Read(&len,2);
- if(len)pStream->SeekRel(disksize-2);
-}
+
void LwpDocData::Read()
{
//XFDateTime
diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/source/filter/lwpdocdata.hxx
index 2e31974..e5aa366 100644
--- a/lotuswordpro/source/filter/lwpdocdata.hxx
+++ b/lotuswordpro/source/filter/lwpdocdata.hxx
@@ -175,19 +175,12 @@ private:
LtTm m_nLastRevisionTime;
LtTm m_nTotalEditTime;
private:
- void SkipExtra(LwpSvStream* pStream);
- void SkipAtomHandler(LwpSvStream* pStream);
rtl::OUString DateTimeToOUString(LtTm& dt);
rtl::OUString TimeToOUString(LtTm& dt);
public:
- //inline sal_uInt8* GetBuffer(){return m_DataBuffer;}
void Read();
void Parse(IXFStream *pOutputStream);
-// LwpEditorAttr* GetEditorList(){return m_pEditorAttrList;}
- //static OUString GetEditorName(sal_uInt8 nID);
- //static XFColor GetHighLightColor(sal_uInt8 nID);
- //static void Reset();
};
#endif
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index 3279efc..31d471b 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -123,10 +123,7 @@ public:
void SetAttr (const SCROW nRow, const ScPatternAttr&);
- void Apply (const SCCOL nCol, const SCTAB nTab, const sal_Bool bClear = true);
-
- void Clear ();
-
+ void Apply (const SCCOL nCol, const SCTAB nTab );
private:
struct ENTRY
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index e997c0d..d15ff3c 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -234,7 +234,7 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr )
}
-void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const sal_Bool /*bClear*/ )
+void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum )
{
ScDocument* pDoc = pLotusRoot->pDoc;
@@ -246,12 +246,6 @@ void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const sal_Bool
}
}
-
-void LotAttrCol::Clear ()
-{
- aEntries.clear();
-}
-
void LotAttrTable::SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow,
const LotAttrWK3& rAttr )
{
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index b9e4b18..50552ec 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -171,7 +171,6 @@ public:
void Record( SfxMacroStatement *pStatement );
void Replace( SfxMacroStatement *pStatement );
void Remove();
- const SfxMacroStatement*GetLastStatement() const;
String GenerateSource() const;
};
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index dba159d..b2c9995 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -168,7 +168,6 @@ public:
sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; }
void DownLoad( const Link& aLink = Link());
void SetDoneLink( const Link& rLink );
- Link GetDoneLink( ) const;
void SetDataAvailableLink( const Link& rLink );
sal_uInt32 GetErrorCode() const;
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index c6756dc..a76e6fa 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -195,7 +195,6 @@ public:
SAL_DLLPRIVATE void SetIsClosing_Impl();
// Methods for accessing the current set
- SAL_DLLPRIVATE void SetDescriptor( SfxFrameDescriptor* );
SAL_DLLPRIVATE SfxFrameDescriptor* GetDescriptor() const;
SAL_DLLPRIVATE void Lock_Impl( sal_Bool bLock );
@@ -213,7 +212,6 @@ public:
SAL_DLLPRIVATE void SetToolSpaceBorderPixel_Impl( const SvBorder& );
SAL_DLLPRIVATE Rectangle GetTopOuterRectPixel_Impl() const;
SAL_DLLPRIVATE void CreateWorkWindow_Impl();
- SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* pWorkwin );
SAL_DLLPRIVATE void GrabFocusOnComponent_Impl();
SAL_DLLPRIVATE void SetInPlace_Impl( sal_Bool );
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index abd12ad..168a302 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -103,9 +103,6 @@ public:
SfxFrameDescriptor();
~SfxFrameDescriptor();
- // Properties
- void TakeProperties( const SfxFrameProperties& rProp );
-
// FileName/URL
SfxItemSet* GetArgs();
const INetURLObject& GetURL() const
diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx
index 9521d69..a3ac30b 100644
--- a/sfx2/inc/sfx2/frmhtmlw.hxx
+++ b/sfx2/inc/sfx2/frmhtmlw.hxx
@@ -75,9 +75,6 @@ public:
SvStream&, const String& rBaseURL, const com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet >& xSet,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
String *pNonConvertableChars = 0 );
-
- String CreateURL( SfxFrame* pFrame );
-
};
inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 104a677..d1c58e3 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -455,7 +455,6 @@ public:
void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, sal_Bool bReload = sal_True );
sal_Bool IsAutoLoadLocked() const;
void NotifyReloadAvailable();
- sal_Bool IsSecure();
// Misc
sal_Bool IsPreview() const;
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index d1fcf16..fc08a76 100644
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/sfx2/inc/sfx2/unoctitm.hxx
@@ -160,7 +160,6 @@ public:
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
void SetMasterUnoCommand( sal_Bool bSet );
- sal_Bool IsMasterUnoCommand() const;
SfxDispatcher* GetDispatcher_Impl();
};
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index ed4c986..0be0c5d 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -307,16 +307,6 @@ void SfxPickList::ExecuteMenuEntry( sal_uInt16 nId )
ExecuteEntry( (sal_uInt32)( nId - START_ITEMID_PICKLIST ) );
}
-String SfxPickList::GetMenuEntryTitle( sal_uInt32 nIndex )
-{
- PickListEntry *pPick = SfxPickList::Get().GetPickListEntry( nIndex );
-
- if ( pPick )
- return pPick->aTitle;
- else
- return String();
-}
-
void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.IsA( TYPE( SfxStringHint )))
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index be086d1..dcbefab 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -338,18 +338,4 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
{
}
}
-
-String SfxFrameHTMLWriter::CreateURL( SfxFrame* pFrame )
-{
- String aRet;
- SfxObjectShell* pShell = pFrame->GetCurrentDocument();
- if( !aRet.Len() && pShell )
- {
- aRet = pShell->GetMedium()->GetName();
- }
-
- return aRet;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index d14ac4b..d3edf45 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -443,7 +443,6 @@ void SfxMacro::Record
<SfxMacro::Replace(SfxMacroStatement*)>
<SfxMacro::Remove()>
- <SfxMacro::GetLastStatement()const>
*/
{
@@ -482,7 +481,6 @@ void SfxMacro::Replace
<SfxMacro::Record(SfxMacroStatement*)>
<SfxMacro::Remove()>
- <SfxMacro::GetLastStatement()const>
*/
{
@@ -519,7 +517,6 @@ void SfxMacro::Remove()
<SfxMacro::Replace(SfxMacroStatement*)>
<SfxMacro::Record(SfxMacroStatement*)>
- <SfxMacro::GetLastStatement()const>
*/
{
@@ -530,33 +527,6 @@ void SfxMacro::Remove()
//--------------------------------------------------------------------
-const SfxMacroStatement* SfxMacro::GetLastStatement() const
-
-/* [Description]
-
- This method enables read access to the last recorded statement.
- Together with the method <SfxMacro::Replace(SfxMacroStatement*)> this opens
- for the possibility to summarize statements.
-
- The call is only valid if it is about a SfxMacro, which was constructed
- with SFX_MACRO_RECORDINGRELATIVE or SFX_MACRO_RECORDINGABSOLUTE and is
- available as an already recorded statement.
-
- [Cross-reference]
-
- <SfxMacro::Record(SfxMacroStatement*)>
- <SfxMacro::Replace(SfxMacroStatement*)>
-*/
-
-{
- DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
- if ( pImp->aList.Count() )
- return pImp->aList.GetObject( pImp->aList.Count() - 1 );
- return 0;
-}
-
-//--------------------------------------------------------------------
-
String SfxMacro::GenerateSource() const
/* [Description]
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e512340..752c825 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -431,13 +431,6 @@ void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet )
pControllerItem->setMasterSlaveCommand( bSet );
}
-sal_Bool SfxOfficeDispatch::IsMasterUnoCommand() const
-{
- if ( pControllerItem )
- return pControllerItem->isMasterSlaveCommand();
- return sal_False;
-}
-
// Determine if URL contains a master/slave command which must be handled a little bit different
sal_Bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL )
{
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 184768e..ddeadec 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -775,12 +775,6 @@ sal_Bool SfxMedium::IsStorage()
}
//------------------------------------------------------------------
-Link SfxMedium::GetDoneLink() const
-{
- return pImp->aDoneLink.GetLink();
-}
-
-//------------------------------------------------------------------
sal_Bool SfxMedium::IsPreview_Impl()
{
sal_Bool bPreview = sal_False;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 1856a2c..5105730 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -183,21 +183,6 @@ long SfxFrameDescriptor::GetSize() const
return nWidth;
}
-void SfxFrameDescriptor::TakeProperties( const SfxFrameProperties& rProp )
-{
- aURL = aActualURL = INetURLObject(rProp.aURL);
- aName = rProp.aName;
- aMargin.Width() = rProp.lMarginWidth;
- aMargin.Height() = rProp.lMarginHeight;
- nWidth = rProp.lSize;
- eScroll = rProp.eScroll;
- eSizeSelector = rProp.eSizeSelector;
- nHasBorder = rProp.bHasBorder ? BORDER_YES : BORDER_NO;
- if ( rProp.bBorderSet )
- nHasBorder |= BORDER_SET;
- bResizeHorizontal = bResizeVertical = rProp.bResizable;
-}
-
void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper )
{
DELETEZ( pImp->pWallpaper );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 2f12a8b..3020513 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1813,49 +1813,6 @@ sal_Bool SfxObjectShell::IsPreview() const
return bPreview;
}
-sal_Bool SfxObjectShell::IsSecure()
-{
- // When global warning is on, go to Secure-Referer-Liste
- String aReferer = GetMedium()->GetName();
- if ( !aReferer.Len() )
- {
- // for new documents use the template as reference
- ::rtl::OUString aTempl( getDocProperties()->getTemplateURL() );
- if ( aTempl.getLength() )
- aReferer = INetURLObject( aTempl ).GetMainURL( INetURLObject::NO_DECODE );
- }
-
- INetURLObject aURL( "macro:" );
- if ( !aReferer.Len() )
- // empty new or embedded document
- return sal_True;
-
- SvtSecurityOptions aOpt;
-
- if( aOpt.GetBasicMode() == eALWAYS_EXECUTE )
- return sal_True;
-
- if( aOpt.GetBasicMode() == eNEVER_EXECUTE )
- return sal_False;
-
- if ( aOpt.IsSecureURL( aURL.GetMainURL( INetURLObject::NO_DECODE ), aReferer ) )
- {
- if ( GetMedium()->GetContent().is() )
- {
- Any aAny( ::utl::UCBContentHelper::GetProperty( aURL.GetMainURL( INetURLObject::NO_DECODE ), String( RTL_CONSTASCII_USTRINGPARAM("IsProtected")) ) );
- sal_Bool bIsProtected = sal_False;
- if ( ( aAny >>= bIsProtected ) && bIsProtected )
- return sal_False;
- else
- return sal_True;
- }
- else
- return sal_True;
- }
- else
- return sal_False;
-}
-
void SfxObjectShell::SetWaitCursor( sal_Bool bSet ) const
{
for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, this ) )
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 855eb99..7990905 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -75,7 +75,6 @@ class SfxPickList : public SfxListener
void CreateMenuEntries( Menu* pMenu );
void ExecuteMenuEntry( sal_uInt16 nId );
void ExecuteEntry( sal_uInt32 nIndex );
- String GetMenuEntryTitle( sal_uInt32 nIndex );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
};
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 7b429e5..cb0dc69 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -455,23 +455,6 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc )
//-------------------------------------------------------------------------
-void SfxFrame::SetDescriptor( SfxFrameDescriptor *pD )
-{
- DBG_ASSERT( pD, "No Descriptor!" );
- DBG_ASSERT( pD != pImp->pDescr, "Descriptor is already set!" );
-
- if ( pImp->pDescr )
- {
- // Only TopLevel-Frames handels their Descriptor, for the others
- // this is done by the Frameset
- if ( !pParentFrame )
- delete pImp->pDescr;
- }
- pImp->pDescr = pD;
-}
-
-//-------------------------------------------------------------------------
-
SfxFrameDescriptor* SfxFrame::GetDescriptor() const
{
// Create a FrameDescriptor On Demand; if there is no TopLevel-Frame
@@ -832,11 +815,6 @@ SfxWorkWindow* SfxFrame::GetWorkWindow_Impl() const
return NULL;
}
-void SfxFrame::SetWorkWindow_Impl( SfxWorkWindow* pWorkwin )
-{
- pImp->pWorkWin = pWorkwin;
-}
-
void SfxFrame::CreateWorkWindow_Impl()
{
SfxFrame* pFrame = this;
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index f7966fc..54bbdfb 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -88,7 +88,6 @@ public:
virtual void Resize();
virtual void GetFocus();
void DoResize();
- DECL_LINK( CloserHdl, void* );
};
SfxFrameWindow_Impl::SfxFrameWindow_Impl( SfxFrame* pF, Window& i_rContainerWindow )
@@ -394,16 +393,6 @@ void SfxFrame::LockResize_Impl( sal_Bool bLock )
pImp->bLockResize = bLock;
}
-IMPL_LINK( SfxFrameWindow_Impl, CloserHdl, void*, EMPTYARG )
-{
- if ( pFrame && !pFrame->PrepareClose_Impl( sal_True ) )
- return 0L;
-
- if ( pFrame )
- pFrame->GetCurrentViewFrame()->GetBindings().Execute( SID_CLOSEWIN, 0, 0, SFX_CALLMODE_ASYNCHRON );
- return 0L;
-}
-
void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn )
{
pImp->bMenuBarOn = bOn;
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index d21897f..5a7899f 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -214,7 +214,6 @@ friend class SfxStyleSheetBase;
SfxStyleSheetBasePool_Impl *pImp;
private:
- SVL_DLLPRIVATE sal_Bool Load1_Impl( SvStream& );
SVL_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl();
protected:
String aAppName;
@@ -234,8 +233,6 @@ public:
SfxStyleSheetBasePool( SfxItemPool& );
SfxStyleSheetBasePool( const SfxStyleSheetBasePool& );
- static String GetStreamName();
-
const String& GetAppName() const { return aAppName; }
SfxItemPool& GetPool();
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index d5c04cf..be5c51e 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -52,9 +52,6 @@
#include <algorithm>
#include <comphelper/servicehelper.hxx>
-#define STYLESTREAM "SfxStyleSheets"
-#define STYLESTREAM_VERSION sal_uInt16(50)
-
#ifdef DBG_UTIL
class DbgStyleSheetReferences
{
@@ -659,14 +656,6 @@ sal_uInt16 SfxStyleSheetBasePool::GetSearchMask() const
return nMask;
}
-
-// Der Name des Streams
-
-String SfxStyleSheetBasePool::GetStreamName()
-{
- return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STYLESTREAM));
-}
-
/////////////////////////////////// Factory ////////////////////////////////
@@ -894,101 +883,6 @@ void SfxStyleSheetBase::Store( SvStream& )
{
}
-sal_Bool SfxStyleSheetBasePool::Load1_Impl( SvStream& rStream )
-{
- aAppName = rPool.GetName();
- sal_uInt16 nVersion;
- short nCharSet;
- rStream >> nVersion;
-
- if(nVersion!=STYLESTREAM_VERSION)
- nCharSet=nVersion;
- else
- rStream >> nCharSet;
-
- rtl_TextEncoding eEnc = GetSOLoadTextEncoding(
- (rtl_TextEncoding)nCharSet,
- sal::static_int_cast< sal_uInt16 >(rStream.GetVersion()) );
- rtl_TextEncoding eOldEnc = rStream.GetStreamCharSet();
- rStream.SetStreamCharSet( eEnc );
-
- sal_uInt16 nStyles;
- rStream >> nStyles;
- sal_uInt16 i;
- for ( i = 0; i < nStyles; i++ )
- {
- // kann nicht mehr weiterlesen?
- if ( rStream.GetError() )
- {
- nStyles = i;
- break;
- }
-
- // Globale Teile
- XubString aName, aParent, aFollow;
- String aHelpFile;
- sal_uInt16 nFamily, nStyleMask,nCount;
- sal_uInt32 nHelpId;
- rStream.ReadByteString(aName, eEnc );
- rStream.ReadByteString(aParent, eEnc );
- rStream.ReadByteString(aFollow, eEnc );
- rStream >> nFamily >> nStyleMask;
- SfxPoolItem::readByteString(rStream, aHelpFile);
- if(nVersion!=STYLESTREAM_VERSION)
- {
- sal_uInt16 nTmpHelpId;
- rStream >> nTmpHelpId;
- nHelpId=nTmpHelpId;
- }
- else
- rStream >> nHelpId;
-
- SfxStyleSheetBase& rSheet = Make( aName, (SfxStyleFamily)nFamily , nStyleMask);
- rSheet.SetHelpId( aHelpFile, nHelpId );
- // Hier erst einmal Parent und Follow zwischenspeichern
- rSheet.aParent = aParent;
- rSheet.aFollow = aFollow;
- sal_uInt32 nPos = rStream.Tell();
- rStream >> nCount;
- if(nCount) {
- rStream.Seek( nPos );
- // Das Laden des ItemSets bedient sich der Methode GetItemSet(),
- // damit eigene ItemSets untergeschoben werden koennen
- SfxItemSet& rSet = rSheet.GetItemSet();
- rSet.ClearItem();
-//! SfxItemSet aTmpSet( *pTmpPool );
- /*!aTmpSet*/ rSet.Load( rStream );
- //! rSet.Put( aTmpSet );
- }
- // Lokale Teile
- sal_uInt32 nSize;
- sal_uInt16 nVer;
- rStream >> nVer >> nSize;
- nPos = rStream.Tell() + nSize;
- rSheet.Load( rStream, nVer );
- rStream.Seek( nPos );
- }
-
- //! delete pTmpPool;
- // Jetzt Parent und Follow setzen. Alle Sheets sind geladen.
- // Mit Setxxx() noch einmal den String eintragen, da diese
- // virtuellen Methoden evtl. ueberlagert sind.
- for ( i = 0; i < nStyles; i++ )
- {
- SfxStyleSheetBase* p = aStyles[ i ].get();
- XubString aText = p->aParent;
- p->aParent.Erase();
- p->SetParent( aText );
- aText = p->aFollow;
- p->aFollow.Erase();
- p->SetFollow( aText );
- }
-
- rStream.SetStreamCharSet( eOldEnc );
-
- return sal_Bool( rStream.GetError() == SVSTREAM_OK );
-}
-
SfxItemPool& SfxStyleSheetBasePool::GetPool()
{
return rPool;
diff --git a/unusedcode.easy b/unusedcode.easy
index 0c331ad..413b9ea 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -339,13 +339,6 @@ LongCurrencyFormatter::IsValueModified() const
LongCurrencyFormatter::Normalize(BigInt) const
LongCurrencyFormatter::SetEmptyValue()
LotAttrCache::ENTRY::ENTRY(ScPatternAttr const&)
-LotAttrCol::Clear()
-LwpBulletStyleMgr::GetSectionName(LwpPara*)
-LwpCellLayout::GetLeaderChar()
-LwpCharacterBorderOverride::Override(LwpCharacterBorderOverride*)
-LwpDLList::LwpDLList(LwpDLList*, LwpDLList*)
-LwpDocData::SkipAtomHandler(LwpSvStream*)
-LwpDocData::SkipExtra(LwpSvStream*)
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
@@ -879,18 +872,13 @@ SfxFoundCacheArr_Impl::Remove(SfxFoundCache_Impl const*&, unsigned short)
SfxFoundCacheArr_Impl::Remove(unsigned short, unsigned short)
SfxFrame::GetBroadcaster() const
SfxFrame::IsTop() const
-SfxFrame::SetDescriptor(SfxFrameDescriptor*)
-SfxFrame::SetWorkWindow_Impl(SfxWorkWindow*)
SfxFrameDescriptor::CheckContent() const
SfxFrameDescriptor::GetItemPos() const
SfxFrameDescriptor::GetSize() const
SfxFrameDescriptor::GetWallpaper() const
SfxFrameDescriptor::GetWinBits() const
SfxFrameDescriptor::SetURL(INetURLObject const&)
-SfxFrameDescriptor::TakeProperties(SfxFrameProperties const&)
-SfxFrameHTMLWriter::CreateURL(SfxFrame*)
SfxFrameProperties::SfxFrameProperties(SfxFrameDescriptor const*)
-SfxFrameWindow_Impl::LinkStubCloserHdl(void*, void*)
SfxHintPoster::SfxHintPoster()
SfxImageItem::GetURL() const
SfxImageItem::SfxImageItem(unsigned short, String const&)
@@ -903,7 +891,6 @@ SfxItemSetHint::SfxItemSetHint(SfxItemSet*)
SfxListener::EndListening(unsigned short)
SfxLockBytesItem::SfxLockBytesItem(unsigned short, SvLockBytes*)
SfxMacro::GenerateSource() const
-SfxMacro::GetLastStatement() const
SfxMacro::GetMode() const
SfxMacro::Record(SfxMacroStatement*)
SfxMacro::Remove()
@@ -913,7 +900,6 @@ SfxMacroStatement::SfxMacroStatement(SfxShell const&, String const&, unsigned ch
SfxMacroStatement::SfxMacroStatement(String const&)
SfxMacroStatement::SfxMacroStatement(String const&, SfxSlot const&, unsigned char, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
SfxMailModel::GetCount() const
-SfxMedium::GetDoneLink() const
SfxMedium::GetHdl()
SfxMedium::GetReferer() const
SfxMenuControl::CreateControl(String const&, unsigned short, Menu&, SfxBindings&, SfxVirtualMenu*)
@@ -927,17 +913,14 @@ SfxNavigatorWrapper::GetChildWindowId()
SfxObjectShell::Count()
SfxObjectShell::CreateAndLoadObject(SfxItemSet const&, SfxFrame*)
SfxObjectShell::DisconnectFromShared()
-SfxObjectShell::IsSecure()
SfxObjectShell::SetFlags(unsigned int)
SfxObjectShell::SetTemplate(unsigned char)
SfxObjectVerbsControl::RegisterControl(unsigned short, SfxModule*)
-SfxOfficeDispatch::IsMasterUnoCommand() const
SfxOleDateProperty::SfxOleDateProperty(int, com::sun::star::util::Date const&)
SfxOleString16Property::SfxOleString16Property(int, String const&)
SfxOrganizeDlg_Impl::OkHdl(Button*)
SfxPartChildWnd_Impl::GetChildWindowId()
SfxPasswordDialog::SetMaxLen(unsigned short)
-SfxPickList::GetMenuEntryTitle(unsigned int)
SfxPopupMenuManager::AddClipboardFunctions()
SfxPopupMenuManager::CheckItem(unsigned short, unsigned char)
SfxPopupMenuManager::EndInsert()
@@ -969,8 +952,6 @@ SfxSizeItem::SfxSizeItem(unsigned short, SvStream&)
SfxSlotPool::NextInterface()
SfxStringListItem::Sort(unsigned char)
SfxStyleSheet::SfxStyleSheet()
-SfxStyleSheetBasePool::GetStreamName()
-SfxStyleSheetBasePool::Load1_Impl(SvStream&)
SfxStyleSheetHintExtended::SfxStyleSheetHintExtended(unsigned short, String const&)
SfxTabDialog::FillOutputItemSet()
SfxTabDialog::GetApplyButton()
@@ -2130,7 +2111,6 @@ binfilter::DbgName_SfxFrameSetDescriptor()
binfilter::DbgName_SfxStringListItem()
binfilter::DbgName_SvxMacroItem()
binfilter::Dictionary::~Dictionary()
-binfilter::E3dLight::E3dLight(binfilter::Vector3D const&, Color const&, double)
binfilter::EECharAttribArray::Insert(binfilter::EECharAttrib const&, unsigned short)
binfilter::EECharAttribArray::Insert(binfilter::EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
binfilter::EECharAttribArray::Remove(unsigned short, unsigned short)
More information about the Libreoffice-commits
mailing list